From d0740914053bb74ac46edb586aa9a959f5015ac8 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 10 Oct 2021 21:10:09 +0200
Subject: [PATCH 0001/1037] Add support for IPv6 addresses when specifying a
 remote worker node

Now it should be possible to specify an IPv6 address with the bracketed notation:
  remote_host=[::1]:2001

Based on a patch by Peter Wong
Closes #673
Bugzilla Id: 65611
---
 .../main/java/org/apache/jmeter/engine/ClientJMeterEngine.java | 3 ++-
 xdocs/changes.xml                                              | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
index 508d13e7bf8..44a8d51294b 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
@@ -58,7 +58,8 @@ private static RemoteJMeterEngine getEngine(String hostAndPort)
         final String name = RemoteJMeterEngineImpl.JMETER_ENGINE_RMI_NAME; // $NON-NLS-1$ $NON-NLS-2$
         String host = hostAndPort;
         int port = RmiUtils.DEFAULT_RMI_PORT;
-        int indexOfSeparator = hostAndPort.indexOf(':');
+        int closingBracket = hostAndPort.indexOf(']');
+        int indexOfSeparator = hostAndPort.indexOf(':', closingBracket);
         if (indexOfSeparator >= 0) {
             host = hostAndPort.substring(0, indexOfSeparator);
             String portAsString = hostAndPort.substring(indexOfSeparator+1);
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a7152b72b46..267e52ca346 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -130,6 +130,7 @@ Summary
 <h3>General</h3>
 <ul>
   <li><bug>61805</bug><pr>663</pr>Add simple HTTP request template. Contributed by Ori Marko (orimarko at gmail.com)</li>
+  <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
@@ -263,6 +264,7 @@ Summary
   <li>Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
   <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
   <li>Mariusz (mawasak at gmail.com)</li>
+  <li>peter.wong@csexperts.com</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 443b549fca5c135940b0a26bf0b2be261f0f0925 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 15 Oct 2021 22:10:24 +0300
Subject: [PATCH 0002/1037] Update Gradle to 7.2

---
 buildSrc/checksum.xml                                  | 10 +++++++++-
 .../apache/jmeter/buildtools/batchtest/BatchTest.kt    |  2 +-
 .../jmeter/buildtools/batchtest/WriterExtensions.kt    |  2 +-
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 settings.gradle.kts                                    |  2 ++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 4e383facdf2..2474daa41fc 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -8,8 +8,12 @@
     <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
     <trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
+    <trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='abe9f3126bb741c1' group='com.google.guava' />
+    <trusted-key id='f6d4a1d411e9d1ae' group='com.google.guava' />
+    <trusted-key id='29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='7eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
     <trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
     <trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
@@ -27,14 +31,15 @@
     <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
     <trusted-key id='e2b3d84202b812d9' group='org.assertj' />
     <trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
+    <trusted-key id='b16698a4adf4d638' group='org.checkerframework' />
     <trusted-key id='41321490758aad6f' group='org.codehaus.groovy' />
     <trusted-key id='466caed6e0747d50' group='org.codehaus.plexus' />
     <trusted-key id='0e91c2de43b72bb1' group='org.ec4j.core' />
     <trusted-key id='c7bf26d0bb617866' group='org.eclipse.aether' />
     <trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
     <trusted-key id='a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='bcf4173966770193' group='org.jetbrains' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains' />
+    <trusted-key id='bcf4173966770193' group='org.jetbrains' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
     <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
     <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
@@ -48,6 +53,9 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.4'>
       <sha512>A343D64A4A607CD30B8464391FA542CDD11B3CAE65A589134DFADF298867B938A79CB752EC709614CB9F2E3080341936FDD40223EBFE414399D0FDAF15ACD358</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.6'>
+      <sha512>59E0C00C153296770FD8ED56CF0B2BDC2C5525557562C63D035E6E325557734940CDC5882407D93AD29C20727CA8C85BC9C50A683B62F67484A9BBE608F26A46</sha512>
+    </dependency>
     <dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
       <sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
     </dependency>
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index 22fba7d9eee..95daf993f9d 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -112,7 +112,7 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
         group = BATCH_TESTS_GROUP_NAME
         description = "Runs jmx file via process fork and verifies outputs"
         workingDir = File(project.rootDir, "bin")
-        main = "org.apache.jmeter.NewDriver"
+        mainClass.set("org.apache.jmeter.NewDriver")
         classpath(jmeterJar)
 
         // This does not depend on the task configuration, so the properties are initialized early
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
index ca36eb2fb8a..4be27400c5e 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
@@ -24,7 +24,7 @@ import java.io.Writer
 
 fun Writer.withPrefix(prefix: String) =
     LineBufferingOutputStream(object : TextStream {
-        override fun text(text: String?) {
+        override fun text(text: String) {
             write(prefix)
             write(text)
             flush()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa357df3542..c8c7da13508 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2bf4381ebcd..6c290f506a5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -133,6 +133,8 @@ val expectedSha512 = mapOf(
     "2A01A91008DF02AA0256D64EAB9238B23B85EA2A886E024E07C3880D642C5E4B96E66DE0D90832BCCEFE5F7C8EF045EBB9905B2A74398E38FAD6A5B28BEBA54D"
             to "gradle-enterprise-gradle-plugin-3.6.jar",
     "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
+            to "gradle-enterprise-gradle-plugin-3.6.3.jar",
+    "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
             to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
             to "bcprov-jdk15on-1.62.jar",

From 8edfaa0a0eb89d01b83af1f9ba15a74ce596f9ed Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 15 Oct 2021 22:15:53 +0300
Subject: [PATCH 0003/1037] Fix Gradle deprecation: replace main -> mainClass
 in BatchTestServer build logic

---
 .../org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
index 5618f3efa97..b48369d62ca 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
@@ -108,7 +108,7 @@ open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTe
         val server = executor.submit {
             project.javaexec {
                 workingDir = File(project.rootDir, "bin")
-                main = "org.apache.jmeter.NewDriver"
+                mainClass.set("org.apache.jmeter.NewDriver")
                 classpath(client.classpath)
                 standardOutput = System.out.writer().withPrefix("[server] ")
                 errorOutput = System.err.writer().withPrefix("[server] ")

From 5f1995de244986c820ed47028ceedf9167004673 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 16 Oct 2021 13:33:21 +0200
Subject: [PATCH 0004/1037] Always call compiler.done(pack) on sampler when it
 is finished

When the sampler set sample to ignore, compiler.done(pack) was not called,
which led to strange effects, as the thread loop thought, it was already
initialized on the next iteration and did not set the new values before
the next sample.

Bugzilla Id: 65569
---
 .../src/main/java/org/apache/jmeter/threads/JMeterThread.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 9084fd4c2f6..26bca46d8fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -587,6 +587,7 @@ private void executeSamplePackage(Sampler current,
                 // This call is done by checkAssertions() , as we don't call it
                 // for isIgnore, we explictely call it here
                 setLastSampleOk(threadContext.getVariables(), result.isSuccessful());
+                compiler.done(pack);
             }
             // Check if thread or test should be stopped
             if (result.isStopThread() || (!result.isSuccessful() && onErrorStopThread)) {

From 3c23246558a56e751f3e4fd860f46a2440893fa8 Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Thu, 21 Oct 2021 12:39:26 +0200
Subject: [PATCH 0005/1037] Update x-stream to 1.4.18 (from 1.4.17)

Closes #675
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 4 ++--
 xdocs/changes.xml                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e82385e352b..46908054dff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -131,5 +131,5 @@ xml-apis.version=1.4.01
 xmlgraphics-commons.version=2.6
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
-xstream.version=1.4.17
+xstream.version=1.4.18
 wiremock-jre8.version=2.30.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 28ad34eef5f..d931ad01aba 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -75,7 +75,7 @@
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
 419054,mongo-java-driver-2.11.3.jar
-29631,mxparser-1.2.1.jar
+29680,mxparser-1.2.2.jar
 4687205,neo4j-java-driver-4.3.3.jar
 65261,oro-2.0.8.jar
 1307434,ph-commons-10.1.2.jar
@@ -96,4 +96,4 @@
 220536,xml-apis-1.4.01.jar
 674607,xmlgraphics-commons-2.6.jar
 7188,xmlpull-1.1.3.1.jar
-629806,xstream-1.4.17.jar
+629707,xstream-1.4.18.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 267e52ca346..0e6f832acb0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -137,7 +137,7 @@ Summary
 <ul>
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>655</pr><pr>667</pr>Updated x-stream to 1.4.17 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>655</pr><pr>667</pr><pr>675</pr>Updated x-stream to 1.4.18 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.7 (from 2.3), accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>

From 062190a2665fdea442e89f0e3a454c75e627b99a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 3 Nov 2021 23:36:41 +0300
Subject: [PATCH 0006/1037] Reduce memory consumption by the logging panel
 (disable undo events for it)

There are two fixes:
1) undoManager.setLimit(0) -> setLimit(1) since (0) means "unlimited undo"
See https://github.com/bobbylight/RSyntaxTextArea/issues/99

2) By default, JMeter adds undoManager to ALL text fields via Swing updateUI method,
so we need to explicitly uninstall it for the case when undo is not needed
---
 .../jmeter/gui/util/JSyntaxTextArea.java      |  4 +-
 ...bleEditListenerPropertyChangeListener.java | 47 ++++++++++++
 .../jorphan/gui/ui/DefaultUndoManager.java    | 58 +++++++++++++++
 .../jorphan/gui/ui/TextComponentUI.java       | 72 +++++++++----------
 xdocs/changes.xml                             |  1 +
 5 files changed, 143 insertions(+), 39 deletions(-)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/gui/ui/AddUndoableEditListenerPropertyChangeListener.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/gui/ui/DefaultUndoManager.java

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
index da2ab82d6a8..4b6d62976f3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
@@ -33,6 +33,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.gui.ui.TextComponentUI;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rsyntaxtextarea.Theme;
@@ -240,6 +241,7 @@ public JSyntaxTextArea(int rows, int cols, boolean disableUndo) {
             }
         }
         if(disableUndo) {
+            TextComponentUI.uninstallUndo(this);
             // We need to do this to force recreation of undoManager which
             // will use the disableUndo otherwise it would always be false
             // See BUG 57440
@@ -276,7 +278,7 @@ public void setLanguage(String language) {
     protected RUndoManager createUndoManager() {
         RUndoManager undoManager = super.createUndoManager();
         if(disableUndo) {
-            undoManager.setLimit(0);
+            undoManager.setLimit(1);
         } else {
             undoManager.setLimit(MAX_UNDOS);
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/AddUndoableEditListenerPropertyChangeListener.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/AddUndoableEditListenerPropertyChangeListener.java
new file mode 100644
index 00000000000..c171e6063fe
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/AddUndoableEditListenerPropertyChangeListener.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.gui.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.text.Document;
+import javax.swing.undo.UndoManager;
+
+class AddUndoableEditListenerPropertyChangeListener implements PropertyChangeListener {
+    private final UndoManager manager;
+
+    public AddUndoableEditListenerPropertyChangeListener(UndoManager manager) {
+        this.manager = manager;
+    }
+
+    public final UndoManager getUndoManager() {
+        return manager;
+    }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        manager.discardAllEdits();
+        if (evt.getOldValue() != null) {
+            ((Document) evt.getOldValue()).removeUndoableEditListener(manager);
+        }
+        if (evt.getNewValue() != null) {
+            ((Document) evt.getNewValue()).addUndoableEditListener(manager);
+        }
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/DefaultUndoManager.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/DefaultUndoManager.java
new file mode 100644
index 00000000000..a5a5e107cdf
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/DefaultUndoManager.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.gui.ui;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.undo.UndoManager;
+
+class DefaultUndoManager extends UndoManager {
+    private final AtomicInteger undoEpoch;
+    private int ourUndoEpoch;
+
+    DefaultUndoManager(AtomicInteger undoEpoch) {
+        this.undoEpoch = undoEpoch;
+        this.ourUndoEpoch = undoEpoch.get();
+    }
+
+    @Override
+    public synchronized void discardAllEdits() {
+        super.discardAllEdits();
+        ourUndoEpoch = undoEpoch.get();
+    }
+
+    @Override
+    public void undoableEditHappened(UndoableEditEvent e) {
+        int epoch = undoEpoch.get();
+        if (ourUndoEpoch != epoch) {
+            discardAllEdits();
+        }
+        super.undoableEditHappened(e);
+    }
+
+    @Override
+    public synchronized boolean canUndo() {
+        return ourUndoEpoch == undoEpoch.get() && super.canUndo();
+    }
+
+    @Override
+    public synchronized boolean canRedo() {
+        return ourUndoEpoch == undoEpoch.get() && super.canRedo();
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
index 3acc7f40807..c7cca0bac5c 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
@@ -20,12 +20,14 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
 import javax.swing.KeyStroke;
-import javax.swing.event.UndoableEditEvent;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.undo.UndoManager;
@@ -70,44 +72,10 @@ public void installUndo(JTextComponent component) {
         // JComponent#name is updated. However, we don't want user to be able to "undo" that
         // So when tree selection is changed, we increase undoEpoch. That enables
         // UndoManagers to treat that as "end of undo history"
-        UndoManager manager = new UndoManager() {
-            private int ourUndoEpoch = undoEpoch.get();
-
-            @Override
-            public synchronized void discardAllEdits() {
-                super.discardAllEdits();
-                ourUndoEpoch = undoEpoch.get();
-            }
-
-            @Override
-            public void undoableEditHappened(UndoableEditEvent e) {
-                int epoch = undoEpoch.get();
-                if (ourUndoEpoch != epoch) {
-                    discardAllEdits();
-                }
-                super.undoableEditHappened(e);
-            }
-
-            @Override
-            public synchronized boolean canUndo() {
-                return ourUndoEpoch == undoEpoch.get() && super.canUndo();
-            }
-
-            @Override
-            public synchronized boolean canRedo() {
-                return ourUndoEpoch == undoEpoch.get() && super.canRedo();
-            }
-        };
+        UndoManager manager = new DefaultUndoManager(undoEpoch);
         manager.setLimit(200);
-        component.addPropertyChangeListener("document", evt -> {
-            manager.discardAllEdits();
-            if (evt.getOldValue() != null) {
-                ((Document) evt.getOldValue()).removeUndoableEditListener(manager);
-            }
-            if (evt.getNewValue() != null) {
-                ((Document) evt.getNewValue()).addUndoableEditListener(manager);
-            }
-        });
+        component.addPropertyChangeListener("document",
+                new AddUndoableEditListenerPropertyChangeListener(manager));
         component.getActionMap().put("undo", new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -130,4 +98,32 @@ public void actionPerformed(ActionEvent e) {
         KeyStroke shiftCommandZ = KeyStroke.getKeyStroke(KeyEvent.VK_Z, COMMAND_KEY | InputEvent.SHIFT_DOWN_MASK);
         component.getInputMap().put(shiftCommandZ, "redo");
     }
+
+    /**
+     * Removes the default undo manager.
+     * By default, JMeter installs undo manager to all text fields via {@code Swing -> createUI},
+     * however, undo is not always needed (e.g. log panel), so here's an API to remove it.
+     * @param component JTextField or JTextArea
+     */
+    @API(since = "5.5", status = API.Status.INTERNAL)
+    public static void uninstallUndo(JTextComponent component) {
+        List<PropertyChangeListener> listenersToRemove = new ArrayList<>();
+        for (PropertyChangeListener listener : component.getPropertyChangeListeners("document")) {
+            if (listener instanceof AddUndoableEditListenerPropertyChangeListener) {
+                AddUndoableEditListenerPropertyChangeListener v =
+                        (AddUndoableEditListenerPropertyChangeListener) listener;
+                listenersToRemove.add(v);
+
+                UndoManager undoManager = v.getUndoManager();
+                undoManager.discardAllEdits();
+                Document document = component.getDocument();
+                if (document != null) {
+                    document.removeUndoableEditListener(undoManager);
+                }
+            }
+        }
+        for (PropertyChangeListener listener : listenersToRemove) {
+            component.removePropertyChangeListener("document", listener);
+        }
+    }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0e6f832acb0..6451c545a52 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -131,6 +131,7 @@ Summary
 <ul>
   <li><bug>61805</bug><pr>663</pr>Add simple HTTP request template. Contributed by Ori Marko (orimarko at gmail.com)</li>
   <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
+  <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From b06f9def2a5c7007a6ee804487fc259c0fbd747b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 13 Nov 2021 15:46:37 +0100
Subject: [PATCH 0007/1037] Use default values for null values when extracting
 with JSONPostProcessor

When we extract a null value for a given expression, we now replace that
null with the given default value for the expression.

That leads to slight change of the meaning of a missing value.

Consider the JSON structure: {"context": null} and the JSON Path: "$.context"

The new implementation will replace the `null` with the default value, while
the old would have stringified it to the empty string.

Cleanup of parameter handling of default values. We should use the default
value for the current handled expression and not pass all default values
for all expression. That leads to confusion, only. (Well, I was confused)

Bugzilla Id: 65681
---
 .../extractor/json/jsonpath/JSONManager.java  |  2 +-
 .../json/jsonpath/JSONPostProcessor.java      | 51 +++++++++----------
 .../extractor/TestJSONPostProcessor.java      | 25 ++++++---
 xdocs/changes.xml                             |  1 +
 4 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
index f156f3d7c8c..c3f3371e64d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
@@ -95,7 +95,7 @@ private String stringifyJSONObject(Object obj) {
         if (obj instanceof JSONArray) {
             return ((JSONArray)obj).toJSONString();
         }
-        return obj == null ? "" : obj.toString(); //$NON-NLS-1$
+        return obj == null ? null : obj.toString();
     }
 
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index 3e7c5cf8bed..a20ea14c66a 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -81,10 +81,10 @@ public void process() {
             clearOldRefVars(vars, currentRefName);
             try {
                 if (jsonResponses.isEmpty()) {
-                    handleEmptyResponse(vars, defaultValues, i, currentRefName);
+                    handleEmptyResponse(vars, defaultValues[i], currentRefName);
                 } else {
                     List<Object> extractedValues = extractValues(jsonResponses, currentJsonPath);
-                    handleResult(vars, defaultValues, i, matchNumber, currentRefName, extractedValues);
+                    handleResult(vars, defaultValues[i], matchNumber, currentRefName, extractedValues);
                 }
             } catch (Exception e) {
                 if (log.isDebugEnabled()) {
@@ -98,13 +98,13 @@ public void process() {
         }
     }
 
-    private void handleResult(JMeterVariables vars, String[] defaultValues, int i, int matchNumber,
-            String currentRefName, List<Object> extractedValues) {
+    private void handleResult(JMeterVariables vars, String defaultValue, int matchNumber, String currentRefName,
+            List<Object> extractedValues) {
         // if no values extracted, default value added
         if (extractedValues.isEmpty()) {
-            handleEmptyResult(vars, defaultValues, i, matchNumber, currentRefName);
+            handleEmptyResult(vars, defaultValue, matchNumber, currentRefName);
         } else {
-            handleNonEmptyResult(vars, defaultValues, i, matchNumber, currentRefName, extractedValues);
+            handleNonEmptyResult(vars, defaultValue, matchNumber, currentRefName, extractedValues);
         }
     }
 
@@ -116,14 +116,14 @@ private List<Object> extractValues(List<String> jsonResponses, String currentJso
         return extractedValues;
     }
 
-    private void handleNonEmptyResult(JMeterVariables vars, String[] defaultValues, int i, int matchNumber,
-            String currentRefName, List<Object> extractedValues) {
+    private void handleNonEmptyResult(JMeterVariables vars, String defaultValue, int matchNumber, String currentRefName,
+            List<Object> extractedValues) {
         // if more than one value extracted, suffix with "_index"
         if (extractedValues.size() > 1) {
-            handleListResult(vars, defaultValues, i, matchNumber, currentRefName, extractedValues);
+            handleListResult(vars, defaultValue, matchNumber, currentRefName, extractedValues);
         } else {
             // else just one value extracted
-            handleSingleResult(vars, matchNumber, currentRefName, extractedValues);
+            handleSingleResult(vars, defaultValue, matchNumber, currentRefName, extractedValues);
         }
         if (matchNumber != 0) {
             vars.put(currentRefName + REF_MATCH_NR, Integer.toString(extractedValues.size()));
@@ -142,17 +142,17 @@ private void validateSameLengthOfArguments(String[] refNames, String[] jsonPathE
         }
     }
 
-    private void handleSingleResult(JMeterVariables vars, final int matchNumber, String currentRefName,
+    private void handleSingleResult(JMeterVariables vars, String defaultValue,  final int matchNumber, String currentRefName,
             List<Object> extractedValues) {
         String suffix = (matchNumber < 0) ? "_1" : "";
-        placeObjectIntoVars(vars, currentRefName + suffix, extractedValues, 0);
+        placeObjectIntoVars(vars, currentRefName + suffix, extractedValues, 0, defaultValue);
         if (matchNumber < 0 && getComputeConcatenation()) {
             vars.put(currentRefName + ALL_SUFFIX, vars.get(currentRefName + suffix));
         }
     }
 
-    private void handleListResult(JMeterVariables vars, String[] defaultValues, final int i, final int matchNumber,
-            String currentRefName, List<Object> extractedValues) {
+    private void handleListResult(JMeterVariables vars, String defaultValue, final int matchNumber, String currentRefName,
+            List<Object> extractedValues) {
         if (matchNumber < 0) {
             // Extract all
             int index = 1;
@@ -161,7 +161,7 @@ private void handleListResult(JMeterVariables vars, String[] defaultValues, fina
                             ? extractedValues.size() * 20
                             : 1);
             for (Object extractedObject : extractedValues) {
-                String extractedString = stringify(extractedObject);
+                String extractedString = StringUtils.defaultString(stringify(extractedObject), defaultValue);
                 vars.put(currentRefName + "_" + index,
                         extractedString); //$NON-NLS-1$
                 if (getComputeConcatenation()) {
@@ -181,7 +181,7 @@ private void handleListResult(JMeterVariables vars, String[] defaultValues, fina
             int matchSize = extractedValues.size();
             int matchNr = JMeterUtils.getRandomInt(matchSize);
             placeObjectIntoVars(vars, currentRefName,
-                    extractedValues, matchNr);
+                    extractedValues, matchNr, defaultValue);
             return;
         }
         // extract at position
@@ -191,15 +191,14 @@ private void handleListResult(JMeterVariables vars, String[] defaultValues, fina
                     "matchNumber({}) exceeds number of items found({}), default value will be used",
                         matchNumber, extractedValues.size());
             }
-            vars.put(currentRefName, defaultValues[i]);
+            vars.put(currentRefName, defaultValue);
         } else {
-            placeObjectIntoVars(vars, currentRefName, extractedValues, matchNumber - 1);
+            placeObjectIntoVars(vars, currentRefName, extractedValues, matchNumber - 1, defaultValue);
         }
     }
 
-    private void handleEmptyResult(JMeterVariables vars, String[] defaultValues, int i, int matchNumber,
-            String currentRefName) {
-        vars.put(currentRefName, defaultValues[i]);
+    private void handleEmptyResult(JMeterVariables vars, String defaultValue, int matchNumber, String currentRefName) {
+        vars.put(currentRefName, defaultValue);
         vars.put(currentRefName + REF_MATCH_NR, "0"); //$NON-NLS-1$
         if (matchNumber < 0 && getComputeConcatenation()) {
             log.debug("No value extracted, storing empty in: {}{}", currentRefName, ALL_SUFFIX);
@@ -207,11 +206,11 @@ private void handleEmptyResult(JMeterVariables vars, String[] defaultValues, int
         }
     }
 
-    private void handleEmptyResponse(JMeterVariables vars, String[] defaultValues, int i, String currentRefName) {
+    private void handleEmptyResponse(JMeterVariables vars, String defaultValue, String currentRefName) {
         if(log.isDebugEnabled()) {
             log.debug("Response or source variable is null or empty for {}", getName());
         }
-        vars.put(currentRefName, defaultValues[i]);
+        vars.put(currentRefName, defaultValue);
     }
 
     private List<String> extractJsonResponse(JMeterContext context, JMeterVariables vars) {
@@ -245,13 +244,13 @@ private void clearOldRefVars(JMeterVariables vars, String refName) {
     }
 
     private void placeObjectIntoVars(JMeterVariables vars, String currentRefName,
-            List<Object> extractedValues, int matchNr) {
+            List<Object> extractedValues, int matchNr, String defaultValue) {
         vars.put(currentRefName,
-                stringify(extractedValues.get(matchNr)));
+                StringUtils.defaultString(stringify(extractedValues.get(matchNr)), defaultValue));
     }
 
     private String stringify(Object obj) {
-        return obj == null ? "" : obj.toString(); //$NON-NLS-1$
+        return obj == null ? null : obj.toString();
     }
 
     public String getJsonPathExpressions() {
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
index 57362dd4edc..891a849d5c2 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
@@ -212,25 +212,36 @@ void testPR235CaseMatchOneWithZero() {
         assertThat(vars.get("varname_2"), CoreMatchers.is(CoreMatchers.nullValue()));
     }
 
-    @Test
-    void testEmptyInput() throws ParseException {
+    private static Stream<Arguments> provideEmptyOrNullResultArgs() {
+        return Stream.of(
+                Arguments.of("{\"context\": null}", "$.context", "0", null, "NONE"), // bug 65681
+                Arguments.of("[{\"context\": null}, {\"context\": \"\"}]", "$[*].context", "1", "2", "NONE"),
+                Arguments.of("[{\"context\": null}, {\"context\": \"\"}]", "$[*].context", "2", "2", ""),
+                Arguments.of("{\"context\": \"\"}", "$.context", "0", null, ""),
+                Arguments.of("", "$.context", "0", null, "NONE"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideEmptyOrNullResultArgs")
+    void testEmptyOrNullResult(String contextValue, String jsonPath, String matchNumber, String expectedMatchNumber,
+            String expectedResult) throws ParseException {
         JMeterContext context = JMeterContextService.getContext();
-        JSONPostProcessor processor = setupProcessor(context, "0", false);
+        JSONPostProcessor processor = setupProcessor(context, matchNumber, false);
 
         SampleResult result = new SampleResult();
-        result.setResponseData("".getBytes(StandardCharsets.UTF_8));
+        result.setResponseData(contextValue.getBytes(StandardCharsets.UTF_8));
 
         JMeterVariables vars = new JMeterVariables();
         context.setVariables(vars);
         context.setPreviousResult(result);
 
-        processor.setJsonPathExpressions("$.context");
+        processor.setJsonPathExpressions(jsonPath);
         processor.setDefaultValues("NONE");
         processor.setScopeAll();
         processor.process();
 
-        assertThat(vars.get(VAR_NAME), CoreMatchers.is("NONE"));
-        assertThat(vars.get(VAR_NAME + "_matchNr"), CoreMatchers.nullValue());
+        assertThat(vars.get(VAR_NAME), CoreMatchers.is(expectedResult));
+        assertThat(vars.get(VAR_NAME + "_matchNr"), CoreMatchers.is(expectedMatchNumber));
         assertThat(vars.get(VAR_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6451c545a52..661d2df9b7a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -213,6 +213,7 @@ Summary
   <li><bug>65259</bug>JMESPathExtractor Attribute <code>Match No.</code> Required</li>
   <li><bug>65269</bug>JSON Extractor and JSON JMESPath Extractor ignore sub-samples</li>
   <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
+  <li><bug>65681</bug>Use default values for null values when extracting with JSONPostProcessor</li>
 </ul>
 
 <h3>Functions</h3>

From 00aa2620fec73c65297711763ecacc06c79e02c0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 16 Oct 2021 11:30:03 +0300
Subject: [PATCH 0008/1037] Update JUnit5 to 5.8.1

---
 gradle.properties        | 2 +-
 src/bom/build.gradle.kts | 3 +--
 src/build.gradle.kts     | 4 +---
 xdocs/changes.xml        | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 46908054dff..dae92ba2a5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -106,7 +106,7 @@ json-smart.version=2.4.7
 jsoup.version=1.14.1
 jtidy.version=r938
 junit4.version=4.13.2
-junit5.version=5.7.2
+junit5.version=5.8.1
 log4j.version=2.14.1
 mail.version=1.5.0-b01
 miglayout.version=5.3
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 374ecaac746..1267c93a176 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -99,10 +99,9 @@ dependencies {
         apiv("javax.mail:mail")
         apiv("jcharts:jcharts")
         apiv("junit:junit", "junit4")
+        apiv("org.junit.jupiter:junit-jupiter", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-api", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-params", "junit5")
-        runtimev("org.junit.jupiter:junit-jupiter-engine", "junit5")
-        runtimev("org.junit.vintage:junit-vintage-engine", "junit5")
         apiv("net.minidev:accessors-smart")
         apiv("net.minidev:json-smart")
         apiv("net.sf.jtidy:jtidy")
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index 7ca93a6a77d..ee291e0d333 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -66,10 +66,8 @@ subprojects {
         }
         val testImplementation by configurations
         val testRuntimeOnly by configurations
-        testImplementation("org.junit.jupiter:junit-jupiter-api")
-        testImplementation("org.junit.jupiter:junit-jupiter-params")
+        testImplementation("org.junit.jupiter:junit-jupiter")
         testImplementation("org.hamcrest:hamcrest")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
         testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
         testImplementation("junit:junit")
         testImplementation(testFixtures(project(":src:testkit")))
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 661d2df9b7a..0ff073163b3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,7 +161,7 @@ Summary
   <li>Updated Apache HttpCore to 4.4.14 (from 4.4.13).</li>
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
-  <li>Updated JUnit to 4.13.2 and 5.7.2 (from 4.13.1 and 5.7.0).</li>
+  <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.14.1 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>

From 03e03caef80a90ca6c7c9d40cf0d07c7556e1025 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 Nov 2021 10:33:01 +0300
Subject: [PATCH 0009/1037] Bump ktlint to 0.40.0

It looks like there's an open IDEA issue regarding the use of continuation indent size.
Kotlin official style guide recomments using *single* indent for continuations,
however, IDEA wants to use double indent for some reason.

So far ij_kotlin_continuation_indent_size = 4 workaround seems to be sufficient
to make IDEA and ktlint format in the same way.

https://youtrack.jetbrains.com/issue/KTIJ-17907
https://github.com/pinterest/ktlint/issues/805
---
 .editorconfig                                 |  5 +
 build.gradle.kts                              | 27 +++---
 buildSrc/build.gradle.kts                     |  2 +-
 buildSrc/checksum.xml                         |  2 +
 buildSrc/gradle.properties                    |  2 +
 .../buildtools/batchtest/WriterExtensions.kt  | 25 ++---
 checksum.xml                                  |  2 +
 gradle.properties                             |  1 +
 settings.gradle.kts                           | 91 +++++++++---------
 src/build.gradle.kts                          | 14 ++-
 src/components/build.gradle.kts               |  8 +-
 src/dist-check/build.gradle.kts               | 14 ++-
 src/dist/build.gradle.kts                     | 96 ++++++++++---------
 src/licenses/build.gradle.kts                 |  8 +-
 xdocs/changes.xml                             |  1 +
 15 files changed, 170 insertions(+), 128 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 018a717cc91..57925963a21 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,6 +16,11 @@ end_of_line = crlf
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_name_count_to_use_star_import = 999
 ij_kotlin_name_count_to_use_star_import_for_members = 999
+# Kotlin code style does not use double-continuation indents
+# Revise this when the following issues are resolved:
+#     https://youtrack.jetbrains.com/issue/KTIJ-17907
+#     https://github.com/pinterest/ktlint/issues/805
+ij_kotlin_continuation_indent_size = 4
 
 [*.java]
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
diff --git a/build.gradle.kts b/build.gradle.kts
index d4af830dbf8..ae272e34c58 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,13 +66,13 @@ version = "jmeter".v + releaseParams.snapshotSuffix
 
 val displayVersion by extra {
     version.toString() +
-            if (releaseParams.release.get()) {
-                ""
-            } else {
-                // Append 7 characters of Git commit id for snapshot version
-                val grgit: Grgit? by project
-                grgit?.let { " " + it.head().abbreviatedId }
-            }
+        if (releaseParams.release.get()) {
+            ""
+        } else {
+            // Append 7 characters of Git commit id for snapshot version
+            val grgit: Grgit? by project
+            grgit?.let { " " + it.head().abbreviatedId }
+        }
 }
 
 println("Building JMeter $version")
@@ -284,7 +284,7 @@ allprojects {
         autostyle {
             kotlinGradle {
                 license()
-                ktlint()
+                ktlint("ktlint".v)
             }
             format("configs") {
                 filter {
@@ -475,9 +475,11 @@ allprojects {
                 sourceDirectories.from(mainCode.allSource.srcDirs)
                 // IllegalStateException: Can't add different class with same name: module-info
                 // https://github.com/jacoco/jacoco/issues/858
-                classDirectories.from(mainCode.output.asFileTree.matching {
-                    exclude("module-info.class")
-                })
+                classDirectories.from(
+                    mainCode.output.asFileTree.matching {
+                        exclude("module-info.class")
+                    }
+                )
             }
         }
     }
@@ -520,7 +522,8 @@ allprojects {
                         filter(org.apache.tools.ant.filters.EscapeUnicode::class)
                         filter(LineEndings.LF)
                     } else if (name.endsWith(".dtd") || name.endsWith(".svg") ||
-                        name.endsWith(".txt")) {
+                        name.endsWith(".txt")
+                    ) {
                         filter(LineEndings.LF)
                     }
                 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index aedf16371a2..affb9719727 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -48,7 +48,7 @@ fun Project.applyKotlinProjectConventions() {
     apply(plugin = "com.github.autostyle")
     autostyle {
         kotlin {
-            ktlint {
+            ktlint(project.extra["ktlint.version"] as String) {
                 userData(mapOf("disabled_rules" to "import-ordering"))
             }
             trimTrailingWhitespace()
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 2474daa41fc..f38af362082 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -18,7 +18,9 @@
     <trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
     <trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
     <trusted-key id='aa49c633b4734832' group='com.pinterest' />
+    <trusted-key id='995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
+    <trusted-key id='995efbf4a3d20beb' group='com.pinterest.ktlint' />
     <trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
     <trusted-key id='a41f13c999945293' group='commons-logging' />
     <trusted-key id='6449005f96bc97a3' group='de.undercouch' />
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 480486641a7..5f11ec80984 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -16,6 +16,8 @@ org.gradle.parallel=true
 kotlin.code.style=official
 kotlin.parallel.tasks.in.project=true
 
+ktlint.version=0.40.0
+
 # Plugins
 com.github.autostyle.version=3.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
index 4be27400c5e..2ced29bc1e9 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
@@ -23,16 +23,19 @@ import org.gradle.internal.io.TextStream
 import java.io.Writer
 
 fun Writer.withPrefix(prefix: String) =
-    LineBufferingOutputStream(object : TextStream {
-        override fun text(text: String) {
-            write(prefix)
-            write(text)
-            flush()
-        }
+    LineBufferingOutputStream(
+        object : TextStream {
+            override fun text(text: String) {
+                write(prefix)
+                write(text)
+                flush()
+            }
 
-        override fun endOfStream(failure: Throwable?) {
-            if (failure != null) {
-                throw failure
+            override fun endOfStream(failure: Throwable?) {
+                if (failure != null) {
+                    throw failure
+                }
             }
-        }
-    }, System.lineSeparator())
+        },
+        System.lineSeparator()
+    )
diff --git a/checksum.xml b/checksum.xml
index 4eadb24e205..0080fd13c72 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -51,7 +51,9 @@
     <trusted-key id='0a36eef644cff773' group='com.metsci.ext.com.kitfox.svg' />
     <trusted-key id='db45d3a62a183ce2' group='com.miglayout' />
     <trusted-key id='aa49c633b4734832' group='com.pinterest' />
+    <trusted-key id='995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
+    <trusted-key id='995efbf4a3d20beb' group='com.pinterest.ktlint' />
     <trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
     <trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
     <trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
diff --git a/gradle.properties b/gradle.properties
index dae92ba2a5a..b8c4fd2a97d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,6 +36,7 @@ jmeter.version=5.5
 checkstyle.version=8.35
 errorprone.version=2.4.0
 jacoco.version=0.8.5
+ktlint.version=0.40.0
 spotbugs.version=4.1.2
 velocity.version=1.7
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6c290f506a5..8bbc6d309a4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -42,35 +42,36 @@ plugins {
 rootProject.name = "jmeter"
 
 include(
-        "src:bom",
-        "src:bshclient",
-        "src:launcher",
-        "src:components",
-        "src:config",
-        "src:core",
-        "src:examples",
-        "src:functions",
-        "src:generator",
-        "src:jorphan",
-        "src:licenses",
-        "src:protocol:bolt",
-        "src:protocol:ftp",
-        "src:protocol:http",
-        "src:protocol:java",
-        "src:protocol:jdbc",
-        "src:protocol:jms",
-        "src:protocol:junit",
-        "src:protocol:junit-sample",
-        "src:protocol:ldap",
-        "src:protocol:mail",
-        "src:protocol:mongodb",
-        "src:protocol:native",
-        "src:protocol:tcp",
-        "src:release",
-        "src:testkit",
-        "src:testkit-wiremock",
-        "src:dist",
-        "src:dist-check")
+    "src:bom",
+    "src:bshclient",
+    "src:launcher",
+    "src:components",
+    "src:config",
+    "src:core",
+    "src:examples",
+    "src:functions",
+    "src:generator",
+    "src:jorphan",
+    "src:licenses",
+    "src:protocol:bolt",
+    "src:protocol:ftp",
+    "src:protocol:http",
+    "src:protocol:java",
+    "src:protocol:jdbc",
+    "src:protocol:jms",
+    "src:protocol:junit",
+    "src:protocol:junit-sample",
+    "src:protocol:ldap",
+    "src:protocol:mail",
+    "src:protocol:mongodb",
+    "src:protocol:native",
+    "src:protocol:tcp",
+    "src:release",
+    "src:testkit",
+    "src:testkit-wiremock",
+    "src:dist",
+    "src:dist-check"
+)
 
 // See https://github.com/gradle/gradle/issues/1348#issuecomment-284758705 and
 // https://github.com/gradle/gradle/issues/5321#issuecomment-387561204
@@ -87,14 +88,14 @@ fun String?.toBool(nullAs: Boolean, blankAs: Boolean, default: Boolean) =
     }
 
 fun property(name: String) =
-        when (extra.has(name)) {
-                true -> extra.get(name) as? String
-                else -> null
-        }
+    when (extra.has(name)) {
+        true -> extra.get(name) as? String
+        else -> null
+    }
 
 if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, default = false)) {
-        // This enables to use local clone of vlsi-release-plugins for debugging purposes
-        includeBuild("../vlsi-release-plugins")
+    // This enables to use local clone of vlsi-release-plugins for debugging purposes
+    includeBuild("../vlsi-release-plugins")
 }
 
 val isCiServer = System.getenv().containsKey("CI")
@@ -125,25 +126,25 @@ buildscript {
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
     "F7040C571C2A2727F2EED4EA772F5A7C5D9CB393828B7A2331F7167E467429486F5F3E9423883FE9A6D652FFB0484EAE722CDFB46D97180209BCBEEBF9C25DE3"
-            to "gradle-enterprise-gradle-plugin-3.4.jar",
+        to "gradle-enterprise-gradle-plugin-3.4.jar",
     "D5B49D90170DEA96E3D05D893B2B6C04E3B16F3DB6B6BB1DF82D3DE3247E5B0457721F232FAA237E689100980E97F4C04C1234FBEDBDAB7AE0CEAA91C40392C9"
-            to "gradle-enterprise-gradle-plugin-3.4.1.jar",
+        to "gradle-enterprise-gradle-plugin-3.4.1.jar",
     "AA8D06BDF95A6BAAEFE2B0DAE530FCD324A92238F7B790C0FF4A4B5C6454A6BE83D2C81BFEC013A7368697A0A9FC61B97E91775EF9948EF5572FA1DAA9E82052"
-            to "gradle-enterprise-gradle-plugin-3.5.jar",
+        to "gradle-enterprise-gradle-plugin-3.5.jar",
     "2A01A91008DF02AA0256D64EAB9238B23B85EA2A886E024E07C3880D642C5E4B96E66DE0D90832BCCEFE5F7C8EF045EBB9905B2A74398E38FAD6A5B28BEBA54D"
-            to "gradle-enterprise-gradle-plugin-3.6.jar",
+        to "gradle-enterprise-gradle-plugin-3.6.jar",
     "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
-            to "gradle-enterprise-gradle-plugin-3.6.3.jar",
+        to "gradle-enterprise-gradle-plugin-3.6.3.jar",
     "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
-            to "bcpg-jdk15on-1.62.jar",
+        to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
-            to "bcprov-jdk15on-1.62.jar",
+        to "bcprov-jdk15on-1.62.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
-            to "okhttp-4.1.0.jar",
+        to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
-            to "okio-2.2.2.jar",
+        to "okio-2.2.2.jar",
     settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()
-            to "checksum-dependency-plugin.jar"
+        to "checksum-dependency-plugin.jar"
 )
 
 fun File.sha512(): String {
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index ee291e0d333..19f252b2f85 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -75,19 +75,25 @@ subprojects {
             testImplementation("org.spockframework:spock-core")
         }
         testRuntimeOnly("cglib:cglib-nodep") {
-            because("""
+            because(
+                """
                 org.spockframework.mock.CannotCreateMockException: Cannot create mock for
                  class org.apache.jmeter.report.processor.AbstractSummaryConsumer${'$'}SummaryInfo.
                  Mocking of non-interface types requires a code generation library.
-                 Please put an up-to-date version of byte-buddy or cglib-nodep on the class path.""".trimIndent())
+                 Please put an up-to-date version of byte-buddy or cglib-nodep on the class path.
+                """.trimIndent()
+            )
         }
         testRuntimeOnly("org.objenesis:objenesis") {
-            because("""
+            because(
+                """
                 org.spockframework.mock.CannotCreateMockException: Cannot create mock for
                  class org.apache.jmeter.report.core.Sample. To solve this problem,
                  put Objenesis 1.2 or higher on the class path (recommended),
                  or supply constructor arguments (e.g. 'constructorArgs: [42]') that allow to construct
-                 an object of the mocked type.""".trimIndent())
+                 an object of the mocked type.
+                """.trimIndent()
+            )
         }
     }
 
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index c183f1bf9a8..2d1bdb5dac3 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -20,11 +20,13 @@ dependencies {
     testImplementation(project(":src:core", "testClasses"))
 
     api("org.apache-extras.beanshell:bsh") {
-        because("""
+        because(
+            """
             BeanShell is not required for JMeter, however it is commonly used in the jmx scripts.
             New scripts should refrain from using BeanShell though and migrate to Groovy or other
             faster engines
-        """.trimIndent())
+            """.trimIndent()
+        )
     }
 
     api("javax.mail:mail") {
@@ -91,7 +93,7 @@ fun classExists(name: String) =
     }
 
 if (!(project.findProperty("enableJavaFx") as? String)
-        .toBool(nullAs = classExists("javafx.application.Platform"), blankAs = true, default = false)
+    .toBool(nullAs = classExists("javafx.application.Platform"), blankAs = true, default = false)
 ) {
     // JavaFX is not present in Maven Central, so exclude the file unless explicitly asked by
     // -PenableJavaFx
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 10abddedb5b..51a7c3d9867 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -16,9 +16,9 @@
  */
 
 import com.github.vlsi.gradle.properties.dsl.props
-import java.time.Duration
 import org.apache.jmeter.buildtools.batchtest.BatchTest
 import org.apache.jmeter.buildtools.batchtest.BatchTestServer
+import java.time.Duration
 
 plugins {
     jmeterbuild.batchtest
@@ -107,7 +107,7 @@ val detailBatchTasks = findProperty("allBatch") is String
 val batchTests by tasks.registering() {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Executes all the batch tests" +
-            if (detailBatchTasks) "" else " (add -PallBatch to see individual batch tasks)"
+        if (detailBatchTasks) "" else " (add -PallBatch to see individual batch tasks)"
 }
 
 val jacoco = project.extensions.findByType<JacocoPluginExtension>()
@@ -117,8 +117,11 @@ inline fun <reified T : BatchTest> createBatchTask(
     suffix: String = "",
     noinline action: (T.() -> Unit)? = null
 ) =
-    tasks.register("batch" + (if (T::class == BatchTestServer::class) "Server" else "") +
-            name.capitalize() + suffix.capitalize(), T::class) {
+    tasks.register(
+        "batch" + (if (T::class == BatchTestServer::class) "Server" else "") +
+            name.capitalize() + suffix.capitalize(),
+        T::class
+    ) {
         group = when {
             detailBatchTasks -> LifecycleBasePlugin.VERIFICATION_GROUP
             else -> ""
@@ -219,7 +222,8 @@ val batchTestServerStartupTimeoutDuration =
         } catch (e: Exception) {
             throw IllegalArgumentException(
                 "Unable to parse the value of batchTestServerStartupTimeout property as duration $it." +
-                        " Please ensure it follows java.time.Duration format (e.g. PT5S)", e
+                    " Please ensure it follows java.time.Duration format (e.g. PT5S)",
+                e
             )
         }
     }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index f40033b33bb..5a02c494961 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -20,8 +20,8 @@ import com.github.vlsi.gradle.crlf.LineEndings
 import com.github.vlsi.gradle.git.FindGitAttributes
 import com.github.vlsi.gradle.git.dsl.gitignore
 import com.github.vlsi.gradle.properties.dsl.props
-import kotlin.math.absoluteValue
 import org.gradle.api.internal.TaskOutputsInternal
+import kotlin.math.absoluteValue
 
 plugins {
     id("com.github.vlsi.crlf")
@@ -29,25 +29,26 @@ plugins {
 }
 
 var jars = arrayOf(
-        ":src:bshclient",
-        ":src:launcher",
-        ":src:components",
-        ":src:core",
-        // ":src:examples",
-        ":src:functions",
-        ":src:jorphan",
-        ":src:protocol:bolt",
-        ":src:protocol:ftp",
-        ":src:protocol:http",
-        ":src:protocol:java",
-        ":src:protocol:jdbc",
-        ":src:protocol:jms",
-        ":src:protocol:junit",
-        ":src:protocol:ldap",
-        ":src:protocol:mail",
-        ":src:protocol:mongodb",
-        ":src:protocol:native",
-        ":src:protocol:tcp")
+    ":src:bshclient",
+    ":src:launcher",
+    ":src:components",
+    ":src:core",
+    // ":src:examples",
+    ":src:functions",
+    ":src:jorphan",
+    ":src:protocol:bolt",
+    ":src:protocol:ftp",
+    ":src:protocol:http",
+    ":src:protocol:java",
+    ":src:protocol:jdbc",
+    ":src:protocol:jms",
+    ":src:protocol:junit",
+    ":src:protocol:ldap",
+    ":src:protocol:mail",
+    ":src:protocol:mongodb",
+    ":src:protocol:native",
+    ":src:protocol:tcp"
+)
 
 // isCanBeConsumed = false ==> other modules must not use the configuration as a dependency
 val buildDocs by configurations.creating {
@@ -332,28 +333,34 @@ fun createAnakiaTask(
     return tasks.register(taskName) {
         inputs.file("$baseDir/$style")
         inputs.file("$baseDir/$projectFile")
-        inputs.files(fileTree(baseDir) {
-            include(*includes)
-            exclude(*excludes)
-        })
+        inputs.files(
+            fileTree(baseDir) {
+                include(*includes)
+                exclude(*excludes)
+            }
+        )
         inputs.property("extension", extension)
         outputs.dir(outputDir)
         dependsOn(prepareProps)
 
         doLast {
             ant.withGroovyBuilder {
-                "taskdef"("name" to "anakia",
-                        "classname" to "org.apache.velocity.anakia.AnakiaTask",
-                        "classpath" to buildDocs.asPath)
-                "anakia"("basedir" to baseDir,
-                        "destdir" to outputDir,
-                        "extension" to extension,
-                        "style" to style,
-                        "projectFile" to projectFile,
-                        "excludes" to excludes.joinToString(" "),
-                        "includes" to includes.joinToString(" "),
-                        "lastModifiedCheck" to "true",
-                        "velocityPropertiesFile" to prepareProps.get().outputs.files.singleFile)
+                "taskdef"(
+                    "name" to "anakia",
+                    "classname" to "org.apache.velocity.anakia.AnakiaTask",
+                    "classpath" to buildDocs.asPath
+                )
+                "anakia"(
+                    "basedir" to baseDir,
+                    "destdir" to outputDir,
+                    "extension" to extension,
+                    "style" to style,
+                    "projectFile" to projectFile,
+                    "excludes" to excludes.joinToString(" "),
+                    "includes" to includes.joinToString(" "),
+                    "lastModifiedCheck" to "true",
+                    "velocityPropertiesFile" to prepareProps.get().outputs.files.singleFile
+                )
             }
         }
     }
@@ -387,12 +394,14 @@ fun CopySpec.printableDocumentation() {
     }
 }
 
-val buildPrintableDoc = createAnakiaTask("buildPrintableDoc", baseDir = xdocs,
-        style = "stylesheets/site_printable.vsl",
-        velocityProperties = "$xdocs/velocity.properties",
-        projectFile = "stylesheets/printable_project.xml",
-        excludes = arrayOf("**/stylesheets/**", "extending.xml", "extending/*.xml"),
-        includes = arrayOf("**/*.xml"))
+val buildPrintableDoc = createAnakiaTask(
+    "buildPrintableDoc", baseDir = xdocs,
+    style = "stylesheets/site_printable.vsl",
+    velocityProperties = "$xdocs/velocity.properties",
+    projectFile = "stylesheets/printable_project.xml",
+    excludes = arrayOf("**/stylesheets/**", "extending.xml", "extending/*.xml"),
+    includes = arrayOf("**/*.xml")
+)
 
 val previewPrintableDocs by tasks.registering(Copy::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
@@ -415,7 +424,8 @@ fun xslt(
 
     val relativePath = if (subdir.isEmpty()) "." else ".."
     ant.withGroovyBuilder {
-        "xslt"("style" to "$xdocs/stylesheets/website-style.xsl",
+        "xslt"(
+            "style" to "$xdocs/stylesheets/website-style.xsl",
             "basedir" to "$xdocs/$subdir",
             "destdir" to "$outputDir/$subdir",
             "excludes" to excludes.joinToString(" "),
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 60f1054e6ad..05d5a27a889 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -120,10 +120,10 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     overrideLicense("xpp3:xpp3_min:1.1.4c") {
         // pom.xml contains multiple licenses
         expectedLicense = SpdxLicense.CC0_1_0 and
-                SimpleLicense(
-                    "Indiana University Extreme! Lab Software License, vesion 1.1.1",
-                    uri("http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt")
-                )
+            SimpleLicense(
+                "Indiana University Extreme! Lab Software License, vesion 1.1.1",
+                uri("http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt")
+            )
         effectiveLicense = SpdxLicense.CC0_1_0 and ExtraLicense.Indiana_University_1_1_1
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0ff073163b3..22e9a329964 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -166,6 +166,7 @@ Summary
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
+  <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.3.4 and 9.5.5 (from 6.2.3 and 9.5.1).</li>
   <li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>

From f09385e27c281745baac330721aff191847d350b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 18:57:58 +0300
Subject: [PATCH 0010/1037] Bump Gradle to 7.3

---
 buildSrc/checksum.xml                    | 5 +++++
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 settings.gradle.kts                      | 2 ++
 xdocs/changes.xml                        | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index f38af362082..4fbc3fd4bf9 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -46,6 +46,8 @@
     <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
     <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
+    <trusted-key id='3967d4eda591b991' group='org.jetbrains.kotlinx' />
+    <trusted-key id='3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
     <trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
   </trusted-keys>
   <dependencies>
@@ -58,6 +60,9 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.6'>
       <sha512>59E0C00C153296770FD8ED56CF0B2BDC2C5525557562C63D035E6E325557734940CDC5882407D93AD29C20727CA8C85BC9C50A683B62F67484A9BBE608F26A46</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.7'>
+      <sha512>2FE2FE885E48F7D3592751F0E824E21BE2478B9046E25E0AF109E6683F126B1ACE3DA7CB0FF3DA586C08498EF9FEFF445A00A63B2B86CC8BE22D0B3242F801B8</sha512>
+    </dependency>
     <dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
       <sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
     </dependency>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c8c7da13508..8a5e6bbc2af 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8bbc6d309a4..4faacde2591 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -135,6 +135,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.6.jar",
     "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
         to "gradle-enterprise-gradle-plugin-3.6.3.jar",
+    "CF0F77035EC4E61E310AAAF484AD543D8FFF84D31BF6F93183D09CA6056FB1F87B10F355F08F11198140AC47DD92A4DE4E5FED16C993A8B4C93FE169A61BB3A3"
+        to "gradle-enterprise-gradle-plugin-3.7.jar",
     "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
         to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 22e9a329964..511533ddec6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -179,6 +179,7 @@ Summary
   <li><bug>65456</bug>Updated commons-jexl 3 to 3.2.1 (from 3.1). Contributed by Ori Marko (orimarko at gmail.com>)</li>
   <li><pr>654</pr>Try do give better feedback while loading keystores</li>
   <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
+  <li>Updated Gradle to 7.3 (from 7.2)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 4d102ec07a25bec67576ac05fe311b30708f76f4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 Nov 2021 00:13:01 +0300
Subject: [PATCH 0011/1037] Fix Gradle 7 warnings related to missing task
 dependencies

When one task writes to a directory and another task reads the same directory
and implicit or explicit dependency should exist.

In most cases, implicit dependencies are created when task use the same *directory*
for input and output configuration.

However, tasks like distZip, autostyleCheck, etc, look as if they read full source tree,
and Gradle can't tell if they always exclude build/ and similar folders.

So we add explicit dependencies like "distZip mustRunAfter copyLibs"
---
 src/core/build.gradle.kts | 17 +++++++++++++++++
 src/dist/build.gradle.kts |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 100eca7521b..359f2d3ad7a 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import com.github.autostyle.gradle.AutostyleTask
+
 plugins {
     id("com.github.vlsi.ide")
 }
@@ -132,6 +134,21 @@ ide {
     generatedJavaSources(versionClass.get(), generatedVersionDir)
 }
 
+// <editor-fold defaultstate="collapsed" desc="Gradle can't infer task dependencies, however it sees they use the same directories. So we add the dependencies">
+tasks.compileKotlin {
+    dependsOn(versionClass)
+}
+
+tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
+    .configureEach {
+        mustRunAfter(versionClass)
+    }
+
+tasks.withType<AutostyleTask>().configureEach {
+    mustRunAfter(versionClass)
+}
+// </editor-fold>
+
 tasks.jar {
     into("org/apache/jmeter/images") {
         from("$rootDir/xdocs/images/logo.svg")
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 5a02c494961..1770fca3ff7 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -570,6 +570,10 @@ for (type in listOf("binary", "source")) {
             if (this is Tar) {
                 compression = Compression.GZIP
             }
+            // dist task excludes jar files from bin/, and lib/ however Gradle does not see that
+            // So we add an artificial dependency
+            mustRunAfter(copyBinLibs)
+            mustRunAfter(copyLibs)
             // Gradle does not track "filters" as archive/copy task dependencies,
             // So a mere change of a file attribute won't trigger re-execution of a task
             // So we add a custom property to re-execute the task in case attributes change

From 0c7af0ce99d0fd1136de5aaf1a0ac8bd4eec66b3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 19:26:13 +0300
Subject: [PATCH 0012/1037] Support Java 17, test with Java 17 in GitHub
 Actions and Travis CI

---
 .github/workflows/main.yml                         | 14 +++++++-------
 .travis.yml                                        |  7 +++----
 .../report/processor/Top5ErrorsSummaryData.java    |  2 +-
 .../processor/Top5ErrorsSummaryDataSpec.groovy     |  4 ++--
 .../apache/jmeter/util/JSR223TestElementTest.java  |  6 ++++++
 .../src/main/java/org/apache/jmeter/NewDriver.java | 11 +++++++----
 xdocs/changes.xml                                  |  3 +++
 7 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4bc32698f00..3c65a5412ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,35 +12,35 @@ on:
 
 jobs:
   windows:
-    name: 'Windows (JDK 14)'
+    name: 'Windows (JDK 17)'
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1.1.0
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 14'
+    - name: 'Set up JDK 17'
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 17
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:
-        job-id: jdk14
+        job-id: jdk17
         multi-cache-enabled: false
         # An explicit skip for Sha512 tasks is required due to https://github.com/gradle/gradle/issues/16789
         arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512
 
   mac:
-    name: 'macOS (JDK 14)'
+    name: 'macOS (JDK 17)'
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v1.1.0
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 14'
+    - name: 'Set up JDK 17'
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 17
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:
diff --git a/.travis.yml b/.travis.yml
index a299afa596d..e2f7c285a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,10 +61,9 @@ matrix:
         - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-s390x/
         - export PATH=$JAVA_HOME/bin:$PATH
         - ./gradlew build -Djava.awt.headless=true -PskipCheckstyle -PskipSpotless $SKIP_TAR
-    # Java 12 is not here because it has been superceeded by Java 13
-    # Tests with Java 12 do not surface much new, so Java 11 (LTS) and Java 13 (non-LTS) are enough for "post Java 9" testing
-    - name: Tests with OpenJDK 14
-      jdk: openjdk14
+    # We test with so-called LTS releases: 8, 11, 17
+    - name: Tests with OpenJDK 17
+      jdk: openjdk17
       addons:
         apt:
           packages:
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
index 48db05eb8f3..b20fc599711 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
@@ -79,6 +79,6 @@ public Object[][] getTop5ErrorsMetrics() {
                 .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
                 .limit(maxSize)
                 .map(e -> new Object[]{e.getKey(), e.getValue()})
-                .toArray(e -> new Object[maxSize][2]);
+                .toArray(Object[][]::new);
     }
 }
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy
index b97acaea4e1..3ffd87cd03c 100644
--- a/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy
+++ b/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy
@@ -40,7 +40,7 @@ class Top5ErrorsSummaryDataSpec extends Specification {
 
     def "when no errors are registered an array with null values is returned"() {
         expect:
-            sut.getTop5ErrorsMetrics() == new Object[5][2]
+            sut.getTop5ErrorsMetrics() == new Object[0][0]
     }
 
     def "error messages with the same frequency are preserved up until the size limit"() {
@@ -54,7 +54,7 @@ class Top5ErrorsSummaryDataSpec extends Specification {
         given:
             ["A", "A", "A", "B", "B", "C"].each { sut.registerError(it) }
         expect:
-            sut.getTop5ErrorsMetrics() == [["A", 3], ["B", 2], ["C", 1], [null, null], [null, null]]
+            sut.getTop5ErrorsMetrics() == [["A", 3], ["B", 2], ["C", 1]]
     }
 
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
index 8872f92d497..f433c492514 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
@@ -19,7 +19,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import org.apache.commons.lang3.JavaVersion;
 import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 public class JSR223TestElementTest {
@@ -30,6 +32,10 @@ public class JSR223TestElementTest {
 
     @Test
     public void testGetScriptEngineJS() throws Exception {
+        Assumptions.assumeTrue(
+                JavaVersion.JAVA_RECENT.atMost(JavaVersion.JAVA_14),
+                "The default JavaScript engine has been removed in Java 15+, current Java is " + JavaVersion.JAVA_RECENT
+        );
         element.setScriptLanguage("JavaScript");
         assertThat(element.getScriptEngine().getFactory().getLanguageName(),
                 CoreMatchers.containsString("Script"));
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 1b9def6a1d2..99aff035a4c 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -25,8 +25,6 @@
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -131,8 +129,13 @@ public final class NewDriver {
 
         // ClassFinder needs the classpath
         System.setProperty(JAVA_CLASS_PATH, initiaClasspath + classpath.toString());
-        loader = AccessController.doPrivileged(
-                (PrivilegedAction<DynamicClassLoader>) () ->
+        loader = createClassLoader(jars);
+    }
+
+    @SuppressWarnings("removal")
+    private static DynamicClassLoader createClassLoader(List<URL> jars) {
+        return java.security.AccessController.doPrivileged(
+                (java.security.PrivilegedAction<DynamicClassLoader>) () ->
                         new DynamicClassLoader(jars.toArray(new URL[jars.size()]))
         );
     }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 511533ddec6..b576c2adb7c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -59,6 +59,9 @@ Summary
 </ul>
 
 <ch_section>New and Noteworthy</ch_section>
+<ul>
+  <li>Support building and running JMeter with Java 17</li>
+</ul>
 <!--
 <ch_title>Core improvements</ch_title>
 <ch_title>Test Plan</ch_title>

From ac056759c9d1d12d1ac15fac3aeba4c31a46eeda Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 14 Nov 2021 22:09:47 +0300
Subject: [PATCH 0013/1037] Ignore InaccessibleObjectException when configuring
 AWT Title in XToolkit

---
 .../src/main/java/org/apache/jmeter/gui/MainFrame.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 85e886e540d..23003e6879a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -915,6 +915,14 @@ private void setWindowTitle() {
                 if (log.isWarnEnabled()) {
                     log.warn("Error awt title: {}", nsfe.toString()); // $NON-NLS-1$
                 }
+            } catch (RuntimeException e) {
+                // By default, strong encapsulation prevents setAccessible on java.desktop
+                if ("java.lang.reflect.InaccessibleObjectException".equals(e.getClass().getName())) {
+                    /* ignore */
+                    log.info("Unable to adjust awtAppClassName to {}", DEFAULT_APP_NAME);
+                    return;
+                }
+                throw e;
             }
         }
     }

From 3f6c47e4d97e9a1bfa4f297f15eee8dc7d4565ac Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 14 Nov 2021 13:29:28 +0300
Subject: [PATCH 0014/1037] Bump jacoco to 0.8.7 (from 0.8.5)

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b8c4fd2a97d..a644afc5bca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,7 +35,7 @@ jmeter.version=5.5
 # Tools
 checkstyle.version=8.35
 errorprone.version=2.4.0
-jacoco.version=0.8.5
+jacoco.version=0.8.7
 ktlint.version=0.40.0
 spotbugs.version=4.1.2
 velocity.version=1.7
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b576c2adb7c..42515a3de0f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -162,6 +162,7 @@ Summary
   <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
   <li>Updated Apache HttpCore to 4.4.14 (from 4.4.13).</li>
+  <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>

From a1beb216c78986e06fa4e77d216d8ab6a6bbf634 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 12 Nov 2021 11:27:05 +0300
Subject: [PATCH 0015/1037] Bump com.github.vlsi.vlsi-release-plugins to 1.76

---
 gradle.properties | 4 ++--
 xdocs/changes.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a644afc5bca..985ad3273ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,8 +44,8 @@ velocity.version=1.7
 com.github.autostyle.version=3.0
 com.github.spotbugs.version=4.5.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.74
-com.github.vlsi.vlsi-release-plugins.version=1.74
+com.github.vlsi.checksum-dependency.version=1.76
+com.github.vlsi.vlsi-release-plugins.version=1.76
 net.ltgt.errorprone.version=1.2.1
 org.jetbrains.gradle.plugin.idea-ext.version=0.5
 org.nosphere.apache.rat.version=0.7.0
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 42515a3de0f..3ff29cc6ea9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -177,6 +177,7 @@ Summary
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
   <li>Updated Apache Tika to 1.27 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
+  <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
   <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
      to <code>user.properties</code>, as it is read from that place.
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>

From 50d516765db0c5b776b81079036d76d44f573fd6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 14 Nov 2021 12:34:11 +0300
Subject: [PATCH 0016/1037] Skip DNSCacheManagerSpec when no DNS servers
 detected

---
 .../jmeter/protocol/http/control/DNSCacheManagerSpec.groovy  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
index 06f3d221830..c4de5754983 100644
--- a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
+++ b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
@@ -32,12 +32,15 @@ class DNSCacheManagerSpec extends Specification {
 
     private static final boolean localDNSResolverOK = {
         try {
+            if (VALID_DNS_SERVERS == null) {
+                return false
+            }
             new DNSCacheManager().resolve("apache.org")
             return true
         } catch (UnknownHostException uhe) {
             return false
         }
-    }
+    }.call() // <-- this avoids automatic casting of Closure to boolean which yields true in Groovy
 
     def sut = new DNSCacheManager()
 

From 5fdf0928e089836681e9948ba509cce03ccd7b00 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 15:42:35 +0300
Subject: [PATCH 0017/1037] Avoid running batch tests when :dist-check:test is
 executed

It allows to execute tests from IDE without waiting for batch tests
---
 src/dist-check/build.gradle.kts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 51a7c3d9867..b2add274f45 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -232,10 +232,12 @@ createBatchServerTestTask("BatchTestLocal") {
     batchTestServerStartupTimeoutDuration?.let { startupTimeout.set(it) }
 }
 
-tasks.named(JavaPlugin.TEST_TASK_NAME).configure {
+tasks.test {
     // Test examine JAR contents in /lib/..., so we need to copy jars to the projectRoot/lib/
     dependsOn(createDist)
-    // This is a convenience, so batch tests are executed as a part of default "test" task
+}
+
+tasks.check {
     dependsOn(batchTests)
 }
 

From c2dea2bfb8ac775fcbe18c0b9c7b78ed3522ffca Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 15:43:51 +0300
Subject: [PATCH 0018/1037] Make sure reportErrorToUser and reportInfoToUser
 perform Swing operations on AWT thread

---
 .../org/apache/jmeter/util/JMeterUtils.java   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 8974bf509bb..05980b3cffe 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -870,14 +870,17 @@ public static void reportErrorToUser(String errorMsg, String titleMsg, Exception
             System.out.println(errorMsg); // NOSONAR intentional
             return; // Done
         }
-        try {
-            JOptionPane.showMessageDialog(instance.getMainFrame(),
-                    formatMessage(errorMsg),
-                    titleMsg,
-                    JOptionPane.ERROR_MESSAGE);
-        } catch (HeadlessException e) {
-            log.warn("reportErrorToUser(\"{}\") caused", errorMsg, e);
-        }
+        String errorMessage = errorMsg;
+        SwingUtilities.invokeLater(() -> {
+            try {
+                JOptionPane.showMessageDialog(instance.getMainFrame(),
+                        formatMessage(errorMessage),
+                        titleMsg,
+                        JOptionPane.ERROR_MESSAGE);
+            } catch (HeadlessException e) {
+                log.warn("reportErrorToUser(\"{}\") caused", errorMessage, e);
+            }
+        });
     }
 
     /**
@@ -893,14 +896,16 @@ public static void reportInfoToUser(String msg, String titleMsg) {
             System.out.println(msg); // NOSONAR intentional
             return; // Done
         }
-        try {
-            JOptionPane.showMessageDialog(instance.getMainFrame(),
-                    formatMessage(msg),
-                    titleMsg,
-                    JOptionPane.INFORMATION_MESSAGE);
-        } catch (HeadlessException e) {
-            log.warn("reportInfoToUser(\"{}\") caused", msg, e);
-        }
+        SwingUtilities.invokeLater(() -> {
+            try {
+                JOptionPane.showMessageDialog(instance.getMainFrame(),
+                        formatMessage(msg),
+                        titleMsg,
+                        JOptionPane.INFORMATION_MESSAGE);
+            } catch (HeadlessException e) {
+                log.warn("reportInfoToUser(\"{}\") caused", msg, e);
+            }
+        });
     }
 
     private static JScrollPane formatMessage(String errorMsg) {

From d9b29c44aa7af64f862d5fe981e787e001dcbc2a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 18:20:38 +0300
Subject: [PATCH 0019/1037] Improve output of JOrphanUtils#displayThreads

---
 .../org/apache/jorphan/util/JOrphanUtils.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 9c4e37bb140..27f583cd178 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -493,20 +493,21 @@ public static int read(InputStream is, byte[] buffer, int offset, int length) th
     public static void displayThreads(boolean includeDaemons) {
         Map<Thread, StackTraceElement[]> m = Thread.getAllStackTraces();
         String lineSeparator = System.getProperty("line.separator");
+        StringBuilder builder = new StringBuilder();
         for (Map.Entry<Thread, StackTraceElement[]> e : m.entrySet()) {
             boolean daemon = e.getKey().isDaemon();
             if (includeDaemons || !daemon) {
-                StringBuilder builder = new StringBuilder();
+                builder.setLength(0);
+                builder.append(e.getKey());
+                if (daemon) {
+                    builder.append(" (daemon)");
+                }
+                builder.append(lineSeparator);
                 StackTraceElement[] ste = e.getValue();
                 for (StackTraceElement stackTraceElement : ste) {
-                    int lineNumber = stackTraceElement.getLineNumber();
-                    builder.append(stackTraceElement.getClassName())
-                            .append("#")
-                            .append(stackTraceElement.getMethodName())
-                            .append(lineNumber >= 0 ? " at line:" + stackTraceElement.getLineNumber() : "")
-                            .append(lineSeparator);
+                    builder.append("  at ").append(stackTraceElement).append(lineSeparator);
                 }
-                System.out.println(e.getKey().toString() + (daemon ? " (daemon)" : "") + ", stackTrace:" + builder.toString());
+                System.out.println(builder);
             }
         }
     }

From c3662df942ef0ef97813b9628f9ce65a7e3099be Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 18:21:11 +0300
Subject: [PATCH 0020/1037] Improve exception verification in
 DistributedRunnerTest

---
 .../jmeter/engine/DistributedRunnerTest.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index fa35ca918dd..0241287a3bc 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.engine;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -32,9 +32,12 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Execution(ExecutionMode.SAME_THREAD) // System.setOut must not be run concurrently with other tests
 public class DistributedRunnerTest {
 
     public static void createJmeterEnv() {
@@ -84,10 +87,15 @@ private void initRunner(DistributedRunnerEmul runner, List<String> hosts) {
         PrintStream origSystemOut = System.out;
         ByteArrayOutputStream catchingOut = new ByteArrayOutputStream();
         System.setOut(new PrintStream(catchingOut));
-        try {
-            runner.init(hosts, new HashTree());
-            fail();
-        } catch (RuntimeException ignored) {
+        RuntimeException ex = assertThrows(
+                RuntimeException.class,
+                () -> runner.init(hosts, new HashTree()),
+                "Expecting IllegalArgumentException since the testplan is invalid"
+        );
+        if (!ex.getMessage().startsWith("Following remote engines could not be configured:")) {
+            throw new AssertionError(
+                    "Message should start with 'Following remote engines could not be configured:', actual message was " +
+                            ex.getMessage(), ex);
         }
         System.setOut(origSystemOut);
     }

From 6d05eab0fe5e5ac486857a1a7ed0efed78d92a88 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 14 Nov 2021 11:30:53 +0300
Subject: [PATCH 0021/1037] Remove SaveService.FILEVERSION field

---
 .../src/main/java/org/apache/jmeter/save/SaveService.java | 3 ---
 .../test/java/org/apache/jmeter/save/TestSaveService.java | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
index 3dad44fd7c3..bfc3d0b57c7 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
@@ -153,9 +153,6 @@ public String serializedClass(@SuppressWarnings("rawtypes") // superclass does n
 
     // Internal information only
     private static String fileVersion = ""; // computed from saveservice.properties file// $NON-NLS-1$
-    // Must match the sha1 checksum of the file saveservice.properties (without newline character),
-    // used to ensure saveservice.properties and SaveService are updated simultaneously
-    static final String FILEVERSION = "66ea47f7da884dff1c42ccede75113971c5c11f3"; // Expected value $NON-NLS-1$
 
     private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 03946374d6a..8c654e9e6c0 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -89,14 +89,6 @@ public void testPROPVERSION() {
                 SaveService.PROPVERSION, SaveService.getPropertyVersion());
     }
 
-    @Test
-    public void testFILEVERSION() {
-        assertEquals(
-                "SaveService class and saveservice.properties must be aligned. Please ensure you have edited both files," +
-                        " and update SaveService.FILEVERSION",
-                SaveService.FILEVERSION, SaveService.getFileVersion());
-    }
-
     @Test
     public void testLoadAndSave() throws Exception {
         boolean failed = false; // Did a test fail?

From 007070e5fdda163c61a4b24ee2d68ba1839a8e17 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Oct 2021 22:03:10 +0300
Subject: [PATCH 0022/1037] Produce better error message when guiclass
 attribute is not present in xml

---
 .../apache/jmeter/save/converters/TestElementConverter.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
index f477b323d9c..e7e521164d5 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
@@ -88,7 +88,11 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         }
         // Update the test class name if necessary (Bug 52466)
         String inputName = type.getName();
-        String guiClassName = SaveService.aliasToClass(reader.getAttribute(ConversionHelp.ATT_TE_GUICLASS));
+        String guiClass = reader.getAttribute(ConversionHelp.ATT_TE_GUICLASS);
+        if (guiClass == null) {
+            throw new IllegalArgumentException(ConversionHelp.ATT_TE_GUICLASS + " attribute is not found");
+        }
+        String guiClassName = SaveService.aliasToClass(guiClass);
         String targetName = NameUpdater.getCurrentTestName(inputName, guiClassName);
         if (!targetName.equals(inputName)) { // remap the class name
             type = mapper().realClass(targetName);

From c524b2611e955338605c3645f9c10ade5968af42 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 17 Nov 2021 09:46:36 +0300
Subject: [PATCH 0023/1037] Remove compileKotlin reference from build scripts

---
 buildSrc/gradle.properties | 1 -
 gradle.properties          | 1 -
 src/core/build.gradle.kts  | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 5f11ec80984..c8a1d01f881 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -14,7 +14,6 @@
 #   limitations under the License.
 org.gradle.parallel=true
 kotlin.code.style=official
-kotlin.parallel.tasks.in.project=true
 
 ktlint.version=0.40.0
 
diff --git a/gradle.properties b/gradle.properties
index 985ad3273ae..c64173914a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ org.gradle.caching=true
 # repository.apache.org does not yet support .sha256 and .sha512 checksums
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 kotlin.code.style=official
-kotlin.parallel.tasks.in.project=true
 
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 359f2d3ad7a..611ecf1982a 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -135,10 +135,6 @@ ide {
 }
 
 // <editor-fold defaultstate="collapsed" desc="Gradle can't infer task dependencies, however it sees they use the same directories. So we add the dependencies">
-tasks.compileKotlin {
-    dependsOn(versionClass)
-}
-
 tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
     .configureEach {
         mustRunAfter(versionClass)

From c074d9aa1f693957994490289e38c6435b5d7b75 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 18 Nov 2021 17:58:20 +0100
Subject: [PATCH 0024/1037] Fix wrong JVM arg to set up module path for
 nashorn/Java 15

and while we are here, update the example to use newer versions
of the jars
---
 xdocs/changes.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3ff29cc6ea9..4b98e3c5143 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -358,18 +358,18 @@ With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jep
     <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
     <dt>Use OpenJDK Nashorn</dt>
     <dd>
-      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 and its dependencies and set the module path is outlined below:
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
       <source>
 mkdir lib/modules
 pushd lib/modules
-wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.0/nashorn-core-15.0.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.0/asm-util-9.0.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
 popd
-export JVM_ARGS="--modulepath $PWD/lib/modules"
+export JVM_ARGS="--module-path $PWD/lib/modules"
 ./bin/jmeter
       </source>
     </dd>

From 884c45f67a21c2f0668e56164c2840eea4f5ae08 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 20 Nov 2021 17:08:31 +0100
Subject: [PATCH 0025/1037] Correct javadoc for spnego canonicalize host option

---
 .../org/apache/jmeter/protocol/http/control/AuthManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index d88e2c05479..3e30b1c8f90 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -97,10 +97,10 @@ public class AuthManager extends ConfigTestElement implements TestStateListener,
 
     private static final boolean DEFAULT_CLEAR_VALUE = false;
 
-    /** Decides whether port should be omitted from SPN for kerberos spnego authentication */
+    /** Decides whether port should be omitted from SPN for Kerberos SPNEGO authentication */
     public static final boolean STRIP_PORT = JMeterUtils.getPropDefault("kerberos.spnego.strip_port", true);
 
-    /** Decides whether port should be omitted from SPN for kerberos spnego authentication */
+    /** Decides whether SPN for Kerberos SPNEGO authentication should be acquired for the canonicalized host name*/
     public static final boolean USE_CANONICAL_HOST_NAME = JMeterUtils.getPropDefault("kerberos.spnego.use_canonical_host_name", true);
 
     public enum Mechanism {

From 6fc21f881367d2def98615b80accb250ba92ac96 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 20 Nov 2021 17:14:13 +0100
Subject: [PATCH 0026/1037] Add description of
 kerberos.spnego.use_canonical_host_name to property reference and
 jmeter.properties

---
 bin/jmeter.properties                     | 4 ++++
 xdocs/usermanual/properties_reference.xml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 4953cbd9ad8..753167e8918 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -403,6 +403,10 @@ remote_hosts=127.0.0.1
 # for SPNEGO authentication
 #kerberos.spnego.strip_port=true
 
+# Should the host name for constructing SPN be canonicalized
+# for SPNEGO authentication
+#kerberos.spnego.use_canonical_host_name=true
+
 # Should credentials be delegated to webservers when using
 # SPNEGO authentication
 #kerberos.spnego.delegate_cred=false
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index c64144bf281..d4b05a2166b 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -484,6 +484,9 @@ JMETER-SERVER</source>
     Should port be stripped from urls before constructing SPNs for SPNEGO authentication.
     Defaults to: <code>true</code>
 </property>
+<property name="kerberos.spnego.use_canonical_host_name">
+    Should the host name for constructing SPN be canonicalized for SPNEGO authentication.
+</property>
 <property name="kerberos.spnego.delegate_cred">
     Should SPNEGO authentication should use delegation of credentials.
     Defaults to: <code>false</code>

From c98be3f40009caffb8b66aded702356d975bb4d7 Mon Sep 17 00:00:00 2001
From: Philippe M <pmouawad@users.noreply.github.com>
Date: Sat, 20 Nov 2021 21:11:45 +0100
Subject: [PATCH 0027/1037] Align ssl props / Enable setting cipher suite
 (#677)

* Switch in LazyLayeredConnectionSocketFactory https.socket.ciphers to https.cipherSuites as the latter is documented
* Use https.cipherSuites, https.socket.protocols in Proxy (HTTP(S) Test Script Recorder)
* Introduce JMeterUtils.getArrayPropDefault
Rename based on Vladimir proposals

This resolves https://bz.apache.org/bugzilla/show_bug.cgi?id=65692
---
 .../org/apache/jmeter/util/JMeterUtils.java   | 23 +++++++++++++++++++
 .../apache/jmeter/util/TestJMeterUtils.java   | 18 +++++++++++++++
 .../jmeter/protocol/http/proxy/Proxy.java     | 12 ++++++++++
 .../LazyLayeredConnectionSocketFactory.java   | 20 +++++++---------
 xdocs/changes.xml                             |  1 +
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 05980b3cffe..a6b40c64a9c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -52,6 +52,7 @@
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.gui.JFactory;
@@ -713,6 +714,28 @@ public static boolean getPropDefault(String propName, boolean defaultVal) {
         return defaultVal;
     }
 
+    /**
+     * Get an array of String if present and not empty, defaultValue if not present.
+     *
+     * @param propName
+     *            the name of the property.
+     * @param defaultVal
+     *            the default value.
+     * @return The PropDefault value
+     */
+    public static String[] getArrayPropDefault(String propName, String[] defaultVal) {
+        try {
+            String strVal = appProperties.getProperty(propName);
+            if (StringUtils.isNotBlank(strVal)) {
+                return strVal.trim().split("\\s+");
+            }
+        } catch (Exception e) {
+            log.warn("Exception '{}' occurred when fetching Array property:'{}', defaulting to: {}",
+                    e.getMessage(), propName, defaultVal != null ? Arrays.toString(defaultVal) : null);
+        }
+        return defaultVal;
+    }
+
     /**
      * Get a long value with default if not present.
      *
diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 3642fd9b597..80f3cda7740 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -19,6 +19,10 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestJMeterUtils {
@@ -38,4 +42,18 @@ public void testGetResourceFileAsTextWithMisingResource() throws Exception{
     public void testGesResStringDefaultWithNonExistantKey() throws Exception {
         assertEquals("[res_key=noValidKey]", JMeterUtils.getResString("noValidKey"));
     }
+
+    @Test
+    public void testGetArrayPropDefault() throws Exception {
+        Path props = Files.createTempFile("testGetArrayPropDefault", ".properties");
+        JMeterUtils.loadJMeterProperties(props.toString());
+        JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefaultEmpty", "    ");
+        JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefault", " Tolstoi  Dostoievski    Pouchkine       Gorki ");
+        Assertions.assertArrayEquals(new String[]{"Tolstoi", "Dostoievski", "Pouchkine", "Gorki"},
+                JMeterUtils.getArrayPropDefault("testGetArrayPropDefault", null));
+        Assertions.assertArrayEquals(new String[]{"Gilels", "Richter"},
+                JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultMissing", new String[]{"Gilels", "Richter"}));
+        Assertions.assertArrayEquals(null,
+                JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultEmpty", null));
+    }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
index ad732efdb9d..cff632a3b1e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
@@ -89,6 +89,12 @@ public class Proxy extends Thread {
     private static final String SSLCONTEXT_PROTOCOL =
         JMeterUtils.getPropDefault("proxy.ssl.protocol", "TLS"); // $NON-NLS-1$ $NON-NLS-2$
 
+    private static final String[] SOCKET_PROTOCOL_ARRAY =
+            JMeterUtils.getArrayPropDefault("https.socket.protocols", null); // $NON-NLS-1$
+
+    private static final String[] SUPPORTED_CIPHER_ARRAY =
+            JMeterUtils.getArrayPropDefault("https.cipherSuites", null); // $NON-NLS-1$
+
     // HashMap to save ssl connection between Jmeter proxy and browser
     private static final HashMap<String, SSLSocketFactory> HOST2SSL_SOCK_FAC = new HashMap<>();
 
@@ -453,6 +459,12 @@ private Socket startSSL(Socket sock, String host) throws IOException {
                 secureSocket = (SSLSocket) sslFactory.createSocket(sock,
                         sock.getInetAddress().getHostName(), sock.getPort(), true);
                 secureSocket.setUseClientMode(false);
+                if (SUPPORTED_CIPHER_ARRAY != null) {
+                    secureSocket.setEnabledCipherSuites(SUPPORTED_CIPHER_ARRAY);
+                }
+                if (SOCKET_PROTOCOL_ARRAY != null) {
+                    secureSocket.setEnabledProtocols(SOCKET_PROTOCOL_ARRAY);
+                }
                 if (log.isDebugEnabled()){
                     log.debug("{} SSL transaction ok with cipher: {}", port, secureSocket.getSession().getCipherSuite());
                 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java
index 1d75e5a65cd..bf8794fdb99 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java
@@ -39,18 +39,14 @@
  */
 public final class LazyLayeredConnectionSocketFactory implements LayeredConnectionSocketFactory{
     private static final Logger LOG = LoggerFactory.getLogger(LazyLayeredConnectionSocketFactory.class);
-    private static final String PROTOCOL_LIST =
-            JMeterUtils.getPropDefault("https.socket.protocols", ""); // $NON-NLS-1$ $NON-NLS-2$
+    private static final String[] SOCKET_PROTOCOL_ARRAY =
+            JMeterUtils.getArrayPropDefault("https.socket.protocols", null); // $NON-NLS-1$
 
-    private static final String CIPHER_LIST =
-            JMeterUtils.getPropDefault("https.socket.ciphers", ""); // $NON-NLS-1$ $NON-NLS-2$
+    private static final String[] SOCKET_CIPHER_ARRAY =
+            JMeterUtils.getArrayPropDefault("https.socket.ciphers", null); // $NON-NLS-1$
 
-    private static final String[] SUPPORTED_PROTOCOL_LIST =
-            PROTOCOL_LIST.isEmpty() ?
-                    null: PROTOCOL_LIST.split(" "); // $NON-NLS-1$
-    private static final String[] SUPPORTED_CIPHER_LIST =
-            CIPHER_LIST.isEmpty() ?
-                    null : CIPHER_LIST.split(" "); // $NON-NLS-1$
+    private static final String[] CIPHER_SUITE_ARRAY =
+            JMeterUtils.getArrayPropDefault("https.cipherSuites", SOCKET_CIPHER_ARRAY); // $NON-NLS-1$
 
     private static class AdapteeHolder { // IODH idiom
         private static final LayeredConnectionSocketFactory ADAPTEE = checkAndInit();
@@ -62,8 +58,8 @@ private static LayeredConnectionSocketFactory checkAndInit() throws SSLInitializ
             LOG.info("Setting up HTTPS TrustAll Socket Factory");
             return new SSLConnectionSocketFactory(
                     new HttpSSLProtocolSocketFactory(JsseSSLManager.CPS),
-                    SUPPORTED_PROTOCOL_LIST,
-                    SUPPORTED_CIPHER_LIST,
+                    SOCKET_PROTOCOL_ARRAY,
+                    CIPHER_SUITE_ARRAY,
                     NoopHostnameVerifier.INSTANCE);
         }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4b98e3c5143..1d94a6bd6cb 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -196,6 +196,7 @@ Summary
   <li><bug>65310</bug>Don't let users override <code>multipart/form-data</code> <code>content-type</code>
     header in HC4 sampler.</li>
   <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
+  <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align ssl properties between Java and HC4 impl</li>
 </ul>
 
 <h3>Other Samplers</h3>

From b507cce82face544289e83c0eb98501c16eb6160 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 27 Nov 2021 19:30:23 +0300
Subject: [PATCH 0028/1037] Configure max_line_length=120 in .editorconfig

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 57925963a21..5f65cc4c81c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,6 +5,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 charset = utf-8
 indent_style = space
+max_line_length = 120
 
 [{*.sh,gradlew}]
 end_of_line = lf

From a22e121723b04f9bc034c0ed334d280ec71e8bfa Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 Nov 2021 18:20:20 +0300
Subject: [PATCH 0029/1037] Change jmeter.exit.check.pause to 0 by default so
 tests do not show "The JVM should have exited but did not" warning

---
 bin/jmeter.properties                                | 2 +-
 src/core/src/main/java/org/apache/jmeter/JMeter.java | 2 +-
 xdocs/usermanual/get-started.xml                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 753167e8918..447b3649f0e 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1146,7 +1146,7 @@ cookies=cookies
 
 # How long to pause (in ms) in the daemon thread before reporting that the JVM has failed to exit.
 # If the value is <= 0, the JMeter does not start the daemon thread
-#jmeter.exit.check.pause=2000
+#jmeter.exit.check.pause=0
 
 # If running non-GUI, then JMeter listens on the following port for a shutdown message.
 # To disable, set the port to 1000 or less.
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index ea25835b25d..83a62020036 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -1364,7 +1364,7 @@ private void checkForRemainingThreads() {
             // This cannot be a JMeter class variable, because properties
             // are not initialised until later.
             final int pauseToCheckForRemainingThreads =
-                    JMeterUtils.getPropDefault("jmeter.exit.check.pause", 2000); // $NON-NLS-1$
+                    JMeterUtils.getPropDefault("jmeter.exit.check.pause", 0); // $NON-NLS-1$
 
             if (pauseToCheckForRemainingThreads > 0) {
                 Thread daemon = new Thread(){
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 6cd13194a95..44f77841e80 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -826,8 +826,8 @@ This daemon thread waits a short while; if it returns from the wait, then clearl
 JVM has not been able to exit, and the thread prints a message to say why.
 </p>
 <p>
-The property <code>jmeter.exit.check.pause</code> can be used to override the default pause of 2000ms (2secs).
-If set to <code>0</code>, then JMeter does not start the daemon thread.
+The property <code>jmeter.exit.check.pause</code> can be used to configure the delay before printing non-daemon threads.
+If set to <code>0</code> (default value), then JMeter does not print non-terminated threads at the end of the test.
 </p>
 </subsection>
 

From a139597ccdf2a1a1497ac56a3219b554c3ffa20f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 16 Oct 2021 18:38:03 +0300
Subject: [PATCH 0030/1037] Move ThreadGroup#makeThread to AbstractThreadGroup
 to simplify implementation of new thread groups

---
 .../jmeter/threads/AbstractThreadGroup.java   | 57 +++++++++++++++
 .../apache/jmeter/threads/JMeterThread.java   | 14 +++-
 .../apache/jmeter/threads/ThreadGroup.java    | 72 +++----------------
 3 files changed, 81 insertions(+), 62 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index ef2b5db2ae0..ea6ac89911a 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.threads;
 
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -25,6 +26,7 @@
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.engine.StandardJMeterEngine;
+import org.apache.jmeter.engine.TreeCloner;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.AbstractTestElement;
@@ -33,7 +35,9 @@
 import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
+import org.apiguardian.api.API;
 
 /**
  * ThreadGroup holds the settings for a JMeter thread group.
@@ -50,6 +54,10 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
 
     private static final Object DUMMY = new Object();
 
+    public static final Duration DEFAULT_THREAD_STOP_TIMEOUT =
+            Duration.ofMillis(
+                    JMeterUtils.getPropDefault("jmeterengine.threadstop.wait", 5 * 1000L));
+
     /** Action to be taken when a Sampler error occurs */
     public static final String ON_SAMPLE_ERROR = "ThreadGroup.on_sample_error"; // int
 
@@ -326,4 +334,53 @@ public void setIsSameUserOnNextIteration(boolean isSameUserOnNextIteration) {
     public boolean isSameUserOnNextIteration() {
         return getPropertyAsBoolean(ThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION, true);
     }
+
+    /**
+     * Create {@link JMeterThread}. Note: the input tree is not cloned.
+     * @param monitor {@link JMeterThreadMonitor}
+     * @param notifier {@link ListenerNotifier}
+     * @param threadGroupTree {@link ListedHashTree}
+     * @param engine {@link StandardJMeterEngine}
+     * @param threadNumber int thread number
+     * @param variables initial variables
+     * @return {@link JMeterThread}
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5")
+    protected JMeterThread makeThread(
+            StandardJMeterEngine engine,
+            JMeterThreadMonitor monitor, ListenerNotifier notifier,
+            int groupNumber, int threadNumber,
+            ListedHashTree threadGroupTree,
+            JMeterVariables variables) {
+        boolean onErrorStopTest = getOnErrorStopTest();
+        boolean onErrorStopTestNow = getOnErrorStopTestNow();
+        boolean onErrorStopThread = getOnErrorStopThread();
+        boolean onErrorStartNextLoop = getOnErrorStartNextLoop();
+        String groupName = getName();
+        final JMeterThread jmeterThread = new JMeterThread(threadGroupTree, monitor, notifier, isSameUserOnNextIteration());
+        jmeterThread.setThreadNum(threadNumber);
+        jmeterThread.setThreadGroup(this);
+        jmeterThread.putVariables(variables);
+        String distributedPrefix =
+                JMeterUtils.getPropDefault(JMeterUtils.THREAD_GROUP_DISTRIBUTED_PREFIX_PROPERTY_NAME, "");
+        final String threadName = distributedPrefix + (distributedPrefix.isEmpty() ? "":"-") +groupName + " " + groupNumber + "-" + (threadNumber + 1);
+        jmeterThread.setThreadName(threadName);
+        jmeterThread.setEngine(engine);
+        jmeterThread.setOnErrorStopTest(onErrorStopTest);
+        jmeterThread.setOnErrorStopTestNow(onErrorStopTestNow);
+        jmeterThread.setOnErrorStopThread(onErrorStopThread);
+        jmeterThread.setOnErrorStartNextLoop(onErrorStartNextLoop);
+        return jmeterThread;
+    }
+
+    /**
+     * @param tree {@link ListedHashTree}
+     * @return a clone of tree
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5")
+    public static ListedHashTree cloneTree(ListedHashTree tree) {
+        TreeCloner cloner = new TreeCloner(true);
+        tree.traverse(cloner);
+        return cloner.getClonedTree();
+    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 26bca46d8fd..1f12ecd3f48 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -59,6 +59,7 @@
 import org.apache.jorphan.util.JMeterStopTestException;
 import org.apache.jorphan.util.JMeterStopTestNowException;
 import org.apache.jorphan.util.JMeterStopThreadException;
+import org.apiguardian.api.API;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -170,8 +171,19 @@ public JMeterThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier
         this.isSameUserOnNextIteration = isSameUserOnNextIteration;
     }
 
+    @Deprecated
+    @API(status = API.Status.DEPRECATED, since = "5.5")
     public void setInitialContext(JMeterContext context) {
-        threadVars.putAll(context.getVariables());
+        putVariables(context.getVariables());
+    }
+
+    /**
+     * Updates the variables with all entries found in the variables in {@code vars}
+     * @param variables {@link JMeterVariables} with the entries to be updated
+     */
+    @API(status = API.Status.STABLE, since = "5.5")
+    public void putVariables(JMeterVariables variables) {
+        threadVars.putAll(variables);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index ad0e0012180..4aeb580e39c 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.jmeter.engine.StandardJMeterEngine;
-import org.apache.jmeter.engine.TreeCloner;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.IntegerProperty;
@@ -47,7 +46,7 @@ public class ThreadGroup extends AbstractThreadGroup {
 
     private static final Logger log = LoggerFactory.getLogger(ThreadGroup.class);
 
-    private static final long WAIT_TO_DIE = JMeterUtils.getPropDefault("jmeterengine.threadstop.wait", 5 * 1000); // 5 seconds
+    private static final long WAIT_TO_DIE = DEFAULT_THREAD_STOP_TIMEOUT.toMillis();
 
     /** How often to check for shutdown during ramp-up, default 1000ms */
     private static final int RAMPUP_GRANULARITY =
@@ -215,7 +214,6 @@ public void start(int groupNum, ListenerNotifier notifier, ListedHashTree thread
         this.threadGroupTree = threadGroupTree;
         int numThreads = getNumThreads();
         int rampUpPeriodInSeconds = getRampUp();
-        boolean isSameUserOnNextIteration = isSameUserOnNextIteration();
         delayedStartup = isDelayedStartup(); // Fetch once; needs to stay constant
         log.info("Starting thread group... number={} threads={} ramp-up={} delayedStart={}", groupNumber,
                 numThreads, rampUpPeriodInSeconds, delayedStartup);
@@ -225,7 +223,7 @@ public void start(int groupNum, ListenerNotifier notifier, ListedHashTree thread
             threadStarter.start();
             // N.B. we don't wait for the thread to complete, as that would prevent parallel TGs
         } else {
-            final JMeterContext context = JMeterContextService.getContext();
+            final JMeterVariables variables = JMeterContextService.getContext().getVariables();
             long lastThreadStartInMillis = 0;
             int delayForNextThreadInMillis = 0;
             final int perThreadDelayInMillis = Math.round((float) rampUpPeriodInSeconds * 1000 / numThreads);
@@ -241,8 +239,7 @@ public void start(int groupNum, ListenerNotifier notifier, ListedHashTree thread
                     log.debug("Computed delayForNextThreadInMillis:{} for thread:{}", delayForNextThreadInMillis, Thread.currentThread().getId());
                 }
                 lastThreadStartInMillis = nowInMillis;
-                startNewThread(notifier, threadGroupTree, engine, threadNum, context, nowInMillis, Math.max(0, delayForNextThreadInMillis),
-                        isSameUserOnNextIteration);
+                startNewThread(notifier, threadGroupTree, engine, threadNum, variables, nowInMillis, Math.max(0, delayForNextThreadInMillis));
             }
         }
         log.info("Started thread group number {}", groupNumber);
@@ -254,15 +251,14 @@ public void start(int groupNum, ListenerNotifier notifier, ListedHashTree thread
      * @param threadGroupTree {@link ListedHashTree}
      * @param engine {@link StandardJMeterEngine}
      * @param threadNum Thread number
-     * @param context {@link JMeterContext}
+     * @param variables initial values for the variables in the thread
      * @param now Nom in milliseconds
      * @param delay int delay in milliseconds
-     * @param isSameUserOnNextIteration boolean indicating a next iteration will simulate a new or returning user
      * @return {@link JMeterThread} newly created
      */
     private JMeterThread startNewThread(ListenerNotifier notifier, ListedHashTree threadGroupTree, StandardJMeterEngine engine,
-            int threadNum, final JMeterContext context, long now, int delay, Boolean isSameUserOnNextIteration) {
-        JMeterThread jmThread = makeThread(notifier, threadGroupTree, engine, threadNum, context, isSameUserOnNextIteration);
+            int threadNum, JMeterVariables variables, long now, int delay) {
+        JMeterThread jmThread = makeThread(engine, this, notifier, groupNumber, threadNum, cloneTree(threadGroupTree), variables);
         scheduleThread(jmThread, now); // set start and end time
         jmThread.setInitialDelay(delay);
         Thread newThread = new Thread(jmThread, jmThread.getThreadName());
@@ -288,41 +284,6 @@ private void registerStartedThread(JMeterThread jMeterThread, Thread newThread)
         allThreads.put(jMeterThread, newThread);
     }
 
-    /**
-     * Create {@link JMeterThread} cloning threadGroupTree
-     * @param notifier {@link ListenerNotifier}
-     * @param threadGroupTree {@link ListedHashTree}
-     * @param engine {@link StandardJMeterEngine}
-     * @param threadNumber int thread number
-     * @param context {@link JMeterContext}
-     * @param isSameUserOnNextIteration Boolean
-     * @return {@link JMeterThread}
-     */
-    private JMeterThread makeThread(
-            ListenerNotifier notifier, ListedHashTree threadGroupTree,
-            StandardJMeterEngine engine, int threadNumber,
-            JMeterContext context, Boolean isSameUserOnNextIteration) { // N.B. Context needs to be fetched in the correct thread
-        boolean onErrorStopTest = getOnErrorStopTest();
-        boolean onErrorStopTestNow = getOnErrorStopTestNow();
-        boolean onErrorStopThread = getOnErrorStopThread();
-        boolean onErrorStartNextLoop = getOnErrorStartNextLoop();
-        String groupName = getName();
-        final JMeterThread jmeterThread = new JMeterThread(cloneTree(threadGroupTree), this, notifier, isSameUserOnNextIteration);
-        jmeterThread.setThreadNum(threadNumber);
-        jmeterThread.setThreadGroup(this);
-        jmeterThread.setInitialContext(context);
-        String distributedPrefix =
-                JMeterUtils.getPropDefault(JMeterUtils.THREAD_GROUP_DISTRIBUTED_PREFIX_PROPERTY_NAME, "");
-        final String threadName = distributedPrefix + (distributedPrefix.isEmpty() ? "":"-") +groupName + " " + groupNumber + "-" + (threadNumber + 1);
-        jmeterThread.setThreadName(threadName);
-        jmeterThread.setEngine(engine);
-        jmeterThread.setOnErrorStopTest(onErrorStopTest);
-        jmeterThread.setOnErrorStopTestNow(onErrorStopTestNow);
-        jmeterThread.setOnErrorStopThread(onErrorStopThread);
-        jmeterThread.setOnErrorStartNextLoop(onErrorStartNextLoop);
-        return jmeterThread;
-    }
-
     @Override
     @SuppressWarnings("SynchronizeOnNonFinalField")
     public JMeterThread addNewThread(int delay, StandardJMeterEngine engine) {
@@ -334,7 +295,7 @@ public JMeterThread addNewThread(int delay, StandardJMeterEngine engine) {
             numThreads = getNumThreads();
             setNumThreads(numThreads + 1);
         }
-        newJmThread = startNewThread(notifier, threadGroupTree, engine, numThreads, context, now, delay, isSameUserOnNextIteration());
+        newJmThread = startNewThread(notifier, threadGroupTree, engine, numThreads, context.getVariables(), now, delay);
         JMeterContextService.addTotalThreads( 1 );
         log.info("Started new thread in group {}", groupNumber);
         return newJmThread;
@@ -526,16 +487,6 @@ private void waitThreadStopped(Thread thread) {
         }
     }
 
-    /**
-     * @param tree {@link ListedHashTree}
-     * @return a clone of tree
-     */
-    private ListedHashTree cloneTree(ListedHashTree tree) {
-        TreeCloner cloner = new TreeCloner(true);
-        tree.traverse(cloner);
-        return cloner.getClonedTree();
-    }
-
     /**
      * Starts Threads using ramp up
      */
@@ -544,7 +495,7 @@ class ThreadStarter implements Runnable {
         private final ListenerNotifier notifier;
         private final ListedHashTree threadGroupTree;
         private final StandardJMeterEngine engine;
-        private final JMeterContext context;
+        private final JMeterVariables variables;
 
         public ThreadStarter(ListenerNotifier notifier, ListedHashTree threadGroupTree, StandardJMeterEngine engine) {
             super();
@@ -552,7 +503,7 @@ public ThreadStarter(ListenerNotifier notifier, ListedHashTree threadGroupTree,
             this.threadGroupTree = threadGroupTree;
             this.engine = engine;
             // Store context from Root Thread to pass it to created threads
-            this.context = JMeterContextService.getContext();
+            this.variables = JMeterContextService.getContext().getVariables();
         }
 
         /**
@@ -591,7 +542,7 @@ private void delayBy(long delay) {
         public void run() {
             try {
                 // Copy in ThreadStarter thread context from calling Thread
-                JMeterContextService.getContext().setVariables(this.context.getVariables());
+                JMeterContextService.getContext().setVariables(variables);
                 long endtime = 0;
                 final boolean usingScheduler = getScheduler();
                 if (usingScheduler) {
@@ -608,7 +559,6 @@ public void run() {
                 final int numThreads = getNumThreads();
                 final float rampUpOriginInMillis = (float) getRampUp() * 1000;
                 final long startTimeInMillis = System.currentTimeMillis();
-                final boolean isSameUserOnNextIteration = isSameUserOnNextIteration();
                 for (int threadNumber = 0; running && threadNumber < numThreads; threadNumber++) {
                     if (threadNumber > 0) {
                         long elapsedInMillis = System.currentTimeMillis() - startTimeInMillis;
@@ -619,7 +569,7 @@ public void run() {
                     if (usingScheduler && System.currentTimeMillis() > endtime) {
                         break; // no point continuing beyond the end time
                     }
-                    JMeterThread jmThread = makeThread(notifier, threadGroupTree, engine, threadNumber, context, isSameUserOnNextIteration);
+                    JMeterThread jmThread = makeThread(engine, ThreadGroup.this, notifier, groupNumber, threadNumber, cloneTree(threadGroupTree), variables);
                     jmThread.setInitialDelay(0);   // Already waited
                     if (usingScheduler) {
                         jmThread.setScheduled(true);

From 8fed0cb711e21b9e8a01134bebc007385ffbecdf Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 16 Oct 2021 11:32:07 +0300
Subject: [PATCH 0031/1037] Added Kotlin 1.6.0 for JMeter engine
 implementation. The set of JSR 223 languages is intact

src/main code is compiled with explicitApi mode, so it enforces
access modifiers (public, private, internal, protected) are set explicitly,
and it requires explicit types for public members
See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors

src/main code is restricted to Kotlin 1.5 APIs, so projects that use Kotlin 1.5
can use JMeter.

Kotlin code style follows the official Kotlin code style
See https://kotlinlang.org/docs/coding-conventions.html
---
 build.gradle.kts                            | 30 +++++++++++++++++++++
 checksum.xml                                |  4 +++
 gradle.properties                           |  6 +++++
 settings.gradle.kts                         |  1 +
 src/bom/build.gradle.kts                    |  1 +
 src/build.gradle.kts                        | 13 +++++++++
 src/core/build.gradle.kts                   |  6 +++++
 src/dist/src/dist/expected_release_jars.csv |  6 ++++-
 xdocs/changes.xml                           |  1 +
 9 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ae272e34c58..19944b72401 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,10 +27,13 @@ import com.github.vlsi.gradle.release.RepositoryType
 import net.ltgt.gradle.errorprone.errorprone
 import org.ajoberstar.grgit.Grgit
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.sonarqube.gradle.SonarQubeProperties
 
 plugins {
     java
+    kotlin("jvm") apply false
     jacoco
     checkstyle
     id("org.jetbrains.gradle.plugin.idea-ext") apply false
@@ -429,6 +432,33 @@ allprojects {
         }
     }
 
+    plugins.withId("org.jetbrains.kotlin.jvm") {
+        configure<KotlinJvmProjectExtension> {
+            // Require explicit access modifiers and require explicit types for public APIs.
+            // See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
+            if (props.bool("kotlin.explicitApi", default = true)) {
+                explicitApi()
+            }
+        }
+        tasks.withType<KotlinCompile>().configureEach {
+            kotlinOptions {
+                if (!name.startsWith("compileTest")) {
+                    apiVersion = "kotlin.api".v
+                }
+            }
+        }
+        if (!skipAutostyle) {
+            autostyle {
+                kotlin {
+                    license()
+                    trimTrailingWhitespace()
+                    ktlint("ktlint".v)
+                    endWithNewline()
+                }
+            }
+        }
+    }
+
     plugins.withType<JacocoPlugin> {
         the<JacocoPluginExtension>().toolVersion = "jacoco".v
 
diff --git a/checksum.xml b/checksum.xml
index 0080fd13c72..ff6752629c4 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -15,6 +15,7 @@
     <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='07d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
     <trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
+    <trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
     <trusted-key id='379ce192d401ab61' group='com.github.javaparser' />
     <trusted-key id='431b8f80403a7dc1' group='com.github.javaparser' />
     <trusted-key id='8ea48d105232855d' group='com.github.jknack' />
@@ -77,6 +78,7 @@
     <trusted-key id='a41f13c999945293' group='commons-logging' />
     <trusted-key id='7a8860944fad5f62' group='commons-net' />
     <trusted-key id='86fdc7e2a11262cb' group='commons-net' />
+    <trusted-key id='6449005f96bc97a3' group='de.undercouch' />
     <trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
     <trusted-key id='a5c8dbb8a1599bd4' group='dnsjava' />
     <trusted-key id='379ce192d401ab61' group='info.picocli' />
@@ -159,10 +161,12 @@
     <trusted-key id='8799af90c06efbbd' group='org.jdom' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains' />
     <trusted-key id='bcf4173966770193' group='org.jetbrains' />
+    <trusted-key id='c2148900bcd3c2af' group='org.jetbrains' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
     <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
     <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
+    <trusted-key id='3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
     <trusted-key id='91ae1504568ec4dd' group='org.jodd' />
     <trusted-key id='145d819475314d97' group='org.json' />
     <trusted-key id='f42e87f9665015c9' group='org.jsoup' />
diff --git a/gradle.properties b/gradle.properties
index c64173914a9..716ae0f59b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,6 +45,11 @@ com.github.spotbugs.version=4.5.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
 com.github.vlsi.checksum-dependency.version=1.76
 com.github.vlsi.vlsi-release-plugins.version=1.76
+kotlin.version=1.6.0
+# Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
+kotlin.api.version=1.5
+# See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
+kotlin.explicitApi=true
 net.ltgt.errorprone.version=1.2.1
 org.jetbrains.gradle.plugin.idea-ext.version=0.5
 org.nosphere.apache.rat.version=0.7.0
@@ -98,6 +103,7 @@ jackson-databind.version=2.10.5
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
+jetbrains-annotations.version=23.0.0
 jmespath-core.version=0.5.0
 jmespath-jackson.version=0.5.0
 jodd.version=5.0.13
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4faacde2591..8480562f1c5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,6 +28,7 @@ pluginManagement {
         idv("com.github.vlsi.stage-vote-release", "com.github.vlsi.vlsi-release-plugins")
         idv("net.ltgt.errorprone")
         idv("org.jetbrains.gradle.plugin.idea-ext")
+        kotlin("jvm") version extra["kotlin.version"].toString()
         idv("org.nosphere.apache.rat")
         idv("org.sonarqube")
     }
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 1267c93a176..c77e44d5663 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -99,6 +99,7 @@ dependencies {
         apiv("javax.mail:mail")
         apiv("jcharts:jcharts")
         apiv("junit:junit", "junit4")
+        apiv("org.jetbrains:annotations", "jetbrains-annotations")
         apiv("org.junit.jupiter:junit-jupiter", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-api", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-params", "junit5")
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index 19f252b2f85..46181612c51 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -15,6 +15,11 @@
  * limitations under the License.
  */
 
+plugins {
+    // Bring Kotlin plugin to the build script class path, so it can be found when required
+    // in apply(plugin = ...) below
+    kotlin("jvm") apply false
+}
 val skipMavenPublication = setOf(
     ":src:bshclient",
     ":src:dist",
@@ -45,12 +50,16 @@ subprojects {
     }
 
     val groovyUsed = file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory
+    val kotlinUsed = file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory
     val testsPresent = file("src/test").isDirectory
 
     apply<JavaLibraryPlugin>()
     if (groovyUsed) {
         apply<GroovyPlugin>()
     }
+    if (kotlinUsed) {
+        apply(plugin = "org.jetbrains.kotlin.jvm")
+    }
     if (project.path !in skipMavenPublication) {
         apply<MavenPublishPlugin>()
     }
@@ -64,6 +73,7 @@ subprojects {
             // No tests => no dependencies required
             return@dependencies
         }
+        val implementation by configurations
         val testImplementation by configurations
         val testRuntimeOnly by configurations
         testImplementation("org.junit.jupiter:junit-jupiter")
@@ -74,6 +84,9 @@ subprojects {
         if (groovyUsed) {
             testImplementation("org.spockframework:spock-core")
         }
+        if (kotlinUsed) {
+            testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+        }
         testRuntimeOnly("cglib:cglib-nodep") {
             because(
                 """
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 611ecf1982a..107cbe877c5 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -135,6 +135,12 @@ ide {
 }
 
 // <editor-fold defaultstate="collapsed" desc="Gradle can't infer task dependencies, however it sees they use the same directories. So we add the dependencies">
+plugins.withId("org.jetbrains.kotlin.jvm") {
+    tasks.named("compileKotlin") {
+        dependsOn(versionClass)
+    }
+}
+
 tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
     .configureEach {
         mustRunAfter(versionClass)
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index d931ad01aba..ecc8aa287eb 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,5 +1,5 @@
 29489,accessors-smart-2.4.7.jar
-18538,annotations-16.0.2.jar
+29371,annotations-23.0.0.jar
 2387,apiguardian-api-1.1.0.jar
 122004,asm-9.2.jar
 113369,bsf-2.4.0.jar
@@ -67,6 +67,10 @@
 415074,jsoup-1.14.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
+1508076,kotlin-stdlib-1.6.0.jar
+200616,kotlin-stdlib-common-1.6.0.jar
+22357,kotlin-stdlib-jdk7-1.6.0.jar
+16201,kotlin-stdlib-jdk8-1.6.0.jar
 206756,log4j-1.2-api-2.14.1.jar
 300365,log4j-api-2.14.1.jar
 1745700,log4j-core-2.14.1.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1d94a6bd6cb..fbef3200a97 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -139,6 +139,7 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+  <li>Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>655</pr><pr>667</pr><pr>675</pr>Updated x-stream to 1.4.18 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>

From 417846471d320c5d18bfec899b8518276c8a9574 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 18 Oct 2021 10:01:01 +0300
Subject: [PATCH 0032/1037] Open Model Thread Group: load generator with
 programmable profile

See https://github.com/apache/jmeter/pull/674
See https://lists.apache.org/thread.html/r62952bcf60212202f742329015c110c3b9da0d8c48ded6b9b833f04d%40%3Cdev.jmeter.apache.org%3E
---
 bin/saveservice.properties                    |   3 +
 checksum.xml                                  |   7 +
 gradle.properties                             |   2 +
 src/bom/build.gradle.kts                      |   2 +
 src/core/build.gradle.kts                     |   8 +
 .../validation/TreeClonerForValidation.java   |   6 +
 .../threads/openmodel/EvenArrivalsRamp.kt     | 120 +++++++++
 .../threads/openmodel/OpenModelThreadGroup.kt | 247 ++++++++++++++++++
 .../OpenModelThreadGroupController.kt         |  37 +++
 .../threads/openmodel/PoissonArrivalsRamp.kt  | 118 +++++++++
 .../ThreadScheduleProcessGenerator.kt         | 109 ++++++++
 .../threads/openmodel/TimeUnitExtensions.kt   |  41 +++
 .../openmodel/gui/OpenModelThreadGroupGui.kt  | 170 ++++++++++++
 .../threads/openmodel/gui/TargetRateChart.kt  | 150 +++++++++++
 .../threads/openmodel/scheduleParser.kt       | 235 +++++++++++++++++
 .../threads/openmodel/scheduleTokenizer.kt    | 103 ++++++++
 .../jmeter/resources/messages.properties      |   4 +
 .../jmeter/resources/messages_fr.properties   |   4 +
 .../threads/openmodel/EvenArrivalsRampTest.kt | 105 ++++++++
 .../openmodel/PoissonArrivalsRampTest.kt      | 129 +++++++++
 .../ThreadScheduleProcessGeneratorTest.kt     | 121 +++++++++
 .../threads/openmodel/ThreadScheduleTest.kt   |  58 ++++
 .../jmeter/threads/openmodel/TokenizerTest.kt |  48 ++++
 src/dist/build.gradle.kts                     |   2 +-
 src/dist/src/dist/expected_release_jars.csv   |  30 +++
 src/licenses/build.gradle.kts                 |  18 ++
 src/licenses/licenses/lets-plot/LICENSE       |  21 ++
 xdocs/changes.xml                             |   1 +
 .../screenshots/open_model_thread_group.png   | Bin 0 -> 34656 bytes
 xdocs/usermanual/component_reference.xml      |  72 ++++-
 30 files changed, 1968 insertions(+), 3 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRamp.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRamp.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGenerator.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/TimeUnitExtensions.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
 create mode 100644 src/licenses/licenses/lets-plot/LICENSE
 create mode 100644 xdocs/images/screenshots/open_model_thread_group.png

diff --git a/bin/saveservice.properties b/bin/saveservice.properties
index b2ec16700e5..60ccfbea37e 100644
--- a/bin/saveservice.properties
+++ b/bin/saveservice.properties
@@ -137,6 +137,9 @@ DNSCachePanel=org.apache.jmeter.protocol.http.gui.DNSCachePanel
 DurationAssertion=org.apache.jmeter.assertions.DurationAssertion
 DurationAssertionGui=org.apache.jmeter.assertions.gui.DurationAssertionGui
 PreciseThroughputTimer=org.apache.jmeter.timers.poissonarrivals.PreciseThroughputTimer
+OpenModelThreadGroup=org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+OpenModelThreadGroupController=org.apache.jmeter.threads.openmodel.OpenModelThreadGroupController
+OpenModelThreadGroupGui=org.apache.jmeter.threads.openmodel.gui.OpenModelThreadGroupGui
 # Should really have been defined as floatProp to agree with other properties
 # No point changing this now
 FloatProperty=org.apache.jmeter.testelement.property.FloatProperty
diff --git a/checksum.xml b/checksum.xml
index ff6752629c4..e197b841691 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -84,6 +84,7 @@
     <trusted-key id='379ce192d401ab61' group='info.picocli' />
     <trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
     <trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />
     <trusted-key id='6425559c47cc79c4' group='javax.mail' />
@@ -166,7 +167,10 @@
     <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
     <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
+    <trusted-key id='3967d4eda591b991' group='org.jetbrains.kotlinx' />
     <trusted-key id='3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
+    <trusted-key id='16fbb6b6e3120829' group='org.jetbrains.lets-plot' />
+    <trusted-key id='be6397e958ab7594' group='org.jetbrains.lets-plot' />
     <trusted-key id='91ae1504568ec4dd' group='org.jodd' />
     <trusted-key id='145d819475314d97' group='org.json' />
     <trusted-key id='f42e87f9665015c9' group='org.jsoup' />
@@ -307,6 +311,9 @@
     <dependency group='xerces' module='xercesImpl' version='2.9.1'>
       <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
     </dependency>
+    <dependency group='xml-apis' module='xml-apis-ext' version='1.3.04'>
+      <sha512>AC0896B9A3FEA71644330DAEF4ECCB33005B5B7AC1E1D1D73EED2B2A1F4B2282057F3C0F3698B899E1C76B19C09C69BF4CD0EE548427B9BCC676B791DB5C36BC</sha512>
+    </dependency>
     <dependency group='xml-resolver' module='xml-resolver' version='1.2'>
       <sha512>ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index 716ae0f59b8..57fcd139e8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -113,6 +113,8 @@ jsoup.version=1.14.1
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.1
+lets-plot-batik.version=2.2.0
+lets-plot-kotlin-jvm.version=3.1.0
 log4j.version=2.14.1
 mail.version=1.5.0-b01
 miglayout.version=5.3
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index c77e44d5663..09726fe6067 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -100,6 +100,8 @@ dependencies {
         apiv("jcharts:jcharts")
         apiv("junit:junit", "junit4")
         apiv("org.jetbrains:annotations", "jetbrains-annotations")
+        apiv("org.jetbrains.lets-plot:lets-plot-batik")
+        apiv("org.jetbrains.lets-plot:lets-plot-kotlin-jvm")
         apiv("org.junit.jupiter:junit-jupiter", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-api", "junit5")
         apiv("org.junit.jupiter:junit-jupiter-params", "junit5")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 107cbe877c5..937200eb602 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -84,6 +84,14 @@ dependencies {
     implementation("commons-collections:commons-collections") {
         because("Compatibility for old plugins")
     }
+    implementation("org.jetbrains.lets-plot:lets-plot-batik") {
+        // See https://github.com/JetBrains/lets-plot/issues/471
+        exclude("org.jetbrains.kotlin", "kotlin-reflect")
+    }
+    implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm") {
+        // See https://github.com/JetBrains/lets-plot/issues/471
+        exclude("org.jetbrains.kotlin", "kotlin-reflect")
+    }
     implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3") {
         because("Mean, DescriptiveStatistics")
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java b/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
index a6a1c6314f1..e2c797a7d99 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
@@ -21,6 +21,7 @@
 import org.apache.jmeter.engine.TreeCloner;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup;
 import org.apache.jmeter.timers.Timer;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.backend.Backend;
@@ -86,6 +87,11 @@ protected Object addNodeToTree(Object node) {
                 if(((AbstractThreadGroup)clonedNode).getSamplerController() instanceof LoopController) {
                     ((LoopController)((AbstractThreadGroup)clonedNode).getSamplerController()).setLoops(VALIDATION_ITERATIONS);
                 }
+            } else if (clonedNode instanceof OpenModelThreadGroup) {
+                OpenModelThreadGroup tg = (OpenModelThreadGroup) clonedNode;
+                tg.setRandomSeedString("0");
+                // Launch all the iterations during the first second, and leave one hour for the threads to complete
+                tg.setScheduleString("rate(" + VALIDATION_ITERATIONS + " / sec) even_arrivals(1 sec) pause(1 hour)");
             }
             return clonedNode;
         }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRamp.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRamp.kt
new file mode 100644
index 00000000000..debe2543060
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRamp.kt
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apiguardian.api.API
+import org.slf4j.LoggerFactory
+import java.util.PrimitiveIterator
+import kotlin.math.absoluteValue
+import kotlin.math.sqrt
+
+/**
+ * Generates events that represent constant, linearly increasing or linearly decreasing load.
+ *
+ *  Sample usage:
+ *
+ *     val ramp = EvenArrivalsRamp()
+ *     ramp.prepare(beginRate = 0.0, endRate = 1.0, duration = 10)
+ *     while(ramp.hasNext()) {
+ *         println(ramp.nextDouble()) // -> values from 0..duration
+ *     }
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class EvenArrivalsRamp : PrimitiveIterator.OfDouble {
+    private var beginRate = 0.0
+    private var endRate = 0.0
+    private var meanRate = 0.0
+    private var acceleration = 0.0
+    private var n = 0L
+    private var numEvents = 0L
+
+    private companion object {
+        private val log = LoggerFactory.getLogger(EvenArrivalsRamp::class.java)
+    }
+
+    override fun remove() {
+        TODO("Element removal is not supported")
+    }
+
+    override fun hasNext(): Boolean = n < numEvents
+
+    /**
+     * Returns the time of the next event `0..duration`.
+     * The first event happens at 0.0, and the rest are distributed evenly.
+     */
+    override fun nextDouble(): Double {
+        val res = if (n == 0L) {
+            0.0
+        } else if (acceleration == 0.0) {
+            // constant rate
+            // The n is 0..(maxEvents-1), so the first event is always 0
+            n / meanRate
+        } else {
+            // increasing or decreasing rate
+            // Suppose
+            //     the arrival rate at the beginning is beginRate,
+            //     the arrival rate at the end is endRate
+            //     interval duration is duration
+            //     f(t) the number of arrivals during 0..t
+            // Then
+            //     f(t) = v0 * t + a * t^2 / 2, where v0 = beginRate, and a = (beginRate - endRate) / duration
+            // What we need is to figure out the time for n-th arrival,
+            // In other words, we need to solve the following quadratic equation for t
+            //     n = v0 * t + a * t^2 / 2
+            // The solution is
+            //     D = v0^2 + 2 * a * n, t = (sqrt(D) - v0) / a
+            (sqrt(beginRate * beginRate + 2 * acceleration * n) - beginRate) / acceleration
+        }
+        n++
+        return res
+    }
+
+    /**
+     * Prepares events for constant, linearly increasing or linearly decreasing load.
+     * @param beginRate the load rate at the beginning of the interval, must be positive
+     * @param endRate the load rate at the end of the interval, must be positive
+     * @param duration the duration of the load interval, must be positive
+     */
+    public fun prepare(
+        beginRate: Double,
+        endRate: Double,
+        duration: Double
+    ) {
+        this.beginRate = beginRate
+        this.endRate = endRate
+        meanRate = (beginRate + endRate) / 2
+        // 3.7 events means 3, not 4. It ensures we always we do not overflow over duration interval
+        numEvents = (meanRate * duration).toLong()
+        n = 0 // position to the first event
+        acceleration = if ((endRate - beginRate).absoluteValue < 0.0001 * meanRate) {
+            // If the rate change is insignificant, assume the rate is equal to meanRate
+            0.0
+        } else {
+            (endRate - beginRate) / duration
+        }
+        if (log.isInfoEnabled) {
+            log.info(
+                "Generating {} events, beginRate = {} / sec, endRate = {} / sec, duration = {} sec",
+                numEvents,
+                beginRate,
+                endRate,
+                duration
+            )
+        }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
new file mode 100644
index 00000000000..c290dd6c5b2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -0,0 +1,247 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.control.Controller
+import org.apache.jmeter.engine.StandardJMeterEngine
+import org.apache.jmeter.gui.GUIMenuSortOrder
+import org.apache.jmeter.threads.AbstractThreadGroup
+import org.apache.jmeter.threads.JMeterContextService
+import org.apache.jmeter.threads.JMeterThread
+import org.apache.jmeter.threads.JMeterThreadMonitor
+import org.apache.jmeter.threads.ListenerNotifier
+import org.apache.jmeter.threads.TestCompilerHelper
+import org.apache.jorphan.collections.ListedHashTree
+import org.apiguardian.api.API
+import org.slf4j.LoggerFactory
+import java.io.Serializable
+import java.lang.Thread.sleep
+import java.util.Random
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicReference
+import kotlin.math.roundToLong
+
+/**
+ * The thread group that emulates open model.
+ * Currently, threads are created on demand, every thread exists after completion,
+ * and the maximum number of threads is not limited.
+ */
+@GUIMenuSortOrder(1)
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class OpenModelThreadGroup :
+    AbstractThreadGroup(),
+    Serializable,
+    Controller,
+    JMeterThreadMonitor,
+    TestCompilerHelper {
+    public companion object {
+        private val log = LoggerFactory.getLogger(OpenModelThreadGroup::class.java)
+
+        /** Thread group schedule. See [ThreadSchedule]. */
+        public const val SCHEDULE: String = "OpenModelThreadGroup.schedule"
+
+        /** The seed for reproducible workloads. 0 means no seed, so the schedule would be new on every execution */
+        public const val RANDOM_SEED: String = "OpenModelThreadGroup.random_seed"
+
+        /**
+         * A thread pool for "thread starter thread".
+         * It is not re-created across JMeter test restart
+         */
+        private val houseKeepingThreadPool = Executors.newCachedThreadPool()
+
+        private const val serialVersionUID: Long = 1L
+    }
+
+    // A thread pool that executes main workload.
+    // It is created on test start and it is shutdown on every test stop.
+    // ExecutorService shutdown is the only way to wait for completion of all tasks.
+    private var executorService: ExecutorService? = null
+
+    private val threadStarterFuture = AtomicReference<Future<*>?>()
+    private val activeThreads = ConcurrentHashMap<JMeterThread, Future<*>>()
+
+    /**
+     * Schedule expression (see [ThreadSchedule]).
+     */
+    public var scheduleString: String
+        get() = getPropertyAsString(SCHEDULE)
+        set(value) {
+            setProperty(SCHEDULE, value)
+        }
+
+    public val randomSeed: Long get() = getPropertyAsLong(RANDOM_SEED)
+
+    /**
+     * Random seed for building reproducible schedules. 0 means random seed.
+     */
+    public var randomSeedString: String
+        get() = getPropertyAsString(RANDOM_SEED)
+        set(value) {
+            setProperty(RANDOM_SEED, value)
+        }
+
+    private class ThreadsStarter(
+        private val testStartTime: Long,
+        private val executorService: ExecutorService,
+        private val activeThreads: MutableMap<JMeterThread, Future<*>>,
+        private val gen: ThreadScheduleProcessGenerator,
+        private val jmeterThreadFactory: (threadNumber: Int) -> JMeterThread,
+    ) : Runnable {
+        override fun run() {
+            log.info("Thread starting init")
+            val endTime = (testStartTime + gen.totalDuration * 1000).roundToLong()
+            var threadNumber = 0
+            var prevTime = 0L
+            while (gen.hasNext()) {
+                val scheduledTime = testStartTime + (gen.nextDouble() * 1000).roundToLong()
+                // If multiple events are scheduled for the same millisecond, we don't want to call currentTimeMillis
+                if (scheduledTime >= prevTime) {
+                    prevTime = System.currentTimeMillis()
+                    val nextDelay = scheduledTime - prevTime
+                    if (nextDelay > 0) {
+                        sleep(nextDelay)
+                    }
+                }
+                val jmeterThread = jmeterThreadFactory(threadNumber++)
+                jmeterThread.endTime = endTime
+                activeThreads[jmeterThread] = executorService.submit {
+                    Thread.currentThread().name = jmeterThread.threadName
+                    jmeterThread.run()
+                }
+            }
+            // If test schedule ends with a pause, then we need to wait for it
+            val timeLeft = endTime - System.currentTimeMillis()
+            if (timeLeft > 0) {
+                log.info(
+                    "There will be no more events, so will wait for {} sec till the end of the schedule",
+                    TimeUnit.MILLISECONDS.toSeconds(timeLeft)
+                )
+                sleep(timeLeft)
+            } else {
+                log.info("Thread schedule finished {} ms ago", -timeLeft)
+            }
+            // No more actions will be scheduled, let awaitTermination to see the completion
+            val threadsStillRunning = activeThreads.size
+            if (threadsStillRunning == 0) {
+                log.info("There will be no more events, will shutdown the thread pool")
+            } else {
+                log.info(
+                    "Test schedule finished, however, there are {} thread(s) still running." +
+                        " Will interrupt the threads." +
+                        " If you want to keep some time for the threads to complete, consider" +
+                        " adding pause(10 min) at the end of the schedule.",
+                    threadsStillRunning
+                )
+                @Suppress("JavaMapForEach")
+                activeThreads.forEach { thread, future ->
+                    log.info("Terminating thread {}", thread)
+                    // Safe stop the thread
+                    thread.stop()
+                    // Interrupt it
+                    future.cancel(true)
+                }
+            }
+            executorService.shutdownNow()
+            log.info("Thread starting done")
+        }
+    }
+
+    override fun start(
+        threadGroupIndex: Int,
+        notifier: ListenerNotifier,
+        threadGroupTree: ListedHashTree,
+        engine: StandardJMeterEngine
+    ) {
+        try {
+            val jMeterContext = JMeterContextService.getContext()
+            val variables = jMeterContext.variables
+            val schedule = scheduleString
+            log.info("Starting OpenModelThreadGroup#{} with schedule {}", threadGroupIndex, schedule)
+            val parsedSchedule = ThreadSchedule(schedule)
+            val seed = randomSeed
+            val rnd = if (seed == 0L) Random() else Random(seed)
+            val gen = ThreadScheduleProcessGenerator(rnd, parsedSchedule)
+            val testStartTime = JMeterContextService.getTestStartTime()
+            val executorService = Executors.newCachedThreadPool()
+            this.executorService = executorService
+            val starter = ThreadsStarter(testStartTime, executorService, activeThreads, gen) { threadNumber ->
+                val clonedTree = cloneTree(threadGroupTree)
+                makeThread(engine, this, notifier, threadGroupIndex, threadNumber, clonedTree, variables)
+            }
+            threadStarterFuture.set(
+                houseKeepingThreadPool.submit {
+                    Thread.currentThread().name = "open-model-thread-starter-$name-$threadGroupIndex"
+                    starter.run()
+                }
+            )
+        } catch (expected: Throwable) {
+            log.error("Unable to start thread group", expected)
+        }
+    }
+
+    override fun threadFinished(thread: JMeterThread?) {
+        activeThreads.remove(thread)
+    }
+
+    override fun addNewThread(delay: Int, engine: StandardJMeterEngine?): JMeterThread {
+        TODO("Will not be implemented as the semantics of the API is unclear")
+    }
+
+    override fun stopThread(threadName: String?, now: Boolean): Boolean {
+        TODO("Will not be implemented as the semantics of the API is unclear")
+    }
+
+    override fun numberOfActiveThreads(): Int = activeThreads.size
+
+    override fun verifyThreadsStopped(): Boolean =
+        executorService?.awaitTermination(0, TimeUnit.SECONDS) != false
+
+    override fun waitThreadsStopped() {
+        executorService?.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
+    }
+
+    override fun stop() {
+        log.info("Gracefully stopping the threads")
+        threadStarterFuture.getAndSet(null)?.cancel(true)
+        // We use Java's forEach since ConcurrentHashMap has a slightly better implementation
+        // than Kotlin's generic forEach
+        @Suppress("JavaMapForEach")
+        activeThreads.forEach { thread, _ ->
+            log.info("Gracefully stopping thread {}", thread)
+            // Safe stop the thread
+            thread.stop()
+        }
+    }
+
+    override fun tellThreadsToStop() {
+        // Graceful stop
+        stop()
+        log.info("Interrupting the threads")
+        // Interrupting all the threads
+        // shutdownNow will interrupt the threads
+        executorService?.shutdownNow()?.forEach {
+            // In theory, there should be no "queued" runnables left,
+            // However, if there's something, we remove it from activeThreads
+            activeThreads.remove(it)
+        }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
new file mode 100644
index 00000000000..b44272701da
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.control.GenericController
+import org.apache.jmeter.samplers.Sampler
+import org.apiguardian.api.API
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class OpenModelThreadGroupController : GenericController() {
+    public companion object {
+        private const val serialVersionUID: Long = 1L
+    }
+
+    override fun next(): Sampler? {
+        if (iterCount >= 1) {
+            // For now, every thread performs just one iteration
+            isDone = true
+        }
+        return super.next()
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRamp.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRamp.kt
new file mode 100644
index 00000000000..2faaff00386
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRamp.kt
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apiguardian.api.API
+import org.slf4j.LoggerFactory
+import java.nio.DoubleBuffer
+import java.util.PrimitiveIterator
+import java.util.Random
+import kotlin.math.min
+import kotlin.math.sqrt
+
+/**
+ * Generates events that represent constant, linearly increasing or linearly decreasing load.
+ *
+ *  Sample usage:
+ *
+ *     val ramp = PoissonArrivalsRamp()
+ *     ramp.prepare(beginRate = 0.0, endRate = 1.0, duration = 10, random = ...)
+ *     while(ramp.hasNext()) {
+ *         println(ramp.nextDouble()) // -> values from 0..duration
+ *     }
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class PoissonArrivalsRamp : PrimitiveIterator.OfDouble {
+    private lateinit var events: DoubleBuffer
+
+    private companion object {
+        private val log = LoggerFactory.getLogger(PoissonArrivalsRamp::class.java)
+    }
+
+    override fun remove() {
+        TODO("Element removal is not supported")
+    }
+
+    override fun hasNext(): Boolean = events.hasRemaining()
+
+    /**
+     * Returns the time of the next event `0..duration`.
+     */
+    override fun nextDouble(): Double = events.get()
+
+    private fun ensureCapacity(len: Int) {
+        if (::events.isInitialized && events.capacity() >= len) {
+            events.clear()
+            return
+        }
+        events = DoubleBuffer.allocate(len)
+    }
+
+    /**
+     * Prepares events for constant, linearly increasing or linearly decreasing load.
+     * @param beginRate the load rate at the beginning of the interval, must be positive
+     * @param endRate the load rate at the end of the interval, must be positive
+     * @param duration the duration of the load interval, must be positive
+     * @param random random number generator
+     */
+    public fun prepare(
+        beginRate: Double,
+        endRate: Double,
+        duration: Double,
+        random: Random
+    ) {
+        val minRate = min(beginRate, endRate)
+        // 3.7 events means 3, not 4. It ensures we always we do not overflow over duration interval
+        val numEvents = ((beginRate + endRate) / 2 * duration).toInt()
+        ensureCapacity(numEvents)
+        val flatEvents = (minRate * duration).toInt()
+        val events = events
+        if (minRate > 0) {
+            // Generate uniform process with minimal rate
+            repeat(flatEvents) {
+                events.put(random.nextDouble() * duration)
+            }
+        }
+        val eventsLeft = numEvents - flatEvents
+        if (log.isInfoEnabled) {
+            log.info(
+                "Generating {} events, beginRate = {} / sec, endRate = {} / sec, duration = {} sec",
+                numEvents,
+                beginRate,
+                endRate,
+                duration
+            )
+        }
+        if (beginRate != endRate && eventsLeft != 0) {
+            // The rest is either increasing from 0 or decreasing to 0 load
+            // For "increasing from 0 to 1" load the cumulative distribution function is x*x
+            // so sqrt(random) generates "linearly increasing load"
+            // and 1-sqrt(random) generates "linearly decreasing load"
+            // See https://en.wikipedia.org/wiki/Inverse_transform_sampling
+            repeat(eventsLeft) {
+                var time = sqrt(random.nextDouble())
+                if (beginRate > endRate) {
+                    time = 1 - time
+                }
+                events.put(time * duration)
+            }
+        }
+        events.array().sort(0, events.position())
+        events.flip()
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGenerator.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGenerator.kt
new file mode 100644
index 00000000000..a56295d0c2d
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGenerator.kt
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.threads.openmodel.ThreadScheduleStep.ArrivalsStep
+import org.apache.jmeter.threads.openmodel.ThreadScheduleStep.RateStep
+import java.util.PrimitiveIterator
+import java.util.Random
+
+/**
+ * Generates timestamps for events according to the schedule.
+ * The resulting timestamps are in seconds: `0..totalDuration`.
+ */
+internal class ThreadScheduleProcessGenerator(
+    private val random: Random,
+    private val schedule: ThreadSchedule
+) : PrimitiveIterator.OfDouble {
+    // position of ArrivalStep
+    private var pos = -1
+    private val poissonRamp = PoissonArrivalsRamp()
+    private val evenRamp = EvenArrivalsRamp()
+    private var gen: PrimitiveIterator.OfDouble = poissonRamp
+
+    // The times are in seconds
+    private var timeOffset = 0.0
+    private var lastDuration = 0.0
+    private var beginRate = 0.0
+    private var endRate = 0.0
+    private lateinit var arrivalStep: ArrivalsStep
+
+    /**
+     * Total schedule duration in seconds.
+     */
+    val totalDuration = schedule.steps.sumOf { (it as? ArrivalsStep)?.duration ?: 0.0 }
+
+    override fun remove() {
+        TODO("Element removal is not supported")
+    }
+
+    /**
+     * Returns the timestamp of the next event in seconds.
+     */
+    override fun nextDouble(): Double = timeOffset + gen.nextDouble()
+
+    override fun hasNext(): Boolean {
+        if (pos != -1 && gen.hasNext()) {
+            return true
+        }
+        do {
+            timeOffset += lastDuration
+            lastDuration = 0.0
+            // Find next arrivals
+            if (!findNextArrivalStep()) {
+                return false
+            }
+            lastDuration = arrivalStep.duration
+            // Prepare next events
+            gen = when (arrivalStep.type) {
+                ThreadScheduleStep.ArrivalType.EVEN ->
+                    evenRamp.apply {
+                        prepare(beginRate = beginRate, endRate = endRate, duration = lastDuration)
+                    }
+                ThreadScheduleStep.ArrivalType.RANDOM ->
+                    poissonRamp.apply {
+                        prepare(beginRate = beginRate, endRate = endRate, duration = lastDuration, random = random)
+                    }
+            }
+        } while (!gen.hasNext())
+        return true
+    }
+
+    private fun findNextArrivalStep(): Boolean {
+        val steps = schedule.steps
+        // Find the next beginRate and arrivalStep
+        while (true) {
+            pos += 1
+            if (pos == steps.size) {
+                return false
+            }
+            when (val step = steps[pos]) {
+                is RateStep -> beginRate = step.rate
+                is ArrivalsStep -> {
+                    arrivalStep = step
+                    break
+                }
+            }
+        }
+
+        // If the next step is RateStep, then treat it as the endRate
+        // Otherwise, use endRate==beginRate
+        endRate = (steps.getOrNull(pos + 1) as? RateStep)?.rate ?: beginRate
+        return true
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/TimeUnitExtensions.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/TimeUnitExtensions.kt
new file mode 100644
index 00000000000..c30161cb484
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/TimeUnitExtensions.kt
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import java.util.concurrent.TimeUnit
+
+/**
+ * Returns the number of seconds in the current [TimeUnit].
+ * Unfortunately Java's `TimeUnit.MILLISECONDS.toSecond(1)` returns `0`.
+ */
+internal val TimeUnit.asSeconds: Double get() = when (this) {
+    TimeUnit.MILLISECONDS -> 0.001
+    else -> toSeconds(1).toDouble()
+}
+
+/**
+ * Returns the suitable axis scale given a [rate] in Hz.
+ * For instance, 10000/sec looks better as 10/ms,
+ * and 0.0025/sec looks better as 9/hour.
+ */
+internal fun rateUnitFor(rate: Double) = when {
+    rate > 1000 -> TimeUnit.MILLISECONDS
+    rate > 1000.0 / TimeUnit.MINUTES.asSeconds -> TimeUnit.SECONDS
+    rate > 1000.0 / TimeUnit.HOURS.asSeconds -> TimeUnit.MINUTES
+    else -> TimeUnit.HOURS
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
new file mode 100644
index 00000000000..e23541f2a51
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel.gui
+
+import net.miginfocom.swing.MigLayout
+import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.gui.TestElementMetadata
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apache.jmeter.threads.AbstractThreadGroup
+import org.apache.jmeter.threads.gui.AbstractThreadGroupGui
+import org.apache.jmeter.threads.openmodel.DefaultThreadSchedule
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroupController
+import org.apache.jmeter.threads.openmodel.ThreadSchedule
+import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
+import org.apache.jmeter.threads.openmodel.asSeconds
+import org.apache.jmeter.threads.openmodel.rateUnitFor
+import org.apache.jmeter.util.JMeterUtils
+import org.apache.jmeter.util.JMeterUtils.labelFor
+import org.apache.jorphan.gui.JFactory
+import org.apiguardian.api.API
+import java.text.MessageFormat
+import java.time.Duration
+import javax.swing.JButton
+import javax.swing.JLabel
+import javax.swing.JPanel
+import javax.swing.JTextArea
+import javax.swing.JTextField
+import javax.swing.event.DocumentEvent
+import javax.swing.event.DocumentListener
+import kotlin.math.roundToLong
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+@TestElementMetadata(labelResource = "openmodelthreadgroup")
+public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
+    override fun getLabelResource(): String = "openmodelthreadgroup"
+
+    private val randomSeedEditor = JTextField()
+    private val scheduleStringEditor = JFactory.tabMovesFocus(JTextArea())
+    private val explanation = JLabel()
+    private val targetRateChart = TargetRateChart()
+    private val scheduleSummaryFormat = MessageFormat(JMeterUtils.getResString("openmodelthreadgroup_schedule_summary"))
+
+    init {
+        add(createPanel())
+        scheduleStringEditor.document.addDocumentListener(object : DocumentListener {
+            override fun insertUpdate(e: DocumentEvent?) {
+                updateExplanation()
+            }
+
+            override fun removeUpdate(e: DocumentEvent?) {
+                updateExplanation()
+            }
+
+            override fun changedUpdate(e: DocumentEvent?) {
+                updateExplanation()
+            }
+        })
+    }
+
+    private fun createPanel() =
+        JPanel(MigLayout("fillx, wrap1", "[fill, grow]")).apply {
+            add(labelFor(scheduleStringEditor, "openmodelthreadgroup_schedule_string"), "grow 0, split 6")
+            add(templateButton("rate(1/min)"), "grow 0")
+            add(templateButton("random_arrivals(10 min)"), "grow 0")
+            add(templateButton("pause(1 min)"), "grow 0")
+            add(templateButton("/* comment */"), "grow 0")
+            add(JPanel())
+            add(scheduleStringEditor)
+
+            add(labelFor(randomSeedEditor, "openmodelthreadgroup_random_seed"), "grow 0, split 3")
+            add(randomSeedEditor, "width 100pt, grow 0")
+            add(JPanel())
+
+            add(explanation)
+            add(targetRateChart, "height 200")
+        }
+
+    private fun templateButton(title: String) = JButton(title).apply {
+        isRequestFocusEnabled = false
+        addActionListener {
+            val editor = scheduleStringEditor
+            val originalText = editor.text
+            var replacement = title
+            if (editor.selectionStart > 0 && !originalText[editor.selectionStart - 1].isWhitespace()) {
+                replacement = " $replacement"
+            }
+            if (editor.selectionEnd < originalText.length && !originalText[editor.selectionEnd].isWhitespace()) {
+                replacement = "$replacement "
+            }
+            editor.replaceSelection(replacement)
+        }
+    }
+
+    private fun updateExplanation() {
+        val schedule = evaluate(scheduleStringEditor.text)
+        explanation.text =
+            try {
+                val threadSchedule = ThreadSchedule(schedule)
+                targetRateChart.updateSchedule(threadSchedule)
+                val duration = Duration.ofSeconds(threadSchedule.totalDuration.roundToLong())
+                val maxRate = threadSchedule.steps.maxOf { (it as? ThreadScheduleStep.RateStep)?.rate ?: 0.0 }
+                val rateUnit = rateUnitFor(maxRate)
+                val rate = maxRate * rateUnitFor(maxRate).asSeconds
+                val rateUnitLabel = rateUnit.toString().lowercase().removeSuffix("s")
+                val readableDuration = duration.toString().removePrefix("PT").lowercase()
+                val sheduleSummary = scheduleSummaryFormat.format(
+                    arrayOf(
+                        readableDuration,
+                        "$rate / $rateUnitLabel"
+                    )
+                )
+                "<html><body>$sheduleSummary</body></html>"
+            } catch (expected: Exception) {
+                expected.message
+            }
+    }
+
+    private fun evaluate(input: String): String = CompoundVariable(input).execute()
+
+    override fun createTestElement(): TestElement =
+        OpenModelThreadGroup().also {
+            it.setProperty(TestElementProperty(AbstractThreadGroup.MAIN_CONTROLLER, OpenModelThreadGroupController()))
+            modifyTestElement(it)
+        }
+
+    override fun modifyTestElement(tg: TestElement) {
+        configureTestElement(tg)
+        tg as OpenModelThreadGroup
+        tg.scheduleString = scheduleStringEditor.text
+        tg.randomSeedString = randomSeedEditor.text
+    }
+
+    override fun configure(tg: TestElement) {
+        super.configure(tg)
+        tg as OpenModelThreadGroup
+        scheduleStringEditor.text = tg.scheduleString
+        randomSeedEditor.text = tg.randomSeedString
+    }
+
+    override fun clearGui() {
+        super.clearGui()
+        scheduleStringEditor.text = ""
+        randomSeedEditor.text = ""
+        targetRateChart.updateSchedule(
+            DefaultThreadSchedule(
+                listOf(
+                    ThreadScheduleStep.RateStep(0.0),
+                    ThreadScheduleStep.ArrivalsStep(ThreadScheduleStep.ArrivalType.RANDOM, 1.0)
+                )
+            )
+        )
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
new file mode 100644
index 00000000000..306803612d8
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel.gui
+
+import jetbrains.datalore.base.registration.Disposable
+import jetbrains.datalore.plot.MonolithicCommon
+import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik
+import jetbrains.letsPlot.geom.geomLine
+import jetbrains.letsPlot.intern.toSpec
+import jetbrains.letsPlot.label.ggtitle
+import jetbrains.letsPlot.letsPlot
+import jetbrains.letsPlot.scale.scaleXContinuous
+import jetbrains.letsPlot.theme
+import org.apache.jmeter.threads.openmodel.ThreadSchedule
+import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
+import org.apache.jmeter.threads.openmodel.asSeconds
+import org.apache.jmeter.threads.openmodel.rateUnitFor
+import org.apiguardian.api.API
+import org.slf4j.LoggerFactory
+import java.awt.BorderLayout
+import java.util.concurrent.TimeUnit
+import javax.swing.JComponent
+import javax.swing.JPanel
+
+/**
+ * Draws a line chart with the expected load rate over time for given [ThreadSchedule].
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class TargetRateChart : JPanel() {
+    private companion object {
+        private val log = LoggerFactory.getLogger(TargetRateChart::class.java)
+        private const val MIN_TICKS_FOR_TIME_AXIS = 2.5
+    }
+
+    init {
+        layout = BorderLayout()
+    }
+
+    private var prevTimes: DoubleArray? = null
+    private var prevRate: DoubleArray? = null
+
+    public fun updateSchedule(threadSchedule: ThreadSchedule) {
+        val timeValues = mutableListOf<Double>()
+        val rateValues = mutableListOf<Double>()
+        var time = 0.0
+        var rate = 0.0
+        var addPoint = false
+
+        for (step in threadSchedule.steps) {
+            when (step) {
+                is ThreadScheduleStep.RateStep -> {
+                    rate = step.rate
+                    if (addPoint) {
+                        addPoint = false
+                        timeValues += time
+                        rateValues += rate
+                    }
+                }
+                is ThreadScheduleStep.ArrivalsStep -> if (step.duration > 0) {
+                    timeValues += time
+                    rateValues += rate
+                    addPoint = true
+                    time += step.duration
+                }
+            }
+        }
+        if (addPoint) {
+            timeValues += time
+            rateValues += rate
+        }
+        setData(timeValues.toDoubleArray(), rateValues.toDoubleArray())
+    }
+
+    private fun setData(time: DoubleArray, rate: DoubleArray) {
+        if (time.contentEquals(prevTimes) && rate.contentEquals(prevRate)) {
+            return
+        }
+        prevTimes = time.copyOf()
+        prevRate = rate.copyOf()
+        val totalDuration = time.last()
+        val timeUnit = when {
+            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.DAYS.asSeconds -> TimeUnit.DAYS
+            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.HOURS.asSeconds -> TimeUnit.HOURS
+            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.MINUTES.asSeconds -> TimeUnit.MINUTES
+            else -> TimeUnit.SECONDS
+        }
+        if (timeUnit != TimeUnit.SECONDS) {
+            val scale = 1.0 / timeUnit.asSeconds
+            for (i in time.indices) {
+                time[i] *= scale
+            }
+        }
+        val maxRate = rate.maxOrNull() ?: 0.0
+        val rateUnit = rateUnitFor(maxRate)
+        if (rateUnit != TimeUnit.SECONDS) {
+            val scale = rateUnit.asSeconds
+            for (i in rate.indices) {
+                rate[i] *= scale
+            }
+        }
+
+        components.forEach {
+            if (it is Disposable) {
+                it.dispose()
+            }
+        }
+        removeAll()
+        add(createChart(time = time, rate = rate, timeUnit = timeUnit, rateUnit = rateUnit), BorderLayout.CENTER)
+    }
+
+    private fun createChart(time: DoubleArray, rate: DoubleArray, timeUnit: TimeUnit, rateUnit: TimeUnit): JComponent {
+        val data = mapOf(
+            "time" to time,
+            "rate" to rate
+        )
+        val plot = letsPlot(data) + geomLine { x = "time"; y = "rate" } +
+            scaleXContinuous("Time, " + timeUnit.name.lowercase(), expand = listOf(0, 0)) +
+            ggtitle("Target load rate per " + rateUnit.name.lowercase().removeSuffix("s")) +
+            theme(axisTitleY = "blank")
+
+        val rawSpec = plot.toSpec()
+        val processedSpec = MonolithicCommon.processRawSpecs(rawSpec, frontendOnly = false)
+
+        return DefaultPlotPanelBatik(
+            processedSpec = processedSpec,
+            preserveAspectRatio = false,
+            preferredSizeFromPlot = false,
+            repaintDelay = 10,
+        ) { messages ->
+            for (message in messages) {
+                log.info(message)
+            }
+        }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
new file mode 100644
index 00000000000..c7aae036453
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
@@ -0,0 +1,235 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("ThreadScheduleUtils")
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.threads.openmodel.ThreadScheduleStep.ArrivalType
+import org.apiguardian.api.API
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+import kotlin.jvm.Throws
+
+/**
+ * rate(2/sec) arrivals(1 min) rate(3/sec) ...
+ *    means 2/sec..3/sec during 1min
+ *
+ * rate(2/sec) arrivals(1 min) arrivals(2 min) rate(3/sec) ...
+ *   means 2/sec..2/sec during 1min, then 2/sec..3/sec during 2min
+ *
+ * rate(1/sec) rate(2/sec) arrivals(1 min) rate(3/sec) rate(4/sec) arrivals(2 min) rate(5/sec)...
+ *   means 2/sec..3/sec during 1min, then 4/sec..5/sec during 2min
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public interface ThreadSchedule {
+    /**
+     * Schedule steps.
+     */
+    public val steps: List<ThreadScheduleStep>
+
+    /**
+     * Total schedule duration in seconds.
+     */
+    public val totalDuration: Double get() = steps.sumOf { (it as? ThreadScheduleStep.ArrivalsStep)?.duration ?: 0.0 }
+}
+
+/**
+ * Parses schedule string into [ThreadSchedule] object.
+ * @param schedule schedule DSL. See [ThreadSchedule]
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+@Throws(ParserException::class, TokenizerException::class)
+public fun ThreadSchedule(schedule: String): ThreadSchedule =
+    schedule.toIntOrNull()?.let {
+        // If schedule string looks like a number, then pretend it is like "validation mode"
+        // It is undocumented for now to gather feedback
+        val rate = it.toDouble()
+        // If schedule looks like
+        DefaultThreadSchedule(
+            listOf(
+                // Launch N requests
+                ThreadScheduleStep.RateStep(rate),
+                ThreadScheduleStep.ArrivalsStep(ArrivalType.EVEN, 1.0),
+                ThreadScheduleStep.RateStep(rate),
+                // Let threads to complete
+                ThreadScheduleStep.RateStep(0.0),
+                ThreadScheduleStep.ArrivalsStep(ArrivalType.EVEN, TimeUnit.HOURS.asSeconds),
+            )
+        )
+    } ?: ScheduleParser(schedule).parse()
+
+private val FORMAT = DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.ROOT))
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public sealed interface ThreadScheduleStep {
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5")
+    public data class RateStep(val rate: Double) : ThreadScheduleStep {
+        override fun toString(): String = "Rate(${FORMAT.format(rate)})"
+    }
+
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5")
+    public enum class ArrivalType {
+        EVEN, RANDOM
+    }
+
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5")
+    public data class ArrivalsStep(val type: ArrivalType, val duration: Double) : ThreadScheduleStep {
+        override fun toString(): String = "Arrivals(type=$type, duration=${FORMAT.format(duration)})"
+    }
+}
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class DefaultThreadSchedule(override val steps: List<ThreadScheduleStep>) : ThreadSchedule {
+    override fun toString(): String = steps.toString()
+}
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class ParserException(public val input: String, public val position: Int, message: String) :
+    Exception(
+        "$message at position $position: " +
+            input.substring(position until (position + 20).coerceAtMost(input.length))
+    )
+
+/**
+ * Parses schedule string into [ThreadSchedule] object.
+ * @param schedule schedule string (e.g. `"rate(2/sec) arrivals(1 min) rate(3/sec)"`)
+ */
+internal class ScheduleParser(private val schedule: String) {
+    val tokens = Tokenizer.tokenize(schedule)
+    private var pos: Int = 0
+    private val token: Tokenizer.Token? get() = if (pos >= tokens.size) null else tokens[pos].token
+    private var lastRate = ThreadScheduleStep.RateStep(0.0)
+
+    private fun throwParseException(message: String): Nothing =
+        throw ParserException(schedule, if (pos >= tokens.size) 0 else tokens[pos].pos, message)
+
+    fun parse(): ThreadSchedule {
+        val steps = mutableListOf<ThreadScheduleStep>()
+        while (pos < tokens.size) {
+            val pauseSteps = parsePause()
+            if (pauseSteps != null) {
+                steps += pauseSteps
+                continue
+            }
+            // Variable is needed for formatting: https://youtrack.jetbrains.com/issue/KTIJ-19984
+            val step = parseRate()
+                ?: parseArrivals("random_arrivals", ArrivalType.RANDOM)
+                ?: parseArrivals("even_arrivals", ArrivalType.EVEN)
+                ?: throwParseException(
+                    "Unexpected input (expecting rate, random_arrivals, even_arrivals, or pause)"
+                )
+            steps += step
+            if (step is ThreadScheduleStep.RateStep) {
+                lastRate = step
+            }
+        }
+        return DefaultThreadSchedule(steps)
+    }
+
+    private fun consume(vararg expected: Tokenizer.Token) {
+        if (token !in expected) {
+            throwParseException("Unexpected input. Expected ${expected.joinToString()} got $token")
+        }
+        pos += 1
+    }
+
+    private inline fun <reified T : Tokenizer.Token> consume(failMessage: String): T = (token as? T).also { pos += 1 }
+        ?: throwParseException("Unexpected input. Expected $failMessage got $token")
+
+    private fun parseRate(): ThreadScheduleStep? {
+        if (!token?.image.equals("rate", ignoreCase = true)) {
+            return null
+        }
+        pos += 1
+        consume(Tokenizer.OpenParenthesisToken)
+        val rate = consume<Tokenizer.NumberToken>("float number for rate")
+        val rateValue = rate.image.toDouble()
+        // rate(0) is OK without unit, as 0 is the same no matter what time unit is in use
+        // If the upcoming token is ), then assume the unit is absent
+        val timeUnit = if (rateValue == 0.0 && token == Tokenizer.CloseParenthesisToken) {
+            TimeUnit.SECONDS
+        } else {
+            consume(Tokenizer.DivideToken, Tokenizer.IdentifierToken("per"))
+            parseTimeUnit()
+        }
+        consume(Tokenizer.CloseParenthesisToken)
+        return ThreadScheduleStep.RateStep(rateValue / timeUnit.asSeconds)
+    }
+
+    private fun parseArrivals(functionName: String, type: ArrivalType): ThreadScheduleStep? {
+        if (!token?.image.equals(functionName, ignoreCase = true)) {
+            return null
+        }
+        pos += 1
+        consume(Tokenizer.OpenParenthesisToken)
+        val duration = parseDuration()
+        consume(Tokenizer.CloseParenthesisToken)
+        return ThreadScheduleStep.ArrivalsStep(type, duration)
+    }
+
+    private fun parsePause(): List<ThreadScheduleStep>? {
+        if (!token?.image.equals("pause", ignoreCase = true)) {
+            return null
+        }
+        pos += 1
+        consume(Tokenizer.OpenParenthesisToken)
+        val duration = parseDuration()
+        consume(Tokenizer.CloseParenthesisToken)
+        val arrivals = ThreadScheduleStep.ArrivalsStep(ArrivalType.EVEN, duration)
+        if (lastRate.rate == 0.0) {
+            return listOf(arrivals, lastRate)
+        }
+        val zeroRate = ThreadScheduleStep.RateStep(0.0)
+        return listOf(lastRate, zeroRate, arrivals, zeroRate, lastRate)
+    }
+
+    private fun parseDuration(): Double {
+        var res = 0.0
+        do {
+            val duration = consume<Tokenizer.NumberToken>("float number for duration")
+            val durationValue = duration.image.toDouble()
+            // Allow 0 duration without time unit
+            if (durationValue == 0.0 && token == Tokenizer.CloseParenthesisToken) {
+                break
+            }
+            val timeUnit = parseTimeUnit()
+            res += durationValue * timeUnit.asSeconds
+        } while (token is Tokenizer.NumberToken)
+        return res
+    }
+
+    private fun parseTimeUnit(): TimeUnit {
+        val unit = consume<Tokenizer.IdentifierToken>("unit for duration: sec, min, hour, day")
+        val image = unit.image
+        val timeUnit = when {
+            image.equals("ms", ignoreCase = true) -> TimeUnit.MILLISECONDS
+            image.equals("s", ignoreCase = true) || image.startsWith("sec", ignoreCase = true) ->
+                TimeUnit.SECONDS
+            image.equals("m", ignoreCase = true) || image.startsWith("min", ignoreCase = true) ->
+                TimeUnit.MINUTES
+            image.equals("h", ignoreCase = true) || image.startsWith("hour", ignoreCase = true) ->
+                TimeUnit.HOURS
+            image.equals("d", ignoreCase = true) || image.startsWith("day", ignoreCase = true) ->
+                TimeUnit.DAYS
+            else -> throwParseException("Unexpected time unit $image")
+        }
+        return timeUnit
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
new file mode 100644
index 00000000000..d88fa2ec08c
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apiguardian.api.API
+import java.util.Locale
+import java.util.regex.Matcher
+
+@API(status = API.Status.EXPERIMENTAL, since = "5.5")
+public class TokenizerException(public val input: String, public val position: Int, message: String) :
+    Exception(
+        "$message at position $position: " +
+            input.substring(position until (position + 20).coerceAtMost(input.length))
+    )
+
+/**
+ * Tokenizes string with schedule like `rate(5 min) ...` into tokens
+ *   `rate`, `(`, `5`, `min`, `)`, so [ScheduleParser] can parse them and build [ThreadSchedule].
+ */
+internal object Tokenizer {
+    private val WHITESPACE = Regex("""(?>\s+|/\*(?:(?!\*/).)*+\*/)|//[^\n\r]*+[\n\r]*+""")
+    private val IDENTIFIER = Regex("""\p{Alpha}(?>\p{Alnum}|_)*+""")
+    private val NUMBER = Regex("""(?>\d++(?:\.\d++)?|\.\d++)""")
+
+    data class TokenPosition(val pos: Int, val token: Token) {
+        override fun toString() = "$token:$pos"
+    }
+
+    sealed interface Token {
+        val image: String
+    }
+
+    data class IdentifierToken(override val image: String) : Token {
+        override fun equals(other: Any?) = other is IdentifierToken && image.equals(other.image, ignoreCase = true)
+        override fun hashCode() = image.lowercase(Locale.ROOT).hashCode()
+        override fun toString() = "Identifier($image)"
+    }
+
+    data class NumberToken(override val image: String) : Token {
+        override fun toString() = "Number($image)"
+    }
+
+    object OpenParenthesisToken : Token {
+        override val image: String get() = "("
+        override fun toString() = "("
+    }
+
+    object CloseParenthesisToken : Token {
+        override val image: String get() = ")"
+        override fun toString() = ")"
+    }
+
+    object DivideToken : Token {
+        override val image: String get() = "/"
+        override fun toString() = "/"
+    }
+
+    private fun Regex.prepareMatcher(value: String) =
+        toPattern().matcher(value).useAnchoringBounds(false).useTransparentBounds(true).region(0, value.length)
+
+    private fun Matcher.lookingAt(pos: Int): Boolean =
+        region(pos, regionEnd()).lookingAt()
+
+    fun tokenize(value: String): List<TokenPosition> {
+        val res = mutableListOf<TokenPosition>()
+        var pos = 0
+        val mWhitespace = WHITESPACE.prepareMatcher(value)
+        val mIdentifier = IDENTIFIER.prepareMatcher(value)
+        val mNumber = NUMBER.prepareMatcher(value)
+        while (pos < value.length) {
+            if (mWhitespace.lookingAt(pos)) {
+                pos = mWhitespace.end()
+                continue
+            }
+            val token = when {
+                value[pos] == '(' -> OpenParenthesisToken
+                value[pos] == ')' -> CloseParenthesisToken
+                value[pos] == '/' -> DivideToken
+                mNumber.lookingAt(pos) -> NumberToken(mNumber.group())
+                mIdentifier.lookingAt(pos) -> IdentifierToken(mIdentifier.group())
+                else -> throw TokenizerException(value, pos, "Unexpected input")
+            }
+            res += TokenPosition(pos, token)
+            pos += token.image.length
+        }
+        return res
+    }
+}
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 53f57b196e0..4b81a583019 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -803,6 +803,10 @@ obsolete_test_element=This test element is obsolete
 once_only_controller_title=Once Only Controller
 opcode=opCode
 open=Open...
+openmodelthreadgroup=Open Model Thread Group
+openmodelthreadgroup_random_seed=Random Seed
+openmodelthreadgroup_schedule_string=Schedule
+openmodelthreadgroup_schedule_summary=Total duration: {0}, max rate: {1}
 option=Options
 optional_tasks=Optional Tasks
 paramtable=Send Parameters With the Request\:
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index 1b1cd4055fa..729648defc9 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -792,6 +792,10 @@ obsolete_test_element=Cet élément de test est obsolète
 once_only_controller_title=Contrôleur Exécution unique
 opcode=Code d'opération
 open=Ouvrir...
+openmodelthreadgroup=Groupe d'unités en modèle ouvert
+openmodelthreadgroup_random_seed=Sel pour la fonction aléatoire
+openmodelthreadgroup_schedule_string=Planification
+openmodelthreadgroup_schedule_summary=Durée totale: {0}, débit max: {1}
 option=Options
 optional_tasks=Tâches optionnelles
 paramtable=Envoyer les paramètres avec la requête \:
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
new file mode 100644
index 00000000000..7f9ea58f165
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Locale
+import kotlin.test.assertEquals
+
+class EvenArrivalsRampTest {
+    class Case(val beginRate: Double, val endRate: Double, val duration: Double, val expected: String) {
+        override fun toString() = "beginRate=$beginRate, endRate=$endRate, duration=$duration"
+    }
+
+    companion object {
+        @JvmStatic
+        fun data() = listOf(
+            Case(beginRate = 1.0, endRate = 1.0, duration = 1.0, "0"),
+            Case(
+                beginRate = 2.0, endRate = 2.0, duration = 1.0,
+                """
+                0
+                0.5
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 0.0, endRate = 4.0, duration = 4.0,
+                """
+                0
+                1.4142
+                2
+                2.4495
+                2.8284
+                3.1623
+                3.4641
+                3.7417
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 5.0, endRate = 1.0, duration = 4.0,
+                """
+                0
+                0.2042
+                0.4174
+                0.6411
+                0.8769
+                1.127
+                1.3944
+                1.6834
+                2
+                2.3542
+                2.7639
+                3.2679
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 1.0, endRate = 5.0, duration = 4.0,
+                """
+                0
+                0.7321
+                1.2361
+                1.6458
+                2
+                2.3166
+                2.6056
+                2.873
+                3.1231
+                3.3589
+                3.5826
+                3.7958
+                """.trimIndent()
+            ),
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    fun test(case: Case) {
+        val gen = EvenArrivalsRamp()
+        gen.prepare(beginRate = case.beginRate, endRate = case.endRate, duration = case.duration)
+        val format = DecimalFormat("#.####", DecimalFormatSymbols.getInstance(Locale.ROOT))
+        assertEquals(
+            case.expected,
+            gen.asSequence().joinToString("\n") { format.format(it) },
+            case.toString()
+        )
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
new file mode 100644
index 00000000000..29123629e7c
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Locale
+import java.util.Random
+import kotlin.test.assertEquals
+
+class PoissonArrivalsRampTest {
+    class Case(
+        val beginRate: Double,
+        val endRate: Double,
+        val duration: Double,
+        val expected: String,
+        val seed: Long = 0L,
+    ) {
+        override fun toString() = "beginRate=$beginRate, endRate=$endRate, duration=$duration, seed=$seed"
+    }
+
+    companion object {
+        @JvmStatic
+        fun data() = listOf(
+            Case(beginRate = 1.0, endRate = 1.0, duration = 1.0, "0.731"),
+            Case(
+                beginRate = 2.0, endRate = 2.0, duration = 1.0,
+                """
+                0.2405
+                0.731
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 0.0, endRate = 4.0, duration = 4.0,
+                """
+                1.9618
+                2.309
+                2.4825
+                2.9677
+                3.092
+                3.1935
+                3.4199
+                3.9696
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 5.0, endRate = 1.0, duration = 4.0,
+                """
+                0.0304
+                0.1193
+                0.2494
+                0.908
+                0.9621
+                1.5175
+                1.691
+                1.9026
+                2.2017
+                2.5497
+                2.5639
+                2.9239
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 1.0, endRate = 5.0, duration = 4.0,
+                """
+                0.9621
+                1.4361
+                2.0974
+                2.2017
+                2.309
+                2.4825
+                2.5497
+                2.9239
+                3.092
+                3.7506
+                3.8807
+                3.9696
+                """.trimIndent()
+            ),
+            Case(
+                beginRate = 1.0, endRate = 5.0, duration = 4.0, seed = 1L,
+                expected = """
+                0.3128
+                0.8309
+                1.3309
+                1.6403
+                2.358
+                2.5209
+                2.9235
+                3.8721
+                3.8779
+                3.893
+                3.9267
+                3.935
+                """.trimIndent()
+            ),
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    fun test(case: Case) {
+        val gen = PoissonArrivalsRamp()
+        gen.prepare(beginRate = case.beginRate, endRate = case.endRate, duration = case.duration, random = Random(case.seed))
+        val format = DecimalFormat("#.####", DecimalFormatSymbols.getInstance(Locale.ROOT))
+        assertEquals(
+            case.expected,
+            gen.asSequence().joinToString("\n") { format.format(it) },
+            case.toString()
+        )
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
new file mode 100644
index 00000000000..b889ccf3f67
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Locale
+import java.util.Random
+import kotlin.test.assertEquals
+
+class ThreadScheduleProcessGeneratorTest {
+    class Case(val schedule: String, val expected: String) {
+        override fun toString() = schedule
+    }
+
+    companion object {
+        @JvmStatic
+        fun data() = listOf(
+            Case(
+                """
+                // total duration is 2+3+1+2 => 8 sec
+                // 1/sec * 2 sec => 2 events at 1 and 2
+                rate(1/sec) even_arrivals(2 sec) rate(1/sec)
+                // 2/sec * 3sec => 6 events at 2.5, 3, 3.5, 4, 4.5, 5
+                rate(2/sec) even_arrivals(3 sec) rate(2/sec)
+                // (2/sec + 5/sec)/2 * 1 sec => 3.5 events (truncated to 3) in 5..6
+                even_arrivals(1 sec) rate(5/sec)
+                // (5/sec + 3/sec)/2 * 2 sec => 8 events in 6..8
+                even_arrivals(2 sec) rate(3/sec)
+                """.trimIndent(),
+                """
+                totalDuration: 8
+                events:
+                  0
+                  1
+                  2
+                  2.5
+                  3
+                  3.5
+                  4
+                  4.5
+                  5
+                  5.3874
+                  5.6667
+                  6
+                  6.2042
+                  6.4174
+                  6.6411
+                  6.8769
+                  7.127
+                  7.3944
+                  7.6834
+                """.trimIndent()
+            ),
+            Case(
+                """
+                // total duration is 2+3+10+4 => 19 sec
+                // (0/sec + 2/sec)/2 * sec => 2 events at 0..2
+                rate(0) random_arrivals(2 sec) rate(2/sec)
+                // 2/sec * 3sec => 6 events at 2..5
+                random_arrivals(3 sec)
+                pause(10 sec)
+                // (2/sec + 1/sec)/2 * 4 sec => 6 events at 15..19
+                random_arrivals(4 sec) rate(1/sec)
+                """.trimIndent(),
+                """
+                totalDuration: 19
+                events:
+                  0.9809
+                  1.7099
+                  2.9997
+                  3.1556
+                  3.6513
+                  3.7926
+                  3.9123
+                  4.9545
+                  15.5156
+                  16.0998
+                  17.4685
+                  18.3902
+                  18.5167
+                  18.765
+                """.trimIndent()
+            ),
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    fun scheduleTest(case: Case) {
+        val rnd = Random(0)
+        val schedule = case.schedule
+        val gen = ThreadScheduleProcessGenerator(rnd, ThreadSchedule(schedule))
+        val format = DecimalFormat("#.####", DecimalFormatSymbols.getInstance(Locale.ROOT))
+        assertEquals(
+            case.expected,
+            """
+            totalDuration: ${format.format(gen.totalDuration)}
+            events:
+            """.trimIndent() + "\n" + gen.asSequence().joinToString("\n") { "  " + format.format(it) },
+            schedule
+        )
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
new file mode 100644
index 00000000000..e2ee2ab1432
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import kotlin.test.assertEquals
+
+class ThreadScheduleTest {
+    class Case(val input: String, val expected: String) {
+        override fun toString() = input
+    }
+
+    companion object {
+        @JvmStatic
+        fun data() = listOf(
+            Case("rate(0/min)", "[Rate(0)]"),
+            Case("rate(36000/hour)", "[Rate(10)]"),
+            Case("random_arrivals(0) /* 0 does not require time unit */", "[Arrivals(type=RANDOM, duration=0)]"),
+            Case(
+                "rate(1/sec) random_arrivals(2 min) pause(3 min) random_arrivals(4 sec)",
+                "[Rate(1), Arrivals(type=RANDOM, duration=120), Rate(1), Rate(0), Arrivals(type=EVEN, duration=180), Rate(0), Rate(1), Arrivals(type=RANDOM, duration=4)]"
+            ),
+            Case("rate(50.1/sec)", "[Rate(50.1)]"),
+            Case("even_arrivals(50 min)", "[Arrivals(type=EVEN, duration=3000)]"),
+            Case("even_arrivals(2d 1m 30s)", "[Arrivals(type=EVEN, duration=${2 * 86400 + 60 + 30})]"),
+            Case(
+                "rate(50/min) even_arrivals(2 hour) rate(60/min)",
+                "[Rate(0.8), Arrivals(type=EVEN, duration=7200), Rate(1)]"
+            ),
+            Case(
+                "rate(0 per min) even_arrivals(30 min) rate(50 per min) random_arrivals(4 min) rate(200 per min) random_arrivals(10 sec)",
+                "[Rate(0), Arrivals(type=EVEN, duration=1800), Rate(0.8), Arrivals(type=RANDOM, duration=240), Rate(3.3), Arrivals(type=RANDOM, duration=10)]"
+            )
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    fun test(case: Case) {
+        assertEquals(case.expected, ThreadSchedule(case.input).toString(), case.input)
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
new file mode 100644
index 00000000000..438bcc494d3
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import kotlin.test.assertEquals
+
+class TokenizerTest {
+    class Case(val input: String, val expected: String) {
+        override fun toString() = input
+    }
+
+    companion object {
+        @JvmStatic
+        fun data() = listOf(
+            Case(
+                "rate(0 per min)",
+                "[Identifier(rate):0, (:4, Number(0):5, Identifier(per):7, Identifier(min):11, ):14]"
+            ),
+            Case(
+                "rate(50/min) /* comment */ even_arrivals(50 min/**/) rate(60/min)",
+                "[Identifier(rate):0, (:4, Number(50):5, /:7, Identifier(min):8, ):11, Identifier(even_arrivals):27, (:40, Number(50):41, Identifier(min):44, ):51, Identifier(rate):53, (:57, Number(60):58, /:60, Identifier(min):61, ):64]"
+            )
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    fun verifyTest(case: Case) {
+        assertEquals(case.expected, Tokenizer.tokenize(case.input).toString(), case.input)
+    }
+}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 1770fca3ff7..d414fb3ac88 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -187,7 +187,7 @@ val verifyReleaseDependencies by tasks.registering {
         }
 
         val sb = StringBuilder()
-        sb.append("External dependencies differ (you could update ${expectedLibs.relativeTo(rootDir)} if you add -PupdateExpectedJars):")
+        sb.append("External dependencies differ (you could update ${expectedLibs.relativeTo(rootDir)} if you run $path -PupdateExpectedJars):")
 
         val sizeBefore = expected.values.sum()
         val sizeAfter = libs.values.sum()
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ecc8aa287eb..0d377ae880f 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -2,6 +2,25 @@
 29371,annotations-23.0.0.jar
 2387,apiguardian-api-1.1.0.jar
 122004,asm-9.2.jar
+517353,base-portable-jvm-2.2.0.jar
+485809,batik-anim-1.14.jar
+424624,batik-awt-util-1.14.jar
+703757,batik-bridge-1.14.jar
+112373,batik-codec-1.14.jar
+8433,batik-constants-1.14.jar
+330318,batik-css-1.14.jar
+184487,batik-dom-1.14.jar
+10238,batik-ext-1.14.jar
+192087,batik-gvt-1.14.jar
+11466,batik-i18n-1.14.jar
+76875,batik-parser-1.14.jar
+25876,batik-script-1.14.jar
+6663,batik-shared-resources-1.14.jar
+232734,batik-svg-dom-1.14.jar
+227514,batik-svggen-1.14.jar
+129300,batik-transcoder-1.14.jar
+127477,batik-util-1.14.jar
+33866,batik-xml-1.14.jar
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 925272,caffeine-2.9.2.jar
@@ -67,10 +86,14 @@
 415074,jsoup-1.14.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
+32033,kotlin-logging-jvm-2.0.5.jar
 1508076,kotlin-stdlib-1.6.0.jar
 200616,kotlin-stdlib-common-1.6.0.jar
 22357,kotlin-stdlib-jdk7-1.6.0.jar
 16201,kotlin-stdlib-jdk8-1.6.0.jar
+792176,kotlinx-html-jvm-0.7.3.jar
+191102,lets-plot-batik-2.2.0.jar
+3995999,lets-plot-common-2.2.0.jar
 206756,log4j-1.2-api-2.14.1.jar
 300365,log4j-api-2.14.1.jar
 1745700,log4j-core-2.14.1.jar
@@ -84,6 +107,11 @@
 65261,oro-2.0.8.jar
 1307434,ph-commons-10.1.2.jar
 506616,ph-css-6.3.4.jar
+640740,plot-api-jvm-3.1.0.jar
+882161,plot-base-portable-jvm-2.2.0.jar
+847234,plot-builder-portable-jvm-2.2.0.jar
+115295,plot-common-portable-jvm-2.2.0.jar
+744679,plot-config-portable-jvm-2.2.0.jar
 11369,reactive-streams-1.0.3.jar
 1315838,rhino-1.7.13.jar
 1242230,rsyntaxtextarea-3.1.3.jar
@@ -95,9 +123,11 @@
 2539,swing-extensions-visual-padding-0.1.3.jar
 734528,tika-core-1.27.jar
 1397879,tika-parsers-1.27.jar
+173926,vis-svg-portable-jvm-2.2.0.jar
 3154938,xalan-2.7.2.jar
 1386502,xercesImpl-2.12.1.jar
 220536,xml-apis-1.4.01.jar
+85686,xml-apis-ext-1.3.04.jar
 674607,xmlgraphics-commons-2.6.jar
 7188,xmlpull-1.1.3.1.jar
 629707,xstream-1.4.18.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 05d5a27a889..67115faa3fe 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -135,6 +135,24 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.MIT
     }
 
+    for (
+        a in listOf(
+            "lets-plot-kotlin-jvm",
+            "lets-plot-common",
+            "plot-config-portable-jvm",
+            "plot-builder-portable-jvm",
+            "plot-base-portable-jvm",
+            "plot-common-portable-jvm",
+            "vis-svg-portable-jvm",
+            "base-portable-jvm"
+        )
+    ) {
+        overrideLicense("org.jetbrains.lets-plot:$a") {
+            expectedLicense = SpdxLicense.MIT
+            licenseFiles = "lets-plot"
+        }
+    }
+
     overrideLicense("com.sun.mail:all:1.5.0-b01") {
         // Multiple licenses, specify explicitly
         expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html"))
diff --git a/src/licenses/licenses/lets-plot/LICENSE b/src/licenses/licenses/lets-plot/LICENSE
new file mode 100644
index 00000000000..1bcc8b5941d
--- /dev/null
+++ b/src/licenses/licenses/lets-plot/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 JetBrains
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index fbef3200a97..548a1c25cce 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -61,6 +61,7 @@ Summary
 <ch_section>New and Noteworthy</ch_section>
 <ul>
   <li>Support building and running JMeter with Java 17</li>
+  <li>Open Model Thread Group: load generator with programmable profile</li>
 </ul>
 <!--
 <ch_title>Core improvements</ch_title>
diff --git a/xdocs/images/screenshots/open_model_thread_group.png b/xdocs/images/screenshots/open_model_thread_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..072a618201a17de6f4146c1f176846ef08718ed2
GIT binary patch
literal 34656
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
D9imeo

literal 0
HcmV?d00001

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 2e014f6e249..02b9cf90b05 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -23,6 +23,7 @@
 <!ENTITY le       "&#x02264;" >
 <!ENTITY ge       "&#x02265;" >
 <!ENTITY nnbsp    "&#8239;" >
+<!ENTITY mdash    "&#8212;" >
 ]>
 <document index="yes" index-level-2="yes" index-numbers="no" colbreak="&sect-num;.4"
   prev="boss.html" next="properties_reference.html" id="$Id$">
@@ -5146,7 +5147,7 @@ to the random delay.</property>
 
 <component name="Constant Throughput Timer" index="&sect-num;.6.4" width="636" height="146" screenshot="timers/constant_throughput_timer.png">
 
-<description><p>This timer introduces variable pauses, calculated to keep the total throughput (in terms of samples per minute) as close as possible to a give figure. Of course the throughput will be lower if the server is not capable of handling it, or if other timers or time-consuming test elements prevent it.</p>
+<description><p>This timer introduces variable pauses, calculated to keep the total throughput (in terms of samples per minute) as close as possible to a given figure. Of course the throughput will be lower if the server is not capable of handling it, or if other timers or time-consuming test elements prevent it.</p>
 <p>
 N.B. although the Timer is called the Constant Throughput timer, the throughput value does not need to be constant.
 It can be defined in terms of a variable or function call, and the value can be changed during a test.
@@ -5186,7 +5187,15 @@ Note that the throughput value should not be changed too often during a test
 </component>
 
 <component name="Precise Throughput Timer" index="&sect-num;.6.5" width="573" height="407" screenshot="timers/precise_throughput_timer.png">
-<description><p>This timer introduces variable pauses, calculated to keep the total throughput (e.g. in terms of samples per minute) as close as possible to a give figure. Of course the throughput will be lower if the server is not capable of handling it, or if other timers, or if there's not enough threads, or time-consuming test elements prevent it.</p>
+<description><p>This timer introduces variable pauses, calculated to keep the total throughput (e.g. in terms of samples per minute) as close as possible to a given figure. The timer does not generate threads, so the resulting throughput will be lower if the server is not capable of handling it, or if other timers add too big delays, or if there's not enough threads, or time-consuming test elements prevent it.</p>
+
+<note>Note: in many cases, Open Model Thread Group would be a better choice for generating the desired load profile</note>
+
+<note>Note: if you alter timer configuration on the fly, then it might take time to adapt to the new settings.
+For instance, if the timer was initially configured for 1 request per hour, then it assigns incoming
+threads with 3600+sec pauses. Then, if the load configuration is altered to 1 per second, then
+the threads are not interrupted from their delays, and the threads keep waiting.</note>
+
 <p>Although the Timer is called Precise Throughput Timer, it does not aim to produce precisely the same number of samples over one-second intervals during the test.</p>
 <p>The timer works best for rates under 36000 requests/hour, however your mileage might vary (see monitoring section below if your goals are
     vastly different).</p>
@@ -6501,6 +6510,65 @@ See <a href="get-started.html#classpath">JMeter's Classpath</a> and
 </description>
 </component>
 
+<component name="Open Model Thread Group" width="1398" height="1117" screenshot="open_model_thread_group.png">
+<description>
+    <note>This thread group is experimental, and it might change in the future releases. Please provide your feedback on what works and what could be improved.</note>
+    <p>Open Model Thread Group defines a pool of users that will execute a particular test case against the server.
+       The users are generated according to the schedule.
+    </p>
+    <p>The load profile consists of a sequence of constant, increasing or decreasing load.
+       The following commands are available:
+        <ul>
+            <li><code>rate(&lt;number&gt;/sec)</code> &mdash; configures target load rate.
+                The following time units are supported: <code>ms</code>, <code>sec</code>, <code>min</code>, <code>hour</code>, <code>day</code>.
+                You can omit time unit in case the rate is 0: <code>rate(0)</code></li>
+            <li><code>random_arrivals(&lt;number&gt; sec)</code> &mdash; configures random arrivals schedule with the given duration.
+                The starting load rate is configured before <code>random_arrivals</code>, and the finish load rate is configured after <code>random_arrivals</code>.
+                For example, 10 minute test from 5/sec at the beginning till 15/sec at the end could be configured as <code>rate(5/sec) random_arrivals(10 min) rate(15/sec)</code>.
+                <br/>The implicit rate at the beginning of the test is 0. If the finish rate is not provided (or if several <code>random_arrivals</code> steps go one after another),
+                then the load is constant. For instance, <code>rate(3/sec) random_arrivals(1 min) random_arrivals(2 min) rate(6/sec)</code> configures
+                constant rate of 3/sec for the first 1 minute, and then the load increases from 3/sec till 6/sec during the next 2 minutes.
+                The time units are the same as in <code>rate</code>.
+            </li>
+            <li><code>even_arrivals(&lt;number&gt; sec)</code> &mdash; configures even arrivals (TODO: not implemented yet). For instance, if the desired load
+                is 1/sec, then <code>random_arrivals</code> would lauch samples with exactly 1 second intervals.</li>
+            <li><code>pause(&lt;number&gt; sec)</code> &mdash; configures a pause for the given duration.
+                The rate is restored after the pause, so <code>rate(2/sec) random_arrivals(5 sec) pause(5 sec) random_arrivals(5 sec)</code>
+                generates random arrivals with 2/sec rate, then a pause for 5 seconds (no new arrivals), then 5 more seconds with 2/sec rate.<br/>
+                Note: <code>pause</code> duration is always honoured, even if all the scenarios are complete, and no new ones will be scheduled.
+                For instance, if you use <code>rate(1/sec) random_arrivals(1 min) pause(1 hour)</code>, the thread group would
+                always last for 61 minutes no matter how much time do individual scenarios take.
+            </li>
+            <li><code>/* Comments */</code> can be used to clarify the schedule or temporary disable some steps. Comments
+                cannot be nested.</li>
+            <li><code>// line comments</code> can be used to clarify the schedule or temporary disable some steps.
+                Line comment lasts till the end of the line.</li>
+        </ul>
+    </p>
+    <p>The thread groups terminates threads as soon as the schedule ends. In other words, the threads are interrupted
+        after all <code>arrivals</code> and <code>pause</code> intervals.
+        If you want to let the threads complete safely, consider adding <code>pause(5 min)</code> at the end of the schedule.
+        That will add 5 minutes for the threads to continue.
+    </p>
+    <p>There are no special functions for generating the load profile in a loop, however, the default JMeter templating functions
+        can be helpful for generating the schedule.
+    </p>
+    <p>For example, the following pattern would generate a sequence of 10 steps where each step lasts 10 seconds: 10/sec, 20/sec, 30/sec, ...
+        <code>${__groovy((1..10).collect { "rate(" + it*10 + "/sec) random_arrivals(10 sec) pause(1 sec)" }.join(" "))}</code>
+        You can get variables from properties as follows:
+        <code>rate(${__P(beginRate,40)}) random_arrivals(${__P(testDuration, 10)} sec) rate(${__P(endRate,40)})</code>
+    </p>
+    <p>Currently, the load profile is evaluated at the beginning of the test only, so if you use dynamic functions, then only the first result will be used.
+    </p>
+</description>
+
+    <properties>
+    <property name="Name" required="No">Descriptive name for this thread group that is shown in the tree</property>
+    <property name="Schedule" required="Yes">The expression that configures schedule. For example: <code>rate(5/sec) random_arrivals(1 min) pause(5 sec)</code></property>
+    <property name="Random Seed (change from 0 to random)" required="No">Note: different thread groups should better have different seed values. Constant seed ensures thread group generates the same delays each test start. The value of "0" means the schedule is truly random (non-repeatable from one execution to another)..</property>
+</properties>
+</component>
+
 <component name="Thread Group" index="&sect-num;.9.2"  width="911" height="662" screenshot="threadgroup.png">
 <description>
 <p>A Thread Group defines a pool of users that will execute a particular test case against your server.  In the Thread Group GUI, you can control the number of users simulated (number of threads), the ramp up time (how long it takes to start all the threads), the number of times to perform the test, and optionally, a start and stop time for the test.</p>

From d9a1f7e2d6b4164dec7fb43a346da864a642f564 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 3 Dec 2021 10:53:24 +0300
Subject: [PATCH 0033/1037] Dependency verification: register checksum for
 gradle-enterprise-gradle-plugin-3.7.2.jar

---
 settings.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8480562f1c5..aee85f38b75 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -138,6 +138,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.6.3.jar",
     "CF0F77035EC4E61E310AAAF484AD543D8FFF84D31BF6F93183D09CA6056FB1F87B10F355F08F11198140AC47DD92A4DE4E5FED16C993A8B4C93FE169A61BB3A3"
         to "gradle-enterprise-gradle-plugin-3.7.jar",
+    "7AC5F1C070A8C0A2BD096D96E896EB147966C39E0746120ABA5E107DDBDED441FF71F31F167475CD36EE082D8430D1FB98C51D29C6B91D147CC64DCE59C66D49"
+        to "gradle-enterprise-gradle-plugin-3.7.2.jar",
     "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
         to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"

From fde3c093bb9c685e25280a9ba5958cd354a24da5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 3 Dec 2021 11:00:30 +0300
Subject: [PATCH 0034/1037] Bump vlsi-release-plugins to 1.77

This updates org.eclipse.jgit as the previous version was not
compatible with Java 1.8 (it has been compiled with bytecode 55, Java 11)
---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 57fcd139e8a..4c87f94cd6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -43,8 +43,8 @@ velocity.version=1.7
 com.github.autostyle.version=3.0
 com.github.spotbugs.version=4.5.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.76
-com.github.vlsi.vlsi-release-plugins.version=1.76
+com.github.vlsi.checksum-dependency.version=1.77
+com.github.vlsi.vlsi-release-plugins.version=1.77
 kotlin.version=1.6.0
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5

From 0938f50e15cc62e2de645b823def881364e64b78 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 3 Dec 2021 12:00:14 +0300
Subject: [PATCH 0035/1037] Add org.eclipse.jgit to the build script to make
 the build workable with Java 1.8

---
 settings.gradle.kts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index aee85f38b75..4fd91363720 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -118,6 +118,8 @@ buildscript {
             // Gradle ships kotlin-stdlib which is good enough
             exclude("org.jetbrains.kotlin", "kotlin-stdlib")
         }
+        // Remove when Autostyle updates jgit dependency
+        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
     }
     repositories {
         gradlePluginPortal()
@@ -126,6 +128,13 @@ buildscript {
 
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
+    // TODO: remove JavaEWAH-1.1.12.jar, org.eclipse.jgit-5.13.0.202109080827-r.jar, slf4j-api-1.7.30.jar when Autostyle updates jgit
+    "ECBBFD1C6593AFBAA4CA7F65E10BC67B12FF75EB221E490051522FAC8D291B202A0A165644A9C5AC9E5618CD771817C9052F171E5E6210CB021DF5A6E4CBF787"
+        to "JavaEWAH-1.1.12.jar",
+    "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
+        to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
+    "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
+        to "slf4j-api-1.7.30.jar",
     "F7040C571C2A2727F2EED4EA772F5A7C5D9CB393828B7A2331F7167E467429486F5F3E9423883FE9A6D652FFB0484EAE722CDFB46D97180209BCBEEBF9C25DE3"
         to "gradle-enterprise-gradle-plugin-3.4.jar",
     "D5B49D90170DEA96E3D05D893B2B6C04E3B16F3DB6B6BB1DF82D3DE3247E5B0457721F232FAA237E689100980E97F4C04C1234FBEDBDAB7AE0CEAA91C40392C9"

From edc77273e9fc7d3ceb986252d6ac83ae79b30aaf Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 7 Dec 2021 18:17:13 +0100
Subject: [PATCH 0036/1037] Add missing param for javadoc

---
 .../java/org/apache/jmeter/threads/AbstractThreadGroup.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index ea6ac89911a..b00f9a83c47 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -337,11 +337,12 @@ public boolean isSameUserOnNextIteration() {
 
     /**
      * Create {@link JMeterThread}. Note: the input tree is not cloned.
+     * @param engine {@link StandardJMeterEngine}
      * @param monitor {@link JMeterThreadMonitor}
      * @param notifier {@link ListenerNotifier}
-     * @param threadGroupTree {@link ListedHashTree}
-     * @param engine {@link StandardJMeterEngine}
+     * @param groupNumber  thread group number
      * @param threadNumber int thread number
+     * @param threadGroupTree {@link ListedHashTree}
      * @param variables initial variables
      * @return {@link JMeterThread}
      */

From 403842148e82c24e560c365efd8b7290076b0ba5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Dec 2021 16:34:56 +0300
Subject: [PATCH 0037/1037] Update log4j2 to 2.15.0 to fix CVE-2021-44228:
 Apache Log4j2 JNDI features do not protect against attacker controlled LDAP
 and other JNDI related endpoints

See https://logging.apache.org/log4j/2.x/security.html
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4c87f94cd6a..f516d615f2b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.0
 lets-plot-kotlin-jvm.version=3.1.0
-log4j.version=2.14.1
+log4j.version=2.15.0
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 0d377ae880f..ff087660121 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 191102,lets-plot-batik-2.2.0.jar
 3995999,lets-plot-common-2.2.0.jar
-206756,log4j-1.2-api-2.14.1.jar
-300365,log4j-api-2.14.1.jar
-1745700,log4j-core-2.14.1.jar
-23625,log4j-slf4j-impl-2.14.1.jar
+207879,log4j-1.2-api-2.15.0.jar
+301804,log4j-api-2.15.0.jar
+1789769,log4j-core-2.15.0.jar
+24231,log4j-slf4j-impl-2.15.0.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 548a1c25cce..69f6b0eb151 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -168,7 +168,7 @@ Summary
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.14.1 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.15.0 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>

From bdc610a1df6d5d92e7b8ee2e36f186a45ba0d428 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 14 Dec 2021 17:51:09 +0300
Subject: [PATCH 0038/1037] Update log4j2 to 2.16.0

See https://lists.apache.org/thread/d6v4r6nosxysyq9rvnr779336yf0woz4
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f516d615f2b..f5c262fbae2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.0
 lets-plot-kotlin-jvm.version=3.1.0
-log4j.version=2.15.0
+log4j.version=2.16.0
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ff087660121..ee47255c6bf 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 191102,lets-plot-batik-2.2.0.jar
 3995999,lets-plot-common-2.2.0.jar
-207879,log4j-1.2-api-2.15.0.jar
-301804,log4j-api-2.15.0.jar
-1789769,log4j-core-2.15.0.jar
-24231,log4j-slf4j-impl-2.15.0.jar
+207909,log4j-1.2-api-2.16.0.jar
+301892,log4j-api-2.16.0.jar
+1789565,log4j-core-2.16.0.jar
+24258,log4j-slf4j-impl-2.16.0.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 69f6b0eb151..967f6b89d29 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -168,7 +168,7 @@ Summary
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.15.0 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.16.0 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>

From 0551e4cef9c693fb1661580a3abb212763104a9d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 14 Dec 2021 18:06:31 +0300
Subject: [PATCH 0039/1037] Add Matt Sicker's b4c70893b62babe8 key for
 org.apache.logging.log4j

See https://downloads.apache.org/logging/KEYS
---
 checksum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/checksum.xml b/checksum.xml
index e197b841691..c335c72277a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -124,6 +124,7 @@
     <trusted-key id='ecdfea3cb4493b94' group='org.apache.geronimo.specs' />
     <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
     <trusted-key id='3595395eb3d8e1ba' group='org.apache.logging.log4j' />
+    <trusted-key id='b4c70893b62babe8' group='org.apache.logging.log4j' />
     <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
     <trusted-key id='31474e5e7c6b7034' group='org.apache.mina' />
     <trusted-key id='9c8c892f91f8e6d1' group='org.apache.rat' />

From f2f4a0e7fbc0b527929e0d1e7235d62175abf122 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 17 Dec 2021 10:54:53 +0100
Subject: [PATCH 0040/1037] Add the 5.4.2 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 347f21ee5b1..24d6f555584 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -300,6 +300,13 @@
         <revision>5.4.1 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2021-12-16</created>
+        <revision>5.4.2 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From 5f1d3d27dfda35fd5c604156ad1d2c02e0063691 Mon Sep 17 00:00:00 2001
From: Chromico Rek <atech5122@gmail.com>
Date: Sun, 19 Dec 2021 20:08:48 +0400
Subject: [PATCH 0041/1037] Update log4j to 2.17.0

Relates to CVE-2021-45105
Closes #683
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f5c262fbae2..bb5ff14426e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.0
 lets-plot-kotlin-jvm.version=3.1.0
-log4j.version=2.16.0
+log4j.version=2.17.0
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ee47255c6bf..52aaea2489c 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 191102,lets-plot-batik-2.2.0.jar
 3995999,lets-plot-common-2.2.0.jar
-207909,log4j-1.2-api-2.16.0.jar
-301892,log4j-api-2.16.0.jar
-1789565,log4j-core-2.16.0.jar
-24258,log4j-slf4j-impl-2.16.0.jar
+207909,log4j-1.2-api-2.17.0.jar
+301892,log4j-api-2.17.0.jar
+1789565,log4j-core-2.17.0.jar
+24258,log4j-slf4j-impl-2.17.0.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 967f6b89d29..af8db71c33f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -168,7 +168,7 @@ Summary
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.16.0 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.17.0 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>

From 610eeeb866b1fda23025787e70bf0a81d0e8740c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 19 Dec 2021 19:17:22 +0100
Subject: [PATCH 0042/1037] Update expected_release_jars.csv for log4j 2.17.0

---
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 52aaea2489c..8ef431f9fe3 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 191102,lets-plot-batik-2.2.0.jar
 3995999,lets-plot-common-2.2.0.jar
-207909,log4j-1.2-api-2.17.0.jar
-301892,log4j-api-2.17.0.jar
-1789565,log4j-core-2.17.0.jar
-24258,log4j-slf4j-impl-2.17.0.jar
+208235,log4j-1.2-api-2.17.0.jar
+301776,log4j-api-2.17.0.jar
+1789339,log4j-core-2.17.0.jar
+24252,log4j-slf4j-impl-2.17.0.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar

From ac47049163a20bf2982911829e0e457fa7dd0641 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 24 Dec 2021 16:06:29 +0100
Subject: [PATCH 0043/1037] Add the 5.4.3 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 24d6f555584..414ac06cdcd 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -307,6 +307,13 @@
         <revision>5.4.2 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2021-12-24</created>
+        <revision>5.4.3 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From 3236c61a94ef0fddb5549d8887b2e714ac772b12 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 14 Dec 2021 19:56:02 +0300
Subject: [PATCH 0044/1037] Bump lets-plot to 2.2.1 and 3.1.1

It resolves
* https://github.com/JetBrains/lets-plot/issues/472
* https://github.com/JetBrains/lets-plot/issues/485
---
 gradle.properties                             |  4 +--
 .../threads/openmodel/gui/TargetRateChart.kt  | 28 ++++++++-----------
 src/dist/src/dist/expected_release_jars.csv   | 18 ++++++------
 src/licenses/build.gradle.kts                 | 18 ------------
 src/licenses/licenses/lets-plot/LICENSE       | 21 --------------
 5 files changed, 23 insertions(+), 66 deletions(-)
 delete mode 100644 src/licenses/licenses/lets-plot/LICENSE

diff --git a/gradle.properties b/gradle.properties
index bb5ff14426e..154d602a448 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -113,8 +113,8 @@ jsoup.version=1.14.1
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.1
-lets-plot-batik.version=2.2.0
-lets-plot-kotlin-jvm.version=3.1.0
+lets-plot-batik.version=2.2.1
+lets-plot-kotlin-jvm.version=3.1.1
 log4j.version=2.17.0
 mail.version=1.5.0-b01
 miglayout.version=5.3
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
index 306803612d8..facfb6182f0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -24,7 +24,7 @@ import jetbrains.letsPlot.geom.geomLine
 import jetbrains.letsPlot.intern.toSpec
 import jetbrains.letsPlot.label.ggtitle
 import jetbrains.letsPlot.letsPlot
-import jetbrains.letsPlot.scale.scaleXContinuous
+import jetbrains.letsPlot.scale.scaleXTime
 import jetbrains.letsPlot.theme
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
@@ -51,10 +51,15 @@ public class TargetRateChart : JPanel() {
         layout = BorderLayout()
     }
 
+    private var prevSteps: List<ThreadScheduleStep>? = null
     private var prevTimes: DoubleArray? = null
     private var prevRate: DoubleArray? = null
 
     public fun updateSchedule(threadSchedule: ThreadSchedule) {
+        if (threadSchedule.steps == prevSteps) {
+            return
+        }
+        prevSteps = threadSchedule.steps
         val timeValues = mutableListOf<Double>()
         val rateValues = mutableListOf<Double>()
         var time = 0.0
@@ -92,18 +97,9 @@ public class TargetRateChart : JPanel() {
         }
         prevTimes = time.copyOf()
         prevRate = rate.copyOf()
-        val totalDuration = time.last()
-        val timeUnit = when {
-            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.DAYS.asSeconds -> TimeUnit.DAYS
-            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.HOURS.asSeconds -> TimeUnit.HOURS
-            totalDuration > MIN_TICKS_FOR_TIME_AXIS * TimeUnit.MINUTES.asSeconds -> TimeUnit.MINUTES
-            else -> TimeUnit.SECONDS
-        }
-        if (timeUnit != TimeUnit.SECONDS) {
-            val scale = 1.0 / timeUnit.asSeconds
-            for (i in time.indices) {
-                time[i] *= scale
-            }
+        val timeScale = TimeUnit.SECONDS.toMillis(1).toDouble()
+        for (i in time.indices) {
+            time[i] *= timeScale
         }
         val maxRate = rate.maxOrNull() ?: 0.0
         val rateUnit = rateUnitFor(maxRate)
@@ -120,16 +116,16 @@ public class TargetRateChart : JPanel() {
             }
         }
         removeAll()
-        add(createChart(time = time, rate = rate, timeUnit = timeUnit, rateUnit = rateUnit), BorderLayout.CENTER)
+        add(createChart(time = time, rate = rate, rateUnit = rateUnit), BorderLayout.CENTER)
     }
 
-    private fun createChart(time: DoubleArray, rate: DoubleArray, timeUnit: TimeUnit, rateUnit: TimeUnit): JComponent {
+    private fun createChart(time: DoubleArray, rate: DoubleArray, rateUnit: TimeUnit): JComponent {
         val data = mapOf(
             "time" to time,
             "rate" to rate
         )
         val plot = letsPlot(data) + geomLine { x = "time"; y = "rate" } +
-            scaleXContinuous("Time, " + timeUnit.name.lowercase(), expand = listOf(0, 0)) +
+            scaleXTime("Time since test start", expand = listOf(0, 0)) +
             ggtitle("Target load rate per " + rateUnit.name.lowercase().removeSuffix("s")) +
             theme(axisTitleY = "blank")
 
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 8ef431f9fe3..27a5d84f98a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -2,7 +2,7 @@
 29371,annotations-23.0.0.jar
 2387,apiguardian-api-1.1.0.jar
 122004,asm-9.2.jar
-517353,base-portable-jvm-2.2.0.jar
+518460,base-portable-jvm-2.2.1.jar
 485809,batik-anim-1.14.jar
 424624,batik-awt-util-1.14.jar
 703757,batik-bridge-1.14.jar
@@ -92,8 +92,8 @@
 22357,kotlin-stdlib-jdk7-1.6.0.jar
 16201,kotlin-stdlib-jdk8-1.6.0.jar
 792176,kotlinx-html-jvm-0.7.3.jar
-191102,lets-plot-batik-2.2.0.jar
-3995999,lets-plot-common-2.2.0.jar
+181223,lets-plot-batik-2.2.1.jar
+4025480,lets-plot-common-2.2.1.jar
 208235,log4j-1.2-api-2.17.0.jar
 301776,log4j-api-2.17.0.jar
 1789339,log4j-core-2.17.0.jar
@@ -107,11 +107,11 @@
 65261,oro-2.0.8.jar
 1307434,ph-commons-10.1.2.jar
 506616,ph-css-6.3.4.jar
-640740,plot-api-jvm-3.1.0.jar
-882161,plot-base-portable-jvm-2.2.0.jar
-847234,plot-builder-portable-jvm-2.2.0.jar
-115295,plot-common-portable-jvm-2.2.0.jar
-744679,plot-config-portable-jvm-2.2.0.jar
+642167,plot-api-jvm-3.1.1.jar
+891618,plot-base-portable-jvm-2.2.1.jar
+845777,plot-builder-portable-jvm-2.2.1.jar
+116030,plot-common-portable-jvm-2.2.1.jar
+749095,plot-config-portable-jvm-2.2.1.jar
 11369,reactive-streams-1.0.3.jar
 1315838,rhino-1.7.13.jar
 1242230,rsyntaxtextarea-3.1.3.jar
@@ -123,7 +123,7 @@
 2539,swing-extensions-visual-padding-0.1.3.jar
 734528,tika-core-1.27.jar
 1397879,tika-parsers-1.27.jar
-173926,vis-svg-portable-jvm-2.2.0.jar
+174661,vis-svg-portable-jvm-2.2.1.jar
 3154938,xalan-2.7.2.jar
 1386502,xercesImpl-2.12.1.jar
 220536,xml-apis-1.4.01.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 67115faa3fe..05d5a27a889 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -135,24 +135,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.MIT
     }
 
-    for (
-        a in listOf(
-            "lets-plot-kotlin-jvm",
-            "lets-plot-common",
-            "plot-config-portable-jvm",
-            "plot-builder-portable-jvm",
-            "plot-base-portable-jvm",
-            "plot-common-portable-jvm",
-            "vis-svg-portable-jvm",
-            "base-portable-jvm"
-        )
-    ) {
-        overrideLicense("org.jetbrains.lets-plot:$a") {
-            expectedLicense = SpdxLicense.MIT
-            licenseFiles = "lets-plot"
-        }
-    }
-
     overrideLicense("com.sun.mail:all:1.5.0-b01") {
         // Multiple licenses, specify explicitly
         expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html"))
diff --git a/src/licenses/licenses/lets-plot/LICENSE b/src/licenses/licenses/lets-plot/LICENSE
deleted file mode 100644
index 1bcc8b5941d..00000000000
--- a/src/licenses/licenses/lets-plot/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 JetBrains
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

From 1977e4c2dd0c49d037ade10e0946c36970da25eb Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Thu, 23 Dec 2021 17:51:02 +0100
Subject: [PATCH 0045/1037] Update changes_history.xml for 5.4.2 and 5.4.3

---
 xdocs/changes_history.xml | 272 ++++++++++++++++++++++++++++++--------
 1 file changed, 218 insertions(+), 54 deletions(-)

diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index b0e24c9055d..8b8b4f40006 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -41,73 +41,257 @@ Current changes are detailed in <a href="changes.html">Changes</a>.
 <p><b>Changes sections are chronologically ordered from top (most recent) to bottom
 (least recent)</b></p>
 
-<!--  =================== 5.4.1 =================== -->
+<!--  =================== 5.4.3 =================== -->
 
-<h1>Version 5.4.1</h1>
+<h1>Version 5.4.3</h1>
 <p>
 Summary
 </p>
+<p>This version is a fix release against the vulnerability CVE-2021-45105: Apache Log4j2 versions 2.0-alpha1 through 2.16.0 (excluding 2.12.3) did not protect from uncontrolled recursion from self-referential lookups. This allows an attacker with control over Thread Context Map data to cause a denial of service when a crafted string is interpreted.
+</p>
 <ul>
-<li><a href="#New and Noteworthy">New and Noteworthy</a></li>
-<li><a href="#Incompatible changes">Incompatible changes</a></li>
-<li><a href="#Bug fixes">Bug fixes</a></li>
-<li><a href="#Improvements">Improvements</a></li>
 <li><a href="#Non-functional changes">Non-functional changes</a></li>
 <li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
-<li><a href="#Thanks">Thanks</a></li>
 
 </ul>
 
-<ch_section>New and Noteworthy</ch_section>
-<!--
-<ch_title>Core improvements</ch_title>
-<ch_title>Test Plan</ch_title>
-<ch_title>Scripting / Debugging enhancements</ch_title>
-<ch_title>Functions</ch_title>
--->
-<ch_title>UX improvements</ch_title>
-
-<!-- =================== Incompatible changes =================== -->
-
-<ch_section>Incompatible changes</ch_section>
+<ch_section>Non-functional changes</ch_section>
 <ul>
-    <li>Restart after LAF change has been reinstated, it had been removed in JMeter 5.3</li>
+    <li>Updated Apache log4j2 to 2.17.0 (from 2.16.0).</li>
 </ul>
-<!-- =================== Improvements =================== -->
 
-<ch_section>Improvements</ch_section>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
 
-<h3>HTTP Samplers and Test Script Recorder</h3>
+<ch_section>Known problems and workarounds</ch_section>
 <ul>
-</ul>
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
 
-<h3>Other samplers</h3>
-<ul>
-</ul>
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.0/nashorn-core-15.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.0/asm-util-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar
+popd
+export JVM_ARGS="--modulepath $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
 
-<h3>Controllers</h3>
-<ul>
 </ul>
 
-<h3>Listeners</h3>
+<!--  =================== 5.4.2 =================== -->
+
+<h1>Version 5.4.2</h1>
+<p>
+Summary
+</p>
+<p>This version is a fix release against the vulnerability CVE-2021-44228: Apache Log4j2 JNDI features do not protect against attacker controlled LDAP and other JNDI related endpoints.
+</p>
 <ul>
+<li><a href="#Non-functional changes">Non-functional changes</a></li>
+<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
+
 </ul>
 
-<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+<ch_section>Non-functional changes</ch_section>
 <ul>
+    <li>Updated Apache log4j2 to 2.16.0 (from 2.13.3).</li>
 </ul>
 
-<h3>Functions</h3>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
+
+<ch_section>Known problems and workarounds</ch_section>
 <ul>
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
+
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.0/nashorn-core-15.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.0/asm-util-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar
+popd
+export JVM_ARGS="--modulepath $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
+
 </ul>
 
-<h3>I18N</h3>
+<!--  =================== 5.4.1 =================== -->
+
+<h1>Version 5.4.1</h1>
+<p>
+Summary
+</p>
 <ul>
+<li><a href="#Incompatible changes">Incompatible changes</a></li>
+<li><a href="#Non-functional changes">Non-functional changes</a></li>
+<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
+<li><a href="#Thanks">Thanks</a></li>
+
 </ul>
 
-<h3>Report / Dashboard</h3>
+<ch_section>Incompatible changes</ch_section>
 <ul>
+    <li>Restart after LAF change has been reinstated, it had been removed in JMeter 5.3</li>
 </ul>
+<!-- =================== Improvements =================== -->
+
+<ch_section>Improvements</ch_section>
 
 <h3>General</h3>
 <ul>
@@ -153,32 +337,12 @@ Summary
      the case of waiting for an EOM.</li>
 </ul>
 
-<h3>Controllers</h3>
-<ul>
-</ul>
-
 <h3>Listeners</h3>
 <ul>
   <li><bug>64821</bug>When importing XML formatted jtl files, sub samplers will get renamed</li>
   <li><bug>65052</bug>XPath2 Tester and JSON JMESPath Tester are missing in <code>view.results.tree.renderers_order</code> property</li>
 </ul>
 
-<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
-<ul>
-</ul>
-
-<h3>Functions</h3>
-<ul>
-</ul>
-
-<h3>I18N</h3>
-<ul>
-</ul>
-
-<h3>Report / Dashboard</h3>
-<ul>
-</ul>
-
 <h3>Documentation</h3>
 <ul>
   <li><bug>64960</bug>Change scheduler reference in Thread Group documentation. Contributed by Ori Marko</li>

From 52f4945766287806d6ab447214f64e4a95e61803 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Dec 2021 20:37:50 +0300
Subject: [PATCH 0046/1037] Update changelog for JMeter 5.5

---
 xdocs/changes.xml | 53 +++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index af8db71c33f..22bd0e92559 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -59,26 +59,41 @@ Summary
 </ul>
 
 <ch_section>New and Noteworthy</ch_section>
-<ul>
-  <li>Support building and running JMeter with Java 17</li>
-  <li>Open Model Thread Group: load generator with programmable profile</li>
-</ul>
-<!--
+<p>JMeter now supports Java 17</p>
+
+<p>JMeter 5.5 ships with log4j2 2.17</p>
+
+<p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
+allows creating load profiles with variable load.</p>
+
+<p>For example, if you need to gradually increase load from <code>0/sec</code> to <code>10/sec</code> during <code>minute</code>
+you could previously use <code>Thread Group + Timer</code> combinations. However, then you need to compute
+the expected number of threads, ensure they are created only when needed, and so on.</p>
+
+<p>With <code>Open Model Thread Group</code> you can configure the same load profile as <code>rate(0/sec) random_arrivals(1 minute) rate(10/sec)</code>.
+The thread group would spawn threads as needed to drive the configured load.
+The load profile can use properties, so you can launch the same script with slightly different load levels,
+however, the profile can't be updated while the test is running.
+</p>
+
+<p>The new thread group is experimental in JMeter 5.5, so please feel free to submit your feedback.</p>
+<figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
+
 <ch_title>Core improvements</ch_title>
-<ch_title>Test Plan</ch_title>
-<ch_title>Scripting / Debugging enhancements</ch_title>
-<ch_title>Functions</ch_title>
--->
-<ch_title>UX improvements</ch_title>
+<p>Kotlin language is now used in some core classes and tests (e.g. Open Model Thread Group).
+    JMeter is compiled with <code>apiTarget=1.5</code>, and it ships with <code>kotlin-stdlib</code> 1.6.
+</p>
+
+<p><a href="https://github.com/JetBrains/lets-plot-kotlin">lets-plot-kotlin</a> charting library is added,
+    so it will be easier to refine and create new charts in UI in the future.
+</p>
 
-<!-- =================== Incompatible changes =================== -->
+<ch_section>Improvements</ch_section>
 
-<ch_section>Incompatible changes</ch_section>
+<h3>Thread Groups</h3>
 <ul>
+  <li>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code></li>
 </ul>
-<!-- =================== Improvements =================== -->
-
-<ch_section>Improvements</ch_section>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
@@ -118,14 +133,6 @@ Summary
         not their string representations.</li>
 </ul>
 
-<h3>Functions</h3>
-<ul>
-</ul>
-
-<h3>I18N</h3>
-<ul>
-</ul>
-
 <h3>Report / Dashboard</h3>
 <ul>
   <li><bug>65353</bug>Make the estimator used for calculating percentiles on the dashboard configurable</li>

From 879a2b935c0c8e7e087d96f141c28e915504c537 Mon Sep 17 00:00:00 2001
From: Woonsan Ko <woonsan.ko@bloomreach.com>
Date: Mon, 27 Dec 2021 21:54:31 +0300
Subject: [PATCH 0047/1037] 65108: Support JMeter variables in GraphQL HTTP
 Request

Previously the variables were parsed as JSON, and now the variable
contents is added as a raw part (no parsing) of the JSON.

fixes #660
---
 .../http/config/GraphQLRequestParams.java     |  9 +++
 .../http/util/GraphQLRequestParamUtils.java   | 64 ++++++++-----------
 .../util/TestGraphQLRequestParamUtils.java    | 53 +++++++++------
 xdocs/changes.xml                             |  1 +
 4 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/GraphQLRequestParams.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/GraphQLRequestParams.java
index 6edabbf4c8c..ded3b8d8594 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/GraphQLRequestParams.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/GraphQLRequestParams.java
@@ -64,4 +64,13 @@ public String getVariables() {
     public void setVariables(String variables) {
         this.variables = variables;
     }
+
+    @Override
+    public String toString() {
+        return "GraphQLRequestParams{" +
+                "operationName='" + operationName + '\'' +
+                ", query='" + query + '\'' +
+                ", variables='" + variables + '\'' +
+                '}';
+    }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
index 0d3f7422079..00673bf4ab5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
@@ -20,6 +20,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.regex.Pattern;
@@ -31,13 +32,12 @@
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -46,16 +46,16 @@
  */
 public final class GraphQLRequestParamUtils {
 
-    private static final String VARIABLES_FIELD = "variables";
+    public static final String VARIABLES_FIELD = "variables";
 
-    private static final String OPERATION_NAME_FIELD = "operationName";
+    public static final String OPERATION_NAME_FIELD = "operationName";
 
-    private static final String QUERY_FIELD = "query";
-
-    private static Logger log = LoggerFactory.getLogger(GraphQLRequestParamUtils.class);
+    public static final String QUERY_FIELD = "query";
 
     private static final Pattern WHITESPACES_PATTERN = Pattern.compile("\\p{Space}+");
 
+    private static final JsonFactory jsonFactory = new JsonFactory();
+
     private GraphQLRequestParamUtils() {
     }
 
@@ -79,28 +79,26 @@ public static boolean isGraphQLContentType(final String contentType) {
      * @throws RuntimeException if JSON serialization fails for some reason due to any runtime environment issues
      */
     public static String toPostBodyString(final GraphQLRequestParams params) {
-        final ObjectMapper mapper = new ObjectMapper();
-        final ObjectNode postBodyJson = mapper.createObjectNode();
-        postBodyJson.set(OPERATION_NAME_FIELD,
-                JsonNodeFactory.instance.textNode(StringUtils.trimToNull(params.getOperationName())));
-
-        if (StringUtils.isNotBlank(params.getVariables())) {
-            try {
-                final ObjectNode variablesJson = mapper.readValue(params.getVariables(), ObjectNode.class);
-                postBodyJson.set(VARIABLES_FIELD, variablesJson);
-            } catch (JsonProcessingException e) {
-                log.error("Ignoring the GraphQL query variables content due to the syntax error: {}",
-                        e.getLocalizedMessage());
+        final StringWriter writer = new StringWriter();
+
+        try (JsonGenerator gen = jsonFactory.createGenerator(writer)) {
+            gen.writeStartObject();
+
+            gen.writeStringField(OPERATION_NAME_FIELD, StringUtils.trimToNull(params.getOperationName()));
+
+            if (StringUtils.isNotBlank(params.getVariables())) {
+                gen.writeFieldName(VARIABLES_FIELD);
+                gen.writeRawValue(StringUtils.trim(params.getVariables()));
             }
-        }
 
-        postBodyJson.set(QUERY_FIELD, JsonNodeFactory.instance.textNode(StringUtils.trim(params.getQuery())));
+            gen.writeStringField(QUERY_FIELD, StringUtils.trim(params.getQuery()));
 
-        try {
-            return mapper.writeValueAsString(postBodyJson);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException("Cannot serialize JSON for POST body string", e);
+            gen.writeEndObject();
+        } catch (IOException e) {
+            throw new IllegalStateException("Error while writing graphql post body " + params, e);
         }
+
+        return writer.toString();
     }
 
     /**
@@ -118,17 +116,7 @@ public static String queryToGetParamValue(final String query) {
      * @return an HTTP GET request parameter value converted from the GraphQL Variables JSON input string
      */
     public static String variablesToGetParamValue(final String variables) {
-        final ObjectMapper mapper = new ObjectMapper();
-
-        try {
-            final ObjectNode variablesJson = mapper.readValue(variables, ObjectNode.class);
-            return mapper.writeValueAsString(variablesJson);
-        } catch (JsonProcessingException e) {
-            log.error("Ignoring the GraphQL query variables content due to the syntax error: {}",
-                    e.getLocalizedMessage());
-        }
-
-        return null;
+        return StringUtils.trimToNull(variables);
     }
 
     /**
@@ -151,7 +139,7 @@ public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final
         try (InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(postData), encoding)) {
             data = mapper.readValue(reader, ObjectNode.class);
         } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid json data: " + e.getLocalizedMessage());
+            throw new IllegalArgumentException("Invalid json data: " + e.getLocalizedMessage(), e);
         }
 
         String operationName = null;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
index 4b4d0ea782b..be7b075eed1 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
@@ -22,8 +22,8 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
 
@@ -36,7 +36,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 class TestGraphQLRequestParamUtils {
 
@@ -72,6 +73,8 @@ class TestGraphQLRequestParamUtils {
             + "\"query\":\"" + StringUtils.replace(QUERY.trim(), "\n", "\\n") + "\""
             + "}";
 
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
     private GraphQLRequestParams params;
 
     @BeforeEach
@@ -81,7 +84,7 @@ void setUp() {
 
     @ParameterizedTest
     @ValueSource(strings = { "application/json", "application/json;charset=utf-8", "application/json; charset=utf-8" })
-    void testIsGraphQLContentType(String contentType) throws Exception {
+    void testIsGraphQLContentType(String contentType) {
         assertTrue(GraphQLRequestParamUtils.isGraphQLContentType(contentType));
     }
 
@@ -97,20 +100,32 @@ void testInvalidGraphQLContentType(String contentType) {
         assertFalse(GraphQLRequestParamUtils.isGraphQLContentType(contentType));
     }
 
-    @Test
-    void testToPostBodyString() throws Exception {
-        assertEquals(EXPECTED_POST_BODY, GraphQLRequestParamUtils.toPostBodyString(params));
+    static Stream<org.junit.jupiter.params.provider.Arguments> postBodyFieldNameAndJsonNodes() throws Exception {
+        final JsonNode expectedPostBodyJson = objectMapper.readTree(EXPECTED_POST_BODY);
+        final JsonNode actualPostBodyJson = objectMapper.readTree(
+                GraphQLRequestParamUtils.toPostBodyString(new GraphQLRequestParams(OPERATION_NAME, QUERY, VARIABLES)));
+        return Stream.of(
+                arguments(GraphQLRequestParamUtils.OPERATION_NAME_FIELD, expectedPostBodyJson, actualPostBodyJson),
+                arguments(GraphQLRequestParamUtils.VARIABLES_FIELD, expectedPostBodyJson, actualPostBodyJson),
+                arguments(GraphQLRequestParamUtils.QUERY_FIELD, expectedPostBodyJson, actualPostBodyJson));
+    }
+
+    @ParameterizedTest
+    @MethodSource("postBodyFieldNameAndJsonNodes")
+    void testFieldInJsonFromToPostBodyString(String fieldName, JsonNode expectedNode, JsonNode actualNode) {
+        assertEquals(expectedNode.get(fieldName), actualNode.get(fieldName),
+                "The value of the '" + fieldName + "' field doesn't match in " + actualNode);
     }
 
     @Test
-    void testQueryToGetParamValue() throws Exception {
+    void testQueryToGetParamValue() {
         assertEquals(EXPECTED_QUERY_GET_PARAM_VALUE, GraphQLRequestParamUtils.queryToGetParamValue(params.getQuery()));
     }
 
     @Test
     void testVariablesToGetParamValue() throws Exception {
-        assertEquals(EXPECTED_VARIABLES_GET_PARAM_VALUE,
-                GraphQLRequestParamUtils.variablesToGetParamValue(params.getVariables()));
+        assertEquals(objectMapper.readTree(EXPECTED_VARIABLES_GET_PARAM_VALUE),
+                objectMapper.readTree(GraphQLRequestParamUtils.variablesToGetParamValue(params.getVariables())));
     }
 
     @Test
@@ -132,24 +147,20 @@ void testToGraphQLRequestParamsWithPostData() throws Exception {
 
     @ParameterizedTest
     @ValueSource(strings = { "", "{}"})
-    void testInvalidJsonData(String postDataAsString) throws JsonProcessingException, UnsupportedEncodingException {
+    void testInvalidJsonData(String postDataAsString) {
         byte[] postData = postDataAsString.getBytes(StandardCharsets.UTF_8);
         assertThrows(IllegalArgumentException.class,
-                () -> {
-                    GraphQLRequestParamUtils.toGraphQLRequestParams(postData, null);
-                });
+                () -> GraphQLRequestParamUtils.toGraphQLRequestParams(postData, null));
     }
 
     @ParameterizedTest
     @ValueSource(strings = { "{\"query\":\"select * from emp\"}",
             "{\"operationName\":{\"id\":123},\"query\":\"query { droid { id }}\"}",
             "{\"variables\":\"r2d2\",\"query\":\"query { droid { id }}\"}" })
-    void testInvalidGraphQueryParam(String postDataAsString)
-            throws JsonProcessingException, UnsupportedEncodingException {
+    void testInvalidGraphQueryParam(String postDataAsString) {
         byte[] postData = postDataAsString.getBytes(StandardCharsets.UTF_8);
-        assertThrows(IllegalArgumentException.class, () -> {
-            GraphQLRequestParamUtils.toGraphQLRequestParams(postData, null);
-        });
+        assertThrows(IllegalArgumentException.class,
+                () -> GraphQLRequestParamUtils.toGraphQLRequestParams(postData, null));
     }
 
     @Test
@@ -186,14 +197,14 @@ void testToGraphQLRequestParamsWithHttpArguments() throws Exception {
     }
 
     @Test
-    void testMissingParams() throws UnsupportedEncodingException {
+    void testMissingParams() {
         Arguments args = new Arguments();
         assertThrows(IllegalArgumentException.class,
                 () -> GraphQLRequestParamUtils.toGraphQLRequestParams(args, null));
     }
 
     @Test
-    void testInvalidQueryParam() throws UnsupportedEncodingException {
+    void testInvalidQueryParam() {
         Arguments args = new Arguments();
         args.addArgument(new HTTPArgument("query", "select * from emp", "=", false));
         assertThrows(IllegalArgumentException.class,
@@ -201,7 +212,7 @@ void testInvalidQueryParam() throws UnsupportedEncodingException {
     }
 
     @Test
-    void testInvalidQueryParamVariables() throws UnsupportedEncodingException {
+    void testInvalidQueryParamVariables() {
         Arguments args = new Arguments();
         args.addArgument(new HTTPArgument("query", "query { droid { id }}", "=", false));
         args.addArgument(new HTTPArgument("variables", "r2d2", "=", false));
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 22bd0e92559..de4a9ca6b4a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -206,6 +206,7 @@ however, the profile can't be updated while the test is running.
     header in HC4 sampler.</li>
   <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
   <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align ssl properties between Java and HC4 impl</li>
+  <li><bug>65108</bug>Support JMeter variables in <a href="./usermanual/component_reference.html#HTTP_Request">GraphQL HTTP Request</a></li>
 </ul>
 
 <h3>Other Samplers</h3>

From 3786a5e61340a6eccb3594db03d919e5c94f7af8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 28 Dec 2021 12:42:12 +0300
Subject: [PATCH 0048/1037] Simplify :src:dist:clean configuration, ensure
 /lib/junit/test.jar is removed on clean

In practice, clean should not be required, however, making it a bit more precise makes sense anyway.

See https://bz.apache.org/bugzilla/show_bug.cgi?id=63914
fixes #659
---
 src/dist/build.gradle.kts | 15 +++++++--------
 xdocs/changes.xml         |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index d414fb3ac88..9fc84783deb 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -92,14 +92,13 @@ dependencies {
     buildDocs("org.jdom:jdom")
 }
 
-tasks.named(BasePlugin.CLEAN_TASK_NAME).configure {
-    doLast {
-        // createDist can't yet remove outdated jars (e.g. when dependency is updated to a newer version)
-        // so we enhance "clean" task to kill the jars
-        delete(fileTree("$rootDir/bin") { include("ApacheJMeter.jar") })
-        delete(fileTree("$rootDir/lib") { include("*.jar") })
-        delete(fileTree("$rootDir/lib/ext") { include("ApacheJMeter*.jar") })
-    }
+tasks.clean {
+    // copyLibs uses Sync task, so it can't predict all the possible output files (e.g. from previous executions)
+    // So we register patterns to remove explicitly
+    delete(fileTree("$rootDir/bin") { include("ApacheJMeter.jar") })
+    delete(fileTree("$rootDir/lib") { include("*.jar") })
+    delete(fileTree("$rootDir/lib/ext") { include("ApacheJMeter*.jar") })
+    delete(fileTree("$rootDir/lib/junit") { include("test.jar") })
 }
 
 // Libs are populated dynamically since we can't get the full set of dependencies
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index de4a9ca6b4a..a3a9cfb2a7c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -265,6 +265,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65300</bug>IllegalAccessError when opening file dialog with Java 16</li>
   <li><bug>65336</bug>Blank labels when different elements had the same name</li>
   <li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
+  <li><bug>63914</bug>Simplify :src:dist:clean configuration, ensure /lib/junit/test.jar is removed on clean</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 155485c72b74ca8bc225aa19706676f7e33f5272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Sp=C3=A5ngdal?= <magnus.spangdal@avanza.se>
Date: Wed, 14 Apr 2021 19:05:42 +0200
Subject: [PATCH 0049/1037] Allow setters in ConstantThroughputTimer to
 updating the values during the run time

fixes #662
---
 .../timers/ConstantThroughputTimer.java       | 35 +++++++++++--------
 .../ConstantThroughputTimerBeanInfo.java      |  8 ++---
 xdocs/changes.xml                             |  2 ++
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index a4dafcfe946..7b745b9c0fe 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -30,6 +30,8 @@
 import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestStateListener;
+import org.apache.jmeter.testelement.property.DoubleProperty;
+import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.AbstractThreadGroup;
@@ -60,6 +62,12 @@ private static class ThroughputInfo{
 
     private static final double MILLISEC_PER_MIN = 60000.0;
 
+    private static final Mode DEFAULT_CALC_MODE = Mode.ThisThreadOnly;
+
+    // TODO: most props use class simpleName as prefix but that would break backward compatiblity here
+    public static final String THROUGHPUT = "throughput";
+    public static final String CALC_MODE = "calcMode";
+
     /**
      * This enum defines the calculation modes used by the ConstantThroughputTimer.
      */
@@ -72,6 +80,8 @@ public enum Mode {
         ;
 
         private final String propertyName; // The property name to be used to look up the display string
+        // Enum#values() clones the array, and we don't want to pay that cost as we know we don't modify the array
+        private static final Mode[] CACHED_VALUES = values();
 
         Mode(String name) {
             this.propertyName = name;
@@ -89,13 +99,6 @@ public String toString() {
      */
     private long previousTime = 0;
 
-    private Mode mode = Mode.ThisThreadOnly;
-
-    /**
-     * Desired throughput, in samples per minute.
-     */
-    private double throughput;
-
     //For calculating throughput across all threads
     private static final ThroughputInfo allThreadsInfo = new ThroughputInfo();
 
@@ -117,7 +120,7 @@ public ConstantThroughputTimer() {
      *            Desired sampling rate, in samples per minute.
      */
     public void setThroughput(double throughput) {
-        this.throughput = throughput;
+        setProperty(new DoubleProperty(THROUGHPUT, throughput));
     }
 
     /**
@@ -126,15 +129,16 @@ public void setThroughput(double throughput) {
      * @return the rate at which samples should occur, in samples per minute.
      */
     public double getThroughput() {
-        return throughput;
+        return getPropertyAsDouble(THROUGHPUT);
     }
 
     public int getCalcMode() {
-        return mode.ordinal();
+        return getPropertyAsInt(CALC_MODE, DEFAULT_CALC_MODE.ordinal());
     }
 
     public void setCalcMode(int mode) {
-        this.mode = Mode.values()[mode];
+        Mode resolved = Mode.CACHED_VALUES[mode];
+        setProperty(new IntegerProperty(CALC_MODE, resolved.ordinal()));
     }
 
     /**
@@ -178,7 +182,7 @@ private long calculateDelay() {
         long delay;
         // N.B. we fetch the throughput each time, as it may vary during a test
         double msPerRequest = MILLISEC_PER_MIN / getThroughput();
-        switch (mode) {
+        switch (getMode()) {
         case AllActiveThreads: // Total number of threads
             delay = Math.round(JMeterContextService.getNumberOfThreads() * msPerRequest);
             break;
@@ -279,7 +283,7 @@ public void setProperty(JMeterProperty property) {
                 try {
                     final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass());
                     final ResourceBundle rb = (ResourceBundle) beanInfo.getBeanDescriptor().getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE);
-                    for(Enum<Mode> e : Mode.values()) {
+                    for(Enum<Mode> e : Mode.CACHED_VALUES) {
                         final String propName = e.toString();
                         if (objectValue.equals(rb.getObject(propName))) {
                             final int tmpMode = e.ordinal();
@@ -324,11 +328,12 @@ public void testEnded(String host) {
 
     // For access from test code
     Mode getMode() {
-        return mode;
+        int mode = getCalcMode();
+        return Mode.CACHED_VALUES[mode];
     }
 
     // For access from test code
     void setMode(Mode newMode) {
-        mode = newMode;
+        setCalcMode(newMode.ordinal());
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
index 0d28dffb438..63db360d1f2 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
@@ -30,14 +30,14 @@ public ConstantThroughputTimerBeanInfo() {
         super(ConstantThroughputTimer.class);
 
         createPropertyGroup("delay",  //$NON-NLS-1$
-                new String[] { "throughput", //$NON-NLS-1$
-                "calcMode" }); //$NON-NLS-1$
+                new String[] { ConstantThroughputTimer.THROUGHPUT, //$NON-NLS-1$
+                ConstantThroughputTimer.CALC_MODE }); //$NON-NLS-1$
 
-        PropertyDescriptor p = property("throughput"); //$NON-NLS-1$
+        PropertyDescriptor p = property(ConstantThroughputTimer.THROUGHPUT); //$NON-NLS-1$
         p.setValue(NOT_UNDEFINED, Boolean.TRUE);
         p.setValue(DEFAULT, 0.0);
 
-        p = property("calcMode", ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
+        p = property(ConstantThroughputTimer.CALC_MODE, ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
         p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal());
         p.setValue(NOT_UNDEFINED, Boolean.TRUE); // must be defined
     }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a3a9cfb2a7c..d29ffc259a1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -232,6 +232,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65269</bug>JSON Extractor and JSON JMESPath Extractor ignore sub-samples</li>
   <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
   <li><bug>65681</bug>Use default values for null values when extracting with JSONPostProcessor</li>
+  <li>Allow setters in ConstantThroughputTimer to updating the values during the run time</li>
 </ul>
 
 <h3>Functions</h3>
@@ -286,6 +287,7 @@ however, the profile can't be updated while the test is running.
   <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
   <li>Mariusz (mawasak at gmail.com)</li>
   <li>peter.wong@csexperts.com</li>
+  <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From eb851f3f1f1ba0d86fe90ab8fb0e1ef5ffc6940a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 28 Dec 2021 13:18:10 +0300
Subject: [PATCH 0050/1037] Update "thanks" section for 5.5

---
 xdocs/changes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d29ffc259a1..e48dfb09190 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -287,6 +287,8 @@ however, the profile can't be updated while the test is running.
   <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
   <li>Mariusz (mawasak at gmail.com)</li>
   <li>peter.wong@csexperts.com</li>
+  <li>Woonsan Ko (woonsan.ko at bloomreach.com)</li>
+  <li>Chromico Rek (atech5122 at gmail.com)</li>
   <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>

From 08e350d8e58044655c2f6f58444e8b60798af93d Mon Sep 17 00:00:00 2001
From: Piotr Smietana <piotrsmietana1998@gmail.com>
Date: Wed, 29 Dec 2021 16:58:15 +0100
Subject: [PATCH 0051/1037] Update log4j2 to 2.17.1 (#685)

Co-authored-by: smiep <Piotr.Smietana@pega.com>
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 154d602a448..df7baa176cc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.1
 lets-plot-kotlin-jvm.version=3.1.1
-log4j.version=2.17.0
+log4j.version=2.17.1
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 27a5d84f98a..3cd09108c19 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 181223,lets-plot-batik-2.2.1.jar
 4025480,lets-plot-common-2.2.1.jar
-208235,log4j-1.2-api-2.17.0.jar
-301776,log4j-api-2.17.0.jar
-1789339,log4j-core-2.17.0.jar
-24252,log4j-slf4j-impl-2.17.0.jar
+208006,log4j-1.2-api-2.17.1.jar
+301872,log4j-api-2.17.1.jar
+1790452,log4j-core-2.17.1.jar
+24279,log4j-slf4j-impl-2.17.1.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e48dfb09190..33606f2ab5a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -61,7 +61,7 @@ Summary
 <ch_section>New and Noteworthy</ch_section>
 <p>JMeter now supports Java 17</p>
 
-<p>JMeter 5.5 ships with log4j2 2.17</p>
+<p>JMeter 5.5 ships with log4j2 2.17.1</p>
 
 <p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
 allows creating load profiles with variable load.</p>
@@ -175,7 +175,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.17.0 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.17.1 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
@@ -290,6 +290,7 @@ however, the profile can't be updated while the test is running.
   <li>Woonsan Ko (woonsan.ko at bloomreach.com)</li>
   <li>Chromico Rek (atech5122 at gmail.com)</li>
   <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
+  <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 1d8f1e1665ce3aefd091c1d37648674af599b572 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 3 Jan 2022 17:34:15 +0300
Subject: [PATCH 0052/1037] Gradle 7.5 compatibility: add checksum for
 gradle-enterprise-gradle-plugin-3.8.jar

---
 settings.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4fd91363720..e27df11c67c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -149,6 +149,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.7.jar",
     "7AC5F1C070A8C0A2BD096D96E896EB147966C39E0746120ABA5E107DDBDED441FF71F31F167475CD36EE082D8430D1FB98C51D29C6B91D147CC64DCE59C66D49"
         to "gradle-enterprise-gradle-plugin-3.7.2.jar",
+    "24A1722CB574BA3126C3C6EBEB3D4A39D2A86ECCEDD378BA96A5508626D1AEAC7BB5FFBC189929E16900B94C1D016AFA83A462DCB2BB03F634FCA9C7FDE9EBA5"
+        to "gradle-enterprise-gradle-plugin-3.8.jar",
     "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
         to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"

From dc91e8bcf6bcb6ec6572672b12ec9fbb389c7159 Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Tue, 4 Jan 2022 09:20:25 +0000
Subject: [PATCH 0053/1037] Deleted the redundant log variable

---
 .../protocol/http/gui/action/ParseCurlCommandAction.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 7e42bc03dd9..cc3c67433cb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -123,7 +123,6 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato
     public static final String IMPORT_CURL = "import_curl";
     private static final String CREATE_REQUEST = "CREATE_REQUEST";
     private static final String CERT = "cert";
-    private Logger log = LoggerFactory.getLogger(getClass());
     /** A panel allowing results to be saved. */
     private FilePanel filePanel = null;
     static {
@@ -550,11 +549,11 @@ private void setFormData(Request request, HTTPSamplerProxy httpSampler) {
                         if (contentFile.canRead()) {
                             contentType = tika.detect(contentFile);
                         } else {
-                            log.info("Can not read file {}, so guessing contentType by extension.", formValue);
+                            LOGGER.info("Can not read file {}, so guessing contentType by extension.", formValue);
                             contentType = tika.detect(formValue);
                         }
                     } catch (IOException e) {
-                        log.info(
+                        LOGGER.info(
                                 "Could not detect contentType for file {} by content, so falling back to detection by filename",
                                 formValue);
                         contentType = tika.detect(formValue);

From 374cda59bb17af9f2ead0344132c1c32ef63d0da Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Tue, 4 Jan 2022 09:24:03 +0000
Subject: [PATCH 0054/1037] Remove unnecessary throws exception

---
 .../apache/jmeter/engine/DistributedRunnerTest.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index 0241287a3bc..6aa30b8faf8 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -53,7 +53,7 @@ public static void createJmeterEnv() {
     }
 
     @Test
-    public void testSuccess() throws Exception {
+    public void testSuccess() {
         createJmeterEnv();
         JMeterUtils.setProperty(DistributedRunner.RETRIES_NUMBER, "1");
         JMeterUtils.setProperty(DistributedRunner.CONTINUE_ON_FAIL, "false");
@@ -69,7 +69,7 @@ public void testSuccess() throws Exception {
     }
 
     @Test
-    public void testFailure1() throws Exception {
+    public void testFailure1() {
         createJmeterEnv();
         JMeterUtils.setProperty(DistributedRunner.RETRIES_NUMBER, "2");
         JMeterUtils.setProperty(DistributedRunner.RETRIES_DELAY, "1");
@@ -101,7 +101,7 @@ private void initRunner(DistributedRunnerEmul runner, List<String> hosts) {
     }
 
     @Test
-    public void testFailure2() throws Exception {
+    public void testFailure2() {
         createJmeterEnv();
         JMeterUtils.setProperty(DistributedRunner.RETRIES_NUMBER, "1");
         JMeterUtils.setProperty(DistributedRunner.RETRIES_DELAY, "1");
@@ -112,7 +112,7 @@ public void testFailure2() throws Exception {
     }
 
     @Test
-    public void testFailure3() throws Exception {
+    public void testFailure3() {
         createJmeterEnv();
         JMeterUtils.setProperty(DistributedRunner.RETRIES_NUMBER, "1");
         JMeterUtils.setProperty(DistributedRunner.RETRIES_DELAY, "1");
@@ -154,7 +154,7 @@ public void configure(HashTree testPlan) {
         }
 
         @Override
-        public void runTest() throws JMeterEngineException {
+        public void runTest() {
             log.debug("Running {}", host);
         }
 
@@ -188,4 +188,4 @@ public void setHost(String host) {
             this.host = host;
         }
     }
-}
+}
\ No newline at end of file

From 5c68bf81510bd2665a19f82ed7a929b9da93122f Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Tue, 4 Jan 2022 09:45:06 +0000
Subject: [PATCH 0055/1037] Kept the new line as suggested

---
 .../java/org/apache/jmeter/engine/DistributedRunnerTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index 6aa30b8faf8..172b94d1691 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -188,4 +188,4 @@ public void setHost(String host) {
             this.host = host;
         }
     }
-}
\ No newline at end of file
+}

From 51507ea138dddcdb997b5d2c6626a894901ee468 Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Tue, 4 Jan 2022 14:51:41 +0000
Subject: [PATCH 0056/1037] Logger and string usage warning fix

Closes #689
---
 .../java/org/apache/jmeter/functions/StringFromFile.java     | 5 ++---
 xdocs/changes.xml                                            | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
index e1b221da7fa..fc2207feeeb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
@@ -122,7 +122,7 @@ public class StringFromFile extends AbstractFunction implements TestStateListene
 
     public StringFromFile() {
         if (log.isDebugEnabled()) {
-            log.debug("++++++++ Construct {}" + this);
+            log.debug("++++++++ Construct {}", this);
         }
     }
 
@@ -147,9 +147,8 @@ private synchronized void openFile() {
         String tn = Thread.currentThread().getName();
         fileName = ((CompoundVariable) values[0]).execute();
 
-        String start = "";
         if (values.length >= PARAM_START) {
-            start = ((CompoundVariable) values[PARAM_START - 1]).execute();
+            String start = ((CompoundVariable) values[PARAM_START - 1]).execute();
             try {
                 // Low chances to be non numeric, we parse
                 myStart = Integer.parseInt(start);
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 33606f2ab5a..15ce9515889 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -194,6 +194,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>654</pr>Try do give better feedback while loading keystores</li>
   <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
   <li>Updated Gradle to 7.3 (from 7.2)</li>
+  <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -291,6 +292,7 @@ however, the profile can't be updated while the test is running.
   <li>Chromico Rek (atech5122 at gmail.com)</li>
   <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
   <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
+  <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 00834652d0ee8857d2976616eb60f52062fd5694 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 4 Jan 2022 18:27:15 +0100
Subject: [PATCH 0057/1037] Use correct message format for MessageFormat in
 HTMLAssertion

Regression introduced by code clean up in commit af3958b3cd5172bc60ca2d3f440febf173f45f8e

Bugzilla Id: 65782
---
 .../main/java/org/apache/jmeter/assertions/HTMLAssertion.java   | 2 +-
 xdocs/changes.xml                                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index 8fc41ea1cdd..6e93c7e82c8 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -124,7 +124,7 @@ private AssertionResult runTidy(SampleResult inResponse) {
                 log.debug("Errors/warnings detected while parsing with tidy: {}", errbuf);
                 result.setFailure(true);
                 result.setFailureMessage(MessageFormat.format(
-                        "Tidy Parser errors: {} (allowed {}) Tidy Parser warnings: {} (allowed {})",
+                        "Tidy Parser errors: {0} (allowed {1}) Tidy Parser warnings: {2} (allowed {3})",
                         tidy.getParseErrors(), getErrorThreshold(), tidy.getParseWarnings(), getWarningThreshold()));
                 // return with an error
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 15ce9515889..c6cbeb9a215 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -234,6 +234,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
   <li><bug>65681</bug>Use default values for null values when extracting with JSONPostProcessor</li>
   <li>Allow setters in ConstantThroughputTimer to updating the values during the run time</li>
+  <li><bug>65782</bug>Use correct message format for MessageFormat in HTMLAssertion</li>
 </ul>
 
 <h3>Functions</h3>

From a16df4bcc86453b122a5ff9ad5e640d036ad0673 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 4 Jan 2022 20:03:26 +0100
Subject: [PATCH 0058/1037] Convert links to mail archives to the new
 lists.apache.org counterparts

---
 xdocs/mail2.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xdocs/mail2.xml b/xdocs/mail2.xml
index 5311853b86f..520e6d4f08a 100644
--- a/xdocs/mail2.xml
+++ b/xdocs/mail2.xml
@@ -62,7 +62,7 @@ For old postings, please see the Jakarta JMeter User list, below.
 <li>Subscribe at <a href="mailto:user-subscribe@jmeter.apache.org">user-subscribe@jmeter.apache.org</a></li>
 <li>Send your message to: <a href="mailto:user@jmeter.apache.org">user@jmeter.apache.org</a> (after the subscription process)</li>
 <li>Unsubscribe at <a href="mailto:user-unsubscribe@jmeter.apache.org">user-unsubscribe@jmeter.apache.org</a></li>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jmeter-user/">jmeter-user Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?user@jmeter.apache.org">jmeter-user Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Apache JMeter Developer" anchor="JMeterDev">
@@ -81,7 +81,7 @@ For earlier postings, please see below.
 <li>Subscribe at <a href="mailto:dev-subscribe@jmeter.apache.org">dev-subscribe@jmeter.apache.org</a></li>
 <li>Send your message to: <a href="mailto:dev@jmeter.apache.org">dev@jmeter.apache.org</a> (after the subscription process)</li>
 <li>Unsubscribe at <a href="mailto:dev-unsubscribe@jmeter.apache.org">dev-unsubscribe@jmeter.apache.org</a></li>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jmeter-dev/">jmeter-dev Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?dev@jmeter.apache.org">jmeter-dev Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Apache JMeter Commits" anchor="JMeterCommits">
@@ -92,7 +92,7 @@ Prior to Nov 2011, they were sent to the Jakarta Notifications list, see below.
 <ul>
 <li>Subscribe at <a href="mailto:commits-subscribe@jmeter.apache.org">commits-subscribe@jmeter.apache.org</a></li>
 <li>Unsubscribe at <a href="mailto:commits-unsubscribe@jmeter.apache.org">commits-unsubscribe@jmeter.apache.org</a></li>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jmeter-commits/">jmeter-commits Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?commits@jmeter.apache.org">jmeter-commits Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Apache JMeter Issues" anchor="JMeterIssues">
@@ -106,31 +106,31 @@ Prior to Nov 2011, they were sent to the Jakarta Notifications list, see below.
 <ul>
 <li>Subscribe at <a href="mailto:issues-subscribe@jmeter.apache.org">issues-subscribe@jmeter.apache.org</a></li>
 <li>Unsubscribe at <a href="mailto:issues-unsubscribe@jmeter.apache.org">issues-unsubscribe@jmeter.apache.org</a></li>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jmeter-issues/">jmeter-issues Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?issues@jmeter.apache.org">jmeter-issues Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Jakarta Developer" anchor="JakartaDev">
 <p>Combined Jakarta developer list, April 2010 to November 2011</p>
 <ul>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jakarta-dev/">jakarta-dev Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?dev@jakarta.apache.org">jakarta-dev Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Jakarta JMeter User" anchor="JakartaJMeterUser">
 This is the old JMeter user list from when JMeter was a sub-project of Apache Jakarta.
 <ul>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jakarta-jmeter-user/">jakarta-jmeter-user Archive</a></li></ul>
+<li>Archives at <a href="https://lists.apache.org/list.html?jmeter-user@jakarta.apache.org">jakarta-jmeter-user Archive</a></li></ul>
 </subsection>
 <subsection name="Jakarta JMeter Developer" anchor="JakartaJMeterDev">
 Historical list, up to April 2010.
 <ul>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jakarta-jmeter-dev/">jakarta-jmeter-dev Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?jmeter-dev@jakarta.apache.org">jakarta-jmeter-dev Archive</a></li>
 </ul>
 </subsection>
 <subsection name="Jakarta Notifications" anchor="JakartaNotif">
 Combined Jakarta notifications to November 2011.
 Includes Bugzilla, SVN and Wiki commit mails for JMeter.
 <ul>
-<li>Archives at <a href="http://mail-archives.apache.org/mod_mbox/jakarta-notifications/">jakarta-notifications Archive</a></li>
+<li>Archives at <a href="https://lists.apache.org/list.html?notifications@jakarta.apache.org">jakarta-notifications Archive</a></li>
 </ul>
 </subsection>
 </section>

From 37be72fc48121c142c0a4be1c634373e0f929882 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 5 Jan 2022 16:23:01 +0100
Subject: [PATCH 0059/1037] No Graphs displayed in Aggregate Report/Response
 Time Graph

Make sure, that we scale away from zero (which is in our case mostly up).
Otherwise we might end up with a scaling factor of zero, which would
result in really small images.

Bugzilla Id: 65784
---
 .../main/java/org/apache/jmeter/visualizers/AxisGraph.java    | 2 +-
 .../org/apache/jmeter/visualizers/RespTimeGraphChart.java     | 4 ++--
 xdocs/changes.xml                                             | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
index c241a4f4793..5725557a00f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
@@ -399,7 +399,7 @@ private void drawSample(String _title, int _maxLength, String[] _xAxisLabels,
             // Y Axis
             try {
                 BigDecimal round = BigDecimal.valueOf(max / 1000d);
-                round = round.setScale(0, RoundingMode.HALF_EVEN);
+                round = round.setScale(0, RoundingMode.UP);
                 double topValue = round.doubleValue() * 1000;
                 yaxis.setUserDefinedScale(0, 500);
                 yaxis.setNumItems((int) (topValue / 500)+1);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
index 02ab8f09f6d..bc1af59f487 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
@@ -282,7 +282,7 @@ private void drawSample(String _title, String[] _xAxisLabels,
             double[][] _data, int _width, int _height, int _incrScaleYAxis,
             Color[] _color, Font legendFont, Graphics g) {
 
-        double max = maxYAxisScale > 0 ? maxYAxisScale : getTopValue(findMax(_data), RoundingMode.HALF_EVEN); // define max scale y axis
+        double max = maxYAxisScale > 0 ? maxYAxisScale : getTopValue(findMax(_data), RoundingMode.UP); // define max scale y axis
         try {
             // if the title graph is empty, we can assume some default
             if (_title.length() == 0 ) {
@@ -332,7 +332,7 @@ private void drawSample(String _title, String[] _xAxisLabels,
                 double incrYAxis = max / numInterval;
                 double incrTopValue = _incrScaleYAxis;
                 if (_incrScaleYAxis == 0) {
-                    incrTopValue = getTopValue(incrYAxis, RoundingMode.HALF_EVEN);
+                    incrTopValue = getTopValue(incrYAxis, RoundingMode.HALF_UP);
                 }
                 if (incrTopValue < 1) {
                     incrTopValue = 1.0d; // Increment cannot be < 1
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index c6cbeb9a215..79c70d79a24 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -224,6 +224,7 @@ however, the profile can't be updated while the test is running.
 <h3>Listeners</h3>
 <ul>
   <li><bug>64962</bug>Save CSV sub-results recursively from View Results Tree</li>
+  <li><bug>65784</bug>No Graphs displayed in Aggregate Report/Response Time Graph</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From af7fc4d56bffab352843cc87514ab9ed19bdad32 Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Thu, 6 Jan 2022 14:49:05 +0000
Subject: [PATCH 0060/1037] Split function test refactor with failure and
 different success scenarios separately

Closes #690
---
 .../jmeter/functions/SplitFunctionTest.java   | 56 +++++++++++++------
 xdocs/changes.xml                             |  1 +
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
index 177b85ef7df..69169bb8d8a 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
@@ -17,15 +17,16 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -34,27 +35,30 @@
 
 public class SplitFunctionTest extends JMeterTestCase {
 
-    private JMeterContext jmctx = null;
     private JMeterVariables vars = null;
 
     @BeforeEach
     public void setUp() {
-        jmctx = JMeterContextService.getContext();
-        jmctx.setVariables(new JMeterVariables());
-        vars = jmctx.getVariables();
+        JMeterContext jmeterContext = JMeterContextService.getContext();
+        jmeterContext.setVariables(new JMeterVariables());
+        vars = jmeterContext.getVariables();
     }
 
     @Test
-    public void splitTest1() throws Exception {
-        String src = "";
-
-        try {
-            splitParams("a,b,c", null, null);
-            fail("Expected InvalidVariableException (wrong number of parameters)");
-        } catch (InvalidVariableException e) {
-            // OK
-        }
-        src = "a,b,c";
+    public void shouldThrowExceptionWhenParameterCountIsInvalid() {
+        InvalidVariableException invalidVariableException = assertThrows(InvalidVariableException.class, () ->
+                splitParams("a,b,c", null, null),
+            ""
+        );
+        assertEquals(
+            "__split called with wrong number of parameters. Actual: 1. Expected: >= 2 and <= 3",
+            invalidVariableException.getMessage()
+        );
+    }
+
+    @Test
+    public void shouldSplitWithoutAnyArguments() throws Exception {
+        String src = "a,b,c";
         SplitFunction split;
         split = splitParams(src, "VAR1", null);
         assertEquals(src, split.execute());
@@ -134,6 +138,24 @@ public void splitTest1() throws Exception {
         assertNull(vars.get("VAR5_5"));
     }
 
+    @Test
+    public void shouldSplitWithPreviousResultOnly() throws Exception {
+        String src = "a,,c,";
+        vars.put("VAR", src);
+        SplitFunction split = splitParams("${VAR}", "VAR5", null);
+
+        SampleResult previousResult = new SampleResult();
+        previousResult.setResponseData("Some data", null);
+
+        assertEquals(src, split.execute(previousResult, null));
+        assertEquals("4", vars.get("VAR5_n"));
+        assertEquals("a", vars.get("VAR5_1"));
+        assertEquals("?", vars.get("VAR5_2"));
+        assertEquals("c", vars.get("VAR5_3"));
+        assertEquals("?", vars.get("VAR5_4"));
+        assertNull(vars.get("VAR5_5"));
+    }
+
     // Create the SplitFile function and set its parameters.
     private static SplitFunction splitParams(String p1, String p2, String p3) throws Exception {
         SplitFunction split = new SplitFunction();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 79c70d79a24..e80edad1dcb 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -195,6 +195,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
   <li>Updated Gradle to 7.3 (from 7.2)</li>
   <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From abb069cc8e72c8e57eb8835bf3ceb26e4bb91416 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 15 Jan 2022 22:18:30 +0300
Subject: [PATCH 0061/1037] ci: terminate stale GitHub CI jobs early

For instance, when several commits are pushed to PR in short sequence,
older CI jobs would be terminated immediately so the newer commits are tested faster.
---
 .github/workflows/main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c65a5412ed..de80c5e9eec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,13 @@ on:
 
 # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners
 
+concurrency:
+  # On master/release, we don't want any jobs cancelled so the sha is used to name the group
+  # On PR branches, we cancel the job if new commits are pushed
+  # More info: https://stackoverflow.com/a/68422069/253468
+  group: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
+  cancel-in-progress: true
+
 jobs:
   windows:
     name: 'Windows (JDK 17)'

From 6a5cac0ad75e72d5313f3c795845c6cea9ff6520 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 18 Jan 2022 17:36:49 +0100
Subject: [PATCH 0062/1037] JSON Assertion always successful with indefinite
 paths

Add a note to the component reference for JSON Path Assertions

Bugzilla Id: 65794
---
 xdocs/changes.xml                        | 2 ++
 xdocs/usermanual/component_reference.xml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e80edad1dcb..6f56b600c49 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -253,6 +253,7 @@ however, the profile can't be updated while the test is running.
 
 <h3>Documentation</h3>
 <ul>
+  <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
 </ul>
 
 <h3>General</h3>
@@ -300,6 +301,7 @@ however, the profile can't be updated while the test is running.
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
   <li>Nikola Aleksic (nalexic at gmail.com)</li>
+  <li>Vladimir Rosu (rosuvladimir at gmail.com)</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 02b9cf90b05..985918c93ff 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -5035,6 +5035,9 @@ please ensure that you select "<code>Store the message using MIME (raw)</code>"
             Second, it will search for specified path, using syntax from <a href="https://github.com/json-path/JsonPath" >Jayway JsonPath 1.2.0</a>. If the path is not found, it will fail.
             Third, if JSON path was found in the document, and validation against expected value was requested, it will perform validation. For the <code>null</code> value there is special checkbox in the GUI.
             Note that if the path will return array object, it will be iterated and if expected value is found, the assertion will succeed. To validate empty array use <code>[]</code> string. Also, if patch will return dictionary object, it will be converted to string before comparison.
+           <note>When using <a href="https://github.com/json-path/JsonPath#what-is-returned-when">indefinite JSON Paths</a>
+             you must assert the value due to the existing JSON library implementation, otherwise the assertion could always
+             return successful</note>
         </p>
     </description>
     <properties>

From 278255de85829c850d36ad1655d1541e66d5368f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 15 Jan 2022 18:11:36 +0100
Subject: [PATCH 0063/1037] Fail JSONPath Assertion on indefinite paths and no
 assertion value

The docs for JSONPath Assertion state, that it will fail the assertion,
when no element is found with the given JSON path. This was currently
not followed, when an indefinite path was used. In such a case, the
JSONPath library would return an empty list, which the assertion logic
would log as OK.

With this change we let the assertion fail, when
 * an indefinite path was given
 * and an empty list is extracted
 * and no assertion value is given

Bugzilla Id: 65794
---
 .../apache/jmeter/assertions/JSONPathAssertion.java    | 10 ++++++++--
 .../jmeter/assertions/TestJSONPathAssertion.java       |  6 +++++-
 xdocs/changes.xml                                      |  2 +-
 xdocs/usermanual/component_reference.xml               |  4 +++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 2e135b46b21..c2986df1cd8 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -30,12 +30,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.jayway.jsonpath.JsonPath;
+
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONValue;
 
-import com.jayway.jsonpath.JsonPath;
-
 /**
  * This is main class for JSONPath Assertion which verifies assertion on
  * previous sample result using JSON path expression
@@ -112,6 +112,12 @@ private void doAssert(String jsonString) {
         Object value = JsonPath.read(jsonString, getJsonPath());
 
         if (!isJsonValidationBool()) {
+            if (value instanceof JSONArray) {
+                JSONArray arrayValue = (JSONArray) value;
+                if (arrayValue.isEmpty() && !JsonPath.isPathDefinite(getJsonPath())) {
+                    throw new IllegalStateException("JSONPath is indefinite and the extracted Value is an empty Array. Please use an assertion value, to be sure to get a correct result. " + getExpectedValue());
+                }
+            }
             return;
         }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index f4245f21638..a6738c30a43 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.nio.charset.Charset;
 import java.util.Locale;
 
 import org.apache.jmeter.samplers.SampleResult;
@@ -270,6 +271,9 @@ void testGetResult_list_negative() {
 
     @Test
     void testGetResult_list_empty_novalidate() {
+        // With bug 65794 the outcome of this test has changed
+        // we now consider an indefinite path with no assertion value
+        // an error and set the AssertionResult to failure
         SampleResult samplerResult = new SampleResult();
         samplerResult.setResponseData("{\"myval\": []}".getBytes());
 
@@ -279,7 +283,7 @@ void testGetResult_list_empty_novalidate() {
         AssertionResult expResult = new AssertionResult("");
         AssertionResult result = instance.getResult(samplerResult);
         assertEquals(expResult.getName(), result.getName());
-        assertFalse(result.isFailure());
+        assertTrue(result.isFailure());
     }
 
     @Test
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6f56b600c49..89c936b95b2 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -237,6 +237,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65681</bug>Use default values for null values when extracting with JSONPostProcessor</li>
   <li>Allow setters in ConstantThroughputTimer to updating the values during the run time</li>
   <li><bug>65782</bug>Use correct message format for MessageFormat in HTMLAssertion</li>
+  <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
 </ul>
 
 <h3>Functions</h3>
@@ -253,7 +254,6 @@ however, the profile can't be updated while the test is running.
 
 <h3>Documentation</h3>
 <ul>
-  <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
 </ul>
 
 <h3>General</h3>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 985918c93ff..d1fdfb8d216 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -5037,7 +5037,9 @@ please ensure that you select "<code>Store the message using MIME (raw)</code>"
             Note that if the path will return array object, it will be iterated and if expected value is found, the assertion will succeed. To validate empty array use <code>[]</code> string. Also, if patch will return dictionary object, it will be converted to string before comparison.
            <note>When using <a href="https://github.com/json-path/JsonPath#what-is-returned-when">indefinite JSON Paths</a>
              you must assert the value due to the existing JSON library implementation, otherwise the assertion could always
-             return successful</note>
+             return successful.<br>
+             Since JMeter version 5.5 the assertion will fail, if an indefinite path is given, an empty list is extracted and
+             no assertion value is set.</note>
         </p>
     </description>
     <properties>

From 3e54034a25f2ce0582fb52b00322fdbbc6591136 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 19 Jan 2022 19:33:04 +0100
Subject: [PATCH 0064/1037] Fix markup for components reference

Broken with last commit for JSON Path Assertion

Bugzilla Id: 65794
---
 xdocs/usermanual/component_reference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index d1fdfb8d216..5aff4f054cd 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -5037,7 +5037,7 @@ please ensure that you select "<code>Store the message using MIME (raw)</code>"
             Note that if the path will return array object, it will be iterated and if expected value is found, the assertion will succeed. To validate empty array use <code>[]</code> string. Also, if patch will return dictionary object, it will be converted to string before comparison.
            <note>When using <a href="https://github.com/json-path/JsonPath#what-is-returned-when">indefinite JSON Paths</a>
              you must assert the value due to the existing JSON library implementation, otherwise the assertion could always
-             return successful.<br>
+             return successful.<br></br>
              Since JMeter version 5.5 the assertion will fail, if an indefinite path is given, an empty list is extracted and
              no assertion value is set.</note>
         </p>

From 980e5b8975948bb0dab45b735d88901c185b00a4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 19 Jan 2022 19:53:12 +0100
Subject: [PATCH 0065/1037] Apply autostyle to imports changed with last commit

Bugzilla Id: 65794
---
 .../java/org/apache/jmeter/assertions/JSONPathAssertion.java  | 4 ++--
 .../org/apache/jmeter/assertions/TestJSONPathAssertion.java   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index c2986df1cd8..91325dc15a8 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -30,12 +30,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jayway.jsonpath.JsonPath;
-
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONValue;
 
+import com.jayway.jsonpath.JsonPath;
+
 /**
  * This is main class for JSONPath Assertion which verifies assertion on
  * previous sample result using JSON path expression
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index a6738c30a43..8447977d687 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -22,7 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.nio.charset.Charset;
 import java.util.Locale;
 
 import org.apache.jmeter.samplers.SampleResult;

From b953b45099351cc13e0a07afe0c8ba43fc420f10 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 19 Jan 2022 19:58:37 +0100
Subject: [PATCH 0066/1037] Line too long

Bugzilla Id: 65794
---
 .../java/org/apache/jmeter/assertions/JSONPathAssertion.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 91325dc15a8..98aeca67250 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -115,7 +115,8 @@ private void doAssert(String jsonString) {
             if (value instanceof JSONArray) {
                 JSONArray arrayValue = (JSONArray) value;
                 if (arrayValue.isEmpty() && !JsonPath.isPathDefinite(getJsonPath())) {
-                    throw new IllegalStateException("JSONPath is indefinite and the extracted Value is an empty Array. Please use an assertion value, to be sure to get a correct result. " + getExpectedValue());
+                    throw new IllegalStateException("JSONPath is indefinite and the extracted Value is an empty Array." +
+                            " Please use an assertion value, to be sure to get a correct result. " + getExpectedValue());
                 }
             }
             return;

From d87a25bb1908293322a523d91050f30a459139d7 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 24 Jan 2022 19:02:10 +0100
Subject: [PATCH 0067/1037] Fix typo (mainly to trigger buildbot)

---
 xdocs/usermanual/include_controller_tutorial.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/include_controller_tutorial.xml b/xdocs/usermanual/include_controller_tutorial.xml
index 065b3561de1..145dfdebaa7 100644
--- a/xdocs/usermanual/include_controller_tutorial.xml
+++ b/xdocs/usermanual/include_controller_tutorial.xml
@@ -38,7 +38,7 @@ in a couple of ways.
 </p>
 
 <ul>
-<li>the Include Controller loads a simple controller with all it's samples, where as the Module
+<li>the Include Controller loads a simple controller with all its samples, where as the Module
     Controller can use any controller</li>
 <li>the Include Controller doesn't use the workbench</li>
 <li>the Module Controller doesn't load from a file</li>

From 160ec244b7da7e8dd35fa1ca1d2591218375ec0a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 24 Jan 2022 19:08:52 +0100
Subject: [PATCH 0068/1037] Correct more typos (it's vs. its)

---
 xdocs/usermanual/component_reference.xml | 4 ++--
 xdocs/usermanual/jmeter_tutorial.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 5aff4f054cd..00b8ed21cda 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -1211,7 +1211,7 @@ props.put("PROP1","1234");</source>
     </property>
     <property name="Script File" required="No">Name of a file to be used as a JSR223 script, if a relative file path is used, then it will be relative to directory referenced by "<code>user.dir</code>" System property</property>
     <property name="Parameters" required="No">List of parameters to be passed to the script file or the script.</property>
-    <property name="Cache compiled script if available" required="No">If checked (advised) and the language used supports <code><a href="https://docs.oracle.com/javase/8/docs/api/javax/script/Compilable.html">Compilable</a></code> interface (Groovy is one of these, java, beanshell and javascript are not), JMeter will compile the Script and cache it using it's MD5 hash as unique cache key</property>
+    <property name="Cache compiled script if available" required="No">If checked (advised) and the language used supports <code><a href="https://docs.oracle.com/javase/8/docs/api/javax/script/Compilable.html">Compilable</a></code> interface (Groovy is one of these, java, beanshell and javascript are not), JMeter will compile the Script and cache it using its MD5 hash as unique cache key</property>
     <property name="Script" required="Yes (unless script file is provided)">Script to be passed to JSR223 language</property>
 </properties>
 <p>
@@ -6044,7 +6044,7 @@ extracting the node as text or attribute value and store the result into the giv
     use namespaces than with the old XPathExtractor version.</property>
    </properties>
    <p>To allow for use in a <complink name="ForEach Controller"/>, it works exactly the same as the above XPath Extractor</p>
-   <p>XPath2 Extractor provides some interestings tools such as an improved syntax and much more functions than in it's first version.</p>
+   <p>XPath2 Extractor provides some interestings tools such as an improved syntax and much more functions than in its first version.</p>
    <p>Here are some exemples: </p>
    <dl>
    <dt><code>abs(/book/page[2])</code></dt>
diff --git a/xdocs/usermanual/jmeter_tutorial.xml b/xdocs/usermanual/jmeter_tutorial.xml
index fe5e7f0b425..f32a8d0f887 100644
--- a/xdocs/usermanual/jmeter_tutorial.xml
+++ b/xdocs/usermanual/jmeter_tutorial.xml
@@ -768,7 +768,7 @@ JMeter's <code>src/components</code> directory).
         attention to your properties. These properties will become the basis of a GUI form by
         which users will configure the <code>CSVDataSet</code> element.
       </li>
-      <li>Your element will be cloned by JMeter when the test starts. Each thread will get it's
+      <li>Your element will be cloned by JMeter when the test starts. Each thread will get its
         own instance. However, you will have a chance to control how the cloning is done, if
         you need it.
       </li>
@@ -785,7 +785,7 @@ JMeter's <code>src/components</code> directory).
       </li>
       <li>I then implemented the <code>IterationStart</code> method of the <code>LoopIterationListener</code> interface.
         The point of this "event" is that your component is notified of when the test has entered
-        it's parent controller. For our purposes, every time the <code>CSVDataSet</code>'s parent controller
+        its parent controller. For our purposes, every time the <code>CSVDataSet</code>'s parent controller
         is entered, we will read a new line of the data file and set the variables. Thus, for a
         regular controller, each loop through the test will result in a new set of values being
         read. For a loop controller, each iteration will do likewise. Every test thread will get

From 04548fd2081def422d3756907823406691290c7e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 24 Jan 2022 20:35:21 +0100
Subject: [PATCH 0069/1037] Use English typographic conventions for colons (no
 space in front)

---
 xdocs/usermanual/generating-dashboard.xml | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/xdocs/usermanual/generating-dashboard.xml b/xdocs/usermanual/generating-dashboard.xml
index 912b9255792..49ee7fc1763 100644
--- a/xdocs/usermanual/generating-dashboard.xml
+++ b/xdocs/usermanual/generating-dashboard.xml
@@ -42,23 +42,23 @@
                 <ul>
                     <li><a href="https://en.wikipedia.org/wiki/Apdex" title="Application Performance Index" target="_blank">APDEX</a> (Application Performance Index) table that computes for every transaction the APDEX based on configurable values for tolerated and satisfied thresholds</li>
                     <li>A request summary graph showing the Success and failed requests (Transaction Controller Sample Results are not taken into account) percentage: <figure width="1636" height="982" image="dashboard/report_apdex_and_summary.png" ></figure></li>
-                    <li>A Statistics table providing in one table a summary of all metrics per transaction including 3 configurable percentiles : <figure width="1639" height="467" image="dashboard/report_statistics.png" ></figure></li>
-                    <li>An error table providing a summary of all errors and their proportion in the total requests : <figure width="1344" height="455" image="dashboard/report_errors.png" ></figure></li>
-                    <li>A Top 5 Errors by Sampler table providing for every Sampler (excluding Transaction Controller by default) the top 5 Errors : <figure width="1609" height="508" image="dashboard/top_5_errors_by_sampler.png" ></figure></li>
+                    <li>A Statistics table providing in one table a summary of all metrics per transaction including 3 configurable percentiles: <figure width="1639" height="467" image="dashboard/report_statistics.png" ></figure></li>
+                    <li>An error table providing a summary of all errors and their proportion in the total requests: <figure width="1344" height="455" image="dashboard/report_errors.png" ></figure></li>
+                    <li>A Top 5 Errors by Sampler table providing for every Sampler (excluding Transaction Controller by default) the top 5 Errors: <figure width="1609" height="508" image="dashboard/top_5_errors_by_sampler.png" ></figure></li>
                     <li>Zoomable chart where you can check/uncheck every transaction to show/hide it for:
                         <ul>
-                            <li>Response times Over Time (Includes Transaction Controller Sample Results) : <figure width="1398" height="566" image="dashboard/report_response_times_over_time.png" ></figure></li>
-                            <li>Response times Percentiles Over Time (successful responses only) : <figure width="1640" height="539" image="dashboard/response_time_percentiles_over_time.png" ></figure></li>
-                            <li>Active Threads Over Time : <figure width="1638" height="544" image="dashboard/report_active_threads_over_time.png" ></figure></li>
-                            <li>Bytes throughput Over Time (Ignores Transaction Controller Sample Results)  : <figure width="1373" height="543" image="dashboard/report_bytes_throughput_over_time.png" ></figure></li>
-                            <li>Latencies Over Time (Includes Transaction Controller Sample Results) : <figure width="1373" height="547" image="dashboard/report_latencies_over_time.png" ></figure></li>
-                            <li>Connect Time Over Time (Includes Transaction Controller Sample Results) : <figure width="1635" height="520" image="dashboard/report_connect_time_over_time.png" ></figure></li>
+                            <li>Response times Over Time (Includes Transaction Controller Sample Results): <figure width="1398" height="566" image="dashboard/report_response_times_over_time.png" ></figure></li>
+                            <li>Response times Percentiles Over Time (successful responses only): <figure width="1640" height="539" image="dashboard/response_time_percentiles_over_time.png" ></figure></li>
+                            <li>Active Threads Over Time: <figure width="1638" height="544" image="dashboard/report_active_threads_over_time.png" ></figure></li>
+                            <li>Bytes throughput Over Time (Ignores Transaction Controller Sample Results): <figure width="1373" height="543" image="dashboard/report_bytes_throughput_over_time.png" ></figure></li>
+                            <li>Latencies Over Time (Includes Transaction Controller Sample Results): <figure width="1373" height="547" image="dashboard/report_latencies_over_time.png" ></figure></li>
+                            <li>Connect Time Over Time (Includes Transaction Controller Sample Results): <figure width="1635" height="520" image="dashboard/report_connect_time_over_time.png" ></figure></li>
                             <li>Hits per second (Ignores Transaction Controller Sample Results): <figure width="1375" height="552" image="dashboard/report_hits_per_second.png" ></figure></li>
                             <li>Response codes per second (Ignores Transaction Controller Sample Results): <figure width="1380" height="558" image="dashboard/report_codes_per_second.png" ></figure></li>
                             <li>Transactions per second (Includes Transaction Controller Sample Results): <figure width="1372" height="577" image="dashboard/report_transactions_per_second.png" ></figure></li>
                             <li>Response Time vs Request per second (Ignores Transaction Controller Sample Results): <figure width="1380" height="545" image="dashboard/report_response_time_vs_request.png" ></figure></li>
                             <li>Latency vs Request per second (Ignores Transaction Controller Sample Results): <figure width="1373" height="543" image="dashboard/report_latencies_vs_request.png" ></figure></li>
-                            <li>Response time Overview (Excludes Transaction Controller Sample Results) : <figure width="1645" height="562" image="dashboard/response_time_overview.png" ></figure></li>
+                            <li>Response time Overview (Excludes Transaction Controller Sample Results): <figure width="1645" height="562" image="dashboard/response_time_overview.png" ></figure></li>
                             <li>Response times percentiles (Includes Transaction Controller Sample Results): <figure width="1374" height="551" image="dashboard/report_response_time_percentiles.png" ></figure></li>
                             <li>Times vs Threads (Includes Transaction Controller Sample Results): <figure width="1373" height="567" image="dashboard/report_time_vs_threads.png" ></figure>
                             <note>In distributed mode, this graph shows a horizontal axis the number of threads for 1 server. It's a current limitation</note>
@@ -215,9 +215,9 @@ jmeter.save.saveservice.timestamp_format = ms
                     </properties>
                     <note>Percentiles used by Summary table and Percentile graphs can be adjusted to different values by using the 3 properties:
                     <ul>
-                        <li>aggregate_rpt_pct1 : Defaults to 90</li>
-                        <li>aggregate_rpt_pct2 : Defaults to 95</li>
-                        <li>aggregate_rpt_pct3 : Defaults to 99</li>
+                        <li>aggregate_rpt_pct1: Defaults to 90</li>
+                        <li>aggregate_rpt_pct2: Defaults to 95</li>
+                        <li>aggregate_rpt_pct3: Defaults to 99</li>
                     </ul>
                     </note>
                     <note>Relative paths are built from the JMeter working directory

From 85580b49ee2f06505129ebccac5d382e412c58e2 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 24 Jan 2022 20:51:01 +0100
Subject: [PATCH 0070/1037] Whitespace change (remove tab, as we normally use
 spaces here)

---
 xdocs/usermanual/properties_reference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index d4b05a2166b..e373627838d 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -117,7 +117,7 @@ defined in the <code>system.properties</code> file or on the command-line. The
     JVM does not support the specified cipher suites, or if the cipher suites
     supported by the HTTPS server do not overlap this list.  See the
     <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html#Customization">JSSE
-	    Reference Guide.</a><br/>
+    Reference Guide.</a><br/>
     For example: <source>https.cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256</source>
     If not specified, JMeter will use the default list of cipher suites
     supported by the JVM.

From 25932ff6b7b1364a27c46bd0f1e35dc7fac0a209 Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Tue, 25 Jan 2022 13:35:41 +0100
Subject: [PATCH 0071/1037] Update tika-parsers to 1.28, jackson to 2.13.1 and
 jsoup to 1.14.3

Detailed version updates are:
 Updated jsoup from 1.14.1 (in nightlies), from 1.13.1 (last released)
 Updated Apache Tika from 1.27 (in nightlies), from 1.26 (last released)
 Updated jackson to 2.13.1 (from 2.10.5)

Closes #695
---
 gradle.properties                           |  8 ++++----
 src/dist/src/dist/expected_release_jars.csv | 12 ++++++------
 xdocs/changes.xml                           |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index df7baa176cc..23207fddbef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -98,8 +98,8 @@ httpclient.version=4.5.13
 httpcore-nio.version=4.4.14
 httpcore.version=4.4.14
 httpmime.version=4.5.13
-jackson.version=2.10.5
-jackson-databind.version=2.10.5
+jackson.version=2.13.1
+jackson-databind.version=2.13.1
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
@@ -109,7 +109,7 @@ jmespath-jackson.version=0.5.0
 jodd.version=5.0.13
 json-path.version=2.6.0
 json-smart.version=2.4.7
-jsoup.version=1.14.1
+jsoup.version=1.14.3
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.1
@@ -132,7 +132,7 @@ slf4j.version=1.7.32
 spock-core.version=2.0-M2-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
-tika.version=1.27
+tika.version=1.28
 xalan.version=2.7.2
 xercesImpl.version=2.12.1
 xml-apis.version=1.4.01
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 3cd09108c19..a43c8d348bf 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -69,9 +69,9 @@
 328436,httpcore-4.4.14.jar
 369365,httpcore-nio-4.4.14.jar
 41790,httpmime-4.5.13.jar
-68080,jackson-annotations-2.10.5.jar
-349331,jackson-core-2.10.5.jar
-1404939,jackson-databind-2.10.5.jar
+75717,jackson-annotations-2.13.1.jar
+374588,jackson-core-2.13.1.jar
+1534017,jackson-databind-2.13.1.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16630,jcl-over-slf4j-1.7.32.jar
@@ -83,7 +83,7 @@
 26047,jodd-props-5.0.13.jar
 238605,json-path-2.6.0.jar
 119227,json-smart-2.4.7.jar
-415074,jsoup-1.14.1.jar
+423395,jsoup-1.14.3.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
@@ -121,8 +121,8 @@
 301279,svgSalamander-1.1.2.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
-734528,tika-core-1.27.jar
-1397879,tika-parsers-1.27.jar
+735635,tika-core-1.28.jar
+1585374,tika-parsers-1.28.jar
 174661,vis-svg-portable-jvm-2.2.1.jar
 3154938,xalan-2.7.2.jar
 1386502,xercesImpl-2.12.1.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 89c936b95b2..e45c4afcd95 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -167,13 +167,12 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache commons-pool2 to 2.11.0 (from 2.9.0).</li>
   <li>Updated equalsverifier to 3.7 (from 3.4.2).</li>
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
-  <li>Updated hsqldb to 2.5.2 (from 2.5.0).</li>
   <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
   <li>Updated Apache HttpCore to 4.4.14 (from 4.4.13).</li>
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
-  <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
+  <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.17.1 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
@@ -184,9 +183,10 @@ however, the profile can't be updated while the test is running.
   <li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
-  <li>Updated Apache Tika to 1.27 (from 1.26).</li>
+  <li>Updated Apache Tika to 1.28 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
+  <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
   <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
      to <code>user.properties</code>, as it is read from that place.
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>

From 6196e403091c2d9cf2f7d1ea6aa1610efab73e37 Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Thu, 13 Jan 2022 18:14:26 +0000
Subject: [PATCH 0072/1037] Fixed the deprecation warnings in build file

Closes #692
---
 build.gradle.kts  | 6 +++---
 xdocs/changes.xml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 19944b72401..97eccfa8262 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -207,7 +207,7 @@ fun SonarQubeProperties.add(name: String, valueProvider: () -> String) {
 }
 
 if (jacocoEnabled) {
-    val mergedCoverage = jacocoReport.get().reports.xml.destination.toString()
+    val mergedCoverage = jacocoReport.get().reports.xml.outputLocation.toString()
 
     // For every module we pass merged coverage report
     // That enables to see ":src:core" lines covered even in case they are covered from
@@ -493,8 +493,8 @@ allprojects {
 
         tasks.withType<JacocoReport>().configureEach {
             reports {
-                html.isEnabled = reportsForHumans()
-                xml.isEnabled = !reportsForHumans()
+                html.required.set(reportsForHumans())
+                xml.required.set(!reportsForHumans())
             }
         }
         // Add each project to combined report
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e45c4afcd95..3877b556b1a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -196,6 +196,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Gradle to 7.3 (from 7.2)</li>
   <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 97c969865abdb0c7e01731b856a234441367b499 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Feb 2022 12:06:07 +0100
Subject: [PATCH 0073/1037] Use isEmtpy instead of checking length

---
 .../apache/jmeter/protocol/http/proxy/FormCharSetFinder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index 84b595a227b..9588cde061e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -67,7 +67,7 @@ public void addFormActionsAndCharSet(String html, Map<String, String> formEncodi
                     // Just use the first one of the possible many charsets
                     if(charSets.length > 0) {
                         formCharSet = charSets[0].trim();
-                        if(formCharSet.length() == 0) {
+                        if (formCharSet.isEmpty()) {
                             formCharSet = null;
                         }
                     }

From 48dc723d22c52b5605022a8739c9bf65fd0be1ca Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Feb 2022 12:07:17 +0100
Subject: [PATCH 0074/1037] Use space between if and parenthesis

if is not a function.
---
 .../jmeter/protocol/http/proxy/FormCharSetFinder.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index 9588cde061e..77b3fe22fb7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -62,17 +62,17 @@ public void addFormActionsAndCharSet(String html, Map<String, String> formEncodi
                 String formCharSet = pageEncoding;
                 String acceptCharSet = element.attr("accept-charset");
                 // Check if we found an accept-charset attribute on the form
-                if(acceptCharSet != null) {
+                if (acceptCharSet != null) {
                     String[] charSets = JOrphanUtils.split(acceptCharSet, ",");
                     // Just use the first one of the possible many charsets
-                    if(charSets.length > 0) {
+                    if (charSets.length > 0) {
                         formCharSet = charSets[0].trim();
                         if (formCharSet.isEmpty()) {
                             formCharSet = null;
                         }
                     }
                 }
-                if(formCharSet != null) {
+                if (formCharSet != null) {
                     formEncodings.put(action, formCharSet);
                 }
             }

From a1b170de57f7f32a333aec2db9bb4d1823f44258 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Feb 2022 16:49:57 +0100
Subject: [PATCH 0075/1037] Catch NullPointerException from JSoup when
 recording a test plan

As reported in the bug issue, JSoup throws a NPE on some input.
When we know more about that input, we might be able to do
better, for now, let us wrap the exception into the declared
HTMLParseException and hope, that we can continue.

Bugzilla Id: 65864
---
 .../jmeter/protocol/http/proxy/FormCharSetFinder.java       | 6 +++++-
 xdocs/changes.xml                                           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index 77b3fe22fb7..43e3395aaaa 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -52,7 +52,11 @@ public void addFormActionsAndCharSet(String html, Map<String, String> formEncodi
             throws HTMLParseException {
         log.debug("Parsing html of: {}", html);
 
-        Document document = Jsoup.parse(html);
+        try {
+            Document document = Jsoup.parse(html);
+        } catch (RuntimeException e) {
+            throw new HTMLParseException("Could not parse HTML to look for forms charsets", e);
+        }
         Elements forms = document.select("form");
         for (Element element : forms) {
             String action = element.attr("action");
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3877b556b1a..2f86ec86bde 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -210,6 +210,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
   <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align ssl properties between Java and HC4 impl</li>
   <li><bug>65108</bug>Support JMeter variables in <a href="./usermanual/component_reference.html#HTTP_Request">GraphQL HTTP Request</a></li>
+  <li><bug>65864</bug>Catch NullPointerException from JSoup when recording a test plan</li>
 </ul>
 
 <h3>Other Samplers</h3>

From 3a74a92b298b0d32cfc96a689c8fc95125201dde Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Feb 2022 16:56:54 +0100
Subject: [PATCH 0076/1037] Catch NullPointerException from JSoup when
 recording a test plan

Fix stupid bug, where I placed the declaration of the method
variable inside the try-catch block.

Bugzilla Id: 65864
---
 .../apache/jmeter/protocol/http/proxy/FormCharSetFinder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index 43e3395aaaa..d577f320284 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -52,8 +52,9 @@ public void addFormActionsAndCharSet(String html, Map<String, String> formEncodi
             throws HTMLParseException {
         log.debug("Parsing html of: {}", html);
 
+        Document document;
         try {
-            Document document = Jsoup.parse(html);
+            document = Jsoup.parse(html);
         } catch (RuntimeException e) {
             throw new HTMLParseException("Could not parse HTML to look for forms charsets", e);
         }

From 755302aacda5468d8c1631b78607a900073fb961 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 13 Feb 2022 12:59:35 +0300
Subject: [PATCH 0077/1037] Add a checksum for
 gradle-enterprise-gradle-plugin-3.8.1.jar for Gradle 7.4+

---
 settings.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index e27df11c67c..8fce3cdecca 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -151,6 +151,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.7.2.jar",
     "24A1722CB574BA3126C3C6EBEB3D4A39D2A86ECCEDD378BA96A5508626D1AEAC7BB5FFBC189929E16900B94C1D016AFA83A462DCB2BB03F634FCA9C7FDE9EBA5"
         to "gradle-enterprise-gradle-plugin-3.8.jar",
+    "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
+        to "gradle-enterprise-gradle-plugin-3.8.1.jar",
     "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
         to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"

From dbbe8e6e353dc996f57b776b5948fc6b0cfde5a4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 17 Jan 2022 12:03:52 +0300
Subject: [PATCH 0078/1037] [Bug 63620] Fix GUI freeze when viewing response
 body with long lines

GUI gets unresponsive when the response contains long lines (e.g lines exceeding 100K chars).
The workaround is to add artificial line breaks.

We try to break on word boundaries first, and if not possible,
we break on char boundaries (e.g. large chunks of base64 data).

view.results.tree.max_line_size=110000 (defaults to 110K)
view.results.tree.soft_wrap_line_size=100000 (defaults to max_line_size/1.1)

CPU spin trace looks as follows:

"AWT-EventQue...
...
        at sun.font.GlyphLayout.layout(Unknown Source)
...
        at java.awt.font.TextLine.<init>(Unknown Source)
        at java.awt.font.TextMeasurer.makeTextLineOnRange(Unknown Source)
        at java.awt.font.TextMeasurer.getLayout(Unknown Source)
...
        at javax.swing.text.JTextComponent.setDocument(Unknown Source)
        at org.apache.jmeter.visualizers.SamplerResultTab.setTextOptimized(SamplerResultTab.java:695)
...
---
 bin/jmeter.properties                         |   7 +
 .../RenderAsBoundaryExtractor.java            |   1 +
 .../jmeter/visualizers/RenderAsCssJQuery.java |   1 +
 .../jmeter/visualizers/RenderAsRegexp.java    |   1 +
 .../jmeter/visualizers/RenderAsXPath.java     |   1 +
 .../jmeter/visualizers/RenderAsXPath2.java    |   1 +
 .../jmeter/visualizers/SamplerResultTab.java  |   1 +
 .../ViewResultsFullVisualizer.java            |  23 +++
 .../org/apache/jorphan/util/StringWrap.java   | 166 ++++++++++++++++++
 .../apache/jorphan/util/StringWrapTest.java   |  61 +++++++
 xdocs/changes.xml                             |   1 +
 xdocs/usermanual/properties_reference.xml     |  12 ++
 12 files changed, 276 insertions(+)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
 create mode 100644 src/jorphan/src/test/java/org/apache/jorphan/util/StringWrapTest.java

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 447b3649f0e..c77877efa6e 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1180,6 +1180,13 @@ cookies=cookies
 # Set to 0 to disable the size check and display the whole response
 #view.results.tree.max_size=10485760
 
+# UI gets unresponsive when response contains very long lines,
+# So we break lines by adding artificial line breaks
+# The break is introduced somewhere in between soft_wrap_line_size..max_line_size
+# We try to break on word boundaries first
+#view.results.tree.max_line_size=110000
+#view.results.tree.soft_wrap_line_size=100000
+
 # Order of Renderers in View Results Tree
 # Note full class names should be used for non JMeter core renderers
 # For JMeter core renderers, class names start with '.' and are automatically
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
index 0af0cdacf17..e48002e246f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
@@ -212,6 +212,7 @@ public void setSamplerResult(Object userObject) {
     public void renderResult(SampleResult sampleResult) {
         clearData();
         String response = ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+        response = ViewResultsFullVisualizer.wrapLongLines(response);
         boundaryExtractorDataField.setText(response);
         boundaryExtractorDataField.setCaretPosition(0);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
index eff86a9be55..e802246feab 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
@@ -145,6 +145,7 @@ private String process(String textToParse) {
    public void renderResult(SampleResult sampleResult) {
        clearData();
         String response = ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+        response = ViewResultsFullVisualizer.wrapLongLines(response);
         cssJqueryDataField.setText(response);
         cssJqueryDataField.setCaretPosition(0);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index 66d74fb0021..f598e0a1efa 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -143,6 +143,7 @@ private String process(String textToParse) {
     public void renderResult(SampleResult sampleResult) {
         clearData();
         String response = ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+        response = ViewResultsFullVisualizer.wrapLongLines(response);
         regexpDataField.setText(response);
         regexpDataField.setCaretPosition(0);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
index 2399f56db2c..f8e6ea51e8e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
@@ -180,6 +180,7 @@ private Document parseResponse(String unicodeData, XPathExtractor extractor)
     @Override
     public void renderResult(SampleResult sampleResult) {
         String response = ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+        response = ViewResultsFullVisualizer.wrapLongLines(response);
         try {
             xmlDataField.setText(response == null ? "" : response);
             xmlDataField.setCaretPosition(0);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
index b55ffcbac01..4dd8acf151a 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
@@ -164,6 +164,7 @@ private String getDocumentNamespaces(String textToParse) {
     @Override
     public void renderResult(SampleResult sampleResult) {
         String response = ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+        response = ViewResultsFullVisualizer.wrapLongLines(response);
         try {
             xmlDataField.setText(response == null ? "" : response);
             xmlDataField.setCaretPosition(0);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 3828c2a571d..f6d17f6e2a9 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -688,6 +688,7 @@ protected void setTextOptimized(String data) {
         Document blank = new DefaultStyledDocument();
         results.setDocument(blank);
         try {
+            data = ViewResultsFullVisualizer.wrapLongLines(data);
             document.insertString(0, data == null ? "" : data, null);
         } catch (BadLocationException ex) {
             LOGGER.error("Error inserting text", ex);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index d4520d55820..3a549ba9c1e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -74,6 +74,8 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
 import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.util.StringWrap;
+import org.apiguardian.api.API;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,6 +105,14 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer
     private static final int MAX_DISPLAY_SIZE =
             JMeterUtils.getPropDefault("view.results.tree.max_size", 10485760); // $NON-NLS-1$
 
+    // Default limited to 110K
+    private static final int MAX_LINE_SIZE =
+            JMeterUtils.getPropDefault("view.results.tree.max_line_size", 110000); // $NON-NLS-1$
+
+    // Limit the soft wrap to 100K (hard limit divided by 1.1)
+    private static final int SOFT_WRAP_LINE_SIZE =
+            JMeterUtils.getPropDefault("view.results.tree.soft_wrap_line_size", (int) (MAX_LINE_SIZE / 1.1f)); // $NON-NLS-1$
+
     // default display order
     private static final String VIEWERS_ORDER =
             JMeterUtils.getPropDefault("view.results.tree.renderers_order", ""); // $NON-NLS-1$ //$NON-NLS-2$
@@ -563,6 +573,19 @@ public static String getResponseAsString(SampleResult res) {
         return response;
     }
 
+    @API(status = API.Status.INTERNAL, since = "5.5")
+    public static String wrapLongLines(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+        if (SOFT_WRAP_LINE_SIZE > 0 && MAX_LINE_SIZE > 0) {
+            StringWrap stringWrap = new StringWrap(SOFT_WRAP_LINE_SIZE, MAX_LINE_SIZE);
+            return stringWrap.wrap(input, "\n");
+        }
+        return input;
+    }
+
+
     private static class ResultsNodeRenderer extends DefaultTreeCellRenderer {
         private static final long serialVersionUID = 4159626601097711565L;
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java b/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
new file mode 100644
index 00000000000..b36f66ad490
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
@@ -0,0 +1,166 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+import java.text.BreakIterator;
+
+import org.apiguardian.api.API;
+
+/**
+ * Wraps text in such a way so the lines do not exceed given maximum length.
+ */
+@API(since = "5.5", status = API.Status.EXPERIMENTAL)
+public class StringWrap {
+    private final int minWrap;
+    private final int maxWrap;
+
+    private final BreakCursor wordCursor = new BreakCursor(BreakIterator.getLineInstance());
+    private final BreakCursor charCursor = new BreakCursor(BreakIterator.getCharacterInstance());
+
+    /**
+     * Stores the current and the next position for a given {@link BreakIterator}.
+     * It allows reducing the number of calls to {@link BreakIterator}.
+     */
+    private static class BreakCursor {
+        private static final int UNINITIALIZED = -2;
+
+        private final BreakIterator iterator;
+        private int pos;
+        private int next;
+
+        BreakCursor(BreakIterator iterator) {
+            this.iterator = iterator;
+        }
+
+        void setText(String text) {
+            iterator.setText(text);
+            pos = 0;
+            next = UNINITIALIZED;
+        }
+
+        public int getPos() {
+            return pos;
+        }
+
+        /**
+         * Advances the cursor if possible.
+         * @param startWrap the start index of the wrap to consider
+         * @param endWrap the end index of the wrap to consider
+         * @return true if the next break is detected within startWrap..endWrap boundaries
+         */
+        public boolean advance(int startWrap, int endWrap) {
+            if (pos == BreakIterator.DONE || pos > endWrap) {
+                return false;
+            }
+            pos = next != UNINITIALIZED ? next : iterator.following(startWrap);
+            if (pos == BreakIterator.DONE || pos > endWrap) {
+                return false;
+            }
+            // Try adding more items up to endWrap
+            while (true) {
+                next = iterator.next();
+                if (next == BreakIterator.DONE || next > endWrap) {
+                    break;
+                }
+                pos = next;
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Creates string wrapper instance.
+     *
+     * @param minWrap minimal word length for the wrap
+     * @param maxWrap maximum word length for the wrap
+     */
+    public StringWrap(int minWrap, int maxWrap) {
+        this.minWrap = minWrap;
+        this.maxWrap = maxWrap;
+    }
+
+    public int getMinWrap() {
+        return minWrap;
+    }
+
+    public int getMaxWrap() {
+        return maxWrap;
+    }
+
+    /**
+     * Wraps given {@code input} text accoding to
+     *
+     * @param input     input text
+     * @param delimiter delimiter when inserting soft wraps
+     * @return modified text with added soft wraps, or input if wraps are not needed
+     */
+    public String wrap(String input, String delimiter) {
+        if (input.length() <= minWrap) {
+            return input;
+        }
+        wordCursor.setText(input);
+        charCursor.setText(input);
+        int pos = 0;
+        StringBuilder sb = new StringBuilder(input.length() + input.length() / minWrap * delimiter.length());
+        boolean hasChanges = false;
+        int nextLineSeparator = BreakCursor.UNINITIALIZED;
+        // Wrap long lines
+        while (input.length() - pos > maxWrap) {
+            if (nextLineSeparator != BreakIterator.DONE && nextLineSeparator < pos) {
+                nextLineSeparator = input.indexOf('\n', pos);
+            }
+            // Try adding the next line if it does not exceed maxWrap
+            int next = nextLineSeparator;
+            if (next != -1 && pos - next <= maxWrap) {
+                // The existing lines do not exceed maxWrap, just reuse them
+                next++; // include newline
+                sb.append(input, pos, next);
+                pos = next;
+                continue;
+            }
+            int startWrap = pos + minWrap - 1;
+            int endWrap = pos + maxWrap;
+            // Try breaking on word boundaries first
+            if (wordCursor.advance(startWrap, endWrap)) {
+                next = wordCursor.getPos();
+            } else {
+                // If char advances at least once, add it with the break even if it exceeds maxWrap
+                // Note: single "char break" might consume multiple Java chars in case like emojis.
+                charCursor.advance(startWrap, endWrap);
+                next = charCursor.getPos();
+                if (next == BreakIterator.DONE || next == input.length()) {
+                    break;
+                }
+            }
+            sb.append(input, pos, next);
+            sb.append(delimiter);
+            hasChanges = true;
+            pos = next;
+        }
+        // Free up the memory
+        wordCursor.setText("");
+        charCursor.setText("");
+        if (!hasChanges) {
+            return input;
+        }
+        if (pos != input.length()) {
+            sb.append(input, pos, input.length());
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/StringWrapTest.java b/src/jorphan/src/test/java/org/apache/jorphan/util/StringWrapTest.java
new file mode 100644
index 00000000000..12b19e3809b
--- /dev/null
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/StringWrapTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class StringWrapTest {
+    static Stream<Arguments> data() {
+        return Stream.of(
+                arguments(2, 2, "0123456789", "01|23|45|67|89"),
+                arguments(2, 5, "0123456789", "01234|56789"),
+                arguments(3, 3, "0123456789", "012|345|678|9"),
+                arguments(2, 5, "01-2-3-4-56-789-", "01-2-|3-4-|56-|789-"),
+                arguments(2, 5, "012\n345\n6\n7\n8\n9", null),
+                arguments(2, 5, "012\n3456789", "012\n34567|89"),
+                // Single-char symbols
+                arguments(2, 5, "丈丈丈丈丈a丈丈a 丈丈丈 b 丈丈", "丈丈丈丈丈|a丈丈a |丈丈丈 |b 丈丈"),
+                // Two-char symbols
+                arguments(2, 5, "निनिनिनिनिनिनdनिनिनिनि3निनिनिनिनिनि1 नि", "निनि|निनि|निनिन|dनिनि|निनि3|निनि|निनि|निनि1| नि"),
+                // Two-char symbols
+                arguments(2, 5, "😃😃😃😃😃😃😃😃a😃aa😃😃 😃😃 b 😃", "😃😃|😃😃|😃😃|😃😃a|😃aa|😃😃 |😃😃 |b 😃"),
+                arguments(1, 1, "😃", null),
+                // Multi-char symbols
+                arguments(2, 5, "rè̑ͧ̌aͨl̘̝̙̃ͤ͂̾̆rè̑ͧ̌aͨl̘̝̙̃ͤ͂̾̆rè̑ͧ", "rè̑ͧ̌|aͨ|l̘̝̙̃ͤ͂̾̆|r|è̑ͧ̌|aͨ|l̘̝̙̃ͤ͂̾̆|rè̑ͧ"),
+                arguments(2, 9, "rè̑ͧ̌aͨl̘̝̙̃ͤ͂̾̆rè̑ͧ̌aͨl̘̝̙̃ͤ͂̾̆rè̑ͧ", "rè̑ͧ̌aͨ|l̘̝̙̃ͤ͂̾̆|rè̑ͧ̌aͨ|l̘̝̙̃ͤ͂̾̆|rè̑ͧ")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    void wrap(int minWrap, int maxWrap, String input, String expected) {
+        if (expected == null) {
+            expected = input;
+        }
+        StringWrap stringWrap = new StringWrap(minWrap, maxWrap);
+        String output = stringWrap.wrap(input, "|");
+        assertEquals(expected, output, () -> "minWrap=" + minWrap + ", maxWrap=" + maxWrap + ", input=" + input);
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2f86ec86bde..1666936dc13 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -143,6 +143,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>61805</bug><pr>663</pr>Add simple HTTP request template. Contributed by Ori Marko (orimarko at gmail.com)</li>
   <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
   <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
+  <li><bug>63620</bug><pr>694</pr>Fix GUI freeze when viewing response body with long line breaks</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index e373627838d..c4452ecfe26 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1510,6 +1510,18 @@ JMETER-SERVER</source>
     Set to zero to disable the size check and display the whole response.<br/>
     Defaults to: <code>10485760</code>
 </property>
+<property name="view.results.tree.max_line_size">
+    Maximum size (in characters) of the line in the displayed.<br/>
+    This property works around Bug 63620 since Swing hangs when displaying very long lines.<br/>
+    Set to zero to disable line wrapping.<br/>
+    Defaults to: <code>110000</code>
+</property>
+<property name="view.results.tree.soft_wrap_line_size">
+    Line size (in characters) to consider wrapping to make UI faster.<br/>
+    This property works around Bug 63620 since Swing hangs when displaying very long lines.<br/>
+    Set to zero to disable line wrapping.<br/>
+    Defaults to: <code>view.results.tree.max_line_size / 1.1f</code>
+</property>
 <property name="view.results.tree.renderers_order">
     Order of Renderers in View Results Tree.<br/>
     <note>Note full class names should be used for non JMeter core renderers</note>

From d4f637130db35cec7993094357290236ffef4497 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 6 Feb 2022 13:38:49 +0300
Subject: [PATCH 0079/1037] [Bug 63620] Disable kerning when document lenght
 exceeds 10K

The treshold can be configured via text.kerning.max_document_size
---
 bin/jmeter.properties                         |   3 +
 .../jmeter/visualizers/SamplerResultTab.java  |   2 +
 .../main/java/org/apache/jmeter/JMeter.java   |   4 +
 .../jorphan/gui/ui/KerningOptimizer.java      | 200 ++++++++++++++++++
 .../jorphan/gui/ui/TextAreaUIWithUndo.java    |   1 +
 xdocs/usermanual/properties_reference.xml     |   4 +
 6 files changed, 214 insertions(+)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index c77877efa6e..8996e4f185d 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1201,6 +1201,9 @@ view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundar
 # Set to 0 to disable the size check
 #document.max_size=0
 
+# Configures the maximum document length for rendering with kerning enabled
+#text.kerning.max_document_size=10000
+
 #JMS options
 # Enable the following property to stop JMS Point-to-Point Sampler from using
 # the properties java.naming.security.[principal|credentials] when creating the queue connection
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index f6d17f6e2a9..5a9afe4fad2 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -61,6 +61,7 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.gui.RendererUtils;
+import org.apache.jorphan.gui.ui.KerningOptimizer;
 import org.apache.jorphan.reflect.Functor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -693,6 +694,7 @@ protected void setTextOptimized(String data) {
         } catch (BadLocationException ex) {
             LOGGER.error("Error inserting text", ex);
         }
+        KerningOptimizer.INSTANCE.configureKerning(results, document.getLength());
         results.setDocument(document);
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 83a62020036..e5dffc61a99 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -105,6 +105,7 @@
 import org.apache.jorphan.collections.SearchByClass;
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.gui.ui.KerningOptimizer;
 import org.apache.jorphan.reflect.ClassTools;
 import org.apache.jorphan.util.HeapDumper;
 import org.apache.jorphan.util.JMeterException;
@@ -374,6 +375,9 @@ private void startGui(String testFile) {
         System.out.println("Check : https://jmeter.apache.org/usermanual/best-practices.html");//NOSONAR
         System.out.println("================================================================================");//NOSONAR
 
+        KerningOptimizer.INSTANCE.setMaxTextLengthWithKerning(
+                JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
+        );
         JMeterUIDefaults.INSTANCE.install();
 
         String jMeterLaf = LookAndFeelCommand.getPreferredLafCommand();
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java
new file mode 100644
index 00000000000..a414cae47d5
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java
@@ -0,0 +1,200 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.gui.ui;
+
+import java.awt.Font;
+import java.awt.font.TextAttribute;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
+
+import org.apiguardian.api.API;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Text rendering might be slow for long lines when kerning is enabled, so it is worth disabling kerning for long
+ * texts.
+ */
+@API(since = "5.5", status = API.Status.INTERNAL)
+public class KerningOptimizer {
+    private final static Logger log = LoggerFactory.getLogger(KerningOptimizer.class);
+
+    public static final KerningOptimizer INSTANCE = new KerningOptimizer();
+
+    private volatile int maxLengthWithKerning = 10000;
+
+    /**
+     * Cache to avoid repeated calls to {@link Font#getAttributes()} since it copies the map every time.
+     */
+    static class FontKerningCache {
+        private static final String CLIENT_PROPERTY_KEY = "[jmeter]FontKerningCache";
+        WeakReference<Font> font;
+        boolean kerning;
+
+        static Boolean kerningOf(JComponent component) {
+            Font font = component.getFont();
+            if (font == null) {
+                return null;
+            }
+            if (!font.hasLayoutAttributes()) {
+                return false;
+            }
+            FontKerningCache cache = (FontKerningCache) component.getClientProperty(CLIENT_PROPERTY_KEY);
+            if (cache == null) {
+                cache = new FontKerningCache();
+                component.putClientProperty(CLIENT_PROPERTY_KEY, cache);
+            }
+            if (cache.font == null || !font.equals(cache.font.get())) {
+                cache.font = new WeakReference<>(font);
+                cache.kerning = TextAttribute.KERNING_ON.equals(font.getAttributes().get(TextAttribute.KERNING));
+            }
+            return cache.kerning;
+        }
+    }
+
+    /**
+     * Configures the maximum document length for rendering with kerning enabled.
+     *
+     * @param length maximum document length for rendering with kerning enabled
+     */
+    public void setMaxTextLengthWithKerning(int length) {
+        maxLengthWithKerning = length;
+    }
+
+    public int getMaxTextLengthWithKerning() {
+        return maxLengthWithKerning;
+    }
+
+    /**
+     * Configures text kerning according to the expected document length. This might be useful before setting the
+     * document so the kerning is disabled before updating the document.
+     *
+     * @param component      text component for kerning configuration
+     * @param documentLength expected document length
+     */
+    public void configureKerning(JComponent component, int documentLength) {
+        Boolean kerning = FontKerningCache.kerningOf(component);
+        if (kerning == null) {
+            return;
+        }
+        boolean desiredKerning = documentLength <= maxLengthWithKerning;
+        if (kerning != desiredKerning) {
+            if (log.isDebugEnabled()) {
+                log.info("Updating kerning (old: {}, new: {}), documentLength={}, component {}, ", kerning, desiredKerning, documentLength, component);
+            }
+            Font font = component.getFont();
+            Font newFont = font.deriveFont(Collections.singletonMap(TextAttribute.KERNING, desiredKerning ? TextAttribute.KERNING_ON : 0));
+            SwingUtilities.invokeLater(() -> component.setFont(newFont));
+        }
+    }
+
+    /**
+     * Adds a listener that disables kerning if text length reaches a certain threshold.
+     *
+     * @param textComponent text component for kerning configuration
+     */
+    public void installKerningListener(JTextComponent textComponent) {
+        log.debug("Installing KerningOptimizer {} to {}", this, textComponent);
+        textComponent.addPropertyChangeListener("document", new DisableKerningForLargeTexts(textComponent));
+    }
+
+    /**
+     * Removes the listener that disables kerning if text length reaches a certain threshold.
+     *
+     * @param textComponent text component for kerning configuration
+     */
+    public void uninstallKerningListener(JTextComponent textComponent) {
+        DisableKerningForLargeTexts kerningListener = null;
+        for (PropertyChangeListener listener : textComponent.getPropertyChangeListeners("document")) {
+            if (listener instanceof DisableKerningForLargeTexts) {
+                kerningListener = (DisableKerningForLargeTexts) listener;
+            }
+        }
+        if (kerningListener == null) {
+            return;
+        }
+        log.debug("Uninstalling KerningOptimizer {} from {}", this, textComponent);
+        Document document = textComponent.getDocument();
+        if (document != null) {
+            document.removeDocumentListener(kerningListener);
+        }
+        textComponent.removePropertyChangeListener("document", kerningListener);
+    }
+
+    static class DisableKerningForLargeTexts implements PropertyChangeListener, DocumentListener {
+        final JTextComponent component;
+
+        DisableKerningForLargeTexts(JTextComponent component) {
+            this.component = component;
+        }
+
+        private void configureKerning(Document e) {
+            // RSyntaxTextArea and other implementations do not expect setFont called from document change listeners
+            // It looks like invokeLater fixes that
+            Boolean kerning = FontKerningCache.kerningOf(component);
+            if (kerning == null) {
+                return;
+            }
+            boolean desiredKerning = e.getLength() <= INSTANCE.getMaxTextLengthWithKerning();
+            if (kerning != desiredKerning) {
+                SwingUtilities.invokeLater(() -> INSTANCE.configureKerning(component, e.getLength()));
+            }
+        }
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            if (!"document".equals(evt.getPropertyName())) {
+                return;
+            }
+            Document oldDocument = (Document) evt.getOldValue();
+            if (oldDocument != null) {
+                oldDocument.removeDocumentListener(this);
+            }
+            Document newDocument = (Document) evt.getNewValue();
+            if (newDocument != null) {
+                newDocument.addDocumentListener(this);
+                configureKerning(newDocument);
+            }
+        }
+
+
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            configureKerning(e.getDocument());
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            configureKerning(e.getDocument());
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            configureKerning(e.getDocument());
+        }
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextAreaUIWithUndo.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextAreaUIWithUndo.java
index 75dd190a058..8cc94e061f6 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextAreaUIWithUndo.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextAreaUIWithUndo.java
@@ -60,6 +60,7 @@ public static void install(UIDefaults defaults) {
      */
     @SuppressWarnings("unused")
     public static ComponentUI createUI(JComponent component) {
+        KerningOptimizer.INSTANCE.installKerningListener((JTextComponent) component);
         TextComponentUI.INSTANCE.installUndo((JTextComponent) component);
         if (component.getClass() == JTextArea.class) {
             component.addPropertyChangeListener("UI",
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index c4452ecfe26..fb53cd2e1e2 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1535,6 +1535,10 @@ JMETER-SERVER</source>
     Set to zero to disable the size check.<br/>
     Defaults to: <code>10485760</code>
 </property>
+<property name="text.kerning.max_document_size">
+    Configures the maximum document length for rendering with kerning enabled.<br/>
+    Defaults to: <code>10000</code>
+</property>
 <property name="JMSSampler.useSecurity.properties">
     JMS options.<br/>
     Enable the following property to stop JMS Point-to-Point Sampler from using

From 8546e2372ac08eecc27f56a5bfc24a6c4ecc7135 Mon Sep 17 00:00:00 2001
From: pmouawad <p.mouawad@ubik-ingenierie.com>
Date: Tue, 15 Feb 2022 23:09:16 +0100
Subject: [PATCH 0080/1037] Bug 65885 - HTML Report: Error report displays
 wrong failure message when Response Assertion checks Ignore Status and
 response code is not 200

---
 .../report/processor/ErrorsSummaryConsumer.java     |  9 ++++++---
 .../report/processor/ErrorsSummaryConsumerTest.java | 13 +++++++++++--
 xdocs/changes.xml                                   |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index f0175730aaf..3b8d3b5ae92 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -88,17 +88,20 @@ protected String getKeyFromSample(Sample sample) {
      * @return String Error key for sample
      */
     static String getErrorKey(Sample sample) {
+        if (sample.getSuccess()) {
+            return "";
+        }
         String responseCode = sample.getResponseCode();
         String responseMessage = sample.getResponseMessage();
         String key = responseCode + (!StringUtils.isEmpty(responseMessage) ?
                  "/" + escapeJson(responseMessage) : "");
+
         if (MetricUtils.isSuccessCode(responseCode) ||
-                (StringUtils.isEmpty(responseCode) &&
-                        !StringUtils.isEmpty(sample.getFailureMessage()))) {
+                StringUtils.isNotBlank(sample.getFailureMessage())) {
             key = MetricUtils.ASSERTION_FAILED;
             if (ASSERTION_RESULTS_FAILURE_MESSAGE) {
                 String msg = sample.getFailureMessage();
-                if (!StringUtils.isEmpty(msg)) {
+                if (StringUtils.isNotBlank(msg)) {
                     key = escapeJson(msg);
                 }
             }
diff --git a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
index ab43b8e964f..9a41be978e4 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
@@ -38,6 +38,9 @@ public void testGetErrorKey() {
         sample = new Sample(0, metadata, new String[] { "false", "200", "", "FailureMessage" });
         assertEquals("FailureMessage", ErrorsSummaryConsumer.getErrorKey(sample));
 
+        sample = new Sample(0, metadata, new String[] { "false", "200", "", "" });
+        assertEquals(MetricUtils.ASSERTION_FAILED, ErrorsSummaryConsumer.getErrorKey(sample));
+
         sample = new Sample(0, metadata, new String[] { "false", "200", "",
                 "Test failed: text expected to contain /<title>Some html text</title>/" });
         assertEquals("Test failed: text expected to contain /&lt;title&gt;Some html text&lt;/title&gt;/",
@@ -49,9 +52,15 @@ public void testGetErrorKey() {
                 ErrorsSummaryConsumer.getErrorKey(sample));
 
         sample = new Sample(0, metadata, new String[] { "true", "200", "", "" });
-        assertEquals(MetricUtils.ASSERTION_FAILED, ErrorsSummaryConsumer.getErrorKey(sample));
+        assertEquals("", ErrorsSummaryConsumer.getErrorKey(sample));
+
+        sample = new Sample(0, metadata, new String[] { "false", "403", "", "" });
+        assertEquals("403", ErrorsSummaryConsumer.getErrorKey(sample));
+
+        sample = new Sample(0, metadata, new String[] { "false", "403", "", "FailureMessage" });
+        assertEquals("FailureMessage", ErrorsSummaryConsumer.getErrorKey(sample));
 
-        sample = new Sample(0, metadata, new String[] { "false", "500", "Server Error", "FailureMessage" });
+        sample = new Sample(0, metadata, new String[] { "false", "500", "Server Error", "" });
         assertEquals("500/Server Error", ErrorsSummaryConsumer.getErrorKey(sample));
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1666936dc13..ced05b19f21 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -136,6 +136,7 @@ however, the profile can't be updated while the test is running.
 <h3>Report / Dashboard</h3>
 <ul>
   <li><bug>65353</bug>Make the estimator used for calculating percentiles on the dashboard configurable</li>
+  <li><bug>65885</bug>HTML Report: Error report displays wrong failure message when Response Assertion checks Ignore Status and response code is not 200</li>
 </ul>
 
 <h3>General</h3>

From efe50ca5b150cdbdb578886f8b4d98d3f1ea264f Mon Sep 17 00:00:00 2001
From: sseide <account-github@seide.st>
Date: Wed, 16 Feb 2022 13:39:36 +0100
Subject: [PATCH 0081/1037] update tika-parsers to 1.28.1 (from 1.28) and
 xstreams to 1.4.19 (from 1.4.18) (#698)

* update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from 1.4.18)

* update xercesImpl to 2.12.2 (from 2.12.1) and add new gpg key from xerces maintainer (ref XERCESJ-1735)

* add pr number to changes.xml

* update expected_release_jars.csv
---
 checksum.xml                                | 1 +
 gradle.properties                           | 6 +++---
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 7 +++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index c335c72277a..c860213a819 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -198,6 +198,7 @@
     <trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
     <trusted-key id='9ff25980f5ba7e4f' group='xalan' />
     <trusted-key id='858fc4c4f43856a3' group='xerces' />
+    <trusted-key id='7d713008cc07e9ad' group='xerces' />
     <trusted-key id='86fdc7e2a11262cb' group='xml-apis' />
   </trusted-keys>
   <dependencies>
diff --git a/gradle.properties b/gradle.properties
index 23207fddbef..376c3298fd6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -132,12 +132,12 @@ slf4j.version=1.7.32
 spock-core.version=2.0-M2-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
-tika.version=1.28
+tika.version=1.28.1
 xalan.version=2.7.2
-xercesImpl.version=2.12.1
+xercesImpl.version=2.12.2
 xml-apis.version=1.4.01
 xmlgraphics-commons.version=2.6
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
-xstream.version=1.4.18
+xstream.version=1.4.19
 wiremock-jre8.version=2.30.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index a43c8d348bf..9caa9b8281f 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -121,13 +121,13 @@
 301279,svgSalamander-1.1.2.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
-735635,tika-core-1.28.jar
-1585374,tika-parsers-1.28.jar
+735645,tika-core-1.28.1.jar
+1585382,tika-parsers-1.28.1.jar
 174661,vis-svg-portable-jvm-2.2.1.jar
 3154938,xalan-2.7.2.jar
-1386502,xercesImpl-2.12.1.jar
+1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
 674607,xmlgraphics-commons-2.6.jar
 7188,xmlpull-1.1.3.1.jar
-629707,xstream-1.4.18.jar
+633140,xstream-1.4.19.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ced05b19f21..44a09ceef70 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -152,7 +152,7 @@ however, the profile can't be updated while the test is running.
   <li>Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>655</pr><pr>667</pr><pr>675</pr>Updated x-stream to 1.4.18 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.7 (from 2.3), accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
@@ -185,7 +185,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
-  <li>Updated Apache Tika to 1.28 (from 1.26).</li>
+  <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
   <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
@@ -263,10 +263,9 @@ however, the profile can't be updated while the test is running.
 <h3>General</h3>
 <ul>
   <li><bug>64318</bug>DNS Cache Manager - custom DNS resolver does not use system resolver by default</li>
-  <li><pr>641</pr>Updated xercesImpl to 2.12.1 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
+  <li><pr>641</pr><pr>698</pr>Updated xercesImpl to 2.12.2 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
   <li><pr>645</pr>Add escaping for new lines in <code>AbstractInfluxdbMetricsSender</code>. Contributed by David Getzlaff (david.getzlaff at t-systems.com>)</li>
   <li><bug>65198</bug>Can't copy generated function from FunctionHelper</li>
-  <li>Updated Apache Tika to 1.26 (from 1.24.1)</li>
   <li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at gmail.com)</li>
   <li><pr>661</pr>Fix wording in doc. Contributed by BugKing (wangzhen at fit2cloud.com)</li>
   <li><pr>664</pr>Allow whitespace in path. Contributed by Till Neunast (github.com/tilln)</li>

From 33ad9306b2fbe823fd9fd1bd207262cd7a0ec4a6 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 16 Feb 2022 21:54:44 +0100
Subject: [PATCH 0082/1037] Allow unquoted tokens for values in
 content-disposition header

Use httpcomponents BasicHeaderValueParser instead of our simple parser, as
we were assuming parameters would always be surrounded by quotes.

Bugzilla Id: 65884
---
 .../http/config/MultipartUrlConfig.java       | 47 ++++++++---
 .../http/config/MultipartUrlConfigTest.java   | 82 ++++++++++++++++++-
 xdocs/changes.xml                             |  1 +
 3 files changed, 114 insertions(+), 16 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index e420fdefbd8..f4eeae90d16 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -20,6 +20,10 @@
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HeaderElement;
+import org.apache.http.NameValuePair;
+import org.apache.http.ParseException;
+import org.apache.http.message.BasicHeaderValueParser;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPFileArgs;
@@ -28,6 +32,8 @@
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Configuration element which handles HTTP Parameters and files to be uploaded
@@ -46,6 +52,8 @@ public class MultipartUrlConfig implements Serializable {
 
     private final Arguments args;
 
+    private static final Logger log = LoggerFactory.getLogger(MultipartUrlConfig.class);
+
     /**
      * HTTPFileArgs list to be uploaded with http request.
      */
@@ -129,20 +137,25 @@ public void parseArguments(String queryString) {
             // Check if it is form data
             if (contentDisposition != null && contentDisposition.contains("form-data")) { //$NON-NLS-1$
                 // Get the form field name
-                final String namePrefix = "name=\""; //$NON-NLS-1$
-                int index = contentDisposition.indexOf(namePrefix) + namePrefix.length();
-                String name = contentDisposition.substring(index, contentDisposition.indexOf('\"', index)); //$NON-NLS-1$
-
-                // Check if it is a file being uploaded
-                final String filenamePrefix = "filename=\""; //$NON-NLS-1$
-                if (contentDisposition.contains(filenamePrefix)) {
-                    // Get the filename
-                    index = contentDisposition.indexOf(filenamePrefix) + filenamePrefix.length();
-                    String path = contentDisposition.substring(index, contentDisposition.indexOf('\"', index)); //$NON-NLS-1$
-                    if (path != null && path.length() > 0) {
-                        // Set the values retrieved for the file upload
-                        files.addHTTPFileArg(path, name, contentType);
+                HeaderElement[] headerElements = null;
+                try {
+                    headerElements = BasicHeaderValueParser.parseElements(
+                            contentDisposition,
+                            BasicHeaderValueParser.INSTANCE);
+                } catch (ParseException e) {
+                    log.info("Can't parse header {}", contentDisposition, e);
+                }
+                String name = "";
+                String path = null;
+                if (headerElements != null) {
+                    for (HeaderElement element : headerElements) {
+                        name = getParameterValue(element, "name", "");
+                        path = getParameterValue(element, "filename", null);
                     }
+                }
+                if (path != null && !path.isEmpty()) {
+                    // Set the values retrieved for the file upload
+                    files.addHTTPFileArg(path, name, contentType);
                 } else {
                     // Find the first empty line of the multipart, it signals end of headers for multipart
                     // Agents are supposed to terminate lines in CRLF:
@@ -160,6 +173,14 @@ public void parseArguments(String queryString) {
         }
     }
 
+    private static String getParameterValue(HeaderElement element, String name, String defaultValue) {
+        NameValuePair parameter = element.getParameterByName(name);
+        if (parameter == null) {
+            return defaultValue;
+        }
+        return parameter.getValue();
+    }
+
     private static String getHeaderValue(String headerName, String multiPart) {
         String regularExpression = headerName + "\\s*:\\s*(.*)$"; //$NON-NLS-1$
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
index 214d3eca52a..e31cebe27f0 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
@@ -19,17 +19,24 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.protocol.http.util.HTTPFileArgs;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class MultipartUrlConfigTest {
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testConstructors() {
+    void testConstructors() {
         MultipartUrlConfig muc = new MultipartUrlConfig();
         assertEquals(0, muc.getArguments().getArgumentCount());
         assertEquals(0, muc.getHTTPFileArgs().getHTTPFileArgCount());
@@ -41,7 +48,7 @@ public void testConstructors() {
 
     // TODO - should LF-only EOL be allowed?
     @Test
-    public void testParseArgumentsLF() {
+    void testParseArgumentsLF() {
         String queryString
             = "Content-Disposition: form-data; name=\"aa\"\n"
             + "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -90,7 +97,7 @@ public void testParseArgumentsLF() {
     }
 
     @Test
-    public void testParseArgumentsCRLF() {
+    void testParseArgumentsCRLF() {
         String queryString
             = "Content-Disposition: form-data; name=\"aa\"\r\n"
             + "Content-Type: text/plain; charset=ISO-8859-1\r\n"
@@ -137,4 +144,73 @@ public void testParseArgumentsCRLF() {
         assertEquals("abc", arg.getName());
         assertEquals("xyz  \r\nxyz  ", arg.getValue());
     }
+
+    private static Stream<org.junit.jupiter.params.provider.Arguments> quotedMultiPartArgs() {
+        String boundary = "7d159c1302d0y0";
+        HTTPFileArgs fileArgs = new HTTPFileArgs();
+        List<Argument> args = new ArrayList<>();
+        List<String> queryLines = new ArrayList<>();
+        int counter = 1;
+        for (boolean quoteName: Arrays.asList(true, false)) {
+            String paramName = "abc" + counter;
+            counter++;
+            String quoteStringName = quoteName ? '"' + paramName + '"' : paramName;
+            String value = "some value for " + paramName;
+            queryLines.add(String.format("Content-Disposition: form-data; name=%s", quoteStringName));
+            queryLines.add("Content-Type: text/plain; charset=ISO-8859-1");
+            queryLines.add("Content-Transfer-Encoding: 8bit");
+            queryLines.add("");
+            queryLines.add(value);
+            queryLines.add("--" + boundary);
+            args.add(new Argument(paramName, value));
+            for (boolean quoteFilename: Arrays.asList(true, false)) {
+                String filenameName = "def" + counter;
+                counter++;
+                String quoteStringFile = quoteFilename ? '"' +filenameName + '"' : filenameName ;
+                String content = "some value for " + paramName + " and " + filenameName ;
+                queryLines.add(String.format("Content-Disposition: form-data; name=%s; filename=%s",
+                        quoteStringName,
+                        quoteStringFile
+                        ));
+                queryLines.add("Content-Type: text/plain");
+                queryLines.add("Content-Transfer-Encoding: binary");
+                queryLines.add("");
+                queryLines.add(content);
+                queryLines.add("");
+                queryLines.add("--" + boundary);
+                fileArgs.addHTTPFileArg(filenameName, paramName, "text/plain");
+            }
+        }
+        queryLines.remove(queryLines.size()-1);
+        queryLines.add("");
+        return Stream.of(
+                org.junit.jupiter.params.provider.Arguments.of(
+                        boundary, String.join("\n", queryLines), fileArgs, args),
+                org.junit.jupiter.params.provider.Arguments.of(
+                        boundary, String.join("\r\n", queryLines), fileArgs, args));
+    }
+
+    @ParameterizedTest()
+    @MethodSource("quotedMultiPartArgs")
+    void testParseArgumentsQuotingStyle(String boundary, String queryString, HTTPFileArgs expectedFiles, List<Argument> expectedArgs) {
+        MultipartUrlConfig muc = new MultipartUrlConfig(boundary);
+        muc.parseArguments(queryString);
+        HTTPFileArgs files = muc.getHTTPFileArgs();
+        assertEquals(expectedFiles.getHTTPFileArgCount(), files.getHTTPFileArgCount());
+        for (int i=0; i<files.getHTTPFileArgCount(); i++) {
+            HTTPFileArg got = files.getHTTPFileArg(i);
+            HTTPFileArg expected = expectedFiles.getHTTPFileArg(i);
+            assertEquals(expected.getParamName(), got.getParamName());
+            assertEquals(expected.getPath(), got.getPath());
+            assertEquals(expected.getMimeType(), got.getMimeType());
+        }
+        Arguments args = muc.getArguments();
+        assertEquals(expectedArgs.size(), args.getArgumentCount());
+        for (int i=0; i<args.getArgumentCount(); i++) {
+            Argument got = args.getArgument(i);
+            Argument expected = expectedArgs.get(i);
+            assertEquals(expected.getName(), got.getName());
+            assertEquals(expected.getValue(), got.getValue());
+        }
+    }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 44a09ceef70..8a3aaeb5543 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -230,6 +230,7 @@ however, the profile can't be updated while the test is running.
 <ul>
   <li><bug>64962</bug>Save CSV sub-results recursively from View Results Tree</li>
   <li><bug>65784</bug>No Graphs displayed in Aggregate Report/Response Time Graph</li>
+  <li><bug>65884</bug>GUI doesn't display response for multipart request <em>manually</em> encoded</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From bc0d31de7b06b4b2666637e8fdcee74548e3e79f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 17 Feb 2022 21:19:14 +0100
Subject: [PATCH 0083/1037] Fix generated Content-disposition header for
 failing test

After fixing issue 65884, the parser for the content-disposition header is more
lenient on the usage of quotes, but less forgiving about missing seperators between
the parameters.

Part of Bugzilla Id: 65884
---
 .../apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index 2c2c2d9ec74..82c5b46bcfa 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -612,7 +612,7 @@ private String createMultipartFileUploadBody(String fileField, String fileName,
             String fileMimeType, String fileContent, String boundary, String endOfLine) {
         // File upload multipart
         String postBody = "--" + boundary + endOfLine
-            + "Content-Disposition: form-data; name=\"" + fileField + "\" filename=\"" + fileName + "\"" + endOfLine
+            + "Content-Disposition: form-data; name=\"" + fileField + "\"; filename=\"" + fileName + "\"" + endOfLine
             + "Content-Type: " + fileMimeType + endOfLine
             + "Content-Transfer-Encoding: binary" + endOfLine
             + endOfLine

From c2f29ccfd1e2619ae2960c96bd54e76e2ba0e03b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 19 Feb 2022 19:41:27 +0100
Subject: [PATCH 0084/1037] Setup GUI in Swing thread

This seems to be the right thing to do and it fixes an exception, that happens
on startup after the code for Bug 63620 has been incorporated.

The exception was:

ERROR o.a.j.g.u.JSyntaxTextArea: Dubious problem while setting text to SOMETHING
java.lang.NullPointerException: null
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView.updateMetrics(WrappedSyntaxView.java:1081) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView.getPreferredSpan(WrappedSyntaxView.java:618) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView.calculateBreakPosition(WrappedSyntaxView.java:114) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView$WrappedLine.calculateLineCount(WrappedSyntaxView.java:1191) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView$WrappedLine.handleDocumentEvent(WrappedSyntaxView.java:1440) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView$WrappedLine.insertUpdate(WrappedSyntaxView.java:1464) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at org.fife.ui.rsyntaxtextarea.WrappedSyntaxView.insertUpdate(WrappedSyntaxView.java:705) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at javax.swing.plaf.basic.BasicTextUI$RootView.insertUpdate(BasicTextUI.java:1706) ~[?:?]
        at javax.swing.plaf.basic.BasicTextUI$UpdateHandler.insertUpdate(BasicTextUI.java:1965) ~[?:?]
        at javax.swing.text.AbstractDocument.fireInsertUpdate(AbstractDocument.java:203) ~[?:?]
        at org.fife.ui.rsyntaxtextarea.RSyntaxDocument.fireInsertUpdate(RSyntaxDocument.java:187) ~[rsyntaxtextarea-3.1.3.jar:3.1.3]
        at javax.swing.text.AbstractDocument.handleInsertString(AbstractDocument.java:757) ~[?:?]
        at javax.swing.text.AbstractDocument.insertString(AbstractDocument.java:716) ~[?:?]
        at javax.swing.text.PlainDocument.insertString(PlainDocument.java:131) ~[?:?]
        at javax.swing.text.AbstractDocument.replace(AbstractDocument.java:675) ~[?:?]
        at javax.swing.text.JTextComponent.setText(JTextComponent.java:1729) ~[?:?]
        at org.apache.jmeter.gui.util.JSyntaxTextArea.setInitialText(JSyntaxTextArea.java:296) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.testbeans.gui.TextAreaEditor.setValue(TextAreaEditor.java:112) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer.setEditorValue(GenericTestBeanCustomizer.java:479) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer.setObject(GenericTestBeanCustomizer.java:511) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.testbeans.gui.TestBeanGUI.setValues(TestBeanGUI.java:323) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.testbeans.gui.TestBeanGUI.configure(TestBeanGUI.java:307) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.tree.JMeterTreeModel.addComponent(JMeterTreeModel.java:162) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.tree.JMeterTreeModel.addSubTree(JMeterTreeModel.java:131) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.tree.JMeterTreeModel.addSubTree(JMeterTreeModel.java:123) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.GuiPackage.addSubTree(GuiPackage.java:554) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.action.Load.insertLoadedTree(Load.java:199) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.gui.action.Load.insertLoadedTree(Load.java:235) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.JMeter.startGui(JMeter.java:431) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at org.apache.jmeter.JMeter.start(JMeter.java:566) [ApacheJMeter_core.jar:5.5-SNAPSHOT]
        at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:?]
        at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:?]
        at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:?]
        at java.lang.reflect.Method.invoke(Method.java:564) ~[?:?]
        at org.apache.jmeter.NewDriver.main(NewDriver.java:257)

Which seemed to happen on the main thread.

Part of [Bug 63620] Fix GUI freeze when viewing response body with long lines

Bugzilla Id: 63620
---
 src/core/src/main/java/org/apache/jmeter/JMeter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index e5dffc61a99..3fa0d81f511 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -54,6 +54,7 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.swing.JTree;
+import javax.swing.SwingUtilities;
 import javax.swing.tree.TreePath;
 
 import org.apache.commons.cli.avalon.CLArgsParser;
@@ -563,7 +564,8 @@ public void start(String[] args) {
                     ReportGenerator generator = new ReportGenerator(reportFile, null);
                     generator.generate();
                 } else if (parser.getArgumentById(NONGUI_OPT) == null) { // not non-GUI => GUI
-                    startGui(testFile);
+                    String initialTestFile = testFile;
+                    SwingUtilities.invokeAndWait(() -> startGui(initialTestFile));
                     startOptionalServers();
                 } else { // NON-GUI must be true
                     extractAndSetReportOutputFolder(parser, deleteResultFile);

From 1d573158f2af7be882674e59c02490836abd0cde Mon Sep 17 00:00:00 2001
From: KING76169835 <liuboyang468@126.com>
Date: Sat, 26 Feb 2022 12:29:01 +0800
Subject: [PATCH 0085/1037] =?UTF-8?q?CSV=E6=96=87=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E6=A8=A1=E5=BC=8F=E6=B1=89=E5=8C=96=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E6=9C=89=E8=AF=AF=EF=BC=9A=E6=89=80=E6=9C=89=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=BA-->=E6=89=80=E6=9C=89=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apache/jmeter/config/CSVDataSetResources_zh_CN.properties   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
index 1e05c25dde4..e4b72cac502 100644
--- a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
@@ -36,6 +36,6 @@ stopThread.displayName=遇到文件结束符停止线程？
 stopThread.shortDescription=当文件结束时是否停止线程(只有当再次循环关闭情况下)？
 shareMode.displayName=线程共享模式
 shareMode.shortDescription=选择哪些线程会共享同一个文件句柄
-shareMode.all=所有现场
+shareMode.all=所有线程
 shareMode.group=当前线程组
 shareMode.thread=当前线程

From 576a281e8d4a4d0fce8dc88c6726313bb81d98dc Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 4 Mar 2022 19:41:18 +0100
Subject: [PATCH 0086/1037] Update to log4j2 2.17.2

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 376c3298fd6..64a38484c7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.1
 lets-plot-kotlin-jvm.version=3.1.1
-log4j.version=2.17.1
+log4j.version=2.17.2
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 9caa9b8281f..bc024803e97 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 181223,lets-plot-batik-2.2.1.jar
 4025480,lets-plot-common-2.2.1.jar
-208006,log4j-1.2-api-2.17.1.jar
-301872,log4j-api-2.17.1.jar
-1790452,log4j-core-2.17.1.jar
-24279,log4j-slf4j-impl-2.17.1.jar
+303443,log4j-1.2-api-2.17.2.jar
+302511,log4j-api-2.17.2.jar
+1811089,log4j-core-2.17.2.jar
+24248,log4j-slf4j-impl-2.17.2.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 8a3aaeb5543..1164896d197 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -61,7 +61,7 @@ Summary
 <ch_section>New and Noteworthy</ch_section>
 <p>JMeter now supports Java 17</p>
 
-<p>JMeter 5.5 ships with log4j2 2.17.1</p>
+<p>JMeter 5.5 ships with log4j2 2.17.2</p>
 
 <p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
 allows creating load profiles with variable load.</p>
@@ -176,7 +176,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.17.1 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>

From 303f355293c3c685a17f073f968e3755a4f9e0f4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 4 Mar 2022 20:54:52 +0100
Subject: [PATCH 0087/1037] Update json-smart and accessors-smart to 2.4.8

---
 checksum.xml                                | 12 +++++++++---
 gradle.properties                           |  4 ++--
 src/dist/src/dist/expected_release_jars.csv |  4 ++--
 xdocs/changes.xml                           |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index c860213a819..af317ecd33a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -51,10 +51,10 @@
     <trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
     <trusted-key id='0a36eef644cff773' group='com.metsci.ext.com.kitfox.svg' />
     <trusted-key id='db45d3a62a183ce2' group='com.miglayout' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest' />
     <trusted-key id='995efbf4a3d20beb' group='com.pinterest' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
+    <trusted-key id='aa49c633b4734832' group='com.pinterest' />
     <trusted-key id='995efbf4a3d20beb' group='com.pinterest.ktlint' />
+    <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
     <trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
     <trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
     <trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
@@ -197,8 +197,8 @@
     <trusted-key id='72385ff0af338d52' group='org.threeten' />
     <trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
     <trusted-key id='9ff25980f5ba7e4f' group='xalan' />
-    <trusted-key id='858fc4c4f43856a3' group='xerces' />
     <trusted-key id='7d713008cc07e9ad' group='xerces' />
+    <trusted-key id='858fc4c4f43856a3' group='xerces' />
     <trusted-key id='86fdc7e2a11262cb' group='xml-apis' />
   </trusted-keys>
   <dependencies>
@@ -238,9 +238,15 @@
     <dependency group='net.minidev' module='accessors-smart' version='2.4.7'>
       <sha512>6DAAF2FE1B278599D6D0BBD3F157096F8BCCF3D25616099C128139CE164B29461860EB2786F3D3728937A0D0505DF73F1C9673B0766F946C50878E5F60305736</sha512>
     </dependency>
+    <dependency group='net.minidev' module='accessors-smart' version='2.4.8'>
+      <sha512>45405C083334B05EFA07572497B9D510CA771AF32CE93D960BE802216A9714FFFF8418384EA48E197D3DFB6EBEC4EC3E610155841E8A257A7FB9A4BD6A1B668F</sha512>
+    </dependency>
     <dependency group='net.minidev' module='json-smart' version='2.4.7'>
       <sha512>3E9E1EE9A44EA15044B588B06A956AC150A37B63C161BF9B08A60539F5C90EFC7718DEB24FD084F503B68092516AAC3349DBB74049777EA4C6619AC26090A1D</sha512>
     </dependency>
+    <dependency group='net.minidev' module='json-smart' version='2.4.8'>
+      <sha512>13F4609FE72DF98C81F86D25616E5B0CE1426688AA5A9DD953733FA98A8DEADB87B3E69A77741DC9D31DD4485265D3B9E4EC71D99346E4A7558F2500F3677714</sha512>
+    </dependency>
     <dependency group='net.sf.ezmorph' module='ezmorph' version='1.0.6'>
       <sha512>16D30BE564723B74F312B4E7D06F349370FB6726B3162778C869CD723ECA2A40C4972C2757B3E107E1820CEC0D70B0BD2B96EFCD466518FC64495F7AEF97967A</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index 64a38484c7f..d8d1cfa04eb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,7 +56,7 @@ org.nosphere.apache.rat.version=0.7.0
 org.sonarqube.version=3.0
 
 # Dependencies
-accessors-smart.version=2.4.7
+accessors-smart.version=2.4.8
 activemq.version=5.16.2
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
@@ -108,7 +108,7 @@ jmespath-core.version=0.5.0
 jmespath-jackson.version=0.5.0
 jodd.version=5.0.13
 json-path.version=2.6.0
-json-smart.version=2.4.7
+json-smart.version=2.4.8
 jsoup.version=1.14.3
 jtidy.version=r938
 junit4.version=4.13.2
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index bc024803e97..15f17c4db6a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,4 +1,4 @@
-29489,accessors-smart-2.4.7.jar
+29524,accessors-smart-2.4.8.jar
 29371,annotations-23.0.0.jar
 2387,apiguardian-api-1.1.0.jar
 122004,asm-9.2.jar
@@ -82,7 +82,7 @@
 19858,jodd-log-5.0.13.jar
 26047,jodd-props-5.0.13.jar
 238605,json-path-2.6.0.jar
-119227,json-smart-2.4.7.jar
+119545,json-smart-2.4.8.jar
 423395,jsoup-1.14.3.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1164896d197..28ed31160ac 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -153,7 +153,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.7 (from 2.3), accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>

From d5640f7169a80c287d596e5b07ea215cb040df14 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 10:48:50 +0100
Subject: [PATCH 0088/1037] Update ActiveMQ to 5.16.4

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d8d1cfa04eb..f111edf9748 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ org.sonarqube.version=3.0
 
 # Dependencies
 accessors-smart.version=2.4.8
-activemq.version=5.16.2
+activemq.version=5.16.4
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
 asm.version=9.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 28ed31160ac..81bd4da610f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -158,7 +158,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
-  <li>Updated Apache ActiveMQ to 15.6.2 (from 15.6.0).</li>
+  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
   <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
   <li>Updated Caffeine to 2.9.2 (from 2.8.8).</li>

From 19fdf6a45721e3983431aaa850c776a176b1d90f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:00:25 +0100
Subject: [PATCH 0089/1037] Add checksum of key for xbean

---
 checksum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/checksum.xml b/checksum.xml
index af317ecd33a..68e7a0920e9 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -132,6 +132,7 @@
     <trusted-key id='d0eb627d4885ced1' group='org.apache.velocity' />
     <trusted-key id='73129f58de61ecbd' group='org.apache.xbean' />
     <trusted-key id='a2e92e06ddb37997' group='org.apache.xbean' />
+    <trusted-key id='e91287822fdb81b1' group='org.apache.xbean' />
     <trusted-key id='5b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
     <trusted-key id='85911f425ec61b51' group='org.apiguardian' />
     <trusted-key id='e2b3d84202b812d9' group='org.assertj' />

From 75d5ad688fabd35dcac8b9538b8604e145bbf802 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:08:10 +0100
Subject: [PATCH 0090/1037] Updated Caffeine to 2.9.3

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f111edf9748..72c4d9a06a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -64,7 +64,7 @@ asm.version=9.2
 bouncycastle.version=1.69
 bsf.version=2.4.0
 bsh.version=2.0b6
-caffeine.version=2.9.2
+caffeine.version=2.9.3
 cglib-nodep.version=3.2.12
 commons-codec.version=1.15
 commons-collections.version=3.2.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 81bd4da610f..04522e7db83 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,7 +161,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
   <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
-  <li>Updated Caffeine to 2.9.2 (from 2.8.8).</li>
+  <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>
   <li>Updated Apache commons-dbcp2 to 2.9.0 (from 2.8.0).</li>
   <li>Updated Apache commons-io to 2.11.0 (from 2.8.0).</li>
   <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>

From 1228254494a09a0aec93bc83bd51ce712f789cfb Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:15:54 +0100
Subject: [PATCH 0091/1037] Updated commons-pool2 to 2.11.1

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 72c4d9a06a8..33b83262b08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -78,7 +78,7 @@ commons-lang3.version=3.12.0
 commons-logging.version=1.2
 commons-math3.version=3.6.1
 commons-net.version=3.8.0
-commons-pool2.version=2.11.0
+commons-pool2.version=2.11.1
 commons-text.version=1.9
 darklaf.version=2.7.3
 darklaf.extensions.version=0.3.4
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 04522e7db83..7cc6a07ee43 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -166,7 +166,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache commons-io to 2.11.0 (from 2.8.0).</li>
   <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>
   <li>Updated Apache commons-net to 3.8.0 (from 3.7.2).</li>
-  <li>Updated Apache commons-pool2 to 2.11.0 (from 2.9.0).</li>
+  <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
   <li>Updated equalsverifier to 3.7 (from 3.4.2).</li>
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
   <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>

From 1c325d6309bba2f69a36404f973610403a9ab91b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:20:21 +0100
Subject: [PATCH 0092/1037] Updates equalsverifier to 3.9

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 33b83262b08..ba601cb6422 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -84,7 +84,7 @@ darklaf.version=2.7.3
 darklaf.extensions.version=0.3.4
 dec.version=0.1.2
 dnsjava.version=2.1.9
-equalsverifier.version=3.7
+equalsverifier.version=3.9
 freemarker.version=2.3.31
 ftplet-api.version=1.1.1
 ftpserver-core.version=1.1.1
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7cc6a07ee43..6bebedb2e50 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -167,7 +167,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>
   <li>Updated Apache commons-net to 3.8.0 (from 3.7.2).</li>
   <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
-  <li>Updated equalsverifier to 3.7 (from 3.4.2).</li>
+  <li>Updated equalsverifier to 3.9 (from 3.4.2).</li>
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
   <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>

From 1d164f744cf53b843a8c04eee27d5c6c2ef42fd1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:23:59 +0100
Subject: [PATCH 0093/1037] Updated ftplet and ftpserver to 1.1.3

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ba601cb6422..e915fe4cb66 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -86,8 +86,8 @@ dec.version=0.1.2
 dnsjava.version=2.1.9
 equalsverifier.version=3.9
 freemarker.version=2.3.31
-ftplet-api.version=1.1.1
-ftpserver-core.version=1.1.1
+ftplet-api.version=1.1.3
+ftpserver-core.version=1.1.3
 geronimo-jms_1.1_spec.version=1.1.1
 groovy.version=3.0.9
 hamcrest.version=2.2

From ee6d4f06c92de7e4d18b12d83b965d9a407a8d10 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:25:35 +0100
Subject: [PATCH 0094/1037] Updated hamcrest-date to 2.0.8

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e915fe4cb66..10031536bbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -91,7 +91,7 @@ ftpserver-core.version=1.1.3
 geronimo-jms_1.1_spec.version=1.1.1
 groovy.version=3.0.9
 hamcrest.version=2.2
-hamcrest-date.version=2.0.7
+hamcrest-date.version=2.0.8
 hsqldb.version=2.5.2
 httpasyncclient.version=4.1.4
 httpclient.version=4.5.13

From b4c9e671550ae792ff62b13b0a910af67e7e20f0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:27:09 +0100
Subject: [PATCH 0095/1037] Updated hsqldb to 2.6.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 10031536bbe..4b92e98b015 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -92,7 +92,7 @@ geronimo-jms_1.1_spec.version=1.1.1
 groovy.version=3.0.9
 hamcrest.version=2.2
 hamcrest-date.version=2.0.8
-hsqldb.version=2.5.2
+hsqldb.version=2.6.1
 httpasyncclient.version=4.1.4
 httpclient.version=4.5.13
 httpcore-nio.version=4.4.14

From 0d04f1379ed7d7a7ad6999bf69a60d0758030039 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:32:26 +0100
Subject: [PATCH 0096/1037] Bytebuddy used by Caffeine

---
 checksum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/checksum.xml b/checksum.xml
index 68e7a0920e9..096e3d67e4e 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -93,6 +93,7 @@
     <trusted-key id='528dc75aa68f0923' group='jcharts' />
     <trusted-key id='85911f425ec61b51' group='junit' />
     <trusted-key id='efe8086f9e93774e' group='junit' />
+    <trusted-key id='7999befba1039e8b' group='net.bytebuddy' />
     <trusted-key id='15c71c0a4e0b8edd' group='net.java.dev.jna' />
     <trusted-key id='75bf031b7c94e183' group='net.java.dev.jna' />
     <trusted-key id='c51e10bd96d06071' group='net.javacrumbs.json-unit' />

From bcf2c29225abfd05ef7b8b0b43e5966ec7a90f9f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 11:36:18 +0100
Subject: [PATCH 0097/1037] Updated Apache HttpCore to 4.4.15

---
 gradle.properties | 6 +++---
 xdocs/changes.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4b92e98b015..c30380cecd7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -93,10 +93,10 @@ groovy.version=3.0.9
 hamcrest.version=2.2
 hamcrest-date.version=2.0.8
 hsqldb.version=2.6.1
-httpasyncclient.version=4.1.4
+httpasyncclient.version=4.1.5
 httpclient.version=4.5.13
-httpcore-nio.version=4.4.14
-httpcore.version=4.4.14
+httpcore-nio.version=4.4.15
+httpcore.version=4.4.15
 httpmime.version=4.5.13
 jackson.version=2.13.1
 jackson-databind.version=2.13.1
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6bebedb2e50..f17be2e8619 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -171,7 +171,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
   <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
-  <li>Updated Apache HttpCore to 4.4.14 (from 4.4.13).</li>
+  <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>

From 1564774137506e6eb8283f384324bd51306ca1c1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 12:17:01 +0100
Subject: [PATCH 0098/1037] Update JMESPath to 0.5.1

---
 gradle.properties | 4 ++--
 xdocs/changes.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c30380cecd7..d08905ec9ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -104,8 +104,8 @@ javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
 jetbrains-annotations.version=23.0.0
-jmespath-core.version=0.5.0
-jmespath-jackson.version=0.5.0
+jmespath-core.version=0.5.1
+jmespath-jackson.version=0.5.1
 jodd.version=5.0.13
 json-path.version=2.6.0
 json-smart.version=2.4.8
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f17be2e8619..0dd8dfe65de 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -189,6 +189,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
   <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
+  <li>Updated jmespath to 0.5.1</li>
   <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
      to <code>user.properties</code>, as it is read from that place.
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>

From b93413802408a6d66bc3adbf080ed5edce0dc749 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 12:29:57 +0100
Subject: [PATCH 0099/1037] Reverted Update of hsqldb to 2.6.1 (the binary
 seems to be compiled with Java >8)

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d08905ec9ec..77db8847699 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -92,7 +92,7 @@ geronimo-jms_1.1_spec.version=1.1.1
 groovy.version=3.0.9
 hamcrest.version=2.2
 hamcrest-date.version=2.0.8
-hsqldb.version=2.6.1
+hsqldb.version=2.5.2
 httpasyncclient.version=4.1.5
 httpclient.version=4.5.13
 httpcore-nio.version=4.4.15
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0dd8dfe65de..9d88b651c2d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -169,7 +169,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
   <li>Updated equalsverifier to 3.9 (from 3.4.2).</li>
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
-  <li>Updated hsqldb to 2.6.0 (from 2.5.0).</li>
+  <li>Updated hsqldb to 2.5.2 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
   <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>

From 339d66fed0523d7229444a773d94f4e22f48fd1d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 12:40:43 +0100
Subject: [PATCH 0100/1037] Updated JUnit5 to 5.8.2

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 77db8847699..ca61c5681be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -112,7 +112,7 @@ json-smart.version=2.4.8
 jsoup.version=1.14.3
 jtidy.version=r938
 junit4.version=4.13.2
-junit5.version=5.8.1
+junit5.version=5.8.2
 lets-plot-batik.version=2.2.1
 lets-plot-kotlin-jvm.version=3.1.1
 log4j.version=2.17.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 9d88b651c2d..73639a1363e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -175,7 +175,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>
-  <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
+  <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>

From 7c161a2d3c041fd5fd149a1b555a2b5e97878a44 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 12:55:02 +0100
Subject: [PATCH 0101/1037] Updated mina-core to 2.1.6

It was already used in this version by dependency
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ca61c5681be..1e3d3121a4b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -118,7 +118,7 @@ lets-plot-kotlin-jvm.version=3.1.1
 log4j.version=2.17.2
 mail.version=1.5.0-b01
 miglayout.version=5.3
-mina-core.version=2.0.19
+mina-core.version=2.1.6
 mongo-java-driver.version=2.11.3
 neo4j-java-driver.version=4.3.3
 objenesis.version=3.2

From de94417d5d0347d8f6d80d532185498a609c201d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 13:02:18 +0100
Subject: [PATCH 0102/1037] Updated Neo4j Java driver to 4.4.4

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1e3d3121a4b..03de6e67c00 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -120,7 +120,7 @@ mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.1.6
 mongo-java-driver.version=2.11.3
-neo4j-java-driver.version=4.3.3
+neo4j-java-driver.version=4.4.3
 objenesis.version=3.2
 oro.version=2.0.8
 ph-commons.version=10.1.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 73639a1363e..18c7657ef56 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -178,7 +178,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
-  <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
+  <li>Updated Neo4j Java driver to 4.4.4 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
   <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.3.4 and 9.5.5 (from 6.2.3 and 9.5.1).</li>

From 1c605fd532692318179cac622e1f0fc78aad39fa Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 13:22:49 +0100
Subject: [PATCH 0103/1037] Updated PH CSS and PH commons to 6.5.4 and 10.1.6

---
 gradle.properties | 4 ++--
 xdocs/changes.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 03de6e67c00..b20ebe8371d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -123,8 +123,8 @@ mongo-java-driver.version=2.11.3
 neo4j-java-driver.version=4.4.3
 objenesis.version=3.2
 oro.version=2.0.8
-ph-commons.version=10.1.2
-ph-css.version=6.3.4
+ph-commons.version=10.1.6
+ph-css.version=6.5.0
 rhino.version=1.7.13
 rsyntaxtextarea.version=3.1.3
 Saxon-HE.version=9.9.1-8
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 18c7657ef56..9bb5ecbeec6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -181,7 +181,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Neo4j Java driver to 4.4.4 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
   <li>Updated ktlint to 0.40.0</li>
-  <li>Updated PH CSS and PH commons to 6.3.4 and 9.5.5 (from 6.2.3 and 9.5.1).</li>
+  <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
   <li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>

From 7d2afdc5eca3b9d6847712f79730fcac4c8a99db Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:13:58 +0100
Subject: [PATCH 0104/1037] Update expected_release_jars and set errorprone to
 the currently used version

---
 gradle.properties                           |  2 +-
 src/dist/src/dist/expected_release_jars.csv | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b20ebe8371d..042d0f50631 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,7 +33,7 @@ jmeter.version=5.5
 
 # Tools
 checkstyle.version=8.35
-errorprone.version=2.4.0
+errorprone.version=2.10.0
 jacoco.version=0.8.7
 ktlint.version=0.40.0
 spotbugs.version=4.1.2
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 15f17c4db6a..9bd2899db78 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -23,8 +23,8 @@
 33866,batik-xml-1.14.jar
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
-925272,caffeine-2.9.2.jar
-207036,checker-qual-3.10.0.jar
+912143,caffeine-2.9.3.jar
+222143,checker-qual-3.19.0.jar
 353793,commons-codec-1.15.jar
 588337,commons-collections-3.2.2.jar
 751914,commons-collections4-4.4.jar
@@ -36,7 +36,7 @@
 61829,commons-logging-1.2.jar
 2213560,commons-math3-3.6.1.jar
 307305,commons-net-3.8.0.jar
-145267,commons-pool2-2.11.0.jar
+145516,commons-pool2-2.11.1.jar
 216211,commons-text-1.9.jar
 1547509,darklaf-core-2.7.3.jar
 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
@@ -49,7 +49,7 @@
 217795,darklaf-windows-2.7.3.jar
 98115,dec-0.1.2.jar
 320748,dnsjava-2.1.9.jar
-13854,error_prone_annotations-2.5.1.jar
+15992,error_prone_annotations-2.10.0.jar
 1715750,freemarker-2.3.31.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8004986,groovy-3.0.9.jar
@@ -63,11 +63,11 @@
 296025,groovy-xml-3.0.9.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
-104518,hamcrest-date-2.0.7.jar
-179964,httpasyncclient-4.1.4.jar
+109741,hamcrest-date-2.0.8.jar
+181512,httpasyncclient-4.1.5.jar
 780321,httpclient-4.5.13.jar
-328436,httpcore-4.4.14.jar
-369365,httpcore-nio-4.4.14.jar
+328324,httpcore-4.4.15.jar
+369486,httpcore-nio-4.4.15.jar
 41790,httpmime-4.5.13.jar
 75717,jackson-annotations-2.13.1.jar
 374588,jackson-core-2.13.1.jar
@@ -75,8 +75,8 @@
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16630,jcl-over-slf4j-1.7.32.jar
-490565,jmespath-core-0.5.0.jar
-7041,jmespath-jackson-0.5.0.jar
+490571,jmespath-core-0.5.1.jar
+7066,jmespath-jackson-0.5.1.jar
 403497,jodd-core-5.0.13.jar
 220475,jodd-lagarto-5.0.13.jar
 19858,jodd-log-5.0.13.jar
@@ -103,10 +103,10 @@
 22576,miglayout-swing-5.3.jar
 419054,mongo-java-driver-2.11.3.jar
 29680,mxparser-1.2.2.jar
-4687205,neo4j-java-driver-4.3.3.jar
+4890898,neo4j-java-driver-4.4.3.jar
 65261,oro-2.0.8.jar
-1307434,ph-commons-10.1.2.jar
-506616,ph-css-6.3.4.jar
+1308773,ph-commons-10.1.6.jar
+530791,ph-css-6.5.0.jar
 642167,plot-api-jvm-3.1.1.jar
 891618,plot-base-portable-jvm-2.2.1.jar
 845777,plot-builder-portable-jvm-2.2.1.jar

From 500b6bed818d5be990b4e1f910e2ec160f7864e0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:17:58 +0100
Subject: [PATCH 0105/1037] Updated RSyntaxTextArea to 3.1.6

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 xdocs/changes.xml                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 042d0f50631..6231653b6a1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -126,7 +126,7 @@ oro.version=2.0.8
 ph-commons.version=10.1.6
 ph-css.version=6.5.0
 rhino.version=1.7.13
-rsyntaxtextarea.version=3.1.3
+rsyntaxtextarea.version=3.1.6
 Saxon-HE.version=9.9.1-8
 slf4j.version=1.7.32
 spock-core.version=2.0-M2-groovy-3.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 9bd2899db78..855ceb18c74 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -114,7 +114,7 @@
 749095,plot-config-portable-jvm-2.2.1.jar
 11369,reactive-streams-1.0.3.jar
 1315838,rhino-1.7.13.jar
-1242230,rsyntaxtextarea-3.1.3.jar
+1245900,rsyntaxtextarea-3.1.6.jar
 5506669,Saxon-HE-9.9.1-8.jar
 276420,serializer-2.7.2.jar
 41513,slf4j-api-1.7.32.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 9bb5ecbeec6..3ffe9d2a0c8 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -182,7 +182,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
   <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
-  <li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
+  <li>Updated RSyntaxTextArea to 3.1.6 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
   <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>

From de9d1fd61acce33a96cd609625138e1bbf8214fa Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:26:40 +0100
Subject: [PATCH 0106/1037] Updated Saxon-HE to 11.2

---
 checksum.xml                                | 2 ++
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 4 +++-
 xdocs/changes.xml                           | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 096e3d67e4e..03092002e70 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -102,6 +102,7 @@
     <trusted-key id='0da8a5ec02d11ead' group='net.sf.jopt-simple' />
     <trusted-key id='d4012dda1f1f0f82' group='net.sf.jtidy' />
     <trusted-key id='1d185615d0a84648' group='net.sf.saxon' />
+    <trusted-key id='a929ea2321fdbf8f' group='net.sf.saxon' />
     <trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='4a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
     <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
@@ -197,6 +198,7 @@
     <trusted-key id='9a2c7a98e457c53d' group='org.springframework' />
     <trusted-key id='e4b53844e02b191b' group='org.swinglabs' />
     <trusted-key id='72385ff0af338d52' group='org.threeten' />
+    <trusted-key id='a929ea2321fdbf8f' group='org.xmlresolver' />
     <trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
     <trusted-key id='9ff25980f5ba7e4f' group='xalan' />
     <trusted-key id='7d713008cc07e9ad' group='xerces' />
diff --git a/gradle.properties b/gradle.properties
index 6231653b6a1..75a7b000585 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -127,7 +127,7 @@ ph-commons.version=10.1.6
 ph-css.version=6.5.0
 rhino.version=1.7.13
 rsyntaxtextarea.version=3.1.6
-Saxon-HE.version=9.9.1-8
+Saxon-HE.version=11.2
 slf4j.version=1.7.32
 spock-core.version=2.0-M2-groovy-3.0
 springframework.version=4.3.17.RELEASE
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 855ceb18c74..52a4c466637 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -115,7 +115,7 @@
 11369,reactive-streams-1.0.3.jar
 1315838,rhino-1.7.13.jar
 1245900,rsyntaxtextarea-3.1.6.jar
-5506669,Saxon-HE-9.9.1-8.jar
+5104409,Saxon-HE-11.2.jar
 276420,serializer-2.7.2.jar
 41513,slf4j-api-1.7.32.jar
 301279,svgSalamander-1.1.2.4.jar
@@ -130,4 +130,6 @@
 85686,xml-apis-ext-1.3.04.jar
 674607,xmlgraphics-commons-2.6.jar
 7188,xmlpull-1.1.3.1.jar
+1027759,xmlresolver-4.2.0-data.jar
+150259,xmlresolver-4.2.0.jar
 633140,xstream-1.4.19.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3ffe9d2a0c8..d144e20aa0d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -190,6 +190,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
   <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
   <li>Updated jmespath to 0.5.1</li>
+  <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
   <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
      to <code>user.properties</code>, as it is read from that place.
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>

From 9980e47023041414a8194a8bf2c369f373b3d515 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:30:16 +0100
Subject: [PATCH 0107/1037] Updated SLF4J to 1.7.36

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 4 ++--
 xdocs/changes.xml                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 75a7b000585..7d8e1e4420a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -128,7 +128,7 @@ ph-css.version=6.5.0
 rhino.version=1.7.13
 rsyntaxtextarea.version=3.1.6
 Saxon-HE.version=11.2
-slf4j.version=1.7.32
+slf4j.version=1.7.36
 spock-core.version=2.0-M2-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 52a4c466637..daecdda5b1c 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -74,7 +74,7 @@
 1534017,jackson-databind-2.13.1.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
-16630,jcl-over-slf4j-1.7.32.jar
+16555,jcl-over-slf4j-1.7.36.jar
 490571,jmespath-core-0.5.1.jar
 7066,jmespath-jackson-0.5.1.jar
 403497,jodd-core-5.0.13.jar
@@ -117,7 +117,7 @@
 1245900,rsyntaxtextarea-3.1.6.jar
 5104409,Saxon-HE-11.2.jar
 276420,serializer-2.7.2.jar
-41513,slf4j-api-1.7.32.jar
+41125,slf4j-api-1.7.36.jar
 301279,svgSalamander-1.1.2.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d144e20aa0d..708209ee4db 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -183,7 +183,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
   <li>Updated RSyntaxTextArea to 3.1.6 (from 3.1.1).</li>
-  <li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
+  <li>Updated SLF4J to 1.7.36 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
   <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>

From a1e9ac7d15792800e39cb1a5307db31574e27b20 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:45:39 +0100
Subject: [PATCH 0108/1037] Update Apache xmlgraphics commons to 2.7

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 xdocs/changes.xml                           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7d8e1e4420a..7668e03b0b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -136,7 +136,7 @@ tika.version=1.28.1
 xalan.version=2.7.2
 xercesImpl.version=2.12.2
 xml-apis.version=1.4.01
-xmlgraphics-commons.version=2.6
+xmlgraphics-commons.version=2.7
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
 xstream.version=1.4.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index daecdda5b1c..d627e3d9648 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -128,7 +128,7 @@
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
-674607,xmlgraphics-commons-2.6.jar
+675889,xmlgraphics-commons-2.7.jar
 7188,xmlpull-1.1.3.1.jar
 1027759,xmlresolver-4.2.0-data.jar
 150259,xmlresolver-4.2.0.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 708209ee4db..833fd2c63ba 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -191,6 +191,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
   <li>Updated jmespath to 0.5.1</li>
   <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
+  <li>Updated Apache xmlgraphics commons to 2.7 (from 2.6)</li>
   <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
      to <code>user.properties</code>, as it is read from that place.
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>

From c8a47113d5316ca5d835c102abb650523ae4e16d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 15:54:50 +0100
Subject: [PATCH 0109/1037] Updated wiremock to 2.32.0

---
 checksum.xml      | 2 ++
 gradle.properties | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/checksum.xml b/checksum.xml
index 03092002e70..4d4bd139588 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -125,6 +125,8 @@
     <trusted-key id='cbaebe39a46c4ca1' group='org.apache.geronimo.specs' />
     <trusted-key id='ecdfea3cb4493b94' group='org.apache.geronimo.specs' />
     <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
+    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
+    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
     <trusted-key id='3595395eb3d8e1ba' group='org.apache.logging.log4j' />
     <trusted-key id='b4c70893b62babe8' group='org.apache.logging.log4j' />
     <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
diff --git a/gradle.properties b/gradle.properties
index 7668e03b0b3..2e58940a2bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -140,4 +140,4 @@ xmlgraphics-commons.version=2.7
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
 xstream.version=1.4.19
-wiremock-jre8.version=2.30.0
+wiremock-jre8.version=2.32.0

From 0b34b4054a9674b6b37dc73f068421ebeda69235 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 16:07:13 +0100
Subject: [PATCH 0110/1037] Update checkstyle to 9.3

The 10.x branch is Java 11 and higher, only.
Suppress UnnecessaryParentheses for now, as we have quite a few of those and
it seems to be  new check.
---
 checksum.xml                                  | 4 ++++
 config/checkstyle/checkstyle-suppressions.xml | 1 +
 gradle.properties                             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/checksum.xml b/checksum.xml
index 4d4bd139588..f0b151d7995 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -82,6 +82,7 @@
     <trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
     <trusted-key id='a5c8dbb8a1599bd4' group='dnsjava' />
     <trusted-key id='379ce192d401ab61' group='info.picocli' />
+    <trusted-key id='6601e5c08dccbb96' group='info.picocli' />
     <trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
     <trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
     <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
@@ -106,6 +107,7 @@
     <trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='4a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
     <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+    <trusted-key id='347cd0eaed975c5f' group='org.antlr' />
     <trusted-key id='6b1b008864323b92' group='org.antlr' />
     <trusted-key id='411063a3a0ffd119' group='org.apache-extras.beanshell' />
     <trusted-key id='87a7f75a6a8ba5fc' group='org.apache.activemq' />
@@ -165,6 +167,7 @@
     <trusted-key id='313cba932516c4d3' group='org.hsqldb' />
     <trusted-key id='ab049df4ab24c1ef' group='org.hsqldb' />
     <trusted-key id='cb43338e060cf9fa' group='org.jacoco' />
+    <trusted-key id='164779204e106a76' group='org.javassist' />
     <trusted-key id='8799af90c06efbbd' group='org.jdom' />
     <trusted-key id='379ce192d401ab61' group='org.jetbrains' />
     <trusted-key id='bcf4173966770193' group='org.jetbrains' />
@@ -192,6 +195,7 @@
     <trusted-key id='5f69ad087600b22c' group='org.ow2.asm' />
     <trusted-key id='2be5d98f751f4136' group='org.pcollections' />
     <trusted-key id='1364c5e2df3e99c5' group='org.reactivestreams' />
+    <trusted-key id='f13d3e721d56bd54' group='org.reflections' />
     <trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
     <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.api' />
     <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.gradle' />
diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index 87101fa1e2c..17e98efbfe3 100644
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -28,4 +28,5 @@
               files="test[\\/].*"/>
     <suppress checks="NewlineAtEndOfFile" files="test[\\/].*.xml"/>
     <suppress checks="NewlineAtEndOfFile" files="test[\\/].*.txt"/>
+    <suppress checks="UnnecessaryParentheses" files=".*.java"/>
 </suppressions>
diff --git a/gradle.properties b/gradle.properties
index 2e58940a2bd..6caea8bcf3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,7 +32,7 @@ kotlin.code.style=official
 jmeter.version=5.5
 
 # Tools
-checkstyle.version=8.35
+checkstyle.version=9.3
 errorprone.version=2.10.0
 jacoco.version=0.8.7
 ktlint.version=0.40.0

From cc62ec4921c14d6397418cb766b96038e2bb99cd Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 17:32:22 +0100
Subject: [PATCH 0111/1037] Add notice for mxparser to README.md

According to https://raw.githubusercontent.com/x-stream/mxparser/master/LICENSE.txt
we have to put such a notice somewhere in the documentation.
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index a5703ea1cce..1255834304f 100644
--- a/README.md
+++ b/README.md
@@ -266,3 +266,11 @@ Apache JMeter does not include any implementation of JSSE or JCE.
 ## Thanks
 
 **Thank you for using Apache JMeter.**
+
+### Third party notices
+
+* Notice for mxparser:
+
+  >  This product includes software developed by the Indiana
+  >  University Extreme! Lab.  For further information please visit
+  >  http://www.extreme.indiana.edu/

From d8a169e10f5d79ec1ee24d665f961f5be1972aa9 Mon Sep 17 00:00:00 2001
From: "Y. Z. Chen" <754097987@qq.com>
Date: Sat, 5 Mar 2022 00:22:07 +0800
Subject: [PATCH 0112/1037] ci: use https://www.apache.org instead of
 http://www.eu.apache.org for downloading Maven

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

diff --git a/.travis.yml b/.travis.yml
index e2f7c285a46..a10bff12ec7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,7 @@ matrix:
       arch: s390x
       jdk: openjdk11
       script:
-        - wget http://www.eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        - wget https://www.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
         - tar -xvzf apache-maven-3.6.3-bin.tar.gz
         - export PATH=`pwd`/apache-maven-3.6.3/bin/:$PATH
         - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore

From 2bb940e230531cd7f07b6e1932b36b54724af16e Mon Sep 17 00:00:00 2001
From: "Y. Z. Chen" <754097987@qq.com>
Date: Fri, 4 Mar 2022 08:12:54 +0800
Subject: [PATCH 0113/1037] (typo) in zh-CN translation.

---
 .../org/apache/jmeter/resources/messages_zh_CN.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index 2ff829e4626..9ae4dfaa350 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -759,7 +759,7 @@ web_testing_basic=基本
 web_testing_concurrent_download=并行下载. 数量：
 web_testing_embedded_url_pattern=网址必须匹配：
 web_testing_retrieve_images=从HTML文件获取所有内含的资源
-web_testing_retrieve_title=从HMTL文件嵌入资源
+web_testing_retrieve_title=从HTML文件嵌入资源
 web_testing_source_ip=源地址
 web_testing_source_ip_device=设备
 web_testing_source_ip_device_ipv4=设备 IPv4

From 5e92589b10480c136f279e52df6873b8190e5cc4 Mon Sep 17 00:00:00 2001
From: "C.C" <709787793@qq.com>
Date: Wed, 23 Feb 2022 17:24:34 +0800
Subject: [PATCH 0114/1037] Updated Chinese Simplified Translation

Kept the ordering of the original file and deleted those new entries from #701,
that can't be found in any other translation file or the sources.

Closes #701
---
 .../resources/messages_zh_CN.properties       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index 9ae4dfaa350..3ac59dd129f 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -21,7 +21,7 @@
 #
 
 # Please add new entries in alphabetical order
-about=关于Apache JMeter
+about=关于 Apache JMeter
 action_check_message=测试当前正在运行，停止或关闭测试以执行此命令
 action_check_title=测试运行中
 active_total_threads_tooltip=运行中线程数/运行线程总数
@@ -35,7 +35,7 @@ add_pattern=添加模式：
 add_test=添加测试
 add_think_times=为子线程添加响应时间
 add_user=添加用户
-add_value=添加数值
+add_value=添加值
 addtest=添加测试
 aggregate_graph=统计图表
 aggregate_graph_choose_color=选择颜色
@@ -47,7 +47,7 @@ aggregate_graph_column_settings=列设置
 aggregate_graph_columns_to_display=列显示：
 aggregate_graph_dimension=图表大小
 aggregate_graph_display=显示图表
-aggregate_graph_draw_outlines=画出轮廓？
+aggregate_graph_draw_outlines=绘制轮廓？
 aggregate_graph_dynamic_size=动态图形大小
 aggregate_graph_font=字体：
 aggregate_graph_height=高度：
@@ -56,9 +56,9 @@ aggregate_graph_legend=图例
 aggregate_graph_legend.placement.bottom=底部
 aggregate_graph_legend.placement.left=左
 aggregate_graph_legend.placement.right=右
-aggregate_graph_legend.placement.top=上
+aggregate_graph_legend.placement.top=顶部
 aggregate_graph_legend_placement=放置：
-aggregate_graph_max_length_xaxis_label=X轴标签最大长度
+aggregate_graph_max_length_xaxis_label=X轴标签的最大长度
 aggregate_graph_ms=毫秒
 aggregate_graph_no_values_to_graph=没有要绘制的值
 aggregate_graph_number_grouping=显示号码分组？
@@ -443,7 +443,7 @@ httpmirror_title=HTTP镜像服务器
 id_prefix=ID前缀
 id_suffix=ID后缀
 if_controller_label=条件
-if_controller_title=如果（If）控制器
+if_controller_title=IF 控制器
 ignore_subcontrollers=忽略子控制器块
 include_controller=Include控制器
 include_equals=包含等于？
@@ -574,7 +574,7 @@ post_as_parameters=参数
 post_body=消息体数据
 post_body_raw=消息体数据
 post_files_upload=文件上传
-post_thread_group_title=tearDown线程组
+post_thread_group_title=tearDown 线程组
 property_default_param=默认值
 property_edit=编辑
 property_editor.value_is_invalid_title=无效输入
@@ -637,7 +637,7 @@ sampler_on_error_start_next_loop=启动下一进程循环
 sampler_on_error_stop_test=停止测试
 sampler_on_error_stop_test_now=立即停止测试
 sampler_on_error_stop_thread=停止线程
-save=保存测试计划
+save=保存
 save?=保存？
 save_all_as=保存测试计划为
 save_as=选中部分保存为...
@@ -661,7 +661,7 @@ send_file_param_name_label=参数名称：
 server=服务器名称或IP：
 servername=服务器名称：
 session_argument_name=会话参数名称：
-setup_thread_group_title=setUp线程组
+setup_thread_group_title=setUp 线程组
 shutdown=关闭
 simple_config_element=简单配置元件
 simple_data_writer_title=简单数据写入器
@@ -695,7 +695,7 @@ tcp_port=端口号：
 tcp_request_data=要发送的文本
 tcp_sample_title=TCP取样器
 tcp_timeout=超时：
-teardown_on_shutdown=主线程结束后运行 tearDown线程组
+teardown_on_shutdown=主线程结束后运行 tearDown 线程组
 template_field=模板：
 template_menu=模板...
 test=测试
@@ -738,13 +738,13 @@ username=用户名
 validate_threadgroup=验证
 value=值
 var_name=引用名称
-view_graph_tree_title=察看结果树
-view_results_in_table=用表格察看结果
+view_graph_tree_title=查看结果树
+view_results_in_table=用表格查看结果
 view_results_tab_request=请求
 view_results_tab_response=响应数据
 view_results_tab_sampler=取样器结果
-view_results_title=察看结果
-view_results_tree_title=察看结果树
+view_results_title=查看结果
+view_results_tree_title=查看结果树
 web_proxy_server_title=代理服务器
 web_request=HTTP请求
 web_server=Web服务器

From 4ea72b5028e3eeac531777496a3a6349064a9fe8 Mon Sep 17 00:00:00 2001
From: shblue21 <shblue21@naver.com>
Date: Mon, 21 Feb 2022 13:32:29 +0900
Subject: [PATCH 0115/1037] Write graphite guide in realtime section

write graphite setting, in realtime section,
with simple pickle protocol

Closes #699
---
 xdocs/changes.xml                               |   2 ++
 .../screenshots/backend_listener_graphite.png   | Bin 0 -> 5760 bytes
 .../backend_listener_graphite_pickle.png        | Bin 0 -> 1929 bytes
 xdocs/usermanual/realtime-results.xml           |  16 ++++++++++++++--
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 xdocs/images/screenshots/backend_listener_graphite.png
 create mode 100644 xdocs/images/screenshots/backend_listener_graphite_pickle.png

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 833fd2c63ba..f72c51cf411 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -145,6 +145,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
   <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
   <li><bug>63620</bug><pr>694</pr>Fix GUI freeze when viewing response body with long line breaks</li>
+  <li><pr>699</pr>Add documentation for Graphite Backend Listener. Contributed by Ji Hun (jihunkimkw at gmail.com)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
@@ -304,6 +305,7 @@ however, the profile can't be updated while the test is running.
   <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
   <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
   <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li>Ji Hun (jihunkimkw at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/images/screenshots/backend_listener_graphite.png b/xdocs/images/screenshots/backend_listener_graphite.png
new file mode 100644
index 0000000000000000000000000000000000000000..d952b22354b79636c888c79df69d1d3aee057141
GIT binary patch
literal 5760
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

literal 0
HcmV?d00001

diff --git a/xdocs/images/screenshots/backend_listener_graphite_pickle.png b/xdocs/images/screenshots/backend_listener_graphite_pickle.png
new file mode 100644
index 0000000000000000000000000000000000000000..a314543b675ba0bcf5ed1142bd0af00de477c720
GIT binary patch
literal 1929
zcmV;42X^?0P)<h;3K|Lk000e1NJLTq00PAT005-|0{{R3$<Ao_00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#32;bRa{vGmbN~PnbOGLGA9w%&01Qw}R7L;)|9Xm<
z?(Xh0Gc(0Di&Fpq2L?$*K~#9!?VZnx<2Vq;3+h^+R}tiDP$0KuVNd%A`yTrU%fcRZ
zA0dJ6dj@(7bPe=-q+t>CZ7}1llJZBH?vCvt8QFtOkK0LG)-THE(&w_|f%V*$-=QK`
z<ceGl`LAE+wJc%%2aH>mP<mPaIr5A7sk|^Maz*};k++*WBWnfwn<78W5Bbw(^ZC=u
z{@=~LkRKi%_b*b(Es-A{o}RY*{r!-)+ZU<ihFX4E%Q5eYyuLN^r_C2Z?(T-X**<=L
z**t!^CGtaT<@NoLqcCn6<Q^ZM?kbG+e*5{x!q{y76Xg3vjP?F;yYFrpF=~fhkt=dV
zejoYokyp6C)hq08xWb+<vIQ?I)D4!GPFFxZ$fzq$#g8umDf=UyH{<cF?CpY;E!k+t
z)%+G&3N_|XIj|j!3@7BvH{V58DoYTN5y#bhMsB=qDJ=NehsI!NcN`3}b=cs}@a_$A
zOMVCX*I;x7zL9n7(AotCE9I#3VPQD!frg*q6^z|U5veA$f@~WiZVATKd`9-(qoKxn
zqQ!#922WPLKlWbUwBhRlE8RK%m8`D7$4&NZwX|#yl9t4{hrAQK0ULr8G4ci~veyj)
z998ofnZ3wQ_B|Gq*H#q8KEBIukx4i~swRu5$hy{2<VCBZOo|2ddzU?|eh9&o1H}W%
zwrH724{yfRe1Y7>f~H+8OsfSAgYC4S3m+gm0c{1@w2CaHIz^7c5CC~C!iakWIYdHs
z3Aqz2%Z7a?pLSHuIWitTE68UBEhsC?@m=@;Ikg00Y;V+3(xyTkg(2scV8!yNhe*h&
zh#p+_){WyAG_>Yi%V<pcdTdgqR;*vAD(YS2CJMMwJ!Zl<)UU|$TeaLoEpyZ|C(SE9
zBrWSQrsh0iz$*o<E68y|!+PF2c5*;DZ~2{wfjirHJ*#Dx5bF+&iv+=h#%sh7VI205
zL+~pZ%Th#7u~r%|MGR<hRLxmj=Idebow!VSNajJsY+fW==v#Wf4#pyzkkyZaN@<^V
zJLGDMz5{Z-BUObl$S?Ort!3<l#p`O{S{NAzA_wiSQTt#Bg^)A9Y_<RL*FjeCk|H8w
zsaDSXvc2y54#EIJNUdB7IrGb|yK141$aVtAN7t&Ye8rDU2>Ik%6&d=4!BiMI_sfH{
zEM~qia_*NkVsPj|Hgat&*T;G>Tq-V)_sgYwzwv&#dW`Cqt6#2u*=y#v{~~|cYV5{I
zAY;n>_93rg4{3@b=YCnbwC5h*zMKGZ?w2(i%tMeDMUivA95h4OgG`e^KKW%BitGy`
zpZ)R><d}->xU81Xet8HoD>4?27-zo>VuE`j#;Th@T&{k(dW`Cqt6%=nwM^&n5V2ot
zuf*lJ=JLpw;~}uOmCGXU9JDSU53zG*_i?wqqM$kGmbe_U-pS9$L+I^h`q*5qk|9A;
zu$B3Q9LGa+%-4~V`9vy@d>jwKz?}|exrXe5j;1Kz%E$2#z>IyZ3?7OjXX7DY2Evet
zVb0?r1lb{7ix_%yLLvs0LmpXRHNOt~=jt)4U#@<+YWc7j?jPJx=nmya$kz5Dub@1#
zLlg_V@T>!jnHIde+OPfMgLT&~TfRq!9dmL`BNk&P$c?>@yozR|Y=SEeWYuw{;8BOX
zT5qolgLLd`abZMcHw+nD>#!?(`uPJg4?|9NxwMuOviEX%ZTm9JD{6{s+39@;MQ#My
za4$0Mibst675678Cf561PF$%Tqx$9Qm#Z*7M2?|NbIde1WS9Z6bY<$7nOoBPtK7QD
zBOm;-ri`QG!Rfa$10FMj1pPV9X$T|PBHs~4Va(w4JD5*xUL7Mo2Vr>8@L}@aOtkFa
zRaj%hz~EYL%}nC*;M_z-u70`t<?5Gbi0n>@iI}@GA-$k<#Z6hFU^4k-dpSwj(gkv!
z+n7RrS-L$;^LDHwdPcyohy$4oHu7udq?NNtfD_3tA7)1d_BMz+62k%3hT!AVEjT^h
z;MB@f$S*6TYt!R6<VUwe%jr=InxR9;Cjm|&zbwKqt+o0u4j%#ab7Vq9c7dZX&Z)&I
z<d=2$g`98t1QAA?kS!e^XrayPA)f>|nf$V)T+52At?U!|S6ZGxe)(<05G@;J)rcX&
z=yus8z-i@|EnMc7aq=B@d@j?xkgF}Ke!2SPV#w4pY5agJQ5+m}VAz#M9yBUh=lg+p
zkpUBZ?uPsfEyckY&T2n61lb-s@lwb^6U#OlikPn*)XKgs*~-xtK^m(%VDRb6#K+zt
zh=VGJ+zCV%k-L6jEMH~sMtr}qO*v#p51fe)d+TlHWfTveW=Is$a=M%wrDZG~F;E}k
zW(GwJjmv77sbE|l*;Gpya(A#ISHE2S@&Ld5&;0%$sft{YD{@8tfsy|QvXu`VJ}D&Y
P00000NkvXXu0mjf0G6^h

literal 0
HcmV?d00001

diff --git a/xdocs/usermanual/realtime-results.xml b/xdocs/usermanual/realtime-results.xml
index 3ba3d7c4254..5fc95380a81 100644
--- a/xdocs/usermanual/realtime-results.xml
+++ b/xdocs/usermanual/realtime-results.xml
@@ -186,10 +186,22 @@ InfluxDB data can be easily viewed in a browser through <a href="http://grafana.
     <figure width="1265" height="581" image="grafana_dashboard.png">Grafana dashboard</figure>
 </subsection>
 
-<subsection name="&sect-num;.5 Graphite" anchor="graphite">
-<p>HELP WELCOME for this section, see <a href="../building.html" >Contributing documentation</a></p>
+<subsection name="&sect-num;.5 Graphite Configuration" anchor="graphite_configuration">
+    <p>To make JMeter send metrics to backend, add a BackendListener using the GraphiteBackendListenerClient.</p>
+    <p><a href="./component_reference.html#Backend_Listener">GraphiteBackendListenerClient</a> section will help you do the configuration.</p>
+    <figure width="902" height="341" image="backend_listener_graphite.png">Graphite configuration</figure>
 </subsection>
 
+<subsection name="&sect-num;.5.1 Graphite Sender" anchor="graphite_sendor">
+    <p>Two types of Senders are available. TextGraphiteMetricsSender, PickleGraphiteMetricsSender</p>
+    <ul>
+        <li>For plaintext protocol, set graphiteMetricsSender parameter to <code>org.apache.jmeter.visualizers.backend.graphite.TextGraphiteMetricsSender</code></li>
+        <li>For pickle protocol, set graphiteMetricsSender parameter to <code>org.apache.jmeter.visualizers.backend.graphite.PickleGraphiteMetricsSender</code></li>
+    </ul>    
+    <p>To send large amounts of data, use the Pickle sender. It is an efficient transmission method compared to textplain.
+    Read this for more details <a href="https://graphite.readthedocs.io/en/latest/feeding-carbon.html" target="_blank">Graphite documentation.</a></p>
+    <figure width="902" height="341" image="backend_listener_graphite_pickle.png">Graphite pickle sender</figure>
+</subsection>
 </section>
 
 </body>

From 9c16f2fdb32e352efd8dbefb5de1c31390300a7a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 20:58:06 +0100
Subject: [PATCH 0116/1037] Rephrase docs a bit

Don't use 'here' or similar as link text. Remove space at the end of line.
---
 xdocs/usermanual/realtime-results.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xdocs/usermanual/realtime-results.xml b/xdocs/usermanual/realtime-results.xml
index 5fc95380a81..ef01051cc29 100644
--- a/xdocs/usermanual/realtime-results.xml
+++ b/xdocs/usermanual/realtime-results.xml
@@ -197,9 +197,9 @@ InfluxDB data can be easily viewed in a browser through <a href="http://grafana.
     <ul>
         <li>For plaintext protocol, set graphiteMetricsSender parameter to <code>org.apache.jmeter.visualizers.backend.graphite.TextGraphiteMetricsSender</code></li>
         <li>For pickle protocol, set graphiteMetricsSender parameter to <code>org.apache.jmeter.visualizers.backend.graphite.PickleGraphiteMetricsSender</code></li>
-    </ul>    
-    <p>To send large amounts of data, use the Pickle sender. It is an efficient transmission method compared to textplain.
-    Read this for more details <a href="https://graphite.readthedocs.io/en/latest/feeding-carbon.html" target="_blank">Graphite documentation.</a></p>
+    </ul>
+    <p>To send large amounts of data, use the Pickle sender. It is a more efficient transmission method compared to textplain.
+    Read <a href="https://graphite.readthedocs.io/en/latest/feeding-carbon.html" target="_blank">the Graphite documentation</a> for more details.</p>
     <figure width="902" height="341" image="backend_listener_graphite_pickle.png">Graphite pickle sender</figure>
 </subsection>
 </section>

From 197b727ffced485376e3f2812b97281390d15f9f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 20:40:11 +0100
Subject: [PATCH 0117/1037] Use isEmpty instead of comparing length to zero

---
 .../java/org/apache/jmeter/visualizers/RenderAsRegexp.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index f598e0a1efa..c3c35483483 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -100,8 +100,8 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse
      */
     private void executeAndShowRegexpTester(String textToParse) {
-        if (textToParse != null && textToParse.length() > 0
-                && this.regexpField.getText().length() > 0) {
+        if (textToParse != null && !textToParse.isEmpty()
+                && !this.regexpField.getText().isEmpty()) {
             this.regexpResultField.setText(process(textToParse));
             this.regexpResultField.setCaretPosition(0); // go to first line
         }

From 18f4da2e65660d0f5f0c8c711213f804e00aef48 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 20:58:54 +0100
Subject: [PATCH 0118/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/visualizers/RenderAsRegexp.java    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index c3c35483483..d3f8f70b7b6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -24,6 +24,8 @@
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.PatternSyntaxException;
 
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
@@ -65,6 +67,8 @@ public class RenderAsRegexp implements ResultRenderer, ActionListener {
 
     private JTabbedPane rightSide;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /** {@inheritDoc} */
     @Override
     public void clearData() {
@@ -108,7 +112,40 @@ private void executeAndShowRegexpTester(String textToParse) {
     }
 
     private String process(String textToParse) {
+        if (useJavaRegex) {
+            return processJavaRegex(textToParse);
+        }
+        return processOroRegex(textToParse);
+    }
 
+    private String processJavaRegex(String textToParse) {
+        java.util.regex.Pattern pattern;
+        try {
+            pattern = java.util.regex.Pattern.compile(regexpField.getText());
+        } catch (PatternSyntaxException e) {
+            return e.toString();
+        }
+        Matcher matcher = pattern.matcher(textToParse);
+        List<java.util.regex.MatchResult> matches = new ArrayList<>();
+        while (matcher.find()) {
+            matches.add(matcher.toMatchResult());
+        }
+
+        // Construct a multi-line string with all matches
+        StringBuilder sb = new StringBuilder();
+        final int size = matches.size();
+        sb.append("Match count: ").append(size).append("\n");
+        for (int j = 0; j < size; j++) {
+            java.util.regex.MatchResult mr = matches.get(j);
+            final int groups = mr.groupCount();
+            for (int i = 0; i < groups; i++) {
+                sb.append("Match[").append(j+1).append("][").append(i).append("]=").append(mr.group(i)).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
+    private String processOroRegex(String textToParse) {
         Perl5Matcher matcher = new Perl5Matcher();
         PatternMatcherInput input = new PatternMatcherInput(textToParse);
 
@@ -123,6 +160,7 @@ private String process(String textToParse) {
         while (matcher.contains(input, pattern)) {
             matches.add(matcher.getMatch());
         }
+
         // Construct a multi-line string with all matches
         StringBuilder sb = new StringBuilder();
         final int size = matches.size();

From cc792fb6dc4332571b7300eb9e3075de3d68d3a5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:04:17 +0100
Subject: [PATCH 0119/1037] Use isEmpty instead of comparing length to zero

---
 .../java/org/apache/jmeter/assertions/ResponseAssertion.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index ce7201398a4..ea559e2b39e 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -533,7 +533,7 @@ private static StringBuilder equalsComparisonText(final String received, final S
         String compDeltaSeq;
         String endingEqSeq = trunc(true, received.substring(lastRecDiff + 1, recLength));
         String                  recDeltaSeq;
-        if (endingEqSeq.length() == 0) {
+        if (endingEqSeq.isEmpty()) {
             recDeltaSeq = trunc(true, received.substring(firstDiff, recLength));
             compDeltaSeq = trunc(true, comparison.substring(firstDiff, compLength));
         } else {

From a9f512732fc3bfa7c75ce711c09dcdb79baa1d5d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:16:28 +0100
Subject: [PATCH 0120/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/assertions/ResponseAssertion.java  | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index ea559e2b39e..fa82744777d 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -21,6 +21,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -94,6 +95,8 @@ public class ResponseAssertion extends AbstractScopedAssertion implements Serial
     private static final String DIFF_DELTA_END
             = JMeterUtils.getPropDefault("assertion.equals_diff_delta_end", "]]]");
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     public ResponseAssertion() {
         setProperty(new CollectionProperty(TEST_STRINGS, new ArrayList<String>()));
     }
@@ -326,19 +329,27 @@ private AssertionResult evaluateResponse(SampleResult response) {
             List<String> allCheckMessage = new ArrayList<>();
             for (JMeterProperty jMeterProperty : getTestStrings()) {
                 String stringPattern = jMeterProperty.getStringValue();
-                Pattern pattern = null;
-                if (contains || matches) {
-                    pattern = JMeterUtils.getPatternCache().getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
-                }
                 boolean found;
                 if (contains) {
-                    found = localMatcher.contains(toCheck, pattern);
+                    if (useJavaRegex) {
+                        found = containsWithJavaRegex(toCheck, stringPattern);
+                    } else {
+                        Pattern pattern = JMeterUtils.getPatternCache()
+                                .getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
+                        found = localMatcher.contains(toCheck, pattern);
+                    }
                 } else if (equals) {
                     found = toCheck.equals(stringPattern);
                 } else if (substring) {
                     found = toCheck.contains(stringPattern);
                 } else {
-                    found = localMatcher.matches(toCheck, pattern);
+                    if (useJavaRegex) {
+                        found = matchesWithJavaRegex(toCheck, stringPattern);
+                    } else {
+                        Pattern pattern = JMeterUtils.getPatternCache()
+                                .getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
+                        found = localMatcher.matches(toCheck, pattern);
+                    }
                 }
                 boolean pass = notTest ? !found : found;
                 if (orTest) {
@@ -375,7 +386,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
                     result.setFailureMessage(customMsg);
                 }
             }
-        } catch (MalformedCachePatternException e) {
+        } catch (MalformedCachePatternException | PatternSyntaxException e) {
             result.setError(true);
             result.setFailure(false);
             result.setFailureMessage("Bad test configuration " + e);
@@ -383,6 +394,14 @@ private AssertionResult evaluateResponse(SampleResult response) {
         return result;
     }
 
+    private static boolean matchesWithJavaRegex(String toCheck, String stringPattern) {
+        return java.util.regex.Pattern.compile(stringPattern).matcher(toCheck).matches();
+    }
+
+    private static boolean containsWithJavaRegex(String toCheck, String stringPattern) {
+        return java.util.regex.Pattern.compile(stringPattern).matcher(toCheck).find();
+    }
+
     private String getStringToCheck(SampleResult response) {
         String toCheck; // The string to check (Url or data)
         // What are we testing against?

From 046ebacadbd7bc23273fc854661aa02628ad7381 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:20:32 +0100
Subject: [PATCH 0121/1037] Add a switch to decide which regex engine should be
 used

---
 .../apache/jmeter/assertions/JSONPathAssertion.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 98aeca67250..cd9f36538ae 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -51,6 +51,8 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab
     public static final String INVERT = "INVERT";
     public static final String ISREGEX = "ISREGEX";
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     private static ThreadLocal<DecimalFormat> decimalFormatter =
             ThreadLocal.withInitial(JSONPathAssertion::createDecimalFormat);
 
@@ -164,8 +166,12 @@ private boolean arrayMatched(JSONArray value) {
     private boolean isEquals(Object subj) {
         if (isUseRegex()) {
             String str = objectToString(subj);
-            Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
-            return JMeterUtils.getMatcher().matches(str, pattern);
+            if (useJavaRegex) {
+                return java.util.regex.Pattern.matches(getExpectedValue(), str);
+            } else {
+                Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
+                return JMeterUtils.getMatcher().matches(str, pattern);
+            }
         } else {
             Object expected = JSONValue.parse(getExpectedValue());
             return Objects.equals(expected, subj);

From d69f4b91a96b9a500a835c5a765e2aead6a4a86e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:23:10 +0100
Subject: [PATCH 0122/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/assertions/jmespath/JMESPathAssertion.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index 0cf46bdab98..4e078c75f86 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -58,6 +58,8 @@ public class JMESPathAssertion extends AbstractTestElement implements Serializab
     private static final String ISREGEX = "ISREGEX";
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * Used to do a JMESPath query and compute result if the expectedValue matches
      * with the JMESPath query result
@@ -177,8 +179,12 @@ public static String objectToString(ObjectMapper mapper, JsonNode element) throw
     private boolean isEquals(ObjectMapper mapper, JsonNode jsonNode) throws JsonProcessingException {
         String str = objectToString(mapper, jsonNode);
         if (isUseRegex()) {
-            Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
-            return JMeterUtils.getMatcher().matches(str, pattern);
+            if (useJavaRegex) {
+                return java.util.regex.Pattern.matches(getExpectedValue(), str);
+            } else {
+                Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
+                return JMeterUtils.getMatcher().matches(str, pattern);
+            }
         } else {
             String expectedValueString = getExpectedValue();
             // first try to match as a string value, as

From 0e22677d83aca8d96b6873ce40cf0fbcf89e2542 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:31:49 +0100
Subject: [PATCH 0123/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/assertions/CompareAssertion.java   | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
index 96d78ba6083..dd63482ffc3 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
@@ -48,6 +48,8 @@ public class CompareAssertion extends AbstractTestElement implements Assertion,
 
     private Collection<SubstitutionElement> stringsToSkip;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     public CompareAssertion() {
         super();
     }
@@ -155,17 +157,25 @@ private String filterString(final String content) {
             return content;
         }
 
-        String result = content;
-        for (SubstitutionElement regex : stringsToSkip) {
-            emptySub.setSubstitution(regex.getSubstitute());
-            result = Util.substitute(
-                    JMeterUtils.getMatcher(),
-                    JMeterUtils.getPatternCache().getPattern(regex.getRegex()),
-                    emptySub,
-                    result,
-                    Util.SUBSTITUTE_ALL);
+        if (useJavaRegex) {
+            String result = content;
+            for (SubstitutionElement element: stringsToSkip) {
+                result = result.replaceAll(element.getRegex(), element.getSubstitute());
+            }
+            return result;
+        } else {
+            String result = content;
+            for (SubstitutionElement regex : stringsToSkip) {
+                emptySub.setSubstitution(regex.getSubstitute());
+                result = Util.substitute(
+                        JMeterUtils.getMatcher(),
+                        JMeterUtils.getPatternCache().getPattern(regex.getRegex()),
+                        emptySub,
+                        result,
+                        Util.SUBSTITUTE_ALL);
+            }
+            return result;
         }
-        return result;
     }
 
     @Override

From b73c0c354cb241a5f77da5fdfe3f52fdcab43bd0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:34:34 +0100
Subject: [PATCH 0124/1037] Use isEmpty instead of comparing length to zero

---
 .../java/org/apache/jmeter/extractor/RegexExtractor.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 6513311c6b9..aa3e17c28bb 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -49,6 +49,7 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
 
     // What to match against. N.B. do not change the string value or test plans will break!
     private static final String MATCH_AGAINST = "RegexExtractor.useHeaders"; // $NON-NLS-1$
+
     /*
      * Permissible values:
      *  true - match against headers
@@ -104,7 +105,7 @@ public void process() {
         int matchNumber = getMatchNumber();
 
         final String defaultValue = getDefaultValue();
-        if (defaultValue.length() > 0 || isEmptyDefaultValue()) {// Only replace default if it is provided or empty default value is explicitly requested
+        if (!defaultValue.isEmpty() || isEmptyDefaultValue()) {// Only replace default if it is provided or empty default value is explicitly requested
             vars.put(refName, defaultValue);
         }
 
@@ -479,7 +480,7 @@ public boolean useRequestHeaders() {
     // Allow for property not yet being set (probably only applies to Test cases)
     public boolean useBody() {
         String prop = getPropertyAsString(MATCH_AGAINST);
-        return prop.length()==0 || USE_BODY.equalsIgnoreCase(prop);// $NON-NLS-1$
+        return prop.isEmpty() || USE_BODY.equalsIgnoreCase(prop);// $NON-NLS-1$
     }
 
     public boolean useUnescapedBody() {

From 8768b868242f68e0f4a353b134a6308140973825 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:52:19 +0100
Subject: [PATCH 0125/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/extractor/RegexExtractor.java      | 174 ++++++++++++++++++
 1 file changed, 174 insertions(+)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index aa3e17c28bb..7ec7cdcec78 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -21,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.processor.PostProcessor;
@@ -81,6 +83,8 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
 
     private static final boolean DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE = false;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     private transient List<Object> template;
 
     /**
@@ -109,6 +113,14 @@ public void process() {
             vars.put(refName, defaultValue);
         }
 
+        if (useJavaRegex) {
+            extractWithJavaRegex(previousResult, vars, refName, matchNumber);
+        } else {
+            extractWithOroRegex(previousResult, vars, refName, matchNumber);
+        }
+    }
+
+    private void extractWithOroRegex(SampleResult previousResult, JMeterVariables vars, String refName, int matchNumber) {
         Perl5Matcher matcher = JMeterUtils.getMatcher();
         String regex = getRegex();
         Pattern pattern = null;
@@ -167,6 +179,62 @@ public void process() {
         }
     }
 
+    private void extractWithJavaRegex(SampleResult previousResult, JMeterVariables vars, String refName, int matchNumber) {
+        String regex = getRegex();
+        java.util.regex.Pattern pattern = null;
+        try {
+            pattern = java.util.regex.Pattern.compile(regex);
+            List<java.util.regex.MatchResult> matches = processMatches(pattern, previousResult, matchNumber, vars);
+            int prevCount = 0;
+            String prevString = vars.get(refName + REF_MATCH_NR);
+            if (prevString != null) {
+                vars.remove(refName + REF_MATCH_NR);// ensure old value is not left defined
+                try {
+                    prevCount = Integer.parseInt(prevString);
+                } catch (NumberFormatException nfe) {
+                    log.warn("Could not parse number: '{}'", prevString);
+                }
+            }
+            int matchCount=0;// Number of refName_n variable sets to keep
+            try {
+                java.util.regex.MatchResult match;
+                if (matchNumber >= 0) {// Original match behaviour
+                    match = getCorrectMatchJavaRegex(matches, matchNumber);
+                    if (match != null) {
+                        vars.put(refName, generateResult(match));
+                        saveGroups(vars, refName, match);
+                    } else {
+                        // refname has already been set to the default (if present)
+                        removeGroups(vars, refName);
+                    }
+                } else // < 0 means we save all the matches
+                {
+                    removeGroups(vars, refName); // remove any single matches
+                    matchCount = matches.size();
+                    vars.put(refName + REF_MATCH_NR, Integer.toString(matchCount));// Save the count
+                    for (int i = 1; i <= matchCount; i++) {
+                        match = getCorrectMatchJavaRegex(matches, i);
+                        if (match != null) {
+                            final String refName_n = refName + UNDERSCORE + i;
+                            vars.put(refName_n, generateResult(match));
+                            saveGroups(vars, refName_n, match);
+                        }
+                    }
+                }
+                // Remove any left-over variables
+                for (int i = matchCount + 1; i <= prevCount; i++) {
+                    final String refName_n = refName + UNDERSCORE + i;
+                    vars.remove(refName_n);
+                    removeGroups(vars, refName_n);
+                }
+            } catch (RuntimeException e) {
+                log.warn("Error while generating result");
+            }
+        } catch (PatternSyntaxException e) {
+            log.error("Error in pattern: '{}'", regex);
+        }
+    }
+
     private String getInputString(SampleResult result) {
         String inputString = useUrl() ? result.getUrlAsString() // Bug 39707
                 : useHeaders() ? result.getResponseHeaders()
@@ -213,6 +281,36 @@ private List<MatchResult> processMatches(Pattern pattern, String regex, SampleRe
         return Collections.unmodifiableList(matches);
     }
 
+    private List<java.util.regex.MatchResult> processMatches(
+            java.util.regex.Pattern pattern, SampleResult result, int matchNumber, JMeterVariables vars) {
+        log.debug("Regex = '{}'", pattern.pattern());
+
+        List<java.util.regex.MatchResult> matches = new ArrayList<>();
+        int found = 0;
+
+        if (isScopeVariable()) {
+            String inputString=vars.get(getVariableName());
+            if(inputString == null) {
+                if (log.isWarnEnabled()) {
+                    log.warn("No variable '{}' found to process by RegexExtractor '{}', skipping processing",
+                            getVariableName(), getName());
+                }
+                return Collections.emptyList();
+            }
+            matchStrings(matchNumber, pattern, matches, found, inputString);
+        } else {
+            List<SampleResult> sampleList = getSampleList(result);
+            for (SampleResult sr : sampleList) {
+                String inputString = getInputString(sr);
+                found = matchStrings(matchNumber, pattern, matches, found, inputString);
+                if (matchNumber > 0 && found == matchNumber) {// no need to process further
+                    break;
+                }
+            }
+        }
+        return Collections.unmodifiableList(matches);
+    }
+
     private int matchStrings(int matchNumber, Perl5Matcher matcher,
             Pattern pattern, List<MatchResult> matches, int found,
             String inputString) {
@@ -229,6 +327,22 @@ private int matchStrings(int matchNumber, Perl5Matcher matcher,
         return found;
     }
 
+    private int matchStrings(int matchNumber, java.util.regex.Pattern pattern,
+                             List<java.util.regex.MatchResult> matches, int found,
+                             String inputString) {
+        Matcher matcher = pattern.matcher(inputString);
+        while (matchNumber <=0 || found != matchNumber) {
+            if (matcher.find()) {
+                log.debug("RegexExtractor: Match found!");
+                matches.add(matcher.toMatchResult());
+                found++;
+            } else {
+                break;
+            }
+        }
+        return found;
+    }
+
     /**
      * Creates the variables:<br/>
      * basename_gn, where n=0...# of groups<br/>
@@ -263,6 +377,35 @@ private void saveGroups(JMeterVariables vars, String basename, MatchResult match
         }
     }
 
+    private void saveGroups(JMeterVariables vars, String basename, java.util.regex.MatchResult match) {
+        StringBuilder buf = new StringBuilder();
+        buf.append(basename);
+        buf.append("_g"); // $NON-NLS-1$
+        int pfxlen=buf.length();
+        String prevString=vars.get(buf.toString());
+        int previous=0;
+        if (prevString!=null){
+            try {
+                previous=Integer.parseInt(prevString);
+            } catch (NumberFormatException nfe) {
+                log.warn("Could not parse number: '{}'.", prevString);
+            }
+        }
+        //Note: match.groups() includes group 0
+        final int groups = match.groupCount();
+        for (int x = 0; x < groups; x++) {
+            buf.append(x);
+            vars.put(buf.toString(), match.group(x));
+            buf.setLength(pfxlen);
+        }
+        vars.put(buf.toString(), Integer.toString(groups-1));
+        for (int i = groups; i <= previous; i++){
+            buf.append(i);
+            vars.remove(buf.toString());// remove the remaining _gn vars
+            buf.setLength(pfxlen);
+        }
+    }
+
     /**
      * Removes the variables:<br/>
      * basename_gn, where n=0...# of groups<br/>
@@ -304,6 +447,22 @@ private String generateResult(MatchResult match) {
         return result.toString();
     }
 
+    private String generateResult(java.util.regex.MatchResult match) {
+        StringBuilder result = new StringBuilder();
+        for (Object obj : template) {
+            if(log.isDebugEnabled()) {
+                log.debug("RegexExtractor: Template piece {} ({})", obj, obj.getClass());
+            }
+            if (obj instanceof Integer) {
+                result.append(match.group((Integer) obj));
+            } else {
+                result.append(obj);
+            }
+        }
+        log.debug("Regex Extractor result = '{}'", result);
+        return result.toString();
+    }
+
     private void initTemplate() {
         if (template != null) {
             return;
@@ -368,6 +527,21 @@ private MatchResult getCorrectMatch(List<MatchResult> matches, int entry) {
         return matches.get(entry - 1);
     }
 
+    private java.util.regex.MatchResult getCorrectMatchJavaRegex(List<java.util.regex.MatchResult> matches, int entry) {
+        int matchSize = matches.size();
+
+        if (matchSize <= 0 || entry > matchSize){
+            return null;
+        }
+
+        if (entry == 0) // Random match
+        {
+            return matches.get(JMeterUtils.getRandomInt(matchSize));
+        }
+
+        return matches.get(entry - 1);
+    }
+
     /**
      * Set the regex to be used
      * @param regex The string representation of the regex

From 7d81464d9bada76de0d6435fb2036685d46ca029 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 21:53:18 +0100
Subject: [PATCH 0126/1037] Remove unnecessary second argument for substring
 (we want it all)

---
 .../main/java/org/apache/jmeter/extractor/RegexExtractor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 7ec7cdcec78..32d8936a0bc 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -491,7 +491,7 @@ private void initTemplate() {
         }
 
         if (beginOffset < rawTemplate.length()) { // trailing string is not empty
-            combined.add(rawTemplate.substring(beginOffset, rawTemplate.length()));
+            combined.add(rawTemplate.substring(beginOffset));
         }
         if (log.isDebugEnabled()) {
             log.debug("Template item count: {}", combined.size());

From a28e31b6a4a01111d258b7ac6e6525240e38cdde Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 21 Feb 2022 22:02:15 +0100
Subject: [PATCH 0127/1037] Use isEmpty instead of comparing length to zero

---
 .../org/apache/jmeter/functions/RegexFunction.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 71ffd73cd27..54ea52647e9 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -99,7 +99,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             if (values.length > 2) {
                 valueIndex = ((CompoundVariable) values[2]).execute();
             }
-            if (valueIndex.length() == 0) {
+            if (valueIndex.isEmpty()) {
                 valueIndex = "1"; //$NON-NLS-1$
             }
 
@@ -109,7 +109,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
 
             if (values.length > 4) {
                 String dv = ((CompoundVariable) values[4]).execute();
-                if (dv.length() != 0) {
+                if (!dv.isEmpty()) {
                     defaultValue = dv;
                 }
             }
@@ -133,19 +133,19 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             return defaultValue;
         }
 
-        if (name.length() > 0) {
+        if (!name.isEmpty()) {
             vars.put(name, defaultValue);
         }
 
         String textToMatch=null;
 
-        if (inputVariable.length() > 0){
+        if (!inputVariable.isEmpty()){
             textToMatch=vars.get(inputVariable);
         } else if (previousResult != null){
             textToMatch = previousResult.getResponseDataAsString();
         }
 
-        if (textToMatch == null || textToMatch.length() == 0) {
+        if (textToMatch == null || textToMatch.isEmpty()) {
             return defaultValue;
         }
 
@@ -160,7 +160,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
                 }
             }
         } finally {
-            if (name.length() > 0){
+            if (!name.isEmpty()){
                 vars.put(name + "_matchNr", Integer.toString(collectAllMatches.size())); //$NON-NLS-1$
             }
         }
@@ -225,7 +225,7 @@ private String generateResult(MatchResult match, String namep, Object[] template
                 result.append(match.group((Integer) t));
             }
         }
-        if (namep.length() > 0){
+        if (!namep.isEmpty()){
             vars.put(namep, result.toString());
         }
         return result.toString();

From ec257dcd150b0e166b5d4b59a7edb136bb55bde6 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 22 Feb 2022 16:36:47 +0100
Subject: [PATCH 0128/1037] Remove unused local variable

this is the old default else branch, where implicitly  is true.
---
 .../java/org/apache/jmeter/assertions/ResponseAssertion.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index fa82744777d..664e952b8f2 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -308,7 +308,6 @@ private AssertionResult evaluateResponse(SampleResult response) {
         boolean contains = isContainsType(); // do it once outside loop
         boolean equals = isEqualsType();
         boolean substring = isSubstringType();
-        boolean matches = isMatchType();
 
         log.debug("Test Type Info: contains={}, notTest={}, orTest={}", contains, notTest, orTest);
 
@@ -342,7 +341,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
                     found = toCheck.equals(stringPattern);
                 } else if (substring) {
                     found = toCheck.contains(stringPattern);
-                } else {
+                } else { // this is the old `matches` part which means `isMatchType()` is true
                     if (useJavaRegex) {
                         found = matchesWithJavaRegex(toCheck, stringPattern);
                     } else {

From de99883df5db26182126a2bd1c0941a8c9748a83 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 22 Feb 2022 16:37:13 +0100
Subject: [PATCH 0129/1037] Use isEmpty instead of comparing length to zero

---
 .../java/org/apache/jmeter/functions/EscapeOroRegexpChars.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
index 01a24485ed4..91c8d99641b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
@@ -75,7 +75,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
 
         String escapedValue = Perl5Compiler.quotemeta(valueToEscape);
 
-        if (varName.length() > 0) {
+        if (!varName.isEmpty()) {
             JMeterVariables vars = getVariables();
             if (vars != null) {// Can be null if called from Config item testEnded() method
                 vars.put(varName, escapedValue);

From 2c6bdf45af539cc131255da8bba50422174a24e8 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 22 Feb 2022 16:43:20 +0100
Subject: [PATCH 0130/1037] Add a switch to decide which regex engine should be
 used

---
 .../jmeter/functions/RegexFunction.java       | 213 +++++++++++++++---
 1 file changed, 181 insertions(+), 32 deletions(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 54ea52647e9..9163a3e6257 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -18,10 +18,13 @@
 package org.apache.jmeter.functions;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.regex.Matcher;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
@@ -60,6 +63,8 @@ public class RegexFunction extends AbstractFunction {
     private static final String TEMPLATE_PATTERN = "\\$(\\d+)\\$";  //$NON-NLS-1$
     /** initialised to the regex \$(\d+)\$ */
     private final Pattern templatePattern;
+    private static final java.util.regex.Pattern templatePatternJava =
+            java.util.regex.Pattern.compile(TEMPLATE_PATTERN);
 
     // Number of parameters expected - used to reject invalid calls
     private static final int MIN_PARAMETER_COUNT = 2;
@@ -75,6 +80,8 @@ public class RegexFunction extends AbstractFunction {
         desc.add(JMeterUtils.getResString("regexfunc_param_7"));// input variable //$NON-NLS-1$
     }
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     public RegexFunction() {
         templatePattern = JMeterUtils.getPatternCache().getPattern(TEMPLATE_PATTERN,
                 Perl5Compiler.READ_ONLY_MASK);
@@ -89,43 +96,35 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         String between = ""; //$NON-NLS-1$
         String name = ""; //$NON-NLS-1$
         String inputVariable = ""; //$NON-NLS-1$
-        Pattern searchPattern;
         Object[] tmplt;
-        try {
-            searchPattern = JMeterUtils.getPatternCache().getPattern(((CompoundVariable) values[0]).execute(),
-                    Perl5Compiler.READ_ONLY_MASK);
-            tmplt = generateTemplate(((CompoundVariable) values[1]).execute());
-
-            if (values.length > 2) {
-                valueIndex = ((CompoundVariable) values[2]).execute();
-            }
-            if (valueIndex.isEmpty()) {
-                valueIndex = "1"; //$NON-NLS-1$
-            }
+        tmplt = generateTemplate(((CompoundVariable) values[1]).execute());
+        if (values.length > 2) {
+            valueIndex = ((CompoundVariable) values[2]).execute();
+        }
+        if (valueIndex.isEmpty()) {
+            valueIndex = "1"; //$NON-NLS-1$
+        }
 
-            if (values.length > 3) {
-                between = ((CompoundVariable) values[3]).execute();
-            }
+        if (values.length > 3) {
+            between = ((CompoundVariable) values[3]).execute();
+        }
 
-            if (values.length > 4) {
-                String dv = ((CompoundVariable) values[4]).execute();
-                if (!dv.isEmpty()) {
-                    defaultValue = dv;
-                }
+        if (values.length > 4) {
+            String dv = ((CompoundVariable) values[4]).execute();
+            if (!dv.isEmpty()) {
+                defaultValue = dv;
             }
+        }
 
-            if (values.length > 5) {
-                name = ((CompoundVariable) values[5]).execute();
-            }
+        if (values.length > 5) {
+            name = ((CompoundVariable) values[5]).execute();
+        }
 
-            if (values.length > 6) {
-                inputVariable = ((CompoundVariable) values[6]).execute();
-            }
-        } catch (MalformedCachePatternException e) {
-            log.error("Malformed cache pattern:{}", values[0], e);
-            throw new InvalidVariableException("Malformed cache pattern:"+values[0], e);
+        if (values.length > 6) {
+            inputVariable = ((CompoundVariable) values[6]).execute();
         }
 
+
         // Relatively expensive operation, so do it once
         JMeterVariables vars = getVariables();
 
@@ -149,8 +148,84 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             return defaultValue;
         }
 
+        if (useJavaRegex) {
+            return getResultWithJavaRegex(valueIndex, defaultValue, between, name, tmplt, vars, textToMatch);
+        }
+        return getResultWithOroRegex(valueIndex, defaultValue, between, name, tmplt, vars, textToMatch);
+
+    }
+
+    private String getResultWithJavaRegex(String valueIndex, String defaultValue, String between, String name,
+                                         Object[] tmplt, JMeterVariables vars, String textToMatch)
+            throws InvalidVariableException {
+        List<java.util.regex.MatchResult> collectAllMatches = new ArrayList<>();
+        try {
+            java.util.regex.Pattern searchPattern = generateJavaPattern();
+            Matcher matcher = searchPattern.matcher(textToMatch);
+            while (matcher.find()) {
+                java.util.regex.MatchResult match = matcher.toMatchResult();
+                collectAllMatches.add(match);
+            }
+        } finally {
+            if (!name.isEmpty()){
+                vars.put(name + "_matchNr", Integer.toString(collectAllMatches.size())); //$NON-NLS-1$
+            }
+        }
+
+        if (collectAllMatches.isEmpty()) {
+            return defaultValue;
+        }
+
+        if (valueIndex.equals(ALL)) {
+            StringBuilder value = new StringBuilder();
+            Iterator<java.util.regex.MatchResult> it = collectAllMatches.iterator();
+            boolean first = true;
+            while (it.hasNext()) {
+                if (!first) {
+                    value.append(between);
+                } else {
+                    first = false;
+                }
+                value.append(generateResult(it.next(), name, tmplt, vars));
+            }
+            return value.toString();
+        } else if (valueIndex.equals(RAND)) {
+            java.util.regex.MatchResult result = collectAllMatches.get(
+                    ThreadLocalRandom.current().nextInt(collectAllMatches.size()));
+            return generateResult(result, name, tmplt, vars);
+        } else {
+            try {
+                int index = Integer.parseInt(valueIndex) - 1;
+                if(index >= collectAllMatches.size()) {
+                    return defaultValue;
+                }
+                java.util.regex.MatchResult result = collectAllMatches.get(index);
+                return generateResult(result, name, tmplt, vars);
+            } catch (NumberFormatException e) {
+                float ratio = Float.parseFloat(valueIndex);
+                java.util.regex.MatchResult result = collectAllMatches
+                        .get((int) (collectAllMatches.size() * ratio + .5) - 1);
+                return generateResult(result, name, tmplt, vars);
+            }
+        }
+    }
+
+    private java.util.regex.Pattern generateJavaPattern() throws InvalidVariableException {
+        try {
+            return java.util.regex.Pattern.compile(((CompoundVariable) values[0]).execute());
+
+        } catch (PatternSyntaxException e) {
+            log.error("Malformed regex pattern:{}", values[0], e);
+            throw new InvalidVariableException("Malformed regex pattern:" + values[0], e);
+        }
+    }
+
+    private String getResultWithOroRegex(String valueIndex, String defaultValue, String between, String name,
+                                         Object[] tmplt, JMeterVariables vars, String textToMatch)
+            throws InvalidVariableException {
         List<MatchResult> collectAllMatches = new ArrayList<>();
         try {
+            Pattern searchPattern = generateOroPattern();
             PatternMatcher matcher = JMeterUtils.getMatcher();
             PatternMatcherInput input = new PatternMatcherInput(textToMatch);
             while (matcher.contains(input, searchPattern)) {
@@ -200,7 +275,23 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
                 return generateResult(result, name, tmplt, vars);
             }
         }
+    }
 
+    private Pattern generateOroPattern() throws InvalidVariableException {
+        try {
+            return JMeterUtils.getPatternCache().getPattern(((CompoundVariable) values[0]).execute(),
+                    Perl5Compiler.READ_ONLY_MASK);
+
+        } catch (MalformedCachePatternException e) {
+            log.error("Malformed cache pattern:{}", values[0], e);
+            throw new InvalidVariableException("Malformed cache pattern:" + values[0], e);
+        }
+    }
+
+    private void saveGroups(java.util.regex.MatchResult result, String namep, JMeterVariables vars) {
+        for (int x = 0; x < result.groupCount(); x++) {
+            vars.put(namep + "_g" + x, result.group(x)); //$NON-NLS-1$
+        }
     }
 
     private void saveGroups(MatchResult result, String namep, JMeterVariables vars) {
@@ -231,6 +322,23 @@ private String generateResult(MatchResult match, String namep, Object[] template
         return result.toString();
     }
 
+    private String generateResult(java.util.regex.MatchResult match, String namep, Object[] template,
+                                  JMeterVariables vars) {
+        saveGroups(match, namep, vars);
+        StringBuilder result = new StringBuilder();
+        for (Object t : template) {
+            if (t instanceof String) {
+                result.append(t);
+            } else {
+                result.append(match.group((Integer) t));
+            }
+        }
+        if (!namep.isEmpty()){
+            vars.put(namep, result.toString());
+        }
+        return result.toString();
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getReferenceKey() {
@@ -245,6 +353,43 @@ public void setParameters(Collection<CompoundVariable> parameters) throws Invali
     }
 
     private Object[] generateTemplate(String rawTemplate) {
+        if (useJavaRegex) {
+            return generateTemplateWithJavaRegex(rawTemplate);
+        }
+        return generateTemplateWithOroRegex(rawTemplate);
+    }
+
+    private Object[] generateTemplateWithJavaRegex(String rawTemplate) {
+        // String or Integer
+        List<Object> combined = new ArrayList<>();
+        List<String> pieces = Arrays.asList(templatePatternJava.split(rawTemplate));
+        Matcher matcher = templatePatternJava.matcher(rawTemplate);
+        boolean startsWith = isFirstElementGroup(rawTemplate);
+        if (startsWith) {
+            pieces.remove(0);// Remove initial empty entry
+        }
+        Iterator<String> iter = pieces.iterator();
+        while (iter.hasNext()) {
+            boolean matchExists = matcher.find();
+            if (startsWith) {
+                if (matchExists) {
+                    combined.add(Integer.valueOf(matcher.group(1)));
+                }
+                combined.add(iter.next());
+            } else {
+                combined.add(iter.next());
+                if (matchExists) {
+                    combined.add(Integer.valueOf(matcher.group(1)));
+                }
+            }
+        }
+        if (matcher.find()) {
+            combined.add(Integer.valueOf(matcher.group(1)));
+        }
+        return combined.toArray();
+    }
+
+    private Object[] generateTemplateWithOroRegex(String rawTemplate) {
         List<String> pieces = new ArrayList<>();
         // String or Integer
         List<Object> combined = new ArrayList<>();
@@ -277,9 +422,13 @@ private Object[] generateTemplate(String rawTemplate) {
     }
 
     private boolean isFirstElementGroup(String rawData) {
-        Pattern pattern = JMeterUtils.getPatternCache().getPattern("^\\$\\d+\\$",  //$NON-NLS-1$
-                Perl5Compiler.READ_ONLY_MASK);
-        return JMeterUtils.getMatcher().contains(rawData, pattern);
+        if (useJavaRegex) {
+            return java.util.regex.Pattern.compile("^\\$\\d+\\$").matcher(rawData).find();
+        } else {
+            Pattern pattern = JMeterUtils.getPatternCache().getPattern("^\\$\\d+\\$",  //$NON-NLS-1$
+                    Perl5Compiler.READ_ONLY_MASK);
+            return JMeterUtils.getMatcher().contains(rawData, pattern);
+        }
     }
 
 }

From eb7c88c6cc15c7eb3c476d1b2d2b420361db6128 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 18:44:44 +0100
Subject: [PATCH 0131/1037] Add a switch to decide which regex engine should be
 used

---
 .../util/ReplaceFunctionsWithStrings.java     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index 8ac37b9f58a..9f55cf800fb 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.engine.util;
 
 import java.util.Map;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.jmeter.functions.InvalidVariableException;
 import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -53,6 +54,8 @@ public class ReplaceFunctionsWithStrings extends AbstractTransformer {
 
     private final boolean regexMatch;// Should we match using regexes?
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     public ReplaceFunctionsWithStrings(CompoundVariable masterFunction, Map<String, String> variables) {
         this(masterFunction, variables, false);
     }
@@ -66,6 +69,13 @@ public ReplaceFunctionsWithStrings(CompoundVariable masterFunction, Map<String,
 
     @Override
     public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariableException {
+        if (useJavaRegex) {
+            return transformValueWithJavaRegex(prop);
+        }
+        return transformValueWithOroRegex(prop);
+    }
+
+    private JMeterProperty transformValueWithOroRegex(JMeterProperty prop) throws InvalidVariableException {
         PatternMatcher pm = JMeterUtils.getMatcher();
         PatternCompiler compiler = new Perl5Compiler();
         String input = prop.getStringValue();
@@ -91,6 +101,28 @@ public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariable
         return new StringProperty(prop.getName(), input);
     }
 
+    private JMeterProperty transformValueWithJavaRegex(JMeterProperty prop) throws InvalidVariableException {
+        String input = prop.getStringValue();
+        if(input == null) {
+            return prop;
+        }
+        for(Map.Entry<String, String> entry : getVariables().entrySet()){
+            String key = entry.getKey();
+            String value = entry.getValue();
+            if (regexMatch) {
+                try {
+                    java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(constructPattern(value));
+                    input = pattern.matcher(input).replaceAll(FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
+                } catch (PatternSyntaxException e) {
+                    log.warn("Malformed pattern: {}", value);
+                }
+            } else {
+                input = StringUtilities.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
+            }
+        }
+        return new StringProperty(prop.getName(), input);
+    }
+
     /**
      * Normal regexes will be surrounded by boundary character matches to make life easier for users.
      * If a user doesn't want that behaviour, they can prevent the modification by giving a regex, that

From e746871640e67b9c5bd6b859ab2f8ef3ab917941 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 20:14:59 +0100
Subject: [PATCH 0132/1037] Add a switch to decide which regex engine should be
 used

---
 .../apache/jmeter/save/CSVSaveService.java    | 60 ++++++++++++++-----
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index 0b29926a6e9..e439fb938ae 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -35,6 +35,7 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
 
 import javax.swing.table.DefaultTableModel;
 
@@ -116,6 +117,8 @@ public final class CSVSaveService {
 
     private static final String LINE_SEP = System.getProperty("line.separator"); // $NON-NLS-1$
 
+    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * Private constructor to prevent instantiation.
      */
@@ -510,20 +513,9 @@ public static SampleSaveConfiguration getSampleSaveConfiguration(
         String delim = null;
 
         if (parts == null) {
-            Perl5Matcher matcher = JMeterUtils.getMatcher();
-            PatternMatcherInput input = new PatternMatcherInput(headerLine);
-            Pattern pattern = JMeterUtils.getPatternCache()
-            // This assumes the header names are all single words with no spaces
-            // word followed by 0 or more repeats of (non-word char + word)
-            // where the non-word char (\2) is the same
-            // e.g. abc|def|ghi but not abd|def~ghi
-                    .getPattern("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*", // $NON-NLS-1$
-                            // last entries may be quoted strings
-                            Perl5Compiler.READ_ONLY_MASK);
-            if (matcher.matches(input, pattern)) {
-                delim = matcher.getMatch().group(2);
-                parts = splitHeader(headerLine, delim);// now validate the
-                                                       // result
+            delim = extractDelimiter(headerLine);
+            if (delim != null) {
+                parts = splitHeader(headerLine, delim);// now validate the result
             }
         }
 
@@ -557,6 +549,46 @@ public static SampleSaveConfiguration getSampleSaveConfiguration(
         return saveConfig;
     }
 
+    private static String extractDelimiter(String headerLine) {
+        if (useJavaRegex) {
+            return extractDelimWithJavaRegex(headerLine);
+        }
+        return extractDelimWithOroRegex(headerLine);
+    }
+
+    private static String extractDelimWithJavaRegex(String headerLine) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern
+                // This assumes the header names are all single words with no spaces
+                // word followed by 0 or more repeats of (non-word char + word)
+                // where the non-word char (\2) is the same
+                // e.g. abc|def|ghi but not abd|def~ghi
+                .compile("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*" // $NON-NLS-1$
+                        // last entries may be quoted strings
+                        );
+        Matcher matcher = pattern.matcher(headerLine);
+        if (matcher.matches()) {
+            return matcher.group(2);
+        }
+        return null;
+    }
+
+    private static String extractDelimWithOroRegex(String headerLine) {
+        Perl5Matcher matcher = JMeterUtils.getMatcher();
+        PatternMatcherInput input = new PatternMatcherInput(headerLine);
+        Pattern pattern = JMeterUtils.getPatternCache()
+        // This assumes the header names are all single words with no spaces
+        // word followed by 0 or more repeats of (non-word char + word)
+        // where the non-word char (\2) is the same
+        // e.g. abc|def|ghi but not abd|def~ghi
+                .getPattern("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*", // $NON-NLS-1$
+                        // last entries may be quoted strings
+                        Perl5Compiler.READ_ONLY_MASK);
+        if (matcher.matches(input, pattern)) {
+            return matcher.getMatch().group(2);
+        }
+        return null;
+    }
+
     private static String[] splitHeader(String headerLine, String delim) {
         String[] parts = headerLine.split("\\Q" + delim);// $NON-NLS-1$
         int previous = -1;

From c7b4b764079342bdd83458565423640805876469 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 20:27:48 +0100
Subject: [PATCH 0133/1037] Add a switch to decide which regex engine should be
 used

---
 .../report/dashboard/ReportGenerator.java     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index f66cf7b3be0..36034583dc2 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -103,6 +103,8 @@ public class ReportGenerator {
     private final File testFile;
     private final ReportGeneratorConfiguration configuration;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * ResultCollector used
      */
@@ -439,9 +441,7 @@ private ApdexSummaryConsumer createApdexSummaryConsumer() {
                 // by property jmeter.reportgenerator.apdex_per_transaction
                 // key in entry below can be a hardcoded name or a regex
                 for (Map.Entry<String, Long[]> entry : configuration.getApdexPerTransaction().entrySet()) {
-                    org.apache.oro.text.regex.Pattern regex = JMeterUtils.getPatternCache().getPattern(entry.getKey());
-                    PatternMatcher matcher = JMeterUtils.getMatcher();
-                    if (sampleName != null && matcher.matches(sampleName, regex)) {
+                    if (isMatching(sampleName, entry.getKey())) {
                         Long satisfied = entry.getValue()[0];
                         Long tolerated = entry.getValue()[1];
                         if(log.isDebugEnabled()) {
@@ -458,6 +458,19 @@ private ApdexSummaryConsumer createApdexSummaryConsumer() {
         return apdexSummaryConsumer;
     }
 
+    private boolean isMatching(String sampleName, String keyName) {
+        if (sampleName == null) {
+            return false;
+        }
+        if (useJavaRegex) {
+            java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(keyName);
+            return pattern.matcher(sampleName).matches();
+        }
+        org.apache.oro.text.regex.Pattern regex = JMeterUtils.getPatternCache().getPattern(keyName);
+        PatternMatcher matcher = JMeterUtils.getMatcher();
+        return matcher.matches(sampleName, regex);
+    }
+
     /**
      * @return a {@link FilterConsumer} that filters samplers based on their name
      */

From a699d2bcd6ac155382e0d4a399d82706b3223140 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 20:42:13 +0100
Subject: [PATCH 0134/1037] Use isEmpty instead of comparing length to zero

---
 .../apache/jmeter/protocol/http/parser/HtmlParsingUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index d692b02c073..a245e84c7e4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -89,7 +89,7 @@ public static boolean isAnchorMatched(HTTPSamplerBase newLink, HTTPSamplerBase c
         }
 
         final String domain = config.getDomain();
-        if (domain != null && domain.length() > 0) {
+        if (domain != null && !domain.isEmpty()) {
             if (!isEqualOrMatches(newLink.getDomain(), domain, matcher, patternCache)){
                 return false;
             }

From 432cda4f12b5bd3fdb6fef926b6baa944b499ae9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 20:47:54 +0100
Subject: [PATCH 0135/1037] Use isEmpty instead of comparing length to zero

---
 .../protocol/http/proxy/ProxyControl.java     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index cda7adadaa8..6819c185215 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -794,18 +794,18 @@ public String[] getCertificateDetails() {
     // Package protected to allow test case access
     boolean filterUrl(HTTPSamplerBase sampler) {
         String domain = sampler.getDomain();
-        if (domain == null || domain.length() == 0) {
+        if (domain == null || domain.isEmpty()) {
             return false;
         }
 
         String url = generateMatchUrl(sampler);
         CollectionProperty includePatterns = getIncludePatterns();
-        if (includePatterns.size() > 0 && !matchesPatterns(url, includePatterns)) {
+        if (!includePatterns.isEmpty() && !matchesPatterns(url, includePatterns)) {
             return false;
         }
 
         CollectionProperty excludePatterns = getExcludePatterns();
-        if (excludePatterns.size() > 0 && matchesPatterns(url, excludePatterns)) {
+        if (!excludePatterns.isEmpty() && matchesPatterns(url, excludePatterns)) {
             return false;
         }
 
@@ -826,16 +826,14 @@ boolean filterContentType(SampleResult result) {
         String excludeExp = getContentTypeExclude();
 
         // If no expressions are specified, we let the sample pass
-        if((includeExp == null || includeExp.length() == 0) &&
-                (excludeExp == null || excludeExp.length() == 0)
-                )
-        {
+        if ((includeExp == null || includeExp.isEmpty()) &&
+                (excludeExp == null || excludeExp.isEmpty())) {
             return true;
         }
 
         // Check that we have a content type
         String sampleContentType = result.getContentType();
-        if (sampleContentType == null || sampleContentType.length() == 0) {
+        if (sampleContentType == null || sampleContentType.isEmpty()) {
             if (log.isDebugEnabled()) {
                 log.debug("No Content-type found for : {}", result.getUrlAsString());
             }
@@ -870,7 +868,7 @@ boolean filterContentType(SampleResult result) {
      * @return boolean true if Matching expression
      */
     private boolean testPattern(String expression, String sampleContentType, boolean expectedToMatch) {
-        if(expression != null && expression.length() > 0) {
+        if(expression != null && !expression.isEmpty()) {
             if(log.isDebugEnabled()) {
                 log.debug(
                         "Testing Expression : {} on sampleContentType: {}, expected to match: {}",
@@ -1324,7 +1322,7 @@ private void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<ConfigT
             for (ConfigTestElement config : configurations) {
                 String configValue = config.getPropertyAsString(name);
 
-                if (configValue != null && configValue.length() > 0) {
+                if (configValue != null && !configValue.isEmpty()) {
                     if (configValue.equals(value)) {
                         sampler.setProperty(name, ""); // $NON-NLS-1$
                     }
@@ -1342,7 +1340,7 @@ private String generateMatchUrl(HTTPSamplerBase sampler) {
         buf.append(':'); // $NON-NLS-1$
         buf.append(sampler.getPort());
         buf.append(sampler.getPath());
-        if (sampler.getQueryString().length() > 0) {
+        if (!sampler.getQueryString().isEmpty()) {
             buf.append('?'); // $NON-NLS-1$
             buf.append(sampler.getQueryString());
         }
@@ -1577,7 +1575,7 @@ private void initDynamicKeyStore() throws IOException, GeneralSecurityException
             keyStore = getKeyStore(storePassword.toCharArray()); // This should now work
         }
         final String sslDomains = getSslDomains().trim();
-        if (sslDomains.length() > 0) {
+        if (!sslDomains.isEmpty()) {
             final String[] domains = sslDomains.split(",");
             // The subject may be either a host or a domain
             for (String subject : domains) {

From 283e3b32209c3124937feb6533f5f1bf2d930314 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 21:08:10 +0100
Subject: [PATCH 0136/1037] Add a switch to decide which regex engine should be
 used

---
 .../protocol/http/proxy/ProxyControl.java     | 69 +++++++++++++++----
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 6819c185215..80a856141ab 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.prefs.Preferences;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -245,6 +246,8 @@ public enum KeystoreMode {
     // Although this field is mutable, it is only accessed within the synchronized method deliverSampler()
     private static String LAST_REDIRECT = null;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     private transient Daemon server;
 
     private long lastTime = 0;// When was the last sample seen?
@@ -868,26 +871,42 @@ boolean filterContentType(SampleResult result) {
      * @return boolean true if Matching expression
      */
     private boolean testPattern(String expression, String sampleContentType, boolean expectedToMatch) {
-        if(expression != null && !expression.isEmpty()) {
-            if(log.isDebugEnabled()) {
-                log.debug(
-                        "Testing Expression : {} on sampleContentType: {}, expected to match: {}",
-                        expression, sampleContentType, expectedToMatch);
-            }
+        if (expression == null || expression.isEmpty()) {
+            return true;
+        }
+        if(log.isDebugEnabled()) {
+            log.debug(
+                    "Testing Expression : {} on sampleContentType: {}, expected to match: {}",
+                    expression, sampleContentType, expectedToMatch);
+        }
 
-            Pattern pattern = null;
-            try {
-                pattern = JMeterUtils.getPatternCache().getPattern(expression, Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
-                if(JMeterUtils.getMatcher().contains(sampleContentType, pattern) != expectedToMatch) {
-                    return false;
-                }
-            } catch (MalformedCachePatternException e) {
-                log.warn("Skipped invalid content pattern: {}", expression, e);
+        try {
+            boolean contains;
+            if (useJavaRegex) {
+                contains = isContainedWithJavaRegex(expression, sampleContentType);
+            } else {
+                contains = isContainedWithOroRegex(expression, sampleContentType);
+            }
+            if (contains != expectedToMatch) {
+                return false;
             }
+        } catch (PatternSyntaxException | MalformedCachePatternException e) {
+            log.warn("Skipped invalid content pattern: {}", expression, e);
         }
         return true;
     }
 
+    private boolean isContainedWithJavaRegex(String expression, String sampleContentType) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(expression);
+        return pattern.matcher(sampleContentType).find();
+    }
+
+    private boolean isContainedWithOroRegex(String expression, String sampleContentType) {
+        Pattern pattern = JMeterUtils.getPatternCache().getPattern(expression,
+                Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
+        return JMeterUtils.getMatcher().contains(sampleContentType, pattern);
+    }
+
     /**
      * Find if there is any AuthManager in JMeterTreeModel
      * If there is no one, create and add it to tree
@@ -1348,6 +1367,28 @@ private String generateMatchUrl(HTTPSamplerBase sampler) {
     }
 
     private boolean matchesPatterns(String url, CollectionProperty patterns) {
+        if (useJavaRegex) {
+            return matchesPatternsWithJavaRegex(url, patterns);
+        }
+        return matchesPatternsWithOroRegex(url, patterns);
+    }
+
+    private boolean matchesPatternsWithJavaRegex(String url, CollectionProperty patterns) {
+        for (JMeterProperty jMeterProperty : patterns) {
+            String item = jMeterProperty.getStringValue();
+            try {
+                java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(item);
+                if (pattern.matcher(url).matches()) {
+                    return true;
+                }
+            } catch (PatternSyntaxException e) {
+                log.warn("Skipped invalid pattern: {}", item, e);
+            }
+        }
+        return false;
+    }
+
+    private boolean matchesPatternsWithOroRegex(String url, CollectionProperty patterns) {
         for (JMeterProperty jMeterProperty : patterns) {
             String item = jMeterProperty.getStringValue();
             try {

From e74cb153d2d45d5007365a6eb9c59b5f1fc44967 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 21:59:41 +0100
Subject: [PATCH 0137/1037] Add a switch to decide which regex engine should be
 used

---
 .../http/config/MultipartUrlConfig.java       | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index f4eeae90d16..4060e4902e3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.protocol.http.config;
 
 import java.io.Serializable;
+import java.util.regex.Matcher;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HeaderElement;
@@ -54,6 +55,8 @@ public class MultipartUrlConfig implements Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(MultipartUrlConfig.class);
 
+    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * HTTPFileArgs list to be uploaded with http request.
      */
@@ -183,6 +186,24 @@ private static String getParameterValue(HeaderElement element, String name, Stri
 
     private static String getHeaderValue(String headerName, String multiPart) {
         String regularExpression = headerName + "\\s*:\\s*(.*)$"; //$NON-NLS-1$
+        if (useJavaRegex) {
+            return getHeaderValueWithJavaRegex(headerName, multiPart, regularExpression);
+        }
+        return getHeaderValueWithOroRegex(headerName, multiPart, regularExpression);
+    }
+
+    private static String getHeaderValueWithJavaRegex(String headerName, String multiPart, String regularExpression) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regularExpression,
+                 java.util.regex.Pattern.CASE_INSENSITIVE
+                        | java.util.regex.Pattern.MULTILINE);
+        Matcher matcher = pattern.matcher(multiPart);
+        if (matcher.find()) {
+            return matcher.group(1).trim();
+        }
+        return null;
+    }
+
+    private static String getHeaderValueWithOroRegex(String headerName, String multiPart, String regularExpression) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         Pattern pattern = JMeterUtils.getPattern(regularExpression,
                 Perl5Compiler.READ_ONLY_MASK
@@ -191,8 +212,6 @@ private static String getHeaderValue(String headerName, String multiPart) {
         if(localMatcher.contains(multiPart, pattern)) {
             return localMatcher.getMatch().group(1).trim();
         }
-        else {
-            return null;
-        }
+        return null;
     }
 }

From fe0d0f83170af500371eca58aa39df191be7ec70 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 23 Feb 2022 22:03:59 +0100
Subject: [PATCH 0138/1037] Use isEmpty instead of comparing length to zero

---
 .../apache/jmeter/protocol/http/control/HttpMirrorThread.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
index 3fdb5c3fe6c..5411c6acf80 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
@@ -109,7 +109,7 @@ public void run() {
 
             baos.close();
             final String headerString = headers.toString();
-            if(headerString.length() == 0 || headerString.indexOf('\r') < 0) {
+            if(headerString.isEmpty() || headerString.indexOf('\r') < 0) {
                 log.error("Invalid request received:'{}'", headerString);
                 return;
             }

From 3aa7cbf9418abe0fdb0ce4021302b7a1365dbe2e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 11:53:19 +0100
Subject: [PATCH 0139/1037] Remove unused parameter in private method

---
 .../jmeter/protocol/http/config/MultipartUrlConfig.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index 4060e4902e3..ead373c57e7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -187,12 +187,12 @@ private static String getParameterValue(HeaderElement element, String name, Stri
     private static String getHeaderValue(String headerName, String multiPart) {
         String regularExpression = headerName + "\\s*:\\s*(.*)$"; //$NON-NLS-1$
         if (useJavaRegex) {
-            return getHeaderValueWithJavaRegex(headerName, multiPart, regularExpression);
+            return getHeaderValueWithJavaRegex(multiPart, regularExpression);
         }
-        return getHeaderValueWithOroRegex(headerName, multiPart, regularExpression);
+        return getHeaderValueWithOroRegex(multiPart, regularExpression);
     }
 
-    private static String getHeaderValueWithJavaRegex(String headerName, String multiPart, String regularExpression) {
+    private static String getHeaderValueWithJavaRegex(String multiPart, String regularExpression) {
         java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regularExpression,
                  java.util.regex.Pattern.CASE_INSENSITIVE
                         | java.util.regex.Pattern.MULTILINE);
@@ -203,7 +203,7 @@ private static String getHeaderValueWithJavaRegex(String headerName, String mult
         return null;
     }
 
-    private static String getHeaderValueWithOroRegex(String headerName, String multiPart, String regularExpression) {
+    private static String getHeaderValueWithOroRegex(String multiPart, String regularExpression) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         Pattern pattern = JMeterUtils.getPattern(regularExpression,
                 Perl5Compiler.READ_ONLY_MASK

From c3e9f612ce5b8f283f6c295c822c76648f074eca Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 12:04:52 +0100
Subject: [PATCH 0140/1037] Add a switch to decide which regex engine should be
 used

---
 .../http/control/HttpMirrorThread.java        | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
index 5411c6acf80..5dbb8c6aa08 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
@@ -28,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
 
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.util.JMeterUtils;
@@ -68,6 +69,8 @@ public class HttpMirrorThread implements Runnable {
 
     private static final String VERBOSE = "v"; // $NON-NLS-1$
 
+    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /** Socket to client. */
     private final Socket clientSocket;
 
@@ -290,6 +293,13 @@ else if (isChunked) {
     }
 
     private static String getRequestHeaderValue(String requestHeaders, String headerName) {
+        if (useJavaRegex) {
+            return getRequestHeaderValueWithJavaRegex(requestHeaders, headerName);
+        }
+        return getRequestHeaderValueWithOroRegex(requestHeaders, headerName);
+    }
+
+    private static String getRequestHeaderValueWithOroRegex(String requestHeaders, String headerName) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         // We use multi-line mask so can prefix the line with ^
         String expression = "^" + headerName + ":\\s+([^\\r\\n]+)"; // $NON-NLS-1$ $NON-NLS-2$
@@ -297,16 +307,49 @@ private static String getRequestHeaderValue(String requestHeaders, String header
                 Perl5Compiler.READ_ONLY_MASK
                         | Perl5Compiler.CASE_INSENSITIVE_MASK
                         | Perl5Compiler.MULTILINE_MASK);
-        if(localMatcher.contains(requestHeaders, pattern)) {
+        if (localMatcher.contains(requestHeaders, pattern)) {
             // The value is in the first group, group 0 is the whole match
             return localMatcher.getMatch().group(1);
         }
-        else {
-            return null;
+        return null;
+    }
+
+    private static String getRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
+        // We use multi-line mask so can prefix the line with ^
+        String expression = "^" + headerName + ":\\s+([^\\r\\n]+)"; // $NON-NLS-1$ $NON-NLS-2$
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(expression,
+                java.util.regex.Pattern.CASE_INSENSITIVE
+                        | java.util.regex.Pattern.MULTILINE);
+        Matcher matcher = pattern.matcher(requestHeaders);
+        if (matcher.find()) {
+            // The value is in the first group, group 0 is the whole match
+            return matcher.group(1);
         }
+        return null;
     }
 
     private static int getPositionOfBody(String stringToCheck) {
+        if (useJavaRegex) {
+            return getPositionOfBodyWithJavaRegex(stringToCheck);
+        }
+        return getPositionOfBodyWithOroRegex(stringToCheck);
+    }
+
+    private static int getPositionOfBodyWithJavaRegex(String stringToCheck) {
+        // The headers and body are divided by a blank line (the \r is to allow for the CR before LF)
+        String regularExpression = "^\\r$"; // $NON-NLS-1$
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regularExpression,
+                java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
+
+        Matcher matcher = pattern.matcher(stringToCheck);
+        if (matcher.find()) {
+            return matcher.start(0);
+        }
+        // No divider was found
+        return -1;
+    }
+
+    private static int getPositionOfBodyWithOroRegex(String stringToCheck) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         // The headers and body are divided by a blank line (the \r is to allow for the CR before LF)
         String regularExpression = "^\\r$"; // $NON-NLS-1$
@@ -316,7 +359,7 @@ private static int getPositionOfBody(String stringToCheck) {
                         | Perl5Compiler.MULTILINE_MASK);
 
         PatternMatcherInput input = new PatternMatcherInput(stringToCheck);
-        if(localMatcher.contains(input, pattern)) {
+        if (localMatcher.contains(input, pattern)) {
             MatchResult match = localMatcher.getMatch();
             return match.beginOffset(0);
         }

From 1efe1ee2818c4ef141e42ac4d0a8a7ca5cc20968 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 16:32:26 +0100
Subject: [PATCH 0141/1037] Use isEmpty instead of comparing length to zero

---
 .../protocol/http/sampler/HTTPSamplerBase.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index ad8cecc5b05..ddf8895133e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -381,9 +381,9 @@ public boolean getSendFileAsPostBody() {
         // If there is one file with no parameter name, the file will
         // be sent as post body.
         HTTPFileArg[] files = getHTTPFiles();
-        return (files.length == 1)
-                && (files[0].getPath().length() > 0)
-                && (files[0].getParamName().length() == 0);
+        return files.length == 1
+                && !files[0].getPath().isEmpty()
+                && files[0].getParamName().isEmpty();
     }
 
     /**
@@ -402,7 +402,7 @@ public boolean getSendParameterValuesAsPostBody() {
             for (JMeterProperty jMeterProperty : getArguments()) {
                 hasArguments = true;
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
-                if (arg.getName() != null && arg.getName().length() > 0) {
+                if (arg.getName() != null && !arg.getName().isEmpty()) {
                     return false;
                 }
             }
@@ -458,7 +458,7 @@ public void setProtocol(String value) {
      */
     public String getProtocol() {
         String protocol = getPropertyAsString(PROTOCOL);
-        if (protocol == null || protocol.length() == 0) {
+        if (protocol == null || protocol.isEmpty()) {
             return DEFAULT_PROTOCOL;
         }
         return protocol;
@@ -1104,7 +1104,7 @@ public URL getUrl() throws MalformedURLException {
             // If no encoding is specified by user, we will get it
             // encoded in UTF-8, which is what the HTTP spec says
             String queryString = getQueryString(getContentEncoding());
-            if (queryString.length() > 0) {
+            if (!queryString.isEmpty()) {
                 if (path.contains(QRY_PFX)) {// Already contains a prefix
                     pathAndQuery.append(QRY_SEP);
                 } else {
@@ -1236,7 +1236,7 @@ public void parseArguments(String queryString, String contentEncoding) {
                 name = arg;
                 value = "";
             }
-            if (name.length() > 0) {
+            if (!name.isEmpty()) {
                 log.debug("Name: {} Value: {} Metadata: {}", name, value, metaData);
                 // If we know the encoding, we can decode the argument value,
                 // to make it easier to read for the user
@@ -1367,7 +1367,7 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
             String allowRegex = getEmbeddedUrlRE();
             Perl5Matcher localMatcher = null;
             Pattern allowPattern = null;
-            if (allowRegex.length() > 0) {
+            if (!allowRegex.isEmpty()) {
                 try {
                     allowPattern = JMeterUtils.getPattern(allowRegex);
                     localMatcher = JMeterUtils.getMatcher();// don't fetch unless pattern compiles
@@ -1377,7 +1377,7 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
             }
             Pattern excludePattern = null;
             String excludeRegex = getEmbededUrlExcludeRE();
-            if (excludeRegex.length() > 0) {
+            if (!excludeRegex.isEmpty()) {
                 try {
                     excludePattern = JMeterUtils.getPattern(excludeRegex);
                     if (localMatcher == null) {

From 1654b75ec82d7dd1e352f7c7a68c59c92b71b3e4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 17:00:43 +0100
Subject: [PATCH 0142/1037] Add a switch to decide which regex engine should be
 used

---
 .../http/sampler/HTTPSamplerBase.java         | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index ddf8895133e..57985dc7ef7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -41,6 +41,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.function.Predicate;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -320,6 +322,8 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     private static final boolean SEPARATE_CONTAINER =
             JMeterUtils.getPropDefault("httpsampler.separate.container", true); // $NON-NLS-1$
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     static {
         String[] parsers = JOrphanUtils.split(RESPONSE_PARSERS, " " , true);// returns empty array for null
         for (final String parser : parsers) {
@@ -1365,28 +1369,9 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
 
             // Get the URL matcher
             String allowRegex = getEmbeddedUrlRE();
-            Perl5Matcher localMatcher = null;
-            Pattern allowPattern = null;
-            if (!allowRegex.isEmpty()) {
-                try {
-                    allowPattern = JMeterUtils.getPattern(allowRegex);
-                    localMatcher = JMeterUtils.getMatcher();// don't fetch unless pattern compiles
-                } catch (MalformedCachePatternException e) { // NOSONAR
-                    log.warn("Ignoring embedded URL match string: {}", e.getMessage());
-                }
-            }
-            Pattern excludePattern = null;
+            Predicate<URL> allowPredicate = generateMatcherPredicate(allowRegex, "allow", true);
             String excludeRegex = getEmbededUrlExcludeRE();
-            if (!excludeRegex.isEmpty()) {
-                try {
-                    excludePattern = JMeterUtils.getPattern(excludeRegex);
-                    if (localMatcher == null) {
-                        localMatcher = JMeterUtils.getMatcher();// don't fetch unless pattern compiles
-                    }
-                } catch (MalformedCachePatternException e) { // NOSONAR
-                    log.warn("Ignoring embedded URL exclude string: {}", e.getMessage());
-                }
-            }
+            Predicate<URL> excludePredicate = generateMatcherPredicate(excludeRegex, "exclude", false);
 
             // For concurrent get resources
             final List<Callable<AsynSamplerResultHolder>> list = new ArrayList<>();
@@ -1423,12 +1408,11 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
                             setParentSampleSuccess(res, false);
                             continue;
                         }
-                        log.debug("allowPattern: {}, excludePattern: {}, localMatcher: {}, url: {}", allowPattern, excludePattern, localMatcher, url);
-                        // I don't think localMatcher can be null here, but check just in case
-                        if (allowPattern != null && localMatcher != null && !localMatcher.matches(url.toString(), allowPattern)) {
+                        log.debug("allowPattern: {}, excludePattern: {}, url: {}", allowRegex, excludeRegex, url);
+                        if (!allowPredicate.test(url)) {
                             continue; // we have a pattern and the URL does not match, so skip it
                         }
-                        if (excludePattern != null && localMatcher != null && localMatcher.matches(url.toString(), excludePattern)) {
+                        if (excludePredicate.test(url)) {
                             continue; // we have a pattern and the URL does not match, so skip it
                         }
                         try {
@@ -1491,6 +1475,29 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
         return res;
     }
 
+    private Predicate<URL> generateMatcherPredicate(String regex, String explanation, boolean defaultAnswer) {
+        if (StringUtils.isEmpty(regex)) {
+            return s -> defaultAnswer;
+        }
+        if (useJavaRegex) {
+            try {
+                java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
+                return s -> pattern.matcher(s.toString()).matches();
+            } catch (PatternSyntaxException e) {
+                log.warn("Ignoring embedded URL {} string: {}", explanation, e.getMessage());
+                return s -> defaultAnswer;
+            }
+        }
+        try {
+            Pattern pattern = JMeterUtils.getPattern(regex);
+            Perl5Matcher matcher = JMeterUtils.getMatcher();
+            return s -> matcher.matches(s.toString(), pattern);
+        } catch (MalformedCachePatternException e) { // NOSONAR
+            log.warn("Ignoring embedded URL {} string: {}", explanation, e.getMessage());
+            return s -> defaultAnswer;
+        }
+    }
+
     static void registerParser(String contentType, String className) {
         log.info("Parser for {} is {}", contentType, className);
         PARSERS_FOR_CONTENT_TYPE.put(contentType, className);

From 5de17638ba2b1bc5b0c09fd4e37c20b83863251d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 17:41:49 +0100
Subject: [PATCH 0143/1037] Add a cache to store compiled Patterns into
 JMeterUtils

---
 .../org/apache/jmeter/util/JMeterUtils.java   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index a6b40c64a9c..a19d5a04331 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -53,6 +53,7 @@
 import javax.swing.SwingUtilities;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.gui.JFactory;
@@ -70,6 +71,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import com.thoughtworks.xstream.security.NoTypePermission;
@@ -95,6 +98,20 @@ private LazyPatternCacheHolder() {
                 new Perl5Compiler());
     }
 
+    private static final class LazyJavaPatternCacheHolder {
+        private LazyJavaPatternCacheHolder() {
+            super();
+        };
+        public static final LoadingCache<Pair<String, Integer>, java.util.regex.Pattern> INSTANCE =
+                Caffeine
+                        .newBuilder()
+                        .maximumSize(getPropDefault("java_regex.patterncache.size", 1000))
+                        .build(key -> {
+                            //noinspection MagicConstant
+                            return java.util.regex.Pattern.compile(key.getLeft(), key.getRight().intValue());
+                        });
+    }
+
     public static final String RES_KEY_PFX = "[res_key="; // $NON-NLS-1$
 
     private static final String EXPERT_MODE_PROPERTY = "jmeter.expertMode"; // $NON-NLS-1$
@@ -253,6 +270,14 @@ public static Properties loadProperties(String file, Properties defaultProps) {
         return p;
     }
 
+    public static java.util.regex.Pattern compilePattern(String expression) {
+        return compilePattern(expression, 0);
+    }
+
+    public static java.util.regex.Pattern compilePattern(String expression, int flags) {
+        return LazyJavaPatternCacheHolder.INSTANCE.get(Pair.of(expression, Integer.valueOf(flags)));
+    }
+
     public static PatternCacheLRU getPatternCache() {
         return LazyPatternCacheHolder.INSTANCE;
     }
@@ -270,7 +295,6 @@ public static PatternCacheLRU getPatternCache() {
     public static Pattern getPattern(String expression) throws MalformedCachePatternException {
         return getPattern(expression, Perl5Compiler.READ_ONLY_MASK);
     }
-
     /**
      * Get a compiled expression from the pattern cache.
      *

From 6b01e55ecf23405d36f2e09b92445546df365a77 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 17:53:51 +0100
Subject: [PATCH 0144/1037] Remove useless semicolon

---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index a19d5a04331..5ccf37daab4 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -101,7 +101,7 @@ private LazyPatternCacheHolder() {
     private static final class LazyJavaPatternCacheHolder {
         private LazyJavaPatternCacheHolder() {
             super();
-        };
+        }
         public static final LoadingCache<Pair<String, Integer>, java.util.regex.Pattern> INSTANCE =
                 Caffeine
                         .newBuilder()

From fe66021be8e009c0f685a1b2332c6191927428b2 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 19:00:46 +0100
Subject: [PATCH 0145/1037] Rename property for regex cache size

That way -- as Vladimir pointed out -- it would be more consistent to
a potentially renamed property jmeter.regex.engine, which would
replace the boolean property jmeter.use_java_regex.
---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 5ccf37daab4..3a8408bb2a7 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -105,7 +105,7 @@ private LazyJavaPatternCacheHolder() {
         public static final LoadingCache<Pair<String, Integer>, java.util.regex.Pattern> INSTANCE =
                 Caffeine
                         .newBuilder()
-                        .maximumSize(getPropDefault("java_regex.patterncache.size", 1000))
+                        .maximumSize(getPropDefault("jmeter.regex.patterncache.size", 1000))
                         .build(key -> {
                             //noinspection MagicConstant
                             return java.util.regex.Pattern.compile(key.getLeft(), key.getRight().intValue());

From 4e21125aef15040ef3b992492b69a5eef3698089 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 19:04:48 +0100
Subject: [PATCH 0146/1037] use 'modern' Java features as isEmpty and contains

---
 .../jmeter/protocol/http/modifier/URLRewritingModifier.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 1cb6c1e1ed0..ac1250372bc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -119,7 +119,7 @@ public void process() {
 
         // Bug 15025 - save session value across samplers
         if (shouldCache()){
-            if (value == null || value.length() == 0) {
+            if (value == null || value.isEmpty()) {
                 value = savedValue;
             } else {
                 savedValue = value;
@@ -132,7 +132,7 @@ private void modify(HTTPSamplerBase sampler, String value) {
         if (isPathExtension()) {
             String oldPath = sampler.getPath();
             int indexOfSessionId = oldPath.indexOf(SEMI_COLON + getArgumentName());
-            if(oldPath.indexOf(SEMI_COLON + getArgumentName())>=0) {
+            if(oldPath.contains(SEMI_COLON + getArgumentName())) {
                 int indexOfQuestionMark = oldPath.indexOf('?');
                 if(indexOfQuestionMark < 0) {
                     oldPath = oldPath.substring(0, indexOfSessionId);

From d61b9d3550dcf8757d9bdfe70fb64e20f63f9211 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 19:40:14 +0100
Subject: [PATCH 0147/1037] Add a switch to decide which regex engine should be
 used

---
 .../http/modifier/URLRewritingModifier.java   | 196 +++++++++++-------
 1 file changed, 121 insertions(+), 75 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index ac1250372bc..d5986742d6c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -18,6 +18,8 @@
 package org.apache.jmeter.protocol.http.modifier;
 
 import java.io.Serializable;
+import java.util.function.Function;
+import java.util.regex.Matcher;
 
 import org.apache.jmeter.processor.PreProcessor;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
@@ -41,15 +43,11 @@ public class URLRewritingModifier extends AbstractTestElement implements Seriali
 
     private static final String SEMI_COLON = ";"; // $NON-NLS-1$
 
-    private transient Pattern pathExtensionEqualsQuestionmarkRegexp;
-
-    private transient Pattern pathExtensionEqualsNoQuestionmarkRegexp;
-
-    private transient Pattern parameterRegexp;
-
-    private transient Pattern pathExtensionNoEqualsQuestionmarkRegexp;
-
-    private transient Pattern pathExtensionNoEqualsNoQuestionmarkRegexp;
+    private transient Function<String, String> pathExtensionEqualsQuestionmarkExtractor;
+    private transient Function<String, String> pathExtensionEqualsNoQuestionmarkExtractor;
+    private transient Function<String, String> pathExtensionNoEqualsQuestionmarkExtractor;
+    private transient Function<String, String> pathExtensionNoEqualsNoQuestionmarkExtractor;
+    private transient Function<String, String> parameterExtractor;
 
     private static final String ARGUMENT_NAME = "argument_name"; // $NON-NLS-1$
 
@@ -63,6 +61,8 @@ public class URLRewritingModifier extends AbstractTestElement implements Seriali
 
     private static final String ENCODE = "encode"; // $NON-NLS-1$
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     // PreProcessors are cloned per-thread, so this will be saved per-thread
     private transient String savedValue = ""; // $NON-NLS-1$
 
@@ -79,46 +79,21 @@ public void process() {
         }
         initRegex(getArgumentName());
         String text = responseText.getResponseDataAsString();
-        Perl5Matcher matcher = JMeterUtils.getMatcher();
-        String value = "";
+        String value;
         if (isPathExtension() && isPathExtensionNoEquals() && isPathExtensionNoQuestionmark()) {
-            if (matcher.contains(text, pathExtensionNoEqualsNoQuestionmarkRegexp)) {
-                MatchResult result = matcher.getMatch();
-                value = result.group(1);
-            }
-        } else if (isPathExtension() && isPathExtensionNoEquals()) // && !isPathExtensionNoQuestionmark()
-        {
-            if (matcher.contains(text, pathExtensionNoEqualsQuestionmarkRegexp)) {
-                MatchResult result = matcher.getMatch();
-                value = result.group(1);
-            }
-        } else if (isPathExtension() && isPathExtensionNoQuestionmark()) // && !isPathExtensionNoEquals()
-        {
-            if (matcher.contains(text, pathExtensionEqualsNoQuestionmarkRegexp)) {
-                MatchResult result = matcher.getMatch();
-                value = result.group(1);
-            }
-        } else if (isPathExtension()) // && !isPathExtensionNoEquals() && !isPathExtensionNoQuestionmark()
-        {
-            if (matcher.contains(text, pathExtensionEqualsQuestionmarkRegexp)) {
-                MatchResult result = matcher.getMatch();
-                value = result.group(1);
-            }
-        } else // if ! isPathExtension()
-        {
-            if (matcher.contains(text, parameterRegexp)) {
-                MatchResult result = matcher.getMatch();
-                for (int i = 1; i < result.groups(); i++) {
-                    value = result.group(i);
-                    if (value != null) {
-                        break;
-                    }
-                }
-            }
+            value = pathExtensionEqualsQuestionmarkExtractor.apply(text);
+        } else if (isPathExtension() && isPathExtensionNoEquals()) { // && !isPathExtensionNoQuestionmark()
+            value = pathExtensionEqualsNoQuestionmarkExtractor.apply(text);
+        } else if (isPathExtension() && isPathExtensionNoQuestionmark()) { // && !isPathExtensionNoEquals()
+            value = pathExtensionNoEqualsQuestionmarkExtractor.apply(text);
+        } else if (isPathExtension()) { // && !isPathExtensionNoEquals() && !isPathExtensionNoQuestionmark()
+            value = pathExtensionNoEqualsNoQuestionmarkExtractor.apply(text);
+        } else { // if ! isPathExtension()
+            value = parameterExtractor.apply(text);
         }
 
         // Bug 15025 - save session value across samplers
-        if (shouldCache()){
+        if (shouldCache()) {
             if (value == null || value.isEmpty()) {
                 value = savedValue;
             } else {
@@ -158,42 +133,113 @@ public void setArgumentName(String argName) {
 
     private void initRegex(String argName) {
         String quotedArg = Perl5Compiler.quotemeta(argName);// Don't get tripped up by RE chars in the arg name
-        pathExtensionEqualsQuestionmarkRegexp = JMeterUtils.getPatternCache().getPattern(
-                SEMI_COLON + quotedArg + "=([^\"'<>&\\s;]*)", // $NON-NLS-1$
-                Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
+        pathExtensionEqualsQuestionmarkExtractor = generateExtractor(
+                SEMI_COLON + quotedArg + "=([^\"'<>&\\s;]*)" // $NON-NLS-1$
+        );
+        pathExtensionEqualsNoQuestionmarkExtractor = generateExtractor(
+                SEMI_COLON + quotedArg + "=([^\"'<>&\\s;?]*)" // $NON-NLS-1$
+        );
+        pathExtensionNoEqualsQuestionmarkExtractor = generateExtractor(
+                SEMI_COLON + quotedArg + "([^\"'<>&\\s;]*)"// $NON-NLS-1$
+        );
+        pathExtensionNoEqualsNoQuestionmarkExtractor = generateExtractor(
+                SEMI_COLON + quotedArg + "([^\"'<>&\\s;?]*)" // $NON-NLS-1$
+        );
+
+        parameterExtractor = generateFirstMatchExtractor(
+                // ;sessionid=value
+                "[;\\?&]" + quotedArg + "=([^\"'<>&\\s;\\\\]*)"  // $NON-NLS-1$
+
+                        // name="sessionid" value="value"
+                        +  "|\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']" + quotedArg
+                        + "[\"']" + "[^>]*"  // $NON-NLS-1$
+                        + "\\s[vV][Aa][Ll][Uu][Ee]\\s*=\\s*[\"']" // $NON-NLS-1$
+                        + "([^\"']*)" + "[\"']" // $NON-NLS-1$
+
+                        //  value="value" name="sessionid"
+                        + "|\\s[vV][Aa][Ll][Uu][Ee]\\s*=\\s*[\"']" // $NON-NLS-1$
+                        + "([^\"']*)" + "[\"']" + "[^>]*" // $NON-NLS-1$ // $NON-NLS-2$ // $NON-NLS-3$
+                        + "\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']"  // $NON-NLS-1$
+                        + quotedArg + "[\"']" // $NON-NLS-1$
+        );
+        // NOTE: the handling of simple- vs. double-quotes could be formally
+        // more accurate, but I can't imagine a session id containing
+        // either, so we should be OK. The whole set of expressions is a
+        // quick hack anyway, so who cares.
+    }
 
-        pathExtensionEqualsNoQuestionmarkRegexp = JMeterUtils.getPatternCache().getPattern(
-                SEMI_COLON + quotedArg + "=([^\"'<>&\\s;?]*)", // $NON-NLS-1$
-                Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
+    private Function<String, String> generateExtractor(String regex) {
+        if (useJavaRegex) {
+            return generateExtractorWithJavaRegex(regex);
+        }
+        return generateExtractorWithOroRegex(regex);
+    }
 
-        pathExtensionNoEqualsQuestionmarkRegexp = JMeterUtils.getPatternCache().getPattern(
-                SEMI_COLON + quotedArg + "([^\"'<>&\\s;]*)", // $NON-NLS-1$
-                Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
+    private Function<String, String> generateExtractorWithJavaRegex(String regex) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(
+                regex,
+                java.util.regex.Pattern.MULTILINE);
+        return text -> {
+            Matcher matcher = pattern.matcher(text);
+            if (matcher.find()) {
+                return matcher.group(1);
+            }
+            return "";
+        };
+    }
 
-        pathExtensionNoEqualsNoQuestionmarkRegexp = JMeterUtils.getPatternCache().getPattern(
-                SEMI_COLON + quotedArg + "([^\"'<>&\\s;?]*)", // $NON-NLS-1$
+    private Function<String, String> generateExtractorWithOroRegex(String regex) {
+        Pattern pattern = JMeterUtils.getPatternCache().getPattern(
+                regex,
                 Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
+        Perl5Matcher matcher = JMeterUtils.getMatcher();
+        return text -> {
+            if (matcher.contains(text, pattern)) {
+                MatchResult result = matcher.getMatch();
+                return result.group(1);
+            }
+            return "";
+        };
+    }
 
-        parameterRegexp = JMeterUtils.getPatternCache().getPattern(
-                // ;sessionid=value
-                "[;\\?&]" + quotedArg + "=([^\"'<>&\\s;\\\\]*)" +  // $NON-NLS-1$
-
-                // name="sessionid" value="value"
-                "|\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']" + quotedArg
-                + "[\"']" + "[^>]*"  // $NON-NLS-1$
-                + "\\s[vV][Aa][Ll][Uu][Ee]\\s*=\\s*[\"']" // $NON-NLS-1$
-                + "([^\"']*)" + "[\"']" // $NON-NLS-1$
-
-                //  value="value" name="sessionid"
-                + "|\\s[vV][Aa][Ll][Uu][Ee]\\s*=\\s*[\"']" // $NON-NLS-1$
-                + "([^\"']*)" + "[\"']" + "[^>]*" // $NON-NLS-1$ // $NON-NLS-2$ // $NON-NLS-3$
-                + "\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']"  // $NON-NLS-1$
-                + quotedArg + "[\"']", // $NON-NLS-1$
+    private Function<String, String> generateFirstMatchExtractor(String regex) {
+        if (useJavaRegex) {
+            return generateFirstMatchExtractorWithJavaRegex(regex);
+        }
+        return generateFirstMatchExtractorWithOroRegex(regex);
+    }
+
+    private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String regex) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(
+                regex,
+                java.util.regex.Pattern.MULTILINE);
+        return text -> {
+            Matcher matcher = pattern.matcher(text);
+            for (int i = 1; i < matcher.groupCount(); i++) {
+                String value = matcher.group(i);
+                if (value != null) {
+                    return value;
+                }
+            }
+            return "";
+        };
+    }
+
+    private Function<String, String> generateFirstMatchExtractorWithOroRegex(String regex) {
+        Pattern pattern = JMeterUtils.getPatternCache().getPattern(
+                regex,
                 Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
-        // NOTE: the handling of simple- vs. double-quotes could be formally
-        // more accurate, but I can't imagine a session id containing
-        // either, so we should be OK. The whole set of expressions is a
-        // quick hack anyway, so who cares.
+        Perl5Matcher matcher = JMeterUtils.getMatcher();
+        return text -> {
+            MatchResult result = matcher.getMatch();
+            for (int i = 1; i < result.groups(); i++) {
+                String value = result.group(i);
+                if (value != null) {
+                    return value;
+                }
+            }
+            return "";
+        };
     }
 
     public String getArgumentName() {

From 949a028802ad5d1f53186753632a2242d93fa463 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 19:49:02 +0100
Subject: [PATCH 0148/1037] Fix missing 'contains'/'find' for pattern

---
 .../http/modifier/URLRewritingModifier.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index d5986742d6c..7565727ad2e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -215,10 +215,12 @@ private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String
                 java.util.regex.Pattern.MULTILINE);
         return text -> {
             Matcher matcher = pattern.matcher(text);
-            for (int i = 1; i < matcher.groupCount(); i++) {
-                String value = matcher.group(i);
-                if (value != null) {
-                    return value;
+            if (matcher.find()) {
+                for (int i = 1; i < matcher.groupCount(); i++) {
+                    String value = matcher.group(i);
+                    if (value != null) {
+                        return value;
+                    }
                 }
             }
             return "";
@@ -231,11 +233,13 @@ private Function<String, String> generateFirstMatchExtractorWithOroRegex(String
                 Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
         Perl5Matcher matcher = JMeterUtils.getMatcher();
         return text -> {
-            MatchResult result = matcher.getMatch();
-            for (int i = 1; i < result.groups(); i++) {
-                String value = result.group(i);
-                if (value != null) {
-                    return value;
+            if (matcher.contains(text, pattern)) {
+                MatchResult result = matcher.getMatch();
+                for (int i = 1; i < result.groups(); i++) {
+                    String value = result.group(i);
+                    if (value != null) {
+                        return value;
+                    }
                 }
             }
             return "";

From f9cb8fca34e93382ad3f7cb04970b1c6c001d413 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:01:18 +0100
Subject: [PATCH 0149/1037] Use correct order of extractors

too many No's there :)
---
 .../protocol/http/modifier/URLRewritingModifier.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 7565727ad2e..67155eaab5c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -81,13 +81,13 @@ public void process() {
         String text = responseText.getResponseDataAsString();
         String value;
         if (isPathExtension() && isPathExtensionNoEquals() && isPathExtensionNoQuestionmark()) {
-            value = pathExtensionEqualsQuestionmarkExtractor.apply(text);
+            value = pathExtensionNoEqualsNoQuestionmarkExtractor.apply(text);
         } else if (isPathExtension() && isPathExtensionNoEquals()) { // && !isPathExtensionNoQuestionmark()
-            value = pathExtensionEqualsNoQuestionmarkExtractor.apply(text);
-        } else if (isPathExtension() && isPathExtensionNoQuestionmark()) { // && !isPathExtensionNoEquals()
             value = pathExtensionNoEqualsQuestionmarkExtractor.apply(text);
+        } else if (isPathExtension() && isPathExtensionNoQuestionmark()) { // && !isPathExtensionNoEquals()
+            value = pathExtensionEqualsNoQuestionmarkExtractor.apply(text);
         } else if (isPathExtension()) { // && !isPathExtensionNoEquals() && !isPathExtensionNoQuestionmark()
-            value = pathExtensionNoEqualsNoQuestionmarkExtractor.apply(text);
+            value = pathExtensionEqualsQuestionmarkExtractor.apply(text);
         } else { // if ! isPathExtension()
             value = parameterExtractor.apply(text);
         }

From affa4994d435318d2e7cc603b30341977258f5a1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:10:44 +0100
Subject: [PATCH 0150/1037] Add missing closing parenthesis in javadoc

---
 .../apache/jmeter/protocol/http/parser/RegexpHTMLParser.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index 47ff39d2e46..0e421cd1bdc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -37,7 +37,7 @@
  * HtmlParser implementation using regular expressions.
  * <p>
  * This class will find URLs specified in the following ways (where <b>url</b>
- * represents the URL being found:
+ * represents the URL being found):
  * <ul>
  * <li>&lt;img src=<b>url</b> ... &gt;
  * <li>&lt;script src=<b>url</b> ... &gt;

From 2416a64dd11fd3f66fe39b4924700f2e55ae5320 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:22:56 +0100
Subject: [PATCH 0151/1037] Add a switch to decide which regex engine should be
 used

This one uses the new cache for Java based Regex-Patterns in JMeterUtils
---
 .../http/parser/RegexpHTMLParser.java         | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index 0e421cd1bdc..6166b5d193e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -21,6 +21,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
+import java.util.regex.Matcher;
+import java.util.regex.PatternSyntaxException;
 
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jmeter.util.JMeterUtils;
@@ -115,6 +117,8 @@ class RegexpHTMLParser extends HTMLParser {
     private static final ThreadLocal<PatternMatcherInput> localInput =
             ThreadLocal.withInitial(() -> new PatternMatcherInput(new char[0]));
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * Make sure to compile the regular expression upon instantiation:
      */
@@ -127,6 +131,64 @@ protected RegexpHTMLParser() {
      */
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl, URLCollection urls, String encoding) throws HTMLParseException {
+        if (useJavaRegex) {
+            return getEmbeddedResourceURLsWithJavaRegex(userAgent,html, baseUrl, urls, encoding);
+        }
+        return getEmbeddedResourceURLsWithOroRegex(userAgent,html, baseUrl, urls, encoding);
+    }
+
+    private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(String userAgent, byte[] html, URL baseUrl,
+                                                               URLCollection urls, String encoding) throws HTMLParseException {
+        try {
+
+            // TODO: find a way to avoid the cost of creating a String here --
+            // probably a new PatternMatcherInput working on a byte[] would do
+            // better.
+            String input = new String(html, encoding);
+            java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
+                    REGEXP,
+                    java.util.regex.Pattern.CASE_INSENSITIVE
+            );
+
+            Matcher matcher = pattern.matcher(input);
+            while (matcher.find()) {
+                java.util.regex.MatchResult match = matcher.toMatchResult();
+                String s;
+                if (log.isDebugEnabled()) {
+                    log.debug("match groups {} {}", match.groupCount(), match);
+                }
+                // Check for a BASE HREF:
+                for (int g = 1; g <= NUM_BASE_GROUPS && g <= match.groupCount(); g++) {
+                    s = match.group(g);
+                    if (s != null) {
+                        log.debug("new baseUrl: {} - {}", s, baseUrl);
+                        try {
+                            baseUrl = ConversionUtils.makeRelativeURL(baseUrl, s);
+                        } catch (MalformedURLException e) {
+                            // Doesn't even look like a URL?
+                            // Maybe it isn't: Ignore the exception.
+                            log.debug("Can't build base URL from URL {} in page {}", s, baseUrl, e);
+                        }
+                    }
+                }
+                for (int g = NUM_BASE_GROUPS + 1; g <= match.groupCount(); g++) {
+                    s = match.group(g);
+                    if (s != null) {
+                        if (log.isDebugEnabled()) {
+                            log.debug("group {} - {}", g, match.group(g));
+                        }
+                        urls.addURL(s, baseUrl);
+                    }
+                }
+            }
+            return urls.iterator();
+        } catch (UnsupportedEncodingException
+                | PatternSyntaxException e) {
+            throw new HTMLParseException(e.getMessage(), e);
+        }
+    }
+
+    private Iterator<URL> getEmbeddedResourceURLsWithOroRegex(String userAgent, byte[] html, URL baseUrl, URLCollection urls, String encoding) throws HTMLParseException {
         Pattern pattern= null;
         Perl5Matcher matcher = null;
         try {

From 47f16d06fa4531bfdb92ce41073c0bbff83aa0ea Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:34:31 +0100
Subject: [PATCH 0152/1037] Make errorProne happy and remove unused parameter
 from newly introduced private method

---
 .../protocol/http/parser/RegexpHTMLParser.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index 6166b5d193e..3c22d4d21a1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -130,15 +130,16 @@ protected RegexpHTMLParser() {
      * {@inheritDoc}
      */
     @Override
-    public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl, URLCollection urls, String encoding) throws HTMLParseException {
+    public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl,
+                                                 URLCollection urls, String encoding) throws HTMLParseException {
         if (useJavaRegex) {
-            return getEmbeddedResourceURLsWithJavaRegex(userAgent,html, baseUrl, urls, encoding);
+            return getEmbeddedResourceURLsWithJavaRegex(html, baseUrl, urls, encoding);
         }
-        return getEmbeddedResourceURLsWithOroRegex(userAgent,html, baseUrl, urls, encoding);
+        return getEmbeddedResourceURLsWithOroRegex(html, baseUrl, urls, encoding);
     }
 
-    private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(String userAgent, byte[] html, URL baseUrl,
-                                                               URLCollection urls, String encoding) throws HTMLParseException {
+    private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL baseUrl, URLCollection urls,
+                                                               String encoding) throws HTMLParseException {
         try {
 
             // TODO: find a way to avoid the cost of creating a String here --
@@ -188,7 +189,8 @@ private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(String userAgent, byt
         }
     }
 
-    private Iterator<URL> getEmbeddedResourceURLsWithOroRegex(String userAgent, byte[] html, URL baseUrl, URLCollection urls, String encoding) throws HTMLParseException {
+    private Iterator<URL> getEmbeddedResourceURLsWithOroRegex(byte[] html, URL baseUrl, URLCollection urls,
+                                                              String encoding) throws HTMLParseException {
         Pattern pattern= null;
         Perl5Matcher matcher = null;
         try {

From 51e2583b9e02b247ef34157aeacaa0944cd4480e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:42:22 +0100
Subject: [PATCH 0153/1037] Add a switch to decide which regex engine should be
 used

This one uses the new cache for Java based Regex-Patterns in JMeterUtils
---
 .../dashboard/ApdexPerTransactionTest.java    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
index 52b9560b6c4..ebbc1c3ab19 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
@@ -24,6 +24,8 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
@@ -39,6 +41,8 @@ public class ApdexPerTransactionTest extends JMeterTestCase {
     // it also includes hardcoded sample names mixed with regexes
     private static final String apdexString = "sample(\\d+):1000|2000;samples12:3000|4000;scenar01-12:5000|6000";
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     @Test
     public void testgetApdexPerTransactionProperty() throws Exception {
         final Props props = new Props();
@@ -118,10 +122,18 @@ public void testSampleNameMatching() {
         for (String sampleName : sampleNames) {
             boolean hasMatched = false;
             for (Map.Entry<String, Long[]> entry : apdex.entrySet()) {
-                org.apache.oro.text.regex.Pattern regex = JMeterUtils.getPatternCache().getPattern(entry.getKey());
-                PatternMatcher matcher = JMeterUtils.getMatcher();
-                if(matcher.matches(sampleName, regex)) {
-                    hasMatched= true;
+                if (useJavaRegex) {
+                    Pattern pattern = JMeterUtils.compilePattern(entry.getKey());
+                    Matcher matcher = pattern.matcher(sampleName);
+                    if (matcher.matches()) {
+                        hasMatched = true;
+                    }
+                } else {
+                    org.apache.oro.text.regex.Pattern regex = JMeterUtils.getPatternCache().getPattern(entry.getKey());
+                    PatternMatcher matcher = JMeterUtils.getMatcher();
+                    if (matcher.matches(sampleName, regex)) {
+                        hasMatched = true;
+                    }
                 }
             }
             assertTrue(hasMatched);

From f8b22b35b038f446281d25e02ba62e4a1a5f116b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:45:08 +0100
Subject: [PATCH 0154/1037] Use newer jupiter Assertions

---
 .../dashboard/ApdexPerTransactionTest.java    | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
index ebbc1c3ab19..2e5c13ac27c 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
@@ -17,11 +17,6 @@
 
 package org.apache.jmeter.report.dashboard;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -31,6 +26,7 @@
 import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.oro.text.regex.PatternMatcher;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import jodd.props.Props;
@@ -54,7 +50,7 @@ public void testgetApdexPerTransactionProperty() throws Exception {
         props.load(this.getClass().getResourceAsStream("reportgenerator_test.properties"));
         final String apdexPerTransaction = getOptionalProperty(props,
                 REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION);
-        assertEquals(apdexString, apdexPerTransaction);
+        Assertions.assertEquals(apdexString, apdexPerTransaction);
     }
 
     @Test
@@ -63,48 +59,48 @@ public void testgetApdexPerTransactionPropertySimple() throws Exception {
         props.load(this.getClass().getResourceAsStream("reportgenerator_test.properties"));
         final String title = getOptionalProperty(props,
                 "jmeter.reportgenerator.graph.responseTimePercentiles.title");
-        assertNotNull("title should not be null", title);
+        Assertions.assertNotNull(title, "title should not be null");
     }
 
     @Test
     public void testGetApdexPerTransactionParts() {
         Map<String, Long[]> apdex = ReportGeneratorConfiguration.getApdexPerTransactionParts(apdexString);
-        assertNotNull("map should not be null", apdex);
-        assertEquals(3, apdex.size());
+        Assertions.assertNotNull(apdex, "map should not be null");
+        Assertions.assertEquals(3, apdex.size());
         Set<String> keys = apdex.keySet();
-        assertTrue(keys.contains("samples12"));
-        assertTrue(keys.contains("scenar01-12"));
-        assertTrue(keys.contains("sample(\\d+)"));
-        assertArrayEquals(new Long[] {1000L,  2000L}, apdex.get("sample(\\d+)"));
+        Assertions.assertTrue(keys.contains("samples12"));
+        Assertions.assertTrue(keys.contains("scenar01-12"));
+        Assertions.assertTrue(keys.contains("sample(\\d+)"));
+        Assertions.assertArrayEquals(new Long[] {1000L,  2000L}, apdex.get("sample(\\d+)"));
     }
 
    @Test
     public void testGetApdexPerTransactionPartsOneCustomization() {
         Map<String, Long[]> apdex = ReportGeneratorConfiguration.getApdexPerTransactionParts("sample(\\d+):1000|2000");
-        assertNotNull("map should not be null", apdex);
-        assertEquals(1, apdex.size());
+        Assertions.assertNotNull(apdex, "map should not be null");
+        Assertions.assertEquals(1, apdex.size());
         Set<String> keys = apdex.keySet();
-        assertTrue(keys.contains("sample(\\d+)"));
-        assertArrayEquals(new Long[] {1000L,  2000L}, apdex.get("sample(\\d+)"));
+        Assertions.assertTrue(keys.contains("sample(\\d+)"));
+        Assertions.assertArrayEquals(new Long[] {1000L,  2000L}, apdex.get("sample(\\d+)"));
     }
 
    @Test
    public void testGetApdexPerTransactionNoValue() {
        Map<String, Long[]> apdex = ReportGeneratorConfiguration.getApdexPerTransactionParts("");
-       assertNotNull("map should not be null", apdex);
-       assertEquals(0, apdex.size());
+       Assertions.assertNotNull(apdex, "map should not be null");
+       Assertions.assertEquals(0, apdex.size());
 
        apdex = ReportGeneratorConfiguration.getApdexPerTransactionParts(" ");
-       assertNotNull("map should not be null", apdex);
-       assertEquals(0, apdex.size());
+       Assertions.assertNotNull(apdex, "map should not be null");
+       Assertions.assertEquals(0, apdex.size());
    }
 
    @Test
    public void testGetApdexPerTransactionWrongFormat() {
        Map<String, Long[]> apdex =
                ReportGeneratorConfiguration.getApdexPerTransactionParts("sample1|123:434");
-       assertNotNull("map should not be null", apdex);
-       assertEquals(0, apdex.size());
+       Assertions.assertNotNull(apdex, "map should not be null");
+       Assertions.assertEquals(0, apdex.size());
    }
 
     @Test
@@ -136,7 +132,7 @@ public void testSampleNameMatching() {
                     }
                 }
             }
-            assertTrue(hasMatched);
+            Assertions.assertTrue(hasMatched);
         }
 
     }

From 765afaf5db878bde8bbdeb721229b53963e38c10 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 20:52:07 +0100
Subject: [PATCH 0155/1037] Use isEmpty instead of comparing length to zero

---
 .../TestHTTPSamplersAgainstHttpMirrorServer.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index b4351464daa..1682b05d735 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -835,7 +835,7 @@ private void checkPostRequestUrlEncoded(
             String descriptionField,
             String descriptionValue,
             boolean valuesAlreadyUrlEncoded) throws IOException {
-        if (contentEncoding == null || contentEncoding.length() == 0) {
+        if (contentEncoding == null || contentEncoding.isEmpty()) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -867,7 +867,7 @@ private void checkPostRequestFormMultipart(
             String titleValue,
             String descriptionField,
             String descriptionValue) throws IOException {
-        if (contentEncoding == null || contentEncoding.length() == 0) {
+        if (contentEncoding == null || contentEncoding.isEmpty()) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -916,7 +916,7 @@ private void checkPostRequestFileUpload(
             File fileValue,
             String fileMimeType,
             byte[] fileContent) throws IOException {
-        if (contentEncoding == null || contentEncoding.length() == 0) {
+        if (contentEncoding == null || contentEncoding.isEmpty()) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -956,7 +956,7 @@ private void checkPostRequestBody(
             String contentEncoding,
             String expectedPostBody,
             String expectedContentType) throws IOException {
-        if (contentEncoding == null || contentEncoding.length() == 0) {
+        if (contentEncoding == null || contentEncoding.isEmpty()) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -1037,7 +1037,7 @@ private void checkGetRequest_Parameters(
             String descriptionField,
             String descriptionValue,
             boolean valuesAlreadyUrlEncoded) throws IOException {
-        if (contentEncoding == null || contentEncoding.length() == 0) {
+        if (contentEncoding == null || contentEncoding.isEmpty()) {
             contentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
         }
         // Check URL
@@ -1093,7 +1093,7 @@ private void checkMethodPathQuery(
         assertEquals(expectedMethod, methodSent);
         String uriSent = headersSent.substring(indexFirstSpace + 1, indexSecondSpace);
         int indexQueryStart = uriSent.indexOf('?');
-        if (expectedQueryString != null && expectedQueryString.length() > 0) {
+        if (expectedQueryString != null && !expectedQueryString.isEmpty()) {
             // We should have a query string part
             if (indexQueryStart <= 0 || indexQueryStart == uriSent.length() - 1) {
                 fail("Could not find query string in URI");
@@ -1110,7 +1110,7 @@ private void checkMethodPathQuery(
         String pathSent = uriSent.substring(0, indexQueryStart);
         assertEquals(expectedPath, pathSent);
         // Check query
-        if (expectedQueryString != null && expectedQueryString.length() > 0) {
+        if (expectedQueryString != null && !expectedQueryString.isEmpty()) {
             String queryStringSent = uriSent.substring(indexQueryStart + 1);
             // Is it only the parameter values which are encoded in the specified
             // content encoding, the rest of the query is encoded in UTF-8

From 2a8e6db8da0725fff15bfb021847324a06eae49f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 24 Feb 2022 21:06:37 +0100
Subject: [PATCH 0156/1037] Add a switch to decide which regex engine should be
 used

This one uses the new cache for Java based Regex-Patterns in JMeterUtils
---
 ...stHTTPSamplersAgainstHttpMirrorServer.java | 85 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 1682b05d735..124c92997cd 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -27,6 +27,7 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
+import java.util.regex.Matcher;
 
 import org.apache.jmeter.engine.util.ValueReplacer;
 import org.apache.jmeter.junit.JMeterTestCaseJUnit;
@@ -76,6 +77,8 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
 
     private final int item;
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     public TestHTTPSamplersAgainstHttpMirrorServer(String arg0) {
         super(arg0);
         this.item = -1;
@@ -1178,6 +1181,25 @@ private void checkHeaderContentType(String requestHeaders, String contentType) {
     }
 
     private String getSentRequestHeaderValue(String requestHeaders, String headerName) {
+        if (useJavaRegex) {
+            return getSentRequestHeaderValueWithJavaRegex(requestHeaders, headerName);
+        }
+        return getSentRequestHeaderValueWithOroRegex(requestHeaders, headerName);
+    }
+
+    private String getSentRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
+        String expression = ".*" + headerName + ": (\\d*).*";
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression,
+                        java.util.regex.Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(requestHeaders);
+        if (matcher.matches()) {
+            // The value is in the first group, group 0 is the whole match
+            return matcher.group(1);
+        }
+        return null;
+    }
+
+    private String getSentRequestHeaderValueWithOroRegex(String requestHeaders, String headerName) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         String expression = ".*" + headerName + ": (\\d*).*";
         Pattern pattern = JMeterUtils.getPattern(expression,
@@ -1192,6 +1214,19 @@ private String getSentRequestHeaderValue(String requestHeaders, String headerNam
     }
 
     private boolean checkRegularExpression(String stringToCheck, String regularExpression) {
+        if (useJavaRegex) {
+            return checkRegularExpressionWithJavaRegex(stringToCheck, regularExpression);
+        }
+        return checkRegularExpressionWithOroRegex(stringToCheck, regularExpression);
+    }
+
+    private boolean checkRegularExpressionWithJavaRegex(String stringToCheck, String regularExpression) {
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
+                java.util.regex.Pattern.CASE_INSENSITIVE);
+        return pattern.matcher(stringToCheck).find();
+    }
+
+    private boolean checkRegularExpressionWithOroRegex(String stringToCheck, String regularExpression) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         Pattern pattern = JMeterUtils.getPattern(regularExpression,
                 Perl5Compiler.READ_ONLY_MASK
@@ -1201,6 +1236,28 @@ private boolean checkRegularExpression(String stringToCheck, String regularExpre
     }
 
     private int getPositionOfBody(String stringToCheck) {
+        if (useJavaRegex) {
+            return getPositionOfBodyWithJavaRegex(stringToCheck);
+        }
+        return getPositionOfBodyWithOroRegex(stringToCheck);
+    }
+
+    private int getPositionOfBodyWithJavaRegex(String stringToCheck) {
+        // The headers and body are divided by a blank line
+        String regularExpression = "^.$";
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
+                java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
+
+        Matcher localMatcher = pattern.matcher(stringToCheck);
+        if (localMatcher.find()) {
+            java.util.regex.MatchResult match = localMatcher.toMatchResult();
+            return match.start(0);
+        }
+        // No divider was found
+        return -1;
+    }
+
+    private int getPositionOfBodyWithOroRegex(String stringToCheck) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         // The headers and body are divided by a blank line
         String regularExpression = "^.$";
@@ -1210,7 +1267,7 @@ private int getPositionOfBody(String stringToCheck) {
                         | Perl5Compiler.MULTILINE_MASK);
 
         PatternMatcherInput input = new PatternMatcherInput(stringToCheck);
-        while (localMatcher.contains(input, pattern)) {
+        if (localMatcher.contains(input, pattern)) {
             MatchResult match = localMatcher.getMatch();
             return match.beginOffset(0);
         }
@@ -1219,6 +1276,32 @@ private int getPositionOfBody(String stringToCheck) {
     }
 
     private String getBoundaryStringFromContentType(String requestHeaders) {
+        if (useJavaRegex) {
+            return getBoundaryStringFromContentTypeWithJavaRegex(requestHeaders);
+        }
+        return getBoundaryStringFromContentTypeWithOroRegex(requestHeaders);
+    }
+
+    private String getBoundaryStringFromContentTypeWithJavaRegex(String requestHeaders) {
+        String regularExpression = "^" + HTTPConstants.HEADER_CONTENT_TYPE + ": multipart/form-data; boundary=(.+)$";
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
+                java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
+        Matcher localMatcher = pattern.matcher(requestHeaders);
+        if (localMatcher.find()) {
+            String matchString = localMatcher.group(1);
+            // Header may contain ;charset= , regexp extracts it so computed boundary is wrong
+            int indexOf = matchString.indexOf(';');
+            if (indexOf >= 0) {
+                return matchString.substring(0, indexOf);
+            } else {
+                return matchString;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    private String getBoundaryStringFromContentTypeWithOroRegex(String requestHeaders) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         String regularExpression = "^" + HTTPConstants.HEADER_CONTENT_TYPE + ": multipart/form-data; boundary=(.+)$";
         Pattern pattern = JMeterUtils.getPattern(regularExpression,

From 8f677947d7211f362ec20c064371b2fb678cb56f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 25 Feb 2022 16:42:15 +0100
Subject: [PATCH 0157/1037] Add a switch to decide which regex engine should be
 used

This one uses the new cache for Java based Regex-Patterns in JMeterUtils
---
 .../http/parser/HtmlParsingUtils.java         | 99 +++++++++++++++++--
 1 file changed, 93 insertions(+), 6 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index a245e84c7e4..04b1e12975e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -25,6 +25,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.regex.Matcher;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
@@ -50,6 +51,8 @@
 public final class HtmlParsingUtils {
     private static final Logger log = LoggerFactory.getLogger(HtmlParsingUtils.class);
 
+    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     /**
      * Private constructor to prevent instantiation.
      */
@@ -81,6 +84,46 @@ public static boolean isAnchorMatched(HTTPSamplerBase newLink, HTTPSamplerBase c
 
         final Arguments arguments = config.getArguments();
 
+        if (useJavaRegex) {
+            return isAnchorMatchedWithJavaRegex(newLink, config, query, arguments);
+        }
+        return isAnchorMatchedWithOroRegex(newLink, config, query, arguments);
+    }
+
+    private static boolean isAnchorMatchedWithJavaRegex(HTTPSamplerBase newLink, HTTPSamplerBase config, String query, Arguments arguments) {
+
+        if (!isEqualOrMatchesWithJavaRegex(newLink.getProtocol(), config.getProtocol())){
+            return false;
+        }
+
+        final String domain = config.getDomain();
+        if (domain != null && !domain.isEmpty()) {
+            if (!isEqualOrMatchesWithJavaRegex(newLink.getDomain(), domain)) {
+                return false;
+            }
+        }
+
+        final String path = config.getPath();
+        if (!newLink.getPath().equals(path)
+                && !JMeterUtils.compilePattern("[/]*" + path).matcher(newLink.getPath()).matches()) { // $NON-NLS-1$
+            return false;
+        }
+
+        for (JMeterProperty argument : arguments) {
+            Argument item = (Argument) argument.getObjectValue();
+            final String name = item.getName();
+            if (!query.contains(name + "=")) { // $NON-NLS-1$
+                if (!JMeterUtils.compilePattern(name).matcher(query).find()) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+    private static boolean isAnchorMatchedWithOroRegex(HTTPSamplerBase newLink, HTTPSamplerBase config, String query, Arguments arguments) {
         final Perl5Matcher matcher = JMeterUtils.getMatcher();
         final PatternCacheLRU patternCache = JMeterUtils.getPatternCache();
 
@@ -125,12 +168,19 @@ public static boolean isAnchorMatched(HTTPSamplerBase newLink, HTTPSamplerBase c
      * @return true if both name and value match
      */
     public static boolean isArgumentMatched(Argument arg, Argument patternArg) {
+        if (useJavaRegex) {
+            return isEqualOrMatchesWithJavaRegex(arg.getName(), patternArg.getName())
+                    && isEqualOrMatchesWithJavaRegex(arg.getValue(), patternArg.getValue());
+        }
+        return isArgumentMatchedWithOroRegex(arg, patternArg);
+    }
+
+    private static boolean isArgumentMatchedWithOroRegex(Argument arg, Argument patternArg) {
         final Perl5Matcher matcher = JMeterUtils.getMatcher();
         final PatternCacheLRU patternCache = JMeterUtils.getPatternCache();
-        return
-            isEqualOrMatches(arg.getName(), patternArg.getName(), matcher, patternCache)
-        &&
-            isEqualOrMatches(arg.getValue(), patternArg.getValue(), matcher, patternCache);
+        return isEqualOrMatches(arg.getName(), patternArg.getName(), matcher, patternCache)
+                &&
+                isEqualOrMatches(arg.getValue(), patternArg.getValue(), matcher, patternCache);
     }
 
     /**
@@ -150,6 +200,10 @@ public static boolean isEqualOrMatches(String arg, String pat, Perl5Matcher matc
             matcher.matches(arg,cache.getPattern(pat,Perl5Compiler.READ_ONLY_MASK));
     }
 
+    private static boolean isEqualOrMatchesWithJavaRegex(String arg, String pat) {
+        return arg.equals(pat) || JMeterUtils.compilePattern(pat).matcher(arg).matches();
+    }
+
     /**
      * Match the input argument against the pattern using String.equals() or pattern matching if that fails
      * using case-insensitive matching.
@@ -168,6 +222,11 @@ public static boolean isEqualOrMatchesCaseBlind(String arg, String pat, Perl5Mat
             matcher.matches(arg,cache.getPattern(pat,Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.CASE_INSENSITIVE_MASK));
     }
 
+    private static boolean isEqualOrMatchesCaseBlindWithJavaRegex(String arg, String pat) {
+        return arg.equalsIgnoreCase(pat)
+                || JMeterUtils.compilePattern(pat, java.util.regex.Pattern.CASE_INSENSITIVE).matcher(arg).matches();
+    }
+
     /**
      * Match the input argument against the pattern using String.equals() or pattern matching if that fails
      * using case-insensitive matching.
@@ -177,7 +236,10 @@ public static boolean isEqualOrMatchesCaseBlind(String arg, String pat, Perl5Mat
      *
      * @return true if input matches the pattern
      */
-    public static boolean isEqualOrMatches(String arg, String pat){
+    public static boolean isEqualOrMatches(String arg, String pat) {
+        if (useJavaRegex) {
+            return isEqualOrMatchesWithJavaRegex(arg, pat);
+        }
         return isEqualOrMatches(arg, pat, JMeterUtils.getMatcher(), JMeterUtils.getPatternCache());
     }
 
@@ -190,7 +252,10 @@ public static boolean isEqualOrMatches(String arg, String pat){
      *
      * @return true if input matches the pattern
      */
-    public static boolean isEqualOrMatchesCaseBlind(String arg, String pat){
+    public static boolean isEqualOrMatchesCaseBlind(String arg, String pat) {
+        if (useJavaRegex) {
+            return isEqualOrMatchesCaseBlindWithJavaRegex(arg, pat);
+        }
         return isEqualOrMatchesCaseBlind(arg, pat, JMeterUtils.getMatcher(), JMeterUtils.getPatternCache());
     }
 
@@ -377,6 +442,27 @@ private static HTTPSamplerBase createFormUrlConfig(Node tempNode, URL context) t
     }
 
     public static void extractStyleURLs(final URL baseUrl, final URLCollection urls, String styleTagStr) {
+        if (useJavaRegex) {
+            extractStyleURLsWithJavaRegex(baseUrl, urls, styleTagStr);
+        } else {
+            extractStyleURLsWithOroRegex(baseUrl, urls, styleTagStr);
+        }
+    }
+
+    private static void extractStyleURLsWithJavaRegex(URL baseUrl, URLCollection urls, String styleTagStr) {
+
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
+                "URL\\(\\s*('|\")(.*)('|\")\\s*\\)", // $NON-NLS-1$
+                java.util.regex.Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(styleTagStr);
+        while (matcher.find()) {
+            // The value is in the second group
+            String styleUrl = matcher.group(2);
+            urls.addURL(styleUrl, baseUrl);
+        }
+    }
+
+    private static void extractStyleURLsWithOroRegex(URL baseUrl, URLCollection urls, String styleTagStr) {
         Perl5Matcher matcher = JMeterUtils.getMatcher();
         Pattern pattern = JMeterUtils.getPatternCache().getPattern(
                 "URL\\(\\s*('|\")(.*)('|\")\\s*\\)", // $NON-NLS-1$
@@ -390,4 +476,5 @@ public static void extractStyleURLs(final URL baseUrl, final URLCollection urls,
             urls.addURL(styleUrl, baseUrl);
         }
     }
+
 }

From 3b03a0af140d7d75bc7b0807a6d35ca278e713b4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 11:27:02 +0100
Subject: [PATCH 0158/1037] Add a switch to decide which regex engine should be
 used

This one uses the new cache for Java based Regex-Patterns in JMeterUtils
---
 .../http/util/accesslog/LogFilter.java        | 45 +++++++++++++++++++
 .../http/util/accesslog/SessionFilter.java    | 20 +++++++++
 2 files changed, 65 insertions(+)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index 5b9068088bb..aa182a455a8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -19,6 +19,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
@@ -74,6 +75,8 @@ public class LogFilter implements Filter, Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(LogFilter.class);
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
     // protected members used by class to filter
 
     protected boolean CHANGEEXT = false;
@@ -96,6 +99,10 @@ public class LogFilter implements Filter, Serializable {
 
     protected boolean PTRNFILTER = false;
 
+    private List<String> excludePatternStrings = new ArrayList<>();
+
+    private  List<String> includePatternStrings = new ArrayList<>();
+
     protected ArrayList<Pattern> EXCPATTERNS = new ArrayList<>();
 
     protected ArrayList<Pattern> INCPATTERNS = new ArrayList<>();
@@ -176,6 +183,7 @@ public void includePattern(String[] regexp) {
             // add it to the arraylist
             for (String includePattern : INCPTRN) {
                 this.INCPATTERNS.add(this.createPattern(includePattern));
+                this.includePatternStrings.add(includePattern);
             }
         }
     }
@@ -199,6 +207,7 @@ public void excludePattern(String[] regexp) {
             // add it to the arraylist
             for (String excludePattern : EXCPTRN) {
                 this.EXCPATTERNS.add(this.createPattern(excludePattern));
+                this.excludePatternStrings.add(excludePattern);
             }
         }
     }
@@ -327,6 +336,24 @@ protected boolean filterPattern(String text) {
      * @return <code>true</code> if text is included
      */
     protected boolean incPattern(String text) {
+        if (useJavaRegex) {
+            return incPatternWithJavaRegex(text);
+        }
+        return incPatternWithOroRegex(text);
+    }
+
+    private boolean incPatternWithJavaRegex(String text) {
+        this.USEFILE = false;
+        for (String includePattern : this.includePatternStrings) {
+            if (JMeterUtils.compilePattern(includePattern).matcher(text).find()) {
+                this.USEFILE = true;
+                break;
+            }
+        }
+        return this.USEFILE;
+    }
+
+    private boolean incPatternWithOroRegex(String text) {
         this.USEFILE = false;
         for (Pattern includePattern : this.INCPATTERNS) {
             if (JMeterUtils.getMatcher().contains(text, includePattern)) {
@@ -345,6 +372,24 @@ protected boolean incPattern(String text) {
      * @return <code>true</code> if text is excluded
      */
     protected boolean excPattern(String text) {
+        if (useJavaRegex) {
+            return excPatternWithJavaRegex(text);
+        }
+        return excPatternWithOroRegex(text);
+    }
+
+    protected boolean excPatternWithJavaRegex(String text) {
+        this.USEFILE = true;
+        for (String excludePattern : this.excludePatternStrings) {
+            if (JMeterUtils.compilePattern(text).matcher(text).find()) {
+                this.USEFILE = false;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected boolean excPatternWithOroRegex(String text) {
         this.USEFILE = true;
         boolean exc = false;
         for (Pattern excludePattern : this.EXCPATTERNS) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index b22167b0d66..61d2ce285c8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
 
 import org.apache.jmeter.protocol.http.control.CookieManager;
 import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
@@ -43,6 +44,9 @@ public class SessionFilter implements Filter, Serializable, TestCloneable,Thread
     private static final long serialVersionUID = 233L;
     private static final Logger log = LoggerFactory.getLogger(SessionFilter.class);
 
+    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+
+
     /**
      * Protects access to managersInUse
      */
@@ -86,6 +90,22 @@ protected boolean hasExcPattern(String text) {
     }
 
     protected String getIpAddress(String logLine) {
+        if (useJavaRegex) {
+            return getIpAddressWithJavaRegex(logLine);
+        }
+        return getIpAddressWithOroRegex(logLine);
+    }
+
+    protected String getIpAddressWithJavaRegex(String logLine) {
+        java.util.regex.Pattern incIp = JMeterUtils.compilePattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
+        Matcher matcher = incIp.matcher(logLine);
+        if (matcher.find()) {
+            return matcher.group(0);
+        }
+        return "";
+    }
+
+    protected String getIpAddressWithOroRegex(String logLine) {
         Pattern incIp = JMeterUtils.getPatternCache().getPattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}",
                 Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
         Perl5Matcher matcher = JMeterUtils.getMatcher();

From 41b16e58ac95c7b43398c0f002e8b9748830022c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 14:29:13 +0100
Subject: [PATCH 0159/1037] Use correct variable to compile regex

---
 .../apache/jmeter/protocol/http/util/accesslog/LogFilter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index aa182a455a8..d72ca4ff59a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -381,7 +381,7 @@ protected boolean excPattern(String text) {
     protected boolean excPatternWithJavaRegex(String text) {
         this.USEFILE = true;
         for (String excludePattern : this.excludePatternStrings) {
-            if (JMeterUtils.compilePattern(text).matcher(text).find()) {
+            if (JMeterUtils.compilePattern(excludePattern).matcher(text).find()) {
                 this.USEFILE = false;
                 return true;
             }

From 74c69e2d77085290e618be6632d980d52574b423 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 14:35:44 +0100
Subject: [PATCH 0160/1037] Use private instead of protected for new methods

They should not be used outside of this class.
---
 .../apache/jmeter/protocol/http/util/accesslog/LogFilter.java | 4 ++--
 .../jmeter/protocol/http/util/accesslog/SessionFilter.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index d72ca4ff59a..088605fc086 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -378,7 +378,7 @@ protected boolean excPattern(String text) {
         return excPatternWithOroRegex(text);
     }
 
-    protected boolean excPatternWithJavaRegex(String text) {
+    private boolean excPatternWithJavaRegex(String text) {
         this.USEFILE = true;
         for (String excludePattern : this.excludePatternStrings) {
             if (JMeterUtils.compilePattern(excludePattern).matcher(text).find()) {
@@ -389,7 +389,7 @@ protected boolean excPatternWithJavaRegex(String text) {
         return false;
     }
 
-    protected boolean excPatternWithOroRegex(String text) {
+    private boolean excPatternWithOroRegex(String text) {
         this.USEFILE = true;
         boolean exc = false;
         for (Pattern excludePattern : this.EXCPATTERNS) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index 61d2ce285c8..addff05e1af 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -96,7 +96,7 @@ protected String getIpAddress(String logLine) {
         return getIpAddressWithOroRegex(logLine);
     }
 
-    protected String getIpAddressWithJavaRegex(String logLine) {
+    private String getIpAddressWithJavaRegex(String logLine) {
         java.util.regex.Pattern incIp = JMeterUtils.compilePattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
         Matcher matcher = incIp.matcher(logLine);
         if (matcher.find()) {
@@ -105,7 +105,7 @@ protected String getIpAddressWithJavaRegex(String logLine) {
         return "";
     }
 
-    protected String getIpAddressWithOroRegex(String logLine) {
+    private String getIpAddressWithOroRegex(String logLine) {
         Pattern incIp = JMeterUtils.getPatternCache().getPattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}",
                 Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
         Perl5Matcher matcher = JMeterUtils.getMatcher();

From d73d65fbf2ff4d325d8e6ea1fc4e203bc972fd89 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:04:09 +0100
Subject: [PATCH 0161/1037] Use Pattern-cache from JMeterUtils

This will help in test plans with lots of threads (1000 tested)
---
 .../java/org/apache/jmeter/assertions/ResponseAssertion.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index 664e952b8f2..6288e4772d3 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -394,11 +394,11 @@ private AssertionResult evaluateResponse(SampleResult response) {
     }
 
     private static boolean matchesWithJavaRegex(String toCheck, String stringPattern) {
-        return java.util.regex.Pattern.compile(stringPattern).matcher(toCheck).matches();
+        return JMeterUtils.compilePattern(stringPattern).matcher(toCheck).matches();
     }
 
     private static boolean containsWithJavaRegex(String toCheck, String stringPattern) {
-        return java.util.regex.Pattern.compile(stringPattern).matcher(toCheck).find();
+        return JMeterUtils.compilePattern(stringPattern).matcher(toCheck).find();
     }
 
     private String getStringToCheck(SampleResult response) {

From 65e6afa9d195615e0e0c1abe13ec6b315f7c9efe Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:14:01 +0100
Subject: [PATCH 0162/1037] Use Pattern cache from JMeterUtils and extract
 constant Pattern

---
 .../java/org/apache/jmeter/functions/RegexFunction.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 9163a3e6257..1eed9be2119 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -60,6 +60,8 @@ public class RegexFunction extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
 
+    private static final java.util.regex.Pattern FIRST_ELEMENT_PATTERN = java.util.regex.Pattern.compile("^\\$\\d+\\$");
+
     private static final String TEMPLATE_PATTERN = "\\$(\\d+)\\$";  //$NON-NLS-1$
     /** initialised to the regex \$(\d+)\$ */
     private final Pattern templatePattern;
@@ -212,7 +214,7 @@ private String getResultWithJavaRegex(String valueIndex, String defaultValue, St
 
     private java.util.regex.Pattern generateJavaPattern() throws InvalidVariableException {
         try {
-            return java.util.regex.Pattern.compile(((CompoundVariable) values[0]).execute());
+            return JMeterUtils.compilePattern(((CompoundVariable) values[0]).execute());
 
         } catch (PatternSyntaxException e) {
             log.error("Malformed regex pattern:{}", values[0], e);
@@ -423,7 +425,7 @@ private Object[] generateTemplateWithOroRegex(String rawTemplate) {
 
     private boolean isFirstElementGroup(String rawData) {
         if (useJavaRegex) {
-            return java.util.regex.Pattern.compile("^\\$\\d+\\$").matcher(rawData).find();
+            return FIRST_ELEMENT_PATTERN.matcher(rawData).find();
         } else {
             Pattern pattern = JMeterUtils.getPatternCache().getPattern("^\\$\\d+\\$",  //$NON-NLS-1$
                     Perl5Compiler.READ_ONLY_MASK);

From ed12cad6fd583239924829bb72dd86de7099dae9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:22:27 +0100
Subject: [PATCH 0163/1037] Use Pattern cache from JMeterUtils

---
 .../main/java/org/apache/jmeter/extractor/RegexExtractor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 32d8936a0bc..b8ce0d23c31 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -183,7 +183,7 @@ private void extractWithJavaRegex(SampleResult previousResult, JMeterVariables v
         String regex = getRegex();
         java.util.regex.Pattern pattern = null;
         try {
-            pattern = java.util.regex.Pattern.compile(regex);
+            pattern = JMeterUtils.compilePattern(regex);
             List<java.util.regex.MatchResult> matches = processMatches(pattern, previousResult, matchNumber, vars);
             int prevCount = 0;
             String prevString = vars.get(refName + REF_MATCH_NR);

From be942ea52fa09b17406795cf24863a85efe8784f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:24:06 +0100
Subject: [PATCH 0164/1037] Use Pattern cache from JMeterUtils

---
 .../apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index 9f55cf800fb..bdfbfb98b59 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -111,7 +111,7 @@ private JMeterProperty transformValueWithJavaRegex(JMeterProperty prop) throws I
             String value = entry.getValue();
             if (regexMatch) {
                 try {
-                    java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(constructPattern(value));
+                    java.util.regex.Pattern pattern = JMeterUtils.compilePattern(constructPattern(value));
                     input = pattern.matcher(input).replaceAll(FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
                 } catch (PatternSyntaxException e) {
                     log.warn("Malformed pattern: {}", value);

From e6a791d2f860a0e586901b13f1fd24bd6ea3475a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:26:47 +0100
Subject: [PATCH 0165/1037] Use Pattern cache from JMeterUtils

---
 .../apache/jmeter/protocol/http/config/MultipartUrlConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index ead373c57e7..8ffcd4a85de 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -193,7 +193,7 @@ private static String getHeaderValue(String headerName, String multiPart) {
     }
 
     private static String getHeaderValueWithJavaRegex(String multiPart, String regularExpression) {
-        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regularExpression,
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
                  java.util.regex.Pattern.CASE_INSENSITIVE
                         | java.util.regex.Pattern.MULTILINE);
         Matcher matcher = pattern.matcher(multiPart);

From 045a80534051e7f3f9a3181168bbd606d7539158 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:27:53 +0100
Subject: [PATCH 0166/1037] Use Pattern cache from JMeterUtils

---
 .../apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 57985dc7ef7..33ef490cbf9 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -1481,7 +1481,7 @@ private Predicate<URL> generateMatcherPredicate(String regex, String explanation
         }
         if (useJavaRegex) {
             try {
-                java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
+                java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regex);
                 return s -> pattern.matcher(s.toString()).matches();
             } catch (PatternSyntaxException e) {
                 log.warn("Ignoring embedded URL {} string: {}", explanation, e.getMessage());

From 18211407e20334469b9948282c04ce1ee3a4c91f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:29:10 +0100
Subject: [PATCH 0167/1037] Use Pattern cache from JMeterUtils

---
 .../jmeter/protocol/http/modifier/URLRewritingModifier.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 67155eaab5c..69c3c585460 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -176,7 +176,7 @@ private Function<String, String> generateExtractor(String regex) {
     }
 
     private Function<String, String> generateExtractorWithJavaRegex(String regex) {
-        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
                 regex,
                 java.util.regex.Pattern.MULTILINE);
         return text -> {
@@ -210,7 +210,7 @@ private Function<String, String> generateFirstMatchExtractor(String regex) {
     }
 
     private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String regex) {
-        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
                 regex,
                 java.util.regex.Pattern.MULTILINE);
         return text -> {

From 9af67500f9366b7f01ce3e9cef8a76baafb6dd09 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:49:00 +0100
Subject: [PATCH 0168/1037] Add tests for new methods in JMeterUtils

---
 .../apache/jmeter/util/TestJMeterUtils.java   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 80f3cda7740..62755c52d32 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -18,9 +18,13 @@
 package org.apache.jmeter.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -56,4 +60,26 @@ public void testGetArrayPropDefault() throws Exception {
         Assertions.assertArrayEquals(null,
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultEmpty", null));
     }
+
+    @Test
+    void testCompilePatternOK() {
+        Pattern pattern = JMeterUtils.compilePattern("some.*");
+        assertTrue(pattern.matcher("something").matches());
+    }
+
+    @Test
+    void testCompilePatternMultilineCaseIgnoreOK() {
+        Pattern pattern = JMeterUtils.compilePattern("^some.*g$", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
+        assertTrue(pattern.matcher("abc\nsome good thing").find());
+    }
+
+    @Test
+    void testCompilePatternNull() {
+        assertThrows(NullPointerException.class, () -> JMeterUtils.compilePattern(null));
+    }
+
+    @Test
+    void testCompilePatternInvalid() {
+        assertThrows(PatternSyntaxException.class, () -> JMeterUtils.compilePattern("[missing closing bracket"));
+    }
 }

From ee07e3c3b22fe672d3b0e1767bd8dd25ddf90b1f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:49:46 +0100
Subject: [PATCH 0169/1037] Use newer junit5 Assertion methods

---
 .../java/org/apache/jmeter/util/TestJMeterUtils.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 62755c52d32..591c5a326c6 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -17,9 +17,7 @@
 
 package org.apache.jmeter.util;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -34,17 +32,17 @@ public class TestJMeterUtils {
     @Test
     public void testGetResourceFileAsText() throws Exception{
         String sep = System.getProperty("line.separator");
-        assertEquals("line one" + sep + "line two" + sep, JMeterUtils.getResourceFileAsText("resourcefile.txt"));
+        Assertions.assertEquals("line one" + sep + "line two" + sep, JMeterUtils.getResourceFileAsText("resourcefile.txt"));
     }
 
     @Test
     public void testGetResourceFileAsTextWithMisingResource() throws Exception{
-        assertEquals("", JMeterUtils.getResourceFileAsText("not_existant_resourcefile.txt"));
+        Assertions.assertEquals("", JMeterUtils.getResourceFileAsText("not_existant_resourcefile.txt"));
     }
 
     @Test
     public void testGesResStringDefaultWithNonExistantKey() throws Exception {
-        assertEquals("[res_key=noValidKey]", JMeterUtils.getResString("noValidKey"));
+        Assertions.assertEquals("[res_key=noValidKey]", JMeterUtils.getResString("noValidKey"));
     }
 
     @Test
@@ -64,13 +62,13 @@ public void testGetArrayPropDefault() throws Exception {
     @Test
     void testCompilePatternOK() {
         Pattern pattern = JMeterUtils.compilePattern("some.*");
-        assertTrue(pattern.matcher("something").matches());
+        Assertions.assertTrue(pattern.matcher("something").matches());
     }
 
     @Test
     void testCompilePatternMultilineCaseIgnoreOK() {
         Pattern pattern = JMeterUtils.compilePattern("^some.*g$", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
-        assertTrue(pattern.matcher("abc\nsome good thing").find());
+        Assertions.assertTrue(pattern.matcher("abc\nsome good thing").find());
     }
 
     @Test

From 642ce05100d0807b7bf693059c9ee9671115a33a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 26 Feb 2022 16:50:45 +0100
Subject: [PATCH 0170/1037] Break lines that are longer than 120 characters

---
 .../java/org/apache/jmeter/util/TestJMeterUtils.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 591c5a326c6..4abbe451a67 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -32,7 +32,8 @@ public class TestJMeterUtils {
     @Test
     public void testGetResourceFileAsText() throws Exception{
         String sep = System.getProperty("line.separator");
-        Assertions.assertEquals("line one" + sep + "line two" + sep, JMeterUtils.getResourceFileAsText("resourcefile.txt"));
+        Assertions.assertEquals("line one" + sep + "line two" + sep,
+                JMeterUtils.getResourceFileAsText("resourcefile.txt"));
     }
 
     @Test
@@ -50,11 +51,13 @@ public void testGetArrayPropDefault() throws Exception {
         Path props = Files.createTempFile("testGetArrayPropDefault", ".properties");
         JMeterUtils.loadJMeterProperties(props.toString());
         JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefaultEmpty", "    ");
-        JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefault", " Tolstoi  Dostoievski    Pouchkine       Gorki ");
+        JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefault",
+                " Tolstoi  Dostoievski    Pouchkine       Gorki ");
         Assertions.assertArrayEquals(new String[]{"Tolstoi", "Dostoievski", "Pouchkine", "Gorki"},
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefault", null));
         Assertions.assertArrayEquals(new String[]{"Gilels", "Richter"},
-                JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultMissing", new String[]{"Gilels", "Richter"}));
+                JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultMissing",
+                        new String[]{"Gilels", "Richter"}));
         Assertions.assertArrayEquals(null,
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultEmpty", null));
     }

From 75f9b912ca3e0af58375990c9438a8a2434ca3ac Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 17:49:32 +0100
Subject: [PATCH 0171/1037] Pass system property for regex switch to the tests

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 97eccfa8262..cca69d1f9d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -600,6 +600,7 @@ allprojects {
                     val value = System.getProperty(name) ?: default
                     value?.let { systemProperty(name, it) }
                 }
+                passProperty("jmeter.use_java_regex")
                 passProperty("java.awt.headless")
                 passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
                 passProperty("junit.jupiter.execution.parallel.enabled", "true")

From a1780049b4dc3e8193b41459c74783b2ee004de2 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:03:29 +0100
Subject: [PATCH 0172/1037] Java Regex and Oro differ when considering line
 ending

and use DOT_ALL to match new lines
---
 .../apache/jmeter/protocol/http/control/HttpMirrorThread.java | 2 +-
 .../apache/jmeter/protocol/http/parser/RegexpHTMLParser.java  | 2 +-
 .../http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
index 5dbb8c6aa08..2f3e47dcc9c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
@@ -337,7 +337,7 @@ private static int getPositionOfBody(String stringToCheck) {
 
     private static int getPositionOfBodyWithJavaRegex(String stringToCheck) {
         // The headers and body are divided by a blank line (the \r is to allow for the CR before LF)
-        String regularExpression = "^\\r$"; // $NON-NLS-1$
+        String regularExpression = "^$"; // $NON-NLS-1$
         java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regularExpression,
                 java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index 3c22d4d21a1..edc759efd01 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -148,7 +148,7 @@ private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL base
             String input = new String(html, encoding);
             java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
                     REGEXP,
-                    java.util.regex.Pattern.CASE_INSENSITIVE
+                    java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.DOTALL
             );
 
             Matcher matcher = pattern.matcher(input);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 124c92997cd..f85d82b7b8f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -1190,7 +1190,7 @@ private String getSentRequestHeaderValue(String requestHeaders, String headerNam
     private String getSentRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
         String expression = ".*" + headerName + ": (\\d*).*";
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression,
-                        java.util.regex.Pattern.CASE_INSENSITIVE);
+                        java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.DOTALL);
         Matcher matcher = pattern.matcher(requestHeaders);
         if (matcher.matches()) {
             // The value is in the first group, group 0 is the whole match
@@ -1244,7 +1244,7 @@ private int getPositionOfBody(String stringToCheck) {
 
     private int getPositionOfBodyWithJavaRegex(String stringToCheck) {
         // The headers and body are divided by a blank line
-        String regularExpression = "^.$";
+        String regularExpression = "^$";
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
                 java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
 

From ce9adc669503dab0b3c4f02fe4a7ee7e6faf345e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:05:54 +0100
Subject: [PATCH 0173/1037] Java Regex and oro differ in groups() vs
 groupCount()

Oro seems to count group(0) twice
---
 .../main/java/org/apache/jmeter/extractor/RegexExtractor.java | 4 ++--
 .../java/org/apache/jmeter/visualizers/RenderAsRegexp.java    | 2 +-
 .../jmeter/protocol/http/modifier/URLRewritingModifier.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index b8ce0d23c31..f7bcc6390dd 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -391,8 +391,8 @@ private void saveGroups(JMeterVariables vars, String basename, java.util.regex.M
                 log.warn("Could not parse number: '{}'.", prevString);
             }
         }
-        //Note: match.groups() includes group 0
-        final int groups = match.groupCount();
+        //Note: match.groups() includes group 0, groupCount() not
+        final int groups = match.groupCount() + 1;
         for (int x = 0; x < groups; x++) {
             buf.append(x);
             vars.put(buf.toString(), match.group(x));
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index d3f8f70b7b6..043f5e8274c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -138,7 +138,7 @@ private String processJavaRegex(String textToParse) {
         for (int j = 0; j < size; j++) {
             java.util.regex.MatchResult mr = matches.get(j);
             final int groups = mr.groupCount();
-            for (int i = 0; i < groups; i++) {
+            for (int i = 0; i <= groups; i++) {
                 sb.append("Match[").append(j+1).append("][").append(i).append("]=").append(mr.group(i)).append("\n");
             }
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 69c3c585460..1e5d252d102 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -216,7 +216,7 @@ private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String
         return text -> {
             Matcher matcher = pattern.matcher(text);
             if (matcher.find()) {
-                for (int i = 1; i < matcher.groupCount(); i++) {
+                for (int i = 1; i <= matcher.groupCount(); i++) {
                     String value = matcher.group(i);
                     if (value != null) {
                         return value;

From 9681192291ccd7e89cb1bd3d60b704abdaac7c09 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:08:11 +0100
Subject: [PATCH 0174/1037] Java Regex split() works quite different to oro
 split()

Use a different approach to split the template and correct the
difference between Java Regex groupCount() and Oro groups()
---
 .../jmeter/functions/RegexFunction.java       | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 1eed9be2119..4bba26763fb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -291,7 +291,7 @@ private Pattern generateOroPattern() throws InvalidVariableException {
     }
 
     private void saveGroups(java.util.regex.MatchResult result, String namep, JMeterVariables vars) {
-        for (int x = 0; x < result.groupCount(); x++) {
+        for (int x = 0; x <= result.groupCount(); x++) {
             vars.put(namep + "_g" + x, result.group(x)); //$NON-NLS-1$
         }
     }
@@ -363,32 +363,20 @@ private Object[] generateTemplate(String rawTemplate) {
 
     private Object[] generateTemplateWithJavaRegex(String rawTemplate) {
         // String or Integer
-        List<Object> combined = new ArrayList<>();
-        List<String> pieces = Arrays.asList(templatePatternJava.split(rawTemplate));
+        List<Object> pieces = new ArrayList<>();
         Matcher matcher = templatePatternJava.matcher(rawTemplate);
-        boolean startsWith = isFirstElementGroup(rawTemplate);
-        if (startsWith) {
-            pieces.remove(0);// Remove initial empty entry
-        }
-        Iterator<String> iter = pieces.iterator();
-        while (iter.hasNext()) {
-            boolean matchExists = matcher.find();
-            if (startsWith) {
-                if (matchExists) {
-                    combined.add(Integer.valueOf(matcher.group(1)));
-                }
-                combined.add(iter.next());
-            } else {
-                combined.add(iter.next());
-                if (matchExists) {
-                    combined.add(Integer.valueOf(matcher.group(1)));
-                }
+        int pos = 0;
+        while (matcher.find()) {
+            if (pos < matcher.start()) {
+                pieces.add(rawTemplate.substring(pos, matcher.start()));
             }
+            pieces.add(Integer.valueOf(matcher.group(1)));
+            pos = matcher.end();
         }
-        if (matcher.find()) {
-            combined.add(Integer.valueOf(matcher.group(1)));
+        if (pos < rawTemplate.length()) {
+            pieces.add(rawTemplate.substring(pos));
         }
-        return combined.toArray();
+        return pieces.toArray();
     }
 
     private Object[] generateTemplateWithOroRegex(String rawTemplate) {

From 8da5aab2ac94afa2e99700e14f285d99bbfbf338 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:09:09 +0100
Subject: [PATCH 0175/1037] curly braces are special in Java Regex

Oro seems to get along with the escaped braces, so use them for testing
both implementations
---
 .../org/apache/jmeter/assertions/ResponseAssertionTest.java | 2 +-
 .../org/apache/jmeter/assertions/TestJSONPathAssertion.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
index 5c3bfd319ab..a556c407b3a 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
@@ -258,7 +258,7 @@ public void testResponseAssertionContainsDollar() throws Exception {
         assertion.unsetNotType();
         assertion.setToContainsType();
         assertion.setTestFieldResponseData();
-        assertion.addTestString("value=\"\\${ID}\" Group\\$ctl00\\$drpEmails");
+        assertion.addTestString("value=\"\\$\\{ID\\}\" Group\\$ctl00\\$drpEmails");
 
         result = assertion.getResult(sample);
         assertPassed();
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index 8447977d687..125662f7909 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -82,7 +82,7 @@ void testIsJsonValidationBool() {
         "{\"myval\": 123}; $.myval; 123",
         "{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}; $.myval[*].test; 2",
         "{\"myval\": []}; $.myval; []",
-        "{\"myval\": {\"key\": \"val\"}}; $.myval; {\"key\":\"val\"}"
+        "{\"myval\": {\"key\": \"val\"}}; $.myval; \\{\"key\":\"val\"\\}"
     }, delimiterString=";")
     void testGetResult_pathsWithOneResult(String data, String jsonPath, String expectedResult) {
         SampleResult samplerResult = new SampleResult();
@@ -311,14 +311,14 @@ void testGetResult_match_msg_problem() {
         instance.setJsonPath("$.execution[0].scenario.requests[0].headers");
         instance.setJsonValidationBool(true);
         instance.setExpectNull(false);
-        instance.setExpectedValue("{headerkey=header value}");
+        instance.setExpectedValue("\\{headerkey=header value\\}");
         instance.setInvert(false);
         AssertionResult expResult = new AssertionResult("");
         AssertionResult result = instance.getResult(samplerResult);
         assertEquals(expResult.getName(), result.getName());
         assertTrue(result.isFailure());
         assertEquals(
-                "Value expected to match regexp '{headerkey=header value}', but it did not match: '{\"headerkey\":\"header value\"}'",
+                "Value expected to match regexp '\\{headerkey=header value\\}', but it did not match: '{\"headerkey\":\"header value\"}'",
                 result.getFailureMessage());
     }
 

From ee0ae7697c6bd015efb541a84cece7c7615840f0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:10:29 +0100
Subject: [PATCH 0176/1037] $ is a special character in Java Regex

Guard it for usage within a Regex
---
 .../apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index bdfbfb98b59..aeb7cf3e1a5 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -47,6 +47,7 @@ public class ReplaceFunctionsWithStrings extends AbstractTransformer {
      * Functions are wrapped in ${ and }
      */
     private static final String FUNCTION_REF_PREFIX = "${"; //$NON-NLS-1$
+    private static final String FUNCTION_REF_PREFIX_REGEX_SAFE = "\\${"; //$NON-NLS-1$
     /**
      * Functions are wrapped in ${ and }
      */
@@ -112,7 +113,7 @@ private JMeterProperty transformValueWithJavaRegex(JMeterProperty prop) throws I
             if (regexMatch) {
                 try {
                     java.util.regex.Pattern pattern = JMeterUtils.compilePattern(constructPattern(value));
-                    input = pattern.matcher(input).replaceAll(FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
+                    input = pattern.matcher(input).replaceAll(FUNCTION_REF_PREFIX_REGEX_SAFE + key + FUNCTION_REF_SUFFIX);
                 } catch (PatternSyntaxException e) {
                     log.warn("Malformed pattern: {}", value);
                 }

From bfd9b384c48fc203b6d4f2e35bee01c439e0c08f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:12:12 +0100
Subject: [PATCH 0177/1037] Java Regex replaceAll() would replace too much

The Java Regex implementation sees an empty group at the end of
a string, when matching against .*. So let us rephrase our wish
to at least one character.
---
 .../java/org/apache/jmeter/engine/util/TestValueReplacer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
index d9317170418..026f95ff17c 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
@@ -98,7 +98,7 @@ public void testReverseReplacementXml() throws Exception {
     public void testOverlappingMatches() throws Exception {
         TestPlan plan = new TestPlan();
         plan.addParameter("longMatch", "servername");
-        plan.addParameter("shortMatch", ".*");
+        plan.addParameter("shortMatch", ".+");
         ValueReplacer replacer = new ValueReplacer(plan);
         TestElement element = new TestPlan();
         element.setProperty(new StringProperty("domain", "servername.domain"));

From 6275949dcc90bc34fe9cc73cc41a49f4df3e4520 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:16:50 +0100
Subject: [PATCH 0178/1037] Enable testing of Java Regex instead of Oro on
 travis

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a10bff12ec7..0b943674dec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,20 @@ matrix:
         # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
         # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
         - ./gradlew build -Djava.awt.headless=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
+    - name: Tests with OpenJDK 11 and Java Regex
+      jdk: openjdk11
+      addons:
+        apt:
+          packages:
+            - language-pack-fr
+      env:
+        - TZ=Pacific/Chatham # flips between +12:45 and +13:45
+        - LANG=fr_FR.UTF-8
+        - LC_ALL=fr_FR.UTF-8
+      script:
+        # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
+        # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
+        - ./gradlew build -Djava.awt.headless=true -Djmeter.use_java_regex=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
     - name: Tests with OpenJDK 11 on s390x
       os: linux
       arch: s390x

From 73b30cb7025be852849b3faa5b11f495408b0caf Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:19:18 +0100
Subject: [PATCH 0179/1037] Order import

---
 .../src/main/java/org/apache/jmeter/functions/RegexFunction.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 4bba26763fb..a3ea476e5e3 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -18,7 +18,6 @@
 package org.apache.jmeter.functions;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;

From 2c14e913adfeecaf3cc4fbfab38dc44c4d2b2d84 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 12:27:26 +0100
Subject: [PATCH 0180/1037] Enable passing of system properties to tests via
 special namespace

If a system property prefixed with jmeter.properties. is found, Gradle will
now pass it as a system property without that prefix to the unit tests.
That allows to set system properties (which might be used as jmeter properties)
to the unit tests, without setting them in the JVM, that is used by Gradle.
---
 .travis.yml      | 2 +-
 build.gradle.kts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b943674dec..2ff58054e9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
       script:
         # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
         # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
-        - ./gradlew build -Djava.awt.headless=true -Djmeter.use_java_regex=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
+        - ./gradlew build -Djava.awt.headless=true -Djmeter.properties.jmeter.use_java_regex=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
     - name: Tests with OpenJDK 11 on s390x
       os: linux
       arch: s390x
diff --git a/build.gradle.kts b/build.gradle.kts
index cca69d1f9d4..8349f3c4d37 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -600,7 +600,11 @@ allprojects {
                     val value = System.getProperty(name) ?: default
                     value?.let { systemProperty(name, it) }
                 }
-                passProperty("jmeter.use_java_regex")
+                System.getProperties().filter {
+                    it.key.toString().startsWith("jmeter.properties.")
+                }.forEach {
+                    systemProperty(it.key.toString().substring("jmeter.properties.".length), it.value)
+                }
                 passProperty("java.awt.headless")
                 passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
                 passProperty("junit.jupiter.execution.parallel.enabled", "true")

From e88353a44453fa2905fdb7bd351af3886e74c1b8 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 15:46:23 +0100
Subject: [PATCH 0181/1037] Use Pattern cache in more places

---
 .../java/org/apache/jmeter/assertions/JSONPathAssertion.java  | 2 +-
 .../apache/jmeter/assertions/jmespath/JMESPathAssertion.java  | 2 +-
 .../java/org/apache/jmeter/visualizers/RenderAsRegexp.java    | 2 +-
 .../org/apache/jmeter/report/dashboard/ReportGenerator.java   | 2 +-
 .../apache/jmeter/protocol/http/control/HttpMirrorThread.java | 2 +-
 .../org/apache/jmeter/protocol/http/proxy/ProxyControl.java   | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index cd9f36538ae..cc108626bbd 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -167,7 +167,7 @@ private boolean isEquals(Object subj) {
         if (isUseRegex()) {
             String str = objectToString(subj);
             if (useJavaRegex) {
-                return java.util.regex.Pattern.matches(getExpectedValue(), str);
+                return JMeterUtils.compilePattern(getExpectedValue()).matcher(str).matches();
             } else {
                 Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
                 return JMeterUtils.getMatcher().matches(str, pattern);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index 4e078c75f86..54d6e368522 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -180,7 +180,7 @@ private boolean isEquals(ObjectMapper mapper, JsonNode jsonNode) throws JsonProc
         String str = objectToString(mapper, jsonNode);
         if (isUseRegex()) {
             if (useJavaRegex) {
-                return java.util.regex.Pattern.matches(getExpectedValue(), str);
+                return JMeterUtils.compilePattern(getExpectedValue()).matcher(str).matches();
             } else {
                 Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
                 return JMeterUtils.getMatcher().matches(str, pattern);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index 043f5e8274c..0f77f33a18e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -121,7 +121,7 @@ private String process(String textToParse) {
     private String processJavaRegex(String textToParse) {
         java.util.regex.Pattern pattern;
         try {
-            pattern = java.util.regex.Pattern.compile(regexpField.getText());
+            pattern = JMeterUtils.compilePattern(regexpField.getText());
         } catch (PatternSyntaxException e) {
             return e.toString();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index 36034583dc2..25a7ae5b2da 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -463,7 +463,7 @@ private boolean isMatching(String sampleName, String keyName) {
             return false;
         }
         if (useJavaRegex) {
-            java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(keyName);
+            java.util.regex.Pattern pattern = JMeterUtils.compilePattern(keyName);
             return pattern.matcher(sampleName).matches();
         }
         org.apache.oro.text.regex.Pattern regex = JMeterUtils.getPatternCache().getPattern(keyName);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
index 2f3e47dcc9c..57746f6f18f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
@@ -317,7 +317,7 @@ private static String getRequestHeaderValueWithOroRegex(String requestHeaders, S
     private static String getRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
         // We use multi-line mask so can prefix the line with ^
         String expression = "^" + headerName + ":\\s+([^\\r\\n]+)"; // $NON-NLS-1$ $NON-NLS-2$
-        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(expression,
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression,
                 java.util.regex.Pattern.CASE_INSENSITIVE
                         | java.util.regex.Pattern.MULTILINE);
         Matcher matcher = pattern.matcher(requestHeaders);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 80a856141ab..111c110b539 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -897,7 +897,7 @@ private boolean testPattern(String expression, String sampleContentType, boolean
     }
 
     private boolean isContainedWithJavaRegex(String expression, String sampleContentType) {
-        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(expression);
+        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression);
         return pattern.matcher(sampleContentType).find();
     }
 
@@ -1377,7 +1377,7 @@ private boolean matchesPatternsWithJavaRegex(String url, CollectionProperty patt
         for (JMeterProperty jMeterProperty : patterns) {
             String item = jMeterProperty.getStringValue();
             try {
-                java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(item);
+                java.util.regex.Pattern pattern = JMeterUtils.compilePattern(item);
                 if (pattern.matcher(url).matches()) {
                     return true;
                 }

From 9eb976dc7f43ecc1b0a811382e5e201590c29241 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 15:56:46 +0100
Subject: [PATCH 0182/1037] Move static pattern to private constant

---
 .../org/apache/jmeter/save/CSVSaveService.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index e439fb938ae..2c5bee2d52d 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -63,6 +63,14 @@
  */
 // For unit tests, @see TestCSVSaveService
 public final class CSVSaveService {
+    private static final java.util.regex.Pattern DELIMITER_PATTERN = java.util.regex.Pattern
+            // This assumes the header names are all single words with no spaces
+            // word followed by 0 or more repeats of (non-word char + word)
+            // where the non-word char (\2) is the same
+            // e.g. abc|def|ghi but not abd|def~ghi
+            .compile("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*" // $NON-NLS-1$
+                    // last entries may be quoted strings
+            );
     private static final Logger log = LoggerFactory.getLogger(CSVSaveService.class);
 
     // ---------------------------------------------------------------------
@@ -557,15 +565,7 @@ private static String extractDelimiter(String headerLine) {
     }
 
     private static String extractDelimWithJavaRegex(String headerLine) {
-        java.util.regex.Pattern pattern = java.util.regex.Pattern
-                // This assumes the header names are all single words with no spaces
-                // word followed by 0 or more repeats of (non-word char + word)
-                // where the non-word char (\2) is the same
-                // e.g. abc|def|ghi but not abd|def~ghi
-                .compile("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*" // $NON-NLS-1$
-                        // last entries may be quoted strings
-                        );
-        Matcher matcher = pattern.matcher(headerLine);
+        Matcher matcher = DELIMITER_PATTERN.matcher(headerLine);
         if (matcher.matches()) {
             return matcher.group(2);
         }

From 24eb4c2795ad747d056a00ab4413e2438b9dd862 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 16:10:04 +0100
Subject: [PATCH 0183/1037] Use constants for static Java Regex Patterns

---
 .../jmeter/protocol/http/parser/HtmlParsingUtils.java  |  8 ++++----
 .../jmeter/protocol/http/parser/RegexpHTMLParser.java  | 10 +++++-----
 .../protocol/http/util/accesslog/SessionFilter.java    |  4 ++--
 .../TestHTTPSamplersAgainstHttpMirrorServer.java       |  7 +++----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index 04b1e12975e..734804e2c82 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -49,6 +49,9 @@
 import org.w3c.tidy.Tidy;
 
 public final class HtmlParsingUtils {
+    private static final java.util.regex.Pattern EXTRACT_STYLE_PATTERN = java.util.regex.Pattern.compile(
+            "URL\\(\\s*('|\")(.*)('|\")\\s*\\)", // $NON-NLS-1$
+            java.util.regex.Pattern.CASE_INSENSITIVE);
     private static final Logger log = LoggerFactory.getLogger(HtmlParsingUtils.class);
 
     private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
@@ -451,10 +454,7 @@ public static void extractStyleURLs(final URL baseUrl, final URLCollection urls,
 
     private static void extractStyleURLsWithJavaRegex(URL baseUrl, URLCollection urls, String styleTagStr) {
 
-        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
-                "URL\\(\\s*('|\")(.*)('|\")\\s*\\)", // $NON-NLS-1$
-                java.util.regex.Pattern.CASE_INSENSITIVE);
-        Matcher matcher = pattern.matcher(styleTagStr);
+        Matcher matcher = EXTRACT_STYLE_PATTERN.matcher(styleTagStr);
         while (matcher.find()) {
             // The value is in the second group
             String styleUrl = matcher.group(2);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index edc759efd01..d055eca4db0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -107,6 +107,10 @@ class RegexpHTMLParser extends HTMLParser {
             + "|LINK(?:" + SEP + "(?:HREF" + VALUE+"|REL\\s*=\\s*(?:\"stylesheet\"|'stylesheet'|stylesheet(?=[\\s>])))){2,}"
             + "|LINK(?:" + SEP + "(?:HREF" + VALUE+"|REL\\s*=\\s*(?:\"icon\"|'icon'|icon(?=[\\s>])))){2,}"
             + "|LINK(?:" + SEP + "(?:HREF" + VALUE+"|REL\\s*=\\s*(?:\"shortcut icon\"|'shortcut icon'|shortcut icon(?=[\\s>])))){2,})";
+    private static final java.util.regex.Pattern HTML_PATTERN = java.util.regex.Pattern.compile(
+            REGEXP,
+            java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.DOTALL
+    );
 
     // Number of capturing groups possibly containing Base HREFs:
     private static final int NUM_BASE_GROUPS = 3;
@@ -146,12 +150,8 @@ private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL base
             // probably a new PatternMatcherInput working on a byte[] would do
             // better.
             String input = new String(html, encoding);
-            java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
-                    REGEXP,
-                    java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.DOTALL
-            );
 
-            Matcher matcher = pattern.matcher(input);
+            Matcher matcher = HTML_PATTERN.matcher(input);
             while (matcher.find()) {
                 java.util.regex.MatchResult match = matcher.toMatchResult();
                 String s;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index addff05e1af..6388c8da58e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -41,6 +41,7 @@
  * Provides Session Filtering for the AccessLog Sampler.
  */
 public class SessionFilter implements Filter, Serializable, TestCloneable,ThreadListener {
+    private static final java.util.regex.Pattern IP_PATTERN = java.util.regex.Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
     private static final long serialVersionUID = 233L;
     private static final Logger log = LoggerFactory.getLogger(SessionFilter.class);
 
@@ -97,8 +98,7 @@ protected String getIpAddress(String logLine) {
     }
 
     private String getIpAddressWithJavaRegex(String logLine) {
-        java.util.regex.Pattern incIp = JMeterUtils.compilePattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
-        Matcher matcher = incIp.matcher(logLine);
+        Matcher matcher = IP_PATTERN.matcher(logLine);
         if (matcher.find()) {
             return matcher.group(0);
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index f85d82b7b8f..b51e4256805 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -60,6 +60,8 @@
  * started when the unit tests are executed.
  */
 public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit implements Describable {
+    private static final java.util.regex.Pattern EMPTY_LINE_PATTERN = java.util.regex.Pattern.compile("^$",
+            java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
     private static final int HTTP_SAMPLER = 0;
     private static final int HTTP_SAMPLER3 = 2;
 
@@ -1244,11 +1246,8 @@ private int getPositionOfBody(String stringToCheck) {
 
     private int getPositionOfBodyWithJavaRegex(String stringToCheck) {
         // The headers and body are divided by a blank line
-        String regularExpression = "^$";
-        java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
-                java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
 
-        Matcher localMatcher = pattern.matcher(stringToCheck);
+        Matcher localMatcher = EMPTY_LINE_PATTERN.matcher(stringToCheck);
         if (localMatcher.find()) {
             java.util.regex.MatchResult match = localMatcher.toMatchResult();
             return match.start(0);

From 1d1a548df020a2deb188f07e7ca1a0065fae3d40 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 21:07:19 +0100
Subject: [PATCH 0184/1037] Change property name for regex engine switch

Make switch flag internally always a privatestatic final variable, as it
might help the JIT compiler to remove dead code.
---
 .travis.yml                                         |  2 +-
 .../apache/jmeter/assertions/CompareAssertion.java  |  5 +++--
 .../apache/jmeter/assertions/JSONPathAssertion.java |  5 +++--
 .../apache/jmeter/assertions/ResponseAssertion.java |  7 ++++---
 .../assertions/jmespath/JMESPathAssertion.java      |  5 +++--
 .../org/apache/jmeter/extractor/RegexExtractor.java |  5 +++--
 .../apache/jmeter/visualizers/RenderAsRegexp.java   |  5 +++--
 .../engine/util/ReplaceFunctionsWithStrings.java    |  5 +++--
 .../jmeter/report/dashboard/ReportGenerator.java    |  5 +++--
 .../java/org/apache/jmeter/save/CSVSaveService.java |  5 +++--
 .../report/dashboard/ApdexPerTransactionTest.java   |  5 +++--
 .../org/apache/jmeter/functions/RegexFunction.java  |  9 +++++----
 .../protocol/http/config/MultipartUrlConfig.java    |  5 +++--
 .../protocol/http/control/HttpMirrorThread.java     |  7 ++++---
 .../http/modifier/URLRewritingModifier.java         |  7 ++++---
 .../protocol/http/parser/HtmlParsingUtils.java      | 13 +++++++------
 .../protocol/http/parser/RegexpHTMLParser.java      |  5 +++--
 .../jmeter/protocol/http/proxy/ProxyControl.java    |  7 ++++---
 .../protocol/http/sampler/HTTPSamplerBase.java      |  5 +++--
 .../protocol/http/util/accesslog/LogFilter.java     |  7 ++++---
 .../protocol/http/util/accesslog/SessionFilter.java |  5 +++--
 .../TestHTTPSamplersAgainstHttpMirrorServer.java    | 11 ++++++-----
 22 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ff58054e9a..dfa89c649d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
       script:
         # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
         # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
-        - ./gradlew build -Djava.awt.headless=true -Djmeter.properties.jmeter.use_java_regex=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
+        - ./gradlew build -Djava.awt.headless=true -Djmeter.properties.jmeter.regex.engine=java -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
     - name: Tests with OpenJDK 11 on s390x
       os: linux
       arch: s390x
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
index dd63482ffc3..8092f10c666 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
@@ -48,7 +48,8 @@ public class CompareAssertion extends AbstractTestElement implements Assertion,
 
     private Collection<SubstitutionElement> stringsToSkip;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     public CompareAssertion() {
         super();
@@ -157,7 +158,7 @@ private String filterString(final String content) {
             return content;
         }
 
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             String result = content;
             for (SubstitutionElement element: stringsToSkip) {
                 result = result.replaceAll(element.getRegex(), element.getSubstitute());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index cc108626bbd..446ff6f72e3 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -51,7 +51,8 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab
     public static final String INVERT = "INVERT";
     public static final String ISREGEX = "ISREGEX";
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     private static ThreadLocal<DecimalFormat> decimalFormatter =
             ThreadLocal.withInitial(JSONPathAssertion::createDecimalFormat);
@@ -166,7 +167,7 @@ private boolean arrayMatched(JSONArray value) {
     private boolean isEquals(Object subj) {
         if (isUseRegex()) {
             String str = objectToString(subj);
-            if (useJavaRegex) {
+            if (USE_JAVA_REGEX) {
                 return JMeterUtils.compilePattern(getExpectedValue()).matcher(str).matches();
             } else {
                 Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index 6288e4772d3..a646e6198b0 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -95,7 +95,8 @@ public class ResponseAssertion extends AbstractScopedAssertion implements Serial
     private static final String DIFF_DELTA_END
             = JMeterUtils.getPropDefault("assertion.equals_diff_delta_end", "]]]");
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     public ResponseAssertion() {
         setProperty(new CollectionProperty(TEST_STRINGS, new ArrayList<String>()));
@@ -330,7 +331,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
                 String stringPattern = jMeterProperty.getStringValue();
                 boolean found;
                 if (contains) {
-                    if (useJavaRegex) {
+                    if (USE_JAVA_REGEX) {
                         found = containsWithJavaRegex(toCheck, stringPattern);
                     } else {
                         Pattern pattern = JMeterUtils.getPatternCache()
@@ -342,7 +343,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
                 } else if (substring) {
                     found = toCheck.contains(stringPattern);
                 } else { // this is the old `matches` part which means `isMatchType()` is true
-                    if (useJavaRegex) {
+                    if (USE_JAVA_REGEX) {
                         found = matchesWithJavaRegex(toCheck, stringPattern);
                     } else {
                         Pattern pattern = JMeterUtils.getPatternCache()
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index 54d6e368522..624be969dea 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -58,7 +58,8 @@ public class JMESPathAssertion extends AbstractTestElement implements Serializab
     private static final String ISREGEX = "ISREGEX";
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * Used to do a JMESPath query and compute result if the expectedValue matches
@@ -179,7 +180,7 @@ public static String objectToString(ObjectMapper mapper, JsonNode element) throw
     private boolean isEquals(ObjectMapper mapper, JsonNode jsonNode) throws JsonProcessingException {
         String str = objectToString(mapper, jsonNode);
         if (isUseRegex()) {
-            if (useJavaRegex) {
+            if (USE_JAVA_REGEX) {
                 return JMeterUtils.compilePattern(getExpectedValue()).matcher(str).matches();
             } else {
                 Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index f7bcc6390dd..932484d0597 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -83,7 +83,8 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
 
     private static final boolean DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE = false;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     private transient List<Object> template;
 
@@ -113,7 +114,7 @@ public void process() {
             vars.put(refName, defaultValue);
         }
 
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             extractWithJavaRegex(previousResult, vars, refName, matchNumber);
         } else {
             extractWithOroRegex(previousResult, vars, refName, matchNumber);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index 0f77f33a18e..375d90299d5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -67,7 +67,8 @@ public class RenderAsRegexp implements ResultRenderer, ActionListener {
 
     private JTabbedPane rightSide;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /** {@inheritDoc} */
     @Override
@@ -112,7 +113,7 @@ private void executeAndShowRegexpTester(String textToParse) {
     }
 
     private String process(String textToParse) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return processJavaRegex(textToParse);
         }
         return processOroRegex(textToParse);
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index aeb7cf3e1a5..848b215e162 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -55,7 +55,8 @@ public class ReplaceFunctionsWithStrings extends AbstractTransformer {
 
     private final boolean regexMatch;// Should we match using regexes?
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     public ReplaceFunctionsWithStrings(CompoundVariable masterFunction, Map<String, String> variables) {
         this(masterFunction, variables, false);
@@ -70,7 +71,7 @@ public ReplaceFunctionsWithStrings(CompoundVariable masterFunction, Map<String,
 
     @Override
     public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariableException {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return transformValueWithJavaRegex(prop);
         }
         return transformValueWithOroRegex(prop);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index 25a7ae5b2da..ce575a8842b 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -103,7 +103,8 @@ public class ReportGenerator {
     private final File testFile;
     private final ReportGeneratorConfiguration configuration;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * ResultCollector used
@@ -462,7 +463,7 @@ private boolean isMatching(String sampleName, String keyName) {
         if (sampleName == null) {
             return false;
         }
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             java.util.regex.Pattern pattern = JMeterUtils.compilePattern(keyName);
             return pattern.matcher(sampleName).matches();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index 2c5bee2d52d..6d138073641 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -125,7 +125,8 @@ public final class CSVSaveService {
 
     private static final String LINE_SEP = System.getProperty("line.separator"); // $NON-NLS-1$
 
-    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * Private constructor to prevent instantiation.
@@ -558,7 +559,7 @@ public static SampleSaveConfiguration getSampleSaveConfiguration(
     }
 
     private static String extractDelimiter(String headerLine) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return extractDelimWithJavaRegex(headerLine);
         }
         return extractDelimWithOroRegex(headerLine);
diff --git a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
index 2e5c13ac27c..e2f7d6450e0 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
@@ -37,7 +37,8 @@ public class ApdexPerTransactionTest extends JMeterTestCase {
     // it also includes hardcoded sample names mixed with regexes
     private static final String apdexString = "sample(\\d+):1000|2000;samples12:3000|4000;scenar01-12:5000|6000";
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     @Test
     public void testgetApdexPerTransactionProperty() throws Exception {
@@ -118,7 +119,7 @@ public void testSampleNameMatching() {
         for (String sampleName : sampleNames) {
             boolean hasMatched = false;
             for (Map.Entry<String, Long[]> entry : apdex.entrySet()) {
-                if (useJavaRegex) {
+                if (USE_JAVA_REGEX) {
                     Pattern pattern = JMeterUtils.compilePattern(entry.getKey());
                     Matcher matcher = pattern.matcher(sampleName);
                     if (matcher.matches()) {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index a3ea476e5e3..b8883addf13 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -81,7 +81,8 @@ public class RegexFunction extends AbstractFunction {
         desc.add(JMeterUtils.getResString("regexfunc_param_7"));// input variable //$NON-NLS-1$
     }
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     public RegexFunction() {
         templatePattern = JMeterUtils.getPatternCache().getPattern(TEMPLATE_PATTERN,
@@ -149,7 +150,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             return defaultValue;
         }
 
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getResultWithJavaRegex(valueIndex, defaultValue, between, name, tmplt, vars, textToMatch);
         }
         return getResultWithOroRegex(valueIndex, defaultValue, between, name, tmplt, vars, textToMatch);
@@ -354,7 +355,7 @@ public void setParameters(Collection<CompoundVariable> parameters) throws Invali
     }
 
     private Object[] generateTemplate(String rawTemplate) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return generateTemplateWithJavaRegex(rawTemplate);
         }
         return generateTemplateWithOroRegex(rawTemplate);
@@ -411,7 +412,7 @@ private Object[] generateTemplateWithOroRegex(String rawTemplate) {
     }
 
     private boolean isFirstElementGroup(String rawData) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return FIRST_ELEMENT_PATTERN.matcher(rawData).find();
         } else {
             Pattern pattern = JMeterUtils.getPatternCache().getPattern("^\\$\\d+\\$",  //$NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index 8ffcd4a85de..4e8173a67b7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -55,7 +55,8 @@ public class MultipartUrlConfig implements Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(MultipartUrlConfig.class);
 
-    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * HTTPFileArgs list to be uploaded with http request.
@@ -186,7 +187,7 @@ private static String getParameterValue(HeaderElement element, String name, Stri
 
     private static String getHeaderValue(String headerName, String multiPart) {
         String regularExpression = headerName + "\\s*:\\s*(.*)$"; //$NON-NLS-1$
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getHeaderValueWithJavaRegex(multiPart, regularExpression);
         }
         return getHeaderValueWithOroRegex(multiPart, regularExpression);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
index 57746f6f18f..6be2cad58cb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
@@ -69,7 +69,8 @@ public class HttpMirrorThread implements Runnable {
 
     private static final String VERBOSE = "v"; // $NON-NLS-1$
 
-    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /** Socket to client. */
     private final Socket clientSocket;
@@ -293,7 +294,7 @@ else if (isChunked) {
     }
 
     private static String getRequestHeaderValue(String requestHeaders, String headerName) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getRequestHeaderValueWithJavaRegex(requestHeaders, headerName);
         }
         return getRequestHeaderValueWithOroRegex(requestHeaders, headerName);
@@ -329,7 +330,7 @@ private static String getRequestHeaderValueWithJavaRegex(String requestHeaders,
     }
 
     private static int getPositionOfBody(String stringToCheck) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getPositionOfBodyWithJavaRegex(stringToCheck);
         }
         return getPositionOfBodyWithOroRegex(stringToCheck);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 1e5d252d102..312c49edd9b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -61,7 +61,8 @@ public class URLRewritingModifier extends AbstractTestElement implements Seriali
 
     private static final String ENCODE = "encode"; // $NON-NLS-1$
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     // PreProcessors are cloned per-thread, so this will be saved per-thread
     private transient String savedValue = ""; // $NON-NLS-1$
@@ -169,7 +170,7 @@ private void initRegex(String argName) {
     }
 
     private Function<String, String> generateExtractor(String regex) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return generateExtractorWithJavaRegex(regex);
         }
         return generateExtractorWithOroRegex(regex);
@@ -203,7 +204,7 @@ private Function<String, String> generateExtractorWithOroRegex(String regex) {
     }
 
     private Function<String, String> generateFirstMatchExtractor(String regex) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return generateFirstMatchExtractorWithJavaRegex(regex);
         }
         return generateFirstMatchExtractorWithOroRegex(regex);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index 734804e2c82..bd914405c23 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -54,7 +54,8 @@ public final class HtmlParsingUtils {
             java.util.regex.Pattern.CASE_INSENSITIVE);
     private static final Logger log = LoggerFactory.getLogger(HtmlParsingUtils.class);
 
-    private static boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * Private constructor to prevent instantiation.
@@ -87,7 +88,7 @@ public static boolean isAnchorMatched(HTTPSamplerBase newLink, HTTPSamplerBase c
 
         final Arguments arguments = config.getArguments();
 
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return isAnchorMatchedWithJavaRegex(newLink, config, query, arguments);
         }
         return isAnchorMatchedWithOroRegex(newLink, config, query, arguments);
@@ -171,7 +172,7 @@ private static boolean isAnchorMatchedWithOroRegex(HTTPSamplerBase newLink, HTTP
      * @return true if both name and value match
      */
     public static boolean isArgumentMatched(Argument arg, Argument patternArg) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return isEqualOrMatchesWithJavaRegex(arg.getName(), patternArg.getName())
                     && isEqualOrMatchesWithJavaRegex(arg.getValue(), patternArg.getValue());
         }
@@ -240,7 +241,7 @@ private static boolean isEqualOrMatchesCaseBlindWithJavaRegex(String arg, String
      * @return true if input matches the pattern
      */
     public static boolean isEqualOrMatches(String arg, String pat) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return isEqualOrMatchesWithJavaRegex(arg, pat);
         }
         return isEqualOrMatches(arg, pat, JMeterUtils.getMatcher(), JMeterUtils.getPatternCache());
@@ -256,7 +257,7 @@ public static boolean isEqualOrMatches(String arg, String pat) {
      * @return true if input matches the pattern
      */
     public static boolean isEqualOrMatchesCaseBlind(String arg, String pat) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return isEqualOrMatchesCaseBlindWithJavaRegex(arg, pat);
         }
         return isEqualOrMatchesCaseBlind(arg, pat, JMeterUtils.getMatcher(), JMeterUtils.getPatternCache());
@@ -445,7 +446,7 @@ private static HTTPSamplerBase createFormUrlConfig(Node tempNode, URL context) t
     }
 
     public static void extractStyleURLs(final URL baseUrl, final URLCollection urls, String styleTagStr) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             extractStyleURLsWithJavaRegex(baseUrl, urls, styleTagStr);
         } else {
             extractStyleURLsWithOroRegex(baseUrl, urls, styleTagStr);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index d055eca4db0..6129e710d8c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -121,7 +121,8 @@ class RegexpHTMLParser extends HTMLParser {
     private static final ThreadLocal<PatternMatcherInput> localInput =
             ThreadLocal.withInitial(() -> new PatternMatcherInput(new char[0]));
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     /**
      * Make sure to compile the regular expression upon instantiation:
@@ -136,7 +137,7 @@ protected RegexpHTMLParser() {
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl,
                                                  URLCollection urls, String encoding) throws HTMLParseException {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getEmbeddedResourceURLsWithJavaRegex(html, baseUrl, urls, encoding);
         }
         return getEmbeddedResourceURLsWithOroRegex(html, baseUrl, urls, encoding);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 111c110b539..52b751b2807 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -246,7 +246,8 @@ public enum KeystoreMode {
     // Although this field is mutable, it is only accessed within the synchronized method deliverSampler()
     private static String LAST_REDIRECT = null;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     private transient Daemon server;
 
@@ -882,7 +883,7 @@ private boolean testPattern(String expression, String sampleContentType, boolean
 
         try {
             boolean contains;
-            if (useJavaRegex) {
+            if (USE_JAVA_REGEX) {
                 contains = isContainedWithJavaRegex(expression, sampleContentType);
             } else {
                 contains = isContainedWithOroRegex(expression, sampleContentType);
@@ -1367,7 +1368,7 @@ private String generateMatchUrl(HTTPSamplerBase sampler) {
     }
 
     private boolean matchesPatterns(String url, CollectionProperty patterns) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return matchesPatternsWithJavaRegex(url, patterns);
         }
         return matchesPatternsWithOroRegex(url, patterns);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 33ef490cbf9..f806f12ef7a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -322,7 +322,8 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     private static final boolean SEPARATE_CONTAINER =
             JMeterUtils.getPropDefault("httpsampler.separate.container", true); // $NON-NLS-1$
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     static {
         String[] parsers = JOrphanUtils.split(RESPONSE_PARSERS, " " , true);// returns empty array for null
@@ -1479,7 +1480,7 @@ private Predicate<URL> generateMatcherPredicate(String regex, String explanation
         if (StringUtils.isEmpty(regex)) {
             return s -> defaultAnswer;
         }
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             try {
                 java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regex);
                 return s -> pattern.matcher(s.toString()).matches();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index 088605fc086..917dea79ece 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -75,7 +75,8 @@ public class LogFilter implements Filter, Serializable {
 
     private static final Logger log = LoggerFactory.getLogger(LogFilter.class);
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     // protected members used by class to filter
 
@@ -336,7 +337,7 @@ protected boolean filterPattern(String text) {
      * @return <code>true</code> if text is included
      */
     protected boolean incPattern(String text) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return incPatternWithJavaRegex(text);
         }
         return incPatternWithOroRegex(text);
@@ -372,7 +373,7 @@ private boolean incPatternWithOroRegex(String text) {
      * @return <code>true</code> if text is excluded
      */
     protected boolean excPattern(String text) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return excPatternWithJavaRegex(text);
         }
         return excPatternWithOroRegex(text);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index 6388c8da58e..569f7fcbe54 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -45,7 +45,8 @@ public class SessionFilter implements Filter, Serializable, TestCloneable,Thread
     private static final long serialVersionUID = 233L;
     private static final Logger log = LoggerFactory.getLogger(SessionFilter.class);
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
 
     /**
@@ -91,7 +92,7 @@ protected boolean hasExcPattern(String text) {
     }
 
     protected String getIpAddress(String logLine) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getIpAddressWithJavaRegex(logLine);
         }
         return getIpAddressWithOroRegex(logLine);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index b51e4256805..9b4e0a38011 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -79,7 +79,8 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
 
     private final int item;
 
-    private boolean useJavaRegex = JMeterUtils.getPropDefault("jmeter.use_java_regex", false);
+    private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
+            "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     public TestHTTPSamplersAgainstHttpMirrorServer(String arg0) {
         super(arg0);
@@ -1183,7 +1184,7 @@ private void checkHeaderContentType(String requestHeaders, String contentType) {
     }
 
     private String getSentRequestHeaderValue(String requestHeaders, String headerName) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getSentRequestHeaderValueWithJavaRegex(requestHeaders, headerName);
         }
         return getSentRequestHeaderValueWithOroRegex(requestHeaders, headerName);
@@ -1216,7 +1217,7 @@ private String getSentRequestHeaderValueWithOroRegex(String requestHeaders, Stri
     }
 
     private boolean checkRegularExpression(String stringToCheck, String regularExpression) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return checkRegularExpressionWithJavaRegex(stringToCheck, regularExpression);
         }
         return checkRegularExpressionWithOroRegex(stringToCheck, regularExpression);
@@ -1238,7 +1239,7 @@ private boolean checkRegularExpressionWithOroRegex(String stringToCheck, String
     }
 
     private int getPositionOfBody(String stringToCheck) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getPositionOfBodyWithJavaRegex(stringToCheck);
         }
         return getPositionOfBodyWithOroRegex(stringToCheck);
@@ -1275,7 +1276,7 @@ private int getPositionOfBodyWithOroRegex(String stringToCheck) {
     }
 
     private String getBoundaryStringFromContentType(String requestHeaders) {
-        if (useJavaRegex) {
+        if (USE_JAVA_REGEX) {
             return getBoundaryStringFromContentTypeWithJavaRegex(requestHeaders);
         }
         return getBoundaryStringFromContentTypeWithOroRegex(requestHeaders);

From 619bd069e87249542bda6b66285e3b6364b5692d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 2 Mar 2022 21:31:54 +0100
Subject: [PATCH 0185/1037] Add documentation for the feature flag
 jmeter.regex.engine

---
 bin/jmeter.properties                     |  8 ++++++++
 xdocs/usermanual/properties_reference.xml | 11 +++++++++++
 xdocs/usermanual/regular_expressions.xml  |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 8996e4f185d..22994b683c2 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1127,6 +1127,14 @@ cookies=cookies
 # If you want to use Rhino on JDK8, set this property to true
 #javascript.use_rhino=false
 
+# Ability to switch out the old Oro Regex implementation with the JDK built-in implementation
+# Any value different to 'oro' will disable the Oro implementation and enable the JDK based.
+#jmeter.regex.engine=oro
+
+# We assist the JDK based Regex implementation by caching Pattern objects. The size of the
+# cache can be set with this setting. It can be disabled by setting it to '0'.
+#jmeter.regex.patterncache.size=1000
+
 # Number of milliseconds to wait for a thread to stop
 #jmeterengine.threadstop.wait=5000
 
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index fb53cd2e1e2..6ab39a7b44b 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1426,6 +1426,17 @@ JMETER-SERVER</source>
     If you want to use Rhino, set this value to <code>true</code></note>
     Defaults to: <code>false</code>
 </property>
+<property name="jmeter.regex.engine">
+    Ability to switch out the old Oro Regex implementation with the JDK built-in implementation.
+    Any value different to <code>oro</code> will disable the Oro implementation and enable the JDK based.
+    <note>We intend to switch the default to the JDK based one in a later version of JMeter.</note>
+    Defaults to: <code>oro</code>
+</property>
+<property name="jmeter.regex.patterncache.size">
+    We assist the JDK based Regex implementation by caching Pattern objects. The size of the
+    cache can be set with this setting. It can be disabled by setting it to <code>0</code>.
+    Defaults to: <code>1000</code>
+</property>
 <property name="jmeterengine.threadstop.wait">
     Number of milliseconds to wait for a thread to stop.<br/>
     Defaults to: <code>5000</code>
diff --git a/xdocs/usermanual/regular_expressions.xml b/xdocs/usermanual/regular_expressions.xml
index eafe5469a8e..2862f3ab36c 100644
--- a/xdocs/usermanual/regular_expressions.xml
+++ b/xdocs/usermanual/regular_expressions.xml
@@ -41,6 +41,8 @@ a summary of the pattern matching characters</a>
 There is also documentation on an older incarnation of the product at
 <a href="http://www.savarese.org/oro/docs/OROMatcher/index.html">OROMatcher User's guide</a>, which might prove useful.
 </p>
+<note>With JMeter version 5.5 the Regex implementation can be switched from Oro to the JDK based one by setting
+the JMeter property <code>jmeter.regex.engine</code> to some value different than <code>oro</code>.</note>
 <p>
 The pattern matching is very similar to the pattern matching in Perl.
 A full installation of Perl will include plenty of documentation on regular expressions - look for <code>perlrequick</code>,

From 37a7639c511e5d48d8e5a83534e8a5fba1ab1bdf Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 21:17:53 +0100
Subject: [PATCH 0186/1037] Add changelog entries for feature switch Oro/Java
 Regex

PR #700: Add a switch to replace Oro Regex implementation by the built-in Java one.

Bugzilla Id: 57672
Closes #700
---
 xdocs/changes.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f72c51cf411..7851173c76f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -79,6 +79,10 @@ however, the profile can't be updated while the test is running.
 <p>The new thread group is experimental in JMeter 5.5, so please feel free to submit your feedback.</p>
 <figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
 
+<p>Another experimental feature in JMeter 5.5 is the ability to replace the Oro based Regex implementation
+  by the built-in Java based one. To choose the Java based one, set the JMeter propert <code>jmeter.regex.engine</code>
+  to the value <code>java</code>.</p>
+
 <ch_title>Core improvements</ch_title>
 <p>Kotlin language is now used in some core classes and tests (e.g. Open Model Thread Group).
     JMeter is compiled with <code>apiTarget=1.5</code>, and it ships with <code>kotlin-stdlib</code> 1.6.
@@ -146,6 +150,7 @@ however, the profile can't be updated while the test is running.
   <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
   <li><bug>63620</bug><pr>694</pr>Fix GUI freeze when viewing response body with long line breaks</li>
   <li><pr>699</pr>Add documentation for Graphite Backend Listener. Contributed by Ji Hun (jihunkimkw at gmail.com)</li>
+  <li><bug>57672</bug><pr>700</pr>Add a switch (<code>jmeter.regex.engine</code>) to replace Oro Regex implementation by the built-in Java one.</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 12dd1a1620adccc7fa9576273c9f16edee120b80 Mon Sep 17 00:00:00 2001
From: Sampath Kumar Krishnasamy <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Tue, 8 Feb 2022 09:33:46 +0000
Subject: [PATCH 0187/1037] Used Junit 5 assertions API to keep it consistent
 with Junit 5 tests

Closes #697
---
 .../jorphan/gui/ObjectTableModelTest.java     |  6 +--
 .../jorphan/gui/ObjectTableSorterTest.java    |  6 +--
 .../jorphan/math/TestStatCalculator.java      |  4 +-
 .../jorphan/reflect/TestClassTools.java       |  6 +--
 .../apache/jorphan/util/TestConverter.java    |  4 +-
 .../apache/jorphan/util/TestJorphanUtils.java | 45 ++++++++++---------
 xdocs/changes.xml                             |  1 +
 7 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
index f79013b7d82..c3555a4e893 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
@@ -19,7 +19,7 @@
 
 import static java.lang.String.format;
 import static java.util.stream.IntStream.range;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.stream.IntStream;
@@ -238,10 +238,10 @@ private void assertModelRanges(IntStream... ranges) {
     }
 
     private void assertModel(String... as) {
-        assertEquals("model row count", as.length, model.getRowCount());
+        assertEquals(as.length, model.getRowCount(), "model row count");
 
         for (int row = 0; row < as.length; row++) {
-            assertEquals(format("model[%d,0]", row), as[row], model.getValueAt(row, 0));
+            assertEquals(as[row], model.getValueAt(row, 0), format("model[%d,0]", row));
         }
     }
 
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
index 855a0933b3d..f776065fcc9 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
@@ -28,8 +28,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.AbstractMap;
@@ -125,7 +125,7 @@ public void fixLastRowWithDescendingValue() {
     @Test
     public void customKeyOrder() {
         HashMap<String, Integer> customKeyOrder = Stream.of("a", "c", "b", "d")
-                .reduce(new HashMap<String, Integer>(), (map, key) -> {
+                .reduce(new HashMap<>(), (map, key) -> {
                     map.put(key, map.size());
                     return map;
                 }, (a, b) -> a);
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java b/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
index c0cc5d6eb60..19877c25872 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
@@ -17,8 +17,8 @@
 
 package org.apache.jorphan.math;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java b/src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java
index 2a7cc5c5ffa..1da1b7ae886 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java
@@ -17,9 +17,9 @@
 
 package org.apache.jorphan.reflect;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jorphan.util.JMeterException;
 import org.junit.jupiter.api.Test;
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
index 4d812098c88..2165b509924 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
@@ -17,8 +17,8 @@
 
 package org.apache.jorphan.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.text.DateFormat;
 import java.util.Calendar;
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
index a17369ac3f9..f73985cba50 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
@@ -18,15 +18,16 @@
 package org.apache.jorphan.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.nio.charset.StandardCharsets;
 
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
-import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -253,7 +254,7 @@ public void testTrim() {
 
     @Test
     public void testGetByteArraySlice() throws Exception {
-        Assert.assertArrayEquals(new byte[]{1, 2},
+        assertArrayEquals(new byte[]{1, 2},
                 JOrphanUtils.getByteArraySlice(new byte[]{0, 1, 2, 3}, 1, 2));
     }
 
@@ -280,16 +281,16 @@ public void testbaToByte() throws Exception {
     }
 
     private void assertEqualsArray(byte[] expected, byte[] actual) {
-        assertEquals("arrays must be same length", expected.length, actual.length);
+        assertEquals(expected.length, actual.length, "arrays must be same length");
         for (int i = 0; i < expected.length; i++) {
-            assertEquals("values must be the same for index: " + i, expected[i], actual[i]);
+            assertEquals(expected[i], actual[i], "values must be the same for index: " + i);
         }
     }
 
     @Test
     public void testNullifyIfEmptyTrimmed() {
-        Assert.assertNull(JOrphanUtils.nullifyIfEmptyTrimmed(null));
-        Assert.assertNull(JOrphanUtils.nullifyIfEmptyTrimmed("\u0001"));
+        assertNull(JOrphanUtils.nullifyIfEmptyTrimmed(null));
+        assertNull(JOrphanUtils.nullifyIfEmptyTrimmed("\u0001"));
         assertEquals("1234", JOrphanUtils.nullifyIfEmptyTrimmed("1234"));
     }
 
@@ -334,37 +335,37 @@ public void testBooleanToSTRING() {
     @Test
     public void testReplaceAllWithRegexWithSearchValueContainedInReplaceValue() {
         // Bug 61054
-        Assert.assertArrayEquals(new Object[]{"abcd", 1},
+        assertArrayEquals(new Object[]{"abcd", 1},
                 JOrphanUtils.replaceAllWithRegex("abc", "abc", "abcd", true));
     }
 
     @Test
     public void testReplaceAllWithRegex() {
-        Assert.assertArrayEquals(new Object[]{"toto", 0},
+        assertArrayEquals(new Object[]{"toto", 0},
                 JOrphanUtils.replaceAllWithRegex("toto", "ti", "ta", true));
-        Assert.assertArrayEquals(new Object[]{"toto", 0},
+        assertArrayEquals(new Object[]{"toto", 0},
                 JOrphanUtils.replaceAllWithRegex("toto", "TO", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TITI", 2},
+        assertArrayEquals(new Object[]{"TITI", 2},
                 JOrphanUtils.replaceAllWithRegex("toto", "TO", "TI", false));
-        Assert.assertArrayEquals(new Object[]{"TITI", 2},
+        assertArrayEquals(new Object[]{"TITI", 2},
                 JOrphanUtils.replaceAllWithRegex("toto", "to", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TITIti", 2},
+        assertArrayEquals(new Object[]{"TITIti", 2},
                 JOrphanUtils.replaceAllWithRegex("tototi", "to", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TOTIti", 1},
+        assertArrayEquals(new Object[]{"TOTIti", 1},
                 JOrphanUtils.replaceAllWithRegex("TOtoti", "to", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TOTI", 1},
+        assertArrayEquals(new Object[]{"TOTI", 1},
                 JOrphanUtils.replaceAllWithRegex("TOtoti", "to.*", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TOTI", 1},
+        assertArrayEquals(new Object[]{"TOTI", 1},
                 JOrphanUtils.replaceAllWithRegex("TOtoti", "to.*ti", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TOTITITITIaTITITIti", 7},
+        assertArrayEquals(new Object[]{"TOTITITITIaTITITIti", 7},
                 JOrphanUtils.replaceAllWithRegex("TO1232a123ti", "[0-9]", "TI", true));
-        Assert.assertArrayEquals(new Object[]{"TOTIaTIti", 2},
+        assertArrayEquals(new Object[]{"TOTIaTIti", 2},
                 JOrphanUtils.replaceAllWithRegex("TO1232a123ti", "[0-9]+", "TI", true));
 
-        Assert.assertArrayEquals(new Object[]{"TO${var}2a${var}ti", 2},
+        assertArrayEquals(new Object[]{"TO${var}2a${var}ti", 2},
                 JOrphanUtils.replaceAllWithRegex("TO1232a123ti", "123", "${var}", true));
 
-        Assert.assertArrayEquals(new Object[]{"TO${var}2a${var}ti${var2}", 2},
+        assertArrayEquals(new Object[]{"TO${var}2a${var}ti${var2}", 2},
                 JOrphanUtils.replaceAllWithRegex("TO1232a123ti${var2}", "123", "${var}", true));
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7851173c76f..fe3250952ed 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -208,6 +208,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 935de23483c717bbc950997f8c99ed4bf367ebe1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 5 Mar 2022 21:41:27 +0100
Subject: [PATCH 0188/1037] Use ./gradlew autostyleApply to get rid of unwanted
 whitespace and ordering

---
 .../test/java/org/apache/jorphan/util/TestJorphanUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
index f73985cba50..87ae723fb73 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
@@ -18,11 +18,11 @@
 package org.apache.jorphan.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 

From c33c456d5cb415e445670ec74b0b2be1afee6ed5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 6 Mar 2022 11:30:15 +0100
Subject: [PATCH 0189/1037] Correct typos and markup

---
 xdocs/changes.xml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index fe3250952ed..5f9dbeeedc4 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -22,6 +22,7 @@
 <!ENTITY rarr     "&#x02192;" >
 <!ENTITY vellip   "&#x022EE;" >
 <!ENTITY nbsp     "&#x00A0;" >
+<!ENTITY ndash    "&#x02013;" >
 ]>
 <document>
 <properties>
@@ -80,7 +81,7 @@ however, the profile can't be updated while the test is running.
 <figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
 
 <p>Another experimental feature in JMeter 5.5 is the ability to replace the Oro based Regex implementation
-  by the built-in Java based one. To choose the Java based one, set the JMeter propert <code>jmeter.regex.engine</code>
+  by the built-in Java based one. To choose the Java based one, set the JMeter property <code>jmeter.regex.engine</code>
   to the value <code>java</code>.</p>
 
 <ch_title>Core improvements</ch_title>
@@ -102,7 +103,7 @@ however, the profile can't be updated while the test is running.
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
   <li><bug>65027</bug>Detect mime-type for files automatically when adding files to HTTP Sampler</li>
-  <li><bug>65020</bug>HTTP Sampler/Files upload tab - add missing buttons</li>
+  <li><bug>65020</bug>HTTP Sampler/Files upload tab &ndash; add missing buttons</li>
   <li><pr>650</pr>HTTP Sampler timestamp fix when exception is caught. Contributed by Konstantin Kalinin (konstantin at kkalinin.pro)</li>
   <li><bug>65328</bug><pr>666</pr>HTTP 308 Permanent Redirect is not supported. Contributed by
     Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
@@ -220,14 +221,14 @@ however, the profile can't be updated while the test is running.
   <li><bug>65310</bug>Don't let users override <code>multipart/form-data</code> <code>content-type</code>
     header in HC4 sampler.</li>
   <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
-  <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align ssl properties between Java and HC4 impl</li>
+  <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align SSL properties between Java and HC4 implementation</li>
   <li><bug>65108</bug>Support JMeter variables in <a href="./usermanual/component_reference.html#HTTP_Request">GraphQL HTTP Request</a></li>
-  <li><bug>65864</bug>Catch NullPointerException from JSoup when recording a test plan</li>
+  <li><bug>65864</bug>Catch <code>NullPointerException</code> from JSoup when recording a test plan</li>
 </ul>
 
 <h3>Other Samplers</h3>
 <ul>
-  <li><bug>65152</bug>OS Process Sampler - Cannot <code>Add from Clipboard</code> Command parameters</li>
+  <li><bug>65152</bug>OS Process Sampler &ndash; Cannot <code>Add from Clipboard</code> Command parameters</li>
   <li><pr>638</pr>Bolt Sampler: fixed error displaying results when "Record Query Results" is enabled. Contributed by
         David Pecollet (david.pecollet at gmail.com)</li>
 </ul>
@@ -249,8 +250,8 @@ however, the profile can't be updated while the test is running.
   <li><bug>65259</bug>JMESPathExtractor Attribute <code>Match No.</code> Required</li>
   <li><bug>65269</bug>JSON Extractor and JSON JMESPath Extractor ignore sub-samples</li>
   <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
-  <li><bug>65681</bug>Use default values for null values when extracting with JSONPostProcessor</li>
-  <li>Allow setters in ConstantThroughputTimer to updating the values during the run time</li>
+  <li><bug>65681</bug>Use default values for <code>null</code> values when extracting with JSONPostProcessor</li>
+  <li>Allow setters in ConstantThroughputTimer to update the values during run time</li>
   <li><bug>65782</bug>Use correct message format for MessageFormat in HTMLAssertion</li>
   <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
 </ul>
@@ -269,23 +270,23 @@ however, the profile can't be updated while the test is running.
 
 <h3>Documentation</h3>
 <ul>
+  <li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at gmail.com)</li>
 </ul>
 
 <h3>General</h3>
 <ul>
-  <li><bug>64318</bug>DNS Cache Manager - custom DNS resolver does not use system resolver by default</li>
+  <li><bug>64318</bug>DNS Cache Manager &ndash; custom DNS resolver does not use system resolver by default</li>
   <li><pr>641</pr><pr>698</pr>Updated xercesImpl to 2.12.2 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
   <li><pr>645</pr>Add escaping for new lines in <code>AbstractInfluxdbMetricsSender</code>. Contributed by David Getzlaff (david.getzlaff at t-systems.com>)</li>
   <li><bug>65198</bug>Can't copy generated function from FunctionHelper</li>
-  <li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at gmail.com)</li>
   <li><pr>661</pr>Fix wording in doc. Contributed by BugKing (wangzhen at fit2cloud.com)</li>
   <li><pr>664</pr>Allow whitespace in path. Contributed by Till Neunast (github.com/tilln)</li>
   <li><bug>65270</bug>POST <code>application/x-www-form-urlencoded</code> cURL code generated from Postman is not imported correctly</li>
-  <li>Silence warnings of missing font Arial on startup under linux</li>
-  <li><bug>65300</bug>IllegalAccessError when opening file dialog with Java 16</li>
+  <li>Silence warnings of missing font Arial on startup under Linux</li>
+  <li><bug>65300</bug><code>IllegalAccessError</code> when opening file dialog with Java 16</li>
   <li><bug>65336</bug>Blank labels when different elements had the same name</li>
   <li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
-  <li><bug>63914</bug>Simplify :src:dist:clean configuration, ensure /lib/junit/test.jar is removed on clean</li>
+  <li><bug>63914</bug>Simplify <code>:src:dist:clean</code> configuration, ensure <code>/lib/junit/test.jar</code> is removed on clean</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 2ca7cf98cba881298220f4ce06445ff7883f5ba9 Mon Sep 17 00:00:00 2001
From: Peter Paul Bakker <peter.paul.bakker@stokpop.nl>
Date: Mon, 17 Jan 2022 16:15:05 +0100
Subject: [PATCH 0190/1037] Keep JSyntaxTextArea text value for use in headless
 mode

Closes #696
---
 .../jmeter/gui/util/JSyntaxTextArea.java      | 11 +++++-
 .../jmeter/gui/util/JSyntaxTextAreaTest.java  | 36 +++++++++++++++++--
 xdocs/changes.xml                             |  2 ++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
index 4b6d62976f3..b0bd5c02442 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
@@ -101,6 +101,7 @@ public static JSyntaxTextArea getInstance(int rows, int cols, boolean disableUnd
             // Allow override for unit testing only
             if ("true".equals(System.getProperty("java.awt.headless"))) { // $NON-NLS-1$ $NON-NLS-2$
                 return new JSyntaxTextArea(disableUndo) {
+                    private String savedText = "";
                     private static final long serialVersionUID = 1L;
                     @Override
                     protected void init() {
@@ -118,7 +119,15 @@ public void setCaretPosition(int b) { }
                     @Override
                     public void discardAllEdits() { }
                     @Override
-                    public void setText(String t) { }
+                    public void setText(String t) {
+                        savedText = t;
+                    }
+
+                    @Override
+                    public String getText() {
+                        return savedText;
+                    }
+
                     @Override
                     public boolean isCodeFoldingEnabled(){ return true; }
                 };
diff --git a/src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java b/src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java
index 149edc3e560..5e4d5cc2367 100644
--- a/src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.gui.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.awt.HeadlessException;
 import java.lang.reflect.Field;
@@ -30,7 +30,11 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
+// should not run in parallel due to using a System property that can impact
+// other tests
+@Isolated
 public class JSyntaxTextAreaTest extends JMeterTestCase {
 
     @Test
@@ -41,7 +45,33 @@ public void testSetLanguage() {
             textArea.setLanguage(null);
             assertEquals(SyntaxConstants.SYNTAX_STYLE_NONE, textArea.getSyntaxEditingStyle());
         } catch (HeadlessException he) {
-            // Does not work in headless mode
+            // Does not work in headless mode, which depends on value of java.awt.headless property
+            // and the OS (e.g. might work on MacOS and not on Linux due to missing X11).
+            System.out.println("WARNING for JSyntaxTextAreaTest.testSetLanguage test: does not work in headless mode");
+        }
+    }
+
+    @Test
+    public void testHeadlessGetText() {
+        String key = "java.awt.headless";
+        String initialValue = System.getProperty(key);
+        try {
+            System.setProperty(key, "true");
+            // getInstance() returns anonymous class with some overridden methods
+            // to avoid errors due to 'java.awt.headless=true'.
+            // E.g. it should not throw a HeadlessException.
+            JSyntaxTextArea textArea = JSyntaxTextArea.getInstance(10,20);
+
+            String myText = "my text";
+            textArea.setText(myText);
+            assertEquals(myText, textArea.getText());
+        } finally {
+            if (initialValue != null) {
+                System.setProperty(key, initialValue);
+            }
+            else {
+                System.clearProperty(key);
+            }
         }
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5f9dbeeedc4..2a63a540610 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -287,6 +287,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65336</bug>Blank labels when different elements had the same name</li>
   <li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
   <li><bug>63914</bug>Simplify <code>:src:dist:clean</code> configuration, ensure <code>/lib/junit/test.jar</code> is removed on clean</li>
+  <li><pr>696</pr>Keep JSyntaxTextArea text value for use in headless mode. Contributed by Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -313,6 +314,7 @@ however, the profile can't be updated while the test is running.
   <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
   <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li>Ji Hun (jihunkimkw at gmail.com)</li>
+  <li>Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From e421d794d7c53771e309003506520d33bffbb724 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 9 Mar 2022 17:40:08 +0100
Subject: [PATCH 0191/1037] Markup changes and insertion of titles for new and
 noteworthy stuff

---
 xdocs/changes.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2a63a540610..4202954fee6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -64,6 +64,8 @@ Summary
 
 <p>JMeter 5.5 ships with log4j2 2.17.2</p>
 
+<ch_title>Open Model Thread Group</ch_title>
+
 <p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
 allows creating load profiles with variable load.</p>
 
@@ -71,7 +73,7 @@ allows creating load profiles with variable load.</p>
 you could previously use <code>Thread Group + Timer</code> combinations. However, then you need to compute
 the expected number of threads, ensure they are created only when needed, and so on.</p>
 
-<p>With <code>Open Model Thread Group</code> you can configure the same load profile as <code>rate(0/sec) random_arrivals(1 minute) rate(10/sec)</code>.
+<p>With <code>Open Model Thread Group</code> you can configure the same load profile as <code>rate(0/sec) random_arrivals(1&nbsp;minute) rate(10/sec)</code>.
 The thread group would spawn threads as needed to drive the configured load.
 The load profile can use properties, so you can launch the same script with slightly different load levels,
 however, the profile can't be updated while the test is running.
@@ -80,6 +82,8 @@ however, the profile can't be updated while the test is running.
 <p>The new thread group is experimental in JMeter 5.5, so please feel free to submit your feedback.</p>
 <figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
 
+<ch_title>Preparing the deprecation of Oro Regex usage</ch_title>
+
 <p>Another experimental feature in JMeter 5.5 is the ability to replace the Oro based Regex implementation
   by the built-in Java based one. To choose the Java based one, set the JMeter property <code>jmeter.regex.engine</code>
   to the value <code>java</code>.</p>

From 8ecf734012ddc159453d8f94a9242c0fcecc8a77 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 9 Mar 2022 17:49:02 +0100
Subject: [PATCH 0192/1037] Hide the 'go to top' button in print mode

---
 xdocs/css/new-style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xdocs/css/new-style.css b/xdocs/css/new-style.css
index 3df19e20024..ee03c4e9e30 100644
--- a/xdocs/css/new-style.css
+++ b/xdocs/css/new-style.css
@@ -623,6 +623,10 @@ table {
     display: none;
   }
 
+  #topButton {
+    display: none;
+  }
+
   #content {
     display: block;
     width: 70rem;

From 1efebb753d52b90c7e569534d7b4518dbaa60b76 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sat, 12 Mar 2022 15:27:44 +0100
Subject: [PATCH 0193/1037] prepare new version 5.5

---
 NOTICE                              | 2 +-
 xdocs/download_jmeter.xml           | 2 +-
 xdocs/stylesheets/website-style.xsl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NOTICE b/NOTICE
index 0f5314e48c8..a1a8d333582 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache JMeter
-Copyright 1998-2021 The Apache Software Foundation
+Copyright 1998-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 1d76529cf91..448648f793b 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.4.1'>
+<!ENTITY release '5.5'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
 
diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index b44ee857815..7cc19339001 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -38,7 +38,7 @@
   <xsl:param name="cssdir" select="concat($relative-path, '/css')" />
   <xsl:param name="apidir" select="concat($relative-path, '/api')" />
   <xsl:param name="jakarta-site" select="'https://jakarta.apache.org'" />
-  <xsl:param name="year" select="'2021'" />
+  <xsl:param name="year" select="'2022'" />
   <xsl:param name="max-img-width" select="'600'" />
 
   <!-- Output method -->

From 53a992c8179f0f64fe1993df34bda6594856cf5e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 14 Mar 2022 20:15:27 +0100
Subject: [PATCH 0194/1037] Correct wording in JMESPath JSON extractor

---
 xdocs/usermanual/component_reference.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 00b8ed21cda..bd94ec9f840 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6169,8 +6169,7 @@ where "<code>uri-for-namespace</code>" is the uri for the "<code>mynamespace</co
 
 <component name="JSON JMESPath Extractor" index="&sect-num;.8.4" anchor="JSON_JMESPath_Extractor" width="896" height="205" screenshot="extractor/jmespath_extractor.png">
     <description>This test element allows the user to extract value(s) from
-        structured response - XML or (X)HTML - using JMESPath
-        query language.
+        JSON response using JMESPath query language.
    </description>
    <note>In the XPATH Extractor we support to extract multiple xpaths at the same time, but in JMES Extractor only
    one JMES Expression can be entered at a time.

From cc61e6db5a8d61af1d586745b131b6cf03f0ba00 Mon Sep 17 00:00:00 2001
From: NaveenKumar Namachivayam <catch.nkn@gmail.com>
Date: Tue, 29 Mar 2022 21:00:47 -0400
Subject: [PATCH 0195/1037] Use current screenshot for save-to-file listener in
 documentation

Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)
Used Gimp to make new image less wide and used pngquant to make it
use less bytes.

Closes #707
Bugzilla Id: 65983
---
 xdocs/changes.xml                       |   2 ++
 xdocs/images/screenshots/savetofile.png | Bin 13024 -> 9705 bytes
 2 files changed, 2 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4202954fee6..77a0c326a17 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -214,6 +214,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -319,6 +320,7 @@ however, the profile can't be updated while the test is running.
   <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li>Ji Hun (jihunkimkw at gmail.com)</li>
   <li>Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
+  <li>NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/images/screenshots/savetofile.png b/xdocs/images/screenshots/savetofile.png
index fb6bae88e728167d621b7178dc8a6b2ce0b01898..5552c12cca48a72671e8aec3ba444d2f624c0d4b 100644
GIT binary patch
literal 9705
zcmZvB1z1#1_x}Y{Km?=&1XQFYB^GfB1*8S(kXVuK(xpKu1wjF6kS<xe*<}GK>26rM
z<I)|!<@?6-{-5Xn%$>M1XU?2GbME<^nf>}kS(f<r{o4Ql5X;L+s{sHW8~|`$5a3~Z
z*oi;TU@JlgIbCM}AZfbJI8mG=bO3ON%3VXpMeQB@k%N=HnWc^CBNsOZ(?_PRmSzCp
zI-VbA>BRK3!2fEG()kAYj5~b+8F&jk-b>XmG^w2W*s5cz_<Ii5Sl&bnd2w|GpY%EI
z>n{n(9h`JJJa4*};3BSZb!<5@Ju`oBbjs1Z?sc$Q6T<s208W>7<bUZ(nzX)Z`={f<
zJ5eL}0h;N+a0R_nk}}@?C+GkpSI{x<{^dy0RziG1tHVP*NEEXyw#~nI$#9ew^XhVE
zs<!Sfk)ht#Pz@97H$E5nq(p<>ub^PN(NKL=%IYaSgMHd%#f>0Q25@oe?1;qOX}5#z
zsPD`YQz`Mx=u}Kn;+TJ0e6I1Kz5l-XvJsDWWieWhxkuRH^3)~q>?l#QXYBjHLF|qN
zT42rTqpNP<C%l+-A@02==d9u}>qD-Z(-+JO9V!y8UA>?0M$Jp!;oNulgT|Q0#?qK7
z&Kj5m8;<<GXURV_N4ZHAMrm79MvmZ^&|T3mv?UxtZ;smsws&*#Y2bzgaGo2XCgH+9
zdrr$bC@DU3^3!dCA|1o`fv>tR`P+kcCmj`I{EQ6Y#}~+^$C_VZHIw=xu%r3nCb?Pe
z%KhL{ex996_SBj78tVF28%cbu>}1<<8>Aw~kJTjWzefQdxTr(<zr2u>zbB)h(KQ#W
zQCu6R{zphF!lbwZM)655zWi=NRuZf^_HQydr^sMrR;*fkZpNCLqL_7<$YP=*<j49e
zMXuZhH3jbc{og{v8qVD1!&)AZSumJYb(Gdy>)McYn?c<?0kpH}-(E7=`))r~W$C;k
z#09zq_qa;CA!iYpM6o(<QJUIsz3?kv1~b6N-C_*j6Bj?MWmQC17u1!-Hupzzrc^KX
zPhSoGVGyc*Y&zd=Jy^8{?0I~JIYe-oNh=vYnrnXiLNcVebL4Ki&H|Sin($Tl4W`KE
zmV6i)lfNUrJR7QIi`z*eI6?71)-kf~Rk!ZSC3U#7|CaOQ<=t{qFFQjr4~^85LCzs~
ziG`tZy6MO0K4%8TLFV-C-yI<N_=7y*sYt&9Pr-=2{a~`-Z{a{LbC<sMNRHk2QI!_)
zyKGxp<m{TPGa8!}-Td9{URh5~PcUkB#CwVlZ6V(_&iLS5!H|<UqO)6d<<2RYvR_EH
zRvjrzEc(B_*V5M?_1=mldRs(Z+p~=fXxT~JH#X2>e(3NaBPr{?vJLvTGH;5dPC}qz
zL+2DehQqW>%TuS^LzIT(*_PJa8o~RrfDUaNgWF#5e_ta;IfmaX_uaPX9MHCsWiI%-
zm=3OF7B%PKm=~r6QDqGCu{wC|n)KzSMt@i$+*D#PkCcBz>St`rxM8t9&Y5DR|0r>x
zV%YE_msd0D4<_BXh1T(x6keZdJI>BFv4i#O7E4B&$E(jpU+_9e6O_M}70I@PVA4xs
z1}055U6U~4;+h$YqptPgGm$OB?ezn+?j~j}e*PEnIs9z0^wX7HvIk^)deeDYWLx;K
z8l*oi`K1sha~t1{rs@_W)r-P~+8&<L9};bu4u^zN#(|l4o)}uExn^_A^C%c4(Mwd1
zFmk*9z{%mJva426aMWwNlN?XP%}KjXI;d8r_bEv$%y{R`wgv5vY<gLIl2qOzO5Yz%
zlYi=z)|0%x6@)SKGPu4W!O5|{pYT~XDQ#J9e;H48yru}}g;_X_tRi31lJMf#g<fPl
zBjZJC8_m`mXR2R`j>Nsqvve%O-NQQK`f^<Z67{SGidDGX3~WNqEhzJ+YqCOJ!RF()
zvUgDh(w^B};(c4Va$dtCWfXtQG+k>@)du2&v$?&&>v|JocKR_+Es#gZ3I7|o^D=KL
z9L-+Seu;3BK|dDzK42XCj9Xyiey_993c6!rv~vBxcK0lG%WcZXXxK~Wu(G2D?7ZkI
z*;+O{_SQWr?7pZ%oJ}_&++}I0<0ZKWZm98fMYB&z8%a^yCHalBAN-9k?ax3Q*{D1W
zrP#eeHD1<nuiXV9ll+^~J9Q#if%{bB9U1fKeO27SbY-KZIHeh)nbd{6+?}-dM|a>`
zPoI5DQ4N&|*OS1tVV%n2PA=pB_EABg!(v&76*sdl!6ucDQ?3HGnWsSNH0hr{&<oFG
z`E8qHTY6wAZxLg8YvCRp?{hA4d}+O23bYgh^n>4b<NK=L(@k+Rly2Qq6n{TJp`uEv
zTJk*4v6R2Jmm=Mn_H9|;Xvk-RB86epZMu->AKLp~aOy8nt<d33LY?a?tJb9q>2q;w
zbHv9lBu@dYfb>n}?Gzz~ZS&+I#s~`%-?9?*)F4@x`--1UR$cbK^dwH{NIo)F+P8!g
zJiftazl}BxinHxq%qtufgg;H}X40gg|M{e{maRx)_fTipub3kL$4l#nOtfG9I5+0c
z<B&Yv#iQR~Zj>rEc%u*0KiM&}+h#}5wM-Z-d&MtZ3Vy$Ha@I*oF{J`Op9tL27N{HR
zt?d-hn}iv-sr|ft@N1IPqM0~Sbf1ezbZUQ>mq%6<nCCbDd=<`Jpwr!CpqN!iq9=M%
zKxj72lu<3kv?}vP$Kt-hM^+Ou180U6RuPld^k1rXNIp*I3q`sXOZ8c*5Ik6u7|>Cr
z7o!sw<hb*hGtr7tNWBYDwtR2D@g=^gYyu)r9S{BDv2kR1LUNj)3CCDuE75HnThar`
zAe-OWAZ>*biR?=aso>Q=Jjbx?o3Dt;wc1MuMBoY<{DL&gZri~%Sp@k`axEF`H$Ju8
z7*u5#l-?<j8MV%qR%M9#HeD1_%7TOclTzH=-v9M-X)JDOlf8}_4)peeubDA>^n#vb
z)K=dD>YHm_m`QsVZc)B!vGZ(A>vDY)G!%q08K%%dOu)-J%dopLTESY2%Yx9kv8dwW
zP3bFU$Yk8gcZ<W7+`^fho{>h?*Z$3iN6h)>%pbxR9{Z0`pbF5Bmbj>9Z;s>?{N(2P
zc4lSH|1OC5F8{*k)=EO0F9a;5M6iLsxyCM>pO)#Xdr1MQK_^bWT%8|CfyYuerzW$e
z5B<TEqEA$k+;?9Ek=SHqj+MKlt0a;YY76p7zabMPpbZY_5+1u1v;ljz>&QAtK#%z7
zo#V|+g#S`s_%4b96Ni8jJ6%}#{w;Uq!IXUzEv3~b<6R*?hE7;&r1X`pV7h|AdyOj@
z-(_^}t8J&LqdDadA8E<vh|?tM&c>~vA$~1~ZFj)wJ1_I&IgX@{0yw}s)m_InO_9V~
zmFVMks{fW%N~xxO`Q(3lSIWE_%Na7>UC!zV<{N5vP^zWZ`sF2{t)AITJ<m{zi>-J~
zncx_^HgnsT^@}Sc_=S@}TfzfNU)p^-N+#-M+L%SkcMPQD{s;o5RI{13YC5w@xyu1w
z4i1;L4FTR`+>9oAG2qNEtb*-<LC)Zpa4yU{Rvmj4Xv+4?lvBNMP|El>pN!c)M(Pe6
z5{}pI(tbYv^j3e&)kVcp@&7g!<Fi?WcpKv%m0FX(KDzTn`xAu)1u@fv56h#D*YP=b
zJ3i@;yo(K7XS_MosSD%jlJ;M)4$D%04?OgHX*zKkJT`jwrjXK<;tD-X;OW|raE8z&
zhX=|G%0V^@7Mop+cjO;QKK3^8kbZZcaJ51UV3(CnU%1^Pa{Hd!CJw6%B`h`L$surF
z)T$^cDn9Dr|1dw^4o1hWp+@nTu94_GAJzl0fWK*6ezz4gfBC%g!s_jn`&Ya8ucJQ(
zUsQ=ENQF1ZaNt@kQM&gi5boy{D|^(a-wv+q!!<47%aLnGq@fufTi*9k6ukE(>zNVb
zqkWw5J=!Q7_B{oi*|M~ZX>xYSZhoeZc_R03Do1}MTzOn%_{`(ZO;ta&8&Py7TCG1`
z{-J?B>Xjt?38WHE{j4|)JTb{NTd1Qt;_G%GdBxvrJ>!idD4Ibd<bZ&6NV;rKSjj~@
z3PqN*$*R3Cu)3Xid|x0is3~tKVD(WF9ph`gIgMB=I(k0+po~a~X)cQo=ny9yg4CYg
z1<sYbrEsgO0Lg%tEjW;8?TLW_vyDe`v+6A!P0+`{o-OBH&@?t-567TKV6)w5S=@Hj
z8@+t=wk8=oxrp9c_VBLDJQE)A#`ItGmmhwyu=Rk{Y`mi=B0AyNr_zAHDoNXjLJjgp
zOCNfW7@Qqk*>+t}-*Ve7N-r^%!X6<K-Y99j+TPyA9w00&Ed>Mwz^*_DB(Mtvudc50
z@=GTtCp$X=U<eQaf)D_>9sm&lBoGDwAOeP^1ppWTLtKrAVJATVn21Oic+CRK4>Epr
zg@6GN0MfaYhb79x@&O<a7z{gE1OO_ouCObGjbFjA6Cp4J4BHz90A?@<Fg6}`byX2i
z7=S&c<Zb1RhhfP@%qp%rw>qvW%tQb)z^uaB+WPSDP)<$`hUgLr8!sOZt1ttwV$RLY
z!61R1c}7^4LXJ*YQWy*oc+DSjbu|uy!N#yG01+4hf#u2r2>`eiU=T=XO&9{~3KJ12
zzp4-sF@psLb_K#j0FeqaGqbSqs;a7h&O9>_kuK~n3k(Fix<t&(j3NTM5HPc_u<`M*
z!T<<XJ~Oilp@2f{jEbv@Fzmu2K$wUbc5O2etZX7ic^!cWto{(8V-@2SW<miGV^`x9
z*d;|oDzMsvKoDJld3i?TR~3MektzT@#cG33rIix4007hj^3pFgT*o(()}7zV(gyYP
zzo%u^Epg$R2)7w4o~W@au#13L_Ls>I^aG5RpGZ>m+Z|}ld}kr`cN&Go>yx{-kTIpp
zE5^D`lyBXBt+Mxz9fVVyt)BggI?P_6BLq6>P<ZuF0OgTe7B${mnMdWVQ1ln`!9yW8
zzh(4<zx9|8I)xb>5PVzC+%|ma2QTWy2)$+SnkZ!8Rjeu5nX6TVFI)kGP#qg^ykIbs
zvnFk5^1b?p_<Yo#uUu1xY=p9B{K&CW6pN85N#W4JL!*4T&9cVKu~esmp{esf0%x=3
z?j8pNLkj2TK*&<kS=80*=I3m|<)O4f6Z=%CJ=p_)X0Nx?Lq2PTRuvE>cut+%NUlve
zc_2~gp8Cm2fO+?N(vF?5x3}*rBzk>0s?|{6^1~^^#OeVwoU4V{N3hf@#q-mHpFyW8
zZipdA?8+y(=jU^#1`SA+`DJ_^LC}Oym2+{T)}<6PY0n&|E3cYlVbJ_#=KEUPQtD9V
zbg}n76ay93k5BSgUM7XaHz225dq|61F>P}SZ-+cjewW);>geBT`^gy?-Kp;ty4y`0
zWA=TUN7T6ws-*?%s~w23y9nbo(#^K#-3i99cnz4#$O@DmhKJlginFT{gj(s&iwpQH
zNhZ@uNYtn0=egLlJvEe*AFxd}=pV!jX#Qc>!<9IiE@AtHcWbD^9bI5tOVk)JX1LQ|
zqj1^T{2^-P1m|8Sv{b*)gh4&mNO5TOFhej7r>@;XQN7eui)Ybd!Vqkurt|u<PB07=
zPNXys%B!ARCpZyk#c0l9RnR2vtf#Yre{BVLzSOe}zzhR`!NETNQztTjXhI;;$sNOu
zSMUGNzzhSHB56KM4a_$hUCPD}nMor2q#W}^-J|j{OYI@C*FAyVt=YCZ<g62e7*xN`
zfdPa)MIraoTa+-^ck$DCIiKNaiDxX}f)dt#?t;<YBTq4=tewoYF0Z{t)rBHI8Iuda
z@3(p!=`_`tDkP}Ruk3s(a8_IT#(X+k;)O8RufB||TQlpUuW~Q)p5<Lai=dKvdiBIk
zB&pxTkt^G@PZ4Kc9vK;c=VLhC<?tx)u3_ZIR%UWrq47K<^?FP5SCmK2R?T`LvV(Mb
zpfW8!S8-{nJIeO#xaQ;TGO72+D$nJ$JvzNg<huP@oA$!?o@dLag9EuNt{{qu^sFAw
zwH^`&bgg2Hcc#78Prdwj{L{L%;P!cRn1Ob6dY8b6lXgWp<JB`kc&5(S`;Nn%Jv!}t
zKG`1h&&$0})wSCiB+CMy-=SZ9U?apB9GT-ko5rw=X)6vfI7d;V687DD3d|pfK?0OQ
zb{6b?F3&#Z$h7=C+FNsRnP2n60V^)v3D2i2Ox1`vE-;jn+-pLbb!gNu6CK!%v{1bs
zG{0<Me`iyb+0mab;Z<hi-c%&+w7mAo3w0T?$R=^A_Pi&%qK6VJNNBujH>V$``q^t<
zfTURV%94QAiyU<~WgSJiiw#02J}7_mItt+O6xCR(OqHn~ezP{156|2gEEyXjH$77*
zEigV)+Iu1`E`_cQ>Z=KcI&RxR1%Cm{qewTjUH4~#YcoOJzBZ<R8C3Wl;2`7t0Pq!k
zinTZF^N-zK*GSdvh&zDDCV*1818kE3Ahx*90Qk>KHxh1}sbP-W8tCOph`~`>G%(v8
z<sI1}frVjeO-n5YsLHjDlJPap^;29{i8HOHeyP#va&+GVfvjCSbp?Y`O~sOJw--Zy
zmT@(;tyopZo8;EpV%A;p`SRcu9)hn;YN}&=c;xr1UwD`)g$cgRBqjU<_02_1*nitm
z&QS7$XYt(YY=rvK4r|(ti<d4WUFbgor_98>psVPil%5;0LrCVx5weXMg*N22<<B`o
zqYGr_pv-4DAmGuuz67}9`@*j?;2MO@_}dDu_<$z~HQ?3<IMiT>C&KUnw*77to6S5k
zCIB9}0}}FO!n-bH`p>%w*BSb8I+vzijm<=Ils0;n+CAv7bEdWC&~ye9As#&xN8YOw
zVwvKRaFrmkvG8sQzIsQDSH}-#uVlNyE#`}Ov~9bcGq-A`HW9Sn6s#V5s4>aCAp5(7
zX)1{Vc&vaqf!ZP;%29LWV~+0UZa@lUxidGumA9}oPZfKcRHB#|fWQ%C&dB71B~4?^
z^u=+cXY;}hjAjJu5{}Y_!KrPfOq|InF8A4Gpi8vmr1|*ois|0c-ycb9K!N;_5~d^{
zm~R_OK*Z}Uu~$^KVa%zfihfVrDAe2F)o;Ct&fo11_B{=n598R}pW^z8Q~Yc5|Jncl
zZGyn{PTy;+BdhmBg+yE`w;?OWZYLyS&@P9SjdLEttd6E7e9=qZOuNmVU0Qe`0JgYY
zcmCmvb}4<}v3w*l!!R>t0m`ryj51bo$n|S`-UxXR{e{Z;J>=%aHokW{Vv5STgy|1r
zEz_DOKQp$6JgIe9OCphHYHMhh|8|kD*V0N871X3wfVC>Wn4gP`(<7pE&iL{%IGz{f
zI;_lOSvbYDTsqllJ{Z!#b1Hi3VF^Db{PVal@0)^tu@p--In;CDhS+FXPz3xVovona
zlbK8CqGz;)4F6re)bh=dYhn-KCyvd;QMJyEukA4}Y6Ui}1g-7sk--x5-2!(v`mfF(
z<M0$!VM68g9i_(8Y=qVXOrHsnae{K)!2++-bo7&}wZ5CnFN^%>+3oO@NvGL(Os2qj
zL%tsOT0zakru+*7+8d#WEE_=<^X9)1C+zp$u9W1<h<8kudYL{=W=RfTSbu_nIz_@}
z&pN3)G<b>1+R|^K5|D7j?|Ngm)-wT|rLF%5B>o2{FgW$1wew!a0B-}*a+;c<t~Rbo
z+;<E`$1qHdFJ3jZP|VAGh@-SV6<dT(qry7~!;a?G(k0C=BZ{Q5Fk?7%3`y5rXPtc_
z-fqcbTQuND)A}2k8Q58!RR#P{T6>0|w7;#u-~2O74RRZJvCT+T5${9gCsK1sUi2uY
zVp5m_*s^$hvxh$yj^u|Gw3KL)p8;muc1mH%c_v;7edZ&YN&;5d5u^Bg>d9_;KSuE#
zlu_?BZyMeNU42;VCu{%hl>Y0Npuj&(Y!RCc$NHuj7FYQBS(^DB&iE)}m$9enoC2YE
zC}xn^KUM3}R&0rS*k)WkeeNnuO#Q8orFq#yKTPPi`};=1Pt>-L>j>*TYdu`9)<-4_
z3kYe0Exh>~?AN91dZgG)SvO~$yqrK8S>juujP&g}hQz1fgQ>csPe;n$66xDwx#n5*
za{HK~FA@(+cU$zPn$H(=y__CdR{T887Vk38R1dmX?CUG&99VX0^)yLItfLfiU5!62
z%C^dtzLoWE?nOq*M2|O8_@(Zx*hshxa&g9B&zK%f{rG_zb*(VXjy584^I3UMH+X1;
z#%x3@+peq8FKd(eSTVXc%ihwOI!VuIaLMk&SgmA7{H+(0aO6|#U6y+T&M3Ja9bCvN
zBS(?7k_54l9XEZ6zaEFYZ`P7@8|zvQ+IUKBs3HD=Q42A5`qGCh?9P6Sf06^nL5;#-
ziIpUjvI+VOit%y)FPZYDoCeKFVx-iL17DplVoqY~M9X>UX||FSgTz~qcTJZHcX$H#
z?$r|Y2+(kRfjb1ADslfB;&IJBLq0R$74&0Fw0|_myW8D-9xx~ly{gz05MEF1+0XvC
z{zP~_oxhO$C@x=b%Ya^p#>0F!Ywv5O+{+8<qEcb`Wq$!jucHRBJOfvT2CgXSRd=fD
zjBz;=Ta)(|O-6&}HP@2#bPEeupL(MU)V_*4G*pD1sK!yF2_Mp~3=7TYG|VJnmAum=
znUUf~er9{1tNp38^w-Jb-KHgiO{Qz~`*sv|WRBZ8^>2In7xewd%AVn2KOK5@cYI*4
z5Dr|U1pYNh+;$VT(WZk=0cHnwCi_l(#Vg8GAYis<=d!;`0Or7fQV(ib-k8TJwr1g?
zKT#IcH}cmFmKwhSGt!u`nEv^dMYS7cgbj)YmnAAmHi|jFzJFTECji(y>l9pl%)S`%
zyn2E3H$CgkDpHg*9BO`nSKqd7FlbE@>PynLwDpPfbHO-`MJHbDF!GsuH6@O1w0?<Z
zLS5o{U2Um{-TagJZ7ZENhPLR1D5^0hL_0*8;<IH0t6(Oz&^tX?ia_R@_Fm4FSC+h0
zbGU)C&c1aC&X}XbQrSFS#V}L(Gf~^jp<h!&%4yll8?9$=sb?m`FO`i`63*RlxmFG6
zYxTeRc1w0Uzg3Gi5O<!s7LK?j?!UUh>c|&v-Ao6#R=R^9Q#QEf4D>u>j}>+*KWjY+
zCFb?2hsLfXo#?g-|2j@SiG{Bk+B1^2wg=rKlZ&xU5*9`el7g@_IB9~wllJ%E1D|32
zcI4t2wD!X-5JptHz8`^D4hDZy<D0ALnrA(%<94<}Q}X6trdqQQ<Ugd>zAw){XuUb{
zboSRzZvEJ{KC4<HTD~<8Z;JSz+o3TRCm)e*Mi(Uyz|RN?Q_>Bw30Hi&xuoIAHtCuX
zhpCV_?@|u<3sNtRUv9L5X~P@d0@gvpmyS|-2hU5Q5MpZiY|d+2UR5BP<pYanKuKM1
zfsoG*&q_2K*l_B8l%kgF2?mjN`pB|Dp+_67phQI74-e9U&XBmXo$MI4rGYauOkM|D
zA9+zerd(O#YOJ6zFOMY`Nu-xW+T*#I6gks@(#-rqbWmpX7oonVS(2((c<*<R+R>AX
zv6odhp-;}Bdz%>KsfEzYPcfZo$E@<#`!#HsRoR2B$~qrr0T)TbOUHd?J=}^z&!wKL
z^ZBNcp|8{@Wd}UsV*MwN?LVkBv8e=Onupv^&SY)DC?R{)1~0>2!5iXdZlsWYWO^N%
zSHMuewuYa=r*7QsKnN4nh(x5#*C<25?=IutX!E3uf@2hNt)XS@h2mu`^GeGG`uWrz
z!lLkHbG5gBj%*McD%O{Cj%FyLzRS?9hWPIS)3-5W-(%Rik&)V9e9U*By_H(Uf%D|#
z%e|F^^lMd=W8@Lxd3hA?UG(rmB{!3P8;2E~M-(XTEz52AOBAMEXkIU&-SOnaEfV8j
zB9VX6QA;-#P~<c3QB;8GS_3;#_8GIQY~K+9ROyTt1{^3PQHkBxE$z6~sqT=%@5+X;
zR}`8B8{`tMMBw(;M;gSz*B_c5NBc<~bzY}i-Q6BBYjl`d1{4I`68m9IcuHQtG|I|0
zIiTXbSv&t67lSj>g$?VQklCQd%HTH13O0b*Ciy4XrC-O%C_L2rL_(H_<~+K?wiIvD
zzF*8&3;Q-33GQZktE)#Cl$^ar`Q`6)523iVRhS6b`+}3UM2E86%{%T!&|<2CwXvhy
zc3%fm<<c6bJ_ojyTo{ZF3W6Df1RyK~wYLa~DCQSyZ0at0$w7^OKOl{ez477~=bvJO
zh#UFGRreU42bxe#9BK;jSd)%%ROA}KKS--add7(>)-v^6==C@~MES9_#>H!>B}ct8
z_SqY2h||rWdf>*xQjly-p7NAwUqM&6DfKuXU1p0$c+p5aH-J7f5~dR#6Ee6Pa*uSD
z!A8?Z`}@G_tn8e!?&RtP$`RqQUHc;fh54jN_F(Ha%{*#}rX6<ih-Op8jK0e%w&(UH
zX%8_C^kAAxBrV62Zsd9Rve^?(SL)XC&K;gA!7T%qM7AYclVUDRgAFK{Yho7o^%?6$
ztOssQd;jx`@LzA9rnjTRSoW%-<%A@<1shwGJ+NZc@^ycUH}TomU8A3Fi2kKb=-1dr
z%X(;lr=d@&(90hgo+6ga@siU~UvVqRW|{LV`r>0bWOv1dEf!ixE|j|f`O?fFGRI)!
z2PZOs#KQfDs+&_EjbL|^)j9M`GkQ4eOfw||gM&@84A_VioBrLrexEvYzdj_uvF7lf
zxXPv&J{>&ULjV)PyrQPda@Ce2iPTm9TqhGxoqD&0@C^^hES9NSmc!mpj_GnKrondc
zgBgb&(x~B}%B?AX9;y@*Ott>41Z2w7*o*n#CTe+z8Tn%#AwV+Pag2-S!$6?z+Gn1d
z1GbWo_)gOK8|>-u{DI|ofuF6g)9xqh6@qhWhAg(3v$)@xLzL8nZCQ1*ld@qom&%PH
z5hw2wfyMo;&c(F=*T-F39rNGU9MvhisQa%v#~E)5JXiQhwus_W_H_yqSdT=7ls+w-
zpZfc9h7x2Abj1DH3l(^<?-p%XAeB5$-_N@!bfo<G>3i_`l$IPe)KK1aTuQ{wEpe-4
zTUM6*mAPm3NUZOXLfxP?m~`uX%j(vqo;VlPtv<IX5v&+2dv+`i`PeT81hh68uvm+j
z{QqL@KbY&Q>E4QsQ{gjHwhPDH-@Eph21pf_r>y_(B%rp-xv&V)w(rO94&S4%qjNP!
zYVlvBBx1OK&c}@2Maz^`scb|NNL=Yw?zGMac4>xFO1wT%bjjo4vb2C4Okahs;xF#o
zh11ue9XTwULlo75zi$uppzAtnmW*EScoYzNkGFb_u&`&&hAK(0r@})Pk5^ar`C{0J
z$-GY*Qkhwkwn*;tyjG$(N0j0t<@NT%uw=8(oQvt}9Kk<3(>d_A8R~4LTX3?3@1z9H
zI{0_r538g%VMe0eF2feaMq5e0*!vbbYkw*3&}|_jg;(JbmyPBTcr<RZSr31<BVRe6
zn}oLfor@n`mdy~VEI}PSgct-H&8c*b?(x@3I|0tuEY;lL9iyd!`bl`GxA}0tTO8iL
z@X2IC2mJqB5B<kNvGqSqY=P*9Zc*S>;elDx)Lz!_yZ~42{Q{rKf>1YM#tz<S3czm3
z;Pkk3i5X<Irvw4RAb1icC5H0PsSUxj%I||#du{P&BxIftA25@6HPW?iP$(<DA0Hrc
z9q}3M950vDNyZwIJ*4z3>q8EQ7sSVY<NzMg%@+DWew8T|2Sx_kWc^^xludot4UM7F
ziXlKRLwtG`6|G}~jpXKrab`|2aWB)mJbtYvL9<HRVm=0bKf)gB7g3QqXavo$xzw>!
zx!`A&-J|$^*!+btSOQ^t3*6gQ-b?FA2q;3Ez<TnImGo$JNLYM&vi9UrMxq3Z+a$1J
z$EDY^e{ivvW{C7_6%{#w*lY6Z)9XKX7XUc?O&Hj=JHTwd7^@ZoTM8o03-izI8hIP$
z8I<<z3at%q*%}%0&6|toTS}fcS|eW7Lq}ymn-r<j!u9hi>TMpe$z~|ZZxy3?HK=&Y
zNMn5|nMmN7lGG2sJoH{M38P7K3pAqyF<gWGc^pI}TqIaZ^6~9i{GC3>r({P7Upt*L
zJ$G0)&I5Uj>t4bcFOBJF-`&4>uC@pZx!5Lwj3et3FOjF22X=+wCNjhi7g8dQRfLQf
zGImHx5Q@HcBk$|ko2N5AHz>>@{^ZKTi4wK*Cm(-TMhKm@9q{&>2sjS0HIdFvDvX@D
zc6;TY_MMc2PvyE?4VTtx6<IK|Tm{nb&3ClgH}f)A>~5C#*p?I#R(|OTVfQTdd@f3~
z&e!d~x!oNVZZv@Wu@a*tVbyb}+^MduR}AlCT|0q9#$jx&Jb5q;l;8rsSOZi*p)->1
z&ok#bvKz&OcXRhDqJ@{|mFRGHpt`Ar^Gah2eB=IM0!MUAm{8B+seEPOE4`Muq9M%C
zb4MpXI+6z)r;~h~FSWw=*dUjw(a9f09AvGXx-*2y|8OKAniGl!h?9F)_ctk-n8w}o
zX)z62u5hUmJKX~8Z5HAy+%KR%1PjYyX97F_I2){I|1VNweGmBP@cQy<>&7)^`|i5o
o1DvoyD4^rza~;wbC7nMcdrhj0E0{)!{i_6!f2Ay4APM{Yf3iGWwEzGB

literal 13024
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


From 76d1de31243a942591a107f6d58e030daa1e4d55 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 12 Apr 2022 18:17:45 +0200
Subject: [PATCH 0196/1037] Update ActiveMQ to 5.17.0

and its dependent usage of Spring framework to 5.3.18
---
 checksum.xml      | 1 +
 gradle.properties | 4 ++--
 xdocs/changes.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index f0b151d7995..0a6f0a06c27 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -88,6 +88,7 @@
     <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />
+    <trusted-key id='6425559c47cc79c4' group='javax.annotation' />
     <trusted-key id='6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4044edf1bb73efea' group='jaxen' />
diff --git a/gradle.properties b/gradle.properties
index 6caea8bcf3b..4cbbdfc6051 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ org.sonarqube.version=3.0
 
 # Dependencies
 accessors-smart.version=2.4.8
-activemq.version=5.16.4
+activemq.version=5.17.0
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
 asm.version=9.2
@@ -130,7 +130,7 @@ rsyntaxtextarea.version=3.1.6
 Saxon-HE.version=11.2
 slf4j.version=1.7.36
 spock-core.version=2.0-M2-groovy-3.0
-springframework.version=4.3.17.RELEASE
+springframework.version=5.3.18
 svgSalamander.version=1.1.2.4
 tika.version=1.28.1
 xalan.version=2.7.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 77a0c326a17..d7adf9d2cab 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -169,7 +169,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
-  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
+  <li>Updated Apache ActiveMQ to 15.7.0 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
   <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
   <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>

From 40de048e0edc23cfb78467747963a043ad6698c3 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 20 Mar 2022 16:27:18 +0100
Subject: [PATCH 0197/1037] Hack to make rendering of large text results faster

Currently the used JEditorPane is slow when using large texts, as it
tries to find good places to break words.

This hack disables word wrapping by using non-wrapping views
for every element in the JEditorPane.

Introduce a new setting view.results.tree.simple_view_limit for view results tree

This setting is used to decide, whether the text view should switch to a simpler
view model. That can help to get rid of UI unresponsiveness on large contents.

Closes #706
---
 bin/jmeter.properties                         |  5 ++
 .../jmeter/visualizers/SamplerResultTab.java  | 77 +++++++++++++++++++
 xdocs/usermanual/properties_reference.xml     |  6 ++
 3 files changed, 88 insertions(+)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 22994b683c2..69b77d46bdf 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1195,6 +1195,11 @@ cookies=cookies
 #view.results.tree.max_line_size=110000
 #view.results.tree.soft_wrap_line_size=100000
 
+# Even with the above setting the UI can be unresponsive on large contents in the text view,
+# so we allow to switch to a simpler view mode, that is faster, but does not break lines.
+# Can be switched off by setting it to -1
+#view.results.tree.simple_view_limit=10000
+
 # Order of Renderers in View Results Tree
 # Note full class names should be used for non JMeter core renderers
 # For JMeter core renderers, class names start with '.' and are automatically
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 5a9afe4fad2..5e1d4a0b832 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -21,6 +21,11 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.GridLayout;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -28,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -43,11 +49,17 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.text.BadLocationException;
+import javax.swing.text.Caret;
 import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.Element;
+import javax.swing.text.PlainView;
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
 
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
@@ -94,6 +106,9 @@ public abstract class SamplerResultTab implements ResultRenderer {
 
     private static final String STYLE_REDIRECT = "Redirect"; // $NON-NLS-1$
 
+    private static final int SIMPLE_VIEW_LIMIT =
+            JMeterUtils.getPropDefault("view.results.tree.simple_view_limit", 10_000); // $NON-NLS-1$
+
     private JTextPane stats;
 
     /** Response Data pane */
@@ -694,7 +709,69 @@ protected void setTextOptimized(String data) {
         } catch (BadLocationException ex) {
             LOGGER.error("Error inserting text", ex);
         }
+        if (SIMPLE_VIEW_LIMIT >= 0 && document.getLength() > SIMPLE_VIEW_LIMIT) {
+            results.setEditorKit(new NonWrappingPlainTextEditorKit(results.getEditorKit()));
+        }
         KerningOptimizer.INSTANCE.configureKerning(results, document.getLength());
         results.setDocument(document);
     }
+    static class NonWrappingPlainTextEditorKit extends EditorKit {
+
+        private final EditorKit delegate;
+
+        NonWrappingPlainTextEditorKit(EditorKit delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public String getContentType() {
+            return delegate.getContentType();
+        }
+
+        @Override
+        public ViewFactory getViewFactory() {
+            //return new BasicTextAreaUI();
+            return new ViewFactory() {
+                @Override
+                public View create(Element elem) {
+                    return new PlainView(elem);
+                }
+            };
+        }
+
+        @Override
+        public Action[] getActions() {
+            return delegate.getActions();
+        }
+
+        @Override
+        public Caret createCaret() {
+            return delegate.createCaret();
+        }
+
+        @Override
+        public Document createDefaultDocument() {
+            return delegate.createDefaultDocument();
+        }
+
+        @Override
+        public void read(InputStream in, Document doc, int pos) throws IOException, BadLocationException {
+            delegate.read(in, doc, pos);
+        }
+
+        @Override
+        public void write(OutputStream out, Document doc, int pos, int len) throws IOException, BadLocationException {
+            delegate.write(out, doc, pos, len);
+        }
+
+        @Override
+        public void read(Reader in, Document doc, int pos) throws IOException, BadLocationException {
+            delegate.read(in, doc, pos);
+        }
+
+        @Override
+        public void write(Writer out, Document doc, int pos, int len) throws IOException, BadLocationException {
+            delegate.write(out, doc, pos, len);
+        }
+    }
 }
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index 6ab39a7b44b..2643f37f09d 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1541,6 +1541,12 @@ JMETER-SERVER</source>
     Defaults to:
     <source>.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML</source>
 </property>
+<property name="view.results.tree.simple_view_limit">
+    Configures maximum document length for text view before switching to a simpler view, that does not do line breaks.<br/>
+    Works probably best, when combined with a low setting of <code>view.results.tree.max_line_size</code>.
+    Can be switched off by setting the value to <code>-1</code>.<br/>
+    Defaults to: <code>10000</code>
+</property>
 <property name="document.max_size">
     Maximum size (in bytes) of Document that can be parsed by Tika engine<br/>
     Set to zero to disable the size check.<br/>

From 530e05559b61a4aa91e4790215143f169542915c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 12 Apr 2022 18:31:43 +0200
Subject: [PATCH 0198/1037] Add missing changelog entry for view hack

---
 xdocs/changes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d7adf9d2cab..7534a8d46b1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -131,6 +131,8 @@ however, the profile can't be updated while the test is running.
 <ul>
   <li><bug>64988</bug>Sort properties and variables in a human expected order for DebugPostProcessor and DebugSampler</li>
   <li><bug>63061</bug>Sort View Results in Table in a human expected order</li>
+  <li><pr>706</pr>Try to keep UI responsive when displaying large text results. Can be configured with the new property
+      <code>view.results.tree.simple_view_limit</code></li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From e457b35cbc92af2a28dc73f5028cb0f142bba227 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 12 Apr 2022 18:31:48 +0200
Subject: [PATCH 0199/1037] Revert "Update ActiveMQ to 5.17.0"

This reverts commit 76d1de31243a942591a107f6d58e030daa1e4d55.

Seems, that Java 9+ is needed. JMeter has to be able to run
with Java 8.
---
 checksum.xml      | 1 -
 gradle.properties | 4 ++--
 xdocs/changes.xml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 0a6f0a06c27..f0b151d7995 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -88,7 +88,6 @@
     <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />
-    <trusted-key id='6425559c47cc79c4' group='javax.annotation' />
     <trusted-key id='6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4044edf1bb73efea' group='jaxen' />
diff --git a/gradle.properties b/gradle.properties
index 4cbbdfc6051..6caea8bcf3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ org.sonarqube.version=3.0
 
 # Dependencies
 accessors-smart.version=2.4.8
-activemq.version=5.17.0
+activemq.version=5.16.4
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
 asm.version=9.2
@@ -130,7 +130,7 @@ rsyntaxtextarea.version=3.1.6
 Saxon-HE.version=11.2
 slf4j.version=1.7.36
 spock-core.version=2.0-M2-groovy-3.0
-springframework.version=5.3.18
+springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
 tika.version=1.28.1
 xalan.version=2.7.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7534a8d46b1..321ee336dd2 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -171,7 +171,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
-  <li>Updated Apache ActiveMQ to 15.7.0 (from 15.6.0).</li>
+  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
   <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
   <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>

From dfa7e3425b94846f046dc16a5e8366cfb2fcfe3a Mon Sep 17 00:00:00 2001
From: Wilson Kurniawan <wilson@visenze.com>
Date: Tue, 12 Apr 2022 07:55:07 +0800
Subject: [PATCH 0200/1037] Add necessary trusted-keys in checksum.xml

---
 checksum.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/checksum.xml b/checksum.xml
index f0b151d7995..3d43a4475cc 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -28,6 +28,7 @@
     <trusted-key id='105cb91cac2aee0e' group='com.github.vlsi.gradle' />
     <trusted-key id='254e9c64c264c176' group='com.github.weisj' />
     <trusted-key id='5e1f79a7c298661e' group='com.google.auto' />
+    <trusted-key id='b0f3710fa64900e7' group='com.google.auto' />
     <trusted-key id='c51e6cbc7ff46f0b' group='com.google.auto.service' />
     <trusted-key id='b0f3710fa64900e7' group='com.google.auto.value' />
     <trusted-key id='353a436e043e3145' group='com.google.code.findbugs' />
@@ -85,6 +86,7 @@
     <trusted-key id='6601e5c08dccbb96' group='info.picocli' />
     <trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
     <trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
     <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />

From f7b597fa1e37d2d6bbf68e6abe94be34f6b419d6 Mon Sep 17 00:00:00 2001
From: Wilson Kurniawan <wilson@visenze.com>
Date: Tue, 12 Apr 2022 17:04:34 +0800
Subject: [PATCH 0201/1037] Fix simple errorprone violations

---
 .../org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java    | 2 +-
 .../java/org/apache/jmeter/samplers/AbstractSampleSender.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
index 1f3ab5c5e6f..7ed3ba2158a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
@@ -48,7 +48,7 @@ public HeaderAsPropertyRenderer() {
      * are moved.
      */
     @Deprecated
-    public HeaderAsPropertyRenderer(@Deprecated Object[][] columnsMsgParameters) {
+    public HeaderAsPropertyRenderer(Object[][] columnsMsgParameters) {
         super();
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
index ccc0ecf64e3..27fba4ec7ad 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
@@ -30,7 +30,7 @@ public abstract class AbstractSampleSender implements SampleSender {
     private final boolean isClientConfigured = JMeterUtils.getPropDefault("sample_sender_client_configured", true); // $NON-NLS-1$
 
     /**
-     * @return boolean indicates how SampleSender configuration is done, @{code true}
+     * @return boolean indicates how SampleSender configuration is done, {@code true}
      *         means use client properties and send to servers, {@code false} means use
      *         server configurations
      */

From d9f775e8f82a2584ad4360d092589ed9d31d5fa6 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 12 Apr 2022 20:31:33 +0200
Subject: [PATCH 0202/1037] Use a finer filter to disable warnings about
 java.util.Date

and keep them locally

Part of #708
---
 .../src/main/java/org/apache/jorphan/util/HeapDumper.java       | 2 +-
 .../src/main/java/org/apache/jorphan/util/ThreadDumper.java     | 2 +-
 src/launcher/src/main/java/org/apache/jmeter/NewDriver.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
index 3f71f346ddd..fffaf7c9b57 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
@@ -159,7 +159,7 @@ public static String dumpHeap(boolean live) throws Exception {
      * @return the name of the dump file that was created
      * @throws Exception if the MXBean cannot be found, or if there is a problem during invocation
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public static String dumpHeap(File basedir, boolean live) throws Exception {
         SimpleDateFormat timestampFormat = new SimpleDateFormat("yyyyMMdd_hhmmss_SSS");
         String stamp = timestampFormat.format(new Date());
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
index 2c6762ee78d..3f572a22e35 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
@@ -56,7 +56,7 @@ public static String threadDump() throws Exception {
      * @return Name of file containing thread dump
      * @throws Exception  if file cannot we written
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public static String threadDump(File basedir) throws Exception {
         SimpleDateFormat timestampFormat = new SimpleDateFormat("yyyyMMdd_hhmmss_SSS");
         String stamp = timestampFormat.format(new Date());
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 99aff035a4c..91d609c5f7a 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -344,7 +344,7 @@ private static String getCommandLineArgument(String[] args, int id, String name)
     /*
      * If the fileName contains at least one set of paired single-quotes, reformat using DateFormat
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private static String replaceDateFormatInFileName(String fileName) {
         try {
             StringBuilder builder = new StringBuilder();

From 9362e183409f7e8ff51e7b16ec8c9c081ea3e656 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 12 Apr 2022 20:51:18 +0200
Subject: [PATCH 0203/1037] Replace java.util.Date with java.time based objects

Part of #708
---
 .../java/org/apache/jorphan/util/HeapDumper.java   | 10 +++++-----
 .../java/org/apache/jorphan/util/ThreadDumper.java | 10 +++++-----
 .../src/main/java/org/apache/jmeter/NewDriver.java | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
index fffaf7c9b57..eef6b52e463 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
@@ -19,8 +19,9 @@
 
 import java.io.File;
 import java.lang.management.ManagementFactory;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
@@ -159,10 +160,9 @@ public static String dumpHeap(boolean live) throws Exception {
      * @return the name of the dump file that was created
      * @throws Exception if the MXBean cannot be found, or if there is a problem during invocation
      */
-    @SuppressWarnings("JavaUtilDate")
     public static String dumpHeap(File basedir, boolean live) throws Exception {
-        SimpleDateFormat timestampFormat = new SimpleDateFormat("yyyyMMdd_hhmmss_SSS");
-        String stamp = timestampFormat.format(new Date());
+        DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern("yyyyMMdd_hhmmss_SSS").withZone(ZoneId.systemDefault());
+        String stamp = timestampFormat.format(Instant.now());
         File temp = new File(basedir,"dump_"+stamp+".hprof");
         final String path = temp.getPath();
         dumpHeap(path, live);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
index 3f572a22e35..d97cb658706 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java
@@ -27,8 +27,9 @@
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 
 /**
  * Utility class to create a Thread Dump
@@ -56,10 +57,9 @@ public static String threadDump() throws Exception {
      * @return Name of file containing thread dump
      * @throws Exception  if file cannot we written
      */
-    @SuppressWarnings("JavaUtilDate")
     public static String threadDump(File basedir) throws Exception {
-        SimpleDateFormat timestampFormat = new SimpleDateFormat("yyyyMMdd_hhmmss_SSS");
-        String stamp = timestampFormat.format(new Date());
+        DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern("yyyyMMdd_hhmmss_SSS").withZone(ZoneId.systemDefault());
+        String stamp = timestampFormat.format(Instant.now());
         File temp = new File(basedir,"thread_dump_"+stamp+".log");
         final String path = temp.getPath();
         try (FileOutputStream fos = new FileOutputStream(temp);
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 91d609c5f7a..95a53501543 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter;
 
 // N.B. this must only use standard Java packages
+
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -25,10 +26,11 @@
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -344,19 +346,17 @@ private static String getCommandLineArgument(String[] args, int id, String name)
     /*
      * If the fileName contains at least one set of paired single-quotes, reformat using DateFormat
      */
-    @SuppressWarnings("JavaUtilDate")
     private static String replaceDateFormatInFileName(String fileName) {
         try {
             StringBuilder builder = new StringBuilder();
 
-            // TODO: replace with java.time.*
-            final Date date = new Date();
+            final Instant date = Instant.now();
             int fromIndex = 0;
             int begin = fileName.indexOf('\'', fromIndex);// $NON-NLS-1$
             int end;
 
             String format;
-            SimpleDateFormat dateFormat;
+            DateTimeFormatter dateFormat;
 
             while (begin != -1) {
                 builder.append(fileName.substring(fromIndex, begin));
@@ -368,7 +368,7 @@ private static String replaceDateFormatInFileName(String fileName) {
                 }
 
                 format = fileName.substring(begin + 1, end);
-                dateFormat = new SimpleDateFormat(format);
+                dateFormat = DateTimeFormatter.ofPattern(format).withZone(ZoneId.systemDefault());
                 builder.append(dateFormat.format(date));
 
                 fromIndex = end + 1;

From aa13ae939f681590d4d2a8b99b3163b53cefdc0f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 13 Apr 2022 12:35:10 +0200
Subject: [PATCH 0204/1037] Further silence error prone warnings

Replace JdkObsolete with JavaUtilDate where we can't replace usage of new Date()
Use Instant and other newer APIs from java.time, where we can replace Date() without
changing our API.

Part of #708
---
 .../jmeter/engine/DistributedRunner.java      | 20 ++++++++++---
 .../jmeter/engine/StandardJMeterEngine.java   | 28 ++++++++++++++-----
 .../apache/jmeter/gui/util/JDateField.java    |  4 +--
 .../org/apache/jmeter/visualizers/Sample.java |  2 +-
 .../jmeter/visualizers/TableSample.java       |  2 +-
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java b/src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java
index 5ed86cbfc90..1ea5bca7bb1 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java
@@ -22,11 +22,15 @@
 import java.io.PrintStream;
 import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
@@ -116,15 +120,23 @@ public void init(List<String> addresses, HashTree tree) {
         }
     }
 
+    private static String formatLikeDate(Instant instant) {
+        return DateTimeFormatter
+                .ofLocalizedDateTime(FormatStyle.LONG)
+                .withLocale(Locale.ROOT)
+                .withZone(ZoneId.systemDefault())
+                .format(instant);
+    }
+
     /**
      * Starts a remote testing engines
      *
      * @param addresses list of the DNS names or IP addresses of the remote testing engines
      */
-    @SuppressWarnings("JdkObsolete")
     public void start(List<String> addresses) {
-        long now = System.currentTimeMillis();
-        println("Starting distributed test with remote engines: " + addresses + " @ " + new Date(now) + " (" + now + ")");
+        Instant now = Instant.now();
+        println("Starting distributed test with remote engines: "
+                + addresses + " @ " + formatLikeDate(now) + " (" + now.toEpochMilli() + ')');
         List<String> startedEngines = new ArrayList<>(addresses.size());
         List<String> failedEngines = new ArrayList<>(addresses.size());
         for (String address : addresses) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index aa1aae664bd..a2a878341b2 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -17,10 +17,14 @@
 
 package org.apache.jmeter.engine;
 
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
@@ -171,11 +175,12 @@ public void configure(HashTree testTree) {
     }
 
     @Override
-    @SuppressWarnings("JdkObsolete")
     public void runTest() throws JMeterEngineException {
         if (host != null){
-            long now=System.currentTimeMillis();
-            System.out.println("Starting the test on host " + host + " @ "+new Date(now)+" ("+now+")"); // NOSONAR Intentional
+            Instant now = Instant.now();
+            String nowAsString = formatLikeDate(now);
+            System.out.println("Starting the test on host "  // NOSONAR Intentional
+                    + host + " @ " + nowAsString + " (" + now.toEpochMilli() + ')');
         }
         try {
             Thread runningThread = new Thread(this, "StandardJMeterEngine");
@@ -186,6 +191,14 @@ public void runTest() throws JMeterEngineException {
         }
     }
 
+    private String formatLikeDate(Instant instant) {
+        return DateTimeFormatter
+                .ofLocalizedDateTime(FormatStyle.LONG)
+                .withLocale(Locale.ROOT)
+                .withZone(ZoneId.systemDefault())
+                .format(instant);
+    }
+
     private void removeThreadGroups(List<?> elements) {
         Iterator<?> iter = elements.iterator();
         while (iter.hasNext()) { // Can't use for loop here because we remove elements
@@ -209,7 +222,6 @@ private void notifyTestListenersOfStart(SearchByClass<TestStateListener> testLis
         }
     }
 
-    @SuppressWarnings("JdkObsolete")
     private void notifyTestListenersOfEnd(SearchByClass<TestStateListener> testListeners) {
         log.info("Notifying test listeners of end of test");
         for (TestStateListener tl : testListeners.getSearchResults()) {
@@ -225,8 +237,10 @@ private void notifyTestListenersOfEnd(SearchByClass<TestStateListener> testListe
         }
         if (host != null) {
             log.info("Test has ended on host {} ", host);
-            long now=System.currentTimeMillis();
-            System.out.println("Finished the test on host " + host + " @ "+new Date(now)+" ("+now+")" // NOSONAR Intentional
+            Instant now = Instant.now();
+            String nowAsString = formatLikeDate(now);
+            System.out.println("Finished the test on host "  // NOSONAR Intentional
+                    + host + " @ " + nowAsString + " (" + now.toEpochMilli() + ')'
                     +(EXIT_AFTER_TEST ? " - exit requested." : ""));
             if (EXIT_AFTER_TEST){
                 exit();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
index 813310b1a91..27b15538eae 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
@@ -93,7 +93,7 @@ public JDateField(Date date) {
     }
 
     // Dummy constructor to allow JUnit tests to work
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public JDateField() {
         this(new Date());
     }
@@ -113,7 +113,7 @@ public void setDate(Date date) {
      *
      * @return The currently set date
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public Date getDate() {
         try {
             return dateFormat.parse(getText());
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
index bb0fec28456..c3ce2d3ed21 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
@@ -208,7 +208,7 @@ public long getStartTime() {
      * @return the start time using the specified format
      * Intended for use from Functors
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public String getStartTimeFormatted(Format format) {
         return format.format(new Date(getStartTime()));
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
index 9c7f62efc42..c8623157463 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
@@ -107,7 +107,7 @@ public long getStartTime() {
      * @return the start time using the specified format
      * Intended for use from Functors
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public String getStartTimeFormatted(Format format) {
         return format.format(new Date(getStartTime()));
     }

From de43727474fe9c345e7cd57d0d9b2e01adc05a4d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 13 Apr 2022 12:35:51 +0200
Subject: [PATCH 0205/1037] Suppress InlineMe warnings from error prone

Part of #708
---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8349f3c4d37..60b7e3b8aa3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -403,6 +403,7 @@ allprojects {
                     disable(
                         "ComplexBooleanConstant",
                         "EqualsGetClass",
+                        "InlineMeSuggester",
                         "OperatorPrecedence",
                         "MutableConstantField",
                         // "ReferenceEquality",

From 8f8eb0f209bd6cd76fd9c5dd0173cb34c292d744 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 13 Apr 2022 15:55:02 +0200
Subject: [PATCH 0206/1037] Further silence error prone warnings

Replace JdkObsolete with JavaUtilDate where we can't replace usage of new Date()
Use Instant and other newer APIs from java.time, where we can replace Date() without
changing our API.

And while we are here, we can get use some more isEmpty calls.

Part of #708
---
 .../visualizers/RespTimeGraphVisualizer.java  | 12 +++---
 .../jmeter/visualizers/SamplerResultTab.java  | 12 +++---
 .../main/java/org/apache/jmeter/JMeter.java   | 38 ++++++++++++-------
 .../apache/jmeter/report/core/TimeHelper.java |  2 +-
 .../report/dashboard/ReportGenerator.java     |  2 +-
 .../processor/NormalizerSampleConsumer.java   |  2 +-
 .../apache/jmeter/reporters/ResultSaver.java  | 11 +++---
 .../apache/jmeter/save/CSVSaveService.java    |  4 +-
 .../functions/DateTimeConvertFunction.java    | 18 +++++----
 .../apache/jmeter/functions/TimeFunction.java | 16 ++++----
 .../protocol/http/control/CacheManager.java   |  8 ++--
 .../http/control/HC4CookieHandler.java        |  4 +-
 .../protocol/http/proxy/ProxyControl.java     |  8 ++--
 .../protocol/jms/sampler/BaseJMSSampler.java  |  2 +-
 .../protocol/jms/sampler/JMSSampler.java      | 20 +++++++---
 15 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index 03115a2ce90..a98701c0527 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -23,9 +23,10 @@
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -705,12 +706,13 @@ private JPanel createGraphActionsPane() {
         return buttonPanel;
     }
 
-    @SuppressWarnings("JdkObsolete")
     public String[] getXAxisLabels() {
-        SimpleDateFormat formatter = new SimpleDateFormat(xAxisTimeFormat.getText()); //$NON-NLS-1$
+        DateTimeFormatter formatter = DateTimeFormatter
+                .ofPattern(xAxisTimeFormat.getText()) //$NON-NLS-1$
+                .withZone(ZoneId.systemDefault());
         String[] xAxisLabels = new String[(int) durationTest]; // Test can't have a duration more than 2^31 secs (cast from long to int)
         for (int j = 0; j < durationTest; j++) {
-            xAxisLabels[j] = formatter.format(new Date((minStartTime + j) * intervalValue));
+            xAxisLabels[j] = formatter.format(Instant.ofEpochMilli((minStartTime + j) * intervalValue));
         }
         return xAxisLabels;
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 5e1d4a0b832..f0115931e17 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -26,9 +26,9 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -86,7 +86,9 @@ public abstract class SamplerResultTab implements ResultRenderer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SamplerResultTab.class);
     // N.B. these are not multi-threaded, so don't make it static
-    private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"); // ISO format $NON-NLS-1$
+    private final DateTimeFormatter dateFormat = DateTimeFormatter
+            .ofPattern("yyyy-MM-dd HH:mm:ss z")  // ISO format $NON-NLS-1$
+            .withZone(ZoneId.systemDefault());
 
     private static final String NL = "\n"; // $NON-NLS-1$
 
@@ -262,7 +264,7 @@ public void setupTabPane() {
                                 .getResString("view_results_thread_name")) //$NON-NLS-1$
                         .append(sampleResult.getThreadName()).append(NL);
                 String startTime = dateFormat
-                        .format(new Date(sampleResult.getStartTime()));
+                        .format(Instant.ofEpochMilli(sampleResult.getStartTime()));
                 statsBuff
                         .append(JMeterUtils
                                 .getResString("view_results_sample_start")) //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 3fa0d81f511..7c6f51a098e 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -32,10 +32,12 @@
 import java.net.SocketException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
@@ -456,7 +458,6 @@ private void startGui(String testFile) {
      * Called reflectively by {@link NewDriver#main(String[])}
      * @param args The arguments for JMeter
      */
-    @SuppressWarnings("JdkObsolete")
     public void start(String[] args) {
         CLArgsParser parser = new CLArgsParser(args, options);
         String error = parser.getErrorString();
@@ -524,11 +525,10 @@ public void start(String[] args) {
             }
 
             // Set some (hopefully!) useful properties
-            long now=System.currentTimeMillis();
-            JMeterUtils.setProperty("START.MS",Long.toString(now));// $NON-NLS-1$
-            Date today=new Date(now); // so it agrees with above
-            JMeterUtils.setProperty("START.YMD",new SimpleDateFormat("yyyyMMdd").format(today));// $NON-NLS-1$ $NON-NLS-2$
-            JMeterUtils.setProperty("START.HMS",new SimpleDateFormat("HHmmss").format(today));// $NON-NLS-1$ $NON-NLS-2$
+            Instant now = Instant.now();
+            JMeterUtils.setProperty("START.MS",Long.toString(now.toEpochMilli()));// $NON-NLS-1$
+            JMeterUtils.setProperty("START.YMD", getFormatter("yyyyMMdd").format(now));// $NON-NLS-1$ $NON-NLS-2$
+            JMeterUtils.setProperty("START.HMS", getFormatter("HHmmss").format(now));// $NON-NLS-1$ $NON-NLS-2$
 
             if (parser.getArgumentById(VERSION_OPT) != null) {
                 displayAsciiArt();
@@ -599,6 +599,10 @@ public void start(String[] args) {
         }
     }
 
+    private static DateTimeFormatter getFormatter(String pattern) {
+        return DateTimeFormatter.ofPattern(pattern).withZone(ZoneId.systemDefault());
+    }
+
     /**
      * Extract option JMeter#REPORT_OUTPUT_FOLDER_OPT and if defined sets property
      * {@link JMeter#JMETER_REPORT_OUTPUT_DIR_PROPERTY} after checking folder can
@@ -1096,8 +1100,8 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
                 clonedTree.add(clonedTree.getArray()[0], new ListenToTest(
                         org.apache.jmeter.JMeter.ListenToTest.RunMode.LOCAL, false, reportGenerator));
                 engine.configure(clonedTree);
-                long now=System.currentTimeMillis();
-                println("Starting standalone test @ "+new Date(now)+" ("+now+")");
+                Instant now = Instant.now();
+                println("Starting standalone test @ "+ formatLikeDate(now) + " (" + now.toEpochMilli() + ')');
                 engines.add(engine);
                 engine.runTest();
             } else {
@@ -1127,6 +1131,14 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
         }
     }
 
+    private static String formatLikeDate(Instant instant) {
+        return DateTimeFormatter
+                .ofLocalizedDateTime(FormatStyle.LONG)
+                .withLocale(Locale.ROOT)
+                .withZone(ZoneId.systemDefault())
+                .format(instant);
+    }
+
     /**
      * This function does the following:
      * <ul>
@@ -1325,11 +1337,11 @@ public void testStarted() {
 
         @SuppressWarnings("JdkObsolete")
         private void endTest(boolean isDistributed) {
-            long now = System.currentTimeMillis();
+            Instant now = Instant.now();
             if (isDistributed) {
-                println("Tidying up remote @ "+new Date(now)+" ("+now+")");
+                println("Tidying up remote @ " + formatLikeDate(now) + " (" + now.toEpochMilli() + ')');
             } else {
-                println("Tidying up ...    @ "+new Date(now)+" ("+now+")");
+                println("Tidying up ...    @ " + formatLikeDate(now) + " (" + now.toEpochMilli() + ')');
             }
 
             if (isDistributed) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java b/src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java
index b490b48dea6..0c1953f8706 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java
@@ -76,7 +76,7 @@ public static String formatTimeStamp(long timeStamp) {
      *            the format
      * @return the string
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public static String formatTimeStamp(long timeStamp, String format) {
         SimpleDateFormat dateFormat = format != null ? new SimpleDateFormat(
                 format) : new SimpleDateFormat();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index ce575a8842b..c73031c3406 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -270,7 +270,7 @@ public void generate() throws GenerationException {
     /**
      * @return {@link FilterConsumer} that filter data based on date range
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private FilterConsumer createFilterByDateRange() {
         FilterConsumer dateRangeFilter = new FilterConsumer();
         dateRangeFilter.setName(DATE_RANGE_FILTER_CONSUMER_NAME);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java
index 7834af8f4e5..55df979911e 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java
@@ -89,7 +89,7 @@ private SimpleDateFormat createFormatter() {
     }
 
     @Override
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public void consume(Sample s, int channel) {
         Date date = null;
         try {
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
index b1f0c55977c..cd9b6d565e7 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
@@ -23,9 +23,9 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 
 import org.apache.jmeter.control.TransactionController;
 import org.apache.jmeter.engine.util.NoThreadClone;
@@ -123,13 +123,12 @@ public void testStarted() {
     }
 
     @Override
-    @SuppressWarnings("JdkObsolete")
     public void testStarted(String host) {
         synchronized(LOCK){
             sequenceNumber = 0;
             if (getAddTimeStamp()) {
-                DateFormat format = new SimpleDateFormat(TIMESTAMP_FORMAT);
-                timeStamp = format.format(new Date());
+                DateTimeFormatter format = DateTimeFormatter.ofPattern(TIMESTAMP_FORMAT).withZone(ZoneId.systemDefault());
+                timeStamp = format.format(Instant.now());
             } else {
                 timeStamp = "";
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index 6d138073641..fc13865c553 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -203,7 +203,7 @@ public static void processSamples(String filename, Visualizer visualizer,
      *
      * @throws JMeterError
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private static SampleEvent makeResultFromDelimitedString(
             final String[] parts,
             final SampleSaveConfiguration saveConfig, // may be updated
@@ -843,7 +843,7 @@ public static String resultToDelimitedString(SampleEvent event,
      *            the separation string
      * @return the separated value representation of the result
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public static String resultToDelimitedString(SampleEvent event,
             SampleResult sample,
             SampleSaveConfiguration saveConfig,
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
index 002d795f66b..c382ba17476 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
@@ -17,10 +17,11 @@
 
 package org.apache.jmeter.functions;
 
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -62,20 +63,23 @@ public List<String> getArgumentDesc() {
     }
 
     @Override
-    @SuppressWarnings("JdkObsolete")
     public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException {
         String dateString = values[0].execute();
         String sourceDateFormat = values[1].execute();
         String targetDateFormat = values[2].execute();
         try {
-            SimpleDateFormat targetDateFormatter = new SimpleDateFormat(targetDateFormat);
+            DateTimeFormatter targetDateFormatter = DateTimeFormatter
+                    .ofPattern(targetDateFormat)
+                    .withZone(ZoneId.systemDefault());
             String newDate;
-            if (sourceDateFormat != null && sourceDateFormat.length() > 0) {
-                SimpleDateFormat sourceDateFormatter = new SimpleDateFormat(sourceDateFormat);
+            if (sourceDateFormat != null && !sourceDateFormat.isEmpty()) {
+                DateTimeFormatter sourceDateFormatter = DateTimeFormatter
+                        .ofPattern(sourceDateFormat)
+                        .withZone(ZoneId.systemDefault());
                 newDate = targetDateFormatter.format(sourceDateFormatter.parse(dateString));
             } else {
                 // dateString will be an epoch time
-                newDate = targetDateFormatter.format(new Date(Long.parseLong(dateString)));
+                newDate = targetDateFormatter.format(Instant.ofEpochMilli(Long.parseLong(dateString)));
             }
             addVariableValue(newDate, values, 3);
             return newDate;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index e6566a205fd..69c90be61d6 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -17,10 +17,11 @@
 
 package org.apache.jmeter.functions;
 
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,10 +78,9 @@ public TimeFunction(){
 
     /** {@inheritDoc} */
     @Override
-    @SuppressWarnings("JdkObsolete")
     public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException {
         String datetime;
-        if (format.length() == 0){// Default to milliseconds
+        if (format.isEmpty()) {// Default to milliseconds
             datetime = Long.toString(System.currentTimeMillis());
         } else {
             // Resolve any aliases
@@ -92,12 +92,14 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
                 long div = Long.parseLong(fmt.substring(1)); // should never case NFE
                 datetime = Long.toString(System.currentTimeMillis() / div);
             } else {
-                SimpleDateFormat df = new SimpleDateFormat(fmt);// Not synchronised, so can't be shared
-                datetime = df.format(new Date());
+                DateTimeFormatter df = DateTimeFormatter // Not synchronised, so can't be shared
+                        .ofPattern(fmt)
+                        .withZone(ZoneId.systemDefault());
+                datetime = df.format(Instant.now());
             }
         }
 
-        if (variable.length() > 0) {
+        if (!variable.isEmpty()) {
             JMeterVariables vars = getVariables();
             if (vars != null){// vars will be null on TestPlan
                 vars.put(variable, datetime);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index 8b26d702de8..9e0a426484f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -63,7 +63,7 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
 
     private static final Logger log = LoggerFactory.getLogger(CacheManager.class);
 
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private static final Date EXPIRED_DATE = new Date(0L);
     private static final int DEFAULT_MAX_SIZE = 5000;
     private static final long ONE_YEAR_MS = 365*24*60*60*1000L;
@@ -307,7 +307,7 @@ private Date extractExpiresDateFromExpires(String expires) {
         return expiresDate;
     }
 
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private Date extractExpiresDateFromCacheControl(String lastModified,
             String cacheControl, String expires, String etag, String url,
             String date, final String maxAge, Date defaultExpiresDate) {
@@ -327,7 +327,7 @@ private Date extractExpiresDateFromCacheControl(String lastModified,
         return defaultExpiresDate;
     }
 
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private Date calcExpiresDate(String lastModified, String cacheControl,
             String expires, String etag, String url, String date) {
         if(!StringUtils.isEmpty(lastModified) && !StringUtils.isEmpty(date)) {
@@ -516,7 +516,7 @@ public String getValue() {
 
     }
 
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private boolean entryStillValid(URL url, CacheEntry entry) {
         log.debug("Check if entry {} is still valid for url {}", entry, url);
         if (entry != null && entry.getVaryHeader() == null) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
index a5c07414b75..0dab8cac52f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
@@ -104,7 +104,7 @@ public HC4CookieHandler(String policy) {
     }
 
     @Override
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public void addCookieFromHeader(CookieManager cookieManager,
             boolean checkCookies, String cookieHeader, URL url) {
             boolean debugEnabled = log.isDebugEnabled();
@@ -240,7 +240,7 @@ List<org.apache.http.cookie.Cookie> getCookiesForUrl(
     /**
      * Create an HttpClient cookie from a JMeter cookie
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private org.apache.http.cookie.Cookie makeCookie(Cookie jmc) {
         long exp = jmc.getExpiresMillis();
         BasicClientCookie ret = new BasicClientCookie(jmc.getName(),
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 52b751b2807..6c0335109f1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -773,7 +773,7 @@ public void stopProxy() {
         }
     }
 
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public String[] getCertificateDetails() {
         if (isDynamicMode()) {
             try {
@@ -1540,7 +1540,7 @@ private void initKeyStore() throws IOException, GeneralSecurityException {
     /**
      * Initialise the user-provided keystore
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private void initUserKeyStore() {
         try {
             keyStore = getKeyStore(storePassword.toCharArray());
@@ -1562,7 +1562,7 @@ private void initUserKeyStore() {
     /**
      * Initialise the dynamic domain keystore
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private void initDynamicKeyStore() throws IOException, GeneralSecurityException {
         if (storePassword  != null) { // Assume we have already created the store
             try {
@@ -1658,7 +1658,7 @@ KeyStore updateKeyStore(String port, String host) throws IOException, GeneralSec
     /**
      * Initialise the single key JMeter keystore (original behaviour)
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     private void initJMeterKeyStore() throws IOException, GeneralSecurityException {
         if (storePassword != null) { // Assume we have already created the store
             try {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
index 9e60decdf3a..0ff317f76a1 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
@@ -337,7 +337,7 @@ public boolean isDestinationStatic(){
      * @param message JMS Message
      * @return String with message header values.
      */
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings("JavaUtilDate")
     public static String getMessageHeaders(Message message) {
         final StringBuilder response = new StringBuilder(256);
         try {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index 62d74887469..5d448f98c8a 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -18,9 +18,13 @@
 package org.apache.jmeter.protocol.jms.sampler;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.jms.BytesMessage;
@@ -747,10 +751,17 @@ private void printEnvironment(Context context) throws NamingException {
         }
     }
 
-    @SuppressWarnings("JdkObsolete")
+    private static String formatLikeDate(Instant instant) {
+        return DateTimeFormatter
+                .ofLocalizedDateTime(FormatStyle.LONG)
+                .withLocale(Locale.ROOT)
+                .withZone(ZoneId.systemDefault())
+                .format(instant);
+    }
+
     private void logThreadStart() {
         if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Thread started {}", new Date());
+            LOGGER.debug("Thread started {}", formatLikeDate(Instant.now()));
             LOGGER.debug("JMSSampler: [{}], hashCode=[{}]", Thread.currentThread().getName(), hashCode());
             LOGGER.debug("QCF: [{}], sendQueue=[{}]", getQueueConnectionFactory(), getSendQueue());
             LOGGER.debug("Timeout = [{}]", getTimeout());
@@ -794,10 +805,9 @@ public String getPriority() {
      * {@inheritDoc}
      */
     @Override
-    @SuppressWarnings("JdkObsolete")
     public void threadFinished() {
         if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Thread ended {}", new Date());
+            LOGGER.debug("Thread ended {}", formatLikeDate(Instant.now()));
         }
 
         if (context != null) {

From d8a6876169ea6327b8c20f23445a472af32f4276 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 13 Apr 2022 16:17:56 +0200
Subject: [PATCH 0207/1037] Specify the char encoding when decoding bytes into
 strings

As all other commits related to #708, this is based on patch by Wilson Kurniawan (wilson at visenze.com)

Closes #708
---
 .../jmeter/gui/action/HtmlReportGenerator.java    |  3 ++-
 .../protocol/http/proxy/HttpRequestHdr.java       |  5 +++--
 .../protocol/tcp/sampler/TCPClientImpl.java       | 15 +++++++++++++--
 xdocs/changes.xml                                 |  2 ++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 87803da1e34..e00fee3f9c3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -20,6 +20,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -83,7 +84,7 @@ public List<String> run() {
             LOGGER.debug("Running report generation");
             resultCode = sc.run(generationCommand);
             if (resultCode != 0) {
-                errorMessageList.add(commandExecutionOutput.toString());
+                errorMessageList.add(commandExecutionOutput.toString(Charset.defaultCharset().name()));
                 LOGGER.info("The HTML report generation failed and returned: {}", commandExecutionOutput);
                 return errorMessageList;
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index abd69a883b7..c931bcb677a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -24,6 +24,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -164,7 +165,7 @@ public byte[] parse(InputStream in) throws IOException {
                     inHeaders = false;
                     firstLine = false; // cannot be first line either
                 }
-                final String reqLine = line.toString();
+                final String reqLine = line.toString(StandardCharsets.ISO_8859_1.name());
                 if (firstLine) {
                     parseFirstLine(reqLine);
                     firstLine = false;
@@ -189,7 +190,7 @@ public byte[] parse(InputStream in) throws IOException {
         if (log.isDebugEnabled()){
             log.debug("rawPostData in default JRE encoding: {}, Request: '{}'",
                     new String(rawPostData, Charset.defaultCharset()),
-                    clientRequest.toString().replaceAll("\r\n", CRLF));
+                    clientRequest.toString(StandardCharsets.ISO_8859_1.name()).replaceAll("\r\n", CRLF));
         }
         return clientRequest.toByteArray();
     }
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
index 749b295a0b1..66ba928ac86 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
 import org.apache.commons.lang3.StringUtils;
@@ -115,11 +116,21 @@ public String read(InputStream is, SampleResult sampleResult) throws ReadExcepti
 
             // do we need to close byte array (or flush it?)
             if(log.isDebugEnabled()) {
-                log.debug("Read: {}\n{}", w.size(), w.toString());
+                log.debug("Read: {}\n{}", w.size(), w.toString(CHARSET));
             }
             return w.toString(CHARSET);
+        } catch (UnsupportedEncodingException e) {
+            throw new ReadException("Error decoding bytes from server with " + CHARSET + ", bytes read: " + w.size(),
+                    e, "<Read bytes with bad encoding>");
         } catch (IOException e) {
-            throw new ReadException("Error reading from server, bytes read: " + w.size(), e, w.toString());
+            String decodedBytes;
+            try {
+                decodedBytes = w.toString(CHARSET);
+            } catch (UnsupportedEncodingException uee) {
+                // we should never get here, as it would have crashed earlier
+                decodedBytes = "<Read bytes with bad encoding>";
+            }
+            throw new ReadException("Error reading from server, bytes read: " + w.size(), e, decodedBytes);
         }
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 321ee336dd2..a14681778ab 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -217,6 +217,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
+  <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.comr)></li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -323,6 +324,7 @@ however, the profile can't be updated while the test is running.
   <li>Ji Hun (jihunkimkw at gmail.com)</li>
   <li>Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
   <li>NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
+  <li>Wilson Kurniawan (wilson at visenze.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From ab461ecd4b2b4a432ce3bc6b5f1623c39dec532d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:18:04 +0200
Subject: [PATCH 0208/1037] Correct mail address in changes.xml

---
 xdocs/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a14681778ab..39650534bd3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -217,7 +217,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
-  <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.comr)></li>
+  <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.com)></li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 1e93c67a59673fe4d71a3a710c80bb485965b355 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 15:46:26 +0200
Subject: [PATCH 0209/1037] Get rid of error prone warnings because of missing
 explicit default character encoding

While we are in the sources, use try-with, isEmpty and other minor clean-ups.
Don't encode ASCII printable characters as unicode sequences, as they are
decoded by Java anyway and are obfuscating the code unnecessarily.
Remove unused method variables and parameters, when possible.
Use ArrayList instead of LinkedList, when possible (more will follow).
---
 .../assertions/TestJSONPathAssertion.java     | 40 ++++++++++---------
 .../assertions/XMLSchemaAssertionTest.java    | 31 ++++++++------
 .../java/org/apache/jmeter/JMeterTest.java    | 11 +++--
 .../jmeter/junit/JMeterTestCaseJUnit.java     |  4 +-
 .../resources/ResourceKeyUsageTest.java       |  6 ++-
 .../apache/jmeter/save/TestSaveService.java   | 10 +++--
 .../http/control/TestAuthManager.java         | 12 ++++--
 .../http/proxy/TestHttpRequestHdr.java        | 23 +++++------
 .../protocol/http/sampler/PostWriterTest.java | 22 +++++-----
 ...stHTTPSamplersAgainstHttpMirrorServer.java |  7 ++--
 10 files changed, 97 insertions(+), 69 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index 125662f7909..e9349efb1ee 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.nio.charset.Charset;
 import java.util.Locale;
 
 import org.apache.jmeter.samplers.SampleResult;
@@ -86,7 +87,7 @@ void testIsJsonValidationBool() {
     }, delimiterString=";")
     void testGetResult_pathsWithOneResult(String data, String jsonPath, String expectedResult) {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData(data.getBytes());
+        samplerResult.setResponseData(data.getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath(jsonPath);
@@ -101,7 +102,7 @@ void testGetResult_pathsWithOneResult(String data, String jsonPath, String expec
     @Test
     void testGetResult_positive_regexp() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -112,7 +113,7 @@ void testGetResult_positive_regexp() {
         assertEquals(expResult.getName(), result.getName());
         assertFalse(result.isFailure());
 
-        samplerResult.setResponseData("{\"myval\": 456}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 456}".getBytes(Charset.defaultCharset()));
         AssertionResult result2 = instance.getResult(samplerResult);
         assertFalse(result2.isFailure());
     }
@@ -120,7 +121,7 @@ void testGetResult_positive_regexp() {
     @Test
     void testGetResult_positive_invert() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -136,7 +137,7 @@ void testGetResult_positive_invert() {
     @Test
     void testGetResult_not_regexp() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": \"some complicated value\"}".getBytes());
+        samplerResult.setResponseData("{\"myval\": \"some complicated value\"}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -153,7 +154,8 @@ void testGetResult_not_regexp() {
     @Test
     void testGetResult_complex_map() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": { \"a\": 23, \"b\": 42, \"c\": \"something\" } }".getBytes());
+        samplerResult.setResponseData(
+                "{\"myval\": { \"a\": 23, \"b\": 42, \"c\": \"something\" } }".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -167,7 +169,7 @@ void testGetResult_complex_map() {
     @Test
     void testGetResult_negative() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -182,7 +184,7 @@ void testGetResult_negative() {
     @Test
     void testGetResult_negative_invert() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -198,7 +200,7 @@ void testGetResult_negative_invert() {
     @Test
     void testGetResult_null() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": null}".getBytes());
+        samplerResult.setResponseData("{\"myval\": null}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -213,7 +215,7 @@ void testGetResult_null() {
     @Test
     void testGetResult_null_not_found() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes());
+        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -228,7 +230,7 @@ void testGetResult_null_not_found() {
     @Test
     void testGetResult_null_novalidate() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": null}".getBytes());
+        samplerResult.setResponseData("{\"myval\": null}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
@@ -242,7 +244,7 @@ void testGetResult_null_novalidate() {
     @Test
     void testGetResult_no_such_path() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": null}".getBytes());
+        samplerResult.setResponseData("{\"myval\": null}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.notexist");
@@ -256,7 +258,8 @@ void testGetResult_no_such_path() {
     @Test
     void testGetResult_list_negative() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}".getBytes());
+        samplerResult.setResponseData(
+                "{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval[*].test");
@@ -274,7 +277,7 @@ void testGetResult_list_empty_novalidate() {
         // we now consider an indefinite path with no assertion value
         // an error and set the AssertionResult to failure
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": []}".getBytes());
+        samplerResult.setResponseData("{\"myval\": []}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval[*]");
@@ -288,7 +291,7 @@ void testGetResult_list_empty_novalidate() {
     @Test
     void testGetResult_inverted_null() {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": [{\"key\": null}]}".getBytes());
+        samplerResult.setResponseData("{\"myval\": [{\"key\": null}]}".getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval[*].key");
@@ -305,7 +308,7 @@ void testGetResult_inverted_null() {
     void testGetResult_match_msg_problem() {
         SampleResult samplerResult = new SampleResult();
         String str = "{\"execution\":[{\"scenario\":{\"requests\":[{\"headers\":{\"headerkey\":\"header value\"}}]}}]}";
-        samplerResult.setResponseData(str.getBytes());
+        samplerResult.setResponseData(str.getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.execution[0].scenario.requests[0].headers");
@@ -338,7 +341,7 @@ void testGetResult_match_msg_problem2() {
                 "   }\n" +
                 " }\n" +
                 "}";
-        samplerResult.setResponseData(str.getBytes());
+        samplerResult.setResponseData(str.getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.contact.info.ngn_number");
@@ -361,7 +364,8 @@ void testGetResultFloat() {
             Locale.setDefault(Locale.US);
             SampleResult samplerResult = new SampleResult();
 
-            samplerResult.setResponseData("{\"myval\": [{\"test\":0.0000123456789}]}".getBytes());
+            samplerResult.setResponseData(
+                    "{\"myval\": [{\"test\":0.0000123456789}]}".getBytes(Charset.defaultCharset()));
 
             JSONPathAssertion instance = new JSONPathAssertion();
             instance.setJsonPath("$.myval[*].test");
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
index ca3143734fa..236625a1b54 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
@@ -25,6 +25,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.samplers.SampleResult;
@@ -52,19 +53,21 @@ public void setUp() throws Exception {
     }
 
     private ByteArrayOutputStream readBA(String name) throws IOException {
-        BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-        int len = 0;
-        byte[] data = new byte[512];
-        while ((len = bis.read(data)) >= 0) {
-            baos.write(data, 0, len);
+        try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)))) {
+            int len = 0;
+            byte[] data = new byte[512];
+            while ((len = bis.read(data)) >= 0) {
+                baos.write(data, 0, len);
+            }
         }
-        bis.close();
         return baos;
     }
 
     private byte[] readFile(String name) throws IOException {
-        return readBA(name).toByteArray();
+        try (ByteArrayOutputStream baos = readBA(name)) {
+            return baos.toByteArray();
+        }
     }
 
     @Test
@@ -151,9 +154,10 @@ public void testAssertionBlankResult() throws Exception {
 
     @Test
     public void testXMLTrailingContent() throws Exception {
-        ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
-        baos.write("extra".getBytes()); // TODO - charset?
-        result.setResponseData(baos.toByteArray());
+        try (ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml")) {
+            baos.write("extra".getBytes(StandardCharsets.UTF_8));
+            result.setResponseData(baos.toByteArray());
+        }
         assertion.setXsdFileName(findTestPath("testfiles/XMLSchema-pass.xsd"));
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
@@ -165,9 +169,10 @@ public void testXMLTrailingContent() throws Exception {
 
     @Test
     public void testXMLTrailingWhitespace() throws Exception {
-        ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
-        baos.write(" \t\n".getBytes()); // TODO - charset?
-        result.setResponseData(baos.toByteArray());
+        try (ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml")) {
+            baos.write(" \t\n".getBytes(StandardCharsets.UTF_8));
+            result.setResponseData(baos.toByteArray());
+        }
         assertion.setXsdFileName(findTestPath("testfiles/XMLSchema-pass.xsd"));
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("xisError() " + res.isError() + " isFailure() " + res.isFailure());
diff --git a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
index b70e5a29dcc..77fec89f513 100644
--- a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
@@ -22,8 +22,11 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.report.config.ConfigurationException;
@@ -59,7 +62,8 @@ public void testSuccessWhenJmxExists() throws IOException, ConfigurationExceptio
                 + "        <collectionProp name=\"Arguments.arguments\"/>\n" + "      </elementProp>\n"
                 + "      <stringProp name=\"TestPlan.user_define_classpath\"></stringProp></TestPlan>"
                 + "    <hashTree/></hashTree></jmeterTestPlan>";
-        try (FileWriter fw = new FileWriter(temp);
+        try (FileOutputStream os = new FileOutputStream(temp);
+                Writer fw = new OutputStreamWriter(os, StandardCharsets.UTF_8);
                 BufferedWriter out = new BufferedWriter(fw)) {
             out.write(testPlan);
         }
@@ -102,7 +106,8 @@ public void testFailureWithMissingPlugin() throws IOException, ConfigurationExce
                 + "          <stringProp name=\"CONNECT\">${__Random(1,5)}</stringProp>\n"
                 + "        </kg.apc.jmeter.samplers.DummySampler></hashTree></hashTree>\n"
                 + "  </hashTree></jmeterTestPlan><hashTree/></hashTree>\n" + "</jmeterTestPlan>";
-        try (FileWriter fw = new FileWriter(temp);
+        try (FileOutputStream os = new FileOutputStream(temp);
+                Writer fw = new OutputStreamWriter(os, StandardCharsets.UTF_8);
                 BufferedWriter out = new BufferedWriter(fw)) {
             out.write(testPlan);
         }
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
index 41b2f146ee0..a653f95cabf 100644
--- a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
+++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
@@ -21,8 +21,8 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.Locale;
 import java.util.MissingResourceException;
 
@@ -110,7 +110,7 @@ protected static File findTestFile(String file) {
 
     protected void checkInvalidParameterCounts(AbstractFunction func, int minimum)
             throws Exception {
-        Collection<CompoundVariable> parms = new LinkedList<>();
+        Collection<CompoundVariable> parms = new ArrayList<>();
         for (int c = 0; c < minimum; c++) {
             assertThrows(InvalidVariableException.class, () -> func.setParameters(parms));
             parms.add(new CompoundVariable());
diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
index eb9551a6438..b9af52655fb 100644
--- a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
@@ -26,6 +26,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.MissingResourceException;
@@ -51,6 +52,7 @@ private PropertyResourceBundle getRAS(String res) throws Exception {
 
     // Check that calls to getResString use a valid property key name
     @Test
+    @SuppressWarnings("CatchAndPrintStackTrace")
     public void checkResourceReferences() throws Exception {
         String resourceName = "/org/apache/jmeter/resources/messages.properties";
         PropertyResourceBundle messagePRB = getRAS(resourceName);
@@ -66,7 +68,7 @@ public boolean accept(File dir, String name) {
                 if (name.endsWith(".java")) {
                   BufferedReader fileReader = null;
                   try {
-                    fileReader = new BufferedReader(new FileReader(file));
+                    fileReader = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8));
                     String s;
                     while ((s = fileReader.readLine()) != null) {
                         if (s.matches("\\s*//.*")) { // leading comment
@@ -89,7 +91,7 @@ public boolean accept(File dir, String name) {
                         }
                     }
                 } catch (IOException e) {
-                    e.printStackTrace();
+                      e.printStackTrace();
                 } finally {
                     JOrphanUtils.closeQuietly(fileReader);
                 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 8c654e9e6c0..9b44acc7d71 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -25,12 +25,13 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.util.List;
 
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -128,8 +129,8 @@ private boolean loadAndSave(File testFile, String fileName, boolean checkSize, F
 
         final FileStats outputStats;
         try (ByteArrayInputStream ins = new ByteArrayInputStream(out.toByteArray());
-                Reader insReader = new InputStreamReader(ins);
-                BufferedReader bufferedReader = new BufferedReader(insReader)) {
+             Reader insReader = new InputStreamReader(ins, Charset.defaultCharset());
+             BufferedReader bufferedReader = new BufferedReader(insReader)) {
             outputStats = computeFileStats(bufferedReader);
         }
         // We only check the length of the result. Comparing the
@@ -167,7 +168,8 @@ private FileStats getFileStats(File testFile) throws IOException,
         if (testFile == null || !testFile.exists()) {
             return FileStats.NO_STATS;
         }
-        try (FileReader fileReader = new FileReader(testFile);
+        try (FileInputStream fis = new FileInputStream(testFile);
+             InputStreamReader fileReader = new InputStreamReader(fis, Charset.defaultCharset());
                 BufferedReader bufferedReader = new BufferedReader(fileReader)) {
             return computeFileStats(bufferedReader);
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
index e3b41ab9b9f..eee4a212572 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -88,7 +89,8 @@ public void testFile() throws Exception {
     @Test
     public void testAddFileWithoutDomainAndRealmWithMechanism() throws IOException {
         File authFile = File.createTempFile("auth", ".txt");
-        Files.write(authFile.toPath(), "http://example.com\tuser\tpassword\t\t\tBASIC_DIGEST".getBytes());
+        Files.write(authFile.toPath(),
+                "http://example.com\tuser\tpassword\t\t\tBASIC_DIGEST".getBytes(Charset.defaultCharset()));
         AuthManager manager = new AuthManager();
         manager.addFile(authFile.getAbsolutePath());
         Authorization authForURL = manager.getAuthForURL(new URL("http://example.com"));
@@ -98,7 +100,9 @@ public void testAddFileWithoutDomainAndRealmWithMechanism() throws IOException {
     @Test
     public void testAddFileWithDomainAndRealmAndDefaultMechanism() throws IOException {
         File authFile = File.createTempFile("auth", ".txt");
-        Files.write(authFile.toPath(), "http://example.com\tuser\tpassword\tdomain\tEXAMPLE.COM\tBASIC_DIGEST".getBytes());
+        Files.write(authFile.toPath(),
+                "http://example.com\tuser\tpassword\tdomain\tEXAMPLE.COM\tBASIC_DIGEST"
+                        .getBytes(Charset.defaultCharset()));
         AuthManager manager = new AuthManager();
         manager.addFile(authFile.getAbsolutePath());
         Authorization authForURL = manager.getAuthForURL(new URL("http://example.com"));
@@ -109,7 +113,9 @@ public void testAddFileWithDomainAndRealmAndDefaultMechanism() throws IOExceptio
     @Test
     public void testAddFileWithDomainAndRealmAndMechanism() throws IOException {
         File authFile = File.createTempFile("auth", ".txt");
-        Files.write(authFile.toPath(), "http://example.com\tuser\tpassword\tdomain\tEXAMPLE.COM\tKERBEROS".getBytes());
+        Files.write(authFile.toPath(),
+                "http://example.com\tuser\tpassword\tdomain\tEXAMPLE.COM\tKERBEROS"
+                        .getBytes(Charset.defaultCharset()));
         AuthManager manager = new AuthManager();
         manager.addFile(authFile.getAbsolutePath());
         Authorization authForURL = manager.getAuthForURL(new URL("http://example.com"));
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index 82c5b46bcfa..bbfc09e3d2a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -24,6 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -328,7 +329,7 @@ private void testGetRequestEncodings(String url) throws Exception {
         // A HTTP GET request, with UTF-8 encoding
         contentEncoding = "UTF-8";
         param1Value = "yes";
-        param2Value = "0+5 -\u007c\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85";
+        param2Value = "0+5 -|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85";
         param2ValueEncoded = URLEncoder.encode(param2Value, contentEncoding);
         testGetRequest =
             "GET " + url
@@ -394,7 +395,7 @@ public void testPostRequestEncodings() throws Exception {
         // A HTTP POST request, with UTF-8 encoding
         contentEncoding = "UTF-8";
         param1Value = "yes";
-        param2Value = "0+5 -\u007c\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85";
+        param2Value = "0+5 -|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85";
         param2ValueEncoded = URLEncoder.encode(param2Value, contentEncoding);
         postBody = "param1=" + param1Value + "&param2=" + param2ValueEncoded + "\r\n";
         testPostRequest =
@@ -525,10 +526,9 @@ public void testPostMultipartFormData() throws Exception {
     @Test
     public void testParse1() throws Exception {// no space after :
         HttpRequestHdr req = new HttpRequestHdr();
-        ByteArrayInputStream bis = null;
-        bis = new ByteArrayInputStream("GET xxx HTTP/1.0\r\nname:value \r\n".getBytes("ISO-8859-1"));
-        req.parse(bis);
-        bis.close();
+        try (ByteArrayInputStream bis = new ByteArrayInputStream("GET xxx HTTP/1.0\r\nname:value \r\n".getBytes("ISO-8859-1"))) {
+            req.parse(bis);
+        }
         HeaderManager mgr = req.getHeaderManager();
         Header header;
         mgr.getHeaders();
@@ -541,10 +541,9 @@ public void testParse1() throws Exception {// no space after :
     @Test
     public void testParse2() throws Exception {// spaces after :
         HttpRequestHdr req = new HttpRequestHdr();
-        ByteArrayInputStream bis = null;
-        bis = new ByteArrayInputStream("GET xxx HTTP/1.0\r\nname:           value \r\n".getBytes("ISO-8859-1"));
-        req.parse(bis);
-        bis.close();
+        try (ByteArrayInputStream bis = new ByteArrayInputStream("GET xxx HTTP/1.0\r\nname:           value \r\n".getBytes("ISO-8859-1"))) {
+            req.parse(bis);
+        }
         HeaderManager mgr = req.getHeaderManager();
         Header header;
         mgr.getHeaders();
@@ -679,12 +678,12 @@ private void checkArgument(
     }
 
     private int getBodyLength(String postBody, String contentEncoding) throws IOException {
-        if(contentEncoding != null && contentEncoding.length() > 0) {
+        if(contentEncoding != null && !contentEncoding.isEmpty()) {
             return postBody.getBytes(contentEncoding).length;
         }
         else {
             // Most browsers use ISO-8859-1 as default encoding, even if spec says UTF-8
-            return postBody.getBytes().length; // TODO - charset?
+            return postBody.getBytes(Charset.defaultCharset()).length; // TODO - charset?
         }
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
index e771aefb559..8de0d14c694 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
@@ -32,6 +32,8 @@
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -68,7 +70,8 @@ public void setUp() throws Exception {
         postWriter=new PostWriter();
 
         // Create the test file content
-        TEST_FILE_CONTENT = "foo content &?=01234+56789-\u007c\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052".getBytes(UTF_8);
+        TEST_FILE_CONTENT = "foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052"
+                .getBytes(UTF_8);
 
         // create a temporary file to make sure we always have a file to give to the PostWriter
         // Whereever we are or Whatever the current path is.
@@ -176,7 +179,7 @@ public void testSendPostData_NoFilename() throws IOException {
         postWriter.sendPostData(connection, sampler);
 
         checkNoContentType(connection);
-        byte[] expectedUrl = "title=mytitle&description=mydescription".getBytes(); // TODO - charset?
+        byte[] expectedUrl = "title=mytitle&description=mydescription".getBytes(StandardCharsets.UTF_8);
         checkContentLength(connection, expectedUrl.length);
         checkArraysHaveSameContent(expectedUrl, connection.getOutputStreamContent());
         expectedUrl = "title=mytitle&description=mydescription".getBytes(UTF_8);
@@ -238,7 +241,7 @@ public void testSendPostData_FileAsBody() throws IOException {
         checkContentLength(connection, TEST_FILE_CONTENT.length);
         checkArraysHaveSameContent(TEST_FILE_CONTENT, connection.getOutputStreamContent());
         // Check that other encoding is not the current encoding
-        checkArraysHaveDifferentContent(new String(TEST_FILE_CONTENT) // TODO - charset?
+        checkArraysHaveDifferentContent(new String(TEST_FILE_CONTENT, Charset.defaultCharset()) // TODO - charset?
             .getBytes(otherEncoding), connection.getOutputStreamContent());
 
         // If we have both file as body, and form data, then only form data will be sent
@@ -249,7 +252,8 @@ public void testSendPostData_FileAsBody() throws IOException {
         postWriter.sendPostData(connection, sampler);
 
         checkNoContentType(connection);
-        byte[] expectedUrl = "title=mytitle&description=mydescription".getBytes(); // TODO - charset?
+        byte[] expectedUrl = "title=mytitle&description=mydescription"
+                .getBytes(Charset.defaultCharset()); // TODO - charset?
         checkContentLength(connection, expectedUrl.length);
         checkArraysHaveSameContent(expectedUrl, connection.getOutputStreamContent());
     }
@@ -619,11 +623,11 @@ public void testSetHeaders_NoFilename() throws IOException {
 
     /** setup commons parts of HTTPSampler with a no filename. */
     private void setupNoFilename(HTTPSampler httpSampler) {
-        setupFilepart(sampler, "upload", null, "application/octet-stream");
+        setupFilepart(httpSampler, "upload", null, "application/octet-stream");
     }
 
     private void setupFilepart(HTTPSampler httpSampler) {
-        setupFilepart(sampler, "upload", temporaryFile, "text/plain");
+        setupFilepart(httpSampler, "upload", temporaryFile, "text/plain");
     }
 
     private void setupFilepart(HTTPSampler httpSampler, String fileField, File file, String mimeType) {
@@ -636,7 +640,7 @@ private void setupFormData(HTTPSampler httpSampler) {
     }
 
     private void setupFormData(HTTPSampler httpSampler, String titleValue, String descriptionValue) {
-        setupFormData(sampler, false, titleValue, descriptionValue);
+        setupFormData(httpSampler, false, titleValue, descriptionValue);
     }
 
     private void setupFormData(HTTPSampler httpSampler, boolean isEncoded, String titleValue, String descriptionValue) {
@@ -740,7 +744,7 @@ private byte[] createExpectedFormdataOutput(
             output.write(titleValue.getBytes(contentEncoding));
         }
         else {
-            output.write(titleValue.getBytes()); // TODO - charset?
+            output.write(titleValue.getBytes(Charset.defaultCharset())); // TODO - charset?
         }
         output.write(CRLF);
         output.write(DASH_DASH);
@@ -762,7 +766,7 @@ private byte[] createExpectedFormdataOutput(
             output.write(descriptionValue.getBytes(contentEncoding));
         }
         else {
-            output.write(descriptionValue.getBytes()); // TODO - charset?
+            output.write(descriptionValue.getBytes(Charset.defaultCharset())); // TODO - charset?
         }
         output.write(CRLF);
         output.write(DASH_DASH);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 9b4e0a38011..1ca676f0c6b 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -25,6 +25,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -117,7 +118,7 @@ public static Test suite() {
             protected void setUp() throws Exception {
                 httpServer = TestHTTPMirrorThread.startHttpMirror(MIRROR_PORT);
                 // Create the test file content
-                TEST_FILE_CONTENT = "some foo content &?=01234+56789-\u007c\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
+                TEST_FILE_CONTENT = "some foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
                         .getBytes(StandardCharsets.UTF_8);
 
                 // create a temporary file to make sure we always have a file to give to the PostWriter
@@ -1457,7 +1458,7 @@ private byte[] createExpectedFormDataOutput(
         if (contentEncoding != null) {
             output.write(titleValue.getBytes(contentEncoding));
         } else {
-            output.write(titleValue.getBytes()); // TODO - charset?
+            output.write(titleValue.getBytes(Charset.defaultCharset())); // TODO - charset?
         }
         output.write(CRLF);
         output.write(DASH_DASH);
@@ -1479,7 +1480,7 @@ private byte[] createExpectedFormDataOutput(
         if (contentEncoding != null) {
             output.write(descriptionValue.getBytes(contentEncoding));
         } else {
-            output.write(descriptionValue.getBytes()); // TODO - charset?
+            output.write(descriptionValue.getBytes(Charset.defaultCharset())); // TODO - charset?
         }
         output.write(CRLF);
         output.write(DASH_DASH);

From fb6322030f9bc1ea97160810c3f83f066544c47c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 15:58:44 +0200
Subject: [PATCH 0210/1037] Make error prone happy by re-throwing catched
 exception

and while we are here, update to junit5
and get rid of unused code
---
 .../jmeter/control/TestIfController.java      | 51 +++++++++----------
 .../apache/jmeter/functions/PackageTest.java  | 25 ++-------
 2 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java b/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
index 1585eb8fa5e..03805d42b0d 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
@@ -17,10 +17,6 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.junit.stubs.TestSampler;
@@ -31,14 +27,15 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-public class TestIfController extends JMeterTestCase {
+class TestIfController extends JMeterTestCase {
 
     @BugId("56160")
     @Test
-    public void testStackOverflow() throws Exception {
+    void testStackOverflow() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(1);
         controller.setContinueForever(false);
@@ -65,15 +62,15 @@ public void testStackOverflow() throws Exception {
                 sampler.sample(null);
                 counter++;
             }
-            assertEquals(0, counter);
+            Assertions.assertEquals(0, counter);
         } catch (StackOverflowError e) {
-            fail("Stackoverflow occurred in testStackOverflow");
+            throw new AssertionError("Stackoverflow occurred in testStackOverflow", e);
         }
     }
 
     @BugId("53768")
     @Test
-    public void testBug53768() throws Exception {
+    void testBug53768() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(1);
         controller.setContinueForever(false);
@@ -125,19 +122,19 @@ public void testBug53768() throws Exception {
 
             Sampler sampler = controller.next();
             sampler.sample(null);
-            assertEquals("0", vars.get("VAR1"));
+            Assertions.assertEquals("0", vars.get("VAR1"));
             sampler = controller.next();
             sampler.sample(null);
-            assertEquals("0", vars.get("VAR1"));
+            Assertions.assertEquals("0", vars.get("VAR1"));
 
         } catch (StackOverflowError e) {
-            fail("Stackoverflow occurred in testStackOverflow");
+            throw new AssertionError("Stackoverflow occurred in testStackOverflow", e);
         }
     }
 
     @Test
     @Disabled
-    public void testProcessing() throws Exception {
+    void testProcessing() throws Exception {
 
         GenericController controller = new GenericController();
 
@@ -150,7 +147,7 @@ public void testProcessing() throws Exception {
     }
 
     @Test
-    public void testProcessingTrue() throws Exception {
+    void testProcessingTrue() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(2);
         controller.addTestElement(new TestSampler("Sample1"));
@@ -170,14 +167,14 @@ public void testProcessingTrue() throws Exception {
         Sampler sampler = null;
         while ((sampler = controller.next()) != null) {
             sampler.sample(null);
-            assertEquals(order[counter], sampler.getName());
+            Assertions.assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        assertEquals(counter, 6);
+        Assertions.assertEquals(counter, 6);
     }
 
     @Test
-    public void testProcessingTrueWithExpression() throws Exception {
+    void testProcessingTrueWithExpression() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(2);
         controller.addTestElement(new TestSampler("Sample1"));
@@ -198,10 +195,10 @@ public void testProcessingTrueWithExpression() throws Exception {
         Sampler sampler = null;
         while ((sampler = controller.next()) != null) {
             sampler.sample(null);
-            assertEquals(order[counter], sampler.getName());
+            Assertions.assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        assertEquals(counter, 6);
+        Assertions.assertEquals(counter, 6);
     }
 
 
@@ -209,7 +206,7 @@ public void testProcessingTrueWithExpression() throws Exception {
      * Test false return on sample3 (sample4 doesn't execute)
      */
     @Test
-    public void testEvaluateAllChildrenWithoutSubController() throws Exception {
+    void testEvaluateAllChildrenWithoutSubController() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(2);
         controller.addTestElement(new TestSampler("Sample1"));
@@ -235,17 +232,17 @@ public void testEvaluateAllChildrenWithoutSubController() throws Exception {
             if (sampler.getName().equals("Sample3")) {
                 ifCont.setCondition("true==false");
             }
-            assertEquals(order[counter], sampler.getName());
+            Assertions.assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        assertEquals(counter, 6);
+        Assertions.assertEquals(counter, 6);
     }
 
     /**
      * test 2 loops with a sub generic controller (sample4 doesn't execute)
      */
     @Test
-    public void testEvaluateAllChildrenWithSubController() throws Exception {
+    void testEvaluateAllChildrenWithSubController() throws Exception {
         LoopController controller = new LoopController();
         controller.setLoops(2);
         controller.addTestElement(new TestSampler("Sample1"));
@@ -274,14 +271,14 @@ public void testEvaluateAllChildrenWithSubController() throws Exception {
             if (sampler.getName().equals("Sample3")) {
                 ifCont.setCondition("true==false");
             }
-            assertEquals(order[counter], sampler.getName());
+            Assertions.assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        assertEquals(counter, 6);
+        Assertions.assertEquals(counter, 6);
     }
 
     @Test
-    public void shouldIgnoreEmptyLastLine() {
+    void shouldIgnoreEmptyLastLine() {
         GenericController controller = new GenericController();
 
         IfController ifCont = new IfController("true\n");
@@ -296,6 +293,6 @@ public void shouldIgnoreEmptyLastLine() {
         ifCont.setRunningVersion(true);
 
         Sampler sampler = controller.next();
-        assertFalse(sampler == null);
+        Assertions.assertNotNull(sampler);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
index ae392c9a4bf..3b6b25d975b 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
@@ -105,7 +105,7 @@ public void BSH1() throws Exception {
             bsh = BSHFParams("", "", null);
             assertEquals("", bsh.execute());
         } catch (InvalidVariableException e) {
-            fail("BeanShell not present");
+            throw new AssertionError("BeanShell not present", e);
         }
 
         bsh = BSHFParams("1", null, null);
@@ -158,25 +158,6 @@ public void BSH1() throws Exception {
 
     }
 
-    // Helper class used to implement co-routine between two threads
-    private static class Baton {
-        void pass() {
-            done();
-            try {
-                wait(1000);
-            } catch (InterruptedException e) {
-                System.out.println(e);
-            }
-        }
-
-        void done() {
-            notifyAll();
-        }
-
-    }
-
-    private static final Baton BATON = new Baton();
-
     // XPathFileContainer tests
 
     public void XPathtestNull() throws Exception {
@@ -207,7 +188,7 @@ public void XPathtestColumns() throws Exception {
         int last = 0;
         for (int i = 0; i < f.size(); i++) {
             last = f.nextRow();
-            log.debug("found [" + i + "]" + f.getXPathString(last));
+            log.debug("found [{}]{}", i, f.getXPathString(last));
         }
         assertEquals(last + 1, f.size());
 
@@ -275,7 +256,7 @@ public void XPathFile2() throws Exception{
 
     private XPath setupXPath(String file, String expr) throws Exception{
         XPath xp = new XPath();
-        xp.setParameters(makeParams(new Object[]{getResourceFilePath(file), expr}));
+        xp.setParameters(makeParams(getResourceFilePath(file), expr));
         return xp;
     }
 

From a91c28d82bbf8631c9051830bb5e78336da9266f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:33:26 +0200
Subject: [PATCH 0211/1037] Make error prone happier by using static inner
 class

While we are here, switch to junit5 methods.
---
 .../jmeter/control/TestTransactionController.java    | 12 +++++++-----
 .../samplers/TestDataStrippingSampleSender.java      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
index f9bcb6f9fc3..ac54f064793 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
@@ -17,8 +17,6 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +33,7 @@
 import org.apache.jmeter.threads.TestCompiler;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jorphan.collections.ListedHashTree;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
@@ -81,11 +80,14 @@ public void testIssue57958() throws Exception {
         thread.setOnErrorStopThread(true);
         thread.run();
 
-        assertEquals("Must one transaction samples with parent debug sample", 1, listener.events.size());
-        assertEquals("Number of samples in transaction : 1, number of failing samples : 1", listener.events.get(0).getResult().getResponseMessage());
+        Assertions.assertEquals(1, listener.events.size(),
+                "Must one transaction samples with parent debug sample");
+        Assertions.assertEquals("Number of samples in transaction : 1, number of failing samples : 1",
+                listener.events.get(0).getResult().getResponseMessage());
     }
 
-    public class TestSampleListener extends ResultCollector implements SampleListener {
+    public static class TestSampleListener extends ResultCollector implements SampleListener {
+        private static final long serialVersionUID = -1373192220822942714L;
         public List<SampleEvent> events = new ArrayList<>();
 
         @Override
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
index cac17a5d780..a2168564efe 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
@@ -92,7 +92,7 @@ private static SampleResult result(boolean isSuccess, SampleResult... subResults
         return result;
     }
 
-    private class SimpleSender implements SampleSender {
+    private static class SimpleSender implements SampleSender {
 
         private SampleResult result;
 

From b351b6df75b49605013f2fdabb8f52faf727f71f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:36:36 +0200
Subject: [PATCH 0212/1037] Silence warning about mutable enums

We are probably not using the enum as a pattern correctly, but it works
for us now. Might be worth to look further into this.
---
 .../org/apache/jmeter/extractor/TestJSONPostProcessor.java     | 3 ++-
 .../jmeter/extractor/json/jmespath/TestJMESPathExtractor.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
index 891a849d5c2..7705bee083a 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
@@ -43,12 +43,13 @@ class TestJSONPostProcessor {
 
     private static final String VAR_NAME = "varName";
 
+    @SuppressWarnings("ImmutableEnumChecker")
     private enum AccessMode {
         ALL(AbstractScopedTestElement::setScopeAll),
         PARENT(AbstractScopedTestElement::setScopeParent),
         CHILDREN(AbstractScopedTestElement::setScopeChildren);
 
-        private Consumer<AbstractScopedTestElement> applier;
+        private final Consumer<AbstractScopedTestElement> applier;
 
         AccessMode(Consumer<AbstractScopedTestElement> applier) {
             this.applier = applier;
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
index 008f18df190..b10f6e1a5a5 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
@@ -193,7 +193,8 @@ enum AccessMode {
         PARENT(AbstractScopedTestElement::setScopeParent),
         CHILDREN(AbstractScopedTestElement::setScopeChildren);
 
-        private Consumer<AbstractScopedTestElement> applier;
+        @SuppressWarnings("ImmutableEnumChecker")
+        private final Consumer<AbstractScopedTestElement> applier;
 
         AccessMode(Consumer<AbstractScopedTestElement> applier) {
             this.applier = applier;

From 1527a8fcb1c96b2270d215775687443dfadc480d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:42:41 +0200
Subject: [PATCH 0213/1037] Get rid of warning about converting long to float

by introducing a new private assertion method.
While we are here, convert to junit5 and add another assertion method
to check vor valid range.
---
 .../timers/ConstantThroughputTimerTest.java   |  91 +++++-----
 .../jmeter/samplers/TestSampleResult.java     | 160 +++++++++---------
 2 files changed, 130 insertions(+), 121 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
index f8c8df13913..a55b4bae4a3 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
@@ -17,32 +17,26 @@
 
 package org.apache.jmeter.timers;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.UUID;
 
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.TestJMeterContextService;
 import org.apache.jmeter.util.BeanShellInterpreter;
 import org.apache.jmeter.util.ScriptingTestElement;
-import org.junit.Assert;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConstantThroughputTimerTest {
 
-    private static final Logger log = LoggerFactory.getLogger(ConstantThroughputTimerTest.class);
+class ConstantThroughputTimerTest {
 
     @Test
-    public void testTimer1() throws Exception {
+    void testTimer1() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        assertEquals(0,timer.getCalcMode());// Assume this thread only
+        Assertions.assertEquals(0, timer.getCalcMode());// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
         long start = System.currentTimeMillis();
         long delay = timer.delay(); // Initialise
-        assertEquals(0,delay);
+        Assertions.assertEquals(0, delay);
         // The test tries to check if the calculated delay is correct.
         // If the build machine is busy, then the sleep(500) may take longer in
         // which case the calculated delay should be shorter.
@@ -55,107 +49,120 @@ public void testTimer1() throws Exception {
         if (expected < 0) {
             expected = 0;
         }
-        assertEquals("Expected delay of approx 500", expected, timer.delay(), 50);
+        assertAlmostEquals(expected, timer.delay(), 50);
     }
 
+    private static void assertAlmostEquals(long expected, long actual, long delta) {
+        long actualDelta = Math.abs(actual - expected);
+        if (actualDelta > delta) {
+            Assertions.fail(() -> "Expected " + expected + " within delta of " + delta
+                    + ", but got " + actual + " which is a delta of " + actualDelta);
+        }
+    }
     @Test
-    public void testTimer2() throws Exception {
+    void testTimer2() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        assertEquals(0,timer.getCalcMode());// Assume this thread only
+        Assertions.assertEquals(0, timer.getCalcMode());// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
-        assertEquals(1000,timer.calculateCurrentTarget(0)); // Should delay for 1 second
+        Assertions.assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
         timer.setThroughput(60000.0);// 1 per milli-second
-        assertEquals(1,timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
     }
 
     @Test
-    public void testTimer3() throws Exception {
+    void testTimer3() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
         timer.setMode(ConstantThroughputTimer.Mode.AllActiveThreads); //$NON-NLS-1$ - all threads
-        assertEquals(1,timer.getCalcMode());// All threads
+        Assertions.assertEquals(1, timer.getCalcMode());// All threads
         for(int i=1; i<=10; i++){
             TestJMeterContextService.incrNumberOfThreads();
         }
-        assertEquals(10,JMeterContextService.getNumberOfThreads());
+        Assertions.assertEquals(10, JMeterContextService.getNumberOfThreads());
         timer.setThroughput(600.0);// 10 per second
-        assertEquals(1000,timer.calculateCurrentTarget(0)); // Should delay for 1 second
+        Assertions.assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
         timer.setThroughput(600000.0);// 10 per milli-second
-        assertEquals(1,timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
         for(int i=1; i<=990; i++){
             TestJMeterContextService.incrNumberOfThreads();
         }
-        assertEquals(1000,JMeterContextService.getNumberOfThreads());
+        Assertions.assertEquals(1000, JMeterContextService.getNumberOfThreads());
         timer.setThroughput(60000000.0);// 1000 per milli-second
-        assertEquals(1,timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
     }
 
     @Test
-    public void testTimerBSH() throws Exception {
-        Assume.assumeTrue("BeanShell jar should be on the classpath, otherwise the test makes no sense",
-                BeanShellInterpreter.isInterpreterPresent());
+    void testTimerBSH() throws Exception {
+        Assumptions.assumeTrue(BeanShellInterpreter.isInterpreterPresent(),
+                "BeanShell jar should be on the classpath, otherwise the test makes no sense");
         BeanShellTimer timer = new BeanShellTimer();
 
         timer.setScript("\"60\"");
-        assertEquals(60, timer.delay());
+        Assertions.assertEquals(60, timer.delay());
 
         timer.setScript("60");
-        assertEquals(60, timer.delay());
+        Assertions.assertEquals(60, timer.delay());
 
         timer.setScript("5*3*4");
-        assertEquals(60,timer.delay());
+        Assertions.assertEquals(60, timer.delay());
     }
 
     @Test
-    public void testTimerJSR223Timer() throws Exception {
+    void testTimerJSR223Timer() throws Exception {
         JSR223Timer timer = new JSR223Timer();
         timer.setScriptLanguage(ScriptingTestElement.DEFAULT_SCRIPT_LANGUAGE);
         timer.setCacheKey(UUID.randomUUID().toString());
 
         timer.setScript("\"60\"");
-        assertEquals(60, timer.delay());
+        Assertions.assertEquals(60, timer.delay());
 
         timer.setScript("60");
-        assertEquals(60, timer.delay());
+        Assertions.assertEquals(60, timer.delay());
 
         timer.setScript("5*3*4");
-        assertEquals(60,timer.delay());
+        Assertions.assertEquals(60, timer.delay());
     }
 
     @Test
-    public void testUniformRandomTimer() throws Exception {
+    void testUniformRandomTimer() throws Exception {
         UniformRandomTimer timer = new UniformRandomTimer();
         timer.setDelay("1000");
         timer.setRange(100d);
         timer.iterationStart(null);
         long delay = timer.delay();
-        Assert.assertTrue("delay:"+delay +" is not in expected range", delay >= 1000 && delay <=1100);
+        assertBetween(1000, 1100, delay);
     }
 
+    private static void assertBetween(long expectedLow, long expectedHigh, long actual) {
+        if (actual < expectedLow || actual > expectedHigh) {
+            Assertions.fail(() -> "delay not in expected range: expected " + actual
+                    + " to be within " + expectedLow + " and " + expectedHigh);
+        }
+    }
     @Test
-    public void testConstantTimer() throws Exception {
+    void testConstantTimer() throws Exception {
         ConstantTimer timer = new ConstantTimer();
         timer.setDelay("1000");
         timer.iterationStart(null);
-        assertEquals(1000, timer.delay());
+        Assertions.assertEquals(1000, timer.delay());
     }
 
     @Test
-    public void testPoissonRandomTimerRangeHigherThan30() throws Exception {
+    void testPoissonRandomTimerRangeHigherThan30() throws Exception {
         PoissonRandomTimer timer = new PoissonRandomTimer();
         timer.setDelay("300");
         timer.setRange(100d);
         timer.iterationStart(null);
         long delay = timer.delay();
-        Assert.assertTrue("delay:"+delay +" is not in expected range", delay >= 356 && delay <=457);
+        assertBetween(356, 457, delay);
     }
 
     @Test
-    public void testPoissonRandomTimerRangeLowerThan30() throws Exception {
+    void testPoissonRandomTimerRangeLowerThan30() throws Exception {
         PoissonRandomTimer timer = new PoissonRandomTimer();
         timer.setDelay("300");
         timer.setRange(30d);
         timer.iterationStart(null);
         long delay = timer.delay();
-        Assert.assertTrue("delay:"+delay +" is not in expected range", delay >= 305 && delay <=362);
+        assertBetween(305, 362, delay);
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
index 9bdbea74691..a551a5287f1 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
@@ -17,24 +17,18 @@
 
 package org.apache.jmeter.samplers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.util.Calculator;
 import org.apache.jmeter.util.LogRecordingDelegatingLogger;
 import org.apache.jorphan.test.JMeterSerialTest;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class TestSampleResult implements JMeterSerialTest {
+class TestSampleResult implements JMeterSerialTest {
 
     @Test
-    public void testElapsedTrue() throws Exception {
+    void testElapsedTrue() throws Exception {
         SampleResult res = new SampleResult(true);
 
         // Check sample increments OK
@@ -43,12 +37,12 @@ public void testElapsedTrue() throws Exception {
         res.sampleEnd();
         long time = res.getTime();
         if (time < 100) {
-            fail("Sample time should be >=100, actual " + time);
+            Assertions.fail("Sample time should be >=100, actual " + time);
         }
     }
 
     @Test
-    public void testElapsedFalse() throws Exception {
+    void testElapsedFalse() throws Exception {
         SampleResult res = new SampleResult(false);
 
         // Check sample increments OK
@@ -57,12 +51,12 @@ public void testElapsedFalse() throws Exception {
         res.sampleEnd();
         long time = res.getTime();
         if (time < 100) {
-            fail("Sample time should be >=100, actual " + time);
+            Assertions.fail("Sample time should be >=100, actual " + time);
         }
     }
 
     @Test
-    public void testPauseFalse() throws Exception {
+    void testPauseFalse() throws Exception {
         SampleResult res = new SampleResult(false);
         // Check sample increments OK
         res.sampleStart();
@@ -76,11 +70,19 @@ public void testPauseFalse() throws Exception {
         totalSampleTime += sleep(100);
         res.sampleEnd();
         long sampleTime = res.getTime();
-        assertEquals("Accumulated sample time", totalSampleTime, sampleTime, 50);
+        assertAlmostEquals(totalSampleTime, sampleTime, 50, "Accumulated sample time");
     }
 
+    private static void assertAlmostEquals(long expected, long actual, long delta, String message) {
+        long actualDelta = Math.abs(expected - actual);
+        if (actualDelta > delta) {
+            Assertions.fail(() -> message + ", expected " + expected
+                    + " within delta of " + delta + ", but got " + actual
+                    + " which results in actual delta of " + actualDelta);
+        }
+    }
     @Test
-    public void testPauseTrue() throws Exception {
+    void testPauseTrue() throws Exception {
         SampleResult res = new SampleResult(true);
         // Check sample increments OK
         res.sampleStart();
@@ -94,7 +96,7 @@ public void testPauseTrue() throws Exception {
         totalSampleTime += sleep(100);
         res.sampleEnd();
         long sampleTime = res.getTime();
-        assertEquals("Accumulated sample time", totalSampleTime, sampleTime, 50);
+        assertAlmostEquals(totalSampleTime, sampleTime, 50, "Accumulated sample time");
     }
 
     private LogRecordingDelegatingLogger recordLogger;
@@ -110,76 +112,76 @@ private void divertLog() {// N.B. This needs to divert the log for SampleResult
     }
 
     @Test
-    public void testPause2True() throws Exception {
+    void testPause2True() throws Exception {
         divertLog();
         SampleResult res = new SampleResult(true);
         res.sampleStart();
         res.samplePause();
-        assertEquals(0, recordLogger.getLogRecordCount());
+        Assertions.assertEquals(0, recordLogger.getLogRecordCount());
         res.samplePause();
-        assertNotEquals(0, recordLogger.getLogRecordCount());
+        Assertions.assertNotEquals(0, recordLogger.getLogRecordCount());
     }
 
     @Test
-    public void testPause2False() throws Exception {
+    void testPause2False() throws Exception {
         divertLog();
         SampleResult res = new SampleResult(false);
         res.sampleStart();
         res.samplePause();
-        assertEquals(0, recordLogger.getLogRecordCount());
+        Assertions.assertEquals(0, recordLogger.getLogRecordCount());
         res.samplePause();
-        assertNotEquals(0, recordLogger.getLogRecordCount());
+        Assertions.assertNotEquals(0, recordLogger.getLogRecordCount());
     }
 
     @Test
-    public void testByteCount() throws Exception {
+    void testByteCount() throws Exception {
         SampleResult res = new SampleResult();
 
         res.sampleStart();
         res.setBytes(100L);
         res.setSampleLabel("sample of size 100 bytes");
         res.sampleEnd();
-        assertEquals(100, res.getBytesAsLong());
-        assertEquals("sample of size 100 bytes", res.getSampleLabel());
+        Assertions.assertEquals(100, res.getBytesAsLong());
+        Assertions.assertEquals("sample of size 100 bytes", res.getSampleLabel());
     }
 
     @Test
-    public void testSubResultsTrue() throws Exception {
+    void testSubResultsTrue() throws Exception {
         testSubResults(true, 0);
     }
 
     @Test
-    public void testSubResultsTrueThread() throws Exception {
+    void testSubResultsTrueThread() throws Exception {
         testSubResults(true, 500L, 0);
     }
 
     @Test
-    public void testSubResultsFalse() throws Exception {
+    void testSubResultsFalse() throws Exception {
         testSubResults(false, 0);
     }
 
     @Test
-    public void testSubResultsFalseThread() throws Exception {
+    void testSubResultsFalseThread() throws Exception {
         testSubResults(false, 500L, 0);
     }
 
     @Test
-    public void testSubResultsTruePause() throws Exception {
+    void testSubResultsTruePause() throws Exception {
         testSubResults(true, 100);
     }
 
     @Test
-    public void testSubResultsTruePauseThread() throws Exception {
+    void testSubResultsTruePauseThread() throws Exception {
         testSubResults(true, 500L, 100);
     }
 
     @Test
-    public void testSubResultsFalsePause() throws Exception {
+    void testSubResultsFalsePause() throws Exception {
         testSubResults(false, 100);
     }
 
     @Test
-    public void testSubResultsFalsePauseThread() throws Exception {
+    void testSubResultsFalsePauseThread() throws Exception {
         testSubResults(false, 500L, 100);
     }
 
@@ -204,7 +206,7 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
         SampleResult parent = new SampleResult(nanoTime, nanoThreadSleep);
 
         JMeterTestCase.assertPrimitiveEquals(nanoTime, parent.useNanoTime);
-        assertEquals(nanoThreadSleep, parent.nanoThreadSleep);
+        Assertions.assertEquals(nanoThreadSleep, parent.nanoThreadSleep);
 
         long beginTest = parent.currentTimeInMillis();
 
@@ -226,11 +228,11 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
         child1.sampleEnd();
         long child1Elapsed = child1.getTime();
 
-        assertTrue(child1.isSuccessful());
-        assertEquals(100, child1.getBytesAsLong());
-        assertEquals("Child1 Sample", child1.getSampleLabel());
-        assertEquals(1, child1.getSampleCount());
-        assertEquals(0, child1.getSubResults().length);
+        Assertions.assertTrue(child1.isSuccessful());
+        Assertions.assertEquals(100, child1.getBytesAsLong());
+        Assertions.assertEquals("Child1 Sample", child1.getSampleLabel());
+        Assertions.assertEquals(1, child1.getSampleCount());
+        Assertions.assertEquals(0, child1.getSubResults().length);
 
         long actualPause = 0;
         if (pause > 0) {
@@ -249,20 +251,20 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
         child2.sampleEnd();
         long child2Elapsed = child2.getTime();
 
-        assertTrue(child2.isSuccessful());
-        assertEquals(200, child2.getBytesAsLong());
-        assertEquals("Child2 Sample", child2.getSampleLabel());
-        assertEquals(1, child2.getSampleCount());
-        assertEquals(0, child2.getSubResults().length);
+        Assertions.assertTrue(child2.isSuccessful());
+        Assertions.assertEquals(200, child2.getBytesAsLong());
+        Assertions.assertEquals("Child2 Sample", child2.getSampleLabel());
+        Assertions.assertEquals(1, child2.getSampleCount());
+        Assertions.assertEquals(0, child2.getSubResults().length);
 
         // Now add the subsamples to the sample
         parent.addSubResult(child1);
         parent.addSubResult(child2);
-        assertTrue(parent.isSuccessful());
-        assertEquals(600, parent.getBytesAsLong());
-        assertEquals("Parent Sample", parent.getSampleLabel());
-        assertEquals(1, parent.getSampleCount());
-        assertEquals(2, parent.getSubResults().length);
+        Assertions.assertTrue(parent.isSuccessful());
+        Assertions.assertEquals(600, parent.getBytesAsLong());
+        Assertions.assertEquals("Parent Sample", parent.getSampleLabel());
+        Assertions.assertEquals(1, parent.getSampleCount());
+        Assertions.assertEquals(2, parent.getSubResults().length);
         long parentElapsedTotal = parent.getTime();
 
         long overallTime = parent.currentTimeInMillis() - beginTest;
@@ -277,7 +279,7 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
         long diff = parentElapsedTotal - sumSamplesTimes;
         long maxDiff = nanoTime ? 10 : 16; // TimeMillis has granularity of 10-20
         if (diff < 0 || diff > maxDiff) {
-            fail("ParentElapsed: " + parentElapsedTotal + " - " + " sum(samples): " + sumSamplesTimes
+            Assertions.fail("ParentElapsed: " + parentElapsedTotal + " - " + " sum(samples): " + sumSamplesTimes
                     + " => " + diff + " not in [0," + maxDiff + "]; nanotime=" + nanoTime);
         }
 
@@ -286,53 +288,53 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
 
         diff = overallTime - parentElapsedTotal;
         if (diff < 0 || diff > maxDiff) {
-            fail("TestElapsed: " + overallTime + " - " + " ParentElapsed: " + parentElapsedTotal
+            Assertions.fail("TestElapsed: " + overallTime + " - " + " ParentElapsed: " + parentElapsedTotal
                     + " => " + diff + " not in [0," + maxDiff + "]; nanotime=" + nanoTime);
         }
 
         // Check that calculator gets the correct statistics from the sample
         Calculator calculator = new Calculator();
         calculator.addSample(parent);
-        assertEquals(600, calculator.getTotalBytes());
-        assertEquals(1, calculator.getCount());
-        assertEquals(1d / (parentElapsedTotal / 1000d), calculator.getRate(), 0.0001d); // Allow for some margin of error
+        Assertions.assertEquals(600, calculator.getTotalBytes());
+        Assertions.assertEquals(1, calculator.getCount());
+        Assertions.assertEquals(1d / (parentElapsedTotal / 1000d), calculator.getRate(), 0.0001d); // Allow for some margin of error
         // Check that the throughput uses the time elapsed for the sub results
-        assertFalse(1d / (parentElapsed / 1000d) <= calculator.getRate());
+        Assertions.assertFalse(1d / (parentElapsed / 1000d) <= calculator.getRate());
     }
 
     // TODO some more invalid sequence tests needed
 
     @Test
-    public void testEncodingAndType() throws Exception {
+    void testEncodingAndType() throws Exception {
         // check default
         SampleResult res = new SampleResult();
-        assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
-        assertEquals("DataType should be blank", "", res.getDataType());
-        assertNull(res.getDataEncodingNoDefault());
+        Assertions.assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
+        Assertions.assertEquals("", res.getDataType(), "DataType should be blank");
+        Assertions.assertNull(res.getDataEncodingNoDefault());
 
         // check null changes nothing
         res.setEncodingAndType(null);
-        assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
-        assertEquals("DataType should be blank", "", res.getDataType());
-        assertNull(res.getDataEncodingNoDefault());
+        Assertions.assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
+        Assertions.assertEquals("", res.getDataType(), "DataType should be blank");
+        Assertions.assertNull(res.getDataEncodingNoDefault());
 
         // check no charset
         res.setEncodingAndType("text/html");
-        assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
-        assertEquals("text", res.getDataType());
-        assertNull(res.getDataEncodingNoDefault());
+        Assertions.assertEquals(SampleResult.DEFAULT_ENCODING, res.getDataEncodingWithDefault());
+        Assertions.assertEquals("text", res.getDataType());
+        Assertions.assertNull(res.getDataEncodingNoDefault());
 
         // Check unquoted charset
         res.setEncodingAndType("text/html; charset=aBcd");
-        assertEquals("aBcd", res.getDataEncodingWithDefault());
-        assertEquals("aBcd", res.getDataEncodingNoDefault());
-        assertEquals("text", res.getDataType());
+        Assertions.assertEquals("aBcd", res.getDataEncodingWithDefault());
+        Assertions.assertEquals("aBcd", res.getDataEncodingNoDefault());
+        Assertions.assertEquals("text", res.getDataType());
 
         // Check quoted charset
         res.setEncodingAndType("text/html; charset=\"aBCd\"");
-        assertEquals("aBCd", res.getDataEncodingWithDefault());
-        assertEquals("aBCd", res.getDataEncodingNoDefault());
-        assertEquals("text", res.getDataType());
+        Assertions.assertEquals("aBCd", res.getDataEncodingWithDefault());
+        Assertions.assertEquals("aBCd", res.getDataEncodingNoDefault());
+        Assertions.assertEquals("text", res.getDataType());
     }
 
     // sleep and return how long we actually slept
@@ -344,7 +346,7 @@ private long sleep(long ms) throws InterruptedException {
     }
 
     @Test
-    public void testCompareSampleLabels() {
+    void testCompareSampleLabels() {
         final boolean prevValue = TestPlan.getFunctionalMode();
         TestPlan plan = new TestPlan();
         plan.setFunctionalMode(true);
@@ -358,25 +360,25 @@ public void testCompareSampleLabels() {
             subResult.setSampleLabel("subResult label");
 
             result.addSubResult(subResult);
-            assertEquals("subResult label", subResult.getSampleLabel());
+            Assertions.assertEquals("subResult label", subResult.getSampleLabel());
 
             plan.setFunctionalMode(false);
             subResult.setSampleLabel("parent label");
             result.addRawSubResult(subResult);
-            assertEquals("parent label-0", subResult.getSampleLabel());
+            Assertions.assertEquals("parent label-0", subResult.getSampleLabel());
         } finally {
             plan.setFunctionalMode(prevValue);
         }
     }
 
     @Test
-    public void testBug63433() {
+    void testBug63433() {
         SampleResult firstResult = new SampleResult();
-        assertFalse("Expected false on first call of markFile", firstResult.markFile("result.csv"));
-        assertTrue("Expected true on second call of markFile", firstResult.markFile("result.csv"));
+        Assertions.assertFalse(firstResult.markFile("result.csv"), "Expected false on first call of markFile");
+        Assertions.assertTrue(firstResult.markFile("result.csv"), "Expected true on second call of markFile");
 
         SampleResult secondResult = new SampleResult();
-        assertFalse("Expected false on first call of markFile with null", secondResult.markFile(null));
-        assertTrue("Expected true on second call of markFile with null", secondResult.markFile(null));
+        Assertions.assertFalse(secondResult.markFile(null), "Expected false on first call of markFile with null");
+        Assertions.assertTrue(secondResult.markFile(null), "Expected true on second call of markFile with null");
     }
 }

From 32b03e9334a480fb2ef571bcbdf31168a339ac51 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:49:13 +0200
Subject: [PATCH 0214/1037] Remove unused variable

Specify charset, when none is given and use isEmpty.
---
 .../PreciseThroughputTimerTest.java           |  3 ---
 .../apache/jmeter/resources/PackageTest.java  | 26 ++++++-------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
index ed5e9734132..d6358fc40b8 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
@@ -25,11 +25,8 @@
 import java.util.Random;
 
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class PreciseThroughputTimerTest {
-    private static final Logger LOG = LoggerFactory.getLogger(PreciseThroughputTimerTest.class);
 
     @Test
     public void testTimer1() throws Exception {
diff --git a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java
index 116a27acd69..744cb69c8fe 100644
--- a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java
@@ -23,8 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -67,20 +66,12 @@
 
 public class PackageTest extends TestCase implements Describable {
     // We assume the test starts in "src/core" directory (which is true for Gradle and IDEs)
-    private static final File srcFiledir = new File("src/main/java");
     private static final File resourceFiledir = new File("src/main/resources");
 
     private static final String MESSAGES = "messages";
 
     private static PropertyResourceBundle defaultPRB; // current default language properties file
 
-    private static final CharsetEncoder ASCII_ENCODER =
-        Charset.forName("US-ASCII").newEncoder(); // Ensure properties files don't use special characters
-
-    private static boolean isPureAscii(String v) {
-      return ASCII_ENCODER.canEncode(v);
-    }
-
     // Read resource into ResourceBundle and store in List
     private PropertyResourceBundle getRAS(String res) throws Exception {
         InputStream ras = this.getClass().getResourceAsStream(res);
@@ -97,16 +88,16 @@ private PropertyResourceBundle getRAS(String res) throws Exception {
     private void readRF(String res, List<String> l) throws Exception {
         InputStream ras = this.getClass().getResourceAsStream(res);
         if (ras == null){
-            if (MESSAGES.equals(resourcePrefix)|| lang.length() == 0 ) {
+            if (MESSAGES.equals(resourcePrefix)|| lang.isEmpty()) {
                 throw new IOException("Cannot open resource file "+res);
             } else {
                 return;
             }
         }
-        try (BufferedReader fileReader = new BufferedReader(new InputStreamReader(ras));) {
+        try (BufferedReader fileReader = new BufferedReader(new InputStreamReader(ras, StandardCharsets.UTF_8))) {
             String s;
             while ((s = fileReader.readLine()) != null) {
-                if (s.length() > 0 && !s.startsWith("#") && !s.startsWith("!")) {
+                if (!s.isEmpty() && !s.startsWith("#") && !s.startsWith("!")) {
                     int equ = s.indexOf('=');
                     String key = s.substring(0, equ);
                     if (resourcePrefix.equals(MESSAGES)){// Only relevant for messages
@@ -147,7 +138,7 @@ private void readRF(String res, List<String> l) throws Exception {
 
     // Helper method to construct resource name
     private String getResName(String lang) {
-        if (lang.length() == 0) {
+        if (lang.isEmpty()) {
             return resourcePrefix+".properties";
         } else {
             return resourcePrefix+"_" + lang + ".properties";
@@ -177,7 +168,7 @@ private void check(String resname, boolean checkUnexpected) throws Exception {
             last = curr;
         }
 
-        if (resname.length() == 0) // Must be the default resource file
+        if (resname.isEmpty()) // Must be the default resource file
         {
             defaultPRB = getRAS(res);
             if (defaultPRB == null){
@@ -325,15 +316,14 @@ public void checkI18n() throws Exception {
         for (String prefix : prefixList) {
             Properties messages = new Properties();
             messages.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(prefix.substring(1)+".properties"));
-            checkMessagesForLanguage( missingLabelsPerBundle , missingLabelsPerBundle, messages,prefix.substring(1), lang);
+            checkMessagesForLanguage( missingLabelsPerBundle , messages,prefix.substring(1), lang);
         }
 
         assertEquals(missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle), 0, missingLabelsPerBundle.size());
     }
 
     private void checkMessagesForLanguage(Map<String, Map<String, String>> missingLabelsPerBundle,
-            Map<String, Map<String, String>> missingLabelsPerBundle2,
-            Properties messages, String bundlePath, String language)
+                                          Properties messages, String bundlePath, String language)
             throws IOException {
         Properties messagesFr = new Properties();
         String languageBundle = bundlePath+"_"+language+ ".properties";

From d27bc1fb17ce7369a03ca0580c9763ae57112d86 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:52:50 +0200
Subject: [PATCH 0215/1037] Suppress warning about comparing references

We really want to test for the same reference here.
---
 .../src/test/java/org/apache/jmeter/engine/TestTreeCloner.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java b/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
index 53ce8e233d8..143f5691c1f 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
@@ -36,6 +36,7 @@
 public class TestTreeCloner extends JMeterTestCase {
 
     @Test
+    @SuppressWarnings("ReferenceEquality")
     public void testCloning() throws Exception {
         ListedHashTree original = new ListedHashTree();
         GenericController controller = new GenericController();

From cf4ae3281651eabf5d01a55dcd4822793afc74a4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 16:54:18 +0200
Subject: [PATCH 0216/1037] Use ArrayList instead of LinkedList

it is considered to be faster in almost all cases.

While we are here
 * Suppress a warning about catching and printing an exception
 * Add override annotations to anonymous classes methods
 * convert to junit5 methods
 * shorten lines to less than 120 chars
 * introduce a private helper to make params (a real builder/DSL would
   be even better)
 * introduce a helper method to assert a range check
---
 .../jmeter/engine/DistributedRunnerTest.java  |   5 +-
 .../gui/logging/TestGuiLogEventAppender.java  |   7 +-
 .../util/LogRecordingDelegatingLogger.java    |   4 +-
 .../org/apache/jmeter/junit/JMeterTest.java   |   4 +-
 .../jmeter/functions/SplitFunctionTest.java   |   4 +-
 .../jmeter/functions/SumFunctionTest.java     |  20 +-
 .../jmeter/functions/TestChangeCase.java      |   4 +-
 .../TestDateTimeConvertFunction.java          |  36 +--
 .../jmeter/functions/TestDigestFunction.java  |  34 +--
 .../functions/TestEscapeOroRegexpChars.java   |  33 +-
 .../jmeter/functions/TestFileToString.java    |   4 +-
 .../jmeter/functions/TestGroovyFunction.java  |   4 +-
 .../jmeter/functions/TestIsPropDefined.java   |   4 +-
 .../jmeter/functions/TestIsVarDefined.java    |  14 +-
 .../functions/TestJavascriptFunction.java     |  32 +-
 .../jmeter/functions/TestJexl2Function.java   |  35 ++-
 .../jmeter/functions/TestMachineIPName.java   |  19 +-
 .../functions/TestRandomFromMultipleVars.java |  24 +-
 .../jmeter/functions/TestRegexFunction.java   | 288 +++++++++---------
 .../functions/TestSamplerNameFunction.java    |  19 +-
 .../jmeter/functions/TestSetProperty.java     |   4 +-
 .../jmeter/functions/TestSimpleFunctions.java |  25 +-
 .../jmeter/functions/TestTimeFunction.java    |  80 ++---
 .../jmeter/functions/TestUrlEncodeDecode.java |  19 +-
 .../protocol/http/util/TestHTTPFileArgs.java  |   4 +-
 25 files changed, 365 insertions(+), 361 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index 172b94d1691..bca31541424 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -23,8 +23,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
@@ -40,6 +40,7 @@
 @Execution(ExecutionMode.SAME_THREAD) // System.setOut must not be run concurrently with other tests
 public class DistributedRunnerTest {
 
+    @SuppressWarnings("CatchAndPrintStackTrace")
     public static void createJmeterEnv() {
         File propsFile;
         try {
@@ -127,7 +128,7 @@ public void testFailure3() {
     }
 
     private static class DistributedRunnerEmul extends DistributedRunner {
-        public List<EmulatorEngine> engines = new LinkedList<>();
+        public List<EmulatorEngine> engines = new ArrayList<>();
 
         @Override
         protected JMeterEngine createEngine(String address) {
diff --git a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
index 0182366ed7b..e59184d17c6 100644
--- a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
+++ b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
@@ -19,8 +19,8 @@
 
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.logging.log4j.Level;
@@ -43,7 +43,7 @@
 
 public class TestGuiLogEventAppender {
 
-    private static List<String> log4j2LevelErrorMessages = Collections.synchronizedList(new LinkedList<>());
+    private static List<String> log4j2LevelErrorMessages = Collections.synchronizedList(new ArrayList<>());
 
     /*
      * Configure logging with GuiLogEventAppender for root logger, and override the handler of GuiLogEventAppender
@@ -74,14 +74,17 @@ public static void beforeClass() {
 
         guiLogEventAppender.stop();
         guiLogEventAppender.setHandler(new ErrorHandler() {
+            @Override
             public void error(String msg) {
                 log4j2LevelErrorMessages.add(msg);
             }
 
+            @Override
             public void error(String msg, Throwable t) {
                 log4j2LevelErrorMessages.add(msg + " " + t);
             }
 
+            @Override
             public void error(String msg, LogEvent event, Throwable t) {
                 log4j2LevelErrorMessages.add(msg + " " + t);
             }
diff --git a/src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java b/src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
index 8938b832578..4eeda133110 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.util;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -30,7 +30,7 @@
  */
 public class LogRecordingDelegatingLogger implements Logger {
 
-    private List<LogRecord> logRecords = Collections.synchronizedList(new LinkedList<>());
+    private List<LogRecord> logRecords = Collections.synchronizedList(new ArrayList<>());
 
     private Logger delegate;
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 87a03ae61aa..9297edc5149 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -30,10 +30,10 @@
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.rmi.RemoteException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -456,7 +456,7 @@ public static Collection<Object> getObjects(Class<?> extendsClass) throws Except
         Object myThis = "";
         Iterator<String> classes = ClassFinder
                 .findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { extendsClass }).iterator();
-        List<Object> objects = new LinkedList<>();
+        List<Object> objects = new ArrayList<>();
         String n = "";
         boolean caughtError = true;
         Throwable caught = null;
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
index 69169bb8d8a..1fe81f2a311 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java
@@ -21,8 +21,8 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -159,7 +159,7 @@ public void shouldSplitWithPreviousResultOnly() throws Exception {
     // Create the SplitFile function and set its parameters.
     private static SplitFunction splitParams(String p1, String p2, String p3) throws Exception {
         SplitFunction split = new SplitFunction();
-        Collection<CompoundVariable> parms = new LinkedList<>();
+        Collection<CompoundVariable> parms = new ArrayList<>();
         parms.add(new CompoundVariable(p1));
         if (p2 != null) {
             parms.add(new CompoundVariable(p2));
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
index dc49c38447d..fc5a2ee1627 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.stream.Collectors;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -29,22 +28,23 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class SumFunctionTest extends JMeterTestCase {
+class SumFunctionTest extends JMeterTestCase {
 
     private JMeterVariables vars = null;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         JMeterContext jmctx = JMeterContextService.getContext();
         jmctx.setVariables(new JMeterVariables());
         vars = jmctx.getVariables();
     }
 
     @Test
-    public void sumTest() throws Exception {
+    void sumTest() throws Exception {
         String maxIntVal = Integer.toString(Integer.MAX_VALUE);
         String minIntVal = Integer.toString(Integer.MIN_VALUE);
 
@@ -78,19 +78,19 @@ public void sumTest() throws Exception {
     private void checkSum(AbstractFunction func, String value, String[] addends)  throws Exception {
         Collection<CompoundVariable> parms = Arrays.stream(addends)
                 .map(CompoundVariable::new)
-                .collect(Collectors.toCollection(LinkedList::new));
+                .collect(Collectors.toCollection(ArrayList::new));
         parms.add(new CompoundVariable("Result"));
         func.setParameters(parms);
-        assertEquals(value, func.execute(null,null));
-        assertEquals(value, vars.getObject("Result"));
+        Assertions.assertEquals(value, func.execute(null,null));
+        Assertions.assertEquals(value, vars.getObject("Result"));
     }
 
     // Perform a sum and check the results
     private void checkSumNoVar(AbstractFunction func, String value, String[] addends)  throws Exception {
         Collection<CompoundVariable> parms = Arrays.stream(addends)
                 .map(CompoundVariable::new)
-                .collect(Collectors.toCollection(LinkedList::new));
+                .collect(Collectors.toCollection(ArrayList::new));
         func.setParameters(parms);
-        assertEquals(value,func.execute(null,null));
+        Assertions.assertEquals(value, func.execute(null,null));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java
index a1b2237a0fd..f3c5a4f2345 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java
@@ -20,8 +20,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -93,7 +93,7 @@ public void testChangeCaseCapitalize() throws Exception {
     public void testChangeCaseError() throws Exception {
         assertThrows(
                 InvalidVariableException.class,
-                () -> changeCase.setParameters(new LinkedList<>()));
+                () -> changeCase.setParameters(new ArrayList<>()));
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java
index f219d777fc8..825eff164bf 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.TimeZone;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -31,6 +30,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jorphan.test.JMeterSerialTest;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -38,7 +38,7 @@
  * Test {@link DateTimeConvertFunction}
  * We implement JMeterSerialTest as we change TimeZone
  */
-public class TestDateTimeConvertFunction extends JMeterTestCase implements JMeterSerialTest {
+class TestDateTimeConvertFunction extends JMeterTestCase implements JMeterSerialTest {
 
     private AbstractFunction dateConvert;
     private SampleResult result;
@@ -47,7 +47,7 @@ public class TestDateTimeConvertFunction extends JMeterTestCase implements JMete
     private JMeterContext jmctx;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         dateConvert = new DateTimeConvertFunction();
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
@@ -56,7 +56,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
@@ -65,17 +65,17 @@ public void testParameterCount512() throws Exception {
     }
 
     @Test
-    public void testDateTimeConvert() throws Exception {
+    void testDateTimeConvert() throws Exception {
         params.add(new CompoundVariable("2017-01-02 21:00:21"));
         params.add(new CompoundVariable("yyyy-MM-dd HH:mm:ss"));
         params.add(new CompoundVariable("dd-MM-yyyy hh:mm"));
         dateConvert.setParameters(params);
         String returnValue = dateConvert.execute(result, null);
-        assertEquals("02-01-2017 09:00", returnValue);
+        Assertions.assertEquals("02-01-2017 09:00", returnValue);
     }
 
     @Test
-    public void testDateTimeConvertEpochTime() throws Exception {
+    void testDateTimeConvertEpochTime() throws Exception {
         TimeZone initialTZ = TimeZone.getDefault();
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         params.add(new CompoundVariable("1526574881000"));
@@ -83,33 +83,33 @@ public void testDateTimeConvertEpochTime() throws Exception {
         params.add(new CompoundVariable("dd/MM/yyyy HH:mm"));
         dateConvert.setParameters(params);
         String returnValue = dateConvert.execute(result, null);
-        assertEquals("17/05/2018 16:34", returnValue);
+        Assertions.assertEquals("17/05/2018 16:34", returnValue);
         TimeZone.setDefault(initialTZ);
     }
 
     @Test
-    public void testDateConvert() throws Exception {
+    void testDateConvert() throws Exception {
         params.add(new CompoundVariable("2017-01-02"));
         params.add(new CompoundVariable("yyyy-MM-dd"));
         params.add(new CompoundVariable("dd-MM-yyyy"));
         dateConvert.setParameters(params);
         String returnValue = dateConvert.execute(result, null);
-        assertEquals("02-01-2017", returnValue);
+        Assertions.assertEquals("02-01-2017", returnValue);
     }
 
     @Test
-    public void testDateConvertWithVariable() throws Exception {
+    void testDateConvertWithVariable() throws Exception {
         params.add(new CompoundVariable("2017-01-02"));
         params.add(new CompoundVariable("yyyy-MM-dd"));
         params.add(new CompoundVariable("dd-MM-yyyy"));
         params.add(new CompoundVariable("varName"));
         dateConvert.setParameters(params);
         dateConvert.execute(result, null);
-        assertEquals("02-01-2017", vars.get("varName"));
+        Assertions.assertEquals("02-01-2017", vars.get("varName"));
     }
 
     @Test
-    public void testDateConvertError() throws Exception {
+    void testDateConvertError() throws Exception {
         params.add(new CompoundVariable("2017-01-02"));
         params.add(new CompoundVariable("yyyy-MM-dd"));
         assertThrows(
@@ -118,20 +118,20 @@ public void testDateConvertError() throws Exception {
     }
 
     @Test
-    public void testDateConvertErrorFormat() throws Exception {
+    void testDateConvertErrorFormat() throws Exception {
         params.add(new CompoundVariable("2017-01-02"));
         params.add(new CompoundVariable("yyyy-MM-dd"));
         params.add(new CompoundVariable("abcd"));
         dateConvert.setParameters(params);
-        assertEquals(dateConvert.execute(result, null), "");
+        Assertions.assertEquals(dateConvert.execute(result, null), "");
     }
 
     @Test
-    public void testDateConvertDateError() throws Exception {
+    void testDateConvertDateError() throws Exception {
         params.add(new CompoundVariable("a2017-01-02"));
         params.add(new CompoundVariable("yyyy-MM-dd"));
         params.add(new CompoundVariable("dd-MM-yyyy HH:mm:ss"));
         dateConvert.setParameters(params);
-        assertEquals(dateConvert.execute(result, null), "");
+        Assertions.assertEquals(dateConvert.execute(result, null), "");
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java
index 77459f5bf4f..17ea4796ccb 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -29,6 +28,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,7 +47,7 @@ public void setUp() {
         JMeterVariables vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
@@ -62,9 +62,9 @@ public void testSha512WithSalt() throws Exception {
         params.add(new CompoundVariable("salt"));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals(
-                "abc8c7a1c814c74d5882e527d21fabfccf480716df9d17bae73e5e767992d8a2a47033459a9ea91aca3186f75bfbe559419109bc44c1e6dfd618101fdc0beb1b",
-                returnValue);
+        Assertions.assertEquals(
+                "abc8c7a1c814c74d5882e527d21fabfccf480716df9d17bae73e5e767992d8a2a4703345" +
+                        "9a9ea91aca3186f75bfbe559419109bc44c1e6dfd618101fdc0beb1b", returnValue);
     }
 
     @Test
@@ -74,9 +74,9 @@ public void testSha512WithSaltAndSpace() throws Exception {
         params.add(new CompoundVariable("salt "));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals(
-                "961451eb5870ded3fa484ad49fd1481ae3c6decdcc560200e70624a1d62ad0d1793edf3c8eccd0786bffab0b3e4421f54c7fd11a9e7461580352346d039b8e16",
-                returnValue);
+        Assertions.assertEquals(
+                "961451eb5870ded3fa484ad49fd1481ae3c6decdcc560200e70624a1d62ad0d1793edf3c8eccd0" +
+                        "786bffab0b3e4421f54c7fd11a9e7461580352346d039b8e16", returnValue);
     }
 
     @Test
@@ -86,9 +86,9 @@ public void testSha512WithSaltAndSpaceInBoth() throws Exception {
         params.add(new CompoundVariable("salt "));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals(
-                "3968fd028934466fa095f6323c527148e87d7b74601d1db5f474748dd7c643b4f508e46beb29a405ec658a64c0f581461e99eca063414099af0b63dc890b5739",
-                returnValue);
+        Assertions.assertEquals(
+                "3968fd028934466fa095f6323c527148e87d7b74601d1db5f474748dd7c643b4f508e46beb29a" +
+                        "405ec658a64c0f581461e99eca063414099af0b63dc890b5739", returnValue);
     }
 
     @Test
@@ -97,7 +97,7 @@ public void testSha1() throws Exception {
         params.add(new CompoundVariable("nofile"));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals("4ea2ced10057872be25371cfe638d3b096c58f2f", returnValue);
+        Assertions.assertEquals("4ea2ced10057872be25371cfe638d3b096c58f2f", returnValue);
     }
 
     @Test
@@ -109,7 +109,7 @@ public void testSha1Variable() throws Exception {
         params.add(new CompoundVariable("newVar"));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals("4EA2CED10057872BE25371CFE638D3B096C58F2F", returnValue);
+        Assertions.assertEquals("4EA2CED10057872BE25371CFE638D3B096C58F2F", returnValue);
     }
 
     @Test
@@ -121,9 +121,9 @@ public void testSha512Variable() throws Exception {
         params.add(new CompoundVariable("newVar"));
         digest.setParameters(params);
         String returnValue = digest.execute(result, null);
-        assertEquals(
-                "58DA94D45A97B35B31D7F76D2EBAC184BC4BDA512B966CDBE43FDE1CAE1CFAF89617082CA89928FB5DC1C75D60B93ADB5631F518F970CA6DCC196E1AFC678B8C",
-                returnValue);
+        Assertions.assertEquals(
+                "58DA94D45A97B35B31D7F76D2EBAC184BC4BDA512B966CDBE43FDE1CAE1CFAF89617082" +
+                        "CA89928FB5DC1C75D60B93ADB5631F518F970CA6DCC196E1AFC678B8C", returnValue);
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java
index 8091d1bcf6a..1722c309e9e 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -28,6 +26,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,7 +39,7 @@ public class TestEscapeOroRegexpChars extends JMeterTestCase {
     private JMeterContext jmctx;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         function = new EscapeOroRegexpChars();
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
@@ -49,53 +48,53 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         checkInvalidParameterCounts(function, 1, 2);
     }
 
     @Test
-    public void testNOEscape() throws Exception {
+    void testNOEscape() throws Exception {
         params.add(new CompoundVariable("toto1titi"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("toto1titi", ret);
+        Assertions.assertEquals("toto1titi", ret);
     }
 
     @Test
-    public void testEscapeSpace() throws Exception {
+    void testEscapeSpace() throws Exception {
         params.add(new CompoundVariable("toto1 titi"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("toto1\\ titi", ret);
+        Assertions.assertEquals("toto1\\ titi", ret);
     }
 
     @Test
-    public void testEscape() throws Exception {
+    void testEscape() throws Exception {
         params.add(new CompoundVariable("toto(.+?)titi"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("toto\\(\\.\\+\\?\\)titi", ret);
+        Assertions.assertEquals("toto\\(\\.\\+\\?\\)titi", ret);
     }
 
     @Test
-    public void testEscapeWithVars() throws Exception {
+    void testEscapeWithVars() throws Exception {
         params.add(new CompoundVariable("toto(.+?)titi"));
         params.add(new CompoundVariable("exportedVar"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("toto\\(\\.\\+\\?\\)titi", ret);
-        assertEquals("toto\\(\\.\\+\\?\\)titi", vars.get("exportedVar"));
+        Assertions.assertEquals("toto\\(\\.\\+\\?\\)titi", ret);
+        Assertions.assertEquals("toto\\(\\.\\+\\?\\)titi", vars.get("exportedVar"));
     }
 
     @Test
-    public void testEscape2() throws Exception {
+    void testEscape2() throws Exception {
         params.add(new CompoundVariable("[^\"].+?"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("\\[\\^\\\"\\]\\.\\+\\?", ret);
+        Assertions.assertEquals("\\[\\^\\\"\\]\\.\\+\\?", ret);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
index f6e501848ce..634482ce1ae 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
@@ -20,8 +20,8 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -52,7 +52,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
index 513a6153bb9..a8e5a28ec79 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
@@ -19,8 +19,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -58,7 +58,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
index 113eebd1391..297fc902957 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
@@ -19,8 +19,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -50,7 +50,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java
index eabc18a5544..59f3240f598 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -50,7 +48,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
@@ -63,7 +61,7 @@ public void testIsVarNotDefinedOnlyPropDefined() throws Exception {
         params.add(new CompoundVariable("file.encoding"));
         isVarDefined.setParameters(params);
         String returnValue = isVarDefined.execute(result, null);
-        assertEquals("false", returnValue);
+        Assertions.assertEquals("false", returnValue);
     }
 
     @Test
@@ -72,7 +70,7 @@ public void testIsVarDefined() throws Exception {
         params.add(new CompoundVariable("varName"));
         isVarDefined.setParameters(params);
         String returnValue = isVarDefined.execute(result, null);
-        assertEquals("true", returnValue);
+        Assertions.assertEquals("true", returnValue);
     }
 
     @Test
@@ -80,7 +78,7 @@ public void testIsVarNotDefined() throws Exception {
         params.add(new CompoundVariable("emptyProperty"));
         isVarDefined.setParameters(params);
         String returnValue = isVarDefined.execute(result, null);
-        assertEquals("false", returnValue);
+        Assertions.assertEquals("false", returnValue);
     }
 
     @Test
@@ -96,7 +94,7 @@ public void testNoVariablesDefined() throws Exception {
         params.add(new CompoundVariable("emptyProperty"));
         isVarDefined.setParameters(params);
         String returnValue = isVarDefined.execute(result, null);
-        assertEquals("false", returnValue);
+        Assertions.assertEquals("false", returnValue);
     }
 
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java
index 6835741da48..fa7840d6485 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java
@@ -17,10 +17,9 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -30,6 +29,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -42,12 +42,12 @@ public class TestJavascriptFunction extends JMeterTestCase {
     private JMeterContext jmctx;
 
     @AfterEach
-    public void tearDown() {
+    void tearDown() {
         JMeterUtils.getJMeterProperties().remove("javascript.use_rhino");
     }
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         function = new JavaScript();
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
@@ -56,49 +56,49 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         checkInvalidParameterCounts(function, 1, 2);
     }
 
     @Test
-    public void testSum() throws Exception {
+    void testSum() throws Exception {
         params.add(new CompoundVariable("1+2+3"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("6", ret);
+        Assertions.assertEquals("6", ret);
     }
 
     @Test
-    public void testSumVar() throws Exception {
+    void testSumVar() throws Exception {
         params.add(new CompoundVariable("1+2+3"));
         params.add(new CompoundVariable("TOTAL"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("6", ret);
-        assertEquals("6", vars.get("TOTAL"));
+        Assertions.assertEquals("6", ret);
+        Assertions.assertEquals("6", vars.get("TOTAL"));
     }
 
     @Test
-    public void testReplace1() throws Exception {
+    void testReplace1() throws Exception {
         params.add(new CompoundVariable(
                 "sampleResult.getResponseDataAsString().replaceAll('T','t')"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("the quick brown fox", ret);
+        Assertions.assertEquals("the quick brown fox", ret);
     }
 
     @Test
-    public void testReplace2() throws Exception {
+    void testReplace2() throws Exception {
         vars.put("URL", "/query.cgi?s1=1&amp;s2=2&amp;s3=3");
         params.add(new CompoundVariable("vars.get('URL').replaceAll('&amp;','&')"));
         params.add(new CompoundVariable("URL"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("/query.cgi?s1=1&s2=2&s3=3", ret);
-        assertEquals(ret,vars.getObject("URL"));
+        Assertions.assertEquals("/query.cgi?s1=1&s2=2&s3=3", ret);
+        Assertions.assertEquals(ret, vars.getObject("URL"));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java
index af647d0e939..ef172b26677 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -28,6 +26,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,7 +39,7 @@ public class TestJexl2Function extends JMeterTestCase {
     private JMeterContext jmctx;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         function = new Jexl2Function();
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
@@ -49,57 +48,57 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         checkInvalidParameterCounts(function, 1, 2);
     }
 
     @Test
-    public void testSum() throws Exception {
+    void testSum() throws Exception {
         params.add(new CompoundVariable("1+2+3"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("6", ret);
+        Assertions.assertEquals("6", ret);
     }
 
     @Test
-    public void testSumVar() throws Exception {
+    void testSumVar() throws Exception {
         params.add(new CompoundVariable("1+2+3"));
         params.add(new CompoundVariable("TOTAL"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("6", ret);
-        assertEquals("6", vars.get("TOTAL"));
+        Assertions.assertEquals("6", ret);
+        Assertions.assertEquals("6", vars.get("TOTAL"));
     }
 
     @Test
-    public void testReplace1() throws Exception {
+    void testReplace1() throws Exception {
         params.add(new CompoundVariable(
                 "sampleResult.getResponseDataAsString().replaceAll('T','t')"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("the quick brown fox", ret);
+        Assertions.assertEquals("the quick brown fox", ret);
     }
 
     @Test
-    public void testReplace2() throws Exception {
+    void testReplace2() throws Exception {
         vars.put("URL", "/query.cgi?s1=1&amp;s2=2&amp;s3=3");
         params.add(new CompoundVariable("vars.get('URL').replaceAll('&amp;','&')"));
         params.add(new CompoundVariable("URL"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("/query.cgi?s1=1&s2=2&s3=3", ret);
-        assertEquals(ret,vars.getObject("URL"));
+        Assertions.assertEquals("/query.cgi?s1=1&s2=2&s3=3", ret);
+        Assertions.assertEquals(ret, vars.getObject("URL"));
     }
 
     @Test
-    public void testSumWithVar() throws Exception {
+    void testSumWithVar() throws Exception {
         params.add(new CompoundVariable("var a = 1+2+3"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("6", ret);
+        Assertions.assertEquals("6", ret);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java
index e56e8047f26..347bb80fb46 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -29,6 +27,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -49,7 +48,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
@@ -66,7 +65,7 @@ public void testMachineName() throws Exception {
         function = new MachineName();
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals(JMeterUtils.getLocalHostName(), ret);
+        Assertions.assertEquals(JMeterUtils.getLocalHostName(), ret);
     }
 
     @Test
@@ -75,8 +74,8 @@ public void testMachineNameWithVar() throws Exception {
         params.add(new CompoundVariable("HOST_NAME"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals(JMeterUtils.getLocalHostName(), ret);
-        assertEquals(JMeterUtils.getLocalHostName(), vars.get("HOST_NAME"));
+        Assertions.assertEquals(JMeterUtils.getLocalHostName(), ret);
+        Assertions.assertEquals(JMeterUtils.getLocalHostName(), vars.get("HOST_NAME"));
     }
 
     @Test
@@ -84,7 +83,7 @@ public void testMachineIP() throws Exception {
         function = new MachineIP();
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals(JMeterUtils.getLocalHostIP(), ret);
+        Assertions.assertEquals(JMeterUtils.getLocalHostIP(), ret);
     }
 
     @Test
@@ -93,7 +92,7 @@ public void testMachineIPWithVar() throws Exception {
         params.add(new CompoundVariable("HOST_IP"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals(JMeterUtils.getLocalHostIP(), ret);
-        assertEquals(JMeterUtils.getLocalHostIP(), vars.get("HOST_IP"));
+        Assertions.assertEquals(JMeterUtils.getLocalHostIP(), ret);
+        Assertions.assertEquals(JMeterUtils.getLocalHostIP(), vars.get("HOST_IP"));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
index 19b23d55225..486097fbb9f 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -30,7 +28,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -43,7 +41,7 @@ public class TestRandomFromMultipleVars extends JMeterTestCase {
     private JMeterContext jmctx;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
         String data = "The quick brown fox";
@@ -52,16 +50,16 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         checkInvalidParameterCounts(function, 1, 2);
     }
 
     @Test
-    public void testExtractionFromMultipleVars() throws Exception {
+    void testExtractionFromMultipleVars() throws Exception {
         String existingVarName1 = "var1";
         String existingVarName2 = "var2";
         vars.put(existingVarName1+"_matchNr", "1");
@@ -78,7 +76,7 @@ public void testExtractionFromMultipleVars() throws Exception {
                 CoreMatchers.anyOf(CoreMatchers.is("var1_value"),
                         CoreMatchers.is("var2_value1"),
                         CoreMatchers.is("var2_value2")));
-        Assert.assertNull(vars.get("outputVar"));
+        Assertions.assertNull(vars.get("outputVar"));
     }
 
     @Test
@@ -89,8 +87,8 @@ public void test1Extraction() throws Exception {
         params.add(new CompoundVariable("var1"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        assertEquals("value1", returnValue);
-        Assert.assertNull(vars.get("outputVar"));
+        Assertions.assertEquals("value1", returnValue);
+        Assertions.assertNull(vars.get("outputVar"));
     }
 
     @Test
@@ -102,7 +100,7 @@ public void test1ExtractionWithOutputVar() throws Exception {
         params.add(new CompoundVariable("outputVar"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        assertEquals("value1", returnValue);
-        assertEquals("value1", vars.get("outputVar"));
+        Assertions.assertEquals("value1", returnValue);
+        Assertions.assertEquals("value1", vars.get("outputVar"));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
index 7682beb6b02..4fd7f19beea 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
@@ -21,7 +21,8 @@
 import static org.junit.Assert.assertNull;
 
 import java.util.Collection;
-import java.util.LinkedList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -65,10 +66,10 @@ public void setUp() {
 
     @Test
     public void testVariableExtraction() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$"));
-        params.add(new CompoundVariable("2"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$",
+                "2");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("5", match);
@@ -77,13 +78,13 @@ public void testVariableExtraction() throws Exception {
     // Test with output variable name
     @Test
     public void testVariableExtraction1a() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$")); // template
-        params.add(new CompoundVariable("2")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$", // template
+                "2", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("3", vars.getObject("OUTVAR_matchNr"));
@@ -97,13 +98,12 @@ public void testVariableExtraction1a() throws Exception {
     // Test with empty output variable name
     @Test
     public void testVariableExtraction1b() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$")); // template
-        params.add(new CompoundVariable("2")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable(""));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$", // template
+                "2", // match number
+                "-", // ALL separator
+                "default","");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("5", match);
@@ -112,14 +112,14 @@ public void testVariableExtraction1b() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("$2$")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "$2$", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -132,14 +132,14 @@ public void testVariableExtractionFromVariable() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable2() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("$1$$2$")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "$1$$2$", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -152,14 +152,14 @@ public void testVariableExtractionFromVariable2() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable3() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("pre$2$post")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "pre$2$post", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -172,14 +172,14 @@ public void testVariableExtractionFromVariable3() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable4() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("pre$2$")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "pre$2$", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -192,14 +192,14 @@ public void testVariableExtractionFromVariable4() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable5() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("$2$post")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "$2$post", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -212,14 +212,14 @@ public void testVariableExtractionFromVariable5() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable6() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("$2$$2$")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "$2$$2$", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -232,13 +232,13 @@ public void testVariableExtractionFromVariable6() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable7() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("pre$1$mid$2$post")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "pre$1$mid$2$post", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR");
         params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
         variable.setParameters(params);
         String match = variable.execute(result, null);
@@ -252,14 +252,14 @@ public void testVariableExtractionFromVariable7() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable8() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("pre$1$mid$2$")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "pre$1$mid$2$", // template
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -272,14 +272,14 @@ public void testVariableExtractionFromVariable8() throws Exception {
 
     @Test
     public void testVariableExtractionFromVariable9() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("(\\d+)\\s+(\\w+)"));
-        params.add(new CompoundVariable("$1$mid$2$post")); // template
-        params.add(new CompoundVariable("1")); // match number
-        params.add(new CompoundVariable("-")); // ALL separator
-        params.add(new CompoundVariable("default"));
-        params.add(new CompoundVariable("OUTVAR"));
-        params.add(new CompoundVariable(INPUT_VARIABLE_NAME));
+        params = makeParams(
+                "(\\d+)\\s+(\\w+)",
+                "$1$mid$2$post",
+                "1", // match number
+                "-", // ALL separator
+                "default",
+                "OUTVAR",
+                INPUT_VARIABLE_NAME);
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1", vars.getObject("OUTVAR_matchNr"));
@@ -292,10 +292,10 @@ public void testVariableExtractionFromVariable9() throws Exception {
 
     @Test
     public void testVariableExtraction2() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$1$"));
-        params.add(new CompoundVariable("3"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$1$",
+                "3");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("pinposition3", match);
@@ -303,11 +303,11 @@ public void testVariableExtraction2() throws Exception {
 
     @Test
     public void testVariableExtraction5() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$1$"));
-        params.add(new CompoundVariable("ALL"));
-        params.add(new CompoundVariable("_"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$1$",
+                "ALL",
+                "_");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("pinposition1_pinposition2_pinposition3", match);
@@ -315,12 +315,12 @@ public void testVariableExtraction5() throws Exception {
 
     @Test
     public void testVariableExtraction6() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$"));
-        params.add(new CompoundVariable("4"));
-        params.add(new CompoundVariable(""));
-        params.add(new CompoundVariable("default"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$",
+                "4",
+                "",
+                "default");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("default", match);
@@ -328,10 +328,10 @@ public void testVariableExtraction6() throws Exception {
 
     @Test
     public void testComma() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value,? field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$1$"));
-        params.add(new CompoundVariable("3"));
+        params = makeParams(
+                "<value,? field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$1$",
+                "3");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("pinposition3", match);
@@ -339,10 +339,10 @@ public void testComma() throws Exception {
 
     @Test
     public void testVariableExtraction3() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("_$1$"));
-        params.add(new CompoundVariable("2"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "_$1$",
+                "2");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("_pinposition2", match);
@@ -350,12 +350,12 @@ public void testVariableExtraction3() throws Exception {
 
     @Test
     public void testExtractionIndexTooHigh() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("_$1$"));
-        params.add(new CompoundVariable("10"));
-        params.add(new CompoundVariable(""));
-        params.add(new CompoundVariable("No Value Found"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "_$1$",
+                "10",
+                "",
+                "No Value Found");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("No Value Found", match);
@@ -363,12 +363,12 @@ public void testExtractionIndexTooHigh() throws Exception {
 
     @Test
     public void testRandomExtraction() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<company-xmlext-query-ret>(.+?)</company-xmlext-query-ret>"));
-        params.add(new CompoundVariable("$1$"));
-        params.add(new CompoundVariable("RAND"));
-        params.add(new CompoundVariable(""));
-        params.add(new CompoundVariable("No Value Found"));
+        params = makeParams(
+                "<company-xmlext-query-ret>(.+?)</company-xmlext-query-ret>",
+                "$1$",
+                "RAND",
+                "",
+                "No Value Found");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("<row>" + "<value field=\"RetCode\">" + "LIS_OK</value><value"
@@ -382,12 +382,12 @@ public void testRandomExtraction() throws Exception {
 
     @Test
     public void testExtractionIndexNotNumeric() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("_$1$"));
-        params.add(new CompoundVariable("0.333a"));
-        params.add(new CompoundVariable(""));
-        params.add(new CompoundVariable("No Value Found"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "_$1$",
+                "0.333a",
+                "",
+                "No Value Found");
         variable.setParameters(params);
         Assertions.assertThrows(
                 Exception.class,
@@ -396,10 +396,10 @@ public void testExtractionIndexNotNumeric() throws Exception {
 
     @Test
     public void testVariableExtraction4() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$, "));
-        params.add(new CompoundVariable(".333"));
+        params = makeParams(
+                "<value field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$, ",
+                ".333");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("1, ", match);
@@ -407,14 +407,20 @@ public void testVariableExtraction4() throws Exception {
 
     @Test
     public void testDefaultValue() throws Exception {
-        params = new LinkedList<>();
-        params.add(new CompoundVariable("<value,, field=\"(pinposition\\d+)\">(\\d+)</value>"));
-        params.add(new CompoundVariable("$2$, "));
-        params.add(new CompoundVariable(".333"));
-        params.add(new CompoundVariable(""));
-        params.add(new CompoundVariable("No Value Found"));
+        params = makeParams(
+                "<value,, field=\"(pinposition\\d+)\">(\\d+)</value>",
+                "$2$, ",
+                ".333",
+                "",
+                "No Value Found");
         variable.setParameters(params);
         String match = variable.execute(result, null);
         assertEquals("No Value Found", match);
     }
+
+    private static Collection<CompoundVariable> makeParams(String... params) {
+        return Stream.of(params)
+                .map(CompoundVariable::new)
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java
index 225c534d14c..83680e3c278 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -29,6 +27,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -42,32 +41,32 @@ public class TestSamplerNameFunction extends JMeterTestCase {
     private String value;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         jmctx = JMeterContextService.getContext();
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
         result = new SampleResult();
         variable = new SamplerName();
     }
 
     @Test
-    public void testSamplerName() throws Exception {
+    void testSamplerName() throws Exception {
         variable.setParameters(params);
         TestSampler sampler = new TestSampler("UnitTestSampler");
         value = variable.execute(result, sampler);
-        assertEquals("UnitTestSampler", value);
+        Assertions.assertEquals("UnitTestSampler", value);
     }
 
     @Test
-    public void testSamplerNameWithVar() throws Exception {
+    void testSamplerNameWithVar() throws Exception {
         variable.setParameters(params);
         TestSampler sampler = new TestSampler("UnitTestSampler");
         variable.setParameters(FunctionTestHelper.makeParams("var1"));
         value = variable.execute(result, sampler);
 
-        assertEquals("UnitTestSampler", value);
-        assertEquals("UnitTestSampler", vars.get("var1"));
+        Assertions.assertEquals("UnitTestSampler", value);
+        Assertions.assertEquals("UnitTestSampler", vars.get("var1"));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
index c3c80c5c15b..7a1e714d81b 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
@@ -19,8 +19,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -52,7 +52,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java
index 148745d2f48..579139b449d 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.UUID;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -33,6 +31,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jorphan.test.JMeterSerialTest;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -52,7 +51,7 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
         Thread.currentThread().setName("ThreadGroup-1");
     }
 
@@ -103,7 +102,7 @@ public void testThreadNumber() throws Exception {
         AbstractFunction function = new ThreadNumber();
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("1", ret);
+        Assertions.assertEquals("1", ret);
     }
 
     @Test
@@ -120,7 +119,7 @@ public void testEscapeHtml() throws Exception {
         params.add(new CompoundVariable("\"bread\" & \"butter\""));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("&quot;bread&quot; &amp; &quot;butter&quot;", ret);
+        Assertions.assertEquals("&quot;bread&quot; &amp; &quot;butter&quot;", ret);
     }
 
     @Test
@@ -129,7 +128,7 @@ public void testUnEscapeHtml() throws Exception {
         params.add(new CompoundVariable("&quot;bread&quot; &amp; &quot;butter&quot;"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("\"bread\" & \"butter\"", ret);
+        Assertions.assertEquals("\"bread\" & \"butter\"", ret);
     }
 
     @Test
@@ -138,7 +137,7 @@ public void testUnEscapeHtml2() throws Exception {
         params.add(new CompoundVariable("&lt;Fran&ccedil;ais&gt;"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("<Français>", ret);
+        Assertions.assertEquals("<Français>", ret);
     }
 
     @Test
@@ -147,7 +146,7 @@ public void testUnEscapeHtml3() throws Exception {
         params.add(new CompoundVariable("&gt;&zzzz;x"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals(">&zzzz;x", ret);
+        Assertions.assertEquals(">&zzzz;x", ret);
     }
 
     @Test
@@ -156,7 +155,7 @@ public void testEscapeXml() throws Exception {
         params.add(new CompoundVariable("\"bread\" & <'butter'>"));
         function.setParameters(params);
         String ret = function.execute(result, null);
-        assertEquals("&quot;bread&quot; &amp; &lt;&apos;butter&apos;&gt;", ret);
+        Assertions.assertEquals("&quot;bread&quot; &amp; &lt;&apos;butter&apos;&gt;", ret);
     }
 
     @Test
@@ -166,7 +165,7 @@ public void testTestPlanName() throws Exception {
             FileServer.getFileServer().setScriptName("Test");
             function.setParameters(params);
             String ret = function.execute(result, null);
-            assertEquals("Test", ret);
+            Assertions.assertEquals("Test", ret);
         } finally {
             FileServer.getFileServer().setScriptName(null);
         }
@@ -183,7 +182,7 @@ public void testThreadGroupName() throws Exception {
             context.setCurrentSampler(httpRequest);
             context.setThreadGroup(threadGroup);
             String ret = function.execute(result, httpRequest);
-            assertEquals("ThreadGroup-1", ret);
+            Assertions.assertEquals("ThreadGroup-1", ret);
         } finally {
             FileServer.getFileServer().setScriptName(null);
         }
@@ -199,7 +198,7 @@ public void testThreadGroupNameBug63241() throws Exception {
             context.setThreadGroup(null);
             context.setCurrentSampler(httpRequest);
             String ret = function.execute(result, httpRequest);
-            assertEquals("", ret);
+            Assertions.assertEquals("", ret);
         } finally {
             FileServer.getFileServer().setScriptName(null);
         }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java
index 397ac72708d..25ad599c2b7 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java
@@ -17,13 +17,10 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.Locale;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -32,10 +29,11 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestTimeFunction extends JMeterTestCase {
+class TestTimeFunction extends JMeterTestCase {
 
     private Function variable;
     private SampleResult result;
@@ -45,39 +43,45 @@ public class TestTimeFunction extends JMeterTestCase {
     private String value;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         jmctx = JMeterContextService.getContext();
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
         result = new SampleResult();
         variable = new TimeFunction();
     }
 
     @Test
-    public void testDefault() throws Exception {
+    void testDefault() throws Exception {
         variable.setParameters(params);
         long before = System.currentTimeMillis();
         value = variable.execute(result, null);
         long now = Long.parseLong(value);
         long after = System.currentTimeMillis();
-        assertTrue(now >= before && now <= after);
+        assertBetween(before, after, now);
+    }
+
+    private static void assertBetween(long expectedLow, long expectedHigh, long actual) {
+        if (actual < expectedLow || actual > expectedHigh) {
+            Assertions.fail(() -> actual + " not within " + expectedLow + " and " + expectedHigh);
+        }
     }
 
     @Test
-    public void testDefault1() throws Exception {
+    void testDefault1() throws Exception {
         params.add(new CompoundVariable());
         variable.setParameters(params);
         long before = System.currentTimeMillis();
         value = variable.execute(result, null);
         long now = Long.parseLong(value);
         long after = System.currentTimeMillis();
-        assertTrue(now >= before && now <= after);
+        assertBetween(before, after, now);
     }
 
     @Test
-    public void testDefault2() throws Exception {
+    void testDefault2() throws Exception {
         params.add(new CompoundVariable());
         params.add(new CompoundVariable());
         variable.setParameters(params);
@@ -85,20 +89,20 @@ public void testDefault2() throws Exception {
         value = variable.execute(result, null);
         long now = Long.parseLong(value);
         long after = System.currentTimeMillis();
-        assertTrue(now >= before && now <= after);
+        assertBetween(before, after, now);
     }
 
     @Test
-    public void testDefaultNone() throws Exception {
+    void testDefaultNone() throws Exception {
         long before = System.currentTimeMillis();
         value = variable.execute(result, null);
         long now = Long.parseLong(value);
         long after = System.currentTimeMillis();
-        assertTrue(now >= before && now <= after);
+        assertBetween(before, after, now);
     }
 
     @Test
-    public void testTooMany() throws Exception {
+    void testTooMany() throws Exception {
         params.add(new CompoundVariable("YMD"));
         params.add(new CompoundVariable("NAME"));
         params.add(new CompoundVariable("YMD"));
@@ -106,92 +110,92 @@ public void testTooMany() throws Exception {
     }
 
     @Test
-    public void testYMD() throws Exception {
+    void testYMD() throws Exception {
         params.add(new CompoundVariable("YMD"));
         params.add(new CompoundVariable("NAME"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(8, value.length());
-        assertEquals(value, vars.get("NAME"));
+        Assertions.assertEquals(8, value.length());
+        Assertions.assertEquals(value, vars.get("NAME"));
     }
 
     @Test
-    public void testYMDnoV() throws Exception {
+    void testYMDnoV() throws Exception {
         params.add(new CompoundVariable("YMD"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(8, value.length());
-        assertNull(vars.get("NAME"));
+        Assertions.assertEquals(8, value.length());
+        Assertions.assertNull(vars.get("NAME"));
     }
 
     @Test
-    public void testHMS() throws Exception {
+    void testHMS() throws Exception {
         params.add(new CompoundVariable("HMS"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(6, value.length());
+        Assertions.assertEquals(6, value.length());
     }
 
     @Test
-    public void testYMDHMS() throws Exception {
+    void testYMDHMS() throws Exception {
         params.add(new CompoundVariable("YMDHMS"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(15, value.length());
+        Assertions.assertEquals(15, value.length());
     }
 
     @Test
-    public void testUSER1() throws Exception {
+    void testUSER1() throws Exception {
         params.add(new CompoundVariable("USER1"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(0, value.length());
+        Assertions.assertEquals(0, value.length());
     }
 
     @Test
-    public void testUSER2() throws Exception {
+    void testUSER2() throws Exception {
         params.add(new CompoundVariable("USER2"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals(0, value.length());
+        Assertions.assertEquals(0, value.length());
     }
 
     @Test
-    public void testFixed() throws Exception {
+    void testFixed() throws Exception {
         params.add(new CompoundVariable("'Fixed text'"));
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals("Fixed text", value);
+        Assertions.assertEquals("Fixed text", value);
     }
 
     @Test
-    public void testMixed() throws Exception {
+    void testMixed() throws Exception {
         params.add(new CompoundVariable("G"));
         variable.setParameters(params);
         Locale locale = Locale.getDefault();
         Locale.setDefault(Locale.ENGLISH);
         value = variable.execute(result, null);
         Locale.setDefault(locale);
-        assertEquals("AD", value);
+        Assertions.assertEquals("AD", value);
     }
 
     @Test
-    public void testDivisor() throws Exception {
+    void testDivisor() throws Exception {
         params.add(new CompoundVariable("/1000"));
         variable.setParameters(params);
         long before = System.currentTimeMillis() / 1000;
         value = variable.execute(result, null);
         long now = Long.parseLong(value);
         long after = System.currentTimeMillis() / 1000;
-        assertTrue(now >= before && now <= after);
+        assertBetween(before, after, now);
     }
 
     @Test
-    public void testDivisorNoMatch() throws Exception {
+    void testDivisorNoMatch() throws Exception {
         params.add(new CompoundVariable("/1000 ")); // trailing space
         variable.setParameters(params);
         value = variable.execute(result, null);
-        assertEquals("/1000 ", value);
+        Assertions.assertEquals("/1000 ", value);
     }
 
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java
index 54f6b325264..6c53f51fd2d 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -28,6 +26,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -39,7 +38,7 @@ public class TestUrlEncodeDecode extends JMeterTestCase {
     private JMeterContext jmctx;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         result = new SampleResult();
         jmctx = JMeterContextService.getContext();
         String data = "The quick brown fox";
@@ -47,11 +46,11 @@ public void setUp() {
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
         jmctx.setPreviousResult(result);
-        params = new LinkedList<>();
+        params = new ArrayList<>();
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         AbstractFunction function = new UrlEncode();
         checkInvalidParameterCounts(function, 1, 1);
 
@@ -60,20 +59,20 @@ public void testParameterCount() throws Exception {
     }
 
     @Test
-    public void testUrlEncode() throws Exception {
+    void testUrlEncode() throws Exception {
         AbstractFunction function = new UrlEncode();
         params.add(new CompoundVariable("Veni, vidi, vici ?"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        assertEquals("Veni%2C+vidi%2C+vici+%3F", returnValue);
+        Assertions.assertEquals("Veni%2C+vidi%2C+vici+%3F", returnValue);
     }
 
     @Test
-    public void testUrlDecode() throws Exception {
+    void testUrlDecode() throws Exception {
         AbstractFunction function = new UrlDecode();
         params.add(new CompoundVariable("Veni%2C+vidi%2C+vici+%3F"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        assertEquals("Veni, vidi, vici ?", returnValue);
+        Assertions.assertEquals("Veni, vidi, vici ?", returnValue);
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
index 9d6e30c4276..fb8c4ec254f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
@@ -19,7 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -56,7 +56,7 @@ public void testAdding() throws Exception {
 
     @Test
     public void testSetHTTPFileArgs() throws Exception {
-        List<HTTPFileArg> newHTTPFileArgs = new LinkedList<>();
+        List<HTTPFileArg> newHTTPFileArgs = new ArrayList<>();
         newHTTPFileArgs.add(new HTTPFileArg("hede"));
         HTTPFileArgs files = new HTTPFileArgs();
         files.setHTTPFileArgs(newHTTPFileArgs);

From 9fb66c4ab00c8198b97f49962f262b46ce877438 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:11:15 +0200
Subject: [PATCH 0217/1037] Use newer time API to make error prone happy

---
 .../jmeter/threads/TestJMeterThread.java      |  6 +--
 .../functions/TestTimeRandomDateFunction.java | 46 +++++++++----------
 .../functions/TestTimeShiftFunction.java      | 20 ++++----
 .../http/control/TestCacheManagerBase.java    | 44 +++++++++---------
 .../TestCacheManagerThreadIteration.java      | 29 ++++++------
 5 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
index 9cbbc3be421..7ad315d949d 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.samplers.AbstractSampler;
@@ -156,9 +156,9 @@ void testBug63490EndTestWhenDelayIsTooLongForScheduler() {
         jMeterThread.setScheduled(true);
         jMeterThread.setEndTime(System.currentTimeMillis() + maxDuration);
         jMeterThread.setThreadGroup(threadGroup);
-        long startTime = new Date().getTime();
+        Instant startTime = Instant.now();
         jMeterThread.run();
-        long duration = new Date().getTime() - startTime;
+        long duration = Instant.now().toEpochMilli() - startTime.toEpochMilli();
 
         assertFalse("Sampler should not be called", dummySampler.isCalled());
 
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
index b53f7bdf01e..b0e99fd660e 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
@@ -21,10 +21,9 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 
@@ -34,6 +33,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -46,7 +46,7 @@ public class TestTimeRandomDateFunction extends JMeterTestCase {
     private String value;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         jmctx = JMeterContextService.getContext();
         vars = new JMeterVariables();
         jmctx.setVariables(vars);
@@ -56,12 +56,12 @@ public void setUp() {
     }
 
     @Test
-    public void testParameterCount() throws Exception {
+    void testParameterCount() throws Exception {
         checkInvalidParameterCounts(function, 3, 5);
     }
 
     @Test
-    public void testDefault() throws Exception {
+    void testDefault() throws Exception {
         String endDate = "2099-01-01";
         String formatDate = "yyyy-dd-MM";
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatDate);
@@ -69,22 +69,22 @@ public void testDefault() throws Exception {
         function.setParameters(params);
         value = function.execute(result, null);
         LocalDate result = LocalDate.parse(value, formatter);
-        LocalDate now = LocalDate.now();
+        LocalDate now = LocalDate.now(ZoneId.systemDefault());
         LocalDate max = LocalDate.parse(endDate, formatter);
-        assertTrue(now.isBefore(result) && result.isBefore(max));
+        Assertions.assertTrue(now.isBefore(result) && result.isBefore(max));
     }
 
     @Test
-    public void testDefault2() throws Exception {
+    void testDefault2() throws Exception {
         String endDate = "2099-01-01";
         Collection<CompoundVariable> params = makeParams("yyyy-dd-MM", "", endDate, "", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertEquals(10, value.length());
+        Assertions.assertEquals(10, value.length());
     }
 
     @Test
-    public void testFormatDate() throws Exception {
+    void testFormatDate() throws Exception {
         String endDate = "01 01 2099";
         String formatDate = "dd MM yyyy";
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatDate);
@@ -92,23 +92,23 @@ public void testFormatDate() throws Exception {
         function.setParameters(params);
         value = function.execute(result, null);
         LocalDate result = LocalDate.parse(value, formatter);
-        LocalDate now = LocalDate.now();
+        LocalDate now = LocalDate.now(ZoneId.systemDefault());
         LocalDate max = LocalDate.parse(endDate, formatter);
-        assertTrue(now.isBefore(result) && result.isBefore(max));
+        Assertions.assertTrue(now.isBefore(result) && result.isBefore(max));
     }
 
     @Test
-    public void testFormatDate2() throws Exception {
+    void testFormatDate2() throws Exception {
         String endDate = "01012099";
         String formatDate = "ddMMyyyy";
         Collection<CompoundVariable> params = makeParams(formatDate, "", endDate, "", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertEquals(8, value.length());
+        Assertions.assertEquals(8, value.length());
     }
 
     @Test
-    public void testFormatDate3() throws Exception {
+    void testFormatDate3() throws Exception {
         String startDate = "29 Aug 2111";
         String endDate = "30 Aug 2111";
         String formatDate = "dd MMM yyyy";
@@ -120,7 +120,7 @@ public void testFormatDate3() throws Exception {
     }
 
     @Test
-    public void testFrenchFormatDate() throws Exception {
+    void testFrenchFormatDate() throws Exception {
         String startDate = "29 mars 2111";
         String endDate = "30 mars 2111";
         String formatDate = "dd MMM yyyy";
@@ -132,7 +132,7 @@ public void testFrenchFormatDate() throws Exception {
     }
 
     @Test
-    public void testEmptyFormatDate() throws Exception {
+    void testEmptyFormatDate() throws Exception {
         String startDate = "2111-03-29";
         String endDate = "2111-03-30";
         String formatDate = "";
@@ -144,7 +144,7 @@ public void testEmptyFormatDate() throws Exception {
     }
 
     @Test
-    public void testEndDateBeforeStartDate() throws Exception {
+    void testEndDateBeforeStartDate() throws Exception {
         String startDate = "2111-03-29";
         String endDate = "2011-03-30";
         String formatDate = "";
@@ -156,7 +156,7 @@ public void testEndDateBeforeStartDate() throws Exception {
     }
 
     @Test
-    public void testEndDateBeforeStartDateNullVariable() throws Exception {
+    void testEndDateBeforeStartDateNullVariable() throws Exception {
         String startDate = "2111-03-29";
         String endDate = "2111-03-30";
         String formatDate = "";
@@ -168,7 +168,7 @@ public void testEndDateBeforeStartDateNullVariable() throws Exception {
     }
 
     @Test
-    public void testEndDateBeforeStartDateWithVariable() throws Exception {
+    void testEndDateBeforeStartDateWithVariable() throws Exception {
         String startDate = "2111-03-29";
         String endDate = "2111-03-30";
         String formatDate = "";
@@ -181,7 +181,7 @@ public void testEndDateBeforeStartDateWithVariable() throws Exception {
     }
 
     @Test
-    public void testInvalidFormat() throws Exception {
+    void testInvalidFormat() throws Exception {
         String startDate = "2111-03-29";
         String endDate = "2011-03-30";
         String formatDate = "abcd";
@@ -193,7 +193,7 @@ public void testInvalidFormat() throws Exception {
     }
 
     @Test
-    public void testInvalidStartDateFormat() throws Exception {
+    void testInvalidStartDateFormat() throws Exception {
         String startDate = "23-2111-03";
         String endDate = "2011-03-30";
         String formatDate = "abcd";
@@ -205,7 +205,7 @@ public void testInvalidStartDateFormat() throws Exception {
     }
 
     @Test
-    public void testInvalidEndDateFormat() throws Exception {
+    void testInvalidEndDateFormat() throws Exception {
         String startDate = "2011-03-30";
         String endDate = "23-2111-03";
         String formatDate = "abcd";
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
index f3d53da1571..a307ed8334f 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
@@ -98,7 +98,7 @@ void testDefault() throws Exception {
         long resultat = Long.parseLong(value);
         LocalDateTime nowFromFunction = LocalDateTime.ofInstant(Instant.ofEpochMilli(resultat),
                 TimeZone.getDefault().toZoneId());
-        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now()));
+        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now(ZoneId.systemDefault())));
     }
 
     @Test
@@ -106,7 +106,7 @@ void testNowPlusOneDay() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-MM-dd", "", "P1d", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        LocalDate tomorrow = LocalDate.now().plusDays(1);
+        LocalDate tomorrow = LocalDate.now(ZoneId.systemDefault()).plusDays(1);
         LocalDate tomorrowFromFunction = LocalDate.parse(value);
         assertThat(tomorrowFromFunction, sameDay(tomorrow));
     }
@@ -120,16 +120,18 @@ void testNowWithComplexPeriod() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-MM-dd'T'HH:mm:ss", "", "P10DT-1H-5M5S", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        LocalDateTime futureDate = LocalDateTime.now().plusDays(10).plusHours(-1).plusMinutes(-5).plusSeconds(5);
+        LocalDateTime futureDate = LocalDateTime.now(ZoneId.systemDefault())
+                .plusDays(10).plusHours(-1).plusMinutes(-5).plusSeconds(5);
         LocalDateTime futureDateFromFunction = LocalDateTime.parse(value);
         assertThat(futureDateFromFunction, within(1, ChronoUnit.SECONDS, futureDate));
     }
 
-    private BooleanSupplier dstChangeAhead(String duration) {
+    private static BooleanSupplier dstChangeAhead(String duration) {
         return () -> {
             ZoneId defaultZoneId = ZoneId.systemDefault();
-            Instant now = LocalDateTime.now().atZone(defaultZoneId).toInstant();
-            Instant then = LocalDateTime.now().plus(Duration.parse(duration)).atZone(defaultZoneId).toInstant();
+            Instant now = LocalDateTime.now(defaultZoneId).atZone(defaultZoneId).toInstant();
+            Instant then = LocalDateTime.now(defaultZoneId).plus(Duration.parse(duration))
+                    .atZone(defaultZoneId).toInstant();
             ZoneRules rules = defaultZoneId.getRules();
             Duration nowDST = rules.getDaylightSavings(now);
             Duration thenDST = rules.getDaylightSavings(then);
@@ -180,7 +182,7 @@ void testWrongAmountToAdd() throws Exception {
         long resultat = Long.parseLong(value);
         LocalDateTime nowFromFunction = LocalDateTime.ofInstant(Instant.ofEpochMilli(resultat),
                 TimeZone.getDefault().toZoneId());
-        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now()));
+        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now(ZoneId.systemDefault())));
     }
 
     @Test
@@ -200,13 +202,13 @@ void testRandomPeriod() throws Exception {
         function.setParameters(params);
         value = function.execute(result, null);
         LocalDateTime randomFutureDate = LocalDateTime.parse(value);
-        LocalDateTime checkFutureDate = LocalDateTime.now().plusMinutes(randomInt);
+        LocalDateTime checkFutureDate = LocalDateTime.now(ZoneId.systemDefault()).plusMinutes(randomInt);
         assertThat(randomFutureDate, within(5, ChronoUnit.SECONDS, checkFutureDate));
         randomInt = r.ints(1, 60).limit(1).findFirst().getAsInt();
         vars.put("random", String.valueOf(randomInt));
         value = function.execute(result, null);
         randomFutureDate = LocalDateTime.parse(value);
-        checkFutureDate = LocalDateTime.now().plusMinutes(randomInt);
+        checkFutureDate = LocalDateTime.now(ZoneId.systemDefault()).plusMinutes(randomInt);
         assertThat(randomFutureDate, within(5, ChronoUnit.SECONDS, checkFutureDate));
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
index b2e0def17e9..e776c2842fc 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
@@ -25,11 +25,11 @@
 
 import java.lang.reflect.Field;
 import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.protocol.http.control.CacheManager.CacheEntry;
@@ -43,22 +43,23 @@
 public abstract class TestCacheManagerBase extends JMeterTestCase {
     protected static final String LOCAL_HOST = "http://localhost/";
     protected static final String EXPECTED_ETAG = "0xCAFEBABEDEADBEEF";
-    protected static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+    protected static final ZoneId GMT = ZoneId.of("GMT");
     protected CacheManager cacheManager;
     protected String currentTimeInGMT;
     protected String vary = null;
     protected URL url;
     protected HTTPSampleResult sampleResultOK;
 
-    protected String makeDate(Date d) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
-        simpleDateFormat.setTimeZone(GMT);
-        return simpleDateFormat.format(d);
+    protected String makeDate(Instant d) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z")
+                .withLocale(Locale.US)
+                .withZone(GMT);
+        return formatter.format(d);
     }
 
     public void setUp() throws Exception {
         this.cacheManager = new CacheManager();
-        this.currentTimeInGMT = makeDate(new Date());
+        this.currentTimeInGMT = makeDate(Instant.now());
         this.url = new URL(LOCAL_HOST);
 
         this.sampleResultOK = getSampleResultWithSpecifiedResponseCode("200");
@@ -106,7 +107,7 @@ public void testExpiresBug59962() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start + 2000)));
+        setExpires(makeDate(Instant.ofEpochMilli(start + 2000)));
         cacheResultWithGivenCode("304");
         assertValidEntry();
         sleepTill(start + 2010);
@@ -119,7 +120,7 @@ public void testExpires() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start + 2000)));
+        setExpires(makeDate(Instant.ofEpochMilli(start + 2000)));
         cacheResult(sampleResultOK);
         assertValidEntry();
         sleepTill(start + 2010);
@@ -131,7 +132,7 @@ public void testNoExpires() throws Exception {
         this.cacheManager.setUseExpires(false);
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
-        setExpires(makeDate(new Date(System.currentTimeMillis() + 2000)));
+        setExpires(makeDate(Instant.ofEpochMilli(System.currentTimeMillis() + 2000)));
         cacheResult(sampleResultOK);
         assertInvalidEntry();
     }
@@ -142,7 +143,7 @@ public void testCacheControl() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         assertValidEntry();
@@ -213,7 +214,7 @@ private void testCacheVary(String vary, Header[] origHeaders, Header[] different
         this.cacheManager.testIterationStart(null);
         assertNull(getThreadCacheEntry(LOCAL_HOST), "Should not find entry");
         assertFalse(this.cacheManager.inCache(url, origHeaders), "Should not find valid entry");
-        setExpires(makeDate(new Date(System.currentTimeMillis())));
+        setExpires(makeDate(Instant.ofEpochMilli(System.currentTimeMillis())));
         setCacheControl("public, max-age=5");
         sampleResultOK.setRequestHeaders(asString(origHeaders));
         this.vary = vary;
@@ -230,7 +231,7 @@ public void testCacheHEAD() throws Exception {
         this.cacheManager.setUseExpires(true);
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
-        setExpires(makeDate(new Date(System.currentTimeMillis())));
+        setExpires(makeDate(Instant.ofEpochMilli(System.currentTimeMillis())));
         setCacheControl("public, max-age=5");
         HTTPSampleResult sampleResultHEAD = getSampleResultWithSpecifiedResponseCode("200");
         sampleResultHEAD.setHTTPMethod("HEAD");
@@ -244,7 +245,7 @@ public void testPrivateCache() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("private, max-age=1");
         cacheResult(sampleResultOK);
         assertValidEntry();
@@ -264,7 +265,7 @@ public void testNoCacheControlNoMaxAgeNoExpire() throws Exception {
         // be fresh for the next 10% of X seconds == 0.1*X seconds
         long start = System.currentTimeMillis();
         long age = 30 * 1000; // 30 seconds
-        setLastModified(makeDate(new Date(start - age)));
+        setLastModified(makeDate(Instant.ofEpochMilli(start - age)));
         cacheResult(sampleResultOK);
         assertValidEntry();
         sleepTill(start + age / 10 + 1010);
@@ -283,7 +284,7 @@ public void testPrivateCacheNoMaxAgeNoExpire() throws Exception {
         // be fresh for the next 10% of X seconds == 0.1*X seconds
         long start = System.currentTimeMillis();
         long age = 30 * 1000; // 30 seconds
-        setLastModified(makeDate(new Date(start - age)));
+        setLastModified(makeDate(Instant.ofEpochMilli(start - age)));
         cacheResult(sampleResultOK);
         assertValidEntry();
         sleepTill(start + age / 10 + 1010);
@@ -296,7 +297,7 @@ public void testPrivateCacheExpireNoMaxAge() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start + 2000)));
+        setExpires(makeDate(Instant.ofEpochMilli(start + 2000)));
         setCacheControl("private");
         cacheResult(sampleResultOK);
         assertValidEntry();
@@ -340,7 +341,7 @@ public void testCacheHttpClientBug51932() throws Exception {
         this.cacheManager.testIterationStart(null);
         assertNoSuchEntry();
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1, no-transform");
         cacheResult(sampleResultOK);
         assertValidEntry();
@@ -352,7 +353,8 @@ public void testCacheHttpClientBug51932() throws Exception {
     private void assertInvalidEntry() throws Exception {
         CacheEntry cachedEntry = getThreadCacheEntry(LOCAL_HOST);
         assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Should find entry");
-        assertFalse(this.cacheManager.inCache(url), "Should not find valid entry. Found: " + cachedEntry + " at " + System.currentTimeMillis());
+        assertFalse(this.cacheManager.inCache(url),
+                () -> "Should not find valid entry. Found: " + cachedEntry + " at " + System.currentTimeMillis());
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
index cbf6e6a5908..68c260cc9f5 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
@@ -25,13 +25,13 @@
 import java.lang.reflect.Field;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -62,7 +62,7 @@ public class TestCacheManagerThreadIteration {
     private static final String SAME_USER="__jmv_SAME_USER";
     protected static final String LOCAL_HOST = "http://localhost/";
     protected static final String EXPECTED_ETAG = "0xCAFEBABEDEADBEEF";
-    protected static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+    protected static final ZoneId GMT = ZoneId.of("GMT");
     protected CacheManager cacheManager;
     protected String currentTimeInGMT;
     protected String vary = null;
@@ -226,10 +226,11 @@ public java.net.URI getURI() {
         }
     }
 
-    protected String makeDate(Date d) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
-        simpleDateFormat.setTimeZone(GMT);
-        return simpleDateFormat.format(d);
+    protected String makeDate(Instant d) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z")
+                .withLocale(Locale.US)
+                .withZone(GMT);
+        return formatter.format(d);
     }
 
     protected HTTPSampleResult getSampleResultWithSpecifiedResponseCode(String code) {
@@ -246,7 +247,7 @@ protected HTTPSampleResult getSampleResultWithSpecifiedResponseCode(String code)
     @BeforeEach
     public void setUp() throws Exception {
         this.cacheManager = new CacheManager();
-        this.currentTimeInGMT = makeDate(new Date());
+        this.currentTimeInGMT = makeDate(Instant.now());
         this.url = new URL(LOCAL_HOST);
         this.sampleResultOK = getSampleResultWithSpecifiedResponseCode("200");
         this.httpMethod = new HttpPostStub();
@@ -311,7 +312,7 @@ public void testCacheControlCleared() throws Exception {
         Header[] headers = new Header[1];
         assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         assertNotNull("Before iternation, should find entry", getThreadCacheEntry(LOCAL_HOST));
@@ -357,7 +358,7 @@ public void testCacheManagerWhenThreadIterationIsANewUser() throws Exception {
         Header[] headers = new Header[1];
         assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         this.cacheManager.setThreadContext(jmctx);
@@ -373,7 +374,7 @@ public void testCacheManagerWhenThreadIterationIsANewUser() throws Exception {
         jmctx.setVariables(jmvars);
         this.cacheManager.setThreadContext(jmctx);
         start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         assertNotNull("Before iternation, should find entry", getThreadCacheEntry(LOCAL_HOST));
@@ -396,7 +397,7 @@ public void testCacheManagerWhenThreadIterationIsSameUser() throws Exception {
         Header[] headers = new Header[1];
         assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
         long start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         this.cacheManager.setThreadContext(jmctx);
@@ -411,7 +412,7 @@ public void testCacheManagerWhenThreadIterationIsSameUser() throws Exception {
         jmctx.setVariables(jmvars);
         this.cacheManager.setThreadContext(jmctx);
         start = System.currentTimeMillis();
-        setExpires(makeDate(new Date(start)));
+        setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         assertNotNull("Before iteration, should find entry", getThreadCacheEntry(LOCAL_HOST));

From ee2353ed1cf75ff87c17ce87fab66326d561821c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:15:32 +0200
Subject: [PATCH 0218/1037] Add override annotations to make error prone happy

---
 .../jmeter/functions/TestJavascriptFunctionWithRhino.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java
index e302ac3a687..7b4f32b1dbd 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java
@@ -25,12 +25,14 @@
 public class TestJavascriptFunctionWithRhino extends TestJavascriptFunction {
 
     @BeforeEach
+    @Override
     public void setUp() {
         JMeterUtils.getJMeterProperties().put("javascript.use_rhino", "true");
         super.setUp();
     }
 
     @AfterEach
+    @Override
     public void tearDown() {
         JMeterUtils.getJMeterProperties().remove("javascript.use_rhino");
     }

From 16340ba1b8a0d441cb52c58423ebc0d3bf343fb9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:21:19 +0200
Subject: [PATCH 0219/1037] Suppress warning about calling wait without a loop

While it is certainly not good to wait ouside a loop,
it is not that problematic here, as the test should fail
in such a case.
---
 .../src/test/java/org/apache/jmeter/functions/Synchronizer.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java b/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
index ebcd95648d3..93a061444d2 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
@@ -25,6 +25,7 @@ void done() {
         notifyAll();
     }
 
+    @SuppressWarnings("WaitNotInLoop")
     void pass() {
         done();
         try {

From 522b86aa89399b52ff9b2e89ba4be64a016ca638 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:22:52 +0200
Subject: [PATCH 0220/1037] Suppress warnings about old date API

we have to use it here.
---
 .../src/test/java/org/apache/jorphan/util/TestConverter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
index 2165b509924..adeef4002d3 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java
@@ -65,14 +65,14 @@ public void testGetCalendarObjectCalendarWithInvalidStringAndNullDefault() {
     }
 
     @Test
-    @SuppressWarnings({ "UndefinedEquals", "JdkObsolete" })
+    @SuppressWarnings({ "UndefinedEquals", "JavaUtilDate" })
     public void testGetDateObjectDateWithTimeAndNullDefault() {
         Date time = new Date();
         assertEquals(time, Converter.getDate(time, null));
     }
 
     @Test
-    @SuppressWarnings({ "UndefinedEquals", "JdkObsolete" })
+    @SuppressWarnings({ "UndefinedEquals", "JavaUtilDate" })
     public void testGetDateObjectDateWithNullAndDateAsDefault() {
         Date date = new Date();
         assertEquals(date, Converter.getDate(null, date));

From bcb2f2261c79a7c0c8e73b901d6f6c7b6f5ff4c7 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:23:48 +0200
Subject: [PATCH 0221/1037] Suppress diverse warnings in test code

* It might not be nice to catch and print the stack trace, but it
  has been done this way for a long time. (Fix it, if you like)
* Get rid of unnecessary toString and with it a warning about default
  char encoding
---
 .../jmeter/protocol/http/proxy/NonGuiProxySample.java     | 2 +-
 .../protocol/mail/sampler/TestMailReaderSampler.java      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java
index 696e731ae02..3af17cf1586 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java
@@ -78,7 +78,7 @@ public static void main(String[] args) throws IllegalUserActionException,
         try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             SaveService.saveTree(treeModel.getTestPlan(), out);
             out.close();
-            System.out.println(out.toString());
+            System.out.println(out);
         }
 
     }
diff --git a/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java b/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
index 2298d0b0581..406d55b9988 100644
--- a/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
+++ b/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
@@ -17,18 +17,18 @@
 
 package org.apache.jmeter.protocol.mail.sampler;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Properties;
 
 import org.apache.jmeter.util.JMeterUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestMailReaderSampler {
 
+    @SuppressWarnings("CatchAndPrintStackTrace")
     public static void createJMeterEnv() {
         File propsFile;
         try {
@@ -51,7 +51,7 @@ public void testPassCustomProperties() {
         MailReaderSampler sampler = new MailReaderSampler();
         Properties properties = new Properties();
         sampler.addCustomProperties(properties);
-        assertEquals(1, properties.size());
-        assertEquals("mail.prop2.value", properties.getProperty("mail.prop2.name"));
+        Assertions.assertEquals(1, properties.size());
+        Assertions.assertEquals("mail.prop2.value", properties.getProperty("mail.prop2.name"));
     }
 }

From 14ab8da63b820feb66ab1539cdab4976b77ae4e1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:26:38 +0200
Subject: [PATCH 0222/1037] Silence warnings in test code and use correct
 parameter when calling chained constructor

When chaining the constructor to add a default UA, we lost one parameter (replaced it
with another). That seems wrong, so I changed it back to the (hopefully) correct one.

While we are here, suppress a few other warnings from error prone, that can't be
fixed in a quick way. Feel free, to fix them.
---
 .../protocol/http/parser/TestHTMLParser.java     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 1566cbc601f..8155eb17965 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -90,6 +90,7 @@ private StaticTestClass() {
         }
     }
 
+    @SuppressWarnings("ClassCanBeStatic")
     private class TestClass // Can't instantiate
     {
         private TestClass() {
@@ -99,7 +100,7 @@ private TestClass() {
     private static class TestData {
         private String fileName;
 
-        private String baseURL;
+        private String baseUrl;
 
         private String expectedSet;
 
@@ -113,10 +114,9 @@ private static class TestData {
          * @param baseUrl Base URL
          * @param expectedSet Set of expected URLs
          * @param expectedList List of expected URLs
-         * @param userAgent User Agent
          */
         private TestData(String htmlFileName, String baseUrl, String expectedSet, String expectedList) {
-            this(htmlFileName, baseUrl, expectedList, expectedList, DEFAULT_UA);
+            this(htmlFileName, baseUrl, expectedSet, expectedList, DEFAULT_UA);
         }
         /**
          *
@@ -128,7 +128,7 @@ private TestData(String htmlFileName, String baseUrl, String expectedSet, String
          */
         private TestData(String htmlFileName, String baseUrl, String expectedSet, String expectedList, String userAgent) {
             this.fileName = htmlFileName;
-            this.baseURL = baseUrl;
+            this.baseUrl = baseUrl;
             this.expectedSet = expectedSet;
             this.expectedList = expectedList;
             this.userAgent = userAgent;
@@ -359,26 +359,28 @@ public void testNotCreatableStatic() throws Exception {
 
     public void testParserSet() throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
-        filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseURL, TESTS[testNumber].expectedSet, null,
+        filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedSet, null,
                 false, TESTS[testNumber].userAgent);
     }
 
+    @SuppressWarnings("JdkObsolete")
     public void testParserList() throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
-        filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseURL, TESTS[testNumber].expectedList,
+        filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedList,
                 new Vector<URLString>(), true, TESTS[testNumber].userAgent);
     }
 
     public void testSpecificParserList() throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
-                SPECIFIC_PARSER_TESTS[testNumber].baseURL,
+                SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
                 SPECIFIC_PARSER_TESTS[testNumber].expectedList,
                 new ArrayList<URLString>(), true,
                 SPECIFIC_PARSER_TESTS[testNumber].userAgent);
     }
 
 
+    @SuppressWarnings("URLEqualsHashCode")
     private static void filetest(HTMLParser p, String file, String url, String resultFile, Collection<URLString> c,
             boolean orderMatters, // Does the order matter?
             String userAgent)

From 89f4a76c61004cf68598b92883e2d1456e6c8ba1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 17:36:27 +0200
Subject: [PATCH 0223/1037] Updated a few dependencies

---
 checksum.xml                                |  3 ++
 gradle.properties                           | 26 ++++++++--------
 src/dist/src/dist/expected_release_jars.csv | 34 ++++++++++-----------
 xdocs/changes.xml                           | 17 ++++++-----
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 3d43a4475cc..d40d479ca24 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -16,6 +16,7 @@
     <trusted-key id='07d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
     <trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
     <trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
+    <trusted-key id='249dee8e2c07a0a2' group='com.github.javaparser' />
     <trusted-key id='379ce192d401ab61' group='com.github.javaparser' />
     <trusted-key id='431b8f80403a7dc1' group='com.github.javaparser' />
     <trusted-key id='8ea48d105232855d' group='com.github.jknack' />
@@ -143,6 +144,7 @@
     <trusted-key id='e91287822fdb81b1' group='org.apache.xbean' />
     <trusted-key id='5b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
     <trusted-key id='85911f425ec61b51' group='org.apiguardian' />
+    <trusted-key id='0cc0b712fee75827' group='org.assertj' />
     <trusted-key id='e2b3d84202b812d9' group='org.assertj' />
     <trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
     <trusted-key id='be84d764623a3644' group='org.brotli' />
@@ -189,6 +191,7 @@
     <trusted-key id='85911f425ec61b51' group='org.junit.platform' />
     <trusted-key id='85911f425ec61b51' group='org.junit.vintage' />
     <trusted-key id='82216a03caa86c78' group='org.mongodb' />
+    <trusted-key id='2f45f85cdf082e68' group='org.mozilla' />
     <trusted-key id='3f36885c24df4b75' group='org.mozilla' />
     <trusted-key id='7ad289796be2ffe2' group='org.neo4j.driver' />
     <trusted-key id='f8052e4e1bd0db31' group='org.neo4j.driver' />
diff --git a/gradle.properties b/gradle.properties
index 6caea8bcf3b..56428b4043f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -61,7 +61,7 @@ activemq.version=5.16.4
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
 asm.version=9.2
-bouncycastle.version=1.69
+bouncycastle.version=1.70
 bsf.version=2.4.0
 bsh.version=2.0b6
 caffeine.version=2.9.3
@@ -84,12 +84,12 @@ darklaf.version=2.7.3
 darklaf.extensions.version=0.3.4
 dec.version=0.1.2
 dnsjava.version=2.1.9
-equalsverifier.version=3.9
+equalsverifier.version=3.10
 freemarker.version=2.3.31
-ftplet-api.version=1.1.3
-ftpserver-core.version=1.1.3
+ftplet-api.version=1.2.0
+ftpserver-core.version=1.2.0
 geronimo-jms_1.1_spec.version=1.1.1
-groovy.version=3.0.9
+groovy.version=3.0.10
 hamcrest.version=2.2
 hamcrest-date.version=2.0.8
 hsqldb.version=2.5.2
@@ -98,8 +98,8 @@ httpclient.version=4.5.13
 httpcore-nio.version=4.4.15
 httpcore.version=4.4.15
 httpmime.version=4.5.13
-jackson.version=2.13.1
-jackson-databind.version=2.13.1
+jackson.version=2.13.2
+jackson-databind.version=2.13.2.2
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
@@ -107,7 +107,7 @@ jetbrains-annotations.version=23.0.0
 jmespath-core.version=0.5.1
 jmespath-jackson.version=0.5.1
 jodd.version=5.0.13
-json-path.version=2.6.0
+json-path.version=2.7.0
 json-smart.version=2.4.8
 jsoup.version=1.14.3
 jtidy.version=r938
@@ -120,16 +120,16 @@ mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.1.6
 mongo-java-driver.version=2.11.3
-neo4j-java-driver.version=4.4.3
+neo4j-java-driver.version=4.4.5
 objenesis.version=3.2
 oro.version=2.0.8
 ph-commons.version=10.1.6
 ph-css.version=6.5.0
-rhino.version=1.7.13
-rsyntaxtextarea.version=3.1.6
-Saxon-HE.version=11.2
+rhino.version=1.7.14
+rsyntaxtextarea.version=3.2.0
+Saxon-HE.version=11.3
 slf4j.version=1.7.36
-spock-core.version=2.0-M2-groovy-3.0
+spock-core.version=2.1-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
 tika.version=1.28.1
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index d627e3d9648..f518fb736e9 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -52,15 +52,15 @@
 15992,error_prone_annotations-2.10.0.jar
 1715750,freemarker-2.3.31.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8004986,groovy-3.0.9.jar
-19457,groovy-datetime-3.0.9.jar
-11684,groovy-dateutil-3.0.9.jar
-137553,groovy-jmx-3.0.9.jar
-133032,groovy-json-3.0.9.jar
-21294,groovy-jsr223-3.0.9.jar
-82930,groovy-sql-3.0.9.jar
-97097,groovy-templates-3.0.9.jar
-296025,groovy-xml-3.0.9.jar
+8014657,groovy-3.0.10.jar
+19460,groovy-datetime-3.0.10.jar
+11688,groovy-dateutil-3.0.10.jar
+137554,groovy-jmx-3.0.10.jar
+133032,groovy-json-3.0.10.jar
+21298,groovy-jsr223-3.0.10.jar
+83198,groovy-sql-3.0.10.jar
+97128,groovy-templates-3.0.10.jar
+296091,groovy-xml-3.0.10.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar
@@ -69,9 +69,9 @@
 328324,httpcore-4.4.15.jar
 369486,httpcore-nio-4.4.15.jar
 41790,httpmime-4.5.13.jar
-75717,jackson-annotations-2.13.1.jar
-374588,jackson-core-2.13.1.jar
-1534017,jackson-databind-2.13.1.jar
+75717,jackson-annotations-2.13.2.jar
+374739,jackson-core-2.13.2.jar
+1535087,jackson-databind-2.13.2.2.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -81,7 +81,7 @@
 220475,jodd-lagarto-5.0.13.jar
 19858,jodd-log-5.0.13.jar
 26047,jodd-props-5.0.13.jar
-238605,json-path-2.6.0.jar
+271159,json-path-2.7.0.jar
 119545,json-smart-2.4.8.jar
 423395,jsoup-1.14.3.jar
 249924,jtidy-r938.jar
@@ -103,7 +103,7 @@
 22576,miglayout-swing-5.3.jar
 419054,mongo-java-driver-2.11.3.jar
 29680,mxparser-1.2.2.jar
-4890898,neo4j-java-driver-4.4.3.jar
+4878084,neo4j-java-driver-4.4.5.jar
 65261,oro-2.0.8.jar
 1308773,ph-commons-10.1.6.jar
 530791,ph-css-6.5.0.jar
@@ -113,9 +113,9 @@
 116030,plot-common-portable-jvm-2.2.1.jar
 749095,plot-config-portable-jvm-2.2.1.jar
 11369,reactive-streams-1.0.3.jar
-1315838,rhino-1.7.13.jar
-1245900,rsyntaxtextarea-3.1.6.jar
-5104409,Saxon-HE-11.2.jar
+1383644,rhino-1.7.14.jar
+1248250,rsyntaxtextarea-3.2.0.jar
+5111311,Saxon-HE-11.3.jar
 276420,serializer-2.7.2.jar
 41125,slf4j-api-1.7.36.jar
 301279,svgSalamander-1.1.2.4.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 39650534bd3..805216f8e25 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -169,39 +169,39 @@ however, the profile can't be updated while the test is running.
   <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
-  <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>
+  <li>Updated Groovy to 3.0.10 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
   <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
-  <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
+  <li>Updated Bouncycastle to 1.70 (from 1.67).</li>
   <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>
   <li>Updated Apache commons-dbcp2 to 2.9.0 (from 2.8.0).</li>
   <li>Updated Apache commons-io to 2.11.0 (from 2.8.0).</li>
   <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>
   <li>Updated Apache commons-net to 3.8.0 (from 3.7.2).</li>
   <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
-  <li>Updated equalsverifier to 3.9 (from 3.4.2).</li>
+  <li>Updated equalsverifier to 3.10 (from 3.4.2).</li>
   <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
   <li>Updated hsqldb to 2.5.2 (from 2.5.0).</li>
   <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
   <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
-  <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
+  <li>Updated json-path to 2.7.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
-  <li>Updated Neo4j Java driver to 4.4.4 (from 4.2.0).</li>
+  <li>Updated Neo4j Java driver to 4.4.5 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
   <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
-  <li>Updated RSyntaxTextArea to 3.1.6 (from 3.1.1).</li>
+  <li>Updated RSyntaxTextArea to 3.2.0 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.36 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
   <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
-  <li>Updated jackson to 2.13.1 (from 2.10.5)</li>
+  <li>Updated jackson to 2.13.2 (from 2.10.5)</li>
   <li>Updated jmespath to 0.5.1</li>
   <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
   <li>Updated Apache xmlgraphics commons to 2.7 (from 2.6)</li>
@@ -218,6 +218,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
   <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
   <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.com)></li>
+  <li>Updated Rhino JavaScript to 1.7.14 (from 1.7.13)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -407,7 +408,7 @@ export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
 With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
   <dl>
     <dt>Use Mozilla Rhino</dt>
-    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
     <dt>Use OpenJDK Nashorn</dt>
     <dd>
       The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:

From eaf5d0edfe1cbe0b8eb9608c0a1de538b1c7c67a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 19:20:11 +0200
Subject: [PATCH 0224/1037] Use correct constructors for Charset aware Reader

and clean-up the code a bit
---
 .../resources/ResourceKeyUsageTest.java       | 49 ++++++++-----------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
index b9af52655fb..0a5f37344dc 100644
--- a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
@@ -17,15 +17,13 @@
 
 package org.apache.jmeter.resources;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,10 +32,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.jorphan.util.JOrphanUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class ResourceKeyUsageTest {
+class ResourceKeyUsageTest {
     // We assume the test starts in "module" (e.g. src/core) directory (which is true for Gradle and IDEs)
     private static final File srcFiledir = new File("src/main/java");
 
@@ -52,23 +50,21 @@ private PropertyResourceBundle getRAS(String res) throws Exception {
 
     // Check that calls to getResString use a valid property key name
     @Test
-    @SuppressWarnings("CatchAndPrintStackTrace")
-    public void checkResourceReferences() throws Exception {
+    void checkResourceReferences() throws Exception {
         String resourceName = "/org/apache/jmeter/resources/messages.properties";
         PropertyResourceBundle messagePRB = getRAS(resourceName);
-        assertNotNull("Resource bundle " + resourceName + " was not found", resourceName);
+        Assertions.assertNotNull(resourceName, () -> "Resource bundle " + resourceName + " was not found");
         List<String> failures = new ArrayList<>();
+        final List<Exception> exceptions = new ArrayList<>();
 
-        PackageTest.findFile(srcFiledir, null, new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                final File file = new File(dir, name);
-                // Look for calls to JMeterUtils.getResString()
-                final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*");
-                if (name.endsWith(".java")) {
-                  BufferedReader fileReader = null;
-                  try {
-                    fileReader = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8));
+        PackageTest.findFile(srcFiledir, null, (dir, name) -> {
+            final File file = new File(dir, name);
+            // Look for calls to JMeterUtils.getResString()
+            final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*");
+            if (name.endsWith(".java")) {
+                try (FileInputStream fis = new FileInputStream(file);
+                     InputStreamReader is = new InputStreamReader(fis, StandardCharsets.UTF_8);
+                     BufferedReader fileReader = new BufferedReader(is)) {
                     String s;
                     while ((s = fileReader.readLine()) != null) {
                         if (s.matches("\\s*//.*")) { // leading comment
@@ -81,28 +77,25 @@ public boolean accept(File dir, String name) {
                             String resKey = key.replace(' ', '_'); // $NON-NLS-1$ // $NON-NLS-2$
                             resKey = resKey.toLowerCase(java.util.Locale.ENGLISH);
                             if (!key.equals(resKey)) {
-                                System.out.println(file+": non-standard message key: '"+key+"'");
+                                System.out.println(file + ": non-standard message key: '" + key + "'");
                             }
                             try {
                                 messagePRB.getString(resKey);
                             } catch (MissingResourceException e) {
-                                failures.add(file+": missing message key: '"+key+"'");
+                                failures.add(file + ": missing message key: '" + key + "'");
                             }
                         }
                     }
                 } catch (IOException e) {
-                      e.printStackTrace();
-                } finally {
-                    JOrphanUtils.closeQuietly(fileReader);
-                }
-
+                    exceptions.add(e);
                 }
-                return file.isDirectory();
             }
+            return file.isDirectory();
         });
+        Assertions.assertTrue(exceptions.isEmpty());
         if (failures.isEmpty()) {
             return;
         }
-        fail(String.join("\n", failures));
+        Assertions.fail(() -> String.join("\n", failures));
     }
 }

From 6ffd2ddfe0a34c76589ba297232aebedcf317e7d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 19:44:33 +0200
Subject: [PATCH 0225/1037] Remove unused import

---
 .../java/org/apache/jmeter/resources/ResourceKeyUsageTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
index 0a5f37344dc..92308c10016 100644
--- a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
@@ -20,7 +20,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

From a0eb461d74ac70c8b1f2ad025c008c83110f8ff3 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 19:56:06 +0200
Subject: [PATCH 0226/1037] Convert to junit5 methods

---
 .../java/org/apache/jmeter/JMeterTest.java    | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
index 77fec89f513..d4021dc1c98 100644
--- a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
@@ -17,9 +17,6 @@
 
 package org.apache.jmeter;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,24 +28,25 @@
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.report.config.ConfigurationException;
 import org.apache.jorphan.test.JMeterSerialTest;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class JMeterTest extends JMeterTestCase implements JMeterSerialTest {
+class JMeterTest extends JMeterTestCase implements JMeterSerialTest {
 
     @Test
-    public void testFailureWhenJmxDoesntExist() {
+    void testFailureWhenJmxDoesNotExist() {
         JMeter jmeter = new JMeter();
         try {
             jmeter.runNonGui("testPlan.jmx", null, false, null, false);
-            fail("Expected ConfigurationException to be thrown");
+            Assertions.fail("Expected ConfigurationException to be thrown");
         } catch (ConfigurationException e) {
-            assertTrue("When the file doesn't exist, this method 'runNonGui' should have a detailed message",
-                    e.getMessage().contains("doesn't exist or can't be opened"));
+            Assertions.assertTrue(e.getMessage().contains("doesn't exist or can't be opened"),
+                    "When the file doesn't exist, this method 'runNonGui' should have a detailed message");
         }
     }
 
     @Test
-    public void testSuccessWhenJmxExists() throws IOException, ConfigurationException {
+    void testSuccessWhenJmxExists() throws IOException, ConfigurationException {
         File temp = File.createTempFile("testPlan", ".jmx");
         String testPlan = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 + "<jmeterTestPlan version=\"1.2\" properties=\"5.0\" jmeter=\"5.2-SNAPSHOT\">\n" + "  <hashTree>\n"
@@ -72,12 +70,12 @@ public void testSuccessWhenJmxExists() throws IOException, ConfigurationExceptio
             JMeter jmeter = new JMeter();
             jmeter.runNonGui(temp.getAbsolutePath(), null, false, null, false);
         } finally {
-            assertTrue("File "+ temp.getAbsolutePath()+ " should have been deleted", temp.delete());
+            Assertions.assertTrue(temp.delete(), () ->"File " + temp.getAbsolutePath() + " should have been deleted");
         }
     }
 
     @Test
-    public void testFailureWithMissingPlugin() throws IOException, ConfigurationException {
+    void testFailureWithMissingPlugin() throws IOException {
         File temp = File.createTempFile("testPlan", ".jmx");
         String testPlan = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 + "<jmeterTestPlan version=\"1.2\" properties=\"5.0\" jmeter=\"5.2-SNAPSHOT.20190506\">\n"
@@ -114,12 +112,12 @@ public void testFailureWithMissingPlugin() throws IOException, ConfigurationExce
         JMeter jmeter = new JMeter();
         try {
             jmeter.runNonGui(temp.getAbsolutePath(), null, false, null, false);
-            fail("Expected ConfigurationException to be thrown");
+            Assertions.fail("Expected ConfigurationException to be thrown");
         } catch (ConfigurationException e) {
-            assertTrue("When the plugin doesn't exist, the method 'runNonGui' should have a detailed message",
-                    e.getMessage().contains("Error in NonGUIDriver Problem loading XML from"));
+            Assertions.assertTrue(e.getMessage().contains("Error in NonGUIDriver Problem loading XML from"),
+                    "When the plugin doesn't exist, the method 'runNonGui' should have a detailed message");
         } finally {
-            assertTrue("File "+ temp.getAbsolutePath()+ " should have been deleted", temp.delete());
+            Assertions.assertTrue(temp.delete(), () -> "File " + temp.getAbsolutePath() + " should have been deleted");
         }
     }
 }

From ce94f0db8ab17e27dec2ec5474dbb1c1c940b8a8 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 18 Apr 2022 22:03:32 +0200
Subject: [PATCH 0227/1037] Code clean-up mainly to trigger CI

Junit5 method conversion and a few minor nags from IDE.
---
 .../org/apache/jmeter/threads/TestJMeterThread.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
index 7ad315d949d..a114203099d 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
@@ -17,9 +17,6 @@
 
 package org.apache.jmeter.threads;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.time.Instant;
 
 import org.apache.jmeter.control.LoopController;
@@ -65,7 +62,7 @@ public boolean equals(Object obj) {
             if (!super.equals(obj)) {
                 return false;
             }
-            if (getClass() != obj.getClass()) {
+            if (!getClass().equals(obj.getClass())) {
                 return false;
             }
             DummySampler other = (DummySampler) obj;
@@ -75,6 +72,7 @@ public boolean equals(Object obj) {
     }
 
     private static class DummyTimer extends AbstractTestElement implements Timer {
+        private static final long serialVersionUID = 5641410390783919241L;
         private long delay;
 
         void setDelay(long delay) {
@@ -160,11 +158,11 @@ void testBug63490EndTestWhenDelayIsTooLongForScheduler() {
         jMeterThread.run();
         long duration = Instant.now().toEpochMilli() - startTime.toEpochMilli();
 
-        assertFalse("Sampler should not be called", dummySampler.isCalled());
+        Assertions.assertFalse(dummySampler.isCalled(), "Sampler should not be called");
 
         // the duration of this test plan should currently be around zero seconds,
         // but it is allowed to take up to maxDuration amount of time
-        assertTrue("Test plan should not run for longer than duration", duration <= maxDuration);
+        Assertions.assertTrue(duration <= maxDuration, "Test plan should not run for longer than duration");
     }
 
     private LoopController createLoopController() {

From aaead67610cd61d486d6ae54dab7b05338bcf40a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 29 Apr 2022 19:31:10 +0200
Subject: [PATCH 0228/1037] Split start up phase, to give splash screen more
 time

The move of method startGui into the Swing thread led
to an empty or not visible splash screen.

Bugzilla Id: 66044
---
 .../main/java/org/apache/jmeter/JMeter.java   | 36 ++++++++++++++-----
 .../java/org/apache/jmeter/SplashScreen.java  |  6 +++-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 7c6f51a098e..039662e982d 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.lang.reflect.InvocationTargetException;
 import java.net.Authenticator;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -377,7 +378,30 @@ private void startGui(String testFile) {
         System.out.println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file");//NOSONAR
         System.out.println("Check : https://jmeter.apache.org/usermanual/best-practices.html");//NOSONAR
         System.out.println("================================================================================");//NOSONAR
+        invokeAndWait("LaF", JMeter::setupLaF);
 
+        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
+        // bug 66044 split showing splash screen from the other parts to have content in the window
+        SplashScreen splash = new SplashScreen();
+        splash.showScreen();
+        splash.setProgress(10);
+        invokeAndWait("HiDPI settings", JMeterUtils::applyHiDPIOnFonts);
+        splash.setProgress(20);
+        invokeAndWait("main part", () -> startGuiPartTwo(testFile, splash));
+    }
+
+    private static void invokeAndWait(String part, Runnable doRun) {
+        try {
+            log.debug("Setting up {}", part);
+            SwingUtilities.invokeAndWait(doRun);
+        } catch (InterruptedException e) {
+            log.warn("Interrupted while setting up {}", part, e);
+        } catch (InvocationTargetException e) {
+            log.warn("Problem while setting up {}", part, e);
+        }
+    }
+
+    private static void setupLaF() {
         KerningOptimizer.INSTANCE.setMaxTextLengthWithKerning(
                 JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
         );
@@ -390,13 +414,9 @@ private void startGui(String testFile) {
         } catch (IllegalArgumentException ex) {
             log.warn("Could not set LAF to: {}", jMeterLaf, ex);
         }
-        // SplashWindow is created after LaF activation. Otherwise it would cause splash flicker
-        SplashScreen splash = new SplashScreen();
-        splash.showScreen();
-        splash.setProgress(10);
-        log.debug("Apply HiDPI on fonts");
-        JMeterUtils.applyHiDPIOnFonts();
-        splash.setProgress(20);
+    }
+
+    private void startGuiPartTwo(String testFile, SplashScreen splash) {
         log.debug("Configure PluginManager");
         PluginManager.install(this, true);
         splash.setProgress(30);
@@ -565,7 +585,7 @@ public void start(String[] args) {
                     generator.generate();
                 } else if (parser.getArgumentById(NONGUI_OPT) == null) { // not non-GUI => GUI
                     String initialTestFile = testFile;
-                    SwingUtilities.invokeAndWait(() -> startGui(initialTestFile));
+                    startGui(initialTestFile);
                     startOptionalServers();
                 } else { // NON-GUI must be true
                     extractAndSetReportOutputFolder(parser, deleteResultFile);
diff --git a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
index 809ca8f8d72..b3326bb221b 100644
--- a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
+++ b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
@@ -109,6 +109,10 @@ public void close() {
      * @param progress Loading progress
      */
     public void setProgress(final int progress) {
-        SwingUtilities.invokeLater(() -> progressBar.setValue(progress));
+        if (SwingUtilities.isEventDispatchThread()) {
+            progressBar.setValue(progress);
+        } else {
+            SwingUtilities.invokeLater(() -> progressBar.setValue(progress));
+        }
     }
 }

From 4f05afcdd617bd89fb38b608db3196e29ab19e87 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 6 May 2022 18:48:03 +0000
Subject: [PATCH 0229/1037] Update the section about JMeter and HiDPI screens.
 Add mention to Java property sun.java2d.uiScale.

---
 xdocs/usermanual/hints_and_tips.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/xdocs/usermanual/hints_and_tips.xml b/xdocs/usermanual/hints_and_tips.xml
index f2f6b9fb27c..070cea80273 100644
--- a/xdocs/usermanual/hints_and_tips.xml
+++ b/xdocs/usermanual/hints_and_tips.xml
@@ -100,13 +100,22 @@ will match any component that contains test in searchable elements of the compon
 
 </subsection>
 
-<subsection name="&sect-num;.4 JMeter with a HiDPI screen on Linux or Windows" anchor="hidpi">
+<subsection name="&sect-num;.4 JMeter and a HiDPI screen" anchor="hidpi">
 <description>
     <p>
-    The HiDPI mode isn't currently support by the Swing API in Java on Linux, MacOS or Windows. Therefore
-    JMeter can be very hard to read with a HiDPI screen (little icons and chars).
+    With <b>Java version 9 and up</b>, the HiDPI (High Dot Per Inch) screens are supported.
     </p>
-    <p>You can improve the JMeter's display on HiDPI screen by changing some properties:</p>
+    <p>
+    You can define the Java property <b>sun.java2d.uiScale</b> to change the scale of JMeter.
+    The value can be an integer or percentage value.
+    </p>
+    <p>For example, on Linux, with x2 factor (200%):</p>
+    <source>
+    $ export JVM_ARGS="-Dsun.java2d.uiScale=200%"
+    $ ./bin/jmeter</source>
+    <p>
+    With <b>Java version 8</b>, the HiDPI (High Dot Per Inch) screens aren't supported in the Swing API.
+    You can improve the JMeter's display on HiDPI screen by changing some properties:</p>
     <dl>
       <dt><code>jmeter.hidpi.mode</code></dt>
       <dd>set to <code>true</code> to activate a '<em>pseudo</em>'-hidpi mode allowing to increase size of some UI elements</dd>

From a997ed23ce0f9625f92f98314b22d09a6ac96dd6 Mon Sep 17 00:00:00 2001
From: Philippe M <pmouawad@users.noreply.github.com>
Date: Mon, 9 May 2022 21:40:06 +0200
Subject: [PATCH 0230/1037] Revert Bugfix 65885 (#709)

* Revert Bugfix 65885

* Update changes

* Fix style violation
---
 .../apache/jmeter/report/processor/ErrorsSummaryConsumer.java  | 3 ++-
 .../jmeter/report/processor/ErrorsSummaryConsumerTest.java     | 3 ---
 xdocs/changes.xml                                              | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index 3b8d3b5ae92..982198b921f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -97,7 +97,8 @@ static String getErrorKey(Sample sample) {
                  "/" + escapeJson(responseMessage) : "");
 
         if (MetricUtils.isSuccessCode(responseCode) ||
-                StringUtils.isNotBlank(sample.getFailureMessage())) {
+                (StringUtils.isEmpty(responseCode) &&
+                   StringUtils.isNotBlank(sample.getFailureMessage()))) {
             key = MetricUtils.ASSERTION_FAILED;
             if (ASSERTION_RESULTS_FAILURE_MESSAGE) {
                 String msg = sample.getFailureMessage();
diff --git a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
index 9a41be978e4..d2367717259 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
@@ -57,9 +57,6 @@ public void testGetErrorKey() {
         sample = new Sample(0, metadata, new String[] { "false", "403", "", "" });
         assertEquals("403", ErrorsSummaryConsumer.getErrorKey(sample));
 
-        sample = new Sample(0, metadata, new String[] { "false", "403", "", "FailureMessage" });
-        assertEquals("FailureMessage", ErrorsSummaryConsumer.getErrorKey(sample));
-
         sample = new Sample(0, metadata, new String[] { "false", "500", "Server Error", "" });
         assertEquals("500/Server Error", ErrorsSummaryConsumer.getErrorKey(sample));
     }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 805216f8e25..11130ddc2bb 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -147,7 +147,6 @@ however, the profile can't be updated while the test is running.
 <h3>Report / Dashboard</h3>
 <ul>
   <li><bug>65353</bug>Make the estimator used for calculating percentiles on the dashboard configurable</li>
-  <li><bug>65885</bug>HTML Report: Error report displays wrong failure message when Response Assertion checks Ignore Status and response code is not 200</li>
 </ul>
 
 <h3>General</h3>

From cbacd0893ed726a37ea4134598f2016936c01d91 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 22:26:14 +0300
Subject: [PATCH 0231/1037] Update Kotlin to 1.6.21

Note: Kotlin is a new dependency in JMeter 5.5.

See https://kotlinlang.org/docs/whatsnew1620.html
---
 checksum.xml                                | 1 +
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index d40d479ca24..9b5bbf4ab28 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -35,6 +35,7 @@
     <trusted-key id='353a436e043e3145' group='com.google.code.findbugs' />
     <trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='b0f3710fa64900e7' group='com.google.code.gson' />
     <trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='912d2c0eccda55c0' group='com.google.errorprone' />
     <trusted-key id='9a259c7ee636c5ed' group='com.google.errorprone' />
diff --git a/gradle.properties b/gradle.properties
index 56428b4043f..6116b6ee980 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,7 +45,7 @@ com.github.spotbugs.version=4.5.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
 com.github.vlsi.checksum-dependency.version=1.77
 com.github.vlsi.vlsi-release-plugins.version=1.77
-kotlin.version=1.6.0
+kotlin.version=1.6.21
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index f518fb736e9..30fde5d5631 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -87,10 +87,10 @@
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
-1508076,kotlin-stdlib-1.6.0.jar
-200616,kotlin-stdlib-common-1.6.0.jar
-22357,kotlin-stdlib-jdk7-1.6.0.jar
-16201,kotlin-stdlib-jdk8-1.6.0.jar
+1509405,kotlin-stdlib-1.6.21.jar
+200631,kotlin-stdlib-common-1.6.21.jar
+23898,kotlin-stdlib-jdk7-1.6.21.jar
+17772,kotlin-stdlib-jdk8-1.6.21.jar
 792176,kotlinx-html-jvm-0.7.3.jar
 181223,lets-plot-batik-2.2.1.jar
 4025480,lets-plot-common-2.2.1.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 11130ddc2bb..7da2d1349d0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,7 +161,7 @@ however, the profile can't be updated while the test is running.
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
-  <li>Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
+  <li>Added Kotlin 1.6.21 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>

From 57d3a35c67c22168f9274224a0546bb92dd6fb50 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 12:55:43 +0300
Subject: [PATCH 0232/1037] Factor JMeterGuiLauncher out of JMeter

---
 .../main/java/org/apache/jmeter/JMeter.java   | 126 +-------------
 .../org/apache/jmeter/JMeterGuiLauncher.java  | 155 ++++++++++++++++++
 2 files changed, 157 insertions(+), 124 deletions(-)
 create mode 100644 src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 039662e982d..b885463dac4 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -17,14 +17,12 @@
 
 package org.apache.jmeter;
 
-import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.lang.reflect.InvocationTargetException;
 import java.net.Authenticator;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -56,9 +54,6 @@
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.tree.TreePath;
 
 import org.apache.commons.cli.avalon.CLArgsParser;
 import org.apache.commons.cli.avalon.CLOption;
@@ -75,17 +70,9 @@
 import org.apache.jmeter.engine.StandardJMeterEngine;
 import org.apache.jmeter.engine.TreeCloner;
 import org.apache.jmeter.exceptions.IllegalUserActionException;
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.MainFrame;
-import org.apache.jmeter.gui.action.ActionNames;
-import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.gui.action.Load;
 import org.apache.jmeter.gui.action.LoadRecentProject;
-import org.apache.jmeter.gui.action.LookAndFeelCommand;
-import org.apache.jmeter.gui.tree.JMeterTreeListener;
 import org.apache.jmeter.gui.tree.JMeterTreeModel;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
-import org.apache.jmeter.gui.util.FocusRequester;
 import org.apache.jmeter.plugin.JMeterPlugin;
 import org.apache.jmeter.plugin.PluginManager;
 import org.apache.jmeter.report.config.ConfigurationException;
@@ -107,9 +94,6 @@
 import org.apache.jmeter.util.ShutdownClient;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.SearchByClass;
-import org.apache.jorphan.gui.ComponentUtil;
-import org.apache.jorphan.gui.JMeterUIDefaults;
-import org.apache.jorphan.gui.ui.KerningOptimizer;
 import org.apache.jorphan.reflect.ClassTools;
 import org.apache.jorphan.util.HeapDumper;
 import org.apache.jorphan.util.JMeterException;
@@ -120,8 +104,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.thoughtworks.xstream.converters.ConversionException;
-
 /**
  * Main JMeter class; processes options and starts the GUI, non-GUI or server as appropriate.
  */
@@ -366,111 +348,6 @@ public JMeter() {
     }
 
 
-    /**
-     * Starts up JMeter in GUI mode
-     */
-    private void startGui(String testFile) {
-        System.out.println("================================================================================");//NOSONAR
-        System.out.println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.");//NOSONAR
-        System.out.println("For load testing, use CLI Mode (was NON GUI):");//NOSONAR
-        System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]");//NOSONAR
-        System.out.println("& increase Java Heap to meet your test requirements:");//NOSONAR
-        System.out.println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file");//NOSONAR
-        System.out.println("Check : https://jmeter.apache.org/usermanual/best-practices.html");//NOSONAR
-        System.out.println("================================================================================");//NOSONAR
-        invokeAndWait("LaF", JMeter::setupLaF);
-
-        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
-        // bug 66044 split showing splash screen from the other parts to have content in the window
-        SplashScreen splash = new SplashScreen();
-        splash.showScreen();
-        splash.setProgress(10);
-        invokeAndWait("HiDPI settings", JMeterUtils::applyHiDPIOnFonts);
-        splash.setProgress(20);
-        invokeAndWait("main part", () -> startGuiPartTwo(testFile, splash));
-    }
-
-    private static void invokeAndWait(String part, Runnable doRun) {
-        try {
-            log.debug("Setting up {}", part);
-            SwingUtilities.invokeAndWait(doRun);
-        } catch (InterruptedException e) {
-            log.warn("Interrupted while setting up {}", part, e);
-        } catch (InvocationTargetException e) {
-            log.warn("Problem while setting up {}", part, e);
-        }
-    }
-
-    private static void setupLaF() {
-        KerningOptimizer.INSTANCE.setMaxTextLengthWithKerning(
-                JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
-        );
-        JMeterUIDefaults.INSTANCE.install();
-
-        String jMeterLaf = LookAndFeelCommand.getPreferredLafCommand();
-        try {
-            log.info("Setting LAF to: {}", jMeterLaf);
-            LookAndFeelCommand.activateLookAndFeel(jMeterLaf);
-        } catch (IllegalArgumentException ex) {
-            log.warn("Could not set LAF to: {}", jMeterLaf, ex);
-        }
-    }
-
-    private void startGuiPartTwo(String testFile, SplashScreen splash) {
-        log.debug("Configure PluginManager");
-        PluginManager.install(this, true);
-        splash.setProgress(30);
-        log.debug("Setup tree");
-        JMeterTreeModel treeModel = new JMeterTreeModel();
-        JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
-        final ActionRouter instance = ActionRouter.getInstance();
-        splash.setProgress(40);
-        log.debug("populate command map");
-        instance.populateCommandMap();
-        splash.setProgress(60);
-        treeLis.setActionHandler(instance);
-        log.debug("init instance");
-        splash.setProgress(70);
-        GuiPackage.initInstance(treeLis, treeModel);
-        splash.setProgress(80);
-        log.debug("constructing main frame");
-        MainFrame main = new MainFrame(treeModel, treeLis);
-        splash.setProgress(100);
-        ComponentUtil.centerComponentInWindow(main, 80);
-        main.setLocationRelativeTo(splash);
-        main.setVisible(true);
-        main.toFront();
-        instance.actionPerformed(new ActionEvent(main, 1, ActionNames.ADD_ALL));
-        if (testFile != null) {
-            try {
-                File f = new File(testFile);
-                log.info("Loading file: {}", f);
-                FileServer.getFileServer().setBaseForScript(f);
-
-                HashTree tree = SaveService.loadTree(f);
-
-                GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
-
-                Load.insertLoadedTree(1, tree);
-            } catch (ConversionException e) {
-                log.error("Failure loading test file", e);
-                splash.close();
-                JMeterUtils.reportErrorToUser(SaveService.CEtoString(e));
-            } catch (Exception e) {
-                log.error("Failure loading test file", e);
-                splash.close();
-                JMeterUtils.reportErrorToUser(e.toString());
-            }
-        } else {
-            JTree jTree = GuiPackage.getInstance().getMainFrame().getTree();
-            TreePath path = jTree.getPathForRow(0);
-            jTree.setSelectionPath(path);
-            FocusRequester.requestFocus(jTree);
-        }
-        splash.setProgress(100);
-        splash.close();
-    }
-
     /**
      * Takes the command line arguments and uses them to determine how to
      * startup JMeter.
@@ -584,8 +461,9 @@ public void start(String[] args) {
                     ReportGenerator generator = new ReportGenerator(reportFile, null);
                     generator.generate();
                 } else if (parser.getArgumentById(NONGUI_OPT) == null) { // not non-GUI => GUI
+                    PluginManager.install(this, true);
                     String initialTestFile = testFile;
-                    startGui(initialTestFile);
+                    JMeterGuiLauncher.startGui(initialTestFile);
                     startOptionalServers();
                 } else { // NON-GUI must be true
                     extractAndSetReportOutputFolder(parser, deleteResultFile);
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java
new file mode 100644
index 00000000000..7ac560d7b50
--- /dev/null
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter;
+
+import com.thoughtworks.xstream.converters.ConversionException;
+
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.MainFrame;
+import org.apache.jmeter.gui.action.ActionNames;
+import org.apache.jmeter.gui.action.ActionRouter;
+import org.apache.jmeter.gui.action.Load;
+import org.apache.jmeter.gui.action.LookAndFeelCommand;
+import org.apache.jmeter.gui.tree.JMeterTreeListener;
+import org.apache.jmeter.gui.tree.JMeterTreeModel;
+import org.apache.jmeter.gui.util.FocusRequester;
+import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.services.FileServer;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.gui.ComponentUtil;
+import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.gui.ui.KerningOptimizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+public class JMeterGuiLauncher {
+    private static final Logger log = LoggerFactory.getLogger(JMeterGuiLauncher.class);
+
+    /**
+     * Starts up JMeter in GUI mode
+     */
+    static void startGui(String testFile) {
+        System.out.println("================================================================================");//NOSONAR
+        System.out.println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.");//NOSONAR
+        System.out.println("For load testing, use CLI Mode (was NON GUI):");//NOSONAR
+        System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]");//NOSONAR
+        System.out.println("& increase Java Heap to meet your test requirements:");//NOSONAR
+        System.out.println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file");//NOSONAR
+        System.out.println("Check : https://jmeter.apache.org/usermanual/best-practices.html");//NOSONAR
+        System.out.println("================================================================================");//NOSONAR
+        invokeAndWait("LaF", JMeterGuiLauncher::setupLaF);
+
+        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
+        // bug 66044 split showing splash screen from the other parts to have content in the window
+        SplashScreen splash = new SplashScreen();
+        splash.showScreen();
+        splash.setProgress(10);
+        invokeAndWait("HiDPI settings", JMeterUtils::applyHiDPIOnFonts);
+        splash.setProgress(20);
+        invokeAndWait("main part", () -> startGuiPartTwo(testFile, splash));
+    }
+
+    private static void invokeAndWait(String part, Runnable doRun) {
+        try {
+            log.debug("Setting up {}", part);
+            SwingUtilities.invokeAndWait(doRun);
+        } catch (InterruptedException e) {
+            log.warn("Interrupted while setting up {}", part, e);
+        } catch (InvocationTargetException e) {
+            log.warn("Problem while setting up {}", part, e);
+        }
+    }
+
+    private static void setupLaF() {
+        KerningOptimizer.INSTANCE.setMaxTextLengthWithKerning(
+                JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
+        );
+        JMeterUIDefaults.INSTANCE.install();
+
+        String jMeterLaf = LookAndFeelCommand.getPreferredLafCommand();
+        try {
+            log.info("Setting LAF to: {}", jMeterLaf);
+            LookAndFeelCommand.activateLookAndFeel(jMeterLaf);
+        } catch (IllegalArgumentException ex) {
+            log.warn("Could not set LAF to: {}", jMeterLaf, ex);
+        }
+    }
+
+    private static void startGuiPartTwo(String testFile, SplashScreen splash) {
+        log.debug("Configure PluginManager");
+        splash.setProgress(30);
+        log.debug("Setup tree");
+        JMeterTreeModel treeModel = new JMeterTreeModel();
+        JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
+        final ActionRouter instance = ActionRouter.getInstance();
+        splash.setProgress(40);
+        log.debug("populate command map");
+        instance.populateCommandMap();
+        splash.setProgress(60);
+        treeLis.setActionHandler(instance);
+        log.debug("init instance");
+        splash.setProgress(70);
+        GuiPackage.initInstance(treeLis, treeModel);
+        splash.setProgress(80);
+        log.debug("constructing main frame");
+        MainFrame main = new MainFrame(treeModel, treeLis);
+        splash.setProgress(100);
+        ComponentUtil.centerComponentInWindow(main, 80);
+        main.setLocationRelativeTo(splash);
+        main.setVisible(true);
+        main.toFront();
+        instance.actionPerformed(new ActionEvent(main, 1, ActionNames.ADD_ALL));
+        if (testFile != null) {
+            try {
+                File f = new File(testFile);
+                log.info("Loading file: {}", f);
+                FileServer.getFileServer().setBaseForScript(f);
+
+                HashTree tree = SaveService.loadTree(f);
+
+                GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
+
+                Load.insertLoadedTree(1, tree);
+            } catch (ConversionException e) {
+                log.error("Failure loading test file", e);
+                splash.close();
+                JMeterUtils.reportErrorToUser(SaveService.CEtoString(e));
+            } catch (Exception e) {
+                log.error("Failure loading test file", e);
+                splash.close();
+                JMeterUtils.reportErrorToUser(e.toString());
+            }
+        } else {
+            JTree jTree = GuiPackage.getInstance().getMainFrame().getTree();
+            TreePath path = jTree.getPathForRow(0);
+            jTree.setSelectionPath(path);
+            FocusRequester.requestFocus(jTree);
+        }
+        splash.setProgress(100);
+        splash.close();
+    }
+}

From fae5a4cc6c31a4465126f073cc057d60e4338d86 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 13:11:35 +0300
Subject: [PATCH 0233/1037] Convert JMeterGuilLauncher to Kotlin

---
 .../org/apache/jmeter/JMeterGuiLauncher.java  | 155 ------------------
 .../org/apache/jmeter/JMeterGuiLauncher.kt    | 143 ++++++++++++++++
 2 files changed, 143 insertions(+), 155 deletions(-)
 delete mode 100644 src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java
 create mode 100644 src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java
deleted file mode 100644
index 7ac560d7b50..00000000000
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter;
-
-import com.thoughtworks.xstream.converters.ConversionException;
-
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.MainFrame;
-import org.apache.jmeter.gui.action.ActionNames;
-import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.gui.action.Load;
-import org.apache.jmeter.gui.action.LookAndFeelCommand;
-import org.apache.jmeter.gui.tree.JMeterTreeListener;
-import org.apache.jmeter.gui.tree.JMeterTreeModel;
-import org.apache.jmeter.gui.util.FocusRequester;
-import org.apache.jmeter.save.SaveService;
-import org.apache.jmeter.services.FileServer;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.gui.ComponentUtil;
-import org.apache.jorphan.gui.JMeterUIDefaults;
-import org.apache.jorphan.gui.ui.KerningOptimizer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.tree.TreePath;
-
-public class JMeterGuiLauncher {
-    private static final Logger log = LoggerFactory.getLogger(JMeterGuiLauncher.class);
-
-    /**
-     * Starts up JMeter in GUI mode
-     */
-    static void startGui(String testFile) {
-        System.out.println("================================================================================");//NOSONAR
-        System.out.println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.");//NOSONAR
-        System.out.println("For load testing, use CLI Mode (was NON GUI):");//NOSONAR
-        System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]");//NOSONAR
-        System.out.println("& increase Java Heap to meet your test requirements:");//NOSONAR
-        System.out.println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file");//NOSONAR
-        System.out.println("Check : https://jmeter.apache.org/usermanual/best-practices.html");//NOSONAR
-        System.out.println("================================================================================");//NOSONAR
-        invokeAndWait("LaF", JMeterGuiLauncher::setupLaF);
-
-        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
-        // bug 66044 split showing splash screen from the other parts to have content in the window
-        SplashScreen splash = new SplashScreen();
-        splash.showScreen();
-        splash.setProgress(10);
-        invokeAndWait("HiDPI settings", JMeterUtils::applyHiDPIOnFonts);
-        splash.setProgress(20);
-        invokeAndWait("main part", () -> startGuiPartTwo(testFile, splash));
-    }
-
-    private static void invokeAndWait(String part, Runnable doRun) {
-        try {
-            log.debug("Setting up {}", part);
-            SwingUtilities.invokeAndWait(doRun);
-        } catch (InterruptedException e) {
-            log.warn("Interrupted while setting up {}", part, e);
-        } catch (InvocationTargetException e) {
-            log.warn("Problem while setting up {}", part, e);
-        }
-    }
-
-    private static void setupLaF() {
-        KerningOptimizer.INSTANCE.setMaxTextLengthWithKerning(
-                JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
-        );
-        JMeterUIDefaults.INSTANCE.install();
-
-        String jMeterLaf = LookAndFeelCommand.getPreferredLafCommand();
-        try {
-            log.info("Setting LAF to: {}", jMeterLaf);
-            LookAndFeelCommand.activateLookAndFeel(jMeterLaf);
-        } catch (IllegalArgumentException ex) {
-            log.warn("Could not set LAF to: {}", jMeterLaf, ex);
-        }
-    }
-
-    private static void startGuiPartTwo(String testFile, SplashScreen splash) {
-        log.debug("Configure PluginManager");
-        splash.setProgress(30);
-        log.debug("Setup tree");
-        JMeterTreeModel treeModel = new JMeterTreeModel();
-        JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
-        final ActionRouter instance = ActionRouter.getInstance();
-        splash.setProgress(40);
-        log.debug("populate command map");
-        instance.populateCommandMap();
-        splash.setProgress(60);
-        treeLis.setActionHandler(instance);
-        log.debug("init instance");
-        splash.setProgress(70);
-        GuiPackage.initInstance(treeLis, treeModel);
-        splash.setProgress(80);
-        log.debug("constructing main frame");
-        MainFrame main = new MainFrame(treeModel, treeLis);
-        splash.setProgress(100);
-        ComponentUtil.centerComponentInWindow(main, 80);
-        main.setLocationRelativeTo(splash);
-        main.setVisible(true);
-        main.toFront();
-        instance.actionPerformed(new ActionEvent(main, 1, ActionNames.ADD_ALL));
-        if (testFile != null) {
-            try {
-                File f = new File(testFile);
-                log.info("Loading file: {}", f);
-                FileServer.getFileServer().setBaseForScript(f);
-
-                HashTree tree = SaveService.loadTree(f);
-
-                GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
-
-                Load.insertLoadedTree(1, tree);
-            } catch (ConversionException e) {
-                log.error("Failure loading test file", e);
-                splash.close();
-                JMeterUtils.reportErrorToUser(SaveService.CEtoString(e));
-            } catch (Exception e) {
-                log.error("Failure loading test file", e);
-                splash.close();
-                JMeterUtils.reportErrorToUser(e.toString());
-            }
-        } else {
-            JTree jTree = GuiPackage.getInstance().getMainFrame().getTree();
-            TreePath path = jTree.getPathForRow(0);
-            jTree.setSelectionPath(path);
-            FocusRequester.requestFocus(jTree);
-        }
-        splash.setProgress(100);
-        splash.close();
-    }
-}
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
new file mode 100644
index 00000000000..611a04e10dc
--- /dev/null
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jmeter
+
+import com.thoughtworks.xstream.converters.ConversionException
+import org.apache.jmeter.gui.GuiPackage
+import org.apache.jmeter.gui.MainFrame
+import org.apache.jmeter.gui.action.ActionNames
+import org.apache.jmeter.gui.action.ActionRouter
+import org.apache.jmeter.gui.action.Load
+import org.apache.jmeter.gui.action.LookAndFeelCommand
+import org.apache.jmeter.gui.tree.JMeterTreeListener
+import org.apache.jmeter.gui.tree.JMeterTreeModel
+import org.apache.jmeter.gui.util.FocusRequester
+import org.apache.jmeter.save.SaveService
+import org.apache.jmeter.services.FileServer
+import org.apache.jmeter.util.JMeterUtils
+import org.apache.jorphan.gui.ComponentUtil
+import org.apache.jorphan.gui.JMeterUIDefaults
+import org.apache.jorphan.gui.ui.KerningOptimizer
+import org.slf4j.LoggerFactory
+import java.awt.event.ActionEvent
+import java.io.File
+import java.lang.reflect.InvocationTargetException
+import javax.swing.SwingUtilities
+
+public object JMeterGuiLauncher {
+    private val log = LoggerFactory.getLogger(JMeterGuiLauncher::class.java)
+
+    /**
+     * Starts up JMeter in GUI mode
+     */
+    @JvmStatic
+    public fun startGui(testFile: String?) {
+        println("================================================================================") // NOSONAR
+        println("Don't use GUI mode for load testing !, only for Test creation and Test debugging.") // NOSONAR
+        println("For load testing, use CLI Mode (was NON GUI):") // NOSONAR
+        println("   jmeter -n -t [jmx file] -l [results file] -e -o [Path to web report folder]") // NOSONAR
+        println("& increase Java Heap to meet your test requirements:") // NOSONAR
+        println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file") // NOSONAR
+        println("Check : https://jmeter.apache.org/usermanual/best-practices.html") // NOSONAR
+        println("================================================================================") // NOSONAR
+        invokeAndWait("LaF") { setupLaF() }
+
+        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
+        // bug 66044 split showing splash screen from the other parts to have content in the window
+        val splash = SplashScreen()
+        splash.showScreen()
+        splash.setProgress(10)
+        invokeAndWait("HiDPI settings") { JMeterUtils.applyHiDPIOnFonts() }
+        splash.setProgress(20)
+        invokeAndWait("main part") { startGuiPartTwo(testFile, splash) }
+    }
+
+    private fun invokeAndWait(part: String, doRun: Runnable) {
+        try {
+            log.debug("Setting up {}", part)
+            SwingUtilities.invokeAndWait(doRun)
+        } catch (e: InterruptedException) {
+            log.warn("Interrupted while setting up {}", part, e)
+        } catch (e: InvocationTargetException) {
+            log.warn("Problem while setting up {}", part, e)
+        }
+    }
+
+    private fun setupLaF() {
+        KerningOptimizer.INSTANCE.maxTextLengthWithKerning =
+            JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
+        JMeterUIDefaults.INSTANCE.install()
+        val jMeterLaf = LookAndFeelCommand.getPreferredLafCommand()
+        try {
+            log.info("Setting LAF to: {}", jMeterLaf)
+            LookAndFeelCommand.activateLookAndFeel(jMeterLaf)
+        } catch (ex: IllegalArgumentException) {
+            log.warn("Could not set LAF to: {}", jMeterLaf, ex)
+        }
+    }
+
+    private fun startGuiPartTwo(testFile: String?, splash: SplashScreen) {
+        log.debug("Configure PluginManager")
+        splash.setProgress(30)
+        log.debug("Setup tree")
+        val treeModel = JMeterTreeModel()
+        val treeLis = JMeterTreeListener(treeModel)
+        val instance = ActionRouter.getInstance()
+        splash.setProgress(40)
+        log.debug("populate command map")
+        instance.populateCommandMap()
+        splash.setProgress(60)
+        treeLis.setActionHandler(instance)
+        log.debug("init instance")
+        splash.setProgress(70)
+        GuiPackage.initInstance(treeLis, treeModel)
+        splash.setProgress(80)
+        log.debug("constructing main frame")
+        val main = MainFrame(treeModel, treeLis)
+        splash.setProgress(100)
+        ComponentUtil.centerComponentInWindow(main, 80)
+        main.setLocationRelativeTo(splash)
+        main.isVisible = true
+        main.toFront()
+        instance.actionPerformed(ActionEvent(main, 1, ActionNames.ADD_ALL))
+        if (testFile != null) {
+            try {
+                val f = File(testFile)
+                log.info("Loading file: {}", f)
+                FileServer.getFileServer().setBaseForScript(f)
+                val tree = SaveService.loadTree(f)
+                GuiPackage.getInstance().testPlanFile = f.absolutePath
+                Load.insertLoadedTree(1, tree)
+            } catch (e: ConversionException) {
+                log.error("Failure loading test file", e)
+                splash.close()
+                JMeterUtils.reportErrorToUser(SaveService.CEtoString(e))
+            } catch (e: Exception) {
+                log.error("Failure loading test file", e)
+                splash.close()
+                JMeterUtils.reportErrorToUser(e.toString())
+            }
+        } else {
+            val jTree = GuiPackage.getInstance().mainFrame.tree
+            val path = jTree.getPathForRow(0)
+            jTree.selectionPath = path
+            FocusRequester.requestFocus(jTree)
+        }
+        splash.setProgress(100)
+        splash.close()
+    }
+}

From 3ee6c98c32cc42d62b502c557e0bc154c2a54338 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 13:32:34 +0300
Subject: [PATCH 0234/1037] Use kotlinx-coroutines for GUI launcher

---
 gradle.properties                             |  1 +
 src/bom/build.gradle.kts                      |  1 +
 src/core/build.gradle.kts                     |  2 +
 .../org/apache/jmeter/JMeterGuiLauncher.kt    | 61 ++++++++++---------
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6116b6ee980..2549e977f09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -113,6 +113,7 @@ jsoup.version=1.14.3
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.2
+kotlinx-coroutines.version=1.6.1
 lets-plot-batik.version=2.2.1
 lets-plot-kotlin-jvm.version=3.1.1
 log4j.version=2.17.2
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 09726fe6067..79e4e4c548f 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -45,6 +45,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.codehaus.groovy:groovy-bom:${"groovy".v}"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:${"kotlinx-coroutines".v}"))
 
     // Parenthesis are needed here: https://github.com/gradle/gradle/issues/9248
     (constraints) {
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 937200eb602..db221daf451 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -68,6 +68,8 @@ dependencies {
         }
     }
 
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing")
     implementation("com.fasterxml.jackson.core:jackson-annotations")
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index 611a04e10dc..1194f350cb1 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -14,9 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.jmeter
 
 import com.thoughtworks.xstream.converters.ConversionException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.swing.Swing
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.yield
 import org.apache.jmeter.gui.GuiPackage
 import org.apache.jmeter.gui.MainFrame
 import org.apache.jmeter.gui.action.ActionNames
@@ -35,8 +42,6 @@ import org.apache.jorphan.gui.ui.KerningOptimizer
 import org.slf4j.LoggerFactory
 import java.awt.event.ActionEvent
 import java.io.File
-import java.lang.reflect.InvocationTargetException
-import javax.swing.SwingUtilities
 
 public object JMeterGuiLauncher {
     private val log = LoggerFactory.getLogger(JMeterGuiLauncher::class.java)
@@ -54,26 +59,18 @@ public object JMeterGuiLauncher {
         println("   Modify current env variable HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file") // NOSONAR
         println("Check : https://jmeter.apache.org/usermanual/best-practices.html") // NOSONAR
         println("================================================================================") // NOSONAR
-        invokeAndWait("LaF") { setupLaF() }
-
-        // SplashScreen is created after LaF activation, otherwise it would cause splash flicker.
-        // bug 66044 split showing splash screen from the other parts to have content in the window
-        val splash = SplashScreen()
-        splash.showScreen()
-        splash.setProgress(10)
-        invokeAndWait("HiDPI settings") { JMeterUtils.applyHiDPIOnFonts() }
-        splash.setProgress(20)
-        invokeAndWait("main part") { startGuiPartTwo(testFile, splash) }
-    }
 
-    private fun invokeAndWait(part: String, doRun: Runnable) {
-        try {
-            log.debug("Setting up {}", part)
-            SwingUtilities.invokeAndWait(doRun)
-        } catch (e: InterruptedException) {
-            log.warn("Interrupted while setting up {}", part, e)
-        } catch (e: InvocationTargetException) {
-            log.warn("Problem while setting up {}", part, e)
+        runBlocking {
+            // See https://github.com/Kotlin/kotlinx.coroutines/blob/master/ui/coroutines-guide-ui.md
+            launch(Dispatchers.Swing) {
+                setupLaF()
+                val splash = SplashScreen()
+                splash.showScreen()
+                setProgress(splash, 10)
+                JMeterUtils.applyHiDPIOnFonts()
+                setProgress(splash, 20)
+                startGuiPartTwo(testFile, splash)
+            }
         }
     }
 
@@ -90,25 +87,25 @@ public object JMeterGuiLauncher {
         }
     }
 
-    private fun startGuiPartTwo(testFile: String?, splash: SplashScreen) {
+    private suspend fun startGuiPartTwo(testFile: String?, splash: SplashScreen) {
         log.debug("Configure PluginManager")
-        splash.setProgress(30)
+        setProgress(splash, 30)
         log.debug("Setup tree")
         val treeModel = JMeterTreeModel()
         val treeLis = JMeterTreeListener(treeModel)
         val instance = ActionRouter.getInstance()
-        splash.setProgress(40)
+        setProgress(splash, 40)
         log.debug("populate command map")
         instance.populateCommandMap()
-        splash.setProgress(60)
+        setProgress(splash, 60)
         treeLis.setActionHandler(instance)
         log.debug("init instance")
-        splash.setProgress(70)
+        setProgress(splash, 70)
         GuiPackage.initInstance(treeLis, treeModel)
-        splash.setProgress(80)
+        setProgress(splash, 80)
         log.debug("constructing main frame")
         val main = MainFrame(treeModel, treeLis)
-        splash.setProgress(100)
+        setProgress(splash, 100)
         ComponentUtil.centerComponentInWindow(main, 80)
         main.setLocationRelativeTo(splash)
         main.isVisible = true
@@ -137,7 +134,13 @@ public object JMeterGuiLauncher {
             jTree.selectionPath = path
             FocusRequester.requestFocus(jTree)
         }
-        splash.setProgress(100)
+        setProgress(splash, 100)
         splash.close()
     }
+
+    private suspend fun setProgress(splash: SplashScreen, progress: Int) {
+        splash.setProgress(progress)
+        // Allow UI updates
+        yield()
+    }
 }

From f0fe4642aee89ac631b3ca38a4441ad73c71a538 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 13:44:55 +0300
Subject: [PATCH 0235/1037] Move test plan loading off from the event
 dispatcher thread

---
 .../java/org/apache/jmeter/JMeterGuiLauncher.kt     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index 1194f350cb1..c5a74489bb5 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -36,6 +36,7 @@ import org.apache.jmeter.gui.util.FocusRequester
 import org.apache.jmeter.save.SaveService
 import org.apache.jmeter.services.FileServer
 import org.apache.jmeter.util.JMeterUtils
+import org.apache.jorphan.collections.HashTree
 import org.apache.jorphan.gui.ComponentUtil
 import org.apache.jorphan.gui.JMeterUIDefaults
 import org.apache.jorphan.gui.ui.KerningOptimizer
@@ -113,10 +114,14 @@ public object JMeterGuiLauncher {
         instance.actionPerformed(ActionEvent(main, 1, ActionNames.ADD_ALL))
         if (testFile != null) {
             try {
-                val f = File(testFile)
-                log.info("Loading file: {}", f)
-                FileServer.getFileServer().setBaseForScript(f)
-                val tree = SaveService.loadTree(f)
+                val f: File
+                val tree: HashTree?
+                withContext(Dispatchers.Default) {
+                    f = File(testFile)
+                    log.info("Loading file: {}", f)
+                    FileServer.getFileServer().setBaseForScript(f)
+                    tree = SaveService.loadTree(f)
+                }
                 GuiPackage.getInstance().testPlanFile = f.absolutePath
                 Load.insertLoadedTree(1, tree)
             } catch (e: ConversionException) {

From a41b33ceb197f38a2060cba83a1c41d232f1895d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 14:05:10 +0300
Subject: [PATCH 0236/1037] There's no need to split startGui into "part one"
 and "part two"

---
 .../java/org/apache/jmeter/JMeterGuiLauncher.kt  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index c5a74489bb5..32da2a6ecb7 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -64,13 +64,7 @@ public object JMeterGuiLauncher {
         runBlocking {
             // See https://github.com/Kotlin/kotlinx.coroutines/blob/master/ui/coroutines-guide-ui.md
             launch(Dispatchers.Swing) {
-                setupLaF()
-                val splash = SplashScreen()
-                splash.showScreen()
-                setProgress(splash, 10)
-                JMeterUtils.applyHiDPIOnFonts()
-                setProgress(splash, 20)
-                startGuiPartTwo(testFile, splash)
+                startGuiInternal(testFile)
             }
         }
     }
@@ -88,7 +82,13 @@ public object JMeterGuiLauncher {
         }
     }
 
-    private suspend fun startGuiPartTwo(testFile: String?, splash: SplashScreen) {
+    private suspend fun startGuiInternal(testFile: String?) {
+        setupLaF()
+        val splash = SplashScreen()
+        splash.showScreen()
+        setProgress(splash, 10)
+        JMeterUtils.applyHiDPIOnFonts()
+        setProgress(splash, 20)
         log.debug("Configure PluginManager")
         setProgress(splash, 30)
         log.debug("Setup tree")

From bec177060498eb68c34b899d8ff07d5dffe54d44 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 17:58:32 +0300
Subject: [PATCH 0237/1037] Extract loadFile function

---
 .../org/apache/jmeter/JMeterGuiLauncher.kt    | 73 ++++++++++---------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index 32da2a6ecb7..dcb19e9da3c 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -85,67 +85,70 @@ public object JMeterGuiLauncher {
     private suspend fun startGuiInternal(testFile: String?) {
         setupLaF()
         val splash = SplashScreen()
+        suspend fun setProgress(progress: Int) {
+            splash.setProgress(progress)
+            // Allow UI updates
+            yield()
+        }
         splash.showScreen()
-        setProgress(splash, 10)
+        setProgress(10)
         JMeterUtils.applyHiDPIOnFonts()
-        setProgress(splash, 20)
+        setProgress(20)
         log.debug("Configure PluginManager")
-        setProgress(splash, 30)
+        setProgress(30)
         log.debug("Setup tree")
         val treeModel = JMeterTreeModel()
         val treeLis = JMeterTreeListener(treeModel)
         val instance = ActionRouter.getInstance()
-        setProgress(splash, 40)
-        log.debug("populate command map")
-        instance.populateCommandMap()
-        setProgress(splash, 60)
+        setProgress(40)
+        withContext(Dispatchers.Default) {
+            log.debug("populate command map")
+            instance.populateCommandMap()
+        }
+        setProgress(60)
         treeLis.setActionHandler(instance)
         log.debug("init instance")
-        setProgress(splash, 70)
+        setProgress(70)
         GuiPackage.initInstance(treeLis, treeModel)
-        setProgress(splash, 80)
+        setProgress(80)
         log.debug("constructing main frame")
         val main = MainFrame(treeModel, treeLis)
-        setProgress(splash, 100)
+        setProgress(90)
         ComponentUtil.centerComponentInWindow(main, 80)
         main.setLocationRelativeTo(splash)
         main.isVisible = true
         main.toFront()
         instance.actionPerformed(ActionEvent(main, 1, ActionNames.ADD_ALL))
         if (testFile != null) {
-            try {
-                val f: File
-                val tree: HashTree?
-                withContext(Dispatchers.Default) {
-                    f = File(testFile)
-                    log.info("Loading file: {}", f)
-                    FileServer.getFileServer().setBaseForScript(f)
-                    tree = SaveService.loadTree(f)
-                }
-                GuiPackage.getInstance().testPlanFile = f.absolutePath
-                Load.insertLoadedTree(1, tree)
-            } catch (e: ConversionException) {
-                log.error("Failure loading test file", e)
-                splash.close()
-                JMeterUtils.reportErrorToUser(SaveService.CEtoString(e))
-            } catch (e: Exception) {
-                log.error("Failure loading test file", e)
-                splash.close()
-                JMeterUtils.reportErrorToUser(e.toString())
-            }
+            loadFile(testFile)
         } else {
             val jTree = GuiPackage.getInstance().mainFrame.tree
             val path = jTree.getPathForRow(0)
             jTree.selectionPath = path
             FocusRequester.requestFocus(jTree)
         }
-        setProgress(splash, 100)
+        setProgress(100)
         splash.close()
     }
 
-    private suspend fun setProgress(splash: SplashScreen, progress: Int) {
-        splash.setProgress(progress)
-        // Allow UI updates
-        yield()
+    private suspend fun loadFile(testFile: String) {
+        try {
+            val f: File
+            val tree: HashTree?
+            withContext(Dispatchers.Default) {
+                f = File(testFile)
+                log.info("Loading file: {}", f)
+                FileServer.getFileServer().setBaseForScript(f)
+                tree = SaveService.loadTree(f)
+            }
+            GuiPackage.getInstance().testPlanFile = f.absolutePath
+            Load.insertLoadedTree(1, tree)
+        } catch (e: ConversionException) {
+            log.error("Failure loading test file", e)
+            JMeterUtils.reportErrorToUser(SaveService.CEtoString(e))
+        } catch (e: Exception) {
+            log.error("Failure loading test file", e)
+            JMeterUtils.reportErrorToUser(e.toString())
+        }
     }
 }

From 52b8c3d90acd08214ef7725b31a7bc66c17c4632 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 May 2022 21:59:13 +0300
Subject: [PATCH 0238/1037] Update expected_release_jars

---
 src/dist/src/dist/expected_release_jars.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 30fde5d5631..e63f2ab31d4 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -91,6 +91,8 @@
 200631,kotlin-stdlib-common-1.6.21.jar
 23898,kotlin-stdlib-jdk7-1.6.21.jar
 17772,kotlin-stdlib-jdk8-1.6.21.jar
+1492143,kotlinx-coroutines-core-jvm-1.6.1.jar
+10026,kotlinx-coroutines-swing-1.6.1.jar
 792176,kotlinx-html-jvm-0.7.3.jar
 181223,lets-plot-batik-2.2.1.jar
 4025480,lets-plot-common-2.2.1.jar

From ff7e8496c576c67984c7de443ccc4a4ecb793cb9 Mon Sep 17 00:00:00 2001
From: Zishuo Ding <dingzi2012@gmail.com>
Date: Fri, 3 Jun 2022 15:39:48 -0400
Subject: [PATCH 0239/1037] refine the log message from the state of in
 pregress to complete (#714)

---
 .../jmeter/protocol/http/proxy/DefaultSamplerCreator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 1021160c208..752e98505b2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -417,7 +417,7 @@ protected void computePath(HTTPSamplerBase sampler, HttpRequestHdr request) {
             sampler.setPath(request.getPath(), null);
         }
         if (log.isDebugEnabled()) {
-            log.debug("Proxy: setting path: {}", sampler.getPath());
+            log.debug("Proxy: finished setting path: {}", sampler.getPath());
         }
     }
 

From 935b6821036754e5abdf720d8e14e17b6150e681 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 4 Jun 2022 11:39:03 +0200
Subject: [PATCH 0240/1037] Update to Groovy 3.0.11

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2549e977f09..b4ef748aaf1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -89,7 +89,7 @@ freemarker.version=2.3.31
 ftplet-api.version=1.2.0
 ftpserver-core.version=1.2.0
 geronimo-jms_1.1_spec.version=1.1.1
-groovy.version=3.0.10
+groovy.version=3.0.11
 hamcrest.version=2.2
 hamcrest-date.version=2.0.8
 hsqldb.version=2.5.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7da2d1349d0..65abb342912 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -168,7 +168,7 @@ however, the profile can't be updated while the test is running.
   <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
-  <li>Updated Groovy to 3.0.10 (from 3.0.7).</li>
+  <li>Updated Groovy to 3.0.11 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
   <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>

From 6731c66412d638c24bef5f5061ec6e8ef30a3633 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 4 Jun 2022 12:01:55 +0200
Subject: [PATCH 0241/1037] Update expected checksums for Groovy 3.0.11

---
 src/dist/src/dist/expected_release_jars.csv | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index e63f2ab31d4..6b0e8ce0330 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -52,15 +52,15 @@
 15992,error_prone_annotations-2.10.0.jar
 1715750,freemarker-2.3.31.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8014657,groovy-3.0.10.jar
-19460,groovy-datetime-3.0.10.jar
-11688,groovy-dateutil-3.0.10.jar
-137554,groovy-jmx-3.0.10.jar
-133032,groovy-json-3.0.10.jar
-21298,groovy-jsr223-3.0.10.jar
-83198,groovy-sql-3.0.10.jar
-97128,groovy-templates-3.0.10.jar
-296091,groovy-xml-3.0.10.jar
+8023771,groovy-3.0.11.jar
+19460,groovy-datetime-3.0.11.jar
+11688,groovy-dateutil-3.0.11.jar
+137554,groovy-jmx-3.0.11.jar
+133032,groovy-json-3.0.11.jar
+21298,groovy-jsr223-3.0.11.jar
+83198,groovy-sql-3.0.11.jar
+98476,groovy-templates-3.0.11.jar
+296089,groovy-xml-3.0.11.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar

From 7153c74dd0e860d0ca3825cc5a23e976e0242b6e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 6 Jun 2022 12:09:12 +0200
Subject: [PATCH 0242/1037] Update various dependecies

* apiguardian-api.version=1.1.2
* asm.version=9.3
* jackson.version=2.13.3
* jsoup.version=1.15.1
* neo4j-java-driver.version=4.4.6
* tika.version=1.28.3
---
 gradle.properties                           | 12 ++++++------
 src/dist/src/dist/expected_release_jars.csv | 18 +++++++++---------
 xdocs/changes.xml                           | 10 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b4ef748aaf1..7c1c765514c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,8 +59,8 @@ org.sonarqube.version=3.0
 accessors-smart.version=2.4.8
 activemq.version=5.16.4
 apache-rat.version=0.13
-apiguardian-api.version=1.1.0
-asm.version=9.2
+apiguardian-api.version=1.1.2
+asm.version=9.3
 bouncycastle.version=1.70
 bsf.version=2.4.0
 bsh.version=2.0b6
@@ -98,7 +98,7 @@ httpclient.version=4.5.13
 httpcore-nio.version=4.4.15
 httpcore.version=4.4.15
 httpmime.version=4.5.13
-jackson.version=2.13.2
+jackson.version=2.13.3
 jackson-databind.version=2.13.2.2
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
@@ -109,7 +109,7 @@ jmespath-jackson.version=0.5.1
 jodd.version=5.0.13
 json-path.version=2.7.0
 json-smart.version=2.4.8
-jsoup.version=1.14.3
+jsoup.version=1.15.1
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.2
@@ -121,7 +121,7 @@ mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.1.6
 mongo-java-driver.version=2.11.3
-neo4j-java-driver.version=4.4.5
+neo4j-java-driver.version=4.4.6
 objenesis.version=3.2
 oro.version=2.0.8
 ph-commons.version=10.1.6
@@ -133,7 +133,7 @@ slf4j.version=1.7.36
 spock-core.version=2.1-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
-tika.version=1.28.1
+tika.version=1.28.3
 xalan.version=2.7.2
 xercesImpl.version=2.12.2
 xml-apis.version=1.4.01
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 6b0e8ce0330..c032b63b412 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,7 +1,7 @@
 29524,accessors-smart-2.4.8.jar
 29371,annotations-23.0.0.jar
-2387,apiguardian-api-1.1.0.jar
-122004,asm-9.2.jar
+6806,apiguardian-api-1.1.2.jar
+122176,asm-9.3.jar
 518460,base-portable-jvm-2.2.1.jar
 485809,batik-anim-1.14.jar
 424624,batik-awt-util-1.14.jar
@@ -69,9 +69,9 @@
 328324,httpcore-4.4.15.jar
 369486,httpcore-nio-4.4.15.jar
 41790,httpmime-4.5.13.jar
-75717,jackson-annotations-2.13.2.jar
-374739,jackson-core-2.13.2.jar
-1535087,jackson-databind-2.13.2.2.jar
+75714,jackson-annotations-2.13.3.jar
+374895,jackson-core-2.13.3.jar
+1536542,jackson-databind-2.13.3.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -83,7 +83,7 @@
 26047,jodd-props-5.0.13.jar
 271159,json-path-2.7.0.jar
 119545,json-smart-2.4.8.jar
-423395,jsoup-1.14.3.jar
+429123,jsoup-1.15.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
@@ -105,7 +105,7 @@
 22576,miglayout-swing-5.3.jar
 419054,mongo-java-driver-2.11.3.jar
 29680,mxparser-1.2.2.jar
-4878084,neo4j-java-driver-4.4.5.jar
+4888362,neo4j-java-driver-4.4.6.jar
 65261,oro-2.0.8.jar
 1308773,ph-commons-10.1.6.jar
 530791,ph-css-6.5.0.jar
@@ -123,8 +123,8 @@
 301279,svgSalamander-1.1.2.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
-735645,tika-core-1.28.1.jar
-1585382,tika-parsers-1.28.1.jar
+735701,tika-core-1.28.3.jar
+1587751,tika-parsers-1.28.3.jar
 174661,vis-svg-portable-jvm-2.2.1.jar
 3154938,xalan-2.7.2.jar
 1446149,xercesImpl-2.12.2.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 65abb342912..3f461c0020a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -165,7 +165,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
   <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.3 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
   <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.11 (from 3.0.7).</li>
@@ -186,21 +186,21 @@ however, the profile can't be updated while the test is running.
   <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
   <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
   <li>Updated json-path to 2.7.0 (from 2.4.0).</li>
-  <li>Updated jsoup to 1.14.3 (from 1.13.1).</li>
+  <li>Updated jsoup to 1.15.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
   <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
-  <li>Updated Neo4j Java driver to 4.4.5 (from 4.2.0).</li>
+  <li>Updated Neo4j Java driver to 4.4.6 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
   <li>Updated ktlint to 0.40.0</li>
   <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
   <li>Updated RSyntaxTextArea to 3.2.0 (from 3.1.1).</li>
   <li>Updated SLF4J to 1.7.36 (from 1.7.30).</li>
   <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
-  <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>
+  <li><pr>698</pr>Updated Apache Tika to 1.28.3 (from 1.26).</li>
   <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
   <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
-  <li>Updated jackson to 2.13.2 (from 2.10.5)</li>
+  <li>Updated jackson to 2.13.3 (from 2.10.5)</li>
   <li>Updated jmespath to 0.5.1</li>
   <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
   <li>Updated Apache xmlgraphics commons to 2.7 (from 2.6)</li>

From 7548000b1f1dc6708e2186afa721df71057b8082 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 14 Jun 2022 14:01:26 +0100
Subject: [PATCH 0243/1037] Add the 5.5 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 414ac06cdcd..99e8aa4d08b 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -314,6 +314,13 @@
         <revision>5.4.3 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2022-06-14</created>
+        <revision>5.5 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From 5143a9794699ae8abc0a636aab651db3fc2e8892 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 7 Jul 2022 16:41:08 +0200
Subject: [PATCH 0244/1037] Prepare files for next round of 5.6-snapshots

---
 gradle.properties         |   2 +-
 xdocs/changes.xml         | 196 ++-----------------
 xdocs/changes_history.xml | 393 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 403 insertions(+), 188 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7c1c765514c..94d3f4c0e8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.5
+jmeter.version=5.6
 
 # Tools
 checkstyle.version=9.3
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3f461c0020a..1130e30954b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -18,11 +18,15 @@
 
 <!DOCTYPE document
 [
-<!ENTITY hellip   "&#x02026;" >
-<!ENTITY rarr     "&#x02192;" >
-<!ENTITY vellip   "&#x022EE;" >
-<!ENTITY nbsp     "&#x00A0;" >
-<!ENTITY ndash    "&#x02013;" >
+<!ENTITY hellip   "&#x02026;">
+<!ENTITY le       "&#x02264;">
+<!ENTITY nbsp     "&#x000A0;">
+<!ENTITY ndash    "&#x02013;">
+<!ENTITY oacute   "&#x000F3;">
+<!ENTITY rarr     "&#x02192;">
+<!ENTITY rArr     "&#x021D2;">
+<!ENTITY THORN    "&#x000DE;">
+<!ENTITY vellip   "&#x022EE;">
 ]>
 <document>
 <properties>
@@ -42,9 +46,9 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 </note>
 
 
-<!--  =================== 5.5 =================== -->
+<!--  =================== 5.6 =================== -->
 
-<h1>Version 5.5</h1>
+<h1>Version 5.6</h1>
 <p>
 Summary
 </p>
@@ -60,164 +64,43 @@ Summary
 </ul>
 
 <ch_section>New and Noteworthy</ch_section>
-<p>JMeter now supports Java 17</p>
-
-<p>JMeter 5.5 ships with log4j2 2.17.2</p>
-
-<ch_title>Open Model Thread Group</ch_title>
-
-<p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
-allows creating load profiles with variable load.</p>
-
-<p>For example, if you need to gradually increase load from <code>0/sec</code> to <code>10/sec</code> during <code>minute</code>
-you could previously use <code>Thread Group + Timer</code> combinations. However, then you need to compute
-the expected number of threads, ensure they are created only when needed, and so on.</p>
-
-<p>With <code>Open Model Thread Group</code> you can configure the same load profile as <code>rate(0/sec) random_arrivals(1&nbsp;minute) rate(10/sec)</code>.
-The thread group would spawn threads as needed to drive the configured load.
-The load profile can use properties, so you can launch the same script with slightly different load levels,
-however, the profile can't be updated while the test is running.
-</p>
-
-<p>The new thread group is experimental in JMeter 5.5, so please feel free to submit your feedback.</p>
-<figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
-
-<ch_title>Preparing the deprecation of Oro Regex usage</ch_title>
-
-<p>Another experimental feature in JMeter 5.5 is the ability to replace the Oro based Regex implementation
-  by the built-in Java based one. To choose the Java based one, set the JMeter property <code>jmeter.regex.engine</code>
-  to the value <code>java</code>.</p>
-
-<ch_title>Core improvements</ch_title>
-<p>Kotlin language is now used in some core classes and tests (e.g. Open Model Thread Group).
-    JMeter is compiled with <code>apiTarget=1.5</code>, and it ships with <code>kotlin-stdlib</code> 1.6.
-</p>
-
-<p><a href="https://github.com/JetBrains/lets-plot-kotlin">lets-plot-kotlin</a> charting library is added,
-    so it will be easier to refine and create new charts in UI in the future.
-</p>
 
 <ch_section>Improvements</ch_section>
 
 <h3>Thread Groups</h3>
 <ul>
-  <li>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code></li>
 </ul>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
-  <li><bug>65027</bug>Detect mime-type for files automatically when adding files to HTTP Sampler</li>
-  <li><bug>65020</bug>HTTP Sampler/Files upload tab &ndash; add missing buttons</li>
-  <li><pr>650</pr>HTTP Sampler timestamp fix when exception is caught. Contributed by Konstantin Kalinin (konstantin at kkalinin.pro)</li>
-  <li><bug>65328</bug><pr>666</pr>HTTP 308 Permanent Redirect is not supported. Contributed by
-    Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
 </ul>
 
 <h3>Other samplers</h3>
 <ul>
-  <li><bug>65149</bug><pr>644</pr>Encode the personal part of email addresses in SMTP Sampler</li>
-  <li><pr>638</pr>Various additions to the Bolt Sampler. Added <code>transaction timeout</code>, <code>database</code>
-    option required for Neo4j 4.x (with multi-database support) and <code>access mode</code> option, that allows running
-    against a Neo4j Enterprise Causal Cluster. Contributed by David Pecollet (david.pecollet at gmail.com)</li>
 </ul>
 
 <h3>Controllers</h3>
 <ul>
-  <li><pr>665</pr>Increase visible lines of code in <code>IfController</code> and <code>WhileController</code>.
-    Based on an idea by David Getzlaff (david.getzlaff at t-systems.com>).</li>
 </ul>
 
 <h3>Listeners</h3>
 <ul>
-  <li><bug>64988</bug>Sort properties and variables in a human expected order for DebugPostProcessor and DebugSampler</li>
-  <li><bug>63061</bug>Sort View Results in Table in a human expected order</li>
-  <li><pr>706</pr>Try to keep UI responsive when displaying large text results. Can be configured with the new property
-      <code>view.results.tree.simple_view_limit</code></li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
-    <li><pr>638</pr>Bolt Connection Configuration: added <code>ConnectionPoolMaxSize</code> parameter. Contributed by
-        David Pecollet (david.pecollet at gmail.com)</li>
-    <li><bug>65515</bug>Allow pooling of Prepared Statements in JDBC</li>
-    <li><bug>65299</bug>JSONPathAssertion attributes are out of order/Compare JSON objects and
-        not their string representations.</li>
 </ul>
 
 <h3>Report / Dashboard</h3>
 <ul>
-  <li><bug>65353</bug>Make the estimator used for calculating percentiles on the dashboard configurable</li>
 </ul>
 
 <h3>General</h3>
 <ul>
-  <li><bug>61805</bug><pr>663</pr>Add simple HTTP request template. Contributed by Ori Marko (orimarko at gmail.com)</li>
-  <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
-  <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
-  <li><bug>63620</bug><pr>694</pr>Fix GUI freeze when viewing response body with long line breaks</li>
-  <li><pr>699</pr>Add documentation for Graphite Backend Listener. Contributed by Ji Hun (jihunkimkw at gmail.com)</li>
-  <li><bug>57672</bug><pr>700</pr>Add a switch (<code>jmeter.regex.engine</code>) to replace Oro Regex implementation by the built-in Java one.</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
-  <li>Added Kotlin 1.6.21 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
-  <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
-  <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.3 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
-  <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
-  <li>Updated Groovy to 3.0.11 (from 3.0.7).</li>
-  <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
-  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
-  <li>Updated Asm to 9.2 (from 9.1).</li>
-  <li>Updated Bouncycastle to 1.70 (from 1.67).</li>
-  <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>
-  <li>Updated Apache commons-dbcp2 to 2.9.0 (from 2.8.0).</li>
-  <li>Updated Apache commons-io to 2.11.0 (from 2.8.0).</li>
-  <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>
-  <li>Updated Apache commons-net to 3.8.0 (from 3.7.2).</li>
-  <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
-  <li>Updated equalsverifier to 3.10 (from 3.4.2).</li>
-  <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
-  <li>Updated hsqldb to 2.5.2 (from 2.5.0).</li>
-  <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
-  <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
-  <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
-  <li>Updated json-path to 2.7.0 (from 2.4.0).</li>
-  <li>Updated jsoup to 1.15.1 (from 1.13.1).</li>
-  <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
-  <li>Updated Miglayout to 5.3 (from 5.2).</li>
-  <li>Updated Neo4j Java driver to 4.4.6 (from 4.2.0).</li>
-  <li>Updated Objenesis to 3.2 (from 2.6).</li>
-  <li>Updated ktlint to 0.40.0</li>
-  <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
-  <li>Updated RSyntaxTextArea to 3.2.0 (from 3.1.1).</li>
-  <li>Updated SLF4J to 1.7.36 (from 1.7.30).</li>
-  <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
-  <li><pr>698</pr>Updated Apache Tika to 1.28.3 (from 1.26).</li>
-  <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
-  <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
-  <li>Updated jackson to 2.13.3 (from 2.10.5)</li>
-  <li>Updated jmespath to 0.5.1</li>
-  <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
-  <li>Updated Apache xmlgraphics commons to 2.7 (from 2.6)</li>
-  <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
-     to <code>user.properties</code>, as it is read from that place.
-     Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>
-  <li><bug>65456</bug>Updated commons-jexl 3 to 3.2.1 (from 3.1). Contributed by Ori Marko (orimarko at gmail.com>)</li>
-  <li><pr>654</pr>Try do give better feedback while loading keystores</li>
-  <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
-  <li>Updated Gradle to 7.3 (from 7.2)</li>
-  <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
-  <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
-  <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
-  <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
-  <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
-  <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.com)></li>
-  <li>Updated Rhino JavaScript to 1.7.14 (from 1.7.13)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -226,19 +109,10 @@ however, the profile can't be updated while the test is running.
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
-  <li><bug>65310</bug>Don't let users override <code>multipart/form-data</code> <code>content-type</code>
-    header in HC4 sampler.</li>
-  <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
-  <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align SSL properties between Java and HC4 implementation</li>
-  <li><bug>65108</bug>Support JMeter variables in <a href="./usermanual/component_reference.html#HTTP_Request">GraphQL HTTP Request</a></li>
-  <li><bug>65864</bug>Catch <code>NullPointerException</code> from JSoup when recording a test plan</li>
 </ul>
 
 <h3>Other Samplers</h3>
 <ul>
-  <li><bug>65152</bug>OS Process Sampler &ndash; Cannot <code>Add from Clipboard</code> Command parameters</li>
-  <li><pr>638</pr>Bolt Sampler: fixed error displaying results when "Record Query Results" is enabled. Contributed by
-        David Pecollet (david.pecollet at gmail.com)</li>
 </ul>
 
 <h3>Controllers</h3>
@@ -247,21 +121,10 @@ however, the profile can't be updated while the test is running.
 
 <h3>Listeners</h3>
 <ul>
-  <li><bug>64962</bug>Save CSV sub-results recursively from View Results Tree</li>
-  <li><bug>65784</bug>No Graphs displayed in Aggregate Report/Response Time Graph</li>
-  <li><bug>65884</bug>GUI doesn't display response for multipart request <em>manually</em> encoded</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
-  <li><bug>65257</bug>JMESPathExtractor writes error log entries if JMESPath filter returns empty result</li>
-  <li><bug>65259</bug>JMESPathExtractor Attribute <code>Match No.</code> Required</li>
-  <li><bug>65269</bug>JSON Extractor and JSON JMESPath Extractor ignore sub-samples</li>
-  <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
-  <li><bug>65681</bug>Use default values for <code>null</code> values when extracting with JSONPostProcessor</li>
-  <li>Allow setters in ConstantThroughputTimer to update the values during run time</li>
-  <li><bug>65782</bug>Use correct message format for MessageFormat in HTMLAssertion</li>
-  <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
 </ul>
 
 <h3>Functions</h3>
@@ -278,24 +141,10 @@ however, the profile can't be updated while the test is running.
 
 <h3>Documentation</h3>
 <ul>
-  <li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at gmail.com)</li>
 </ul>
 
 <h3>General</h3>
 <ul>
-  <li><bug>64318</bug>DNS Cache Manager &ndash; custom DNS resolver does not use system resolver by default</li>
-  <li><pr>641</pr><pr>698</pr>Updated xercesImpl to 2.12.2 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
-  <li><pr>645</pr>Add escaping for new lines in <code>AbstractInfluxdbMetricsSender</code>. Contributed by David Getzlaff (david.getzlaff at t-systems.com>)</li>
-  <li><bug>65198</bug>Can't copy generated function from FunctionHelper</li>
-  <li><pr>661</pr>Fix wording in doc. Contributed by BugKing (wangzhen at fit2cloud.com)</li>
-  <li><pr>664</pr>Allow whitespace in path. Contributed by Till Neunast (github.com/tilln)</li>
-  <li><bug>65270</bug>POST <code>application/x-www-form-urlencoded</code> cURL code generated from Postman is not imported correctly</li>
-  <li>Silence warnings of missing font Arial on startup under Linux</li>
-  <li><bug>65300</bug><code>IllegalAccessError</code> when opening file dialog with Java 16</li>
-  <li><bug>65336</bug>Blank labels when different elements had the same name</li>
-  <li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
-  <li><bug>63914</bug>Simplify <code>:src:dist:clean</code> configuration, ensure <code>/lib/junit/test.jar</code> is removed on clean</li>
-  <li><pr>696</pr>Keep JSyntaxTextArea text value for use in headless mode. Contributed by Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -304,32 +153,9 @@ however, the profile can't be updated while the test is running.
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
-  <li>Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li>njzukas (github.com/njzukas)</li>
-  <li>David Getzlaff (david.getzlaff at t-systems.com>)</li>
-  <li>Konstantin Kalinin (konstantin at kkalinin.pro)</li>
-  <li>David Pecollet (david.pecollet at gmail.com)</li>
-  <li>Ori Marko (orimarko at gmail.com)</li>
-  <li>BugKing (wangzhen at fit2cloud.com)</li>
-  <li>Till Neunast (github.com/tilln)</li>
-  <li>Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
-  <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
-  <li>Mariusz (mawasak at gmail.com)</li>
-  <li>peter.wong@csexperts.com</li>
-  <li>Woonsan Ko (woonsan.ko at bloomreach.com)</li>
-  <li>Chromico Rek (atech5122 at gmail.com)</li>
-  <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
-  <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
-  <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
-  <li>Ji Hun (jihunkimkw at gmail.com)</li>
-  <li>Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
-  <li>NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
-  <li>Wilson Kurniawan (wilson at visenze.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
-  <li>Nikola Aleksic (nalexic at gmail.com)</li>
-  <li>Vladimir Rosu (rosuvladimir at gmail.com)</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index 8b8b4f40006..bff95888506 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -17,14 +17,15 @@
   -->
 
 <!DOCTYPE document [
-  <!ENTITY vellip   "&#x022EE;" >
   <!ENTITY hellip "&#x02026;">
   <!ENTITY le     "&#x02264;">
   <!ENTITY nbsp   "&#x000A0;">
+  <!ENTITY ndash  "&#x02013;">
   <!ENTITY oacute "&#x000F3;">
-  <!ENTITY THORN  "&#x000DE;">
   <!ENTITY rarr   "&#x02192;">
   <!ENTITY rArr   "&#x021D2;">
+  <!ENTITY THORN  "&#x000DE;">
+  <!ENTITY vellip "&#x022EE;">
 ]>
 <document>
 <properties>
@@ -41,6 +42,394 @@ Current changes are detailed in <a href="changes.html">Changes</a>.
 <p><b>Changes sections are chronologically ordered from top (most recent) to bottom
 (least recent)</b></p>
 
+<!--  =================== 5.5 =================== -->
+
+<h1>Version 5.5</h1>
+<p>
+Summary
+</p>
+<ul>
+<li><a href="#New and Noteworthy">New and Noteworthy</a></li>
+<li><a href="#Incompatible changes">Incompatible changes</a></li>
+<li><a href="#Bug fixes">Bug fixes</a></li>
+<li><a href="#Improvements">Improvements</a></li>
+<li><a href="#Non-functional changes">Non-functional changes</a></li>
+<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
+<li><a href="#Thanks">Thanks</a></li>
+
+</ul>
+
+<ch_section>New and Noteworthy</ch_section>
+<p>JMeter now supports Java 17</p>
+
+<p>JMeter 5.5 ships with log4j2 2.17.2</p>
+
+<ch_title>Open Model Thread Group</ch_title>
+
+<p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
+allows creating load profiles with variable load.</p>
+
+<p>For example, if you need to gradually increase load from <code>0/sec</code> to <code>10/sec</code> during <code>minute</code>
+you could previously use <code>Thread Group + Timer</code> combinations. However, then you need to compute
+the expected number of threads, ensure they are created only when needed, and so on.</p>
+
+<p>With <code>Open Model Thread Group</code> you can configure the same load profile as <code>rate(0/sec) random_arrivals(1&nbsp;minute) rate(10/sec)</code>.
+The thread group would spawn threads as needed to drive the configured load.
+The load profile can use properties, so you can launch the same script with slightly different load levels,
+however, the profile can't be updated while the test is running.
+</p>
+
+<p>The new thread group is experimental in JMeter 5.5, so please feel free to submit your feedback.</p>
+<figure width="1398" height="1117" image="open_model_thread_group.png">Open Model Thread Group sample</figure>
+
+<ch_title>Preparing the deprecation of Oro Regex usage</ch_title>
+
+<p>Another experimental feature in JMeter 5.5 is the ability to replace the Oro based Regex implementation
+  by the built-in Java based one. To choose the Java based one, set the JMeter property <code>jmeter.regex.engine</code>
+  to the value <code>java</code>.</p>
+
+<ch_title>Core improvements</ch_title>
+<p>Kotlin language is now used in some core classes and tests (e.g. Open Model Thread Group).
+    JMeter is compiled with <code>apiTarget=1.5</code>, and it ships with <code>kotlin-stdlib</code> 1.6.
+</p>
+
+<p><a href="https://github.com/JetBrains/lets-plot-kotlin">lets-plot-kotlin</a> charting library is added,
+    so it will be easier to refine and create new charts in UI in the future.
+</p>
+
+<ch_section>Improvements</ch_section>
+
+<h3>Thread Groups</h3>
+<ul>
+  <li>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code></li>
+</ul>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><bug>65027</bug>Detect mime-type for files automatically when adding files to HTTP Sampler</li>
+  <li><bug>65020</bug>HTTP Sampler/Files upload tab &ndash; add missing buttons</li>
+  <li><pr>650</pr>HTTP Sampler timestamp fix when exception is caught. Contributed by Konstantin Kalinin (konstantin at kkalinin.pro)</li>
+  <li><bug>65328</bug><pr>666</pr>HTTP 308 Permanent Redirect is not supported. Contributed by
+    Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
+</ul>
+
+<h3>Other samplers</h3>
+<ul>
+  <li><bug>65149</bug><pr>644</pr>Encode the personal part of email addresses in SMTP Sampler</li>
+  <li><pr>638</pr>Various additions to the Bolt Sampler. Added <code>transaction timeout</code>, <code>database</code>
+    option required for Neo4j 4.x (with multi-database support) and <code>access mode</code> option, that allows running
+    against a Neo4j Enterprise Causal Cluster. Contributed by David Pecollet (david.pecollet at gmail.com)</li>
+</ul>
+
+<h3>Controllers</h3>
+<ul>
+  <li><pr>665</pr>Increase visible lines of code in <code>IfController</code> and <code>WhileController</code>.
+    Based on an idea by David Getzlaff (david.getzlaff at t-systems.com>).</li>
+</ul>
+
+<h3>Listeners</h3>
+<ul>
+  <li><bug>64988</bug>Sort properties and variables in a human expected order for DebugPostProcessor and DebugSampler</li>
+  <li><bug>63061</bug>Sort View Results in Table in a human expected order</li>
+  <li><pr>706</pr>Try to keep UI responsive when displaying large text results. Can be configured with the new property
+      <code>view.results.tree.simple_view_limit</code></li>
+</ul>
+
+<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+<ul>
+    <li><pr>638</pr>Bolt Connection Configuration: added <code>ConnectionPoolMaxSize</code> parameter. Contributed by
+        David Pecollet (david.pecollet at gmail.com)</li>
+    <li><bug>65515</bug>Allow pooling of Prepared Statements in JDBC</li>
+    <li><bug>65299</bug>JSONPathAssertion attributes are out of order/Compare JSON objects and
+        not their string representations.</li>
+</ul>
+
+<h3>Report / Dashboard</h3>
+<ul>
+  <li><bug>65353</bug>Make the estimator used for calculating percentiles on the dashboard configurable</li>
+</ul>
+
+<h3>General</h3>
+<ul>
+  <li><bug>61805</bug><pr>663</pr>Add simple HTTP request template. Contributed by Ori Marko (orimarko at gmail.com)</li>
+  <li><bug>65611</bug><pr>673</pr>Add support for IPv6 addresses when specifying a remote worker node. Based on a patch by Peter Wong (peter.wong at csexperts.com)</li>
+  <li>Reduce memory consumption by the logging panel (disable undo events for it)</li>
+  <li><bug>63620</bug><pr>694</pr>Fix GUI freeze when viewing response body with long line breaks</li>
+  <li><pr>699</pr>Add documentation for Graphite Backend Listener. Contributed by Ji Hun (jihunkimkw at gmail.com)</li>
+  <li><bug>57672</bug><pr>700</pr>Add a switch (<code>jmeter.regex.engine</code>) to replace Oro Regex implementation by the built-in Java one.</li>
+</ul>
+
+<ch_section>Non-functional changes</ch_section>
+<ul>
+  <li>Added Kotlin 1.6.21 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
+  <li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
+  <li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.8 (from 2.3), accessors-smart to 2.4.8 (from 1.2) and asm 9.3 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
+  <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
+  <li>Updated Groovy to 3.0.11 (from 3.0.7).</li>
+  <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
+  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
+  <li>Updated Asm to 9.2 (from 9.1).</li>
+  <li>Updated Bouncycastle to 1.70 (from 1.67).</li>
+  <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>
+  <li>Updated Apache commons-dbcp2 to 2.9.0 (from 2.8.0).</li>
+  <li>Updated Apache commons-io to 2.11.0 (from 2.8.0).</li>
+  <li>Updated Apache commons-lang3 to 3.12.0 (from 3.11).</li>
+  <li>Updated Apache commons-net to 3.8.0 (from 3.7.2).</li>
+  <li>Updated Apache commons-pool2 to 2.11.1 (from 2.9.0).</li>
+  <li>Updated equalsverifier to 3.10 (from 3.4.2).</li>
+  <li>Updated Apache Freemarker to 2.3.31 (from 2.3.30).</li>
+  <li>Updated hsqldb to 2.5.2 (from 2.5.0).</li>
+  <li>Updated Apache HttpClient to 4.5.13 (from 4.5.12).</li>
+  <li>Updated Apache HttpCore to 4.4.15 (from 4.4.13).</li>
+  <li>Updated jacoco to 0.8.7 (from 0.8.5).</li>
+  <li>Updated json-path to 2.7.0 (from 2.4.0).</li>
+  <li>Updated jsoup to 1.15.1 (from 1.13.1).</li>
+  <li>Updated JUnit to 4.13.2 and 5.8.2 (from 4.13.1 and 5.7.0).</li>
+  <li>Updated Apache log4j2 to 2.17.2 (from 2.13.3).</li>
+  <li>Updated Miglayout to 5.3 (from 5.2).</li>
+  <li>Updated Neo4j Java driver to 4.4.6 (from 4.2.0).</li>
+  <li>Updated Objenesis to 3.2 (from 2.6).</li>
+  <li>Updated ktlint to 0.40.0</li>
+  <li>Updated PH CSS and PH commons to 6.5.4 and 10.1.6 (from 6.2.3 and 9.5.1).</li>
+  <li>Updated RSyntaxTextArea to 3.2.0 (from 3.1.1).</li>
+  <li>Updated SLF4J to 1.7.36 (from 1.7.30).</li>
+  <li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
+  <li><pr>698</pr>Updated Apache Tika to 1.28.3 (from 1.26).</li>
+  <li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
+  <li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
+  <li>Updated jackson to 2.13.3 (from 2.10.5)</li>
+  <li>Updated jmespath to 0.5.1</li>
+  <li>Updated Saxon-HE to 11.2 (from 9.9.1-8)</li>
+  <li>Updated Apache xmlgraphics commons to 2.7 (from 2.6)</li>
+  <li><pr>671</pr>Move example definition of property <code>jmeter.reportgenerator.statistic_window</code>
+     to <code>user.properties</code>, as it is read from that place.
+     Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>
+  <li><bug>65456</bug>Updated commons-jexl 3 to 3.2.1 (from 3.1). Contributed by Ori Marko (orimarko at gmail.com>)</li>
+  <li><pr>654</pr>Try do give better feedback while loading keystores</li>
+  <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
+  <li>Updated Gradle to 7.3 (from 7.2)</li>
+  <li><pr>689</pr>Code clean up in StringFromFile. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>690</pr>Refactor a few unit tests. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>692></pr>Fix a few deprecation warnings for Gradle. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><pr>697></pr>Junit 5 tests to use asserts from Junit 5 API. Contributed by Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li><bug>65983</bug><pr>707</pr>Use current screenshot for save-to-file listener in documentation. Based on patch by NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
+  <li><pr>708</pr>Make errorprone happier. Based on patch by Wilson Kurniawan (wilson at visenze.com)></li>
+  <li>Updated Rhino JavaScript to 1.7.14 (from 1.7.13)</li>
+</ul>
+
+ <!-- =================== Bug fixes =================== -->
+
+<ch_section>Bug fixes</ch_section>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><bug>65310</bug>Don't let users override <code>multipart/form-data</code> <code>content-type</code>
+    header in HC4 sampler.</li>
+  <li><bug>65363</bug><code>NullPointerException</code> in <code>HTTPHC4Impl$ManagedCredentialsProvider.getAuthorizationForAuthScope</code> when <code>401</code> response from remote and <code>httpclient4.auth.preemptive=false</code></li>
+  <li><bug>65692</bug>HTTP(s) Test Script Recorder: Enable setting enabled cipher suite and enabled protocols on SSLContext/ Align SSL properties between Java and HC4 implementation</li>
+  <li><bug>65108</bug>Support JMeter variables in <a href="./usermanual/component_reference.html#HTTP_Request">GraphQL HTTP Request</a></li>
+  <li><bug>65864</bug>Catch <code>NullPointerException</code> from JSoup when recording a test plan</li>
+</ul>
+
+<h3>Other Samplers</h3>
+<ul>
+  <li><bug>65152</bug>OS Process Sampler &ndash; Cannot <code>Add from Clipboard</code> Command parameters</li>
+  <li><pr>638</pr>Bolt Sampler: fixed error displaying results when "Record Query Results" is enabled. Contributed by
+        David Pecollet (david.pecollet at gmail.com)</li>
+</ul>
+
+<h3>Controllers</h3>
+<ul>
+</ul>
+
+<h3>Listeners</h3>
+<ul>
+  <li><bug>64962</bug>Save CSV sub-results recursively from View Results Tree</li>
+  <li><bug>65784</bug>No Graphs displayed in Aggregate Report/Response Time Graph</li>
+  <li><bug>65884</bug>GUI doesn't display response for multipart request <em>manually</em> encoded</li>
+</ul>
+
+<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+<ul>
+  <li><bug>65257</bug>JMESPathExtractor writes error log entries if JMESPath filter returns empty result</li>
+  <li><bug>65259</bug>JMESPathExtractor Attribute <code>Match No.</code> Required</li>
+  <li><bug>65269</bug>JSON Extractor and JSON JMESPath Extractor ignore sub-samples</li>
+  <li><bug>65352</bug>Warning logged when Boundary Extractor doesn't find any match</li>
+  <li><bug>65681</bug>Use default values for <code>null</code> values when extracting with JSONPostProcessor</li>
+  <li>Allow setters in ConstantThroughputTimer to update the values during run time</li>
+  <li><bug>65782</bug>Use correct message format for MessageFormat in HTMLAssertion</li>
+  <li><bug>65794</bug>JSON Assertion always successful with indefinite paths</li>
+</ul>
+
+<h3>Functions</h3>
+<ul>
+</ul>
+
+<h3>I18N</h3>
+<ul>
+</ul>
+
+<h3>Report / Dashboard</h3>
+<ul>
+</ul>
+
+<h3>Documentation</h3>
+<ul>
+  <li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at gmail.com)</li>
+</ul>
+
+<h3>General</h3>
+<ul>
+  <li><bug>64318</bug>DNS Cache Manager &ndash; custom DNS resolver does not use system resolver by default</li>
+  <li><pr>641</pr><pr>698</pr>Updated xercesImpl to 2.12.2 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
+  <li><pr>645</pr>Add escaping for new lines in <code>AbstractInfluxdbMetricsSender</code>. Contributed by David Getzlaff (david.getzlaff at t-systems.com>)</li>
+  <li><bug>65198</bug>Can't copy generated function from FunctionHelper</li>
+  <li><pr>661</pr>Fix wording in doc. Contributed by BugKing (wangzhen at fit2cloud.com)</li>
+  <li><pr>664</pr>Allow whitespace in path. Contributed by Till Neunast (github.com/tilln)</li>
+  <li><bug>65270</bug>POST <code>application/x-www-form-urlencoded</code> cURL code generated from Postman is not imported correctly</li>
+  <li>Silence warnings of missing font Arial on startup under Linux</li>
+  <li><bug>65300</bug><code>IllegalAccessError</code> when opening file dialog with Java 16</li>
+  <li><bug>65336</bug>Blank labels when different elements had the same name</li>
+  <li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
+  <li><bug>63914</bug>Simplify <code>:src:dist:clean</code> configuration, ensure <code>/lib/junit/test.jar</code> is removed on clean</li>
+  <li><pr>696</pr>Keep JSyntaxTextArea text value for use in headless mode. Contributed by Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
+</ul>
+
+ <!--  =================== Thanks =================== -->
+
+<ch_section>Thanks</ch_section>
+<p>We thank all contributors mentioned in bug and improvement sections above:
+</p>
+<ul>
+  <li>Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li>njzukas (github.com/njzukas)</li>
+  <li>David Getzlaff (david.getzlaff at t-systems.com>)</li>
+  <li>Konstantin Kalinin (konstantin at kkalinin.pro)</li>
+  <li>David Pecollet (david.pecollet at gmail.com)</li>
+  <li>Ori Marko (orimarko at gmail.com)</li>
+  <li>BugKing (wangzhen at fit2cloud.com)</li>
+  <li>Till Neunast (github.com/tilln)</li>
+  <li>Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
+  <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
+  <li>Mariusz (mawasak at gmail.com)</li>
+  <li>peter.wong@csexperts.com</li>
+  <li>Woonsan Ko (woonsan.ko at bloomreach.com)</li>
+  <li>Chromico Rek (atech5122 at gmail.com)</li>
+  <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
+  <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
+  <li>Sampath Kumar Krishnasamy (sampathkumar.krishnasamykuppusamy at aexp.com)</li>
+  <li>Ji Hun (jihunkimkw at gmail.com)</li>
+  <li>Peter Paul Bakker (peter.paul.bakker at stokpop.nl)</li>
+  <li>NaveenKumar Namachivayam (catch.nkn at gmail.com)</li>
+  <li>Wilson Kurniawan (wilson at visenze.com)</li>
+</ul>
+<p>We also thank bug reporters who helped us improve JMeter.</p>
+<ul>
+  <li>Nikola Aleksic (nalexic at gmail.com)</li>
+  <li>Vladimir Rosu (rosuvladimir at gmail.com)</li>
+</ul>
+<p>
+Apologies if we have omitted anyone else.
+</p>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
+
+<ch_section>Known problems and workarounds</ch_section>
+<ul>
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
+
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
+popd
+export JVM_ARGS="--module-path $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
+
+</ul>
+
 <!--  =================== 5.4.3 =================== -->
 
 <h1>Version 5.4.3</h1>

From b914b713640ffd88b935786d13c0acce51b04259 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 5 Jul 2022 16:16:38 +0200
Subject: [PATCH 0245/1037] Correct theme for darklaf on rsyntaxtextarea

The id of the theme has been changed to all lowercase

Bugzilla Id: 66517
Closes #719
---
 .../java/org/apache/jmeter/gui/action/LookAndFeelCommand.java   | 2 +-
 xdocs/changes.xml                                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 864a3e552e1..260c59f4f83 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -200,7 +200,7 @@ public LookAndFeelCommand() {
     }
 
     public static boolean isDarklafTheme() {
-        return "Darklaf".equals(UIManager.getLookAndFeel().getID()); // $NON-NLS-1$
+        return "Darklaf".equalsIgnoreCase(UIManager.getLookAndFeel().getID()); // $NON-NLS-1$
     }
 
     public static boolean isDark() {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1130e30954b..84bb8e3ce4a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -145,6 +145,7 @@ Summary
 
 <h3>General</h3>
 <ul>
+  <li><bug>66157<bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From cc98da39143caa456126a4787c199623f95f2ec3 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 7 Jul 2022 17:26:33 +0200
Subject: [PATCH 0246/1037] Correct markup

---
 xdocs/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 84bb8e3ce4a..a1d8771a717 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -145,7 +145,7 @@ Summary
 
 <h3>General</h3>
 <ul>
-  <li><bug>66157<bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
+  <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 0327a256c591f8bea36eddbfe692ef65af0883e1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 7 Jul 2022 17:27:50 +0200
Subject: [PATCH 0247/1037] Only bug fixes for now, so set next version to
 5.5.1

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 94d3f4c0e8a..874c65a5204 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.6
+jmeter.version=5.5.1
 
 # Tools
 checkstyle.version=9.3
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a1d8771a717..65147fb68da 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -46,9 +46,9 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 </note>
 
 
-<!--  =================== 5.6 =================== -->
+<!--  =================== 5.5.1 =================== -->
 
-<h1>Version 5.6</h1>
+<h1>Version 5.5.1</h1>
 <p>
 Summary
 </p>

From c6f0685b5f3f61c52c71c970d6d4c9b4764bc5a0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 8 Jul 2022 11:59:58 +0200
Subject: [PATCH 0248/1037] Switch to Ubuntu focal for building on travis

The default dist is xenial, which is 16.04 and really out of date now
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dfa89c649d2..756b8c94308 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: java
+dist: focal
 
 # skip default "install" command
 install: true

From d07220973bb4be05c511f6f6874894b9accc384b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 8 Jul 2022 15:04:22 +0200
Subject: [PATCH 0249/1037] install-jdk.sh on travis doesn't support Java 8
 with Focal

---
 .travis.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 756b8c94308..262e2cb501e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,11 +29,16 @@ matrix:
     - name: Tests with OpenJDK 11 on s390x
   include:
     - name: Tests with OpenJDK 8 + code coverage
-      jdk: openjdk8
+      before_script:
+        - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
       script:
         - xvfb-run ./gradlew build jacocoReport $SKIP_TAR
       after_success:
         - bash <(curl -s https://codecov.io/bash)
+      addons:
+        apt:
+          packages:
+            - openjdk-8-jdk
     - name: Tests with OpenJDK 11
       jdk: openjdk11
       addons:
@@ -91,7 +96,12 @@ matrix:
         # Spotless, Checkstyle, and JaCoCo are verified here to ensure they all work with the latest supported Java
         - xvfb-run ./gradlew build jacocoReport -Duser.language=fr -Duser.country=FR $SKIP_TAR
     - name: jmeter-maven-plugin tests
-      jdk: openjdk8
+      addons:
+        apt:
+          packages:
+            - openjdk-8-jdk
+      before_script:
+        - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
       script:
         - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore
         - cd ..

From 65789f880038d806101da1de20ce98df53acac09 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 29 Jun 2022 20:11:22 +0300
Subject: [PATCH 0250/1037] doc: add load profile samples to Open Model Thread
 Group documentation

---
 xdocs/usermanual/component_reference.xml | 85 ++++++++++++++++++------
 1 file changed, 64 insertions(+), 21 deletions(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index bd94ec9f840..73d0c2619aa 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6521,38 +6521,81 @@ See <a href="get-started.html#classpath">JMeter's Classpath</a> and
        The users are generated according to the schedule.
     </p>
     <p>The load profile consists of a sequence of constant, increasing or decreasing load.
-       The following commands are available:
-        <ul>
-            <li><code>rate(&lt;number&gt;/sec)</code> &mdash; configures target load rate.
+       The basic configuration is <code>rate(1/sec) random_arrivals(2 min) rate(3/sec)</code> which means the load will increase linearly
+        from one request per second to three requests per second during a period of two-minutes.
+       If you omit rate at the end, then it will be set to the same value as that from the start. For example,
+        <code>rate(1/sec) random_arrivals(2 min)</code> is exactly the same as <code>rate(1/sec) random_arrivals(2 min) rate(1/sec)</code>.
+       That is why <code>rate(1/sec) random_arrivals(2 min) random_arrivals(3 min) rate(4/sec)</code> is exactly the same as
+        <code>rate(1/sec) random_arrivals(2 min) rate(1/sec) random_arrivals(3 min) rate(4/sec)</code>, so the load is one request per second during the first two minutes,
+        after which it increases linearly from one request per second to four requests per second during three minutes.
+    </p>
+    <p>Here are examples for using the schedule:
+        <dl>
+            <dt><code>rate(10/sec) random_arrivals(1 min) rate(10/sec)</code></dt>
+            <dd>constant load rate of ten requests per second during one minute</dd>
+
+            <dt><code>rate(0) random_arrivals(1 min) rate(10/sec)</code></dt>
+            <dd>linearly increase the load from zero requests per second to ten requests per second during one minute</dd>
+
+            <dt><code>rate(0) random_arrivals(1 min) rate(10/sec) random_arrivals(1 min) rate(10/sec) random_arrivals(1 min) rate(0)</code></dt>
+            <dd>linearly increase the load from zero requests per second to ten requests per second during one minute, then hold the load during one minute,
+                then linearly decrease the load from ten requests per second to zero during one minute</dd>
+
+            <dt><code>rate(10) random_arrivals(1 min) rate(10/sec) random_arrivals(1 min) rate(10/sec) random_arrivals(1 min) rate(0)</code></dt>
+            <dd>linearly increase the load from zero requests per second to ten requests per second during one minute, then hold the load during one minute,
+                then linearly decrease the load from ten requests per second to zero requests per second during one minute</dd>
+
+            <dt><code>rate(10) random_arrivals(1 min) pause(2 sec) random_arrivals(1 min)</code></dt>
+            <dd>run with constant load of ten requests per second during one minute, then make two second pause, then resume the load of ten requests per second for one minute</dd>
+        </dl>
+    </p>
+    <p>The following commands are available:
+        <dl>
+            <dt><code>rate(&lt;number&gt;/sec)</code></dt>
+            <dd>configures target load rate.
                 The following time units are supported: <code>ms</code>, <code>sec</code>, <code>min</code>, <code>hour</code>, <code>day</code>.
-                You can omit time unit in case the rate is 0: <code>rate(0)</code></li>
-            <li><code>random_arrivals(&lt;number&gt; sec)</code> &mdash; configures random arrivals schedule with the given duration.
+                You can omit time unit in case the rate is 0: <code>rate(0)</code>
+            </dd>
+
+            <dt><code>random_arrivals(&lt;number&gt; sec)</code></dt>
+            <dd>configures random arrivals schedule with the given duration.
                 The starting load rate is configured before <code>random_arrivals</code>, and the finish load rate is configured after <code>random_arrivals</code>.
-                For example, 10 minute test from 5/sec at the beginning till 15/sec at the end could be configured as <code>rate(5/sec) random_arrivals(10 min) rate(15/sec)</code>.
-                <br/>The implicit rate at the beginning of the test is 0. If the finish rate is not provided (or if several <code>random_arrivals</code> steps go one after another),
+                For example, 10 minute test from five requests per second at the beginning to fifteen request per second at the end could be configured as <code>rate(5/sec) random_arrivals(10 min) rate(15/sec)</code>.
+                <br/>The implicit rate at the beginning of the test is <code>0</code>. If the finish rate is not provided (or if several <code>random_arrivals</code> steps go one after another),
                 then the load is constant. For instance, <code>rate(3/sec) random_arrivals(1 min) random_arrivals(2 min) rate(6/sec)</code> configures
-                constant rate of 3/sec for the first 1 minute, and then the load increases from 3/sec till 6/sec during the next 2 minutes.
+                constant rate of three requests per second for the first minute, and then the load increases from three requests per second to six requests per second during the next two minutes.
                 The time units are the same as in <code>rate</code>.
-            </li>
-            <li><code>even_arrivals(&lt;number&gt; sec)</code> &mdash; configures even arrivals (TODO: not implemented yet). For instance, if the desired load
-                is 1/sec, then <code>random_arrivals</code> would lauch samples with exactly 1 second intervals.</li>
-            <li><code>pause(&lt;number&gt; sec)</code> &mdash; configures a pause for the given duration.
+            </dd>
+
+            <dt><code>even_arrivals(&lt;number&gt; sec)</code></dt>
+            <dd>configures even arrivals (TODO: not implemented yet). For instance, if the desired load
+                is one request per second, then <code>random_arrivals</code> would lauch samples with exactly one second intervals.
+            </dd>
+
+            <dt><code>pause(&lt;number&gt; sec)</code></dt>
+            <dd>configures a pause for the given duration.
                 The rate is restored after the pause, so <code>rate(2/sec) random_arrivals(5 sec) pause(5 sec) random_arrivals(5 sec)</code>
-                generates random arrivals with 2/sec rate, then a pause for 5 seconds (no new arrivals), then 5 more seconds with 2/sec rate.<br/>
+                generates random arrivals with two requests per second rate, then a pause for five seconds (no new arrivals), then five more seconds with two requests per second rate.<br/>
                 Note: <code>pause</code> duration is always honoured, even if all the scenarios are complete, and no new ones will be scheduled.
                 For instance, if you use <code>rate(1/sec) random_arrivals(1 min) pause(1 hour)</code>, the thread group would
-                always last for 61 minutes no matter how much time do individual scenarios take.
-            </li>
-            <li><code>/* Comments */</code> can be used to clarify the schedule or temporary disable some steps. Comments
-                cannot be nested.</li>
-            <li><code>// line comments</code> can be used to clarify the schedule or temporary disable some steps.
-                Line comment lasts till the end of the line.</li>
-        </ul>
+                always last for sixty-one minutes no matter how much time do individual scenarios take.
+            </dd>
+
+            <dt><code>/* Comments */</code></dt>
+            <dd>can be used to clarify the schedule or temporary disable some steps. Comments
+                cannot be nested.
+            </dd>
+
+            <dt><code>// line comments</code></dt>
+            <dd>can be used to clarify the schedule or temporary disable some steps.
+                Line comment lasts till the end of the line.
+            </dd>
+        </dl>
     </p>
     <p>The thread groups terminates threads as soon as the schedule ends. In other words, the threads are interrupted
         after all <code>arrivals</code> and <code>pause</code> intervals.
         If you want to let the threads complete safely, consider adding <code>pause(5 min)</code> at the end of the schedule.
-        That will add 5 minutes for the threads to continue.
+        That will add five minutes for the threads to continue.
     </p>
     <p>There are no special functions for generating the load profile in a loop, however, the default JMeter templating functions
         can be helpful for generating the schedule.

From 07b67a0ec917c73a3ddf6ab29167bb55e3583282 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 9 Jul 2022 13:17:40 +0200
Subject: [PATCH 0251/1037] Check if target is reachable, before generating
 args for test

Travis doesn't add [::1] to it's local IPv6 interface on newer Ubuntu distros.
---
 .../http/sampler/ParallelResourcesAndIpSource.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
index 50349438601..9b50751b0b6 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
@@ -19,6 +19,7 @@
 
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
+import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -114,6 +115,13 @@ public static Iterable<Arguments> implementationsAndIps() throws SocketException
                     // with the given source IP
                     continue;
                 }
+                try {
+                    if (!InetAddress.getByName(targetHost).isReachable(100)) {
+                        continue;
+                    }
+                } catch (IOException e) {
+                    continue;
+                }
 
                 localIps.forEach(localIp -> {
                     if (finalLocal4 != null) {

From b22b00c69459dad4f7b02518c6a5e1f4bcfebad4 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 9 Jul 2022 14:14:09 +0200
Subject: [PATCH 0252/1037] Guess the delimiter of the CSV source, when
 configured one seems wrong.

This is in line with the behaviour of CSVSaveService.

Bugzilla Id: 66140
---
 .../report/core/SampleMetaDataParser.java     | 38 +++++++++++++++++--
 xdocs/changes.xml                             |  2 +
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
index aeab11b89c7..bc96a660d5a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.report.core;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -26,14 +30,42 @@
  */
 public class SampleMetaDataParser {
 
-    private char separator;
+    private final char separator;
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private static final Pattern DELIMITER_PATTERN = Pattern
+            // This assumes the header names are all single words with no spaces
+            // word followed by 0 or more repeats of (non-word char + word)
+            // where the non-word char (\2) is the same
+            // e.g. abc|def|ghi but not abd|def~ghi
+            .compile("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*" // $NON-NLS-1$
+                    // last entries may be quoted strings
+            );
 
     public SampleMetaDataParser(char separator) {
         this.separator = separator;
     }
 
     public SampleMetadata parse(String headRow) {
-        String[] cols = headRow.split(Pattern.quote(Character.toString(separator)));
-        return new SampleMetadata(separator, cols);
+        char useSep = separator;
+        if (headRow.indexOf(useSep) < 0) {
+            Matcher matcher = DELIMITER_PATTERN.matcher(headRow);
+            if (matcher.matches()) {
+                String guessedSep = matcher.group(2);
+                if (guessedSep.length() != 1) {
+                    throw new IllegalArgumentException(
+                            "We guessed a delimiter of '"+guessedSep+"', but we support only one-character-separators");
+                }
+                useSep = guessedSep.charAt(0);
+                logger.warn("Use guessed delimiter '{}' instead of configured '{}'. "
+                        +"Please configure the property 'jmeter.save.saveservice.default_delimiter={}'",
+                        useSep,
+                        separator,
+                        useSep);
+            }
+        }
+        String[] cols = headRow.split(Pattern.quote(Character.toString(useSep)));
+        return new SampleMetadata(useSep, cols);
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 65147fb68da..89aa8ddc628 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -137,6 +137,8 @@ Summary
 
 <h3>Report / Dashboard</h3>
 <ul>
+  <li><bug>66140</bug>Guess the delimiter of the CSV source, when configured one seems wrong.
+    This is in line with the behaviour of CSVSaveService.</li>
 </ul>
 
 <h3>Documentation</h3>

From 8d53bb9491c629696b48b233605b3d70036f611a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 9 Jul 2022 14:15:11 +0200
Subject: [PATCH 0253/1037] Don't generate same string twice.

---
 .../jmeter/report/core/CsvSampleReader.java      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
index 97508d58b57..86b134c8054 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
@@ -150,18 +150,14 @@ private Pair<Boolean, SampleMetadata> readMetadata(char separator, boolean useSa
                     && CSVSaveService.getSampleSaveConfiguration(
                             line, file.getAbsolutePath()) == null) {
                 // Build metadata from default save config
-                if (log.isWarnEnabled()) {
-                    log.warn(
-                            "File '{}' does not contain the field names header, "
-                                    + "ensure the jmeter.save.saveservice.* properties are the same "
-                                    + "as when the CSV file was created or the file may be read incorrectly "
-                                    + "when generating report",
-                            file.getAbsolutePath());
-                }
-                System.out.println("File '"+file.getAbsolutePath()+"' does not contain the field names header, "
+                String warnMessage = "File '" + file.getAbsolutePath() + "' does not contain the field names header, "
                         + "ensure the jmeter.save.saveservice.* properties are the same "
                         + "as when the CSV file was created or the file may be read incorrectly "
-                        + "when generating report");
+                        + "when generating report";
+                if (log.isWarnEnabled()) {
+                    log.warn(warnMessage);
+                }
+                System.out.println(warnMessage);
                 result = new SampleMetadata(
                         SampleSaveConfiguration.staticConfig());
 

From b46786cd57ffa456e247c8ecb81da65679b01acd Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 9 Jul 2022 14:21:32 +0200
Subject: [PATCH 0254/1037] Order of imports

---
 .../org/apache/jmeter/report/core/SampleMetaDataParser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
index bc96a660d5a..be00c516b53 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.report.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Simple parser to get a {@link SampleMetadata} instance<br>
  *

From 157db3679a5ed14e97f4b7dd59f29b395217cd48 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 9 Jul 2022 14:48:17 +0200
Subject: [PATCH 0255/1037] Make failing tests run again and add more tests

Bugzilla Id: 66140
---
 .../jmeter/report/core/SampleMetaDataParser.java  |  5 +++--
 .../report/core/SampleMetadataParserSpec.groovy   | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
index be00c516b53..b798656efda 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java
@@ -39,9 +39,10 @@ public class SampleMetaDataParser {
             // word followed by 0 or more repeats of (non-word char + word)
             // where the non-word char (\2) is the same
             // e.g. abc|def|ghi but not abd|def~ghi
-            .compile("\\w+((\\W)\\w+)?(\\2\\w+)*(\\2\"\\w+\")*" // $NON-NLS-1$
+            .compile("\\w+((\\W)[\\w ]+)?(\\2[\\w ]+)*(\\2\"[\\w ]+\")*" // $NON-NLS-1$
                     // last entries may be quoted strings
             );
+    private static final Pattern ALL_WORD_CHARS = Pattern.compile("^\\w+$");
 
     public SampleMetaDataParser(char separator) {
         this.separator = separator;
@@ -49,7 +50,7 @@ public SampleMetaDataParser(char separator) {
 
     public SampleMetadata parse(String headRow) {
         char useSep = separator;
-        if (headRow.indexOf(useSep) < 0) {
+        if (headRow.indexOf(useSep) < 0 && !ALL_WORD_CHARS.matcher(headRow).matches()) {
             Matcher matcher = DELIMITER_PATTERN.matcher(headRow);
             if (matcher.matches()) {
                 String guessedSep = matcher.group(2);
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy
index 180fce0d7df..fe1ed724131 100644
--- a/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy
+++ b/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy
@@ -40,4 +40,19 @@ class SampleMetadataParserSpec extends Specification {
             ','       | "abcdef"          | ["abcdef"]
     }
 
+    def "Parse headers (#headers) with wrong separator (#separator) and get (#expectedColumns)"() {
+        given:
+        def sut = new SampleMetaDataParser(separator as char)
+        when:
+        def columns = sut.parse(headers).columns
+        then:
+        columns == expectedColumns
+        where:
+        separator | headers           | expectedColumns
+        ','       | "a;b;c;d;e"       | ["a", "b", "c", "d", "e"]
+        ','       | "a|b|c|d|e"       | ["a", "b", "c", "d", "e"]
+        ','       | "aa|bb|cc|dd|eef" | ["aa", "bb", "cc", "dd", "eef"]
+        ','       | "a&b&c&d&e"       | ["a", "b", "c", "d", "e"]
+        ','       | "a\tb c\td\te"    | ["a", "b c", "d", "e"]
+    }
 }

From cbcf41fc84fd637a5e063e8de88cc746fa884b06 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 23 Jul 2022 15:19:15 +0200
Subject: [PATCH 0256/1037] Restructure tests for XPathUtil

Use a dummy printstream instead of null to ignore errors on System.err.
Use ParameterizedTests to make test methods more concise.
---
 .../org/apache/jmeter/util/XPathUtilTest.java | 174 ++++++++----------
 1 file changed, 76 insertions(+), 98 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index e3c1af65198..c258cba5d31 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -19,16 +19,16 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.FactoryConfigurationError;
@@ -39,6 +39,10 @@
 import org.apache.jmeter.assertions.AssertionResult;
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -115,29 +119,25 @@ public void testputValuesForXPathInListUsingSaxon() throws SaxonApiException, Fa
         assertEquals(0,matchStrings.size());
     }
 
-    @Test
-    public void testnamespacesParse() {
-        String namespaces = "donald=duck";
+    static Stream<Arguments> namespaceData() {
+        return Stream.of(
+                Arguments.of("donald=duck", "donald", "duck", 0),
+                Arguments.of("donald=duck\nmickey=mouse", "donald", "duck", 0),
+                Arguments.of("donald=duck\nmickey=mouse", "mickey", "mouse", 1),
+                Arguments.of("donald=duck\n\n\nmickey=mouse", "mickey", "mouse", 1),
+                Arguments.of("donald=duck\n\n\nmickey=mouse", "donald", "duck", 0),
+                Arguments.of("donald=duck\n     \n   \nmickey=mouse\n   \n\n", "donald", "duck", 0),
+                Arguments.of("donald=duck\n     \n   \nmickey=mouse\n   \n\n", "mickey", "mouse", 1),
+                Arguments.of("   \n \ndonald=duck\n     \n   \nmickey=mouse\n   \n\n", "donald", "duck", 0),
+                Arguments.of("   \n \ndonald=duck\n     \n   \nmickey=mouse\n   \n\n", "mickey", "mouse", 1)
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("namespaceData")
+    public void testnamespacesParse(String namespaces, String key, String value, int position) {
         List<String[]> test = XPathUtil.namespacesParse(namespaces);
-        assertEquals("donald",test.get(0)[0]);
-        assertEquals("duck",test.get(0)[1]);
-
-        namespaces = "donald=duck\nmickey=mouse";
-        test = XPathUtil.namespacesParse(namespaces);
-        assertEquals("donald",test.get(0)[0]);
-        assertEquals("duck",test.get(0)[1]);
-        assertEquals("mickey",test.get(1)[0]);
-        assertEquals("mouse",test.get(1)[1]);
-
-        namespaces = "donald=duck\n\n\nmickey=mouse";
-        test = XPathUtil.namespacesParse(namespaces);
-        assertEquals("mickey",test.get(1)[0]);
-        assertEquals("mouse",test.get(1)[1]);
-
-        namespaces = "geo=patate\n       \n   \n\nmickey=mouse\n\n      \n";
-        test = XPathUtil.namespacesParse(namespaces);
-        assertEquals("mickey",test.get(1)[0]);
-        assertEquals("mouse",test.get(1)[1]);
+        assertEquals(key,test.get(position)[0]);
+        assertEquals(value, test.get(position)[1]);
     }
 
     @Test
@@ -163,64 +163,44 @@ public void testFormatXmlComplex() {
     @Test
     public void testFormatXmlInvalid() {
         PrintStream origErr = System.err;
-        // The parser will print an error, so let it go where we will not see it
-        System.setErr(null);
-        assertThat("No well formed xml here", CoreMatchers
-                .is(XPathUtil.formatXml("No well formed xml here")));
-        System.setErr(origErr);
+        try {
+            // The parser will print an error, so let it go where we will not see it
+            System.setErr(new PrintStream(new OutputStream() {
+                @Override
+                public void write(int b) throws IOException {
+                    // ignore output
+                }
+            }));
+            assertThat("No well formed xml here", CoreMatchers
+                    .is(XPathUtil.formatXml("No well formed xml here")));
+        } finally {
+            System.setErr(origErr);
+        }
     }
 
-    @Test
-    public void testMakeDocument() throws ParserConfigurationException, SAXException, IOException, TidyException {
-        String responseData = "<book><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
-        Document testDoc = XPathUtil.makeDocument(
-                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)), false, false, false, false,
-                false, false, false, false, false);
-        AssertionResult res = new AssertionResult("test");
-        String xpathquery = "/book";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, false);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
-        xpathquery = "/book/error";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, false);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        xpathquery = "count(/book/page)=2";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, false);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
-        xpathquery = "count(/book/page)=1";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, false);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        xpathquery = "///book";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, false);
-        assertTrue("Should be an error", res.isError());
-    }
-
-    @Test
-    public void testMakeDocumentIsnegated()
+    @ParameterizedTest
+    @CsvSource(value = {
+            "/book,false,false,false",
+            "/book/error,false,false,true",
+            "/book/error,true,false,false",
+            "/book/preface,true,false,true",
+            "count(/book/page)=2,false,false,false",
+            "count(/book/page)=2,true,false,true",
+            "count(/book/page)=1,false,false,true",
+            "count(/book/page)=1,true,false,false",
+            "///book,false,true,false"
+    })
+    public void testMakeDocument(String xpathquery, boolean isNegated, boolean isError, boolean isFailure)
             throws ParserConfigurationException, SAXException, IOException, TidyException {
         String responseData = "<book><preface>zero</preface><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
         Document testDoc = XPathUtil.makeDocument(
-                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)), false, false, false, false,
+                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)),
+                false, false, false, false,
                 false, false, false, false, false);
         AssertionResult res = new AssertionResult("test");
-        String xpathquery = "/book/error";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, true);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
-        xpathquery = "/book/preface";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, true);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, true);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        xpathquery = "count(/book/page)=1";
-        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, true);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
+        XPathUtil.computeAssertionResult(res, testDoc, xpathquery, isNegated);
+        assertEquals("test isError", isError, res.isError());
+        assertEquals("test isFailure", isFailure, res.isFailure());
     }
 
     @Test
@@ -234,37 +214,35 @@ public void testGetNamespaces() throws XMLStreamException, FactoryConfigurationE
         assertEquals("http://www.w3.org/wgs85_pos#", res.get(1)[1]);
     }
 
-    @Test
-    public void testComputeAssertionResultUsingSaxon() throws SaxonApiException, FactoryConfigurationError {
+    @ParameterizedTest
+    @CsvSource(value = {
+            "/book,false,false,false",
+            "/book,true,false,true",
+            "/b,false,false,true",
+            "/b,true,false,false",
+            "count(//page)=2,false,false,false",
+            "count(//page)=2,true,false,true",
+            "count(//page)=3,false,false,true",
+            "count(//page)=3,true,false,false"
+    })
+    public void testComputeAssertionResultUsingSaxon(String xpathquery, boolean isNegated, boolean isError, boolean isFailure)
+            throws SaxonApiException, FactoryConfigurationError {
         //test xpath2 assertion
         AssertionResult res = new AssertionResult("test");
         String responseData = "<book><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
-        String xpathquery = "/book";
-        XPathUtil.computeAssertionResultUsingSaxon(res, responseData, xpathquery, "", false);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
-        //test xpath2 assertion
-        xpathquery = "/b";
-        XPathUtil.computeAssertionResultUsingSaxon(res, responseData, xpathquery, "", false);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        //test xpath2 assertion boolean
-        xpathquery = "count(//page)=2";
-        XPathUtil.computeAssertionResultUsingSaxon(res, responseData, xpathquery, "", false);
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
-        //test xpath2 assertion boolean
-        xpathquery = "count(//page)=3";
-        XPathUtil.computeAssertionResultUsingSaxon(res, responseData, xpathquery, "", false);
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
+        XPathUtil.computeAssertionResultUsingSaxon(res, responseData, xpathquery, "", isNegated);
+        assertEquals(isError, res.isError());
+        assertEquals(isFailure, res.isFailure());
     }
 
     @Test
-    public void testPutValuesForXPathInList() throws ParserConfigurationException, SAXException, IOException, TidyException, TransformerException {
+    public void testPutValuesForXPathInList()
+            throws ParserConfigurationException, SAXException, IOException, TidyException, TransformerException {
         String responseData = "<book><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
         Document testDoc = XPathUtil.makeDocument(
-                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)), false, false, false, false,
+                new ByteArrayInputStream(
+                        responseData.getBytes(StandardCharsets.UTF_8)),
+                false, false, false, false,
                 false, false, false, false, false);
         String xpathquery = "/book/page";
         List<String> matchs=new ArrayList<>();

From 3d49c6efb781035ab23e14127502e765abdb2534 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sat, 23 Jul 2022 15:32:28 +0100
Subject: [PATCH 0257/1037] Update XPathUtilTest.java

---
 .../src/test/java/org/apache/jmeter/util/XPathUtilTest.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index c258cba5d31..89f1f4dc765 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -19,6 +19,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -251,7 +252,12 @@ public void testPutValuesForXPathInList()
         assertEquals("<page>two</page>", matchs.get(1));
         matchs=new ArrayList<>();
         XPathUtil.putValuesForXPathInList(testDoc, xpathquery, matchs, false);
+        assertEquals(2, matchs.size());
         assertEquals("one", matchs.get(0));
         assertEquals("two", matchs.get(1));
+        matchs=new ArrayList<>();
+        XPathUtil.putValuesForXPathInList(testDoc, "/book/a", matchs, false);
+        assertEquals(1, matchs.size());
+        assertNull(matchs.get(0));
     }
 }

From 936e275e5a7689284bb8ec63b719221090a6163c Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sat, 23 Jul 2022 16:13:11 +0100
Subject: [PATCH 0258/1037] Update XPathUtilTest.java

---
 .../org/apache/jmeter/util/XPathUtilTest.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index 89f1f4dc765..dd02987a6f5 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -45,6 +45,8 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import net.sf.saxon.s9api.Processor;
@@ -260,4 +262,19 @@ public void testPutValuesForXPathInList()
         assertEquals(1, matchs.size());
         assertNull(matchs.get(0));
     }
+
+    @Test
+    public void testSelectNodeList() throws ParserConfigurationException, SAXException, IOException, TidyException, TransformerException {
+        String responseData = "<book><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
+        Document testDoc = XPathUtil.makeDocument(
+                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)), false, false, false, false,
+                false, false, false, false, false);
+        String xpathquery = "/book/page";
+        NodeList nodeList = XPathUtil.selectNodeList(testDoc, xpathquery);
+        assertEquals(2, nodeList.getLength());
+        Element e0 = (Element) nodeList.item(0);
+        Element e1 = (Element) nodeList.item(1);
+        assertEquals("one", e0.getTextContent());
+        assertEquals("two", e1.getTextContent());
+    }
 }

From b73f69074f8b3b5d71767ab0fedb52f16a1e55d6 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 23 Jul 2022 17:21:10 +0200
Subject: [PATCH 0259/1037] Add test for broken xpath in
 XPathUtil#selectNodeList

---
 .../java/org/apache/jmeter/util/XPathUtilTest.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index dd02987a6f5..d916487f10d 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -20,6 +20,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -277,4 +278,14 @@ public void testSelectNodeList() throws ParserConfigurationException, SAXExcepti
         assertEquals("one", e0.getTextContent());
         assertEquals("two", e1.getTextContent());
     }
+
+    @Test()
+    public void testSelectNodeListWithInvalidXPath() throws Exception {
+        String responseData = "<book><page>one</page><page>two</page><empty></empty><a><b></b></a></book>";
+        Document testDoc = XPathUtil.makeDocument(
+                new ByteArrayInputStream(responseData.getBytes(StandardCharsets.UTF_8)), false, false, false, false,
+                false, false, false, false, false);
+        String xpathquery = "<";
+        assertThrows(TransformerException.class, () -> XPathUtil.selectNodeList(testDoc, xpathquery));
+    }
 }

From 82cc3e5c89630ff67723571e2aa48a23fa40a6be Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 23 Sep 2022 13:23:12 +0300
Subject: [PATCH 0260/1037] Add .asf.yaml, enable GitHub Issues

https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
---
 .asf.yaml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 00000000000..2eaa5c930b8
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,25 @@
+# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
+
+github:
+  description: "Apache JMeter open-source load testing tool for analyzing and measuring the performance of a variety of services"
+  homepage: https://jmeter.apache.org/
+  labels:
+    - performance
+    - test
+    - java
+
+  enabled_merge_buttons:
+    squash: true
+    merge:  false
+    rebase: true
+
+  features:
+    wiki: false
+    issues: true
+    projects: false
+
+notifications:
+  commits:      commits@jmeter.apache.org
+  issues:       dev@jmeter.apache.org
+  pullrequests: dev@jmeter.apache.org
+  jira_options: link label

From 47c18776267273464254447be6b50a8d61b14e3e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Sep 2022 18:25:18 +0300
Subject: [PATCH 0261/1037] Add GitHub Issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        | 59 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yaml            |  5 ++
 .github/ISSUE_TEMPLATE/documentation.yaml     | 27 +++++++++
 .github/ISSUE_TEMPLATE/feature_request.yaml   | 58 ++++++++++++++++++
 .github/ISSUE_TEMPLATE/regression.yaml        | 59 +++++++++++++++++++
 .../PULL_REQUEST_TEMPLATE.md                  |  0
 ISSUE_TEMPLATE.md                             | 15 -----
 7 files changed, 208 insertions(+), 15 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/regression.yaml
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md (100%)
 delete mode 100644 ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000000..8e079b4fa5e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,59 @@
+name: Bug report
+description: Create a report and help us improve
+labels:
+  - defect
+  - to-triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+        Read the [User manual](https://jmeter.apache.org/usermanual/index.html) and/or [Reference documentation](https://jmeter.apache.org/usermanual/component_reference.html)
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: |
+        Describe what you were expecting JMeter to do
+      placeholder: |
+        Here you can also attach log files, screenshots or a video
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual behavior
+      description: |
+        Describe what you observed JMeter did instead
+      placeholder: |
+        Here you can also attach log files (e.g. jmeter.log), screenshots or a video
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce the problem
+      description: |
+        - If the problem relates to a third-party plugin, consider removing them first
+      placeholder: |
+        Here you can also attach log files, screenshots or a video
+    validations:
+      required: true
+  - type: input
+    id: jmeter-version
+    attributes:
+      label: JMeter Version
+      description: |
+        What JMeter version and edition did you use?
+        Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
+      placeholder: ex. JMeter 5.5
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java Version
+      description: What JDK version and distribution did you use (use `java -version`)
+      placeholder: ex. openjdk version "17" 2021-09-14
+  - type: input
+    id: os-version
+    attributes:
+      label: OS Version
+      description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
+      placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 00000000000..04a0fb026db
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: JMeter users mailing list
+    url: https://jmeter.apache.org/mail2.html
+    about: Please ask questions on JMeter usage on users mailing list (note that you need to subscribe first)
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
new file mode 100644
index 00000000000..66192ff73e6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -0,0 +1,27 @@
+name: Feedback about the manual
+description: Found an issue with the documentation?
+labels:
+  - documentation
+  - to-triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: input
+    id: url
+    attributes:
+      label: The documentation URL
+      placeholder: ex. https://jmeter.apache.org/usermanual/best-practices.html
+    validations:
+      required: true
+  - type: textarea
+    id: feedback
+    attributes:
+      label: Feedback
+      description: |
+        Describe what issue with the documentation you've found
+      placeholder: |
+        Here you can also attach log files, screenshots or a video
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000000..d3a52265e22
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,58 @@
+name: Feature Request
+description: Suggest an idea
+labels:
+  - enhancement
+  - to-triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please describe the use-case you have. This will better help us understand the context in which you're looking for a new feature.
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description: |
+        Please describe the use-case you have. This will better help us understand the context in which you're looking for a new feature.
+      placeholder: Describe the use-case here
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Possible solution
+      description: |
+        Please describe a possible solution you'd like to see in JMeter, ideally with example code.
+        Please note, it's not always easy to describe a good solution. Describing the use-case above is much more important to us.
+      placeholder: Describe the possible solution here.
+    validations:
+      required: false
+  - type: textarea
+    id: workarounds
+    attributes:
+      label: Possible workarounds
+      description: |
+        Please describe the possible workarounds you've implemented to work around the lacking functionality.
+      placeholder: Describe the possible workarounds here.
+    validations:
+      required: false
+  - type: input
+    id: jmeter-version
+    attributes:
+      label: JMeter Version
+      description: What JMeter version and edition did you use?
+      placeholder: ex. JMeter 5.5
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java Version
+      description: What JDK version and distribution did you use (use `java -version`)
+      placeholder: ex. openjdk version "17" 2021-09-14
+  - type: input
+    id: os-version
+    attributes:
+      label: OS Version
+      description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
+      placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
diff --git a/.github/ISSUE_TEMPLATE/regression.yaml b/.github/ISSUE_TEMPLATE/regression.yaml
new file mode 100644
index 00000000000..3bda8912d70
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/regression.yaml
@@ -0,0 +1,59 @@
+name: Regression
+description: Report a problem about something that used to work
+labels:
+  - regression
+  - to-triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+        Read the [User manual](https://jmeter.apache.org/usermanual/index.html) and/or [Reference documentation](https://jmeter.apache.org/usermanual/component_reference.html)
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: |
+        Describe what you were expecting JMeter to do
+      placeholder: |
+        Here you can also attach log files, screenshots or a video
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual behavior
+      description: |
+        Describe what you observed JMeter did instead
+      placeholder: |
+        Here you can also attach log files (e.g. jmeter.log), screenshots or a video
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce the problem
+      description: |
+        - If the problem relates to a third-party plugin, consider removing them first
+      placeholder: |
+        Here you can also attach log files, screenshots or a video
+    validations:
+      required: true
+  - type: input
+    id: jmeter-version
+    attributes:
+      label: JMeter Version
+      description: |
+        What JMeter version and edition did you use?
+        Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
+      placeholder: ex. JMeter 5.5
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java Version
+      description: What JDK version and distribution did you use (use `java -version`)
+      placeholder: ex. openjdk version "17" 2021-09-14
+  - type: input
+    id: os-version
+    attributes:
+      label: OS Version
+      description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
+      placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index d24c0af1d5f..00000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Reporting an issue:
-
-- Mention JVM implementation (OpenJDK, Oracle JDK, ...), versions of Java, Apache JMeter
-- Provide anonymized and as simple as possible test plan helping reproduce the issue
-- Provide jmeter.log
-- If it's a bug, explain clearly how to reproduce:
-    - What should happen (OK Case)
-    - What happens (KO Case)
-- If it's an enhancement request, explain what you want, why you need it and the clear use case
-- Answer to questions of the person who handles your case
-
-Issue are related to bug or enhancements, it is not the right place to ask questions about usage, for the latter:
-
-- Read the [User manual](https://jmeter.apache.org/usermanual/index.html) and/or [Reference documentation](https://jmeter.apache.org/usermanual/component_reference.html)
-- Ask questions on the [user mailing list](https://jmeter.apache.org/mail2.html). *Note you need to subscribe first*

From 4f802f64bde23eb95007b9ba78468d6ee8307410 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Sep 2022 22:05:43 +0300
Subject: [PATCH 0262/1037] Use "5.5" suggestion in issue template instead of
 "JMeter 5.5"

---
 .github/ISSUE_TEMPLATE/bug_report.yaml      | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +-
 .github/ISSUE_TEMPLATE/regression.yaml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8e079b4fa5e..00a07cd91a7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,7 +42,7 @@ body:
       description: |
         What JMeter version and edition did you use?
         Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
-      placeholder: ex. JMeter 5.5
+      placeholder: ex. 5.5
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index d3a52265e22..f85d623f2f5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -41,7 +41,7 @@ body:
     attributes:
       label: JMeter Version
       description: What JMeter version and edition did you use?
-      placeholder: ex. JMeter 5.5
+      placeholder: ex. 5.5
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/regression.yaml b/.github/ISSUE_TEMPLATE/regression.yaml
index 3bda8912d70..14e09d220af 100644
--- a/.github/ISSUE_TEMPLATE/regression.yaml
+++ b/.github/ISSUE_TEMPLATE/regression.yaml
@@ -42,7 +42,7 @@ body:
       description: |
         What JMeter version and edition did you use?
         Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
-      placeholder: ex. JMeter 5.5
+      placeholder: ex. 5.5
     validations:
       required: true
   - type: input

From f4e43daa4f96cd5a2feaba11e6d55943d8b9690c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Sep 2022 18:45:26 +0300
Subject: [PATCH 0263/1037] doc: handle <issue> markup in documentation

---
 xdocs/stylesheets/website-style.xsl | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index 7cc19339001..445d5810ab0 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -552,7 +552,7 @@
       Bug
       <xsl:value-of select="./text()" />
     </a>
-    -
+    <xsl:call-template name="issue_separator"/>
   </xsl:template>
 
   <xsl:template match="rfc">
@@ -566,23 +566,27 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="pr[following-sibling::pr or following-sibling::bug]">
+  <xsl:template match="pr">
     <a href="https://github.com/apache/jmeter/pull/{./text()}">
       Pull request #<xsl:value-of select="./text()" />
-    </a>,
+    </a>
+    <xsl:call-template name="issue_separator"/>
   </xsl:template>
 
-  <xsl:template match="pr[not(following-sibling::pr) and (not(preceding-sibling::*) or preceding-sibling::bug or preceding-sibling::pr)]">
-    <a href="https://github.com/apache/jmeter/pull/{./text()}">
-      Pull request #<xsl:value-of select="./text()" />
+  <xsl:template match="issue">
+    <a href="https://github.com/apache/jmeter/issues/{./text()}">
+      Issue #<xsl:value-of select="./text()" />
     </a>
-    -
+    <xsl:call-template name="issue_separator"/>
   </xsl:template>
 
-  <xsl:template match="pr">
-    <a href="https://github.com/apache/jmeter/pull/{./text()}">
-      Pull request #<xsl:value-of select="./text()" />
-    </a>
+  <xsl:template name="issue_separator">
+    <xsl:choose>
+      <xsl:when test="following-sibling::issue or following-sibling::pr or following-sibling::bug">, </xsl:when>
+      <!-- If preceding element is text, then avoid adding "," or "-". It looks like inline reference to an issue, PR -->
+      <xsl:when test="preceding-sibling::text()[normalize-space() != '']"/>
+      <xsl:otherwise> &ndash; </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="links">

From 9a90023aeecba2b7c822055c9b73aeb5cd275a73 Mon Sep 17 00:00:00 2001
From: kaola89 <36156723+kaola89@users.noreply.github.com>
Date: Wed, 17 Aug 2022 22:03:10 +0800
Subject: [PATCH 0264/1037] Update messages_zh_CN.properties

Add Chinese Simplified Translation for Open Model Thread Group
---
 .../org/apache/jmeter/resources/messages_zh_CN.properties     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index 3ac59dd129f..d056b882d4d 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -557,6 +557,10 @@ notify_child_listeners_fr=将过滤过的取样器通知子监听器
 number_of_threads=线程数：
 once_only_controller_title=仅一次控制器
 open=打开...
+openmodelthreadgroup=开放模式线程组
+openmodelthreadgroup_random_seed=随机种子
+openmodelthreadgroup_schedule_string=调度计划
+openmodelthreadgroup_schedule_summary=总持续时间：{0}, 最大速率：{1}
 option=选项
 optional_tasks=其他任务
 paramtable=同请求一起发送参数：

From c60c3ab8e05c5d0f6c8bcadd2f0540297c6f0ea3 Mon Sep 17 00:00:00 2001
From: kaola89 <36156723+kaola89@users.noreply.github.com>
Date: Wed, 17 Aug 2022 23:27:57 +0800
Subject: [PATCH 0265/1037] Update messages_zh_CN.properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update word “模式” to “模型”
---
 .../org/apache/jmeter/resources/messages_zh_CN.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index d056b882d4d..71dfbaa56c0 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -557,7 +557,7 @@ notify_child_listeners_fr=将过滤过的取样器通知子监听器
 number_of_threads=线程数：
 once_only_controller_title=仅一次控制器
 open=打开...
-openmodelthreadgroup=开放模式线程组
+openmodelthreadgroup=开放模型线程组
 openmodelthreadgroup_random_seed=随机种子
 openmodelthreadgroup_schedule_string=调度计划
 openmodelthreadgroup_schedule_summary=总持续时间：{0}, 最大速率：{1}

From 89255174ed7488e8cb87c5752745fe6af992119b Mon Sep 17 00:00:00 2001
From: SampathKumarAmex <sampathkumar.krishnasamykuppusamy@aexp.com>
Date: Thu, 25 Aug 2022 15:37:02 +0100
Subject: [PATCH 0266/1037] Used Junit 5 assertions to keep it consistent

---
 .../apache/jmeter/timers/SyncTimerTest.java   | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
index 9efd2ce1aaa..ceee196ba5c 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.jmeter.timers;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterThread;
 import org.apache.jorphan.collections.ListedHashTree;
-import org.junit.Assert;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class SyncTimerTest {
@@ -35,10 +36,9 @@ public void testTimerWithScheduledEndpoint() {
         timer.setGroupSize(2);
         timer.testStarted();
         long duration = timeDelay(timer);
-        Assert.assertTrue(
-                "Calculating delay takes less then " + schedulerDuration * 2
-                        + " ms (took: " + duration + " ms)",
-                duration < schedulerDuration * 2);
+        assertTrue(duration < schedulerDuration * 2,
+            "Calculating delay takes less then " + schedulerDuration * 2
+                + " ms (took: " + duration + " ms)");
     }
 
     @Test
@@ -51,10 +51,9 @@ public void testTimerWithLongerScheduledEndpointThanTimeoutForTimer() {
         timer.testStarted();
         timer.setTimeoutInMs(timerTimeout);
         long duration = timeDelay(timer);
-        Assert.assertTrue(
-                "Calculating delay takes less then " + timerTimeout * 2
-                        + " ms (took: " + duration + " ms)",
-                duration < timerTimeout * 2);
+        assertTrue(duration < timerTimeout * 2,
+            "Calculating delay takes less then " + timerTimeout * 2
+                + " ms (took: " + duration + " ms)");
     }
 
     @Test
@@ -67,10 +66,10 @@ public void testTimerWithShorterScheduledEndpointThanTimeoutForTimer() {
         timer.testStarted();
         timer.setTimeoutInMs(timerTimeout);
         long duration = timeDelay(timer);
-        Assert.assertTrue(
-                "Calculating delay takes less then " + schedulerDuration * 2
-                        + " ms (took: " + duration + " ms)",
-                duration < schedulerDuration * 2);
+        assertTrue(
+            duration < schedulerDuration * 2,
+            "Calculating delay takes less then " + schedulerDuration * 2
+                + " ms (took: " + duration + " ms)");
     }
 
     @Test
@@ -82,9 +81,9 @@ public void testTimerWithInvalidTimeout() {
         timer.setGroupSize(2);
         timer.testStarted();
         timer.setTimeoutInMs(timerTimeout);
-        Assertions.assertThrows(
-                IllegalArgumentException.class,
-                timer::delay);
+        assertThrows(
+            IllegalArgumentException.class,
+            timer::delay);
     }
 
     private long timeDelay(SyncTimer timer) {

From 45cd565ffa1cc606e42b9a3e8f1f5f961261e231 Mon Sep 17 00:00:00 2001
From: Sampath <61689771+SampathKumarAmex@users.noreply.github.com>
Date: Mon, 26 Sep 2022 11:07:41 +0100
Subject: [PATCH 0267/1037] Update grgit to 4.1.1 (from 4.1.0) (#691)

---
 buildSrc/checksum.xml                               | 6 ++++++
 buildSrc/subprojects/batchtest/batchtest.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 4fbc3fd4bf9..30aaae10ce3 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -51,6 +51,12 @@
     <trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
   </trusted-keys>
   <dependencies>
+    <dependency group='org.ajoberstar.grgit' module='grgit-gradle' version='4.1.1'>
+      <sha512>DB910E6A6A65DBB18E68D566F1CFD8B7CBF5F57F05A8FAC79EAB71830C5F5B5B7574F039A859EDEE6EF737E5B43B6E6985E0D1BC8D24195A11EB9E9807DFAC8A</sha512>
+    </dependency>
+    <dependency group='org.ajoberstar.grgit' module='grgit-core' version='4.1.1'>
+      <sha512>B1137C44F791BAD962C7D1FDE2DD54F6A2564097DA111BAE5D4764497E3679A8243728666C3947F6DCB464E2B6AE0592889DB9D4D69B407C4694DC01DE3C76E1</sha512>
+    </dependency>
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='1.4.9'>
       <sha512>E2E7D75380BBFB3A6DAA93A75FAB9D8F4038D42FFBA93B9FE8A350C1BD735FF746A01E3FB76A62DFA7B26EDADA638EB045D45F47568A427E6C1505F70A92AE79</sha512>
     </dependency>
diff --git a/buildSrc/subprojects/batchtest/batchtest.gradle.kts b/buildSrc/subprojects/batchtest/batchtest.gradle.kts
index 40c2a43d46e..1fc67667905 100644
--- a/buildSrc/subprojects/batchtest/batchtest.gradle.kts
+++ b/buildSrc/subprojects/batchtest/batchtest.gradle.kts
@@ -17,7 +17,7 @@
  */
 
 dependencies {
-    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
+    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
     implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r")
 }
 

From bd04dda149c380d66d203950fa395917d08b12ce Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 26 Sep 2022 13:31:02 +0300
Subject: [PATCH 0268/1037] Update Spock to 2.2-groovy-3.0 (from
 2.1-groovy-3.0) (#5713)

---
 gradle.properties | 2 +-
 xdocs/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 874c65a5204..87324f2475e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -130,7 +130,7 @@ rhino.version=1.7.14
 rsyntaxtextarea.version=3.2.0
 Saxon-HE.version=11.3
 slf4j.version=1.7.36
-spock-core.version=2.1-groovy-3.0
+spock-core.version=2.2-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
 tika.version=1.28.3
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 89aa8ddc628..96dd6b42b86 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -101,6 +101,7 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+  <li><pr>5713</pr>update spockAdded randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 4caddd8d33364f3bb0f6447f5e3409d6db4a6a35 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 26 Sep 2022 13:44:10 +0300
Subject: [PATCH 0269/1037] Add missing bits to "non-functional changes" in
 change.xml

---
 xdocs/changes.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 96dd6b42b86..cf5e9f23bbd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -101,7 +101,9 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
-  <li><pr>5713</pr>update spockAdded randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
+  <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
+  <li><pr>5710</pr>Add GitHub Issue templates</li>
+  <li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 452bebd2c63ba71e5ce61b053667a9c751199b9f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 5 Oct 2022 21:07:55 +0200
Subject: [PATCH 0270/1037] Try to fix #5671 with a redirect

---
 xdocs/.htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/.htaccess b/xdocs/.htaccess
index 7fe5e555ab0..37981836417 100644
--- a/xdocs/.htaccess
+++ b/xdocs/.htaccess
@@ -29,3 +29,4 @@ RewriteCond %{HTTPS} !=on
 # Redirect to https version
 RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L]
 
+RewriteRule ^/download_jmeter$ /download_jmeter.cgi [L]

From ce2f0fa6a14db06c0b7f5c46ff4209b70f347ae1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 10 Oct 2022 08:22:31 +0200
Subject: [PATCH 0271/1037] Add missing R to RewriteRule

---
 xdocs/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/.htaccess b/xdocs/.htaccess
index 37981836417..71094333524 100644
--- a/xdocs/.htaccess
+++ b/xdocs/.htaccess
@@ -29,4 +29,4 @@ RewriteCond %{HTTPS} !=on
 # Redirect to https version
 RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L]
 
-RewriteRule ^/download_jmeter$ /download_jmeter.cgi [L]
+RewriteRule ^/download_jmeter$ /download_jmeter.cgi [R,L]

From fb557d548d829812591d041fe8218f87d857e0c5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 20 Oct 2022 18:53:45 +0200
Subject: [PATCH 0272/1037] Update Apache commons-text to 1.10.0 (from 1.9)

The CVE (https://nvd.nist.gov/vuln/detail/CVE-2022-42889)
doesn't concern us, as we are not using the affected class StringSubstitutor
in our code.

But it is always a good idea, to keep our dependencies up to date.

Fixes #5718
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 xdocs/changes.xml                           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 87324f2475e..4c810271a8b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,7 @@ commons-logging.version=1.2
 commons-math3.version=3.6.1
 commons-net.version=3.8.0
 commons-pool2.version=2.11.1
-commons-text.version=1.9
+commons-text.version=1.10.0
 darklaf.version=2.7.3
 darklaf.extensions.version=0.3.4
 dec.version=0.1.2
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c032b63b412..be292924c50 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -37,7 +37,7 @@
 2213560,commons-math3-3.6.1.jar
 307305,commons-net-3.8.0.jar
 145516,commons-pool2-2.11.1.jar
-216211,commons-text-1.9.jar
+238400,commons-text-1.10.0.jar
 1547509,darklaf-core-2.7.3.jar
 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
 93477,darklaf-macos-2.7.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index cf5e9f23bbd..19b13dceb0b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -104,6 +104,7 @@ Summary
   <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
   <li><pr>5710</pr>Add GitHub Issue templates</li>
   <li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
+  <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 6dec35fdf58a4bd075c37fdb574c5e6dbbeb5f3c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 20 Oct 2022 18:58:03 +0200
Subject: [PATCH 0273/1037] Redirect Bing to the real download URL

---
 xdocs/.htaccess | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xdocs/.htaccess b/xdocs/.htaccess
index 71094333524..a30d89339d8 100644
--- a/xdocs/.htaccess
+++ b/xdocs/.htaccess
@@ -15,6 +15,9 @@
 
 RewriteEngine On
 
+# Try to get Bing away from the old download location
+RewriteRule ^download_jmeter(\.html)?$ /download_jmeter.cgi [R]
+
 # Redirect http to https
 # From Cordova PMC Member raphinesse
 # https://s.apache.org/An8s
@@ -29,4 +32,5 @@ RewriteCond %{HTTPS} !=on
 # Redirect to https version
 RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L]
 
-RewriteRule ^/download_jmeter$ /download_jmeter.cgi [R,L]
+
+

From bbe0fad785fe36c86a74729ba4faebf84c9d1305 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 25 Oct 2022 10:16:11 +0300
Subject: [PATCH 0274/1037] Remove Travis CI configuration as the ASF is moving
 away from Travis CI

See https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=INFRA&title=Travis+Migrations
---
 .travis.yml | 123 ----------------------------------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 262e2cb501e..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-language: java
-dist: focal
-
-# skip default "install" command
-install: true
-
-# We can clean the caches via web at https://travis-ci.org/apache/jmeter/caches
-before_cache:
-  - F=CleanupGradleCache sh -x -c 'curl -O https://raw.githubusercontent.com/vlsi/cleanup-gradle-cache/v1.x/$F.java && javac -J-Xmx128m $F.java && java -Xmx128m $F'
-  - rm -rf $HOME/.m2/repository/org/apache/jmeter
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.m2/repository
-
-env:
-  global:
-    - SKIP_TAR="-x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512"
-    - ORG_GRADLE_PROJECT_checksumFailOn=build_finish
-    - ORG_GRADLE_PROJECT_checksumPrint=true
-
-matrix:
-  allow_failures:
-    # j-m-p does not seem to download all the dependencies: https://github.com/jmeter-maven-plugin/jmeter-maven-plugin/issues/187
-    - name: jmeter-maven-plugin tests
-    - name: jmeter-maven-plugin tests on s390x
-    - name: Tests with OpenJDK 11 on s390x
-  include:
-    - name: Tests with OpenJDK 8 + code coverage
-      before_script:
-        - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-      script:
-        - xvfb-run ./gradlew build jacocoReport $SKIP_TAR
-      after_success:
-        - bash <(curl -s https://codecov.io/bash)
-      addons:
-        apt:
-          packages:
-            - openjdk-8-jdk
-    - name: Tests with OpenJDK 11
-      jdk: openjdk11
-      addons:
-        apt:
-          packages:
-            - language-pack-fr
-      env:
-        - TZ=Pacific/Chatham # flips between +12:45 and +13:45
-        - LANG=fr_FR.UTF-8
-        - LC_ALL=fr_FR.UTF-8
-      script:
-        # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
-        # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
-        - ./gradlew build -Djava.awt.headless=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
-    - name: Tests with OpenJDK 11 and Java Regex
-      jdk: openjdk11
-      addons:
-        apt:
-          packages:
-            - language-pack-fr
-      env:
-        - TZ=Pacific/Chatham # flips between +12:45 and +13:45
-        - LANG=fr_FR.UTF-8
-        - LC_ALL=fr_FR.UTF-8
-      script:
-        # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
-        # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
-        - ./gradlew build -Djava.awt.headless=true -Djmeter.properties.jmeter.regex.engine=java -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
-    - name: Tests with OpenJDK 11 on s390x
-      os: linux
-      arch: s390x
-      dist: bionic
-      jdk: openjdk11
-      addons:
-        apt:
-          packages:
-            - language-pack-fr
-      script:
-        - sudo apt-get install -y openjdk-11-jdk
-        - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-s390x/
-        - export PATH=$JAVA_HOME/bin:$PATH
-        - ./gradlew build -Djava.awt.headless=true -PskipCheckstyle -PskipSpotless $SKIP_TAR
-    # We test with so-called LTS releases: 8, 11, 17
-    - name: Tests with OpenJDK 17
-      jdk: openjdk17
-      addons:
-        apt:
-          packages:
-            - language-pack-fr
-      env:
-        - TZ=America/New_York # flips between −05:00 and −04:00
-        - LANG=fr_FR.UTF-8
-        - LC_ALL=fr_FR.UTF-8
-      script:
-        # Spotless, Checkstyle, and JaCoCo are verified here to ensure they all work with the latest supported Java
-        - xvfb-run ./gradlew build jacocoReport -Duser.language=fr -Duser.country=FR $SKIP_TAR
-    - name: jmeter-maven-plugin tests
-      addons:
-        apt:
-          packages:
-            - openjdk-8-jdk
-      before_script:
-        - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-      script:
-        - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore
-        - cd ..
-        - git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git
-        - cd jmeter-maven-plugin
-        - mvn verify -Djmeter.version=42.0-SNAPSHOT
-    - name: jmeter-maven-plugin tests on s390x
-      os: linux
-      arch: s390x
-      jdk: openjdk11
-      script:
-        - wget https://www.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
-        - tar -xvzf apache-maven-3.6.3-bin.tar.gz
-        - export PATH=`pwd`/apache-maven-3.6.3/bin/:$PATH
-        - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore
-        - cd ..
-        - git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git
-        - cd jmeter-maven-plugin
-        - mvn verify -Djmeter.version=42.0-SNAPSHOT

From a3a7edfcb356278297da975ca9e7f73e38d1aac3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Oct 2022 12:32:13 +0300
Subject: [PATCH 0275/1037] Bump actions/checkout to v3

It has fetch depth=1 by default
---
 .github/workflows/gradle-wrapper-validation.yml |  2 +-
 .github/workflows/main.yml                      | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b30659..8bfd0dcf51f 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index de80c5e9eec..914a08fdfc7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,9 +22,7 @@ jobs:
     name: 'Windows (JDK 17)'
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v1.1.0
-      with:
-        fetch-depth: 50
+    - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
       uses: actions/setup-java@v1
       with:
@@ -41,9 +39,7 @@ jobs:
     name: 'macOS (JDK 17)'
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v1.1.0
-      with:
-        fetch-depth: 50
+    - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
       uses: actions/setup-java@v1
       with:
@@ -59,9 +55,7 @@ jobs:
     name: 'Error Prone (JDK 11)'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 50
+    - uses: actions/checkout@v3
     - name: 'Set up JDK 11'
       uses: actions/setup-java@v1
       with:

From da6efde33eb80751eff1f778d63b67e4f9bcd652 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 25 Sep 2022 11:43:41 +0300
Subject: [PATCH 0276/1037] Update Bugzilla -> GitHub issues in the
 contribution documentation

---
 .editorconfig                        |   3 +
 CONTRIBUTING.md                      |  15 +--
 xdocs/building.xml                   |  28 ++---
 xdocs/issues.xml                     | 177 ++++++++++++++++-----------
 xdocs/mail2.xml                      |   2 +-
 xdocs/stylesheets/site_printable.vsl |  11 ++
 6 files changed, 143 insertions(+), 93 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5f65cc4c81c..c22898ea681 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -28,3 +28,6 @@ ij_kotlin_continuation_indent_size = 4
 #"static ", "java.", "javax", "org", "net", "com", ""
 ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,net.**,|,com.**,|,*
 ij_java_use_single_class_imports = true
+
+[*.xml]
+indent_size = 2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 14a1c8ce40e..c22f9b37d93 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,16 +4,17 @@ Want to show Apache JMeter some love? Help out by contributing!
 
 ## :beetle: Found a bug
 
-Log it in our bugzilla:
+Log it in GitHub issues:
+
+* https://github.com/apache/jmeter/issues
+* or send a note to the [user mailing list](https://jmeter.apache.org/mail2.html#JMeterUser).
 
-* *<https://jmeter.apache.org/issues.html>*
-* or send a note to the *user mailing list*.
 Be sure to include all relevant information, like the versions of JMeter you’re using as long as Java version.
 A Test plan  that caused the issue as well as any error messages are also very helpful.
 
 ## :question: Need help
 
-Simply contact:
+Contact:
 
 * [Our users mailing list](https://jmeter.apache.org/mail2.html#JMeterUser)
 * or ask question on [stackoverflow](https://stackoverflow.com/questions/tagged/jmeter).
@@ -22,8 +23,8 @@ Simply contact:
 
 See:
 
-* [Open bug entries for JMeter](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&bug_severity=Normal&bug_severity=Regression&bug_severity=Minor&bug_severity=Trivial&product=JMeter&order=Bug%20Number&list_id=164231)
-* [Enhancement requests for JMeter](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Enhancement&product=JMeter&order=Bug%20Number&list_id=164232)
+* [Open issues for JMeter](https://github.com/apache/jmeter/issues)
+* [Enhancement requests for JMeter](https://github.com/apache/jmeter/issues?q=is%3Aopen+label%3Aenhancement)
 
 ## Development setup
 
@@ -66,7 +67,7 @@ The best way to make sure your issue or feature is addressed is to submit a patc
 We accept patches through:
 
 * pull requests
-* patch attached to bugzilla.
+* patch attached to [JMeter developers mailing list](https://jmeter.apache.org/mail2.html#JMeterDev).
 
 However, before sending a patch, please make sure that the following applies:
 
diff --git a/xdocs/building.xml b/xdocs/building.xml
index e0b94f1cc1a..a42ee2af9d6 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -109,22 +109,20 @@ Check that patch does not break JUnit tests by running:
 </p>
 <source>./gradlew test</source>
 
-<h3>Create a PR using GIT</h3>
+<h3>Create a pull request using Git</h3>
 <ul>
-    <li>Open a bugzilla issue, see <a target="_blank" href="issues.html">Issues page</a></li>
-    <li>Fork <a href="https://www.github.com/apache/jmeter" >Apache JMeter mirror</a></li>
-    <li>Clone your forked repository locally : <source>git clone https://github.com/yourid/jmeter/</source></li>
-    <li>Create a branch using for example bugzilla id: <source>git branch BUGID</source></li>
-    <li>Checkout the new branch : <source>git checkout BUGID</source></li>
-    <li>commit your fix there : <source>git commit -m 'Fix to BUGID' list of files</source></li>
+    <li>Fork <a href="https://www.github.com/apache/jmeter">Apache JMeter mirror</a></li>
+    <li>Clone your forked repository locally: <source>git clone https://github.com/yourid/jmeter.git</source></li>
+    <li>Create a branch using for example issue id: <source>git branch gh123-thread-group-typo</source>
+      (please refrain from using <source>master</source> and <source>main</source> branches for pull request)</li>
+    <li>Checkout the new branch: <source>git checkout gh123-thread-group-typo</source></li>
+    <li>Commit your fix there: <source>git commit -m 'Fix to BUGID' list of files</source></li>
     <li>Please avoid creating merge commits in the PR. We embrace small changes, and merge commits are harder to review</li>
-    <li>Add JMeter repository as upstream : <source>git remote add upstream http://www.github.com/apache/jmeter</source></li>
-    <li>push it : <source>git push origin BUGID</source></li>
-    <li>Create a PR and link it in the bugzilla issue</li>
-    <li>Or create a diff and add as attachment to bugzilla issue <source>git diff &gt; BUGID.patch</source></li>
+    <li>Push it: <source>git push origin gh123-thread-group-typo</source></li>
+    <li>Create a <a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request">pull request</a></li>
 </ul>
 
-<note>Different operation systems have different defaults for end-of-line markers.
+<note>Different operating systems have different defaults for end-of-line markers.
   Typical configuration is CRLF for Windows and LF for macOS and GNU/Linux.<br/>
   It is recommended to follow that configuration by appropriate settings of <code>core.autocrlf</code>.
   For Windows <source>git config --global core.autocrlf true</source>, and for macOS and GNU/Linux set <source>git config --global core.autocrlf input</source>
@@ -134,9 +132,9 @@ Check that patch does not break JUnit tests by running:
   no matter the configuration of the developer workstation.
 </note>
 
-<h3>Create a PR using Patch</h3>
+<h3>Proposing a change with a patch</h3>
+<p>If you cannot to create a pull request at GitHub, you might submit your changes as a unified diff patch on JMeter dev mailing list.</p>
 <ul>
-    <li>Open a bugzilla issue, see <a target="_blank" href="issues.html">Issues page</a></li>
     <li>Checkout Apache JMeter source</li>
     <li>Code your fix</li>
     <li>Create your patch by Right clicking on Eclipse project and select
@@ -144,7 +142,7 @@ Check that patch does not break JUnit tests by running:
             <guimenuitem>Team</guimenuitem>
             <guimenuitem>Create Patch &hellip;</guimenuitem>
         </menuchoice></li>
-    <li>Attach your patch to the bugzilla issue</li>
+    <li>Attach your patch to email message on JMeter dev list</li>
 </ul>
 </section>
 
diff --git a/xdocs/issues.xml b/xdocs/issues.xml
index 4a75144b262..91b1638dc28 100644
--- a/xdocs/issues.xml
+++ b/xdocs/issues.xml
@@ -22,78 +22,116 @@
 </properties>
 <body>
 <section name="Issue tracker">
-<p>
-JMeter uses Bugzilla for issue tracking, i.e. for reporting bugs and requesting enhancements.
-</p>
-<p>
-Before creating a new issue, please check whether the issue has already been reported by searching Bugzilla.
-It's also worth checking first on the JMeter user mailing list; others may already have a solution.
-</p>
+  <p>
+    JMeter uses GitHub Issues for issue tracking, i.e. for reporting bugs and requesting enhancements.
+    Previously, the issues were tracked in <a href="https://bz.apache.org/bugzilla/describecomponents.cgi">Bugzilla</a>,
+    and all the issues, comments, and attachments have been migrated to GitHub on 2022-09-22.
+  </p>
 </section>
 <section name="Support Questions">
-<p>
-Please do not use Bugzilla for asking questions. It is not a support forum.
-Instead, please <a href="mail2.html">subscribe</a> to the JMeter user mailing list and ask there.
-The user mailing list has a bigger audience and you are more likely to get an answer quickly.
-</p>
+  <p>
+    Please do not use GitHub Issues for asking questions. It is not a support forum.
+    Instead, please <a href="mail2.html">subscribe</a> to the JMeter user mailing list and ask there.
+    The user mailing list has a bigger audience, and you are more likely to get an answer quickly.
+  </p>
 </section>
 <section name="Known Bugs and enhancements">
-<ul>
-<li>
-<a href="http://bz.apache.org/bugzilla/buglist.cgi?query_format=specific&amp;order=relevance+desc&amp;bug_status=__open__&amp;product=JMeter&amp;content=">
-Bugzilla - All open bugs and enhancements</a>
-</li>
-<li>
-<a href="http://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=NEEDINFO&amp;bug_severity=Blocker&amp;bug_severity=Critical&amp;bug_severity=Major&amp;bug_severity=Normal&amp;bug_severity=Regression&amp;bug_severity=Minor&amp;bug_severity=Trivial&amp;product=JMeter&amp;cmdtype=doit&amp;order=Bug+Number">
-Bugzilla - Open bugs (excluding enhancements)</a></li>
-<li>
-<a href="http://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=NEEDINFO&amp;bug_severity=Enhancement&amp;product=JMeter&amp;cmdtype=doit&amp;order=Bug+Number">
-Bugzilla - Enhancements only</a>
-</li>
-</ul>
+  <ul>
+    <li>
+      <a href="https://github.com/apache/jmeter/issues?q=is%3Aopen+sort%3Areactions-%2B1-desc">
+        Most voted issues
+      </a>
+    </li>
+    <li>
+      <a href="https://github.com/apache/jmeter/issues?q=is%3Aopen">
+        All open bugs and enhancements
+      </a>
+    </li>
+    <li>
+      <a href="https://github.com/apache/jmeter/issues?q=is%3Aissue+is%3Aopen+-label%3Aenhancement">
+        Open bugs (excluding enhancements)
+      </a>
+    </li>
+    <li>
+      <a href="https://github.com/apache/jmeter/issues?q=is%3Aopen+label%3Aenhancement">
+        Enhancements only
+      </a>
+    </li>
+  </ul>
 </section>
 <section name="Requesting an enhancement">
-<p>
-In most cases it is worth starting a discussion on the mailing list first.
-Bugzilla is good for tracking progress and supplying patches, but is unwieldy for longer discussions.
-</p>
-<p>
-If you have not already done so, you need to register an account first, using the "<code>New Account</code>" link at the top of the
-main Bugzilla page: <a href="https://bz.apache.org/bugzilla/">https://bz.apache.org/bugzilla/</a>.
-</p>
-<p>
-Make sure you read and understand the information on the account creation page before signing up.
-</p>
-<p>
-Once logged in, click "<code>File a bug</code>" and select JMeter from the list
-Please set the severity to "<code>enhancement</code>".
-</p>
-<p>
-Please make sure that you describe the enhancement in sufficient detail. If necessary provide an example use-case.
-</p>
-<p>
-If you are providing a code patch, also provide a test case, and documentation on how to use the new feature (ideally as a documentation patch).
-</p>
+  <p>
+    Please check if the same enhancement has already been requested previously.
+    If you find a very similar request in the issues list, please refrain from adding "<em>I also need this</em>" comments to the issue.
+    "<em>I also need this</em>" comments cause notifications, and the comment itself does not add much to the discussion.
+    Instead, prefer adding reactions to the first comment of an existing issue, so the issues could be sorted (see
+    <a href="https://github.com/apache/jmeter/issues?q=sort%3Areactions-%2B1-desc">Most voted issues</a>).
+  </p>
+  <p>
+    Please make sure that you describe the enhancement in sufficient detail. It might be a good idea to start with a use-case.
+  </p>
+  <p>
+    There are several options to propose an enhancement request:
+    <dl>
+      <dt>GitHub issue</dt>
+      <dd>
+        <p>
+          You could <a href="https://github.com/apache/jmeter/issues/new/choose">file an issue on GitHub</a> to start a discussion
+          and gather opinions. GitHub issues allow
+          <a href="https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax">basic formatting</a>,
+          <a href="https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting">advanced formatting</a>,
+          <a href="https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files">attaching files</a>,
+          <a href="https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#quoting-code">syntax highlight</a>,
+          <a href="https://docs.github.com/en/issues/tracking-your-work-with-issues/about-task-lists">task lists</a>,
+          reactions,
+          <a href="https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls#issues-and-pull-requests">references to the other
+            issues and the source code</a>.
+        </p>
+        <p>
+          When you create an issue at GitHub, it suggests one of the templates (e.g. "<em>Bug report</em>",
+          "<em>Feedback about the manual</em>", "<em>Feature Request</em>", "<em>Regression</em>"), and it guides which information is required for each case.
+          You could read more on <a href="https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue">creating issues</a> in
+          GitHub documentation.
+        </p>
+      </dd>
+      <dt>Mailing list discussion</dt>
+      <dd>
+        <p>
+          If you are not sure if something is an enhancement, or if you are unsure regarding the possible solutions,
+          it might be a good idea to start a discussion on <a href="https://jmeter.apache.org/mail2.html#JMeterDev">JMeter dev mailing list</a>
+        </p>
+      </dd>
+      <dt>GitHub pull request</dt>
+      <dd>
+        <p>
+          If you are positive regarding the solution, you could start a discussion by creating a
+          <a href="https://github.com/apache/jmeter/pulls">pull request on GitHub</a>.
+          Pull requests are not much different from issues, however, sometimes it is easier to discuss with code at hand.
+          For instance, if you fix a typo or make other small fixes, there's no need to create "<em>issue and PR</em>" for each change.
+          The following <a href="https://github.blog/2015-01-21-how-to-write-the-perfect-pull-request/">GitHub post</a> might be helpful
+          for creating your perfect pull request.
+        </p>
+        <note>
+          There's no guarantee that your contribution will be accepted, so it might be wise to discuss your suggestions
+          before you invest significant efforts on implementing the changes.
+        </note>
+        <p>
+          If you are providing a code patch, also provide a test case, and documentation on how to use the new feature (ideally as a documentation patch).
+        </p>
+      </dd>
+    </dl>
+  </p>
 </section>
 <section name="Raising an Issue">
-<p>
-First check that the issue has not already been reported.
-If reporting a bug, are you sure it really is a bug in JMeter, not just a misunderstanding of how JMeter works?
-</p>
-<p>
-If you have not already done so, you need to register an account first, using the "<code>New Account</code>" link at the top of the
-main Bugzilla page: <a href="https://bz.apache.org/bugzilla/">https://bz.apache.org/bugzilla/</a>.
-</p>
-<p>
-Make sure you read and understand the information on the account creation page before signing up.
-</p>
-<p>
-Once logged in you have 2 options:
-<ul>
-    <li>At the bottom left of the screen click '<code>File a new bug in the "JMeter" product</code>' link</li>
-    <li>At the top left of the screen, click "<code>New</code>" link and select JMeter from the list.</li>
-</ul>
-</p>
+  <p>
+    First check that the issue has not already been reported on <a href="https://github.com/apache/jmeter/issues">GitHub issues</a>
+    and <a href="https://lists.apache.org/list.html?user@jmeter.apache.org">JMeter user mailing list</a>).
+    If reporting a bug, are you sure it really is a bug in JMeter, not just a misunderstanding of how JMeter works?
+  </p>
+  <p>
+    If you face a bug or regression, please create an <a href="https://github.com/apache/jmeter/issues">issue on GitHub</a>.
+    In case you can't create an issue, you might send the bug report to <a href="https://jmeter.apache.org/mail2.html#JMeterDev">JMeter dev mailing list</a>.
+  </p>
 </section>
 <section name="Required Information for bug reporting">
 <p>
@@ -112,11 +150,10 @@ Use the checklist below to guide you.
 Does it happen every time?
 </li>
 <li>If you have error messages, that you wish to report, copy them as text into the issue, as it makes it easier to search for them and re-use the message in our research for the origin of the issue</li>
-<li>Add yourself in <code>CC</code> List to be notified when JMeter Team requires more information (in this case bug will be marked as <code>NEEDINFO</code>)</li>
-<li>When a bug is market as <code>NEEDINFO</code>, please provide as soon as possible the required information so that bug can be understood and fixed. Be aware that if
-no information is provided after team requires more information and bug is not reproducible, then bug will be closed as <code>WORKSFORME</code>. You can always reopen it later once you provide the required information.</li>
-<li>Select accurately the IMPORTANCE level, <code>ENHANCEMENT</code> means it's not a BUG while others mean it's a BUG</li>
-<li>If you are providing a patch to fix a bug, please ensure it is in unified diff format.
+<li>When a bug is market as <code>need info</code>, please provide as soon as possible the required information so that bug can be understood and fixed. Be aware that if
+no information is provided after team requires more information and bug is not reproducible, then bug will be closed as <code>invalid</code>. You can always ask to reopen it later once you provide the required information.</li>
+<li>Prefer using issue templates (e.g. "<em>Bug report</em>", "<em>Feedback about the manual</em>", "<em>Feature Request</em>", "<em>Regression</em>")</li>
+<li>If you are providing a patch file to fix a bug, please ensure it is in unified diff format.
 If using Eclipse, please set the patch root to "<code>Project</code>", not the default "<code>Workspace</code>" which is harder to apply.</li>
 <li>New source files can be provided as is; please ensure they have the standard Apache License header (as per other JMeter files).
 Please do not use <code>@author</code> tags (credit will be given in the changes file).
@@ -125,7 +162,7 @@ Please do not use <code>@author</code> tags (credit will be given in the changes
 Components are documented in <code>xdocs/usermanual/component_reference.xml</code>.</li>
 </ul>
 <p><b>See also the following <a href="https://bz.apache.org/bugwritinghelp.html">Bug writing guidelines</a>,
-also the terms and conditions noted on the <a href="https://bz.apache.org/bugzilla/createaccount.cgi">Bugzilla account creation page.</a></b></p>
+also the terms and conditions noted on the <a href="https://docs.github.com/en/site-policy/github-terms/github-terms-of-service">GitHub Terms of Service</a></b></p>
 </section>
 </body>
 </document>
diff --git a/xdocs/mail2.xml b/xdocs/mail2.xml
index 520e6d4f08a..69d4e1d8e06 100644
--- a/xdocs/mail2.xml
+++ b/xdocs/mail2.xml
@@ -97,7 +97,7 @@ Prior to Nov 2011, they were sent to the Jakarta Notifications list, see below.
 </subsection>
 <subsection name="Apache JMeter Issues" anchor="JMeterIssues">
 <p>
-<a href="https://bz.apache.org/bugzilla/">Bugzilla</a> messages are sent here.
+<a href="https://github.com/apache/jmeter">GitHub</a> notifications are sent here.
 </p>
 <p>
 Prior to Nov 2011, they were sent to the Jakarta Notifications list, see below.
diff --git a/xdocs/stylesheets/site_printable.vsl b/xdocs/stylesheets/site_printable.vsl
index 5ce2f54f965..3bb8f50f86b 100644
--- a/xdocs/stylesheets/site_printable.vsl
+++ b/xdocs/stylesheets/site_printable.vsl
@@ -239,6 +239,10 @@ No
 <a href="https://github.com/apache/jmeter/pull/$id.getText()">Pull request #$id.getText()</a>##
 #end
 
+#macro ( issue $id)
+<a href="https://github.com/apache/jmeter/issues/$id.getText()">Issue #$id.getText()</a>##
+#end
+
 #macro ( rfc $id)
 #if($id.getText())
 <a href="https://tools.ietf.org/html/rfc$id.getAttributeValue('link')">$id.getText()</a>##
@@ -257,6 +261,11 @@ No
 #pullrequest($id) - ##
 #end
 
+## Shorthand - automatically adds " - " before remaining text
+#macro ( issue_dash $id)
+#issue($id) - ##
+#end
+
 #macro ( contributor $id)
 Contributed by $id.getAttributeValue("name") &lt;$id.getAttributeValue("mail")&gt;
 #end
@@ -317,6 +326,8 @@ Contributed by $id.getAttributeValue("name") &lt;$id.getAttributeValue("mail")&g
 #bug ($node)
 #elseif ($node.getName().equals("pr"))
 #pr ($node)
+#elseif ($node.getName().equals("issue"))
+#issue ($node)
 #elseif ($node.getName().equals("rfc"))
 #rfc ($node)
 #elseif ($node.getName().equals("contributor"))

From 3a1e7c5536586225880356aac8c004b3d1ba3134 Mon Sep 17 00:00:00 2001
From: orimarko <orimarko@gmail.com>
Date: Thu, 10 Nov 2022 13:44:26 +0200
Subject: [PATCH 0277/1037] UPPER is the default case for changeCase

---
 xdocs/usermanual/functions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index 68b7ff2131a..12641941c87 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -1701,7 +1701,7 @@ returns:
     <properties>
     <property name="String to change case" required="Yes">The String
             which case will be changed</property>
-        <property name="change case mode" required="Yes">
+        <property name="change case mode" required="No, default=UPPER">
             The mode to be used to change case, for example for <code>ab-CD eF</code>:
             <ul>
                 <li><code>UPPER</code> result as AB-CD EF</li>

From db847c10271aecf9b59eb7a8008a78e242618145 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 19 Nov 2022 13:44:24 +0100
Subject: [PATCH 0278/1037] Change naming the default to inner text

The long description in the required field let to a line
break in my browser, where the complete text rendered in
the title column.

We might think about a special default attribute for the
arguments, that could be used to specify a default value.

Closes #5731
---
 xdocs/changes.xml              | 2 ++
 xdocs/usermanual/functions.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 19b13dceb0b..a900cf48e2b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -105,6 +105,8 @@ Summary
   <li><pr>5710</pr>Add GitHub Issue templates</li>
   <li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
   <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
+  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
+     Based on a patch by Ori Marko (orimarko at gmail.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index 12641941c87..23fbe8a3c07 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -1701,7 +1701,7 @@ returns:
     <properties>
     <property name="String to change case" required="Yes">The String
             which case will be changed</property>
-        <property name="change case mode" required="No, default=UPPER">
+        <property name="change case mode" required="No">
             The mode to be used to change case, for example for <code>ab-CD eF</code>:
             <ul>
                 <li><code>UPPER</code> result as AB-CD EF</li>
@@ -1709,6 +1709,7 @@ returns:
                 <li><code>CAPITALIZE</code> result as Ab-CD eF</li>
             </ul>
             <note><code>change case mode</code> is case insensitive</note>
+            If no mode is given, <code>UPPER</code> is used as default.
         </property>
         <property name="Name of variable" required="No">The name of the variable to set.</property>
     </properties>

From 8fba9d96aa4b9188b4677fa93dc41c6221d342bf Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 19 Nov 2022 17:26:31 +0100
Subject: [PATCH 0279/1037] Make note more prominent in docs

---
 xdocs/usermanual/component_reference.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 73d0c2619aa..f78ae49b46b 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4649,8 +4649,8 @@ These can be used anywhere within the expression and remain in effect until over
                 HTTP Responses with statuses in the <code>4xx</code> and <code>5xx</code> ranges are normally
                 regarded as unsuccessful.
                 The "<code>Ignore status</code>" checkbox can be used to set the status successful before performing further checks.
-                Note that this will have the effect of clearing any previous assertion failures,
-                so make sure that this is only set on the first assertion.
+                <note>Note that this will have the effect of clearing any previous assertion failures,
+                so make sure that this is only set on the first assertion.</note>
         </property>
         <property name="Pattern Matching Rules" required="Yes">Indicates how the text being tested
         is checked against the pattern.

From 2da0eb558c53ad0e4369fe310e3b460ba11d502f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 29 Nov 2022 20:52:36 +0100
Subject: [PATCH 0280/1037] Allow SampleResult#setEndTime be set in
 JSR223Sampler

Fixes #5733 and closes #5736
---
 .../protocol/java/sampler/JSR223Sampler.java  | 10 ++--
 .../java/sampler/JSR223SamplerTest.java       | 46 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java

diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
index 085e6e1e184..e68eb36ac40 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
@@ -18,7 +18,7 @@
 package org.apache.jmeter.protocol.java.sampler;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -43,7 +43,7 @@
 @TestElementMetadata(labelResource = "displayName")
 public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampler, TestBean, ConfigMergabilityIndicator {
     private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
-            Arrays.asList("org.apache.jmeter.config.gui.SimpleConfigGui"));
+            Collections.singletonList("org.apache.jmeter.config.gui.SimpleConfigGui"));
 
     private static final long serialVersionUID = 235L;
 
@@ -58,7 +58,7 @@ public SampleResult sample(Entry entry) {
         result.setResponseMessageOK();
 
         final String filename = getFilename();
-        if (filename.length() > 0){
+        if (!filename.isEmpty()){
             result.setSamplerData("File: "+filename);
         } else {
             result.setSamplerData(getScript());
@@ -79,7 +79,9 @@ public SampleResult sample(Entry entry) {
             result.setResponseCode("500"); // $NON-NLS-1$
             result.setResponseMessage(e.toString());
         }
-        result.sampleEnd();
+        if (result.getEndTime() == 0) {
+            result.sampleEnd();
+        }
         return result;
     }
 
diff --git a/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java b/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java
new file mode 100644
index 00000000000..f2478c7e4d6
--- /dev/null
+++ b/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.java.sampler;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.jmeter.samplers.SampleResult;
+import org.junit.jupiter.api.Test;
+
+class JSR223SamplerTest {
+
+    @Test
+    void sampleWithEndTimeSet() {
+        JSR223Sampler sampler = new JSR223Sampler();
+        sampler.setName("jsr223Test");
+        sampler.setScript("SampleResult.setEndTime(42); 'OK'");
+        sampler.setScriptLanguage("groovy");
+        SampleResult sampleResult = sampler.sample(null);
+        assertEquals(42, sampleResult.getEndTime());
+    }
+
+    @Test
+    void sampleWithoutEndTimeSet() {
+        JSR223Sampler sampler = new JSR223Sampler();
+        sampler.setName("jsr223Test");
+        sampler.setScript("'OK'");
+        sampler.setScriptLanguage("groovy");
+        SampleResult sampleResult = sampler.sample(null);
+        assertEquals(System.currentTimeMillis(), sampleResult.getEndTime(), 1000);
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a900cf48e2b..048343e00ac 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -119,6 +119,7 @@ Summary
 
 <h3>Other Samplers</h3>
 <ul>
+  <li><pr>5736</pr><issue>5733</issue>Allow <code>SampleResult#setEndTime</code> be set in <code>JSR223Sampler</code></li>
 </ul>
 
 <h3>Controllers</h3>

From 74d9040362a78c07a2afd6c9068c2ec97b4a59c8 Mon Sep 17 00:00:00 2001
From: Kai Lehmann <klehmann@aservo.com>
Date: Wed, 19 Oct 2022 12:27:21 +0200
Subject: [PATCH 0281/1037] added jsonpath string to assertion error message so
 it is easier to understand the error

fixes #5717
---
 .../apache/jmeter/assertions/JSONPathAssertion.java  | 12 ++++++------
 .../jmeter/assertions/TestJSONPathAssertion.java     | 12 +++++++-----
 xdocs/changes.xml                                    |  2 ++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 446ff6f72e3..5671e278564 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -118,8 +118,8 @@ private void doAssert(String jsonString) {
             if (value instanceof JSONArray) {
                 JSONArray arrayValue = (JSONArray) value;
                 if (arrayValue.isEmpty() && !JsonPath.isPathDefinite(getJsonPath())) {
-                    throw new IllegalStateException("JSONPath is indefinite and the extracted Value is an empty Array." +
-                            " Please use an assertion value, to be sure to get a correct result. " + getExpectedValue());
+                    throw new IllegalStateException(String.format("JSONPath '%s' is indefinite and the extracted Value is an empty Array." +
+                            " Please use an assertion value, to be sure to get a correct result. Expected value was '%s'", getJsonPath(), getExpectedValue()));
                 }
             }
             return;
@@ -137,15 +137,15 @@ private void doAssert(String jsonString) {
         }
 
         if (isExpectNull()) {
-            throw new IllegalStateException(String.format("Value expected to be null, but found '%s'", value));
+            throw new IllegalStateException(String.format("Value in json path '%s' expected to be null, but found '%s'", getJsonPath(), value));
         } else {
             String msg;
             if (isUseRegex()) {
-                msg = "Value expected to match regexp '%s', but it did not match: '%s'";
+                msg = "Value in json path '%s' expected to match regexp '%s', but it did not match: '%s'";
             } else {
-                msg = "Value expected to be '%s', but found '%s'";
+                msg = "Value in json path '%s' expected to be '%s', but found '%s'";
             }
-            throw new IllegalStateException(String.format(msg, getExpectedValue(), objectToString(value)));
+            throw new IllegalStateException(String.format(msg, getJsonPath(), getExpectedValue(), objectToString(value)));
         }
     }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index e9349efb1ee..c01f5c5e875 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -311,18 +311,20 @@ void testGetResult_match_msg_problem() {
         samplerResult.setResponseData(str.getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
-        instance.setJsonPath("$.execution[0].scenario.requests[0].headers");
+        String jsonPath = "$.execution[0].scenario.requests[0].headers";
+        String expectedValue = "\\{headerkey=header value\\}";
+        instance.setJsonPath(jsonPath);
         instance.setJsonValidationBool(true);
         instance.setExpectNull(false);
-        instance.setExpectedValue("\\{headerkey=header value\\}");
+        instance.setExpectedValue(expectedValue);
         instance.setInvert(false);
         AssertionResult expResult = new AssertionResult("");
         AssertionResult result = instance.getResult(samplerResult);
         assertEquals(expResult.getName(), result.getName());
         assertTrue(result.isFailure());
-        assertEquals(
-                "Value expected to match regexp '\\{headerkey=header value\\}', but it did not match: '{\"headerkey\":\"header value\"}'",
-                result.getFailureMessage());
+        assertEquals(String.format(
+                "Value in json path '%s' expected to match regexp '%s', but it did not match: '{\"headerkey\":\"header value\"}'",
+                        jsonPath, expectedValue), result.getFailureMessage());
     }
 
     @Test
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 048343e00ac..e05d77416eb 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -132,6 +132,7 @@ Summary
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
+  <li><pr>5717</pr>Add jsonpath string to jsonpath assertion error message so the error is easier to understand</li>
 </ul>
 
 <h3>Functions</h3>
@@ -163,6 +164,7 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+  <li>Kai Lehmann (klehmann at aservo.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From ff1572273ec2dfff463b845c1666a0a3e745803c Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Thu, 3 Nov 2022 20:11:24 +0100
Subject: [PATCH 0282/1037] Update jackson to 2.13.4.2 with new gpg key used
 for signing

---
 checksum.xml                                | 2 +-
 gradle.properties                           | 4 ++--
 src/dist/src/dist/expected_release_jars.csv | 6 +++---
 xdocs/changes.xml                           | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 9b5bbf4ab28..7d7cce2df7a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -8,7 +8,7 @@
     <trusted-key id='1c8d5ef0df2b70d4' group='cglib' />
     <trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
     <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
-    <trusted-key id='c9fbaa83a8753994' group='com.fasterxml.jackson.core' />
+    <trusted-key id='3d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
     <trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
     <trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
     <trusted-key id='379ce192d401ab61' group='com.formdev' />
diff --git a/gradle.properties b/gradle.properties
index 4c810271a8b..161383e63c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -98,8 +98,8 @@ httpclient.version=4.5.13
 httpcore-nio.version=4.4.15
 httpcore.version=4.4.15
 httpmime.version=4.5.13
-jackson.version=2.13.3
-jackson-databind.version=2.13.2.2
+jackson.version=2.13.4
+jackson-databind.version=2.13.4.2
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index be292924c50..292373756e5 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -69,9 +69,9 @@
 328324,httpcore-4.4.15.jar
 369486,httpcore-nio-4.4.15.jar
 41790,httpmime-4.5.13.jar
-75714,jackson-annotations-2.13.3.jar
-374895,jackson-core-2.13.3.jar
-1536542,jackson-databind-2.13.3.jar
+75717,jackson-annotations-2.13.4.jar
+374895,jackson-core-2.13.4.jar
+1531681,jackson-databind-2.13.4.2.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e05d77416eb..122d6105e84 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -107,6 +107,8 @@ Summary
   <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
   <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
      Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+  <li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+  <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From b0284c99998da4099f39aa3dc106526c717e06ea Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Thu, 3 Nov 2022 20:12:12 +0100
Subject: [PATCH 0283/1037] Update jsoup to 1.15.3 and tika parser to 1.28.5

---
 gradle.properties                           | 4 ++--
 src/dist/src/dist/expected_release_jars.csv | 6 +++---
 xdocs/changes.xml                           | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 161383e63c3..a8519bd41b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -109,7 +109,7 @@ jmespath-jackson.version=0.5.1
 jodd.version=5.0.13
 json-path.version=2.7.0
 json-smart.version=2.4.8
-jsoup.version=1.15.1
+jsoup.version=1.15.3
 jtidy.version=r938
 junit4.version=4.13.2
 junit5.version=5.8.2
@@ -133,7 +133,7 @@ slf4j.version=1.7.36
 spock-core.version=2.2-groovy-3.0
 springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
-tika.version=1.28.3
+tika.version=1.28.5
 xalan.version=2.7.2
 xercesImpl.version=2.12.2
 xml-apis.version=1.4.01
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 292373756e5..beb0ab53f51 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -83,7 +83,7 @@
 26047,jodd-props-5.0.13.jar
 271159,json-path-2.7.0.jar
 119545,json-smart-2.4.8.jar
-429123,jsoup-1.15.1.jar
+438018,jsoup-1.15.3.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
@@ -123,8 +123,8 @@
 301279,svgSalamander-1.1.2.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
-735701,tika-core-1.28.3.jar
-1587751,tika-parsers-1.28.3.jar
+736051,tika-core-1.28.5.jar
+1588025,tika-parsers-1.28.5.jar
 174661,vis-svg-portable-jvm-2.2.1.jar
 3154938,xalan-2.7.2.jar
 1446149,xercesImpl-2.12.2.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 122d6105e84..46097082a67 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -109,6 +109,8 @@ Summary
      Based on a patch by Ori Marko (orimarko at gmail.com)</li>
   <li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
   <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
+  <li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+  <li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 62124ca17d02ddc8fbc15c348dc4b166c857bc46 Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Thu, 22 Dec 2022 12:04:18 +0100
Subject: [PATCH 0284/1037] Update Apache commons-net to 3.9.0 and fix changes
 list

---
 checksum.xml                                | 2 +-
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 xdocs/changes.xml                           | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 7d7cce2df7a..a977f79de45 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -7,8 +7,8 @@
   <trusted-keys>
     <trusted-key id='1c8d5ef0df2b70d4' group='cglib' />
     <trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
-    <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
     <trusted-key id='3d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
+    <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
     <trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
     <trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
     <trusted-key id='379ce192d401ab61' group='com.formdev' />
diff --git a/gradle.properties b/gradle.properties
index a8519bd41b2..baaffbd1e7c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -77,7 +77,7 @@ commons-lang.version=2.6
 commons-lang3.version=3.12.0
 commons-logging.version=1.2
 commons-math3.version=3.6.1
-commons-net.version=3.8.0
+commons-net.version=3.9.0
 commons-pool2.version=2.11.1
 commons-text.version=1.10.0
 darklaf.version=2.7.3
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index beb0ab53f51..4dc7157fda4 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -35,7 +35,7 @@
 587402,commons-lang3-3.12.0.jar
 61829,commons-logging-1.2.jar
 2213560,commons-math3-3.6.1.jar
-307305,commons-net-3.8.0.jar
+316431,commons-net-3.9.0.jar
 145516,commons-pool2-2.11.1.jar
 238400,commons-text-1.10.0.jar
 1547509,darklaf-core-2.7.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 46097082a67..845b39f34e3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -111,6 +111,13 @@ Summary
   <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
   <li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
   <li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
+  <li><issue>5725</issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+  <li><issue>5725</issue>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
+  <li><issue>5725</issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+  <li><issue>5725</issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
+  <li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
+  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
+     Based on a patch by Ori Marko (orimarko at gmail.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From e1ba582ffa3862f7d5033eeef71161e313ab0b9a Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Wed, 4 Jan 2023 10:36:54 +0100
Subject: [PATCH 0285/1037] update xstream to 1.4.20 (from 1.4.19)

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 xdocs/changes.xml                           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index baaffbd1e7c..c250716fd8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -140,5 +140,5 @@ xml-apis.version=1.4.01
 xmlgraphics-commons.version=2.7
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
-xstream.version=1.4.19
+xstream.version=1.4.20
 wiremock-jre8.version=2.32.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 4dc7157fda4..7702084ba26 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -134,4 +134,4 @@
 7188,xmlpull-1.1.3.1.jar
 1027759,xmlresolver-4.2.0-data.jar
 150259,xmlresolver-4.2.0.jar
-633140,xstream-1.4.19.jar
+644649,xstream-1.4.20.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 845b39f34e3..f314bde4307 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -118,6 +118,7 @@ Summary
   <li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
      Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+  <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 3e424d774be166bf1e1c921552ad8457ee6f711d Mon Sep 17 00:00:00 2001
From: Stefan Seide <account-github@seide.st>
Date: Thu, 3 Nov 2022 20:22:57 +0100
Subject: [PATCH 0286/1037] add pr number to changes.xml

Closes #5725
---
 xdocs/changes.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f314bde4307..3182bd1b0b6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -107,17 +107,12 @@ Summary
   <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
   <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
      Based on a patch by Ori Marko (orimarko at gmail.com)</li>
-  <li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
-  <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
-  <li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
-  <li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
-  <li><issue>5725</issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
-  <li><issue>5725</issue>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
-  <li><issue>5725</issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
-  <li><issue>5725</issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
-  <li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
-  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
-     Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+  <li><pr>5718</pr>Update Apache commons-text to 1.10.0 (from 1.9)</li>
+  <li><pr>5725</pr>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+  <li><pr>5725</pr>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
+  <li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+  <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
+  <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
 </ul>
 
@@ -177,6 +172,7 @@ Summary
 </p>
 <ul>
   <li>Kai Lehmann (klehmann at aservo.com)</li>
+  <li>Stefan Seide (stefan at trilobyte-se.de)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 2340756d3162f5381c4e3708510992c079207cb9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 29 Nov 2022 20:40:46 +0100
Subject: [PATCH 0287/1037] Fix Aggregated Graph component to cope with empty
 names of samplers/controllers

Related to #5740
Closes #5741
---
 .../main/java/org/apache/jmeter/visualizers/AxisGraph.java   | 5 ++++-
 xdocs/changes.xml                                            | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
index 5725557a00f..e261b00cb0b 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
@@ -351,12 +351,15 @@ private void drawSample(String _title, int _maxLength, String[] _xAxisLabels,
                 _maxLength = 3;
             }
             // if the "Title of Graph" is empty, we can assume some default
-            if (_title.length() == 0 ) {
+            if (_title.isEmpty()) {
                 _title = JMeterUtils.getResString("aggregate_graph_title"); //$NON-NLS-1$
             }
             // if the labels are too long, they'll be "squeezed" to make the chart viewable.
             for (int i = 0; i < _xAxisLabels.length; i++) {
                 String label = _xAxisLabels[i];
+                if (label.isEmpty()) {
+                    label = "<empty>";
+                }
                 _xAxisLabels[i]=squeeze(label, _maxLength);
             }
             this.setPreferredSize(new Dimension(_width,_height));
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3182bd1b0b6..eb8dd6ec0de 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -135,6 +135,7 @@ Summary
 
 <h3>Listeners</h3>
 <ul>
+  <li><issue>5740</issues><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From 8289bba41d79a365859bc90295c0b82c20f2745c Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 4 Jan 2023 21:19:41 +0100
Subject: [PATCH 0288/1037] Correct markup

---
 xdocs/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index eb8dd6ec0de..ed84dd721d6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -135,7 +135,7 @@ Summary
 
 <h3>Listeners</h3>
 <ul>
-  <li><issue>5740</issues><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
+  <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From eb3a22579161d5e36c372949f9a8cbd055de8b5b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 4 Jan 2023 21:20:45 +0100
Subject: [PATCH 0289/1037] Add missing contributor from list of fixes

---
 xdocs/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ed84dd721d6..55b4a6b08e4 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -173,6 +173,7 @@ Summary
 </p>
 <ul>
   <li>Kai Lehmann (klehmann at aservo.com)</li>
+  <li>Ori Marko (orimarko at gmail.com)</li>
   <li>Stefan Seide (stefan at trilobyte-se.de)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>

From 62230c020a0232e3b15f3378eb26eeba51d2f6f7 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Fri, 6 Jan 2023 11:01:12 +0100
Subject: [PATCH 0290/1037] Use the most recent version for the autostyle
 plugin

This version contains fixes to exclude empty directories for input
files that previously caused issues with incremental builds because
some empty directories are created during a build. Subsequent builds
then had different input files and where no longer up to date.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c250716fd8e..fef539a6d42 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,7 +40,7 @@ spotbugs.version=4.1.2
 velocity.version=1.7
 
 # Plugins
-com.github.autostyle.version=3.0
+com.github.autostyle.version=3.2
 com.github.spotbugs.version=4.5.0
 com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
 com.github.vlsi.checksum-dependency.version=1.77

From 33a6d68814651deae54f390408cee482c26a0c33 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Fri, 6 Jan 2023 11:08:46 +0100
Subject: [PATCH 0291/1037] Increase heap size

Total heap size should be bigger than max metaspace size which is part
of the heap.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fef539a6d42..3a15e981651 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-org.gradle.jvmargs=-Xmx512m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx768m -XX:MaxMetaspaceSize=512m
 org.gradle.parallel=true
 # Build cache can be disabled with --no-build-cache option
 org.gradle.caching=true

From 7cb5772a1542bcb570532602b802253e104555d4 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Fri, 6 Jan 2023 11:17:19 +0100
Subject: [PATCH 0292/1037] Ignore empty directories for batch test task input
 directory

Empty directories are created in bin/testfiles that need to be ignored
as task inputs to improve incremental builds.
---
 .../kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index 95daf993f9d..cf19f446124 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -25,6 +25,7 @@ import org.eclipse.jgit.diff.RawTextComparator
 import org.eclipse.jgit.util.io.AutoCRLFInputStream
 import org.gradle.api.GradleException
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.IgnoreEmptyDirectories
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.InputFile
@@ -48,6 +49,7 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
     val testName = objects.property<String>()
 
     @InputDirectory
+    @IgnoreEmptyDirectories
     val inputDirectory = objects.directoryProperty().convention(
         project.rootProject.layout.projectDirectory.dir("bin/testfiles")
     )

From 2317d984499a5604dbf5d5c4d2b4b7301e459904 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Mon, 9 Jan 2023 09:24:45 +0100
Subject: [PATCH 0293/1037] Use newest version of vlsi-release-plugins

1.85 contains a fix for the license gather plugin switching absolute to
relative paths to better support build caching.
---
 buildSrc/checksum.xml        |  1 +
 buildSrc/gradle.properties   |  4 ++--
 buildSrc/settings.gradle.kts |  8 ++++----
 checksum.xml                 | 13 +++++++++++++
 gradle.properties            |  6 +++---
 settings.gradle.kts          |  8 ++++----
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 30aaae10ce3..5644a081079 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -27,6 +27,7 @@
     <trusted-key id='379ce192d401ab61' group='info.picocli' />
     <trusted-key id='efe8086f9e93774e' group='junit' />
     <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+    <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='6b1b008864323b92' group='org.antlr' />
     <trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
     <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index c8a1d01f881..7ed05daa952 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -19,5 +19,5 @@ ktlint.version=0.40.0
 
 # Plugins
 com.github.autostyle.version=3.0
-com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.74
+com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
+com.github.vlsi.checksum-dependency.version=1.85
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 7b5d5e7b56e..ff636718931 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -55,10 +55,10 @@ buildscript {
 
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
-    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
-            to "bcpg-jdk15on-1.62.jar",
-    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
-            to "bcprov-jdk15on-1.62.jar",
+    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+            to "bcpg-jdk15on-1.70.jar",
+    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+            to "bcprov-jdk15on-1.70.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
             to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
diff --git a/checksum.xml b/checksum.xml
index a977f79de45..ff876d11e6a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -111,6 +111,7 @@
     <trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='4a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
     <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+    <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='347cd0eaed975c5f' group='org.antlr' />
     <trusted-key id='6b1b008864323b92' group='org.antlr' />
     <trusted-key id='411063a3a0ffd119' group='org.apache-extras.beanshell' />
@@ -227,6 +228,18 @@
     <dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
       <sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
     </dependency>
+    <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.85'>
+      <sha512>59CD14C68456ADD477C6B6ACC8AC330EE5A10BA4394E3434450E958EC04968197C3EDAE8F3693D42CA32A5C0F639D6D60CF155B659D91CF89301744130087D9A</sha512>
+    </dependency>
+    <dependency group='com.github.vlsi.gradle' module='gradle-extensions-plugin' version='1.85'>
+      <sha512>42B201D43EC742D1EC4122D936291A6FF3C757E9522CA1940D2E25847F4B15D1AF814F4ED9139CD86D501849D2FD887725BF5498471D62FCBDD906AD6F167B8</sha512>
+    </dependency>
+    <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.85'>
+      <sha512>C9B64C9E8D0BE6108D479BE50D156007438CD193517CB79BEE3B9C172F38502EA77CC757D79B78C1BF7436F7747D87FE0E1B59893A5259F29711B72D7AFE1774</sha512>
+    </dependency>
+    <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.85'>
+      <sha512>2F70DA03A8F8ECF0F92C7B8B219321DFE9C8926DC55BF343662B043F277C7F63090B1B7E06F963606D9D9228E3FA4245393E2D3773DFD3D059136EB65D2E7998</sha512>
+    </dependency>
     <dependency group='commons-logging' module='commons-logging' version='1.0.4'>
       <sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index 3a15e981651..649ddff0784 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,9 +42,9 @@ velocity.version=1.7
 # Plugins
 com.github.autostyle.version=3.2
 com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.77
-com.github.vlsi.vlsi-release-plugins.version=1.77
+com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
+com.github.vlsi.checksum-dependency.version=1.85
+com.github.vlsi.vlsi-release-plugins.version=1.85
 kotlin.version=1.6.21
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8fce3cdecca..41dfe98bdb1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,10 +153,10 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.jar",
     "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
-    "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
-        to "bcpg-jdk15on-1.62.jar",
-    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
-        to "bcprov-jdk15on-1.62.jar",
+    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+        to "bcpg-jdk15on-1.70.jar",
+    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+        to "bcprov-jdk15on-1.70.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
         to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"

From 4597480d2bf776ab76835b4fecd84cf35da6b4e3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 9 Jan 2023 13:25:41 +0300
Subject: [PATCH 0294/1037] Downgrade checksum-dependency-plugin to 1.84

---
 buildSrc/gradle.properties   | 4 ++--
 buildSrc/settings.gradle.kts | 8 ++++----
 gradle.properties            | 4 ++--
 settings.gradle.kts          | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 7ed05daa952..e6bf32ef191 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -19,5 +19,5 @@ ktlint.version=0.40.0
 
 # Plugins
 com.github.autostyle.version=3.0
-com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
-com.github.vlsi.checksum-dependency.version=1.85
+com.github.vlsi.checksum-dependency.sha512=C297874DB24FADAACD097C4BF3BC2E4A1F684D04EAD286B6FED9919C563AB9BC5BF86B679156D72B700C2BEC429633291DFF680253088151D702CD6B4DD3A4EE
+com.github.vlsi.checksum-dependency.version=1.84
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index ff636718931..7b5d5e7b56e 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -55,10 +55,10 @@ buildscript {
 
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
-    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
-            to "bcpg-jdk15on-1.70.jar",
-    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
-            to "bcprov-jdk15on-1.70.jar",
+    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
+            to "bcpg-jdk15on-1.62.jar",
+    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
+            to "bcprov-jdk15on-1.62.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
             to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
diff --git a/gradle.properties b/gradle.properties
index 649ddff0784..f4144231597 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,8 +42,8 @@ velocity.version=1.7
 # Plugins
 com.github.autostyle.version=3.2
 com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
-com.github.vlsi.checksum-dependency.version=1.85
+com.github.vlsi.checksum-dependency.sha512=C297874DB24FADAACD097C4BF3BC2E4A1F684D04EAD286B6FED9919C563AB9BC5BF86B679156D72B700C2BEC429633291DFF680253088151D702CD6B4DD3A4EE
+com.github.vlsi.checksum-dependency.version=1.84
 com.github.vlsi.vlsi-release-plugins.version=1.85
 kotlin.version=1.6.21
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 41dfe98bdb1..c1494fbfb32 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,10 +153,10 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.jar",
     "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
-    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
-        to "bcpg-jdk15on-1.70.jar",
-    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
-        to "bcprov-jdk15on-1.70.jar",
+    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
+        to "bcpg-jdk15on-1.62.jar",
+    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
+        to "bcprov-jdk15on-1.62.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
         to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"

From 237abd743c816013ab682dd8193df7ee9f8623ee Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 19:22:51 +0300
Subject: [PATCH 0295/1037] Bump Autostyle Gradle Plugin to 3.2 in buildSrc as
 well

---
 buildSrc/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index e6bf32ef191..8f538a2364a 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -18,6 +18,6 @@ kotlin.code.style=official
 ktlint.version=0.40.0
 
 # Plugins
-com.github.autostyle.version=3.0
+com.github.autostyle.version=3.2
 com.github.vlsi.checksum-dependency.sha512=C297874DB24FADAACD097C4BF3BC2E4A1F684D04EAD286B6FED9919C563AB9BC5BF86B679156D72B700C2BEC429633291DFF680253088151D702CD6B4DD3A4EE
 com.github.vlsi.checksum-dependency.version=1.84

From 92c3431051269e521960804be3974a47ff7e248d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 20:53:49 +0300
Subject: [PATCH 0296/1037] add /.cache-proxy to .gitignore

It resovles flaky failures in GitHub Actions
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 21abad60e4b..7f2b2e19a29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,9 @@
 # Ignore Gradle project-specific cache directory
 .gradle
 
+# burrunan/gradle-cache-action creates this folder, so ignore it until the folder moved to another location
+/.cache-proxy
+
 # macOS
 .DS_Store
 

From 237d2833da0af35d8bc462ea81b14da5d77e30e9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 19:43:18 +0300
Subject: [PATCH 0297/1037] bump checksum-dependency-plugin to 1.86, so public
 pgp keys could be stored under the source control

Fixes https://github.com/apache/jmeter/issues/5749
---
 .ratignore                                    |   2 +
 buildSrc/checksum.xml                         | 126 ++----
 buildSrc/gradle.properties                    |   4 +-
 .../0e/105cb91cac2aee0e.fingerprints          |   1 +
 .../0f/7a01b0f236e5430f.fingerprints          |   1 +
 ...cc4c7594d09e2182c60e0f7a01b0f236e5430f.asc |  16 +
 .../11/164bd2247b936711.fingerprints          |   1 +
 ...e79b6abc762159dc0b1591164bd2247b936711.asc |  16 +
 ...ed3b4843daacc79de555557457ca33c3ce9e15.asc |  16 +
 .../15/7457ca33c3ce9e15.fingerprints          |   1 +
 .../1c/8067ecaa8d58321c.fingerprints          |   1 +
 .../1c/83552a552a0d431c.fingerprints          |   1 +
 .../1e/6005789e24e5ad1e.fingerprints          |   1 +
 .../1f/9d29ae4a6b50e01f.fingerprints          |   1 +
 .../21/60eb70ddaac2ec21.fingerprints          |   1 +
 .../25/2c7b12f2a511e325.fingerprints          |   1 +
 ...5f3b8e59e6e63aa78067482c7b12f2a511e325.asc |  16 +
 .../25/9351716690874f25.fingerprints          |   1 +
 .../2f/315693699f8d102f.fingerprints          |   1 +
 ...570288e10932263e8326cbaa49c633b4734832.asc |  26 ++
 .../32/aa49c633b4734832.fingerprints          |   1 +
 .../36/01f3a913fb698736.fingerprints          |   1 +
 ...beab2d799c020f17c69126b16698a4adf4d638.asc |  16 +
 .../38/b16698a4adf4d638.fingerprints          |   1 +
 .../3b/29579f18fa8fd93b.fingerprints          |   1 +
 .../3b/b5cb27f94f97173b.fingerprints          |   1 +
 ...01e2f8ef035068ec1139cc29579f18fa8fd93b.asc |  16 +
 ...b1a49729b053caf015cee9a6adfc93ef34893e.asc |  16 +
 .../3e/a6adfc93ef34893e.fingerprints          |   1 +
 .../40/750f9a735eecf640.fingerprints          |   1 +
 .../45/1669c4bb543e0445.fingerprints          |   1 +
 .../45/59992768673ae145.fingerprints          |   1 +
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc |  21 +
 .../4e/efe8086f9e93774e.fingerprints          |   1 +
 .../59/10da72cd7fbfa159.fingerprints          |   1 +
 .../5b/32784d4f004b405b.fingerprints          |   1 +
 .../5b/9df7f2349731d55b.fingerprints          |   1 +
 .../5c/b89991d171a02f5c.fingerprints          |   1 +
 ...4dac8350968ec2a8260584ee8ecbbbc188fd5d.asc |  15 +
 .../5d/ee8ecbbbc188fd5d.fingerprints          |   1 +
 .../60/7eb97d110dfadd60.fingerprints          |   1 +
 ...789342f598ad5b1175ef357eb97d110dfadd60.asc |  16 +
 .../61/379ce192d401ab61.fingerprints          |   1 +
 ...56c4f765c9ac3cb6b85d62379ce192d401ab61.asc |  26 ++
 .../6f/41321490758aad6f.fingerprints          |   1 +
 ...aa0f2206de228f0db01ad741321490758aad6f.asc |  16 +
 .../73/59a252fb1199d873.fingerprints          |   1 +
 ...16eb882daf57a11477aaf559a252fb1199d873.asc |  16 +
 .../76/5b05ccde140c2876.fingerprints          |   1 +
 ...669810892cbd3148fa92995b05ccde140c2876.asc |  33 ++
 .../7e/3ff44d37464bbb7e.fingerprints          |   1 +
 .../80/2ac7bf2f3349de80.fingerprints          |   1 +
 .../83/6a0975f8b1127b83.fingerprints          |   1 +
 .../87/0729a0aff8999a87.fingerprints          |   1 +
 ...ba29d08d2e25ee84c132c30729a0aff8999a87.asc |  38 ++
 ...0a7a9cf46221a56b06ad64461a804f2609fd89.asc |  37 ++
 .../89/461a804f2609fd89.fingerprints          |   1 +
 .../8f/dc0b7e986bd7398f.fingerprints          |   1 +
 ...3a1affe42b5f53af19f780bcf4173966770193.asc |  16 +
 .../93/bcf4173966770193.fingerprints          |   1 +
 ...900cd2fc9a9d906ecba48be3822b59020a349d.asc |  38 ++
 .../9d/e3822b59020a349d.fingerprints          |   1 +
 .../a2/0cfe993cdbe1d0a2.fingerprints          |   1 +
 .../a2/92bd2d0b5b21aba2.fingerprints          |   1 +
 .../a2/c3e640f38d845fa2.fingerprints          |   1 +
 ...a37fbe4453c1073e7ef61d6449005f96bc97a3.asc |  37 ++
 .../a3/6449005f96bc97a3.fingerprints          |   1 +
 ...f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc |  24 ++
 .../ab/b341ddb020fcb6ab.fingerprints          |   1 +
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc |  16 +
 .../ae/f6d4a1d411e9d1ae.fingerprints          |   1 +
 .../b1/0e91c2de43b72bb1.fingerprints          |   1 +
 ...6090d3223dca95bfd25c0e38f47d3e410c47b1.asc |  16 +
 ...92113263fc31c74ccbaab20e91c2de43b72bb1.asc |  16 +
 .../b1/38f47d3e410c47b1.fingerprints          |   1 +
 ...5479e1055341431b4545ab72475fd306b9cab7.asc |  16 +
 .../b7/72475fd306b9cab7.fingerprints          |   1 +
 .../b9/5f6ba89d4b0869b9.fingerprints          |   1 +
 .../bd/9c4c23e6ffe405bd.fingerprints          |   1 +
 .../c1/abe9f3126bb741c1.fingerprints          |   1 +
 .../d4/0162fe0cf6e18bd4.fingerprints          |   1 +
 ...78fde933a96dda827840d8e2b3d84202b812d9.asc |  16 +
 .../d9/e2b3d84202b812d9.fingerprints          |   1 +
 .../de/fc7403768b4c0cde.fingerprints          |   1 +
 .../eb/995efbf4a3d20beb.fingerprints          |   1 +
 ...bc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc |  26 ++
 .../ec/1723844cf9a045ec.fingerprints          |   1 +
 .../ed/d3dbc823be4819ed.fingerprints          |   1 +
 ...e770230e69cc6de143fb5b62c82e50836eb3ee.asc |  26 ++
 .../ee/62c82e50836eb3ee.fingerprints          |   1 +
 ...d6ff19930adf43ac127792a50569c7ca7fa1f0.asc |  24 ++
 .../f0/a50569c7ca7fa1f0.fingerprints          |   1 +
 .../f8/c9f04e6e2dc4f7f8.fingerprints          |   1 +
 .../fb/3d5839a2262cbbfb.fingerprints          |   1 +
 .../fb/cfa67e8582f7e9fb.fingerprints          |   1 +
 buildSrc/settings.gradle.kts                  |   8 +-
 checksum.xml                                  | 378 ++++++++----------
 gradle.properties                             |   6 +-
 .../00/4be257b370130000.fingerprints          |   1 +
 .../01/1f7a8f87b9d8f501.fingerprints          |   1 +
 ...6dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc |  38 ++
 .../01/c59d5d06cf8d0e01.fingerprints          |   1 +
 .../02/72ff58594f983302.fingerprints          |   1 +
 .../04/ea8543c570faf804.fingerprints          |   1 +
 .../07/402123d2f5f4af07.fingerprints          |   1 +
 ...88b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc |  16 +
 ...441e504a937f43eb0daef96a65176a0fb1cd0b.asc |  27 ++
 .../0b/6a65176a0fb1cd0b.fingerprints          |   1 +
 .../0b/c51e6cbc7ff46f0b.fingerprints          |   1 +
 .../0c/6b3225e6f495dc0c.fingerprints          |   1 +
 .../0e/105cb91cac2aee0e.fingerprints          |   1 +
 .../0e/3684155e9365c30e.fingerprints          |   1 +
 ...d266db4427983a1a4afb0c3684155e9365c30e.asc |  16 +
 .../10/a7a66be60a24ce10.fingerprints          |   1 +
 .../10/bb2fb7b24b12ae10.fingerprints          |   1 +
 .../11/9f3ffb85a8582c11.fingerprints          |   1 +
 .../14/3faad2cd5ecbb314.fingerprints          |   1 +
 .../14/5cf48cd2f24c5214.fingerprints          |   1 +
 ...e73d84ea4fcc47166087253faad2cd5ecbb314.asc |  26 ++
 .../14/d7913335bfa51814.fingerprints          |   1 +
 ...ed3b4843daacc79de555557457ca33c3ce9e15.asc |  16 +
 .../15/7457ca33c3ce9e15.fingerprints          |   1 +
 .../16/0588bc69a286ff16.fingerprints          |   1 +
 .../16/92aeca6ac21db816.fingerprints          |   1 +
 .../19/411063a3a0ffd119.fingerprints          |   1 +
 .../19/9ff24f51b06dcc19.fingerprints          |   1 +
 ...dee87612e9fb95f5c8d91e411063a3a0ffd119.asc | 117 ++++++
 ...0a37a2e0577f4baa095b52602ec18d20c4661c.asc |  26 ++
 .../1c/602ec18d20c4661c.fingerprints          |   1 +
 .../1c/8067ecaa8d58321c.fingerprints          |   1 +
 .../1c/83552a552a0d431c.fingerprints          |   1 +
 .../1d/9207518d06855c1d.fingerprints          |   1 +
 .../1e/6005789e24e5ad1e.fingerprints          |   1 +
 .../1e/9842fe565aa0601e.fingerprints          |   1 +
 .../1e/d547b4a01f74ac1e.fingerprints          |   1 +
 .../1f/9d29ae4a6b50e01f.fingerprints          |   1 +
 .../20/011b32c57a810220.fingerprints          |   1 +
 .../21/60eb70ddaac2ec21.fingerprints          |   1 +
 .../22/fe694b892910dd22.fingerprints          |   1 +
 .../23/528dc75aa68f0923.fingerprints          |   1 +
 ...569a15406ae682380f3ef8528dc75aa68f0923.asc |  16 +
 .../24/b8c800fb51837224.fingerprints          |   1 +
 .../25/2c7b12f2a511e325.fingerprints          |   1 +
 ...5f3b8e59e6e63aa78067482c7b12f2a511e325.asc |  16 +
 .../25/9351716690874f25.fingerprints          |   1 +
 .../25/a182f48d9c2c0825.fingerprints          |   1 +
 .../29/16fbb6b6e3120829.fingerprints          |   1 +
 ...9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc |  21 +
 .../2c/5f69ad087600b22c.fingerprints          |   1 +
 ...bd02b93e7a40482eb1d66a5f69ad087600b22c.asc |  16 +
 .../2d/127ce18327e55b2d.fingerprints          |   1 +
 .../2d/923c08f9417b222d.fingerprints          |   1 +
 .../2f/315693699f8d102f.fingerprints          |   1 +
 .../30/37de9e37c5b67c30.fingerprints          |   1 +
 .../31/f8052e4e1bd0db31.fingerprints          |   1 +
 .../34/31474e5e7c6b7034.fingerprints          |   1 +
 ...2db2916149baa9d0c92f3731474e5e7c6b7034.asc |  26 ++
 .../36/01f3a913fb698736.fingerprints          |   1 +
 .../36/2be5d98f751f4136.fingerprints          |   1 +
 .../36/3bd211f725778c36.fingerprints          |   1 +
 .../36/6c70a3b7599c5736.fingerprints          |   1 +
 ...8366594e746bf3c449f5622be5d98f751f4136.asc |  16 +
 .../37/218fa0f6a941a037.fingerprints          |   1 +
 ...fd709cc4b0515f2e6af04e218fa0f6a941a037.asc |  16 +
 ...beab2d799c020f17c69126b16698a4adf4d638.asc |  16 +
 .../38/b16698a4adf4d638.fingerprints          |   1 +
 .../3a/b9729775c0352d3a.fingerprints          |   1 +
 ...5f005af50ae94e69701222b9729775c0352d3a.asc |  10 +
 .../3b/06ec66d653dc633b.fingerprints          |   1 +
 .../3b/29579f18fa8fd93b.fingerprints          |   1 +
 .../3b/b5cb27f94f97173b.fingerprints          |   1 +
 ...01e2f8ef035068ec1139cc29579f18fa8fd93b.asc |  16 +
 .../3d/0a52516cf3e88b3d.fingerprints          |   1 +
 .../3d/9a2c7a98e457c53d.fingerprints          |   1 +
 ...acb037933cdeaab7bf77d49a2c7a98e457c53d.asc |  16 +
 ...b1a49729b053caf015cee9a6adfc93ef34893e.asc |  16 +
 .../3e/a6adfc93ef34893e.fingerprints          |   1 +
 .../3f/efd4147f269a813f.fingerprints          |   1 +
 .../40/750f9a735eecf640.fingerprints          |   1 +
 .../40/d8b9c51729d09d40.fingerprints          |   1 +
 .../41/9a347756830c4541.fingerprints          |   1 +
 .../42/a0f7d9615b3a5e42.fingerprints          |   1 +
 .../43/a6ea2e2bf22e0543.fingerprints          |   1 +
 ...77d51812e692011db11e66a6ea2e2bf22e0543.asc |  13 +
 ...4d86c56ca99373b6d8953dbe84d764623a3644.asc |  16 +
 .../44/be84d764623a3644.fingerprints          |   1 +
 .../44/c1d2a95a576a4144.fingerprints          |   1 +
 .../44/c7fddd147fa73f44.fingerprints          |   1 +
 .../45/1669c4bb543e0445.fingerprints          |   1 +
 .../45/353a436e043e3145.fingerprints          |   1 +
 ...bc5d7dc2fb8dd68aa429bd353a436e043e3145.asc |  16 +
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc |  21 +
 .../45/a98bd25be464ea45.fingerprints          |   1 +
 .../46/6f67467bc1adb846.fingerprints          |   1 +
 .../46/873a8e86b4372146.fingerprints          |   1 +
 ...54b35617dc255d9344bcfa873a8e86b4372146.asc |  24 ++
 .../47/dd6aefcee9eb4747.fingerprints          |   1 +
 .../48/1d185615d0a84648.fingerprints          |   1 +
 ...aa7402ba75f78720d975211d185615d0a84648.asc |  16 +
 .../4b/0440006d577eae4b.fingerprints          |   1 +
 .../4b/71499a87dc1ff84b.fingerprints          |   1 +
 .../4e/ccfb05b8ccbc1f4e.fingerprints          |   1 +
 .../4e/f5492b20d173a94e.fingerprints          |   1 +
 .../4f/9ff25980f5ba7e4f.fingerprints          |   1 +
 ...b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc |  19 +
 ...4454fad8697760f3e00d2e4a51a45b944ffd51.asc |  26 ++
 .../51/4a51a45b944ffd51.fingerprints          |   1 +
 .../51/85911f425ec61b51.fingerprints          |   1 +
 ...6e2c001948c5f2f38b0cc385911f425ec61b51.asc |  26 ++
 .../52/33cd6733af5ec452.fingerprints          |   1 +
 ...20d295bf0e61cb4cf0896c33cd6733af5ec452.asc |  24 ++
 .../53/3046c9379f41ea53.fingerprints          |   1 +
 ...2a008a91d11a7fac4a0786f13d3e721d56bd54.asc |  21 +
 .../54/f13d3e721d56bd54.fingerprints          |   1 +
 .../57/098a31f381819057.fingerprints          |   1 +
 ...b9bdf40ed49debb5caaded5b30d3b10694f057.asc |  16 +
 .../57/5b30d3b10694f057.fingerprints          |   1 +
 .../57/6366592024774157.fingerprints          |   1 +
 ...885c07a3204611fb184ef7098a31f381819057.asc |  16 +
 ...d34ed6ff73de368a772a781063fe98bcecb758.asc |  16 +
 .../58/1063fe98bcecb758.fingerprints          |   1 +
 .../59/10da72cd7fbfa159.fingerprints          |   1 +
 .../5b/11cd01355c5bcf5b.fingerprints          |   1 +
 .../5b/3260cb2def74135b.fingerprints          |   1 +
 .../5b/32784d4f004b405b.fingerprints          |   1 +
 .../5b/9df7f2349731d55b.fingerprints          |   1 +
 .../5c/b89991d171a02f5c.fingerprints          |   1 +
 ...4dac8350968ec2a8260584ee8ecbbbc188fd5d.asc |  15 +
 ...de772c338ba540e1057d0c8ea48d105232855d.asc |  16 +
 .../5d/8ea48d105232855d.fingerprints          |   1 +
 .../5d/ee8ecbbbc188fd5d.fingerprints          |   1 +
 .../5f/347cd0eaed975c5f.fingerprints          |   1 +
 ...1128c8fd304fe48e6eed2c347cd0eaed975c5f.asc |  16 +
 .../60/7eb97d110dfadd60.fingerprints          |   1 +
 ...789342f598ad5b1175ef357eb97d110dfadd60.asc |  16 +
 .../61/379ce192d401ab61.fingerprints          |   1 +
 ...56c4f765c9ac3cb6b85d62379ce192d401ab61.asc |  26 ++
 .../62/064ac25270668162.fingerprints          |   1 +
 .../62/7a8860944fad5f62.fingerprints          |   1 +
 ...f1bc78607808ec8e9f69437a8860944fad5f62.asc |  26 ++
 .../67/21939ff0ca2a6567.fingerprints          |   1 +
 ...87a3fd0a54480f0badbebd21939ff0ca2a6567.asc |  26 ++
 .../68/2f45f85cdf082e68.fingerprints          |   1 +
 ...af5293c334c7c0b583227d2f45f85cdf082e68.asc |  21 +
 .../6c/1afec329b615d06c.fingerprints          |   1 +
 .../6e/b2ca0dfe9ed21c6e.fingerprints          |   1 +
 ...2c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc |  16 +
 .../6f/41321490758aad6f.fingerprints          |   1 +
 ...aa0f2206de228f0db01ad741321490758aad6f.asc |  16 +
 ...57c388d7d1d9d031274cd0a5def5a76f94a471.asc |  26 ++
 .../71/a5def5a76f94a471.fingerprints          |   1 +
 .../71/c51e10bd96d06071.fingerprints          |   1 +
 ...5a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc |  16 +
 .../72/a2115ae15f6b8b72.fingerprints          |   1 +
 ...8075a251547bee249bc151a2115ae15f6b8b72.asc |  19 +
 .../73/59a252fb1199d873.fingerprints          |   1 +
 ...16eb882daf57a11477aaf559a252fb1199d873.asc |  16 +
 .../73/8183e80d264ee073.fingerprints          |   1 +
 .../76/164779204e106a76.fingerprints          |   1 +
 ...a8cf92d409a73393d0b736bff2ee42c8282e76.asc |  26 ++
 .../76/254e9c64c264c176.fingerprints          |   1 +
 .../76/575d6c921d84ac76.fingerprints          |   1 +
 .../76/5b05ccde140c2876.fingerprints          |   1 +
 ...669810892cbd3148fa92995b05ccde140c2876.asc |  33 ++
 ...255b26003ef6f82491acd7254e9c64c264c176.asc |  16 +
 .../76/bff2ee42c8282e76.fingerprints          |   1 +
 ...c3b1929191df06136ccb2b164779204e106a76.asc |  26 ++
 .../77/7ba5338873382b77.fingerprints          |   1 +
 ...ba61cf501c09f70911b83b82216a03caa86c78.asc |  10 +
 .../78/82216a03caa86c78.fingerprints          |   1 +
 ...0be7d076a0c89f5f07625ae57428da9e879e7d.asc |  16 +
 .../7d/e57428da9e879e7d.fingerprints          |   1 +
 .../7e/3ff44d37464bbb7e.fingerprints          |   1 +
 .../7f/25a93b1970c22a7f.fingerprints          |   1 +
 .../80/10314d676733c080.fingerprints          |   1 +
 .../80/2ac7bf2f3349de80.fingerprints          |   1 +
 .../80/bede11eaf1164480.fingerprints          |   1 +
 .../80/ca890a5fa09cfd80.fingerprints          |   1 +
 .../80/d068f0d7b6a63980.fingerprints          |   1 +
 ...a9f95079e84ce201f7cf60bede11eaf1164480.asc |  21 +
 ...118c070cb22a0175a2e8d43d12ca2ac19f3181.asc |  26 ++
 .../81/3d12ca2ac19f3181.fingerprints          |   1 +
 ...a70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc |  26 ++
 .../81/ddbcc1270a29d081.fingerprints          |   1 +
 ...752a9878e937049ef3fba7d4012dda1f1f0f82.asc |  16 +
 .../82/d4012dda1f1f0f82.fingerprints          |   1 +
 .../83/31fa045762d93f83.fingerprints          |   1 +
 .../83/6a0975f8b1127b83.fingerprints          |   1 +
 .../83/b7d8b732f9ff1283.fingerprints          |   1 +
 .../87/0729a0aff8999a87.fingerprints          |   1 +
 ...ba29d08d2e25ee84c132c30729a0aff8999a87.asc |  38 ++
 ...4cb436c56916fc01eea4a77c30f7b1329dba87.asc |  38 ++
 .../87/7c30f7b1329dba87.fingerprints          |   1 +
 ...0a7a9cf46221a56b06ad64461a804f2609fd89.asc |  37 ++
 .../89/461a804f2609fd89.fingerprints          |   1 +
 .../89/926dfb2edb329089.fingerprints          |   1 +
 .../8a/ef3fa25a9e1b028a.fingerprints          |   1 +
 .../8b/7999befba1039e8b.fingerprints          |   1 +
 .../8c/0ac07d0bbd11498c.fingerprints          |   1 +
 .../8d/fe4ce430fd91c78d.fingerprints          |   1 +
 ...5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc |  16 +
 .../8f/79e193516be7998f.fingerprints          |   1 +
 ...9a3c6d105b9f57844a721d79e193516be7998f.asc |  16 +
 .../8f/a929ea2321fdbf8f.fingerprints          |   1 +
 .../8f/dc0b7e986bd7398f.fingerprints          |   1 +
 ...ac2213964abe1d1c147c0e1939a2520bab1d90.asc |  16 +
 .../90/1939a2520bab1d90.fingerprints          |   1 +
 .../91/3967d4eda591b991.fingerprints          |   1 +
 .../92/8bcab185914c4a92.fingerprints          |   1 +
 ...c641c3a62453ab390066c4a41f13c999945293.asc |  26 ++
 ...3a1affe42b5f53af19f780bcf4173966770193.asc |  16 +
 .../93/a41f13c999945293.fingerprints          |   1 +
 .../93/bcf4173966770193.fingerprints          |   1 +
 .../94/59ba7bfead3d7f94.fingerprints          |   1 +
 .../94/be6397e958ab7594.fingerprints          |   1 +
 ...23db1360d9029481e7f2efecdfea3cb4493b94.asc |  36 ++
 .../94/ecdfea3cb4493b94.fingerprints          |   1 +
 ...abfb0dbd7a754822d35dd9be6397e958ab7594.asc |  16 +
 .../96/6601e5c08dccbb96.fingerprints          |   1 +
 ...417737bd805456db3cbdde6601e5c08dccbb96.asc |  21 +
 .../97/145d819475314d97.fingerprints          |   1 +
 .../97/4830c9fb8b680a97.fingerprints          |   1 +
 ...caa216b086a7b603b638c5145d819475314d97.asc |  16 +
 .../99/a7764f502a938c99.fingerprints          |   1 +
 ...5e25b78ebb19e47c0a99bca7764f502a938c99.asc |  16 +
 ...92c12c7e3d336a452beb254e066e0459cd109b.asc |  26 ++
 .../9b/4e066e0459cd109b.fingerprints          |   1 +
 .../9d/43203be58f49479d.fingerprints          |   1 +
 ...900cd2fc9a9d906ecba48be3822b59020a349d.asc |  38 ++
 .../9d/e3822b59020a349d.fingerprints          |   1 +
 ...3aabbb95ca37431e20422043203be58f49479d.asc |  26 ++
 .../9e/d4ff1f46313c1a9e.fingerprints          |   1 +
 .../a2/0cfe993cdbe1d0a2.fingerprints          |   1 +
 .../a2/249dee8e2c07a0a2.fingerprints          |   1 +
 ...3e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc |  21 +
 .../a2/92bd2d0b5b21aba2.fingerprints          |   1 +
 ...a37fbe4453c1073e7ef61d6449005f96bc97a3.asc |  37 ++
 .../a3/6449005f96bc97a3.fingerprints          |   1 +
 ...dba0d142fe15d6a16f6b3789af105ceec705a4.asc |  37 ++
 .../a4/89af105ceec705a4.fingerprints          |   1 +
 .../a6/6e50bb68cc1699a6.fingerprints          |   1 +
 .../a7/0e26a79ffe07a3a7.fingerprints          |   1 +
 .../a7/7d1be4480b61e2a7.fingerprints          |   1 +
 .../a7/bc7df305d87bdfa7.fingerprints          |   1 +
 .../aa/3449ec3ac2efe8aa.fingerprints          |   1 +
 ...1ac64f4e34e290503c90323449ec3ac2efe8aa.asc |  37 ++
 ...f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc |  24 ++
 .../ab/3b2a06173073fdab.fingerprints          |   1 +
 .../ab/b341ddb020fcb6ab.fingerprints          |   1 +
 .../ac/a7e989b0634097ac.fingerprints          |   1 +
 .../ad/0da8a5ec02d11ead.fingerprints          |   1 +
 ...7b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc |  24 ++
 ...b87b18a453990eac9453f87d713008cc07e9ad.asc |  26 ++
 .../ad/7d713008cc07e9ad.fingerprints          |   1 +
 .../ae/7494750bdf4f8fae.fingerprints          |   1 +
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc |  16 +
 .../ae/f6d4a1d411e9d1ae.fingerprints          |   1 +
 .../af/c2148900bcd3c2af.fingerprints          |   1 +
 .../b1/07d3516820bcf6b1.fingerprints          |   1 +
 .../b1/0e91c2de43b72bb1.fingerprints          |   1 +
 ...6090d3223dca95bfd25c0e38f47d3e410c47b1.asc |  16 +
 ...92113263fc31c74ccbaab20e91c2de43b72bb1.asc |  16 +
 .../b1/38f47d3e410c47b1.fingerprints          |   1 +
 ...5ee627345f3c1dd422b2e207d3516820bcf6b1.asc |  16 +
 ...d8419ba697f0e7fb85916ee91287822fdb81b1.asc |  26 ++
 .../b1/e91287822fdb81b1.fingerprints          |   1 +
 .../b2/1861c322c56014b2.fingerprints          |   1 +
 ...96a5e3e70732eeb2e5007f1861c322c56014b2.asc |  24 ++
 .../b2/eaae192d27ab3eb2.fingerprints          |   1 +
 ...1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc |  16 +
 .../b3/4a1bac7f1e3b89b3.fingerprints          |   1 +
 .../b3/8b2a34a7d4a9b8b3.fingerprints          |   1 +
 .../b4/2d0e1fb8fe4b68b4.fingerprints          |   1 +
 ...89baf76217b843d66be55b2d0e1fb8fe4b68b4.asc |  26 ++
 ...5479e1055341431b4545ab72475fd306b9cab7.asc |  16 +
 ...6a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc |  16 +
 .../b7/72475fd306b9cab7.fingerprints          |   1 +
 .../b7/a7f5ed0fa05d64b7.fingerprints          |   1 +
 .../b8/1b2718089ce964b8.fingerprints          |   1 +
 ...fae244a81d64507b47182e1b2718089ce964b8.asc |  33 ++
 .../b9/5f6ba89d4b0869b9.fingerprints          |   1 +
 .../b9/fb693bc97890abb9.fingerprints          |   1 +
 .../ba/3595395eb3d8e1ba.fingerprints          |   1 +
 ...c935821aa6a755bd337db53595395eb3d8e1ba.asc |  26 ++
 .../ba/7c7d8456294423ba.fingerprints          |   1 +
 ...5aed155021af8a6c6b7a4a7c7d8456294423ba.asc |  24 ++
 .../ba/fcf74afdf5947aba.fingerprints          |   1 +
 .../bb/1085f41881c989bb.fingerprints          |   1 +
 .../bc/6b7edfc69f043bbc.fingerprints          |   1 +
 .../bd/8799af90c06efbbd.fingerprints          |   1 +
 ...4555c237785ca8a6dc1fe58799af90c06efbbd.asc |  10 +
 .../bd/9c4c23e6ffe405bd.fingerprints          |   1 +
 ...a1a08c62fca78b79d3081164a16faaec16a4be.asc |  16 +
 .../be/64a16faaec16a4be.fingerprints          |   1 +
 .../c0/1241bc872c5e4ec0.fingerprints          |   1 +
 ...6de9055c4c75c7bd9830771241bc872c5e4ec0.asc |  24 ++
 .../c1/11f4ce313a637cc1.fingerprints          |   1 +
 .../c1/abe9f3126bb741c1.fingerprints          |   1 +
 .../c2/3624ee1473a843c2.fingerprints          |   1 +
 .../c3/67631bc0568801c3.fingerprints          |   1 +
 ...2567d2589415bd74eb4c2867631bc0568801c3.asc |  26 ++
 ...7e32d440ef90a83011a8fc6425559c47cc79c4.asc |  16 +
 .../c4/6425559c47cc79c4.fingerprints          |   1 +
 .../c4/c189c86b813330c4.fingerprints          |   1 +
 .../c4/d66472cf54179cc4.fingerprints          |   1 +
 .../c5/1364c5e2df3e99c5.fingerprints          |   1 +
 .../c6/2f53295a4bbac7c6.fingerprints          |   1 +
 .../c7/5858009d3cc798c7.fingerprints          |   1 +
 ...184bcd55f4d016e30d4c9bf42e87f9665015c9.asc |  24 ++
 .../c9/f42e87f9665015c9.fingerprints          |   1 +
 .../cb/1e8f1d57a4450bcb.fingerprints          |   1 +
 ...b4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc |  16 +
 .../cb/4c00043bec5cb7cb.fingerprints          |   1 +
 ...f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc |  33 ++
 .../cb/86fdc7e2a11262cb.fingerprints          |   1 +
 .../cb/b15ad8efbd28d3cb.fingerprints          |   1 +
 .../cd/bb9cc415c9c063cd.fingerprints          |   1 +
 .../ce/ccda41f01581c6ce.fingerprints          |   1 +
 .../d0/9daadc1c9fcc82d0.fingerprints          |   1 +
 ...5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc |  26 ++
 ...fab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc |  26 ++
 ...9751fc3f01f134f476464cd0eb627d4885ced1.asc |  24 ++
 .../d1/9c8c892f91f8e6d1.fingerprints          |   1 +
 .../d1/d0eb627d4885ced1.fingerprints          |   1 +
 .../d4/0162fe0cf6e18bd4.fingerprints          |   1 +
 ...dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc |  16 +
 .../d4/1c8d5ef0df2b70d4.fingerprints          |   1 +
 .../d4/7892707e9657ebd4.fingerprints          |   1 +
 .../d4/a5c8dbb8a1599bd4.fingerprints          |   1 +
 .../d5/1da784ccb5c46dd5.fingerprints          |   1 +
 ...ac8cdc141af0ae468d16921da784ccb5c46dd5.asc |  37 ++
 .../dd/15c71c0a4e0b8edd.fingerprints          |   1 +
 ...cffe916b6670868fa0ea0391ae1504568ec4dd.asc |  26 ++
 .../dd/91ae1504568ec4dd.fingerprints          |   1 +
 ...7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc |  26 ++
 .../de/106bde3d5d78bfde.fingerprints          |   1 +
 .../de/cfca4a29d26468de.fingerprints          |   1 +
 ...182e81c792928921dbcab4cfca4a29d26468de.asc |  16 +
 .../e0/6064b04a9dc688e0.fingerprints          |   1 +
 .../e1/72fefd1572eb75e1.fingerprints          |   1 +
 ...e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc |  16 +
 .../e1/a9b9c4370b8833e1.fingerprints          |   1 +
 ...7ea1255546d6070a23aa00db45d3a62a183ce2.asc |  16 +
 .../e2/db45d3a62a183ce2.fingerprints          |   1 +
 .../e3/e95b8ff73f6b84e3.fingerprints          |   1 +
 ...85b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc |  24 ++
 .../e5/4713a6a15a6ea9e5.fingerprints          |   1 +
 .../e5/7c25280eae63ebe5.fingerprints          |   1 +
 .../e5/b4f772a2a08563e5.fingerprints          |   1 +
 .../e7/b0f3710fa64900e7.fingerprints          |   1 +
 ...be5bcc9fec15518cfda882b0f3710fa64900e7.asc |  16 +
 .../e8/4f89f83c363d30e8.fingerprints          |   1 +
 .../e8/f20db7fef61ce1e8.fingerprints          |   1 +
 .../e9/cff46ee3c17e53e9.fingerprints          |   1 +
 .../ea/4044edf1bb73efea.fingerprints          |   1 +
 .../ea/5b93f1df7cdb6dea.fingerprints          |   1 +
 ...9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc |  26 ++
 .../eb/995efbf4a3d20beb.fingerprints          |   1 +
 ...bc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc |  26 ++
 .../ec/1723844cf9a045ec.fingerprints          |   1 +
 .../ec/2290c86d79f1dfec.fingerprints          |   1 +
 .../ed/9a259c7ee636c5ed.fingerprints          |   1 +
 .../ed/d3dbc823be4819ed.fingerprints          |   1 +
 ...7417ac194160a3fabd04969a259c7ee636c5ed.asc |  26 ++
 ...e770230e69cc6de143fb5b62c82e50836eb3ee.asc |  26 ++
 .../ee/62c82e50836eb3ee.fingerprints          |   1 +
 .../ef/ab049df4ab24c1ef.fingerprints          |   1 +
 ...6260c72df74e66268f7770ab049df4ab24c1ef.asc |  26 ++
 .../f2/fc51362145a05ff2.fingerprints          |   1 +
 .../f8/c9f04e6e2dc4f7f8.fingerprints          |   1 +
 .../f9/9f7335d63326e7f9.fingerprints          |   1 +
 ...13f67d71beec23add0ce0acb43338e060cf9fa.asc |  26 ++
 .../fa/cb43338e060cf9fa.fingerprints          |   1 +
 .../fb/3d5839a2262cbbfb.fingerprints          |   1 +
 .../fc/4006cba6d352f1fc.fingerprints          |   1 +
 ...ef9646901a1652e5b3e5ea694db6f419c8d1fd.asc |  16 +
 .../fd/694db6f419c8d1fd.fingerprints          |   1 +
 .../fe/891e4c2d471515fe.fingerprints          |   1 +
 settings.gradle.kts                           |   8 +-
 479 files changed, 3883 insertions(+), 319 deletions(-)
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints

diff --git a/.ratignore b/.ratignore
index 4f0ca3e960a..ad83641febf 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,6 +1,8 @@
 checksum.xml
 buildSrc/checksum.xml
+buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/**
 gradle/wrapper/gradle-wrapper.jar
+gradle/checksum-dependency-plugin/cached-pgp-keys/**
 .*
 .*/**
 CODE_OF_CONDUCT.md
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 5644a081079..82a1aadb54f 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -1,104 +1,44 @@
 <?xml version='1.0' encoding='utf-8'?>
-<dependency-verification version='1'>
+<dependency-verification version='2'>
   <trust-requirement pgp='GROUP' checksum='NONE' />
   <ignored-keys />
   <trusted-keys>
-    <trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
-    <trusted-key id='379ce192d401ab61' group='com.diffplug.spotless' />
-    <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
-    <trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
-    <trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
-    <trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
-    <trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
-    <trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
-    <trusted-key id='abe9f3126bb741c1' group='com.google.guava' />
-    <trusted-key id='f6d4a1d411e9d1ae' group='com.google.guava' />
-    <trusted-key id='29579f18fa8fd93b' group='com.google.j2objc' />
-    <trusted-key id='7eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
-    <trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
-    <trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest' />
-    <trusted-key id='995efbf4a3d20beb' group='com.pinterest' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
-    <trusted-key id='995efbf4a3d20beb' group='com.pinterest.ktlint' />
-    <trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
-    <trusted-key id='a41f13c999945293' group='commons-logging' />
-    <trusted-key id='6449005f96bc97a3' group='de.undercouch' />
-    <trusted-key id='379ce192d401ab61' group='info.picocli' />
-    <trusted-key id='efe8086f9e93774e' group='junit' />
-    <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
-    <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
-    <trusted-key id='6b1b008864323b92' group='org.antlr' />
-    <trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
-    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
-    <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
-    <trusted-key id='e2b3d84202b812d9' group='org.assertj' />
-    <trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
-    <trusted-key id='b16698a4adf4d638' group='org.checkerframework' />
-    <trusted-key id='41321490758aad6f' group='org.codehaus.groovy' />
-    <trusted-key id='466caed6e0747d50' group='org.codehaus.plexus' />
-    <trusted-key id='0e91c2de43b72bb1' group='org.ec4j.core' />
-    <trusted-key id='c7bf26d0bb617866' group='org.eclipse.aether' />
-    <trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
-    <trusted-key id='a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains' />
-    <trusted-key id='bcf4173966770193' group='org.jetbrains' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
-    <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
-    <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
-    <trusted-key id='3967d4eda591b991' group='org.jetbrains.kotlinx' />
-    <trusted-key id='3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
-    <trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
+    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
+    <trusted-key id='55e770230e69cc6de143fb5b62c82e50836eb3ee' group='com.github.gundy' />
+    <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
+    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
+    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
+    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
+    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
+    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
+    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
+    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
+    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
+    <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest' />
+    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
+    <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest.ktlint' />
+    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
+    <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
+    <trusted-key id='d4c89ea4aaf455fd88b22087efe8086f9e93774e' group='junit' />
+    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
+    <trusted-key id='a778fde933a96dda827840d8e2b3d84202b812d9' group='org.assertj' />
+    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
+    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
+    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
+    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
+    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
+    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
+    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
+    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
+    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
+    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
   </trusted-keys>
   <dependencies>
-    <dependency group='org.ajoberstar.grgit' module='grgit-gradle' version='4.1.1'>
-      <sha512>DB910E6A6A65DBB18E68D566F1CFD8B7CBF5F57F05A8FAC79EAB71830C5F5B5B7574F039A859EDEE6EF737E5B43B6E6985E0D1BC8D24195A11EB9E9807DFAC8A</sha512>
-    </dependency>
-    <dependency group='org.ajoberstar.grgit' module='grgit-core' version='4.1.1'>
-      <sha512>B1137C44F791BAD962C7D1FDE2DD54F6A2564097DA111BAE5D4764497E3679A8243728666C3947F6DCB464E2B6AE0592889DB9D4D69B407C4694DC01DE3C76E1</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='1.4.9'>
-      <sha512>E2E7D75380BBFB3A6DAA93A75FAB9D8F4038D42FFBA93B9FE8A350C1BD735FF746A01E3FB76A62DFA7B26EDADA638EB045D45F47568A427E6C1505F70A92AE79</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.4'>
-      <sha512>A343D64A4A607CD30B8464391FA542CDD11B3CAE65A589134DFADF298867B938A79CB752EC709614CB9F2E3080341936FDD40223EBFE414399D0FDAF15ACD358</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.6'>
-      <sha512>59E0C00C153296770FD8ED56CF0B2BDC2C5525557562C63D035E6E325557734940CDC5882407D93AD29C20727CA8C85BC9C50A683B62F67484A9BBE608F26A46</sha512>
-    </dependency>
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.7'>
       <sha512>2FE2FE885E48F7D3592751F0E824E21BE2478B9046E25E0AF109E6683F126B1ACE3DA7CB0FF3DA586C08498EF9FEFF445A00A63B2B86CC8BE22D0B3242F801B8</sha512>
     </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
-      <sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.2.9'>
-      <sha512>F672FEB39919B2A78E0AEFA95E8BE023C856EA802FBB652EE97FF6BC935BB6E29B9E5E36CC62B9B52D970DE6C49AC0D07C1EC5588771FC2B89787AB94CAE6AC7</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.3.1'>
-      <sha512>8563C160EF97CF2E2C62875B438177212AC247304E4A94466C687F3E4D354E34D69BC31E790F8409BE55C16A25F2B0BABFC9C6311ECA64ADF932F68AB8B2B484</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.3.3'>
-      <sha512>651EACA737F0F794E5805ED6503E4E00A8105BD97DA60A6A75C161C03F2DCF649466D35831D9466D7B1297C707EBEC33D75B2C7FD411F713EB51522629995206</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.3.4'>
-      <sha512>B6F05B16B1826C3FD50D80AFD14965566B27313691A111EC8589867678D6B92AF827E5E098BECCE8F911D8B479AF5303322A6B2ECA971D1A2D985F42BD1AAA87</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='plugins' version='1.3.6'>
-      <sha512>FFC641492549525D06D6788A3D708C7108AFA06C35796EF0B3A71541672162A7BAFDE6DC8F90F63D524BA33D1447C172C589491C16CF3B91C2C3E150AAB71B46</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.4.20'>
-      <sha512>BEEB633A0C9E3AC38A02CC8E901F2327F4668085D1A8AAFF45088DD7FB24B56E0300D42468238AC7429C570C13B86E167637EF50E646F95F2503AA52D8A3FF81</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='jcl-over-slf4j' version='1.6.2'>
-      <sha512>3BA508C96EE0985865C9E86EBE803D1903835F7C198EB15723CDC86B028D6C82DBB7E96ECB01CEFAD7CC6EC7023155676D034B6B730A911D0FFE9F91FE532592</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='slf4j-api' version='1.6.2'>
-      <sha512>F520620AA2DF7856DEA11E8B310F5F48C7A53444867112F734FFEF6726DF6EB469BF068564AF79B7DE30845906E7B5772CA064A3CC0DA18918E6DE46BD02D6E6</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='slf4j-nop' version='1.6.2'>
-      <sha512>89F8559C281F6BCEA4EB193C49AA8C960A5FE6762DCA0198A7BB04B9D8A846AC52231F77EC16B2E9C0B48D0F6011517B641B5B93279B24EEF65EE22E2C1167F3</sha512>
-    </dependency>
   </dependencies>
 </dependency-verification>
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 8f538a2364a..fc20a54f188 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -19,5 +19,5 @@ ktlint.version=0.40.0
 
 # Plugins
 com.github.autostyle.version=3.2
-com.github.vlsi.checksum-dependency.sha512=C297874DB24FADAACD097C4BF3BC2E4A1F684D04EAD286B6FED9919C563AB9BC5BF86B679156D72B700C2BEC429633291DFF680253088151D702CD6B4DD3A4EE
-com.github.vlsi.checksum-dependency.version=1.84
+com.github.vlsi.checksum-dependency.sha512=7BC525B8790D8C3554316D47AC0E048B90E87902EBC40B1FE1C18BC533161037DFC9FD751AC822542D0B35D93B5CEC8848ADBB9F3D958ECBB391CF20A268BBE0
+com.github.vlsi.checksum-dependency.version=1.86
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
new file mode 100644
index 00000000000..276ae3fd4f7
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
@@ -0,0 +1 @@
+1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
new file mode 100644
index 00000000000..8acbce9e3f9
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
@@ -0,0 +1 @@
+afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
new file mode 100644
index 00000000000..6f70b6c9127
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
+mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
+4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
+/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
+jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
++krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG5AQ0EVlSyJAEIAL0+8UoJ
+uUsC3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbau
+L6Lrvw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3
+Yw/xfiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/t
+DxttYkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAg
+P6kgFxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPF
+HNkLijDp+f5mkJcAEQEAAQ==
+=32WC
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
new file mode 100644
index 00000000000..f90c8fd6cb3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
@@ -0,0 +1 @@
+58e79b6abc762159dc0b1591164bd2247b936711
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
new file mode 100644
index 00000000000..ddc2bc81e5e
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFPU8TIBCADGNvExYTJpVuNGCF9NuWw+IkitjAD7WzF7QkvFCSw9VftzgTUZ
+3PYrThRiaDdmHQAke4Sp+nYyAJ7iUcQqg/5/ONiMdzXEv5Kwy5WJN8+o2aXSunIT
+PALIw29DemZdVerw8Xc9jcdNYGxbPgtfSjr/DBCBs5Guq+RuuwsBvyTGLiHpc6hb
+91D/wX6Y0NQB4UlY9f3k6AgqiR5OGq602hXYvL10pH6eT3gSmCvxp1WvNJDBmaRi
+ZdgW76Y+bGQkmygWdAb3Q2DUEQHVH30YTBx5VFoiCfx1Jud4mD90Tv1hhPn0fS50
+oLGqI6f+VB14iJ4XLaSfyk/UMl343iF9PAg9ABEBAAG5AQ0EU9TxMgEIANAOURt9
+TLIRxc4lZLnve9LNSjTe3g88MOSoCI/EsyOR4ttMmc7NqNgCwYXyuNlak+jSGupL
+biUCaFq+ioYWPpDGmZZLfiNFPi5Zm8uJdo5RupRTzWWCGryzhb1PHlr1Pd+H4C7r
+SuB4pgTaPB06p/o7H6DU3/HKb3AEkJ40FThJX+cU2EOkVs999WQ6Xyabj8j1ivfx
+jB0K7q4SuEGEpWvbGHWCGTNuzpjcXYvYWjy0pGgJnmBfaZ4NAqD6mpyNx3yDfVvV
+Lu5D3M1t2a9Q4F6uKbaO65SuvTNNRnsCjFbk0tjCas1s2j/QQjI9IyPonKUkVdOv
+egP9XmQke1Wm/TcAEQEAAQ==
+=qNsi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
new file mode 100644
index 00000000000..dcb0ae5beb3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
+x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
+N4/BiyjQA25sdfaOolhO0sFlZuTZpYy5wG72KkA1ygNq0L+8aBKhEF6zDU61YzCC
+AxjcgTftgTeeoqkJtYa06lNz3jmJDN+zUQignfRa3ymoGtFHTzoXR9maE8RWDty4
+y+DY+8ibdGgSgKPZ0byTCDyNojgU1YTlADa/1/NY1ShYg617O1xicLNo0JEJlf2U
+Tu4Ymql36+xSkYSISU97Q6Utgq27XMuZvDUDABEBAAG5AQ0EUhfJFAEIAN9NHRd2
+bYP/3CDi+n1ilSChld0NR3DUBgS/AdqQ7IoAUfj7skyI/WyaMdV4uy6vRh5YgNg2
+g01nd0LLZR8Gf2Ck+D6F88CdZaTxlkcxHV/dXMZ8yBO+0D6yFRZEL7Imsv8Ig4QX
+OVwfuiXEPk/Ef5Dy9SdAVhcoErTGGR6BOGVVvexGtBwefsjMaOG0khkRbWIQ32Wx
+fUFuAv5XBQ0ckLrlKvYWUYhOlXg27GtFKH2EBBF0Z5ZWu7gaBFwSV0oLp9EWcD+C
++WEwUSfBdqfRJtyXvgf4kZdwdQ5caM8P2/Sdncl2l/LU1At2Smc+plr6zhIhDlLh
+lrzKGa16oARSBdUAEQEAAQ==
+=VB22
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
new file mode 100644
index 00000000000..62da51ed28d
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
@@ -0,0 +1 @@
+56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
new file mode 100644
index 00000000000..85f7ae585ef
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
@@ -0,0 +1 @@
+2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
new file mode 100644
index 00000000000..d0de6ff44ac
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
@@ -0,0 +1 @@
+7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
new file mode 100644
index 00000000000..12ace9e88f0
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
@@ -0,0 +1 @@
+475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
new file mode 100644
index 00000000000..75e98dd9efa
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
+2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
+bOjh4v9ZipD+px8w3o/RNrnZH/KRsoJg9yER6pf+pUZqTJfdg5lXezc1WF+/1qVo
+ypldMGfrkfLsPrUZTT689ubbig978e7eYmJEqldtaIwaAzHQnB70wIJyg/rEwFUM
+ldsvs6t6czSuJ4zPMvmh8TMpTg9e6+DMktPl1CWRONl8RPpgYMIC96gb4OnfDDjk
+Ex6clSCwgbDwdeAyOjjR6pVq+pCNTo1Pcj5jABEBAAG5AQ0ET5k74QEIALaxogmJ
+1t7arw82krV7ILlcOu6aLuuXTuy03K1/jU73oyWfUqwvPSbH4igcLb8kt1/6ogfk
+u0T9tTx+0mDsvqK8A8NZ2nDTXok3T58UAg0FTXlqUqZmy5QPtG+it2j3/xGgip3V
+5p0Ml1TqEl2SfW6gHtLptDUWzuzPi9SgK1ZFlueprPg7xwHmWhp0gwx0KSSOYWlK
+oEllj/1aDxFNcdKogWcGN5aJEsETCEguBP7olL75u6732wc3zola4zTy5bFT4kEY
+Dk30Du3VGQJrdsqlibdQpZYm8uH4AVXDmFMdEAjIs/DGRrUgde/oUqwtgm9U+p9M
+qcbmMoeLFdi7ajEAEQEAAQ==
+=ObeE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
new file mode 100644
index 00000000000..a7c567b4543
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
@@ -0,0 +1 @@
+08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
new file mode 100644
index 00000000000..d9aef5d017d
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFy6CfQBEACycSFejWsSdKTEV3RTXqXVcP2Nx4zYR3ZUKKqdC4lGPjlITjC0
+z5y9mMpH55535dLBJql0dRUg7qKF5obUIqqx2Kg51aVVaeb2OiuSGMF5M2CaKGI3
+vStIPep+GCcq+42CARXPK4Jd9Ob7t8q7YYRzfQMs+/nJ8wAFRI0WbTwKejdZ+IVD
+DuCEvF/yzGWdFZtfLMGESrMhI381BSAnfD4H/5+VvNC0+0EyAQeAsWZQNMlMuq3c
+JafTEhQ9LM3r/c/bWKkPz3d5vjuo+BVZm7hb9kX119A0zEZ/wTQwBv6m7rE+NSTA
+WnvSJs9xPxIjxBjy7tYA//mExzkKRecPCeEi0kbRxrSggi5/jpI3oTz3EFhn6UW2
+srE72hxltLUE6wTjoluq3Jrum4NnT0KBvvxqCFG85G3GIsXAIKQqji2hw56hRyOY
+ucJD7h3Qo0H3OLSVfOiFfSQ4vNBY/l0bWTaD/jOFPMXA87Kmx2PB11UuFjhUm/wK
+jRp7Yv5b6ehZ847uL5W8Xdmy+XcPaxt+nhk84DLP3mX5tNbnaYP9JZsEKiEtzsIK
+rAezDrFmT4iQVrIQBhQBhh051FiJmF+5M3VHa5eiFiCu64R+UniX+4O7uFtzXsR7
+G61wq3hmA+PqlsM5xp5PIKrPVT+l2SADk6AF5UV9ifEAOjpEsnV3sBaXtQARAQAB
+uQINBFy6CfQBEACfqh+i3zvT8DtpfFMpk+F+NqS5UxnOXiwgjKjPrrGV6Dt3v46v
+pFGhfcrdvFV67b0NEWwQVpliGSMqSGCsQSdBSO8WMGk7f3Uzoq5Yti8JBAQYpYik
+vrPPVIRWWe7CtEnBb8dEgcIBGcKX8Zp4RD2q59eS9IufpPFjns59W+3J/ZHyaHU0
+5oBpxRpzsh9uCzL4YSvRHJF1Qr96EGf7hbUf/6kVuoZ4D1NuKoTSbbq64ZxrhdPJ
+8wjw4ONunpzVlTjUzUSTlagsdGPnrJDwJ9+OWr5Axf757ZIHia91Bec+Y+vLasnK
+vk6HAM50xgpvirOECvMgrOS1Ir47MMlJdzqXoTE2idFzKHlUwteMhCiIicYfYdc/
+gWQqy3dBJMIHz0SKSCDPJNO3ihcbcgSQAEW7lZ3696r5vNr5y5X5+b+L/L1393Uo
+6EBpLk5ox6+Yr2FAt0w5JvpIdBacHyGejv9YpRK6ysgQwHC4E0fOtE+fx6WWkr5V
+sAptF/AGzENMsvDDLa64fE2fsSrukxPRLS42jHJNZTGopCKVDgD/00JnNVoZIC+Z
+Hl0BGnDdzIP17FKw0r9sY08UiJ0Bc8dMiTrPsSIxJOS1kjVl7PtGZlwB/njC3+UX
+IMaR1uaSEtIAR7nR884oVYj0j97IjeMTr5n66clN9Q1cNW/J7cV1q4CxpwARAQAB
+=fyQj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
new file mode 100644
index 00000000000..e37b3e7e154
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
@@ -0,0 +1 @@
+a2570288e10932263e8326cbaa49c633b4734832
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
new file mode 100644
index 00000000000..3fe473deef0
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
@@ -0,0 +1 @@
+7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
new file mode 100644
index 00000000000..e66ffdde36d
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
+NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
+/HVNFvTdF8LNnuF+a5aNgg+jjLvFwzkyMFkuiPGuUDFnqEGxC+z9J8t40tpOTOIw
+tPjSzkDN41AJDpUK/simKC5F0Im78nUbwMalE5z2IsZRWpYZyIhN1HhEdDvaDIh7
+3vENjH7enAjWh0iGRu+GTP/fayZnX0uhmausCCwMMhsr489e63ZOaJrqeC//wWrX
+dtEJjcmvRmJ2hwLmgwMP4zSNKsnLGzP0sh69ABEBAAG5AQ0EUzW/0AEIAO62SMbq
+gIzEFQEHlxNN5pZHd7msqDESILFYFkI1mxlkD0twFWMbk4nMH2VXhiuT3ulqKBOU
+UUNQrO7egtfbGsgVv4bWbUHfeZkfvoWDlmbrvi1YLlR/ZxzGpCNc8e3aOcN3XKHl
+BwfUaco6pcTBvLpKPA/TAjkTOtK4A5Azv1CSwpzSJf2bVVbrn7mi/rw78SmZAV2/
+rtiOU5a9S+3fzswLk1PO/z//d4VoCcL2s2WueVO1Q99kejkE55l3lYwEiBzVuAA9
+8Q0a5wg84vRGFZQWLIw8c20On2+dZcTLZc61ZjnsI1LSnLUUyQ/fzHQ+BynQF9l4
+3ZCPKFIl125MGikAEQEAAQ==
+=9tpm
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
new file mode 100644
index 00000000000..71760e28d01
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
@@ -0,0 +1 @@
+19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
new file mode 100644
index 00000000000..b6ee3744e79
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
@@ -0,0 +1 @@
+b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
new file mode 100644
index 00000000000..76e9e5c4fd0
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
+h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
+XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
+RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
+XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
+MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG5AQ0EVgWIwAEIAJ29KWGH
+aEt7gXV8EweJkrYd02nwjc1LyjUT2TRwEzZ9N9qUiVqfpkgnZn4mpHCToxFoqkHa
+iv/QDfj7cp8jbZJa2wjaUkDbH2pZqLBGJ0sUUBZ1KNPM2uhhWRzAnmF/bIo3+Yfl
+hGINLNqoevkYoo9cdelP3hepef4+PUuPmKmeo856uknmaWQ89LPwLlV7oj6wiqMY
+p22sHqTGAgXeR/fSLMK7d0vSPm+57LZed5ECoRMeqYFUwSMV64RjTMkKPsvFBGvR
+hppJ+uWQiMjFFuFq2DFeNBVtueHSdgCHx1TP9i+x+7JmYsmFFmRwnEdbxO3THFXa
+gFQGr4ima+oOjLcAEQEAAQ==
+=b0N8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
new file mode 100644
index 00000000000..93ee42e81e2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN
+OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr
+9nFrAB4eDW0UMbSL9kPmclUm/yN+qcCZBrsVn0q6CWb/Kcd8EEXEu6sGILzOGqGe
+d433t5O+tGXWL2TjAz+Scsk2Hf4zcuDeQcxELAMnVaVgKuGuEZvibrjsdIvJDGI+
+0BzWIu8ZP8ldBl4SVtzGpEVzLvDUo3mOqBeTkj3rP7xLtFDN/3AFtowbLfL7L2Pg
+SMcTnKK+jfFHRfbHP1Ih3rQ4ilLzhCnY/QIZABEBAAG5AQ0ET7FnEgEIAM3i3e1s
+jwrx2PN8XYMPQWG+/YTtw1BYDl2+iYE+LaZvtq1hpbgeCLgEVwXrCJ4spLP1rFXo
+gWqKrkJ0LRjlpdKhKBvyH1ex4grh3cWN/bIDJcJ7JA4I/Bhqhlh8hYycS9pGFeS+
+MR3aFIsii+vadrwYYvuVYGeWvdZhB7mJKYevj5Ms0OpYTfZd95Pzo4o//lNpDnrG
+7Xd3tgTNU/fkpw6rFB/2Ib1Qlk+Kz1z6JNsp+tOPGGCBrzwfwglcikTuqS+xyRgC
+9cHh5eCol11uSoWPKcQR2Ar8Eo56nxv/UApdu15iJ7R8cA5guKeeS4jt0CGCPs2P
+huggDxI73Xvl4zsAEQEAAQ==
+=mB9L
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
new file mode 100644
index 00000000000..ad9eba9afc2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
@@ -0,0 +1 @@
+4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
new file mode 100644
index 00000000000..1c0b7372f15
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
@@ -0,0 +1 @@
+a778fde933a96dda827840d8e2b3d84202b812d9
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
new file mode 100644
index 00000000000..f700439be79
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
+P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
+ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
+fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
+C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
+itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
+wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
+wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
+J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
+Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
+bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
+kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
+L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
+OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
+SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
+mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
+YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
+=A08o
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
new file mode 100644
index 00000000000..f90c8fd6cb3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
@@ -0,0 +1 @@
+58e79b6abc762159dc0b1591164bd2247b936711
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
new file mode 100644
index 00000000000..12ace9e88f0
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
@@ -0,0 +1 @@
+475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
new file mode 100644
index 00000000000..71760e28d01
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
@@ -0,0 +1 @@
+19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
new file mode 100644
index 00000000000..b6ee3744e79
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
@@ -0,0 +1 @@
+b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
new file mode 100644
index 00000000000..13119799a98
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
@@ -0,0 +1 @@
+adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
new file mode 100644
index 00000000000..e41c7cce940
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
+3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
+tHmG/CVFECV33C5SCvzeedzIOSSHy0ybZFrhE2DYXgZddavcxamuRyUOUZAV27yV
+Vyn4RYHSqy9YRz5WrN9R7BK+MeIh2vBJ8Nd9N36z5kBukTLeDZDsb8wujSuMyPGz
+P09gzieX6B5x7biz7Jzotqj4f5KRD0fHbCSVW60N1S7xXFsjZZf6dYdYINWW0Utc
+ABY6T1H8FOfqkd2tcfv4TqNd03vweUiPQnh0v6nWURrQKsty2z7YcVI543l4P0Bv
+/5E3YfT/B/BohsYbakT6nLSlKwgpkHz44+A25seRumMENbcYwi7XFXge1K8pfasE
+Xbf4X+Lngbt8SN7HGHvtepMLlpVIvKhGSCl76Aar/fjc5vQ4Rjd22RTbS6V6MUY2
+ROrqcjzLr8N2zpQgKEL1lG6U1huMFzjapti9CajT9le6kbR6bLU+JVUWKrQSVB4f
+4S0egNNf7gv7lFHPp5fLFwa/jaoYfihydCyYPY2BHhp7muo+k7FL2t6YvOt5rUoB
+BIYQ7LhMbG4MpLNwTlAGI0QKvPjUylZ23v0vXIIHvF8KFTq55D7C0VGW9wARAQAB
+=y/nV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
new file mode 100644
index 00000000000..6155df6d439
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
@@ -0,0 +1 @@
+124dac8350968ec2a8260584ee8ecbbbc188fd5d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
new file mode 100644
index 00000000000..9f01bb4c224
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
@@ -0,0 +1 @@
+a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
new file mode 100644
index 00000000000..a2c07049cbc
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
+7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
+2RRGMnMaDUc91NnoxKs/7VlQ2ySk6Cm6lH3t8KVkwaJdU59lAH1ey9UKhYyvRQuT
+htenl2R63lyyDe1ZLMAlmQXi4RcCWOO+L1emChNv0q0Fsir+7go9ZNYUi6pmIEva
+jKXM8bo/VtRIHrS73DsH7BVVCURYoBWexZWlRdb86KSE993dRXLvFPy5JzlRM+eu
+mUY3CMKxx3nLaDN5qepf1nGzMW88xjq4z4rhABEBAAG5AQ0ET39ECwEIAOvByyJj
+7wUj5zLY1B3MxPoHHLFVsyxLI1WEgXDlItY+uykB20z3BwKs2CZdfbeBQDf8lNaD
+o7rv+BilZ4tu8vDRkmr82OXpU2dtpalKoKk+g46DhtgUyx7jojUSDKgZgxsuNZhK
+utgvSNdO6aiZ52wEZnXuOuOpA4mn9r5BdQbJwcdA6fd63tniauK5AH/NN3w7wPIs
+pObgxYhoN3+9CQLu2QgCnM4JQ9FlIyIjuScZ3M9rFojtjrlYHbE7mX/vU9Gjgyrm
+utGewi5+GSuGaXYm2zhKeuly3mhrsuRzyJ007K+FJ09pL6K/wJpjyjq8qfaARZz7
+3+fsERMJUDdofz8AEQEAAQ==
+=w4JL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
new file mode 100644
index 00000000000..91a7375d718
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
@@ -0,0 +1 @@
+8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
new file mode 100644
index 00000000000..26d0506b5c4
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
+Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
+CBCDJg3ZaqpZti5ti2TfiaXHeawTpxaTb3V5tT4NYhY0aJqe0MGoVl2yZyoKMWsL
+8XcUiJkUYnpu98BvnzO9ORSnKWHk60YxzZuHh5buMNiV4aI331ogiTxqISzTwEdQ
+ygtlp4IeqE6w4x4RUOqQg/mu0xhqnP375KksPtKALLEr9vgqsJXfWVa5UmNl+rZP
+gMiNEt+Abwewa6IQGgSU8GuxMp3qHxZtJQRNwIPx/yb7FngtWrUKIoQXs9xJwdJB
+z4vhfFVeQlyPkEycQNcRfHVzK62oF8L5Jj/D8BIGAD+dj3x10Cy+qVK6BTY/F1zv
+5iL12LjSlz8DtmTbqjit0WGoULjXFZALAU36q6FmE/nMcFuLaTUIinGV4fMvLgf9
+Zn44juAhZMweOt63Pn4n/K0W+uOdrLSmGxJDhoxztabUdIpIMsw44wZ8gnSmPAef
+IDTCjJO2x9s2YuaZbgstpJldooxGJ+FTe52QXFphti+tkiGOg6Tpj8Xq3+ZEM3L9
+Js38SSdys0XBCHYiCv3/4Fk4jspTsCFrDzJ9HqNjsiktxPm9szmUZ72RjwARAQAB
+uQINBFTi8JIBEACq+dSR6serUWrem1itiw0MslItsFyHuOV0+K8ZUOLRge/arBSf
+Gjk7YZPFzIMVbxXo7LYiciHCydZ9K7HdqCqygC4k2IV+85Ll07ZfraPHa2vfgXsh
+u03+VZcMcp6Jxs+UPlVHV7SE2R3o2w+KvKqzLLRLb6aBREoJCsI60HTWyPjsHiHr
+aJ+XFNl0LT22tIPJFjOTeVKU/8OMBs3O5ql3zgdMG3DFGAS2ALiCb1wh+YgJ9c8T
+A44R52Jp0z1XUYXvV298FzHD6n7ejwif2MNUkLF7oFfSknQLkAw1WuqkwYn3QYoc
+fp8aW5u3139vWWR5V2yLWeGI1+/spTJqP8eXBnF+jPWuig/GkHGrWCn+MT7Xv8TT
+2wR4rdhetkYPnPNX0ra+jURZbie6tO/C5OWTYjurTSzBDiPxNLcxxUNjrOMzIbcL
+LhSRQ0DTFLiC56D+5UvPIUY/GiX5O7x4iF1kwSPcoXz1w+xzzCwfFZg9oE5voHAy
+brGkTFCIb5Oo+WKWDCY56K7yHLIUT4UmiF2Liaz7gesTc5yFSFJhP0WpkVX6FxDu
+oCryQx0L38qD+4c445N7aUfVmqbOBBp4ORpJ/w0s8Rb946yQ8TTUB06otovyIz1i
+Zsuj0yU9kzZYovrZpKJLeDEY2ThxdU/O3ZkAowEeTjW+KyddTT9rUuggAwARAQAB
+=iPxD
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
new file mode 100644
index 00000000000..3fe473deef0
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
@@ -0,0 +1 @@
+7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
new file mode 100644
index 00000000000..234e9d4e78a
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
+Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
++oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
+QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
+Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
+kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG5AQ0EUuZY7QEIANFoey9+
+gIJ+VBKDYOZIK5t7s0J3fmgYasBt+uOycrZ/UmZfj3I502i4nYVtjwdWJZFp0LLh
+4G+Ba7uLNdTYEiSOEowjcxyBr2tvck98wDGCKkLkiesrg0IUM56ZGBqUvc+hale+
+bKoTV3+HwWfh8Iu+pRPHlNRUGpLTnAwatQf13sJukfRD8vXKdj4em9CtMjbTbsVB
+LdJXNPRzZV75zfH1DOGHTxvHYKDRsVKUmMZn4JE+gJ555dIYxygjYoB6V5oQVIy6
+hud39dhhqmPeCQDY1bUu4VJQBVJZh6WM5+1mquc6SOtJ9CWJ4zOk7hUbWstalOkn
+ipAzIIMXD411+PsAEQEAAQ==
+=dGMI
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
new file mode 100644
index 00000000000..3af575c8f57
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
@@ -0,0 +1 @@
+7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
new file mode 100644
index 00000000000..ab214126296
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
+MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
+ymy2N3BP9cz2fJ9+3PpBccUPL+ydFKpcnEnIwiQK+p9JjEWzJBlrdUc/UEJ0R+n/
+5r/+0+BHiTEMvjAF6/SwyntpTWpu7iEzLv/pfdCuhFKa4yn+9Ciwe3wGtSiue+dh
+tqKcd4YxED3oAswObBca3CC2HWWsUEH6EmfT1jUdfy1cq4X5x7AZ26oFYfG+odqW
+W5dcB+13VkJtJRzQTO/2HKtITJYC65a1jKt3ABEBAAG5AQ0EVQEbtAEIANsILuU9
+cH/EIEL+OpwIacr/y3/6LG+ok8SKDHIlF6cSpusSsWM6L+RGcZgvCDR0S0EEid44
+yy8wFMvoYSlsXHLN4SqH/rpLIc4CD8DdCLWraKaRZrhtqzNWSsYxEgqo7n1xO6+c
+sU17VJArnpkGPHoA7ooZlaGrc0y/rlkTXH++LKqh8niO9Dap46pLFrdgvuyKbq1B
+6faAf2JMRyvqy2+fuwfVGTc7DEUUFtwGg7FniDF0zl+3rFG1ud9kH8UWz+GwCwFT
+6qhVglgOmtJgw1CSYNeDsQvDB4YTJNnMneMSdM6CkEcRhLp2+lz90+wR0K/a9QBE
+1NPubAaRB2uQR4UAEQEAAQ==
+=uaBu
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
new file mode 100644
index 00000000000..d0de6ff44ac
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
@@ -0,0 +1 @@
+7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
new file mode 100644
index 00000000000..d1f2b8f9914
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
+YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
+en3ClYLXT5UVx0H1ZfDVKCvmaZVirZInfkqbi3OiPQoWrUfu02c3DiHQJ+Y34kdB
+egH2sIShNH8WLfEZ3YDQ4XaWHVuN1C7VwCBM8R3OeTTfyDrTsuyqJ0SeZXRR/6df
+2pEckjF9DNSXyjzFg24MrZhuhgbnj0oR1zmRh1EF+KlBfF4DF4acfxWqqcJVJx/3
+FTtOkLe3Xjj+inyJgxOW52gD4DsJpyf1tIbjAQDZvOdlRRCqZB4FnzzIb/1GmkGD
+JpDLC4MQmqgxkm0n8wgAmmHLpqDTdmuyJXvdX9RdGycpW64sljd1mpzTWJ8UKDhj
+uFQVHSSEdLoHoVj8ItnBV2kXd2uoQ/tWzbxFBST7wE/tX0e9G5XWaPKogvOKeDus
+u9XTIds2krYp80UTYWFZ88oNwGikdIrEYURSYDsYt15miROtKHWbSOHeLVbZqgVx
+dtWPqQVfH4gJGEH97/OSmozqDVog1aZDKBLGZQosng5h4j2RAQpjkaIdxKl8m7CQ
+x0Yi9tA8yD1QhRGggANQIb4n00G/vm7RMU/7NBvvjAQ/nAFjbsyO5oX1rBY1M6Xo
+NFqIBrHSBzV9MmhS3nXU+ZjAktCRhyJ7TsoHM0OYEAf8CduM5Zzp5w02iVYkFQBB
+wAoKHMpycW5LhMMMS4w7gmOfP7y04rtg6+zVe41y6bOqn/SxHCcCgnE/nhdexlzH
+ElYE1H7+HpphoI5vEwS6uElF67CoO5r74Zrb6nshGEj2AoOqjbrsdQm0noBBNYAu
+f9RsjU0sQQFzLW8+2xahqK3oZkLWOkSxzLtVwJbm7EGaGIYxEBjg87OnGQkAi9vv
+tVPwdO3VWyvgKLuPHudLDhTpeH3AMbzKgnru1Pnh/ZpiRhPzsbuFtFPEX8PMuCyE
+n4OLzUALl98kXuPjG5ww+24UsNgKMbKbu8qq/zRu7IHlpZvd730RoCWU2/i18tnY
+zLkCDQRMFWTlEAgA+MQFGIhyA4Ww9g7J8ZiEltwSzRblrjM1q9anexsBIGsWH37A
+92rlVK1RzMVfhj5yl+BzIBGO+zHbgycX7iB5/Fwsm+6R/2Uich6NDm1Qai9rc/jg
+3MS0phOAQzgxlGKOTS2GzdbDJCBQMijDObNe+Cs5DNB/E29/nzzCTQvtRzSeplZN
+r+8Q8lWz6efXmm5EeeZxN4x1YXjjzMJCHbc3yGxOjTgYQOs962yUYsg9UDRJm1OH
+9NKZe1m3dTRIMUcZvL12dq/kyiHHR9V/6CkdiNw1AFMi3tvEdvX4D1k1/Qr/2ORZ
+E4lRzgug4sKkpgaclLnkJZ9EMczmUFTGbbkx3wADBQf/Y+2nZCJSuHiDv/+SdhQh
+OBapZ2hYPDvg29mpPqin/LwH7eFTNv/oos1wzuzGtTHHGEP5mUQLOxjwdAXsWMMj
+scSbCs66ytTN7X4O8qh+1yN7vrM6ZBL12Ix7Ku40cgkWyvTVLBXKaEGm4ElhAmSL
+Fpu+/fJw0riR6rIuwHcGB4R1IJtMWcj+b1odgw9QmJ8AGpHh2WVdXspoCGnTUN4m
+DEswZjplkKXCgLypU13SrHVOqhjd4caK5GNZUfWtCKtwNcJMnvgp2truMvh9BBn6
+widfK48hEknQtXzGjui+bZz2/AD7/OT/T1CqDspB8IQlBCMBn8J4U1grSrZ1wTJf
+HA==
+=n1By
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
new file mode 100644
index 00000000000..798a7ce906f
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
@@ -0,0 +1 @@
+55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
new file mode 100644
index 00000000000..fd731d816b3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+EoPsViw1nG41nzUAEQEAAQ==
+=jYli
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
new file mode 100644
index 00000000000..780f44c7423
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=TUjT
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
new file mode 100644
index 00000000000..9f01bb4c224
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
@@ -0,0 +1 @@
+a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
new file mode 100644
index 00000000000..33cb475b44f
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
+DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
+tFn6YtkFhA15Aahr/vz31NBjUJlBmO4PwvkyxiF/MYP6TQ/AHar4xP1RxSYEPcCi
+dIQczQ8nXzya4OqOyTfibeGz/eiHHuwTLHi3Rd2kihQnlRQdhE1rmm8uTyzFe1H+
+P7WW7kQgygW6yxQ3J+DXrG8kG+nbe57ZY1oyv3F/fOBxzn/kuoKHZ3JJEMJmTIrT
+Lr1ngCZApgteAynRHk4t/SYZiyoyqZCuBcwHABEBAAG5AQ0EUqd5cgEIAL3PEOzt
+IFUibB6FYEkObVhsDbCnHw9yO5MAvAWB60Ohf1J4T9QK63jZ5/CiqcDrw+uab9I+
+Ruz/SgGyFS0UXAkwfTICUdhT5kUzZmGyoj2ul+iFDP9uUdEgSgyXXakrxBbBPzNa
+Mx8+GyIXRVFyRTH7+1gWgPQsdN1sGYOgZ+f8TMzAv6sxu0JVzjKXAAbXdiZTyJh9
+d6h1jS5Icilu8vRwn3Qc/ZzstBRk+eLbb69wS9YGoUlzYvDBz+5tiNwvHUriKc6z
+VT4Edngcr0mKWTdvD+AsvZffU0XK+vxbgMuRWi/51qb+VgK2gFeAseV6a+D1059u
+2+5Pn3h/Fv/vRAEAEQEAAQ==
+=EnO0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
new file mode 100644
index 00000000000..04fea655c64
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
@@ -0,0 +1 @@
+2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
new file mode 100644
index 00000000000..1f1b50f1926
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+NUZsDd9Rnh3Pq5EAEQEAAQ==
+=DBIb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
new file mode 100644
index 00000000000..91a7375d718
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
@@ -0,0 +1 @@
+8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
new file mode 100644
index 00000000000..3af575c8f57
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
@@ -0,0 +1 @@
+7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
new file mode 100644
index 00000000000..8acbce9e3f9
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
@@ -0,0 +1 @@
+afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
new file mode 100644
index 00000000000..caed7968c22
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Izx6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
new file mode 100644
index 00000000000..b3471a55708
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
+xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
+qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
+TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
+vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
++fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
+0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
+Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
+YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrkCDQRKMGw7EAgA
+5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4HaR+j
+NNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw3PcE
+gCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rmwcHG
+opSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjLx0St
+a1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLjNnF4
+SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8486U
+bZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ7hsr
+Qw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxjPY7R
+H41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUGpU9v
+xZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXNYJ/p
+znXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMQ==
+=3smt
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
new file mode 100644
index 00000000000..a7c567b4543
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
@@ -0,0 +1 @@
+08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
new file mode 100644
index 00000000000..317a090c834
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
+9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
+DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
+KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
+xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
+BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
+tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
+nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
+TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
+IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
+Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
+DG73NR9fZCzl1K8AEQEAAQ==
+=FVRo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
new file mode 100644
index 00000000000..85f7ae585ef
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
@@ -0,0 +1 @@
+2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
new file mode 100644
index 00000000000..513827017d1
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
+405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
+6uNnrKcO32/v/lux2AQ7kc0OS+ChaD5rUdihAMIfokBPLuY9OGaCNMcWaQI/s0zv
+X0xPebYYwSYHU0uhLQm1y8fzwvlSNb0J8nVR/ZqzzPvqfM49CVaU8PmtLXqx5naQ
+VOytBT0vGUvQ6CcJPOYdxlVF8VI7vB2B7F6CuxKGdyJIOyFU5NqWBcjRq3oMHXyG
+/vryt3D076ZB8dMfi2gol1m02io3czxnUR1PABEBAAG5AQ0EVQri3wEIAN+aB4lj
+nIaCzy85DeQ4pDkH5Q0YGc6rfLk3ARnOPAexi/lYbUy7XWIZkZy78gjcxMLRgcjF
+jfvsfJqoQ+6bM3VoVL+p9PhMZ8ayFi9V05rtXLvvzJYyuntFeMkOlZ+A3YdhJHrU
+JtC/Cflbslctcz2Al12RrCWpa4tzyfG2roj2+Ymc6Y3PN1Sjnou8FSPSfCGaTwXU
+4W9rGvmvHTPHb060XHScwxXoz6fQWIDftOyQctCZSfFJgckbVKryOZT+LbIbG6wJ
+G0WXWTHpjaWtVVoXLJL1eh4YKGlFEW2Odtgu/MZaGtKZ6fAeLQKRm8u3nMDrqMDt
+3gsfoQk3lGwKzjcAEQEAAQ==
+=eVUr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
new file mode 100644
index 00000000000..412dbb8a715
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
+sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
+6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
+hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
+OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
+EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAG5AQ0EUEib/AEIAMDUgjnP
+KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
+Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
+IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
+6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
+U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
+v5/DheBwvlwheg8AEQEAAQ==
+=JXd7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
new file mode 100644
index 00000000000..276ae3fd4f7
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
@@ -0,0 +1 @@
+1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
new file mode 100644
index 00000000000..daf42500d86
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
+gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
+P7Ss3EUTRGX3LnhKhKN656XQhM0PutdsHQlUKjvnl2JOaKerEhbHCRxga/U/WWOT
+KdobRO+x8v1scsrnUG83J7sTSaja0McmgUhKrhJqrgSk1Tod45SxprxOyp0cgATY
+xjHrf2rkafBn7K7aFDe8a73iCJPWS77gxTZCZ72xkcnMLR0m7QI8TzFa4lRjTovA
+QcTpr7jwjmyjA1+68peL6VHdVr0cdXm34mTVABEBAAG5AQ0ETv6G4wEIANLmAn1+
+tkX0pSiu6NJ0rkaZlMbvkxeFAstHdQ5zOoSWvJV+52DAd+h8HKZy6I89/BI1alYt
+7KWALGzj1I6s1+HavaYKWftk7UvAM6hEh8PzFQD5NNziptDOjTG3oztZ0SK6Et3F
+Qaczyzh9GyPC83vC8Dr48a+Bp5Ygpo/5LbuNloptVIapHftW6PUmRuxlXVXgFdc5
+vSDI2xPqz8dzLSjBa1mRUEiAFqdi6L0na6iyBEyEd4QlQ7TnDp6EKgCSvaS3OPRB
+EOaWOZsaOIcSw5w7tkO7YlDIjbltVQKTbVLUIR0h9njGaJXlGPYvDFvssIMR766Z
+z5bb/uPlG1HtFYUAEQEAAQ==
+=fOn1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
new file mode 100644
index 00000000000..4ed9f6c9144
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
@@ -0,0 +1 @@
+015479e1055341431b4545ab72475fd306b9cab7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
new file mode 100644
index 00000000000..ad9eba9afc2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
@@ -0,0 +1 @@
+4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
new file mode 100644
index 00000000000..62da51ed28d
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
@@ -0,0 +1 @@
+56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
new file mode 100644
index 00000000000..d54a694590e
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFblDs4BCACutkNqmk1mmAJjxSXUH4gOJAU4Ys5OUv2oDjyJ13AY8/4uPdar
+1R/isfgIzGU3hRFaNLUEY25ISL4sW20vOUsmx7HVJ3R4kFYhnNAcA363orye1hVf
+TmF9C0j5yQlUhPVYjkFzpR0Jn8SwLLbWsERLX3jRhCgCYjOKbmekQ08dTl+NC/SS
+MzRIsqt+1m2JYoLARF+MHjEGW6nyILm0AmgiSMjj8VvsaJNJkffO5C5Ijc4xG5Oy
+ilT+7ig2JzgHGuDb2AtYdDPRJcPwkOS8B4V7DdV9csnW5VGhXQP5ow8SE9+CyqTR
+oZ0csvglx6hx0Qc8eY31q8/TKOcebPhuUa4xABEBAAG5AQ0EVuUOzgEIANjPZn6F
+SDH0rzSxpbWEJ+G7727fo1ANYCh6WXj79KGc5b7XK6w3ENO7Ji5/6ysjp9DLvXpA
+go4uvElROaCUd5Vv4RUAARv4ZFBd/bDjuBeW2GwM6F/vc9W5agB9aeSowhLUsoMH
+aHkIJgE+T0Ihe7hTtfWH7HgXERVz0PwzIuAwboTiWy5x5nx8UQeGbl8Xaql2TYl3
+46n//GoZUc8YZgJbPTo44hRC+VyRLiubu9nm9IAeDdg9piKwvRU1y6eOYzBKuip1
+YqrtEF8PxUKPNf0QA4pN2Q5OHI8hdawe/nLpchaOGOSSpJuHh1gPQcIhDPCLUBSA
+DZBj5rpRXaIEuZ0AEQEAAQ==
+=QusP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
new file mode 100644
index 00000000000..1c0b7372f15
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
@@ -0,0 +1 @@
+a778fde933a96dda827840d8e2b3d84202b812d9
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
new file mode 100644
index 00000000000..e37b3e7e154
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
@@ -0,0 +1 @@
+a2570288e10932263e8326cbaa49c633b4734832
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
new file mode 100644
index 00000000000..13119799a98
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
@@ -0,0 +1 @@
+adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
new file mode 100644
index 00000000000..9e0b3a1c163
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb
+2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME
+58xSA5quKBUfl1iO2qx23qv6Haw5G50twq4A9WJdEelJJDKzzweVw0BJdv8z01In
+/+sfiitcTzRT0NPbsuOnKCvfIa3gn87BvHCtqai2njq0b8ZQroLaMONtvzrn/gln
+R4oPBdeIpdjf1CrAdWs8zdiHAZWuL2mZBieEgr3+je074ARM3yCpo3DRw2bMwJe3
+JiqIKb0ebCs8ddmOaT00UngmQqCOx1qGjQeXwTD3x5Tzcihdyi5auP/zsBUZHf6d
+kmugzOWrgQ+rdfUCRI29gLWcwMp5dvMJxanREY+p854Hib5n4HZflmkaZCnEls28
+Xh1h3T6e5pWKvfZhsu7qefFjgY3G8O1vKmHjOQNoc/sEUwimAXJxK8E+S3iH/cSV
+9mdtr0TnlzI2r7+kXdyUy2rGgieonSRVRtd0Gdmu4MkiUkbrX3MBvqP14OvT4xkC
+6lcbQK1lrXflWSSRmtfNKpysVOfaIgT5p9F5zJJFEFGm5J25z8beCD8Pics+OHF4
+xfYB2SlM4xmbow2kr2htAE2RyT5EuUNuokkdtrZONmBGHBqzBPvj1vzncwARAQAB
+uQINBF9amNkBEAC46u0OHX2x5/hOswLlZqgGdscFpjGEtAcfAhTj1zo8v2vTNYX4
+E9aF5hQSQneH59a9SWOFDzHCvVWRgfxtupVm3AFPPyWHcb0xsQyfssG0VE6T4B3P
+BNP52pAt36tr9gh69oxfzkC/CJ/DmlKi8Dy6wqt9CzWG4vciI3v7YRj6JOdM52PS
+r+3r8Ih8EYYDaEPAYVJPqNYqt+cjO5goVqCSQfHy1DuM0ggvZ2vZQAZwAgLmKrED
+A6xQUicHVOfN22MIEsGy/qyC7TRJgyhJzU2KYavS3ySp+hPSuffNh3evpArWpFN5
+2e6vq3l+5f8iuBFuNRasnkIAf78qsu0nR25pO8EYzzdcL5Awkjq28661P2veuD9o
+eR39B8G4CsMvYQ8h9oKLh+Z8il0WACycujJGaFxJr/hm3WugCSltzhCN60ocCOaN
+BMq+5rLEx1PQ2DBaf09xmW0SW+pMl5dUDqE62/cGdXF1DaBCr8HjujZ5GXm2ZCru
+LikPaYU2zEk9pfZheRGOW4uvp+SfeuLFo9jt65TbYQvT/hX8FydwpG0dwQtuM2+9
+FUDSpu7k00NDtLMUwF+xlt6vo49Vt0E9nDMYH9OEQOozFJTtxENapOFvHEDI1ZCY
+xCcKOATKqraWzD++MpKIIfVYrRZ+CTjrh0m3Q2NA5aZDLTEmzB5SY0xliQARAQAB
+=tiDp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
new file mode 100644
index 00000000000..4ed9f6c9144
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
@@ -0,0 +1 @@
+015479e1055341431b4545ab72475fd306b9cab7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
new file mode 100644
index 00000000000..f24401d1630
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFeOGY0BEADIr99yL4ahwgM3KB7zMVzDk/PEkzUWpm1BSxqUxuQtzWArFj13
+Y3Zi6g1tw5jKESfxtmpXx7j7xR3qVdJbsYJMU0zQi+FehwnKox3Go3UnIKt7kydz
+CGowsRjmEuLErftU6QCDof4Xpum/IPFgu3mcQK3dp+EL2sJDDBahz52DF5bxcSZw
+4OawjX13pnjaPHGw7iWt/fhMEDRmlr6c158lTpEMGpIHH4cum/QTFW1xRf2osjbk
+RysnD/e2QMTwnm05WdImBQq0PQGU3Scz6HQr06UAWyaaukp+k9nZD//hZ7t68w5Y
+wHxHcpFI7JTxesRTv8PNgG5+EC61O2fxMgAefDv9UwhUpYDfxtc0yJYz0QTfNQQB
+RTd8Os6J3OjExDnUFUtPN0Xvgl/SzfCIbxmr/mKqWLzazJMiuNs6mfASrYVuYERl
+c8Gm5TXRU2Pg55KeL6iDAyXDuObKvmqYKb8qXM/qba+RI+KOhBLPSMfWVw5nziVL
+XY6sjXHLIyM1AfDfeM0DHReDR4aIkdnQ4yzyzshmhTodguDbZe2H1FlPNqzriS6c
+4s7CoyO8tTTSHmrxkVLJhMaTc1XazhcQrsp/1s6SJ5MUy0rFUt9QyIt8zfGqzQVH
+pqXmFZd+ISd8Eivsyh5gEU4JER+3J7kSuMQx/wMMZqzu1RczUz4gI0nzTwARAQAB
+uQINBFeOGY0BEADaPmufkJ3ZMMpXhbkBISnPYW/2QGIU0mtwGOO13PnkxFGn4bFI
+es0459axyzMAT2DiOF+cOh0R38DJN9r3ZZFgjAuiy0WTaHyFuON9Ebm3uDLN/VrC
+laXhHI2BxzcYC+uCAor/zJRytD36Cxq8c20NqqQqqq/p7mMDp5S0EjoDpuvXQ55w
+vNmH8dwqu1WBgSYbv+R52fzmQfy7OktbU/mvzkSaxnfqTiLDr2ZkAZcZjgURFvGr
+OB262jvFQ6iTj0ATCrj+xauvpazAAP3z0EgUyegFOHQX/VjA8zqJgMF7d8WcKfzG
+xohxIck7ozOXmcroLzUPLb/i8riDOftXqUcKIkuWD0vtpMVytXYG5RUAo24ypGjm
+Bmvyjy5EkPlc/Yys7Bja/tUKG6F7pcZep0OHTT5bWHUyfvC621cc0RODMC0jCOHb
+MJCetcMBtoPioGBhpjZGrGp6qXfTBg/HmvNgPfWgLDdnBL8iE7aq+Ob/PcnodIGm
+tzAskUhpzNqhtDNbkHV7GDxdlzb3ktZMBGwYgeCal6YzwF76gqlLDy9LQlc/KVme
+A//xB8TAOMEP/qrlGgNJV7kohcvY+4drpTf1MyL3zpZZvD275+sdkL/tjzV8ow95
+ggVesGRDrxvcGvbsS/saKQxf7iwaZyShaNNTCqm+131UWizvVN+enO30ZQARAQAB
+=EYyV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
new file mode 100644
index 00000000000..798a7ce906f
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
@@ -0,0 +1 @@
+55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
new file mode 100644
index 00000000000..e44277c3a12
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
+4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
+fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
++zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
+5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
+0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
+GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
+AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
+9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrkCDQRNNXsZEAgA
+u0P3pwV/lKVCGXHXgwJgrQSLFSdrKBiaeKEZuCYEAEWXE9hLxn3T6MWrioHwB83v
+RXWU2NC8tpOg/GxLI7f7V3zKtlePspmjCK5QcaonAkK8n1BUaXwniCuxayimR7Im
+Pc34p1+f77pBpZ2nV0Us6yAiRBzo2IAKNn3R0N0TQy6QGvMCn7TYFX5vyvm9eE4m
+4GUh/C79+TyzgXmnV38Wjd6rJ6swM4KGfnEEzL202Wg6Egng0y4DbnfGJJP0H5AQ
+ZQnVecLHAzQMnPtPIoi7xbNB9Oy1d2nzVCUqxuX6Y+1HylOqsjKGKd5nSydjPPQf
+iF9OQIeryS4uJ0sjqUwZXwADBwf/fIh9jvuZ5eVhn5QNtOh4n/3zFqssSxWrYHgl
+wd+hPEk3rRwj5yjbWG/GsUJL8rhU7psgMY4UvrUmoRVzNBBDRqy3R317w6wmlZy6
+5oIXEp4FtVFV1iuTES4vfIrWqr/L4E9FN2bPqd4MNeMnHcnNYX3/VH1ijYuemSOB
+b/DO4ZiL7qymrufQjOR2SKknjpXi/bxSVqr/7ceAfI9ugMFPzcAzl7u5EWgQMruR
+ODqMw6YO983AbyAlB86uR92DelR/SmBO1NgSxQscSE+FoDyDdEg9+5bumsJQ+x/s
+Fu6GMwiISFC2PdMxfrit63jH124iqi/GxjYBP1EAmNMcb/Av+Q==
+=eVH6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
new file mode 100644
index 00000000000..61b0b4f6326
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
@@ -0,0 +1 @@
+34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
new file mode 100644
index 00000000000..04fea655c64
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
@@ -0,0 +1 @@
+2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
new file mode 100644
index 00000000000..61b0b4f6326
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
@@ -0,0 +1 @@
+34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 7b5d5e7b56e..ff636718931 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -55,10 +55,10 @@ buildscript {
 
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
-    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
-            to "bcpg-jdk15on-1.62.jar",
-    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
-            to "bcprov-jdk15on-1.62.jar",
+    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+            to "bcpg-jdk15on-1.70.jar",
+    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+            to "bcprov-jdk15on-1.70.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
             to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
diff --git a/checksum.xml b/checksum.xml
index ff876d11e6a..bc1a44779ee 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -1,222 +1,165 @@
 <?xml version='1.0' encoding='utf-8'?>
-<dependency-verification version='1'>
+<dependency-verification version='2'>
   <trust-requirement pgp='GROUP' checksum='NONE' />
   <ignored-keys>
     <ignored-key id='1d0690e353be126d' />
   </ignored-keys>
   <trusted-keys>
-    <trusted-key id='1c8d5ef0df2b70d4' group='cglib' />
-    <trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
-    <trusted-key id='3d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
-    <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
-    <trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
-    <trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
-    <trusted-key id='379ce192d401ab61' group='com.formdev' />
-    <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
-    <trusted-key id='07d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
-    <trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
-    <trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
-    <trusted-key id='249dee8e2c07a0a2' group='com.github.javaparser' />
-    <trusted-key id='379ce192d401ab61' group='com.github.javaparser' />
-    <trusted-key id='431b8f80403a7dc1' group='com.github.javaparser' />
-    <trusted-key id='8ea48d105232855d' group='com.github.jknack' />
-    <trusted-key id='218fa0f6a941a037' group='com.github.kevinstern' />
-    <trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
-    <trusted-key id='1756b920eecf0e90' group='com.github.spotbugs' />
-    <trusted-key id='a5def5a76f94a471' group='com.github.spotbugs' />
-    <trusted-key id='78fcd238c26ea995' group='com.github.tomakehurst' />
-    <trusted-key id='b9729775c0352d3a' group='com.github.tomakehurst' />
-    <trusted-key id='105cb91cac2aee0e' group='com.github.vlsi.gradle' />
-    <trusted-key id='254e9c64c264c176' group='com.github.weisj' />
-    <trusted-key id='5e1f79a7c298661e' group='com.google.auto' />
-    <trusted-key id='b0f3710fa64900e7' group='com.google.auto' />
-    <trusted-key id='c51e6cbc7ff46f0b' group='com.google.auto.service' />
-    <trusted-key id='b0f3710fa64900e7' group='com.google.auto.value' />
-    <trusted-key id='353a436e043e3145' group='com.google.code.findbugs' />
-    <trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
-    <trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
-    <trusted-key id='b0f3710fa64900e7' group='com.google.code.gson' />
-    <trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
-    <trusted-key id='912d2c0eccda55c0' group='com.google.errorprone' />
-    <trusted-key id='9a259c7ee636c5ed' group='com.google.errorprone' />
-    <trusted-key id='bf935c771a8474f8' group='com.google.errorprone' />
-    <trusted-key id='9a259c7ee636c5ed' group='com.google.googlejavaformat' />
-    <trusted-key id='abe9f3126bb741c1' group='com.google.guava' />
-    <trusted-key id='f6d4a1d411e9d1ae' group='com.google.guava' />
-    <trusted-key id='29579f18fa8fd93b' group='com.google.j2objc' />
-    <trusted-key id='a7764f502a938c99' group='com.google.protobuf' />
-    <trusted-key id='7eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
-    <trusted-key id='476634a4694e716a' group='com.googlecode.java-diff-utils' />
-    <trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
-    <trusted-key id='e57428da9e879e7d' group='com.helger' />
-    <trusted-key id='e57428da9e879e7d' group='com.helger.commons' />
-    <trusted-key id='3684155e9365c30e' group='com.jayway.jsonpath' />
-    <trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='0a36eef644cff773' group='com.metsci.ext.com.kitfox.svg' />
-    <trusted-key id='db45d3a62a183ce2' group='com.miglayout' />
-    <trusted-key id='995efbf4a3d20beb' group='com.pinterest' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest' />
-    <trusted-key id='995efbf4a3d20beb' group='com.pinterest.ktlint' />
-    <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
-    <trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
-    <trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
-    <trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
-    <trusted-key id='602ec18d20c4661c' group='com.thoughtworks.xstream' />
-    <trusted-key id='1861c322c56014b2' group='commons-beanutils' />
-    <trusted-key id='3faad2cd5ecbb314' group='commons-beanutils' />
-    <trusted-key id='411063a3a0ffd119' group='commons-beanutils' />
-    <trusted-key id='9daadc1c9fcc82d0' group='commons-cli' />
-    <trusted-key id='21939ff0ca2a6567' group='commons-codec' />
-    <trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
-    <trusted-key id='1861c322c56014b2' group='commons-collections' />
-    <trusted-key id='a41f13c999945293' group='commons-collections' />
-    <trusted-key id='1861c322c56014b2' group='commons-collections4' />
-    <trusted-key id='a41f13c999945293' group='commons-collections4' />
-    <trusted-key id='3faad2cd5ecbb314' group='commons-fileupload' />
-    <trusted-key id='86fdc7e2a11262cb' group='commons-io' />
-    <trusted-key id='9daadc1c9fcc82d0' group='commons-io' />
-    <trusted-key id='1241bc872c5e4ec0' group='commons-lang' />
-    <trusted-key id='1861c322c56014b2' group='commons-lang' />
-    <trusted-key id='33cd6733af5ec452' group='commons-logging' />
-    <trusted-key id='a41f13c999945293' group='commons-logging' />
-    <trusted-key id='7a8860944fad5f62' group='commons-net' />
-    <trusted-key id='86fdc7e2a11262cb' group='commons-net' />
-    <trusted-key id='6449005f96bc97a3' group='de.undercouch' />
-    <trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
-    <trusted-key id='a5c8dbb8a1599bd4' group='dnsjava' />
-    <trusted-key id='379ce192d401ab61' group='info.picocli' />
-    <trusted-key id='6601e5c08dccbb96' group='info.picocli' />
-    <trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
-    <trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
-    <trusted-key id='a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
-    <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
-    <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
-    <trusted-key id='6425559c47cc79c4' group='javax.activation' />
-    <trusted-key id='6425559c47cc79c4' group='javax.mail' />
-    <trusted-key id='6425559c47cc79c4' group='javax.servlet' />
-    <trusted-key id='4044edf1bb73efea' group='jaxen' />
-    <trusted-key id='528dc75aa68f0923' group='jcharts' />
-    <trusted-key id='85911f425ec61b51' group='junit' />
-    <trusted-key id='efe8086f9e93774e' group='junit' />
-    <trusted-key id='7999befba1039e8b' group='net.bytebuddy' />
-    <trusted-key id='15c71c0a4e0b8edd' group='net.java.dev.jna' />
-    <trusted-key id='75bf031b7c94e183' group='net.java.dev.jna' />
-    <trusted-key id='c51e10bd96d06071' group='net.javacrumbs.json-unit' />
-    <trusted-key id='1d0690e353be126d' group='net.minidev' />
-    <trusted-key id='f6bc09712c8df6ec' group='net.minidev' />
-    <trusted-key id='0da8a5ec02d11ead' group='net.sf.jopt-simple' />
-    <trusted-key id='d4012dda1f1f0f82' group='net.sf.jtidy' />
-    <trusted-key id='1d185615d0a84648' group='net.sf.saxon' />
-    <trusted-key id='a929ea2321fdbf8f' group='net.sf.saxon' />
-    <trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
-    <trusted-key id='4a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
-    <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
-    <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
-    <trusted-key id='347cd0eaed975c5f' group='org.antlr' />
-    <trusted-key id='6b1b008864323b92' group='org.antlr' />
-    <trusted-key id='411063a3a0ffd119' group='org.apache-extras.beanshell' />
-    <trusted-key id='87a7f75a6a8ba5fc' group='org.apache.activemq' />
-    <trusted-key id='bff2ee42c8282e76' group='org.apache.activemq' />
-    <trusted-key id='a2115ae15f6b8b72' group='org.apache.ant' />
-    <trusted-key id='ddbcc1270a29d081' group='org.apache.ant' />
-    <trusted-key id='86fdc7e2a11262cb' group='org.apache.bcel' />
-    <trusted-key id='3faad2cd5ecbb314' group='org.apache.commons' />
-    <trusted-key id='4e066e0459cd109b' group='org.apache.commons' />
-    <trusted-key id='64a16faaec16a4be' group='org.apache.commons' />
-    <trusted-key id='7a8860944fad5f62' group='org.apache.commons' />
-    <trusted-key id='86fdc7e2a11262cb' group='org.apache.commons' />
-    <trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
-    <trusted-key id='a2115ae15f6b8b72' group='org.apache.commons' />
-    <trusted-key id='f513c419e4b9d0ac' group='org.apache.commons' />
-    <trusted-key id='31474e5e7c6b7034' group='org.apache.ftpserver' />
-    <trusted-key id='cbaebe39a46c4ca1' group='org.apache.geronimo.specs' />
-    <trusted-key id='ecdfea3cb4493b94' group='org.apache.geronimo.specs' />
-    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
-    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
-    <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
-    <trusted-key id='3595395eb3d8e1ba' group='org.apache.logging.log4j' />
-    <trusted-key id='b4c70893b62babe8' group='org.apache.logging.log4j' />
-    <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
-    <trusted-key id='31474e5e7c6b7034' group='org.apache.mina' />
-    <trusted-key id='9c8c892f91f8e6d1' group='org.apache.rat' />
-    <trusted-key id='4a51a45b944ffd51' group='org.apache.tika' />
-    <trusted-key id='d0eb627d4885ced1' group='org.apache.velocity' />
-    <trusted-key id='73129f58de61ecbd' group='org.apache.xbean' />
-    <trusted-key id='a2e92e06ddb37997' group='org.apache.xbean' />
-    <trusted-key id='e91287822fdb81b1' group='org.apache.xbean' />
-    <trusted-key id='5b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
-    <trusted-key id='85911f425ec61b51' group='org.apiguardian' />
-    <trusted-key id='0cc0b712fee75827' group='org.assertj' />
-    <trusted-key id='e2b3d84202b812d9' group='org.assertj' />
-    <trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
-    <trusted-key id='be84d764623a3644' group='org.brotli' />
-    <trusted-key id='b16698a4adf4d638' group='org.checkerframework' />
-    <trusted-key id='41321490758aad6f' group='org.codehaus.groovy' />
-    <trusted-key id='6a65176a0fb1cd0b' group='org.codehaus.groovy' />
-    <trusted-key id='6525fd70cc303655' group='org.codehaus.mojo' />
-    <trusted-key id='873a8e86b4372146' group='org.codehaus.mojo' />
-    <trusted-key id='466caed6e0747d50' group='org.codehaus.plexus' />
-    <trusted-key id='3f00db67ae236e2e' group='org.conscrypt' />
-    <trusted-key id='79e193516be7998f' group='org.dom4j' />
-    <trusted-key id='0e91c2de43b72bb1' group='org.ec4j.core' />
-    <trusted-key id='c7bf26d0bb617866' group='org.eclipse.aether' />
-    <trusted-key id='2d0e1fb8fe4b68b4' group='org.eclipse.jetty' />
-    <trusted-key id='2d0e1fb8fe4b68b4' group='org.eclipse.jetty.http2' />
-    <trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
-    <trusted-key id='694db6f419c8d1fd' group='org.exparity' />
-    <trusted-key id='8759d8f56d022006' group='org.exparity' />
-    <trusted-key id='1939a2520bab1d90' group='org.freemarker' />
-    <trusted-key id='9ff25980f5ba7e4f' group='org.fusesource.hawtbuf' />
-    <trusted-key id='0050076df689fde2' group='org.hamcrest' />
-    <trusted-key id='a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='bede11eaf1164480' group='org.hamcrest' />
-    <trusted-key id='313cba932516c4d3' group='org.hsqldb' />
-    <trusted-key id='ab049df4ab24c1ef' group='org.hsqldb' />
-    <trusted-key id='cb43338e060cf9fa' group='org.jacoco' />
-    <trusted-key id='164779204e106a76' group='org.javassist' />
-    <trusted-key id='8799af90c06efbbd' group='org.jdom' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains' />
-    <trusted-key id='bcf4173966770193' group='org.jetbrains' />
-    <trusted-key id='c2148900bcd3c2af' group='org.jetbrains' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
-    <trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
-    <trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
-    <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
-    <trusted-key id='3967d4eda591b991' group='org.jetbrains.kotlinx' />
-    <trusted-key id='3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
-    <trusted-key id='16fbb6b6e3120829' group='org.jetbrains.lets-plot' />
-    <trusted-key id='be6397e958ab7594' group='org.jetbrains.lets-plot' />
-    <trusted-key id='91ae1504568ec4dd' group='org.jodd' />
-    <trusted-key id='145d819475314d97' group='org.json' />
-    <trusted-key id='f42e87f9665015c9' group='org.jsoup' />
-    <trusted-key id='85911f425ec61b51' group='org.junit.jupiter' />
-    <trusted-key id='85911f425ec61b51' group='org.junit.platform' />
-    <trusted-key id='85911f425ec61b51' group='org.junit.vintage' />
-    <trusted-key id='82216a03caa86c78' group='org.mongodb' />
-    <trusted-key id='2f45f85cdf082e68' group='org.mozilla' />
-    <trusted-key id='3f36885c24df4b75' group='org.mozilla' />
-    <trusted-key id='7ad289796be2ffe2' group='org.neo4j.driver' />
-    <trusted-key id='f8052e4e1bd0db31' group='org.neo4j.driver' />
-    <trusted-key id='7c7d8456294423ba' group='org.objenesis' />
-    <trusted-key id='85911f425ec61b51' group='org.opentest4j' />
-    <trusted-key id='5f69ad087600b22c' group='org.ow2.asm' />
-    <trusted-key id='2be5d98f751f4136' group='org.pcollections' />
-    <trusted-key id='1364c5e2df3e99c5' group='org.reactivestreams' />
-    <trusted-key id='f13d3e721d56bd54' group='org.reflections' />
-    <trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
-    <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.api' />
-    <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.gradle' />
-    <trusted-key id='72fefd1572eb75e1' group='org.spockframework' />
-    <trusted-key id='af0a94402ea0a67f' group='org.spockframework' />
-    <trusted-key id='9a2c7a98e457c53d' group='org.springframework' />
-    <trusted-key id='e4b53844e02b191b' group='org.swinglabs' />
-    <trusted-key id='72385ff0af338d52' group='org.threeten' />
-    <trusted-key id='a929ea2321fdbf8f' group='org.xmlresolver' />
-    <trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
-    <trusted-key id='9ff25980f5ba7e4f' group='xalan' />
-    <trusted-key id='7d713008cc07e9ad' group='xerces' />
-    <trusted-key id='858fc4c4f43856a3' group='xerces' />
-    <trusted-key id='86fdc7e2a11262cb' group='xml-apis' />
+    <trusted-key id='07dbc3c1ab1f4468471656061c8d5ef0df2b70d4' group='cglib' />
+    <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
+    <trusted-key id='58f086abb0ede8f7a04b76c34c00043bec5cb7cb' group='com.fifesoft' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='com.formdev' />
+    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
+    <trusted-key id='635ee627345f3c1dd422b2e207d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
+    <trusted-key id='55e770230e69cc6de143fb5b62c82e50836eb3ee' group='com.github.gundy' />
+    <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
+    <trusted-key id='4bde772c338ba540e1057d0c8ea48d105232855d' group='com.github.jknack' />
+    <trusted-key id='a4fd709cc4b0515f2e6af04e218fa0f6a941a037' group='com.github.kevinstern' />
+    <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
+    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs' />
+    <trusted-key id='e05f005af50ae94e69701222b9729775c0352d3a' group='com.github.tomakehurst' />
+    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
+    <trusted-key id='b0255b26003ef6f82491acd7254e9c64c264c176' group='com.github.weisj' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto' />
+    <trusted-key id='3288b8be8512d6c0ca185268c51e6cbc7ff46f0b' group='com.google.auto.service' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto.value' />
+    <trusted-key id='3dbc5d7dc2fb8dd68aa429bd353a436e043e3145' group='com.google.code.findbugs' />
+    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
+    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
+    <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.errorprone' />
+    <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.googlejavaformat' />
+    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
+    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
+    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
+    <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
+    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
+    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
+    <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger' />
+    <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger.commons' />
+    <trusted-key id='41d266db4427983a1a4afb0c3684155e9365c30e' group='com.jayway.jsonpath' />
+    <trusted-key id='817ea1255546d6070a23aa00db45d3a62a183ce2' group='com.miglayout' />
+    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
+    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
+    <trusted-key id='06d34ed6ff73de368a772a781063fe98bcecb758' group='com.puppycrawl.tools' />
+    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='com.sun.activation' />
+    <trusted-key id='31fae244a81d64507b47182e1b2718089ce964b8' group='com.thoughtworks.qdox' />
+    <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='com.thoughtworks.xstream' />
+    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-beanutils' />
+    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-beanutils' />
+    <trusted-key id='cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0' group='commons-cli' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-codec' />
+    <trusted-key id='bc87a3fd0a54480f0badbebd21939ff0ca2a6567' group='commons-codec' />
+    <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-collections' />
+    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-collections' />
+    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-fileupload' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-io' />
+    <trusted-key id='636de9055c4c75c7bd9830771241bc872c5e4ec0' group='commons-lang' />
+    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-lang' />
+    <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-logging' />
+    <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-net' />
+    <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
+    <trusted-key id='3e1ac64f4e34e290503c90323449ec3ac2efe8aa' group='dnsjava' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
+    <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' />
+    <trusted-key id='c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e' group='io.burt' />
+    <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
+    <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
+    <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
+    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.activation' />
+    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.mail' />
+    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.servlet' />
+    <trusted-key id='4daded739cdf2cd0e48e0ec44044edf1bb73efea' group='jaxen' />
+    <trusted-key id='b5569a15406ae682380f3ef8528dc75aa68f0923' group='jcharts' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
+    <trusted-key id='a7892505cf1a58076453e52d7999befba1039e8b' group='net.bytebuddy' />
+    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
+    <trusted-key id='d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071' group='net.javacrumbs.json-unit' />
+    <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
+    <trusted-key id='4f752a9878e937049ef3fba7d4012dda1f1f0f82' group='net.sf.jtidy' />
+    <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='net.sf.saxon' />
+    <trusted-key id='d9aa7402ba75f78720d975211d185615d0a84648' group='net.sf.saxon' />
+    <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
+    <trusted-key id='2c1708ea05adf6966c32d6454a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
+    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
+    <trusted-key id='b01128c8fd304fe48e6eed2c347cd0eaed975c5f' group='org.antlr' />
+    <trusted-key id='dddee87612e9fb95f5c8d91e411063a3a0ffd119' group='org.apache-extras.beanshell' />
+    <trusted-key id='1aa8cf92d409a73393d0b736bff2ee42c8282e76' group='org.apache.activemq' />
+    <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.bcel' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.commons' />
+    <trusted-key id='3692c12c7e3d336a452beb254e066e0459cd109b' group='org.apache.commons' />
+    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
+    <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.apache.commons' />
+    <trusted-key id='d6f1bc78607808ec8e9f69437a8860944fad5f62' group='org.apache.commons' />
+    <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.ftpserver' />
+    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='org.apache.geronimo.specs' />
+    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
+    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
+    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
+    <trusted-key id='53c935821aa6a755bd337db53595395eb3d8e1ba' group='org.apache.logging.log4j' />
+    <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.mina' />
+    <trusted-key id='6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1' group='org.apache.rat' />
+    <trusted-key id='184454fad8697760f3e00d2e4a51a45b944ffd51' group='org.apache.tika' />
+    <trusted-key id='7b9751fc3f01f134f476464cd0eb627d4885ced1' group='org.apache.velocity' />
+    <trusted-key id='82d8419ba697f0e7fb85916ee91287822fdb81b1' group='org.apache.xbean' />
+    <trusted-key id='5c9a30ff22b2c02f30261c305b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.apiguardian' />
+    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
+    <trusted-key id='3a4d86c56ca99373b6d8953dbe84d764623a3644' group='org.brotli' />
+    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
+    <trusted-key id='34441e504a937f43eb0daef96a65176a0fb1cd0b' group='org.codehaus.groovy' />
+    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
+    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.codehaus.mojo' />
+    <trusted-key id='8f9a3c6d105b9f57844a721d79e193516be7998f' group='org.dom4j' />
+    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
+    <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty' />
+    <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty.http2' />
+    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
+    <trusted-key id='1def9646901a1652e5b3e5ea694db6f419c8d1fd' group='org.exparity' />
+    <trusted-key id='13ac2213964abe1d1c147c0e1939a2520bab1d90' group='org.freemarker' />
+    <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='org.fusesource.hawtbuf' />
+    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
+    <trusted-key id='e3a9f95079e84ce201f7cf60bede11eaf1164480' group='org.hamcrest' />
+    <trusted-key id='d76260c72df74e66268f7770ab049df4ab24c1ef' group='org.hsqldb' />
+    <trusted-key id='a413f67d71beec23add0ce0acb43338e060cf9fa' group='org.jacoco' />
+    <trusted-key id='e5c3b1929191df06136ccb2b164779204e106a76' group='org.javassist' />
+    <trusted-key id='9a4555c237785ca8a6dc1fe58799af90c06efbbd' group='org.jdom' />
+    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
+    <trusted-key id='33fd4bfd33554634053d73c0c2148900bcd3c2af' group='org.jetbrains' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
+    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.kotlinx' />
+    <trusted-key id='8e3a02905a1ae67e7b0f9acd3967d4eda591b991' group='org.jetbrains.kotlinx' />
+    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
+    <trusted-key id='8a9352189aeccfb4ae1f3bc616fbb6b6e3120829' group='org.jetbrains.lets-plot' />
+    <trusted-key id='feabfb0dbd7a754822d35dd9be6397e958ab7594' group='org.jetbrains.lets-plot' />
+    <trusted-key id='1fcffe916b6670868fa0ea0391ae1504568ec4dd' group='org.jodd' />
+    <trusted-key id='cdcaa216b086a7b603b638c5145d819475314d97' group='org.json' />
+    <trusted-key id='f3184bcd55f4d016e30d4c9bf42e87f9665015c9' group='org.jsoup' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.jupiter' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.platform' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.vintage' />
+    <trusted-key id='08ba61cf501c09f70911b83b82216a03caa86c78' group='org.mongodb' />
+    <trusted-key id='e9af5293c334c7c0b583227d2f45f85cdf082e68' group='org.mozilla' />
+    <trusted-key id='07a4fa67a8222f1b39f9edaef8052e4e1bd0db31' group='org.neo4j.driver' />
+    <trusted-key id='e85aed155021af8a6c6b7a4a7c7d8456294423ba' group='org.objenesis' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
+    <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' />
+    <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' />
+    <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' />
+    <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' />
+    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
+    <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
+    <trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />
+    <trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
+    <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='org.xmlresolver' />
+    <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.xmlunit' />
+    <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='xalan' />
+    <trusted-key id='6cb87b18a453990eac9453f87d713008cc07e9ad' group='xerces' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xml-apis' />
   </trusted-keys>
   <dependencies>
     <dependency group='antlr' module='antlr' version='2.7.7'>
@@ -258,6 +201,9 @@
     <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
       <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
     </dependency>
+    <dependency group='io.github.microutils' module='kotlin-logging' version='2.0.5'>
+      <sha512>7396153FF7D2188A963CAEFAC07197C40FCA4866856EC0A1011C5B17E69DA098FCB01401B62E795FBEE18C5BA06D8076380BEC91DA96ADDFC512232B7A6C9A7F</sha512>
+    </dependency>
     <dependency group='net.jcip' module='jcip-annotations' version='1.0'>
       <sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>
     </dependency>
@@ -285,6 +231,12 @@
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.0'>
+      <sha512>1D66B1C76711E0F48800BA1EDFAABC0763A21FC0D4145DED508C8D9DCA0EDF5A61A791E58985578C25861435F5BFB4EFD5E0648A8D0E85A30CDFB01AD1559C6B</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.1'>
+      <sha512>44A5D6F34DB9A4BAE1C11CA10563F3A25F1C6A8F681ABD31C530C7D36C9B001AB6F345F0AB5E2AFD94AD5AB436C06D12D7B1AD9EB7F12DB3EF9487D692107921</sha512>
+    </dependency>
     <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.5.0'>
       <sha512>45A6A697C4E514893A0AA530D12A61E537FEAA68C2429E959C68541DB08D1BDD52542AF1DE21F4472557551309C54F4E96DF48889F09F77B70C09139352BAA2E</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index f4144231597..90a14ef527a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,9 +42,9 @@ velocity.version=1.7
 # Plugins
 com.github.autostyle.version=3.2
 com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=C297874DB24FADAACD097C4BF3BC2E4A1F684D04EAD286B6FED9919C563AB9BC5BF86B679156D72B700C2BEC429633291DFF680253088151D702CD6B4DD3A4EE
-com.github.vlsi.checksum-dependency.version=1.84
-com.github.vlsi.vlsi-release-plugins.version=1.85
+com.github.vlsi.checksum-dependency.sha512=7BC525B8790D8C3554316D47AC0E048B90E87902EBC40B1FE1C18BC533161037DFC9FD751AC822542D0B35D93B5CEC8848ADBB9F3D958ECBB391CF20A268BBE0
+com.github.vlsi.checksum-dependency.version=1.86
+com.github.vlsi.vlsi-release-plugins.version=1.86
 kotlin.version=1.6.21
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
new file mode 100644
index 00000000000..d8855e32ed2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
@@ -0,0 +1 @@
+e3a9f95079e84ce201f7cf60bede11eaf1164480
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
new file mode 100644
index 00000000000..0cae4729da7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
@@ -0,0 +1 @@
+b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
new file mode 100644
index 00000000000..9bc87bcad5e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ZEHxSQuDDyyK92EAEQEAAQ==
+=YUaV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
new file mode 100644
index 00000000000..3a993d282f7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
@@ -0,0 +1 @@
+a413f67d71beec23add0ce0acb43338e060cf9fa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
new file mode 100644
index 00000000000..82ce5f73ae6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
@@ -0,0 +1 @@
+394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
new file mode 100644
index 00000000000..d9ae47869d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
@@ -0,0 +1 @@
+636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
new file mode 100644
index 00000000000..9b9c02b6032
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFbgSbABCADGGENSy3oWLjW7zfYMSsR0pm3l3eMA7ptyU5C0U/MoIYjbXwyX
+XtlGwKnNgngATh1SMpX4WDbD8tn6vdeP4uHQsDb40t0XN7/HISFcLhV5pCgz2wNR
+t1dZbreV/EaZn3f84Vnm9s6TU7RHuPP9qBne1YLbB+LKKZUfQGavqGR+n322DhrR
+NqLdC3zFNtSmCVXS6GZ17IV/B+6CiNdbmPVk0o7zZexqZCNMXxv1IFzHV1/Y8Htu
+WQBfZ0zWwrX85ZKysU7UDdoyUw2aa8/+YpZmKwo32N8GpqA6azBeUjjVXGuqktMy
+l6IcHbLlgymkkjK7TyAKltuhvp6AlBTzp9i/ABEBAAG5AQ0EVuBJsAEIALE90/PK
+unEOu2B+QGGV9e0jJMlW+rs3BV6NI9ZaRw0Uvy0xN+jqhMsyCzB8P1joTZKUsmK9
+ptaPlMuKrTaQ/0GYPi6cP5EamphyvjK8ljLhhQuiAxt7zwv78vX7CGqRUEcAszsK
+8FPBAXERsSit661rjp4Ai71cyQg8YOXDjhissHWmneF8TJ3yItocj4KxDKLxoY+h
+F64epbkjIkpfrZ34iX8zdZMRCNJlh+oTHe/xulYLQDbgkgQa+Y6gnKmUZi0QGU01
+k6eWw/U3yOC69++ehiYcZYS0dWpPE/H51Rizn7QipFeFfTsia9jkGjzMyKHGju66
+URQ8okd4E6ev3N8AEQEAAQ==
+=Kdrg
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
new file mode 100644
index 00000000000..d3364e97093
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
+m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
+fKpWWkpKfHsGIFkfsOX6J83J4GVpaNJBUHsmcdep8YNf1nYDGpIZCxufihQXhuuK
+x9BPm2SUdeyFwUFdxhGN4JdalxZo+x0pvQ6sKO1hQKK14YZXQxLUV043p3me9lVy
+Ubld8kcda0edx3cyhilehib3sZPVhOm8s18GmjV5/ApPnehJN7SueivB2dzzFPN7
+mUwrslti0j2DmTdOImzcz0IT7zErmiV7xtgsgP8jgKEp2LF23VFXuWsKO2yNubQP
+shNDKpYMMgJn0PfD5gwYl8FN9Yzj3OKA5wiJpgPjPl2PveZ/+rOS91bQMG1hFc3W
+v9ZWSisJAZlNQlfyv36rD12WhwQLlupLo0zPlqp7e/i5ZJBPg4unbAYECtJI5Wqj
+Ljhyd0j68QWon1Ripi8ruqXA9MUe7JMy39ZmF3/fLT4rBiHyRVpWkVKjzLlm0Ks4
+f3cNAPxn4FWeTwM+oUzEbpkNpE/swIbR05u1J2y0f+GS6X5t0CSTcHk1VIOnOiTl
+wLzSEJe9hNkBuNJjwM9Cod7dbdorq6Qwd0ffPJoTw1SVkHMPwIjikzxU7QARAQAB
+uQENBFgMcBMBCACSC8Tx2N3ZppqJ03AuDJrBOcNJU903XTp5l37lBl0JiNCDP4+y
+gkCTUyz0/K5YKQYJfyuVmM5q0ydqhQ68nmrmlxqvFxRIug5VqaE7VWhksyNAOROt
+xGi9Lo6AukKH2vK52Vh1uqRPmK44qtB1+bk8DE1YHuht00XB1Awu4ojIt3WKuRpM
+/oSYfbsol82dPt1XpDvN1et2bxeN9qRblCp7u83NRmdvAGiBMRES6yV6n8XWpQFT
+kRYf7wyVromOzz9m81dWAW5Js5QIvh3GMbFMS+2bnT+OVIrnCtJCw0TvTX3xZxyM
+EuaCvYInCZA92frmpHwJMXau7/1u12zuHLflABEBAAG5AQ0EWAxwEwEIANt0/Ryy
+VQalOTDbpaAPCir/Ui6EsdFmGeuLg6TIqy6xyCZ02iY6l4eHTPNxhnDPP4em+3/j
+Hh84Qan01O8sJB/o4ASbijAlvPwFikaJ8Gh/oKc+FO5kUwAcij4f8dtgdknGKlyo
+BFqEdfzzAEiSlX0G7biqrqD+mR6YM3eFbBTRKfZVwnwRMjNIN8n2FUUpvMKcGe3v
+34GL97e9qg+EMIBZ6SJxdKaMtvAfKYB6XG3UImlBQdYQoS8OjKJjoH5M7NRY8qb+
+v08M5z94z+dZ2mF56zpWcIlocYIT4eVi/2J8htykgxIBBWiNPfyYLrK3r2h7GtS+
+0e2MbwhhUimjOGkAEQEAAQ==
+=+Z5g
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
new file mode 100644
index 00000000000..705a8014c7f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
@@ -0,0 +1 @@
+3288b8be8512d6c0ca185268c51e6cbc7ff46f0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
new file mode 100644
index 00000000000..276ae3fd4f7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
@@ -0,0 +1 @@
+1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
new file mode 100644
index 00000000000..f1c8281cae8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
@@ -0,0 +1 @@
+41d266db4427983a1a4afb0c3684155e9365c30e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
new file mode 100644
index 00000000000..b4b3a78ce63
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE1PuKEBCADkfuhQQsJzb53DYO7Am9bCMHPABIOZs3zPTzQ3c0MVvxKgalp2
+2a73JWhdGfvD3UraZKZw6G8Xf1i04vWMw7P1fwnXU0r1kABcF+an/uAY7CbIo15/
+W3cIcoTFm9upzJFGY94MKeddLHIq8A9b+YqNxSofX6q55CXyfCUBvrVmhep2TrDJ
+gQlIYZb8w4JcXsu1Ec4NLw9alGfgs3hcO+iNnKhz0V9iUZjsWp8mtJWF0qdFxsf4
+khVCZb0Aaij1vluU5zZydyAqqXK+nlUmUZy8gTm1nrDA1IzDOArN1+LrX5C4M25l
+eOhCzUeQs607Rt8QVQ9oTy9+pcE68csw6fQJABEBAAG5AQ0ETU+4oQEIANp0K7gr
+SBvq0wjiOUWVDLxP+5Nwl/5tj0YmWFtLK/tb1PXYDt8htwJ0aGQJlmZGm2+RhyrO
+QPlBBdtVAWzunGgM7cdBZD/SQuG5hVoY2Wd1T1y2mWb5fTSKwZGjcNoCtIiiV//w
+d8/F/scyOVAJtfN222DNUhQGNDXavxxTsLK/Qq7qsfbYWiVBn+9AcIWmeNhvVjCT
++aGYumndjFFyfhTfpQ+WJYRvfiI5UCCiyXDLztLjVxOqZP7LBqUuetD4CKZCE8UY
+R/vW2rIE5PkHi7c+JzyynQfIcXCubNKRc+74RSNIYmKDwJnRUhTKlmO+xNv679dp
+kO73jR8NUlV/rJEAEQEAAQ==
+=KxMx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
new file mode 100644
index 00000000000..8c912e167b1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
@@ -0,0 +1 @@
+76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
new file mode 100644
index 00000000000..280dc187d02
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
@@ -0,0 +1 @@
+58f086abb0ede8f7a04b76c34c00043bec5cb7cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
new file mode 100644
index 00000000000..9be987d474f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
@@ -0,0 +1 @@
+b6e73d84ea4fcc47166087253faad2cd5ecbb314
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
new file mode 100644
index 00000000000..c0ba5465eaf
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
@@ -0,0 +1 @@
+82d8419ba697f0e7fb85916ee91287822fdb81b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
new file mode 100644
index 00000000000..d4be53b3fd3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA
+Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g
+MvWpHbuhK6WsXGxjqWykAk8D2o2jfJEsUGeJhbG/12BoT87pjsUcZu7DkKilx6/L
+WoM2/sirH2e4B1FLZvE7NCKpGttZv+vEI9oZmoKgm+ZHt4cSGOPrPtrAtf19irP1
+02/+kIPghmRd9ZwnK4xEazYe6mrY+8kQlrsSWFKTaWfvXQRJjyBJCuSwZCaWgMku
+vP4P7SWTqGX471bdDhVbG8naGhil8aJjgZJlsOUZKYXUCMU6KVKf0f7qzDlJuIPx
+4nrQ3lu2QvF9H9PCnj6pCx8tD+DJBq4nRi8kE2k3lAnpjZ5VpVuW+tSwsai50Son
+ymZe5QZj9T5Nvy8tMkF4LwxA+2alWfvdHWRISuEO6jNwOuxHMtbprbD9KxY9Smd6
+YcRKKsLmKR8J6a5V7pELFTVGSLhSL2H+Z2j14fkswGE5vkxAQpGCfxQh7rbvrhw2
+lpx9OmvljnWFM7U26nfUG5tCp+ieE6pT76hcPZ5MPaqWl18Rk5dVJQhNZ3Gd52In
+ai/y0v96pn8XZBRuNFULMb2PFG88hvU2M49Y8Rdi2VW/IfN3hIh2e4FT2wARAQAB
+uQINBFhqdSMBEACzwFoQH1MJLn3UYF+viqE8yw/CESTkU1aLoI5sXBSA4wIAGC5C
+mI4kCvb/1xJEsIqtEJkNJSna3GgR8ov5NIJmx+MqqhemDKDNJS0IKvFkesNk/khd
+t0zXF7wK9O6zY3XE6lh/usB8/34mHaR0WkU5Td4kCgEhFJQIeOfPKMaG83lrxiXe
+ttRBIfmhldX+1LIRwoqYON+C0wqpfDtAeycYbOTCrjArUsYmiUkzhB23XdTive/+
+BUlvRL9ioHb+p5riHl7YfTl0vcqOKYdOfScb2d8lqgQZLtZoKzySdyIouWOriRQb
+40I/UMjVuVtGyfuhWYkIH0rPwVwpABd5kGxkBkJlrSFGPx1/o2kOx24isexGM4WX
+h56WB8K+KQMUtVEJHaSIU3fuwItcdIHoG1Xf6RXJHW9Wgw/MSZYJhDclVwfznHI2
+D5HFS+hRLKbAF1G1IVauXZBbXbOhcPyIAPwuTFdULhnPieu5ZGFetRfD9+t95rbu
+pKMt54Lvx4cG8R27LvJL86X9KrhPm4WdsDL9lKs8riEUmTliZjmbTjZD9/trIcxP
+QKHtfwtgoQnFm3aeMa7HO4lUo8KgEQiHqFbQQ4WaQruium13SlXTRgGGZuqdEtWE
+MdTEIy+3c1STPR0CkoruBxlPCe/COf8XTn2h3EoyRWnNeNqudErVq34POwARAQAB
+=6L4F
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
new file mode 100644
index 00000000000..65b1cbfce7e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
@@ -0,0 +1 @@
+6cb87b18a453990eac9453f87d713008cc07e9ad
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
new file mode 100644
index 00000000000..dcb0ae5beb3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
+x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
+N4/BiyjQA25sdfaOolhO0sFlZuTZpYy5wG72KkA1ygNq0L+8aBKhEF6zDU61YzCC
+AxjcgTftgTeeoqkJtYa06lNz3jmJDN+zUQignfRa3ymoGtFHTzoXR9maE8RWDty4
+y+DY+8ibdGgSgKPZ0byTCDyNojgU1YTlADa/1/NY1ShYg617O1xicLNo0JEJlf2U
+Tu4Ymql36+xSkYSISU97Q6Utgq27XMuZvDUDABEBAAG5AQ0EUhfJFAEIAN9NHRd2
+bYP/3CDi+n1ilSChld0NR3DUBgS/AdqQ7IoAUfj7skyI/WyaMdV4uy6vRh5YgNg2
+g01nd0LLZR8Gf2Ck+D6F88CdZaTxlkcxHV/dXMZ8yBO+0D6yFRZEL7Imsv8Ig4QX
+OVwfuiXEPk/Ef5Dy9SdAVhcoErTGGR6BOGVVvexGtBwefsjMaOG0khkRbWIQ32Wx
+fUFuAv5XBQ0ckLrlKvYWUYhOlXg27GtFKH2EBBF0Z5ZWu7gaBFwSV0oLp9EWcD+C
++WEwUSfBdqfRJtyXvgf4kZdwdQ5caM8P2/Sdncl2l/LU1At2Smc+plr6zhIhDlLh
+lrzKGa16oARSBdUAEQEAAQ==
+=VB22
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
new file mode 100644
index 00000000000..62da51ed28d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
@@ -0,0 +1 @@
+56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
new file mode 100644
index 00000000000..82ce5f73ae6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
@@ -0,0 +1 @@
+394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
new file mode 100644
index 00000000000..8c2512e5bc9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
@@ -0,0 +1 @@
+e2acb037933cdeaab7bf77d49a2c7a98e457c53d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
new file mode 100644
index 00000000000..c1f484387d9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
@@ -0,0 +1 @@
+a4fd709cc4b0515f2e6af04e218fa0f6a941a037
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
new file mode 100644
index 00000000000..b1fd64c7454
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
@@ -0,0 +1,117 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBDxLUR8RBACODyeCEGdqm62+6DiVYq1Y2DwnItiVOlWDZM0ds488iUZPGhlr
+kZqHX3Pd5iHtYWZhjBBpXMAvsLdX4OTSnFa706RbOU9acldqHcQ1YRKDU42dY4CS
+TXNSbPMFb5PBM5Vups+jYkHX42xa6zRSspNCkHVBkr1oGQ38JXF3hUJV6wCgrIMP
+jIw51njzPYncSUXuRlwMEz0D/0UoR+evuale25859XeL7T1SVFbTeVmyAzMdXL8T
+laTarvT4DzsucK5IowL2l32rfBq/aTIXkDYxzh/o2raXj41QnpayVfWwp3oGM0MV
+MIZNIEho2yRcsQ8kqK//D2cldW8l+zVMMJHoBNe/TOfq4jubuTMU2fBeZd9wW59Z
+QYxJA/4h2Jmk3ah2TCd4BQ8wwkmziof4p7em2FiNtWpbOL0ewXZzJ40ZQ+cmwwqP
+bHtU2e0rZC+TkMYez8e4gzaB33C7dNzc9KD9dUAWzPjSAJCCTzRtatKMvi/f4uBg
+KkjTUMG4WrBsimi+hp5PKQeP8Tlv9eRtBeKMKHvgieVsPI1Xq7kCDQRTkPQZARAA
+wVU7H6EuWEkoYWRfnVWdQzrNr2x7bc/2Q+0QcbVgwcf4bBYdKsMNPztHs9lxMShE
+8qtX44OGDoNZ+eI0eeqkhzNNkaEndGFRHMwyJrSsH8Hf7LMsbXzBi62wkCb+6+bw
+FamEl4v7aX0Oa19PGNx1lKvZy36n0IIgM4JWp5H+xE9YmwOsbQxzKEYXBIKJHU/S
+51BLGX+GPJNwGniTj6Aa6UpT/jJ1RWZ1EvedFlG7oZlPod3XPPuI/SXikZwXWz9E
+hyVQmlJFqsvWRv3mm7INrku01gEX7aq6FxSvin8++j5v11FfxJI94lUqYyyfr4fg
+zml4dyaJbAz6gZ6rB5D2ElMu4dA10/f3DzcPknPOnE+vbb3v683cA3XTvDgCTyRa
+kI03W3YEAf3rjME6HKK5nIh3V3vRoy0h3Hyo7Nnp20Ho8DFH+0v76I1CCuduO51H
+YcMZhZGx2cYa8c3QeiQadtL+y6GV0F+r5f4PCXQELfzVmEHa3+eaqkqBaeDoQZ6w
+GQDmt//zo1E09VWVvzFXcS/93eIx19AGzs4ZFc47IoV2kw2ldLb+wPpQV7a8mpEt
+yyFhqdnHDJyhotUUXlpO9IQuPNQZD5lQE57czVpCtclJpQJHGlb9ok7+N3fWPCu9
+WL3quBZ64xfGCpSSAaB26scPESSFu4QlZktEeYKCZEUAEQEAAbkCDQRYwVRSARAA
+2J8UoQAunKkyJykf6qC2kp19IsOt7LCxhVeBUf5kVZQnhaNEAobXjWXiwEvkr8qR
+IvhccxQVIHq9lwJwXNqJlK9ldlYDtTII2GWdhNymwsYC8n9B6Cqh6XQVVXOR6uwg
+nLpe3TP5Rvcn3ix/I3ypEQp5F1i/+5qjIZ8ae6GRrpgu/TDBPBH7St8c5Zusk++M
+dAZY6tidMdHOFfC0dP/BpYzLtaNfuwuu5uSD0twhT9IxZgS0ldQcPIf3LA8bSb2c
+SAiAxN7VdbBkJdpHr7MqYOwlj420UyQME6VbCvdZFUmwBEKN1wJzugLAkbAlS2WF
+0DP4XvCIypopbRbSCJ+3gnTGOiZWyIlbPvGQ78Ks8Pv+C1YJdqxchY3RUYimEXWg
+dykMRK8UY1WIrvm8bNp+Y9zBHZtvfXiEnOxkWDUgHvotIDAr/s1luc4KV7LlHRzY
+C2DVf+NHTA+caUi75jc0e8Rx2EVL0adg1iidA0GgfHQQhLj0fBMVt7WypNizr9mO
+xAj33TsUaVX8q3AoJTsIBdKZOQrwkOgh6q2avWbIGVWqO/iYGrYCNP3ctqgrFZYT
+KQwg2Z217pJ8nWzI1rRp5CtH3ZpQ/N+DMcgfBcxVv7MBYpt9Uh3aXiEH6hKr7oWu
+dGEh1zfpgLlrznyd+IupHqUABpeIUoYbnflHZVP0XkEAEQEAAbkBDQQ8S1EiEAQA
+tlkyN3ltB/4Z6vPZQV4SfEwmwfVCiW7XB7sHvfCjm7dpU1V+6yx/nxZu5a13Q7Xl
+yXRccB6LNV/yfBiBxDWcbAghvfJu5u0bHEXk8u8q1U3lTfisLG7TN9VVQpdaN3tx
+n7oLPph2Wxwiv2SIVNgvDuJZQ/D1BGSvQ3yxpaDXbvcAAwUD/jUp7oQeopAqT77W
+wTjj/z/cCkTbvP0kDjLbNNO4GzVSW7g/V11ICIsxTJmUh9gMsUXkWGY1VAk26Chz
+yK9krpZ2xWlGvA60bXNc+n4GArKllsKpTe0Vwl84O8Fz38WJ5VA72bM5FaZXI3Ak
+ValpCRXM/7IsjmpD+mRC51DvNKL2uQINBEd5FU0QCAD/d1FpwopBk4Xsp/M3dHxi
+nwAfiJuKnkUkv+LW1DI4Nr7p0WXvHerrUVTaoFNjxrx7VCsfNbn/XuXuhGRfBFop
+D/FvqnRyvau23AX6/SJ7F3/GIHzjXgQem1gTfabEESLDcW6MISwoYDZqN7Xwv5id
+OQKUoH6ffYYa0hWEbq9Pm3WsqMpKM8rAqYQ1vBm4BHK4HaWDAW4ltbIaVEHP569J
+Es9su5NN5t83ozEvI2RY+YS7sFUGooIEXCMHaNFKlYVw/wm1JKYiPn2I2uyXIyKY
+Z7Nj0fLFH0koJxqx1DWVuzUa7w/8jB29xOCWqHOuCFgFYGGKd/+KHih9NuxDsyL7
+AAMFB/wLwa4MdVNAoG+fyuB3KIf+JgYMul233ybV5FvgPO5dreemUNGe9dH710oF
+iJP6jsp0HY6gF2SC4UY5bSYb47QxGrI/ls7qc3GoyrwAA51cwSaMoFgNqjikES97
+7Uf8KG8YXLFxwS1z8D39dHdg50mn6UYaFhmWVXbUTQJW1qzexthLh5iHnBzyks8u
+CYMqdE2XtoIjZ6hTgKjQZo9a34hMkald/16BoOF5H58qpCdrp/gBwaTKdThK46im
+ZpqUWK7UzRj05dD+C9a2mbgQ1lzMT/cLoVNeZrfSFAmCQUygsiHDxTkKDVDtkN62
+ZybUAaME/MtPYTELiayQ9AVv1jLiuQQNBFjBQyIQEACTheN2+ye4UU/kcl93hvpS
+8Zy7LUE5oL6b7E7RUUmotSlJhP6RZxkjM9RZqCS4ffihcECiagXDym5tURkXGj6+
+7/MmKjD5MZb334tO86TBKhFnz1O8+MjXoZhzDd9BSQ2Snzcv2zFOCUxiE/fS28eI
++0b7KRraemV+hsOSWmvy5atHmqlQlGXBebHImEZPfl/mzvUkLHEwomK4LuYH+M2v
+ZTKhLvbU8HitiIrbRvgP1nYUcn7Wrt4AsBiE2I5+gCi8WStKVuxlc8M7v6hmF/CM
+hIS8IGjX7t28Wcc9ht+1/EPEN+rHG8oZzZwVEJtx77oJAqIEZymLFa34dhvu9ICk
+//mxzVUVDrPbTXkQSvfZz9UP4QVCeibIZ9AqJx9zy4EZBh0Dlxsd6Da96oh4BTZR
+tUDrlKTm+i1JJ+1BxErJ6Qz6H9rbfdayI6uI17b2siLKniyB0VNDnOgt+sGYZr8I
+FExYN3yd70is3IDrjWGkqFm1B5PT5PR7LTTekzTHAZB9Fy4Clt4i5HCIMdG6kk38
+5Xx4arz/cw73gjfYWzrzRC6zYUH+TanVjMsCGaEp9fznh1NdBNtDO7lrvIJjG1kE
+DvDQ+72Twe8BUGWgu9f4G0WCwMXLmuwDEY5vfaY0EfPe6ppUrvT78guxzs8KN/8n
+1vGUDGgT7yarqdqbSsIAiwADBQ/7B/2M0d08J4v0rutoQSqKVvfQ6uxGj/wSDcZk
+Xj3vYFSakOTptIwedQSq7MByPq8jt0ovCBuJilAmSEovWzzvIV5Px2VwZ8xkXuw3
+dHG4C3s75QDUnbaPCqtnLwczQFAhnva8wJUQsKHSSwYhEGAOmbXbFkxtjqXn5PE8
+AhX8MRyIxqZA0FxK/qbEtCDcv/yJ+vanVIY3H73lWQ82F7hPX2OecTYGvdE6HnA2
+qYSWrzMnLcY6UbUiuS9k4/Q3uAzeTGIBelYOAfEnq7r97v9eHTT9WWJaW23yGdd+
+P3HXiulOlR9Za7/swZlgOGL7/lfJ3CKSTBW3Rxuni4nu9ZVVQJn42J05UvjekP93
+QVcN6IApHFdvk8GcfIFN5QJ+uZc721bVMTzJ7hhvUmb2xv1Nvzae8zcR/XrbotTz
+UgP3xxfVEVQGRcOKVvxz/jbAX63Ph4R5CxUSMa+kqzNBEpwb+zTWnSa8ThT6aRIa
+NbytFLlehIRSQdYBdwZaWA7dI8pM+j4TKIBoahQSIN0uhN466yxNYck0mzA35wdp
+Jcr5ZEmbeqLaghlRZ5c10axEfqVILJdDayxKghYaAZwliGWo0/XGX3K1B83kAp6j
+LZxS82X2IDX1IVFP+xOvTk9uGUw9BWbUtClRsr+NcPEx2dsbAxjiIz4UqouOSYmc
+VXmVbbm5BA0EUbhZJBAQAJzPjRMTXx0uEeo5eyIwLMUoqhdeEOpQE1B+DRclhyw1
+j1uJmwB+JR4C719aAmpszxOx0ZnBjp3lkHYxCcuOF04QWlyvftRXZCsvDeGOw+vl
+5fLx7lPp2ClQh8ydvyQTCHh+kPlLgKAoRaHVH4fXYxkK0cfnjC2Bg7IaStJSBv3O
+f+I04AFbUotqFFuLK+qwiu/pPNfv3bH32rzVpxe3V9O3L5pjHQYhfB5eO1DLf/Cb
+fqFBwKA970ZlRC1Bt7MfLkPRcq1FyAcN46sstyjz6fHa1maQzD5pIeZx03g6gZ+9
+PZzyFta5LpPQASBw4QqV1KpoRUxSJEhU0octieawvTFUyg29kfCYN3nZCSqKWSXP
+kSRGGMTK19tvt7dYtDqrYNMM09WJGpmJAcxncxU632K+Mf2q5f4BGH59WfmiOEzQ
+rqv8xebABVwRsQbR9ZaSoAmgzZW2oRxZw+mule9x1ezkYB2LDyAC9viq7xT1BD/Q
+IjfIGvd4ug0JNyJDIMEOmxX3w60u61IEw1X0rUfMHAVmyTF/EbH7Fb1W8u7jUwhQ
+0GEDvXNqWUUOUAqynd6fJ5gQ9d0HEXLG2Vo4D02OQ6GZd8uLGHMxqpBkRcWd2nRB
+NUsdBFKOfJ5Hk5Zni226Y3x3e/gubOOkxJfAlRwYw+pQpf/b6xBx+qX2DhG6yhLv
+AAMFD/9sjJZ3nQLlZceM66x+FEbwRlZUOdfiHEYExxaQK68QZXj8EmANSF345qYM
+7X8+6Zl8TMFp/h6h5BjncZLzSWPblzFDfVWl0ZE60oVQTdE9fOsQHIixIBFh0z6/
+iMQmeFgWM3LD7gqaLaW9Y7nBmyJCKllGDwG4CBwufRe4drrektCG9+b2wZUMxdME
+0rtPIsj0uZ/tGvhFPIe3lGxMTuAz7j7u/WL62VnH2Y8xz3aBZ/2rwyZiZsBqbwm1
+9QDDy+uLgcHEUUbwEJZlcNXYNxeD9jZrMpLYmMedCH/M0he7s2ozbfnIsCQlTb1u
+wCM0TrMAJ6YuzoqX2UrQvFgRWJBE83aaQhYV6TCF6stkfmxoLh70uaU8zm8qcW8c
+XZJ66ZhhVvuodL9gDULX+aHWyFSLIMGWqIi8e6kbF1RTXj4bZN6PRJjGwKk8szyw
+qOP24Qrk1gRcaiD0coJ7Bcm5yil5HpzymMZTKXDa/fmnSA600ZVWBXx25OtdnTu0
+JuDGkrYpcvZ7zIOwPBhNLe22rgS5Ubdl37hg5ZAW3NPCD+5yscKH9OAco1G1+tZJ
+mkQ4+kszaRMFS983sjhtKZdsS3qfkzxUO/DRzCzAVjsIHW/O+B+2TktRuyPcRLGc
+++fdwy4IIStiBv8/K2UE/IsE8wwt3RGgV+Af+xJKniXSP+Rrz7kEDQRJZbt1EBAA
+0h2CArKJyLEmi93c/02ptjdzzkXcVm0BaeSwXe5zj+hm9FORvp72HXk31ERQT28u
+v9AA7pwdqmRpUiijiXBouJNPMMnBq+Wmdej1mO9jY5G8+4sT1BMMJspOHa31Z+b7
+jRA2mbMNr+9Yq1gVZ4UF211+Pj7QZeH9blXR9LI7msCSBmBzoXBooh0vkqdlk/k0
+UhclXgb8ZVT1i2fmM4KJNjYJDV826eCYlHBVnMA5gZvaKDD0jRRqfFWlpFINdJDQ
+9iEKC6LVHwFV0ahKso4Aww1EwXeGZutpqkTPqD1O1u5piBXYlXCQj+ML+1bRs7gh
+Y4qfDLrQbL6gy4LrXTMP7AmEAmB0PKlEPIJ+7SeRuIYy1btwFWdP66mYRZ/PmzIj
+HSPKYvwJyW8QuQ1uQwgXUVhIdDIOyHxoRiirVNZAmeb9iui6BpwuNs0BOEs5CeK8
+5qf1c5LbCQspGBNp2p8dFOUALwxNR7GXBRQhJCQiAacU5ojU/Th18A5LsXbucUmw
+NWVfBCVPGy9Hau6PapUqeq73zUe1Ihm4qZDJ34eLefNlvunuCqXmpMXqxJE4LjCi
+DROu+d2lR/jCkHKjKcy4S4RvTqbXYktonZNGVl1LAML0WwOyZD/fbbNriPobnpEK
+cKSTCSPlcw5lAqQlv1cmpBexAjxvf2hY0wqGUZsqXhcAAwUQAInqtsEkItO7L2dm
+bSaVQ6jBrUUggczI5NiL2KeowSwld63MmlOn6L1Ze5DPaih+/Q4wS7g9RXz+QDFv
+ucpTeiz5pdGOsNrfzZZtd6Jse2QPd75C/tGf3fft8pxx5N/d04vMdilWwABUr1mh
+oD1HJVgCEIfVfkJWdGHhb1oDb7tUkLwFlr5qmqQ0uEi/Z0EyyneHFfMZUIHUXHRq
+dsKy8pQHeVZ6wtrCrXC9iCRvoG6eYgQhZDrzMm9WAmoeMxlDLlhi/UYYV+per5Yi
+ebuoD4zCYucxXagW4tXMcEE5savp+5RsX+5UfhKhBkfCO7NHZc/Fr0rbk7Zu7ZTO
+TnTUt6sjze5v4Q4fFQ1PhLyRF8VWglgDH0G1c5euOLU5SOI68b8YnII3Sqs4rOXa
+uBkVsCIs5i4lN3Cgee+8ca/J6gzoB8S32Y4dIBPPnNDEQWXLc0qnEDay6WOXsO0M
+FDEB80rJbMcxp1FdU6AC/Af4hGfidPzOgkgWQM06bffv+EOcwAOwVNs1jGPJV5Qw
+XpXsA3zcZZ6SwxMMOwK2AehQ4/PN6dFKNC5uLT34cyOxDP7FmwqkIC8LFMa9W9cw
+Ex01j79oDDUI1SwoVI5Hq4Y47dPjxGd3wsi10pNnnD9tWhhDofK6/48BDBVjkbOe
+q2Gj2NRVSDymwOf/lp+NcGBH4oxg
+=swLh
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
new file mode 100644
index 00000000000..4f85a4e83ea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEymS9UBEADcrmFYq+YjA87HLx+UugKSIutOap7Yc5PJTZ9sAUOEtDhs0WwP
+bsyNdxu+aQJwowEIIaXci5YzimRzkuDNrfDFYpWyGq8O2yAsccMc4+HnQfcroayX
+xnF45lIY96RSbayW+pZsHkKICuKhiWGwNRQm76afuOcwcejCLAHORxQ/xB9j3g12
+Wrge8mY7zjm8V49XD4J6c8m27KZZ/qLeSB7ofC8qymBv4Hos7lbRpngYmv815rrz
+gxDSzbL+w+kAy96lfyrsiJ4J8N2PhACdDDK6bykwyQQgEa11QeLzSJ3/VJ+Uwlnl
+WKgkKIbLiXXuA7e+qVMKq0hVbf+koloAZQXGCymBzh/1p3OaU/6u/8QwyUXpmUjo
+MNcQLIJUdYKFOYdIFaH/5elsp2r8mHSsFdQABUjPVG5rk//IJro4OO/cij8zeOJ+
+H0HpciY5lXpyuXixOME6NqGbx7nTDJ9thNcCxuQgj7KjD5UAq307bbWqrHJEU2pD
+5Be9NwJKcnxGmNj5oO3CAKaiLY4gDa0yf0ka6L3vSSJUV9y5KwfmDWA8fVq6HLyn
+obDOMu+nCSl9Yb+mvmCC7T7IhfsDm/OnFwYaoheRDuAs1tR+3H/IbrPoG29iMIUj
+Eqi2iJv0Qiuad5TWBDKMGe+vbYj93WvARfHUy2Ge/ITUNGS0AiBWinT6xwARAQAB
+uQINBEymS9UBEADFF6Yo/FnteCVh/np47l3oALM7H7GDe9WJkrpakzg3chm11u4N
+e7qktzBhhQFheTqdBbXrlglrP2Q0v/AcF5Q1Hu0hRamfe8lfos9iJmF9Xuq/5O0o
+XhwKTPAO+79r9QFkwCuC5iIa4nOTJntPNntG8wvhJci6CKVNbdqz1gNHjgQEnyMz
+YbvlcbSPunAjq20XquDg/ylXmvBTKM+04eCo4xafHHYhYrxC+tdaTSCiUgUjrGXR
++2ZSIESbU22OgDeE3KBb/lJwKd5FZCyzL5xw3+67k3cL9TKkLvAQZFZMFfYc/bwB
+S/7v8f+n7qzptHrjTcOSXDCt6l/Aca929Q8SI1xlw80R+eQFhgi6ZPQYGvvLaOrA
+9QOq8OOMUA/Y9HuaYSUJOSOv32aADbM5L67mYBN+7btPiWvYvBzLqjTuYr/G84b/
+59W7hVvINkBExYndA+YM1JAv7GmUpQhe8EVbqgUQLVJz25HVhzP/kTcCuGifHDg1
+y4K8Q1IumAMM2SQgjnZdCAA+WHhT8lAh6TXf/94BnNt9D5hRBNI2qNUaTyE2axqC
+XtKGy7VTohOHNVcsVggAhub3e1A0t6vjnOtO2ucJgVW6w8bQ4hTftPwdiwwPxM6i
+l6EGlAMuRJxWBbyprw9deXwD8s8WNUo+RSysNXujElV7oTcfkvqTFeSa3QARAQAB
+=ptF0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
new file mode 100644
index 00000000000..5e8d54ef968
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
@@ -0,0 +1 @@
+050a37a2e0577f4baa095b52602ec18d20c4661c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
new file mode 100644
index 00000000000..85f7ae585ef
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
@@ -0,0 +1 @@
+2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
new file mode 100644
index 00000000000..25a4bac70e8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
@@ -0,0 +1 @@
+f1182e81c792928921dbcab4cfca4a29d26468de
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
new file mode 100644
index 00000000000..42375c17c5a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
@@ -0,0 +1 @@
+e85aed155021af8a6c6b7a4a7c7d8456294423ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
new file mode 100644
index 00000000000..68968d22716
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
@@ -0,0 +1 @@
+4f7e32d440ef90a83011a8fc6425559c47cc79c4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
new file mode 100644
index 00000000000..d0de6ff44ac
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
@@ -0,0 +1 @@
+7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
new file mode 100644
index 00000000000..9864cacc67c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
@@ -0,0 +1 @@
+4f752a9878e937049ef3fba7d4012dda1f1f0f82
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
new file mode 100644
index 00000000000..9421a4dfd3d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
@@ -0,0 +1 @@
+53c935821aa6a755bd337db53595395eb3d8e1ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
new file mode 100644
index 00000000000..b85e6475cdd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
@@ -0,0 +1 @@
+b5569a15406ae682380f3ef8528dc75aa68f0923
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
new file mode 100644
index 00000000000..c493a9b7d1d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE9gdLgBCADYftTKGjQNoatNJb2Z3GM8zWVyhLXmhc98ZnMLj3kLmHIDagAK
+up+yHD1SSY7aZdrLf0mU/LArGczFRLDe86/D245DH3wSYfIeQN9d5Etg7CCzRb7n
+54xhal70VF8IoNTEOW5F2FX8PO7thIXPfxMYeqAuU3/PruMsE/ZYOj5a7YBexL+s
+HwQiN7FL4wuX/ABkVeDvnu7SuL05gHJ3ISL02zhrMuz95JTIFgE7g+K6T7mlcmJS
+XP+7C7DC1FTHNY0efxVGv3bCgxXOwsBZ9pHsGkP3SMd7mB6/2mt3ms8ci7QkCOvp
+DLnPuB0V7DJq7PapPtDAUghySsOlvQMU+/d/ABEBAAG5AQ0ET2B0uAEIAOrk4y/E
+umKpdYUf//5+VZL39GCQsuG5DWhQDp6IlS0xEH5jlgVGxIVnhYeRsbSmxloIZ80k
+qeoYZv06NEsis8kboIQRFwo644YO2L4AKZEyYvz8xSAanyTPCXVH4tfcjjZ9VP6c
+N/92SKb/GPOzfGEMLDREx1tuDmPAiJ/NcddcEBQtfUKugmClhmA+D/4NC2OVVnpT
+2HE8Qx2LPeyoK0Nhd/Mq5cZDm/XT7VigLA0leGkRjrIn/YDcrXmmq9xRo0LZtpji
+G/xtctHX1uxADI149ONMuWGrODDxxFbJpx85sN0gbjUY5mnaBTXMxc9HZQjPMSga
+fGwhnR709rAEIvMAEQEAAQ==
+=sZ4E
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
new file mode 100644
index 00000000000..7b86060a192
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
@@ -0,0 +1 @@
+07dbc3c1ab1f4468471656061c8d5ef0df2b70d4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
new file mode 100644
index 00000000000..12ace9e88f0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
@@ -0,0 +1 @@
+475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
new file mode 100644
index 00000000000..75e98dd9efa
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
+2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
+bOjh4v9ZipD+px8w3o/RNrnZH/KRsoJg9yER6pf+pUZqTJfdg5lXezc1WF+/1qVo
+ypldMGfrkfLsPrUZTT689ubbig978e7eYmJEqldtaIwaAzHQnB70wIJyg/rEwFUM
+ldsvs6t6czSuJ4zPMvmh8TMpTg9e6+DMktPl1CWRONl8RPpgYMIC96gb4OnfDDjk
+Ex6clSCwgbDwdeAyOjjR6pVq+pCNTo1Pcj5jABEBAAG5AQ0ET5k74QEIALaxogmJ
+1t7arw82krV7ILlcOu6aLuuXTuy03K1/jU73oyWfUqwvPSbH4igcLb8kt1/6ogfk
+u0T9tTx+0mDsvqK8A8NZ2nDTXok3T58UAg0FTXlqUqZmy5QPtG+it2j3/xGgip3V
+5p0Ml1TqEl2SfW6gHtLptDUWzuzPi9SgK1ZFlueprPg7xwHmWhp0gwx0KSSOYWlK
+oEllj/1aDxFNcdKogWcGN5aJEsETCEguBP7olL75u6732wc3zola4zTy5bFT4kEY
+Dk30Du3VGQJrdsqlibdQpZYm8uH4AVXDmFMdEAjIs/DGRrUgde/oUqwtgm9U+p9M
+qcbmMoeLFdi7ajEAEQEAAQ==
+=ObeE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
new file mode 100644
index 00000000000..5fba3d86fbd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
@@ -0,0 +1 @@
+31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
new file mode 100644
index 00000000000..d2f7ce18f6b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
@@ -0,0 +1 @@
+8a9352189aeccfb4ae1f3bc616fbb6b6e3120829
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
new file mode 100644
index 00000000000..451fe6ec348
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBkqm4BDAC9Q7VXP9QBAqF03u97WpLY6qRbXX7jWRBZmeQ5l0gh2612XiWT
+U1iaVfzhs4kCile40SAr4HJgeX/xnGj7HFgeozIgM5G+x39BROlEAuRZHyVvXZJT
++MKO9qEkyUg+3JhjZO/JQNO+9AFXLmCtgd3+kcXJh6Xlb6TDbh21Cb/+Xh0TRwoU
+/mhsmkGMquLnTTZlu77E7kCLmWM1K4jYxB5yqLwiUOzYPLmg2bt/4OAxnAGv8Q/h
+hpzl7YlPduVcR6fW5eehlQvZeesaZcppCLGN4tA0eKvCibwR/WyiM4QddSJm3J/o
+hf0dix8b9T4PFYqSS/Ok9024l4IeDMZ6GlcUgsbWjoDmUhpSmynq2xpFkbMnG7kK
+0eM2E7MRui2LpyoQ2Wqzghlk8FVEyfFZJAIznSAH0MnStozf8und40J8emIC7+1v
+L4a+ArnrFIwGomrS7MQmQNQ0OlAhV80bmZXS3nrp9rWgzcfya0iLWbPMyXuJdTDW
+mrx3Gbp8kfwDITcAEQEAAbkBjQRgZKpuAQwAyi9cy8L0SmWVQCt2uXNpceksUUnA
+57IYBWhn7zUZuqBB7Ju4V590+3ZM+Wk7rCN7VwZaxLLKuJszNvqEzxmB4YP8nCyF
+voyKiH4+bDll0SObMVGe6ZekKDPGQ0sEtEjOfvz2glfEyo3yD8UR/suLZvDTCruz
+tc7D1yJmpdOSO7RYjH/vb7CZ1F3Mzeq3H7VL0Kf+fjwrca00MgP3WQtRV6T2M2Yf
+AKMYTGzWZemdmX/MKFg/67SOljKzYkPxuMLHq8aBwqjmDbLTH44oiXRZeEdazMI2
+HZU3pVT1Pr858wCt3rRncjc5yO16+0BqgXRFQR7subqMJZtLM+xc3zRVZZp+V7CE
+wv7w2EWOVIeRmYGeMSmriSkyaRhELAwdsEnDbrDTrRQgMYx2802aZnXA0PRs31eh
+UTLxYcnUMrze1UgguCAAvwWzCuIjmZQnAbqSMCw7dmhJwHrw6T7E4aZef4xt5nSH
+5xdJYI4IliKbF7mR3sMhkKhgncv/jiAU0sfxABEBAAE=
+=cc2l
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
new file mode 100644
index 00000000000..417448c8d0f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
@@ -0,0 +1 @@
+a5bd02b93e7a40482eb1d66a5f69ad087600b22c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
new file mode 100644
index 00000000000..0c531a4d999
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG
+VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv
+m/7SqGx378m/qw4EvpgGUB8EYif98LYdWp5vsU/zx0Ps9auqvetAzJaL9489oE0F
+q8FVhve6BMfUUV7zOTCmJnf438YO68upjU0PVBdfFE6Qx4cgCeWbQGy2cooW5azN
+iIenhuYU1qikmxMHq2xZzN4uSTWLGDpimPyz+Y1aTSYJ/bgn9gPStbI9sojWo9SS
+5gvNK3XqJzMwxwFow86UcIE0vPD2T6ZlBAXRABEBAAG5AQ0ETslRFwEIANrjVe+1
+SPgEY9Xfe2+XGN/3q9DHHPP0PXLTGPuWKUmAzkBddNEAXTkPKtyCbH4WXhf4jBZR
+yFIpLkoGrW/yIeJZNfoq5xET7ldjDaAMNxb59/78JfyctGbEAgUlzueFONk3Dl0s
+DS5GDiWqJg4orqOtUcY+46oo6Z8ncKBbxIvOL+qv1KLWtzIoxjG81PUMk1/CfTij
+HgklKtLlbpOHs3m47/28AP2sf6kESKxBwzjgdSyeSci2nCuPoeSfLTJBJlsREL+z
+DaJES4G2nj6r/rXX9YHnuH9n0hNxFyhcY0ztsIyz1wqx0kiOYHnLIpUJ+2TcR/YN
+mFCYqZ/co98sDMUAEQEAAQ==
+=Pb2+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
new file mode 100644
index 00000000000..31ae54d10f1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
@@ -0,0 +1 @@
+184454fad8697760f3e00d2e4a51a45b944ffd51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
new file mode 100644
index 00000000000..30cdc0ce87e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
@@ -0,0 +1 @@
+cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
new file mode 100644
index 00000000000..a7c567b4543
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
@@ -0,0 +1 @@
+08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
new file mode 100644
index 00000000000..2aea540087a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
@@ -0,0 +1 @@
+a1885c07a3204611fb184ef7098a31f381819057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
new file mode 100644
index 00000000000..8c912e167b1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
@@ -0,0 +1 @@
+76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
new file mode 100644
index 00000000000..2c5245290ee
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
@@ -0,0 +1 @@
+4d2db2916149baa9d0c92f3731474e5e7c6b7034
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
new file mode 100644
index 00000000000..8dcc39045cb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEyOIt0BEADGQcIcc2Z5FYCS4OYZzg3CobJXOUoFCf8isSU7PzvK2I/95N1T
+NjlpP4P0SkLZrGmJg8T+5+1I6yNOLwanTQ+cMayI7/xPfINNDZvU8OjV708R3gPh
+zE9Jmxn6aDQ6ykbomXv5EFcSKz32tJWCyYAB9QGaS5SEsgO20DBKYTU9U7SbLNe8
+qScTQDkivUA0xIe3WVEZppkRZ8xi/wcnf+zoKHWK07yffRvOKy1DY+6oYo9slVT1
+QIwwbM1kwPfeZ3ZvVmn+KfdTAAaj63aqs0eHOOv1OugIqkrCJFkkYUf8lSmtqtTq
+YCmRyvecsxuPLSSblf2KpW+tqj22JMCQ64sKJAGv3YGFZIQuz2Ui+FGZFKwPLAbG
+niy6TZSNE8J9cZobLfvS6zYC4x7Yh3CYmS8U/XpTtM6P0QIFZflfFZ7IhkE4gdY6
+kOuG6kpL01miNN9Zm0yg2R4dUReDq17zaOu6N42hkWV7dGuoBUShoTCeUkKixiz+
+Cq1lWgiqRosrU/yf4c+ZL15AQ3IVnFyNzR9EvybDSaQDdPaR2Zm9GqHS/5R0iPYl
+G1ULZzWU0TtLD9Vy/PoagLLiWtZOHIh+SVwNbtl1GpPhO7NvtXMfbD+iRc9fk/+/
+ASjLYWhiPcJe1EMp+lstaVDym9sfS3cd6jTCehcZhjC1W3LDyvQDp0q0XQARAQAB
+uQINBEyOIt0BEAC71l7cbfkaQpI+Ad3+rkF5RJFWj5ZjZYBtxC6xVdal1IY2sFnP
+viqzd/O6oNQ0HZyzrWTE66y0R4/zAypP/vko7Ynm2/7FubM3Ww/KVSqEVpSh76uS
+3IQBE+wJtbXesNGRttRBMB2HS50nuMPO5LIn+4m9WKY3lxrG1pjBjCad9u7K2cZC
+bY/u9wN44z/FkxAljujIOFpAh6epEVfZwuO1az+j2PrPYUwmryLZ71u0KLjnWpCp
+EEYA9QOlkAs/NoWAgH7aVvXTOCjxESjeOLT6OAXV/BPKekaejhSKRIc7uJv3+mp2
+X85CyrIZ2wdlvk7P75ZG/DJoqW8rgyUtX/GRjEHFNe+s9mRgVS3gD9rKPoFasubK
+jtDK9+Btb47oaTC7+FE0ekTdcTGkUaIL8oEZKc4wKy5VxT7TzzXhzJjVPb1mXFyM
+jNQzAuAScbcas1cBWo43yVvBHWT32QUjXq1thRcjia0lVFPuBc39nzIJplMwZz7t
+RI7nZHE/vmOEnatnkd4Nl3i3XLG+QiHscO0an0983FIPN4YT4UJRGK8r/ttefQon
+DRXdeU2qdq2bWq1tmlQBh1FmniRvVYUR9iyC+rf61DCqdWMLoVb1t5IKRBM9E2/Z
+zs2nsHAVg5J1n9xluZrlN4YCZ4HOz5tlJIhHXhWr854sK9AEhtUHW9tIjQARAQAB
+=Vbcu
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
new file mode 100644
index 00000000000..3fe473deef0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
@@ -0,0 +1 @@
+7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
new file mode 100644
index 00000000000..ecd11ab7368
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
@@ -0,0 +1 @@
+908366594e746bf3c449f5622be5d98f751f4136
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
new file mode 100644
index 00000000000..68514c2f582
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEwMV84BCAD0u42clJ3hghKlMGwFA8PPlPgSEZjyvs2dRCF+dKWBaPUnR88K
+kGfWB66jX6PBtHzeiVRa078lL002S1lSth2A+s1UfYGS5wVbE938wO6PCMwgoXJ6
+0MCLsTLP54MDlly4tq5qV0Zme1wH+9n/AC0fbKkLsEWbqXhNJLJ7F8TUh6hPziko
+mLAZCb297KeEDJ3tFN2zkzjx7V79/nkA1sKHQC9INdj5jXxkglTwZhcJgPbxYzCz
+nbGeczPxwzNrN/elx0DDnKEpEms/nURfXETsnd7t2xuUuAYhpGIadZOM+LojhP/A
+Wp0KDHsiSc5tQ0oJE//ydBksCEKid0Tu2bXPABEBAAG5AQ0ETAxXzgEIANGJ24GM
+VmW0QcuT6ykJXtjrgXW4HjOEyylQ6LQJZcCt42tNA95ZhAAiNgB0CBBUuOne7y7H
+5IW0wxnrO8qOStqvjbkUWVheqA3G0AlokZVWQRk1LjmBlABJVeHNBle0248pwrXe
+0lY3NVVywxPE1ol9DOasldSv+nKyMcRFgkZ7rPFnVaLRLoozuAIDwXXaRPczN3pg
+iegwo9BLqYV5+0Ncs24+G0hO6iTToX4166GvjWa0e0YHuJ/zztXPy9CAJ6FMJy4Q
+2ZpyfmIPua653srMDty1igFdR3TVNd7xIvyhw+laJY9GxWM0G86JOCpZhrTWDDZi
+BhgL+sF1iNPcC8kAEQEAAQ==
+=JV0b
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
new file mode 100644
index 00000000000..c1f484387d9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
@@ -0,0 +1 @@
+a4fd709cc4b0515f2e6af04e218fa0f6a941a037
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
new file mode 100644
index 00000000000..d5e2fbaabe9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFjDR2UBCADDfzBacBg664xalF55ghVkhxxwLaTNUdvTJ9o0IH+cGTRj7EYr
+7QvLVa68PKigj0q7SVVwhPT7fzBLDosGjHef0UWap10ynqACBoAYSFocT9m3Www1
+nW4AGT/5chvzYfNPpN7YZ2Hkk6DUpmSzS83+6nIYdCAgrcZ5XS0Vg40vUL34TJPy
+IxJinqWxt4A14ZryqSKWbWxRcocmpCAeRLMLNxbQq5rKjjxFksTYR0Sj+t47DQsB
+rqFmnPnZFExP+Q/KG1dKQ4UE/LyvzoCzCqynuMg7gIlMuRBzDv8QB2f6DgViAHdC
+vS6m2YCTGURCQufBdJOGuGplL1uxqoEW54G3ABEBAAG5AQ0EWMNHZQEIALwz8m2S
+GdANvkFLVqXdvmOZ1RjrbrzrIP/iOjs1Bo+sD94L2qUagd+/cKjvGR2cFP3g7Zci
+YBAZVCWZpgmXTL4tL3PSZg3NVvkuXut3MU+23ksjlkl5Lfzlq0Rmidu6I1TgBsXc
+CyD8Yilr3QKtQkD0l94uXX9+Ex2PuBO92qFpNqib567wSt8druTewYm270WlAVSc
+YQ3rJzdmzJD4WT+PyKm15NSLID/wzIHxbgloe1SVs8fNmNfXP4tq3fyOY6wUnsTO
+lj5hfBuEJRiRZj1H2Fch5iFtyc7kw2pH7jhXvOHoCbztjXgA1KgAaoVixQhOHMWp
+NZMy+qDbDlmblV0AEQEAAQ==
+=rs0h
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
new file mode 100644
index 00000000000..e66ffdde36d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
+NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
+/HVNFvTdF8LNnuF+a5aNgg+jjLvFwzkyMFkuiPGuUDFnqEGxC+z9J8t40tpOTOIw
+tPjSzkDN41AJDpUK/simKC5F0Im78nUbwMalE5z2IsZRWpYZyIhN1HhEdDvaDIh7
+3vENjH7enAjWh0iGRu+GTP/fayZnX0uhmausCCwMMhsr489e63ZOaJrqeC//wWrX
+dtEJjcmvRmJ2hwLmgwMP4zSNKsnLGzP0sh69ABEBAAG5AQ0EUzW/0AEIAO62SMbq
+gIzEFQEHlxNN5pZHd7msqDESILFYFkI1mxlkD0twFWMbk4nMH2VXhiuT3ulqKBOU
+UUNQrO7egtfbGsgVv4bWbUHfeZkfvoWDlmbrvi1YLlR/ZxzGpCNc8e3aOcN3XKHl
+BwfUaco6pcTBvLpKPA/TAjkTOtK4A5Azv1CSwpzSJf2bVVbrn7mi/rw78SmZAV2/
+rtiOU5a9S+3fzswLk1PO/z//d4VoCcL2s2WueVO1Q99kejkE55l3lYwEiBzVuAA9
+8Q0a5wg84vRGFZQWLIw8c20On2+dZcTLZc61ZjnsI1LSnLUUyQ/fzHQ+BynQF9l4
+3ZCPKFIl125MGikAEQEAAQ==
+=9tpm
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
new file mode 100644
index 00000000000..71760e28d01
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
@@ -0,0 +1 @@
+19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
new file mode 100644
index 00000000000..dd224857c0c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
@@ -0,0 +1 @@
+e05f005af50ae94e69701222b9729775c0352d3a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
new file mode 100644
index 00000000000..c77ed505b64
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
@@ -0,0 +1,10 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF9ZHHkBCAC87FdE5p9fmsIG4sr88XsPIax9ZGtDADNjlgCZwg9FxjOQIzf7
+KAHWZOZ7EAE1VYQ1xHLN654t5n21kI8Qtnek16bYrfvBVsbD9OA87G1tSVURtORH
+jJAbmsH/Cbkfzghme98XnufB8f0WqkYqgAJNmJ2Q7UVy9unLDO1UWOCypwpwvfdc
+y/vFYJbhBi13M9UAPsqUi39Eu42kHDGGrBPZLkx30H8sghWlCDPK+Ed82gj5ZSi3
+LGEktGOrDCBA4rORuR5jzZxdK1WyDkU6p/v1aU1iSUHfnU3s4C8tp4Tjj4Zfrhop
+f0fvmo4c7t+kk6iNfXIJMeGwXCTAMrTcumCJABEBAAE=
+=YY51
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
new file mode 100644
index 00000000000..47a0f94ec37
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
@@ -0,0 +1 @@
+c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
new file mode 100644
index 00000000000..b6ee3744e79
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
@@ -0,0 +1 @@
+b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
new file mode 100644
index 00000000000..76e9e5c4fd0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
+h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
+XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
+RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
+XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
+MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG5AQ0EVgWIwAEIAJ29KWGH
+aEt7gXV8EweJkrYd02nwjc1LyjUT2TRwEzZ9N9qUiVqfpkgnZn4mpHCToxFoqkHa
+iv/QDfj7cp8jbZJa2wjaUkDbH2pZqLBGJ0sUUBZ1KNPM2uhhWRzAnmF/bIo3+Yfl
+hGINLNqoevkYoo9cdelP3hepef4+PUuPmKmeo856uknmaWQ89LPwLlV7oj6wiqMY
+p22sHqTGAgXeR/fSLMK7d0vSPm+57LZed5ECoRMeqYFUwSMV64RjTMkKPsvFBGvR
+hppJ+uWQiMjFFuFq2DFeNBVtueHSdgCHx1TP9i+x+7JmYsmFFmRwnEdbxO3THFXa
+gFQGr4ima+oOjLcAEQEAAQ==
+=b0N8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
new file mode 100644
index 00000000000..f1c8281cae8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
@@ -0,0 +1 @@
+41d266db4427983a1a4afb0c3684155e9365c30e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
new file mode 100644
index 00000000000..8c2512e5bc9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
@@ -0,0 +1 @@
+e2acb037933cdeaab7bf77d49a2c7a98e457c53d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
new file mode 100644
index 00000000000..470764d3d50
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
+rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
+kMSzmn3nBbeacv5szjB8dzF0ZGPPgciGp28KYrjfPbxrZvnX0PgL6C5RqNkI3cTh
+oUZgYqXGUe/uj5gUiLr+eZvh5lajPqe2YF9fmxfRXklmX47TMYidFkcQKGwxIM47
+7AKa5mKCp9MPKmxA2TG5F74sOwtSe7PYfzraVgaK0GGDJhm0Xr537EdtJfOpDRJF
+GizM3hYSgOp3Yo1wjPrkFA82EfB4hCNZK6ipABEBAAG5AQ0EWM3psAEIAKi9vYsJ
+kKjFWAswJAWCTTsYsfU6WPtJnErx1q5ZZa3uYXibODcs9sd8LhmJD2u8iAQLtWuD
+l/SC6nln1ikCRYy7v1JbENmJw8gWQqIBLjmma9v5GPUe/Dg1QSJqrem6VEjNtgsz
+GJGr4+GDSCJN/AkNKlyMFgSdpRrMCBZkvpwnvSM2EFbhxonbtD/jvqSlx68OY32/
+2cesXPvS/Nj8RqQfj0RxcOK5AHGKFQGoMgK2NGXfAxdOhPOA3I2NwfQLnCNbAVbP
+OauNcV9tg9vbRg0l75CAbW0tmM1i/8Geh248QAlQL5NtApB3az11wbCEMAoFRh8m
+aFLFtTJYTnKgW1MAEQEAAQ==
+=kryq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
new file mode 100644
index 00000000000..93ee42e81e2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN
+OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr
+9nFrAB4eDW0UMbSL9kPmclUm/yN+qcCZBrsVn0q6CWb/Kcd8EEXEu6sGILzOGqGe
+d433t5O+tGXWL2TjAz+Scsk2Hf4zcuDeQcxELAMnVaVgKuGuEZvibrjsdIvJDGI+
+0BzWIu8ZP8ldBl4SVtzGpEVzLvDUo3mOqBeTkj3rP7xLtFDN/3AFtowbLfL7L2Pg
+SMcTnKK+jfFHRfbHP1Ih3rQ4ilLzhCnY/QIZABEBAAG5AQ0ET7FnEgEIAM3i3e1s
+jwrx2PN8XYMPQWG+/YTtw1BYDl2+iYE+LaZvtq1hpbgeCLgEVwXrCJ4spLP1rFXo
+gWqKrkJ0LRjlpdKhKBvyH1ex4grh3cWN/bIDJcJ7JA4I/Bhqhlh8hYycS9pGFeS+
+MR3aFIsii+vadrwYYvuVYGeWvdZhB7mJKYevj5Ms0OpYTfZd95Pzo4o//lNpDnrG
+7Xd3tgTNU/fkpw6rFB/2Ib1Qlk+Kz1z6JNsp+tOPGGCBrzwfwglcikTuqS+xyRgC
+9cHh5eCol11uSoWPKcQR2Ar8Eo56nxv/UApdu15iJ7R8cA5guKeeS4jt0CGCPs2P
+huggDxI73Xvl4zsAEQEAAQ==
+=mB9L
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
new file mode 100644
index 00000000000..ad9eba9afc2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
@@ -0,0 +1 @@
+4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
new file mode 100644
index 00000000000..07c25468d0b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
@@ -0,0 +1 @@
+3f2a008a91d11a7fac4a0786f13d3e721d56bd54
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
new file mode 100644
index 00000000000..2a9be371555
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
@@ -0,0 +1 @@
+3a4d86c56ca99373b6d8953dbe84d764623a3644
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
new file mode 100644
index 00000000000..4dbf1af5455
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
@@ -0,0 +1 @@
+d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
new file mode 100644
index 00000000000..c438265dedb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
@@ -0,0 +1 @@
+4c5f68d09d42ba7fac888df9a929ea2321fdbf8f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
new file mode 100644
index 00000000000..26e5c66989f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
@@ -0,0 +1 @@
+d477d51812e692011db11e66a6ea2e2bf22e0543
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
new file mode 100644
index 00000000000..84b1a448f56
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
+xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
+N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO
+XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM
+XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn
+O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd
+FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP
+sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c
+C3s8XOaBCbJbKpMAEQEAAQ==
+=aVY9
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
new file mode 100644
index 00000000000..bb7f0d9e77e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFim0TMBCADUsNfz2e7p+u2TxujjDjXRq96EBdJ7wNrVjrNneF+8roo36iQz
+KWA65eNzZ9DP0sFlhRwXOopm/AOh5VB+Ex98W499Esujv7RuiZZ5zYuKr54k4fVM
+Ei5P+byCXFZyj8r3KRQmGXwpQBHrSl8R/D0Cc15pH9JAMh/BAXGtpnRGgpg32sq+
+11MO779KSUgcZL2Cqzn4U+0SkTE75w1Srp8/Le8XIIy+0yyS3AbKEARwBgpYJmO0
+MsaWSa4I8PuoO+NK5rp/u6zuXqfMWnoPcgk1Tl1k0KPqvEN+zWVJl1kHD9AClN13
+6oJ+lm25PtKb4aKtHayYs75fgeVCkiCOIuljABEBAAG5AQ0EWKbRMwEIAMiFUp/x
+c0oSAYGw1Xf0cYp9Q5h6XFJa+LW1zf/ZiAqtrpVchkkYThnmCp9yxpWxGcTGcleJ
+bSnqIYe7qkqNatC/rrAfF5gcSok0DPcS7i56DXjX8UM+KkgjXwsp4Cyf5cVMLLow
+RYa2hGOSqt6OIEfe1uDQVB/Nf+/PCUNW0pQeyGlMrxljmhxVcJXVbSTTJvicToen
+MMM8NZXDq7Pn+ubpBfPhQC9BnOiunMGMmeFFyVvx98rME5H5sMigzDV+NYll4rEq
+i6u/NKIsESwXhbrY9ua1uXToLk9g5JvoCzUdF2jBzgins+emuCeie+75FGWxsbfO
+NtjbeGo0avZ9Dk8AEQEAAQ==
+=PKxL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
new file mode 100644
index 00000000000..2a9be371555
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
@@ -0,0 +1 @@
+3a4d86c56ca99373b6d8953dbe84d764623a3644
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
new file mode 100644
index 00000000000..71d9877faa0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
@@ -0,0 +1 @@
+b01128c8fd304fe48e6eed2c347cd0eaed975c5f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
new file mode 100644
index 00000000000..ecd11ab7368
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
@@ -0,0 +1 @@
+908366594e746bf3c449f5622be5d98f751f4136
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
new file mode 100644
index 00000000000..ab62f210dd0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
@@ -0,0 +1 @@
+3dbc5d7dc2fb8dd68aa429bd353a436e043e3145
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
new file mode 100644
index 00000000000..5292cbf2211
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE1/v9YBCADaUiBecDzwU5g9Gmn3T9pAa17OlUl2iH0zn8tNTUg++bW/A9m3
+lWykQBlvPOi32lqZ5q7yewSNBGHl/pHRRVsIE6hhkVigNQbMztRFPshKCU/0RvKu
+29cew2T37crxYFGShYFwiJgOdQmXqhgIai0S2sW0Iavf5/PJJjXbrM1YIqUqkf73
+unns/lIDEiIDXCnGRNJKzGWTPsbt5R3hVo9mFraPUxapw3b9C/2GGDT/mwR51IOf
+rHkQby7Uh6XzDC8jWIH/BrFT6gFRZgKn9BRi3meB5vPip0rvcxPQnmvi2R4iUIyg
+DvCsUpXr6RpAEK6/p4k17JeglxCDlAbTDLUHABEBAAG5AQ0ETX+/1gEIAJsFRfWM
+DIoJMsLPltDrrPsg1lpl2RFQuPqjZfPM0AAiAJTB/UhRfoMoijggV/m5r0y9d6LH
+4XhCynm+2VC/6TTxkvMKHAQroZFKzBKjvpCKXYaLgiMNi0XfsQ8p7/0nEUA1XXZD
+Orol9JJQ+3XxaQv3+64u+ZiZY7JrcH9MtytyVcsqOnQe8ST02pnpjwOIqh0TZt+H
+B17PWraDWRETspAMfbmoZSB9vEBiHsSoELZYywFxcsxB+nbMunYONTjp/14MRKKl
+xeTLlH7CfJwaGV/2rvN+dKOymbg2uA4y/wrZrOJVE3G7IP5ehQ/Pitcb1TP6Q5LI
+SdAo7zGFslS9iD8AEQEAAQ==
+=6UHu
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
new file mode 100644
index 00000000000..f700439be79
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
+P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
+ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
+fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
+C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
+itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
+wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
+wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
+J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
+Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
+bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
+kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
+L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
+OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
+SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
+mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
+YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
+=A08o
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
new file mode 100644
index 00000000000..8e917d9b89c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
@@ -0,0 +1 @@
+bc87a3fd0a54480f0badbebd21939ff0ca2a6567
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
new file mode 100644
index 00000000000..13e597eb156
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
@@ -0,0 +1 @@
+e9af5293c334c7c0b583227d2f45f85cdf082e68
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
new file mode 100644
index 00000000000..ec5761cbd92
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
@@ -0,0 +1 @@
+f254b35617dc255d9344bcfa873a8e86b4372146
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
new file mode 100644
index 00000000000..c8186e541fc
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
+C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
+q2AaCtuOk6q9OtthQX6LfOuGqwbv9uH/KLUDn91PrgKuHPVfVveiF30ZvwCggutX
+D0jTGRHzUJl7F1wViuckHJcD/2z76t0ObSuTnENi0IUjF3Toe4tv+qO+Ljs0knvK
+tu1b8A5Bs+kxNcbEqV+zdIph+6gCL9jy+dB9J+t6uZg6ACJexbIkDPsutNtbAVDV
+w5AtM7JR8930dRHfEt26ahFohFi+73V8RiA7LrmMjA8rX4zuo5Pr48xt/RR1Y/VE
+8ohCA/wOqul9eHHevxeEMDYoGVjGl2EiuIThg4eYuQDDSisBNb9a6dhE8ECQFFBx
+mGz32+I8gXSTKFAkkQUI4HmJmTX35nGJql6E7Bn5yM2OaOG04PV+xkhScJll5ZxZ
+BNEccFDL/aI4N33cwrLHyk+wFNZHBL1hnHpxpjFZYv5xfEBjmbkCDQRHXXXPEAgA
+yqEz3eBEKiZ7VbAj96HtIvGufKTdZ0ERJtrdPO4FUGVBcXpphtnPn+JOWomszUKk
+KLO4x24OaDCG/SENsPy+Ned4wjBB+4uV0YEc5Xn8gts3g4Z5p+YiVu+aWeYPPC5B
+PU61tVqc996i9ZYkZiYOs9F5Z+dKozk3KwVcijaCr0IQMjAtJ/N70zcciP23KhrN
+9Z3Nn54Xm7GezD0nxTUGP8gM79zKHnVhDBptrxIT/adCzU9/UX3UVAQcdq86FfzT
+EpqFG3TM75HBTQgHihIkkirzurE+ivh6aaF3UJwmDBe5Wu3gvxF6Rl0Ja/YBNkkC
+iOXngXSxwvUUR8KJO07RGwADBggAxOFV2DfMHsTBu++gKJ94L6VjETfVFEYPo7e4
+tO2Zn2Unzdxz2BoTJcQY0j6/M3Tl9hCwhOSVVL8Ao/wp1ykjgXnwV4vz0be4d/ZM
+L+KF15x+8730H7Th+aR+Ug6K6Khsp8XIypmLJcYgYLD02PlSnDxCq9Fbv0JDlbr6
+tbsJiVzoRjg+WNEIB3IIrJbTIiOFrRBhloinYoot216QJ1rI2nQpMEBlSuX6f4jY
+F6F7X4dAY4V4ohjFeJCb6SYkKbj4caqBA9OVrj3vh8v/vAUKDB8pqVhpaZicFpMd
+2pEEYVMEU4i1sLE3X73y9RRuaJOvPAx2HHT8MlWjsDmNdY2Mgw==
+=uzlX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
new file mode 100644
index 00000000000..7df0ed8dc7c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
@@ -0,0 +1 @@
+817ea1255546d6070a23aa00db45d3a62a183ce2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
new file mode 100644
index 00000000000..4522d929446
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
@@ -0,0 +1 @@
+d9aa7402ba75f78720d975211d185615d0a84648
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
new file mode 100644
index 00000000000..39e3d438ed0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE9WpyoBCAC7yailtTXVEkGsCqxTvRQ88WHmCGW61P98/b56/+q2+IyQZI/M
+9HZNm/fIXS4Ww2JgfhXMGl7oL+l2sRLfSD5S3e6A0GVg+HMdZInQjL+e1zVA4S+/
+FDqAjl7Xzk5u9Vdx6WFjCHJ85F/bUmgXDvpJXyfDFx68Nr+ALlO6Kzpz5rY/04bw
+o6xEbH2/pU/D1mkYp9nVX6iLZbit93GEOF8VvhpFaM0amBBpdvI+v4vTB4MCIjz4
+JGz6BIzFl3ueCxfx0LkkAbH4ah+sqlT0RnpStKaSBavVmh1iBr0VhSnQHHD8ZIzV
+SPHGT++lsGdNYXfyru882hLLFXxHh/DNyCQ9ABEBAAG5AQ0ET1anKgEIAL/Ind2F
+n5bIQn2xqAyFDMDAg8ykkehDZ6NOUTedjBkf5kdWI18AukNoR0QoA9dP4cmHQqB1
+m42h3f8V5UIuUP8lKdDAq501sQKbwrIA6Zc2yuCxH+722nJkb+Re8rL7zW8LC4pX
+NQOUbCp6U6iMul57cuVCWSo9lp1gINwWYRqddqBELZ0aizEr7s4+ky1ti0MzTwKQ
+UZuHeLZbqml5rQS0KYQewaLDMo319/J7Aq6iu9kTV6XDucgpfBplQ1GEq7rf2K2P
+lx1q92m5rffyCm2AYB3du9OyILiaHcO97KMCun+ke24T7bLnGaEtvMjpwo5PdiOb
+8cUfwk+UDJMcvRcAEQEAAQ==
+=fVYr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
new file mode 100644
index 00000000000..417448c8d0f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
@@ -0,0 +1 @@
+a5bd02b93e7a40482eb1d66a5f69ad087600b22c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
new file mode 100644
index 00000000000..8f7648dd909
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
@@ -0,0 +1 @@
+517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
new file mode 100644
index 00000000000..07c7120ef60
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
@@ -0,0 +1 @@
+3692c12c7e3d336a452beb254e066e0459cd109b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
new file mode 100644
index 00000000000..e684cde6e14
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
@@ -0,0 +1 @@
+670be7d076a0c89f5f07625ae57428da9e879e7d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
new file mode 100644
index 00000000000..2145fcfe24d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
@@ -0,0 +1 @@
+e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
new file mode 100644
index 00000000000..c2ac0348e6c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEPspSsRBADdguKAxMQbA32vTQrCyONR6Zs/YGdvau2Zrr3SSSSR0Ge4FMjZ
+4tzwpf6+32m4Bsf7YIwdLl0H5hI1CgT5gDl9kXvfaFUehFnwR+FDyiBRiyHjUpGF
+4dgkQfWy9diYeWGtsvszsvWHXtED4SXb322StX4MfJj+YesA1iEdTiXK6wCg1QDa
+RucfjC+kx4zPsJwkJOgYpyMEAMTiXtNwQcke6nIFb/lb5374NjwwVAuuMTrRWLyq
+5HodugEIHaw3EitQWtnFfXNkXTJZzS6t2HAGv29UTfhiBzKdkydgCkOk2MLWISOV
+fqcg0tNIp5ZJCmUHg3s+OFNSH4oUi65u+FyDseUid3OKtPI+ZhIk8N+DjOIg2Kvo
+/UALA/9q+WfBd7re+W3iUtU7TutUcwbKsjP+jpaJeUHg2ChOBxVfQKt4YlPHVdrR
+iCrfNi90Z8qbsZ0iAXuqexrfMq20pAPmpHRpe54mmP1CMT5m+Gq71eKIfkUrb3LC
+/zv08dLG2vm9oghd242wbcifaX+t7AhNAIpe/WTvQsB0gpdO4LkBDQRD7KUuEAQA
+kPbkBaDBw2AEUpiy8TFBoYiiMgYnKfgJ//lTfRy6L8rt8hTsm3I2Epx9l0KuHaEr
+H7Hcf91MXp7RKtGHMpXsPHSPvrKEccHUCTbmSNHGhTgmT4IbSb5tE1MX3HP2TUAt
+Kbdj4DlGo1TXQrp7/kqw+5cwZIahCAnUfqD+LzRZ/w8AAwUD/2YjG7uUxqoTU4Ts
+R4CweAuyU1uLSH2mMNRU2/xtzU6zaAE9okPwHz0R6F5MfDo0w0h7vkdU6kqThQDS
+C84GvEmoKvXzIUkEzmwiVoSa4nBk5bh0MY5HWhLmqAT03OmbIqET5+79LXCbLRyg
+vrrv7XFlyes9tQUPiLv9oPWvyomG
+=9fsb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
new file mode 100644
index 00000000000..295ba04bccf
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFwGkIQBEADBkuDMpFPE7nepfcYCWYYE3htn9apn6TudnT+GgeYue1g+XKct
+c5fq/TiX0OOEpBt9xKOikSOwMTgdW6A2LKm568qgDN79wMleHFHel2VOiV59z8bH
+AquBxLk8ZV26QODEjm9voOMXsf/qe2Y+lRiulL+TJP9Ze5LklB4s0rc7EKERLhQ6
+EQC7GXDTp5IY5OHp+ghXknekjgN/KbQqmZm892qQ1qgRV3Rb54CxPJeEebWK2epC
+wQSjGraka4Hrre7eIB0Uuhri2ll9O03eaBqTAQzVdz5Chl1WnbGWsxIb7tL+rw8J
+uO+R2vHazZZIVoRSXfsohPu/ZkmpRZXp1IPLeJWs3Z4YeZ6w/PDCYRx0rbSlwT45
+DUQQ3AK6iT5nh7FqPAnYom1JXELogw+bMQtWVSGHujazC62cox9UmvZdZs9H+bIW
+xRqhnqltuZaON/u7bKsHZWLifWJOd/8D/r3u+Ly4pf+LNyQY0cSC7hfcwg+s8cb8
+IbyuNIAoQvOfrwgjlHqfeWErWe26aQkBjtFtiI9AytkeofRFwhwjzBhCa3L8xMIX
+Ee+1y7yrvsgyblMq0be1+amQ3KXdf7TI+6nar6Hy/+G95kMvynwzwd1ph+CyXF3p
+Ym0u6Mgu8CEf+Bx0YZSEFfHO8r8w+m4K5tQIRE9fOYs5s67+FdTOqXl2KwARAQAB
+uQINBFwGkIQBEADlNOAuQwbGmaieY70xxnlYRdSTbpi8Cfa5/1AbALahr92eE0Rf
+0cHnKl6ysWpyFoC8EzzZhcltrOZUUwbKGLH7I5GXddJUaqH4o0psHahG+uZVRjHm
+H9/ARmKCRvtWlSmOHKhZfIV4G75hkJR4Aat3LX42dHdb/JXj7kAfo12Q8zX3B9cx
+Yn49D0VYlQ2/0awdvhMjsiv217LMzqqsb7RGHNnPfKotreKbLK2r2nVVCMOjyIVB
+58VChHvWfA8dSe+IQq9ZPcSw+sAGmNSNk0uMD/lii3nTcHrP8pyubAB+m2qxK+BG
+WanL6YDb1QZtZS4jXdThycoYiRL6/WLftspnR33NbNSvUNzZ6BBGkz0tW0TJXd1u
+FX7zpKdCCtVmiRrRqGRZOL8cKWsZXgFyjZJjlHsedowqnoAfLP4SDliHyU8hRVRx
+Y9dHarQ1TKeIKb+kb7IlQuueptbOmm+twdAnwTOFN/Ifz2nDnXTwhfuXbhuAw0am
+mOJhK3FQ39Wy/oDzKNCYQ7Tr8Ea3fdZyHrcfpPYOg1S1UzP6zs6B10wkwsShMlSJ
+v5BoVQr6a4dbhxbSl2OtlaIo51Kya8fCXKNzsZEYyTWRMINpZI+cPFG/bREot7IC
+nEiA8SYCKYUXQuH9GZmKmDZl5dzhC2WUcMT4nSPXxI2EWV3quiuQOq5ebwARAQAB
+=6qP3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
new file mode 100644
index 00000000000..31ae54d10f1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
@@ -0,0 +1 @@
+184454fad8697760f3e00d2e4a51a45b944ffd51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
new file mode 100644
index 00000000000..de648a3c373
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
@@ -0,0 +1 @@
+ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
new file mode 100644
index 00000000000..064d520bc4a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
+YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
+nIRoUHucmr10Xftpebr/zaJk5oR8RdaL5FapapmcZmAaHR9CDWB8XtI318u314jq
+M5rKatnAZMERoPugOvvuAOz4bfZKwdfCmZKfYUM/TMSrSinXrGExSW6z4RhtqmpC
+E5M/7OoVfvDynVJKqNazqgigpmMNhOyzAhQsiKh1K0akyxTZbjeZKsdYfhCXvq0q
+k9+KM/cTllQ54MPnFWiObLkHeK0Waw8bI/vAJ4h4x/XM9iGYpkXv7F2/FVsHQdPe
+YJcwD/CkD8KHyiPaRKMeApiUtZsdAHU0L4X/lNmcooea/7ipskruUgwcm+RdLhRZ
+P949t1e7nqDZfpEHy90NiFxmlRAPSNqBLwefxY/hwBgog2jabDALJVcLCMosFWPj
+MQhFlGSIODiVcW8folGIjzkyNZbNMWkwnl2QnWp/h2TAwYQJOMqcv2MG9o5pyzpx
+97Iz1ngq1FlM/gJnGnNUydP2tAjT2L2U3MP1uX/EdRChdgPqdolqYhdFfwCr0Fpf
+W527bUZpReHCEiQ29ABSnQ711mO+d9+qM6edRyHUoBWz89IHt8sCunuvNwARAQAB
+uQINBFrKW9IBEACdAbrfrCWIQ4uRc3rrY5lLpDPb5wWW0JZuir2hf0WcDU8edNjZ
+wC3BLbXhF9ZnGSODpK1q753VZvxOwX9JQ3d4pFLKuQDGVfS/nna+PfGaZ82yyVBf
+jt7poRZnR27QzyPDv9/tDGnQieQF+lDCNKDgQKgfhwDp04Ukh3EG/x2BLgr3Qc24
+gdr5Bh9VJUyMbA6MP1K3o/CRuDWwt50hNGjn0Fu/QnXicT0t1ZsKLA2uQOvbiNN7
+B2CsNoKk3qaxTBwfUTSdjG4oB60cSLY6mAGFpjdFDpA9AHo3LC+YPTFGWUyq7iFK
+nvSkcW2bwu8l1Y6wnnB7cqKMe5nMRsFVNOX7YOE0wjQoyiH4/86bI059YPwMvg07
+elW/6Y8Nmfzb95nddjX+hJCunIloIGNEpqxVO1+ID8WBipOaXqpkyPLqLLCDzist
+7MQuBzEce+OEAp3gJ/HK4IKCcZPSJEsVkrDjhmY5So8OTK8ZF10jIdqDUrtRoz/Z
+QyfqI8zLtdZxoWIfke6HPjdKI52xYa7A2Th0PEd3GbNKOmzQfl2R8JyI4WERzngA
+VwYRcJYde7FWoir+HCpOZWXVFj49NxBQg5/HfpZbWLElB/xOlXFRuigry+vWM4UX
+qSGisNehkMk2EjZUqiZanxjfwQ8bKJQ9k1yeZKJ7PH4yhDABt6qMUwobtQARAQAB
+=RHSx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
new file mode 100644
index 00000000000..d437fadaca0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
@@ -0,0 +1 @@
+b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
new file mode 100644
index 00000000000..d2cefd5e889
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
+FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
+J7VtuhdhIE/+rUiE1go2vkQhdIaad8om/kQDsovbgqxfX6eU2hWL51bJZwCg59D5
+0lXm78y8dlbvGaW0EVdgBesEAJ6rcNAA6rjsi7BUXNIpZe+KF/G/slcLJETgylmw
+g0vquZP7n0fVhZZqB68zSmTcukxo36rd0jr9eSlhPj/6j9xs7gpk/UFWLWsziZDO
+7kZVLv58v6ktK1Dk8u0F9o75pDBjgxOGR7VPVTblur1dIJ+U14ffJ9fn6wzKY8hx
+hZrgA/wIpuJ/aSSns2ccKsErDMPRJP/TGygvrb1Mpfk3tLeGF7owI0sL8L8adKMK
+g9kT/8VFoLzeSeEwUDOKDVm2xB/A5pazoUcgxLdwYs6g/XJzA7y4Sbfcac2W5IZ0
+4WGGUobf5Gp/b3NeVuff+V/2UN1YIr/hlOnBOMQDlNie4loQhrkCDQRE7zskEAgA
+i+8rrcd671s/hYlH3mgNtPbmb6KY21axOKIkwqwVdFoG5nbO5SssW99d+naj6UDJ
++x+mbF8zTb+0uFgEnHlrhjJ3cOSzuSPZ2UY+5X1GJn6tkHN4e9knyQzoAFKNoCbn
+YHzbMkEEyKpziDzcyAuFHEKp1JoHhXD465eX9b/RFcSaaXmjttiGn8bjGhgAiRXD
+5GAP/BLkD+nW0psTbLTraJ3GP+vVka1kwnDN0i7yvpvdSjntNi5xs+tljAtePbs4
+ogWQBeQV3xFD7GwadVhH/3yHRlISuEUNRO/DMK4YFsDYjU+zaBLk+lDka38QnAIj
+QYxhe8eypB8EuiOarDU3dwADBQf+KBZfOx/iCvuPcV3LFiUseNOAbF6xRbmAoJaq
+lxIy3E8fX0oiuEp4OVHz8U02BLsBtH4LIpiEj2/gyELx0P25GhS3S5UtfkNvcG2A
+fNZOtNlWW40GI6gj2KxyJqOaXAkfW+WcPJrgd+gH+9JpJzVfoTJyqkq6r61r6UNo
+gQI2nrhroPjv225TyA8xFuTyShdhRo0WoMP8tqZxDiWXsGzdFciPaLJ3GPwevVT4
+dCpbCvR2XHh/vVuytwC2p84O/Wrh9TUoT35Xe6vY2zkgGg9adhXdj47MDZG0BWqF
+s4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crA==
+=2muo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
new file mode 100644
index 00000000000..99756fd22dd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
@@ -0,0 +1 @@
+7b9751fc3f01f134f476464cd0eb627d4885ced1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
new file mode 100644
index 00000000000..0a4a397e1c9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGFKrJsBDAC1UjHBJhbtkcSQdZSM4sC88QLamu7CTgEpzNfhO4QT7T2P37FU
+dITcwHUOjrp0blADnBRvmTGyPgQnljTIfdeW9DX5sDyiOdMtJ/qFP1SmZ7/2XiSe
+9wIVIqsk9BqE2dcuMnr5HbVSgfC+LEpWDhsK87pV+j795+yrI6S7w27wdwPou6NF
+dpSoaRSo+bPJZmPfKrX18xo1tNdWCOs15itIXvkL0+F2wV7DWTjWnZ4CAPWjf1LK
+l2WAtfae2JJwWtsve9SCZ0968z3oDjv6oJjL+M77fNd7WrCWV1enZBEt2pRlePtF
+Td6VJNJkb2Cwz3e+Uyovjh7HjBjmwopl1MgpOCMVoH7lLztZYLmM5vg+FdKiMwkK
+GjzxQV/6/7dnsgb15aKQwbxDCGMrw9gT98HdE+DuQTL2gdOk6PyaOtvkVU/uHkfT
+mvAUlrhRi2srMvd602Cwy9G4bPqjQp6Y3J1oIJz+rhp793Qee9oLAAjPB56YvVkR
+2AcJQ7FWGpD/kI0AEQEAAbkBjQRhSqybAQwAmIHLTS4faYQ3Bshw9QCCKiVkCSWT
+XWkWstXKUAZyWl9st4FiyOMwygOJIpOQkBC9kDajf7rhEG2gXAHX6KwDXcIwDnDP
+T4AP0WDImQI/sp/b20lcP3pEREa1RJ47i0s/t7NbQkIvGgDhAXAvamO7mRxYK70Z
+SbNqH/r3h43rN15LkbjPv9I7ZTJ4zJGezP1jLyHSmGkQxOUbNQvQXYHoPpN2TzwR
+BNjkaDUV8y7cksrJz40g0L1TDycjDOqq3jJgNDhKXnx0mluLvMQph/SZxLo0+owS
+sbY45h//r0lnyjEzZAawXFtydU4ccUinTqQP9gF7mIXGttMv0iXZTV+cSjRT4KMM
+f1BIzVgvuKSf64WrWjAuqqgj887A/mTdZMKFJvNstVUM0LbhllvyhYZzOv8fx4lr
+f68q1WD0l7xakkG6IfsVfIVimTJfZwNMMBxTVUn5XI4ntAUnwtt3eU2PxjWGzzw1
+qh51lz7t2lVf2y6A/A06kXxtj2pkNQE/HYWvABEBAAE=
+=3699
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
new file mode 100644
index 00000000000..07c25468d0b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
@@ -0,0 +1 @@
+3f2a008a91d11a7fac4a0786f13d3e721d56bd54
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
new file mode 100644
index 00000000000..2aea540087a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
@@ -0,0 +1 @@
+a1885c07a3204611fb184ef7098a31f381819057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
new file mode 100644
index 00000000000..b669eae6ab0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
+wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
+ZXaRUHGWjU/lVwtOk1J9GokIFoqtWqBaQMgNRTyyHKWKpb6xxjlzkrDqV+a3htY4
+xNe5F24QLFqf8QiiLq0nDENPzvTNNerZhGuRCHtMgV4eih2iNzmqZL+Ug/gmNzyw
+vu6tWGNw883JQ2HoJr/wC8blJvDJYiOcahrZ5enQKttNKXHiodvL6CTP6q+CTa5t
+EQwbsUAih5tndvgwKkpqVM4aZvFTmAw/AZavABEBAAG5AQ0EV/NhAwEIALdwrp4X
+XrmQqdUmtSx3suIoWefd7iK3wUY4Jzb96MDOmHycLoDorhCcErhX5OIhQfzL+lNL
+xrasCKsNx0ymsVKMRQdMFUHbPT4u4SvPa6ZGYcipj7Y2ARU90RbVHnGneV2PNt2H
+sVJKamqUsdemACLjf9Tr3HVRNJe2PMRoVRK8GtD9Q8WDxVzbhnKh6Xvj2BrWfb6t
+Z0jpv+EFIcNyjAAtIedA/nONOhKnaOZGbfIk2PknXvCvSIs5Uq/bUcauF9mmtluK
+t9k2odvmZufup7rM+dSxI3YmxQ72cuik1LLDYbKSp2B0sHxi+uN4YMw2cufKso6T
+Qv9rSUxjx+Ee2gUAEQEAAQ==
+=f5pB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
new file mode 100644
index 00000000000..da7007bf710
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
@@ -0,0 +1 @@
+1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
new file mode 100644
index 00000000000..6b5fe01a2ec
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
@@ -0,0 +1 @@
+ce8075a251547bee249bc151a2115ae15f6b8b72
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
new file mode 100644
index 00000000000..6df408b8035
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
+95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
+Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
+VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
+5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
+1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG5AQ0ETjlN2wEIAKRxUnYM
+McvAl+AzYn3UUKKaxhvenacyhuxNZzaPbC222PTZd2wAe7jzXNYA1acb4EuJpuZN
+xdx9ijHrNl2LzKt+J+z0N6/5XvoDjON+2KVgOEAHUGGcVWaI+ZlXCCNo7w/QTvDV
+C69VcrwSblC0zjeLDiiDr6pxiy1tD3eYoLpICgcahaY2BnyamnRN8qxYjidc/g5C
+H7nYgZTaozn9Acyvry/tPDamnv2xAJz1MFnRsdkCPkBzVYyDpR0XtDO1ju52np9x
+Hc05Hx+TVDgof6PGi8n8cB0q/WieRQk7F3UJJ/zbTRPYoDsi/hOd/bUqECShuI9z
+hbIEIh/0V9SmrGMAEQEAAQ==
+=/hzd
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
new file mode 100644
index 00000000000..4b8c258b94d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFOpAXABCACsTEEMlNJ65WN4hGR+y3Dy80YQoI6oFivmf2kjOz5JqsBkoDaA
+vKl+OqLNIeYu4YXBFBe6t9YZvcBKAU660bTVuiiC50PNL2z9ZU6GrLNP34uKvyhP
+tQnZdiS+qPBn8X5Cl7XtPqlwUNRFrtqHiBgymwGGTLfhVZKJXXB0xU/UsShSHYyS
+YESrH89xe7LfdW5QAKv+4MxMDDZi/kBWSGGfdgWBvYYlsVmRv4JbKahBMmpM7qH5
+RbTw6km6AO7kOxcM2BfdwmVncUhj532zXgwS6q8ipv9jzuHCeALEzKNHr68dTq5D
+WAnJT764ovyOJ9yQ80wGmzYRyfp7Wctq80KnABEBAAG5AQ0EU6kBcAEIALL602GU
+LU0ekAqKEYqfbX9i125LJ91t/sTh3MFB/SBqfT3/q0jDiuE4A89eRtdF/ox9SYV6
+3YAg71wFx76nWKm/iAK8I9ZPiKSWF1+zBGFwXtKg8emk6obT9KZYemzSrvXpzXiz
+I03CfE4fMqk6iJGTiJKDirQ231fB80zgG/VhHdILu4qnP+zWPDfKhbBMD0zFDbLa
+i46a+5Jz3Ik8mPxnU3m9IYgcR8O+rXasJQFQIewXRJ1ChGAnLEiyZGmaTQ1jU2P2
+eQjlbqSiCFSEQIQV1mJeMxpQavMfYQsQVRNa05mjSii5ttWRKC0xU0gTFYJjMInc
+l6iFinSK3OL5cA0AEQEAAQ==
+=Bp5D
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
new file mode 100644
index 00000000000..ab9b2a13625
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
@@ -0,0 +1 @@
+06d34ed6ff73de368a772a781063fe98bcecb758
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
new file mode 100644
index 00000000000..12ace9e88f0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
@@ -0,0 +1 @@
+475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
new file mode 100644
index 00000000000..0c74062c389
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
@@ -0,0 +1 @@
+1def9646901a1652e5b3e5ea694db6f419c8d1fd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
new file mode 100644
index 00000000000..9be987d474f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
@@ -0,0 +1 @@
+b6e73d84ea4fcc47166087253faad2cd5ecbb314
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
new file mode 100644
index 00000000000..71760e28d01
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
@@ -0,0 +1 @@
+19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
new file mode 100644
index 00000000000..b6ee3744e79
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
@@ -0,0 +1 @@
+b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
new file mode 100644
index 00000000000..13119799a98
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
@@ -0,0 +1 @@
+adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
new file mode 100644
index 00000000000..e41c7cce940
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
+3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
+tHmG/CVFECV33C5SCvzeedzIOSSHy0ybZFrhE2DYXgZddavcxamuRyUOUZAV27yV
+Vyn4RYHSqy9YRz5WrN9R7BK+MeIh2vBJ8Nd9N36z5kBukTLeDZDsb8wujSuMyPGz
+P09gzieX6B5x7biz7Jzotqj4f5KRD0fHbCSVW60N1S7xXFsjZZf6dYdYINWW0Utc
+ABY6T1H8FOfqkd2tcfv4TqNd03vweUiPQnh0v6nWURrQKsty2z7YcVI543l4P0Bv
+/5E3YfT/B/BohsYbakT6nLSlKwgpkHz44+A25seRumMENbcYwi7XFXge1K8pfasE
+Xbf4X+Lngbt8SN7HGHvtepMLlpVIvKhGSCl76Aar/fjc5vQ4Rjd22RTbS6V6MUY2
+ROrqcjzLr8N2zpQgKEL1lG6U1huMFzjapti9CajT9le6kbR6bLU+JVUWKrQSVB4f
+4S0egNNf7gv7lFHPp5fLFwa/jaoYfihydCyYPY2BHhp7muo+k7FL2t6YvOt5rUoB
+BIYQ7LhMbG4MpLNwTlAGI0QKvPjUylZ23v0vXIIHvF8KFTq55D7C0VGW9wARAQAB
+=y/nV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
new file mode 100644
index 00000000000..3ee15e794be
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFnuhcIBCAC7AxgaKPE8BelwB1MtV061VQFddoBoEPV/RMtpX7ebEtCA1yzl
+02+JNbx+sfTqrkFfuDbKw174xFqP87iRbr+em1+dD98+dH/rX8rX9OxJIuXXcO7V
+SJQy+iBjD2XcSKzCD2IgwAmBKxlG33gCG1zzz1zP/y72e0jrO4RGE1ipyw2Yn9pv
+Hv9gPwb2U16rHeb2L/iDlwH9iPEYgE1K8ybgsi8902opahNvSvAjkPY9FFKRxbPG
+IDtDYK10B7xy/xxjI9J2BKT2m9Lu5QkfeqXuqMX4F7f9F8RZvZFhY3M1chA1HnaI
+p1wI7SjKn3eWh8GirBkRcUTyXsQYLdREHv1vABEBAAG5AQ0EWe6FwgEIAKprrLAe
+Ge2fHQtT0iGUWFmzk1NehFTd7IVZLQFLPePWpYMV9V2aT/0y1iMEIENDlw7ZCCP/
+vczpinmhK2o7274yiqdQ/ZlmKun7ff8syOYX0sXMoaPpk7d/XablcqT6/ksFYywG
+6Mg7qcsRgkdvuZn76D5dc2umWZbhHQlyIXGSRshdr5Qt9V/tMm/QX0WWO9c2XAKC
+2ZWVUTomCMYApRfIiGw4JPyid/0iFk6WF7hn/3QwRldH9qSBteZmWobeJBeBHGXI
+H8/sbhGGZyTGKudBKE5elVXqb3584KG/K6uNwTTSygRtDtgNVjeIxLgDbtBHDj2G
+Q0Tz2ohl2j2Xk10AEQEAAQ==
+=ZVUL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
new file mode 100644
index 00000000000..baa96d37f71
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
@@ -0,0 +1 @@
+4bde772c338ba540e1057d0c8ea48d105232855d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
new file mode 100644
index 00000000000..6155df6d439
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
@@ -0,0 +1 @@
+124dac8350968ec2a8260584ee8ecbbbc188fd5d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
new file mode 100644
index 00000000000..71d9877faa0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
@@ -0,0 +1 @@
+b01128c8fd304fe48e6eed2c347cd0eaed975c5f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
new file mode 100644
index 00000000000..a38eb16d7df
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFhntCUBCAD4TyvpNK/pLusYgw2TdhDxX0v3wk5V18XeVIs2l+Ijj64xfU2A
+DR8Md1QPOZYFWbTJZ0T17CJ5jbPtGLu9ZJWR2s4lxcwtGK7n5y9ANeMjoG38dSyp
+rsEbgNAE0h56ygrRB7/mDVCb+ryD3pzzTm7sgXx7GuNWQ35yz/wGJ4i5vKpp5C+c
+9bZb6xGiPCzVo6O5Xkd743YCLDukJZA76BJedFDyxNSxjFBgsMq4McW9s0C9OwDT
+6oYjvoR/gAlSlbu691eLKinmAxEKLt+184gVShxjlUtsCvibGI+61wYDGfmfnPxT
+jnYwn/97LXl0CqF9464LtCqStXBk03fn1p6JABEBAAG5AQ0EWGe0JQEIAL7BD5Ee
+1NXBr1IS1DTQma8rhl99TG25IXnehs7MTh8rrIFxtZBcOY0l5qINstjQY+l6o0vu
+sMkjvQp3uYHXZZRlMMIl5n+JBFPoUDqYkP2ez1N9cUDld1GB++/yWJEZa3AktIy0
+PU0kYNnEKxH2Zq3bqn9YduoHdQFdxDhiDz85WNCCP4SeDUpHGts8/NJi3KXh9uGA
+abmr5u1JkpeNkkyn53xZ4tQvuVapMgXCwJ0bZf+YC1e4HlP0xojg5b4PvGvypUQ/
+XK1CwktxqEu8Ve8jh4nFSG/6JsrzggWxzmuwdC3AsFZGWl73QjkY42ZMMqnpL7mX
+VV71EkA/KKqyPPsAEQEAAQ==
+=2EJ/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
new file mode 100644
index 00000000000..9f01bb4c224
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
@@ -0,0 +1 @@
+a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
new file mode 100644
index 00000000000..a2c07049cbc
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
+7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
+2RRGMnMaDUc91NnoxKs/7VlQ2ySk6Cm6lH3t8KVkwaJdU59lAH1ey9UKhYyvRQuT
+htenl2R63lyyDe1ZLMAlmQXi4RcCWOO+L1emChNv0q0Fsir+7go9ZNYUi6pmIEva
+jKXM8bo/VtRIHrS73DsH7BVVCURYoBWexZWlRdb86KSE993dRXLvFPy5JzlRM+eu
+mUY3CMKxx3nLaDN5qepf1nGzMW88xjq4z4rhABEBAAG5AQ0ET39ECwEIAOvByyJj
+7wUj5zLY1B3MxPoHHLFVsyxLI1WEgXDlItY+uykB20z3BwKs2CZdfbeBQDf8lNaD
+o7rv+BilZ4tu8vDRkmr82OXpU2dtpalKoKk+g46DhtgUyx7jojUSDKgZgxsuNZhK
+utgvSNdO6aiZ52wEZnXuOuOpA4mn9r5BdQbJwcdA6fd63tniauK5AH/NN3w7wPIs
+pObgxYhoN3+9CQLu2QgCnM4JQ9FlIyIjuScZ3M9rFojtjrlYHbE7mX/vU9Gjgyrm
+utGewi5+GSuGaXYm2zhKeuly3mhrsuRzyJ007K+FJ09pL6K/wJpjyjq8qfaARZz7
+3+fsERMJUDdofz8AEQEAAQ==
+=w4JL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
new file mode 100644
index 00000000000..91a7375d718
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
@@ -0,0 +1 @@
+8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
new file mode 100644
index 00000000000..26d0506b5c4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
+Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
+CBCDJg3ZaqpZti5ti2TfiaXHeawTpxaTb3V5tT4NYhY0aJqe0MGoVl2yZyoKMWsL
+8XcUiJkUYnpu98BvnzO9ORSnKWHk60YxzZuHh5buMNiV4aI331ogiTxqISzTwEdQ
+ygtlp4IeqE6w4x4RUOqQg/mu0xhqnP375KksPtKALLEr9vgqsJXfWVa5UmNl+rZP
+gMiNEt+Abwewa6IQGgSU8GuxMp3qHxZtJQRNwIPx/yb7FngtWrUKIoQXs9xJwdJB
+z4vhfFVeQlyPkEycQNcRfHVzK62oF8L5Jj/D8BIGAD+dj3x10Cy+qVK6BTY/F1zv
+5iL12LjSlz8DtmTbqjit0WGoULjXFZALAU36q6FmE/nMcFuLaTUIinGV4fMvLgf9
+Zn44juAhZMweOt63Pn4n/K0W+uOdrLSmGxJDhoxztabUdIpIMsw44wZ8gnSmPAef
+IDTCjJO2x9s2YuaZbgstpJldooxGJ+FTe52QXFphti+tkiGOg6Tpj8Xq3+ZEM3L9
+Js38SSdys0XBCHYiCv3/4Fk4jspTsCFrDzJ9HqNjsiktxPm9szmUZ72RjwARAQAB
+uQINBFTi8JIBEACq+dSR6serUWrem1itiw0MslItsFyHuOV0+K8ZUOLRge/arBSf
+Gjk7YZPFzIMVbxXo7LYiciHCydZ9K7HdqCqygC4k2IV+85Ll07ZfraPHa2vfgXsh
+u03+VZcMcp6Jxs+UPlVHV7SE2R3o2w+KvKqzLLRLb6aBREoJCsI60HTWyPjsHiHr
+aJ+XFNl0LT22tIPJFjOTeVKU/8OMBs3O5ql3zgdMG3DFGAS2ALiCb1wh+YgJ9c8T
+A44R52Jp0z1XUYXvV298FzHD6n7ejwif2MNUkLF7oFfSknQLkAw1WuqkwYn3QYoc
+fp8aW5u3139vWWR5V2yLWeGI1+/spTJqP8eXBnF+jPWuig/GkHGrWCn+MT7Xv8TT
+2wR4rdhetkYPnPNX0ra+jURZbie6tO/C5OWTYjurTSzBDiPxNLcxxUNjrOMzIbcL
+LhSRQ0DTFLiC56D+5UvPIUY/GiX5O7x4iF1kwSPcoXz1w+xzzCwfFZg9oE5voHAy
+brGkTFCIb5Oo+WKWDCY56K7yHLIUT4UmiF2Liaz7gesTc5yFSFJhP0WpkVX6FxDu
+oCryQx0L38qD+4c445N7aUfVmqbOBBp4ORpJ/w0s8Rb946yQ8TTUB06otovyIz1i
+Zsuj0yU9kzZYovrZpKJLeDEY2ThxdU/O3ZkAowEeTjW+KyddTT9rUuggAwARAQAB
+=iPxD
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
new file mode 100644
index 00000000000..2c5245290ee
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
@@ -0,0 +1 @@
+4d2db2916149baa9d0c92f3731474e5e7c6b7034
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
new file mode 100644
index 00000000000..201964b9d5a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
@@ -0,0 +1 @@
+d6f1bc78607808ec8e9f69437a8860944fad5f62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
new file mode 100644
index 00000000000..601bea67127
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEvxja8BEADAzZOup1X0B12zJsNsDvXVIwmM6bB+uhEsUHoFTvmsEVwRoZtn
+i7Q0WSFoY+LDxbvC4Bg1+urCrUrstRJYRyF/pMqPYq/HokRlPjtrli/i3mUSd0zN
+PGC5+qXvAlOck3GK8Hv05PsW32SlSczZw6PSDKh0natuM3hnb+vt+w2MXadXoSwU
+EV6GtSZpj19vRzAwG/Zv+ZUDCBXVQG13mG7nr6+Q9+E0hJf8i/XZBcvTuWPy5niY
+kzWDetDqNboFgCvBXYUw6dJZTS3tHhrXXp+W6hoSZFzYnRMG+xg0ls1z1ejUZkwO
+mWPL7fr0Z/svSrOfyRxavKx1viKobEdnLwsdHIVK7TGIe5fQzR7PQgBgpMCueoMQ
+NoXkA6GqPTuwS3pgNz2k/K+Bz3ICT9l09SHXzuGcB4GObF7fPDT/UK73Mo3sM0M1
+u68Q51i3fG92Owgy4Z/YXN/IgnAUrCb+EkLYIscSHby1voyvj2a/nIXajmldHqNX
+9yPJhkIAij95VcsD4OUXonFbfqHuV7WqXBv4AhR/z+BndUbMbrlkn+r8dfL77rRY
+63EGV3k8A6IB/WJScGveJsNRGCZLReff+UyvRkRy0jVVI0/G32ge13PbpPLGHoRx
+LXiBSZ6Nuat8R4PS3ry8HKzFx6r2+VO082ptyLjl7e3yQzdVNshpxYxQZwARAQAB
+uQINBEvxja8BEADfuM4j+dpNgMDDXGemxTG2HkQYiZNro/ytH+WOBZ962EgKHWt8
+RKuHD+69fHb4bDjHKFF8yVv9+okei0qK13SWc/+uRUVyLmn1xPX9cgTvjChfsnRG
+JlioFZ3XxdQJ3vH8h/Mqb0yqxAgjoWYQIqIeAlE+7IwNYZy+LsuDD8OUUSbCN3zN
+Q9E42Mo1IDwiMgHl6IQEWvYqjuICiu6nEA42bWuMQJuc7H7UxvzyD/Wuwdiy2gxA
+HAtQMh0i9N2YcE0ZWd2ovpzSe3Dizx95pxUUsaQG7wpu3U+qvxCZjP+/XVNhkDvq
+ROuXGw7B/5g/0OMORgR/nOpodXf1TFpSEU3uPLTwwxYPow2CoQ2X9787ojJODrZE
+nQ9YdYU1ySX2Rqse7QHOu5Yf/Mnx4G3mNTLAFHYlzp/0sjaSRRzqOooKw9hUpqNY
+kvh88h6QQLckdH9TKIHqJk9UiENIEv37XJaVsr1WSAvPeHusQoMS8k/A/1knreLV
+OFh9AoUKG+2gjYs6VUR4f1epLEWLBvsBBwGwbXbwwOIb/0blrjp3h8yp50Tvy+T0
+hco9fQW1O1+50aztQCfVBIQ++/NVoQX7d5z2K6TEcRfIFoIMbANSmB/ZX2auSNIa
+U31hVn4cuEOyENnLYH3XCELaGhce6lMEACD1J1m2i0Ttfr13NeCtppsGMwARAQAB
+=0WZk
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
new file mode 100644
index 00000000000..8e917d9b89c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
@@ -0,0 +1 @@
+bc87a3fd0a54480f0badbebd21939ff0ca2a6567
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
new file mode 100644
index 00000000000..294869e15d5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFxmwqABEADNTTxqFiBcLLQwARbc0bmPUlxFl0A0Di9dTycUEjn0wTGS2xgF
+dFxWomZd8R4b/lVb9jHf0r+AEul7U7sBoKinjwk0EuPDAZK5PEy3P8ILcAulwQqW
+8lc+lnjGsmTG6GBecCQMEXeRPZv3DM4kUkljBFG7nDiFLNPfdSQqovZFTsQmmepA
+EUu/t6y0GRrsbbTMipWJtVR+J4aGKX6kJlYgB2Nja1mbaTrI77KupK/VYzi6k6Kk
+tzyxzqapJVDCLS4ypBH2JJLKSWWGghcgoVfeXtmB6iAki/nFNSRQODGru32lnLkU
+0toprQkEh+TM8giT7Ph30VKlBqruNq43qxWZso0GYNrKxStvVB2+CA95oLAyROtG
+6QrePLKkkgW1uQDN3e4iluPirLkd+QoZ4jJku44LyW/dJE63wGUKzlMIPZSb+joq
+730rqovBSayI+snQjvJv2ImfO48yGsx0Gaojv+hKhgPTjKNzQo+QxqhWV3AWHjFn
+j6vwSjDYkx45OSKEZSwfkr4AHHnvYMVb3sFuyM1a6/nQdhsGu5cc9mGvNKmXE71U
+ArDBDq1w129pi3qttrCwxXdUdTE/PtnvQyaKlVX9lD5QLORD1Pis62p4t9CEr+x+
+BaZZdy7PeLAV8pobv7H7jpfhVWnb6SrLfhokA3Uy3gMyfcq9dmIs6iteKQARAQAB
+uQINBFxmwqABEADbqeRjxCk1AW780rfUpDsCQDNhAUG2e8fPbAqDFfRa1nbOgNBp
+UF9d6hO+UqYxxLH8xQtUW9x/M/v7hEdEg1zCUMUU6vSIpKtEg4ctSEbv9VlsMM3Z
+qBQ47SpMmmVSPlsXip8PqEBX5shfv8rxCpoHtgHYrkPhGhIdEAog7Jwclz5DgwB5
+ct2VYEJrbHH/cWIF27QAXaAFphzspV2kRlgrrIBREL+PeuPRJUJKYNxbTuzI6DZZ
+yQJEZ8JZcmTqREKcVF94klMq15RbfFRpiodDXK93UYp27LMOVYq9vYOyXnPIpAmi
+u23+JcIZlQe/UMb2x7zXFWJJO++gpB8sbuxrhGChl6i2kGGUE4JYU7RcDA6YgZrP
+FJLAuP+P55xhXI4Jl0OHdLlJR9ytgWh8B4Z4QK03I5qDm2CVDXOWLtb0atqGL4zW
+oUnhkseTynRN66Rv6CoxAQ/o1n7N4GvG/yLGNkcCBZO7QpCxfhqOT78OqtFvbOXo
+MADd/cTFiNKP0OzYEiqysu06rD9zJCASorAELPmWbcccQP0FyFKigRw8YwjH+Mlq
+U0j2Fvtw/5o+Asy2T5/4aH8PJ8vy1pnnFSK3qPElB/WgpHjjkhb0gMKGly8estyV
+wAB7snGCxF7X7DcdKrrB3pdWZkx0UCV+5LThTVt5eIePiMUwQPXzTKuDBQARAQAB
+=CqJw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
new file mode 100644
index 00000000000..13e597eb156
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
@@ -0,0 +1 @@
+e9af5293c334c7c0b583227d2f45f85cdf082e68
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
new file mode 100644
index 00000000000..cbbb6fa0672
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGHUzooBDADpUjFpdOCJMkgB2Wz2hc7X6/AmS/d9P3WgiumVMO7dViLDIr+q
+nAS08QwZaFtLcwOs6F47I7CdjK1XLRmIHgeOnVdeRPk+h56SfPOO1qvwyqTxpUXl
+k5CT9GyaU8mab8eenWRwtKFCCwGwTjOJ65iTB7jaUKuE3nUJwRtaIEXalTMdZIg/
+rdPTSrngqwk0v6ntSTMd4MWyF3PryyLwt4VhCkiZc6rB2GafJ4YfSdhyhu0xR7uQ
+voWBL3hdJic27LHvOxH2o82YTOb92nNVR+nVfNM0VXq+4/VBSzXYPSjaqTFHHK1O
+wNWjy9x9qlMeX3eNTPMhZS8XelSMZtshiajUKV0YlTFcULfrZNA3A73NknBedghc
+MaAXJNPgwBUKPwL/H7Pfdx/FnTkmHAtxSbFGDoCK+UoF/pC69BXYW6bvUgkQWPkV
+QGx+Lqc7bV9n5X5lunTCBh0WOphwsIGrfU1ma3YYO1p1248pfVqlukGXpyd79ehS
+8SKaZICuPDIh7UsAEQEAAbkBjQRh1M6KAQwAxMXmZGdKguIx+GOHUDvw4nyiXTW1
+54byzNwHM4qOBfGvHa+aDFklreTzm4igxX8HRWmMpGx/GveYwQXN4KS4uk8FDDoH
+56heryWCzm8033pa5/eQMZj6SiEZnoJEfPWwFmyhasA90BUKGXiUQkQlYD8TXpSN
+/HtjeX/w+VTjQzh6RnDykRE9sL0Mj8PxuZG+63YVyO22SJpJlZ7WRGIatk1Hs4hR
+abIcAoO6HG4Zu90vo18bRQ9TWvJeo1gr+utEtQB1Ye++4GQzgTesfLPAZ5wgZ4UL
+AO4Xq407BLUDNe2hM5NLgHfnodBs+ebvCBJ9zAk7EfhlkkZFjnGmz3AsJ7+EW6j8
+fobxGqQTvQTyn6VRKPeWkh2Wb/eC1b2MHpDE+tXCq/LOjrzCunYPB8gpdROGJ6vA
+/bdm3WjQ57ai3/CxIGQCiIa+07mB3+Dn84LiS1To4H1lB89225/z7sQE1L2NUn3o
+v6uqLRXcK2ap1ID4pmAZu9R6Z5gYUwwqpTjvABEBAAE=
+=sS2X
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
new file mode 100644
index 00000000000..ec5761cbd92
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
@@ -0,0 +1 @@
+f254b35617dc255d9344bcfa873a8e86b4372146
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
new file mode 100644
index 00000000000..47a0f94ec37
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
@@ -0,0 +1 @@
+c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
new file mode 100644
index 00000000000..03f6df2c27a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFe9ujkBCADN5TiqHcFCxrHEwTIqzCjyv/0kADSXhQZ0Tqkz1HA0a1pxs09V
+hkM2EOJfsFJy0tFPQxKlBFmPJKEtwvL86qV7VOjrm4OvhIeFpUhIqRX8MDHDhbeJ
+fCWmfnEgcmTirxRnjVDRY2PrMM2Y2Rz6vRieZ+KxeVr5zJHmazh404cOYN01txMb
+PLICA6tgtxcJDSIqyslnHdD4mRQDeVkK+iYYXBjzgZbiTUYdFhkjSie7aVzCcu2O
+YClI4EYO/2e82Qkb8qlsS5on8MIDQE2fFMMJD2ZF7YJW7jFvCLI3CXgJgU81A/7X
+4BK+aJkEgitaxrcQCC3RgFFad2HX0KabuDQnABEBAAG5AQ0EV726OQEIANDiiR3P
+Gj0KQqwlsJluXVi4rbGU4oihddrigBG+rt5QVl5SwA3CGwNP18Q2jxqVjYU5stmV
+8oleZlC3dpQQBFZxQ5YGdMRWRy/+hOy4dhZj+4HadEtkcboN+dNYfGHOoKSHzvPx
+iMppwEcLy2OVKMEzQF+bP+CEqGKW2yWGWHVlPKsk3EKGq76dAd0UhnnngrKLUOPz
+ePxTP3VHBMCuHizujm6T4CUtqffPtYy6EZ7gDwsUN/5mlwLtEQMyNKJFwcyoJv9m
+mgCECEj0mJAMjlLrEBAUG1b6RmzkNXnWzftJaAWpAYWTqhlAA9zu/0XGXtacpPn+
+85EuI9LwFxqtO7kAEQEAAQ==
+=Cu8+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
new file mode 100644
index 00000000000..3fe473deef0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
@@ -0,0 +1 @@
+7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
new file mode 100644
index 00000000000..234e9d4e78a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
+Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
++oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
+QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
+Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
+kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG5AQ0EUuZY7QEIANFoey9+
+gIJ+VBKDYOZIK5t7s0J3fmgYasBt+uOycrZ/UmZfj3I502i4nYVtjwdWJZFp0LLh
+4G+Ba7uLNdTYEiSOEowjcxyBr2tvck98wDGCKkLkiesrg0IUM56ZGBqUvc+hale+
+bKoTV3+HwWfh8Iu+pRPHlNRUGpLTnAwatQf13sJukfRD8vXKdj4em9CtMjbTbsVB
+LdJXNPRzZV75zfH1DOGHTxvHYKDRsVKUmMZn4JE+gJ555dIYxygjYoB6V5oQVIy6
+hud39dhhqmPeCQDY1bUu4VJQBVJZh6WM5+1mquc6SOtJ9CWJ4zOk7hUbWstalOkn
+ipAzIIMXD411+PsAEQEAAQ==
+=dGMI
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
new file mode 100644
index 00000000000..73f4cef2ba0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF09IUABEAC2p2RNMRu3DgovIw/OuG4BL101EzTepeoPzRbKll+/xtNiN270
+ekSio9Of9nn7ZV0n4AH1nFM4iQqAC4KFZ74NrgJ+EeHoh3eZr7hyQ/TW7p0z4097
+Dm+C9PbN6+7wf1sBdlaRwsQ+eNKkdkal7WGNXUX1YiUtof8WZZRkiqRFD+0Ldsnm
+frJFKc3MPPWR0UC56JmqzMaN0XeiQvcDaoJJ6W8XLT4QbzwQMJVpA1wKyfMNodPO
+kvJ7jOFNLuLA3a8hE/ZFrvMJgp6yziQoIxC+Rlim1AN0leLsfgjVU7TnqTS8Z8+B
+i2LRwpJhLS/HbaiRsJbpXOr53GPiTuZTz78OIq30nqAg40O+NWghOX93DzB7j1xF
+Aunzm/Z1VO76Feos3ORQJSB0PAQbLqCzAyyAu/xuF7DZuiobHB+b8ggZZRJEiEyL
+O64YP5UBWn3sEM+VdNy+NZujqvNKXrehISk2GBdmAQFszJP9Ti5SZiw/L3z148fz
+dERBs9s4k6iUsrbHzEtHvqxy29okKvQvW/PgsA1pImByndYBXCQQrl20giUQRxWa
+mMEy5Zt8DEeG5/D5mRDeJk/sjTxRlFoFheFZX5NGPD3I4/P7um2L59Hu93oxlEqo
+/OcAXDCr6s2lQjkEdeamUPzsGh6/4TKqdP/0wVgxZlDs0U9/iMoQPxwFUQARAQAB
+uQINBF09IUABEADeGZ7xqPNpZ7v9VLQOmZvzuj498/TZ7qaL79o9pN4svEiSP1FI
+O7ol3a7zHnwfHHvJyd76fo5lVlvRRtgqEfJeqzJASUbTQwPU5U/7cMEQhLhvNe0K
+uhLcNInIpPdSmX0z0CS0vuCUCc59wXPangyXER1plkqtaQDq+R+giY5aXRqcmutT
+DL4LW+lJYUIf0lybseVHNmgqRRKzIvD4aYowegHIKVEiBBxh826rrLmB78608/6+
+alABLErpfflPTwyJnI56D77672fu6rXE5m21NiXsEcS5a4snP8QrxcpFkJbBvxmO
+wgGuD8/6juOM263uCWmzt9Qrnj/ujA7RvwPlFXZSTTqmRchEPFTCeC/nRMNIImwR
+DmbrHZkgqsGJhNvWba7f86DitCn5+5ne+PWi7gAK6w+mjWDtUHOOIpo6U0sEegUS
+u6frHaE4U0dB2y+FxJCr2jhtuqNYjlsoFkBMNGCGKUj5zizbX5As2QR7PPtBeA2I
+ZEha74CzdNx1tmBHAqIAmARDfy6iamAoh/yMuLCcOxV0ZN4qtweu4DmNuPFJBUZg
+neDSfEYv2e9oIdVkjaMUZggfxeO5xUUoGaWZKTAemTAASx/wNef/T11D0jwxypTa
+pGMgmPtiGormuHpN8+yJMSCSnns8DvVTHaU0d7kVv+EDcMe+RQzv8NnCPQARAQAB
+=yQnj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
new file mode 100644
index 00000000000..6d4dfa116b9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
@@ -0,0 +1 @@
+9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
new file mode 100644
index 00000000000..8f277d14010
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
@@ -0,0 +1 @@
+d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
new file mode 100644
index 00000000000..c7c9334fed9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF5I6pMBCADjBpuaibzjVWaEmkUPIMnEcYTU0yo/jxOP2b6EH/z9VMFeL72t
+k9PE7BU6yo/0/JK1ALjDDUC6v52pbfLzoD6a4ZYHzRLcXzpMI+yIbOYD2m0XPS2a
+R/4IAiEvyZw5pXQyXU0qfCS6uU7KeB/lwcb78jmSJIPMVzX8APOekMS447xHxqbg
+3cu2aTmVHAfufdBNtRhhQHG376Nq4Fkd577M+/AtjN6zRTXmdCm8sOja1ora4YQd
+Qg2lMxlHO3/EnZCsVIn1BiYrxqS6l23Tswf8Irna9FYR9FPga6izxqLA48KYMbeT
+9t/mct5Ck93wPQEfWYedvfzNZETAaeSVFsDBABEBAAG5AQ0EXkjqkwEIALvvVSwl
+GyHFYnzPk4m0BtAGzd8kIN2Eep2jciPvShsomqHcEUjbOLYJiYUjlWYTO3/ul/20
+CIlfnJzFh9uz8gzHHPJFOCASe+uJLJfIN/jasKKTt4pEcP+Z3C/JGmdriUxxEdWK
+UtMhAzT3Qh1G5fgcVTeICGx6rGVTRB8OBcoEPUhI47faju4+theq/5hcF5WfyAZP
+InxZq7loFFp9bE/YzGo9iSpUAZJmlmSS+t33lIxIpjqSbPnJKGd1av3JZF1idv6s
+pmVO0SwzQfnzt4Kiy4gXoCFiMQiMR0adQl3fqeP5+m/ovX3BzNBnmpbyu9N6sUzW
+BhK3ywWM90+P+D0AEQEAAQ==
+=kKZb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
new file mode 100644
index 00000000000..6b5fe01a2ec
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
@@ -0,0 +1 @@
+ce8075a251547bee249bc151a2115ae15f6b8b72
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
new file mode 100644
index 00000000000..a2c286c51d0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
+5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
+EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
+nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
+Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
+XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
+LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
+Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
+dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrkBDQQ7EiJUEAQA
+zVKWS8QrkysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT8bcE
+nz43MCSx8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6sby4
+dTVxac0rloxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2mlJoE
+7MK3vAhgKwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlphSR2q
+xJCAcBTeOMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6XEXH5
+tGJ5Qvx9Qid6ZfBaXx7bc8yKyCb4
+=XH1b
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
new file mode 100644
index 00000000000..3af575c8f57
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
@@ -0,0 +1 @@
+7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
new file mode 100644
index 00000000000..ab214126296
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
+MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
+ymy2N3BP9cz2fJ9+3PpBccUPL+ydFKpcnEnIwiQK+p9JjEWzJBlrdUc/UEJ0R+n/
+5r/+0+BHiTEMvjAF6/SwyntpTWpu7iEzLv/pfdCuhFKa4yn+9Ciwe3wGtSiue+dh
+tqKcd4YxED3oAswObBca3CC2HWWsUEH6EmfT1jUdfy1cq4X5x7AZ26oFYfG+odqW
+W5dcB+13VkJtJRzQTO/2HKtITJYC65a1jKt3ABEBAAG5AQ0EVQEbtAEIANsILuU9
+cH/EIEL+OpwIacr/y3/6LG+ok8SKDHIlF6cSpusSsWM6L+RGcZgvCDR0S0EEid44
+yy8wFMvoYSlsXHLN4SqH/rpLIc4CD8DdCLWraKaRZrhtqzNWSsYxEgqo7n1xO6+c
+sU17VJArnpkGPHoA7ooZlaGrc0y/rlkTXH++LKqh8niO9Dap46pLFrdgvuyKbq1B
+6faAf2JMRyvqy2+fuwfVGTc7DEUUFtwGg7FniDF0zl+3rFG1ud9kH8UWz+GwCwFT
+6qhVglgOmtJgw1CSYNeDsQvDB4YTJNnMneMSdM6CkEcRhLp2+lz90+wR0K/a9QBE
+1NPubAaRB2uQR4UAEQEAAQ==
+=uaBu
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
new file mode 100644
index 00000000000..3361d9bc60a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
@@ -0,0 +1 @@
+0cc641c3a62453ab390066c4a41f13c999945293
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
new file mode 100644
index 00000000000..558cfa662b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
@@ -0,0 +1 @@
+e5c3b1929191df06136ccb2b164779204e106a76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
new file mode 100644
index 00000000000..dd6a1401eb8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEqmJkEBEADAAMOjOidXzoyK4FK9WhhRg2EEGX1gm5lK8PpJtk68Fqmz6xvv
+N8VJXMIJUgeD7M35zZSQUWJY43xEU8Yfn6oLL0KR0dIqVOclxE+7G8vxXFcIbRE9
+ziZFp7Z5yzsdzjiIzXv5MVQMczcAAMev/i0BnjiRy5Cg+k6kHXVpu/Gsn05JKPaG
+s7ZcfSxpboyS99MVKQvoFLE5Z/Shh4gFJn2rFInqK5EgVpoZbVyysF52nx0dti/e
+O0NjraQkrEDBWvsPt3cYZA0oP1gWiZiRvOLfAFIarf3poMDyoWBIwnbqb3Msv09j
+yDAmcGq9wsD3alHFHcRIiJl5SzFUStml1d5x/BvUl/Xc5VfHPi2ObKF3xOPGkyTf
+aZ6mYFLaRCAJ0v2MPW+4/grDXKsP8n8xPbE2VQvHBpxaZklD7q4Omn2d+m2sUOLX
+NRUo4n29NyfowAffBYl7ZqrYBBodR9YngWC9LpgM+APHyiw3HzauZ94bGy5Of3+L
+Yu6/riDcP4OXF6r6IH6KIsVqIkv5xzq7OGxxXmlhWg8ifNPLq5yNRccS0nWXc5BD
+/9q06ta/ceQGNkXL327XPuZC+lstWGAa4dKEosRDgcO0Pv2j2a3h8W8oHyxF+gEe
+O+9s0mGdQFxNiEA+JyeKCg+jvfx9Hv/2Syrlert76NEkfbaTFA7BJ4c3EQARAQAB
+uQINBEqmJkEBEACj6F4CCCp8iYj75LO8QVfhaiT3nFQMd0kpS8k37If4wWrfUC3e
+IbH4mXL9QDWRwZ+Kg3hpbJiergxr/MJ1GUNiJvB3o3tYe3SnizaTZ8XwUvYJ+ntm
+1yoQLCRlBO4IqalX4oxZxGNFY+k87c6vlsqoNhm8/myWTKNSVUImgGMkHkJaznKG
+XEB7APzpfsuPIS3t+gNU0iDzDkiOGQGV5KsVwLphGjGs/NhL1fCgx+yI69t2NMGY
+xFCfnSUDPbLLhH/RjCyLgm5jPwieTAgsHqRiXedsppZb4CUxwuwfgWP4yjTFh8AL
+DCdaFnD5S8xUCAZssuUYyqDIn82qEqP4U1pIsHC9lXPqlN29/9nlLZwpwQf55K2Z
+CTTXPjleWBgUj7zT2jeNxr42726K7+Dwb7e0IVY2WEHprVztrFsdV1khbLnA9iuJ
+CfIqTVsVYCKg7ifEiTpxooF/YTKbGdh1QMDnij/4yPdCd76Cqwjy2inC9SKfm9vJ
+NGo+5JeOGCasOOaW0Usf7+92x+LpXkIl0lviXMwPii8O4V97TliRJy0tviIPbDVC
+mBmToNJ8Otd2zX2cvAm8f1JE9dC858fRVujHnRsiT2E+DCTDIfz557Fr+dIxZ37t
+q7Z0VxDlF8Loy38K5gmG1x4BNymvn5kc/B8bMk5raiB7T4scPEaKn6BX8QARAQAB
+=HUzE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
new file mode 100644
index 00000000000..2bffd2b7d5e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
@@ -0,0 +1 @@
+b0255b26003ef6f82491acd7254e9c64c264c176
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
new file mode 100644
index 00000000000..bd22f88d8ad
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
@@ -0,0 +1 @@
+28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
new file mode 100644
index 00000000000..d0de6ff44ac
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
@@ -0,0 +1 @@
+7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
new file mode 100644
index 00000000000..d1f2b8f9914
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
+YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
+en3ClYLXT5UVx0H1ZfDVKCvmaZVirZInfkqbi3OiPQoWrUfu02c3DiHQJ+Y34kdB
+egH2sIShNH8WLfEZ3YDQ4XaWHVuN1C7VwCBM8R3OeTTfyDrTsuyqJ0SeZXRR/6df
+2pEckjF9DNSXyjzFg24MrZhuhgbnj0oR1zmRh1EF+KlBfF4DF4acfxWqqcJVJx/3
+FTtOkLe3Xjj+inyJgxOW52gD4DsJpyf1tIbjAQDZvOdlRRCqZB4FnzzIb/1GmkGD
+JpDLC4MQmqgxkm0n8wgAmmHLpqDTdmuyJXvdX9RdGycpW64sljd1mpzTWJ8UKDhj
+uFQVHSSEdLoHoVj8ItnBV2kXd2uoQ/tWzbxFBST7wE/tX0e9G5XWaPKogvOKeDus
+u9XTIds2krYp80UTYWFZ88oNwGikdIrEYURSYDsYt15miROtKHWbSOHeLVbZqgVx
+dtWPqQVfH4gJGEH97/OSmozqDVog1aZDKBLGZQosng5h4j2RAQpjkaIdxKl8m7CQ
+x0Yi9tA8yD1QhRGggANQIb4n00G/vm7RMU/7NBvvjAQ/nAFjbsyO5oX1rBY1M6Xo
+NFqIBrHSBzV9MmhS3nXU+ZjAktCRhyJ7TsoHM0OYEAf8CduM5Zzp5w02iVYkFQBB
+wAoKHMpycW5LhMMMS4w7gmOfP7y04rtg6+zVe41y6bOqn/SxHCcCgnE/nhdexlzH
+ElYE1H7+HpphoI5vEwS6uElF67CoO5r74Zrb6nshGEj2AoOqjbrsdQm0noBBNYAu
+f9RsjU0sQQFzLW8+2xahqK3oZkLWOkSxzLtVwJbm7EGaGIYxEBjg87OnGQkAi9vv
+tVPwdO3VWyvgKLuPHudLDhTpeH3AMbzKgnru1Pnh/ZpiRhPzsbuFtFPEX8PMuCyE
+n4OLzUALl98kXuPjG5ww+24UsNgKMbKbu8qq/zRu7IHlpZvd730RoCWU2/i18tnY
+zLkCDQRMFWTlEAgA+MQFGIhyA4Ww9g7J8ZiEltwSzRblrjM1q9anexsBIGsWH37A
+92rlVK1RzMVfhj5yl+BzIBGO+zHbgycX7iB5/Fwsm+6R/2Uich6NDm1Qai9rc/jg
+3MS0phOAQzgxlGKOTS2GzdbDJCBQMijDObNe+Cs5DNB/E29/nzzCTQvtRzSeplZN
+r+8Q8lWz6efXmm5EeeZxN4x1YXjjzMJCHbc3yGxOjTgYQOs962yUYsg9UDRJm1OH
+9NKZe1m3dTRIMUcZvL12dq/kyiHHR9V/6CkdiNw1AFMi3tvEdvX4D1k1/Qr/2ORZ
+E4lRzgug4sKkpgaclLnkJZ9EMczmUFTGbbkx3wADBQf/Y+2nZCJSuHiDv/+SdhQh
+OBapZ2hYPDvg29mpPqin/LwH7eFTNv/oos1wzuzGtTHHGEP5mUQLOxjwdAXsWMMj
+scSbCs66ytTN7X4O8qh+1yN7vrM6ZBL12Ix7Ku40cgkWyvTVLBXKaEGm4ElhAmSL
+Fpu+/fJw0riR6rIuwHcGB4R1IJtMWcj+b1odgw9QmJ8AGpHh2WVdXspoCGnTUN4m
+DEswZjplkKXCgLypU13SrHVOqhjd4caK5GNZUfWtCKtwNcJMnvgp2truMvh9BBn6
+widfK48hEknQtXzGjui+bZz2/AD7/OT/T1CqDspB8IQlBCMBn8J4U1grSrZ1wTJf
+HA==
+=n1By
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
new file mode 100644
index 00000000000..254217e5604
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF2swU4BCADGPBgTJhjjEKL1ulqHmw1pYLDd1HTms4tlIvBwTCrzxm1JsmU5
+vz6hcGU0U24gFtldN63EncHDrruBz2mJIbVKCbGMP7cEycQBMTklJyrpnJxSsNyL
+YaRBA7a0mBmx5pD7IDQVcL8VBNMCVhaiREemuvvzQgc0rrFu0FKnuDXQVwwXNJVY
+iBpqEk+E/qKFJhKzR7orYhIa2ahpptaWfYp8OfW+6iaj0HslLi0et8Dt0qUlxM5Q
+DMRj/Gh4n+82evfCFy09Jz8rN4iWyrZ7GSHsJJVEs/hhzFRARra7VtbXMc1JCiE8
+VIH4KHbXK4ToL9u3OKocXMfAyS9zmEuB2xTdABEBAAG5AQ0EXazBTgEIALmgCt9p
+UHBwsjqBC/QR41h2ZuZi4Ujj6G7zRZiUbp1mXWKgRUwOUYgpId78ckHua+rya/so
+WZmELdX02v6YSVAx9cYKHDsHqiWIkVG0ldoEAdq1gPtyp0UP0FnnjeKO2wYGvN+T
+jCbPxeibUQQgYMnZHzbSSZc1c8SlfDaC8+dQ2wF4m/VwWJs5Txrg/Gg0YEW8Jw/g
+fOX9yzbA/ujw1z3DWW7LSaEt8hf7wTGqTfiLxEOSx0P5BzmJahtm4F47wky8P7wo
+b4q8uLI+JzieYaaeE/QqRCFxMZozpLugq3H5TF/70MmNlvAQNMPOxEqJJbCaxlYg
+KUutrxHZY51b8VMAEQEAAQ==
+=VHmS
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
new file mode 100644
index 00000000000..23b4752e1f9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
@@ -0,0 +1 @@
+1aa8cf92d409a73393d0b736bff2ee42c8282e76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
new file mode 100644
index 00000000000..08d8dcdb67a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGCVaCABEADgQA8+JfcQ6dEzNpWGi66IFUrH1CQyqrwl6/CD6vI9O1lw9LpK
+IhWvo6832Kf1G+9WQxgUj2Ur/TNA+dAGwIQs4OpIE4HIPQnohdWpO8DF0DQKByD2
+oHSUTIfzPjK1HIU+t2qy7hVprSrvVBufl0LeSAEFXC2zLQLdI5VDaFLh83kADfC8
+8OlXYAzBYLDYoBQTmTq09r/coxNq8vmkzwmMzJBTbtvodsJO+NmRPhKJ1NJ8p4kX
+pkmM4Z36vWMMLxAdg35kA9jgU2zcK/xDma8R6cdbQSWfpMcSb8GYoeD0XLuRME2M
+uim+AjGBwhCL7B2mEEBt834bRXzShO5sjgSij9R/0y0YRDfXdyNbxyDvsPo/rj9Y
+EFdA6ym0X/LBa1k5bDFt3wrvM7Pn4RNnidKB9RFFwb+eHhCxXSIYJFOnOapIuBSD
+WA3Lt1w/5CLJ2DrWEPqTXMQpH9MWNmbAEF/W8BMjrD4vNomVb2UbHH+PrNEvyh8l
+JwRoiE5MZM7xgK71knqyWfEEAKF/CujXHuxUxRu769FG/kDYQoYsmZQvC4fc2q4Z
+fPtd9rSXI4rGLabqLRyImr3wBFV6cjdbys16JloQe/6/A/zA1VC5/wAikWbYgwtp
+20Tm9fbGNdxzuVPpV89jna5MQdQhdTqRHZAHYI9WASGHCBM9kM7mJ6dZtQARAQAB
+uQINBGCVaCABEACeANP2PRAJhpjrQARLJPRB6BN6wUpgyNhESMNEutz0suVA61iC
+9qGou/kl7SxKGxShqrl3iqACbA/r4jaDb1X3SA4Groo3ESSn3CABMU4upaCyiU4h
+TToB76LKaxyLy3gj48hKf+kiuHNBGhbd7ky+VpvpAtjd6hTU+ypRGjmXM9NWCaNA
+pTAFL2P60XNhiTEH+yZKhh33Af5HFkj0xBnBnM87NPXHXiHcrrKKWOxPWzZ9orak
+6LCK8RN0obf4BaGyfkKsof29t3lR+JsZJuZ3C30JXT2qGn72obnayY9pdD79m6Xz
+5OnuivQsn8jlnvX04Z+QTdNMCWGToD25rZ7Pw43eEDz6+sXGs2EPAQycmHDDSbcG
+Usdp2ie5ZvwF1so0q6U5NFKuu+oFVxvWAlZY49qvMLj6wXubJ/TT15yBgq9vJBdx
+DJBZ0o6Twuh8v8ypbK0gAKhG4XVEsbHHUWsq20gLPJUQonGOiB5mMx5x4YdtmsvI
+CxLsqveOsRwjcVLOnp11I9uHM8fsrDn7SbKz3nx1XcbkcUgVLxmi3ZCldyQ8MGP/
+tAUZ0BLsthMjYxZvKJ4uXS+h4fF/LIZf6iqwwd95Z3gTeuCk+PBk/3BG4YVWFTgH
+351E03eggOqmicksVyjxPU+i/7PYSLWhu/SXhQhV3I3BGuoOwg1cLFrJWwARAQAB
+=K4TH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
new file mode 100644
index 00000000000..e8ed4474a32
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
@@ -0,0 +1 @@
+5c9a30ff22b2c02f30261c305b93f1df7cdb6dea
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
new file mode 100644
index 00000000000..b402bccb9c8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
@@ -0,0 +1,10 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE5Kv/ABCAConhU6cL5eRQCAvVpHX8VUyflu2Lcb/X7IQXy/8BCk1Nhhp69U
+ul06/EG16A4UERZQiqZjbwsdow7CvsZiJBwr6Vf/OkM7cDqDA1nTxL8jPByUqI93
+tBtHL/8Zxr+BmdUWYDZhkRaL3HuD6Io3UpoxjQqAASYbuSelhvuVdVN5mG7VjGjq
+oB8xCFL47rdO/+yZLaGFVjoOUC5J/xsvFe7IZm+HusN+r0biRbwjdMg5ppHShzV2
+L1ETra81OQFjcohzHfATvYv00QbNG/1GUTJCIRZKzMI2qp/B0UEGa2kYiiNcQ5b8
+p5GPwjAZX/fqNuRD1pyv1zyb2oiqr5HMtXY3ABEBAAE=
+=CO2B
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
new file mode 100644
index 00000000000..bd5469bbd3f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
@@ -0,0 +1 @@
+08ba61cf501c09f70911b83b82216a03caa86c78
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
new file mode 100644
index 00000000000..444ad2ea08e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFeGGvYBCADLqF9MxqNfwOuDrOmkOigwfiWxdKVHIpZqjFquuWIjH6IhADER
+HzaFrAuLF9DyodBvylQWMLpWOjv8ulGnUp8ow9Gjd2hH0vjrXjR+c9ks3NWtHX9n
+uED/BTZGnIwrKS5fVrOSAaUAl8LAx/dbnxnkwDMxKwSjdcSZhAU5jYZUyKT1KXfS
+4WeZ80kEoh26mNZtsXTSZSC24ou78eyFTLmNFuFY/v+dY4Vlg4zqb8xx7IFAq3wz
+pNGimqkSE8DU5U8Ld1Xua/XQEJpipf1xxXvo+n03dRCeEm6eyFbOJYdMIkZW3HsO
+kWnKxihvfAEWIKtiAxE0DMnruY0pON9RsR/1ABEBAAG5AQ0EV4Ya9gEIALdXMNy1
+wbM6MYSQWUlK35cSE68VEzXp64jnLT7WBkX6wN9OGRb2eBiNOP0NQSRWaB2m2fjS
+dclzNBd/6LXomR36oz9pJWkTSQfiEFbNIaeurfLLcA+m2rMYnT3SlMGlsRhZdUwA
+ntVogVtPUNYGKW/Wmdd2gjE/QvVN/xVzdvAGaKpUYiP2moM2CzRaW7VmSBmycI2W
+sczlLCEZ+zjZKo5p6GD8KDW38Hy6IHinK1/Zjo2CfFocO8WC8NIR31Iyen9YabjQ
+kcALTuP3Cy3y0BL5NhOY2/bo2T3ndf27ixWhzuRwt91JWnXoaZk+MrEw8b7Wn4eo
+Oy7jiX7668plhmsAEQEAAQ==
+=EyR2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
new file mode 100644
index 00000000000..e684cde6e14
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
@@ -0,0 +1 @@
+670be7d076a0c89f5f07625ae57428da9e879e7d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
new file mode 100644
index 00000000000..ab9b2a13625
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
@@ -0,0 +1 @@
+06d34ed6ff73de368a772a781063fe98bcecb758
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
new file mode 100644
index 00000000000..2145fcfe24d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
@@ -0,0 +1 @@
+e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
new file mode 100644
index 00000000000..798a7ce906f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
@@ -0,0 +1 @@
+55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
new file mode 100644
index 00000000000..d8855e32ed2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
@@ -0,0 +1 @@
+e3a9f95079e84ce201f7cf60bede11eaf1164480
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
new file mode 100644
index 00000000000..d2a3c4a02eb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
@@ -0,0 +1 @@
+13ac2213964abe1d1c147c0e1939a2520bab1d90
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
new file mode 100644
index 00000000000..a95ba010fe8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFv1EEwBDAC61jyEM99KH18hI3zlfuqvGoNjTLIh0wge5vXAH8VxMR0ndOID
+HYSBT2+L6OeiqKlyhCgF1km48F/dMzyJdTASkNO1Ni+B2Ric1sBxjsSPufkjl4en
+yMOl/FuQOB2myht1fCXhlynmOoiRia5J6xzCsCNVGOVYfSru8vpoT9QKcD1OlwoD
+WhfyBx/bXsoRvD1CMjQdalcGxv1aJRWfhRumXQwhMPZlFeARAzeDmWNpglqrMnuG
+/VADZXZsbLv8VWaequ4wEWiwTOeA6YYElx648OTSv7NjMM7iyPPPWbbUvkVbA3Em
+lLBLlGYZTx2nI0B/322SsREcEDwaBzO53GStIzP1XvaRosM/98/Y9ITwB+Oh7ZwZ
+dYmmabxN6F5O3v+TNndEW7wgP0lkbsOWZ6YNmFhvoEtd1RxZiSNov5CxokYUrug1
+cS+/vsa9oIecUwxYOG2D1v/pwYhQnr3qasYz4nEEBWHnnkhyr1BbUSuen7w2SiK+
+64cQn6V9aeZYi6cAEQEAAbkBjQRb9RBMAQwA7UCAsQ8KxX8nYO4Sy2pzlh9W5FMP
+wGluuokPA2A6g2Fz3vF62RqeaE4HrRQMpijQCsN3JTJVwDid41X84XCMItkdAxMj
+mn5zeF/yCcRuHe2Ci/+ae5BzrBaKE/VWRAkaZSZWJ1MoDdpSxJhLHNFnVrwTkM/S
+eSNUBk9ZDEC+43b0hciefX9bFlc6XPHgV+yr5ohhwcNcrZ/gbAhhN3/xIVmvKoib
+mb+ZIajhiCP1OOH+GpZAPT93w9qZWq3+2gvP4ZZ7bO+8N8Gmz24GL3/0eYI6aMUM
+wWGjy5J+iRiFjb6E+Iv/zToyZFWm2VOuOUqy5t4u+Vyk5bl0hATpJICmKa5OFtQw
+G5Uvfztk6rujjat90xv8yzsBvoEUqKqzIzjHdN36qop5hLMnBljdLdFY+Rk9CHdF
+7MW8Nf0YWbP/3uUk19utGW686Lolt8gvBQc4B5N7VtNoXFCKM/I3ufgnHQvDlf8p
+gdJOcyx/a90V/DpUI1ANlwg6IsmFZXbBQw7tABEBAAE=
+=u9+Z
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
new file mode 100644
index 00000000000..0a0d4c846cf
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
+R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
+kaIj27OJgbziFcnMAtvGoFRfaPI/7TOwEw3jT7B87RXeiATX4iL8fzMUmkfZm0Hk
+qjnepMQeaz3KzMY4DfBcI45kwzl3EIBFIlk428mhBU5iAAANoyPsimfqEPRCUDjx
+vT8g7PvpkBdNZgRS6R9vLxyzKi/f5KswZIMvop/pRXIhAKDhCCyr2GD+T3JoIKp9
+kvS1MQucWeX8+TFWh5qEA3e06Xu0JSdPCEej0BH06EiTMsAOU5bWqgLAO9DVpS32
+I092KAuMJlEPCnz7IGXVkeNY5KYrlsmoKrBO3GF/zsCyiZDvSULkVJcrtBCYOrgq
+HRIzvJWQaTJ5V15MD8CZIELyjCGZ8Jy8hdZpaTjYalw0bUq+yRAqMD5slp6A1tnv
+jyqVTgU+yRGq2HB90vJ0D3P1w4xRDuNF8c02futO415Yc/qkyh3/5AjGSoocrlfX
+cMreJXpQWVsvXn3NsitjsA6XOJpMOgipCDxfvn8SSLl9fWNJf55j7fCkBokF/lIi
+81RVQbyjVCOV0OEqHJLP9asPHyAFvUppNWtcvViPxVmb52djnw/x/61WVQARAQAB
+uQINBGL4BxIBEACwpcarOeEN5TztQDTvemc+DXZuWirmHv1TyJmjOhU0hGGMzEnK
+KU6VZlUIg5YQNYknUOfOf/05pgQmsEhjjI8NBD3Cys6SVQ6wOlkA+KpDKs/dXwyJ
+ttYE+EG/IMzjwZW2DbF50HkmT2VK/oFhRSf0Par+cbVQ/mNLAVC7ueZWBVXldezq
+Vvk3tDYYZef9T8Qlf999LVXFgiMzRFrzLLcd2KEHAX4se65FTxIfFYYCrshFIKDR
+i4IWNzQqtPV7mb94wXY0Vwse5mMEgjmieGPjBGYne2JU0xYNBxtly1y3aeDXcxNl
+NrcS/Ake9AqWAYU4agtocCefb1pt5Q3li0qg3PsVKDJ5qWDceb+kgcUuHgtwHFCV
+ICoQUMsv9p5F/kWL38/OWcTR2lQ4tGerE2dmlyqFWu7mpELckAfXSpJobZltUbp8
+CO679g0lk+OJWSmxddlVybdXCFaAeOKQb0woQOkR1vo2tJHyGmGr20Eea+UX+kdL
+ojVQwYCqICdvnK4YpHuhpT5crzk6lohfZpBPMHdpR7FQQZeQEW5EbcFNfoUEwsgb
+2qkG+hQIL5Q7wRajHkGaG3WuhY2xEyoHuLSb20hP5hI2uhtxswUl/+IOjjZtDCjz
+Lz59Q+ADkDZYM+PN3eR0UJDqYKly49KTuz23zLluNjNwqo8K0y05XGCQMwARAQAB
+=Gshi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
new file mode 100644
index 00000000000..bd22f88d8ad
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
@@ -0,0 +1 @@
+28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
new file mode 100644
index 00000000000..929d8dc7992
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
+85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
+9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
+JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
+D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
+3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
+LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
+AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
+o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
+TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
+nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
+uQINBFsgsskBEACsFJinwgOtkIicJPjQB31Zq14JOpaUghMQowvEb1oLe0erqS3z
+nShS0SzUeGsmyxff13Fua7Jnxe3k6J7AN75yLHyx7S2syzKFFYI/Y2Y5b43MVl+R
+fKVy+wR9MeONxmb2TSHSLfUgjjyVClWX3PVQnL8OeuBPKiGxSQUgj1TE4mzzS2cO
+TdyL+Vn3akbCIO9I1EaokjjA559VaV4ndF+YlNK7qpaouYIrnfKf9YrAbVUMohpq
+Q7NlKD2lBVMZiFif7K8TceXwMjindlrFgC59JybmiJS9ANuc08y1N1qU5Bxb4plh
+/KIKJ17Yy0H4e9BieDYwYSAI7UBVabRhjS5Xg1Uw9QCDDYpnOxsRRn+BFAICvH3A
+6xelrS7St0JwN4UlxzIM6S6NTZoq1stXH78DcJ7Huygl//msZXdbJQIJzWZd1AA4
+9oqyP49W5dp7bK4hNENTfp+9vRt85ZINE8I/yIz8aNT1uuQO2+tjw4RrWo3cHzyj
+ON3R4CfGWBi/82ireHpYbFUDwWXFDpemFfX4PXOY6gCYVCG4X7skFvvxBmJ0eP9h
+t8GyComD7LgYkMOJzdSHRk6X6FvQ8pmKSHKyyWZLdv+KnksV8R2tf6hewozqDVeV
+c2te/pi0UtjTe/x8/pXMiLmH+3cyyf1PwyMiuEAXAqpu9vSErAoCth23dwARAQAB
+=eX50
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
new file mode 100644
index 00000000000..6e5da6e7595
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
@@ -0,0 +1 @@
+8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
new file mode 100644
index 00000000000..5015eb493bf
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEwzT4oBCAC4yE4/EPw/MHB8u7mZtnk+N4e2SlHw1V4oyPHVEA6vdSUpsc5c
+l/5N1iD78W51a/3/l0JgtZMUNHlTtealzDDZxfEarCgm/fraD8v23AAVI5ccLxRE
+xKsobKOQ86QgFcbJpwwyRQbDv3QBS7ieeEvM7lJefOGIjJPa+xLgzpScd/F7qjZ+
+pGun0jhY2kcdHa2D0z73ACLRk9uEDcD1YfZtEwg6zKxdNx/vEPEn962FBf+LEICd
+urAKd9mIAg8a4I7HfveZbWBqiPijT3lZKkhfX5hbJACV5vEgsvQ6QcFs8UMpkzry
+enWg+20SlFW7xkb4ygiJZKwwAWYmjkU65yDjABEBAAG5AQ0ETDNPigEIAKVDaqOC
+orCrSpumnx+CUQN+2rUAYBwRQYwCs54q9gqLswYqmQfHfPq/3qa5z8wzNd/dgMLH
+BWl6b6uF7V0Xy7WQZe2FK3kXUVDB3jMfPN1HVIGqh+a+YviHwnEhhaydAR9eAxQU
+5cfB809z9DTCh5Sgj31U1eWZ6EomVrBeYhEdjvJKixJR/MxZtAsRGVJgX6HNc3WA
+vFvI4OWE//Om7FE3d4CGLmheMIe7nNfuNBl5gvzKAV2rdVeqNinWX3vH0KoZFly8
+9tLFGKaKaFtFUTMgaT42Ejqc83GmoFKxdfgPtMhWPTS3K7xEGvO5XJKVEe570tvI
+zVW9P53cETs1X20AEQEAAQ==
+=woQT
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
new file mode 100644
index 00000000000..9864cacc67c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
@@ -0,0 +1 @@
+4f752a9878e937049ef3fba7d4012dda1f1f0f82
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
new file mode 100644
index 00000000000..8e65abd72d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
@@ -0,0 +1 @@
+6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
new file mode 100644
index 00000000000..b85e6475cdd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
@@ -0,0 +1 @@
+b5569a15406ae682380f3ef8528dc75aa68f0923
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
new file mode 100644
index 00000000000..3f3a6ae23ed
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
@@ -0,0 +1 @@
+2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
new file mode 100644
index 00000000000..fd731d816b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+EoPsViw1nG41nzUAEQEAAQ==
+=jYli
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
new file mode 100644
index 00000000000..d771580f60d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Vo3ZsUREArFvADUAEQEAAQ==
+=4kaP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
new file mode 100644
index 00000000000..82ce5f73ae6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
@@ -0,0 +1 @@
+394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
new file mode 100644
index 00000000000..780f44c7423
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=TUjT
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
new file mode 100644
index 00000000000..64edfd2e930
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
@@ -0,0 +1 @@
+160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
new file mode 100644
index 00000000000..39f8f25641a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
@@ -0,0 +1 @@
+0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
new file mode 100644
index 00000000000..6f3f2fdb69d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
@@ -0,0 +1 @@
+feabfb0dbd7a754822d35dd9be6397e958ab7594
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
new file mode 100644
index 00000000000..8942c969bea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
@@ -0,0 +1 @@
+b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
new file mode 100644
index 00000000000..0629ccfcfca
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
@@ -0,0 +1 @@
+aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
new file mode 100644
index 00000000000..2bffd2b7d5e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
@@ -0,0 +1 @@
+b0255b26003ef6f82491acd7254e9c64c264c176
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
new file mode 100644
index 00000000000..10dcc4d8145
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFjw3rkBCADI29PsG4+jXT0KajnjFSb9jQynKlHeMmp59e/88goWICaTK7JA
+lM2YB5vpjBeQjA+MCv/1wRyD4defs/cXoNAAsdTeJkh6Qx2C4TyL2dKROJK2DixA
+p2ENJNICHzKQn44UFZM+gsuhDvS7M86xsj6BCKK0JAIHPtscVSdiSlEvRAkLpVQA
+iWLwhTtSju/hMjd0uPWWyQNuSR35EG/nFS8DvxOgblKKciT53CJ03HR3TWtq07XH
+wMzQMA/GfgPbzSYD3imr16Rjk1nWbZbrS7N1bpFyvl1qNI5uE84AqvJlzZf/pGNC
+PKXNjaGwXyk6OtNLrHoc5PrITava34y6QyuTABEBAAG5AQ0EWPDeuQEIAMNad8eb
+jGJH8jT8Io6KK7qBMiu/NOdyZJa+02PExO+hvQNQe2CRoRqTU29a51QKp/egrnMl
+Zv26F+Kge2NNbYtl4p/u58J+cRmrTjbjacG5crZvwBvrNgCF5q/XkWEZI+VIuhhL
+cC2YBuBRh3GvreH1HRtl4fWvhDOqKmlV+073mqGx88IZ/6EI06WdA9JpA3hRsqDg
+omzZvBPV79kL8/I/9j48OzVNPW2vWeZyyvAqd0nzcUMa9l7ZzmgdFdWMfu4mk5ma
+sGea4kk+Cmrt75fT+d0fSrvcTrtyrCY1hdPZmLCLAivTywU39jEOsR3icZt/oeNc
+Y3yDNzmlkKkQRfEAEQEAAQ==
+=vvXb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
new file mode 100644
index 00000000000..d85c89fdfd9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
@@ -0,0 +1 @@
+8f9a3c6d105b9f57844a721d79e193516be7998f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
new file mode 100644
index 00000000000..d9a637ecdb9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFWdcSoBCADK8j+0eVZKUGctZo/VaJ/K2Wppx4jEFgih8xiIWREQ9B3QEugJ
+mJMWZHhrnHB+sjVx5No482ch6sVhYmC+VMyTdzepItZ8beYa0pnNGJnrFT+HcTOS
+g21Ef5e6BRORNho2j9YTvxvjof29XxU4SJFVgffs48jGeJzN1EDmOz4OlZupKGU+
+98o+kMKCiFjcf6Vu03asuml97b2fMOJ09n+UQVlZbBR/Yo407ZLkL2Elx47Fz+82
+iO+M8w2qNnxT4PA/TLgaVzkVHaR/JIDlQQ4DfuyloQI1hBpMB8f60oukVr5dBGuS
+1dPZ1H7td975sLegWoj7CCOFZXrDzYUXwwXPABEBAAG5AQ0EVZ1xKgEIAKJ2COl4
+DJyi+Y49Z/95FcSgPuJtM50qDLrStwdg94Hqk8xVpQyFlBDhBNNFNpgTD1Im0PaK
+27uSGK21y0erdEDkSYh7nT9y8XbYyKlwmoHcwnsCdCn73aUf2uuXbFCy7uPr/Eey
+gR/pQVbNGjdM/Hud/WWqBjwlWlpYsm2x8HK8uLTjLvcMgXT5bdKZKkO8vmHq14Bz
+voXPbq0FWPcx1QUXtSdr6sxTjYrRZQ+QaE9/Oqc/LQYtFt9ieOp04EXrpMyVi27V
+ed38WABVK6AO2HctsWCkNslagavTa2lDam3bZRISUQ0t1nkLOIrbYPqMjLpiHTY0
+m1JWw19DuxD9eikAEQEAAQ==
+=0bpl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
new file mode 100644
index 00000000000..c438265dedb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
@@ -0,0 +1 @@
+4c5f68d09d42ba7fac888df9a929ea2321fdbf8f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
new file mode 100644
index 00000000000..9f01bb4c224
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
@@ -0,0 +1 @@
+a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
new file mode 100644
index 00000000000..971e451d7d3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv
+BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3
+67RAu42fJqJcjD2Rs37wMxlSRRGQ+/bp+Bw2HNO1pw7GwrSgmZwzwT4+1pE/TvXQ
+Wl+Nhdf3swLyBaSuWHJZT3+JOR0kEGSQuurR+57r6fKDmouWSwAKn1z97JelHuXj
+HKZeueCkQvX7dayPP4a1zpoXPcoZhYekFarLWJl411EA3aHIIV8whknsZx/lGGC5
+yF9AVIzHHnhqFC/Fr+GJbwa9oMFXj0pY06ZNABEBAAG5AQ0EUc3EzwEIAK6rZ7kR
+p3uj0CrhvuTnLHU7nEs+KvoUZKLyhcIys76sJQ7cnhEygcG7tng/EtK8bI6skLwU
+aF4fnPliDj/yIigY08p7TvFL/6HL4cLrIXR9uZe5IdvBKYhy23Ie2JXdLk6zH6jq
+5+vBE0IA7ljJUQj0PgiIL92kB73Bn6dPayvtApzctajXvGajYNfOLTYc3n1L/Kqa
+y+/UwjB5MJVlmFtZ1a/EAxyb5yHld/s3RKEaeEIpjaoPSJwXKOWNAcLdtgcPcsyf
+rV4bkgjx7ABzPvf82gYucthyIx4zPZ29hZfktSV61h7cbJL5HGrk39UcSgfstHbf
+BQiTY/1kVN9tuHkAEQEAAQ==
+=GTPB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
new file mode 100644
index 00000000000..d2a3c4a02eb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
@@ -0,0 +1 @@
+13ac2213964abe1d1c147c0e1939a2520bab1d90
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
new file mode 100644
index 00000000000..82ce5f73ae6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
@@ -0,0 +1 @@
+394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
new file mode 100644
index 00000000000..45e1dcebc71
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
@@ -0,0 +1 @@
+cdcaa216b086a7b603b638c5145d819475314d97
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
new file mode 100644
index 00000000000..910b52cf35b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24
+exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL
+9yCmLEVzzSt4VCStMdPmXQGLvn0JV0e6LmDFv5+UfOR+qxjyNXfeF93W7ndVFA/o
+YoYgMJN26Xneb+r9bx3rJcT1zbHYpqUqkswiQ9cZSApe5GHkDqOvu/lJnlFYfFiC
++f0UiR2tEQtdIYy1Owkovcy81gMEKw5Mr49d6lrkQm+oES4ZHcCecZ3Y+z8V5Rqt
+qqlrV1IR960VxwhmUm1+VkxGeGClxCFF6Xo00wCWlcJ/BCAea7FXXr4QrF5a1oQb
+BDfoVDlXt2cl/0Qfo9gCivBbyZ2df883MmeG/Vc3IovAP7Snl0fkX4KgdrfWuISa
+nbARk5xsIxlfC0CsnFNU9CuNh+lg4gNV3E1BiCVEa+boy3XqvcfJIq4/ZiTUXyjq
+chI7QFHmBS+uhHGnTtqEAYzl8KgRQdHijgo2cUVw+it765tM17Ekk+NJV5oQ8C8u
+nlVS6YiWDiuaTfxZZicI3bOBq6kjTr/TZsv0ohhtbUh5JdSRKSxpK8vkWRnNP45W
+m9oFvUmI4X209lzFvu1t4/t33Xl0kzp+8q9Qs6tgnqCpSnxSbJY3MZb/QwARAQAB
+uQINBE8YNGIBEAC4ZnRG2rSszbho94Y9Qysjcb0pX2EsqqIR06uzgxClcvPAToCl
+9w2/d4OjRlf5T+225UUbqObsWpuBQ/Byc3HFFdLlHxBAoMZstv1LDA09/ZzrfOnd
+jMDRe3/etJn5KWALjAL4nqmihOxuLz7Dj8dUtU2gpis7tumPQg4OgOmysWD/YuAX
+U+uTq1EoA9nMnN7PbfcFWbM5rmATLeGMH70RJu4FMlN0/Q1TDeIhurGSpLwI1uG6
+5YNicKyv7h5JoBnCVVoK3k8YVLY89TzmTUW37qfYwBUMb6DnHp2gIB6uxduXj7Wc
+uCZBrqb35E/s4mGy2vuJ9iQtg6Wa4Qpmkoj6FEBLipAPD7W+Gju5PRm67/VvZE3O
+rvwZ5ia0RWzTp2I7IFFxTfkdgdQXLp4eaWg+T3dLUH8J93k+axmT69lOnkrLhsFu
+dYgtl+/2zXyalMPdKi+eSVTaRvFI0/opOTJbePAPM/kkANzaJEkVYfsZsi235Epa
+IC672Fn+tKor7RTG5AVZDm7yWcVVR8CpssyQWsIktDLXNaHTtYRS5p/a9De8hY8/
+ZtvtMtuzFV9TU4fptofFKl+RbaqbXSqkAvQT+jLRsmpzFJDEvM8z1dRyHTKVZdEj
+ofScPx9GufaICnm0Fhhib91lfvVvPXC2FQYt4MO9ainvstnp5CJ99bRBxwARAQAB
+=aqOn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
new file mode 100644
index 00000000000..33cb475b44f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
+DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
+tFn6YtkFhA15Aahr/vz31NBjUJlBmO4PwvkyxiF/MYP6TQ/AHar4xP1RxSYEPcCi
+dIQczQ8nXzya4OqOyTfibeGz/eiHHuwTLHi3Rd2kihQnlRQdhE1rmm8uTyzFe1H+
+P7WW7kQgygW6yxQ3J+DXrG8kG+nbe57ZY1oyv3F/fOBxzn/kuoKHZ3JJEMJmTIrT
+Lr1ngCZApgteAynRHk4t/SYZiyoyqZCuBcwHABEBAAG5AQ0EUqd5cgEIAL3PEOzt
+IFUibB6FYEkObVhsDbCnHw9yO5MAvAWB60Ohf1J4T9QK63jZ5/CiqcDrw+uab9I+
+Ruz/SgGyFS0UXAkwfTICUdhT5kUzZmGyoj2ul+iFDP9uUdEgSgyXXakrxBbBPzNa
+Mx8+GyIXRVFyRTH7+1gWgPQsdN1sGYOgZ+f8TMzAv6sxu0JVzjKXAAbXdiZTyJh9
+d6h1jS5Icilu8vRwn3Qc/ZzstBRk+eLbb69wS9YGoUlzYvDBz+5tiNwvHUriKc6z
+VT4Edngcr0mKWTdvD+AsvZffU0XK+vxbgMuRWi/51qb+VgK2gFeAseV6a+D1059u
+2+5Pn3h/Fv/vRAEAEQEAAQ==
+=EnO0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
new file mode 100644
index 00000000000..3361d9bc60a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
@@ -0,0 +1 @@
+0cc641c3a62453ab390066c4a41f13c999945293
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
new file mode 100644
index 00000000000..04fea655c64
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
@@ -0,0 +1 @@
+2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
new file mode 100644
index 00000000000..853cff28660
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
@@ -0,0 +1 @@
+2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
new file mode 100644
index 00000000000..6f3f2fdb69d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
@@ -0,0 +1 @@
+feabfb0dbd7a754822d35dd9be6397e958ab7594
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
new file mode 100644
index 00000000000..2ee06441948
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBERFeVERBACjfASThn15ynIICr0Gu8quGCl2rSSRar8TsjrbiwYB2MTW35Rg
+NjLU6MN5Nq4d5G8D5aMeoyGODstIHH8zA52sDGeHOMKfDaAraL+lGzElbpmaqP2s
+P+y+J4gDMlxSBoXY5HjfZUTogP4olWYJS0tWTFc6EiXcSH1zCo1rdo1TTwCg9/U5
+q+Us2XbjevKghRbRabl//R0EAIcimKSJf1w/3yVwrYeUh2Op0fM23y+JUAPcG8SD
+lRnHRnIrf2e0pAkQQ32us1zRaHbuHzcJc0lP1eyoQh0KoRZIUq/7mj9q6Dp3H63b
+VNAxU7O4DyPMMmlgTiZCjwN2qBclZ9zegGx51v2UR4b+qKhZZCHOSjdj0Xhq6P1L
+O7G9A/wItw9LtJhVBqXVxL/pNVNA++NneLMdl5OpAAqJtI44oflJpo/FJlnDFuHP
+ueLYZVWWGoOlPW0odKxI3fvMO0ZfTtm4VO0mjEN2kZ/OR8L3c2Tdx9AHS5lVqIh/
+T4fRqXl/zjbdE+ZqYqhEYelZat3V4EhBAmj2jFQiHsSbfMiSergzBGOXF3IWCSsG
+AQQB2kcPAQEHQD9K4oqVlTNYHB4aQ2ZxjJbSqYauArg14roYnqsPribZuQINBGKV
+5oIBEACo1VxhyMrqIT3kMmzcCX1NzPNXPdkq8o5817v0IidZWuP5s2lhCUGyUjaK
+8jlVIMmuSYcSKfbUrldzVFqqP1+R7zogp01Xh58jt6wBUXRpd2TZG+oKid9BVmr6
+fC5a0PCwaL/hCC6tay3rumVp9iwVrw261a/Hp7wA2Qz0orZMtJc9wsBW8JlZDr84
+qSs2XgFdHUFunIq/SemWQcrEMDGHJuFjiDax0SA0an0iWWsSgeMYKhscL/SE/fmh
+M+6+e6XBh9oyMp2ifDxbqjKKFzRzbzK5IZlMbbz88kirW8/y8h2kPnnKLcQ2cVc/
+eWfaQfrS+fHxGUjNMQW9SYv+87GUqsp936TA1eVFreirVxox9Wzq7XVY0C689Tcz
+8pSAL7vi9YXi4QEAEgRJ90zztNG97Ogz+5CM/Cd4fYv4EW81TAp9eefRZrEeTkts
+xqLI72K/ZbFE8LwUydYar1DKYmxMprLpcReQWi1/5nhTGh2/NbvOTRCo6jOhgKkK
+OnyTLhO/PoO8+IWnlpfHR1+gkhE+YZHHm2k06RK+y6vaGGLPltk/QDcPBFbewpn4
+Rf2ccxptBvnvNFrXPm9KWvIoELfpuaDpHjcgOvxh4SFebrYNfY/HgZfrIVAd2tJm
+Hc+IwChaPG5oP4izOmhkYb3LY7+sRFBwTEdN/F+7071UAHgD1QARAQABuQINBERF
+eWMQCADeccn7km+3BAgXPD3llM90H/j4OjonOFmywLUvpm2CMOHfN0QNuWhezKuh
+rDBxjpT66dqTbiJNeVtwj8iBmdgjNlx0czvSGL0q1+FIAxEMj5RoWzEuG/HyFxNR
+XR/PH4Hyrqe90j/x+eMnoKvQRoKZY6oSMRGz00vu9rtjfcmKtBDenB7pWnNp6MT4
+7OmpAwC9+EvD25yr6XYoZNOT8txxBTexQgXSiwBqQ9dtM8MdcWapaQinQZAgTEKi
+tbsUFur7gR13SfgfnjPSQ/8EuHczoeAdNRC6tXnLD796dK/sHTAk+JQuJQJY3WFv
+9XJ2z1Zijg08v8wiXEf9lVNSJ2zTAAMFB/9alHgyMqvGt/obbQn5NcGdFXtxk93H
+gWxQTywJAVrLhnNc/bi2SZZdDVvwByZSvqime4yKjpBdXWUUEhTaut2gne5CKGtz
+bVxMTn8XNiQWtYfcRKU65hRqp59YmncHmLyU2hR1KEAriLCPGwzonUyeX9NPlXaf
+C8HfwKgBy4pBOZQY04CcQIA8aZPLk1DZgtnNEwef0fPJak0osASSnSo30RVkrlME
+ZKcU/R8F9g9YeD6RotXOlPcqGTNIaMThzJajK4hjBJvr/cUudoIJqVhoLyTaYSHD
+2gVolzzLIhqwpqgCds9Z0xdBHfZlJNTBYF3sbID1T7Ato1qYmtqZAQEV
+=Sk0R
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
new file mode 100644
index 00000000000..0f732938752
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGA+cG0BCAD2AHCRED4EC4gf9dHVaPuTe10GfgPTVRNVRbj9XXjW9VyU3EWO
+4OYlulI9sTXGvn39IEy8w+wQNJXYJkI3VHrymYe3rSEq85I/Z/NJbkAuWVs0HdBy
+QgFwObq8cyJLpi8f9MtVwwZkDK9VhQBBW+/Fem6y+KhAGXAE41DH4h50SNMWvydb
+kE5CqwAfwoPlSpbGhoal7pdX8LYM15aHaCeJImMsm5VN7bbQdYaGhmwO3jjl/CL5
+Z173d7LrhXs5nLeZ2VoqYnaUi/ja3cGLNrWHFsUUiKDI8Xu0vG9E9v7bsaClTrr9
+t/LIkvoOUCBbhkOGACXmDNqw2JkuCw09cIwZABEBAAG5AQ0EYD5wbQEIALTkIYJj
+T6jZmwF7oAH0T14AZo9odlnVg2QPuYWCGtJQOvFUu8SBrNW2voHHdfG1+EatLfYU
+kvpblFxt3KfsGtlQo064jJD/AD6reAyaREEWTluE8vaEyd7YwtJGsS5XX3oiViFL
+QWVQ0VLoZZSY2vIFPorXmbhyC30PBMDRnF/DrQlyESBogkz6O0SZtzce0R81UcE7
+rP7v+nXVgwqNttD3YeXM5alsO8bgOdexKPpk9f0SgpL9MnidY867Ms32rFsnPI0e
+chBd/j4X30co1iWW0nm1QPBDydBGED7aXt7uGhOup2CHxnH6iVW6vDYQ0+zpbJJf
+UxBSPWBeBgWXKYcAEQEAAQ==
+=wyy7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
new file mode 100644
index 00000000000..0629ccfcfca
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
@@ -0,0 +1 @@
+aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
new file mode 100644
index 00000000000..b898fdf506a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
+WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
+anVQ8VL1Z7uPeqw4UbtqA7Or/E0aOhF3zkkmhaiE9Yrp+I3KXWH4F0Cj3X9IUcf5
+Z93CPcEFQx7ajxSJ1xw/mSgbU4AtKZXUdK1ehnFAhH3rcMVW9paFSYaXD8f+vUbj
+hdJOp3e9UYEFShsdwo2X0FRqI318ef3gPDpbTATyCaz6NMIybDgRGo9WOGwF+Ysf
+snXwLU2UnT44kpAzHjFdjZhQGcY1w7d8yGNrYX4qw/RMPhmuVefuF2yodBtRxhWW
+09dwNiIYFVuGS4S03vlnEfYZlhmRgvWZK9PDJXm0vE5GI7LdOKlqwZxvoznjGmUU
+lscRU57DtrNlAjyXMZaGdNfPIG85B+ijJmIb0REHbszvG6csX4g1MiZ+i0WID8Jl
+20YpJTUkkvIztXkAEQEAAbkBjQRgVVFjAQwAqfVaX/iL1guWx10Xum2EWJuCzu+H
++RiAgt3KnxzXtMc8J4QzNV/Cr3vO3Y2a1qf0NO8o4dN4nHHXWbB9Vn5ntG9VHt1H
+a4WDLr7zEDyNpPiEe/sLrQLA5TD28kXIJ4WgDuVEYZ+z1tB6tkcZkUzx6182oxCV
+KHU9lYIxAvQzg+XAwFNoHElCYAQDTryKDxEADAbGDEYGFHM476/MEzz95LqgatDI
+WaxE6RDSBjnjSA44ZHsJGwcHjrmz+RXgFnhQjC/9ywSzNZQNWzWjyS9qgLmIEkHM
+b6mD/eQHrGA5SyvElqIJMMvXrRpnoG1l2FFiNn60wyuB+Fztfx9YgKlJJwdLfmDD
+QTuVInaLU5iTKvZZ9uh8ekajtYn3NUEbvAN1SK8gnWqTRhVIm/0wcBdtNViTytTH
+7CM0L0vx4FZpru7c2KyFQx2G4/0VxIolCzHz2ROD3s2oRTvP6B5r5EdCizrsJzrj
+Mljvw1hp99AnXfJPtNMyeHKwkfxVX8Kxnk2nABEBAAE=
+=iXc5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
new file mode 100644
index 00000000000..45e1dcebc71
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
@@ -0,0 +1 @@
+cdcaa216b086a7b603b638c5145d819475314d97
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
new file mode 100644
index 00000000000..5e8d54ef968
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
@@ -0,0 +1 @@
+050a37a2e0577f4baa095b52602ec18d20c4661c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
new file mode 100644
index 00000000000..895ef3d3734
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFXaLScBCADeS/077Kn1MX98DGKx8EreZEwLTUulR8O5UbLy7tXJ1iAm5PYf
+MHENchh1w8YDsvrSk9bogOW+d6sJBCdTNRd5PzOoJfiw3GVG2O/ZeoGptWG0Ns5W
+/3foLDitf/v7ucjUsY79QE+6F4CWzV3wPMU/Jwjffpxuv7qiacJU/SBOlL4TJTlY
+vF2TxP8SDLlJaBKbj09yjZR741Au6RMOwEmWMn5yTi6hw4eD7lZB2gAzUrFJmzRp
+Fxl5j0lELkGyPeE0gzBq1m8YyQud97Mg7ky4P5UDu3iX70MlojBftP7hi5eqnYL8
+4GT0oQ7sM1yqNS3XOf7f/wqjtpTM5LxA2n9ZABEBAAG5AQ0EVdotJwEIANNnHzqd
+hHPjWUPnHQOBjZoKHA3/cs9jGm3FwPjnKCqCRNbC6eY3KLFg//fTUbe+k8L37AFa
+Y2RZ83rv2egKgm4gEtnXb7HHWz3T/1FMtR8qPtMP2KBQqQJIv5yZtzvjs0p7ad9Z
+5+4Gl8R5UkoIrYM1+3uPAbEAdJVtpjiUbqbXWKyFDVwM4FZZfdnqD4xzdAhbfG7D
+iuwrszIBQUOWgD8ZJr055F0ENZIK8HdOH7b6PzlPOLgSwooTE64h2CbialNhGmwb
+cKfx2kxdHPY8RJasv/L+JO//2956DAe3HA9i1Z3tV1gJXVD/ik3pdPv7ZtaTWrii
+qQcVuUXRuYSyIJ0AEQEAAQ==
+=oK7f
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
new file mode 100644
index 00000000000..775b472966a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
@@ -0,0 +1 @@
+d75e25b78ebb19e47c0a99bca7764f502a938c99
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
new file mode 100644
index 00000000000..4603c69828e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFc7oMQBCADaIPEUzMrwF9gnEC+PRn2cSPG8OV4RxXxa88TZm0L7NF7D+F5N
+MNUAZ58oVqFUW+ytgb5iey3X7KjlJXZnuqES4m2Id4N7FlnvrmpeOg7MUc9VmNkt
+E7RH0O5GAo3V3o/Xp5nATUoaQ7v1WaPloB78ucyWLnH/iANw8YuxYuYUTJ0f2b15
+1oY1feqkpibbbO39kdMY36FH5h8Gsv0vvGdeS2O1p9vbzDHXEMLkNyKfcILLjbNU
+O/n2FzDL1y7hHXcFKDl6z2G7rKJCAsASH+r51YX3dOKUepE3pFcUbMAXGeG//n4B
+T8cv9YOhsYGaXBdbOMjy1WsZMvizbp0p6yIhABEBAAG5AQ0EVzugxAEIAMxtJLP4
+EGHrf/bnRuJHkyMqd/LEIMR4KszUl1AU5oeCxah7ZsK2MjwAUDD2UeLAIyANmKq+
+vXtma2wvQeOzo0QDMnxLqADSQ4xqUUcgbn71rjMq2O/T06BI9Lr2BaXeuYYjifA+
+loWzCbOHcgz78p8RRmxlChO5mWWlnrznDbUjV4Pih8M1LR/a2bUiU/Ftg14GPSrh
+ct9D3b5CjMIa4tqWMpvI+6jOjJm/ZD3Ux7WbzlHB+B9/yTw7n3pLSMXj/07PJKrp
+tUeJONprdN7V3wg1fnVS8CuQmLKoJhU1kLnucgnCFQMaHThhjxdaBMr6Mlq3urT2
+BSw970AB1qV4Wg8AEQEAAQ==
+=ysRU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
new file mode 100644
index 00000000000..de3b80caa5d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBErvEZEBEAC1bM12HNDrdM7hs/4Q40+mq2hA3w4Cfh/SqFxhe8r2s1Z1PJHM
+tY13qg9XRH1PsUer46q1YF8Y1lKc41Nm3wYab6sQqN4WaXZuerIfRzHCMkf2c9rk
+6RWzIsvSIYjGsrkRXqEXPLZ6CLkBSZaRsjPuiNulKgk7jO2tN7qmFEkbdDOJNJiD
+VGM3Z4aCLwGNO5OZShDVEDlaST6hD9JCqHXYEmCLDBHFoKtkZQ+m6GQHhR+BJDA+
+WihI9zcrkor6gyLyVeaOO/YqEVh+eMpolzTJPUkKb3zGjDHGkBQHWKzKVK9oNZQC
+6m1a3pB7qTtp/CpaMvFbdgBaYbJUb5kfY0S86qPfEzV2Ckg2b2uR+F0WTMbhfcER
+E7PVMGCkJbt18l8pOejgZmsqGkw8du2DMBO+9YPyXn+tu1Xkq3yR76zShk+5b0B2
+TpwOyopiWJ327C13xcYRwYhc/MvxupdzczVPT4Jj8U54Ykzh1nSgk4Ry9qgQeUgG
+CxNObrIa9B3tLzWnPhyfHc8ZdGIKFZTdZYxO/aof6iY1W/zEefJSwCOprwq6ueVH
+TEEDCUdN5NlV/SFw3BzCMDxTBO+ksUrvqTx/MdoPqmYwsXTEwFppTlhGNBTXKH2D
+QJtMNVU/FMll8hpE0SS/tqiNzcVwRpmw78LgnTnh3DDwsDgCXhzji1xgMQARAQAB
+uQINBErvEZEBEADF3g8hWVkCfuvFFrzNCa8XpwRmV9LNHSIC04dJcZyoBO/Gtikg
+E6cDvrsA6Vd9Zmh89bTVci2yEBCet6i602AcVrTS8ckedYPdN8ayQMq5FPVyEX6E
+WIX1YP1jSiASTlse0Phfw4C8OtEmdfYNue/mkX/NcXRCZEPTqpZ7gRTezB18jlrf
+dBIGI9rl1HDfnosZnXRLJqZCyZYKUMeSXqzXyXfVnipGF2Oa6Z+Gh8jZbGao2/o/
+qL1MFTZh3u/AaSLq53PmTHPIDKSjNeBe3sE/abfgWL5SEnN3Zt6WWfwRF/XuToin
+DXqt2oZJkVgIT/4JRLje/BCdDpdTaKlrLc8tEMEczcxMy1wriWiNLD1z9tRI23gf
+E367T3fDZ5M88MrhZYqIETrlI3FodOuavL3zBxzN3KcNdzY54jzQlWC8UdzleNv2
+y7fzTJQyZsUb+IPILOa4x3dwPrqNShhQTafDaZIuxFnZT7xq8K/am7qinA8NP7yz
+Fk87g1Susn9JhlxwjZnj4Quyh8v0JQSZWz+XwPkV+YSh+jFfxM8l6rNc0XtzcCK+
+dBSYcBek+CVgTWnFOeVGjqjuzIPVNkijy3d79hKZSF0/Qk0FHG2BnhalNIlVUNMk
+9qkKNFUSefS0lPNEKSqC+TPSbIf+UJWRDanO0BGOBUZ53WKutENQpQhl0wARAQAB
+=/gBN
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
new file mode 100644
index 00000000000..07c7120ef60
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
@@ -0,0 +1 @@
+3692c12c7e3d336a452beb254e066e0459cd109b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
new file mode 100644
index 00000000000..21ba0ed5f92
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
@@ -0,0 +1 @@
+e83aabbb95ca37431e20422043203be58f49479d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
new file mode 100644
index 00000000000..1f1b50f1926
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+NUZsDd9Rnh3Pq5EAEQEAAQ==
+=DBIb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
new file mode 100644
index 00000000000..b2e17c92ea5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF1Vn08BEADgfOupXhJxyb3t1kzDNa595spJptjF5ViyXuEJtlMQlmobPP9L
+2gZH83gNe7Ro1TsLesgWTtin3hGANSKITdi/wVH4ET6lPInv1k/8hXe0zlF11Zmi
+pBxZBhFl/ow2g+V604RY581hQybIxFhjnlMoEhooIZl9x/GdleQBsrnPdKnllmO2
+jxU2CKjjnAuaQusVXYBMQ2kCav1TrgZSr/5Tml1xe88p7K2zl1Ihi0okSJJ8CyR+
+s/I/ZngMX6OzlXNHuM2uCd1BoH+9aHGrUqQBMIjo4HBMCri+fmkAKod4Rc2lHo8n
+htMObZzRoN8wPTEUB8GN1chu5GOaX7Xsy69TQxvIs5SX7Nh5wDACk/VR0Try6ZLw
+pphhyeP3aYHvZAd+5+wuCzhcHpQQDnezhhZgeWk/7T2U/uut7LEmC+yRNhwmnWag
+LycLJ3N4dBR1VYPRMWTrbH8RqX7RpqOaCVm9oKxWtIgDsRW+nNg7K7zMsaCC+pPt
+U31ju/eKRzHVw/2CpcrZqbbQlREGRPfPv3zS5vb/rAEz+QRAKcq6iLKvR3c/hi5T
+KZg2I4ZX8Mw0aoRygku7F8gpI+WEmvHgd5wOeI8mlGGAoEwSfgQq9tn5EoxpLtzD
+8eC5NpEiYpUNNMVi5uhYdI9mYdp4WfChdsc6IkPvM3fpt/eHofSqci1rFQARAQAB
+uQINBF1Vn08BEADFtEGfSbLZTO4iKKrg2NSDmnAq9gGjtLnQ88jpzMYR61B0qSSu
+at8jUBfK2JEuj8VzEjHkYWkwCGZrX0Aq19ZtZFExohAw1btkiWtHj8JyCsgtLpkN
++eNZH555dtKOqzkPRqsrVxtmrB5VsH74nGUmsmTG7uN7eCHbo+xWXvn7zgkiMWKC
+z89Ze4vc4kR0CKHQYs+mJVkWUyeq1KJY8a3ciyDu1wEEgA9RfEudUnuT7MvI4GBY
+0/Dqm81SN+Y0vAgBfQ1EmIZl1IUoow+sgmYFzBcEoVinbEnZH0iQjfJtJ0ddUPpC
+VI5BP4Oa17REL4xUvVGexbJCduXWK5YH8Z8fT9KNBw3or5B0xwEvMAFZfb8iD4Iu
+1rwNOv+aNQVZel73sNLNIbmvz8PuD+S1uQhAgZ3nagh5uajYF+Mh3TsE/+ZL0ChQ
+tlkBUIPyMEGqE6YyNv4QmpdiMXeHIXwSLl/6Rre/ynK1WzDi2w2UylEmdAb4JeqF
+kz93UcDmOL4qqs5WzJisKEubCzRS3sZ8HRESkc1iUkcN6ez3BtfqAeO+9AqZL1NM
+5r4xW13ZRP6+JICdH6eqT2iRQoGsbnGWCnjp9Tq6xyYDws7p3WszrOKJ5vBoJ7WY
+7jut5eV+Qxt7phazndaslmF2vGVc3tQs8cfUhyRgVHQmJweNpwiqAlQMvQARAQAB
+=d98R
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
new file mode 100644
index 00000000000..0bf7fa00788
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
@@ -0,0 +1 @@
+253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
new file mode 100644
index 00000000000..91a7375d718
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
@@ -0,0 +1 @@
+8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
new file mode 100644
index 00000000000..0bf7fa00788
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
@@ -0,0 +1 @@
+253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
new file mode 100644
index 00000000000..5320cca32c7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGFcp8cBDADrrm+f15GNXnwAneAT164q5fCsp5CifXMPUDAkApC4o/YEC94D
+mIiKfV/RLBoH1gcXGgiHeJypRvCY94xQrFl9lHB29+8riW3vdYCy6rS07GjfUxu7
+bKOALZ9fsnOVB2B7A+i0WUlNXgBPfhu7KSqQwKG912uaTa0IWA4HKtC31nS3ZvEw
+7bheDBBhOHih7oxJLibcI6KZ8NURFpl2ZeEcxyBJYo3MrQrJ+MWoOrfCoC+r5aq2
+nL3DFb01WkA/2i9/noWyZNYAFlDQEcLkjSdrc6rrfKYNf1L1/855ix0eYCP3UNOC
+zHbtZ1FupnjHEBk+H0CPWgwj9QHb/9AF6rP5gVeSYrnmzjsBDd46SEaEdRD0l4Pi
+ubWxZj9i1wFlPKmD6MR4AXJ441IUbeWFPzaBmjsCUUwMjTyTZ4WSyeko9SGGzpdK
+kUnnw2guvsKtBvJhKKvmkAHc5p7uRy0aQ6V+rAvbdWARbXcAY+xXJ+A/7qAxUMJH
+mvijGOctRMOBy/8AEQEAAbkBjQRhXKfHAQwA4//n/Vw5eMdFUFc7+b381d70FhF4
+E8PyDMFqYpi1t407FhNt+zsr5qPPVw9Nt5/fKTCvql/eNlNcTV4+eFUl4VuKQU7f
+dvR8LmLjAxG0fjUoHL7PzIV+Iae4IBZz7l12BvCaA2mKPHTPyUOZifGkZZGNFtp9
+rylKc5UEXJx9J/H3mMDd3fIQwFaftzRAoH9qKEFDgGjPOIF96XIrlkxGyfvwcCVn
+hLUGrox03zdy2hm0QDgv9DphuGeOc9Cyld11z5OT56j/QsEqQGJ97Vxvwsyh/s34
+rLIQOxIxp6p4CvhGiO52V1aPLcKfMYjr1rT5e0b9W3U+jHk8hjHIDPELGAm3Kmxb
+KbjSWrFANpBk3+OqxCmb3eHTlIObWPLuTLv/tJGB9G7xmkNWH9UM4zuCrG2f18YK
+lKbLdd4ezVDm6odFPYhZuDWNkYfk4jugFcpHZ9C/5KUJ0+WFkQU8kCVg0mA7Bj5r
+5BoONdNm3m3C1zGrtxzAiSq7qzA/yxCGxNAxABEBAAE=
+=5u/h
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
new file mode 100644
index 00000000000..3af575c8f57
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
@@ -0,0 +1 @@
+7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
new file mode 100644
index 00000000000..caed7968c22
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Izx6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
new file mode 100644
index 00000000000..b5e9e1186a7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=xF9l
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
new file mode 100644
index 00000000000..8c912e167b1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
@@ -0,0 +1 @@
+76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
new file mode 100644
index 00000000000..558cfa662b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
@@ -0,0 +1 @@
+e5c3b1929191df06136ccb2b164779204e106a76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
new file mode 100644
index 00000000000..0cae4729da7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
@@ -0,0 +1 @@
+b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
new file mode 100644
index 00000000000..ba5624358d8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
@@ -0,0 +1 @@
+3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
new file mode 100644
index 00000000000..bb7977de5b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=GTCz
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
new file mode 100644
index 00000000000..b3471a55708
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
+xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
+qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
+TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
+vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
++fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
+0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
+Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
+YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrkCDQRKMGw7EAgA
+5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4HaR+j
+NNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw3PcE
+gCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rmwcHG
+opSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjLx0St
+a1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLjNnF4
+SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8486U
+bZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ7hsr
+Qw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxjPY7R
+H41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUGpU9v
+xZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXNYJ/p
+znXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMQ==
+=3smt
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
new file mode 100644
index 00000000000..baa96d37f71
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
@@ -0,0 +1 @@
+4bde772c338ba540e1057d0c8ea48d105232855d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
new file mode 100644
index 00000000000..a7c567b4543
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
@@ -0,0 +1 @@
+08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
new file mode 100644
index 00000000000..8942c969bea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
@@ -0,0 +1 @@
+b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
new file mode 100644
index 00000000000..8f7648dd909
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
@@ -0,0 +1 @@
+517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
new file mode 100644
index 00000000000..013825e272e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
+2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
+gjkS5eq8L04f5CSuXO7r1eLTOch9iDl/ESaI5Nhq9A3mRQIhQalum+FjzwCgx0PK
+hoC4MVPVGXzOQPc5sG4jzAUD/0OX9c/yKQqjHUs38HTCgrjseM40iPhp8NfbWenP
+IwUMSWXE3lz0MMeKrGcEOcZOGWsjyepkLHXwj8DDOeGxhfh9bhFRJssdfzOCKBpf
+6S70A3fanzqOAvddxCqF/zOwDaieDmWvVntVpmZO9d+pgR/sZN0JgSIm7qGDdNqG
+Aq6eBACyywfwuVoY6lfNz70ZZqYjYuUkbKnKqpG0XmI+m5LYrUW7QuKJqaNdg+ZL
+vVgX/TdkWVSIoSRS5+eYm3fRD++cg3ZgoR6ZY4WEa7SRSp2zoidtQijWOzp8WeHs
+30rIaXBrb5wHR4GQ4FYsBGRuWkmIaferusllUmHCHFJI4ldvgbkCDQRNyzHzEAgA
+1rD70DvCcy91ShQKP2snZ4cLJnFwKArulDUcxoBZ0AG0qMbaE8jiiJTHIwgVrqsK
+aS1JENv6tVdUS8xHswu30zvd0obaj+4IGXlMVdc6052Y4SLAGNbGVw99Ah1OkQ7o
+v92gmYAYfqppOtRt1tylz7Jf+F6er0umdVBZm8fJ+QjzTw36AwERj2bjVbc6ogM7
+OsTyru5oZGOJ+oJU+M9/mh/Gq3AyrcfU8c6bL2pacXwylME4lxy4fBB7BsMogPXX
+iplZ2XRH7RmlZiAfLHv3StxVB1RrLXVcjdnqIO2guVYrK6mxH9WMG4LnOGvcnYTf
+GtWexEmNA5l8IOSgsK+InwADBQgA037clDFi3XWaZBVXst7IfkU6bKq9vhmphS4f
+uBx4wp7MBA62k0kGDmZWcbinZWnybypili9ihYSHlp3EYzCNTbUMWlbhc/ffYHuv
+rZsIT2DxMPb2iCnjPu5HMGegTM8iTTotW4xYmJUsEDIvgQUz0/UNsPHTX5XU09So
+cL3YOP5MxcEbgO0Fpjny3X76rc+ETAd9TmDJi7HOm24grKdOQXHQJr65j7nTc9M3
+zWnTxOP3fL9jcVnGTnLGRVoR7kedDpa5FsoFqtY8YMaFvNPVvI4+m+jozjNwTg2d
+GG6nU2dEC0qgDEeKMSJwF1wgO3Fe6mXHvxratgNrqfdY/rtEGQ==
+=PkzR
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
new file mode 100644
index 00000000000..2a911f2525e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF99kCMBEADE22W+h7w4R9fHyqEQV1NpgY2qI1S1HlwSQLQnf1pt1k3ZvMzX
+Eh2q9lNAn96O5TqpiMhHm2ZEDORqXqAx6hEVpA5iy+7NrIaSpxcbM0crUxSqoceW
+xIulkSLhjE47WcEdOwrfaf2z+Nzk+lKJdBY1JykqZev4ySB4Wjwp3p3ZXorMixe5
+BjFkxmKpLKsIH83x51G5mCzL4pIvQdfHXAtWdVeUHQbqF2hB18Z4lPlzrdphbRc+
+F3fQGO3vprMRUVynhxseqYNDSqe3QsQxvB3MTb4wRu11OUJDyJCE/rAphQglxV7r
+YtkQuE6KH4ZfdA8StsQMKAeuwZMWnB9fqwZWen7ukDFAyHsHSuHWqQjh9dEF2jtT
+WXo0/Y/DEyMHEbcF2D69qQkW8rJv77DYhKmdGVllI3ZdA8Ps3In3WyuecBqKiSr6
+UPY9dIKQPKg1q49OXvbOo7dQaW+9Rp2jEEnH/hW5F4rxrAhhyusIFHK1of5CqtZ5
+tgdEd559iwpblEnQirIMP7jzH84yp2JY09gWoaUeSjUjD4s0N+6QZlc1bMI2U9c0
+LQRi7e3OigloDo/+4JFcOemHONjuNB7Sr8yFMZH+daAdbabkROoFWQg6+6gj1biu
+E0OmqL5o7eA/dxQGp+3bAtH3uBkrIkuBTVurclzRFNmftwaGq7Y4S4jAXQARAQAB
+uQINBF99kCMBEACc+NcODwdn4l/mMfMziKRsuwsod0i0O61NLcMGmOE5U6Ba+Jcq
+cKH9qULQ8PnUTPnKgDvaY4gSU+umrfz/ZAQSjOb2EJ1W4NdPvgl1VGnzn1YQZTJ0
+BtfcpwzdEFrBPLEL70H+Wc5POfhDuU1WwmlOaBmL6wAYukHtsWiYFE1LAcRrvc0f
+ndlxwq7oAUNe1KFD/yBVPMsde2H0E6tXqk05mCdvmcANjURyqx+IF99AOenMEjr1
+xEUfo0nLcZJp/hFXJ0Urmt9+zIlSxKZJP0wyYGuGdZGQhyqEr+WWE5e2Rqge6n7n
+twd7uNNu1jFZ8l9vKi7MaNU6J4jRKDmQXqVMpqg/5EFNhuZr8EeCc91F+1RXv6T9
+bYImDaL2u3ZjDTF6vkL2EOb5TNMHNSS+RyLMGmhx425saOdCqMwZiq6W8GoK2Dda
+DjUAPZNUW3BFDxNGIWB8QPZ6CZuv9j5v85Dyn27OdrJUF+5TJV5TTvjuxNi7RAgg
+ofyiNXEKm8V2FjlQq2S9v7Q9AsXpx7fJYOR35Ir3eC1UV7EigpdmSLem2wZEdfSc
+3oftIA+2HFcafuJtVM96q4YvEpo2LpKjrVR1sS/9tnO2iy4SSdgWp23dJuaG2MeD
+PzD6zehc3enxhcurA7GomOcGNDDETVaSPzRd49aErmjOF+w3DOT7A6kvDQARAQAB
+=gt+L
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
new file mode 100644
index 00000000000..65b1cbfce7e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
@@ -0,0 +1 @@
+6cb87b18a453990eac9453f87d713008cc07e9ad
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
new file mode 100644
index 00000000000..ab62f210dd0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
@@ -0,0 +1 @@
+3dbc5d7dc2fb8dd68aa429bd353a436e043e3145
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
new file mode 100644
index 00000000000..317a090c834
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
+9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
+DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
+KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
+xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
+BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
+tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
+nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
+TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
+IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
+Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
+DG73NR9fZCzl1K8AEQEAAQ==
+=FVRo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
new file mode 100644
index 00000000000..0cae4729da7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
@@ -0,0 +1 @@
+b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
new file mode 100644
index 00000000000..6ea37287df5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
@@ -0,0 +1 @@
+635ee627345f3c1dd422b2e207d3516820bcf6b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
new file mode 100644
index 00000000000..85f7ae585ef
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
@@ -0,0 +1 @@
+2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
new file mode 100644
index 00000000000..513827017d1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
+405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
+6uNnrKcO32/v/lux2AQ7kc0OS+ChaD5rUdihAMIfokBPLuY9OGaCNMcWaQI/s0zv
+X0xPebYYwSYHU0uhLQm1y8fzwvlSNb0J8nVR/ZqzzPvqfM49CVaU8PmtLXqx5naQ
+VOytBT0vGUvQ6CcJPOYdxlVF8VI7vB2B7F6CuxKGdyJIOyFU5NqWBcjRq3oMHXyG
+/vryt3D076ZB8dMfi2gol1m02io3czxnUR1PABEBAAG5AQ0EVQri3wEIAN+aB4lj
+nIaCzy85DeQ4pDkH5Q0YGc6rfLk3ARnOPAexi/lYbUy7XWIZkZy78gjcxMLRgcjF
+jfvsfJqoQ+6bM3VoVL+p9PhMZ8ayFi9V05rtXLvvzJYyuntFeMkOlZ+A3YdhJHrU
+JtC/Cflbslctcz2Al12RrCWpa4tzyfG2roj2+Ymc6Y3PN1Sjnou8FSPSfCGaTwXU
+4W9rGvmvHTPHb060XHScwxXoz6fQWIDftOyQctCZSfFJgckbVKryOZT+LbIbG6wJ
+G0WXWTHpjaWtVVoXLJL1eh4YKGlFEW2Odtgu/MZaGtKZ6fAeLQKRm8u3nMDrqMDt
+3gsfoQk3lGwKzjcAEQEAAQ==
+=eVUr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
new file mode 100644
index 00000000000..412dbb8a715
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
+sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
+6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
+hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
+OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
+EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAG5AQ0EUEib/AEIAMDUgjnP
+KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
+Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
+IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
+6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
+U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
+v5/DheBwvlwheg8AEQEAAQ==
+=JXd7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
new file mode 100644
index 00000000000..276ae3fd4f7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
@@ -0,0 +1 @@
+1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
new file mode 100644
index 00000000000..6ffd46c2336
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
+sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
+sHPwo1aRXdI0MvCy+7iaIiiGF4/O16AhU4LmALHnaRQZCyuN6VOQ8rlqNvcczwUf
+J2DQeLHqR/tsch7S01hGpPAptBeu19PyAlQsntYN0yLCLKoe9dFXWCDkvd1So5LF
+6So+ryPqupumBbh4WxCmTp9qwDJYJItjAE0zyPe890FurOtxrFTwtRtX6d6qGKkY
+/B4T3r0tTE1EiOUpmSnxmGNItMh7/l5UtnHjABEBAAG5AQ0EXceB0wEIAK7dVAoq
+ZqBw9twxk6psNcTmIrfQbvjasKl/+PfLCfBNklD/nwe0CLz799fFSFMezCg43ZPC
+KIescCQ5t74r0D6O/QTGMpUyZD+w4JhZkMQYy2HjImfMNtPVOWb+XaLku/RloPt9
+MSG2mtA25TTp295N4mzMPKq0r1PzSa8jj4Yfn3AzzSXXLq6PwoDiljQ91IWBvJL2
+IAUAMaxSxzq3UqJnlbX2h0yMM+VC0nbSmbkK8mUNltg1EnngJKV1mKRG+Y1GDmZZ
+1Es19tEwUMsV9x1gt05YlecC31woUkL0//8i1kWuWG7dqRMf/8cXaTFA1brVJ33b
+/G0VQP/a03UaVd8AEQEAAQ==
+=AghA
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
new file mode 100644
index 00000000000..6e422761984
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEtnVXUBEACz2CXck8rFZsqlmtZrwySHkCKdKQ3dO5fyya3ScYRofIS0OVi0
+BwpWyVfzezq2jl4AkjEFGS/ja0shnr4hg6tWU6w3obZ4S8dQMyPm8x5kSTxj28mn
+lkNnR1mBr7S13n33ZtA6f5c1cPu4zMqzKEFvsqVoBwD/ru5WOB0buwGi9mG173Vi
+tkTi1MtzQ4aaIo8XiJyLsm/StTq1ylU1vfqtyFDZJUzoakdYSiA4NVfVFUL2LMTl
+gPq3hpWNZjVm41+YKWuzjIJ/lidH2Y2TmjivgtQToVbHMV3sHn/PtDKw91S6Ls2q
+kSLUm/Bs19H4ZGPMhWI1MnQnQiuMMPYvqIddIh2SIog2bSowPZz2FkZxrw04ej/t
+tYrSIfiR3sRegmWoeo/FCLYVWZ32mw5L8Tw0npHg3BSi0v5FoNd/GiD1Y6//Usy3
+tQVFUI1zkh/PSWVImAgmgoE3qhcIjzlkVutsFY4NGr6LH2sUpIJBi/ECy0R38rLg
+sg5pjUPhs7QexH5M9FxshI+yDsvPOTeUjvpHysvemHhVJyPQSmpOa16ONFmx5xvz
+d90FmxKfaJJvmVMvNmGMdhdAzaAJ3XomFEJZDKfyBJoOJSoNvdOQRNBUt7aKEEKb
+3BGypY2bzr0C3WxggpywPmlD1xDohurx/b3dLFoK39hmFiTek4db0tin1QARAQAB
+uQINBEtnVXUBEACy0KBkfWgD1HBFoEnbWop47M5oHeI5DKcF2N4MkaJoq4xBaC/4
+2ksKH5+p7y1BKPSPjR+mE4mrR1M1Ko0TEt3g/mESFRcAuQVYaZzy+SLkideR5Rzx
+4y+8AgtrypeNexHljXdMRLWFkaEBRD0o+Ksm5uuchY57GgGd1bqAQBLo3VrChAQW
+xNwHvCtX4B7ukFAcfYKu28Vhd482OJYAd1Xre45NeQzx6WjMExrRwhXOe/iyArOz
+2x0mWD1D7kSJTrMuYQv7OxWC1RzMDHnH2cgxFmyqDGXKxqWqP0ZAeWe/j0lxHjDK
+MdIu+7FRWDJg46xHOluLOPIFl7fD5uj8ngr1yi9eYsggcRo2bXbter+lP9oHv1yZ
+GbLNeAPgRDYCE/zb5z9RWvkY7w8Go8bynJ3AxelPWPOBOYw7C8SGPaE62oD8cTlw
+QimLCBwk6sGDYLWKucClcVOYDrG08YBmMIBocei56U16kD1PzHYu/Og519ch/p05
+fbXxj31UtFxTCPfu7JhNoTBta/IRfu76ce4pZc3tJowv8hhO/+sa75NRUBAaVZOD
+aUmRjq+H/TvURSZq9H8EFQ4/g2qaKw1LRe3Hw4fBD3bHz5rJGLE7cqHo4LWckfkn
+KWv+WqlXFfAeAD+Gf+Nfj9NYWma/0lO/FeVh+dGv1RxwSdwr3/bx5TP4JwARAQAB
+=sxz5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
new file mode 100644
index 00000000000..c0ba5465eaf
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
@@ -0,0 +1 @@
+82d8419ba697f0e7fb85916ee91287822fdb81b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
new file mode 100644
index 00000000000..4dbf1af5455
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
@@ -0,0 +1 @@
+d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
new file mode 100644
index 00000000000..bffa646f616
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
+inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
+iQaq2wLM5rTQfdjLsGQb1iDNDyCXU56+/l4mFZ2JiEGCq3Re9EFHelRBKQCg/7k0
+BIfyoFVTHw39PKaDBmCYF2sD/3CMD0J/WldhBM7gLOndH9/YEQaEMy+PJNXcfTWN
+WLygGPSOQdNBulyLkvcFIZjUTxFVakh7FbjMq3dsAP1oqthwmK7L8A1zsvRgp/TI
+4YMHkZSkgcs0PBBby+h/lpgRrWmtwjTPzql/K5xX4VSRS+umHye/7R+4ZEH7mABa
+m/ZABADkPGG2ECvfjNosPQDHZVFuF9oVaske0OjzxI+rU6sR1fJKtbOPl9d+bgz+
+df7rZ3mwppkPX2r/muUbd0CM1Se10sK7ZAoPYmWqHX+vB/oj3Jq+iqb6M5mDZzEz
+6h4hdnaGERyxbktZvhRV7Psco9CGi8o7RFUQTR79Y5ElnBavqLkCDQRBlStBEAgA
+9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt
+90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcw
+Yc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZr
+M2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEs
+tSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8
+vYlLIhkmuquiXsNV6TILOwACAggAw6kL0PhPZ/EPI0mPfmIYeaKUgTB8q47nDKY4
+6wDs1l/msVJHAVwGEBHuxmbC7r/qfAgfSW+/Lj4XbSLCqaZIWSu6lfY43IOIYXD4
+pe5cCnWkQij+h3LxRR6uDmBr5cwheHEuB2sMFU5lJiiQR1+eXYkPNK4FgVQpHLWe
+boODAlTf0j8gRR+aTs5eWXqfSA+UEsXpn6453bfZKELXkRmEznb4xyGWJaLW2Mlm
+aRlauYvc61M7FK8z15SSZbq6oictpnEcfkgnBxcNza3jZQV7WOWZ3BlD1nKQ661s
+bmS81/nLnxbov9ASs25K2olXBsHkERhjMnERedvv7avlmBwi1g==
+=VzpZ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
new file mode 100644
index 00000000000..8f277d14010
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
@@ -0,0 +1 @@
+d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
new file mode 100644
index 00000000000..7a2b2e3234b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE5FdQoBCADPVXY4gMG2TMUl1bFyh0FjfM/T+DtCRNNw24u4wbmTjZMfHnda
+H08cT0tSbJSJ928s3a6Dn75YDrrhRbYyhBYBo1rz82swLNLOk5EOSM0VqwqHQEm9
+gmLsdeEtYWDgxmIVfJbMjF77RWwnG8T+fXR0hLAn72i6Y7mm8JT5O33A2xHP9+/Q
+g60IHYze/WTAZK678rGvyxwKF4zX2mwYTFKkoL3PaFM/7HbZbLe0HVB8sIF7x+c5
+glEVb9wMApjq83SmhtFM3u/ep0uzcg3c0ks5JXZQ/KtPDYMq0NFp7zGwaFiAF5D1
+BaLWHRFeD6k4c38EPnSQLGBTeVwm+gWHaTjBABEBAAG5AQ0ETkV1CgEIAKYlTJDL
+th/JjDRaFu6hA0xxOEtXZK3fvyrP+fTTtaCyl22E1rAgeETrvoqiK3qvxjgExO92
+XnKlpNSq3LrPiqIIZR7vjMr0HWTHmFOtEEmwhMxsgDt/fVt4sD01FvMr30HGZV1L
++Y9wSm0VI4yJHPy/r9gcCWbTWTHJGvpSf75NeetZwMmnNZ8yneCUtSNroWHBl/Dn
+lfsj08evMhHA96HA1qO/D3NRELLYjhpF0mcIijY/7ZiEqvXQxE83KXdfESOoTaeP
+qhuepHCldq6C15bseOQ3KOq5+23TFeNDPinY68AstEdg6CIbWzlOAGGQAPR2u/WM
+e6sPsoeEBicDo3UAEQEAAQ==
+=+bYl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
new file mode 100644
index 00000000000..ebe17bd0153
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
@@ -0,0 +1 @@
+2c1708ea05adf6966c32d6454a1bac7f1e3b89b3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
new file mode 100644
index 00000000000..de648a3c373
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
@@ -0,0 +1 @@
+ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
new file mode 100644
index 00000000000..32dafe909be
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
@@ -0,0 +1 @@
+5989baf76217b843d66be55b2d0e1fb8fe4b68b4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
new file mode 100644
index 00000000000..95cd6295d15
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFYVT4EBEACqm1qKc6Twp2Iw0tjUqr3hrZ7mjZMWg5MemH9ZiQ9iVIqV4Lee
+KmgjVWk5jnTslriymDilDIMk0YaT67JokhgSdqMIavI29tJ6quOp0K7Rj/rNBc6p
+Um+mw4rybjOUCsYddvP1bg8skDoh1dHnJpVho13u1zoTDMhHpzW5vOdSwVoGhP6h
+OwgdRcd8ZOmHsb7q7/VjUHN6n/nrrnadOn13AJLjw0pWl9d3Ht0uR1jCK1lAgaOb
+t9RAb7p3SpaiLS84wuVzePEoYWVuTS2NfoG8NB+oCyMxbkubp9HLZOiDmFMMT9Cx
+Hzf77m/TyGDGNZtevTEodSoXNe4ZO8Yp3lL5byw1f0bPVmukLU+5VlcdiYckEWTc
+/je/kxGKYUrsGV4GWJ/wAvuSD/NQOYswxtEi2q6m8wlunpWKgy4ZeWz1V7Z+xCFl
+wp9ejY7xRbJbqmVASrKwg8u9WNKAb5QpIF3F2/DQRdhHD3kX0aZ8+a//dFfenAob
+7qOldsje5PxeJ+x6sgtcJ0kKrK5uv3Hk9gTA9fq5i1UKz8C0b3ChPdus7WoYDTiw
+RUB4+2WMtAscGnmh+8jtNVSJIaT6Azc3v+8JiF9lbek49+sMLfTZyxI2Wt8tACpY
+EpiuNTn0R4U4+bKXxfMh2OJ+CfVYvR7/xdNw1OonK5zk2nN58cllAuEZLwARAQAB
+uQINBFYVT4EBEADUwd1+5pSJIS12mfxDbPPViQQ/uy8Nn5M9oHysypvyknyIt8T2
+1fHI++BbdkHckoSeIYIVi7H6ZU0CItTJK81jOg/Xjxe7UKiM0X3mqoJ6hvxVf72X
+w2sRJq5uOpmVdM4SsAhidGyvAmv+fwGngwB2EXJzd4LI/EkrcuUMS6SNEvDJGag4
+mXg6HNS/s2FPFt05WMt478hTm9dSuE4GBLr+uexn8sBIgIWiMfMbnKsT/LAg5SQt
+PCEKEZJVt9UrQi6BjUnr4T+ZEOiSSOPrnTHF6TpSXpRjr8NLCs8dAKCRh7shhufe
+62ZWvW1xxTsyS/KEbiwTwQ4CcVugQGniI07BDelH1TCmccjlZjdOlw0+Pr3aDDi9
+pQV2c4zOxknXFs2xTY7n7mvsuWkKrRqXhETQ+V1nGCoQPEPA9zaXc8kWZLwpv4Nd
+k87pC3YJGL92yWme3/Q4mlYInXd4L8W92t6ZQ/WLc0JykQrCINlvOencpYoUcYMe
+AIOfxzTnPhiqXUc+ZlOdFw/1P1rMvyy8tQB99ND3LXu6zfVIH65gXqpsxHeuVEQG
+Edrv/7obHhyQAxsU+KOXS+z388JB86CmbYzUCYtupsFuULesubwLjhlP+OGqbo4n
+wGG3E0g/MR3nrmi9fzVlLs4a3bxJv3bv6BtvhopdBlVDvgtq1cC7sCkrGQARAQAB
+=5vEa
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
new file mode 100644
index 00000000000..daf42500d86
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
+gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
+P7Ss3EUTRGX3LnhKhKN656XQhM0PutdsHQlUKjvnl2JOaKerEhbHCRxga/U/WWOT
+KdobRO+x8v1scsrnUG83J7sTSaja0McmgUhKrhJqrgSk1Tod45SxprxOyp0cgATY
+xjHrf2rkafBn7K7aFDe8a73iCJPWS77gxTZCZ72xkcnMLR0m7QI8TzFa4lRjTovA
+QcTpr7jwjmyjA1+68peL6VHdVr0cdXm34mTVABEBAAG5AQ0ETv6G4wEIANLmAn1+
+tkX0pSiu6NJ0rkaZlMbvkxeFAstHdQ5zOoSWvJV+52DAd+h8HKZy6I89/BI1alYt
+7KWALGzj1I6s1+HavaYKWftk7UvAM6hEh8PzFQD5NNziptDOjTG3oztZ0SK6Et3F
+Qaczyzh9GyPC83vC8Dr48a+Bp5Ygpo/5LbuNloptVIapHftW6PUmRuxlXVXgFdc5
+vSDI2xPqz8dzLSjBa1mRUEiAFqdi6L0na6iyBEyEd4QlQ7TnDp6EKgCSvaS3OPRB
+EOaWOZsaOIcSw5w7tkO7YlDIjbltVQKTbVLUIR0h9njGaJXlGPYvDFvssIMR766Z
+z5bb/uPlG1HtFYUAEQEAAQ==
+=fOn1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
new file mode 100644
index 00000000000..929317682ea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFELz9cBCAC1cr1c5jWUreRdPYYvk6DK7DwF6dgt7iN4rN2QT75M6ob9Yxow
+QeO709C7V0JXpVCOJ+7gCxnllmktpchRpj7hj3iDdvhVuKMEF4pl+tDyoyzK4Xvh
+HwDgaA7nXJLzxOE1Zn3cNqJPp0siXa76ADFvRQSGEesBvJ4U2dTGczIxIXBJAsm4
+s03DQV05gSqWsHr3iyHsFCwgE1Egy2+tIMfMTKU+wQ5AVb7AlpF5ByyeAA1jUG3n
+zuHQ4fCe3HZrBfY2O4z8WCZRSo2QnFoAGZ4mmcEQ0rZuiEqigjCHiqLdp/BoekDK
+FyvY6nOUED7x3qWx3WS9SJGpRf/2CcfKkuVxABEBAAG5AQ0EUQvP1wEIAOV94VK1
+R4VqP/P/aB0zMgi+vsjrWY1uBP01zd5TrqlO1t3ohwvqHFbll6jUPCk/l3RM3dsY
+SUdSB9Jsq4AaxotuvJPYCom3XnjjPsfK6XUHBSSHQ1CUDlnPtZR8jaNLfLSQrJ8o
+HRebL6xaidd/8X95b+aqESEVBr2hpNnj47EoUT6XBqEgv7GQnoG229xx0JpOaokO
+WO4A/eteXnG7DUyYYtYwp1LOdvnzoGpcfastiFpso5iy0SLbrSQvHs9ewyVylRt8
+0EAC2Z/9mW8w8c3n3OaNHW/bZki9Yni6S2ZlNw7DKULt5BYg/q7MOTxTx1A30071
+Onl77hYWr/3ANIsAEQEAAQ==
+=/2ZE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
new file mode 100644
index 00000000000..4ed9f6c9144
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
@@ -0,0 +1 @@
+015479e1055341431b4545ab72475fd306b9cab7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
new file mode 100644
index 00000000000..47557b038da
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
@@ -0,0 +1 @@
+656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
new file mode 100644
index 00000000000..5fba3d86fbd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
@@ -0,0 +1 @@
+31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
new file mode 100644
index 00000000000..dbf018c11b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBE4CPoURCACWBMGV/j1pioJPWkD9K9NdeRvld8sBorFBZo99DF3mcJvrXo/t
+We7gmvcx2n/8P5lL27sYPuj6WSRgtVBlSMXllJm3NL3Hu/7XRILfJEKVeLLTdxc/
+Qf0f4IDqfvdcPHYGsJwEDeODbiKJ45nE4dWsbbxDEmatXUKd5fJrNlEsI09oDNcr
+7KeJn7rTVAj/Yj7UuvM7JtYKkjZegrJe24dUWg1dh57y+xEQybOpfwyfcCDuhwyj
+e1V6Ho71BWa+iyLmIIbBFBVfWTNqyTo17Ac+2Itnpy5sU/tW3691YBhSXNiepjrj
+r+jQHduI3cLQIn4O42UognuV+HnFUwq4JsHvAQDjpwYJ9IFR7DqkphXK8FEw2xeo
+03We7F51vp4Rm6FKeQf8Cn0QdELeTxX4SkFgwxV4oEAhqJJCHhrISaZY1+AAVvSM
+CcXiCFZDYdkE8rOSWNYwRmp/wGurLpdQX02V/5ogUIcHXUxsqqi20ZE/gA/JcW9S
+OaD5Vc8iX/1spaRKOMO8Oy7ezNfD8WobQoc1Lb9XQCo6ddaihh2TG6Khpy5iqbF5
+/rTh8E6+2Yn/Y2A2V4eCuGFSnQrtIHCeFt6mv8tGAw3hRX0zC0wiA5nXonl5uj2j
+QDcXo4friVHVpLxJFivK+iurquGkYCIi72rNAg3k1oKJEZsKB0HXAqU6/3hTvXU0
+GnCHwlsf0iDsEv1Z4LLRbtYddSAnFRgvowhjX6Hiugf8CeM3wfy6AJbLOhI9DLb8
+MGEOpf4eetPiFTMI6rTw2O5MKATUA7WJF+fAYjM6SENCkXSmAwbdHe1NxRnbZ1qn
+dcjDBIR/SgaXm1HLpmJSyXmjyIbNoP5aRaYaSy3g3DvWwLSmsRyA3LqvWQI0m08S
+2CwdzSx+Z8XuOZ/THJs1O/ztd7R1MGZSbdyyEHLVX0dd80B3mcuAMO48dKNO2UBB
+QEsmzpPQ06ANmx6RnBG+H2Y/99/dxyB4C3Rv7x4HrrGqoJRQOUFpUbhFmEKeFiyK
+XxqDuUeB9KX4YCx53Q1EEoKegRAYFtt+k3chahLkQcIAG6lkOZRVA45w69ApdEoG
+E7kCDQROAj6FEAgAmlAzlKUZ/qynp4S/2fBVBhKhE1ujCxpew0WUotc0O6TCyJBD
+jQ0ofQCrQEuOQKNri+2GKHKPTmIdLwfBvREbkuUI0v3S/81vLG5E3TZqIVPJgrPY
+Y472S3Q5XyCVvwYeVjZjCoPnAuCcO2G94HrE09cmG3ABaoTFE2Jq9qPCPlABegKd
+pU2TfClkWSGdS9YMbH7pD0Vdgdy2TYHLnTR1XKKkEd3rYbwnAjJ5Pa7v+du8aHMu
+wWzyEAlUhtIvipuaebhuNiiuh5N7GpE/ij1FaKAc5kvrw/FszJtXH8dQerkmceDH
+FSYeYTh9pAhlFSFyroy/6ay1nKdGU/nXrmo1IwADBgf/fxnmg8WI2gq3AVjcQim8
+9tQj2vMYImWEZnd/GlCDZkz6+LHqFoKCGiScvW3Xvq/9j2Mq1NboTVoSKTcLOLuo
+QIPeRvOP5lcizoUF7SEUGgC9y7LHqfS+BWhnT8RloMw3cCsw6GN+LcWFw1tQzCjE
+U5lXzlNL0tlc3JBQnV0rKGPqAqc/MLQdPWxilaozw75UzugKLjkG+GsM4H/mxD50
+znIM5REadBKbRKg5XNA+UCyegNaCe+SOUS5h62XeQjUvNoMhUFmS2NC35LYAQejv
+qSp0LMBlnckqI9M1QpeWAkItO/qF428nZWhYrdhrRANq1i7n1A/x1zc9bZ1LAnDb
+Ig==
+=/kab
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
new file mode 100644
index 00000000000..8150d9a5e39
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
@@ -0,0 +1 @@
+d76260c72df74e66268f7770ab049df4ab24c1ef
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
new file mode 100644
index 00000000000..9421a4dfd3d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
@@ -0,0 +1 @@
+53c935821aa6a755bd337db53595395eb3d8e1ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
new file mode 100644
index 00000000000..d0b448ab6db
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBErygmoBEADbs8zVUn5ZwbsG3tqT4x6U7SZYOtd3WXOtHjuu9Cyp74rZ19Pi
+XNbYwIAoCgOI/nXVWwuOrNJH0pHaQ73slbNzLxo2ahQIkw9PbK4V3YXLai1r/W6T
+xU94s7WECoiH8uuRAZFwbei87/xwwTVnfwQjKBThom05LbOebtIGHkSg4Xl3b+Me
+5iqHYiw/QOujiKOqm05s1aTWtm45KB3/u80/5y+2+/vn9HXor61gibDkC/oclDuj
+J1GYPCIAUvj95vw5n6Eq46I6aoed3BWCLD+qXBz3QJjwIKTYLOHO9iTCjPk1UmAq
+NQhrENV7eeahFIDgL+b9wsm6CwuH36B7cdobsOltqBegpMczM+kwTbeaVwyI+S6Y
+jQflqUclFctJCRxZYzUUL3C5X/yvb8Bj+WmoEjm3mSMEPUC+KwWeVGaXIrdw/yzX
+Vziqu+PVWZYovNKsLGlL5zUJt3nV0xmDJdPuLRgheIfB2t4oqn0Ki/PzMLQhhX9+
+9zWc9WD9V8cIZtiSs1hRny5Ns33nQr0KkdGOj1lfVcZVrDv64VUSzofH2nGEWS+f
+h9gkgD3aLHppt2XCH7tJK+wU/NlR5/0j+j3QwAfG5pziD0zMjvnKREfJ3aqqu9jj
+8FgdJ5vJvo7hlq0zakD7qTUO0OJiELHcf8q0jfFdiqaocs4HZp1OO1w8hQARAQAB
+uQINBErygmoBEADOoPQARJ1lrbA+C2JJDBF36+fph6URbnYnc72Y/kddWdChXAnC
+KRN5QAdZeIQWEYKnpECjqS/UnH+E46l1wXSg+YdzFvpfWTGGqdmCzcMM9ooV8AtB
+vtUevbzwa4jBWTT1Vjr2BwWVai2J0zmNJnQ3vismZAl1u1qP2DJTPn5pbViK5noh
+8UTfiPimx++TcNvtGxC4ZvumaYWNAdecGBxWjqHw326fg/vmHB6vfixcOb2u60RH
+MvUxkwS4bsUTxJgM77Hr6m+UJKjBKCj5KKfMAzh/7gAR8Jo5S/8fD92Evh1iLvlc
+wjjYH6asPT6WV8wpswuh+CVG3EED+iqAyREB6Dks0P4qjGoUGTrO0OsaNciV/pPE
+8fkxjamSLPJhVAa3caBJefP8u7PCYhB9kOYd7XlATqv4jToBjVWIgKgzPs2I92B9
+VL0TcGWQ+Gzo6WwiBYTik+em7O4GjkItAgeYyX7kh0mAU35I1VX7j6y3HhREyRqJ
+SRynQybyi6m7IHbxUb986k6qDVUGMWsW61gyNrzqZFjcGDteDrgmPt2qgVcqO89R
++PES4hqaUSY1kzafylKxo9c8UAkbUf3L7KtV9rsvvKcCKrNbHwqsTdKeUq4Sj/ll
+UXfFHW92wnfwEJj4NiXOLFUNo8zuoIHMJUbFUNnqs+wR/CAFM8AY/YHNbQARAQAB
+=UN7K
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
new file mode 100644
index 00000000000..42375c17c5a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
@@ -0,0 +1 @@
+e85aed155021af8a6c6b7a4a7c7d8456294423ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
new file mode 100644
index 00000000000..b106ef01791
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEvsZw4RBADH20nX+H1xvMBYmXRj1Aae4dRr6Y6qI7QRWHO6Z7/dxr9bk/NN
+Yjq5KsVOQxZzloVdtqx75rznT7fZq98g7Nq9IeEtB6k4tnh6XQLhljJMk0a3mzdt
+q3VzdxeVbwCaPJ0zixv8XPTAH6MpRJUvP9XjzxwaYHrjwcQ1LslW4TrIzwCgi5rf
+jChLCyKcaL05gqUjl4lmefED/iqOwYZw5pJ8+X+OHUViiOB43wsJt1brAhPj4KgB
+ODStcE6WlHFKi7YzcYNLzYMebSGYn6bj65b3qNf6rybWD1hGUFK4122Q7+HCH9Ic
+J+rr8HwjGFo/yxI0/mkyaF0BthXYPy4WtdsdTM2kgx8Zr3Q2rSt1jBPuV3q8d27z
+FZMiA/9cWPkRx0RfAJmBPKmKkbBkEtBbNau3G7MY1OEAkEkRnzmnyyjr5IP84A7K
+RdjTCvkbiQrOQH00Ki4sHIg+9Xv1gDg1XLkFDzRARKA1TxjL0OeS4RWF3iia7Swk
+MOnTdhR50pjb18W8kB4mEMZY7duP4nwDfQwHMwbFZGHrjImaurkCDQRL7GcQEAgA
+thrbFDDbIGq97dbX1ZEwNGpjILdeumxZzaCc5PgldHGA86TL2V9iPpONJtv7/Csr
+1c/rvH0IA/BFu+0Kde9UP+z9JycmfJpIsd2Qtxfhn9R4+Td0VtN9NNkpt1+JcThb
+zyQq4UU82uBKwSG/wzubOI4Fn+7ypIuNgDkqK0STIL3ucKF/RV77PsOBeLHkCGKI
+VhUUfY1D51BWZKKB1efaVK7PLdnsi64lAhbaexA43dwUUtVwQOvDzJVtkycV2IMw
+XwyHonlK+4vbcwIH2BAU46LIZy+VFaI+lNNmR9+xeWH49oJYnMWIXif4RzvO1ag2
+KKwlG2sacuVTtpWVqKayBwADBQf7BGl4POKtluAbX3a/KGnX1YyibPT2e4pdOxqb
+KTwuRc7ILIK/LVcejVuLd+eOF1QmjToI7Y3qjlzvtaxSemfkxbIQpdus0SyHEEAG
+H/qjNuTs8ZwEl9tPPrKaJHbJ9kQrlDPwkufA0NDAXTE76UhcHPY0DeykAKEw2rav
+EqI7Y0nXR2WSmRLFChmQ+aNTm/9UGI/IoRdS/dgo1eaLD/7RLFeL5tGDe+2nj+B6
+j+52nZEmaRCWWU7O9jYL1cQu5WTurtneCLtIqehLsjuVz9ihBysYuUcTOV/6W0AI
+clQoMEiFR9Kyv0owDk6LtX2DgibJuAvvLlnajsiGm5nyVh3G1A==
+=6adj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
new file mode 100644
index 00000000000..32dafe909be
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
@@ -0,0 +1 @@
+5989baf76217b843d66be55b2d0e1fb8fe4b68b4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
new file mode 100644
index 00000000000..4522d929446
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
@@ -0,0 +1 @@
+d9aa7402ba75f78720d975211d185615d0a84648
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
new file mode 100644
index 00000000000..23b4752e1f9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
@@ -0,0 +1 @@
+1aa8cf92d409a73393d0b736bff2ee42c8282e76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
new file mode 100644
index 00000000000..e25671d450a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
@@ -0,0 +1 @@
+9a4555c237785ca8a6dc1fe58799af90c06efbbd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
new file mode 100644
index 00000000000..a7d931ebe88
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
@@ -0,0 +1,10 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE56T+oBCAC0M/T+3OUvsOekYY/RtzHZ8OLDHOqfN27fCOtIUA+nn96a88jg
+hF6pRFUN6HMr4qbWX/BLwjfLiLYRAFrJyqY/y1xcuBxYMkxSnrTEQRRli6Q3LBCA
+0JfvTMQIbV4QEVhHmlCT0WiZ0XFUpkfmICA5xZeu+5QLPsupTYzCuxxq0qoA9aIq
+OyLaQMCUzrwMqwaXKnmocshmBiEOVm/78Lv9EmMd+4jma/VpJnhR37pqrhWLzPnx
+Azo2nj2rq81h1lwWb69UMqaIAKDz3q3iJ1SgahuekZkXkXp89yfiywYmnWxo/143
+S96GWB7oSFnNv4Az6bgdo/vniQT3z1zD5T8TABEBAAE=
+=l294
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
new file mode 100644
index 00000000000..ad9eba9afc2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
@@ -0,0 +1 @@
+4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
new file mode 100644
index 00000000000..794a6124934
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
++6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
+kJJDgH2BcbNSmWJlrCqYk+E3GAyQial+szkEZED+02wXHsbs0z3vozjQGHy0RVOj
+Gc5Shwk7Hr/F3vw9EQKa1nNffWmcGEx9B+WcC9ALPVd/fpQVXvlqfbi+kaIbqv2x
+NHQr7BL8j3SpN6vhfZM/3zeghlxQ5HYWER983XwkmvbNdMxt5HWsMKWZ0utt4ocK
+TnQP8NFGlPWEQhPvRRFNb9BI0wvGD0NUb1gjABEBAAG5AQ0EVuqxPQEIAOPl0cr0
+rbuuaQWxwNjrHnfDgv9foBgqZW7tCiXtWFH7Va1leDFloszEPGPlEriw04iqHpHe
+8QyUBVL6JhvNqEj8DR9xJyIKgsKCMkoJHdJOdO7aTQP8w7SVr7AX9sY9rRQAMYgk
+tEKNqWSXm6/hzvNlvIudGXxr1dJzzVynZYlPFp9kmUmQU5ThzJ7DAW4fSnAy9z1a
+bCGSHkh4EXrDwCyPvszlvMkg1djG0owZgDnTrrT0eu83T6uht+DHgCrLiEYqypcy
+xJmK48O9t20feAhFXw091hGr51CD+C/bbZjcbXGmsNVuXUDUIIeVpSpPaUgU+i+O
+gHY7ZIF5f3EpEnMAEQEAAQ==
+=PkT4
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
new file mode 100644
index 00000000000..4fc458aea3b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
@@ -0,0 +1 @@
+41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
new file mode 100644
index 00000000000..d9ae47869d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
@@ -0,0 +1 @@
+636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
new file mode 100644
index 00000000000..f4b4f312da5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
+2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
+aYgApzHAo2LtaiBIyK1T/+OaCexc05lZ/wcHFfyp1yHSzIVazxhIAqx9uwCgptMa
+23r2OeX5TN9xdjwSTUIeImUD/0Mb+AcP04pMbsw9xtjvl4g1V7YbMipLE/PdSI+H
++YLRzmyxkdfdrBNDQRxyGGxoUI2Pi45EDV3wnLBsGVRAG/UkcQ3zE3r+0sLMrRkt
+7oyzK4wqsMuslPbuAyghUes6Dnop/MY4FJYuAKK412RDBvk5s+Tp+pdkWQGHXuvM
+/KJsBACNupFtZA5CgMMWI3bO88upPZqWsO200sA9WqobbU+A2oCUotb2DgWxOgb5
+oi7eJkyFDpS/d+S0H30pq/7mUkTvCOw4Fk/ZR5T6DGqm1/vHv9/y2Z7bOg/DxwuE
+Mu1G9AT74JCjgsYFCdLcFymrghsIpjHBpnsEVjXoI4jwqOgScLkCDQREC9ogEAgA
+w0mrmS4i5o0dQ3KjyNNUUbatkUxFxZjp3zyYrVQj7c3Gpun7s1zRwZ6YQo6poUyi
+w3gpiiLq7zPCqC+ee91aCuYRXQk5y+b400iZybXydEbSeLeZ5pNIFvafYOjLuvrD
+tFiWdV5t159i7R08+Myu5D8K3kDnt/ycKTOs29mt0YCkAdW2EJfivrbSCicPNUyc
+GrMiRh0FDI8Jv43TMUmUBbl+6DdDLmqfDp/Nl09BRzvm40KgBusSRFW7G4l5jR8u
+vuloRYqOGz2X2ifXhxfr6CWIpmN7CNAwhP5OKniTAOTXTtMxvlVM/wILrIxPQ6lp
+b8vhNVIYLP1cmpVtCq3+SwADBQf+NyC/B4lec3BWXH4elVqusCU8Kmj7XDCFCSL7
+khNqO5BF8S0bZBV0NI7W9gaoNJ9ZftnlHbkGsUVNSVl5Gltwi3cD8/nJkHr8C3LK
+6jxA2/B/xQ32NWIBykofT72jw7oNfyu1j+kkF2nUnvpG3kkcuoEvQy4Rbu+1jjaR
+/3MPLcfsLU9EfCcHyiEEgW++AGrceV1AaHB0ZTmvRw8P5Q5R47ZVPR7o6ljucrYM
+MCzFu/3tUezn2cVrxNXyjlhC+kZ6tvlbOsZ8gtmuWqzVoYWZidSYA5ybSFnUtn6w
+SB/gVg57uGVPtYDp3G8lF2ocSWSsVYHzKO9Uo7C2R1V55iA68A==
+=DP2O
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
new file mode 100644
index 00000000000..6ea37287df5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
@@ -0,0 +1 @@
+635ee627345f3c1dd422b2e207d3516820bcf6b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
new file mode 100644
index 00000000000..62da51ed28d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
@@ -0,0 +1 @@
+56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
new file mode 100644
index 00000000000..d437fadaca0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
@@ -0,0 +1 @@
+b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
new file mode 100644
index 00000000000..2475a44f009
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
@@ -0,0 +1 @@
+e52567d2589415bd74eb4c2867631bc0568801c3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
new file mode 100644
index 00000000000..f718a09d374
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFfEskoBEADI7IL49Q8M6i4NXyo7lYTxaDiLFqIJNgnyC0fHSZktNPXxOflY
+rKfJqa5CPYhjJLk+jrj3z5Jkm0V2H4UNdI1HD69hlmg94Pyjhp1b3UV6xqQ80Sah
+Oeh+sOvjdUXsX0c2HNsXT0dmmN7b6fwxvdKXzEkH6VSHy+4W+AW35IsGj6sRdD5y
+rIUMJEiAOjq687nkwWHyWzByzvpFsQy8SZFjkVLrVl1fdTNAyyasybsya0BkPoz0
+97hJaJc3iKKLT8oSl5WEPyBpEw7w0V/5ydPH2WrN3TXa/WQeE8mSnleLa8MPuzR2
+pIEoQ1L0DL/uIZrHxpMzhyGXSabjsPFQy80agO3cm80k2m+tyn5dWroMQ1EOeTNg
+AMAMoGkQAohgGt/pxTo++qyUCi+7MaDpmnmEkov9ahvcj3r0qjlOUbbg0YPYbq4w
+NJyEQ/qp6ooB1WjIV1nUWIIdZmwFAtXxpM0LjysijY55pGTLrYzPg8KrU+KU+2XJ
+hl/wDYvdMNxO54OuNgWSJrKOrg1wgPoEThX2WjD0CUkvNFgYATw1aLciLc7pzkvu
+LiX89VJnH5fnRDEabytrQDoZ39ibv0ZI633wVm2AbqGAghpONOP/M24XqgHdnH9B
+FNLcM6hA0xiLqq+o15HRJPceIE90O7eQ5hFbC9qQl2l8qZPppWr0ZEBT9QARAQAB
+uQINBFfEskoBEADz4k4i0aBP2RbG0YNFbbjvoEPiaYoIjShC6vRJNwGY19SiFoau
+Ijq/tUZdTKJKb/dX1F+Gn67ucWtOHMvfZ6lEaQAUBDQVbIpDrONAw+ZOM8sbgc8K
+LmAMphMKhZ+dLBBohIxj5eZ/heDmq65voJPoqJoz5WqMiT9MdC1yBhDC5kJgWJG5
+oT8lae0ErQksbtWGkkFsGMjFfNHGI67MD/eD45UEZS1xOrMgAGCty6kauQN/mIg4
+ZJsUsWyO7qwqLBFZWoDooneKK9A8eKwGDpP6OnjCq04luvvFu5Pxh2i+4v1YZHzS
+X5wuwNA5gBN262pbpBleC1S1NNCdA3m3LypDhSmP/6j8I/D9GkuxYj7T9Eaz0MMf
+zSIydzF/bSWyqQN/5ElZFkQekpxvwcNGrYa6dhEeJbtMMH1FF+xNSrl3L35gguvp
+N54N/wW+a+gkIt73XFo5MDEEZ6yGrAhzRolIfVh3Gxeg5MQqKG6XdhK6BX/9bV81
+ppC7b9eEjz+onh7cTFiDVhq/bsMDSNudTiJ9eEJDf6SzN1gx3UO9StCKYTCvczFx
+JQMKAXufqA5Fdu8GRhx1jadEgEh+JBoH9VouOCfpY4GQSMg7mMsfiBmce47j33aB
+8AINV6MkpNWm1bQ47sMRBT+uivcFENfDAP6Y3H2J3AgSjJt/q88d8+cdNwARAQAB
+=liSz
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
new file mode 100644
index 00000000000..ce87d9ef13a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB
+fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS
+sviDzjYdZfZtskUM0sRmjmoQL//fVQbfLxJ2zses21za2VHuS3puUbdcm8+UIl/q
+oyneDbzM7j2nYXXJPNXJOfvyVxi1+rsc7xcjMvAj5ievYlWwYlAIgYbAiz969NdL
+RkoA1Wg+cQg+59k7Wvi6xwTfzMsO4jfkV2p24xn4fpcch9J49UhADh6O7XEls1Xr
+80WjysMJWTOX1O2oTtV/BMjpI4gj08SgZRhzABEBAAG5AQ0ETdcUhQEIALq5+uXj
+S4IHZBmOWOBSf6R1EnU4pUqEza0uwgIX5Xr2uSaaCMPCm5xrbtf/Iv45VEuR8zGK
+b8/0dV74me6nXnOeqD27pkkliVE5nMPQnqKAUQmrA5aDR7Tzmey46Bmc+IFrvbWq
+iyA3yZwUpi1FKZR5VLEYhMGI0qOyoaa1NWjD3LDL7/AmQESe9QLCtT6QhNhmj/QW
+ByRpmuIhayNyPGlh5osFyiGgVcinlZE7x12uG76C1V7jo9eYrkjl/uHJHRqfB628
+oLubDFimKl1raYClRZ63jkbZBfC1fRYzxk6356mAxlB2OVDH3aYB97KKZkU8cX22
+IMawk4aBhCyhX8sAEQEAAQ==
+=zQGi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
new file mode 100644
index 00000000000..68968d22716
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
@@ -0,0 +1 @@
+4f7e32d440ef90a83011a8fc6425559c47cc79c4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
new file mode 100644
index 00000000000..201964b9d5a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
@@ -0,0 +1 @@
+d6f1bc78607808ec8e9f69437a8860944fad5f62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
new file mode 100644
index 00000000000..9fddcf29fc6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
@@ -0,0 +1 @@
+e77417ac194160a3fabd04969a259c7ee636c5ed
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
new file mode 100644
index 00000000000..21ba0ed5f92
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
@@ -0,0 +1 @@
+e83aabbb95ca37431e20422043203be58f49479d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
new file mode 100644
index 00000000000..e2429953d4e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
@@ -0,0 +1 @@
+1fcffe916b6670868fa0ea0391ae1504568ec4dd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
new file mode 100644
index 00000000000..11ac8b7abb2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
+Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
+9lFqWQOAuCIWB1XPzoy5iTRDquD2q9NrgldpcwLX3EVtloIPKF7QLq72cwCgrb5X
+R25dB8PUdZKUt2TtJbjB+SMD/1UzAPirgX0/RpL9wUR1i14yIrTfpFP/yM9PE4ij
+qcZ1yafVdw64E1k5W4k+Pyl4D8DvSJvbJHvYjg8/G9V66WzaKcv+987fetUuePvY
+/rwxBPztqq8y6+hjBc8QVhZGWmAoGGEFO6MIGsSyN5ohqPMpNXkczIo+NMvDxGzz
+ld5ZA/9awGTsigBdpBK2F6GOmbvBv+Xebu9rbaJvBvP+npNx01s/f5sHPCxmBTFk
+m1vtaMdZ29RovrWPSZRj8WWes0bcisw80250r1CBlYzGzqEVZ7b0Hh2RfkfaxbYh
+wikyfTfA2iX8TUGBgirsZbyegjUadElhwFNDASnvLTEuQKeVLLkCDQRLbBdqEAgA
+0sZ0JZvWoKIGb+o6MOwI6p3uMb+iWBwdYfoh2RPnUZdBwGhJjp32CiTt2Y3qYEcq
+C5NvF5FWdx1m5KOQe1O+QFoqPKnC1bPj9uZOjLVql7x5tSwCePIaMNB+fMxEh5hY
+wLWtBz8nrdCPgwm+nAwecoE8YfrpmrXZk/YLak54FOeEwLYaP8E4u2FHiEqN+WmK
+MjIRwLzVpYArWRCbTLhSSKyRBy7UxEovUH9mIa4YuU4Pb2R64LwopMHCBm5ow0U8
+kCw8vpW40GrBc/2eaIeXCX2XJ77E9s9ZPgW6MoJ6Ic1xV6voLJKIEV8t44deKNSw
+DfVNZHxyemaKa8/GgpjU5wADBQf/UzL5lXRmyTdJqRvHIfUV3g4A3X77d3vOroab
+8KKw4MFy2LiTioN7btKKxE97Jjp21YZFd7Kpmfu2i/kr9QVJo+DSxe2p2xcQozyS
++layPK8h/61Lhyh8vjzV5AUWA5Zup+P7Jh/WRlh9Gxs0k0vimYMFKImw3mZr4EA8
+UCj2e85XIHNHBd0B1VIukq4OjU4QhRrutNebIy3GZ35ylcaXT5v18Rq/iRJAuJFo
+CzXUaE90/V9/2ob8A1CYEKGLocvOQgBsj7+2gP5WOP+WxI4TWPENRKMVchVBE8zV
++7YZiahPCwOQr9TQWMaUIJxZ85yr7O8DhJOBX3B7EHIfpoADXQ==
+=5pHp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
new file mode 100644
index 00000000000..d41dd187ec7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
@@ -0,0 +1 @@
+f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
new file mode 100644
index 00000000000..4fc458aea3b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
@@ -0,0 +1 @@
+41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
new file mode 100644
index 00000000000..ca04dc02644
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
+WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
+cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
+WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
+KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
+9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG5AQ0ETaTO7AEIALN4amR3
+pf/FN8oMFa9eAc44ognamG31ea1lkqIiPssiJLC9J2z9mShkrECbsBj4o+HxeN/3
+rwW2hQFAm8cAbitujASpPs46slp7Ylx6cfmrNqh3tOkg9BW/5izPwjXAuULovMpG
+PVf30eeDpf6huwRqyc9uYQSS6Jn9KCLi9ULxIeQOZi3UPHyMOCbnehR5aQQk70tI
+jbNytmFKC+DXFrhDiBjlRQruATgtuYYKMWUBO65b/SyvLG7zPGmHXmCSfg2qCTQI
+8xKN6wxgQY6x0PN9BeXa1du3497qYGhaHrsxnW/nM6rcQO2hKoOlY/GmicB5oK40
+MMVfji8aN/EYTS0AEQEAAQ==
+=DpMo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
new file mode 100644
index 00000000000..280dc187d02
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
@@ -0,0 +1 @@
+58f086abb0ede8f7a04b76c34c00043bec5cb7cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
new file mode 100644
index 00000000000..f1d8b5a6d68
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBFPdIH8RCADzGwYa0pK0BdE+higqxRaui47cllWtnWE7vAwK9rTdOPCtCbiv
+peRCzYXOOy7tJ2tH+QXanhNd62Ljp4YXzb9S82LQkYN+cOIxvQ/3gx+EseAr02nj
+uapGpNNCAG0dSPG7ecnfbRKRDZ3vWdj9SeePsBboB+dyRv1BgMFg4iLpiQonFWzT
+xQsu8UogoBfWtejm4/aE54s1ynICbOs6hEjDPTGa+4tie4I2S+NSD5sy8B9ggEDy
+CEqLVRClDl5UYNNtdFY8JNinAkw28HPA1Do2SFnAGxUwfPm/jloUE9tALLMCTMn9
+4QwbuwafteFdDm+RgfwwuBxs6MkHAQcygcR3AQDZJuD1iM4DgNPGkNVplXIey88m
+eb1jXs38PcYQdxQZjQgArq+SqJbBbnYntDFwhpv3g0HitC6oaN39UhJLIUDmX698
+4JnWKjfrtyk/33I//5JSsLEMyOITE6herMXEVIltopuYYQGXFAiTOa2k6h80Ynmw
+gfrN9p5zHeNBc+VHsfW1IefKAARKqOG/zTIUJOvEjMo7qT/bon65eg9swGCXQ6CN
+LJh3xstK7GWCidYJ508bHkdUWAI7gQJMJN983RlkYIE6vjmBYkSZKKktrZfKaIqE
+4l+SCZW+jjCE2ug3pDw0IBmQ67DPFKWpbGkzbeCzdB74niS/s0bSdLKYlwqUb3Hc
+9ltJOLxoTWCQOhYN4WolS5/MgDLxfQYQ5gXvbfuuiQgAg8tXNjJmJ2cp3eu3B0Xx
+Z1XS5sxraun3INtyML/nf1plT/OYjukqAZD3yrgxLaIPO5uDChHgBfUNbz181g/C
+PsnS5MlbI/P7vYou1FJI2vg5whs5wG+1gdicp+Ert79Wqh1B2j5odnpQRYCQXO48
+wGbjZ5TdlnJXnjVqgDNCJo0EjQYgmipLsMfgfv3xUMRIMbuBFXHPuvlQHoyBAoQX
+3U12VUwL6VlAEDurXPdgjdoX9qH7e5qpZI7wayOtUIkPNEmfXd+e+21+6cJJcFUn
+Sv20JELYp/dFk7oVSG8uZO2vAp+n6kltnjSB+oF850XjX/2rcuOiJNf0C5lfzHlS
+tbkCDQRT3SB/EAgAmwRWR6xSA1JQQy/JYa78xbytDaIF4tfpe0vBKZE/BbI4Br7e
+XBBDT6Lfp1OFdiPLpCHBNrXfWf8in7vgxfk/UzRXkqfSBLgxjHmDH9p1ryP5HFPw
+0CTl+4VHu5PpPXG59N2gPf0FT1KymeQonTwIH+KY6pk9CBCAgJjbYrCtquw69zSy
+eMCyXMyNKKtJatnfH2IGa4ArEVEQO66E1xRavDEDqaZU10nnyfdG2LlqrNi98Kmw
+O8uYe2eD+j9lUKnngTFtW8Vk6y5ykypXyVe1l83E82Lr3wx52osJXKiz1ysOihum
+5ND2QvYYjmDSoa5v54qgHL+3Gyl6OtbRPulkTwADBQf+NcAHhZuzmAM1AmBQitA+
+1kViENjZ3hhg4tcDkbmJk2q5SXEYEhmmddaZ6cAxQeHSqdZBQ3tygAD+gwBC0KwB
+1K1lIFwfZEErpebpepybSS3CPX0w/+Ijcff4eRxImwzIYReklSs2r83Y3NMhWMM4
+4PH1KYimcNkjrt3a/pn4ZGhwyn2YpEoXU0XIdLHpY/odbI3s+mQ7I4S2e6ZSUclw
+I2FLfyNDnN6QpCdi7EJDb8ozT7s+IMaRpYM5RJbXcZdvIaa2Ti7DrxSyWxdN+ypV
+3TO/m3uSBqFS4JGTk+R+azM1TGCBvJdJIzpvZ81Cx+PanNU8CWgzs9Hbiziqr7Wt
+qA==
+=QV5+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
new file mode 100644
index 00000000000..853cff28660
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
@@ -0,0 +1 @@
+2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
new file mode 100644
index 00000000000..6d4dfa116b9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
@@ -0,0 +1 @@
+9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
new file mode 100644
index 00000000000..2475a44f009
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
@@ -0,0 +1 @@
+e52567d2589415bd74eb4c2867631bc0568801c3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
new file mode 100644
index 00000000000..30cdc0ce87e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
@@ -0,0 +1 @@
+cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
new file mode 100644
index 00000000000..6426e25c4fb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFKws7QBEADEy9+PqF0cjeS1yG4xMRBV+teFNsS+WZW1ATDBl5ETASqMZT7R
+zFWjMWq8Kf3iTMfmPlKVCPIFH1FG+SgMvWpQEEcLCOmUkJR7UYtn2y3vaXXYqawz
+sDozHQtDs8WvoegtrhjzB3BhmMY0BCgXcTR944OTmc2lqYmDNJC7Picge9ql5a79
+MMqOv8H9IS4jYKyZzUrVhVf+bRD8qBEi6Ne/5C2Vnz/4gVfTs2joH5FlyDmhwtgU
+0m+/5x7CMIfBvB5+oAKgActuHAJZqZiNL+mFmN0m0UtnKkNMlFzrOR17EiT2kA4i
+ZuFrqOkl+Iw0NwTFn4gzkv5XArxDrpK0lDTwXFpEs7jYN/1odHUm3PrHMT5TsfMf
+dSC/Mq2fMTTMKALOne6fH6g1G4bkeeacBvdFbO3il+OXw5p+HDDZOe4ZwgibVgZP
+SjQeeFVevTaOJSIDI1tKQ2O3Zgn4uA27V5BZXOK8pn0BSF4i9XNJvJMRo9+YEec6
+dhe6qlyoU/HX9V8M3s1A3f036YyTXwbl+bcf+eW7koA1I2mppTxOwLeviPsr3BIN
+gJVFr4E30bnkcxJUnbQs7W7HTZ4wts1zE16Aot1B5XNe+VocwtBEQpWRSKvEkNMZ
+p/1Dp3ceba9h1VJmWpmIYa342DUALUqb8gtWTyP8uZWyAynnHq0/W1py1QARAQAB
+uQINBFKws7QBEACfb82u9+A4kyyzAvGZJPvwTZI+yQ6tHKFHAXr/GcMP9J9E/ZRz
+IQa7Sx/MNlTxHRe9fnSrKclZPw/HTvgrUAH9NchW56eXa8ypsHI2sHI3CM6M2KV0
+HWHG++1hHP+cYmqI4KZ1x2MdCgC+b0S9F25lGfArd0PhkeojWf26rPP4upDceJLX
+M7mhi6umZbGYnBYg/VKhmCuy0bPz20bYuc6HTi8rov428geyHhBGTfsHjd5m5qGs
+Ql+U7TBFyHdqJDsY1DyaZ1k5pj//A1xuxE2CSjEazJBCG3VxYLJxbL6Tr4dWpPc0
+PSqn0MeYmF9RA/8vY+56edq9ohIsvXw5+BR5FSR6sXKL05EDem0TWYgW7ATmn1/W
+SbsnVjWclrxcT2uJVdG7vIh7/qhkzVwhYIi1CyO8+2i/r/UMgqB3UBMUrGAE/K1j
+0S19rMISkwPnEprpcSjiVVEa6ubX3gxSFfbIaLPbIBE6nv/DLA0xgMljUvESg90v
+v3tmuApERPmOsU7k28juu5ggWPT5G8M39Rsyms36ZZvN8dpjGcNSuMJxU2KrnFVR
+sokJ36drb73cWv51bc6ir3VnUTr1fWeYODjRqxpRw1K1tfaZoGyBRmxyAVjYSEZh
++uenFly42CHEndiJRy7b9NYxp8rjwSi541R1mNcpKyMRrXjWDk2/AitcBQARAQAB
+=sgiY
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
new file mode 100644
index 00000000000..1de2589772f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFPNlskBEACysou71/IxEXwgPku/U96oPoJLJVgUpA/gtfv2Qhy6JECqEA13
+g95KcLZBZfGNt3DAwEP4A8XcG2bVX4pnMMgpOQ+exf+2tHhZsA8sI7Q10N4M5+g/
+o04w2+znAA7LI+Oz5WqAx0pL/yiMoeB3/UA1v689dDhknEaeLbluA+SlMbosY+Hn
+rtCektcwKfB+mmEb3eBJrwmmkTGzOimIXO4ETgTGeDgAD+EgCtTLBxlMthTCIiBP
+wHOxfMqENhPBusbnRJMQh9v6ZKxc86SfZhKoyAaLOfpqxJ9u0EXesUP/mPj7oZHR
+IstfStRM9JqO1/WS5UooQdNffatSVmafFANDtr7qjnWF8krWZp3Dg5mFw4LqAc0g
+LCVWzvx1tzNOD7XU61lHNhv4lrCS8od1DFGou/L1foPQuioONAgzbAf3s71l/dvF
+upTDEdQhVwZvaJ8b0PnrEiEyQSr9wycIRFuhirfo/Lq86VltRfTKguQu82btbIi/
+K7I2IeCaUK+xHvj15P0j5D2h0CnXH3vYh5lnVZ6Qkjs4JZkSI/5GvVilRRx3p9rj
+iv9p9IPvVlV+Aqugd6G1EujtYahn5xwtPMeJauKgYDfyhoW8p6qSj21jwqNdOGFM
+NclhP0+m2eISK8bkofhnF7GqrRJXSVhNAGTLNAU24gNrmHbbMT5xqKxaxQARAQAB
+uQINBFPNlskBEADkNzRMohiS854dOXd2HrB2DC+3kiKNrIS6XRGnU/HV2Rp0iu49
+sjJRhIu6Egzt1uMtWC77670a26aVBFxTV95DXPSr5sRT63jqXvmWURtJ1IcUQS0f
+gM4PG9xb/2QYzlvoA3jYYgc981/I+QX/jyAq6EreieTqE+ZEO7gcobIQ3q8pUyH7
+tmRpon/2IqRkoe2gatm3rdeCk7HWbM5kwV9THtqONb/QwTbdsxoCNm1PSZl5oLPc
+3UIb6fAL+w4MMPfrDd8hcGX4kItBlLw44WybJ3aU6+jKeDPTOsJ4PV2dguenxxxg
+cLpKwWA9UH6609+ZP42W+IAuza1b7an0c894jU7BQ269ZxU6rlV83KAlPB/34Vra
+9Z6hhpQpNCsrMHE3iuyt/MAv9lNziWsqX2xAXEmOtyU74Tw/dglMW65MjmVS6CFa
+Czqcax79N7qU/qjZOOQrg2eLOAY9ZhwFTXItxvdCa+dh3JqYgqA7e/ssRwwwgoEv
+pr/dlKAO3FQn8Ec3wUFUcjKliLj+s4Q1CgZk2lJK/U6JHuPQSj33ZW56LaS/AqWn
+anhwrL4GehGL2TGJLgoVZtloD5RkGyIealX2MuyueDmj3RnJpQbcF1/tgDPGJfcN
+T6uNt2YHw9xnwMadDxcUw3qwnJafxJbGKks/y1rV1bsUOKotxTQCL9SEOQARAQAB
+=vySE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
new file mode 100644
index 00000000000..aa01fc7076d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEN3YBARBACMx0BWLY5fSwyiNS6IpNXunE7wC/3wP1TXblBulG/LNbStJ0rY
+QRXOZunyT4PGy9Yk4JJHnofLuExc9dpVpHt04mldc9wQkh7er1dhGF5s5bgBrj4V
+w7ile6zf/z0qRUXXSi4IlblxCXgRkrcEHlz2XGcGabzTHabjOm+0Qbd66wCgyb8j
+WVt7Y9cPCI8apCdsobeO/WcD/3ThXZTGDCAtzG5HpRVyVMTKF36GAu06p32xxsui
+46OwZc98v+7xPFYnyOSBYb/e8oaA0lSZXUEW2pSWuMO2W5/s4XOkUy7WgfjBAo4i
+PBPCBtPzc/32qMPTljGQWiSxLQvVkuNaVP4udxXYiM4gG1xwkpc4JWbCuQAsMf1p
+LTzPA/9DvulXGeLAKRZuUG+FAbRCPzpxUx/N9xYPpkdfbqKKXmXtcvyvuYKTDv13
+PDFsad33WTUc14MgCg3o6/nhJuVzs2Xjb1x1mXPlBEaXGdoPyFSm3WyJVg5zKzEY
+/+DFzK13ZbFIFNj+M6BGVtcOAS/9mW4lf+1B4PMlRJHmQ8Te0LkCDQRDd2BUEAgA
+jZhtBarQ8LHAY0F3HozYhHrDvpHu5Zzc6ehQCUE1bMiU7acn7jfpMmruq+a5cU9u
+XSfX3ic/vi90zmcEOxpgQM5bhFjk2qI3F06c0dfjIiewdOYEe3/ITwROB5Yzfnj7
+BNWxQ2ev5t1jCTBLG06WaokKJM7F6ROGMpo1y5OHcBGhHTfAtvY9nF/Z6X4W+q6o
+6S9titeVXar2BhmIcyZY/P1GhlneXXszzfXInr3KYvgTGn8BRl8/4ZMVWI6mCrTr
+csG9RmT2jz3WCceDFzjjlW8MaEv87aB7ffim6zr8a0oVwq85z2EgyXHLCZNb+xUC
+BpIol/8G2AuVvagfinMlwwADBQf6AviRBKjQ0ZuObxuWvw8vF+Prkc0pCs0xEU2L
+Qdw0zcawnoca0xOupHOXpt8+carnCf6QS6SlVonR3/ykZK92y+MddZXZz/Rg9hRY
+Olgqeb2v3Lzg+VQpbXuyk2WqlDHGERg6IhOCp/GfYqNc0yoxk9u0WoCnCLm/MsCQ
+8xS5mPD1hL6On/oZ7n5oZESvHWmPrDVgs9LoStDzV7qLTUrDidp9mwe0jIuEpvup
+5ffboyJTlztq80mME3d2N5sp4mC0HEMjMThJ1ABrvQbMgsCwimgXuRkkg37/45JI
+A6l0G2Lj6D6pt1DGsQTHVlBGfXgQvWgqTYChjtoTy72bxzvpPg==
+=x2/n
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
new file mode 100644
index 00000000000..8e65abd72d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
@@ -0,0 +1 @@
+6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
new file mode 100644
index 00000000000..99756fd22dd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
@@ -0,0 +1 @@
+7b9751fc3f01f134f476464cd0eb627d4885ced1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
new file mode 100644
index 00000000000..c1e00ed9841
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFYqcQkBCACjAM0/0XQMWIe97ntE71r2LS/wvbYNuBnS1PYHPt6GSV0w62L1
+IcIBpOQhD+YZkx8sYBU3WZtb5QS7rHrQym0WbZubYyMy89mY+Nq0VRl0+aiZeKCO
+KT0CIPu2PHdO5A6xl30skL5fLAal7HknDR385qEvc43GzwEol36q9GaMQddWWmJy
+kbMJ/4R7AZvokpr3tflESspVReRt3JA/vr8Nd/V3/bFQBLOda0fNni+xqp2SI+uZ
+dfm10rTD0N2EnMkVAZsae/i91exJ8HGAygp3FVXcstdOeW/vObKPYgpPUaF8uAsb
+/vHZf24LHUEFdeQc96/BwASUB6nu3lvfvCyvABEBAAG5AQ0EVipxCQEIAL7a1rYJ
+3mjnwYO18Tt92h4h49ZFwjrwYnbHwVcIvAr3N+bz9t7ptJte8uBTsSU6gcQCHw6R
+lyeP31PdUdwHqL72xHOIrBUho/HH2YWx01AURs0spAcZdityVtF3UXmKUpwC4AKb
+sztJNvbMmi0C3lRCLFZWRfMsS69XSnxyKd6b5Kq/diZggn8Va1NgQ253jtj2JA/z
+iD1PeuRiEeYEZgvVhec3OF9rcRx6E3buh3NUQ2TJRchsgN/9QXFz18M/HJLJRp0o
+gako0o9ZYDw63aDKgWvaXICTZdTKCkGZ1yWNWLs6j7TdizwgsFv0wK26IuqlRsm4
+iFp3bbfqpSm2pMEAEQEAAQ==
+=5DDO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
new file mode 100644
index 00000000000..7b86060a192
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
@@ -0,0 +1 @@
+07dbc3c1ab1f4468471656061c8d5ef0df2b70d4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
new file mode 100644
index 00000000000..c9c100ac5c3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
new file mode 100644
index 00000000000..ba5624358d8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
@@ -0,0 +1 @@
+3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
new file mode 100644
index 00000000000..8942c969bea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
@@ -0,0 +1 @@
+b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
new file mode 100644
index 00000000000..a88b1830556
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=g3cB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
new file mode 100644
index 00000000000..28e016cb361
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
new file mode 100644
index 00000000000..c0bb3cb1730
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFkuiigBEADmIwb2nUFzfBlCrfyWvwIM3tNYCb/VQ7+yncFkpJgChUOP7CQv
+SC3lp7wjb0kfVUiEq5LAARy2VQ4Efyl0zfySMnOlQ9TfkJUweGBGgauwgaePoRNl
+MTPt597eRNPwPzJUJg+MtCQDQtIMrYbE7nQ/Nlh9YIBp4G+WA8XN1wDXTj5jE25x
+IM1hBHyWU6JCYtV+KtbpFJadr72Lr76VhtdPFLCd0rZl91wpMjnrmxL1yqIxAF3Q
+SIpwRcqRcMk9E3+/u115OWValgOrNza662xDjfFtC7ohm0MRNZFoiqncDn1V3obA
+6kmEX+TtfLByI3p0fpDwVGu7991jJzrMfO6Wh/h5hpgVtm6EbhB5OBEBZNMq0G/Z
+6HZxCBHjRQ2FiiNhy5vzH/BXIIeQcR3JqFDdQD1nfXZbJYNnzZJjAtHI2Scixnv2
+thzqjXjlAnTOdAOMneMHWyM5HNS0n0ZClbwSXLxkOhusDEQOCc3kUajrBNL83sVr
+9TqJq/4/CRtuthPUJxvbQFOktg/oXp4gu1BjAWNG1c7tzJyXfWeSwBaIw9ELdrQL
+P7JvrzXMaMx8EL6s4w5urjkhFn+uXgY3W01r1G6ToLOQSvafbmvMZibjE8HfdMdG
+eWi1RG/EQJAlSpowuJC0yECeEVQkHf8QGz21+EzNfdrc4zk/Wn5wSE4bPQARAQAB
+uQINBFkuiigBEADREKnlLCg5EYDgkrrMsByWPTKe1m2NHBEGRHFqQHaBaRJVtVqs
+AhZmQFt7L2gV16JA5TJd5gOrSMVFt55XIWopln3LXOUT5SitFj3jgeclZ+vR1Lvi
+9KTjIzKdgerkpjo7jm3OOsWytfUmFY2jsq5NI/y1u5Oqv85lfN+h9KPEKQPWG3yM
+vv33CkxTPP8vtDMPxc2dRCo0SAORguo8cK0i1fyM1GXdZ7+VutGS0cXxkb9uwWir
+Qq1lV1klRnLGBZiTure2ATx/45nP5ODV2R5OnlXjQRHMQsu/o/dzXzLo3wVl6Pes
+aqlEmNEwEgHeD85xbBgub6Rv5puqOU2WPXtoCyUETobidon9CWOzJs39mQVYOsBA
+x4fUgBocJQf1KulhjQTBHQE1Hv242TNe5ujtCH5L/aFm2u3iBnxsOLDKDGOgzvE4
+yV90aWX72yP3kAdQNCK1LIhq2zpLBhpCAhlY5nO7S6VKlnDMjnG2ndR8P4Gv3/X8
+9YqZPgGZKLxjMzYqSJFZJ5PU509dzbAU4KZ3hXLeyOnvY5gMr4zjnuzKTz4rkBbh
+2tWnMjl+kjKTsq/UhQ7J+ehDJgkPmgwhEHWwUOaODGd101lfQx5m5xeTqRPIqmsw
+qa+o86P9nb+i3Sd2RbKRX1D/gbN70SoQQ3LiD+6WEfxGWpiyUK1Pr1TWlQARAQAB
+=ghux
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
new file mode 100644
index 00000000000..e2429953d4e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
@@ -0,0 +1 @@
+1fcffe916b6670868fa0ea0391ae1504568ec4dd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
new file mode 100644
index 00000000000..e75721c1d11
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
+20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
+y5M9gIc0yCynC4Cnmg2DmRWuafVvqogz0vDKUG3ADvPgRyaItzh0xO/PsWPZvIHD
+SlCX9Ny/RT1vZ741tBUm1flGUzxs0zAPt0I+ievjwOeKw8OeUb59sc98U3XpVOVQ
+KDD6RIzhnvronznoPkcKPGMrVgBbgyP1/6rwn1u/69CTlED+lyWervseGtDQCO4h
+nVZGTfLLo3cB1ertknmmMqyahfaQcohykvAmVzxxkzaWE1vSkOX1U2bFaUNiYuZN
+U8zJtdENX2isKQp4xSxJ1/+/hjyfrGwLAebtvnwNcsM3oDwHoevusMoLmMNGkGe0
+yLjz38gwLCIuVrSFeHtHJKdPPsnWVsA65o3iCQyEO5lp38cjDE1hkHzXGO34LiPX
+AlDHU2YzoWvAHPqSppppjPJmz1tgHqx146tukezuzoRXuEUTmDAjbpLEHxvKQuBr
+DcSfWqe4zfKKqH/CfhxlPGilUcVyLmhaHjs1ti1Bnj4YmQuWo9BR3rPdLi1gQFlp
+wZfzytmmK6Zy4Ek89la7cgt6AF3eXjNmpVtGZlAb7lr3xne9DTp98IW3iwARAQAB
+uQINBFcyNOoBEADH4HSIjsu94/e0zGBJbyrFFCE8ISGTI7HANfUQeL0Cpl7EbpQN
+jIGFbEtvdPheeaz5hJ5sg3dt/og3fQ9oBAXkkx65XmRnsLwYud5uI4bS240UV+HX
+DBBAVTE/luQfIp6CWImSY3dpfSRZWarXkU3vDtZgj3drSrY8DbLBPU6B9e7QqToy
+3qmZQ9/VN7QEXR+AyNDR2ajEbCzhkWyvXD+7VJg+lzhDnzepIxmDmpbiwmsT9J1i
++BoG8FrN++ZRVXaOEslARP0+rvpIK6RZG9wdBtb09RJODBnufyprYP0//GmcZyOZ
+CbyLBfJqOI7vUYu78xyBcbwQgbulwMop3sN/IgxCTGFY4R4waHmgfMdagBNobCv5
+bjODfegAeKmI/Tmg4sppfH31+YahntYZ+MZCxgbCWRpODut6JlZ/KW015I/BAjrx
+cj/WooDMxGgq87SAYF6+Kl/Zm4eNp8emduIfLQguZymAryzWQixWwZFfkis/DVYA
+OhZWYvlXao1RPAMMHFhht+578atKpJYzMca6WzGX5TuLSip2tXRR5Y8k7vWMVEQa
+TlQyHQAl3jw62Sc4WI7u7vA3edbW++1wH8kQvoHTIjdUHpGEkGiNDuVi2dlr0LH1
+yEoVyoZYu+sSeRhBKezHtPsOd02iVBevJIXpnVA9z/FlTEOBfcz4oFKyiQARAQAB
+=RUvE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
new file mode 100644
index 00000000000..25a4bac70e8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
@@ -0,0 +1 @@
+f1182e81c792928921dbcab4cfca4a29d26468de
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
new file mode 100644
index 00000000000..af3dc98a73e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFVi8aEBCADKwLgNJXN01oO8Ei23wQYdngUtFl1f1tbTG0zAq2SfeYQcH0qR
+jy4AYE/SqkxjGibOp7OL8O+cOSNNmsiGp/ZLx9C7o91g+HnW9VjofHqv3LREoZxV
+QVFBywBdoeKQNmQ6dn4m9mdq6UfG20JrPawRygGi0yDiVhs6kZkrfkeHHPE73/gP
+QdDEgMmeBhuTzv/tITw2xIYYyF4z39uYSMGlo/C5pgoonWBm1sqJyN4sDFxf7feT
+qbnqlKyiXEX7zBqByoiWi+bccfJsZdwDtaoJdcmGuO0T5baztXnbQnPqs3kUxZDL
+T/fsvLYss5SZp7Ldi/oJfl2QQjU01qFXZfYPABEBAAG5AQ0EVWLxoQEIAKQn1HcG
+Zpg+HgbnguNzA8MYPbBzQ/WlmEpFRqp0y3tbSWmDzyqfFwjWlnaoG3UIrHXcw/qh
+IWpEV/JQtyCHgfA6wYHjMc88avhEe1HpSWEwcFVzdukf9aUZQkxidrgbsUBH2v2g
+9KqXPuUNyGxA0vlOX3bFwfvUfNX1MXbJtVaOT1zLAb9Ks0IeSaUhi3BXcfG42hgv
+i5c9JcjZIZWmfCK4pCmcToMnXQzwkGgJqxDZbpzRPpHjRTYrzUW+8M8fUQMd4Z/5
+aBpq4zxH8TOZITQrj1Wpp2ECC848ezmBGz4N9JVLi22VNROLGoTjlzihF/RjnkXX
+WFPHW2J78FwXAl0AEQEAAQ==
+=Bcuw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
new file mode 100644
index 00000000000..d41dd187ec7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
@@ -0,0 +1 @@
+f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
new file mode 100644
index 00000000000..dc98d3e3192
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
@@ -0,0 +1 @@
+76e94e8ff0ab5af3b6f8366972fefd1572eb75e1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
new file mode 100644
index 00000000000..146c907bb49
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFt1xhcBCADDofPZYtlG1I5NRG67j5Fn8KArIzKK9L3bH3MfJC+XYYPY2N11
+ckiF3JQ0kXH3BPL6r0+dOQm/9SGJYsRVRYYoz2HEf/bzLSxFvKeEdEsWh66IcEzp
+xlxV7rXc3oeGCZ+EvobG7JVoRyyLegx/VareBwtBhW39lLGfBjGBzFuXEMVG4H4U
+v304N7D4sEIBYWT8c2z5Q5/Iviiyu/VgHxczDn0H6Sl1kXP1vVhWff+OBlbO7JAF
+TcW4ET3K/ASWL/CirLbyyVkO8DO5pQyuJqci7pJFWWp/56CpJBmxuyQRc4SEpPjC
+ZUOs335j1+MxAJh6z1L/xZHF9OV0GgT8cs67ABEBAAG5AQ0EW3XGFwEIAMYfnXhq
+pCttsnWLFIxpEXvARjfUEH3WNyn7kyLoFPZ0AU7V3rcdsBg9k9Ds9Ly5xhRFVUd8
+AzlrywSeAQ/bSV++iXh39xLq494PHLQTG5Wuxg8Hw21tKe709iOzJa8r6CO10sj9
+JfCn5zWilqObcxcNjKcmGOwTfoIlm8giVftdMNge1zEsJQ3XTZtMNSNHnK3Ap/I7
+tIBTx/p2AdgFKOL73owtqQIBXplmRr9AHrEiwq4vsxwh33S39HsfE3KCmVWJEIp9
+CbitNGmonb+5cFtaxhEEhnmpmXpAbuQcNsjBgOiWXIUecp7iTkPMoF/fCzJgBzHV
+x34IV/XBzi4ZuZkAEQEAAQ==
+=X4hN
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
new file mode 100644
index 00000000000..f5793d0b464
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
@@ -0,0 +1 @@
+dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
new file mode 100644
index 00000000000..da9b93d6f8d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE7CF+QBCACgVSxGo1xBKSebwXNvh5g6Sb4KOwOEFSTve6xixOdlENjI+Jqy
+8diCfFF0jA1ZNOd9xo/Dwo0geYfw6/W2RWFhs8HmTnOPKQu3c0DoobHGfGLXnFb7
+Lq9WAeixoIrkU1AGvll1a1V9BTaYPHVWj9sflA4tBuoV70R6JicnMMz2cSDNu0AE
+YnmRQjnOhTWJtrvLJqS3Syl18XtXuftVtAqVqvB7LpZwhqLRBnjg9k5jpnb/JApp
+VYkDvCmURTn7bVMklBQqQdWDsX92WyOyelK+D4g7dEhofA3QRg/vzBwxoy47Xpe1
+1Nj0BZB9UYvi77T3MPCvJ2n7QLVzEN92dnbBABEBAAG5AQ0ETsIX5AEIALYECndW
+IXJpzXIiZgoITlsPA07RYOdZO4oWjQalmmmBB0ajHGWbLrWqjPV0g6KK0HidV6go
+vca8qUoaufzk9HSLSrzTYzevM7hNXrlI9Fsso/GB5rZwiX4F7E7FApRtyddQ5/Hp
+ft/P/xnRQ1ETCC4STDkvZ9j83gsY7Y8MRBBg1dN34Rl/lTyKdF1s8d44hjkDl5IV
++jyUsi1woOzx3wm4oOrHQeqhdEoqXvhDZY72ajd0Guo0jxRgKo7yn0Z00KRw2Rd8
+uz2ppvFMH79hZxItdZj2Nt330goT4WXwTQ+aJ41hub8xO/26qF7DjZ8N/SrLVTZJ
+LmFKoZ9Vram2zkcAEQEAAQ==
+=wK7a
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
new file mode 100644
index 00000000000..7df0ed8dc7c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
@@ -0,0 +1 @@
+817ea1255546d6070a23aa00db45d3a62a183ce2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
new file mode 100644
index 00000000000..dc98d3e3192
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
@@ -0,0 +1 @@
+76e94e8ff0ab5af3b6f8366972fefd1572eb75e1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
new file mode 100644
index 00000000000..44482f78ea7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
+f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
+bhhFEuc2B85vNf2o9Y4V5GFwbD+tFNy4u24n7zg6/VgE2WDvYJ8JRqCEkwCggyLj
+ba0lsZ2XtSINh/W8ok+9f0sD/A8WhqBfDTEBuG9gnuCYXM0j7XBBPdPS+FXmmfea
+zyP+URKRprLCdt0ThZAMllIxZJrkbv7aeXVpM6KSZ/XvvaFQ/gha4o4iJFvpoKt1
+Er2j4Tz/STKztHGsMt6pqfrMNPWovu4tLuLZQmojtbIk+IwmcYxMy99owH8oV1WC
+U4HeA/9MlUxzmlmrQF7VLqFTGEEqQaEJqz95wNPj/t1DmI97hshPzXLD4zwKwa9m
+qZJPStRHM0a6xW2dztF12aXhrmYg1gIGNnsHtq+t8ZhfINZUurSWn0m65WT5notA
+15s6hwyDACHWWOgFQ9jmWuGDh0ZpiaBe7BxeTV+MsswY81sOn7kCDQRD6J8HEAgA
+sivVzAfz34QE+S4WTXCuknmYiSEEnyTwk9awb52vrYlhoQ2t2EhRClc/tR6QbhNM
+haMxPt1OYeutOvZN4q216IE2SwZzIDDTchYApP/brBdIDf4L/XGWFIqftCSn+vnb
+0LAzYNVuNXtNwRni2q/fZ3g1wniVMbJ2MrJNt2VhLrP9K/ipFz7JCJittMngmmDF
+7mEKhnrqBROLubFsUfNmz1qRC6PiEwyyCCdG+4m8fIiSyqna3CMkZr/UaVfxuGZH
+WM8HYGmiQjafqeLqo8aSbWerzDYtF2+v4hAAt9eDwdgYy8oNxXEvw7Q+G5lix+6S
+UMYV6NKLNUbBYffm9wjVuwADBQf8DbA7RpziZWLv7DHjR31AA5nnGEeud0dCRO8r
+wfQNnaQvuJq8siRmU3uPAL2NwDgMaa0cT1xt7p4/8/RU0N9otVqnzkLMUTuqq/wt
+QrQt0OWsEJRyxemWFwiL9ZpU4eTg49cfOQXjg2q3fbx9D1Xr6Bu/Pn7UDU8r9GbD
+StGJ7R3Z0kkhtCErWnGNXbuqlVd8uEsyeM2HYpM76BmH/8vMg43lOJyyh6Id20ZT
+n3HgWzRI5QaDJ1JYBhMuVChbTPUCcMox+qgiH4KtRIAjt+m3w0Axjsqo3EFPweWG
+pRfqMyiUcESt4X/Z9V2Nf41NH+nQ74v3RvpP7EWKf9FfEtFprw==
+=n2+K
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
new file mode 100644
index 00000000000..da7007bf710
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
@@ -0,0 +1 @@
+1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
new file mode 100644
index 00000000000..39f8f25641a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
@@ -0,0 +1 @@
+0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
new file mode 100644
index 00000000000..ebe17bd0153
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
@@ -0,0 +1 @@
+2c1708ea05adf6966c32d6454a1bac7f1e3b89b3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
new file mode 100644
index 00000000000..c9c100ac5c3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
new file mode 100644
index 00000000000..93ae4e36dbe
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
+hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
+cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
+2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
+nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
+w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
+4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
+V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
+6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
+BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
+bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
+eFcAOJmvqC3c4pUAEQEAAQ==
+=Hn4p
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
new file mode 100644
index 00000000000..ba5624358d8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
@@ -0,0 +1 @@
+3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
new file mode 100644
index 00000000000..775b472966a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
@@ -0,0 +1 @@
+d75e25b78ebb19e47c0a99bca7764f502a938c99
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
new file mode 100644
index 00000000000..0cae4729da7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
@@ -0,0 +1 @@
+b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
new file mode 100644
index 00000000000..47557b038da
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
@@ -0,0 +1 @@
+656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
new file mode 100644
index 00000000000..e8ed4474a32
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
@@ -0,0 +1 @@
+5c9a30ff22b2c02f30261c305b93f1df7cdb6dea
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
new file mode 100644
index 00000000000..fa5f227100e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFVcZesBEAC5Poew53ijRTE5kV2o2Tj+plJmoQMRtfiurMUpPQ4s/vTz8Bte
+WoHdNfJrzordHBZdy1S7V8p2kTtKWyaNFMyVoavBqo/BurmJ/3qUKH5otXkXuaAi
+zFaJPeEnR6y7pxTYkwFKyrn7TE4I84JKZEMLEbJIw1YF3t76nj055/OnzRtwc2Df
+cPyGqDALyoFXk6R04qIotVmlX3NwwF6A0M79+W+kWvPg4sD4R6SqwJb1UhcqHrqb
+kQOllg74cBjyAikRbqrCfoydHM10gc8f5w9+8v/fbDkSBtoh8Y31WSK6ocoWIg85
+I3odqHFxThwFTAYQC2tdw1M5kYcOiYVqw91JvBivpKH02vryH2BJu9zQDNFeyXud
+wyengMLlzUUmf9jBk3M8IUE4JTerw1AzWj0b3jdvG7FrgHrlszb6eCzE3BdY7zGS
+Qh6e+ROsF2LEKkbjxeAg58nl/h5iLythheY0S6sspeOTuDtgLgm8TZiGHA+j/qKH
+DY+aRReI0X2bzqNZROhTIXHSKsoX9+9g5a+1NYQeZmiICNo4vj+r4+i037QvIoy6
+3K4NSVQgKnR9bbgyQCUprifrkywKF5a8eP3wtUGtH2FNqFQg1rUKBgLjLbRJ8PF2
+Ag8O0jmJBPxdOIdVP4vz37m+jyKE6L4JWjnaFldtD3NDJI1QQYX4MmXEaQARAQAB
+uQINBFVcZesBEADFcTVSAZoaax9xpw1zxwjVgfQrNfobqnJM33r2EBSB4b80NbPO
+toHJ2OUvHq4w84PB+H4+JNAIA2KbPOvzB+u1Bn5IgJr9asH5lhrnrUSR+YCwUlnC
+w+2YJumdv/l6RKcFKbSRZHWSwTD3ZLBMuPUqX9uZkOuG1ftTkcVtfFHN3WAuckHj
+VxTSkaHhZ7ALz8LIUH+8AL3/3eThM1KEgx+bcod8YttctzjTy9cAaT93DwKOqzqH
+Xpk6Fpv9bvdiNye8Ye7f8487N0/3alMPpJqt2tHAqjxJRDb590/09cbt2N6l6B+W
+lpM5hgkV//7ViL357Hids64sqbYSnmpQjZWUdafDvVvMKYbITmx26BEoWtIqwwpj
+7+DdQlxd/7bAtyk8XiHe6Ej9FF1PUEvBQw5NXOUiCSBo0hzcMMNy1uRb/WpdoZX3
+TFKXTWulv95uzKGAo3zrUuKcfOGfDgqZ/H2dy8Yw9DaWJRnXyYwweUi1PtncNk9k
+tycypCcVbsOQhGdQJNyGVUVgVV1CWz5GJ3eqtjHY09r7HEm6bGviJRu/soskXmmj
+RUFpqwtDCRACYShDpnFjpmWTZegPcwpN+492qLP6cjh1XSN4Cg1YZ/0BMY4NV/ye
+adQf/hbM5hzPOhN6mr+VHOLulyXuV49EWisIRferqaXG67zIXbVQ4qfqfwARAQAB
+=zOLc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
new file mode 100644
index 00000000000..13119799a98
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
@@ -0,0 +1 @@
+adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
new file mode 100644
index 00000000000..9e0b3a1c163
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb
+2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME
+58xSA5quKBUfl1iO2qx23qv6Haw5G50twq4A9WJdEelJJDKzzweVw0BJdv8z01In
+/+sfiitcTzRT0NPbsuOnKCvfIa3gn87BvHCtqai2njq0b8ZQroLaMONtvzrn/gln
+R4oPBdeIpdjf1CrAdWs8zdiHAZWuL2mZBieEgr3+je074ARM3yCpo3DRw2bMwJe3
+JiqIKb0ebCs8ddmOaT00UngmQqCOx1qGjQeXwTD3x5Tzcihdyi5auP/zsBUZHf6d
+kmugzOWrgQ+rdfUCRI29gLWcwMp5dvMJxanREY+p854Hib5n4HZflmkaZCnEls28
+Xh1h3T6e5pWKvfZhsu7qefFjgY3G8O1vKmHjOQNoc/sEUwimAXJxK8E+S3iH/cSV
+9mdtr0TnlzI2r7+kXdyUy2rGgieonSRVRtd0Gdmu4MkiUkbrX3MBvqP14OvT4xkC
+6lcbQK1lrXflWSSRmtfNKpysVOfaIgT5p9F5zJJFEFGm5J25z8beCD8Pics+OHF4
+xfYB2SlM4xmbow2kr2htAE2RyT5EuUNuokkdtrZONmBGHBqzBPvj1vzncwARAQAB
+uQINBF9amNkBEAC46u0OHX2x5/hOswLlZqgGdscFpjGEtAcfAhTj1zo8v2vTNYX4
+E9aF5hQSQneH59a9SWOFDzHCvVWRgfxtupVm3AFPPyWHcb0xsQyfssG0VE6T4B3P
+BNP52pAt36tr9gh69oxfzkC/CJ/DmlKi8Dy6wqt9CzWG4vciI3v7YRj6JOdM52PS
+r+3r8Ih8EYYDaEPAYVJPqNYqt+cjO5goVqCSQfHy1DuM0ggvZ2vZQAZwAgLmKrED
+A6xQUicHVOfN22MIEsGy/qyC7TRJgyhJzU2KYavS3ySp+hPSuffNh3evpArWpFN5
+2e6vq3l+5f8iuBFuNRasnkIAf78qsu0nR25pO8EYzzdcL5Awkjq28661P2veuD9o
+eR39B8G4CsMvYQ8h9oKLh+Z8il0WACycujJGaFxJr/hm3WugCSltzhCN60ocCOaN
+BMq+5rLEx1PQ2DBaf09xmW0SW+pMl5dUDqE62/cGdXF1DaBCr8HjujZ5GXm2ZCru
+LikPaYU2zEk9pfZheRGOW4uvp+SfeuLFo9jt65TbYQvT/hX8FydwpG0dwQtuM2+9
+FUDSpu7k00NDtLMUwF+xlt6vo49Vt0E9nDMYH9OEQOozFJTtxENapOFvHEDI1ZCY
+xCcKOATKqraWzD++MpKIIfVYrRZ+CTjrh0m3Q2NA5aZDLTEmzB5SY0xliQARAQAB
+=tiDp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
new file mode 100644
index 00000000000..4ed9f6c9144
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
@@ -0,0 +1 @@
+015479e1055341431b4545ab72475fd306b9cab7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
new file mode 100644
index 00000000000..6e5da6e7595
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
@@ -0,0 +1 @@
+8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
new file mode 100644
index 00000000000..9fddcf29fc6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
@@ -0,0 +1 @@
+e77417ac194160a3fabd04969a259c7ee636c5ed
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
new file mode 100644
index 00000000000..c0335cd02e8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
@@ -0,0 +1 @@
+1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
new file mode 100644
index 00000000000..385bd035fe4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa
+SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la
+0d8eYXrKO8BU024o+go+LzJEBqOb3+bn23dwF96dyCUfnhabYz+ZbPd3VmZV5D3G
+fv0vBMnQnJkToOW6fVEoqjzCpEQmSFCWe6Cryj0veci2JmFIiiLA45hwuMg3hj92
+Czd+mdxcURtwm4XFfUoO32a5nAhNfrzKfz2eoV4my79MC8JA8OwQau5aksVu0Ohs
+3z5IsdXi2hUqPF3s+j6BQFwSPmLo3r5XwZWTx9RAM7D6cOHWr2jW61o32t6ABSiI
+cfhECTb0arEvjGtr56kD2JhgTA5GTIBGPwbdNBHMKZc4VmIFITnUlJ7MLoRv/gP6
+XyCerPB4Cm6kOTcNZnm33yUMNB6GfR1/l/+3hCFP+0z4/WJ0aK10d3/9opikkmep
+gmNtedS6ScgOnU3pj9UF8jEMleK47nD2njc7FhGKdB5+I59L1ri0tSUdMhpuBAEd
+u497Ei/Q1rt+vkNwA8uMQgXOGka7NLpgPcNw6sDCq1fecCEpt/HgmGrHdK6pY8KE
+3I1xEGP6GG5DcBs57cbZv1Jdjf3A8fIozX7Ntn+7nBCHUVEWCzaASlQYrQARAQAB
+uQINBFKD+PgBEAC8ZqGlqxaPZ+Y9QNsroptbfZ8/YL/+09qEki6bJ/bPn1wwAOpf
+Q57LSHryrVFZXnqMO/+oSTb6zNRvy4C5VG8Lvoc7JqGSo/fc5nfeZwFS1v58j4d+
+6AfWPPmg0f4mt3JASoHqJVwsRTEQsZsuaykPulA9DUsB5/wMQXlJLU/YewcmkDig
+QHw1bhG3KROTFnnFp1bWwEQ0C3zTaB9mJcrCswKUnauDIWGeR0r3ALGllPwvzr4R
+cwwTLUHzaQeeRzJL39oRpU+iq/3WW4HN6at8BQ2jHiat6QidtWOQNKQTvrjybs6X
+gkRskZniombGiTbDgsTp1/4BRMDb+0nRGh2z3QIj4ZPVg0d2ISf82M0AMdZpzPXX
+6Jw3o/A7Tv4pJa5gHzOUTDThkOFiQROgVP65nvPt8JPBIvwL5eaG5rzDXm4iWq6a
+cMnREGz7jQdC07UvVxRAbVa4mCHGJKNskRDbWdGZDT4clYFoMQbMup2CMMkObJac
+OTxiZ4xy7vQWZ2obNkb37RNrIKqCFxCcuQl/9AhlkbAFFrodEqTjNHOFH0uq1/0B
+uH3XiW9Xih3AZ0fL1wq7qrl2DXBIYMAbzABoQviGYoRXvApSSfuozFnV9B/y8hyJ
+DQRInzHslXW/lkdrBWiBYDb9rxKKXCzE1WYYHhcw0BG8dj3T1LJ3c4NKcwARAQAB
+=Irkl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
new file mode 100644
index 00000000000..f24401d1630
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFeOGY0BEADIr99yL4ahwgM3KB7zMVzDk/PEkzUWpm1BSxqUxuQtzWArFj13
+Y3Zi6g1tw5jKESfxtmpXx7j7xR3qVdJbsYJMU0zQi+FehwnKox3Go3UnIKt7kydz
+CGowsRjmEuLErftU6QCDof4Xpum/IPFgu3mcQK3dp+EL2sJDDBahz52DF5bxcSZw
+4OawjX13pnjaPHGw7iWt/fhMEDRmlr6c158lTpEMGpIHH4cum/QTFW1xRf2osjbk
+RysnD/e2QMTwnm05WdImBQq0PQGU3Scz6HQr06UAWyaaukp+k9nZD//hZ7t68w5Y
+wHxHcpFI7JTxesRTv8PNgG5+EC61O2fxMgAefDv9UwhUpYDfxtc0yJYz0QTfNQQB
+RTd8Os6J3OjExDnUFUtPN0Xvgl/SzfCIbxmr/mKqWLzazJMiuNs6mfASrYVuYERl
+c8Gm5TXRU2Pg55KeL6iDAyXDuObKvmqYKb8qXM/qba+RI+KOhBLPSMfWVw5nziVL
+XY6sjXHLIyM1AfDfeM0DHReDR4aIkdnQ4yzyzshmhTodguDbZe2H1FlPNqzriS6c
+4s7CoyO8tTTSHmrxkVLJhMaTc1XazhcQrsp/1s6SJ5MUy0rFUt9QyIt8zfGqzQVH
+pqXmFZd+ISd8Eivsyh5gEU4JER+3J7kSuMQx/wMMZqzu1RczUz4gI0nzTwARAQAB
+uQINBFeOGY0BEADaPmufkJ3ZMMpXhbkBISnPYW/2QGIU0mtwGOO13PnkxFGn4bFI
+es0459axyzMAT2DiOF+cOh0R38DJN9r3ZZFgjAuiy0WTaHyFuON9Ebm3uDLN/VrC
+laXhHI2BxzcYC+uCAor/zJRytD36Cxq8c20NqqQqqq/p7mMDp5S0EjoDpuvXQ55w
+vNmH8dwqu1WBgSYbv+R52fzmQfy7OktbU/mvzkSaxnfqTiLDr2ZkAZcZjgURFvGr
+OB262jvFQ6iTj0ATCrj+xauvpazAAP3z0EgUyegFOHQX/VjA8zqJgMF7d8WcKfzG
+xohxIck7ozOXmcroLzUPLb/i8riDOftXqUcKIkuWD0vtpMVytXYG5RUAo24ypGjm
+Bmvyjy5EkPlc/Yys7Bja/tUKG6F7pcZep0OHTT5bWHUyfvC621cc0RODMC0jCOHb
+MJCetcMBtoPioGBhpjZGrGp6qXfTBg/HmvNgPfWgLDdnBL8iE7aq+Ob/PcnodIGm
+tzAskUhpzNqhtDNbkHV7GDxdlzb3ktZMBGwYgeCal6YzwF76gqlLDy9LQlc/KVme
+A//xB8TAOMEP/qrlGgNJV7kohcvY+4drpTf1MyL3zpZZvD275+sdkL/tjzV8ow95
+ggVesGRDrxvcGvbsS/saKQxf7iwaZyShaNNTCqm+131UWizvVN+enO30ZQARAQAB
+=EYyV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
new file mode 100644
index 00000000000..798a7ce906f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
@@ -0,0 +1 @@
+55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
new file mode 100644
index 00000000000..8150d9a5e39
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
@@ -0,0 +1 @@
+d76260c72df74e66268f7770ab049df4ab24c1ef
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
new file mode 100644
index 00000000000..e6b060b17a9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFkGbgoBEADXtL1z5unXjC2gSBMvM6f2Z1G60UCv5W8CD9XhWRFxqhbeo0yN
+Ld9mWpTh1b9equw85LURzVKF9SKTFrBbtSLPqAsnomgoiW4X9F4S2IQfe/d4YpTC
+wxgQ7xvG/gg1YIXg14emXLyYGhP1k5d+BTcFWp3cCRqRQyUxRp6raiSmSy8n8GwH
+SX7jY6d0tJUifpM3ol0Zyc91/BsInJsOBHgGqholZoZMAEQvgz5kZA9SG9svW+bS
+638aZ2WmNXwTvba6za43tg9HoDBV0oM0c0r1ETxa8JbHGGJCt98FSpblEhQ34Z3u
+Be80FAXpoympbTXmzwcWXfmFL+Ye44513C5fFCtqGQwDSUUpjnEAZrla18ZfJRW3
+zPt+yLL4KkA6bpr4XtRmw/GB5pRYmdW4JOWKJZAErDmjwfUumAYDCMDP1T6GU/kc
+imH9owloujSBhmIPS1q9zrl3t+XSq/TqawqmcmVb+2aALpAbh3A+E/PJpwQ3Rm7d
+RBsYtz1mQZprHd3WnU9mgYaIztBxkhyBp/2HScM3YsPMjSgbyqKDDY6Uy4Swx7au
+8sOwVSNyFTQDdVsxyS1eLqzsiVoBNZSAFchFp4zbXoMjnlysIDxh0HWOOmWheOZ3
+M9dMYHMXL8IqghCkZ7/V8lKPf6hnO8QxXAz7/7WVAoj8biIErs4eJmKY1QARAQAB
+uQINBFkGbgoBEAC8RudwGRy047m5oKjNDRCYu2iAAHAjh4aiWl6MpJCpbPKB3J07
+ViLyUsdHuyoWVwGqZRX5v63FCtO+0EZBOGy1dsv3uLtxE++5oAqv0mgYO1FIDTRr
+c56b/8HN93J9PmW7IQhtmeUPSiSfE2XqsqSVgJEmwxazZvudDGccWbBPjdr/rehG
+WmVibP6aUF4JvlgNnoZ7tvhWsqpfIagkB00H/x5h1RY7ZeYYV9uDyvMVx9G46XPE
+g1Cl3UnXMMIykIT11gg7mqn9NFn2c9HiMeT5SydIG7W3IyaG5y2NKx6UJjS2T0O2
+//3cKzbMHXjLCOyXeB48iK98VJ6Z+WG1RbyKP3F6wgDAzo5DMhB6x7GKuW75vrdt
+/SoKTIcZg7SZQf0Ym9ORZN7t/T5hnFkt48lZDR5w1HozUPbIGTShTQaKkYfBrlcQ
+35MAu9AC5WRQCQ//5W+WZ76sC7wc4Q18xNLmk0xQNOWn0ANtgJcOR2J8JVSUdAv4
+9ANZdZY3qZ7Vwh72iQCqaZ3QPAF3Ift7zDEU7UeXwUmgt8jCnISV7RSsPg/neCT3
+58iN+PzBIyblg05iEVhJGs2rF3+2A5PwKzeaTVdGWISC0NG9mjs25aI/kJ5sY1Sn
+786gq5vWSywa8UVcBiT4NDdWruPlWXLwrxPMXlvK7EpYP+qIqAAREs4AuQARAQAB
+=ef3u
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
new file mode 100644
index 00000000000..d2f7ce18f6b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
@@ -0,0 +1 @@
+8a9352189aeccfb4ae1f3bc616fbb6b6e3120829
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
new file mode 100644
index 00000000000..04fea655c64
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
@@ -0,0 +1 @@
+2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
new file mode 100644
index 00000000000..d85c89fdfd9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
@@ -0,0 +1 @@
+8f9a3c6d105b9f57844a721d79e193516be7998f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
new file mode 100644
index 00000000000..fb8c4507eef
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBE0NT+kBEAD1hzO+dXStXYJj8M6FBn9fxw+grddjM9rqaEgJ2omSdpZZOPBs
+DRor7v0Rm23Ec17y/7Dd6oR1CvyAeQwhJvNBaAW4LQmUcvvqep4hfkWDhlRvh/QS
+z+0yHhMMDrMHB/dhQaCvB/SoF1IFp0mASTEYU8DieHeRgYy72glTnTC/LhBExuuH
+N8E/YP/oAlQ3djijCP4oZ/mIC5AUZzTvzmUFp60plg9trH+mIKZRFiKY7De94I7D
+yGencpy/BRPc9lLYr/vvPoxfJUVT8lObXTSsDUw2Q+X6Z7t++eMphDQRNkauII7q
+7Wgq66wCjvpMHAVU1yT/nripQOjab6OBddNyS5EE890laxN1DPn++szOlH3qElUp
+1zrq4wZK/b2ykC29D/YWU6sSUFvjXKy7RodqrB2IwcvAKf6cb3p/q6c/Ka4vr2xp
+DlRyvYnZELlHoQvXSaXzPg41mtvgGrile0bkJ5PCtTOBx/pA/4S8/5y++TDbDYgw
+AZ7Oqn82wma7tVb7AfcPCNRtP8t0nCWDJOsCczgE08PodpOwCUgqgb+AOYaduBBJ
+H8v7LZ0CX5a6PImQGUMztrjfpPK0msLLu30nkiMzJcXvo4blekOMhTZBiWZ5LF8Z
+hHnx++g+DhKXi4yLMQFliDknPGLpnxV+2enqBs3HNPU7IO+xUooWxJpdMQARAQAB
+uQINBE0NT+kBEAChIJDHA7W2T1uZg7L6e7hCYfSpQMsuIQg5j++eZObU1OssweXw
+zvf8Y0pUHjIXw8JrmWqfvxZkgjO2qnKQpwQv0zElU1GcguVVQw3jq0Qe1soblZAP
+E4Jf+luvEvVxBNqRB2x3K4QRJdqKzY7K5rxBWU5WNp2aJ1y8t3aCFtvsdc38tgg0
+Lpx1sfPg7RCrrHzx60rgCtJ/PRIGmbZMx8mKdOMlr5dNzJ7QFGIIZFx6qr+8Kkfv
+jBTSkDDxLF5smWkduTee0Aqc3ZdUkrk8yjrPb592LY8OHOnLj1wc+ACyo/p/X27K
+QHqf/v2Bgab+VgxrTKc5BAwycAqvU1KmRMfxYk3NIIgL+xhzdC0f2KXDL/ojc8lY
+lxGaTm7xEGWaPldPbF2RoGoEYkGD5IUU19fvSO6ztzdUqcKcNjZeh4vhILkjNb5W
+e1RP2hubGvcIJdrjJ7wwas4sWZiJtZLdSmpbL6VXuKBjRZ5cZNav7iWuzYAEgiat
+7NjifEEMjJMXOMqUkSdQbdD7Nyk3RqiLNlqS2yR3z07qsGVmA6BV3jvD57lOwqDx
++rO7zHqSUc/CVwGPdMowlSrRWY338y9HboEIesh7o1+P9h+6Eii61xl3+xYJov70
+5LanmDOaKqp6lId89HeGJwEr6+sQzR6xzsl7GQaPbejeQ/aY+Cfw9/wQMQARAQAB
+=Rs0u
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
new file mode 100644
index 00000000000..3a993d282f7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
@@ -0,0 +1 @@
+a413f67d71beec23add0ce0acb43338e060cf9fa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
new file mode 100644
index 00000000000..e076fde96b2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
@@ -0,0 +1 @@
+bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
new file mode 100644
index 00000000000..705a8014c7f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
@@ -0,0 +1 @@
+3288b8be8512d6c0ca185268c51e6cbc7ff46f0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
new file mode 100644
index 00000000000..f1dc32f668a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF2IYVABCADlkNxFiE7AUD+BirOireAA0LceQl5HMo3EThWHzrhKTq5MqTmu
+HBjOdKQjutFRfRQ6xM6VitVc70TuBKCNwsbCQqSScZ44f9pOEu+f1z2CaI2J+ojY
+YuL8MBh3yMz9nvREGfmIzKRu0VZ8kZvxa4GCiWAvUSgEj0DE/HI2zaXssPiPbPB2
+9Y8eud+gzyuUEJv+/fYgNq23mXVPZWVE1OzvYvOakzWtym8YDRmPvZLI+EnN39dB
+Xw21AKYIaie2kvWYmVloyTff/cBDSjqiU97wfx0ufUSAZUg0BytFNpLmlT0mUXER
+LNL4qNNmtLg3xmJgg1uHk6I3bCCGnKsdvztHABEBAAG5AQ0EXYhhUAEIAKT+HmwR
+gvXV5TbW8lfYfBXGw2UPtcG3+G59feMps5BwMh6vCPfO3BKQCmt3MFdIVHMrvcyK
+V4nt+ZgVOZvTbl/3eWTQjyDFHOjb3nYa8fqUSalvNBTPu6rEgsGer/HP0aMDnuNl
+A2npqfHVNnJF/3G9iBkN8PNn5tHFo2z/9S6UHIPZonie4PFRpW3xtb6naw/Fq5r6
+m8DSp8GPL7INrCSag+3LByGaZ79IYFpnQrtBp6GeLZ71b6n52KxxAWw5xiFnIWb8
+lU9c/JDOviKPqIWdNnQv1/guzAmNYVOuTW+jO4XuN0S7sQNsl9Q4FVATRRt4lK3b
+3XdNGYpE0RrlqQsAEQEAAQ==
+=cqef
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
new file mode 100644
index 00000000000..0c74062c389
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
@@ -0,0 +1 @@
+1def9646901a1652e5b3e5ea694db6f419c8d1fd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
new file mode 100644
index 00000000000..28e016cb361
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c1494fbfb32..41dfe98bdb1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,10 +153,10 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.jar",
     "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
-    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
-        to "bcpg-jdk15on-1.62.jar",
-    "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
-        to "bcprov-jdk15on-1.62.jar",
+    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+        to "bcpg-jdk15on-1.70.jar",
+    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+        to "bcprov-jdk15on-1.70.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
         to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"

From 1113a183c50b42ab045189ad2c2c15a1def03ec6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 21:41:48 +0300
Subject: [PATCH 0298/1037] bump actions/setup-java@v1 -> actions/setup-java@v2

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 914a08fdfc7..8d73424850b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: 17
     - uses: burrunan/gradle-cache-action@v1
@@ -41,7 +41,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: 17
     - uses: burrunan/gradle-cache-action@v1
@@ -57,7 +57,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 11'
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: 11
     - uses: burrunan/gradle-cache-action@v1

From be226be9bdce45128affb6e9f1cae4a7fbb0d695 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 21:55:14 +0300
Subject: [PATCH 0299/1037] chore: add /src/dist-check/temp/ to .gitignore

See https://github.com/apache/jmeter/issues/5762
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7f2b2e19a29..2400313e97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,9 @@
 /src/protocol/*/build/
 /src/protocol/*/bin/
 /src/protocol/*/out/
+# This folder is generated by running one of the tests (HTML report?), so ignore it for now
+# See https://github.com/apache/jmeter/issues/5762
+/src/dist-check/temp/
 /dist/
 /docs/
 /local/

From 4998611f45fc9da2b1f6bbc3916e581649f4cba1 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Fri, 6 Jan 2023 11:23:30 +0100
Subject: [PATCH 0300/1037] Enabled build caching for some tasks

---
 src/dist/build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 9fc84783deb..500fe45810c 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -340,6 +340,7 @@ fun createAnakiaTask(
         )
         inputs.property("extension", extension)
         outputs.dir(outputDir)
+        outputs.cacheIf { true }
         dependsOn(prepareProps)
 
         doLast {
@@ -442,6 +443,7 @@ val processSiteXslt by tasks.registering {
     inputs.files(xdocs)
     inputs.property("year", lastEditYear)
     outputs.dir(outputDir)
+    outputs.cacheIf { true }
 
     doLast {
         for (f in (outputs as TaskOutputsInternal).previousOutputFiles) {

From 3013d59089adba8a8a07a9f6429f4614661892a4 Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Fri, 6 Jan 2023 11:29:21 +0100
Subject: [PATCH 0301/1037] Use relative paths in task inputs

This improves build caching because those paths are part of the cache
key calculation.
---
 src/dist/build.gradle.kts     | 8 ++++----
 src/licenses/build.gradle.kts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 500fe45810c..bd0e7f35189 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -330,14 +330,14 @@ fun createAnakiaTask(
     }
 
     return tasks.register(taskName) {
-        inputs.file("$baseDir/$style")
-        inputs.file("$baseDir/$projectFile")
+        inputs.file("$baseDir/$style").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("styleDir")
+        inputs.file("$baseDir/$projectFile").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("projectDir")
         inputs.files(
             fileTree(baseDir) {
                 include(*includes)
                 exclude(*excludes)
             }
-        )
+        ).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("baseDir")
         inputs.property("extension", extension)
         outputs.dir(outputDir)
         outputs.cacheIf { true }
@@ -440,7 +440,7 @@ fun xslt(
 
 val processSiteXslt by tasks.registering {
     val outputDir = "$buildDir/siteXslt"
-    inputs.files(xdocs)
+    inputs.files(xdocs).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
     inputs.property("year", lastEditYear)
     outputs.dir(outputDir)
     outputs.cacheIf { true }
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 05d5a27a889..07a1da3fe8f 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -51,7 +51,7 @@ fun gradleWrapperVersion(wrapperProps: String) =
 
 val gatherSourceLicenses by tasks.registering(GatherLicenseTask::class) {
     val wrapperProps = "$rootDir/gradle/wrapper/gradle-wrapper.properties"
-    inputs.file(wrapperProps)
+    inputs.file(wrapperProps).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("wrapper.props")
     addDependency("org.gradle:gradle-wrapper:${gradleWrapperVersion(wrapperProps)}", SpdxLicense.Apache_2_0)
     addDependency(":bootstrap:3.3.4", SpdxLicense.MIT)
     addDependency(":bootstrap-social:4.8.0", SpdxLicense.MIT)

From 1415915da2dec40114b3c2355e05209242060c02 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 22:08:19 +0300
Subject: [PATCH 0302/1037] chore; use zulu Java distribution in GitHub Actions

---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8d73424850b..7178b823607 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: 17
+        distribution: 'zulu'
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:
@@ -44,6 +45,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: 17
+        distribution: 'zulu'
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:
@@ -60,6 +62,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: 11
+        distribution: 'zulu'
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:

From a3bf75b02f0d4160776ad3bccb9b116e77b57233 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 22:25:16 +0300
Subject: [PATCH 0303/1037] bump actions/setup-java@v2 -> actions/setup-java@v3

See https://github.com/actions/setup-java/issues/393#issuecomment-1282530799
---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7178b823607..73f1f9f5fe1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: 17
         distribution: 'zulu'
@@ -42,7 +42,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: 17
         distribution: 'zulu'
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Set up JDK 11'
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: 11
         distribution: 'zulu'

From 3021896497ab980e625d23587334c529c6284619 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 10 Jan 2023 22:04:41 +0300
Subject: [PATCH 0304/1037] Update Gradle to 7.6 from 7.3

See https://github.com/apache/jmeter/pull/5763
---
 build.gradle.kts                              |   5 +
 buildSrc/build.gradle.kts                     |   2 -
 buildSrc/checksum.xml                         |  11 +
 .../d4/7892707e9657ebd4.fingerprints          |   1 +
 .../dd/15c71c0a4e0b8edd.fingerprints          |   1 +
 ...7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc |  26 ++
 .../e7/b0f3710fa64900e7.fingerprints          |   1 +
 ...be5bcc9fec15518cfda882b0f3710fa64900e7.asc |  16 ++
 .../fe/891e4c2d471515fe.fingerprints          |   1 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 59203 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +-
 gradlew                                       | 269 +++++++++++-------
 gradlew.bat                                   |  15 +-
 settings.gradle.kts                           |   2 +
 xdocs/changes.xml                             |   1 +
 15 files changed, 241 insertions(+), 115 deletions(-)
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
 create mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints

diff --git a/build.gradle.kts b/build.gradle.kts
index 60b7e3b8aa3..61eef9e93e6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -610,6 +610,11 @@ allprojects {
                 passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
                 passProperty("junit.jupiter.execution.parallel.enabled", "true")
                 passProperty("junit.jupiter.execution.timeout.default", "2 m")
+                // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
+                // See https://github.com/apache/jmeter/pull/5763
+                if (JavaVersion.current().isJava9Compatible) {
+                    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+                }
             }
             withType<SpotBugsTask>().configureEach {
                 group = LifecycleBasePlugin.VERIFICATION_GROUP
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index affb9719727..84d622aa054 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -39,8 +39,6 @@ fun Project.applyKotlinProjectConventions() {
     apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 
     tasks.withType<KotlinCompile> {
-        sourceCompatibility = "unused"
-        targetCompatibility = "unused"
         kotlinOptions {
             jvmTarget = "1.8"
         }
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 82a1aadb54f..b6b24f05e90 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -8,6 +8,7 @@
     <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
     <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
     <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
@@ -22,6 +23,7 @@
     <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
     <trusted-key id='d4c89ea4aaf455fd88b22087efe8086f9e93774e' group='junit' />
+    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='a778fde933a96dda827840d8e2b3d84202b812d9' group='org.assertj' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
@@ -40,5 +42,14 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.7'>
       <sha512>2FE2FE885E48F7D3592751F0E824E21BE2478B9046E25E0AF109E6683F126B1ACE3DA7CB0FF3DA586C08498EF9FEFF445A00A63B2B86CC8BE22D0B3242F801B8</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.4.1'>
+      <sha512>438E982D2C40426C18E4953AFA3A88A6A5BB69D37D11A60CFF03F28E8ACABD1009B5F10D07D99F61470DDDE194F489EA01425BB4D3AF798B10A2954E6D0ED095</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.7.10'>
+      <sha512>CB887D0053A5C1656260BC77003BCAE612CAA018933CB7A752EC2A87AB571EA0CD683905436771ED1982A8DDE15299F861C513CC73A83E1C0F31F1154095D11D</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-sam-with-receiver' version='1.7.10'>
+      <sha512>5A1FF4989B370946633B6BB2BE9E42729AE8CA323D59444F149EAB1AFC199AEED8ADC35199C672DB153AAA7D8E670C2FD9A9B78A36EC02130A342999943EB4B9</sha512>
+    </dependency>
   </dependencies>
 </dependency-verification>
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
new file mode 100644
index 00000000000..c9c100ac5c3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
new file mode 100644
index 00000000000..28e016cb361
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
new file mode 100644
index 00000000000..e75721c1d11
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
+20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
+y5M9gIc0yCynC4Cnmg2DmRWuafVvqogz0vDKUG3ADvPgRyaItzh0xO/PsWPZvIHD
+SlCX9Ny/RT1vZ741tBUm1flGUzxs0zAPt0I+ievjwOeKw8OeUb59sc98U3XpVOVQ
+KDD6RIzhnvronznoPkcKPGMrVgBbgyP1/6rwn1u/69CTlED+lyWervseGtDQCO4h
+nVZGTfLLo3cB1ertknmmMqyahfaQcohykvAmVzxxkzaWE1vSkOX1U2bFaUNiYuZN
+U8zJtdENX2isKQp4xSxJ1/+/hjyfrGwLAebtvnwNcsM3oDwHoevusMoLmMNGkGe0
+yLjz38gwLCIuVrSFeHtHJKdPPsnWVsA65o3iCQyEO5lp38cjDE1hkHzXGO34LiPX
+AlDHU2YzoWvAHPqSppppjPJmz1tgHqx146tukezuzoRXuEUTmDAjbpLEHxvKQuBr
+DcSfWqe4zfKKqH/CfhxlPGilUcVyLmhaHjs1ti1Bnj4YmQuWo9BR3rPdLi1gQFlp
+wZfzytmmK6Zy4Ek89la7cgt6AF3eXjNmpVtGZlAb7lr3xne9DTp98IW3iwARAQAB
+uQINBFcyNOoBEADH4HSIjsu94/e0zGBJbyrFFCE8ISGTI7HANfUQeL0Cpl7EbpQN
+jIGFbEtvdPheeaz5hJ5sg3dt/og3fQ9oBAXkkx65XmRnsLwYud5uI4bS240UV+HX
+DBBAVTE/luQfIp6CWImSY3dpfSRZWarXkU3vDtZgj3drSrY8DbLBPU6B9e7QqToy
+3qmZQ9/VN7QEXR+AyNDR2ajEbCzhkWyvXD+7VJg+lzhDnzepIxmDmpbiwmsT9J1i
++BoG8FrN++ZRVXaOEslARP0+rvpIK6RZG9wdBtb09RJODBnufyprYP0//GmcZyOZ
+CbyLBfJqOI7vUYu78xyBcbwQgbulwMop3sN/IgxCTGFY4R4waHmgfMdagBNobCv5
+bjODfegAeKmI/Tmg4sppfH31+YahntYZ+MZCxgbCWRpODut6JlZ/KW015I/BAjrx
+cj/WooDMxGgq87SAYF6+Kl/Zm4eNp8emduIfLQguZymAryzWQixWwZFfkis/DVYA
+OhZWYvlXao1RPAMMHFhht+578atKpJYzMca6WzGX5TuLSip2tXRR5Y8k7vWMVEQa
+TlQyHQAl3jw62Sc4WI7u7vA3edbW++1wH8kQvoHTIjdUHpGEkGiNDuVi2dlr0LH1
+yEoVyoZYu+sSeRhBKezHtPsOd02iVBevJIXpnVA9z/FlTEOBfcz4oFKyiQARAQAB
+=RUvE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
new file mode 100644
index 00000000000..c9c100ac5c3
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
new file mode 100644
index 00000000000..93ae4e36dbe
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
+hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
+cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
+2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
+nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
+w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
+4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
+V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
+6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
+BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
+bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
+eFcAOJmvqC3c4pUAEQEAAQ==
+=Hn4p
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
new file mode 100644
index 00000000000..28e016cb361
--- /dev/null
+++ b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 39316
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

delta 36846
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
CcabXq

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8a5e6bbc2af..5120b9cb24d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c811..65dcd68d65c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e..93e3f59f135 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 41dfe98bdb1..35f34077684 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,6 +153,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.jar",
     "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
+    "B795B889E3E2EC6D3E3DEB7429345A62B3FCCB4E51B88014AA77FBC3F61D3BC4307E023C83B08FEDA49BF2EAC6B99A48D2995CB9425E5C3E76BBE25D4170BDC8"
+        to "gradle-enterprise-gradle-plugin-3.11.4.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 55b4a6b08e4..57f7e6df464 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -114,6 +114,7 @@ Summary
   <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
   <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
+  <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From cc08883e82b6140d44939954afeee3d2a2f1954d Mon Sep 17 00:00:00 2001
From: Sandra Thieme <sthieme@gradle.com>
Date: Mon, 16 Jan 2023 16:00:18 +0300
Subject: [PATCH 0305/1037] chore: suppress Gradle warning on rat and copyLibs
 tasks operating on the same files

See https://github.com/apache/jmeter/pull/5757
---
 build.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 61eef9e93e6..c9016caea30 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -98,6 +98,10 @@ val rat by tasks.getting(org.nosphere.apache.rat.RatTask::class) {
     verbose.set(true)
     // Note: patterns are in non-standard syntax for RAT, so we use exclude(..) instead of excludeFile
     exclude(rootDir.resolve(".ratignore").readLines())
+    // Gradle validation might assume copyLibs and rat operate on the intersecting set of files
+    // Technically speaking, that is false positive since rat ignores *.jar files,
+    // and copyLibs copies jar files only
+    mustRunAfter(":src:dist:copyBinLibs", ":src:dist:copyLibs")
 }
 
 tasks.validateBeforeBuildingReleaseArtifacts {

From 0f9be6642c0e74475e2f4851a7129a18a68c1e13 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 1 Feb 2023 11:28:18 +0100
Subject: [PATCH 0306/1037] docs: add security page to the website

Tested with `./gradlew buildPreviewSite`

See https://github.com/apache/jmeter/pull/5768
---
 xdocs/security.xml            | 56 +++++++++++++++++++++++++++++++++++
 xdocs/stylesheets/project.xml |  2 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 xdocs/security.xml

diff --git a/xdocs/security.xml b/xdocs/security.xml
new file mode 100644
index 00000000000..2ccf4b296ff
--- /dev/null
+++ b/xdocs/security.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<document>
+<properties>
+    <title>Security</title>
+</properties>
+<body>
+<section name="Security Model">
+  <p>
+    The purpose of JMeter is to execute the workload specified
+    in the input jmx file, which may include arbitrary code.
+  </p>
+  <p>
+    As such, the JMeter security model assumes you trust
+    jmx input files: even opening a jmx input file may in some
+    cases trigger code execution. If you want to use JMeter to
+    evaluate untrusted jmx files, it is up to you to provide the
+    required isolation.
+  </p>
+</section>
+<section name="Reporting security issues">
+  <p>
+    We strongly encourage you to report potential security vulnerabilities to our private security mailing list, <a href="mailto:security@apache.org">security@apache.org</a>, before disclosing them in a public forum.
+  </p>
+  <p>
+    Only use this list to report undisclosed security vulnerabilities in Apache projects and manage the process of fixing such vulnerabilities. We cannot accept regular bug reports or other security-related queries at these addresses. We will ignore mail sent to these addresses that does not relate to an undisclosed security problem in an Apache project.
+  </p>
+  <p>
+    An overview of the vulnerability handling process is:
+    <ul>
+    <li>The reporter reports the vulnerability privately to Apache.</li>
+    <li>The appropriate project's security team works privately with the reporter to resolve the vulnerability.</li>
+    <li>The project creates a new release of the package the vulnerabilty affects to deliver its fix.</li>
+    <li>The project publicly announces the vulnerability and describes how to apply the fix.</li>
+    </ul>
+    Committers should read a <a href="https://www.apache.org/security/committers.html">more detailed description of the process</a>. Reporters of security vulnerabilities may also find it useful.
+  </p>
+</section>
+</body>
+</document>
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index 7fb0834801e..113277f8cc8 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -53,7 +53,7 @@
      </menu>
      <menu name="Community">
         <item name="Issue Tracking"      href="/issues.html"/>
-        <item name="Security"            href="https://www.apache.org/security/"/>
+        <item name="Security"            href="/security.html"/>
         <item name="Mailing Lists"       href="/mail.html"/>
         <item name="Source Repositories"    href="/svnindex.html"/>
         <item name="Building and Contributing"    href="/building.html"/>

From 5ca8729b9acdc4f3e7ab603071d9f783a311ad1a Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 3 Feb 2023 10:43:03 +0100
Subject: [PATCH 0307/1037] Add Security Manager mention when running JMeter in
 distributed environment

---
 xdocs/security.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xdocs/security.xml b/xdocs/security.xml
index 2ccf4b296ff..19c43f5a2d2 100644
--- a/xdocs/security.xml
+++ b/xdocs/security.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
+<!DOCTYPE document>
 <document>
 <properties>
     <title>Security</title>
@@ -33,6 +33,13 @@
     evaluate untrusted jmx files, it is up to you to provide the
     required isolation.
   </p>
+  <p>
+    Still in the area of security, when JMeter is used in distributed
+    environment, we recommend setting up the security manager in order
+    to avoid any execution of malicious code on the distributed
+    architecture. See the <a href="./usermanual/remote-test.html#security-manager">
+    Security-Manager documentation</a> for its implementation.
+  </p>
 </section>
 <section name="Reporting security issues">
   <p>

From 69c1109d4ca2ad6495470c4ed4f423626b4e57bc Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 3 Feb 2023 12:41:40 +0100
Subject: [PATCH 0308/1037] Fix autostyleConfigsCheck issue

---
 xdocs/security.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/security.xml b/xdocs/security.xml
index 19c43f5a2d2..f42ed06216a 100644
--- a/xdocs/security.xml
+++ b/xdocs/security.xml
@@ -15,6 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+
 <!DOCTYPE document>
 <document>
 <properties>

From 0619b848c62e34ee44c32cc8184a28f953d846f5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 20 Feb 2023 14:02:41 +0100
Subject: [PATCH 0309/1037] Javadoc link for commons-math has changed

---
 xdocs/usermanual/properties_reference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index 2643f37f09d..68441b1bb82 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1165,7 +1165,7 @@ JMETER-SERVER</source>
     Defaults to: <code>5000</code>
 </property>
 <property name="backend_metrics_percentile_estimator">
-    Specify the <a href="https://commons.apache.org/proper/commons-math/javadocs/api-3.5/org/apache/commons/math3/stat/descriptive/rank/Percentile.EstimationType.html">Percentile Estimation Type</a> to use.<br/>
+    Specify the <a href="https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/org/apache/commons/math3/stat/descriptive/rank/Percentile.EstimationType.html">Percentile Estimation Type</a> to use.<br/>
     To make the values from the dashboard compatible with the Aggregate Report, use the value <code>R_3</code>.<br/>
     Defaults to: <code>LEGACY</code>
 </property>

From ec3122abf1bc6ed6c7b766bcf55e8d0e7bb48b71 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 20 Feb 2023 14:39:36 +0100
Subject: [PATCH 0310/1037] Issue 5694: Document changed formatter for function
 __time()

Closes #5694
---
 xdocs/changes.xml              |  1 +
 xdocs/usermanual/functions.xml | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 57f7e6df464..dcc7b18e6b9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -160,6 +160,7 @@ Summary
 
 <h3>Documentation</h3>
 <ul>
+  <li><issue>5694</issue>Document changed formatter for <funclink name="__time()"/></li>
 </ul>
 
 <h3>General</h3>
diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index 23fbe8a3c07..5e4078ea48c 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -1121,7 +1121,7 @@ If omitted, <code>,</code> is used. Note that <code>,</code> would need to be sp
 
 <properties>
         <property name="Format" required="No">
-        The format to be passed to <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>.
+        The format to be passed to <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>.
         The function supports various shorthand aliases, see below.
         If omitted, the function returns the current time in milliseconds since the epoch.
         </property>
@@ -1131,7 +1131,7 @@ If omitted, <code>,</code> is used. Note that <code>,</code> would need to be sp
 If the format matches "<code>/ddd</code>" (where <code>ddd</code> are decimal digits),
 then the function returns the current time in milliseconds divided by the value of <code>ddd</code>.
 For example, "<code>/1000</code>" returns the current time in seconds since the epoch.
-Otherwise, the current time is passed to SimpleDateFormat.
+Otherwise, the current time is passed to DateTimeFormatter.
 The following shorthand aliases are provided:
 </p>
 <ul>
@@ -1147,6 +1147,12 @@ The following shorthand aliases are provided:
 <p><source>${__time(dd/MM/yyyy,)}</source>  will return <code>21/01/2018</code> if ran on 21 january 2018</p>
 <p><source>${__time(YMD,)}</source>  will return <code>20180121</code> if ran on 21 january 2018</p>
 <p><source>${__time()}</source>  will return time in millis <code>1516540541624</code></p>
+<note>
+ The format to be passed to used to be <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>,
+ but that changed with JMeter 5.5 to <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>.
+ While they use mostly the same codes, they differ slightly. Most notable is probably the code <code>u</code>, that meant
+ <em>day number of week</em> and is now interpreted as <em>year</em>.
+</note>
 </component>
 
 <component index="&sect-num;.5.18" name="__jexl2">

From 95ccef20bcf845a937ba242a0f9b2e1790aadefa Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 20 Feb 2023 15:07:13 +0100
Subject: [PATCH 0311/1037] Issue 5694: Log a warning if 'u' is found in time
 functions format string

A warning will be logged,  if the code 'u' is found in the format string,
as the meaning for that code has changed from day-of-week to year.

Part of #5694
---
 .../org/apache/jmeter/resources/messages.properties        | 1 +
 .../org/apache/jmeter/resources/messages_fr.properties     | 1 +
 .../java/org/apache/jmeter/functions/TimeFunction.java     | 7 +++++++
 xdocs/changes.xml                                          | 4 +++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 4b81a583019..dc93ac77c13 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -1331,6 +1331,7 @@ throughput_control_perthread_label=Per User
 throughput_control_title=Throughput Controller
 throughput_control_tplabel=Throughput
 time_format=Format string for SimpleDateFormat (optional)
+time_format_changed=Formatters for time function has been changed from SimpleDateFormat to DateTimeFormatter. Especially the meaning of 'u' has changed from day-of-week to year. Please check and update your format strings accordingly
 time_format_random=Format string for DateTimeFormatter (optional) (default yyyy-MM-dd)
 time_format_shift=Format string for DateTimeFormatter (optional) (default unix timestamp in millisecond)
 timelim=Time limit
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index 729648defc9..5a68c3ebd59 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -1320,6 +1320,7 @@ throughput_control_perthread_label=Par utilisateur
 throughput_control_title=Contrôleur Débit
 throughput_control_tplabel=Débit \:
 time_format=Chaîne de formatage sur le modèle SimpleDateFormat (optionnel)
+time_format_changed=Les formateurs pour la fonction de temps ont été modifiés de SimpleDateFormat à DateTimeFormatter. En particulier, la signification de 'u' a changé du jour de la semaine à l'année. Veuillez vérifier et mettre à jour vos chaînes de format en conséquence
 time_format_random=Chaîne de formatage sur le modèle DateTimeFormatter (optionnel) ( défaut \: yyyy-MM-dd )
 time_format_shift=Chaîne de formatage sur le modèle DateTimeFormatter (optionnel) ( défaut \: unix timestamp en millisecondes )
 timelim=Limiter le temps de réponses à (ms)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index 69c90be61d6..65e6c01a9dd 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -32,6 +32,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // See org.apache.jmeter.functions.TestTimeFunction for unit tests
 
@@ -50,6 +52,8 @@ public class TimeFunction extends AbstractFunction {
     // Only modified in class init
     private static final Map<String, String> aliases = new HashMap<>();
 
+    private static final Logger log = LoggerFactory.getLogger(TimeFunction.class);
+
     static {
         desc.add(JMeterUtils.getResString("time_format")); //$NON-NLS-1$
         desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$
@@ -92,6 +96,9 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
                 long div = Long.parseLong(fmt.substring(1)); // should never case NFE
                 datetime = Long.toString(System.currentTimeMillis() / div);
             } else {
+                if (fmt.contains("u")) {
+                    log.warn(JMeterUtils.getResString("time_format_changed"));
+                }
                 DateTimeFormatter df = DateTimeFormatter // Not synchronised, so can't be shared
                         .ofPattern(fmt)
                         .withZone(ZoneId.systemDefault());
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index dcc7b18e6b9..508296c40ac 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -160,7 +160,9 @@ Summary
 
 <h3>Documentation</h3>
 <ul>
-  <li><issue>5694</issue>Document changed formatter for <funclink name="__time()"/></li>
+  <li><issue>5694</issue>Document changed formatter for <funclink name="__time()"/>. A warning will be logged,
+  if the code <code>u</code> is found in the format string, as the meaning for that code has changed from <em>day-of-week</em>
+  to <em>year</em>.</li>
 </ul>
 
 <h3>General</h3>

From 50e2015613752fbd0ceedc84440d0bea27848b91 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sun, 2 Apr 2023 12:11:19 +0000
Subject: [PATCH 0312/1037] Add ASF Privacy Policy link on website

---
 xdocs/stylesheets/project.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index 113277f8cc8..75a44522207 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -63,6 +63,7 @@
      <menu name="Foundation">
         <item name="The Apache Software Foundation (ASF)" href="https://www.apache.org/"/>
         <item name="Get Involved in the ASF" href="https://www.apache.org/foundation/getinvolved.html"/>
+        <item name="Privacy Policy"      href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
         <item name="Sponsorship"         href="https://www.apache.org/foundation/sponsorship.html"/>
         <item name="Thanks"              href="https://www.apache.org/foundation/thanks.html"/>
      </menu>

From a2693893de0eecd517bb10691fbb8564bc3aaf59 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sat, 22 Apr 2023 12:19:35 +0000
Subject: [PATCH 0313/1037] Change from Assert. to Assertions. (#5813)

* Change from Assert. to Assertions.

* No need to extends TestCase
---
 .../http/control/TestHC4CookieManager.java    |  40 +++---
 .../http/sampler/SamplingNamingTest.java      |   9 +-
 .../http/visualizers/RequestViewHTTPTest.java | 124 +++++++++---------
 3 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
index 2468448ac83..0d445cf9b74 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
@@ -35,7 +35,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -113,7 +113,7 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
         URL url = new URL("https://subdomain.bt.com/page");
         String headerLine = "SMTRYNO=1; path=/; domain=.bt.com";
         man.addCookieFromHeader(headerLine, url);
-        Assert.assertEquals(1, man.getCookieCount());
+        Assertions.assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
@@ -121,8 +121,8 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
 
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assert.assertEquals("bt.com", cookie.getDomain());
-            Assert.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            Assertions.assertEquals("bt.com", cookie.getDomain());
+            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
 
         // we check that CookieManager returns the cookies for the main domain
@@ -130,11 +130,11 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
         cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlMainDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assert.assertEquals(1, cookies.size());
+        Assertions.assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assert.assertEquals("bt.com", cookie.getDomain());
-            Assert.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            Assertions.assertEquals("bt.com", cookie.getDomain());
+            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
     }
 
@@ -143,16 +143,16 @@ public void testAddCookieFromHeaderWithNoWildcard() throws Exception {
         URL url = new URL("https://subdomain.bt.com/page");
         String headerLine = "SMTRYNO=1; path=/";
         man.addCookieFromHeader(headerLine, url);
-        Assert.assertEquals(1, man.getCookieCount());
+        Assertions.assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assert.assertEquals(1, cookies.size());
+        Assertions.assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assert.assertEquals("subdomain.bt.com", cookie.getDomain());
-            Assert.assertFalse(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            Assertions.assertEquals("subdomain.bt.com", cookie.getDomain());
+            Assertions.assertFalse(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
 
         // we check that CookieManager returns the cookies for the main domain
@@ -160,7 +160,7 @@ public void testAddCookieFromHeaderWithNoWildcard() throws Exception {
         cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlMainDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assert.assertEquals(0, cookies.size());
+        Assertions.assertEquals(0, cookies.size());
     }
 
     @Test
@@ -169,18 +169,18 @@ public void testAddCookieFromHeaderWithWildcard2() throws Exception {
         String headerLine = "SMTRYNO=1; path=/; domain=.bt.com";
         man.addCookieFromHeader(headerLine, url);
 
-        Assert.assertEquals(1, man.getCookieCount());
+        Assertions.assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         URL urlSubDomain = new URL("https://subdomain.bt.com/page");
 
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlSubDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assert.assertEquals(1, cookies.size());
+        Assertions.assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assert.assertEquals("bt.com", cookie.getDomain());
-            Assert.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            Assertions.assertEquals("bt.com", cookie.getDomain());
+            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
     }
 
@@ -191,18 +191,18 @@ public void testBug56358() throws Exception {
         man.setCookiePolicy(CookieSpecs.STANDARD);
         man.addCookieFromHeader(headerLine, url);
 
-        Assert.assertEquals(1, man.getCookieCount());
+        Assertions.assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         URL urlSameDomainDifferentPort = new URL("http://remote.com:10001/test/me");
 
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlSameDomainDifferentPort,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assert.assertEquals(1, cookies.size());
+        Assertions.assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assert.assertEquals("remote.com", cookie.getDomain());
-            Assert.assertEquals("test", cookie.getName());
+            Assertions.assertEquals("remote.com", cookie.getDomain());
+            Assertions.assertEquals("test", cookie.getName());
         }
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
index f82da5a4c72..26d5916da52 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
@@ -25,8 +25,8 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jorphan.test.JMeterSerialTest;
-import org.junit.Assert;
 import org.junit.Ignore;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -47,7 +47,7 @@ private static Stream<Arguments> getImplementations() {
     void testBug63364(String implementation) {
         TestPlan plan = new TestPlan();
         SampleResult[] subResults = doSample(implementation);
-        Assert.assertTrue("We should have at least one sample result, we had none", subResults.length > 0);
+        Assertions.assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
         for (int i = 0; i < subResults.length; i++) {
             assertEquals("Expected sample label to be " + LABEL + "-" + i, LABEL + "-" + i,
                     subResults[i].getSampleLabel());
@@ -56,10 +56,9 @@ void testBug63364(String implementation) {
         plan.setFunctionalMode(true);
         try {
             subResults = doSample(implementation);
-            Assert.assertTrue("We should have at least one sample result, we had none", subResults.length > 0);
+            Assertions.assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
             for (SampleResult subResult : subResults) {
-                Assert.assertTrue("Expected sample label to start with " + JMETER_HOME_PAGE,
-                        subResult.getSampleLabel().startsWith(JMETER_HOME_PAGE));
+                Assertions.assertTrue(subResult.getSampleLabel().startsWith(JMETER_HOME_PAGE), "Expected sample label to start with " + JMETER_HOME_PAGE);
             }
         } finally {
             plan.setFunctionalMode(prevValue);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 5066799ba20..28279d82870 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -20,12 +20,10 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import junit.framework.TestCase;
-
-public class RequestViewHTTPTest extends TestCase {
+public class RequestViewHTTPTest {
 
     @Test
     public void testGetQueryMapValueContainingAmpersand() {
@@ -33,18 +31,18 @@ public void testGetQueryMapValueContainingAmpersand() {
         String query = "login=toto1&pwd=Welcome%261";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(2, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(2, params.size());
 
         String[] param1 = params.get("login");
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.length);
-        Assert.assertEquals("toto1", param1[0]);
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.length);
+        Assertions.assertEquals("toto1", param1[0]);
 
         String[] param2 = params.get("pwd");
-        Assert.assertNotNull(param2);
-        Assert.assertEquals(1, param2.length);
-        Assert.assertEquals("Welcome&1", param2[0]);
+        Assertions.assertNotNull(param2);
+        Assertions.assertEquals(1, param2.length);
+        Assertions.assertEquals("Welcome&1", param2[0]);
     }
 
     //http://www.foo.com/test/json/getXXXX.jsp?postalCode=59115&qrcode=
@@ -53,18 +51,18 @@ public void testGetQueryMapWithEmptyValue() {
         String query = "postalCode=59115&qrcode=";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(2, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(2, params.size());
 
         String[] param1 = params.get("postalCode");
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.length);
-        Assert.assertEquals("59115", param1[0]);
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.length);
+        Assertions.assertEquals("59115", param1[0]);
 
         String[] param2 = params.get("qrcode");
-        Assert.assertNotNull(param2);
-        Assert.assertEquals(1, param2.length);
-        Assert.assertEquals("", param2[0]);
+        Assertions.assertNotNull(param2);
+        Assertions.assertEquals(1, param2.length);
+        Assertions.assertEquals("", param2[0]);
     }
 
     @Test
@@ -72,19 +70,19 @@ public void testGetQueryMapMultipleValues() {
         String query = "param2=15&param1=12&param2=baulpismuth";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(2, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(2, params.size());
 
         String[] param1 = params.get("param1");
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.length);
-        Assert.assertEquals("12", param1[0]);
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.length);
+        Assertions.assertEquals("12", param1[0]);
 
         String[] param2 = params.get("param2");
-        Assert.assertNotNull(param2);
-        Assert.assertEquals(2, param2.length);
-        Assert.assertEquals("15", param2[0]);
-        Assert.assertEquals("baulpismuth", param2[1]);
+        Assertions.assertNotNull(param2);
+        Assertions.assertEquals(2, param2.length);
+        Assertions.assertEquals("15", param2[0]);
+        Assertions.assertEquals("baulpismuth", param2[1]);
     }
 
     @Test
@@ -92,23 +90,23 @@ public void testGetQueryMapAmpInValue() {
         String query = "param2=15&param1=12&param3=baul%26Pismuth";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(3, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(3, params.size());
 
         String[] param1 = params.get("param1");
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.length);
-        Assert.assertEquals("12", param1[0]);
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.length);
+        Assertions.assertEquals("12", param1[0]);
 
         String[] param2 = params.get("param2");
-        Assert.assertNotNull(param2);
-        Assert.assertEquals(1, param2.length);
-        Assert.assertEquals("15", param2[0]);
+        Assertions.assertNotNull(param2);
+        Assertions.assertEquals(1, param2.length);
+        Assertions.assertEquals("15", param2[0]);
 
         String[] param3 = params.get("param3");
-        Assert.assertNotNull(param3);
-        Assert.assertEquals(1, param3.length);
-        Assert.assertEquals("baul&Pismuth", param3[0]);
+        Assertions.assertNotNull(param3);
+        Assertions.assertEquals(1, param3.length);
+        Assertions.assertEquals("baul&Pismuth", param3[0]);
     }
 
     @Test
@@ -116,23 +114,23 @@ public void testGetQueryMapBug54055() {
         String query = "param2=15&param1=12&param3=bu4m1KzFvsozCnR4lra0%2Be69YzpnRcF09nDjc3VJvl8%3D";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(3, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(3, params.size());
 
         String[] param1 = params.get("param1");
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.length);
-        Assert.assertEquals("12", param1[0]);
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.length);
+        Assertions.assertEquals("12", param1[0]);
 
         String[] param2 = params.get("param2");
-        Assert.assertNotNull(param2);
-        Assert.assertEquals(1, param2.length);
-        Assert.assertEquals("15", param2[0]);
+        Assertions.assertNotNull(param2);
+        Assertions.assertEquals(1, param2.length);
+        Assertions.assertEquals("15", param2[0]);
 
         String[] param3 = params.get("param3");
-        Assert.assertNotNull(param3);
-        Assert.assertEquals(1, param3.length);
-        Assert.assertEquals("bu4m1KzFvsozCnR4lra0+e69YzpnRcF09nDjc3VJvl8=", param3[0]);
+        Assertions.assertNotNull(param3);
+        Assertions.assertEquals(1, param3.length);
+        Assertions.assertEquals("bu4m1KzFvsozCnR4lra0+e69YzpnRcF09nDjc3VJvl8=", param3[0]);
     }
 
     @Test
@@ -142,14 +140,14 @@ public void testGetQueryMapBug52491() {
                 + "<params></params><refs></refs></call></body></envelope>";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(1, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(1, params.size());
 
         Map.Entry<String, String[]> param1 = params.entrySet().iterator().next();
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.getValue().length);
-        Assert.assertEquals(query, param1.getValue()[0]);
-        Assert.assertTrue(StringUtils.isBlank(param1.getKey()));
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.getValue().length);
+        Assertions.assertEquals(query, param1.getValue()[0]);
+        Assertions.assertTrue(StringUtils.isBlank(param1.getKey()));
     }
 
     @Test
@@ -184,13 +182,13 @@ public void testGetQueryMapSoapHack() {
                 "</SOAP-ENV:Envelope>";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
-        Assert.assertNotNull(params);
-        Assert.assertEquals(1, params.size());
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(1, params.size());
 
         Map.Entry<String, String[]> param1 = params.entrySet().iterator().next();
-        Assert.assertNotNull(param1);
-        Assert.assertEquals(1, param1.getValue().length);
-        Assert.assertEquals(query, param1.getValue()[0]);
-        Assert.assertTrue(StringUtils.isBlank(param1.getKey()));
+        Assertions.assertNotNull(param1);
+        Assertions.assertEquals(1, param1.getValue().length);
+        Assertions.assertEquals(query, param1.getValue()[0]);
+        Assertions.assertTrue(StringUtils.isBlank(param1.getKey()));
     }
 }

From b90f122b2074a9790cce8ec23c9e361528c83d51 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sun, 23 Apr 2023 17:11:12 +0000
Subject: [PATCH 0314/1037] Bug #5807 - Fix an ArrayIndexOutOfBoundsException
 on HTTP parameters line on special case when key and value are empty, i.e.:
 "k1=v1&=&k2=v2 (#5812)

Thanks to Felix for code improvement
---
 .../http/visualizers/RequestViewHTTP.java     |  4 +-
 .../http/visualizers/RequestViewHTTPTest.java | 47 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index feb6494cbe6..a4ade6e40ab 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -287,6 +287,9 @@ public static Map<String, String[]> getQueryMap(String query) {
         String[] params = query.split(PARAM_CONCATENATE);
         for (String param : params) {
             String[] paramSplit = param.split("=");
+            if (paramSplit.length == 0) {
+                continue; // We found no key-/value-pair, so continue on the next param
+            }
             String name = decodeQuery(paramSplit[0]);
 
             // hack for SOAP request (generally)
@@ -318,7 +321,6 @@ public static Map<String, String[]> getQueryMap(String query) {
             }
             map.put(name, known);
         }
-
         return map;
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 28279d82870..974c9924987 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -17,11 +17,21 @@
 
 package org.apache.jmeter.protocol.http.visualizers;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class RequestViewHTTPTest {
 
@@ -191,4 +201,41 @@ public void testGetQueryMapSoapHack() {
         Assertions.assertEquals(query, param1.getValue()[0]);
         Assertions.assertTrue(StringUtils.isBlank(param1.getKey()));
     }
+
+    @SafeVarargs
+    private static Map<String, List<String>> mapOf(Pair<String, String>... args) {
+        Map<String, List<String>> results = new HashMap<>();
+        Arrays.stream(args)
+                .forEach(arg -> results.put(arg.getKey(), Arrays.asList(arg.getValue().split(","))));
+        return results;
+    }
+
+    private static Stream<Arguments> data() {
+        return Stream.of(Arguments.of("k1=v1&=&k2=v2",
+                mapOf(
+                        Pair.of("k1", "v1"),
+                        Pair.of("k2", "v2"))),
+                Arguments.of("=", mapOf()),
+                Arguments.of("k1=v1&=value&k2=v2",
+                        mapOf(
+                                Pair.of("k1", "v1"),
+                                Pair.of("", "value"),
+                                Pair.of("k2", "v2"))),
+                Arguments.of("a=1&a=2&=abc&=def",
+                        mapOf(
+                                Pair.of("a", "1,2"),
+                                Pair.of("", "abc,def"))));
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testGetQueryMapWithEmptyKeyAndValue(String query, Map<String, List<String>> expected) {
+        Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(expected.size(), params.size());
+        expected.forEach((key, values) -> {
+            MatcherAssert.assertThat(params, Matchers.hasKey(key));
+            Assertions.assertArrayEquals(values.toArray(), params.get(key));
+        });
+    }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 508296c40ac..e7033ce4eb1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -137,6 +137,7 @@ Summary
 <h3>Listeners</h3>
 <ul>
   <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
+  <li><issue>5807</issue>Fix an ArrayIndexOutOfBoundsException on HTTP parameters line on special case when key and value are empty, i.e.: "k1=v1&amp;&#61;&amp;k2=v2"</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

From f7ff28ee44c5386ad0060260e95a9e4ff866cbba Mon Sep 17 00:00:00 2001
From: David Getzlaff <54536760+dgetzlaf@users.noreply.github.com>
Date: Mon, 24 Apr 2023 16:04:01 +0200
Subject: [PATCH 0315/1037] Add KeyStroke for start_no_timers (Start no pauses)
 (#5792)

---
 .../src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java  | 1 +
 .../src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java b/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
index 34ef5f08402..d141a76e8bd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
@@ -72,6 +72,7 @@ private static int getMenuShortcutKeyMask() {
     public static final KeyStroke OPEN              = KeyStroke.getKeyStroke(KeyEvent.VK_O, CONTROL_MASK);
     public static final KeyStroke EXIT              = KeyStroke.getKeyStroke(KeyEvent.VK_Q, CONTROL_MASK);
     public static final KeyStroke ACTION_START      = KeyStroke.getKeyStroke(KeyEvent.VK_R, CONTROL_MASK);
+    public static final KeyStroke ACTION_START_NO_PAUSE  = KeyStroke.getKeyStroke(KeyEvent.VK_N, CONTROL_MASK | InputEvent.SHIFT_DOWN_MASK);
     public static final KeyStroke REMOTE_START_ALL  = KeyStroke.getKeyStroke(KeyEvent.VK_R, CONTROL_MASK | InputEvent.SHIFT_DOWN_MASK);
     public static final KeyStroke SAVE              = KeyStroke.getKeyStroke(KeyEvent.VK_S, CONTROL_MASK);
     public static final KeyStroke SAVE_ALL_AS       = KeyStroke.getKeyStroke(KeyEvent.VK_S, CONTROL_MASK | InputEvent.SHIFT_DOWN_MASK);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index fb9b9835277..e24ab319a99 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -448,7 +448,7 @@ private void makeRunMenu() {
 
         runStart = makeMenuItemRes("start", 'S', ActionNames.ACTION_START, KeyStrokes.ACTION_START); //$NON-NLS-1$
 
-        runStartNoTimers = makeMenuItemRes("start_no_timers", 'N', ActionNames.ACTION_START_NO_TIMERS); //$NON-NLS-1$
+        runStartNoTimers = makeMenuItemRes("start_no_timers", 'N', ActionNames.ACTION_START_NO_TIMERS, KeyStrokes.ACTION_START_NO_PAUSE); //$NON-NLS-1$
 
         runStop = makeMenuItemRes("stop", 'T', ActionNames.ACTION_STOP, KeyStrokes.ACTION_STOP); //$NON-NLS-1$
         runStop.setEnabled(false);

From f5515ed300ef4eb689362923325b3d4f61e45fa9 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Mon, 24 Apr 2023 15:07:51 +0100
Subject: [PATCH 0316/1037] Update changes.xml with #5792

---
 xdocs/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e7033ce4eb1..80d269d03e1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -97,6 +97,7 @@ Summary
 
 <h3>General</h3>
 <ul>
+  <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From f64dec52750587dbb5af7e3ba69bd077c5245204 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Mon, 24 Apr 2023 15:24:50 +0100
Subject: [PATCH 0317/1037] Update year in copyright notice

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index a1a8d333582..7d41bdf0e27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache JMeter
-Copyright 1998-2022 The Apache Software Foundation
+Copyright 1998-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

From c8ace6b4912d89b59f38e55ddf6b6e3168cef532 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 22 Apr 2023 15:10:46 +0300
Subject: [PATCH 0318/1037] chore: bump Gradle to 8.1.1

---
 buildSrc/build.gradle.kts                |  5 -----
 buildSrc/checksum.xml                    |  6 ++++++
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 settings.gradle.kts                      |  2 ++
 src/dist-check/build.gradle.kts          |  2 +-
 src/dist/build.gradle.kts                | 13 ++++++++-----
 xdocs/changes.xml                        |  2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 84d622aa054..a1f57b2a832 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -38,11 +38,6 @@ allprojects {
 fun Project.applyKotlinProjectConventions() {
     apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
     apply(plugin = "com.github.autostyle")
     autostyle {
         kotlin {
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index b6b24f05e90..e10c7c1650d 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -45,9 +45,15 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.4.1'>
       <sha512>438E982D2C40426C18E4953AFA3A88A6A5BB69D37D11A60CFF03F28E8ACABD1009B5F10D07D99F61470DDDE194F489EA01425BB4D3AF798B10A2954E6D0ED095</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
+      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.7.10'>
       <sha512>CB887D0053A5C1656260BC77003BCAE612CAA018933CB7A752EC2A87AB571EA0CD683905436771ED1982A8DDE15299F861C513CC73A83E1C0F31F1154095D11D</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
+      <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-sam-with-receiver' version='1.7.10'>
       <sha512>5A1FF4989B370946633B6BB2BE9E42729AE8CA323D59444F149EAB1AFC199AEED8ADC35199C672DB153AAA7D8E670C2FD9A9B78A36EC02130A342999943EB4B9</sha512>
     </dependency>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5120b9cb24d..e277e34d474 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 35f34077684..c7a14aa4d00 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -155,6 +155,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
     "B795B889E3E2EC6D3E3DEB7429345A62B3FCCB4E51B88014AA77FBC3F61D3BC4307E023C83B08FEDA49BF2EAC6B99A48D2995CB9425E5C3E76BBE25D4170BDC8"
         to "gradle-enterprise-gradle-plugin-3.11.4.jar",
+    "AFC0F3E5B78359131E2BF6C24A128F1CE76F2D128F38DFA8C01F7CF74D1695527C8E953E4B6E7C3ACD925CC03A50845A53B84359AC2B0F5C1F233355E45186D1"
+        to "gradle-enterprise-gradle-plugin-3.12.6.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index b2add274f45..37e42b07dc1 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -119,7 +119,7 @@ inline fun <reified T : BatchTest> createBatchTask(
 ) =
     tasks.register(
         "batch" + (if (T::class == BatchTestServer::class) "Server" else "") +
-            name.capitalize() + suffix.capitalize(),
+            name.replaceFirstChar { it.titlecaseChar() } + suffix.replaceFirstChar { it.titlecaseChar() },
         T::class
     ) {
         group = when {
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index bd0e7f35189..b92e4401079 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -202,7 +202,7 @@ val verifyReleaseDependencies by tasks.registering {
             sb.append("\n  ${expected.size} => ${libs.size} files")
             sb.append(" (${if (libs.size > expected.size) "+" else "-"}${(libs.size - expected.size).absoluteValue})")
         }
-        sb.appendln()
+        sb.appendLine()
         for (dep in (libs.keys + expected.keys).sortedWith(caseInsensitive)) {
             val old = expected[dep]
             val new = libs[dep]
@@ -270,6 +270,9 @@ val copyBinLibs by tasks.registering(Copy::class) {
     // Can't use $rootDir since Gradle somehow reports .gradle/caches/ as "always modified"
     rootSpec.into("$rootDir/bin")
     with(binLibs)
+    // :src:config:jar conflicts with copyBinLibs on bin, bin/templates, bin/report-template folders
+    // so we add explicit ordering
+    mustRunAfter(":src:config:jar")
 }
 
 val createDist by tasks.registering {
@@ -320,9 +323,9 @@ fun createAnakiaTask(
                 parentFile.run { isDirectory || mkdirs() } || throw IllegalStateException("Unable to create directory $parentFile")
 
                 writer().use {
-                    it.appendln("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
+                    it.appendLine("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
                     for (line in lines) {
-                        it.appendln(line)
+                        it.appendLine(line)
                     }
                 }
             }
@@ -563,7 +566,7 @@ for (type in listOf("binary", "source")) {
         break
     }
     for (archive in listOf(Zip::class, Tar::class)) {
-        val taskName = "dist${archive.simpleName}${type.replace("binary", "").capitalize()}"
+        val taskName = "dist${archive.simpleName}${type.replace("binary", "").replaceFirstChar { it.titlecaseChar() }}"
         val archiveTask = tasks.register(taskName, archive) {
             val eol = if (archive == Tar::class) LineEndings.LF else LineEndings.CRLF
             group = distributionGroup
@@ -610,7 +613,7 @@ val runGui by tasks.registering(JavaExec::class) {
     dependsOn(createDist)
 
     workingDir = File(project.rootDir, "bin")
-    main = "org.apache.jmeter.NewDriver"
+    mainClass.set("org.apache.jmeter.NewDriver")
     classpath("$rootDir/bin/ApacheJMeter.jar")
     jvmArgs("-Xss256k")
     jvmArgs("-XX:MaxMetaspaceSize=256m")
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 80d269d03e1..8fc357778a5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,7 +115,7 @@ Summary
   <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
   <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
-  <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
+  <li><pr>5763</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From a9ec76d067da103265609cff8c5fce481e97bac2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 23 Apr 2023 13:40:25 +0300
Subject: [PATCH 0319/1037] chore: factor build-logic so it is easier to reuse

See https://docs.gradle.org/current/userguide/structuring_software_products.html
---
 .ratignore                                    |   6 +-
 build-logic-commons/.gitignore                |  18 +
 .../gradle-plugin/build.gradle.kts            |  32 +
 ...-logic.kotlin-dsl-gradle-plugin.gradle.kts |  26 +
 .../settings.gradle.kts                       |  19 +-
 build-logic/.gitignore                        |  18 +
 build-logic/basics/build.gradle.kts           |  20 +
 ...build-logic.reproducible-builds.gradle.kts |  24 +
 .../batchtest/build.gradle.kts                |  18 +-
 .../kotlin/build-logic.batchtest.gradle.kts   |  16 +
 .../jmeter/buildtools/batchtest/BatchTest.kt  |   0
 .../buildtools/batchtest/BatchTestServer.kt   |   0
 .../buildtools/batchtest/WriterExtensions.kt  |   0
 build-logic/build-parameters/build.gradle.kts |  92 +++
 build-logic/build.gradle.kts                  |  54 ++
 build-logic/checksum.xml                      | 120 ++++
 build-logic/gradle.properties                 |  19 +
 .../00/8118b3bcdb1a5000.fingerprints          |   1 +
 .../04/ea8543c570faf804.fingerprints          |   1 +
 .../06/3a1959eef8726006.fingerprints          |   1 +
 ...e38bc93d90b852d88465dd3a1959eef8726006.asc |  26 +
 .../07/402123d2f5f4af07.fingerprints          |   1 +
 ...441e504a937f43eb0daef96a65176a0fb1cd0b.asc |  27 +
 .../0b/6a65176a0fb1cd0b.fingerprints          |   1 +
 .../0c/0ae7bbd7fee66e0c.fingerprints          |   1 +
 .../0e/105cb91cac2aee0e.fingerprints          |   0
 .../0f/7a01b0f236e5430f.fingerprints          |   0
 ...cc4c7594d09e2182c60e0f7a01b0f236e5430f.asc |   0
 .../0f/aff3e378166b1f0f.fingerprints          |   1 +
 ...ed3b4843daacc79de555557457ca33c3ce9e15.asc |   0
 .../15/7457ca33c3ce9e15.fingerprints          |   0
 ...d52b5a8295137c88fb5748dddafa7674e54418.asc |  16 +
 .../18/dddafa7674e54418.fingerprints          |   1 +
 .../1a/1db198f93525ec1a.fingerprints          |   1 +
 ...9f1ee92b19609de816fde81db198f93525ec1a.asc |  26 +
 .../1c/83552a552a0d431c.fingerprints          |   0
 .../1e/6005789e24e5ad1e.fingerprints          |   0
 .../1f/9d29ae4a6b50e01f.fingerprints          |   0
 .../21/60eb70ddaac2ec21.fingerprints          |   0
 .../25/2c7b12f2a511e325.fingerprints          |   0
 ...5f3b8e59e6e63aa78067482c7b12f2a511e325.asc |   0
 .../25/9351716690874f25.fingerprints          |   0
 .../25/a182f48d9c2c0825.fingerprints          |   1 +
 .../2b/d89d05374952262b.fingerprints          |   1 +
 .../2f/315693699f8d102f.fingerprints          |   0
 .../30/37de9e37c5b67c30.fingerprints          |   1 +
 .../34/e98008460eb9bb34.fingerprints          |   1 +
 .../36/01f3a913fb698736.fingerprints          |   0
 .../36/3bd211f725778c36.fingerprints          |   1 +
 .../36/6c70a3b7599c5736.fingerprints          |   1 +
 ...beab2d799c020f17c69126b16698a4adf4d638.asc |   0
 .../38/b16698a4adf4d638.fingerprints          |   0
 .../38/b5681e477ad61c38.fingerprints          |   1 +
 .../3b/29579f18fa8fd93b.fingerprints          |   0
 ...01e2f8ef035068ec1139cc29579f18fa8fd93b.asc |   0
 ...b1a49729b053caf015cee9a6adfc93ef34893e.asc |   0
 .../3e/a6adfc93ef34893e.fingerprints          |   0
 .../41/9a347756830c4541.fingerprints          |   1 +
 .../51/85911f425ec61b51.fingerprints          |   1 +
 ...6e2c001948c5f2f38b0cc385911f425ec61b51.asc |  26 +
 .../52/33cd6733af5ec452.fingerprints          |   1 +
 ...20d295bf0e61cb4cf0896c33cd6733af5ec452.asc |  24 +
 .../55/6525fd70cc303655.fingerprints          |   1 +
 ...f833963889d7ed06f1e4dc6525fd70cc303655.asc |  24 +
 .../57/098a31f381819057.fingerprints          |   1 +
 ...b9bdf40ed49debb5caaded5b30d3b10694f057.asc |  16 +
 .../57/5b30d3b10694f057.fingerprints          |   1 +
 ...885c07a3204611fb184ef7098a31f381819057.asc |  16 +
 .../58/2161d72e7dcd4258.fingerprints          |   1 +
 .../59/10da72cd7fbfa159.fingerprints          |   0
 .../5a/083891ad4774845a.fingerprints          |   1 +
 ...46dec275b1f230acce4eeb083891ad4774845a.asc |  26 +
 .../5b/32784d4f004b405b.fingerprints          |   0
 .../5b/9df7f2349731d55b.fingerprints          |   0
 ...4dac8350968ec2a8260584ee8ecbbbc188fd5d.asc |   0
 .../5d/ee8ecbbbc188fd5d.fingerprints          |   0
 ...86f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc |  26 +
 .../5f/86f75e83e1ee085f.fingerprints          |   1 +
 .../60/7eb97d110dfadd60.fingerprints          |   0
 ...789342f598ad5b1175ef357eb97d110dfadd60.asc |   0
 .../61/379ce192d401ab61.fingerprints          |   0
 ...56c4f765c9ac3cb6b85d62379ce192d401ab61.asc |   0
 .../62/5a5c54a339b38462.fingerprints          |   1 +
 .../6f/41321490758aad6f.fingerprints          |   0
 ...aa0f2206de228f0db01ad741321490758aad6f.asc |   0
 .../73/59a252fb1199d873.fingerprints          |   0
 ...16eb882daf57a11477aaf559a252fb1199d873.asc |   0
 .../76/575d6c921d84ac76.fingerprints          |   1 +
 .../76/5b05ccde140c2876.fingerprints          |   0
 ...669810892cbd3148fa92995b05ccde140c2876.asc |   0
 .../7e/3ff44d37464bbb7e.fingerprints          |   0
 .../80/ca890a5fa09cfd80.fingerprints          |   1 +
 ...118c070cb22a0175a2e8d43d12ca2ac19f3181.asc |  26 +
 .../81/3d12ca2ac19f3181.fingerprints          |   1 +
 ...a70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc |  26 +
 .../81/ddbcc1270a29d081.fingerprints          |   1 +
 .../83/6a0975f8b1127b83.fingerprints          |   0
 .../87/0729a0aff8999a87.fingerprints          |   0
 ...ba29d08d2e25ee84c132c30729a0aff8999a87.asc |  38 +-
 .../89/926dfb2edb329089.fingerprints          |   1 +
 .../8b/5d9ffe7b8e3dea8b.fingerprints          |   1 +
 .../8c/0ac07d0bbd11498c.fingerprints          |   1 +
 .../8f/dc0b7e986bd7398f.fingerprints          |   0
 ...3a1affe42b5f53af19f780bcf4173966770193.asc |   0
 .../93/bcf4173966770193.fingerprints          |   0
 .../94/59ba7bfead3d7f94.fingerprints          |   1 +
 ...14760097dc5cfad0175ac2c9fbaa83a8753994.asc |  16 +
 .../94/c9fbaa83a8753994.fingerprints          |   1 +
 ...23db1360d9029481e7f2efecdfea3cb4493b94.asc |  36 +
 .../94/ecdfea3cb4493b94.fingerprints          |   1 +
 .../96/6601e5c08dccbb96.fingerprints          |   1 +
 ...417737bd805456db3cbdde6601e5c08dccbb96.asc |  21 +
 ...900cd2fc9a9d906ecba48be3822b59020a349d.asc |  38 +-
 .../9d/c1b12a5d99c0729d.fingerprints          |   1 +
 .../9d/e3822b59020a349d.fingerprints          |   0
 ...2231331bca7e1f292c9b88c1b12a5d99c0729d.asc |  21 +
 .../9e/d4ff1f46313c1a9e.fingerprints          |   1 +
 .../9e/e0130a3ed5a2079e.fingerprints          |   1 +
 ...1703b1d287caea3a60f931e0130a3ed5a2079e.asc |  16 +
 .../a0/7ec19439e4d4c2a0.fingerprints          |   1 +
 .../a2/0cfe993cdbe1d0a2.fingerprints          |   0
 .../a2/249dee8e2c07a0a2.fingerprints          |   1 +
 ...3e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc |  21 +
 .../a2/606cc6c4533e81a2.fingerprints          |   1 +
 .../a2/92bd2d0b5b21aba2.fingerprints          |   0
 .../a2/c3e640f38d845fa2.fingerprints          |   0
 .../a3/501b5adef57ce6a3.fingerprints          |   1 +
 ...d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc |  15 +
 .../a6/ac5ec74981f9cda6.fingerprints          |   1 +
 ...ba03381ef6c89096acd985ac5ec74981f9cda6.asc |  21 +
 .../a6/fe6c7d77a1ce15a6.fingerprints          |   1 +
 .../a7/bc7df305d87bdfa7.fingerprints          |   1 +
 ...f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc |   0
 .../ab/b341ddb020fcb6ab.fingerprints          |   0
 .../ac/d908a43fb7ec07ac.fingerprints          |   1 +
 .../b1/0e91c2de43b72bb1.fingerprints          |   0
 ...6090d3223dca95bfd25c0e38f47d3e410c47b1.asc |   0
 ...92113263fc31c74ccbaab20e91c2de43b72bb1.asc |   0
 .../b1/38f47d3e410c47b1.fingerprints          |   0
 .../b1/50c6cc55c6f24fb1.fingerprints          |   1 +
 .../b2/1861c322c56014b2.fingerprints          |   1 +
 ...96a5e3e70732eeb2e5007f1861c322c56014b2.asc |  24 +
 .../b3/8b2a34a7d4a9b8b3.fingerprints          |   1 +
 ...5479e1055341431b4545ab72475fd306b9cab7.asc |   0
 .../b7/72475fd306b9cab7.fingerprints          |   0
 .../b8/1b2718089ce964b8.fingerprints          |   1 +
 ...fae244a81d64507b47182e1b2718089ce964b8.asc |  33 +
 .../bd/9c4c23e6ffe405bd.fingerprints          |   0
 .../c0/1241bc872c5e4ec0.fingerprints          |   1 +
 ...6de9055c4c75c7bd9830771241bc872c5e4ec0.asc |  24 +
 .../c1/abe9f3126bb741c1.fingerprints          |   0
 .../c2/3624ee1473a843c2.fingerprints          |   1 +
 ...184bcd55f4d016e30d4c9bf42e87f9665015c9.asc |  24 +
 .../c9/f42e87f9665015c9.fingerprints          |   1 +
 ...b4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc |  16 +
 .../cb/86fdc7e2a11262cb.fingerprints          |   1 +
 .../d2/dcf4b49b4d5845d2.fingerprints          |   1 +
 .../da/5a3d35a6757384da.fingerprints          |   1 +
 .../dd/15c71c0a4e0b8edd.fingerprints          |   0
 ...7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc |   0
 .../e0/6064b04a9dc688e0.fingerprints          |   1 +
 .../e2/56028df552ba32e2.fingerprints          |   1 +
 ...36a28bc89fb250272c9f7f56028df552ba32e2.asc |  38 ++
 ...85b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc |  24 +
 .../e5/4713a6a15a6ea9e5.fingerprints          |   1 +
 .../e5/7c25280eae63ebe5.fingerprints          |   1 +
 ...10792983023d5d14c93b488d7f1bec1e2ecae7.asc |  16 +
 .../e7/8d7f1bec1e2ecae7.fingerprints          |   1 +
 .../ec/1723844cf9a045ec.fingerprints          |   0
 .../ec/2290c86d79f1dfec.fingerprints          |   1 +
 ...d6ff19930adf43ac127792a50569c7ca7fa1f0.asc |   0
 .../f0/a50569c7ca7fa1f0.fingerprints          |   0
 .../f8/bf935c771a8474f8.fingerprints          |   1 +
 .../f8/c9f04e6e2dc4f7f8.fingerprints          |   0
 ...5e5f90e43e837f9dd8c781bf935c771a8474f8.asc |  26 +
 .../fb/3d5839a2262cbbfb.fingerprints          |   0
 .../fb/cfa67e8582f7e9fb.fingerprints          |   0
 .../fe/891e4c2d471515fe.fingerprints          |   0
 build-logic/jvm/build.gradle.kts              |  29 +
 .../build-logic.dokka-javadoc.gradle.kts      |  35 +
 .../main/kotlin/build-logic.groovy.gradle.kts |  22 +
 .../build-logic.java-library.gradle.kts       |  21 +
 .../main/kotlin/build-logic.java.gradle.kts   | 156 +++++
 .../kotlin/build-logic.jvm-library.gradle.kts |  29 +
 .../main/kotlin/build-logic.kotlin.gradle.kts |  52 ++
 .../kotlin/build-logic.test-base.gradle.kts   |  56 ++
 .../kotlin/build-logic.test-junit5.gradle.kts |  42 ++
 .../kotlin/build-logic.test-spock.gradle.kts  |  46 ++
 .../kotlin/build-logic.testing.gradle.kts     |  17 +
 build-logic/publishing/build.gradle.kts       |  26 +
 ...ld-logic.java-published-library.gradle.kts |  43 ++
 ...d-logic.java-published-platform.gradle.kts |  34 +
 ...ild-logic.jvm-published-library.gradle.kts |  21 +
 .../build-logic.publish-to-central.gradle.kts |  70 ++
 ...logic.publish-to-tmp-maven-repo.gradle.kts |  57 ++
 build-logic/root-build/build.gradle.kts       |  30 +
 .../kotlin/build-logic.root-build.gradle.kts  |  66 ++
 {buildSrc => build-logic}/settings.gradle.kts |  51 +-
 build-logic/verification/build.gradle.kts     |  33 +
 .../kotlin/build-logic.autostyle.gradle.kts   | 105 +++
 .../build-logic.checkerframework.gradle.kts   |  61 ++
 .../kotlin/build-logic.checkstyle.gradle.kts  |  51 ++
 .../kotlin/build-logic.errorprone.gradle.kts  |  71 ++
 .../build-logic.forbidden-apis.gradle.kts     |  37 +
 .../build-logic.jacoco-aggregate.gradle.kts   |  85 +++
 .../main/kotlin/build-logic.jacoco.gradle.kts |  71 ++
 ...build-logic.sonarqube-aggregate.gradle.kts |  91 +++
 .../kotlin/build-logic.spotbugs.gradle.kts    |  71 ++
 .../main/kotlin/build-logic.style.gradle.kts  |  92 +++
 .../DefaultJacocoAggregateReportSpec.kt       |  43 ++
 .../jacoco/JacocoAggregateReportSpec.kt       |  29 +
 build.gradle.kts                              | 631 ++----------------
 buildSrc/build.gradle.kts                     |  62 --
 buildSrc/checksum.xml                         |  61 --
 buildSrc/gradle.properties                    |  23 -
 .../11/164bd2247b936711.fingerprints          |   1 -
 ...e79b6abc762159dc0b1591164bd2247b936711.asc |  16 -
 .../1c/8067ecaa8d58321c.fingerprints          |   1 -
 ...570288e10932263e8326cbaa49c633b4734832.asc |  26 -
 .../32/aa49c633b4734832.fingerprints          |   1 -
 .../3b/b5cb27f94f97173b.fingerprints          |   1 -
 .../40/750f9a735eecf640.fingerprints          |   1 -
 .../45/1669c4bb543e0445.fingerprints          |   1 -
 .../45/59992768673ae145.fingerprints          |   1 -
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc |  21 -
 .../4e/efe8086f9e93774e.fingerprints          |   1 -
 .../5c/b89991d171a02f5c.fingerprints          |   1 -
 .../80/2ac7bf2f3349de80.fingerprints          |   1 -
 ...0a7a9cf46221a56b06ad64461a804f2609fd89.asc |  37 -
 .../89/461a804f2609fd89.fingerprints          |   1 -
 ...a37fbe4453c1073e7ef61d6449005f96bc97a3.asc |  37 -
 .../a3/6449005f96bc97a3.fingerprints          |   1 -
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc |  16 -
 .../ae/f6d4a1d411e9d1ae.fingerprints          |   1 -
 .../b9/5f6ba89d4b0869b9.fingerprints          |   1 -
 .../d4/0162fe0cf6e18bd4.fingerprints          |   1 -
 .../d4/7892707e9657ebd4.fingerprints          |   1 -
 ...78fde933a96dda827840d8e2b3d84202b812d9.asc |  16 -
 .../d9/e2b3d84202b812d9.fingerprints          |   1 -
 .../de/fc7403768b4c0cde.fingerprints          |   1 -
 .../e7/b0f3710fa64900e7.fingerprints          |   1 -
 ...be5bcc9fec15518cfda882b0f3710fa64900e7.asc |  16 -
 .../eb/995efbf4a3d20beb.fingerprints          |   1 -
 ...bc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc |  26 -
 .../ed/d3dbc823be4819ed.fingerprints          |   1 -
 ...e770230e69cc6de143fb5b62c82e50836eb3ee.asc |  26 -
 .../ee/62c82e50836eb3ee.fingerprints          |   1 -
 checksum.xml                                  |  62 +-
 config/forbidden-apis/forbidden-apis.txt      |  22 +
 gradle.md                                     |   9 +-
 gradle.properties                             | 108 +--
 .../00/8118b3bcdb1a5000.fingerprints          |   1 +
 .../06/3a1959eef8726006.fingerprints          |   1 +
 ...e38bc93d90b852d88465dd3a1959eef8726006.asc |  26 +
 ...ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc |  21 +
 .../0b/74c249541619ff0b.fingerprints          |   1 +
 .../0b/96b88eacd463b90b.fingerprints          |   1 +
 .../0c/0ae7bbd7fee66e0c.fingerprints          |   1 +
 ...2c7ef8ada0f794b58c7c63436902af59edf60e.asc |   6 +
 .../0e/436902af59edf60e.fingerprints          |   1 +
 .../0f/7a01b0f236e5430f.fingerprints          |   1 +
 ...cc4c7594d09e2182c60e0f7a01b0f236e5430f.asc |  16 +
 .../0f/aff3e378166b1f0f.fingerprints          |   1 +
 ...d52b5a8295137c88fb5748dddafa7674e54418.asc |  16 +
 .../18/dddafa7674e54418.fingerprints          |   1 +
 .../1a/1db198f93525ec1a.fingerprints          |   1 +
 ...9f1ee92b19609de816fde81db198f93525ec1a.asc |  26 +
 .../1c/ae5a7fb608a0221c.fingerprints          |   1 +
 ...2137d875d833d9b23392ecae5a7fb608a0221c.asc |  33 +
 ...90c240ce51b4670d30ad1c38ee757d69184620.asc |  26 +
 .../20/38ee757d69184620.fingerprints          |   1 +
 .../20/d364abaa39a47320.fingerprints          |   1 +
 ...0ca873074092f806f59b65d364abaa39a47320.asc |  26 +
 .../22/51f5b36c761aa122.fingerprints          |   1 +
 .../2b/d89d05374952262b.fingerprints          |   1 +
 .../2e/a1766be5f812ac2e.fingerprints          |   1 +
 .../34/dee12b9896f97e34.fingerprints          |   1 +
 ...d98c5fd55a8af232290e58dee12b9896f97e34.asc |  16 +
 .../34/e98008460eb9bb34.fingerprints          |   1 +
 .../38/b5681e477ad61c38.fingerprints          |   1 +
 .../40/66b50994442d2d40.fingerprints          |   1 +
 ...d744ace7ade6aa50dd591f66b50994442d2d40.asc |  15 +
 .../44/5923a9d358adf744.fingerprints          |   1 +
 .../46/9a716f957bc42546.fingerprints          |   1 +
 .../4b/700e4f39bc05364b.fingerprints          |   1 +
 .../50/726f4e5c34cfd750.fingerprints          |   1 +
 .../52/8671a8df71296252.fingerprints          |   1 +
 ...d6c97108b8585f91b158748671a8df71296252.asc |  26 +
 .../55/6525fd70cc303655.fingerprints          |   1 +
 ...f833963889d7ed06f1e4dc6525fd70cc303655.asc |  24 +
 .../58/2161d72e7dcd4258.fingerprints          |   1 +
 .../5a/083891ad4774845a.fingerprints          |   1 +
 ...46dec275b1f230acce4eeb083891ad4774845a.asc |  26 +
 ...86f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc |  26 +
 .../5f/86f75e83e1ee085f.fingerprints          |   1 +
 ...97b4f5dcc46cea61059071a1ae06236ca2ba62.asc |  21 +
 .../62/5a5c54a339b38462.fingerprints          |   1 +
 .../62/a1ae06236ca2ba62.fingerprints          |   1 +
 .../81/33aebc1f01c98081.fingerprints          |   1 +
 ...91fed3922d52296888bae9b6d3ab9bcc641282.asc |  26 +
 .../82/b6d3ab9bcc641282.fingerprints          |   1 +
 ...200ac4ae761f1614d6c46766d68daa073be985.asc |  11 +
 .../85/66d68daa073be985.fingerprints          |   1 +
 .../89/4b1e11d5a4b91e89.fingerprints          |   1 +
 ...a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc |  21 +
 .../8b/5d9ffe7b8e3dea8b.fingerprints          |   1 +
 .../8d/2a742740e08e7f8d.fingerprints          |   1 +
 ...19e50eac5a4b1dd390b72c2a742740e08e7f8d.asc |  33 +
 ...14760097dc5cfad0175ac2c9fbaa83a8753994.asc |  16 +
 .../94/c9fbaa83a8753994.fingerprints          |   1 +
 .../9c/c6fc46eb51cf569c.fingerprints          |   1 +
 ...491704d613780d2bee00f2c6fc46eb51cf569c.asc |  16 +
 .../9d/c1b12a5d99c0729d.fingerprints          |   1 +
 ...2231331bca7e1f292c9b88c1b12a5d99c0729d.asc |  21 +
 .../9e/e0130a3ed5a2079e.fingerprints          |   1 +
 ...1703b1d287caea3a60f931e0130a3ed5a2079e.asc |  16 +
 .../a0/7ec19439e4d4c2a0.fingerprints          |   1 +
 .../a2/606cc6c4533e81a2.fingerprints          |   1 +
 .../a2/c3e640f38d845fa2.fingerprints          |   1 +
 .../a3/501b5adef57ce6a3.fingerprints          |   1 +
 .../a6/ac5ec74981f9cda6.fingerprints          |   1 +
 ...ba03381ef6c89096acd985ac5ec74981f9cda6.asc |  21 +
 .../ac/d908a43fb7ec07ac.fingerprints          |   1 +
 .../af/030dd9087c31c9af.fingerprints          |   1 +
 ...4fe82e5a4c5377bca2edec5208812e1e4a6db0.asc |  16 +
 .../b0/5208812e1e4a6db0.fingerprints          |   1 +
 .../b1/50c6cc55c6f24fb1.fingerprints          |   1 +
 .../b9/e09f6a4522f77db9.fingerprints          |   1 +
 .../bd/38185785755267bd.fingerprints          |   1 +
 .../c8/3f606403dca455c8.fingerprints          |   1 +
 .../d2/dcf4b49b4d5845d2.fingerprints          |   1 +
 .../da/5a3d35a6757384da.fingerprints          |   1 +
 .../e2/56028df552ba32e2.fingerprints          |   1 +
 ...36a28bc89fb250272c9f7f56028df552ba32e2.asc |  38 ++
 ...10792983023d5d14c93b488d7f1bec1e2ecae7.asc |  16 +
 .../e7/8d7f1bec1e2ecae7.fingerprints          |   1 +
 ...d6ff19930adf43ac127792a50569c7ca7fa1f0.asc |  24 +
 .../f0/a50569c7ca7fa1f0.fingerprints          |   1 +
 .../f4/92bf193ad552c6f4.fingerprints          |   1 +
 .../f8/bf935c771a8474f8.fingerprints          |   1 +
 ...5e5f90e43e837f9dd8c781bf935c771a8474f8.asc |  26 +
 .../fb/cfa67e8582f7e9fb.fingerprints          |   1 +
 settings.gradle.kts                           |  29 +-
 src/bom-thirdparty/build.gradle.kts           | 153 +++++
 src/bom/build.gradle.kts                      | 156 +----
 src/bshclient/build.gradle.kts                |   4 +
 src/build.gradle.kts                          | 228 -------
 src/components/build.gradle.kts               |   8 +-
 .../jmeter/extractor/RegexExtractor.java      |   2 +-
 .../org/apache/jmeter/timers/SyncTimer.java   |   1 +
 src/config/build.gradle.kts                   |   2 +-
 src/core/build.gradle.kts                     |  10 +-
 .../report/dashboard/ReportGenerator.java     |   2 +-
 src/dist-check/build.gradle.kts               |  11 +-
 src/dist/build.gradle.kts                     |  27 +-
 src/dist/src/dist/expected_release_jars.csv   |   8 +-
 src/examples/build.gradle.kts                 |   6 +-
 src/functions/build.gradle.kts                |   6 +-
 src/generator/build.gradle.kts                |   6 +-
 src/jorphan/build.gradle.kts                  |   6 +-
 src/launcher/build.gradle.kts                 |   4 +
 src/licenses/build.gradle.kts                 |  20 +-
 src/protocol/bolt/build.gradle.kts            |  31 +
 src/protocol/build.gradle.kts                 | 220 ------
 src/protocol/ftp/build.gradle.kts             |  34 +
 src/protocol/http/build.gradle.kts            |  80 +++
 src/protocol/java/build.gradle.kts            |  33 +
 src/protocol/jdbc/build.gradle.kts            |  34 +
 src/protocol/jms/build.gradle.kts             |  41 ++
 .../protocol/jms/sampler/MessageAdmin.java    |   1 +
 src/protocol/junit-sample/build.gradle.kts    |  28 +
 .../main/java/test/DummyAnnotatedTest.java    |   2 +-
 src/protocol/junit/build.gradle.kts           |  35 +
 src/protocol/ldap/build.gradle.kts            |  33 +
 src/protocol/mail/build.gradle.kts            |  41 ++
 src/protocol/mongodb/build.gradle.kts         |  31 +
 src/protocol/native/build.gradle.kts          |  30 +
 src/protocol/tcp/build.gradle.kts             |  33 +
 src/testkit-wiremock/build.gradle.kts         |   1 +
 src/testkit/build.gradle.kts                  |   1 +
 380 files changed, 4582 insertions(+), 1828 deletions(-)
 create mode 100644 build-logic-commons/.gitignore
 create mode 100644 build-logic-commons/gradle-plugin/build.gradle.kts
 create mode 100644 build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
 rename buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt => build-logic-commons/settings.gradle.kts (69%)
 create mode 100644 build-logic/.gitignore
 create mode 100644 build-logic/basics/build.gradle.kts
 create mode 100644 build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
 rename buildSrc/subprojects/batchtest/batchtest.gradle.kts => build-logic/batchtest/build.gradle.kts (72%)
 create mode 100644 build-logic/batchtest/src/main/kotlin/build-logic.batchtest.gradle.kts
 rename {buildSrc/subprojects => build-logic}/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt (100%)
 rename {buildSrc/subprojects => build-logic}/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt (100%)
 rename {buildSrc/subprojects => build-logic}/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt (100%)
 create mode 100644 build-logic/build-parameters/build.gradle.kts
 create mode 100644 build-logic/build.gradle.kts
 create mode 100644 build-logic/checksum.xml
 create mode 100644 build-logic/gradle.properties
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc (50%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc (50%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints (100%)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints (100%)
 rename {buildSrc => build-logic}/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints (100%)
 create mode 100644 build-logic/jvm/build.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
 create mode 100644 build-logic/publishing/build.gradle.kts
 create mode 100644 build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
 create mode 100644 build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
 create mode 100644 build-logic/publishing/src/main/kotlin/build-logic.jvm-published-library.gradle.kts
 create mode 100644 build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
 create mode 100644 build-logic/publishing/src/main/kotlin/build-logic.publish-to-tmp-maven-repo.gradle.kts
 create mode 100644 build-logic/root-build/build.gradle.kts
 create mode 100644 build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
 rename {buildSrc => build-logic}/settings.gradle.kts (71%)
 create mode 100644 build-logic/verification/build.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
 create mode 100644 build-logic/verification/src/main/kotlin/jacoco/DefaultJacocoAggregateReportSpec.kt
 create mode 100644 build-logic/verification/src/main/kotlin/jacoco/JacocoAggregateReportSpec.kt
 delete mode 100644 buildSrc/build.gradle.kts
 delete mode 100644 buildSrc/checksum.xml
 delete mode 100644 buildSrc/gradle.properties
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
 delete mode 100644 buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
 create mode 100644 config/forbidden-apis/forbidden-apis.txt
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
 create mode 100644 src/bom-thirdparty/build.gradle.kts
 delete mode 100644 src/build.gradle.kts
 create mode 100644 src/protocol/bolt/build.gradle.kts
 delete mode 100644 src/protocol/build.gradle.kts
 create mode 100644 src/protocol/ftp/build.gradle.kts
 create mode 100644 src/protocol/http/build.gradle.kts
 create mode 100644 src/protocol/java/build.gradle.kts
 create mode 100644 src/protocol/jdbc/build.gradle.kts
 create mode 100644 src/protocol/jms/build.gradle.kts
 create mode 100644 src/protocol/junit-sample/build.gradle.kts
 create mode 100644 src/protocol/junit/build.gradle.kts
 create mode 100644 src/protocol/ldap/build.gradle.kts
 create mode 100644 src/protocol/mail/build.gradle.kts
 create mode 100644 src/protocol/mongodb/build.gradle.kts
 create mode 100644 src/protocol/native/build.gradle.kts
 create mode 100644 src/protocol/tcp/build.gradle.kts

diff --git a/.ratignore b/.ratignore
index ad83641febf..88bd46bdec2 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,9 +1,9 @@
 checksum.xml
-buildSrc/checksum.xml
-buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/**
+build-logic/checksum.xml
+build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/**
 gradle/wrapper/gradle-wrapper.jar
 gradle/checksum-dependency-plugin/cached-pgp-keys/**
-.*
+**/.*
 .*/**
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
diff --git a/build-logic-commons/.gitignore b/build-logic-commons/.gitignore
new file mode 100644
index 00000000000..b9970e2f5d6
--- /dev/null
+++ b/build-logic-commons/.gitignore
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+/build/
+/*/build/
diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
new file mode 100644
index 00000000000..59d18a29ea1
--- /dev/null
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion
+
+plugins {
+    `kotlin-dsl`
+}
+
+group = "org.apache.jmeter.build-logic"
+
+dependencies {
+    // We use precompiled script plugins (== plugins written as src/kotlin/build-logic.*.gradle.kts files,
+    // and we need to declare dependency on org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin
+    // to make it work.
+    // See https://github.com/gradle/gradle/issues/17016 regarding expectedKotlinDslPluginsVersion
+    implementation("org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:$expectedKotlinDslPluginsVersion")
+}
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
new file mode 100644
index 00000000000..449e3c9b7c3
--- /dev/null
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-library")
+    id("org.gradle.kotlin.kotlin-dsl") // this is 'kotlin-dsl' without version
+}
+
+tasks.validatePlugins {
+    failOnWarning.set(true)
+    enableStricterValidation.set(true)
+}
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt b/build-logic-commons/settings.gradle.kts
similarity index 69%
rename from buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
rename to build-logic-commons/settings.gradle.kts
index 370edb0c721..28f941e2070 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
+++ b/build-logic-commons/settings.gradle.kts
@@ -2,26 +2,25 @@
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to you under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package org.apache.jmeter.buildtools.batchtest
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-open class BatchtestPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
     }
 }
+
+rootProject.name = "build-logic-commons"
+
+include("gradle-plugin")
diff --git a/build-logic/.gitignore b/build-logic/.gitignore
new file mode 100644
index 00000000000..b9970e2f5d6
--- /dev/null
+++ b/build-logic/.gitignore
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+/build/
+/*/build/
diff --git a/build-logic/basics/build.gradle.kts b/build-logic/basics/build.gradle.kts
new file mode 100644
index 00000000000..d8c115622bb
--- /dev/null
+++ b/build-logic/basics/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
diff --git a/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts b/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
new file mode 100644
index 00000000000..ee54f0ac9e5
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+tasks.withType<AbstractArchiveTask>().configureEach {
+    // Ensure builds are reproducible
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+    dirMode = "775".toInt(8)
+    fileMode = "664".toInt(8)
+}
diff --git a/buildSrc/subprojects/batchtest/batchtest.gradle.kts b/build-logic/batchtest/build.gradle.kts
similarity index 72%
rename from buildSrc/subprojects/batchtest/batchtest.gradle.kts
rename to build-logic/batchtest/build.gradle.kts
index 1fc67667905..f36e54aae8b 100644
--- a/buildSrc/subprojects/batchtest/batchtest.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -2,30 +2,24 @@
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to you under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
 dependencies {
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
     implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r")
 }
-
-gradlePlugin {
-    plugins {
-        register("batchtest") {
-            id = "jmeterbuild.batchtest"
-            implementationClass = "org.apache.jmeter.buildtools.batchtest.BatchtestPlugin"
-        }
-    }
-}
diff --git a/build-logic/batchtest/src/main/kotlin/build-logic.batchtest.gradle.kts b/build-logic/batchtest/src/main/kotlin/build-logic.batchtest.gradle.kts
new file mode 100644
index 00000000000..2a4297155ea
--- /dev/null
+++ b/build-logic/batchtest/src/main/kotlin/build-logic.batchtest.gradle.kts
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
similarity index 100%
rename from buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
rename to build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
similarity index 100%
rename from buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
rename to build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
similarity index 100%
rename from buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
rename to build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
new file mode 100644
index 00000000000..c06c997468a
--- /dev/null
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("org.gradlex.build-parameters") version "1.4.3"
+    id("com.github.vlsi.gradle-extensions") version "1.86"
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
+buildParameters {
+    // Other plugins can contribute parameters, so below list is not exhaustive
+    enableValidation.set(false)
+    pluginId("build-logic.build-params")
+    bool("enableMavenLocal") {
+        defaultValue.set(true)
+        description.set("Add mavenLocal() to repositories")
+    }
+    bool("coverage") {
+        defaultValue.set(false)
+        description.set("Collect test coverage")
+    }
+    bool("spotbugs") {
+        defaultValue.set(false)
+        description.set("Run SpotBugs verifications")
+    }
+    bool("sonarqube") {
+        defaultValue.set(false)
+        description.set("Report verification results to Sonarqube")
+    }
+    bool("ignoreSpotBugsFailures") {
+        defaultValue.set(false)
+        description.set("Ignore SpotBugs failures")
+    }
+    bool("enableCheckerframework") {
+        defaultValue.set(false)
+        description.set("Run CheckerFramework (nullness) verifications")
+    }
+    bool("skipAutostyle") {
+        defaultValue.set(false)
+        description.set("Skip AutoStyle verifications")
+    }
+    bool("skipCheckstyle") {
+        defaultValue.set(false)
+        description.set("Skip Checkstyle verifications")
+    }
+    bool("skipDist") {
+        defaultValue.set(false)
+        description.set("Allow to skip building source/binary distributions")
+    }
+    bool("skipForbiddenApis") {
+        defaultValue.set(true)
+        description.set("Skip forbidden-apis verifications")
+    }
+    bool("enableErrorprone") {
+        defaultValue.set(true)
+        description.set("Enable ErrorProne verifications")
+    }
+    bool("skipJavadoc") {
+        defaultValue.set(false)
+        description.set("Skip javadoc generation")
+    }
+    bool("failOnJavadocWarning") {
+        defaultValue.set(true)
+        description.set("Fail build on javadoc warnings")
+    }
+    bool("enableGradleMetadata") {
+        defaultValue.set(false)
+        description.set("Generate and publish Gradle Module Metadata")
+    }
+    bool("useGpgCmd") {
+        defaultValue.set(false)
+        description.set("By default use Java implementation to sign artifacts. When useGpgCmd=true, then gpg command line tool is used for signing artifacts")
+    }
+    bool("werror") {
+        defaultValue.set(true)
+        description.set("Treat javac, javadoc, kotlinc warnings as errors")
+    }
+}
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
new file mode 100644
index 00000000000..457336af365
--- /dev/null
+++ b/build-logic/build.gradle.kts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    `embedded-kotlin` apply false
+    id("com.github.autostyle") version "3.2"
+}
+
+allprojects {
+    group = "org.apache.jmeter"
+    version = "1.0.0"
+
+    apply(plugin = "com.github.autostyle")
+    autostyle {
+        kotlinGradle {
+            ktlint("0.40.0")
+            licenseHeader(
+                """
+                Licensed to the Apache Software Foundation (ASF) under one or more
+                contributor license agreements.  See the NOTICE file distributed with
+                this work for additional information regarding copyright ownership.
+                The ASF licenses this file to you under the Apache License, Version 2.0
+                (the "License"); you may not use this file except in compliance with
+                the License.  You may obtain a copy of the License at
+
+                http://www.apache.org/licenses/LICENSE-2.0
+
+                Unless required by applicable law or agreed to in writing, software
+                distributed under the License is distributed on an "AS IS" BASIS,
+                WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+                See the License for the specific language governing permissions and
+                limitations under the License.
+                """.trimIndent()
+            ) {
+                addBlankLineAfter.set(true)
+            }
+            trimTrailingWhitespace()
+        }
+    }
+}
diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
new file mode 100644
index 00000000000..bb09cb568e4
--- /dev/null
+++ b/build-logic/checksum.xml
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='utf-8'?>
+<dependency-verification version='2'>
+  <trust-requirement pgp='GROUP' checksum='NONE' />
+  <ignored-keys />
+  <trusted-keys>
+    <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
+    <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.dataformat' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.module' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
+    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
+    <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
+    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
+    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
+    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='f05e5f90e43e837f9dd8c781bf935c771a8474f8' group='com.google.errorprone' />
+    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
+    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
+    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
+    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
+    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
+    <trusted-key id='31fae244a81d64507b47182e1b2718089ce964b8' group='com.thoughtworks.qdox' />
+    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-beanutils' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-codec' />
+    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-collections' />
+    <trusted-key id='636de9055c4c75c7bd9830771241bc872c5e4ec0' group='commons-lang' />
+    <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
+    <trusted-key id='0186f8b24c5bc02c94a0e0e486f75e83e1ee085f' group='de.thetaphi' />
+    <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' />
+    <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
+    <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
+    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
+    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
+    <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
+    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
+    <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
+    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
+    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
+    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
+    <trusted-key id='34441e504a937f43eb0daef96a65176a0fb1cd0b' group='org.codehaus.groovy' />
+    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
+    <trusted-key id='82f833963889d7ed06f1e4dc6525fd70cc303655' group='org.codehaus.mojo' />
+    <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
+    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
+    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
+    <trusted-key id='66d7cbff956830fe9f5a723afe6c7d77a1ce15a6' group='org.gradlex' />
+    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
+    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
+    <trusted-key id='e62231331bca7e1f292c9b88c1b12a5d99c0729d' group='org.jetbrains' />
+    <trusted-key id='98465301a4939c0279f2e847d89d05374952262b' group='org.jetbrains.dokka' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
+    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.kotlinx' />
+    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
+    <trusted-key id='f3184bcd55f4d016e30d4c9bf42e87f9665015c9' group='org.jsoup' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.jupiter' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.platform' />
+    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
+    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
+    <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
+    <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
+    <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
+  </trusted-keys>
+  <dependencies>
+    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.13'>
+      <sha512>2B171CABD12C1E2A89EA9DFEEDC4F97F89587AADADCBB6B4B093D7C558EE3CB2F7D2A6CC66787D5D7B664CF3DC9BC7E4CDAD3737CDCE109D7AB5A0EF0D8BC925</sha512>
+    </dependency>
+    <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
+      <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
+    </dependency>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.5'>
+      <sha512>4A6B7FA6CD8C6FA82A517C396510E408F1C6FAB5FF6D4C68008F80718F05E5943755AA240F329C95661CCB0231114DD0F6D7C38EFBF73EE6B1ECC70850F40F7E</sha512>
+    </dependency>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
+      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    </dependency>
+    <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
+      <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
+    </dependency>
+    <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
+      <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
+    </dependency>
+    <dependency group='net.sf.ezmorph' module='ezmorph' version='1.0.6'>
+      <sha512>16D30BE564723B74F312B4E7D06F349370FB6726B3162778C869CD723ECA2A40C4972C2757B3E107E1820CEC0D70B0BD2B96EFCD466518FC64495F7AEF97967A</sha512>
+    </dependency>
+    <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
+      <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
+    </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
+      <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
+    </dependency>
+    <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
+      <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
+    </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
+      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
+      <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
+      <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
+    </dependency>
+    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
+      <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
+    </dependency>
+    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
+      <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
+    </dependency>
+    <dependency group='xerces' module='xercesImpl' version='2.9.1'>
+      <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
+    </dependency>
+    <dependency group='xml-resolver' module='xml-resolver' version='1.2'>
+      <sha512>ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A</sha512>
+    </dependency>
+  </dependencies>
+</dependency-verification>
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
new file mode 100644
index 00000000000..ca3a5f9a95c
--- /dev/null
+++ b/build-logic/gradle.properties
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
+com.github.vlsi.checksum-dependency.version=1.88
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
new file mode 100644
index 00000000000..3b7f58c1acb
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
@@ -0,0 +1 @@
+dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
new file mode 100644
index 00000000000..1efb468cd8d
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
@@ -0,0 +1 @@
+cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
new file mode 100644
index 00000000000..a8b12b46251
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
+j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
+lOiq5GM/Em0mtCSDI+i+zpD7MKCQEeV6V9d09r8Ncltf42BQb2x30ajTsGps++tH
+Z6xxhlPaYsF6OT7SBSt40cjc+rhUuAUo7D4Jt7S7zvi2aeulEr9YD+gkp6+EED2p
+f085M4tn9FjIEmYEOdfq2LkrKbel4r7x3YTypU+G0SDEeGKLJrlekNr7B97CxNat
+aP+ioa6GPY1+u8pkELSZDaUUKpqPKuYt37t1XqWHnvzGYzFyORQjuANCz2f8yAkN
+QqgImFuHiv4Zem7Y4ZagG0TG+T+BT7fZFbYIjpMxuy96mn8jdDMRvNOlskMWD+7x
+QLt1TGaworhDJ5suY4TVN7jQfUX11sTjriBkb+xoSvEFJt5MmQvEi587rIt0Xxcu
+/PKkob99JB/W178ZSbJBoOD43iTP//ifgPPlWHa8GgLBg+EyR1HNvZ6goXhfysGB
+BMV0JP4Fk7SOeV6sb2A2vUIA4uVGVzkzxkb/aG03vIl4pvf74y2Gi70/y1/mAbQp
+BWg3LAcn9ARB6t3Z/rTXWL2bfQPGQ6HWSBcG/qHLwQq+1eUR08GdG2PvwwARAQAB
+uQINBFu07sABEADvtfuYWvWH514Ykl9/BpRFWuGvjR3Xfnc2hn12vCH61Na851r9
+vfYkq3PKLMnzBq5Z/jodIcivDLm4zsNUPxVtsHsqr9PE/5xeFO4i7EWU0554Z9p1
+L2D6Q556WSXAFfO6r/41H96VbSctF3onJ4aUL8QQ4gVtPgX3LutC59DUDpcN+1Ut
+VFPsUMaRShVS7weN1PvBRo0QRIo5YbWMnbt48Hx/lY5X0IAT2ptdUbU+AGOiIh0W
+AMks+hyrKddi5fXupMTEYASnUvZOibBYKID4A6WmIma4QniaWy7CMPvGuKaHEZ9d
+DeK/kjGlHc5O9UmQ3bJgiTNTgmNij7VpxeTkiaYq+l7aPiuJo4TQRLZ7XtMv3YTf
+HnMZFZj/BJw5otPa9EWvMXOO8mi8MRg4KfraMNUzniJnEGL2iXAPAU/oMiHRlgrT
+vKS2s81Kaj7HDfgxS1pKKLLcXTvDIt4VAe2+9rl7UEmlR9UuRmFZx0dTmvby54MC
+qR6Xin0XMr+Y+NcONF8l1nN20AMhyWUzshKDoEsqdvyTyfKZjUoP6kAvqQknsmC2
+nSyp1V2ToPlPACAK5cMdJPa7R7C5xWrF+Do7j3FQsAoy1GzJezP78tbZyCxQTSDO
+MjvMg4l+2ngHa/aLIb5aLopobuH/9yVSILOcjTnO6wEL6YZHaJAMckVGcQARAQAB
+=ZdoI
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
new file mode 100644
index 00000000000..d9ae47869d2
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
@@ -0,0 +1 @@
+636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
new file mode 100644
index 00000000000..d3364e97093
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
+m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
+fKpWWkpKfHsGIFkfsOX6J83J4GVpaNJBUHsmcdep8YNf1nYDGpIZCxufihQXhuuK
+x9BPm2SUdeyFwUFdxhGN4JdalxZo+x0pvQ6sKO1hQKK14YZXQxLUV043p3me9lVy
+Ubld8kcda0edx3cyhilehib3sZPVhOm8s18GmjV5/ApPnehJN7SueivB2dzzFPN7
+mUwrslti0j2DmTdOImzcz0IT7zErmiV7xtgsgP8jgKEp2LF23VFXuWsKO2yNubQP
+shNDKpYMMgJn0PfD5gwYl8FN9Yzj3OKA5wiJpgPjPl2PveZ/+rOS91bQMG1hFc3W
+v9ZWSisJAZlNQlfyv36rD12WhwQLlupLo0zPlqp7e/i5ZJBPg4unbAYECtJI5Wqj
+Ljhyd0j68QWon1Ripi8ruqXA9MUe7JMy39ZmF3/fLT4rBiHyRVpWkVKjzLlm0Ks4
+f3cNAPxn4FWeTwM+oUzEbpkNpE/swIbR05u1J2y0f+GS6X5t0CSTcHk1VIOnOiTl
+wLzSEJe9hNkBuNJjwM9Cod7dbdorq6Qwd0ffPJoTw1SVkHMPwIjikzxU7QARAQAB
+uQENBFgMcBMBCACSC8Tx2N3ZppqJ03AuDJrBOcNJU903XTp5l37lBl0JiNCDP4+y
+gkCTUyz0/K5YKQYJfyuVmM5q0ydqhQ68nmrmlxqvFxRIug5VqaE7VWhksyNAOROt
+xGi9Lo6AukKH2vK52Vh1uqRPmK44qtB1+bk8DE1YHuht00XB1Awu4ojIt3WKuRpM
+/oSYfbsol82dPt1XpDvN1et2bxeN9qRblCp7u83NRmdvAGiBMRES6yV6n8XWpQFT
+kRYf7wyVromOzz9m81dWAW5Js5QIvh3GMbFMS+2bnT+OVIrnCtJCw0TvTX3xZxyM
+EuaCvYInCZA92frmpHwJMXau7/1u12zuHLflABEBAAG5AQ0EWAxwEwEIANt0/Ryy
+VQalOTDbpaAPCir/Ui6EsdFmGeuLg6TIqy6xyCZ02iY6l4eHTPNxhnDPP4em+3/j
+Hh84Qan01O8sJB/o4ASbijAlvPwFikaJ8Gh/oKc+FO5kUwAcij4f8dtgdknGKlyo
+BFqEdfzzAEiSlX0G7biqrqD+mR6YM3eFbBTRKfZVwnwRMjNIN8n2FUUpvMKcGe3v
+34GL97e9qg+EMIBZ6SJxdKaMtvAfKYB6XG3UImlBQdYQoS8OjKJjoH5M7NRY8qb+
+v08M5z94z+dZ2mF56zpWcIlocYIT4eVi/2J8htykgxIBBWiNPfyYLrK3r2h7GtS+
+0e2MbwhhUimjOGkAEQEAAQ==
+=+Z5g
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
new file mode 100644
index 00000000000..38f48c56106
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
@@ -0,0 +1 @@
+fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
new file mode 100644
index 00000000000..f6e3fba880b
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
@@ -0,0 +1 @@
+6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
new file mode 100644
index 00000000000..f8b377469ce
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF8tnmMBCADROe7j1ZvgiMgfsQKqCSuSqgMkfMT2DEXwZKdHqkj0gfx8MPQg
+OP1pmMgpIwIXKr5kZ9KMGiGULNnS+WU2SNqjyKeq3MlnSYW5Di52MoAD7W4cHmry
+8ekaasF/x0AS5Q3M/6X/EBOD8YLWaFkk+h5x8D4IOSqiOiWH8olGjY4ZmGblaldX
+PLr7BWSrPKQ1QDsoICn583Mnjz3YLlc4p5IKnY2wss1zm7/gQk6KkdL5bRuASxLh
+to2adZ1LEE8MQfHweauHCK915RmMg7W3KW66/EsuCyEwZKBwq6rIpAciym2FngJt
+CPnY0o4IMFSasV7d1xSH5N4jeHL3Hh2Yd9tHABEBAAG5AQ0EXy2eYwEIANZAQd63
+jnuXS/btvoRXGM1kwaU0j3f2jeTg12sIGCUiiM4NcD2OnxWSKwvv6SWuk4/W+ahV
+3zQuTR8ZI51kNwgxvNZYKFExUyRjS+B4Oo6ArDSPp76Kyo3+82KmPaeHxxibir4s
+HoZUTSl8UKyszxEUV7BE756wS7DRHWpeE1gsjClFXc6/hnEOnXIzsoAdIFzzockf
+LW3guouh+MD5EE/x//rYyZJEotsPCu4vP/TanR9H6WnYOIn8g3jSUarV9LFGNcxN
+Ccj5sh2x3tOVjQBtPpE2SUEveLj3aHFTXzx29rU9kzSzEAxlFdK3pwUK/P+MO+V/
+qMHoOY3XwTZp3nkAEQEAAQ==
+=lsuN
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
new file mode 100644
index 00000000000..28f7bcf5d21
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
@@ -0,0 +1 @@
+7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
new file mode 100644
index 00000000000..86601279642
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
@@ -0,0 +1 @@
+679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
new file mode 100644
index 00000000000..eff24e1bee4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGCGrYsBEAC/Ws37TXMujQ4z2ioXlh5SlrWaCzdN5RSBAQEKaiuuQeuwdWku
+bsnhI2f7YgxfJh2if6hCsGeWx3Wd2paLT9IqJbnIltOzHQkYXajIJrJVDep31wQD
+FsjQS8DWdRGkrldc2ClWZs1PAGC4Snp9bNYrnlE8Z1uHVnmN2R0aQ3v7PGw2qpQ9
+XxsQl9m30hMDb4IZBOKy92PC+xNpb6dgee3HJ8uJ2t/nTUCuP1FsMPGP3crbK9po
+UOUigIWMKNnYTyHbx+p22EQIn3iKQU4DQTeZm1/rUnfuULp2Zhl+fTs6U/czCrdr
+7DN4MCzthK7DMhDHH7/uVk53+e0oe0FJZSxYE1ppjvLz4Ox7xMHrlOMFIqb9JOgn
+exUDV34KcPByHqY4ff7IL94Tx7YAwEplnJYBEfb0sYfmjai4PCFj74gjjCmhQUm8
+5Cbm23JvDGck9W75wc6qj7wcFpZrFtfpOsz10YsprM5TcmK9rEIV+o+bRqoNs5hS
++heZmdz7LoWJgarJnlkPjDDOXW54bA5kS8ARlkxllzZ+f0BwaN/HBNbVv3gkBHUX
+YOxphjESdv/WByNQMgzoIBiUt02RqAJg9PECLJSjSfFzd2F9g7Lmc0TUdA/kLEZm
+DqgrDjPkfkwnSqCglI38Z/gcVoSDN2iYhEIfuGoZXbjG4IDVuFYyGZjimQARAQAB
+uQINBGCGrk4BEACTD/+Nk/tDzN3viBmw0GvgWWyeyfVKuhXTYgp1NA2Zugcsz9ZF
+jzQegH+jwekWc4JFSQTFHpxqog94eQ7UKzk3LaYeCMiPpuxyxsY8MSZooAOcysRa
+bkvVHNLFhCKiiTu7E8NkOlCT9v2+f/1aatFnM+D///1/RTR0MJ7lz3EuQWtC6gC0
+MQBydHoN9Ofov07j8RSVXBBf7TfZjl+uYfpYEkP5++bnWLw1WMv8AceaXyCjoJ/3
+L5GfrIHoNmpRujj8FLAZV0YOdpQCEwMn6gfJrcWXcPLcg3vmmYLhOWqj9kZoqE7N
+pejtzp9S4Yi9wM0ZTG+TTk2zec7dw7RstxTLEEJ8dx9IyXAkoNf8etlC9f9KuTnL
+K23lsi3cvjs58WzYxtl6MQS9x8U9QBlb86K8GMDYiwRrPyDusVvzwe0lZgrt7Sbo
+QP5+hD+wY92tJde9JQbYSVcIQwgRGPZGYIZ+DEo5g4SWBVp/y+pFTVd2dFmbu8D2
+RLunI+hy7zjBEXbdRCxhyI16/lGG5wecg6Y4N26w3trUHymeTdAPQ+5swE9F2MTz
+1D/FQrrb/pGa/6FcgusLvAvTJNCK/NAQNWx9ZJ1/teGCO8n2vhPi29950id4V93H
+dLcCy2PBAL4ltAp4gCBjXXRXZuou2jC+syfB/o8kln0/1sblBVlheopMbQARAQAB
+=XO0W
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
new file mode 100644
index 00000000000..5fba3d86fbd
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
@@ -0,0 +1 @@
+31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
new file mode 100644
index 00000000000..2aea540087a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
@@ -0,0 +1 @@
+a1885c07a3204611fb184ef7098a31f381819057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
new file mode 100644
index 00000000000..52dd86c65c0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
@@ -0,0 +1 @@
+8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
new file mode 100644
index 00000000000..4dbf1af5455
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
@@ -0,0 +1 @@
+d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
new file mode 100644
index 00000000000..de648a3c373
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
@@ -0,0 +1 @@
+ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
new file mode 100644
index 00000000000..064d520bc4a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
+YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
+nIRoUHucmr10Xftpebr/zaJk5oR8RdaL5FapapmcZmAaHR9CDWB8XtI318u314jq
+M5rKatnAZMERoPugOvvuAOz4bfZKwdfCmZKfYUM/TMSrSinXrGExSW6z4RhtqmpC
+E5M/7OoVfvDynVJKqNazqgigpmMNhOyzAhQsiKh1K0akyxTZbjeZKsdYfhCXvq0q
+k9+KM/cTllQ54MPnFWiObLkHeK0Waw8bI/vAJ4h4x/XM9iGYpkXv7F2/FVsHQdPe
+YJcwD/CkD8KHyiPaRKMeApiUtZsdAHU0L4X/lNmcooea/7ipskruUgwcm+RdLhRZ
+P949t1e7nqDZfpEHy90NiFxmlRAPSNqBLwefxY/hwBgog2jabDALJVcLCMosFWPj
+MQhFlGSIODiVcW8folGIjzkyNZbNMWkwnl2QnWp/h2TAwYQJOMqcv2MG9o5pyzpx
+97Iz1ngq1FlM/gJnGnNUydP2tAjT2L2U3MP1uX/EdRChdgPqdolqYhdFfwCr0Fpf
+W527bUZpReHCEiQ29ABSnQ711mO+d9+qM6edRyHUoBWz89IHt8sCunuvNwARAQAB
+uQINBFrKW9IBEACdAbrfrCWIQ4uRc3rrY5lLpDPb5wWW0JZuir2hf0WcDU8edNjZ
+wC3BLbXhF9ZnGSODpK1q753VZvxOwX9JQ3d4pFLKuQDGVfS/nna+PfGaZ82yyVBf
+jt7poRZnR27QzyPDv9/tDGnQieQF+lDCNKDgQKgfhwDp04Ukh3EG/x2BLgr3Qc24
+gdr5Bh9VJUyMbA6MP1K3o/CRuDWwt50hNGjn0Fu/QnXicT0t1ZsKLA2uQOvbiNN7
+B2CsNoKk3qaxTBwfUTSdjG4oB60cSLY6mAGFpjdFDpA9AHo3LC+YPTFGWUyq7iFK
+nvSkcW2bwu8l1Y6wnnB7cqKMe5nMRsFVNOX7YOE0wjQoyiH4/86bI059YPwMvg07
+elW/6Y8Nmfzb95nddjX+hJCunIloIGNEpqxVO1+ID8WBipOaXqpkyPLqLLCDzist
+7MQuBzEce+OEAp3gJ/HK4IKCcZPSJEsVkrDjhmY5So8OTK8ZF10jIdqDUrtRoz/Z
+QyfqI8zLtdZxoWIfke6HPjdKI52xYa7A2Th0PEd3GbNKOmzQfl2R8JyI4WERzngA
+VwYRcJYde7FWoir+HCpOZWXVFj49NxBQg5/HfpZbWLElB/xOlXFRuigry+vWM4UX
+qSGisNehkMk2EjZUqiZanxjfwQ8bKJQ9k1yeZKJ7PH4yhDABt6qMUwobtQARAQAB
+=RHSx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
new file mode 100644
index 00000000000..d437fadaca0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
@@ -0,0 +1 @@
+b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
new file mode 100644
index 00000000000..d2cefd5e889
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
+FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
+J7VtuhdhIE/+rUiE1go2vkQhdIaad8om/kQDsovbgqxfX6eU2hWL51bJZwCg59D5
+0lXm78y8dlbvGaW0EVdgBesEAJ6rcNAA6rjsi7BUXNIpZe+KF/G/slcLJETgylmw
+g0vquZP7n0fVhZZqB68zSmTcukxo36rd0jr9eSlhPj/6j9xs7gpk/UFWLWsziZDO
+7kZVLv58v6ktK1Dk8u0F9o75pDBjgxOGR7VPVTblur1dIJ+U14ffJ9fn6wzKY8hx
+hZrgA/wIpuJ/aSSns2ccKsErDMPRJP/TGygvrb1Mpfk3tLeGF7owI0sL8L8adKMK
+g9kT/8VFoLzeSeEwUDOKDVm2xB/A5pazoUcgxLdwYs6g/XJzA7y4Sbfcac2W5IZ0
+4WGGUobf5Gp/b3NeVuff+V/2UN1YIr/hlOnBOMQDlNie4loQhrkCDQRE7zskEAgA
+i+8rrcd671s/hYlH3mgNtPbmb6KY21axOKIkwqwVdFoG5nbO5SssW99d+naj6UDJ
++x+mbF8zTb+0uFgEnHlrhjJ3cOSzuSPZ2UY+5X1GJn6tkHN4e9knyQzoAFKNoCbn
+YHzbMkEEyKpziDzcyAuFHEKp1JoHhXD465eX9b/RFcSaaXmjttiGn8bjGhgAiRXD
+5GAP/BLkD+nW0psTbLTraJ3GP+vVka1kwnDN0i7yvpvdSjntNi5xs+tljAtePbs4
+ogWQBeQV3xFD7GwadVhH/3yHRlISuEUNRO/DMK4YFsDYjU+zaBLk+lDka38QnAIj
+QYxhe8eypB8EuiOarDU3dwADBQf+KBZfOx/iCvuPcV3LFiUseNOAbF6xRbmAoJaq
+lxIy3E8fX0oiuEp4OVHz8U02BLsBtH4LIpiEj2/gyELx0P25GhS3S5UtfkNvcG2A
+fNZOtNlWW40GI6gj2KxyJqOaXAkfW+WcPJrgd+gH+9JpJzVfoTJyqkq6r61r6UNo
+gQI2nrhroPjv225TyA8xFuTyShdhRo0WoMP8tqZxDiWXsGzdFciPaLJ3GPwevVT4
+dCpbCvR2XHh/vVuytwC2p84O/Wrh9TUoT35Xe6vY2zkgGg9adhXdj47MDZG0BWqF
+s4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crA==
+=2muo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
new file mode 100644
index 00000000000..b22da3df4b4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
@@ -0,0 +1 @@
+82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
new file mode 100644
index 00000000000..e53a26ad84c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEmhev8RBACz56FVQ9l701+PE7Nr6+6Lsoy5tK6wmV89pEvUDgDjT0VTs4EI
+dupAk4a0dLn8Lu87AloEYuSzbCxv5cH5vyDcvLDK6g3/sRC1LPQPydD+UlCvG8LI
+jCmzJYSJj8joVqTBLL2RBdR7xUie34e1RTvAM5b0UHnnvmsvEwwFRsb6CwCg7VFi
+5CrOZlhNeWcWqSpPZCTV4ikD/2xEBh5fUlpfo6qoWeYx2pLg7X7TIriD6IVSREmT
+ewrVXK/C5N9jcJ1zCERjkPOinyZh11MX9dau6M7I+72bapVj7Za49VHiPutDCb8t
+3OPS+ksddfTccQw0iHGDjSusJM+hX6wmHDBgY++WBCYX9TkZxz/cFutqOZ+HBYUW
+QiEjA/9p5vk/gpSB2UtmUn0StfAnwsqpiiwV4weS3sbn66qRYq3jbbAjS5v+jGwf
+KZjPpUyBitKW2Jx+BgPnFy6yk+u19gv7MOiKwikqeDqyF6M0fAjJflproQFLyHZQ
+7YFfIvhB0k76t7qSeCU9MA2wbU/DvDS/TmsMiMFqBuhjB6T8wbkCDQRJoXr/EAgA
+oJmSrlu4uHo9RhCtUmSNOczGf922j95Ldou20NKmRKd6Mki9dGdCt/TJSCaWFULf
+oQ7rKDQy8IRrP18xaJ/KzhG6fjh9uuA0v9x9ORsEHB5Xih3s9gt/TqC6NWeOSd8R
+ZeG6Y6SgtFcA+5a3UP9yFSXo0xS2It48f/ClB1/I1V+iQjVXC3pbs3LwGJlaclNE
+V8ROkXDhyYPwW6LQkWEDa043dSKCOFe6FnytD/9vv92weOFe7pSltEJiHjz9qpZl
+Aq3CANsjqsqqZJU36+8rpyiJfSiHXcdjgCiDQyzdQm5HQl0cU1e1+CabMrL/8+9X
+6C1a4dSXu++NDXgbVB5hnwAEDQf/Z3kUqSvprtKZjh2orialskkQ6jQlGTSCoX/o
+UAsBvnsVSdP0CHUnI0mYfIh4WhuiJwHgmvTfjrAzU2Jfwww9glw6OlhXP4mgvM23
+rF/Rk/gpAaUfweSy6TYlynfzFHQ6HPIYEZqGmLPJ/n8a4rsIGSWcW2+TC+OEI7Rg
+YvC+LJuoXToqn2tPQ3Av3JeEbO8nenk3SJtrR70cu5F76ANJwgCuwug/ylzvM774
+DuXQd4vPFd4jFxvj/AvKs5itQAGRaInfCxn4uHcUZc2WiGy7T28CpD1Q3ptUybs/
+ogyDCKa/xVHKXu9wRF4osf8U1DdDpjfabdKWG1+RMbx08zH7dQ==
+=WcKl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
new file mode 100644
index 00000000000..2aea540087a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
@@ -0,0 +1 @@
+a1885c07a3204611fb184ef7098a31f381819057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
new file mode 100644
index 00000000000..b669eae6ab0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
+wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
+ZXaRUHGWjU/lVwtOk1J9GokIFoqtWqBaQMgNRTyyHKWKpb6xxjlzkrDqV+a3htY4
+xNe5F24QLFqf8QiiLq0nDENPzvTNNerZhGuRCHtMgV4eih2iNzmqZL+Ug/gmNzyw
+vu6tWGNw883JQ2HoJr/wC8blJvDJYiOcahrZ5enQKttNKXHiodvL6CTP6q+CTa5t
+EQwbsUAih5tndvgwKkpqVM4aZvFTmAw/AZavABEBAAG5AQ0EV/NhAwEIALdwrp4X
+XrmQqdUmtSx3suIoWefd7iK3wUY4Jzb96MDOmHycLoDorhCcErhX5OIhQfzL+lNL
+xrasCKsNx0ymsVKMRQdMFUHbPT4u4SvPa6ZGYcipj7Y2ARU90RbVHnGneV2PNt2H
+sVJKamqUsdemACLjf9Tr3HVRNJe2PMRoVRK8GtD9Q8WDxVzbhnKh6Xvj2BrWfb6t
+Z0jpv+EFIcNyjAAtIedA/nONOhKnaOZGbfIk2PknXvCvSIs5Uq/bUcauF9mmtluK
+t9k2odvmZufup7rM+dSxI3YmxQ72cuik1LLDYbKSp2B0sHxi+uN4YMw2cufKso6T
+Qv9rSUxjx+Ee2gUAEQEAAQ==
+=f5pB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
new file mode 100644
index 00000000000..da7007bf710
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
@@ -0,0 +1 @@
+1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
new file mode 100644
index 00000000000..6df408b8035
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
+95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
+Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
+VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
+5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
+1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG5AQ0ETjlN2wEIAKRxUnYM
+McvAl+AzYn3UUKKaxhvenacyhuxNZzaPbC222PTZd2wAe7jzXNYA1acb4EuJpuZN
+xdx9ijHrNl2LzKt+J+z0N6/5XvoDjON+2KVgOEAHUGGcVWaI+ZlXCCNo7w/QTvDV
+C69VcrwSblC0zjeLDiiDr6pxiy1tD3eYoLpICgcahaY2BnyamnRN8qxYjidc/g5C
+H7nYgZTaozn9Acyvry/tPDamnv2xAJz1MFnRsdkCPkBzVYyDpR0XtDO1ju52np9x
+Hc05Hx+TVDgof6PGi8n8cB0q/WieRQk7F3UJJ/zbTRPYoDsi/hOd/bUqECShuI9z
+hbIEIh/0V9SmrGMAEQEAAQ==
+=/hzd
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
new file mode 100644
index 00000000000..86601279642
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
@@ -0,0 +1 @@
+679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
new file mode 100644
index 00000000000..3b7f58c1acb
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
@@ -0,0 +1 @@
+dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
new file mode 100644
index 00000000000..70aae820c67
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
+9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
+M6mGWsr02oVZCKdRzq0sTa8qO4UXrAjfciYoe0n6sc5e+URIH0Cmd8p60AmpKPaI
+L8/dyfDYA0EY6VVJgYlCa44IaDet7xb2VvwNxbTmvZ4lui/U+MSt8IDaW+4g58UH
+7gkRGFq4FK1a+cwBzQsPRdeEgAXsRZmCIQPt/Eti+ZF0XmLe34kT60lz/C+WcGb5
+h17NYkxERAhvDET4xLykSW9y64GEYqFVUvypqYpGk3xQ5Ly//stai0+CzwPDbhJV
+HZVWwyy4zCH+WrbAtoZSIhbGJNBryPVf+qV7e4kVdc7GTMDy74myl1d3W7v9XBWZ
+TGsVAXfemH/4CgznDw7Zj/xD5i6wnSd9zeX8cLVR66yWOYxUtFieuLzRnbbUEKAB
+Rf3uLWOLN1eTgfg3/w7lx6dn9PLvWzOIpkeLF3UHIW9iYHNhbs9lCop75o/YR/g8
+5t0p1bIm97tCKmGZSHppH4KmWQTHLaBG73H8RYCXlvoiwCApleQPaMT7q4FUJr8U
+Utu6YNQgzoE/xUOHAPHO66DaVvAjR0eS1ge9wf99CKWSnU54pwQXo9IGCwARAQAB
+uQINBFu1EwcBEAD1tTlKuxwUaoEm3Gh8lw6MR7fnBgiUZzED/W7obyUpCdflOSHA
++tgLkjpbz7azO2a0beS21NkXdx4yOhJ1Yv8wjCIwmoA1HGC17SHiYXvKM3TovEFj
+BUhVpJxOMrR68GVC8Bx2r7zRNnru9fXzwWPkyq8qPOhqWqf465gXxZnn70qqBQfS
+sSXq+9hhVGqPn8PfTMUiRGb0O/8fUxL/bLDva+w1/hSPAMgwIIHJ8Vc62dHNP4be
+wV1r8yMjNZlM4mysm+yVhgFaH+WgTJm9HSDSxraFptq8QkAhIpDuRXORGFMm7Ain
+sKzUuMkgfPmW7sk60/1RBQ9MmKh4ma0ia8OkG58jby4yyNCh7TLP56tzyai7kk14
+l2os2Zr1ytBbSmXp3HKiHO6WU64Sa6HmAyqbv7+gP3qHz8nj+UtiWn6vo7e+Pzcp
+ejxcQUEZ3hyWGViQiRHJ6c8KDQLA6YlqJ+WZrzemy8Km7qudlpo/dUnjp9UzXeOL
+Yh8GIcAb0bfFFcTTyTYhD14DcBFCiBGLcQPiuPzzP7kei7IHj+7b+VkiGQ4+77wz
+shjTZrhA/P/e83X/QeGmfHGPnHOXFPHeSDYLf8sroEnG4SJcuoRXEavDeE6/b5yb
+3JgB/KOfScavAUk+MNHyssuSpJDpuLGb5X76qnwCGxsL4OBctwbGBJNU2wARAQAB
+=Q7gw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
new file mode 100644
index 00000000000..de46195c1ea
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
++cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
+lsq1P5bi7RQyJmmr0JDQ70uD2i3zIHMjqLKgvOMmhXnOnstCEQR0xPauEkkcHyY9
+fSZkpoD+c/i+1NvElX8/pgf3Gx9gs2jSgVJ4eREuvTm3j4ro+D6oYRbdSFHn7+RH
+1GF3Dm4pgB9b/QQVgOSOQGrn0OGyn6zGDbc06JyOQ6EdzLQv1bzl0agLO0/wVGwt
+r63HSf9C1Fy5PmcLqP3A7e9vMJ6NYCYhfj/kXdg2YyiW9MrkD30aHg97Gpqy3/jI
+emSmu0tqVqeFADS4iNXyxnpPO7pNorGmyYvAN8ONHbSyX2zL9RusEIvAbgPWZ2sd
+5UpwSg5iw1tBNjpbprPgcRzNgdOnlKYvHcfETvVM3a0g9pf5/2buMCKijrWi6nTk
+tJ9F1xXuVKCzY++AyQaZIDnk6m+bOPxUWvcIPdqxrm3IGzUcHAU26bD8nvWAKStD
+sIlf/9C/+Wa4wQW6R7Q6NGZBa09K8MRAuesNbannvczSoCKS0npTLfAJX7KjNh0+
+ycagnocbhln1I8RuRmvSMbTD4npX7rdUmDFGyTQvT7WmOUbn99NC5arpfwARAQAB
+uQINBFHtw2cBEACjrJ7CmtJDMU35tIRODGY9ze3AOiphP//XOOfri0PAxL0NJtIx
+K4rslBZI2PkSJxhl9fGEJ7gEzmsOmaVZSlN2GQvHXjw7G0SKLNM9UUTc6lZvVDEd
+UKS9asycHs8jisTrqFEWj86aC2AunLsehBXZNPORQ5k9aqQfQqT8lZyuA3H2ypcS
+Hmq252n2oa8f+YrbQ9a5DOdySZZ/7TuyXhQqCIB0u0g9b8bO11zP9y6xc23Wbi7W
+bbSR2416/vsX3Nmyle8kqZMnn4vXIJLtsSYUgVTRMuiVOnz8xkNSM9MaosA5Owhw
+a94ZyP1irC9UHynK6oVun8ChhJmCzub1sOqc54CA+XoJvYJ80EhQpnvSoeLgqgJR
+VfVdbcAtgr1vbYfoceJ5lqSs6TVeEmxQ9iBMGAxSW6yU2mnJojBY6tzmYq9ZjCNS
+vORMGO6ZpcmZJ/kGhahN/hyou9AqC66GdNf55Q+OwW80bGXghQ8NwtlNr5cLtv5H
+R/zQX06z/ofiUmAbc4PA5uDX0CRIe2y6PK9cIBgU5YVJiQGT0yImd693J3uMlX/1
+YcWnXHbSD33CZ+xywyLX/vmUxUMqC8OFZ7GSVUK4wVLc7Ompieyk/QItqFOZ14RO
+QrOcOXA+qeYKpfkUPKUahDO07nzdRp1ebEd3A1PWt8iSvotNsHE+xb7eSwARAQAB
+=weyf
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
new file mode 100644
index 00000000000..e42d6f830e6
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
@@ -0,0 +1 @@
+0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
new file mode 100644
index 00000000000..e42d6f830e6
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
@@ -0,0 +1 @@
+0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
new file mode 100644
index 00000000000..bd22f88d8ad
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
@@ -0,0 +1 @@
+28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
new file mode 100644
index 00000000000..f92ba04f93c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
@@ -0,0 +1 @@
+34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
new file mode 100644
index 00000000000..0a0d4c846cf
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
+R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
+kaIj27OJgbziFcnMAtvGoFRfaPI/7TOwEw3jT7B87RXeiATX4iL8fzMUmkfZm0Hk
+qjnepMQeaz3KzMY4DfBcI45kwzl3EIBFIlk428mhBU5iAAANoyPsimfqEPRCUDjx
+vT8g7PvpkBdNZgRS6R9vLxyzKi/f5KswZIMvop/pRXIhAKDhCCyr2GD+T3JoIKp9
+kvS1MQucWeX8+TFWh5qEA3e06Xu0JSdPCEej0BH06EiTMsAOU5bWqgLAO9DVpS32
+I092KAuMJlEPCnz7IGXVkeNY5KYrlsmoKrBO3GF/zsCyiZDvSULkVJcrtBCYOrgq
+HRIzvJWQaTJ5V15MD8CZIELyjCGZ8Jy8hdZpaTjYalw0bUq+yRAqMD5slp6A1tnv
+jyqVTgU+yRGq2HB90vJ0D3P1w4xRDuNF8c02futO415Yc/qkyh3/5AjGSoocrlfX
+cMreJXpQWVsvXn3NsitjsA6XOJpMOgipCDxfvn8SSLl9fWNJf55j7fCkBokF/lIi
+81RVQbyjVCOV0OEqHJLP9asPHyAFvUppNWtcvViPxVmb52djnw/x/61WVQARAQAB
+uQINBGL4BxIBEACwpcarOeEN5TztQDTvemc+DXZuWirmHv1TyJmjOhU0hGGMzEnK
+KU6VZlUIg5YQNYknUOfOf/05pgQmsEhjjI8NBD3Cys6SVQ6wOlkA+KpDKs/dXwyJ
+ttYE+EG/IMzjwZW2DbF50HkmT2VK/oFhRSf0Par+cbVQ/mNLAVC7ueZWBVXldezq
+Vvk3tDYYZef9T8Qlf999LVXFgiMzRFrzLLcd2KEHAX4se65FTxIfFYYCrshFIKDR
+i4IWNzQqtPV7mb94wXY0Vwse5mMEgjmieGPjBGYne2JU0xYNBxtly1y3aeDXcxNl
+NrcS/Ake9AqWAYU4agtocCefb1pt5Q3li0qg3PsVKDJ5qWDceb+kgcUuHgtwHFCV
+ICoQUMsv9p5F/kWL38/OWcTR2lQ4tGerE2dmlyqFWu7mpELckAfXSpJobZltUbp8
+CO679g0lk+OJWSmxddlVybdXCFaAeOKQb0woQOkR1vo2tJHyGmGr20Eea+UX+kdL
+ojVQwYCqICdvnK4YpHuhpT5crzk6lohfZpBPMHdpR7FQQZeQEW5EbcFNfoUEwsgb
+2qkG+hQIL5Q7wRajHkGaG3WuhY2xEyoHuLSb20hP5hI2uhtxswUl/+IOjjZtDCjz
+Lz59Q+ADkDZYM+PN3eR0UJDqYKly49KTuz23zLluNjNwqo8K0y05XGCQMwARAQAB
+=Gshi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
new file mode 100644
index 00000000000..bd22f88d8ad
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
@@ -0,0 +1 @@
+28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
new file mode 100644
index 00000000000..929d8dc7992
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
+85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
+9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
+JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
+D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
+3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
+LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
+AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
+o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
+TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
+nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
+uQINBFsgsskBEACsFJinwgOtkIicJPjQB31Zq14JOpaUghMQowvEb1oLe0erqS3z
+nShS0SzUeGsmyxff13Fua7Jnxe3k6J7AN75yLHyx7S2syzKFFYI/Y2Y5b43MVl+R
+fKVy+wR9MeONxmb2TSHSLfUgjjyVClWX3PVQnL8OeuBPKiGxSQUgj1TE4mzzS2cO
+TdyL+Vn3akbCIO9I1EaokjjA559VaV4ndF+YlNK7qpaouYIrnfKf9YrAbVUMohpq
+Q7NlKD2lBVMZiFif7K8TceXwMjindlrFgC59JybmiJS9ANuc08y1N1qU5Bxb4plh
+/KIKJ17Yy0H4e9BieDYwYSAI7UBVabRhjS5Xg1Uw9QCDDYpnOxsRRn+BFAICvH3A
+6xelrS7St0JwN4UlxzIM6S6NTZoq1stXH78DcJ7Huygl//msZXdbJQIJzWZd1AA4
+9oqyP49W5dp7bK4hNENTfp+9vRt85ZINE8I/yIz8aNT1uuQO2+tjw4RrWo3cHzyj
+ON3R4CfGWBi/82ireHpYbFUDwWXFDpemFfX4PXOY6gCYVCG4X7skFvvxBmJ0eP9h
+t8GyComD7LgYkMOJzdSHRk6X6FvQ8pmKSHKyyWZLdv+KnksV8R2tf6hewozqDVeV
+c2te/pi0UtjTe/x8/pXMiLmH+3cyyf1PwyMiuEAXAqpu9vSErAoCth23dwARAQAB
+=eX50
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
new file mode 100644
index 00000000000..6e5da6e7595
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
@@ -0,0 +1 @@
+8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
similarity index 50%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
index fd731d816b3..a762ebe93a8 100644
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
@@ -8,15 +8,15 @@ fFHBBPuN0vT03shH2srHjDwQVQLgi2HYBljrUJ4/byip6DKee4Di8qvPw+BAE8KX
 kr9yfoHDyGc1TvZNvTaxiIM956rHcKpeRHGIrzg0t5B2DX8zjFY2rT+O5iQrdQ94
 p5f8alSNjhKp8jRpxljwnmNJQir03UQyfaOArApodCt4zVAT8jc9KXEaIVbZOSJY
 eztmP7C8RiFGtNwRU678guNDRE7pWFmqRmjHyAWj/VU85XcwebkOh+qQvY62fxCf
-oYmgz71fArs8978AEQEAAbkBjQRc8uM9AQwA4p1uJ3vrH7zSq1Q+yNohA7+/xX38
-4pZ02/BuZ+CBnBFNspU69JHRf8gvyineVkAoZ4QxQ5cOdrEUaeqDVrjMVFctNazK
-R3z7KHgVKkGwI1ojJ9O3DhR3K5qObXgybj3BCcxnKPSSSWMvO6MC7QQXZKHN9eRu
-FlqLCUCgbineZnCOhV2CFxr4yfByZ1/UZ0LnuVIqpXxdeEcgKMIBf6sNaJALDPyW
-kpzLmnWu0oyZA8Ox7YirpsXQLjg3Wa/56MBCpjXhStWc1kmV3jSINwRECmjgt5U/
-ph9fdwEKJ85IsjvloSQuQj+CVUYe/aBRciX1s+rWBKkxrFxosIZbln1dgakVxyXh
-1fi5k4q5OtNKDMOvIIMtpdqpXgUizkcxg0DWqDM7cS2U6uwJrEppxlWAEQXoTay7
-cZxbHnTGHbdoVLqxiD/gV09lGzpL/UelXCG28CgStysB5SzW4et8PfbTuGRWLFqt
-kEHT2X1937nUzrx1D921qchHiVjUjQ65zF9vABEBAAG5AY0EXPLjwAEMAONcEBbD
+oYmgz71fArs8978AEQEAAbkBjQRc8uRtAQwA+AWZWc9Gt3zVTChShVQ+31AzAIik
+81XoCt8h0RzjzZldeQrQoAX8haCvLmdlCdjUT6ABAh41OcwIRXPpP/vpu73CV7SW
+SR9DvDtqv1vkevIXsnIGDPeNQob8mam24lx6HtknraZg+St6AAbzmm6B56PALDwP
+iF/lnCAvRhOA60YaUOBX4xL2sXsXT3sV0IIT/prB7d5pElLy86JQP8oy6nRagHn4
+guqrdko7TcYzPVnQvTTo6IC8i42s3p9nYXCypO0kAmJDZ5VzKBJJJiyVVXHS7vtj
+OYjDewKTXWBhIVbUYSMLDsx71zE4sGPZwKQELcwiCBdwWOG5jPYXYe/zZGKvIqLm
+0kimyYkgoyJWG+6COBg35LHe2NYkdOAE0ngoe/NxoQQiQ0A8BCt0nQeYS5n+Lm/R
+N6YFJMO5+BbTfD5v3eQKZQt2/19Bjt1B2ju9nc2o8kBintqVMkwx251cx3ZBpnR+
+h2gBdVAMy+j2kuuFHrySbRKD7FYsNZxuNZ81ABEBAAG5AY0EXPLjwAEMAONcEBbD
 g/uXPlXq3V0M7Ki4LgCGghIHV3mX2QspDi/LuePtBBjV6Kyq1grUnNjfG54mCEKt
 jIq2joRuEOuMVY3KIz64LMJDEuLl/bGmdRxQD0naJ8z3hPK6KwMtiMPg1tUoxWHJ
 jx50H0gJBB3oxLVrKKv4piO1/l3Rep46AQmBcriQXR9JfPajqxLxTBR2gvbza5iw
@@ -25,14 +25,14 @@ LiRuGSV4Nz7KQ3I7OdYRtUyYOw4pDsHtYBuLfkUkhNaBNNDDguzh6OErN/GvvTxt
 Zah6a2Z1Jhr97DAwEenDDH9h8YOThheT13LXHIAj+cL9lMdjZiP7Zpx0coRYXnLS
 9sc/WRiiSz5ArXbPwAEToPyGKQ9iujiWlOBi0XOMhSr+KCRYvGzMvvpEN80x944I
 spuBaciaTDoNBH2+hiuxGCpqZ4C+SzQkcFuDyEHCSuK/ryYkeAhqSuo9YQARAQAB
-uQGNBFzy5G0BDAD4BZlZz0a3fNVMKFKFVD7fUDMAiKTzVegK3yHRHOPNmV15CtCg
-BfyFoK8uZ2UJ2NRPoAECHjU5zAhFc+k/++m7vcJXtJZJH0O8O2q/W+R68heycgYM
-941ChvyZqbbiXHoe2SetpmD5K3oABvOaboHno8AsPA+IX+WcIC9GE4DrRhpQ4Ffj
-EvaxexdPexXQghP+msHt3mkSUvLzolA/yjLqdFqAefiC6qt2SjtNxjM9WdC9NOjo
-gLyLjazen2dhcLKk7SQCYkNnlXMoEkkmLJVVcdLu+2M5iMN7ApNdYGEhVtRhIwsO
-zHvXMTiwY9nApAQtzCIIF3BY4bmM9hdh7/NkYq8ioubSSKbJiSCjIlYb7oI4GDfk
-sd7Y1iR04ATSeCh783GhBCJDQDwEK3SdB5hLmf4ub9E3pgUkw7n4FtN8Pm/d5Apl
-C3b/X0GO3UHaO72dzajyQGKe2pUyTDHbnVzHdkGmdH6HaAF1UAzL6PaS64UevJJt
-EoPsViw1nG41nzUAEQEAAQ==
-=jYli
+uQGNBFzy4z0BDADinW4ne+sfvNKrVD7I2iEDv7/FffzilnTb8G5n4IGcEU2ylTr0
+kdF/yC/KKd5WQChnhDFDlw52sRRp6oNWuMxUVy01rMpHfPsoeBUqQbAjWiMn07cO
+FHcrmo5teDJuPcEJzGco9JJJYy87owLtBBdkoc315G4WWosJQKBuKd5mcI6FXYIX
+GvjJ8HJnX9RnQue5UiqlfF14RyAowgF/qw1okAsM/JaSnMuada7SjJkDw7HtiKum
+xdAuODdZr/nowEKmNeFK1ZzWSZXeNIg3BEQKaOC3lT+mH193AQonzkiyO+WhJC5C
+P4JVRh79oFFyJfWz6tYEqTGsXGiwhluWfV2BqRXHJeHV+LmTirk600oMw68ggy2l
+2qleBSLORzGDQNaoMztxLZTq7AmsSmnGVYARBehNrLtxnFsedMYdt2hUurGIP+BX
+T2UbOkv9R6VcIbbwKBK3KwHlLNbh63w99tO4ZFYsWq2QQdPZfX3fudTOvHUP3bWp
+yEeJWNSNDrnMX28AEQEAAQ==
+=+J+8
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
new file mode 100644
index 00000000000..39f8f25641a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
@@ -0,0 +1 @@
+0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
new file mode 100644
index 00000000000..0629ccfcfca
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
@@ -0,0 +1 @@
+aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
new file mode 100644
index 00000000000..853cff28660
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
@@ -0,0 +1 @@
+2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
new file mode 100644
index 00000000000..a99b5d7cf8b
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
+NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
+/1EO3VqvvDUt39gbaSqMCQNHctnFdb2QYZ7nRFTQeCqG/wyMdB05beqEnWEXzjeP
+FDF9y6gXkELn0lxUm2TKO8tU3h96TCuutDKJ0aE00lOeh/MbEaGHEbIU8kdfui6U
+znZ1X80EWbkCY8cKxEZHKD0aONSVHXwE6nETvFW9/9+K+sj/I7ytlyxwHsaQpi1H
+6aRGnq013VsIECrwkhmXBsLLXNjmhER+LkcDABEBAAG5AQ0EV5a8TAEIAN9uOpE3
+Ua9J/1WSMMNYGpfeEguI/HcMo+JIWZKwCiItISQ/yBEMEPLqmj857P2r5uBv1KT6
+IaJ8m9tU1mvv7zwtLFAQKytUv5mBMBnYuSoAFAnxdiH91M7oEwnmtIsf9g3ps71X
+g2Nih3rtbm5ijH5oKnqR4TuJrt4EdyTbDKrGKQKq9XOYB248KSQ1JG47AuQ6C525
+d/BvsKDVGdpwwwR8N3235rrK1j/wkW7TUb75VXEUc7e+z/9Eg2ubQ7jEo+RPX45x
+3j6HcOWGFG9Fe8j4wp4zS53Q6lRUIEoJmpsUpNWChGmwoL3bllFRKpubIFwiSrJi
+PMPVp1pl2Srg8sUAEQEAAQ==
+=8Tgx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
new file mode 100644
index 00000000000..f6e3fba880b
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
@@ -0,0 +1 @@
+6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
new file mode 100644
index 00000000000..2ee06441948
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Sk0R
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
new file mode 100644
index 00000000000..0629ccfcfca
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
@@ -0,0 +1 @@
+aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
new file mode 100644
index 00000000000..b898fdf506a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
+WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
+anVQ8VL1Z7uPeqw4UbtqA7Or/E0aOhF3zkkmhaiE9Yrp+I3KXWH4F0Cj3X9IUcf5
+Z93CPcEFQx7ajxSJ1xw/mSgbU4AtKZXUdK1ehnFAhH3rcMVW9paFSYaXD8f+vUbj
+hdJOp3e9UYEFShsdwo2X0FRqI318ef3gPDpbTATyCaz6NMIybDgRGo9WOGwF+Ysf
+snXwLU2UnT44kpAzHjFdjZhQGcY1w7d8yGNrYX4qw/RMPhmuVefuF2yodBtRxhWW
+09dwNiIYFVuGS4S03vlnEfYZlhmRgvWZK9PDJXm0vE5GI7LdOKlqwZxvoznjGmUU
+lscRU57DtrNlAjyXMZaGdNfPIG85B+ijJmIb0REHbszvG6csX4g1MiZ+i0WID8Jl
+20YpJTUkkvIztXkAEQEAAbkBjQRgVVFjAQwAqfVaX/iL1guWx10Xum2EWJuCzu+H
++RiAgt3KnxzXtMc8J4QzNV/Cr3vO3Y2a1qf0NO8o4dN4nHHXWbB9Vn5ntG9VHt1H
+a4WDLr7zEDyNpPiEe/sLrQLA5TD28kXIJ4WgDuVEYZ+z1tB6tkcZkUzx6182oxCV
+KHU9lYIxAvQzg+XAwFNoHElCYAQDTryKDxEADAbGDEYGFHM476/MEzz95LqgatDI
+WaxE6RDSBjnjSA44ZHsJGwcHjrmz+RXgFnhQjC/9ywSzNZQNWzWjyS9qgLmIEkHM
+b6mD/eQHrGA5SyvElqIJMMvXrRpnoG1l2FFiNn60wyuB+Fztfx9YgKlJJwdLfmDD
+QTuVInaLU5iTKvZZ9uh8ekajtYn3NUEbvAN1SK8gnWqTRhVIm/0wcBdtNViTytTH
+7CM0L0vx4FZpru7c2KyFQx2G4/0VxIolCzHz2ROD3s2oRTvP6B5r5EdCizrsJzrj
+Mljvw1hp99AnXfJPtNMyeHKwkfxVX8Kxnk2nABEBAAE=
+=iXc5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
similarity index 50%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
index 1f1b50f1926..e347b199ce9 100644
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
@@ -16,23 +16,23 @@ pcK5cH1GnkSrOnTWlnMId0Yg384xOqLf0FF22/crmN3tKWnGRwYsiJ/8gCSSPvdz
 oeymAZ4Qvxj/eQlkKUxSQA9hNctSrn/xIs3cbjb/CDTxAqk8r8JHR1g/S6aI8sG5
 fUeF5BZkTvsDIIzatm0gQPwZAE/yAKBW/Uh7zjBCzuan8fflcXhjwd7buB5q1Qma
 G4VXpUMRSyAbDOYaoDTnVJHX53DQRGzbydryvCFCDkWN1Qc015osGm4XD0Rx3c4K
-M5yYiQW6YjpuibI+NWSWSRVeZ07H7vyIbt/bABEBAAG5AY0EX9FgagEMAMXU3etJ
-iP9HbJB3DE9hRisbaHYiXbvZSKIU9B3zrB+qgadHOC2BTbSBkutFNYreQ5ttsymN
-Xn4mPANMYqbM9rKGfz31z0Jg7UjLn5eDmAtgyTpd7bI0CMfx2fOGS91QfHb4ojCC
-jFMYSDdlQYbNY5UzcLdS7dBX5J7gMesoQXENpvtMR/tS3o7nCyai2HU5w6hYQzDK
-PTJLc1ZfYOzRLEHstYH2z0yiJadVJHzngKBtIHOIlgasYkx3OznEiPACl2rnGNq7
-SoSg74Az9xF/k7WT6KRJ5LiCH1mGgQQzy5lZnt72tpAAAup5I447tz101GEox68p
-jWKFBeV5PL/62ftSTA0JwhGHPFxZazdmFHYLw9TQBBcHTE7WHYOgwJNfz7+pkIRD
-yF6NH5RE1CQQSTtWWNPFQHrQRx64nhzWeIUZDwD4VgXK7Y+eZfgpULElRzlGH8go
-cErzL5R3h+aLk423kBB1FL3rvnsTVVzThMoM+mEyj9r6azP/VWZuNXN5ZwARAQAB
-uQGNBF/RYJUBDADMPdnbVSrdKOMZVwuiqth7m2wT6c0WnP3G31ANtrUI8yqG+0kG
-GiqNepA3AfyXiEc/17/6qGyod9tGqTNkRTjCw0cDfXE3fX0hRoErxFJAky76McyB
-rlhrUOalFqfyDB9tvsl85kGXMBYqDNgwb1OgRPOoepvw/l+j9x1qwZUE3b+VbftN
-vsYMXr9DmOtt4C1KXbdfHt7R44f7vIJpvRdq8SlVx9xg3PoG5GElhXEsUkwE+8WR
-cBMvuBX9Sft00JC5MDypRYKILjkJN1xLJm3tRwYN3RC9TMdZl1YMfIjkHKBMyjhd
-Bh9yhVCme1YtnhM1ix2Cf8cc+5yixBJbrPcEIuuUUzjAzj3G3ExQBT2/Hbp6nOzJ
-wE7lOW8vrbjFagk7/G5Jhf3Djb9cGr+vKE3AmIXwAzQm0I0vFyYBxHJL0ZdQi7VK
-baoNO1U0MWYVEXul9KLFGbK1+/bs61Qv8B4I0IBcTIcH1XViR9Vum+Hu+txQyIGE
-NUZsDd9Rnh3Pq5EAEQEAAQ==
-=DBIb
+M5yYiQW6YjpuibI+NWSWSRVeZ07H7vyIbt/bABEBAAG5AY0EX9FglQEMAMw92dtV
+Kt0o4xlXC6Kq2HubbBPpzRac/cbfUA22tQjzKob7SQYaKo16kDcB/JeIRz/Xv/qo
+bKh320apM2RFOMLDRwN9cTd9fSFGgSvEUkCTLvoxzIGuWGtQ5qUWp/IMH22+yXzm
+QZcwFioM2DBvU6BE86h6m/D+X6P3HWrBlQTdv5Vt+02+xgxev0OY623gLUpdt18e
+3tHjh/u8gmm9F2rxKVXH3GDc+gbkYSWFcSxSTAT7xZFwEy+4Ff1J+3TQkLkwPKlF
+goguOQk3XEsmbe1HBg3dEL1Mx1mXVgx8iOQcoEzKOF0GH3KFUKZ7Vi2eEzWLHYJ/
+xxz7nKLEElus9wQi65RTOMDOPcbcTFAFPb8dunqc7MnATuU5by+tuMVqCTv8bkmF
+/cONv1wav68oTcCYhfADNCbQjS8XJgHEckvRl1CLtUptqg07VTQxZhURe6X0osUZ
+srX79uzrVC/wHgjQgFxMhwfVdWJH1W6b4e763FDIgYQ1RmwN31GeHc+rkQARAQAB
+uQGNBF/RYGoBDADF1N3rSYj/R2yQdwxPYUYrG2h2Il272UiiFPQd86wfqoGnRzgt
+gU20gZLrRTWK3kObbbMpjV5+JjwDTGKmzPayhn899c9CYO1Iy5+Xg5gLYMk6Xe2y
+NAjH8dnzhkvdUHx2+KIwgoxTGEg3ZUGGzWOVM3C3Uu3QV+Se4DHrKEFxDab7TEf7
+Ut6O5wsmoth1OcOoWEMwyj0yS3NWX2Ds0SxB7LWB9s9MoiWnVSR854CgbSBziJYG
+rGJMdzs5xIjwApdq5xjau0qEoO+AM/cRf5O1k+ikSeS4gh9ZhoEEM8uZWZ7e9raQ
+AALqeSOOO7c9dNRhKMevKY1ihQXleTy/+tn7UkwNCcIRhzxcWWs3ZhR2C8PU0AQX
+B0xO1h2DoMCTX8+/qZCEQ8hejR+URNQkEEk7VljTxUB60EceuJ4c1niFGQ8A+FYF
+yu2PnmX4KVCxJUc5Rh/IKHBK8y+Ud4fmi5ONt5AQdRS96757E1Vc04TKDPphMo/a
++msz/1VmbjVzeWcAEQEAAQ==
+=o6L7
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
new file mode 100644
index 00000000000..43a7a8a00b3
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
@@ -0,0 +1 @@
+e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
new file mode 100644
index 00000000000..497c2b28828
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
+lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
+3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
+FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
+0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
+UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
+0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
+TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
+W0JEQdCUVgc6MQEAEQEAAbkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83V
+rlAQcR2WulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9z
+qcRArx7aSaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpv
+uq1ZvL3ndApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0
+JA3MHOk8gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2
+Ul1C2OI+tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9Rao
+gEyFmCxiEuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkG
+qgDBQGC1PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gry
+q/vyQLg/KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAE=
+=9mb+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
new file mode 100644
index 00000000000..0bf7fa00788
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
@@ -0,0 +1 @@
+253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
new file mode 100644
index 00000000000..38f48c56106
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
@@ -0,0 +1 @@
+fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
new file mode 100644
index 00000000000..cf5e8eaf9a0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlMSXMBCADcgN0/57D/gU5cDobPiRuDT6qAxb/NWhQiqwAocKd274r4gPJm
+RbffUEZEgKhjH6l0CQfilC4R4x2QtU9sNC9kB/D6zumoS1uI0Hmx1pC4UseUy55r
+20WDxujUQ7OcJbpe2cDcQVKmMok2top7ZJqt4KVosQEeT9jjsgBBbEtg4cWb5ddR
+5rf+aJw0v/6dMLef1r9YAo0ZtLc+g2dyacqw73tcWEd3oCH++SgE26NntN+GibZu
+VXSE5u6xI4KwfT2vUT3jt5Fb29myX4sxsfB7n/xageuJYy5ms1ABS+WDO5ssEZC4
+eQEVL7eyIb9YhNAW/WtjeAuOfOKNonoqKFGXABEBAAG5AQ0EWUxJcwEIAMgrP3U+
+7YCibxSQKOZrp63RaSUkv7mCvQ3Lx4P4ZD/sDEsLOiKkAc+ZU7ETTIQkEpHaibvC
+ZNrA+R0pfAj0LYBLstEIkUxtAaVM4DBQGN13Zdup46fI8rPZEyZVb2XpZ/qS4RYi
+StFyJzUdazBJs/IB7CT0xp4DUFUOrsykVy0aWzWt4z0QBe1x3AmpAO/DdrDN5gvt
+mWzWbV3f783PuK3g41ju7F9XX5nuuatNSNHOHt65XL4vmhmSfXuP6UFjK6MKzq9z
+pbZD4ipUPoKEId5ONDSucX4C8OydpC8+rFWJCDDDvocox3/l6TzihQXf8MDDcB0u
+1TgDPz4M/S2vBh8AEQEAAQ==
+=Q2Ek
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
new file mode 100644
index 00000000000..0bf7fa00788
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
@@ -0,0 +1 @@
+253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
new file mode 100644
index 00000000000..5320cca32c7
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGFcp8cBDADrrm+f15GNXnwAneAT164q5fCsp5CifXMPUDAkApC4o/YEC94D
+mIiKfV/RLBoH1gcXGgiHeJypRvCY94xQrFl9lHB29+8riW3vdYCy6rS07GjfUxu7
+bKOALZ9fsnOVB2B7A+i0WUlNXgBPfhu7KSqQwKG912uaTa0IWA4HKtC31nS3ZvEw
+7bheDBBhOHih7oxJLibcI6KZ8NURFpl2ZeEcxyBJYo3MrQrJ+MWoOrfCoC+r5aq2
+nL3DFb01WkA/2i9/noWyZNYAFlDQEcLkjSdrc6rrfKYNf1L1/855ix0eYCP3UNOC
+zHbtZ1FupnjHEBk+H0CPWgwj9QHb/9AF6rP5gVeSYrnmzjsBDd46SEaEdRD0l4Pi
+ubWxZj9i1wFlPKmD6MR4AXJ441IUbeWFPzaBmjsCUUwMjTyTZ4WSyeko9SGGzpdK
+kUnnw2guvsKtBvJhKKvmkAHc5p7uRy0aQ6V+rAvbdWARbXcAY+xXJ+A/7qAxUMJH
+mvijGOctRMOBy/8AEQEAAbkBjQRhXKfHAQwA4//n/Vw5eMdFUFc7+b381d70FhF4
+E8PyDMFqYpi1t407FhNt+zsr5qPPVw9Nt5/fKTCvql/eNlNcTV4+eFUl4VuKQU7f
+dvR8LmLjAxG0fjUoHL7PzIV+Iae4IBZz7l12BvCaA2mKPHTPyUOZifGkZZGNFtp9
+rylKc5UEXJx9J/H3mMDd3fIQwFaftzRAoH9qKEFDgGjPOIF96XIrlkxGyfvwcCVn
+hLUGrox03zdy2hm0QDgv9DphuGeOc9Cyld11z5OT56j/QsEqQGJ97Vxvwsyh/s34
+rLIQOxIxp6p4CvhGiO52V1aPLcKfMYjr1rT5e0b9W3U+jHk8hjHIDPELGAm3Kmxb
+KbjSWrFANpBk3+OqxCmb3eHTlIObWPLuTLv/tJGB9G7xmkNWH9UM4zuCrG2f18YK
+lKbLdd4ezVDm6odFPYhZuDWNkYfk4jugFcpHZ9C/5KUJ0+WFkQU8kCVg0mA7Bj5r
+5BoONdNm3m3C1zGrtxzAiSq7qzA/yxCGxNAxABEBAAE=
+=5u/h
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
new file mode 100644
index 00000000000..43a7a8a00b3
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
@@ -0,0 +1 @@
+e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
new file mode 100644
index 00000000000..bfb194deee2
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGL3vDQBEAC06DyZDdCJFMDH2/J7zrbhN5oJmYpM/mkwmOjkHbsIMJRcocz5
+7gYQC8OeMyfs+dkorsrY31UpgMW+efjEZbDKItfbcs+y1iEhQ0fkKKam/lzNyjK0
+wb1ew3QPMz6NFPcE9+ZmHpQDV3oHJSdNB2wrVPxrDgyxQE5Qufz4KBgbggY+Mn63
+yNPxeo7axeK0GgGzoDMw3Iu/pQCVz6eNMn8+0OKowNiE9U8PyYYNdghrmsFEe9sS
+ShS8y6GmEYGz4qErI4TpkG5ZkXuIG1ZEgQlP/BuBrY4AIwkUJADGXowr70JMeeZB
+1oFWa1aTx3iIHBtr2ksVOqOuQRmnFdGcUZnqEebQov+q9ZwAge5l1jHiZqZfxQ6m
+oQnj7vK7rIA0FW+IznZ3De3M+vUnL/D5EIChySvsxjWOqaRCF8gCUA+KrR7Rqifl
+lndVJc4gLFj/NhBvh0TwNYUu2wAEWVEuN40KFs4GcVymdPvy9nJwGqrPOZ3jqdqT
+fOskvrgZJtj75wbSppED9Z+pdHLUc85lC5OzjzgE1qKiBh+cxLUwUgRSDFE797Vt
+ucYWH2coJQRh92I40koTYgPBV4chkNMc3R8/Gy7LJNMIJcjS513tPuVawCMJRDYO
+vz5BSWCgfily85jLX8eK2ceYt1m7OUA8LOElxmzysCGbARgP+lpCMfvHeQARAQAB
+=9h47
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
new file mode 100644
index 00000000000..d8d6da5b047
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF0YzcYBCADmNIEEzvSsnJnxH0u89Hb5vCCkl+45dWHyCMsCLNty8yL214LV
+B35gnU+6BvRXN3DmTpreCV8/wgI2h1eq83dTO2AsnJTxTjvYpiwAtWhONxWxCU1Y
+WlH8Fsvao51CJWUwYY2HzFr9j7h7EOnm6gj2pnUDdjHRgou9/OxIk6q3M6hrwwh2
+IXw6PXFmkg4wRwlqW5FiC90I8gd3ItFCzqx0TR7DuhOFhtvOheWMlApPoMOUY+6u
+C5Ek6kVW5w5xshKafS7p2s0WOsXkOnH76avFtkBtcsPbHkwWTal4xivSMMsCpdPM
+cF6Fr2p5hF4khQ1r5pdmHeYNoXcC+hSnPM9tABEBAAG5AQ0EXRjNxgEIAKa7sUZb
+z0gyyJG0J9aHlo/AvOZZpzMtd5SFyuVyXYYcqLL//Mz7U+EWPT3ZOX9YKJ/Tr3id
+ewquXH087Srpxr0tLIdmrABXwBssfLGSXqZCz4cfkIcQytP8Wk8sJ9NQJLI1HK5E
+laRsmMJ4yQCYH55UcdAt9pFEdVMFbgR/EIcC3At/Kz/Q87zb5oIfAKBSHu9NRqtr
+iSs80dX7sp9JuoIAKTdvR5tjndwC9r6n4Flpz68nnwKD0y6e9RGKB3XXU9k6SIqU
+DHrHByrVnYdwkVOP6O1MbBp5ckSu6w9eFbU3GJSoJ4p7ij0jD4PalgiqpqFUYqeo
+9gNhjd0ExTcYeIMAEQEAAbkBDQRdG4WvAQgAtF9mZmvdsZaWF+u4+bgEDZQ8zzUw
+UrmnZtW/K8Xle6T/4KaOjiBDeiY48IGAcV21oKEOiegaVx6AWkiZ+/8d+feLofWV
+Hwk0GE7MfrEniddVF2mqE3neXSrLn9L747WDhP9PTtkSSQLj523qC5JaIUkWmz0F
+ofK5Gvw2TyIrchUPtm5G4rvYzsSomQY8I+eyYePqnD/FsoUlvd4FhKDuLOU07T6O
+xoui2s3EWornJ5llJoghT11Q8ZknZXc7HUYdF0GzKWGebRz1sIaH7ODy9LLKvgmJ
+JEXWWVfUDQL+T3LjRdsNXDuvnsD9qC4iESlmm6zlxOEtOo57EVjJBVHh0QARAQAB
+=3i2O
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
new file mode 100644
index 00000000000..2e0e940006c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
@@ -0,0 +1 @@
+66d7cbff956830fe9f5a723afe6c7d77a1ce15a6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
new file mode 100644
index 00000000000..8e0902f80d0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
@@ -0,0 +1 @@
+ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
new file mode 100644
index 00000000000..1efb468cd8d
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
@@ -0,0 +1 @@
+cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
new file mode 100644
index 00000000000..28f7bcf5d21
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
@@ -0,0 +1 @@
+7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
new file mode 100644
index 00000000000..4dbf1af5455
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
@@ -0,0 +1 @@
+d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
new file mode 100644
index 00000000000..bffa646f616
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
+inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
+iQaq2wLM5rTQfdjLsGQb1iDNDyCXU56+/l4mFZ2JiEGCq3Re9EFHelRBKQCg/7k0
+BIfyoFVTHw39PKaDBmCYF2sD/3CMD0J/WldhBM7gLOndH9/YEQaEMy+PJNXcfTWN
+WLygGPSOQdNBulyLkvcFIZjUTxFVakh7FbjMq3dsAP1oqthwmK7L8A1zsvRgp/TI
+4YMHkZSkgcs0PBBby+h/lpgRrWmtwjTPzql/K5xX4VSRS+umHye/7R+4ZEH7mABa
+m/ZABADkPGG2ECvfjNosPQDHZVFuF9oVaske0OjzxI+rU6sR1fJKtbOPl9d+bgz+
+df7rZ3mwppkPX2r/muUbd0CM1Se10sK7ZAoPYmWqHX+vB/oj3Jq+iqb6M5mDZzEz
+6h4hdnaGERyxbktZvhRV7Psco9CGi8o7RFUQTR79Y5ElnBavqLkCDQRBlStBEAgA
+9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt
+90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcw
+Yc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZr
+M2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEs
+tSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8
+vYlLIhkmuquiXsNV6TILOwACAggAw6kL0PhPZ/EPI0mPfmIYeaKUgTB8q47nDKY4
+6wDs1l/msVJHAVwGEBHuxmbC7r/qfAgfSW+/Lj4XbSLCqaZIWSu6lfY43IOIYXD4
+pe5cCnWkQij+h3LxRR6uDmBr5cwheHEuB2sMFU5lJiiQR1+eXYkPNK4FgVQpHLWe
+boODAlTf0j8gRR+aTs5eWXqfSA+UEsXpn6453bfZKELXkRmEznb4xyGWJaLW2Mlm
+aRlauYvc61M7FK8z15SSZbq6oictpnEcfkgnBxcNza3jZQV7WOWZ3BlD1nKQ661s
+bmS81/nLnxbov9ASs25K2olXBsHkERhjMnERedvv7avlmBwi1g==
+=VzpZ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
new file mode 100644
index 00000000000..de648a3c373
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
@@ -0,0 +1 @@
+ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
new file mode 100644
index 00000000000..5fba3d86fbd
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
@@ -0,0 +1 @@
+31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
new file mode 100644
index 00000000000..dbf018c11b3
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBE4CPoURCACWBMGV/j1pioJPWkD9K9NdeRvld8sBorFBZo99DF3mcJvrXo/t
+We7gmvcx2n/8P5lL27sYPuj6WSRgtVBlSMXllJm3NL3Hu/7XRILfJEKVeLLTdxc/
+Qf0f4IDqfvdcPHYGsJwEDeODbiKJ45nE4dWsbbxDEmatXUKd5fJrNlEsI09oDNcr
+7KeJn7rTVAj/Yj7UuvM7JtYKkjZegrJe24dUWg1dh57y+xEQybOpfwyfcCDuhwyj
+e1V6Ho71BWa+iyLmIIbBFBVfWTNqyTo17Ac+2Itnpy5sU/tW3691YBhSXNiepjrj
+r+jQHduI3cLQIn4O42UognuV+HnFUwq4JsHvAQDjpwYJ9IFR7DqkphXK8FEw2xeo
+03We7F51vp4Rm6FKeQf8Cn0QdELeTxX4SkFgwxV4oEAhqJJCHhrISaZY1+AAVvSM
+CcXiCFZDYdkE8rOSWNYwRmp/wGurLpdQX02V/5ogUIcHXUxsqqi20ZE/gA/JcW9S
+OaD5Vc8iX/1spaRKOMO8Oy7ezNfD8WobQoc1Lb9XQCo6ddaihh2TG6Khpy5iqbF5
+/rTh8E6+2Yn/Y2A2V4eCuGFSnQrtIHCeFt6mv8tGAw3hRX0zC0wiA5nXonl5uj2j
+QDcXo4friVHVpLxJFivK+iurquGkYCIi72rNAg3k1oKJEZsKB0HXAqU6/3hTvXU0
+GnCHwlsf0iDsEv1Z4LLRbtYddSAnFRgvowhjX6Hiugf8CeM3wfy6AJbLOhI9DLb8
+MGEOpf4eetPiFTMI6rTw2O5MKATUA7WJF+fAYjM6SENCkXSmAwbdHe1NxRnbZ1qn
+dcjDBIR/SgaXm1HLpmJSyXmjyIbNoP5aRaYaSy3g3DvWwLSmsRyA3LqvWQI0m08S
+2CwdzSx+Z8XuOZ/THJs1O/ztd7R1MGZSbdyyEHLVX0dd80B3mcuAMO48dKNO2UBB
+QEsmzpPQ06ANmx6RnBG+H2Y/99/dxyB4C3Rv7x4HrrGqoJRQOUFpUbhFmEKeFiyK
+XxqDuUeB9KX4YCx53Q1EEoKegRAYFtt+k3chahLkQcIAG6lkOZRVA45w69ApdEoG
+E7kCDQROAj6FEAgAmlAzlKUZ/qynp4S/2fBVBhKhE1ujCxpew0WUotc0O6TCyJBD
+jQ0ofQCrQEuOQKNri+2GKHKPTmIdLwfBvREbkuUI0v3S/81vLG5E3TZqIVPJgrPY
+Y472S3Q5XyCVvwYeVjZjCoPnAuCcO2G94HrE09cmG3ABaoTFE2Jq9qPCPlABegKd
+pU2TfClkWSGdS9YMbH7pD0Vdgdy2TYHLnTR1XKKkEd3rYbwnAjJ5Pa7v+du8aHMu
+wWzyEAlUhtIvipuaebhuNiiuh5N7GpE/ij1FaKAc5kvrw/FszJtXH8dQerkmceDH
+FSYeYTh9pAhlFSFyroy/6ay1nKdGU/nXrmo1IwADBgf/fxnmg8WI2gq3AVjcQim8
+9tQj2vMYImWEZnd/GlCDZkz6+LHqFoKCGiScvW3Xvq/9j2Mq1NboTVoSKTcLOLuo
+QIPeRvOP5lcizoUF7SEUGgC9y7LHqfS+BWhnT8RloMw3cCsw6GN+LcWFw1tQzCjE
+U5lXzlNL0tlc3JBQnV0rKGPqAqc/MLQdPWxilaozw75UzugKLjkG+GsM4H/mxD50
+znIM5REadBKbRKg5XNA+UCyegNaCe+SOUS5h62XeQjUvNoMhUFmS2NC35LYAQejv
+qSp0LMBlnckqI9M1QpeWAkItO/qF428nZWhYrdhrRANq1i7n1A/x1zc9bZ1LAnDb
+Ig==
+=/kab
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
new file mode 100644
index 00000000000..d9ae47869d2
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
@@ -0,0 +1 @@
+636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
new file mode 100644
index 00000000000..f4b4f312da5
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
+2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
+aYgApzHAo2LtaiBIyK1T/+OaCexc05lZ/wcHFfyp1yHSzIVazxhIAqx9uwCgptMa
+23r2OeX5TN9xdjwSTUIeImUD/0Mb+AcP04pMbsw9xtjvl4g1V7YbMipLE/PdSI+H
++YLRzmyxkdfdrBNDQRxyGGxoUI2Pi45EDV3wnLBsGVRAG/UkcQ3zE3r+0sLMrRkt
+7oyzK4wqsMuslPbuAyghUes6Dnop/MY4FJYuAKK412RDBvk5s+Tp+pdkWQGHXuvM
+/KJsBACNupFtZA5CgMMWI3bO88upPZqWsO200sA9WqobbU+A2oCUotb2DgWxOgb5
+oi7eJkyFDpS/d+S0H30pq/7mUkTvCOw4Fk/ZR5T6DGqm1/vHv9/y2Z7bOg/DxwuE
+Mu1G9AT74JCjgsYFCdLcFymrghsIpjHBpnsEVjXoI4jwqOgScLkCDQREC9ogEAgA
+w0mrmS4i5o0dQ3KjyNNUUbatkUxFxZjp3zyYrVQj7c3Gpun7s1zRwZ6YQo6poUyi
+w3gpiiLq7zPCqC+ee91aCuYRXQk5y+b400iZybXydEbSeLeZ5pNIFvafYOjLuvrD
+tFiWdV5t159i7R08+Myu5D8K3kDnt/ycKTOs29mt0YCkAdW2EJfivrbSCicPNUyc
+GrMiRh0FDI8Jv43TMUmUBbl+6DdDLmqfDp/Nl09BRzvm40KgBusSRFW7G4l5jR8u
+vuloRYqOGz2X2ifXhxfr6CWIpmN7CNAwhP5OKniTAOTXTtMxvlVM/wILrIxPQ6lp
+b8vhNVIYLP1cmpVtCq3+SwADBQf+NyC/B4lec3BWXH4elVqusCU8Kmj7XDCFCSL7
+khNqO5BF8S0bZBV0NI7W9gaoNJ9ZftnlHbkGsUVNSVl5Gltwi3cD8/nJkHr8C3LK
+6jxA2/B/xQ32NWIBykofT72jw7oNfyu1j+kkF2nUnvpG3kkcuoEvQy4Rbu+1jjaR
+/3MPLcfsLU9EfCcHyiEEgW++AGrceV1AaHB0ZTmvRw8P5Q5R47ZVPR7o6ljucrYM
+MCzFu/3tUezn2cVrxNXyjlhC+kZ6tvlbOsZ8gtmuWqzVoYWZidSYA5ybSFnUtn6w
+SB/gVg57uGVPtYDp3G8lF2ocSWSsVYHzKO9Uo7C2R1V55iA68A==
+=DP2O
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
new file mode 100644
index 00000000000..d437fadaca0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
@@ -0,0 +1 @@
+b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
new file mode 100644
index 00000000000..11ac8b7abb2
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
+Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
+9lFqWQOAuCIWB1XPzoy5iTRDquD2q9NrgldpcwLX3EVtloIPKF7QLq72cwCgrb5X
+R25dB8PUdZKUt2TtJbjB+SMD/1UzAPirgX0/RpL9wUR1i14yIrTfpFP/yM9PE4ij
+qcZ1yafVdw64E1k5W4k+Pyl4D8DvSJvbJHvYjg8/G9V66WzaKcv+987fetUuePvY
+/rwxBPztqq8y6+hjBc8QVhZGWmAoGGEFO6MIGsSyN5ohqPMpNXkczIo+NMvDxGzz
+ld5ZA/9awGTsigBdpBK2F6GOmbvBv+Xebu9rbaJvBvP+npNx01s/f5sHPCxmBTFk
+m1vtaMdZ29RovrWPSZRj8WWes0bcisw80250r1CBlYzGzqEVZ7b0Hh2RfkfaxbYh
+wikyfTfA2iX8TUGBgirsZbyegjUadElhwFNDASnvLTEuQKeVLLkCDQRLbBdqEAgA
+0sZ0JZvWoKIGb+o6MOwI6p3uMb+iWBwdYfoh2RPnUZdBwGhJjp32CiTt2Y3qYEcq
+C5NvF5FWdx1m5KOQe1O+QFoqPKnC1bPj9uZOjLVql7x5tSwCePIaMNB+fMxEh5hY
+wLWtBz8nrdCPgwm+nAwecoE8YfrpmrXZk/YLak54FOeEwLYaP8E4u2FHiEqN+WmK
+MjIRwLzVpYArWRCbTLhSSKyRBy7UxEovUH9mIa4YuU4Pb2R64LwopMHCBm5ow0U8
+kCw8vpW40GrBc/2eaIeXCX2XJ77E9s9ZPgW6MoJ6Ic1xV6voLJKIEV8t44deKNSw
+DfVNZHxyemaKa8/GgpjU5wADBQf/UzL5lXRmyTdJqRvHIfUV3g4A3X77d3vOroab
+8KKw4MFy2LiTioN7btKKxE97Jjp21YZFd7Kpmfu2i/kr9QVJo+DSxe2p2xcQozyS
++layPK8h/61Lhyh8vjzV5AUWA5Zup+P7Jh/WRlh9Gxs0k0vimYMFKImw3mZr4EA8
+UCj2e85XIHNHBd0B1VIukq4OjU4QhRrutNebIy3GZ35ylcaXT5v18Rq/iRJAuJFo
+CzXUaE90/V9/2ob8A1CYEKGLocvOQgBsj7+2gP5WOP+WxI4TWPENRKMVchVBE8zV
++7YZiahPCwOQr9TQWMaUIJxZ85yr7O8DhJOBX3B7EHIfpoADXQ==
+=5pHp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
new file mode 100644
index 00000000000..d41dd187ec7
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
@@ -0,0 +1 @@
+f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
new file mode 100644
index 00000000000..ca04dc02644
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
+WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
+cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
+WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
+KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
+9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG5AQ0ETaTO7AEIALN4amR3
+pf/FN8oMFa9eAc44ognamG31ea1lkqIiPssiJLC9J2z9mShkrECbsBj4o+HxeN/3
+rwW2hQFAm8cAbitujASpPs46slp7Ylx6cfmrNqh3tOkg9BW/5izPwjXAuULovMpG
+PVf30eeDpf6huwRqyc9uYQSS6Jn9KCLi9ULxIeQOZi3UPHyMOCbnehR5aQQk70tI
+jbNytmFKC+DXFrhDiBjlRQruATgtuYYKMWUBO65b/SyvLG7zPGmHXmCSfg2qCTQI
+8xKN6wxgQY6x0PN9BeXa1du3497qYGhaHrsxnW/nM6rcQO2hKoOlY/GmicB5oK40
+MMVfji8aN/EYTS0AEQEAAQ==
+=DpMo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
new file mode 100644
index 00000000000..853cff28660
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
@@ -0,0 +1 @@
+2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
new file mode 100644
index 00000000000..b22da3df4b4
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
@@ -0,0 +1 @@
+82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
new file mode 100644
index 00000000000..aa12f972563
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
@@ -0,0 +1 @@
+f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
new file mode 100644
index 00000000000..d41dd187ec7
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
@@ -0,0 +1 @@
+f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
new file mode 100644
index 00000000000..fa16ad361ea
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+yhmyioZvuRxjrHcAEQEAAQ==
+=/3ce
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
new file mode 100644
index 00000000000..44482f78ea7
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
+f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
+bhhFEuc2B85vNf2o9Y4V5GFwbD+tFNy4u24n7zg6/VgE2WDvYJ8JRqCEkwCggyLj
+ba0lsZ2XtSINh/W8ok+9f0sD/A8WhqBfDTEBuG9gnuCYXM0j7XBBPdPS+FXmmfea
+zyP+URKRprLCdt0ThZAMllIxZJrkbv7aeXVpM6KSZ/XvvaFQ/gha4o4iJFvpoKt1
+Er2j4Tz/STKztHGsMt6pqfrMNPWovu4tLuLZQmojtbIk+IwmcYxMy99owH8oV1WC
+U4HeA/9MlUxzmlmrQF7VLqFTGEEqQaEJqz95wNPj/t1DmI97hshPzXLD4zwKwa9m
+qZJPStRHM0a6xW2dztF12aXhrmYg1gIGNnsHtq+t8ZhfINZUurSWn0m65WT5notA
+15s6hwyDACHWWOgFQ9jmWuGDh0ZpiaBe7BxeTV+MsswY81sOn7kCDQRD6J8HEAgA
+sivVzAfz34QE+S4WTXCuknmYiSEEnyTwk9awb52vrYlhoQ2t2EhRClc/tR6QbhNM
+haMxPt1OYeutOvZN4q216IE2SwZzIDDTchYApP/brBdIDf4L/XGWFIqftCSn+vnb
+0LAzYNVuNXtNwRni2q/fZ3g1wniVMbJ2MrJNt2VhLrP9K/ipFz7JCJittMngmmDF
+7mEKhnrqBROLubFsUfNmz1qRC6PiEwyyCCdG+4m8fIiSyqna3CMkZr/UaVfxuGZH
+WM8HYGmiQjafqeLqo8aSbWerzDYtF2+v4hAAt9eDwdgYy8oNxXEvw7Q+G5lix+6S
+UMYV6NKLNUbBYffm9wjVuwADBQf8DbA7RpziZWLv7DHjR31AA5nnGEeud0dCRO8r
+wfQNnaQvuJq8siRmU3uPAL2NwDgMaa0cT1xt7p4/8/RU0N9otVqnzkLMUTuqq/wt
+QrQt0OWsEJRyxemWFwiL9ZpU4eTg49cfOQXjg2q3fbx9D1Xr6Bu/Pn7UDU8r9GbD
+StGJ7R3Z0kkhtCErWnGNXbuqlVd8uEsyeM2HYpM76BmH/8vMg43lOJyyh6Id20ZT
+n3HgWzRI5QaDJ1JYBhMuVChbTPUCcMox+qgiH4KtRIAjt+m3w0Axjsqo3EFPweWG
+pRfqMyiUcESt4X/Z9V2Nf41NH+nQ74v3RvpP7EWKf9FfEtFprw==
+=n2+K
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
new file mode 100644
index 00000000000..da7007bf710
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
@@ -0,0 +1 @@
+1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
new file mode 100644
index 00000000000..39f8f25641a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
@@ -0,0 +1 @@
+0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
new file mode 100644
index 00000000000..6508c198200
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
+dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
+P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
+qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
+CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
+PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
+dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
+wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
+SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
+9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
+MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
+iDXIY2rT0D71IucAEQEAAQ==
+=/sM2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
new file mode 100644
index 00000000000..52dd86c65c0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
@@ -0,0 +1 @@
+8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
new file mode 100644
index 00000000000..6e5da6e7595
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
@@ -0,0 +1 @@
+8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
new file mode 100644
index 00000000000..aa12f972563
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
@@ -0,0 +1 @@
+f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
new file mode 100644
index 00000000000..4851467af2c
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFfFy6gBEADTj66jLcvIYF4tNUoAL4wyKn0UTEUO3ERr+xt3iCswUGuyCWYk
+PHRN3fRkJO8XqkDO/mjWArYt4PKZme6whYb8WJr++pAil1LJXFHo1AEoX0I0vHNZ
+j9srEKiMg63aQXczekmcLcbTeJurDrCWMR9i3qRxrjya0W6pI4ykaHDh6vQ8k/C2
+wkxIE4OcjIZy4D8+e2Cf7qDmUzdqJfZwbMB/y2RtwwWvOOzFSlrxw0zZ3nfQ+tnB
+LwGxugz2peiF5c8gRcV50EXOJQYxEMdsStkxLymIFaJO9hheW7/zJrTRbWBNHvJI
+gE7wJ0SP/9mJojDPiPH/GCfoUkcl4p42ZwZRYAzs7frHA/rmyuyqM02VqXvVsgZk
+QNI5iAuxfTNICHmj3sv3yifQ0OrAI5x2ja9PcvVXmZvTd3Ocf8Rd4mMylGlBBx9g
+kzuxl6AB8eQu+75rSTgGPKfSeDKyxyOSTkhbJj7uX4nf8thzwhVz6zI5aypyYYDL
+5FWeX7b7GPytKoeN5UiDcWgLuzwjN/wlN/IntHWDWkvUCEJ/JpN6FG5AUY+RQkvS
+FrFQLTkGTLQaP8GHo+47Weve+CApUrvTr58NXHBYh8FxXG/cpgAOYt3xy+Z4niuh
+kpcriHwO2xwd4RL0pFhCuaxvgZlgtbJsCv3yLZ5czoUgy2i4u91ZaGflhwARAQAB
+uQINBFfFy6gBEADxoYf2dNUI2DALMtmTVnwknpccOL84iFlYkG3z08DDx37c6DBi
+0ls8rZZIBw/SUxJTM2Eg2ySBqt6+v/ZihpQqoA0upOCEvqsKB1i3WK0BWPRhAE5z
+qav2hp6odIRgoaWjDes52XFFc0cX611T3oM0l2dKuUHr/9/ycne6DlUU8cHwiUzc
+/rRu+kn99rvJueh883ZgZHsNrq1jKNPsMdqNT5Fot+YQnps7ILoQduIaCMDu9PO5
+yq2JrEtuelqzEC5TrbcV1UaIAAbwS7xE47SXnjJvH/5lV4SMkQe1IqOI03HKuNR0
+k9ETAWLoHYjrHqd9A13dfq6KQgCex5psFrwav01erSq8F3ZZy2jDn09bVMLrwwlv
+eBOleFh5NrN2d/DvJq+f/DBL38gARPvvu3fsuELJHaMlLHk95HuUQINbNIMsz4EL
+esgjhc6jQQEthW7JQDReZLS7/mMuHqFCQzjXajdvd8Djw3FGZfldX2v49d+QQD0I
+u7kMk0gUxEvoUg+CLFIqDjzfMgIEBtT69xJgtnkX5KDWYZ2FXuwRQuSqOsmlRrr0
+d6DdDF71NG72ZHX2LrxgXoWJgm4raYtAOvQrK35MMHdXWSOv2fO1m5hxYrqX5Q1f
+/dARSXGjOuXb/Z+jxzt0G7h02f4OrxYQ0JWfjFbfnpShuYP3vENbgoWKWQARAQAB
+=Tdka
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
similarity index 100%
rename from buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
rename to build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
new file mode 100644
index 00000000000..fef864d2cee
--- /dev/null
+++ b/build-logic/jvm/build.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
+dependencies {
+    api(projects.buildParameters)
+    api(projects.verification)
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.87")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.87")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
+    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
new file mode 100644
index 00000000000..9215287335b
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-base")
+    id("org.jetbrains.dokka")
+}
+
+java {
+    // Workaround https://github.com/gradle/gradle/issues/21933, so it adds javadocElements configuration
+    withJavadocJar()
+}
+
+val dokkaJar by tasks.registering(Jar::class) {
+    group = LifecycleBasePlugin.BUILD_GROUP
+    description = "Assembles a jar archive containing javadoc"
+    from(tasks.dokkaJavadoc)
+    archiveClassifier.set("javadoc")
+}
+
+configurations[JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME].outgoing.artifact(dokkaJar)
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
new file mode 100644
index 00000000000..976a9a3cd81
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java")
+    id("groovy")
+    id("build-logic.test-spock")
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
new file mode 100644
index 00000000000..534f894dfc1
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.java")
+    id("java-library")
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
new file mode 100644
index 00000000000..b202a26b95c
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.crlf.CrLfSpec
+import com.github.vlsi.gradle.crlf.LineEndings
+import com.github.vlsi.gradle.crlf.filter
+import com.github.vlsi.gradle.dsl.configureEach
+
+plugins {
+    id("java")
+    id("eclipse")
+    id("idea")
+    id("com.github.vlsi.crlf")
+    id("com.github.vlsi.gradle-extensions")
+    id("build-logic.testing")
+    id("build-logic.test-base")
+    id("build-logic.build-params")
+    id("build-logic.style")
+    id("build-logic.test-junit5")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    consistentResolution {
+        useCompileClasspathVersions()
+    }
+}
+
+dependencies {
+    findProject(":src:bom")?.let {
+        api(platform(it))
+    }
+    findProject(":src:bom-thirdparty")?.let{
+        api(platform(it))
+    }
+}
+
+tasks.register<DependencyInsightReportTask>("allDependencyInsight") {
+    group = HelpTasksPlugin.HELP_GROUP
+    description =
+        "Shows insights where the dependency is used. For instance: allDependencyInsight --configuration compile --dependency org.jsoup:jsoup"
+}
+
+tasks.configureEach<JavaCompile> {
+    inputs.property("java.version", System.getProperty("java.version"))
+    inputs.property("java.vm.version", System.getProperty("java.vm.version"))
+    options.apply {
+        encoding = "UTF-8"
+        compilerArgs.add("-Xlint:deprecation")
+        if (buildParameters.werror) {
+            compilerArgs.add("-Werror")
+        }
+    }
+}
+
+tasks.configureEach<ProcessResources> {
+    filteringCharset = "UTF-8"
+    eachFile {
+        if (name.endsWith(".properties")) {
+            filteringCharset = "UTF-8"
+            // apply native2ascii conversion since Java 8 expects properties to have ascii symbols only
+            filter(org.apache.tools.ant.filters.EscapeUnicode::class)
+            filter(LineEndings.LF)
+        } else if (name.endsWith(".dtd") || name.endsWith(".svg") ||
+            name.endsWith(".txt")
+        ) {
+            filter(LineEndings.LF)
+        }
+    }
+}
+
+tasks.configureEach<Javadoc> {
+    (options as StandardJavadocDocletOptions).apply {
+        noTimestamp.value = true
+        showFromProtected()
+        locale = "en"
+        docEncoding = "UTF-8"
+        charSet = "UTF-8"
+        encoding = "UTF-8"
+        docTitle = "Apache JMeter ${project.name} API"
+        windowTitle = "Apache JMeter ${project.name} API"
+        header = "<b>Apache JMeter</b>"
+        addStringOption("source", "8")
+        val lastEditYear: String by rootProject.extra
+        bottom =
+            "Copyright © 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
+        if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
+            addBooleanOption("html5", true)
+            links("https://docs.oracle.com/javase/11/docs/api/")
+        } else {
+            links("https://docs.oracle.com/javase/8/docs/api/")
+        }
+    }
+}
+
+// Add default license/notice when missing (e.g. see :src:config that overrides LICENSE)
+afterEvaluate {
+    tasks.configureEach<Jar> {
+        CrLfSpec(LineEndings.LF).run {
+            into("META-INF") {
+                filteringCharset = "UTF-8"
+                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+                // Note: we need "generic Apache-2.0" text without third-party items
+                // So we use the text from $rootDir/config/ since source distribution
+                // contains altered text at $rootDir/LICENSE
+                textFrom("$rootDir/config/LICENSE")
+                textFrom("$rootDir/NOTICE")
+            }
+        }
+    }
+}
+
+tasks.configureEach<Jar> {
+    manifest {
+        attributes["Bundle-License"] = "Apache-2.0"
+        attributes["Specification-Title"] = "Apache JMeter"
+        attributes["Specification-Vendor"] = "Apache Software Foundation"
+        attributes["Implementation-Vendor"] = "Apache Software Foundation"
+        attributes["Implementation-Vendor-Id"] = "org.apache"
+        attributes["Implementation-Version"] = rootProject.version
+    }
+}
+
+// <editor-fold defaultstate="collapsed" desc="TODO: remove dependencies between testClasses of the different projects">
+val testClasses by configurations.creating {
+}
+
+if (file("src/test").isDirectory) {
+    // Do not generate test jars when src/test folder is missing (e.g. "config.jar")
+    val testJar by tasks.registering(Jar::class) {
+        val sourceSets: SourceSetContainer by project
+        archiveClassifier.set("test")
+        from(sourceSets["test"].output)
+    }
+
+    // Parenthesis needed to use Project#getArtifacts
+    (artifacts) {
+        testClasses(testJar)
+    }
+}
+// </editor-fold>
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
new file mode 100644
index 00000000000..cabe6e02820
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.java")
+    id("java-library")
+}
+
+if (file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory) {
+    apply(plugin = "build-logic.groovy")
+}
+
+if (file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory) {
+    apply(plugin = "build-logic.kotlin")
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
new file mode 100644
index 00000000000..006c46bb748
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+import com.github.vlsi.gradle.properties.dsl.props
+import gradle.kotlin.dsl.accessors._86d2c9a61c3426111b16050345f09882.testImplementation
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("java-library")
+    id("build-logic.java")
+    id("build-logic.test-base")
+    id("com.github.autostyle")
+    kotlin("jvm")
+}
+
+dependencies {
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+}
+
+val String.v: String get() = rootProject.extra["$this.version"] as String
+
+kotlin {
+    // Require explicit access modifiers and require explicit types for public APIs.
+    // See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
+    if (props.bool("kotlin.explicitApi", default = true)) {
+        explicitApi()
+    }
+}
+
+tasks.configureEach<KotlinCompile> {
+    kotlinOptions {
+        if (!name.startsWith("compileTest")) {
+            apiVersion = "kotlin.api".v
+        }
+        jvmTarget = java.targetCompatibility.toString()
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
new file mode 100644
index 00000000000..320d0b68a90
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+import org.gradle.api.JavaVersion
+import org.gradle.api.tasks.testing.Test
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.kotlin.dsl.project
+
+plugins {
+    id("java-library")
+}
+
+dependencies {
+    findProject(":src:testkit")?.let {
+        testImplementation(testFixtures(it))
+    }
+}
+
+tasks.configureEach<Test> {
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        showStandardStreams = true
+    }
+    // Pass the property to tests
+    fun passProperty(name: String, default: String? = null) {
+        val value = System.getProperty(name) ?: default
+        value?.let { systemProperty(name, it) }
+    }
+    System.getProperties().filter {
+        it.key.toString().startsWith("jmeter.properties.")
+    }.forEach {
+        systemProperty(it.key.toString().substring("jmeter.properties.".length), it.value)
+    }
+    passProperty("java.awt.headless")
+    passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
+    // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
+    // See https://github.com/apache/jmeter/pull/5763
+    if (JavaVersion.current().isJava9Compatible) {
+        jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
new file mode 100644
index 00000000000..135f4da52fa
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+
+plugins {
+    `java-library`
+    id("build-logic.test-base")
+}
+
+dependencies {
+    testImplementation("junit:junit")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.hamcrest:hamcrest")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+}
+
+tasks.configureEach<Test> {
+    useJUnitPlatform()
+    // Pass the property to tests
+    fun passProperty(name: String, default: String? = null) {
+        val value = System.getProperty(name) ?: default
+        value?.let { systemProperty(name, it) }
+    }
+    passProperty("junit.jupiter.execution.parallel.enabled", "true")
+    passProperty("junit.jupiter.execution.timeout.default", "2 m")
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts
new file mode 100644
index 00000000000..431485b6e2b
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    `java-library`
+    id("build-logic.test-base")
+}
+
+dependencies {
+    testImplementation("org.spockframework:spock-core")
+    testRuntimeOnly("cglib:cglib-nodep") {
+        because(
+            """
+                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
+                 class org.apache.jmeter.report.processor.AbstractSummaryConsumer${'$'}SummaryInfo.
+                 Mocking of non-interface types requires a code generation library.
+                 Please put an up-to-date version of byte-buddy or cglib-nodep on the class path.
+            """.trimIndent()
+        )
+    }
+    testRuntimeOnly("org.objenesis:objenesis") {
+        because(
+            """
+                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
+                 class org.apache.jmeter.report.core.Sample. To solve this problem,
+                 put Objenesis 1.2 or higher on the class path (recommended),
+                 or supply constructor arguments (e.g. 'constructorArgs: [42]') that allow to construct
+                 an object of the mocked type.
+            """.trimIndent()
+        )
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
new file mode 100644
index 00000000000..4b9a3e85b6d
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
diff --git a/build-logic/publishing/build.gradle.kts b/build-logic/publishing/build.gradle.kts
new file mode 100644
index 00000000000..748126d6773
--- /dev/null
+++ b/build-logic/publishing/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
+dependencies {
+    api(projects.basics)
+    api(projects.jvm)
+    api("org.apache.jmeter.build-logic:gradle-plugin")
+}
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
new file mode 100644
index 00000000000..68b140e45bc
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.java-library")
+    id("build-logic.reproducible-builds")
+    id("build-logic.publish-to-central")
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+val archivesBaseName = when (name) {
+    "jorphan", "bshclient" -> name
+    "launcher" -> "ApacheJMeter"
+    else -> "ApacheJMeter_$name"
+}
+setProperty("archivesBaseName", archivesBaseName)
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            artifactId = archivesBaseName
+            from(components["java"])
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
new file mode 100644
index 00000000000..baacdd1f779
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-platform")
+    id("build-logic.reproducible-builds")
+    id("build-logic.publish-to-central")
+}
+
+val archivesBaseName = "ApacheJMeter_$name"
+setProperty("archivesBaseName", archivesBaseName)
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJavaPlatform") {
+            artifactId = archivesBaseName
+            from(components["javaPlatform"])
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.jvm-published-library.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.jvm-published-library.gradle.kts
new file mode 100644
index 00000000000..03126333b07
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/build-logic.jvm-published-library.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-library")
+    id("build-logic.java-published-library")
+}
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
new file mode 100644
index 00000000000..b3b1d25e468
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("maven-publish")
+    id("build-logic.publish-to-tmp-maven-repo")
+}
+
+val repoUrl = "https://github.com/apache/jmeter"
+
+publishing {
+    publications.withType<MavenPublication>().configureEach {
+        // Use the resolved versions in pom.xml
+        // Gradle might have different resolution rules, so we set the versions
+        // that were used in Gradle build/test.
+        versionMapping {
+            usage(Usage.JAVA_RUNTIME) {
+                fromResolutionResult()
+            }
+        }
+        plugins.withId("java") {
+            versionMapping {
+                usage(Usage.JAVA_API) {
+                    fromResolutionOf("runtimeClasspath")
+                }
+            }
+        }
+        pom {
+            name.set("Apache JMeter ${project.name.replaceFirstChar { it.titlecaseChar() }}")
+            // This code might be executed before project-related build.gradle.kts is evaluated
+            // So we delay access to project.description
+            description.set(
+                project.provider { project.description }
+            )
+            inceptionYear.set("1098")
+            url.set("https://jmeter.apache.org/")
+            licenses {
+                license {
+                    name.set("The Apache License, Version 2.0")
+                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    comments.set("A business-friendly OSS license")
+                }
+            }
+            issueManagement {
+                system.set("GitHub Issues")
+                url.set("$repoUrl/issues")
+            }
+            scm {
+                connection.set("scm:git:$repoUrl.git")
+                developerConnection.set("scm:git:$repoUrl.git")
+                url.set(repoUrl)
+                tag.set("HEAD")
+            }
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-tmp-maven-repo.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-tmp-maven-repo.gradle.kts
new file mode 100644
index 00000000000..3b3eb484f27
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-tmp-maven-repo.gradle.kts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("maven-publish")
+}
+
+val localRepoElements by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+    description =
+        "Shares local maven repository directory that contains the artifacts produced by the current project"
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named("maven-repository"))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+    }
+}
+
+val localRepoDir = layout.buildDirectory.dir("local-maven-repo")
+
+publishing {
+    repositories {
+        maven {
+            name = "tmp-maven"
+            url = uri(localRepoDir)
+        }
+    }
+}
+
+localRepoElements.outgoing.artifact(localRepoDir) {
+    builtBy(tasks.named("publishAllPublicationsToTmp-mavenRepository"))
+}
+
+val cleanLocalRepository by tasks.registering(Delete::class) {
+    description = "Clears local-maven-repo so timestamp-based snapshot artifacts do not consume space"
+    delete(localRepoDir)
+}
+
+tasks.withType<PublishToMavenRepository>()
+    .matching { it.name.endsWith("PublicationToTmp-mavenRepository") }
+    .configureEach {
+        dependsOn(cleanLocalRepository)
+    }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
new file mode 100644
index 00000000000..87959577697
--- /dev/null
+++ b/build-logic/root-build/build.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
+dependencies {
+    api(projects.buildParameters)
+    api(projects.verification)
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.86")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.86")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.86")
+    api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:0.5")
+}
diff --git a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
new file mode 100644
index 00000000000..7cb49efd103
--- /dev/null
+++ b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.git.FindGitAttributes
+import com.github.vlsi.gradle.git.dsl.gitignore
+
+plugins {
+    id("build-logic.build-params")
+    id("build-logic.jacoco-aggregate")
+    id("build-logic.sonarqube-aggregate")
+    id("com.github.vlsi.crlf")
+    id("com.github.vlsi.ide")
+    id("org.nosphere.apache.rat")
+    id("org.jetbrains.gradle.plugin.idea-ext")
+}
+
+ide {
+    copyrightToAsf()
+    ideaInstructionsUri =
+        uri("https://github.com/apache/jmeter/blob/master/CONTRIBUTING.md#intellij")
+    doNotDetectFrameworks("android", "jruby")
+}
+
+// This task scans the project for gitignore / gitattributes, and that is reused for building
+// source/binary artifacts with the appropriate eol/executable file flags
+// It enables to automatically exclude patterns from .gitignore
+val gitProps by tasks.registering(FindGitAttributes::class) {
+    // Scanning for .gitignore and .gitattributes files in a task avoids doing that
+    // when distribution build is not required (e.g. code is just compiled)
+    root.set(rootDir)
+}
+
+val rat by tasks.getting(org.nosphere.apache.rat.RatTask::class) {
+    gitignore(gitProps)
+    verbose.set(true)
+    // Note: patterns are in non-standard syntax for RAT, so we use exclude(..) instead of excludeFile
+    exclude(rootDir.resolve(".ratignore").readLines())
+    // Gradle's validation might assume copyLibs and rat operate on the intersecting set of files
+    // Technically speaking, that is false positive since rat ignores *.jar files,
+    // and copyLibs copies jar files only
+    mustRunAfter(":src:dist:copyBinLibs", ":src:dist:copyLibs")
+}
+
+if (buildParameters.coverage) {
+    dependencies {
+        subprojects {
+            if (path !in listOf(":src", ":src:protocol", ":src:release")) {
+                jacocoAggregation(this)
+            }
+        }
+    }
+}
diff --git a/buildSrc/settings.gradle.kts b/build-logic/settings.gradle.kts
similarity index 71%
rename from buildSrc/settings.gradle.kts
rename to build-logic/settings.gradle.kts
index ff636718931..f5cc44ab657 100644
--- a/buildSrc/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -2,44 +2,30 @@
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to you under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-pluginManagement {
-    plugins {
-        fun PluginDependenciesSpec.idv(id: String) = id(id) version extra["$id.version"].toString()
-        idv("com.github.autostyle")
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        // TODO: support enableMavenLocal
+        gradlePluginPortal()
     }
 }
 
-include("batchtest")
-
-val upperCaseLetters = "\\p{Upper}".toRegex()
+rootProject.name = "build-logic"
 
-fun String.toKebabCase() =
-    replace(upperCaseLetters) { "-${it.value.toLowerCase()}" }
-
-fun buildFileNameFor(projectDirName: String) =
-    "$projectDirName.gradle.kts"
-
-for (project in rootProject.children) {
-    val projectDirName = project.name.toKebabCase()
-    project.projectDir = file("subprojects/$projectDirName")
-    project.buildFileName = buildFileNameFor(projectDirName)
-    assert(project.projectDir.isDirectory)
-    assert(project.buildFile.isFile)
-}
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 buildscript {
     dependencies {
@@ -53,18 +39,27 @@ buildscript {
     }
 }
 
+includeBuild("../build-logic-commons")
+include("basics")
+include("batchtest")
+include("build-parameters")
+include("jvm")
+include("publishing")
+include("root-build")
+include("verification")
+
 // Note: we need to verify the checksum for checksum-dependency-plugin itself
 val expectedSha512 = mapOf(
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
-            to "bcpg-jdk15on-1.70.jar",
+        to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
-            to "bcprov-jdk15on-1.70.jar",
+        to "bcprov-jdk15on-1.70.jar",
     "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
-            to "okhttp-4.1.0.jar",
+        to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
-            to "okio-2.2.2.jar",
+        to "okio-2.2.2.jar",
     settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()
-            to "checksum-dependency-plugin.jar"
+        to "checksum-dependency-plugin.jar"
 )
 
 fun File.sha512(): String {
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
new file mode 100644
index 00000000000..d4438f29b33
--- /dev/null
+++ b/build-logic/verification/build.gradle.kts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.kotlin-dsl-gradle-plugin")
+}
+
+dependencies {
+    api(projects.basics)
+    api(projects.buildParameters)
+    api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.13")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.86")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.86")
+    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.4")
+    api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.26")
+    api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
new file mode 100644
index 00000000000..0555d63650e
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import gradle.kotlin.dsl.accessors._156f30e0e6722a90ad34068ddbaee49e.ide
+
+plugins {
+    id("com.github.autostyle")
+    id("com.github.vlsi.ide")
+}
+
+// When building build-logic projects, Gradle applies the plugins to "gradle-kotlin-dsl-accessors" project
+// And the below logic can't fully work there (e.g. .ratignore file is not available)
+// The proper resolution would be to support lazy configuration properties in AutoStyle
+val isActualPluginApplication =
+    rootProject.name.startsWith("jmeter")
+
+fun com.github.autostyle.gradle.BaseFormatExtension.license() {
+    if (isActualPluginApplication) {
+        licenseHeader(rootProject.ide.licenseHeader) {
+            copyrightStyle("bat", com.github.autostyle.generic.DefaultCopyrightStyle.REM)
+            copyrightStyle("cmd", com.github.autostyle.generic.DefaultCopyrightStyle.REM)
+            addBlankLineAfter.set(true)
+        }
+    }
+    trimTrailingWhitespace()
+    endWithNewline()
+}
+
+autostyle {
+    kotlinGradle {
+        license()
+        ktlint("0.40.0")
+    }
+    format("configs") {
+        filter {
+            include("**/*.sh", "**/*.bsh", "**/*.cmd", "**/*.bat")
+            include("**/*.properties", "**/*.yml")
+            include("**/*.xsd", "**/*.xsl", "**/*.xml")
+            // Autostyle does not support gitignore yet https://github.com/autostyle/autostyle/issues/13
+            exclude("out/**")
+            if (project == rootProject) {
+                if (isActualPluginApplication) {
+                    exclude(rootDir.resolve(".ratignore").readLines())
+                }
+                exclude("gradlew*")
+                // Generated by batch tests. It ignores log4j2.xml, however it is not that important
+                // The configuration will be removed when Autostyle will use .gitignore
+                exclude("bin/*.xml")
+            } else {
+                exclude("bin/**")
+            }
+        }
+        license()
+    }
+    format("markdown") {
+        filter.include("**/*.md")
+        endWithNewline()
+    }
+}
+
+plugins.withId("java") {
+    autostyle {
+        java {
+            license()
+            importOrder("static ", "java.", "javax", "org", "net", "com", "")
+            removeUnusedImports()
+            indentWithSpaces(4)
+        }
+    }
+}
+
+plugins.withId("groovy") {
+    autostyle {
+        groovy {
+            license()
+            importOrder("static ", "java.", "javax", "org", "net", "com", "")
+            indentWithSpaces(4)
+        }
+    }
+}
+
+plugins.withId("org.jetbrains.kotlin.jvm") {
+    autostyle {
+        kotlin {
+            license()
+            trimTrailingWhitespace()
+            ktlint("0.40.0")
+            endWithNewline()
+        }
+    }
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
new file mode 100644
index 00000000000..deaa45348ba
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.api.JavaVersion
+import org.gradle.kotlin.dsl.dependencies
+
+plugins {
+    id("org.checkerframework")
+}
+
+dependencies {
+    providers.gradleProperty("checkerframework.version")
+        .takeIf { it.isPresent }
+        ?.let {
+            val checkerframeworkVersion = it.get()
+            "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
+            if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+                // only needed for JDK 8
+                "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
+            }
+        } ?: run {
+        val checkerframeworkVersion = "3.31.0"
+        "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
+        if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+            // only needed for JDK 8
+            "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
+        }
+    }
+}
+
+checkerFramework {
+    skipVersionCheck = true
+    excludeTests = true
+    // See https://checkerframework.org/manual/#introduction
+    checkers.add("org.checkerframework.checker.nullness.NullnessChecker")
+    checkers.add("org.checkerframework.checker.optional.OptionalChecker")
+    // checkers.add("org.checkerframework.checker.index.IndexChecker")
+    checkers.add("org.checkerframework.checker.regex.RegexChecker")
+    extraJavacArgs.add(
+        "-Astubs=" +
+            fileTree("$rootDir/config/checkerframework") {
+                include("*.astub")
+            }.asPath
+    )
+    // The below produces too many warnings :(
+    // extraJavacArgs.add("-Alint=redundantNullComparison")
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
new file mode 100644
index 00000000000..97d39c5a16c
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.api.plugins.quality.Checkstyle
+import org.gradle.kotlin.dsl.withType
+import java.io.File
+
+plugins {
+    id("checkstyle")
+}
+
+checkstyle {
+    toolVersion = "10.8.1"
+    configProperties = mapOf(
+        "cache_file" to buildDir.resolve("checkstyle/cacheFile")
+    )
+
+    providers.gradleProperty("checkstyle.version")
+        .takeIf { it.isPresent }
+        ?.let { toolVersion = it.get() }
+
+    isShowViolations = true
+    // TOOD: move to /config
+    val configDir = File(rootDir, "config/checkstyle")
+    configDirectory.set(configDir)
+    configFile = configDir.resolve("checkstyle.xml")
+}
+
+val checkstyleTasks = tasks.withType<Checkstyle>()
+checkstyleTasks.configureEach {
+    // Checkstyle 8.26 does not need classpath, see https://github.com/gradle/gradle/issues/14227
+    classpath = files()
+}
+
+tasks.register("checkstyleAll") {
+    dependsOn(checkstyleTasks)
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
new file mode 100644
index 00000000000..83a0a1bac04
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+import gradle.kotlin.dsl.accessors._8d406b70b7b518f23730b456e0c46f8d.buildParameters
+import net.ltgt.gradle.errorprone.errorprone
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.dependencies
+
+plugins {
+    id("java")
+    id("build-logic.build-params")
+}
+
+if (buildParameters.enableErrorprone) {
+    apply(plugin = "net.ltgt.errorprone")
+
+    dependencies {
+        "errorprone"("com.google.errorprone:error_prone_core:2.18.0")
+        "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
+    }
+
+    tasks.configureEach<JavaCompile> {
+        if ("Test" in name) {
+            // Ignore warnings in test code
+            options.errorprone.isEnabled.set(false)
+        } else {
+            options.compilerArgs.addAll(listOf("-Xmaxerrs", "10000", "-Xmaxwarns", "10000"))
+            options.errorprone {
+                disableWarningsInGeneratedCode.set(true)
+                enable(
+                    "PackageLocation"
+                )
+                disable(
+                    "ComplexBooleanConstant",
+                    "EqualsGetClass",
+                    "InlineMeSuggester",
+                    "OperatorPrecedence",
+                    "MutableConstantField",
+                    // "ReferenceEquality",
+                    "SameNameButDifferent",
+                    "TypeParameterUnusedInFormals"
+                )
+                // Analyze issues, and enable the check
+                disable(
+                    "BigDecimalEquals",
+                    "EmptyBlockTag",
+                    "Finalize",
+                    "LongDoubleConversion",
+                    "MissingSummary",
+                    "StringSplitter",
+                    "BanJNDI",
+                )
+            }
+        }
+    }
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
new file mode 100644
index 00000000000..5eed88a7d70
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
+
+plugins {
+    id("de.thetaphi.forbiddenapis")
+}
+
+forbiddenApis {
+    failOnUnsupportedJava = false
+    signaturesFiles = files("$rootDir/config/forbidden-apis/forbidden-apis.txt")
+    bundledSignatures.addAll(
+        listOf(
+            // "jdk-deprecated",
+            "jdk-internal",
+            "jdk-non-portable"
+            // "jdk-system-out"
+            // "jdk-unsafe"
+        )
+    )
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
new file mode 100644
index 00000000000..16a09618455
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import jacoco.DefaultJacocoAggregateReportSpec
+import jacoco.JacocoAggregateReportSpec
+
+plugins {
+    `reporting-base`
+    `jvm-ecosystem`
+    jacoco
+}
+
+val jacocoAggregation by configurations.creating {
+    description = "Collects project dependencies for JaCoCo coverage report aggregation"
+    isVisible = false
+    isTransitive = true
+    isCanBeResolved = false
+    isCanBeConsumed = false
+}
+
+val jacocoAggregationCodeCoverageReportResults by configurations.creating {
+    description = "Actual dependencies for JaCoCo coverage aggregation"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    extendsFrom(jacocoAggregation)
+}
+
+// https://github.com/gradle/gradle/pull/16627
+inline fun <reified T : Named> AttributeContainer.attribute(attr: Attribute<T>, value: String) =
+    attribute(attr, objects.named<T>(value))
+
+var allSourceDirectories = jacocoAggregationCodeCoverageReportResults.incoming.artifactView {
+    withVariantReselection()
+    componentFilter { it is ProjectComponentIdentifier }
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, Category.VERIFICATION)
+        attribute(Bundling.BUNDLING_ATTRIBUTE, Bundling.EXTERNAL)
+        attribute(VerificationType.VERIFICATION_TYPE_ATTRIBUTE, VerificationType.MAIN_SOURCES)
+    }
+}
+
+var allClassDirectories = jacocoAggregationCodeCoverageReportResults.incoming.artifactView {
+    withVariantReselection()
+    componentFilter { it is ProjectComponentIdentifier }
+    attributes {
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, LibraryElements.CLASSES)
+    }
+}
+
+reporting {
+    reports.registerBinding(JacocoAggregateReportSpec::class, DefaultJacocoAggregateReportSpec::class)
+    reports.withType<JacocoAggregateReportSpec>().configureEach {
+        reportTask.configure {
+            val execData = jacocoAggregationCodeCoverageReportResults.incoming.artifactView {
+                withVariantReselection()
+                componentFilter { it is ProjectComponentIdentifier }
+                attributes {
+                    attribute(Category.CATEGORY_ATTRIBUTE, Category.VERIFICATION)
+                    attribute(VerificationType.VERIFICATION_TYPE_ATTRIBUTE, VerificationType.JACOCO_RESULTS)
+                    attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.BINARY_DATA_TYPE)
+                }
+            }
+            executionData.from(
+                execData.files
+            )
+            classDirectories.from(allClassDirectories.files)
+            sourceDirectories.from(allSourceDirectories.files)
+        }
+    }
+    reports.create<JacocoAggregateReportSpec>(JacocoAggregateReportSpec.CODE_COVERAGE_REPORT_NAME)
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
new file mode 100644
index 00000000000..f5d3f18ec9c
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-base")
+    id("jacoco")
+}
+
+jacoco {
+    toolVersion = "0.8.8"
+    providers.gradleProperty("jacoco.version")
+        .takeIf { it.isPresent }
+        ?.let { toolVersion = it.get() }
+}
+
+val testTasks = tasks.withType<Test>()
+val javaExecTasks = tasks.withType<JavaExec>()
+    .matching { it.name != "runGui" }
+
+// This configuration must be postponed since JacocoTaskExtension might be added inside
+// configure block of a task (== before this code is run)
+afterEvaluate {
+    for (t in arrayOf(testTasks, javaExecTasks)) {
+        t.configureEach {
+            extensions.findByType<JacocoTaskExtension>()?.apply {
+                // We don't want to collect coverage for third-party classes
+                includes?.add("org.apache.jmeter.*")
+                includes?.add("org.apache.jorphan.*")
+                includes?.add("org.apache.commons.cli.*")
+            }
+        }
+    }
+}
+
+val jacocoReport by rootProject.tasks.existing(JacocoReport::class)
+val mainCode = sourceSets["main"]
+
+// TODO: rework with provide-consume configurations
+jacocoReport {
+    // Note: this creates a lazy collection
+    // Some projects might fail to create a file (e.g. no tests or no coverage),
+    // So we check for file existence. Otherwise, JacocoMerge would fail
+    val execFiles =
+        files(testTasks, javaExecTasks).filter { it.exists() && it.name.endsWith(".exec") }
+    executionData(execFiles)
+    additionalSourceDirs.from(mainCode.allJava.srcDirs)
+    sourceDirectories.from(mainCode.allSource.srcDirs)
+    classDirectories.from(mainCode.output)
+}
+
+// TODO: check which reports do we need
+// tasks.configureEach<JacocoReport> {
+//    reports {
+//        html.required.set(reportsForHumans())
+//        xml.required.set(!reportsForHumans())
+//    }
+// }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
new file mode 100644
index 00000000000..01aee062959
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.spotbugs.snom.SpotBugsTask
+import jacoco.JacocoAggregateReportSpec
+
+plugins {
+    `reporting-base`
+    id("build-logic.build-params")
+    id("org.sonarqube")
+}
+
+sonar {
+    properties {
+        // See https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Gradle#AnalyzingwithSonarQubeScannerforGradle-Configureanalysisproperties
+        property("sonar.sourceEncoding", "UTF-8")
+        val projectName = "JMeter"
+        property("sonar.projectName", projectName)
+        property("sonar.projectKey", System.getenv()["SONAR_PROJECT_KEY"] ?: projectName)
+        property("sonar.organization", System.getenv()["SONAR_ORGANIZATION"] ?: "apache")
+        property("sonar.projectVersion", project.version.toString())
+        property("sonar.host.url", System.getenv()["SONAR_HOST_URL"] ?: "http://localhost:9000")
+        property("sonar.login", System.getenv()["SONAR_LOGIN"] ?: "")
+        property("sonar.password", System.getenv()["SONAR_PASSWORD"] ?: "")
+        property("sonar.links.homepage", "https://jmeter.apache.org")
+        property("sonar.links.ci", "https://builds.apache.org/job/JMeter-trunk/")
+        property("sonar.links.scm", "https://jmeter.apache.org/svnindex.html")
+        property("sonar.links.issue", "https://jmeter.apache.org/issues.html")
+    }
+}
+
+val sonarTask = tasks.sonar
+
+plugins.withId("build-params.jacoco-aggregation") {
+    val coverageReportTask =
+        reporting.reports.named<JacocoAggregateReportSpec>(JacocoAggregateReportSpec.CODE_COVERAGE_REPORT_NAME)
+            .flatMap { it.reportTask }
+    val mergedCoverage =
+        coverageReportTask
+            .map { it.reports.xml.outputLocation }
+    sonarTask {
+        dependsOn(coverageReportTask)
+    }
+
+    subprojects {
+        plugins.withId("java-base") {
+            sonar {
+                properties {
+                    property("sonar.coverage.jacoco.xmlReportPaths", mergedCoverage)
+                }
+            }
+        }
+    }
+}
+
+subprojects {
+    plugins.withId("com.github.spotbugs") {
+        val spotBugTasks = tasks.withType<SpotBugsTask>().matching {
+            // We don't send spotbugs for test classes
+            !it.name.endsWith("Test")
+        }
+        sonarTask {
+            dependsOn(spotBugTasks)
+        }
+        sonar {
+            properties {
+                property(
+                    "sonar.java.spotbugs.reportPaths",
+                    spotBugTasks.asSequence()
+                        .map {
+                            it.reports.named("XML").get().outputLocation.asFile.get()
+                        }
+                )
+            }
+        }
+    }
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
new file mode 100644
index 00000000000..81b8cd3f17c
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.spotbugs.snom.Confidence
+import com.github.spotbugs.snom.SpotBugsTask
+import com.github.vlsi.gradle.dsl.configureEach
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+
+plugins {
+    id("com.github.spotbugs")
+    id("build-logic.build-params")
+}
+
+spotbugs {
+    // Below statement is for Renovate Bot since it does not support toolVersion.set("..") pattern yet
+    val toolVersion = "4.7.3"
+    this.toolVersion.set(toolVersion)
+
+    providers.gradleProperty("spotbugs.version")
+        .takeIf { it.isPresent }
+        ?.let { this.toolVersion.set(it) }
+    reportLevel.set(Confidence.HIGH)
+    ignoreFailures.set(buildParameters.ignoreSpotBugsFailures)
+}
+
+dependencies {
+    constraints {
+        providers.gradleProperty("asm.version")
+            .takeIf { it.isPresent }
+            ?.let {
+                val asmVersion = it.get()
+                spotbugs("org.ow2.asm:asm:$asmVersion")
+                spotbugs("org.ow2.asm:asm-all:$asmVersion")
+                spotbugs("org.ow2.asm:asm-analysis:$asmVersion")
+                spotbugs("org.ow2.asm:asm-commons:$asmVersion")
+                spotbugs("org.ow2.asm:asm-tree:$asmVersion")
+                spotbugs("org.ow2.asm:asm-util:$asmVersion")
+            }
+    }
+}
+
+fun reportsForHumans() = System.getenv()["CI"]?.toBoolean() != true
+
+tasks.configureEach<SpotBugsTask> {
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+    if (!buildParameters.spotbugs) {
+        description = "$description (skipped by default, to enable it add -Pspotbugs)"
+    }
+    reports {
+        // xml goes for SonarQube, so we always create it just in case
+        create("xml")
+        if (reportsForHumans()) {
+            create("html")
+        }
+    }
+    enabled = buildParameters.spotbugs
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
new file mode 100644
index 00000000000..969cd9dfc71
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.kotlin.dsl.apply
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+
+plugins {
+    id("build-logic.build-params")
+}
+
+if (!buildParameters.skipAutostyle) {
+    apply(plugin = "build-logic.autostyle")
+}
+
+val skipCheckstyle = buildParameters.skipCheckstyle || run {
+    logger.info("Checkstyle requires Java 11+")
+    !JavaVersion.current().isJava11Compatible
+}
+
+if (!skipCheckstyle) {
+    apply(plugin = "build-logic.checkstyle")
+}
+
+plugins.withId("java-base") {
+    if (!buildParameters.skipForbiddenApis) {
+        apply(plugin = "build-logic.forbidden-apis")
+    }
+    if (buildParameters.enableCheckerframework) {
+        apply(plugin = "build-logic.checkerframework")
+    }
+    if (!buildParameters.enableErrorprone) {
+        apply(plugin = "build-logic.errorprone")
+    }
+    if (buildParameters.spotbugs) {
+        apply(plugin = "build-logic.spotbugs")
+    }
+    if (buildParameters.coverage) {
+        apply(plugin = "build-logic.jacoco")
+    }
+}
+
+// Autostyle produces more meaningful error messages, so we ensure it is executed before Checkstyle
+if (!skipCheckstyle && !buildParameters.skipAutostyle) {
+    tasks.withType<Checkstyle>().configureEach {
+        mustRunAfter("autostyleApply")
+        mustRunAfter("autostyleCheck")
+    }
+}
+
+if (!buildParameters.skipAutostyle || !skipCheckstyle || !buildParameters.skipForbiddenApis) {
+    tasks.register("style") {
+        group = LifecycleBasePlugin.VERIFICATION_GROUP
+        description = "Formats code (license header, import order, whitespace at end of line, ...) and executes Checkstyle verifications"
+        if (!buildParameters.skipAutostyle) {
+            dependsOn("autostyleApply")
+        }
+        if (!skipCheckstyle) {
+            dependsOn("checkstyleAll")
+        }
+        if (!buildParameters.skipForbiddenApis) {
+            dependsOn("forbiddenApis")
+        }
+    }
+}
+
+tasks.register("checkstyle") {
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+    description = "Executes Checkstyle verifications"
+    if (!skipCheckstyle) {
+        dependsOn("checkstyleAll")
+    }
+    if (!buildParameters.skipAutostyle) {
+        dependsOn("autostyleCheck")
+    }
+    if (!buildParameters.skipForbiddenApis) {
+        dependsOn("forbiddenApis")
+    }
+}
diff --git a/build-logic/verification/src/main/kotlin/jacoco/DefaultJacocoAggregateReportSpec.kt b/build-logic/verification/src/main/kotlin/jacoco/DefaultJacocoAggregateReportSpec.kt
new file mode 100644
index 00000000000..8d4bcb4adc1
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/jacoco/DefaultJacocoAggregateReportSpec.kt
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jacoco
+
+import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.register
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import javax.inject.Inject
+
+abstract class DefaultJacocoAggregateReportSpec @Inject constructor(
+    private val name: String,
+    tasks: TaskContainer
+) : JacocoAggregateReportSpec {
+    override fun getName(): String = name
+
+    override val reportTask: TaskProvider<JacocoReport> =
+        tasks.register<JacocoReport>(name) {
+            group = LifecycleBasePlugin.VERIFICATION_GROUP
+            description = "Generates aggregated code coverage report"
+
+            reports {
+                xml.required.convention(true)
+                html.required.convention(true)
+            }
+        }
+}
diff --git a/build-logic/verification/src/main/kotlin/jacoco/JacocoAggregateReportSpec.kt b/build-logic/verification/src/main/kotlin/jacoco/JacocoAggregateReportSpec.kt
new file mode 100644
index 00000000000..28cd2d5645b
--- /dev/null
+++ b/build-logic/verification/src/main/kotlin/jacoco/JacocoAggregateReportSpec.kt
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jacoco
+
+import org.gradle.api.reporting.ReportSpec
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.testing.jacoco.tasks.JacocoReport
+
+interface JacocoAggregateReportSpec : ReportSpec {
+    companion object {
+        const val CODE_COVERAGE_REPORT_NAME = "jacocoReport"
+    }
+    val reportTask: TaskProvider<JacocoReport>
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index c9016caea30..91cb5261d7e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,45 +15,13 @@
  * limitations under the License.
  */
 
-import com.github.spotbugs.snom.SpotBugsTask
-import com.github.vlsi.gradle.crlf.CrLfSpec
-import com.github.vlsi.gradle.crlf.LineEndings
-import com.github.vlsi.gradle.crlf.filter
-import com.github.vlsi.gradle.git.FindGitAttributes
-import com.github.vlsi.gradle.git.dsl.gitignore
 import com.github.vlsi.gradle.properties.dsl.lastEditYear
-import com.github.vlsi.gradle.properties.dsl.props
 import com.github.vlsi.gradle.release.RepositoryType
-import net.ltgt.gradle.errorprone.errorprone
 import org.ajoberstar.grgit.Grgit
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.sonarqube.gradle.SonarQubeProperties
 
 plugins {
-    java
-    kotlin("jvm") apply false
-    jacoco
-    checkstyle
-    id("org.jetbrains.gradle.plugin.idea-ext") apply false
-    id("org.nosphere.apache.rat")
-    id("com.github.autostyle")
-    id("com.github.spotbugs")
-    id("net.ltgt.errorprone") apply false
-    id("org.sonarqube")
-    id("com.github.vlsi.crlf")
-    id("com.github.vlsi.gradle-extensions")
-    id("com.github.vlsi.ide")
+    id("build-logic.root-build")
     id("com.github.vlsi.stage-vote-release")
-    publishing
-}
-
-ide {
-    copyrightToAsf()
-    ideaInstructionsUri =
-        uri("https://github.com/apache/jmeter/blob/master/CONTRIBUTING.md#intellij")
-    doNotDetectFrameworks("android", "jruby")
 }
 
 fun Project.boolProp(name: String) =
@@ -67,6 +35,63 @@ fun Project.boolProp(name: String) =
 val String.v: String get() = rootProject.extra["$this.version"] as String
 version = "jmeter".v + releaseParams.snapshotSuffix
 
+allprojects {
+    group = "org.apache.jmeter"
+    version = rootProject.version
+}
+
+val platformProjects by extra {
+    setOf(
+        projects.src.bom,
+        projects.src.bomThirdparty,
+    ).mapTo(mutableSetOf()) { it.dependencyProject }
+}
+
+val notPublishedProjects by extra {
+    listOf(
+        projects.jmeter,
+        projects.src,
+        projects.src.bshclient,
+        projects.src.dist,
+        projects.src.distCheck,
+        projects.src.examples,
+        projects.src.generator,
+        projects.src.licenses,
+        projects.src.protocol,
+        projects.src.release,
+        projects.src.testkit,
+        projects.src.testkitWiremock,
+    ).mapTo(mutableSetOf()) { it.dependencyProject }
+}
+
+val publishedProjects by extra {
+    allprojects - notPublishedProjects
+}
+
+notPublishedProjects.forEach { project ->
+    if (project != rootProject) {
+        project.plugins.withId("maven-publish") {
+            throw IllegalStateException(
+                "Project ${project.path} is listed in notPublishedProjects, however it has maven-publish plugin applied. " +
+                    "Please remove maven-publish plugin (e.g. replace build-logic.jvm-published-library with build-logic.jvm-library) or " +
+                    "move the project to the list of published ones"
+            )
+        }
+    }
+}
+
+publishedProjects.forEach {project ->
+    project.afterEvaluate {
+        if (!pluginManager.hasPlugin("maven-publish")) {
+            throw IllegalStateException(
+                "Project ${project.path} is listed in publishedProjects, however it misses maven-publish plugin. " +
+                    "Please add maven-publish plugin (e.g. replace build-logic.jvm-library with build-logic.jvm-published-library) or " +
+                    "move the project to the list of published ones"
+            )
+        }
+    }
+}
+
 val displayVersion by extra {
     version.toString() +
         if (releaseParams.release.get()) {
@@ -84,35 +109,16 @@ fun reportsForHumans() = !(System.getenv()["CI"]?.toBoolean() ?: boolProp("CI")
 
 val lastEditYear by extra(lastEditYear().toString())
 
-// This task scans the project for gitignore / gitattributes, and that is reused for building
-// source/binary artifacts with the appropriate eol/executable file flags
-// It enables to automatically exclude patterns from .gitignore
-val gitProps by tasks.registering(FindGitAttributes::class) {
-    // Scanning for .gitignore and .gitattributes files in a task avoids doing that
-    // when distribution build is not required (e.g. code is just compiled)
-    root.set(rootDir)
-}
-
-val rat by tasks.getting(org.nosphere.apache.rat.RatTask::class) {
-    gitignore(gitProps)
-    verbose.set(true)
-    // Note: patterns are in non-standard syntax for RAT, so we use exclude(..) instead of excludeFile
-    exclude(rootDir.resolve(".ratignore").readLines())
-    // Gradle validation might assume copyLibs and rat operate on the intersecting set of files
-    // Technically speaking, that is false positive since rat ignores *.jar files,
-    // and copyLibs copies jar files only
-    mustRunAfter(":src:dist:copyBinLibs", ":src:dist:copyLibs")
-}
 
 tasks.validateBeforeBuildingReleaseArtifacts {
-    dependsOn(rat)
+    dependsOn(tasks.rat)
 }
 
 releaseArtifacts {
-    fromProject(":src:dist")
+    fromProject(projects.src.dist.dependencyProject.path)
     previewSite {
         into("rat")
-        from(rat) {
+        from(tasks.rat) {
             filteringCharset = "UTF-8"
             // XML is not really interesting for now
             exclude("rat-report.xml")
@@ -144,518 +150,3 @@ releaseParams {
         }
     }
 }
-
-val jacocoReport by tasks.registering(JacocoReport::class) {
-    group = "Coverage reports"
-    description = "Generates an aggregate report from all subprojects"
-}
-
-val jacocoEnabled by extra {
-    (boolProp("coverage") ?: false) || gradle.startParameter.taskNames.any { it.contains("jacoco") }
-}
-
-// Do not enable spotbugs by default. Execute it only when -Pspotbugs is present
-val enableSpotBugs = props.bool("spotbugs", default = false)
-val enableErrorprone by props()
-val ignoreSpotBugsFailures by props()
-val skipCheckstyle by props()
-val skipAutostyle by props()
-val werror by props(true) // treat javac warnings as errors
-// Allow to skip building source/binary distributions
-val skipDist by extra {
-    boolProp("skipDist") ?: false
-}
-// Inherited from stage-vote-release-plugin: skipSign, useGpgCmd
-
-allprojects {
-    apply(plugin = "com.github.vlsi.gradle-extensions")
-
-    if (project.path != ":src") {
-        tasks.register<DependencyInsightReportTask>("allDependencyInsight") {
-            group = HelpTasksPlugin.HELP_GROUP
-            description =
-                "Shows insights where the dependency is used. For instance: allDependencyInsight --configuration compile --dependency org.jsoup:jsoup"
-        }
-    }
-}
-
-sonarqube {
-    properties {
-        // See https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Gradle#AnalyzingwithSonarQubeScannerforGradle-Configureanalysisproperties
-        property("sonar.sourceEncoding", "UTF-8")
-        val projectName = "JMeter"
-        property("sonar.projectName", projectName)
-        property("sonar.projectKey", System.getenv()["SONAR_PROJECT_KEY"] ?: projectName)
-        property("sonar.organization", System.getenv()["SONAR_ORGANIZATION"] ?: "apache")
-        property("sonar.projectVersion", project.version.toString())
-        property("sonar.host.url", System.getenv()["SONAR_HOST_URL"] ?: "http://localhost:9000")
-        property("sonar.login", System.getenv()["SONAR_LOGIN"] ?: "")
-        property("sonar.password", System.getenv()["SONAR_PASSWORD"] ?: "")
-        property("sonar.links.homepage", "https://jmeter.apache.org")
-        property("sonar.links.ci", "https://builds.apache.org/job/JMeter-trunk/")
-        property("sonar.links.scm", "https://jmeter.apache.org/svnindex.html")
-        property("sonar.links.issue", "https://jmeter.apache.org/issues.html")
-    }
-}
-
-fun SonarQubeProperties.add(name: String, valueProvider: () -> String) {
-    properties.getOrPut(name) { mutableSetOf<Any>() }
-        .also {
-            @Suppress("UNCHECKED_CAST")
-            (it as MutableCollection<Any>).add(object {
-                // SonarQube calls toString when converting properties to values
-                // (see SonarQubeProperties), so we use that to emulate "lazy properties"
-                override fun toString() = valueProvider()
-            })
-        }
-}
-
-if (jacocoEnabled) {
-    val mergedCoverage = jacocoReport.get().reports.xml.outputLocation.toString()
-
-    // For every module we pass merged coverage report
-    // That enables to see ":src:core" lines covered even in case they are covered from
-    // "batch tests"
-    subprojects {
-        if (File(projectDir, "src/main").exists()) {
-            apply(plugin = "org.sonarqube")
-            sonarqube {
-                properties {
-                    property("sonar.coverage.jacoco.xmlReportPaths", mergedCoverage)
-                }
-            }
-        }
-    }
-
-    tasks.sonarqube {
-        dependsOn(jacocoReport)
-    }
-}
-
-if (enableSpotBugs) {
-    // By default sonarqube does not depend on spotbugs
-    val sonarqubeTask = tasks.sonarqube
-
-    // See https://jira.sonarsource.com/browse/SONARGRADL-59
-    // Unfortunately, report paths must be specified manually for now
-    allprojects {
-        if (!File(projectDir, "src/main").exists()) {
-            return@allprojects
-        }
-        val spotBugTasks = tasks.withType<SpotBugsTask>().matching {
-            // We don't send spotbugs for test classes
-            !it.name.endsWith("Test")
-        }
-        sonarqubeTask {
-            dependsOn(spotBugTasks)
-        }
-        apply(plugin = "org.sonarqube")
-        sonarqube {
-            properties {
-                spotBugTasks.configureEach {
-                    add("sonar.java.spotbugs.reportPaths") {
-                        // Note: report is created with lower-case xml, and then
-                        // the created entry MUST be retrieved as upper-case XML
-                        reports.named("XML").get().destination.toString()
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun com.github.autostyle.gradle.BaseFormatExtension.license() {
-    licenseHeader(rootProject.ide.licenseHeader) {
-        copyrightStyle("bat", com.github.autostyle.generic.DefaultCopyrightStyle.REM)
-        copyrightStyle("cmd", com.github.autostyle.generic.DefaultCopyrightStyle.REM)
-        addBlankLineAfter.set(true)
-    }
-    trimTrailingWhitespace()
-    endWithNewline()
-}
-
-allprojects {
-    group = "org.apache.jmeter"
-    version = rootProject.version
-
-    repositories {
-        // RAT and Autostyle dependencies
-        mavenCentral()
-    }
-
-    // JMeter ClassFinder parses "class.path" and tries to find jar names there,
-    // so we should produce jars without versions names for now
-    // version = rootProject.version
-    if (!skipAutostyle) {
-        apply(plugin = "com.github.autostyle")
-        autostyle {
-            kotlinGradle {
-                license()
-                ktlint("ktlint".v)
-            }
-            format("configs") {
-                filter {
-                    include("**/*.sh", "**/*.bsh", "**/*.cmd", "**/*.bat")
-                    include("**/*.properties", "**/*.yml")
-                    include("**/*.xsd", "**/*.xsl", "**/*.xml")
-                    // Autostyle does not support gitignore yet https://github.com/autostyle/autostyle/issues/13
-                    exclude("out/**")
-                    if (project == rootProject) {
-                        exclude(rootDir.resolve(".ratignore").readLines())
-                        exclude("gradlew*")
-                        // Generated by batch tests. It ignores log4j2.xml, however it is not that important
-                        // The configuration will be removed when Autostyle will use .gitignore
-                        exclude("bin/*.xml")
-                    } else {
-                        exclude("bin/**")
-                    }
-                }
-                license()
-            }
-            format("markdown") {
-                filter.include("**/*.md")
-                endWithNewline()
-            }
-        }
-    }
-    plugins.withType<JavaPlugin> {
-        // We don't intend to resolve that configuration
-        // It is in line with further Gradle versions: https://github.com/gradle/gradle/issues/8585
-        dependencies {
-            configurations {
-                compileOnly(platform(project(":src:bom")))
-            }
-        }
-
-        apply<IdeaPlugin>()
-        apply<EclipsePlugin>()
-        if (!skipCheckstyle) {
-            apply<CheckstylePlugin>()
-            checkstyle {
-                toolVersion = "checkstyle".v
-                configProperties = mapOf(
-                    "cache_file" to buildDir.resolve("checkstyle/cacheFile")
-                )
-            }
-            val sourceSets: SourceSetContainer by project
-            if (sourceSets.isNotEmpty()) {
-                val checkstyleTasks = tasks.withType<Checkstyle>()
-                checkstyleTasks.configureEach {
-                    // Checkstyle 8.26 does not need classpath, see https://github.com/gradle/gradle/issues/14227
-                    classpath = files()
-                }
-
-                tasks.register("checkstyleAll") {
-                    dependsOn(checkstyleTasks)
-                }
-                tasks.register("checkstyle") {
-                    group = LifecycleBasePlugin.VERIFICATION_GROUP
-                    description = "Executes Checkstyle verifications"
-                    dependsOn("checkstyleAll")
-                    dependsOn("autostyleCheck")
-                }
-                // Autostyle produces more meaningful error messages, so we ensure it is executed before Checkstyle
-                if (!skipAutostyle) {
-                    for (s in sourceSets.names) {
-                        tasks.named("checkstyle" + s.capitalize()) {
-                            mustRunAfter("autostyleApply")
-                            mustRunAfter("autostyleCheck")
-                        }
-                    }
-                }
-            }
-        }
-        apply(plugin = "com.github.spotbugs")
-
-        spotbugs {
-            toolVersion.set("spotbugs".v)
-            ignoreFailures.set(ignoreSpotBugsFailures)
-        }
-
-        if (!skipAutostyle) {
-            autostyle {
-                java {
-                    license()
-                    importOrder("static ", "java.", "javax", "org", "net", "com", "")
-                    removeUnusedImports()
-                    indentWithSpaces(4)
-                }
-            }
-        }
-        tasks.register("style") {
-            group = LifecycleBasePlugin.VERIFICATION_GROUP
-            description = "Formats code (license header, import order, whitespace at end of line, ...) and executes Checkstyle verifications"
-            if (!skipAutostyle) {
-                dependsOn("autostyleApply")
-            }
-            if (!skipCheckstyle) {
-                dependsOn("checkstyleAll")
-            }
-        }
-
-        if (enableErrorprone) {
-            apply(plugin = "net.ltgt.errorprone")
-            dependencies {
-                "errorprone"("com.google.errorprone:error_prone_core:${"errorprone".v}")
-                "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
-            }
-            tasks.withType<JavaCompile>().configureEach {
-                options.compilerArgs.addAll(listOf("-Xmaxerrs", "10000", "-Xmaxwarns", "10000"))
-                options.errorprone {
-                    disableWarningsInGeneratedCode.set(true)
-                    errorproneArgs.add("-XepExcludedPaths:.*/javacc/.*")
-                    disable(
-                        "ComplexBooleanConstant",
-                        "EqualsGetClass",
-                        "InlineMeSuggester",
-                        "OperatorPrecedence",
-                        "MutableConstantField",
-                        // "ReferenceEquality",
-                        "SameNameButDifferent",
-                        "TypeParameterUnusedInFormals"
-                    )
-                    // Analyze issues, and enable the check
-                    disable(
-                        "MissingSummary",
-                        "EmptyBlockTag",
-                        "BigDecimalEquals",
-                        "StringSplitter"
-                    )
-                }
-            }
-        }
-    }
-    plugins.withId("groovy") {
-        if (!skipAutostyle) {
-            autostyle {
-                groovy {
-                    license()
-                    importOrder("static ", "java.", "javax", "org", "net", "com", "")
-                    indentWithSpaces(4)
-                }
-            }
-        }
-    }
-
-    plugins.withId("org.jetbrains.kotlin.jvm") {
-        configure<KotlinJvmProjectExtension> {
-            // Require explicit access modifiers and require explicit types for public APIs.
-            // See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
-            if (props.bool("kotlin.explicitApi", default = true)) {
-                explicitApi()
-            }
-        }
-        tasks.withType<KotlinCompile>().configureEach {
-            kotlinOptions {
-                if (!name.startsWith("compileTest")) {
-                    apiVersion = "kotlin.api".v
-                }
-            }
-        }
-        if (!skipAutostyle) {
-            autostyle {
-                kotlin {
-                    license()
-                    trimTrailingWhitespace()
-                    ktlint("ktlint".v)
-                    endWithNewline()
-                }
-            }
-        }
-    }
-
-    plugins.withType<JacocoPlugin> {
-        the<JacocoPluginExtension>().toolVersion = "jacoco".v
-
-        val testTasks = tasks.withType<Test>()
-        val javaExecTasks = tasks.withType<JavaExec>()
-            .matching { it.name != "runGui" }
-        // This configuration must be postponed since JacocoTaskExtension might be added inside
-        // configure block of a task (== before this code is run). See :src:dist-check:createBatchTask
-        afterEvaluate {
-            for (t in arrayOf(testTasks, javaExecTasks)) {
-                t.configureEach {
-                    extensions.findByType<JacocoTaskExtension>()?.apply {
-                        // Do not collect coverage when not asked (e.g. via jacocoReport or -Pcoverage)
-                        isEnabled = jacocoEnabled
-                        // We don't want to collect coverage for third-party classes
-                        includes?.add("org.apache.jmeter.*")
-                        includes?.add("org.apache.jorphan.*")
-                        includes?.add("org.apache.commons.cli.*")
-                    }
-                }
-            }
-        }
-
-        jacocoReport {
-            // Note: this creates a lazy collection
-            // Some of the projects might fail to create a file (e.g. no tests or no coverage),
-            // So we check for file existence. Otherwise JacocoMerge would fail
-            val execFiles =
-                files(testTasks, javaExecTasks).filter { it.exists() && it.name.endsWith(".exec") }
-            executionData(execFiles)
-        }
-
-        tasks.withType<JacocoReport>().configureEach {
-            reports {
-                html.required.set(reportsForHumans())
-                xml.required.set(!reportsForHumans())
-            }
-        }
-        // Add each project to combined report
-        configure<SourceSetContainer> {
-            val mainCode = main.get()
-            jacocoReport.configure {
-                additionalSourceDirs.from(mainCode.allJava.srcDirs)
-                sourceDirectories.from(mainCode.allSource.srcDirs)
-                // IllegalStateException: Can't add different class with same name: module-info
-                // https://github.com/jacoco/jacoco/issues/858
-                classDirectories.from(
-                    mainCode.output.asFileTree.matching {
-                        exclude("module-info.class")
-                    }
-                )
-            }
-        }
-    }
-
-    tasks.withType<AbstractArchiveTask>().configureEach {
-        // Ensure builds are reproducible
-        isPreserveFileTimestamps = false
-        isReproducibleFileOrder = true
-        dirMode = "775".toInt(8)
-        fileMode = "664".toInt(8)
-    }
-
-    plugins.withType<JavaPlugin> {
-        // This block is executed right after `java` plugin is added to a project
-        java {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            consistentResolution {
-                useCompileClasspathVersions()
-            }
-        }
-
-        repositories {
-            mavenCentral()
-        }
-
-        tasks {
-            withType<JavaCompile>().configureEach {
-                options.encoding = "UTF-8"
-                options.compilerArgs.add("-Xlint:deprecation")
-                if (werror) {
-                    options.compilerArgs.add("-Werror")
-                }
-            }
-            withType<ProcessResources>().configureEach {
-                filteringCharset = "UTF-8"
-                eachFile {
-                    if (name.endsWith(".properties")) {
-                        filteringCharset = "UTF-8"
-                        // apply native2ascii conversion since Java 8 expects properties to have ascii symbols only
-                        filter(org.apache.tools.ant.filters.EscapeUnicode::class)
-                        filter(LineEndings.LF)
-                    } else if (name.endsWith(".dtd") || name.endsWith(".svg") ||
-                        name.endsWith(".txt")
-                    ) {
-                        filter(LineEndings.LF)
-                    }
-                }
-            }
-            afterEvaluate {
-                // Add default license/notice when missing (e.g. see :src:config that overrides LICENSE)
-                withType<Jar>().configureEach {
-                    CrLfSpec(LineEndings.LF).run {
-                        into("META-INF") {
-                            filteringCharset = "UTF-8"
-                            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-                            // Note: we need "generic Apache-2.0" text without third-party items
-                            // So we use the text from $rootDir/config/ since source distribution
-                            // contains altered text at $rootDir/LICENSE
-                            textFrom("$rootDir/config/LICENSE")
-                            textFrom("$rootDir/NOTICE")
-                        }
-                    }
-                }
-            }
-            withType<Jar>().configureEach {
-                manifest {
-                    attributes["Bundle-License"] = "Apache-2.0"
-                    attributes["Specification-Title"] = "Apache JMeter"
-                    attributes["Specification-Vendor"] = "Apache Software Foundation"
-                    attributes["Implementation-Vendor"] = "Apache Software Foundation"
-                    attributes["Implementation-Vendor-Id"] = "org.apache"
-                    attributes["Implementation-Version"] = rootProject.version
-                }
-            }
-            withType<Test>().configureEach {
-                useJUnitPlatform()
-                testLogging {
-                    exceptionFormat = TestExceptionFormat.FULL
-                    showStandardStreams = true
-                }
-
-                outputs.cacheIf("test outcomes sometimes depends on third-party systems, so we should not cache it for now") {
-                    false
-                }
-
-                // Pass the property to tests
-                fun passProperty(name: String, default: String? = null) {
-                    val value = System.getProperty(name) ?: default
-                    value?.let { systemProperty(name, it) }
-                }
-                System.getProperties().filter {
-                    it.key.toString().startsWith("jmeter.properties.")
-                }.forEach {
-                    systemProperty(it.key.toString().substring("jmeter.properties.".length), it.value)
-                }
-                passProperty("java.awt.headless")
-                passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
-                passProperty("junit.jupiter.execution.parallel.enabled", "true")
-                passProperty("junit.jupiter.execution.timeout.default", "2 m")
-                // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
-                // See https://github.com/apache/jmeter/pull/5763
-                if (JavaVersion.current().isJava9Compatible) {
-                    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-                }
-            }
-            withType<SpotBugsTask>().configureEach {
-                group = LifecycleBasePlugin.VERIFICATION_GROUP
-                if (enableSpotBugs) {
-                    description = "$description (skipped by default, to enable it add -Pspotbugs)"
-                }
-                reports {
-                    // xml goes for SonarQube, so we always create it just in case
-                    create("xml")
-                    if (reportsForHumans()) {
-                        create("html")
-                    }
-                }
-                enabled = enableSpotBugs
-            }
-            withType<Javadoc>().configureEach {
-                (options as StandardJavadocDocletOptions).apply {
-                    noTimestamp.value = true
-                    showFromProtected()
-                    locale = "en"
-                    docEncoding = "UTF-8"
-                    charSet = "UTF-8"
-                    encoding = "UTF-8"
-                    docTitle = "Apache JMeter ${project.name} API"
-                    windowTitle = "Apache JMeter ${project.name} API"
-                    header = "<b>Apache JMeter</b>"
-                    addStringOption("source", "8")
-                    bottom =
-                        "Copyright © 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
-                    if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
-                        addBooleanOption("html5", true)
-                        links("https://docs.oracle.com/javase/9/docs/api/")
-                    } else {
-                        links("https://docs.oracle.com/javase/8/docs/api/")
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index a1f57b2a832..00000000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    java
-    `kotlin-dsl` apply false
-    id("com.github.autostyle")
-}
-
-repositories {
-    gradlePluginPortal()
-}
-
-allprojects {
-    repositories {
-        gradlePluginPortal()
-    }
-    applyKotlinProjectConventions()
-}
-
-fun Project.applyKotlinProjectConventions() {
-    apply(plugin = "org.gradle.kotlin.kotlin-dsl")
-
-    apply(plugin = "com.github.autostyle")
-    autostyle {
-        kotlin {
-            ktlint(project.extra["ktlint.version"] as String) {
-                userData(mapOf("disabled_rules" to "import-ordering"))
-            }
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        kotlinGradle {
-            ktlint()
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-    }
-}
-
-dependencies {
-    subprojects.forEach {
-        runtimeOnly(project(it.path))
-    }
-}
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
deleted file mode 100644
index e10c7c1650d..00000000000
--- a/buildSrc/checksum.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<dependency-verification version='2'>
-  <trust-requirement pgp='GROUP' checksum='NONE' />
-  <ignored-keys />
-  <trusted-keys>
-    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
-    <trusted-key id='55e770230e69cc6de143fb5b62c82e50836eb3ee' group='com.github.gundy' />
-    <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
-    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
-    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
-    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
-    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
-    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
-    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
-    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
-    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
-    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
-    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest' />
-    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
-    <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest.ktlint' />
-    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
-    <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
-    <trusted-key id='d4c89ea4aaf455fd88b22087efe8086f9e93774e' group='junit' />
-    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
-    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
-    <trusted-key id='a778fde933a96dda827840d8e2b3d84202b812d9' group='org.assertj' />
-    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
-    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
-    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
-    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
-    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
-    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
-    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
-    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
-    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
-  </trusted-keys>
-  <dependencies>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.7'>
-      <sha512>2FE2FE885E48F7D3592751F0E824E21BE2478B9046E25E0AF109E6683F126B1ACE3DA7CB0FF3DA586C08498EF9FEFF445A00A63B2B86CC8BE22D0B3242F801B8</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.4.1'>
-      <sha512>438E982D2C40426C18E4953AFA3A88A6A5BB69D37D11A60CFF03F28E8ACABD1009B5F10D07D99F61470DDDE194F489EA01425BB4D3AF798B10A2954E6D0ED095</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
-      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.7.10'>
-      <sha512>CB887D0053A5C1656260BC77003BCAE612CAA018933CB7A752EC2A87AB571EA0CD683905436771ED1982A8DDE15299F861C513CC73A83E1C0F31F1154095D11D</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
-      <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-sam-with-receiver' version='1.7.10'>
-      <sha512>5A1FF4989B370946633B6BB2BE9E42729AE8CA323D59444F149EAB1AFC199AEED8ADC35199C672DB153AAA7D8E670C2FD9A9B78A36EC02130A342999943EB4B9</sha512>
-    </dependency>
-  </dependencies>
-</dependency-verification>
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
deleted file mode 100644
index fc20a54f188..00000000000
--- a/buildSrc/gradle.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-org.gradle.parallel=true
-kotlin.code.style=official
-
-ktlint.version=0.40.0
-
-# Plugins
-com.github.autostyle.version=3.2
-com.github.vlsi.checksum-dependency.sha512=7BC525B8790D8C3554316D47AC0E048B90E87902EBC40B1FE1C18BC533161037DFC9FD751AC822542D0B35D93B5CEC8848ADBB9F3D958ECBB391CF20A268BBE0
-com.github.vlsi.checksum-dependency.version=1.86
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
deleted file mode 100644
index f90c8fd6cb3..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/164bd2247b936711.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-58e79b6abc762159dc0b1591164bd2247b936711
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
deleted file mode 100644
index ddc2bc81e5e..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/11/58e79b6abc762159dc0b1591164bd2247b936711.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFPU8TIBCADGNvExYTJpVuNGCF9NuWw+IkitjAD7WzF7QkvFCSw9VftzgTUZ
-3PYrThRiaDdmHQAke4Sp+nYyAJ7iUcQqg/5/ONiMdzXEv5Kwy5WJN8+o2aXSunIT
-PALIw29DemZdVerw8Xc9jcdNYGxbPgtfSjr/DBCBs5Guq+RuuwsBvyTGLiHpc6hb
-91D/wX6Y0NQB4UlY9f3k6AgqiR5OGq602hXYvL10pH6eT3gSmCvxp1WvNJDBmaRi
-ZdgW76Y+bGQkmygWdAb3Q2DUEQHVH30YTBx5VFoiCfx1Jud4mD90Tv1hhPn0fS50
-oLGqI6f+VB14iJ4XLaSfyk/UMl343iF9PAg9ABEBAAG5AQ0EU9TxMgEIANAOURt9
-TLIRxc4lZLnve9LNSjTe3g88MOSoCI/EsyOR4ttMmc7NqNgCwYXyuNlak+jSGupL
-biUCaFq+ioYWPpDGmZZLfiNFPi5Zm8uJdo5RupRTzWWCGryzhb1PHlr1Pd+H4C7r
-SuB4pgTaPB06p/o7H6DU3/HKb3AEkJ40FThJX+cU2EOkVs999WQ6Xyabj8j1ivfx
-jB0K7q4SuEGEpWvbGHWCGTNuzpjcXYvYWjy0pGgJnmBfaZ4NAqD6mpyNx3yDfVvV
-Lu5D3M1t2a9Q4F6uKbaO65SuvTNNRnsCjFbk0tjCas1s2j/QQjI9IyPonKUkVdOv
-egP9XmQke1Wm/TcAEQEAAQ==
-=qNsi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
deleted file mode 100644
index d9aef5d017d..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/a2570288e10932263e8326cbaa49c633b4734832.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFy6CfQBEACycSFejWsSdKTEV3RTXqXVcP2Nx4zYR3ZUKKqdC4lGPjlITjC0
-z5y9mMpH55535dLBJql0dRUg7qKF5obUIqqx2Kg51aVVaeb2OiuSGMF5M2CaKGI3
-vStIPep+GCcq+42CARXPK4Jd9Ob7t8q7YYRzfQMs+/nJ8wAFRI0WbTwKejdZ+IVD
-DuCEvF/yzGWdFZtfLMGESrMhI381BSAnfD4H/5+VvNC0+0EyAQeAsWZQNMlMuq3c
-JafTEhQ9LM3r/c/bWKkPz3d5vjuo+BVZm7hb9kX119A0zEZ/wTQwBv6m7rE+NSTA
-WnvSJs9xPxIjxBjy7tYA//mExzkKRecPCeEi0kbRxrSggi5/jpI3oTz3EFhn6UW2
-srE72hxltLUE6wTjoluq3Jrum4NnT0KBvvxqCFG85G3GIsXAIKQqji2hw56hRyOY
-ucJD7h3Qo0H3OLSVfOiFfSQ4vNBY/l0bWTaD/jOFPMXA87Kmx2PB11UuFjhUm/wK
-jRp7Yv5b6ehZ847uL5W8Xdmy+XcPaxt+nhk84DLP3mX5tNbnaYP9JZsEKiEtzsIK
-rAezDrFmT4iQVrIQBhQBhh051FiJmF+5M3VHa5eiFiCu64R+UniX+4O7uFtzXsR7
-G61wq3hmA+PqlsM5xp5PIKrPVT+l2SADk6AF5UV9ifEAOjpEsnV3sBaXtQARAQAB
-uQINBFy6CfQBEACfqh+i3zvT8DtpfFMpk+F+NqS5UxnOXiwgjKjPrrGV6Dt3v46v
-pFGhfcrdvFV67b0NEWwQVpliGSMqSGCsQSdBSO8WMGk7f3Uzoq5Yti8JBAQYpYik
-vrPPVIRWWe7CtEnBb8dEgcIBGcKX8Zp4RD2q59eS9IufpPFjns59W+3J/ZHyaHU0
-5oBpxRpzsh9uCzL4YSvRHJF1Qr96EGf7hbUf/6kVuoZ4D1NuKoTSbbq64ZxrhdPJ
-8wjw4ONunpzVlTjUzUSTlagsdGPnrJDwJ9+OWr5Axf757ZIHia91Bec+Y+vLasnK
-vk6HAM50xgpvirOECvMgrOS1Ir47MMlJdzqXoTE2idFzKHlUwteMhCiIicYfYdc/
-gWQqy3dBJMIHz0SKSCDPJNO3ihcbcgSQAEW7lZ3696r5vNr5y5X5+b+L/L1393Uo
-6EBpLk5ox6+Yr2FAt0w5JvpIdBacHyGejv9YpRK6ysgQwHC4E0fOtE+fx6WWkr5V
-sAptF/AGzENMsvDDLa64fE2fsSrukxPRLS42jHJNZTGopCKVDgD/00JnNVoZIC+Z
-Hl0BGnDdzIP17FKw0r9sY08UiJ0Bc8dMiTrPsSIxJOS1kjVl7PtGZlwB/njC3+UX
-IMaR1uaSEtIAR7nR884oVYj0j97IjeMTr5n66clN9Q1cNW/J7cV1q4CxpwARAQAB
-=fyQj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
deleted file mode 100644
index e37b3e7e154..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/32/aa49c633b4734832.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a2570288e10932263e8326cbaa49c633b4734832
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
deleted file mode 100644
index 1c0b7372f15..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/59992768673ae145.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a778fde933a96dda827840d8e2b3d84202b812d9
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
deleted file mode 100644
index f700439be79..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
-P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
-ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
-fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
-C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
-itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
-wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
-wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
-J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
-Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
-bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
-kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
-L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
-OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
-SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
-mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
-YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
-=A08o
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
deleted file mode 100644
index f90c8fd6cb3..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/efe8086f9e93774e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-58e79b6abc762159dc0b1591164bd2247b936711
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
deleted file mode 100644
index 13119799a98..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
deleted file mode 100644
index 798a7ce906f..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
deleted file mode 100644
index 780f44c7423..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=TUjT
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
deleted file mode 100644
index caed7968c22..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=Izx6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
deleted file mode 100644
index 317a090c834..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
-9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
-DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
-KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
-xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
-BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
-tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
-nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
-TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
-IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
-Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
-DG73NR9fZCzl1K8AEQEAAQ==
-=FVRo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
deleted file mode 100644
index c9c100ac5c3..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
deleted file mode 100644
index d54a694590e..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/a778fde933a96dda827840d8e2b3d84202b812d9.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFblDs4BCACutkNqmk1mmAJjxSXUH4gOJAU4Ys5OUv2oDjyJ13AY8/4uPdar
-1R/isfgIzGU3hRFaNLUEY25ISL4sW20vOUsmx7HVJ3R4kFYhnNAcA363orye1hVf
-TmF9C0j5yQlUhPVYjkFzpR0Jn8SwLLbWsERLX3jRhCgCYjOKbmekQ08dTl+NC/SS
-MzRIsqt+1m2JYoLARF+MHjEGW6nyILm0AmgiSMjj8VvsaJNJkffO5C5Ijc4xG5Oy
-ilT+7ig2JzgHGuDb2AtYdDPRJcPwkOS8B4V7DdV9csnW5VGhXQP5ow8SE9+CyqTR
-oZ0csvglx6hx0Qc8eY31q8/TKOcebPhuUa4xABEBAAG5AQ0EVuUOzgEIANjPZn6F
-SDH0rzSxpbWEJ+G7727fo1ANYCh6WXj79KGc5b7XK6w3ENO7Ji5/6ysjp9DLvXpA
-go4uvElROaCUd5Vv4RUAARv4ZFBd/bDjuBeW2GwM6F/vc9W5agB9aeSowhLUsoMH
-aHkIJgE+T0Ihe7hTtfWH7HgXERVz0PwzIuAwboTiWy5x5nx8UQeGbl8Xaql2TYl3
-46n//GoZUc8YZgJbPTo44hRC+VyRLiubu9nm9IAeDdg9piKwvRU1y6eOYzBKuip1
-YqrtEF8PxUKPNf0QA4pN2Q5OHI8hdawe/nLpchaOGOSSpJuHh1gPQcIhDPCLUBSA
-DZBj5rpRXaIEuZ0AEQEAAQ==
-=QusP
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
deleted file mode 100644
index 1c0b7372f15..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/e2b3d84202b812d9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a778fde933a96dda827840d8e2b3d84202b812d9
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
deleted file mode 100644
index e37b3e7e154..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/de/fc7403768b4c0cde.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a2570288e10932263e8326cbaa49c633b4734832
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
deleted file mode 100644
index c9c100ac5c3..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
deleted file mode 100644
index 93ae4e36dbe..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
-hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
-cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
-2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
-nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
-w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
-4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
-V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
-6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
-BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
-bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
-eFcAOJmvqC3c4pUAEQEAAQ==
-=Hn4p
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
deleted file mode 100644
index 13119799a98..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
deleted file mode 100644
index 9e0b3a1c163..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb
-2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME
-58xSA5quKBUfl1iO2qx23qv6Haw5G50twq4A9WJdEelJJDKzzweVw0BJdv8z01In
-/+sfiitcTzRT0NPbsuOnKCvfIa3gn87BvHCtqai2njq0b8ZQroLaMONtvzrn/gln
-R4oPBdeIpdjf1CrAdWs8zdiHAZWuL2mZBieEgr3+je074ARM3yCpo3DRw2bMwJe3
-JiqIKb0ebCs8ddmOaT00UngmQqCOx1qGjQeXwTD3x5Tzcihdyi5auP/zsBUZHf6d
-kmugzOWrgQ+rdfUCRI29gLWcwMp5dvMJxanREY+p854Hib5n4HZflmkaZCnEls28
-Xh1h3T6e5pWKvfZhsu7qefFjgY3G8O1vKmHjOQNoc/sEUwimAXJxK8E+S3iH/cSV
-9mdtr0TnlzI2r7+kXdyUy2rGgieonSRVRtd0Gdmu4MkiUkbrX3MBvqP14OvT4xkC
-6lcbQK1lrXflWSSRmtfNKpysVOfaIgT5p9F5zJJFEFGm5J25z8beCD8Pics+OHF4
-xfYB2SlM4xmbow2kr2htAE2RyT5EuUNuokkdtrZONmBGHBqzBPvj1vzncwARAQAB
-uQINBF9amNkBEAC46u0OHX2x5/hOswLlZqgGdscFpjGEtAcfAhTj1zo8v2vTNYX4
-E9aF5hQSQneH59a9SWOFDzHCvVWRgfxtupVm3AFPPyWHcb0xsQyfssG0VE6T4B3P
-BNP52pAt36tr9gh69oxfzkC/CJ/DmlKi8Dy6wqt9CzWG4vciI3v7YRj6JOdM52PS
-r+3r8Ih8EYYDaEPAYVJPqNYqt+cjO5goVqCSQfHy1DuM0ggvZ2vZQAZwAgLmKrED
-A6xQUicHVOfN22MIEsGy/qyC7TRJgyhJzU2KYavS3ySp+hPSuffNh3evpArWpFN5
-2e6vq3l+5f8iuBFuNRasnkIAf78qsu0nR25pO8EYzzdcL5Awkjq28661P2veuD9o
-eR39B8G4CsMvYQ8h9oKLh+Z8il0WACycujJGaFxJr/hm3WugCSltzhCN60ocCOaN
-BMq+5rLEx1PQ2DBaf09xmW0SW+pMl5dUDqE62/cGdXF1DaBCr8HjujZ5GXm2ZCru
-LikPaYU2zEk9pfZheRGOW4uvp+SfeuLFo9jt65TbYQvT/hX8FydwpG0dwQtuM2+9
-FUDSpu7k00NDtLMUwF+xlt6vo49Vt0E9nDMYH9OEQOozFJTtxENapOFvHEDI1ZCY
-xCcKOATKqraWzD++MpKIIfVYrRZ+CTjrh0m3Q2NA5aZDLTEmzB5SY0xliQARAQAB
-=tiDp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
deleted file mode 100644
index f24401d1630..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFeOGY0BEADIr99yL4ahwgM3KB7zMVzDk/PEkzUWpm1BSxqUxuQtzWArFj13
-Y3Zi6g1tw5jKESfxtmpXx7j7xR3qVdJbsYJMU0zQi+FehwnKox3Go3UnIKt7kydz
-CGowsRjmEuLErftU6QCDof4Xpum/IPFgu3mcQK3dp+EL2sJDDBahz52DF5bxcSZw
-4OawjX13pnjaPHGw7iWt/fhMEDRmlr6c158lTpEMGpIHH4cum/QTFW1xRf2osjbk
-RysnD/e2QMTwnm05WdImBQq0PQGU3Scz6HQr06UAWyaaukp+k9nZD//hZ7t68w5Y
-wHxHcpFI7JTxesRTv8PNgG5+EC61O2fxMgAefDv9UwhUpYDfxtc0yJYz0QTfNQQB
-RTd8Os6J3OjExDnUFUtPN0Xvgl/SzfCIbxmr/mKqWLzazJMiuNs6mfASrYVuYERl
-c8Gm5TXRU2Pg55KeL6iDAyXDuObKvmqYKb8qXM/qba+RI+KOhBLPSMfWVw5nziVL
-XY6sjXHLIyM1AfDfeM0DHReDR4aIkdnQ4yzyzshmhTodguDbZe2H1FlPNqzriS6c
-4s7CoyO8tTTSHmrxkVLJhMaTc1XazhcQrsp/1s6SJ5MUy0rFUt9QyIt8zfGqzQVH
-pqXmFZd+ISd8Eivsyh5gEU4JER+3J7kSuMQx/wMMZqzu1RczUz4gI0nzTwARAQAB
-uQINBFeOGY0BEADaPmufkJ3ZMMpXhbkBISnPYW/2QGIU0mtwGOO13PnkxFGn4bFI
-es0459axyzMAT2DiOF+cOh0R38DJN9r3ZZFgjAuiy0WTaHyFuON9Ebm3uDLN/VrC
-laXhHI2BxzcYC+uCAor/zJRytD36Cxq8c20NqqQqqq/p7mMDp5S0EjoDpuvXQ55w
-vNmH8dwqu1WBgSYbv+R52fzmQfy7OktbU/mvzkSaxnfqTiLDr2ZkAZcZjgURFvGr
-OB262jvFQ6iTj0ATCrj+xauvpazAAP3z0EgUyegFOHQX/VjA8zqJgMF7d8WcKfzG
-xohxIck7ozOXmcroLzUPLb/i8riDOftXqUcKIkuWD0vtpMVytXYG5RUAo24ypGjm
-Bmvyjy5EkPlc/Yys7Bja/tUKG6F7pcZep0OHTT5bWHUyfvC621cc0RODMC0jCOHb
-MJCetcMBtoPioGBhpjZGrGp6qXfTBg/HmvNgPfWgLDdnBL8iE7aq+Ob/PcnodIGm
-tzAskUhpzNqhtDNbkHV7GDxdlzb3ktZMBGwYgeCal6YzwF76gqlLDy9LQlc/KVme
-A//xB8TAOMEP/qrlGgNJV7kohcvY+4drpTf1MyL3zpZZvD275+sdkL/tjzV8ow95
-ggVesGRDrxvcGvbsS/saKQxf7iwaZyShaNNTCqm+131UWizvVN+enO30ZQARAQAB
-=EYyV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
deleted file mode 100644
index 798a7ce906f..00000000000
--- a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/checksum.xml b/checksum.xml
index bc1a44779ee..bfe988dc8ea 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -6,7 +6,12 @@
   </ignored-keys>
   <trusted-keys>
     <trusted-key id='07dbc3c1ab1f4468471656061c8d5ef0df2b70d4' group='cglib' />
+    <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
     <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.dataformat' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.module' />
+    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
     <trusted-key id='58f086abb0ede8f7a04b76c34c00043bec5cb7cb' group='com.fifesoft' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='com.formdev' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
@@ -22,22 +27,28 @@
     <trusted-key id='b0255b26003ef6f82491acd7254e9c64c264c176' group='com.github.weisj' />
     <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto' />
     <trusted-key id='3288b8be8512d6c0ca185268c51e6cbc7ff46f0b' group='com.google.auto.service' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto.service' />
     <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto.value' />
     <trusted-key id='3dbc5d7dc2fb8dd68aa429bd353a436e043e3145' group='com.google.code.findbugs' />
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
+    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
     <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
     <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.errorprone' />
+    <trusted-key id='ee0ca873074092f806f59b65d364abaa39a47320' group='com.google.errorprone' />
+    <trusted-key id='f05e5f90e43e837f9dd8c781bf935c771a8474f8' group='com.google.errorprone' />
     <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.googlejavaformat' />
     <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
     <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
+    <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' />
     <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
     <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
     <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger' />
     <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger.commons' />
     <trusted-key id='41d266db4427983a1a4afb0c3684155e9365c30e' group='com.jayway.jsonpath' />
+    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
     <trusted-key id='817ea1255546d6070a23aa00db45d3a62a183ce2' group='com.miglayout' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
@@ -47,6 +58,7 @@
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='com.thoughtworks.xstream' />
     <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-beanutils' />
     <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-beanutils' />
+    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-cli' />
     <trusted-key id='cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0' group='commons-cli' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-codec' />
     <trusted-key id='bc87a3fd0a54480f0badbebd21939ff0ca2a6567' group='commons-codec' />
@@ -59,6 +71,7 @@
     <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-logging' />
     <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-net' />
+    <trusted-key id='0186f8b24c5bc02c94a0e0e486f75e83e1ee085f' group='de.thetaphi' />
     <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
     <trusted-key id='3e1ac64f4e34e290503c90323449ec3ac2efe8aa' group='dnsjava' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
@@ -68,11 +81,14 @@
     <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
     <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
+    <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
+    <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.activation' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4daded739cdf2cd0e48e0ec44044edf1bb73efea' group='jaxen' />
     <trusted-key id='b5569a15406ae682380f3ef8528dc75aa68f0923' group='jcharts' />
+    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
     <trusted-key id='a7892505cf1a58076453e52d7999befba1039e8b' group='net.bytebuddy' />
     <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
@@ -84,6 +100,7 @@
     <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='2c1708ea05adf6966c32d6454a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
+    <trusted-key id='5719e50eac5a4b1dd390b72c2a742740e08e7f8d' group='org.antlr' />
     <trusted-key id='b01128c8fd304fe48e6eed2c347cd0eaed975c5f' group='org.antlr' />
     <trusted-key id='dddee87612e9fb95f5c8d91e411063a3a0ffd119' group='org.apache-extras.beanshell' />
     <trusted-key id='1aa8cf92d409a73393d0b736bff2ee42c8282e76' group='org.apache.activemq' />
@@ -112,7 +129,9 @@
     <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
     <trusted-key id='34441e504a937f43eb0daef96a65176a0fb1cd0b' group='org.codehaus.groovy' />
     <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
+    <trusted-key id='82f833963889d7ed06f1e4dc6525fd70cc303655' group='org.codehaus.mojo' />
     <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.codehaus.mojo' />
+    <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
     <trusted-key id='8f9a3c6d105b9f57844a721d79e193516be7998f' group='org.dom4j' />
     <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
     <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty' />
@@ -129,6 +148,8 @@
     <trusted-key id='9a4555c237785ca8a6dc1fe58799af90c06efbbd' group='org.jdom' />
     <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
     <trusted-key id='33fd4bfd33554634053d73c0c2148900bcd3c2af' group='org.jetbrains' />
+    <trusted-key id='e62231331bca7e1f292c9b88c1b12a5d99c0729d' group='org.jetbrains' />
+    <trusted-key id='98465301a4939c0279f2e847d89d05374952262b' group='org.jetbrains.dokka' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
     <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.kotlinx' />
@@ -149,12 +170,16 @@
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
     <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' />
     <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' />
+    <trusted-key id='e0d98c5fd55a8af232290e58dee12b9896f97e34' group='org.pcollections' />
     <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' />
     <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' />
     <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
+    <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
     <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
     <trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />
     <trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
+    <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
+    <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
     <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='org.xmlresolver' />
     <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.xmlunit' />
     <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='xalan' />
@@ -171,6 +196,9 @@
     <dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
       <sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
     </dependency>
+    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.13'>
+      <sha512>2B171CABD12C1E2A89EA9DFEEDC4F97F89587AADADCBB6B4B093D7C558EE3CB2F7D2A6CC66787D5D7B664CF3DC9BC7E4CDAD3737CDCE109D7AB5A0EF0D8BC925</sha512>
+    </dependency>
     <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.85'>
       <sha512>59CD14C68456ADD477C6B6ACC8AC330EE5A10BA4394E3434450E958EC04968197C3EDAE8F3693D42CA32A5C0F639D6D60CF155B659D91CF89301744130087D9A</sha512>
     </dependency>
@@ -201,15 +229,24 @@
     <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
       <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
     </dependency>
+    <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
+      <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
+    </dependency>
     <dependency group='io.github.microutils' module='kotlin-logging' version='2.0.5'>
       <sha512>7396153FF7D2188A963CAEFAC07197C40FCA4866856EC0A1011C5B17E69DA098FCB01401B62E795FBEE18C5BA06D8076380BEC91DA96ADDFC512232B7A6C9A7F</sha512>
     </dependency>
+    <dependency group='javax.inject' module='javax.inject' version='1'>
+      <sha512>E126B7CCF3E42FD1984A0BEEF1004A7269A337C202E59E04E8E2AF714280D2F2D8D2BA5E6F59481B8DCD34AAF35C966A688D0B48EC7E96F102C274DC0D3B381E</sha512>
+    </dependency>
     <dependency group='net.jcip' module='jcip-annotations' version='1.0'>
       <sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>
     </dependency>
     <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='1.2.1'>
       <sha512>DC1FA477AE67F94B7CA427F1F88FD3C56E562EB3ED92A3CBC4CC116258EB3856F4B53C99506FDC279F6983EAE74BA21271E4A152F5DB8B41392FFCBB6B087C78</sha512>
     </dependency>
+    <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
+      <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
+    </dependency>
     <dependency group='net.minidev' module='accessors-smart' version='2.4.7'>
       <sha512>6DAAF2FE1B278599D6D0BBD3F157096F8BCCF3D25616099C128139CE164B29461860EB2786F3D3728937A0D0505DF73F1C9673B0766F946C50878E5F60305736</sha512>
     </dependency>
@@ -228,26 +265,26 @@
     <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
       <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
+      <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
+      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
+      <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.0'>
       <sha512>1D66B1C76711E0F48800BA1EDFAABC0763A21FC0D4145DED508C8D9DCA0EDF5A61A791E58985578C25861435F5BFB4EFD5E0648A8D0E85A30CDFB01AD1559C6B</sha512>
     </dependency>
     <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.1'>
       <sha512>44A5D6F34DB9A4BAE1C11CA10563F3A25F1C6A8F681ABD31C530C7D36C9B001AB6F345F0AB5E2AFD94AD5AB436C06D12D7B1AD9EB7F12DB3EF9487D692107921</sha512>
     </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.5.0'>
-      <sha512>45A6A697C4E514893A0AA530D12A61E537FEAA68C2429E959C68541DB08D1BDD52542AF1DE21F4472557551309C54F4E96DF48889F09F77B70C09139352BAA2E</sha512>
-    </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.5.2'>
-      <sha512>77A7E43B9CC3AE9676A4B9B6D2CEFFF578D171E6A2741DFA676981856E77DFB990F23BCA5817E8EB0E676CFB2802C7E4A429117F817AF52EE7110DCE4CEBE4CD</sha512>
-    </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.5.3'>
-      <sha512>284AC78C68317C9915877AF900B814FC800396F51DB7B82060FB6E5596408D769871A853D6F332B2534F25C625EC8DB00BDBFB48E3DB36EC25088B93AE90324C</sha512>
-    </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.7.0'>
-      <sha512>FD295B038610BF315827D0504677AAA88745E2B5D2C994C5B304A3DF075D9034BFC748AEB6FA21F230BB10252A038A7E861BCA417E57BFCB709DC36286B22A06</sha512>
+    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
+      <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
     </dependency>
     <dependency group='org.ow2.asm' module='asm-analysis' version='6.2.1'>
       <sha512>BE273F8E886BBCFDA81180917145996AB8FD26A17264EBEB5E1FC2337950A309D64DC8CBD373220009728622A8CBF56B8578E960B5561C22EA66848D296AE44E</sha512>
@@ -291,6 +328,9 @@
     <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='3.0'>
       <sha512>AFC41AFD611214C500CACA4D826652E38D5DDD1BCF182D935AFFD2B5B8DF26650DFEB76E4C06C2D46593E1FB86BB4D093438E8E862666E64AB32FB4B6EFEA30D</sha512>
     </dependency>
+    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
+      <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
+    </dependency>
     <dependency group='oro' module='oro' version='2.0.8'>
       <sha512>9A98E493C4D771322B1331EC05AB0E363A83D8AC2AF8018D96A44DF2BF5BFC97D33EBE6F6F93E46AB10BF1536F0C29E9D9569318ED49BC18B4E96B1A8B476D37</sha512>
     </dependency>
diff --git a/config/forbidden-apis/forbidden-apis.txt b/config/forbidden-apis/forbidden-apis.txt
new file mode 100644
index 00000000000..c6693342ee5
--- /dev/null
+++ b/config/forbidden-apis/forbidden-apis.txt
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Signatures of APIs to avoid.
+
+@defaultMessage Use String#toLowerCase(Locale) to pass locale explicitly. For instance: .toLowerCase(Locale.ROOT)
+java.lang.String#toLowerCase()
+
+@defaultMessage Use String#toUpperCase(Locale) to pass locale explicitly. For instance: .toUpperCase(Locale.ROOT)
+java.lang.String#toUpperCase()
diff --git a/gradle.md b/gradle.md
index 4dbed38f0d9..048b50580e2 100644
--- a/gradle.md
+++ b/gradle.md
@@ -21,6 +21,11 @@ Useful commands (`gw` comes from https://github.com/dougborg/gdub, otherwise `./
       # Different tasks for current module
       gw tasks
 
+## List available build parameters
+
+      # List all build parameters
+      gw :build-logic:build-parameters:parameters
+
 ## Cleaning build directories
 
 Technically `clean` should not be required, every time it is required it might be a bug.
@@ -118,10 +123,10 @@ build only the required jars and files.
 ## Coverage
 
       # Generates code coverage report for the test task to build/reports/jacoco/test/html
-      gw jacocoTestReport
+      gw jacocoTestReport -Pcoverage
 
       # Generate combined coverage report
-      gw jacocoReport
+      gw jacocoReport -Pcoverage
 
 ## Generate Javadocs
 
diff --git a/gradle.properties b/gradle.properties
index 90a14ef527a..3801fc003f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,114 +31,10 @@ kotlin.code.style=official
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
 jmeter.version=5.5.1
 
-# Tools
-checkstyle.version=9.3
-errorprone.version=2.10.0
-jacoco.version=0.8.7
-ktlint.version=0.40.0
-spotbugs.version=4.1.2
-velocity.version=1.7
-
 # Plugins
-com.github.autostyle.version=3.2
-com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=7BC525B8790D8C3554316D47AC0E048B90E87902EBC40B1FE1C18BC533161037DFC9FD751AC822542D0B35D93B5CEC8848ADBB9F3D958ECBB391CF20A268BBE0
-com.github.vlsi.checksum-dependency.version=1.86
-com.github.vlsi.vlsi-release-plugins.version=1.86
-kotlin.version=1.6.21
+com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
+com.github.vlsi.checksum-dependency.version=1.88
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
 kotlin.explicitApi=true
-net.ltgt.errorprone.version=1.2.1
-org.jetbrains.gradle.plugin.idea-ext.version=0.5
-org.nosphere.apache.rat.version=0.7.0
-org.sonarqube.version=3.0
-
-# Dependencies
-accessors-smart.version=2.4.8
-activemq.version=5.16.4
-apache-rat.version=0.13
-apiguardian-api.version=1.1.2
-asm.version=9.3
-bouncycastle.version=1.70
-bsf.version=2.4.0
-bsh.version=2.0b6
-caffeine.version=2.9.3
-cglib-nodep.version=3.2.12
-commons-codec.version=1.15
-commons-collections.version=3.2.2
-commons-collections4.version=4.4
-commons-dbcp2.version=2.9.0
-commons-io.version=2.11.0
-commons-jexl.version=2.1.1
-commons-jexl3.version=3.2.1
-commons-lang.version=2.6
-commons-lang3.version=3.12.0
-commons-logging.version=1.2
-commons-math3.version=3.6.1
-commons-net.version=3.9.0
-commons-pool2.version=2.11.1
-commons-text.version=1.10.0
-darklaf.version=2.7.3
-darklaf.extensions.version=0.3.4
-dec.version=0.1.2
-dnsjava.version=2.1.9
-equalsverifier.version=3.10
-freemarker.version=2.3.31
-ftplet-api.version=1.2.0
-ftpserver-core.version=1.2.0
-geronimo-jms_1.1_spec.version=1.1.1
-groovy.version=3.0.11
-hamcrest.version=2.2
-hamcrest-date.version=2.0.8
-hsqldb.version=2.5.2
-httpasyncclient.version=4.1.5
-httpclient.version=4.5.13
-httpcore-nio.version=4.4.15
-httpcore.version=4.4.15
-httpmime.version=4.5.13
-jackson.version=2.13.4
-jackson-databind.version=2.13.4.2
-javax.activation.version=1.2.0
-jcharts.version=0.7.5
-jdom.version=1.1.3
-jetbrains-annotations.version=23.0.0
-jmespath-core.version=0.5.1
-jmespath-jackson.version=0.5.1
-jodd.version=5.0.13
-json-path.version=2.7.0
-json-smart.version=2.4.8
-jsoup.version=1.15.3
-jtidy.version=r938
-junit4.version=4.13.2
-junit5.version=5.8.2
-kotlinx-coroutines.version=1.6.1
-lets-plot-batik.version=2.2.1
-lets-plot-kotlin-jvm.version=3.1.1
-log4j.version=2.17.2
-mail.version=1.5.0-b01
-miglayout.version=5.3
-mina-core.version=2.1.6
-mongo-java-driver.version=2.11.3
-neo4j-java-driver.version=4.4.6
-objenesis.version=3.2
-oro.version=2.0.8
-ph-commons.version=10.1.6
-ph-css.version=6.5.0
-rhino.version=1.7.14
-rsyntaxtextarea.version=3.2.0
-Saxon-HE.version=11.3
-slf4j.version=1.7.36
-spock-core.version=2.2-groovy-3.0
-springframework.version=4.3.17.RELEASE
-svgSalamander.version=1.1.2.4
-tika.version=1.28.5
-xalan.version=2.7.2
-xercesImpl.version=2.12.2
-xml-apis.version=1.4.01
-xmlgraphics-commons.version=2.7
-xmlpull.version=1.1.3.1
-xpp3_min.version=1.1.4c
-xstream.version=1.4.20
-wiremock-jre8.version=2.32.0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
new file mode 100644
index 00000000000..3b7f58c1acb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
@@ -0,0 +1 @@
+dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
new file mode 100644
index 00000000000..1efb468cd8d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
@@ -0,0 +1 @@
+cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
new file mode 100644
index 00000000000..a8b12b46251
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
+j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
+lOiq5GM/Em0mtCSDI+i+zpD7MKCQEeV6V9d09r8Ncltf42BQb2x30ajTsGps++tH
+Z6xxhlPaYsF6OT7SBSt40cjc+rhUuAUo7D4Jt7S7zvi2aeulEr9YD+gkp6+EED2p
+f085M4tn9FjIEmYEOdfq2LkrKbel4r7x3YTypU+G0SDEeGKLJrlekNr7B97CxNat
+aP+ioa6GPY1+u8pkELSZDaUUKpqPKuYt37t1XqWHnvzGYzFyORQjuANCz2f8yAkN
+QqgImFuHiv4Zem7Y4ZagG0TG+T+BT7fZFbYIjpMxuy96mn8jdDMRvNOlskMWD+7x
+QLt1TGaworhDJ5suY4TVN7jQfUX11sTjriBkb+xoSvEFJt5MmQvEi587rIt0Xxcu
+/PKkob99JB/W178ZSbJBoOD43iTP//ifgPPlWHa8GgLBg+EyR1HNvZ6goXhfysGB
+BMV0JP4Fk7SOeV6sb2A2vUIA4uVGVzkzxkb/aG03vIl4pvf74y2Gi70/y1/mAbQp
+BWg3LAcn9ARB6t3Z/rTXWL2bfQPGQ6HWSBcG/qHLwQq+1eUR08GdG2PvwwARAQAB
+uQINBFu07sABEADvtfuYWvWH514Ykl9/BpRFWuGvjR3Xfnc2hn12vCH61Na851r9
+vfYkq3PKLMnzBq5Z/jodIcivDLm4zsNUPxVtsHsqr9PE/5xeFO4i7EWU0554Z9p1
+L2D6Q556WSXAFfO6r/41H96VbSctF3onJ4aUL8QQ4gVtPgX3LutC59DUDpcN+1Ut
+VFPsUMaRShVS7weN1PvBRo0QRIo5YbWMnbt48Hx/lY5X0IAT2ptdUbU+AGOiIh0W
+AMks+hyrKddi5fXupMTEYASnUvZOibBYKID4A6WmIma4QniaWy7CMPvGuKaHEZ9d
+DeK/kjGlHc5O9UmQ3bJgiTNTgmNij7VpxeTkiaYq+l7aPiuJo4TQRLZ7XtMv3YTf
+HnMZFZj/BJw5otPa9EWvMXOO8mi8MRg4KfraMNUzniJnEGL2iXAPAU/oMiHRlgrT
+vKS2s81Kaj7HDfgxS1pKKLLcXTvDIt4VAe2+9rl7UEmlR9UuRmFZx0dTmvby54MC
+qR6Xin0XMr+Y+NcONF8l1nN20AMhyWUzshKDoEsqdvyTyfKZjUoP6kAvqQknsmC2
+nSyp1V2ToPlPACAK5cMdJPa7R7C5xWrF+Do7j3FQsAoy1GzJezP78tbZyCxQTSDO
+MjvMg4l+2ngHa/aLIb5aLopobuH/9yVSILOcjTnO6wEL6YZHaJAMckVGcQARAQAB
+=ZdoI
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
new file mode 100644
index 00000000000..1b72e8cbd2d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBs2wABDAC+hlEcwcAqPBo183xD18nAU7fBJI3lkg8zCvMgpMzPH8uD54wS
+fd0q+7k+2Ddf6L3VLW7+uxuQDNw1gLfIWHcSxGI151pyXkSmYlWsLmGRRwWNSIDS
+Qhdi1nnQ+JERKXIo72IikoedbNJBhSTQLEWAeVY1RbeOEeJB61L9+ZEoG4BiB8UN
+BRyZ6OCj6BrEL8tzV1wx1GL2kBHCxbxJGEoUxsePW6IM2lfvttC96VFWfZ2aoheI
+cXExFxWyxBUJPSovE0708khSh9NmCtX7yYXAqQ/EwxLnMrVp7x/kVbQpQeQWQB3N
+zRypv9QLWcp2XUx7oMZuomhyKNA36hmodCg04iIZUfP7ytc6yMIliCxLKT9mIbmb
+jg+tr81v95U7j3EYG1/2mM7h9OblqWN6UQ+5ZKG/kra1/IBpqujd9L0AxvI8/RXj
+yJU4q+UYgNer6ijFkpvHMsp+M/DBBtdChycCjhxHF/i7CKyrj1SWyC43HdAFB5pk
+cOnnt2I+JodG3C8AEQEAAbkBjQRgbNsAAQwAwGXsT1c3H4iPHAtDxIGey6STg2s7
+YMxTNvnyXml9TJdqA1mlklUCAk3Jvuez7E3phcSu30tD/gd2JqYGsCjNVDhk1BWN
+6Rbt2u1s8XPElJia9OUYU6F9hFJlA4J7Ej0yZWJhDroJSLxG+quALhc4Ch8fnN+i
+lKXvkbOmSN3eqV6QM8vYK7ta9jeogrueS1rL0Xg1EtJGthuMZ3vLNtkNdGsg9Is3
+K47rms+RoL+EY50psXvhQn3dd6iPXOuxYlsmrV5V+tROW80WX9yrr6buYyX/tfec
+hl0ay63+6xz5wvJsjdWZ7zmjkqopZqBPXRCNchMCFMJUR5pzNx0sppX0kNCQI9jh
+QDaC+S99rMRVd+LEWAXvr7ZkNpo8s9vVxUoLFjzBFLzT9dhf8A/XlTWXmo+Mqwru
+YExcuo92T7ohkMfDh3EPmDnfX3EaTghKmLJ8KWLmMxtyLMWFglbuAqxsWSfbWgcY
+psbviBJJwATjHIqxtMcHeNAL5sjqQPUxRj/RABEBAAE=
+=cZDV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
new file mode 100644
index 00000000000..b65145cdc99
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
@@ -0,0 +1 @@
+5719e50eac5a4b1dd390b72c2a742740e08e7f8d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
new file mode 100644
index 00000000000..760013c5efe
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
@@ -0,0 +1 @@
+66ca61ea0fc7e9ea1216f83396b88eacd463b90b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
new file mode 100644
index 00000000000..38f48c56106
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
@@ -0,0 +1 @@
+fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
new file mode 100644
index 00000000000..aad93447102
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEY4fp+xYJKwYBBAHaRw8BAQdArb04PVwQKvEhtUEmEu7/aASZivOWgEkZBqX0
+Tovwvq8=
+=TWPb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
new file mode 100644
index 00000000000..bc2348be82b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
@@ -0,0 +1 @@
+1d2c7ef8ada0f794b58c7c63436902af59edf60e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
new file mode 100644
index 00000000000..8acbce9e3f9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
@@ -0,0 +1 @@
+afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
new file mode 100644
index 00000000000..6f70b6c9127
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
+mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
+4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
+/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
+jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
++krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG5AQ0EVlSyJAEIAL0+8UoJ
+uUsC3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbau
+L6Lrvw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3
+Yw/xfiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/t
+DxttYkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAg
+P6kgFxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPF
+HNkLijDp+f5mkJcAEQEAAQ==
+=32WC
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
new file mode 100644
index 00000000000..f6e3fba880b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
@@ -0,0 +1 @@
+6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
new file mode 100644
index 00000000000..f8b377469ce
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF8tnmMBCADROe7j1ZvgiMgfsQKqCSuSqgMkfMT2DEXwZKdHqkj0gfx8MPQg
+OP1pmMgpIwIXKr5kZ9KMGiGULNnS+WU2SNqjyKeq3MlnSYW5Di52MoAD7W4cHmry
+8ekaasF/x0AS5Q3M/6X/EBOD8YLWaFkk+h5x8D4IOSqiOiWH8olGjY4ZmGblaldX
+PLr7BWSrPKQ1QDsoICn583Mnjz3YLlc4p5IKnY2wss1zm7/gQk6KkdL5bRuASxLh
+to2adZ1LEE8MQfHweauHCK915RmMg7W3KW66/EsuCyEwZKBwq6rIpAciym2FngJt
+CPnY0o4IMFSasV7d1xSH5N4jeHL3Hh2Yd9tHABEBAAG5AQ0EXy2eYwEIANZAQd63
+jnuXS/btvoRXGM1kwaU0j3f2jeTg12sIGCUiiM4NcD2OnxWSKwvv6SWuk4/W+ahV
+3zQuTR8ZI51kNwgxvNZYKFExUyRjS+B4Oo6ArDSPp76Kyo3+82KmPaeHxxibir4s
+HoZUTSl8UKyszxEUV7BE756wS7DRHWpeE1gsjClFXc6/hnEOnXIzsoAdIFzzockf
+LW3guouh+MD5EE/x//rYyZJEotsPCu4vP/TanR9H6WnYOIn8g3jSUarV9LFGNcxN
+Ccj5sh2x3tOVjQBtPpE2SUEveLj3aHFTXzx29rU9kzSzEAxlFdK3pwUK/P+MO+V/
+qMHoOY3XwTZp3nkAEQEAAQ==
+=lsuN
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
new file mode 100644
index 00000000000..28f7bcf5d21
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
@@ -0,0 +1 @@
+7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
new file mode 100644
index 00000000000..86601279642
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
@@ -0,0 +1 @@
+679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
new file mode 100644
index 00000000000..eff24e1bee4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGCGrYsBEAC/Ws37TXMujQ4z2ioXlh5SlrWaCzdN5RSBAQEKaiuuQeuwdWku
+bsnhI2f7YgxfJh2if6hCsGeWx3Wd2paLT9IqJbnIltOzHQkYXajIJrJVDep31wQD
+FsjQS8DWdRGkrldc2ClWZs1PAGC4Snp9bNYrnlE8Z1uHVnmN2R0aQ3v7PGw2qpQ9
+XxsQl9m30hMDb4IZBOKy92PC+xNpb6dgee3HJ8uJ2t/nTUCuP1FsMPGP3crbK9po
+UOUigIWMKNnYTyHbx+p22EQIn3iKQU4DQTeZm1/rUnfuULp2Zhl+fTs6U/czCrdr
+7DN4MCzthK7DMhDHH7/uVk53+e0oe0FJZSxYE1ppjvLz4Ox7xMHrlOMFIqb9JOgn
+exUDV34KcPByHqY4ff7IL94Tx7YAwEplnJYBEfb0sYfmjai4PCFj74gjjCmhQUm8
+5Cbm23JvDGck9W75wc6qj7wcFpZrFtfpOsz10YsprM5TcmK9rEIV+o+bRqoNs5hS
++heZmdz7LoWJgarJnlkPjDDOXW54bA5kS8ARlkxllzZ+f0BwaN/HBNbVv3gkBHUX
+YOxphjESdv/WByNQMgzoIBiUt02RqAJg9PECLJSjSfFzd2F9g7Lmc0TUdA/kLEZm
+DqgrDjPkfkwnSqCglI38Z/gcVoSDN2iYhEIfuGoZXbjG4IDVuFYyGZjimQARAQAB
+uQINBGCGrk4BEACTD/+Nk/tDzN3viBmw0GvgWWyeyfVKuhXTYgp1NA2Zugcsz9ZF
+jzQegH+jwekWc4JFSQTFHpxqog94eQ7UKzk3LaYeCMiPpuxyxsY8MSZooAOcysRa
+bkvVHNLFhCKiiTu7E8NkOlCT9v2+f/1aatFnM+D///1/RTR0MJ7lz3EuQWtC6gC0
+MQBydHoN9Ofov07j8RSVXBBf7TfZjl+uYfpYEkP5++bnWLw1WMv8AceaXyCjoJ/3
+L5GfrIHoNmpRujj8FLAZV0YOdpQCEwMn6gfJrcWXcPLcg3vmmYLhOWqj9kZoqE7N
+pejtzp9S4Yi9wM0ZTG+TTk2zec7dw7RstxTLEEJ8dx9IyXAkoNf8etlC9f9KuTnL
+K23lsi3cvjs58WzYxtl6MQS9x8U9QBlb86K8GMDYiwRrPyDusVvzwe0lZgrt7Sbo
+QP5+hD+wY92tJde9JQbYSVcIQwgRGPZGYIZ+DEo5g4SWBVp/y+pFTVd2dFmbu8D2
+RLunI+hy7zjBEXbdRCxhyI16/lGG5wecg6Y4N26w3trUHymeTdAPQ+5swE9F2MTz
+1D/FQrrb/pGa/6FcgusLvAvTJNCK/NAQNWx9ZJ1/teGCO8n2vhPi29950id4V93H
+dLcCy2PBAL4ltAp4gCBjXXRXZuou2jC+syfB/o8kln0/1sblBVlheopMbQARAQAB
+=XO0W
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
new file mode 100644
index 00000000000..2c9a0ea2411
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
@@ -0,0 +1 @@
+b02137d875d833d9b23392ecae5a7fb608a0221c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
new file mode 100644
index 00000000000..48e9b9a10a8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBFKTz1wRCADOdMCDOKXlBuQpG7mnQ/5rppqhS0SXdKvNZ5pYrJKib1LLtlS/
+LOeABja3E1ky+znvTqnEEtai7fNhw36zPdUjhPKE0TZwn2aK5fyctkcfqBFsja3E
+ntJgzi4pa6gVn+MtIjCak71jv5SrC+LE0dkPM/GwupgPL7Ohfpf7HyAGjlpKihrQ
+syg6GmkpZKlhLVD+wg+nILrWngXS6Zz2I9M1rd6wfYVqH8tjYkKYNlexB4hL26zt
+f2MKX1MTRpdgO/jPEh8EI4K5qg0eT2x2e6qsii50WobmvraZfUFpQJysJlmt5jwe
+k/FWfxZ7Hlys8r88VYGa6sknvofGZfhFRZRbAQDhMzmNSQ0mBoveEA8/gd0FqVA+
+YzX8TY90YNeRQMjXJQgAt3kbBz6uyzAchGxSCyZpnS2dVFWqi6H8gqMjKmEnDn+g
+vG19F3STuAKYkJPfJZGwAVnZtTbqQ4R14WgjDuoqHPuFjRw5xrIaEVmb71gFKISP
+F8RIMw2jWygNeXbbXjRF2brEV4H+V6JXn6PnzlmBLIiB1zhzutMUu50FxnmclQxa
+gUxGMcZG/6PcQtiuhu9oKHUl1+E1fs/pexnsPK2gKkRdyUMnngHJ3aYm9vBFMWya
+draOg/6DBRTrvgoOVxzQHSFCSs9ttaHXbLDMD1e9K6DnVMKZVHdJVohNVwxsWxrh
+ibUDu0iH4Zp5MFgyx9L2kkP9kbL1hflIsTyQehDUwAgAwl/BklUfuOkw64xNZ9ww
+YZ/y4GTNuoDIdVkSArr0cKhiLR3u2Qsgy/K2CW5iuXMQGPBrYFfxcHO1Lge5Mvyt
+uYhLYvnH7gwfID/8r5Tjx7ktzoZehO2R4wfqyYfKwLoJGY19uj8hCBmKss3GOK7M
+JKLDKLZ3Lv0t4MTiaSmVsZEVRwYD3x70J7l3mUUwVHAK0QeKg9RczJQRd/i0lKzt
+OAA/d4gZYscWHbZi0dH/KxnqHzSUDkrLuWrYSdvgaln5tS9hG1ge0LFDxf82f1U9
++ckdxzYsu5FNjgu8GFZLbLshRri0kKPWqTBX/YPubApadVU94i0eXnqjmZMajXTm
+LbkCDQRSk89cEAgAjxMmDMl2ElKXFXgWpsITsNUuxm3MwQV0oRBDA6YSgLxpf0Fq
+Hh0+5W2owt//Wnr7jjPF9xmyapTwkEUJr7W/m8XYM5e/VraPJdruYI9D8PTxbiLh
+eUfVjXvds65FK55Fg2pj3tNFTDY1sUcWjvxW1sqlRJpumALTNKLEUSXeFTokHmRy
+Z8knEIc/0GiyDIw1aQ+q+BNDwE7hUP0C6CP7Ddtg1nVxPJhn1WdqzM+hPzO1thUy
+EQTGRtoskVV+jYUXyU8iK5WSoNiGoxLCIWiqaC3BuzMb+Q8//zwYdcWC36UZqSpI
+KuJVmGulQVxO/1bFuQsHqa4ovGmITRO+D/I39wADBQf+OlVr0544kUJspemRYSkN
+P4zQtvFCmUW66diQNxrHTHkOkHQeJbx9S0LvuZoL7nleAbKGoPEAD+lgF7jpHV4J
+rhmSLih1Ocuw3gcnhrJws/+jUcFZPtarJ1pEgBQdCxZO9sc0/MG3j1Z1zB/EA7KN
+5w3Xbh9f1VrGar4G6ZXkIcdRPb7Ka8WwfKAVkpU8j4zpY0rV7ilbUY8liYeccw0w
+CjUYF/8Ww5Tj8/dP9i7G0hutvbFQFCWKfJ8pIF3QZsV4nl+mjzXpsG2kTpqj1dRW
+adYFKf9KBw2emi3T/GwAXdGVcwbo2QLD5OqILmdmlWtHo1bsxRiUY3ALKcsV/Xrf
+hA==
+=nRM3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
new file mode 100644
index 00000000000..e733b21bbff
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard
+sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI
+ayjGTBJeKItX3Npqg9D/odO9WWS1i3FQPVdrLn0YH37/BA66jeMQCRo7g7GLpaNf
+IrvYGsqTbxCwsmA37rpE7oyU4Yrf74HT091WBsRIoq/MelhbxTDMR8eu/dUGZQVc
+Kj3lN55RepwWwUUKyqarY0zMt4HkFJ7v7yRL+Cvzy92Ouv4Wf2FlhNtEs5LE4Tax
+W0PO5AEmUoKjX87SezQK0f652018b4u6Ex52cY7p+n5TII/UyoowH6+tY8UHo9yb
+fStrqgNE/mY2bhA6+AwCaOUGsFzVVPTbjtxL3HacUP/jlA1h78V8VTvTs5d55iG7
+jSqR9o05wje8rwNiXXK0xtiJahyNzL97Kn/DgPSqPIi45G+8nxWSPFM5eunBKRl9
+vAnsvwrdPRsR6YR3uMHTuVhQX9/CY891MHkaZJ6wydWtKt3yQwJLYqwo5d4DwnUX
+CduUwSKv+6RmtWI5ZmTQYOcBRcZyGKml9X9Q8iSbm6cnpFXmLrNQwCJN+D3SiYGc
+MtbltZo0ysPMa6Xj5xFaYqWk/BI4iLb2Gs+ByGo/+a0Eq4XYBMOpitNniQARAQAB
+uQINBEzEOZIBEAC/xcCnY8YD8bUqYKtUjM4GbU08i6oYBg9zWX2nR1h2ESC9/DQ1
+dyXkwO/WNs49nY+ykDw0/tGqnos01dhN4z94gkOd1Tk+HKJ7AWkAICnsaabZ0vk9
+Q6G7SAhSdBhs39B0Y+ijts0jrjorVj1pVMG71+zNCyyNvoapcdI0z6myRWf2Wuik
+7W0usXQj1VKVKmGUKaJBGXMEJlKfEPpRqCQ9rDWAmcmqet1/2gDoAhq9kV2HXTh+
+XvLxsxlvpsLQr/lkPQMt+ZhqiOTKpG2XdUG7r9m9euOxP0BBLnH0R1WyVShhj6RT
+FCbXCLcsiLeY6Pq/Qgi+ArOO3Rf/f0TcLjb6bx11MqjAUHVjWUTMeJPzRg/1r4j4
+vZupiDLouqzkLEjmqmHXFF+Datjq69zms9iT0HVH3iNt4qLdbyvIcb1AkE1dx3yY
+IYszerKVZdMkDigYhPJoiUYK4x4pR94U28aKONsQ5DQKvgkKN0AJtYmw8Sgg6tEX
+Fj43AkQDf0OTJqXKHaXSpM1dMhiEuIO7OX61a4Ff5KMdq+P2MbK/CvdPfuB/NgI0
+yhl/wZrEBQkwKgZOqeyNM8YyKif8N902QUND5+K91iJVD2n82OmvfywLzdXx0cX/
+UqQgcibLMw9N0LuX+UwfILYbHZ1Zk6O444qK3RCjLcNmhDC83Vlk0P0zVQARAQAB
+=2hIj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
new file mode 100644
index 00000000000..8168a520dc7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
@@ -0,0 +1 @@
+3690c240ce51b4670d30ad1c38ee757d69184620
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
new file mode 100644
index 00000000000..d7670dfbfbe
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
@@ -0,0 +1 @@
+ee0ca873074092f806f59b65d364abaa39a47320
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
new file mode 100644
index 00000000000..1af4fc1bedd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr
+c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD
+m+1zSFswH2bOqeLSbFZPQ9sVIOzO6AInaOTOoecHChHnUztAhRIOIUYmhABJGiu5
+jCP5SStoXm8YtRWT1unJcduHQ51EztQe02k+RTratQ31OSkeJORle7k7cudCS+yp
+z5gTaS1Bx02v0Y8Qaw17vY9Pn8DmsECRvXL6K7ItX6zKkSdJYVGMtiF/kp4rg94I
+XodrlzrMGPGPga9fTcqMPvx/3ffwgIsgtgaKg7te++L3db/xx48XgZ2qYAU8GssE
+N14xRFQmr8sg+QiCIHL0Az88v9mILYOqgxa3RvQ79tTqAKwPg0o2w/wF/WU0Rw53
+mdNy9JTUjetWKuoTmDaXVZO4LQ2g4W2dQTbgHyomiIgV7BnLFUiqOLPo+imruSCs
+W31Arjpb8q6XGTwjySa8waJxHhyV2AvEdAHUIdNuhD4dmPKXszlfFZwXbo1OOuIF
+tUZ9lsOQiCpuO7IpIprLc8L9d1TRnCrfM8kxMbX4KVGajWL+c8FlLnUwR4gSxT1G
+qIgZZ09wL5QiTeGF3biS5mxvn+gF9ns2Ahr2QmMqA2k5AMBTJimmY/OSWwARAQAB
+uQINBGH0NlsBEAC9o6m+D2LubGjOJxLQB1BnfBOkFHadsbkb82QFdrCNsd44fJie
+aqZVP+6XHKVRHSPktwpE1FnjThBJJsLwwcvwWXwDwvED57n4bATPlrPGuG7x+LRV
+bxFBTd+LQUCcHd3puruvbEjQdV54mbgdMqAp5dSA4Fc6h2hMWVBX4EdLiH/0ui3l
+UoqYTJcB73U1/jbKcbs0+cVuXIpmAPQpIs30p0wWLOKiJqn9tTZpwfntnrdfLvKL
+3FZcRQeWZjqH1Ywt4zWlCRqGEp7yVqhK5gn4nfEdSX2koxr53OOsGk2Pjhzs/5XJ
+Li1FTOcnja5kkqOPiPGB/BxAnjPCEsSiOFmF3Af4WdYa3+TK8+ggBSEeLjjLa5zy
+qexfhADwgb5ASZitUErJZDhAvqHGwfz3VPENy3K2kJLH+maWwOT1ZRoJnz3fxwIu
+gKhPx1MzlwhTclIknK7q2CNcB61pC9lg70ICW090NgknE2DtmjrRMONhcSkuWGLZ
+BKBgRqNwITJFcAdg6+ffZzGLsnEd+6A29PdsXfLS9KJqiabvpiBg8RaAAWiv5Tqs
+Nu9YSWUQUzBZO43u8AxTtThuHYZrxasoC3sCGIcRy2V9eaq480DRJ9uotONMutIH
+UDVSdqViPmmit0+PyRiCX/DOeBHumaEOm+RqIxPE8h6W8sHrYAQ7J1a3AQARAQAB
+=V7yv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
new file mode 100644
index 00000000000..7a127825fc5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
@@ -0,0 +1 @@
+a6d6c97108b8585f91b158748671a8df71296252
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
new file mode 100644
index 00000000000..4df35d838dd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
@@ -0,0 +1 @@
+60200ac4ae761f1614d6c46766d68daa073be985
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
new file mode 100644
index 00000000000..be933a138f5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
@@ -0,0 +1 @@
+e0d98c5fd55a8af232290e58dee12b9896f97e34
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
new file mode 100644
index 00000000000..356760a2025
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFAxQKwBCADJGPv6pmFEq0SDwAKESEgCdnXycbR0bNXpNa/3VGboNto1xKgd
+AQ/sI5x+CmN0hpUjklEwff6QIt3MlofEMkAzSfRmTobhJTK9W7r4+p5DuhJpi5Wz
+ITdbNCMT3Cvp13rRE+dx9qY+WFQmTYPf3gq+C6T8Q1i35ePNlCTN2RayaFxxR77D
+W93zKZDdd7I1qH0Vx7GGcSwBgBlEB8jmhNAkz/zAhv53S6px3ZttqYYmuwRtg6Fi
+i/u9VoDR/c9tyUq8L6oAUtg0mo4CP/tfUF/uZnibshEsLzbRP961VQXduhn8HcRp
+k6QPTj37B1vsNWJ9U7XXJ6pYnkizQo7sl5XxABEBAAG5AQ0EUDFArAEIALyNR+z1
+eBBF4S+dOEWKXz2ANmsp6RRhvR09QeQwNycVdbdEXpOiSZUCAkw/EhuJWmHBngat
+0KBO+7CIHyQqwHnqyatizzKXi1OuaEhMzPsQMwPRfYyWHgN0aklc5oOzB2RbSJN4
+et/oVvfAplVSjgR0v+56+qXw9TFlp4kxqFeJLycZ+5ImKQ+XclsBokKuE7cjeF+g
+O5oY/CFHdkxD8d+cLF8FSNUFMypuDQ4IH9zPYGkUJqsb2t67iMyxi14RqyN2YNqK
+JcwxTL42VBlUFlTBoF2Y3w0LNll6pR2WSNvpcj+5/uBjtY1qAj5e7yVts+d1YZsX
+7D76AV742RQ31kkAEQEAAQ==
+=O33l
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
new file mode 100644
index 00000000000..52dd86c65c0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
@@ -0,0 +1 @@
+8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
new file mode 100644
index 00000000000..13ba5a6bae1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
@@ -0,0 +1 @@
+dbd744ace7ade6aa50dd591f66b50994442d2d40
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
new file mode 100644
index 00000000000..b56f29b665c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0
+OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe
+0qGWlnAzINuQaEuZwNw+pjZqPraMlwc/hwzJB8yFNHCv25pCFohK7KXvFGr5Fc6y
+NHBp6pM3pnDQ1kbkloDr32YZY2LdrfdkRqwa9STNMcZtM724aaInValFpVGEHolF
+dklo9MIsMI6mVHlxi6UwFSSLltUfTXGYY+rt2Q2sLNnEKzK1GvVhK996vrNWCvpr
+cdtbTzGE3WK4f2knhqzlaX99OLmkM1ah+p2EkK7HgWM9oEO7SYpNxKe/F/QfRNRS
+4W0aokPsEtfKCD7vQ3cRWQXdqFwvksilv+b6pcSrwfAsaCzVuhB3lcIra4MevJcH
+ZEbPrfGMi5/MIVtLayglLHSPoZtjQBhlqo8w3nuADR/aFlIUZ6NGOwaz5yXIGVEs
+6E1wiuILRAd7ecJ3Zyr/URHjawfHfKMM2tNCJKl48cScBMY61FJ1EmYzwhDw+at5
+D4pCk75eM5/t6VdYQ1cDWm7J3LGXEANMU5aSZMqgVnb4SQEmRxkW7oq3Z+GIkQQf
+Sj4OK6Oi4cUpM7b0m7Cbcsoqb6nD27VKD3J5KTYEq3e+78h0VRjhoi0Z+QARAQAB
+=UUB8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
new file mode 100644
index 00000000000..8168a520dc7
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
@@ -0,0 +1 @@
+3690c240ce51b4670d30ad1c38ee757d69184620
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
new file mode 100644
index 00000000000..be933a138f5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
@@ -0,0 +1 @@
+e0d98c5fd55a8af232290e58dee12b9896f97e34
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
new file mode 100644
index 00000000000..10049bedd6e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
@@ -0,0 +1 @@
+3c91fed3922d52296888bae9b6d3ab9bcc641282
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
new file mode 100644
index 00000000000..d451d29611d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
@@ -0,0 +1 @@
+f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
new file mode 100644
index 00000000000..7a127825fc5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
@@ -0,0 +1 @@
+a6d6c97108b8585f91b158748671a8df71296252
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
new file mode 100644
index 00000000000..fc77b95b76e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFoQh54BEADOuivAfgGKc4/zDwx+AwJdctjTT0znL9knRTYG6ediv2Eq+CXm
+gBM9m5twl+qhUB1NtrdHb4BH49VY9/gHr3JDyo5ewu96qkbeQl4pxW0zmHg/yJx7
++qvAK32I1WI29iu4BFnda0EJwNCcVNrEsRuLl2dBqN5GF4cmniGW23W2XsvXiuws
+sKe/4GClWVYVSVrbINk9ODaANx/UZw+b6D0evTEI8lEio7WIvyrl3bnpK2dQ16Lb
+9JThn/xmF43D4gXK+u3mGjueGh9sQ4vMTtnpID9yyh0J8pVumY/BVScAPDAGseXu
+vJEsu4LOC9//KxeBQtij+jR5Ob704/kFrq5q83LACcfrSjsqbwkWLwWbQ/a4doRB
+8puXS0GRb/uwevvAljXrp+fCmjkKfdSMMg34TQufAktf2uzh+YCarGO0EuBSq7ug
+3Om5wKTMTu6OGHsWwZxyKTLZw+5FjUNsZXm9pG+20ocEmsWXFcG7jK5tpv73NIvi
+zys+8QoSoLtVeo4UDJa8qUuTUuu5R+d73i9iChWdDsYgTCXlxuDV0eAmVQqjBKbN
+Zpmk401Efz9QORJI0C5kaEnT9mPFltuiYhOjg8I08AbfPoijB1kgzYnKgNxXyUT3
+8vGvziOgS1A3qTGvMwNpkd1vg/n/B3wPBZC124wx/yHl4YM19b+xsvp3SQARAQAB
+uQINBFoQh54BEADdIvTFoGJA1qcRGROS+hTa8I3YgNJgLXQUHMR1voK7yfDHFtlF
+3WBsKmL48k6FC5BrgU3/gpuLEDzPl52w/k4rgtwKf9O0hkA+KGOfZlYA51Yy7ovf
+MA2aao5MXeUjwlsa2jfTgXoAFwvmrisWbB9ZiN6DBX2tLpk/gav8dy5b0nRz0WSf
+UG53ejRVPB9L0L6kXrTW6pAMlWCkh2uwAaGJoFUInNFPUMbh5f9TLPKODsrOc6j5
+Us8wgX+99ST+JWrVSx0gpQgSILEhvhUzabk0p5vsZBNt/AbVXL4M8K2TXk/+IlED
+/XUtaQptEYeqQ6FKwXavrRQzu1Ru0C0DaNsAEU0OKzG5vGNo00HHKRfMJZBgUozx
+79C6vf6CFnkeoFzhFOsBBVfWHMO7rQ4egchuDQ+DmV0a64+ubUjHaurpbtx00Ele
+w8b2NswIWJAaD46ndt+xCtew3J0KTj/Knxn3Fw3u0gEQhyAuI14Yez3z0EfyBCHB
+blEQI6SYkmAxjG1VEApNgyosjawn8uKLFOEctfLjtKz2DregfuVeuSs8ZmvF8DVR
+5pPg97TZPeEj32k8u+AE4KL7iDxG1/ftE01XBnKNzbpayFCjdjBAAjEIurPEV+pn
+h07XvwNkIHVx7OpddsGnTop3TfFcINGetFXf4/dM1Y8aJHwWaTsmQQv5LQARAQAB
+=r0XB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
new file mode 100644
index 00000000000..b22da3df4b4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
@@ -0,0 +1 @@
+82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
new file mode 100644
index 00000000000..e53a26ad84c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEmhev8RBACz56FVQ9l701+PE7Nr6+6Lsoy5tK6wmV89pEvUDgDjT0VTs4EI
+dupAk4a0dLn8Lu87AloEYuSzbCxv5cH5vyDcvLDK6g3/sRC1LPQPydD+UlCvG8LI
+jCmzJYSJj8joVqTBLL2RBdR7xUie34e1RTvAM5b0UHnnvmsvEwwFRsb6CwCg7VFi
+5CrOZlhNeWcWqSpPZCTV4ikD/2xEBh5fUlpfo6qoWeYx2pLg7X7TIriD6IVSREmT
+ewrVXK/C5N9jcJ1zCERjkPOinyZh11MX9dau6M7I+72bapVj7Za49VHiPutDCb8t
+3OPS+ksddfTccQw0iHGDjSusJM+hX6wmHDBgY++WBCYX9TkZxz/cFutqOZ+HBYUW
+QiEjA/9p5vk/gpSB2UtmUn0StfAnwsqpiiwV4weS3sbn66qRYq3jbbAjS5v+jGwf
+KZjPpUyBitKW2Jx+BgPnFy6yk+u19gv7MOiKwikqeDqyF6M0fAjJflproQFLyHZQ
+7YFfIvhB0k76t7qSeCU9MA2wbU/DvDS/TmsMiMFqBuhjB6T8wbkCDQRJoXr/EAgA
+oJmSrlu4uHo9RhCtUmSNOczGf922j95Ldou20NKmRKd6Mki9dGdCt/TJSCaWFULf
+oQ7rKDQy8IRrP18xaJ/KzhG6fjh9uuA0v9x9ORsEHB5Xih3s9gt/TqC6NWeOSd8R
+ZeG6Y6SgtFcA+5a3UP9yFSXo0xS2It48f/ClB1/I1V+iQjVXC3pbs3LwGJlaclNE
+V8ROkXDhyYPwW6LQkWEDa043dSKCOFe6FnytD/9vv92weOFe7pSltEJiHjz9qpZl
+Aq3CANsjqsqqZJU36+8rpyiJfSiHXcdjgCiDQyzdQm5HQl0cU1e1+CabMrL/8+9X
+6C1a4dSXu++NDXgbVB5hnwAEDQf/Z3kUqSvprtKZjh2orialskkQ6jQlGTSCoX/o
+UAsBvnsVSdP0CHUnI0mYfIh4WhuiJwHgmvTfjrAzU2Jfwww9glw6OlhXP4mgvM23
+rF/Rk/gpAaUfweSy6TYlynfzFHQ6HPIYEZqGmLPJ/n8a4rsIGSWcW2+TC+OEI7Rg
+YvC+LJuoXToqn2tPQ3Av3JeEbO8nenk3SJtrR70cu5F76ANJwgCuwug/ylzvM774
+DuXQd4vPFd4jFxvj/AvKs5itQAGRaInfCxn4uHcUZc2WiGy7T28CpD1Q3ptUybs/
+ogyDCKa/xVHKXu9wRF4osf8U1DdDpjfabdKWG1+RMbx08zH7dQ==
+=WcKl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
new file mode 100644
index 00000000000..86601279642
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
@@ -0,0 +1 @@
+679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
new file mode 100644
index 00000000000..3b7f58c1acb
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
@@ -0,0 +1 @@
+dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
new file mode 100644
index 00000000000..70aae820c67
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
+9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
+M6mGWsr02oVZCKdRzq0sTa8qO4UXrAjfciYoe0n6sc5e+URIH0Cmd8p60AmpKPaI
+L8/dyfDYA0EY6VVJgYlCa44IaDet7xb2VvwNxbTmvZ4lui/U+MSt8IDaW+4g58UH
+7gkRGFq4FK1a+cwBzQsPRdeEgAXsRZmCIQPt/Eti+ZF0XmLe34kT60lz/C+WcGb5
+h17NYkxERAhvDET4xLykSW9y64GEYqFVUvypqYpGk3xQ5Ly//stai0+CzwPDbhJV
+HZVWwyy4zCH+WrbAtoZSIhbGJNBryPVf+qV7e4kVdc7GTMDy74myl1d3W7v9XBWZ
+TGsVAXfemH/4CgznDw7Zj/xD5i6wnSd9zeX8cLVR66yWOYxUtFieuLzRnbbUEKAB
+Rf3uLWOLN1eTgfg3/w7lx6dn9PLvWzOIpkeLF3UHIW9iYHNhbs9lCop75o/YR/g8
+5t0p1bIm97tCKmGZSHppH4KmWQTHLaBG73H8RYCXlvoiwCApleQPaMT7q4FUJr8U
+Utu6YNQgzoE/xUOHAPHO66DaVvAjR0eS1ge9wf99CKWSnU54pwQXo9IGCwARAQAB
+uQINBFu1EwcBEAD1tTlKuxwUaoEm3Gh8lw6MR7fnBgiUZzED/W7obyUpCdflOSHA
++tgLkjpbz7azO2a0beS21NkXdx4yOhJ1Yv8wjCIwmoA1HGC17SHiYXvKM3TovEFj
+BUhVpJxOMrR68GVC8Bx2r7zRNnru9fXzwWPkyq8qPOhqWqf465gXxZnn70qqBQfS
+sSXq+9hhVGqPn8PfTMUiRGb0O/8fUxL/bLDva+w1/hSPAMgwIIHJ8Vc62dHNP4be
+wV1r8yMjNZlM4mysm+yVhgFaH+WgTJm9HSDSxraFptq8QkAhIpDuRXORGFMm7Ain
+sKzUuMkgfPmW7sk60/1RBQ9MmKh4ma0ia8OkG58jby4yyNCh7TLP56tzyai7kk14
+l2os2Zr1ytBbSmXp3HKiHO6WU64Sa6HmAyqbv7+gP3qHz8nj+UtiWn6vo7e+Pzcp
+ejxcQUEZ3hyWGViQiRHJ6c8KDQLA6YlqJ+WZrzemy8Km7qudlpo/dUnjp9UzXeOL
+Yh8GIcAb0bfFFcTTyTYhD14DcBFCiBGLcQPiuPzzP7kei7IHj+7b+VkiGQ4+77wz
+shjTZrhA/P/e83X/QeGmfHGPnHOXFPHeSDYLf8sroEnG4SJcuoRXEavDeE6/b5yb
+3JgB/KOfScavAUk+MNHyssuSpJDpuLGb5X76qnwCGxsL4OBctwbGBJNU2wARAQAB
+=Q7gw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
new file mode 100644
index 00000000000..de46195c1ea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
++cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
+lsq1P5bi7RQyJmmr0JDQ70uD2i3zIHMjqLKgvOMmhXnOnstCEQR0xPauEkkcHyY9
+fSZkpoD+c/i+1NvElX8/pgf3Gx9gs2jSgVJ4eREuvTm3j4ro+D6oYRbdSFHn7+RH
+1GF3Dm4pgB9b/QQVgOSOQGrn0OGyn6zGDbc06JyOQ6EdzLQv1bzl0agLO0/wVGwt
+r63HSf9C1Fy5PmcLqP3A7e9vMJ6NYCYhfj/kXdg2YyiW9MrkD30aHg97Gpqy3/jI
+emSmu0tqVqeFADS4iNXyxnpPO7pNorGmyYvAN8ONHbSyX2zL9RusEIvAbgPWZ2sd
+5UpwSg5iw1tBNjpbprPgcRzNgdOnlKYvHcfETvVM3a0g9pf5/2buMCKijrWi6nTk
+tJ9F1xXuVKCzY++AyQaZIDnk6m+bOPxUWvcIPdqxrm3IGzUcHAU26bD8nvWAKStD
+sIlf/9C/+Wa4wQW6R7Q6NGZBa09K8MRAuesNbannvczSoCKS0npTLfAJX7KjNh0+
+ycagnocbhln1I8RuRmvSMbTD4npX7rdUmDFGyTQvT7WmOUbn99NC5arpfwARAQAB
+uQINBFHtw2cBEACjrJ7CmtJDMU35tIRODGY9ze3AOiphP//XOOfri0PAxL0NJtIx
+K4rslBZI2PkSJxhl9fGEJ7gEzmsOmaVZSlN2GQvHXjw7G0SKLNM9UUTc6lZvVDEd
+UKS9asycHs8jisTrqFEWj86aC2AunLsehBXZNPORQ5k9aqQfQqT8lZyuA3H2ypcS
+Hmq252n2oa8f+YrbQ9a5DOdySZZ/7TuyXhQqCIB0u0g9b8bO11zP9y6xc23Wbi7W
+bbSR2416/vsX3Nmyle8kqZMnn4vXIJLtsSYUgVTRMuiVOnz8xkNSM9MaosA5Owhw
+a94ZyP1irC9UHynK6oVun8ChhJmCzub1sOqc54CA+XoJvYJ80EhQpnvSoeLgqgJR
+VfVdbcAtgr1vbYfoceJ5lqSs6TVeEmxQ9iBMGAxSW6yU2mnJojBY6tzmYq9ZjCNS
+vORMGO6ZpcmZJ/kGhahN/hyou9AqC66GdNf55Q+OwW80bGXghQ8NwtlNr5cLtv5H
+R/zQX06z/ofiUmAbc4PA5uDX0CRIe2y6PK9cIBgU5YVJiQGT0yImd693J3uMlX/1
+YcWnXHbSD33CZ+xywyLX/vmUxUMqC8OFZ7GSVUK4wVLc7Ompieyk/QItqFOZ14RO
+QrOcOXA+qeYKpfkUPKUahDO07nzdRp1ebEd3A1PWt8iSvotNsHE+xb7eSwARAQAB
+=weyf
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
new file mode 100644
index 00000000000..e42d6f830e6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
@@ -0,0 +1 @@
+0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
new file mode 100644
index 00000000000..dc3833722c0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGPAYVUBDADCs9PkY8zzhzE38bRZX+vTrr3LdChGNBmObV858NGRrXeZtyLu
+U7YwYVF7w2vHUI/JQWrlPZc5tBFicefucfUtKt790WzAk3NBjGtX4IWpG57C1Z5t
+QRI23HqWr1If0UanH2vUjy4fUgNZdYlH2KzookoU0950dIcqwA/HwiosO5RmQ9iY
+HztkwwvFW9QxiJgL+lR84EcaIVN1ukr0ZKrG1a6wOJ6HLf9S2F3DMe7fQ+O+TpT/
+A11RewOZHwE9spH8cEsNYgutBouw/MttuYHjZKD7O4hN12MmzecWeMAPyrvYgTJp
+PHcjQaVeD27OGLRpy5n5LonvkzJbhTzM+Ps1qEj/4of3EFVhxNjR0gdrkX+0Ub1A
+XXiw3gjqAQuLQVKIbwvCbfj2go+YHrfcXN6kpKkYZU8ERPxI/VBTw230PPdXXwXP
+Ux/JRQIEXOuMIuELm/91H8TXKutw6NdNRu5q+LPcUkU7W6jsv28dmQHdC+ebVHlA
+vNcBOWVSY5e8IasAEQEAAbkBjQRjwGFVAQwAvhlW4RUf3NuFjoB7ADhPe7ZdnuTU
+oY7Ggrvh7KDNgSl8oymVZC0LFzEFd7a1uhPsjxTcytXqbsoPBzEs1Vkzrfx+99Tc
+/HTIazSMHPKM5xtWTqfXzFf1Sg3KgSqnEeHI9tMGv5T04g1yd5dn+Ib0V8tRFmMP
+GE1xByeuea9tQHoz615noalvVh7yCFUIkk2NFFCEXFcTteeZfcLWlmhKgZwHHnNW
+ylK4eOrudNPD+t3s6kLqwErRQuTwY8B3a8lR861lywu86zb75sfE1QtNetpPL99i
+9exNJ74+ZsmjUV3mjeKYjR5TLzndQmYX8du5aykV7zI40eOjT65khOwAyrSNvMbw
+xMoyaCxdL+L+9pbwFVSYt+EHsT5tRcksm5ABqff3s1thmo8XlqAtnXAdKSLeK5gS
+210yzLk9gIt4KqHxO/pUE2QROgoMC81tpp3hmAF3BsFBoAitZ6RamJdJeLPIav9V
+MUTaFPk0LR3UFfKxz0/ZQK8eK3oDVsKXsxLLABEBAAE=
+=IBmq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
new file mode 100644
index 00000000000..e42d6f830e6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
@@ -0,0 +1 @@
+0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
new file mode 100644
index 00000000000..0ab4efdad3a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
@@ -0,0 +1 @@
+4797b4f5dcc46cea61059071a1ae06236ca2ba62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
new file mode 100644
index 00000000000..b0e2c328710
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
@@ -0,0 +1 @@
+314fe82e5a4c5377bca2edec5208812e1e4a6db0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
new file mode 100644
index 00000000000..657153c0eb5
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFhaXO0BEAC8WCdwrJNF/W+C8m9FYwAhEvKBvQ7xmoGYZqgcYe2ntT8udvgZ
+k+dRwZJnu1VI3a8feOLrAmeNI2MxPP0+l2kGeC55c10duXPzLvW9oHONm39FZpCM
+X1m66TYkUBeu/DIttNf5l0nv54dmm4VAWjutnVmlKGf5MVmmAH4mrkmgs7UTyQRK
+JKJ8B7tAt6CI1tXq2ULjzUpz9iyD1IkWal4K2gYfooSuGLayNY+SCdcT9uZkpS4B
+rnHy2QeJqPSnJv+5G1SkX1fzavWelrf72vx+su8L8QzUa6JtGJatFbAHzEdXGJ98
+JnK7TAQvR3hCyzj+TnVCY1hiRO6B+4zI3j/vSJVdc5wmLejvfZRqhiaQ8Vr4xDbu
+w7/i+raAKwr//zVGAqp/zN6zQmyoLks+cfuI4yqHuXKGaNs5RapKCxfukC/TRB2e
+fLhqCpXAbRQ8a+R+0CCBP2WYDYNQoh4FnwuqtZefnm8NVKW+2we5y3llIrXV5PQb
+FFN5WOLuNvO/JOtRQSjNd4WYttwNCDP7ATpRK6ixz7qveztGNhuiCRx01HbZ2uUE
+DKV0DW8mWRjALl9/akMRcdIeTayKHDVjeNq5amnWT0vZ2F422BJW6sQryTs/NIBK
+XGoVVZeXms3fzL9IpztcVFZTuwmk5kk1FXXaBDMwVHlR5hC5gIuLIfLVEwARAQAB
+uQINBFhaXPsBEAC3bR7f5euHbpIDDTuFYHPI0+S5X0DhuqcGBUL2HSFhWMwIlfsA
+aO+pt7GyfXLUkTmzugwmwO+sOW2QmwEZQcK2z3BrcjytZophZ9AUajbAjnadSH6U
+XCMmfExVVnaYSfl/+Uub42szQE/r3gCRIz6M6clVVAjpFv4G/mumfQUV/XzLoUEY
+XTgwTokFJ97R+hDbHvBEBrUT8M6zHP5DhN3EBug3qb6wZVOa/+HEX3M+7k4jVT/p
+pNumw0acg0DDoSNQ13VsRV6sV0XE4zr3Zfs84f8xCgXpEMs4U6DZGqs3iJVVtbRf
+0oL0fgcxNgRrmbCrBfbXYfrS4u+fJ0vB+Wrflv9eNA3i6TtVL6uYpZy9uO2B1olK
+VzfEhsgB3QrULB4jVHZjIXGe4ILn45ndMtAeY4M91wyobgG99Xl+1vPHrxV0+2zR
+P66J3puyxiKE2B7gd7hib54CB3lYyrG1S+K1kZGCI1IFKCnqmTJXY0tKoLAASS3v
+tDcknXenzR5RVSpWTDuxtusekfL0Bw8pCBoz9L4Hex8Q1j//D5CZlqcg1NKFfmBZ
+7ta9PTuJcpOsz/LaPG/0VHYt/QAv5o4eeZESl7iZyM4/0NFh2s/rq0R8Z9yVSSkI
+vvO8d8XGZ65NTm3T4NFuEihn+AEm+zg4KiGdYBEZvs8QQoW9e1+MMN8xnwARAQAB
+=pBMG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
new file mode 100644
index 00000000000..10049bedd6e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
@@ -0,0 +1 @@
+3c91fed3922d52296888bae9b6d3ab9bcc641282
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
new file mode 100644
index 00000000000..552e90c2ca9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg
+IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd
+OlJl1bajIRC4pAoZafDzhOb+FkjJ61lEJzJ6pQtG0Yi24QWDBfXHkSiQSbZFvcC/
+FTJpZua4lwRi8QakEgUrgQQAIwQjBAHakDsvODv4+8aNawGjAd4xhwp+NsASRfJz
+FWdaIelkTfHd9yT9KIwqQivaHt5csY2UbwbFZBYTheZbG+9pKkd+IQC15mb4cBYc
+zaEJc+Dbgy4OmkIwEBMokuzaiNklU6mxqMiBOsoNmS7r9rL8ZNXTZb7arXzp5qHi
+GRt6cm0UYcriFQMBCgk=
+=gGJg
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
new file mode 100644
index 00000000000..4df35d838dd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
@@ -0,0 +1 @@
+60200ac4ae761f1614d6c46766d68daa073be985
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
new file mode 100644
index 00000000000..d451d29611d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
@@ -0,0 +1 @@
+f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
new file mode 100644
index 00000000000..9f9a683244b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF8QwXwBDADKNLAHhjWUqnLYiO+ws3Hy1du6tMvkR3nfsnIDqpCvSjb+3/rI
+OHSyq8TbaGLLuHOM4K/KvrKgjhTbXQxvx1WR5IpoylcINzI959yAbaywBj6gVQB3
+JX1xeZqiep8ZOD5V8YfwFOF5pOidVhabwdkC3xw03ZG9N0izgx4gyou1u8ovpa/T
+clEvZh3OnmT8FU+NtwdCDBHhQ6CpYqUzslw3Lcr7gNWJrecdqH4aZdVetGPwJXqU
++9KOog9JNtgOb3FRUSOGiaYBnReioqTvI4giLxKHqast0xilHGUKJvkVgiKBJj7m
+kEwwhlKsym2RWVMm69cdk9wOfdLP/gHvqWqw9+eh2cQ8d4p9dqMdehkZ/KMbzeyi
+hM11wMNTz+QEAIG9xzYe/tGgoIK8Nn8Ts3jSNNQaY40tJJRzheWZrnUXrpFwAh7W
+TDUyHOS2QFCoSLZ//n1YTT1qhLeXLTkX9KpwPZWYl/qJOJhp1P4XfQLEAtfiCVhy
+HZA8CJDH1uJPuq0AEQEAAbkBjQRfEMF8AQwA5HEu5anH+a1ZZQXtkzeCAhYZiMPQ
+IplkTfhUPOAykJl5Xhdr5BPtd4OGDLdhCuSs+ylmDM1/xIyT2jQs/2Iz0rcbNWKC
+yu/QMRNKo+8zdCiw+N0guUpAvvZ3ky7gmEf4JGWNA3xeA4DHzQtKQNIyOB2p+8oj
+/eObtlKIz5rF1lEAT3SESfF7VYsxiNEhiFfR1iAi91xAHzqi3b84sml9qOd0pIWO
+Hgf7tb2icTqpd7iZzhV7729u7EEZ7X/+wi3NFyeCn5dJDmUhLuY4+RPgRsiEXWR3
+2blSv/iC6zmZLlyh73D/oy0vZ846PB1fwGMWWJkRTEdrH+Ss+wA5B6iANqqkltMv
+nVKqfX/n+Si52kZKaWdtw1CboiDuToJ/L+Fza7tZcMLUA3v/01FTv5FAkQYksaU3
+AcBSJDD1D+H7gR+sRcowjRUewUMb7ccSm7luWHBXDsXVfFpEOJ3KGRFSeAioyNnd
+KhjPxfn65lwH065ZIsT/04SW8gy+PWzuxpIFABEBAAE=
+=YwIJ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
new file mode 100644
index 00000000000..b65145cdc99
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
@@ -0,0 +1 @@
+5719e50eac5a4b1dd390b72c2a742740e08e7f8d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
new file mode 100644
index 00000000000..e2d909ce835
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBGJIi4URCADFspeHyziASBuPXpLpikWjmC3D6VtTaDT17ogOyGLf6/sjsQUz
+0KS3PzWBuPoqRGRpTtZxJ5yr10apr8mJF9Po5LFkrtcexaiYmUWAZAik894OhKt1
+O9he2Sh1OTUiTmFU4ImQY+AeRqASZMYabhbbJOfQLJV2Er+foKzRC0T2MSQVjDho
+NywU1IsQG58lXEQNOA50uCuhnaCUy7Mh/GKCejyBaqXMtd517evHhqsJd9tWMNW/
+W2xKvGiH2mWSRjgllZ0h3zHuUEo8xqetOuHrDGGRpkzRES0kIT7En39hpVpP662Y
+97Wolv4C0/UE4rlfCmiplf6mG9QPET8wZeRvAQDh+Z27sD3ODWU2P5s/EXzsmBoi
+kK2KzGE+n32kRY4fHQf7BE9PfZ3f58KICY7p5apxP/6+bl8uq9vcszGPHl1aT2cH
+oQpPm5i2UHRoWXh7U9TpKWxxqx+yvJlPhV1c2DTvdbx530xEMF6up1f04+axhlqE
+DzjzOenwpnS3DR5iUqflEM33njj4tK+Tw51kXjyBxafPmaKEwuqzYzCFoojidmSx
+Vk4la9hCvIJzGQ+3iTX6OR4d1lGvRGmVm2g2AVrpZ1yPncgjCu5qFH9UiBblE8LV
+SVGBufS86pRwTrwW+fXaKw5iIyiPMSSE11H8uw4q75uFVnmEd4JUtQxGjnv7vbjq
+7hAeE3T4HlLPFBr3y8c3829HY0ozNVKKtXs0/lBzwwgAm/59t1B/dMl61BaufnY1
+5tYFAcStTrl0c3ZAYHO6DWYTJ8ZZQqiBfeyVI3yqWKQAYg0DxC9AzTtNSOs7SGJK
+dgdencJoa0ElraZuVXfb2Pr6cBv5wKRfU7ZBvHfCE56vJ/0zAvGbIRy4DYup8+Pj
+vcLSSWvQMT0iHk9TTw6sJNV/S4aH37Ux2N3SsARvqR1nZ7rQaGN5eTg7qHmwgIgd
+AoHa2Jd3ixOKuLzwIF4hoh+XKI7bYzVHwYq6yVZWevloxlky0FfAXCH2/lrTGyvj
+i83tPUIushngZ07senzgK0IWQIuLVjl03tJ/rc12AtiZkx1/ykssQ2uJolIRLfou
+u7kCDQRiSIuFEAgA+Roa4drFpqXxAR4ZjJ2WA0v9WUGWmbZr03BpqjoWzgHvM453
+IbSQ3e+l+DYzfxw0EpVKs+7GiRLP4/a1f3v0ubBPf/QHfiY/lzfqUDwCUNfB8Zkw
+ygvsydthI+DD6hgWOnd6la3O5vtFHvpuH8cv6uYJVWIn5wVbvAbyhJIn1Ug3++Qq
+/g4Dm7QCKsu/phulcgJtaZuDTPRGKLNhmwVbO7E9chjW1peaEbYhwI0H1jHU8onX
+s+00uiM0baOnpI20+5bvI8Zm8wYu3FGmzhykOLKOwd8y8NlR2VSaTYZAGO2+h2vm
+/PWuMnnl9v8mpYi9XbHdrf9KndAcfx+gYtjdxwAFEwgAqg9KGwxXoPtahCzrBdq4
+M4FK7zJyq5GVtSQXFEzPjnlF4xvcF9ntG+67S7vuPAvTsHyhvfGaqBsssi/eDSVC
+xD9FIYXGZDrrVCCoMkM1R7qmE3EZKr2fjBKUmmQb8qu6sknjDqUkNwyolhMip129
+AUvrOW7SV0HK33SSLlbzdv9z+COYM5lyLvgqmWjInKziuXpG5ATszGqlz1BMH8xh
+tFDoOApVnVPXPO+pLGbxruy2t5DhVIEnsuV/A7rs6ko8XCXk1+njvIyCQndU4m+j
+NRqPU86Qch3+qZyUBuhwmL/u9VsKcrOl0w7KXwxWTbkqQSZynt+NVtpuPKNxoaKz
+OA==
+=DT4Z
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
new file mode 100644
index 00000000000..a99b5d7cf8b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
+NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
+/1EO3VqvvDUt39gbaSqMCQNHctnFdb2QYZ7nRFTQeCqG/wyMdB05beqEnWEXzjeP
+FDF9y6gXkELn0lxUm2TKO8tU3h96TCuutDKJ0aE00lOeh/MbEaGHEbIU8kdfui6U
+znZ1X80EWbkCY8cKxEZHKD0aONSVHXwE6nETvFW9/9+K+sj/I7ytlyxwHsaQpi1H
+6aRGnq013VsIECrwkhmXBsLLXNjmhER+LkcDABEBAAG5AQ0EV5a8TAEIAN9uOpE3
+Ua9J/1WSMMNYGpfeEguI/HcMo+JIWZKwCiItISQ/yBEMEPLqmj857P2r5uBv1KT6
+IaJ8m9tU1mvv7zwtLFAQKytUv5mBMBnYuSoAFAnxdiH91M7oEwnmtIsf9g3ps71X
+g2Nih3rtbm5ijH5oKnqR4TuJrt4EdyTbDKrGKQKq9XOYB248KSQ1JG47AuQ6C525
+d/BvsKDVGdpwwwR8N3235rrK1j/wkW7TUb75VXEUc7e+z/9Eg2ubQ7jEo+RPX45x
+3j6HcOWGFG9Fe8j4wp4zS53Q6lRUIEoJmpsUpNWChGmwoL3bllFRKpubIFwiSrJi
+PMPVp1pl2Srg8sUAEQEAAQ==
+=8Tgx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
new file mode 100644
index 00000000000..f6e3fba880b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
@@ -0,0 +1 @@
+6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
new file mode 100644
index 00000000000..cec29c20c59
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
@@ -0,0 +1 @@
+ca491704d613780d2bee00f2c6fc46eb51cf569c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
new file mode 100644
index 00000000000..d33043ab7a8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFwrYN4BCAComkN3DymSPvTeAV7G/vBEYFKEANL49MeQttSZRzHmGAIAF9Iq
+fUN9Iwp2Ii40sdUV1+03SVnprf5M2xdxO42AB1qgHdKcyQnbUM9oV/i+iwSWZOjU
+23HTSaKkEKgVGfQUQQbXibQiANTJpRmKtOtWQsz+zfyaiGKJEKEa8KZsm6guibp/
+2omOJ6xWrZNszFtQsq3fsdhTVbWTHTpaSMV8Wf4Ue/g11rMrR2CPqzMFrt2sOVVy
+Np7c6tzdDeLYzCDfS/4QS3aGRuyxnt7uNhH11hzm+IvJS16Jg2oVK4lKH5FLh/zl
+myX249Tb+ht1i+daMEn0zpPqiYlNtCTLPLMHABEBAAG5AQ0EXCtg3gEIAM48wHoZ
+BNcXlO/bQTFel8yN7vxzcq8HvAr6iuJf7YOx0rmbFZ2AgJ4hqiJxwx0kGyrgaJaB
+xseQWnkOmm5/A4ivM5RPAu2/NQX+7enFUCS7zSFg6aSOVHJvcs8oLKrAYko1kODW
++lz2f91p9IbRDteKzfyK7w6A/oV8zNrOpilS9esVroUbQWLPf/lU+SKQnhmp+/mf
+xSDRf0N4+7ebeNOTX6yyvhz+Fvu9OaH7CqgTsSk9k9muXeCCXNfhkq1/vdx8aFFm
+3L7ZLQ0mjYwh0Fz/M3wG0t6U1fsOkD7O+9GSoaDzuF1iK8OlvhI0/bJC9tYlAdB1
+D1ag+vHCAXqDThMAEQEAAQ==
+=7M5v
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
new file mode 100644
index 00000000000..43a7a8a00b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
@@ -0,0 +1 @@
+e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
new file mode 100644
index 00000000000..497c2b28828
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
+lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
+3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
+FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
+0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
+UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
+0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
+TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
+W0JEQdCUVgc6MQEAEQEAAbkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83V
+rlAQcR2WulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9z
+qcRArx7aSaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpv
+uq1ZvL3ndApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0
+JA3MHOk8gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2
+Ul1C2OI+tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9Rao
+gEyFmCxiEuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkG
+qgDBQGC1PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gry
+q/vyQLg/KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAE=
+=9mb+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
new file mode 100644
index 00000000000..38f48c56106
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
@@ -0,0 +1 @@
+fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
new file mode 100644
index 00000000000..cf5e8eaf9a0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlMSXMBCADcgN0/57D/gU5cDobPiRuDT6qAxb/NWhQiqwAocKd274r4gPJm
+RbffUEZEgKhjH6l0CQfilC4R4x2QtU9sNC9kB/D6zumoS1uI0Hmx1pC4UseUy55r
+20WDxujUQ7OcJbpe2cDcQVKmMok2top7ZJqt4KVosQEeT9jjsgBBbEtg4cWb5ddR
+5rf+aJw0v/6dMLef1r9YAo0ZtLc+g2dyacqw73tcWEd3oCH++SgE26NntN+GibZu
+VXSE5u6xI4KwfT2vUT3jt5Fb29myX4sxsfB7n/xageuJYy5ms1ABS+WDO5ssEZC4
+eQEVL7eyIb9YhNAW/WtjeAuOfOKNonoqKFGXABEBAAG5AQ0EWUxJcwEIAMgrP3U+
+7YCibxSQKOZrp63RaSUkv7mCvQ3Lx4P4ZD/sDEsLOiKkAc+ZU7ETTIQkEpHaibvC
+ZNrA+R0pfAj0LYBLstEIkUxtAaVM4DBQGN13Zdup46fI8rPZEyZVb2XpZ/qS4RYi
+StFyJzUdazBJs/IB7CT0xp4DUFUOrsykVy0aWzWt4z0QBe1x3AmpAO/DdrDN5gvt
+mWzWbV3f783PuK3g41ju7F9XX5nuuatNSNHOHt65XL4vmhmSfXuP6UFjK6MKzq9z
+pbZD4ipUPoKEId5ONDSucX4C8OydpC8+rFWJCDDDvocox3/l6TzihQXf8MDDcB0u
+1TgDPz4M/S2vBh8AEQEAAQ==
+=Q2Ek
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
new file mode 100644
index 00000000000..43a7a8a00b3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
@@ -0,0 +1 @@
+e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
new file mode 100644
index 00000000000..8acbce9e3f9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
@@ -0,0 +1 @@
+afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
new file mode 100644
index 00000000000..dfb914f64d4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
@@ -0,0 +1 @@
+dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
new file mode 100644
index 00000000000..d8d6da5b047
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF0YzcYBCADmNIEEzvSsnJnxH0u89Hb5vCCkl+45dWHyCMsCLNty8yL214LV
+B35gnU+6BvRXN3DmTpreCV8/wgI2h1eq83dTO2AsnJTxTjvYpiwAtWhONxWxCU1Y
+WlH8Fsvao51CJWUwYY2HzFr9j7h7EOnm6gj2pnUDdjHRgou9/OxIk6q3M6hrwwh2
+IXw6PXFmkg4wRwlqW5FiC90I8gd3ItFCzqx0TR7DuhOFhtvOheWMlApPoMOUY+6u
+C5Ek6kVW5w5xshKafS7p2s0WOsXkOnH76avFtkBtcsPbHkwWTal4xivSMMsCpdPM
+cF6Fr2p5hF4khQ1r5pdmHeYNoXcC+hSnPM9tABEBAAG5AQ0EXRjNxgEIAKa7sUZb
+z0gyyJG0J9aHlo/AvOZZpzMtd5SFyuVyXYYcqLL//Mz7U+EWPT3ZOX9YKJ/Tr3id
+ewquXH087Srpxr0tLIdmrABXwBssfLGSXqZCz4cfkIcQytP8Wk8sJ9NQJLI1HK5E
+laRsmMJ4yQCYH55UcdAt9pFEdVMFbgR/EIcC3At/Kz/Q87zb5oIfAKBSHu9NRqtr
+iSs80dX7sp9JuoIAKTdvR5tjndwC9r6n4Flpz68nnwKD0y6e9RGKB3XXU9k6SIqU
+DHrHByrVnYdwkVOP6O1MbBp5ckSu6w9eFbU3GJSoJ4p7ij0jD4PalgiqpqFUYqeo
+9gNhjd0ExTcYeIMAEQEAAbkBDQRdG4WvAQgAtF9mZmvdsZaWF+u4+bgEDZQ8zzUw
+UrmnZtW/K8Xle6T/4KaOjiBDeiY48IGAcV21oKEOiegaVx6AWkiZ+/8d+feLofWV
+Hwk0GE7MfrEniddVF2mqE3neXSrLn9L747WDhP9PTtkSSQLj523qC5JaIUkWmz0F
+ofK5Gvw2TyIrchUPtm5G4rvYzsSomQY8I+eyYePqnD/FsoUlvd4FhKDuLOU07T6O
+xoui2s3EWornJ5llJoghT11Q8ZknZXc7HUYdF0GzKWGebRz1sIaH7ODy9LLKvgmJ
+JEXWWVfUDQL+T3LjRdsNXDuvnsD9qC4iESlmm6zlxOEtOo57EVjJBVHh0QARAQAB
+=3i2O
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
new file mode 100644
index 00000000000..1efb468cd8d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
@@ -0,0 +1 @@
+cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
new file mode 100644
index 00000000000..0ab4efdad3a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
@@ -0,0 +1 @@
+4797b4f5dcc46cea61059071a1ae06236ca2ba62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
new file mode 100644
index 00000000000..e60869fc33e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFxaxWYBCADI4/gRCJYfXwZYdUoEGlAlCfRgABy90rvebzcs8MKtolAbPVkG
+iqnjftXd28sZhEDx9YJrUfmzspdrYmU7hy1kgV1/WGIcWyTExTH3bqlnaIWnnTxA
+HD0x4NJ2AzmX5VO8LxhqGID+BErrv7uGZvVmJT6trqUIcKeNEq7mzdDJKqTBY4cw
+q+Dm8P0vs4IFTD8q5f1Vr78FmUth2srIBmsIH1wNV1nAUTmQppNBFlCmcvnWTYI1
+0UMcsFFrJ2pFT1yP2AEGUNl4Lgj4hmVHZwX38/lu9pQ7iWtHSLOwZsfuC34/goS+
+ldFt63JqDV7ZaqwAgk7Iq6jbr4pSVsB4VdglABEBAAG5AQ0EXFrFZgEIAN7XqOmH
+9d5gMZ1uDZaEBlOmjFrXEwG2Lb24sxdBNEnHqarYXBW6LuBRjfvmEFNI83+xLXNI
+Zh/4MZs0WEnQO9pUpufIVtSJL5GNSUFJ/lU//TQrAD/750nwW+S+SZAvoLX4NuqS
+ASXZgEDQCvyGFNguIAyqfFoiT+w7+zOiLhDp40ZpDLx8HchYzCr0yZZ0spXabHOh
+HF5Reec0J+MTdHMw/23tNYh/AdUmxVCyRtXb15h00Afp01QZGPq20VCAVas/WaHL
+k3yXi2ehw5XMX26Yz19jTyVaoQygFZp7obpHruah0zIFAKcQN6iAqc8ZKdDYi8BK
+ZnxB5v/NmkmTFwkAEQEAAQ==
+=E210
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
new file mode 100644
index 00000000000..b0e2c328710
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
@@ -0,0 +1 @@
+314fe82e5a4c5377bca2edec5208812e1e4a6db0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
new file mode 100644
index 00000000000..28f7bcf5d21
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
@@ -0,0 +1 @@
+7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
new file mode 100644
index 00000000000..760013c5efe
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
@@ -0,0 +1 @@
+66ca61ea0fc7e9ea1216f83396b88eacd463b90b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
new file mode 100644
index 00000000000..2c9a0ea2411
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
@@ -0,0 +1 @@
+b02137d875d833d9b23392ecae5a7fb608a0221c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
new file mode 100644
index 00000000000..d7670dfbfbe
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
@@ -0,0 +1 @@
+ee0ca873074092f806f59b65d364abaa39a47320
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
new file mode 100644
index 00000000000..b22da3df4b4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
@@ -0,0 +1 @@
+82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
new file mode 100644
index 00000000000..aa12f972563
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
@@ -0,0 +1 @@
+f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
new file mode 100644
index 00000000000..66191e07d11
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
@@ -0,0 +1 @@
+c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
new file mode 100644
index 00000000000..fa16ad361ea
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+yhmyioZvuRxjrHcAEQEAAQ==
+=/3ce
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
new file mode 100644
index 00000000000..6508c198200
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
+dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
+P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
+qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
+CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
+PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
+dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
+wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
+SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
+9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
+MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
+iDXIY2rT0D71IucAEQEAAQ==
+=/sM2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
new file mode 100644
index 00000000000..52dd86c65c0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
@@ -0,0 +1 @@
+8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
new file mode 100644
index 00000000000..e44277c3a12
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
+4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
+fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
++zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
+5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
+0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
+GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
+AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
+9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrkCDQRNNXsZEAgA
+u0P3pwV/lKVCGXHXgwJgrQSLFSdrKBiaeKEZuCYEAEWXE9hLxn3T6MWrioHwB83v
+RXWU2NC8tpOg/GxLI7f7V3zKtlePspmjCK5QcaonAkK8n1BUaXwniCuxayimR7Im
+Pc34p1+f77pBpZ2nV0Us6yAiRBzo2IAKNn3R0N0TQy6QGvMCn7TYFX5vyvm9eE4m
+4GUh/C79+TyzgXmnV38Wjd6rJ6swM4KGfnEEzL202Wg6Egng0y4DbnfGJJP0H5AQ
+ZQnVecLHAzQMnPtPIoi7xbNB9Oy1d2nzVCUqxuX6Y+1HylOqsjKGKd5nSydjPPQf
+iF9OQIeryS4uJ0sjqUwZXwADBwf/fIh9jvuZ5eVhn5QNtOh4n/3zFqssSxWrYHgl
+wd+hPEk3rRwj5yjbWG/GsUJL8rhU7psgMY4UvrUmoRVzNBBDRqy3R317w6wmlZy6
+5oIXEp4FtVFV1iuTES4vfIrWqr/L4E9FN2bPqd4MNeMnHcnNYX3/VH1ijYuemSOB
+b/DO4ZiL7qymrufQjOR2SKknjpXi/bxSVqr/7ceAfI9ugMFPzcAzl7u5EWgQMruR
+ODqMw6YO983AbyAlB86uR92DelR/SmBO1NgSxQscSE+FoDyDdEg9+5bumsJQ+x/s
+Fu6GMwiISFC2PdMxfrit63jH124iqi/GxjYBP1EAmNMcb/Av+Q==
+=eVH6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
new file mode 100644
index 00000000000..61b0b4f6326
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
@@ -0,0 +1 @@
+34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
new file mode 100644
index 00000000000..cec29c20c59
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
@@ -0,0 +1 @@
+ca491704d613780d2bee00f2c6fc46eb51cf569c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
new file mode 100644
index 00000000000..aa12f972563
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
@@ -0,0 +1 @@
+f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
new file mode 100644
index 00000000000..4851467af2c
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFfFy6gBEADTj66jLcvIYF4tNUoAL4wyKn0UTEUO3ERr+xt3iCswUGuyCWYk
+PHRN3fRkJO8XqkDO/mjWArYt4PKZme6whYb8WJr++pAil1LJXFHo1AEoX0I0vHNZ
+j9srEKiMg63aQXczekmcLcbTeJurDrCWMR9i3qRxrjya0W6pI4ykaHDh6vQ8k/C2
+wkxIE4OcjIZy4D8+e2Cf7qDmUzdqJfZwbMB/y2RtwwWvOOzFSlrxw0zZ3nfQ+tnB
+LwGxugz2peiF5c8gRcV50EXOJQYxEMdsStkxLymIFaJO9hheW7/zJrTRbWBNHvJI
+gE7wJ0SP/9mJojDPiPH/GCfoUkcl4p42ZwZRYAzs7frHA/rmyuyqM02VqXvVsgZk
+QNI5iAuxfTNICHmj3sv3yifQ0OrAI5x2ja9PcvVXmZvTd3Ocf8Rd4mMylGlBBx9g
+kzuxl6AB8eQu+75rSTgGPKfSeDKyxyOSTkhbJj7uX4nf8thzwhVz6zI5aypyYYDL
+5FWeX7b7GPytKoeN5UiDcWgLuzwjN/wlN/IntHWDWkvUCEJ/JpN6FG5AUY+RQkvS
+FrFQLTkGTLQaP8GHo+47Weve+CApUrvTr58NXHBYh8FxXG/cpgAOYt3xy+Z4niuh
+kpcriHwO2xwd4RL0pFhCuaxvgZlgtbJsCv3yLZ5czoUgy2i4u91ZaGflhwARAQAB
+uQINBFfFy6gBEADxoYf2dNUI2DALMtmTVnwknpccOL84iFlYkG3z08DDx37c6DBi
+0ls8rZZIBw/SUxJTM2Eg2ySBqt6+v/ZihpQqoA0upOCEvqsKB1i3WK0BWPRhAE5z
+qav2hp6odIRgoaWjDes52XFFc0cX611T3oM0l2dKuUHr/9/ycne6DlUU8cHwiUzc
+/rRu+kn99rvJueh883ZgZHsNrq1jKNPsMdqNT5Fot+YQnps7ILoQduIaCMDu9PO5
+yq2JrEtuelqzEC5TrbcV1UaIAAbwS7xE47SXnjJvH/5lV4SMkQe1IqOI03HKuNR0
+k9ETAWLoHYjrHqd9A13dfq6KQgCex5psFrwav01erSq8F3ZZy2jDn09bVMLrwwlv
+eBOleFh5NrN2d/DvJq+f/DBL38gARPvvu3fsuELJHaMlLHk95HuUQINbNIMsz4EL
+esgjhc6jQQEthW7JQDReZLS7/mMuHqFCQzjXajdvd8Djw3FGZfldX2v49d+QQD0I
+u7kMk0gUxEvoUg+CLFIqDjzfMgIEBtT69xJgtnkX5KDWYZ2FXuwRQuSqOsmlRrr0
+d6DdDF71NG72ZHX2LrxgXoWJgm4raYtAOvQrK35MMHdXWSOv2fO1m5hxYrqX5Q1f
+/dARSXGjOuXb/Z+jxzt0G7h02f4OrxYQ0JWfjFbfnpShuYP3vENbgoWKWQARAQAB
+=Tdka
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
new file mode 100644
index 00000000000..61b0b4f6326
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
@@ -0,0 +1 @@
+34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c7a14aa4d00..a8bb9f14cd1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,20 +17,7 @@
 
 pluginManagement {
     plugins {
-        fun String.v() = extra["$this.version"].toString()
-        fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) version key.v()
-
-        idv("com.github.autostyle")
-        idv("com.github.spotbugs")
-        idv("com.github.vlsi.crlf", "com.github.vlsi.vlsi-release-plugins")
-        idv("com.github.vlsi.gradle-extensions", "com.github.vlsi.vlsi-release-plugins")
-        idv("com.github.vlsi.ide", "com.github.vlsi.vlsi-release-plugins")
-        idv("com.github.vlsi.stage-vote-release", "com.github.vlsi.vlsi-release-plugins")
-        idv("net.ltgt.errorprone")
-        idv("org.jetbrains.gradle.plugin.idea-ext")
-        kotlin("jvm") version extra["kotlin.version"].toString()
-        idv("org.nosphere.apache.rat")
-        idv("org.sonarqube")
+        id("com.github.vlsi.stage-vote-release") version "1.86"
     }
 }
 
@@ -38,12 +25,26 @@ plugins {
     `gradle-enterprise`
 }
 
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        // TODO: support enableMavenLocal
+        mavenCentral()
+    }
+}
+
 // This is the name of a current project
 // Note: it cannot be inferred from the directory name as developer might clone JMeter to jmeter_tmp folder
 rootProject.name = "jmeter"
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+includeBuild("build-logic-commons")
+includeBuild("build-logic")
+
 include(
     "src:bom",
+    "src:bom-thirdparty",
     "src:bshclient",
     "src:launcher",
     "src:components",
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
new file mode 100644
index 00000000000..46dae4c3fb3
--- /dev/null
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.java-published-platform")
+}
+
+description = "A collection of versions of third-party libraries used by Apache JMeter"
+
+javaPlatform {
+    allowDependencies()
+}
+
+dependencies {
+    api(platform("org.codehaus.groovy:groovy-bom:3.0.11"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1"))
+
+    constraints {
+        // api means "the dependency is for both compilation and runtime"
+        // runtime means "the dependency is only for runtime, not for compilation"
+        // In other words, marking dependency as "runtime" would avoid accidental
+        // dependency on it during compilation
+        // Note: if there's at least single chance for the dependency to be needed on the
+        // compilation classpath (e.g. it is used as a transitive by a third-party library)
+        // then it should be declared as "api" here since we use useCompileClasspathVersions
+        // to make runtime classpath consistent with the compile one.
+        api("org.apache.tika:tika-parsers:1.28.5")
+        api("org.ow2.asm:asm:9.3")
+
+        // activemq-all should not be used as it provides secondary slf4j binding
+        api("org.apache.activemq:activemq-broker:5.16.4")
+        api("org.apache.activemq:activemq-client:5.16.4")
+        api("org.apache.activemq:activemq-spring:5.16.4")
+        api("org.springframework:spring-context:4.3.17.RELEASE")
+        api("org.springframework:spring-beans:4.3.17.RELEASE")
+
+        api("bsf:bsf:2.4.0")
+        api("cglib:cglib-nodep:3.2.12")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
+        api("com.fasterxml.jackson.core:jackson-core:2.13.4")
+        api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
+        api("com.fifesoft:rsyntaxtextarea:3.2.0")
+        api("com.formdev:svgSalamander:1.1.2.4")
+        api("com.github.ben-manes.caffeine:caffeine:2.9.3")
+        api("com.github.tomakehurst:wiremock-jre8:2.32.0")
+        api("com.github.weisj:darklaf-core:2.7.3")
+        api("com.github.weisj:darklaf-theme:2.7.3")
+        api("com.github.weisj:darklaf-property-loader:2.7.3")
+        api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
+        api("com.helger.commons:ph-commons:10.1.6")
+        api("com.helger:ph-css:6.5.0")
+        api("com.jayway.jsonpath:json-path:2.7.0")
+        api("com.miglayout:miglayout-core:5.3")
+        api("com.miglayout:miglayout-swing:5.3")
+        api("com.sun.activation:javax.activation:1.2.0")
+        api("com.thoughtworks.xstream:xstream:1.4.20")
+        api("commons-codec:commons-codec:1.15")
+        api("commons-collections:commons-collections:3.2.2")
+        api("commons-io:commons-io:2.11.0")
+        api("commons-lang:commons-lang:2.6")
+        api("commons-logging:commons-logging:1.2")
+        api("commons-net:commons-net:3.9.0")
+        api("dnsjava:dnsjava:2.1.9")
+        api("io.burt:jmespath-core:0.5.1")
+        api("io.burt:jmespath-jackson:0.5.1")
+        api("javax.activation:javax.activation-api:1.2.0")
+        api("javax.mail:mail:1.5.0-b01")
+        api("jcharts:jcharts:0.7.5")
+        api("junit:junit:4.13.2")
+        api("org.jetbrains:annotations:23.0.0")
+        api("org.jetbrains.lets-plot:lets-plot-batik:2.2.1")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.1.1")
+        api("org.junit.jupiter:junit-jupiter:5.8.2")
+        api("org.junit.jupiter:junit-jupiter-api:5.8.2")
+        api("org.junit.jupiter:junit-jupiter-params:5.8.2")
+        api("net.minidev:accessors-smart:2.4.8")
+        api("net.minidev:json-smart:2.4.8")
+        api("net.sf.jtidy:jtidy:r938")
+        api("net.sf.saxon:Saxon-HE:11.3")
+        api("nl.jqno.equalsverifier:equalsverifier:3.10")
+        api("org.apache-extras.beanshell:bsh:2.0b6")
+        api("org.apache.commons:commons-collections4:4.4")
+        api("org.apache.commons:commons-dbcp2:2.9.0")
+        api("org.apache.commons:commons-jexl3:3.2.1")
+        api("org.apache.commons:commons-jexl:2.1.1")
+        api("org.apache.commons:commons-lang3:3.12.0")
+        api("org.apache.commons:commons-math3:3.6.1")
+        api("org.apache.commons:commons-pool2:2.11.1")
+        api("org.apache.commons:commons-text:1.10.0")
+        api("org.apache.ftpserver:ftplet-api:1.2.0")
+        api("org.apache.ftpserver:ftpserver-core:1.2.0")
+        api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
+        api("org.apache.httpcomponents:httpasyncclient:4.1.5")
+        api("org.apache.httpcomponents:httpclient:4.5.13")
+        api("org.apache.httpcomponents:httpcore-nio:4.4.15")
+        api("org.apache.httpcomponents:httpcore:4.4.15")
+        api("org.apache.httpcomponents:httpmime:4.5.13")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.17.2")
+        api("org.apache.logging.log4j:log4j-api:2.17.2")
+        api("org.apache.logging.log4j:log4j-core:2.17.2")
+        api("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
+        api("org.apache.mina:mina-core:2.1.6")
+        api("org.apache.rat:apache-rat:0.13")
+        api("org.apache.tika:tika-core:1.28.5")
+        api("org.apache.velocity:velocity:1.7")
+        api("org.apache.xmlgraphics:xmlgraphics-commons:2.7")
+        api("org.apiguardian:apiguardian-api:1.1.2")
+        api("org.bouncycastle:bcmail-jdk15on:1.70")
+        api("org.bouncycastle:bcpkix-jdk15on:1.70")
+        api("org.bouncycastle:bcprov-jdk15on:1.70")
+        api("org.brotli:dec:0.1.2")
+        api("org.exparity:hamcrest-date:2.0.8")
+        api("org.freemarker:freemarker:2.3.31")
+        api("org.hamcrest:hamcrest:2.2")
+        api("org.hamcrest:hamcrest-core:2.2")
+        api("org.hamcrest:hamcrest-library:2.2")
+        api("org.hsqldb:hsqldb:2.5.2")
+        api("org.jdom:jdom:1.1.3")
+        api("org.jodd:jodd-core:5.0.13")
+        api("org.jodd:jodd-lagarto:5.0.13")
+        api("org.jodd:jodd-log:5.0.13")
+        api("org.jodd:jodd-props:5.0.13")
+        api("org.jsoup:jsoup:1.15.3")
+        api("org.mongodb:mongo-java-driver:2.11.3")
+        api("org.mozilla:rhino:1.7.14")
+        api("org.neo4j.driver:neo4j-java-driver:4.4.6")
+        api("org.objenesis:objenesis:3.2")
+        api("org.slf4j:jcl-over-slf4j:1.7.36")
+        api("org.slf4j:slf4j-api:1.7.36")
+        api("org.spockframework:spock-core:2.2-groovy-3.0")
+        api("oro:oro:2.0.8")
+        api("xalan:serializer:2.7.2")
+        api("xalan:xalan:2.7.2")
+        api("xerces:xercesImpl:2.12.2")
+        api("xml-apis:xml-apis:1.4.01")
+        api("xmlpull:xmlpull:1.1.3.1")
+        api("xpp3:xpp3_min:1.1.4c")
+    }
+}
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 79e4e4c548f..454bfaf8876 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -16,157 +16,17 @@
  */
 
 plugins {
-    `java-platform`
+    id("build-logic.java-published-platform")
 }
 
-val String.v: String get() = rootProject.extra["$this.version"] as String
-
-// Note: Gradle allows to declare dependency on "bom" as "api",
-// and it makes the contraints to be transitively visible
-// However Maven can't express that, so the approach is to use Gradle resolution
-// and generate pom files with resolved versions
-// See https://github.com/gradle/gradle/issues/9866
-
-fun DependencyConstraintHandlerScope.apiv(
-    notation: String,
-    versionProp: String = notation.substringAfterLast(':')
-) =
-    "api"(notation + ":" + versionProp.v)
-
-fun DependencyConstraintHandlerScope.runtimev(
-    notation: String,
-    versionProp: String = notation.substringAfterLast(':')
-) =
-    "runtime"(notation + ":" + versionProp.v)
-
-javaPlatform {
-    allowDependencies()
-}
+description = "A platform that aligns versions of all JMeter components"
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:${"groovy".v}"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:${"kotlinx-coroutines".v}"))
-
-    // Parenthesis are needed here: https://github.com/gradle/gradle/issues/9248
-    (constraints) {
-        // api means "the dependency is for both compilation and runtime"
-        // runtime means "the dependency is only for runtime, not for compilation"
-        // In other words, marking dependency as "runtime" would avoid accidental
-        // dependency on it during compilation
-        // Note: if there's at least single chance for the dependency to be needed on the
-        // compilation classpath (e.g. it is used as a transitive by a third-party library)
-        // then it should be declared as "api" here since we use useCompileClasspathVersions
-        // to make runtime classpath consistent with the compile one.
-        apiv("org.apache.tika:tika-parsers", "tika")
-        apiv("org.ow2.asm:asm")
-
-        // activemq-all should not be used as it provides secondary slf4j binding
-        apiv("org.apache.activemq:activemq-broker", "activemq")
-        apiv("org.apache.activemq:activemq-client", "activemq")
-        apiv("org.apache.activemq:activemq-spring", "activemq")
-        apiv("org.springframework:spring-context", "springframework")
-        apiv("org.springframework:spring-beans", "springframework")
-
-        apiv("bsf:bsf")
-        apiv("cglib:cglib-nodep")
-        apiv("com.fasterxml.jackson.core:jackson-annotations", "jackson")
-        apiv("com.fasterxml.jackson.core:jackson-core", "jackson")
-        apiv("com.fasterxml.jackson.core:jackson-databind", "jackson-databind")
-        apiv("com.fifesoft:rsyntaxtextarea")
-        apiv("com.formdev:svgSalamander")
-        apiv("com.github.ben-manes.caffeine:caffeine")
-        apiv("com.github.tomakehurst:wiremock-jre8")
-        apiv("com.github.weisj:darklaf-core", "darklaf")
-        apiv("com.github.weisj:darklaf-theme", "darklaf")
-        apiv("com.github.weisj:darklaf-property-loader", "darklaf")
-        apiv("com.github.weisj:darklaf-extensions-rsyntaxarea", "darklaf.extensions")
-        apiv("com.helger.commons:ph-commons")
-        apiv("com.helger:ph-css")
-        apiv("com.jayway.jsonpath:json-path")
-        apiv("com.miglayout:miglayout-core", "miglayout")
-        apiv("com.miglayout:miglayout-swing", "miglayout")
-        apiv("com.sun.activation:javax.activation", "javax.activation")
-        apiv("com.thoughtworks.xstream:xstream")
-        apiv("commons-codec:commons-codec")
-        apiv("commons-collections:commons-collections")
-        apiv("commons-io:commons-io")
-        apiv("commons-lang:commons-lang")
-        apiv("commons-logging:commons-logging")
-        apiv("commons-net:commons-net")
-        apiv("dnsjava:dnsjava")
-        apiv("io.burt:jmespath-core")
-        apiv("io.burt:jmespath-jackson")
-        apiv("javax.activation:javax.activation-api", "javax.activation")
-        apiv("javax.mail:mail")
-        apiv("jcharts:jcharts")
-        apiv("junit:junit", "junit4")
-        apiv("org.jetbrains:annotations", "jetbrains-annotations")
-        apiv("org.jetbrains.lets-plot:lets-plot-batik")
-        apiv("org.jetbrains.lets-plot:lets-plot-kotlin-jvm")
-        apiv("org.junit.jupiter:junit-jupiter", "junit5")
-        apiv("org.junit.jupiter:junit-jupiter-api", "junit5")
-        apiv("org.junit.jupiter:junit-jupiter-params", "junit5")
-        apiv("net.minidev:accessors-smart")
-        apiv("net.minidev:json-smart")
-        apiv("net.sf.jtidy:jtidy")
-        apiv("net.sf.saxon:Saxon-HE")
-        apiv("nl.jqno.equalsverifier:equalsverifier")
-        apiv("org.apache-extras.beanshell:bsh")
-        apiv("org.apache.commons:commons-collections4")
-        apiv("org.apache.commons:commons-dbcp2")
-        apiv("org.apache.commons:commons-jexl3")
-        apiv("org.apache.commons:commons-jexl")
-        apiv("org.apache.commons:commons-lang3")
-        apiv("org.apache.commons:commons-math3")
-        apiv("org.apache.commons:commons-pool2")
-        apiv("org.apache.commons:commons-text")
-        apiv("org.apache.ftpserver:ftplet-api")
-        apiv("org.apache.ftpserver:ftpserver-core")
-        apiv("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
-        apiv("org.apache.httpcomponents:httpasyncclient")
-        apiv("org.apache.httpcomponents:httpclient")
-        apiv("org.apache.httpcomponents:httpcore-nio")
-        apiv("org.apache.httpcomponents:httpcore")
-        apiv("org.apache.httpcomponents:httpmime")
-        apiv("org.apache.logging.log4j:log4j-1.2-api", "log4j")
-        apiv("org.apache.logging.log4j:log4j-api", "log4j")
-        apiv("org.apache.logging.log4j:log4j-core", "log4j")
-        apiv("org.apache.logging.log4j:log4j-slf4j-impl", "log4j")
-        apiv("org.apache.mina:mina-core")
-        apiv("org.apache.rat:apache-rat")
-        apiv("org.apache.tika:tika-core", "tika")
-        apiv("org.apache.velocity:velocity")
-        apiv("org.apache.xmlgraphics:xmlgraphics-commons")
-        apiv("org.apiguardian:apiguardian-api")
-        apiv("org.bouncycastle:bcmail-jdk15on", "bouncycastle")
-        apiv("org.bouncycastle:bcpkix-jdk15on", "bouncycastle")
-        apiv("org.bouncycastle:bcprov-jdk15on", "bouncycastle")
-        apiv("org.brotli:dec")
-        apiv("org.exparity:hamcrest-date")
-        apiv("org.freemarker:freemarker")
-        apiv("org.hamcrest:hamcrest")
-        apiv("org.hamcrest:hamcrest-core", "hamcrest")
-        apiv("org.hamcrest:hamcrest-library", "hamcrest")
-        apiv("org.hsqldb:hsqldb")
-        apiv("org.jdom:jdom")
-        apiv("org.jodd:jodd-core", "jodd")
-        apiv("org.jodd:jodd-lagarto", "jodd")
-        apiv("org.jodd:jodd-log", "jodd")
-        apiv("org.jodd:jodd-props", "jodd")
-        apiv("org.jsoup:jsoup")
-        apiv("org.mongodb:mongo-java-driver")
-        apiv("org.mozilla:rhino")
-        apiv("org.neo4j.driver:neo4j-java-driver")
-        apiv("org.objenesis:objenesis")
-        apiv("org.slf4j:jcl-over-slf4j", "slf4j")
-        apiv("org.slf4j:slf4j-api", "slf4j")
-        apiv("org.spockframework:spock-core")
-        apiv("oro:oro")
-        apiv("xalan:serializer", "xalan")
-        apiv("xalan:xalan", "xalan")
-        apiv("xerces:xercesImpl")
-        apiv("xml-apis:xml-apis")
-        apiv("xmlpull:xmlpull")
-        apiv("xpp3:xpp3_min")
+    constraints {
+        val publishedProjects: Set<Project> by rootProject.extra
+        val platformProjects: Set<Project> by rootProject.extra
+        (publishedProjects - platformProjects).forEach {
+            api(it)
+        }
     }
 }
diff --git a/src/bshclient/build.gradle.kts b/src/bshclient/build.gradle.kts
index adb59a4530b..40149cf11fa 100644
--- a/src/bshclient/build.gradle.kts
+++ b/src/bshclient/build.gradle.kts
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-library")
+}
+
 tasks.named<Jar>(JavaPlugin.JAR_TASK_NAME) {
     manifest {
         attributes["Main-Class"] = "org.apache.jmeter.util.BeanShellClient"
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
deleted file mode 100644
index 46181612c51..00000000000
--- a/src/build.gradle.kts
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    // Bring Kotlin plugin to the build script class path, so it can be found when required
-    // in apply(plugin = ...) below
-    kotlin("jvm") apply false
-}
-val skipMavenPublication = setOf(
-    ":src:bshclient",
-    ":src:dist",
-    ":src:dist-check",
-    ":src:examples",
-    ":src:generator",
-    ":src:licenses",
-    ":src:protocol",
-    ":src:release",
-    ":src:testkit",
-    ":src:testkit-wiremock"
-)
-
-fun Project.boolProp(name: String) =
-    findProperty(name)
-        // Project properties include tasks, extensions, etc, and we want only String properties
-        // We don't want to use "task" as a boolean property
-        ?.let { it as? String }
-        ?.equals("false", ignoreCase = true)?.not()
-
-val skipJavadoc by extra {
-    boolProp("skipJavadoc") ?: false
-}
-
-subprojects {
-    if (path == ":src:bom") {
-        return@subprojects
-    }
-
-    val groovyUsed = file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory
-    val kotlinUsed = file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory
-    val testsPresent = file("src/test").isDirectory
-
-    apply<JavaLibraryPlugin>()
-    if (groovyUsed) {
-        apply<GroovyPlugin>()
-    }
-    if (kotlinUsed) {
-        apply(plugin = "org.jetbrains.kotlin.jvm")
-    }
-    if (project.path !in skipMavenPublication) {
-        apply<MavenPublishPlugin>()
-    }
-    apply<JacocoPlugin>()
-
-    dependencies {
-        val api by configurations
-        api(platform(project(":src:bom")))
-
-        if (!testsPresent) {
-            // No tests => no dependencies required
-            return@dependencies
-        }
-        val implementation by configurations
-        val testImplementation by configurations
-        val testRuntimeOnly by configurations
-        testImplementation("org.junit.jupiter:junit-jupiter")
-        testImplementation("org.hamcrest:hamcrest")
-        testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
-        testImplementation("junit:junit")
-        testImplementation(testFixtures(project(":src:testkit")))
-        if (groovyUsed) {
-            testImplementation("org.spockframework:spock-core")
-        }
-        if (kotlinUsed) {
-            testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-        }
-        testRuntimeOnly("cglib:cglib-nodep") {
-            because(
-                """
-                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
-                 class org.apache.jmeter.report.processor.AbstractSummaryConsumer${'$'}SummaryInfo.
-                 Mocking of non-interface types requires a code generation library.
-                 Please put an up-to-date version of byte-buddy or cglib-nodep on the class path.
-                """.trimIndent()
-            )
-        }
-        testRuntimeOnly("org.objenesis:objenesis") {
-            because(
-                """
-                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
-                 class org.apache.jmeter.report.core.Sample. To solve this problem,
-                 put Objenesis 1.2 or higher on the class path (recommended),
-                 or supply constructor arguments (e.g. 'constructorArgs: [42]') that allow to construct
-                 an object of the mocked type.
-                """.trimIndent()
-            )
-        }
-    }
-
-    // Note: jars below do not normalize line endings.
-    // Those jars, however are not included to source/binary distributions
-    // so the normailzation is not that important
-
-    val sourcesJar by tasks.registering(Jar::class) {
-        val sourceSets: SourceSetContainer by project
-        from(sourceSets["main"].allJava)
-        archiveClassifier.set("sources")
-    }
-
-    val javadocJar by tasks.registering(Jar::class) {
-        from(tasks.named(JavaPlugin.JAVADOC_TASK_NAME))
-        archiveClassifier.set("javadoc")
-    }
-
-    val testClasses by configurations.creating {
-    }
-
-    if (testsPresent) {
-        // Do not generate test jars when src/test folder is missing (e.g. "config.jar")
-        val testJar by tasks.registering(Jar::class) {
-            val sourceSets: SourceSetContainer by project
-            archiveClassifier.set("test")
-            from(sourceSets["test"].output)
-        }
-
-        // Parenthesis needed to use Project#getArtifacts
-        (artifacts) {
-            testClasses(testJar)
-        }
-    }
-
-    val archivesBaseName = when (name) {
-        "jorphan", "bshclient" -> name
-        "launcher" -> "ApacheJMeter"
-        else -> "ApacheJMeter_$name"
-    }
-    setProperty("archivesBaseName", archivesBaseName)
-
-    if (project.path in skipMavenPublication) {
-        return@subprojects
-    }
-    // See https://stackoverflow.com/a/53661897/1261287
-    // Subprojects can't use "publishing" since that accessor is not available at parent project
-    // evaluation time
-    configure<PublishingExtension> {
-        publications {
-            create<MavenPublication>(project.name) {
-                artifactId = archivesBaseName
-                version = rootProject.version.toString()
-                from(components["java"])
-
-                if (!skipJavadoc) {
-                    // Eager task creation is required due to
-                    // https://github.com/gradle/gradle/issues/6246
-                    artifact(sourcesJar.get())
-                    artifact(javadocJar.get())
-                }
-
-                // Use the resolved versions in pom.xml
-                // Gradle might have different resolution rules, so we set the versions
-                // that were used in Gradle build/test.
-                versionMapping {
-                    usage(Usage.JAVA_RUNTIME) {
-                        fromResolutionResult()
-                    }
-                    usage(Usage.JAVA_API) {
-                        fromResolutionOf("runtimeClasspath")
-                    }
-                }
-
-                pom {
-                    withXml {
-                        val sb = asString()
-                        var s = sb.toString()
-                        // <scope>compile</scope> is Maven default, so delete it
-                        s = s.replace("<scope>compile</scope>", "")
-                        // Cut <dependencyManagement> because all dependencies have the resolved versions
-                        s = s.replace(
-                            Regex(
-                                "<dependencyManagement>.*?</dependencyManagement>",
-                                RegexOption.DOT_MATCHES_ALL
-                            ),
-                            ""
-                        )
-                        sb.setLength(0)
-                        sb.append(s)
-                        // Re-format the XML
-                        asNode()
-                    }
-                    name.set("Apache JMeter ${project.name.capitalize()}")
-                    description.set(project.description)
-                    inceptionYear.set("1998")
-                    url.set("http://jmeter.apache.org/")
-                    licenses {
-                        license {
-                            name.set("The Apache License, Version 2.0")
-                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                            comments.set("A business-friendly OSS license")
-                        }
-                    }
-                    issueManagement {
-                        system.set("bugzilla")
-                        url.set("https://bz.apache.org/bugzilla/describecomponents.cgi?product=JMeter")
-                    }
-                    scm {
-                        connection.set("scm:git:https://gitbox.apache.org/repos/asf/jmeter.git")
-                        developerConnection.set("scm:git:https://gitbox.apache.org/repos/asf/jmeter.git")
-                        url.set("https://github.com/apache/jmeter")
-                        tag.set("HEAD")
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 2d1bdb5dac3..55d9fe70760 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -15,8 +15,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
 dependencies {
-    api(project(":src:core"))
+    api(projects.src.core)
     testImplementation(project(":src:core", "testClasses"))
 
     api("org.apache-extras.beanshell:bsh") {
@@ -73,7 +77,7 @@ dependencies {
     testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on")
     testRuntimeOnly("org.bouncycastle:bcprov-jdk15on")
     testImplementation("nl.jqno.equalsverifier:equalsverifier")
-    testImplementation(testFixtures(project(":src:testkit-wiremock")))
+    testImplementation(testFixtures(projects.src.testkitWiremock))
 }
 
 fun String?.toBool(nullAs: Boolean, blankAs: Boolean, default: Boolean) =
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 932484d0597..6073551b3d4 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -474,7 +474,7 @@ private void initTemplate() {
         PatternMatcher matcher = JMeterUtils.getMatcher();
         Pattern templatePattern = JMeterUtils.getPatternCache().getPattern("\\$(\\d+)\\$"  // $NON-NLS-1$
                 , Perl5Compiler.READ_ONLY_MASK
-                & Perl5Compiler.SINGLELINE_MASK);
+                | Perl5Compiler.SINGLELINE_MASK);
         if (log.isDebugEnabled()) {
             log.debug("Pattern = '{}', template = '{}'", templatePattern.getPattern(), rawTemplate);
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
index a05c1183b92..624e9d64ddf 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
@@ -86,6 +86,7 @@ public synchronized void setup(int parties) {
          *             entering or while waiting
          * @see java.util.concurrent.CyclicBarrier#await()
          */
+        @SuppressWarnings("UnusedMethod")
         public int await() throws InterruptedException, BrokenBarrierException{
             return barrier.await();
         }
diff --git a/src/config/build.gradle.kts b/src/config/build.gradle.kts
index fff01037695..8b4b84f500c 100644
--- a/src/config/build.gradle.kts
+++ b/src/config/build.gradle.kts
@@ -19,7 +19,7 @@ import com.github.vlsi.gradle.crlf.CrLfSpec
 import com.github.vlsi.gradle.crlf.LineEndings
 
 plugins {
-    id("com.github.vlsi.crlf")
+    id("build-logic.jvm-published-library")
 }
 
 val srcLicense by configurations.creating
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index db221daf451..eb60e8f003a 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -18,12 +18,12 @@
 import com.github.autostyle.gradle.AutostyleTask
 
 plugins {
-    id("com.github.vlsi.ide")
+    id("build-logic.jvm-published-library")
 }
 
 dependencies {
-    api(project(":src:launcher"))
-    api(project(":src:jorphan"))
+    api(projects.src.launcher)
+    api(projects.src.jorphan)
     testImplementation(project(":src:jorphan", "testClasses"))
 
     api("bsf:bsf") {
@@ -145,6 +145,10 @@ ide {
 }
 
 // <editor-fold defaultstate="collapsed" desc="Gradle can't infer task dependencies, however it sees they use the same directories. So we add the dependencies">
+tasks.sourcesJar {
+    dependsOn(versionClass)
+}
+
 plugins.withId("org.jetbrains.kotlin.jvm") {
     tasks.named("compileKotlin") {
         dependsOn(versionClass)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index c73031c3406..d02f7837289 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -319,7 +319,7 @@ private boolean createTempDir(File tmpDir) throws GenerationException {
             log.error(message);
             throw new GenerationException(message);
         }
-        return tmpDirCreated;
+        return true;
     }
 
     private void addGraphConsumer(FilterConsumer nameFilter,
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 37e42b07dc1..bbbb688d176 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -21,15 +21,16 @@ import org.apache.jmeter.buildtools.batchtest.BatchTestServer
 import java.time.Duration
 
 plugins {
-    jmeterbuild.batchtest
+    id("build-logic.batchtest")
     id("com.github.vlsi.gradle-extensions")
+    id("build-logic.jvm-library")
 }
 
 val extraTestDependencies by configurations.creating
 val loggingClasspath by configurations.creating
 
 dependencies {
-    api(project(":src:dist"))
+    api(projects.src.dist)
     testImplementation(project(":src:dist", "allTestClasses"))
     testImplementation("org.apache.commons:commons-lang3") {
         because("StringUtils")
@@ -41,7 +42,7 @@ dependencies {
         because("It is used in ReportGeneratorSpec and HtmlReportGeneratorSpec")
     }
 
-    extraTestDependencies(platform(project(":src:bom")))
+    extraTestDependencies(platform(projects.src.bomThirdparty))
     extraTestDependencies("org.hsqldb:hsqldb")
     extraTestDependencies("org.apache.mina:mina-core")
     extraTestDependencies("org.apache.ftpserver:ftplet-api")
@@ -60,7 +61,7 @@ dependencies {
     // This is not required for regular ./bin/jmeter because activemq/mina is not on the top-level
     // classpath but all the jars are loaded by a custom classloader which is instantiated by NewDriver
     // TODO: implement "extra classpath folder" in DynamicClassLoader
-    loggingClasspath(platform(project(":src:bom")))
+    loggingClasspath(platform(projects.src.bomThirdparty))
     loggingClasspath("org.slf4j:jcl-over-slf4j")
     loggingClasspath("org.apache.logging.log4j:log4j-api")
     loggingClasspath("org.apache.logging.log4j:log4j-core")
@@ -90,7 +91,7 @@ libOpt.from(populateLibs)
 // For now lib/opt is hard-coded in some of the JMX files
 val extraTestJarsDir = rootProject.layout.projectDirectory.dir("lib").dir("opt")
 
-val createDist by project(":src:dist").tasks.existing(Task::class)
+val createDist = ":src:dist:createDist"
 
 val copyExtraTestLibs by tasks.registering(Sync::class) {
     dependsOn(createDist)
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index b92e4401079..e399679d830 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -24,8 +24,10 @@ import org.gradle.api.internal.TaskOutputsInternal
 import kotlin.math.absoluteValue
 
 plugins {
+    id("build-logic.build-params")
     id("com.github.vlsi.crlf")
     id("com.github.vlsi.stage-vote-release")
+    id("build-logic.jvm-library")
 }
 
 var jars = arrayOf(
@@ -50,6 +52,10 @@ var jars = arrayOf(
     ":src:protocol:tcp"
 )
 
+// https://github.com/gradle/gradle/pull/16627
+inline fun <reified T : Named> AttributeContainer.attribute(attr: Attribute<T>, value: String) =
+    attribute(attr, objects.named<T>(value))
+
 // isCanBeConsumed = false ==> other modules must not use the configuration as a dependency
 val buildDocs by configurations.creating {
     isCanBeConsumed = false
@@ -59,6 +65,13 @@ val generatorJar by configurations.creating {
 }
 val junitSampleJar by configurations.creating {
     isCanBeConsumed = false
+    isTransitive = false
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, Category.LIBRARY)
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, LibraryElements.JAR)
+        attribute(Usage.USAGE_ATTRIBUTE, Usage.JAVA_RUNTIME)
+        attribute(Bundling.BUNDLING_ATTRIBUTE, Bundling.EXTERNAL)
+    }
 }
 val binLicense by configurations.creating {
     isCanBeConsumed = false
@@ -83,9 +96,9 @@ dependencies {
     binLicense(project(":src:licenses", "binLicense"))
     srcLicense(project(":src:licenses", "srcLicense"))
     generatorJar(project(":src:generator", "archives"))
-    junitSampleJar(project(":src:protocol:junit-sample", "archives"))
+    junitSampleJar(project(":src:protocol:junit-sample"))
 
-    buildDocs(platform(project(":src:bom")))
+    buildDocs(platform(projects.src.bomThirdparty))
     buildDocs("org.apache.velocity:velocity")
     buildDocs("commons-lang:commons-lang")
     buildDocs("org.apache.commons:commons-collections4")
@@ -121,9 +134,9 @@ val populateLibs by tasks.registering {
     doLast {
         val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
         // This ensures project exists, if project is renamed, names should be corrected here as wells
-        val launcherProject = project(":src:launcher").path
-        val bshclientProject = project(":src:bshclient").path
-        val jorphanProject = project(":src:jorphan").path
+        val launcherProject = projects.src.launcher.dependencyProject.path
+        val bshclientProject = projects.src.bshclient.dependencyProject.path
+        val jorphanProject = projects.src.jorphan.dependencyProject.path
         listOf(libs, libsExt, binLibs).forEach {
             it.fileMode = "644".toInt(8)
             it.dirMode = "755".toInt(8)
@@ -557,12 +570,10 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
     setDestinationDir(file("$buildDir/docs/javadocAggregate"))
 }
 
-val skipDist: Boolean by rootProject.extra
-
 // Generates distZip, distTar, distZipSource, and distTarSource tasks
 // The archives and checksums are put to build/distributions
 for (type in listOf("binary", "source")) {
-    if (skipDist) {
+    if (buildParameters.skipDist) {
         break
     }
     for (archive in listOf(Zip::class, Tar::class)) {
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 7702084ba26..e0e31144252 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -87,10 +87,10 @@
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
-1509405,kotlin-stdlib-1.6.21.jar
-200631,kotlin-stdlib-common-1.6.21.jar
-23898,kotlin-stdlib-jdk7-1.6.21.jar
-17772,kotlin-stdlib-jdk8-1.6.21.jar
+1670468,kotlin-stdlib-1.8.21.jar
+221490,kotlin-stdlib-common-1.8.21.jar
+963,kotlin-stdlib-jdk7-1.8.21.jar
+968,kotlin-stdlib-jdk8-1.8.21.jar
 1492143,kotlinx-coroutines-core-jvm-1.6.1.jar
 10026,kotlinx-coroutines-swing-1.6.1.jar
 792176,kotlinx-html-jvm-0.7.3.jar
diff --git a/src/examples/build.gradle.kts b/src/examples/build.gradle.kts
index 0e6567f1b06..c1c4a1fca0b 100644
--- a/src/examples/build.gradle.kts
+++ b/src/examples/build.gradle.kts
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-library")
+}
+
 dependencies {
-    api(project(":src:components"))
+    api(projects.src.components)
 }
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 3a16b5ee38c..0673b2a61e1 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -15,8 +15,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
 dependencies {
-    api(project(":src:components"))
+    api(projects.src.components)
     testImplementation(project(":src:core", "testClasses"))
 
     implementation("org.mozilla:rhino")
diff --git a/src/generator/build.gradle.kts b/src/generator/build.gradle.kts
index 0e6567f1b06..c1c4a1fca0b 100644
--- a/src/generator/build.gradle.kts
+++ b/src/generator/build.gradle.kts
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-library")
+}
+
 dependencies {
-    api(project(":src:components"))
+    api(projects.src.components)
 }
diff --git a/src/jorphan/build.gradle.kts b/src/jorphan/build.gradle.kts
index 39a99a4e8b0..ee914aa9e3c 100644
--- a/src/jorphan/build.gradle.kts
+++ b/src/jorphan/build.gradle.kts
@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 
-dependencies {
-    api(platform(project(":src:bom")))
+plugins {
+    id("build-logic.jvm-published-library")
+}
 
+dependencies {
     api("org.apiguardian:apiguardian-api")
     api("org.slf4j:slf4j-api")
 
diff --git a/src/launcher/build.gradle.kts b/src/launcher/build.gradle.kts
index 95e8644e9c6..c7860154ef3 100644
--- a/src/launcher/build.gradle.kts
+++ b/src/launcher/build.gradle.kts
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
 val lastEditYear: String by rootProject.extra
 
 tasks.withType<ProcessResources>().configureEach {
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 07a1da3fe8f..95ad60bfefd 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -29,8 +29,24 @@ import com.github.vlsi.gradle.release.ExtraLicense
 import com.github.vlsi.gradle.release.dsl.dependencyLicenses
 import com.github.vlsi.gradle.release.dsl.licensesCopySpec
 
+plugins {
+    base
+    // jvm-ecosystem workarounds issue with "ambiguous variants for caffeine"
+    `jvm-ecosystem`
+}
+
+// https://github.com/gradle/gradle/pull/16627
+inline fun <reified T : Named> AttributeContainer.attribute(attr: Attribute<T>, value: String) =
+    attribute(attr, objects.named<T>(value))
+
 val binaryDependencies by configurations.creating {
     isCanBeConsumed = false
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, Category.LIBRARY)
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, LibraryElements.JAR)
+        attribute(Usage.USAGE_ATTRIBUTE, Usage.JAVA_RUNTIME)
+        attribute(Bundling.BUNDLING_ATTRIBUTE, Bundling.EXTERNAL)
+    }
 }
 val binLicense by configurations.creating {
     isCanBeResolved = false
@@ -71,8 +87,8 @@ val gatherSourceLicenses by tasks.registering(GatherLicenseTask::class) {
 
 val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     configuration(binaryDependencies)
-    ignoreMissingLicenseFor.add(SpdxLicense.Apache_2_0.asExpression())
-    defaultTextFor.add(SpdxLicense.MPL_2_0.asExpression())
+    ignoreMissingLicenseFor.add(SpdxLicense.Apache_2_0.expression)
+    defaultTextFor.add(SpdxLicense.MPL_2_0.expression)
     // There are three major cases here:
     // 1. License id needs to be overridden (e.g. "BSD style" -> BSD-3-Clause)
     // 2. Jar file misses LICENSE/NOTICE files, thus we need to specify local folder with relevant files (e.g. licenses/rsyntaxtextarea)
diff --git a/src/protocol/bolt/build.gradle.kts b/src/protocol/bolt/build.gradle.kts
new file mode 100644
index 00000000000..3bee4a4d445
--- /dev/null
+++ b/src/protocol/bolt/build.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.neo4j.driver:neo4j-java-driver")
+    implementation("org.apache.commons:commons-lang3")
+    implementation("com.fasterxml.jackson.core:jackson-core")
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/build.gradle.kts b/src/protocol/build.gradle.kts
deleted file mode 100644
index acedf564141..00000000000
--- a/src/protocol/build.gradle.kts
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-subprojects {
-    dependencies {
-        api(project(":src:core"))
-        testImplementation(project(":src:core", "testClasses"))
-    }
-}
-
-project("bolt") {
-    dependencies {
-        implementation("org.neo4j.driver:neo4j-java-driver")
-        implementation("org.apache.commons:commons-lang3")
-        implementation("com.fasterxml.jackson.core:jackson-core")
-        implementation("com.fasterxml.jackson.core:jackson-databind")
-    }
-}
-
-project("ftp") {
-    dependencies {
-        implementation("commons-net:commons-net")
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-    }
-}
-
-project("http") {
-    dependencies {
-        // for SearchTextExtension
-        api(project(":src:components"))
-        testImplementation(project(":src:components", "testClasses"))
-
-        api("com.thoughtworks.xstream:xstream") {
-            because("HTTPResultConverter uses XStream in public API")
-        }
-
-        compileOnly("javax.activation:javax.activation-api") {
-            because("ParseCurlCommandAction uses new MimetypesFileTypeMap()")
-        }
-
-        implementation("com.github.ben-manes.caffeine:caffeine")
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-        implementation("org.apache.commons:commons-text") {
-            because("StringEscapeUtils")
-        }
-        implementation("org.jodd:jodd-lagarto")
-        implementation("org.jsoup:jsoup")
-        implementation("oro:oro")
-        implementation("org.apache.commons:commons-collections4")
-        implementation("commons-net:commons-net")
-        implementation("com.helger.commons:ph-commons") {
-            // We don't really need to use/distribute jsr305
-            exclude("com.google.code.findbugs", "jsr305")
-        }
-        implementation("com.helger:ph-css") {
-            // We don't really need to use/distribute jsr305
-            exclude("com.google.code.findbugs", "jsr305")
-        }
-        implementation("dnsjava:dnsjava")
-        implementation("org.apache.httpcomponents:httpmime")
-        implementation("org.apache.httpcomponents:httpcore")
-        implementation("org.brotli:dec")
-        implementation("com.miglayout:miglayout-swing")
-        implementation("com.fasterxml.jackson.core:jackson-core")
-        implementation("com.fasterxml.jackson.core:jackson-databind")
-        testImplementation(testFixtures(project(":src:testkit-wiremock")))
-        testImplementation("com.github.tomakehurst:wiremock-jre8")
-        // For some reason JMeter bundles just tika-core and tika-parsers without transitive
-        // dependencies. So we exclude those
-        implementation("org.apache.tika:tika-core") {
-            isTransitive = false
-        }
-        runtimeOnly("org.apache.tika:tika-parsers") {
-            isTransitive = false
-        }
-    }
-}
-
-project("java") {
-    dependencies {
-        implementation("org.apache.commons:commons-lang3") {
-            because("ArrayUtils")
-        }
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-    }
-}
-
-project("jdbc") {
-    dependencies {
-        implementation("org.apache.commons:commons-dbcp2")
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils, ObjectUtils")
-        }
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-    }
-}
-
-project("jms") {
-    dependencies {
-        testImplementation(project(":src:core", "testClasses"))
-        api("com.github.ben-manes.caffeine:caffeine") {
-            because("MessageRenderer#getValueFromFile(..., caffeine.cache.Cache)")
-        }
-        // TODO: technically speaking, jms_1.1_spec should be compileOnly
-        // since we either include a JMS implementation or we can't use JMS at all
-        implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-        implementation("com.miglayout:miglayout-swing")
-    }
-}
-
-project("junit") {
-    dependencies {
-        api("junit:junit")
-        implementation("org.apache.commons:commons-lang3") {
-            because("ArrayUtils")
-        }
-        implementation("org.exparity:hamcrest-date") {
-            because("hamcrest-date.jar was historically shipped with JMeter")
-        }
-        implementation("com.miglayout:miglayout-swing")
-    }
-}
-
-project("junit-sample") {
-    dependencies {
-        api("junit:junit")
-    }
-}
-
-project("ldap") {
-    dependencies {
-        implementation("org.apache.commons:commons-text") {
-            because("StringEscapeUtils")
-        }
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-    }
-}
-
-project("mail") {
-    dependencies {
-        api("javax.mail:mail") {
-            exclude("javax.activation", "activation")
-        }
-        // There's no javax.activation:activation:1.2.0, so we use com.sun...
-        runtimeOnly("com.sun.activation:javax.activation")
-        // This is an API-only jar. javax.activation is present in Java 8,
-        // however it is not there in Java 9
-        compileOnly("javax.activation:javax.activation-api")
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-    }
-}
-
-project("mongodb") {
-    dependencies {
-        api("org.mongodb:mongo-java-driver")
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-    }
-}
-
-project("native") {
-    dependencies {
-        implementation("org.apache.commons:commons-lang3") {
-            because("StringUtils")
-        }
-    }
-}
-
-project("tcp") {
-    dependencies {
-        implementation("org.apache.commons:commons-lang3") {
-            because("ArrayUtils")
-        }
-        implementation("commons-io:commons-io") {
-            because("IOUtils")
-        }
-    }
-}
diff --git a/src/protocol/ftp/build.gradle.kts b/src/protocol/ftp/build.gradle.kts
new file mode 100644
index 00000000000..c853600ff2d
--- /dev/null
+++ b/src/protocol/ftp/build.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("commons-net:commons-net")
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
new file mode 100644
index 00000000000..dc46d47f6de
--- /dev/null
+++ b/src/protocol/http/build.gradle.kts
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    api(projects.src.components) {
+        because("we need SearchTextExtension")
+    }
+    testImplementation(project(":src:components", "testClasses"))
+
+    api("com.thoughtworks.xstream:xstream") {
+        because("HTTPResultConverter uses XStream in public API")
+    }
+
+    compileOnly("javax.activation:javax.activation-api") {
+        because("ParseCurlCommandAction uses new MimetypesFileTypeMap()")
+    }
+
+    implementation("com.github.ben-manes.caffeine:caffeine")
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+    implementation("org.apache.commons:commons-text") {
+        because("StringEscapeUtils")
+    }
+    implementation("org.jodd:jodd-lagarto")
+    implementation("org.jsoup:jsoup")
+    implementation("oro:oro")
+    implementation("org.apache.commons:commons-collections4")
+    implementation("commons-net:commons-net")
+    implementation("com.helger.commons:ph-commons") {
+        // We don't really need to use/distribute jsr305
+        exclude("com.google.code.findbugs", "jsr305")
+    }
+    implementation("com.helger:ph-css") {
+        // We don't really need to use/distribute jsr305
+        exclude("com.google.code.findbugs", "jsr305")
+    }
+    implementation("dnsjava:dnsjava")
+    implementation("org.apache.httpcomponents:httpmime")
+    implementation("org.apache.httpcomponents:httpcore")
+    implementation("org.brotli:dec")
+    implementation("com.miglayout:miglayout-swing")
+    implementation("com.fasterxml.jackson.core:jackson-core")
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation(testFixtures(projects.src.testkitWiremock))
+    testImplementation("com.github.tomakehurst:wiremock-jre8")
+    // For some reason JMeter bundles just tika-core and tika-parsers without transitive
+    // dependencies. So we exclude those
+    implementation("org.apache.tika:tika-core") {
+        isTransitive = false
+    }
+    runtimeOnly("org.apache.tika:tika-parsers") {
+        isTransitive = false
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/java/build.gradle.kts b/src/protocol/java/build.gradle.kts
new file mode 100644
index 00000000000..4f4211d0745
--- /dev/null
+++ b/src/protocol/java/build.gradle.kts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.apache.commons:commons-lang3") {
+        because("ArrayUtils")
+    }
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/jdbc/build.gradle.kts b/src/protocol/jdbc/build.gradle.kts
new file mode 100644
index 00000000000..936a3ac110d
--- /dev/null
+++ b/src/protocol/jdbc/build.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.apache.commons:commons-dbcp2")
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils, ObjectUtils")
+    }
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/jms/build.gradle.kts b/src/protocol/jms/build.gradle.kts
new file mode 100644
index 00000000000..4479af072af
--- /dev/null
+++ b/src/protocol/jms/build.gradle.kts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    testImplementation(project(":src:core", "testClasses"))
+    api("com.github.ben-manes.caffeine:caffeine") {
+        because("MessageRenderer#getValueFromFile(..., caffeine.cache.Cache)")
+    }
+    // TODO: technically speaking, jms_1.1_spec should be compileOnly
+    // since we either include a JMS implementation or we can't use JMS at all
+    implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+    implementation("com.miglayout:miglayout-swing")
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
index 4c68668936a..b551227e9a1 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
@@ -52,6 +52,7 @@ public Object getReply() {
             return reply;
         }
 
+        @SuppressWarnings("UnusedMethod")
         public Object getRequest() {
             return request;
         }
diff --git a/src/protocol/junit-sample/build.gradle.kts b/src/protocol/junit-sample/build.gradle.kts
new file mode 100644
index 00000000000..66de3f9e8e5
--- /dev/null
+++ b/src/protocol/junit-sample/build.gradle.kts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    api("junit:junit")
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java b/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
index e93749b69c2..62bacb09cd7 100644
--- a/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
+++ b/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
@@ -60,7 +60,7 @@ public void printDone() {
 
     @Test
     // Succeeds only if Before method - verifyTwo() - is run.
-    @SuppressWarnings("UseCorrectAssertInTests")
+    @SuppressWarnings({"UseCorrectAssertInTests", "AlreadyChecked"})
     public void add() {
         int four = two + 2;
         if (4 != four) {
diff --git a/src/protocol/junit/build.gradle.kts b/src/protocol/junit/build.gradle.kts
new file mode 100644
index 00000000000..f56ec620813
--- /dev/null
+++ b/src/protocol/junit/build.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    api("junit:junit")
+    implementation("org.apache.commons:commons-lang3") {
+        because("ArrayUtils")
+    }
+    implementation("org.exparity:hamcrest-date") {
+        because("hamcrest-date.jar was historically shipped with JMeter")
+    }
+    implementation("com.miglayout:miglayout-swing")
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/ldap/build.gradle.kts b/src/protocol/ldap/build.gradle.kts
new file mode 100644
index 00000000000..1dd9372f043
--- /dev/null
+++ b/src/protocol/ldap/build.gradle.kts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.apache.commons:commons-text") {
+        because("StringEscapeUtils")
+    }
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/mail/build.gradle.kts b/src/protocol/mail/build.gradle.kts
new file mode 100644
index 00000000000..f4e1f17d7c0
--- /dev/null
+++ b/src/protocol/mail/build.gradle.kts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    api("javax.mail:mail") {
+        exclude("javax.activation", "activation")
+    }
+    // There's no javax.activation:activation:1.2.0, so we use com.sun...
+    runtimeOnly("com.sun.activation:javax.activation")
+    // This is an API-only jar. javax.activation is present in Java 8,
+    // however it is not there in Java 9
+    compileOnly("javax.activation:javax.activation-api")
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/mongodb/build.gradle.kts b/src/protocol/mongodb/build.gradle.kts
new file mode 100644
index 00000000000..f1bef7c0243
--- /dev/null
+++ b/src/protocol/mongodb/build.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    api("org.mongodb:mongo-java-driver")
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/native/build.gradle.kts b/src/protocol/native/build.gradle.kts
new file mode 100644
index 00000000000..6288c95d059
--- /dev/null
+++ b/src/protocol/native/build.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.apache.commons:commons-lang3") {
+        because("StringUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/protocol/tcp/build.gradle.kts b/src/protocol/tcp/build.gradle.kts
new file mode 100644
index 00000000000..4f4211d0745
--- /dev/null
+++ b/src/protocol/tcp/build.gradle.kts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-published-library")
+}
+
+dependencies {
+    api(projects.src.core)
+
+    implementation("org.apache.commons:commons-lang3") {
+        because("ArrayUtils")
+    }
+    implementation("commons-io:commons-io") {
+        because("IOUtils")
+    }
+
+    testImplementation(project(":src:core", "testClasses"))
+}
diff --git a/src/testkit-wiremock/build.gradle.kts b/src/testkit-wiremock/build.gradle.kts
index 804cb4c940c..9f877c6988c 100644
--- a/src/testkit-wiremock/build.gradle.kts
+++ b/src/testkit-wiremock/build.gradle.kts
@@ -17,6 +17,7 @@
 
 plugins {
     `java-test-fixtures`
+    id("build-logic.jvm-library")
 }
 
 dependencies {
diff --git a/src/testkit/build.gradle.kts b/src/testkit/build.gradle.kts
index 1013df73fe5..572e53e67ee 100644
--- a/src/testkit/build.gradle.kts
+++ b/src/testkit/build.gradle.kts
@@ -17,6 +17,7 @@
 
 plugins {
     `java-test-fixtures`
+    id("build-logic.jvm-library")
 }
 
 // test-fixtures enable to share code across test modules

From 76ed9ad086ddda10dc2656e0d1f94421844f32a3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 15:03:53 +0300
Subject: [PATCH 0320/1037] chore: update trusted keys for jaxan and org.slf4j

---
 checksum.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/checksum.xml b/checksum.xml
index bfe988dc8ea..ea941500a09 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -87,6 +87,7 @@
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4daded739cdf2cd0e48e0ec44044edf1bb73efea' group='jaxen' />
+    <trusted-key id='ca491704d613780d2bee00f2c6fc46eb51cf569c' group='jaxen' />
     <trusted-key id='b5569a15406ae682380f3ef8528dc75aa68f0923' group='jcharts' />
     <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
@@ -174,6 +175,7 @@
     <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' />
     <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' />
     <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
+    <trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='org.slf4j' />
     <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
     <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
     <trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />

From 5b03959e9e5eb15f08d996614ab2a857961e6d9d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 15:22:21 +0300
Subject: [PATCH 0321/1037] chore: add missing distTarSource ->
 copyExtraTestLibs dependency

---
 src/dist/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index e399679d830..9bf30eb3b7b 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -589,6 +589,7 @@ for (type in listOf("binary", "source")) {
             // So we add an artificial dependency
             mustRunAfter(copyBinLibs)
             mustRunAfter(copyLibs)
+            mustRunAfter(":src:dist-check:copyExtraTestLibs")
             // Gradle does not track "filters" as archive/copy task dependencies,
             // So a mere change of a file attribute won't trigger re-execution of a task
             // So we add a custom property to re-execute the task in case attributes change

From b073b2393e5bf14988f45ea8f228ce02bcd1d12e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 15:37:49 +0300
Subject: [PATCH 0322/1037] chore: remove use of toUpperCase() deprecated
 function in Kotlin

---
 build-logic/settings.gradle.kts | 4 +++-
 settings.gradle.kts             | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index f5cc44ab657..c3d1415f69f 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import java.util.*
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -67,7 +69,7 @@ fun File.sha512(): String {
     forEachBlock { buffer, bytesRead ->
         md.update(buffer, 0, bytesRead)
     }
-    return BigInteger(1, md.digest()).toString(16).toUpperCase()
+    return BigInteger(1, md.digest()).toString(16).uppercase(Locale.ROOT)
 }
 
 val violations =
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a8bb9f14cd1..def4213cf96 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import java.util.*
+
 pluginManagement {
     plugins {
         id("com.github.vlsi.stage-vote-release") version "1.86"
@@ -175,7 +177,7 @@ fun File.sha512(): String {
     forEachBlock { buffer, bytesRead ->
         md.update(buffer, 0, bytesRead)
     }
-    return BigInteger(1, md.digest()).toString(16).toUpperCase()
+    return BigInteger(1, md.digest()).toString(16).uppercase(Locale.ROOT)
 }
 
 val violations =

From bc968fcd4aea733a4256e20b098e41a7918c0511 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 27 Apr 2023 16:50:56 +0200
Subject: [PATCH 0323/1037] Update lets-plot-jvm (#5797)

This release looses the dependency to xalan, which can help
resolving #721
---
 src/bom-thirdparty/build.gradle.kts           |  4 +-
 .../threads/openmodel/gui/TargetRateChart.kt  | 12 ++---
 src/dist/src/dist/expected_release_jars.csv   | 54 +++++++++----------
 xdocs/changes.xml                             |  3 ++
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 46dae4c3fb3..e90b07747c2 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -82,8 +82,8 @@ dependencies {
         api("jcharts:jcharts:0.7.5")
         api("junit:junit:4.13.2")
         api("org.jetbrains:annotations:23.0.0")
-        api("org.jetbrains.lets-plot:lets-plot-batik:2.2.1")
-        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.1.1")
+        api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
         api("org.junit.jupiter:junit-jupiter:5.8.2")
         api("org.junit.jupiter:junit-jupiter-api:5.8.2")
         api("org.junit.jupiter:junit-jupiter-params:5.8.2")
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
index facfb6182f0..63ca5b42021 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -20,17 +20,17 @@ package org.apache.jmeter.threads.openmodel.gui
 import jetbrains.datalore.base.registration.Disposable
 import jetbrains.datalore.plot.MonolithicCommon
 import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik
-import jetbrains.letsPlot.geom.geomLine
-import jetbrains.letsPlot.intern.toSpec
-import jetbrains.letsPlot.label.ggtitle
-import jetbrains.letsPlot.letsPlot
-import jetbrains.letsPlot.scale.scaleXTime
-import jetbrains.letsPlot.theme
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
 import org.apache.jmeter.threads.openmodel.asSeconds
 import org.apache.jmeter.threads.openmodel.rateUnitFor
 import org.apiguardian.api.API
+import org.jetbrains.letsPlot.geom.geomLine
+import org.jetbrains.letsPlot.intern.toSpec
+import org.jetbrains.letsPlot.label.ggtitle
+import org.jetbrains.letsPlot.letsPlot
+import org.jetbrains.letsPlot.scale.scaleXTime
+import org.jetbrains.letsPlot.themes.theme
 import org.slf4j.LoggerFactory
 import java.awt.BorderLayout
 import java.util.concurrent.TimeUnit
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index e0e31144252..2b9c6c63f0d 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -2,25 +2,25 @@
 29371,annotations-23.0.0.jar
 6806,apiguardian-api-1.1.2.jar
 122176,asm-9.3.jar
-518460,base-portable-jvm-2.2.1.jar
-485809,batik-anim-1.14.jar
-424624,batik-awt-util-1.14.jar
-703757,batik-bridge-1.14.jar
-112373,batik-codec-1.14.jar
-8433,batik-constants-1.14.jar
-330318,batik-css-1.14.jar
-184487,batik-dom-1.14.jar
-10238,batik-ext-1.14.jar
-192087,batik-gvt-1.14.jar
-11466,batik-i18n-1.14.jar
-76875,batik-parser-1.14.jar
-25876,batik-script-1.14.jar
-6663,batik-shared-resources-1.14.jar
-232734,batik-svg-dom-1.14.jar
-227514,batik-svggen-1.14.jar
-129300,batik-transcoder-1.14.jar
-127477,batik-util-1.14.jar
-33866,batik-xml-1.14.jar
+582079,base-portable-jvm-3.1.0.jar
+485898,batik-anim-1.16.jar
+424607,batik-awt-util-1.16.jar
+704905,batik-bridge-1.16.jar
+112371,batik-codec-1.16.jar
+8431,batik-constants-1.16.jar
+330361,batik-css-1.16.jar
+184060,batik-dom-1.16.jar
+10239,batik-ext-1.16.jar
+192085,batik-gvt-1.16.jar
+11464,batik-i18n-1.16.jar
+76872,batik-parser-1.16.jar
+25198,batik-script-1.16.jar
+6665,batik-shared-resources-1.16.jar
+232734,batik-svg-dom-1.16.jar
+227487,batik-svggen-1.16.jar
+129300,batik-transcoder-1.16.jar
+127485,batik-util-1.16.jar
+33870,batik-xml-1.16.jar
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
@@ -94,8 +94,8 @@
 1492143,kotlinx-coroutines-core-jvm-1.6.1.jar
 10026,kotlinx-coroutines-swing-1.6.1.jar
 792176,kotlinx-html-jvm-0.7.3.jar
-181223,lets-plot-batik-2.2.1.jar
-4025480,lets-plot-common-2.2.1.jar
+185204,lets-plot-batik-3.1.0.jar
+4819710,lets-plot-common-3.1.0.jar
 303443,log4j-1.2-api-2.17.2.jar
 302511,log4j-api-2.17.2.jar
 1811089,log4j-core-2.17.2.jar
@@ -109,11 +109,11 @@
 65261,oro-2.0.8.jar
 1308773,ph-commons-10.1.6.jar
 530791,ph-css-6.5.0.jar
-642167,plot-api-jvm-3.1.1.jar
-891618,plot-base-portable-jvm-2.2.1.jar
-845777,plot-builder-portable-jvm-2.2.1.jar
-116030,plot-common-portable-jvm-2.2.1.jar
-749095,plot-config-portable-jvm-2.2.1.jar
+1235840,plot-api-jvm-4.3.0.jar
+1138257,plot-base-portable-jvm-3.1.0.jar
+1065661,plot-builder-portable-jvm-3.1.0.jar
+206691,plot-common-portable-jvm-3.1.0.jar
+893288,plot-config-portable-jvm-3.1.0.jar
 11369,reactive-streams-1.0.3.jar
 1383644,rhino-1.7.14.jar
 1248250,rsyntaxtextarea-3.2.0.jar
@@ -125,7 +125,7 @@
 2539,swing-extensions-visual-padding-0.1.3.jar
 736051,tika-core-1.28.5.jar
 1588025,tika-parsers-1.28.5.jar
-174661,vis-svg-portable-jvm-2.2.1.jar
+182638,vis-svg-portable-jvm-3.1.0.jar
 3154938,xalan-2.7.2.jar
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 8fc357778a5..c2769d1058d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -116,6 +116,9 @@ Summary
   <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
   <li><pr>5763</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
+  <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
+  <li>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
+  <li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 15aa699f4ea98c84b443f6654a0bc215f0a840b8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 14:52:17 +0000
Subject: [PATCH 0324/1037] chore: add renovate.json

closes #5821
---
 renovate.json | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000000..05bd10539d4
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "labels": ["dependencies"],
+  "schedule": ["every 3 weeks on Monday"],
+  "packageRules": [
+    {
+      "matchPackagePrefixes": ["com.github.vlsi"],
+      "groupName": "com.github.vlsi"
+    },
+    {
+      "matchPackagePrefixes": ["org.apache.activemq"],
+      "groupName": "org.apache.activemq"
+    },
+    {
+      "matchPackagePatterns": ["^src:protocol:"],
+      "ignoreLookupWarnings": true
+    }
+  ]
+}

From abe418b5aa6e92c239ab3788c9a761a5229e6cfa Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 18:20:27 +0300
Subject: [PATCH 0325/1037] chore: fix renovate syntax for ignoring
 src:protocol

See https://docs.renovatebot.com/configuration-options/#ignoredeps

Fixes #5822
---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 05bd10539d4..93b423b8772 100644
--- a/renovate.json
+++ b/renovate.json
@@ -16,7 +16,7 @@
     },
     {
       "matchPackagePatterns": ["^src:protocol:"],
-      "ignoreLookupWarnings": true
+      "enabled": false
     }
   ]
 }

From 0d1979b14634b74d71df8b6feb12c9e72d802040 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 18:31:36 +0300
Subject: [PATCH 0326/1037] chore: group certain packages in Renovate PRs

---
 renovate.json | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 93b423b8772..ee93eef6215 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,16 +6,57 @@
   "labels": ["dependencies"],
   "schedule": ["every 3 weeks on Monday"],
   "packageRules": [
+    {
+      "matchPackagePrefixes": ["com.fasterxml.jackson.core"],
+      "groupName": "com.fasterxml.jackson.core"
+    },
     {
       "matchPackagePrefixes": ["com.github.vlsi"],
       "groupName": "com.github.vlsi"
     },
+    {
+      "matchPackagePrefixes": ["com.github.weisj"],
+      "groupName": "com.github.weisj"
+    },
+    {
+      "matchPackagePrefixes": ["com.helger"],
+      "groupName": "com.helger"
+    },
+    {
+      "matchPackagePrefixes": ["com.miglayout"],
+      "groupName": "com.miglayout"
+    },
     {
       "matchPackagePrefixes": ["org.apache.activemq"],
       "groupName": "org.apache.activemq"
     },
     {
-      "matchPackagePatterns": ["^src:protocol:"],
+      "matchPackagePrefixes": ["org.apache.httpcomponents"],
+      "groupName": "org.apache.httpcomponents"
+    },
+    {
+      "matchPackagePrefixes": ["org.apache.logging.log4j"],
+      "groupName": "org.apache.logging.log4j"
+    },
+    {
+      "matchPackagePrefixes": ["org.apache.tika"],
+      "groupName": "org.apache.tika"
+    },
+    {
+      "matchPackagePrefixes": ["org.checkerframework"],
+      "groupName": "org.checkerframework"
+    },
+    {
+      "matchPackagePrefixes": ["org.jodd"],
+      "groupName": "org.jodd"
+    },
+    {
+      "matchPackagePrefixes": ["org.slf4j"],
+      "groupName": "org.slf4j",
+      "allowedVersions": "< 2.0.0"
+    },
+    {
+      "matchPackagePatterns": ["^src:protocol"],
       "enabled": false
     }
   ]

From eaf8e7c58b392e62270abb36415d19f930a1d1af Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 18:32:41 +0300
Subject: [PATCH 0327/1037] chore: exclude renovate.json from rat since JSON
 can't have comments

---
 .ratignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ratignore b/.ratignore
index 88bd46bdec2..f2ade8505bd 100644
--- a/.ratignore
+++ b/.ratignore
@@ -12,6 +12,7 @@ gradle.md
 ISSUE_TEMPLATE.md
 PULL_REQUEST_TEMPLATE.md
 README.md
+renovate.json
 **/*.jmx
 bin/examples/**
 bin/report-output/**

From 1c6625ecb183c7bd0d9b98f981a8bfd6e7796882 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 18:36:51 +0300
Subject: [PATCH 0328/1037] chore: add dependency
 rat.mustRunAfter(:src:dist-check:copyExtraTestLibs)

---
 .../root-build/src/main/kotlin/build-logic.root-build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
index 7cb49efd103..2e75d5e448a 100644
--- a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
+++ b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
@@ -53,6 +53,7 @@ val rat by tasks.getting(org.nosphere.apache.rat.RatTask::class) {
     // Technically speaking, that is false positive since rat ignores *.jar files,
     // and copyLibs copies jar files only
     mustRunAfter(":src:dist:copyBinLibs", ":src:dist:copyLibs")
+    mustRunAfter(":src:dist-check:copyExtraTestLibs")
 }
 
 if (buildParameters.coverage) {

From 97a5cea3a35d07f1c0db13380a235ef4831a99da Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 18:52:26 +0200
Subject: [PATCH 0329/1037] fix(deps): update com.github.vlsi to v1.88 (#5824)

---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 build-logic/jvm/build.gradle.kts              | 4 ++--
 build-logic/root-build/build.gradle.kts       | 6 +++---
 build-logic/verification/build.gradle.kts     | 4 ++--
 settings.gradle.kts                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index c06c997468a..a7e60c8753a 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("org.gradlex.build-parameters") version "1.4.3"
-    id("com.github.vlsi.gradle-extensions") version "1.86"
+    id("com.github.vlsi.gradle-extensions") version "1.88"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
 
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index fef864d2cee..0c8b9388a6c 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -22,8 +22,8 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.87")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.87")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
 }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 87959577697..4d951397a06 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -22,9 +22,9 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.86")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.86")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.86")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:0.5")
 }
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index d4438f29b33..f903ddd5853 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -24,8 +24,8 @@ dependencies {
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.13")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.86")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.86")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.4")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.26")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index def4213cf96..396df665929 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,7 @@ import java.util.*
 
 pluginManagement {
     plugins {
-        id("com.github.vlsi.stage-vote-release") version "1.86"
+        id("com.github.vlsi.stage-vote-release") version "1.88"
     }
 }
 

From d135e7e46cbc5b5399a23c98258f5105f6a4b70b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 19:21:34 +0200
Subject: [PATCH 0330/1037] fix(deps): update dependency checkstyle to v10.10.0
 (#5825)

---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 97d39c5a16c..30bed085fec 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 checkstyle {
-    toolVersion = "10.8.1"
+    toolVersion = "10.10.0"
     configProperties = mapOf(
         "cache_file" to buildDir.resolve("checkstyle/cacheFile")
     )

From da18ff51c5b8ed46c88a9ab26647546692ab1db2 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 19:21:53 +0200
Subject: [PATCH 0331/1037] fix(deps): update dependency
 de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin to v3.5.1
 (#5826)

---
 build-logic/verification/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index f903ddd5853..762def2dd19 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.13")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
-    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.4")
+    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.26")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")

From 0e52a756bf4831827f0f09897b390812d50e721c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 21:04:06 +0300
Subject: [PATCH 0332/1037] chore: call verifyReleaseDependencies only when
 building release version (#5828)

For non-snapshot versions, don't fail the build if the actual dependencies
differ from the expected ones.

It would enable accepting PRs from Renovate bot without resorting to manual resolution every time.

Renovate supports postUpgradeTasks, however, it works with self-hosted runners only:
https://docs.renovatebot.com/configuration-options/#postupgradetasks
---
 src/dist/build.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 9bf30eb3b7b..39b0c4e7c5c 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -237,6 +237,10 @@ val verifyReleaseDependencies by tasks.registering {
         if (updateExpectedJars) {
             println("Updating ${expectedLibs.relativeTo(rootDir)}")
             actualLibs.copyTo(expectedLibs, overwrite = true)
+        } else if (version.toString().endsWith("-SNAPSHOT")) {
+            // Renovate requires self-hosted runner for executing postUpgradeTasks,
+            // so we can't make Renovate to update expected_release_jars.csv at the moment
+            logger.lifecycle(sb.toString())
         } else {
             throw GradleException(sb.toString())
         }

From ea39208897f370452480399127b96aaa0a9085d1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 20:04:17 +0200
Subject: [PATCH 0333/1037] fix(deps): update dependency jacoco to v0.8.10
 (#5827)

---
 .../verification/src/main/kotlin/build-logic.jacoco.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
index f5d3f18ec9c..19ba3646d4a 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.10"
     providers.gradleProperty("jacoco.version")
         .takeIf { it.isPresent }
         ?.let { toolVersion = it.get() }

From 7cde38fdd36a8269563000728b3e86f656e939ab Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 27 Apr 2023 21:52:33 +0300
Subject: [PATCH 0334/1037] chore: add trusted keys for
 ch.randelshofer:fastdoubleparser, com.github.javaparser, spotbugs

---
 checksum.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/checksum.xml b/checksum.xml
index ea941500a09..5651ae1987f 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -6,6 +6,7 @@
   </ignored-keys>
   <trusted-keys>
     <trusted-key id='07dbc3c1ab1f4468471656061c8d5ef0df2b70d4' group='cglib' />
+    <trusted-key id='6ead752b3e2b38e8e2236d7ba9321edaa5cb3202' group='ch.randelshofer' />
     <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
     <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
     <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
@@ -18,6 +19,7 @@
     <trusted-key id='635ee627345f3c1dd422b2e207d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
     <trusted-key id='55e770230e69cc6de143fb5b62c82e50836eb3ee' group='com.github.gundy' />
     <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
+    <trusted-key id='fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe' group='com.github.javaparser' />
     <trusted-key id='4bde772c338ba540e1057d0c8ea48d105232855d' group='com.github.jknack' />
     <trusted-key id='a4fd709cc4b0515f2e6af04e218fa0f6a941a037' group='com.github.kevinstern' />
     <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
@@ -201,6 +203,9 @@
     <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.13'>
       <sha512>2B171CABD12C1E2A89EA9DFEEDC4F97F89587AADADCBB6B4B093D7C558EE3CB2F7D2A6CC66787D5D7B664CF3DC9BC7E4CDAD3737CDCE109D7AB5A0EF0D8BC925</sha512>
     </dependency>
+    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.14'>
+      <sha512>F8768877E3B204EA886F7BDEE6B4D900DB80B1B63CF37800F56E3BB1E2D3C13B38F7BA4784160DB80A0CAB658D4948BEE1992E9FAFE519C156BEF8A4B0B3E903</sha512>
+    </dependency>
     <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.85'>
       <sha512>59CD14C68456ADD477C6B6ACC8AC330EE5A10BA4394E3434450E958EC04968197C3EDAE8F3693D42CA32A5C0F639D6D60CF155B659D91CF89301744130087D9A</sha512>
     </dependency>

From 0238874ff654377f985b1fdc7cfd64469f929c09 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 21:41:06 +0200
Subject: [PATCH 0335/1037] fix(deps): update junit5 monorepo to v5.9.3 (#5832)

---
 src/bom-thirdparty/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index e90b07747c2..a86dc92663f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -84,9 +84,9 @@ dependencies {
         api("org.jetbrains:annotations:23.0.0")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
-        api("org.junit.jupiter:junit-jupiter:5.8.2")
-        api("org.junit.jupiter:junit-jupiter-api:5.8.2")
-        api("org.junit.jupiter:junit-jupiter-params:5.8.2")
+        api("org.junit.jupiter:junit-jupiter:5.9.3")
+        api("org.junit.jupiter:junit-jupiter-api:5.9.3")
+        api("org.junit.jupiter:junit-jupiter-params:5.9.3")
         api("net.minidev:accessors-smart:2.4.8")
         api("net.minidev:json-smart:2.4.8")
         api("net.sf.jtidy:jtidy:r938")

From b76c5f73025b21ec9a17605910a9b4a3e2c4321f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 27 Apr 2023 22:10:37 +0200
Subject: [PATCH 0336/1037] fix(deps): update dependency
 org.codehaus.groovy:groovy-bom to v3.0.17 (#5830)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a86dc92663f..735621095a8 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:3.0.11"))
+    api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1"))
 
     constraints {

From 873c188f25b00d1c2e3826a73990c1d976ddee24 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 09:37:26 +0300
Subject: [PATCH 0337/1037] fix(deps): update dependency
 com.github.spotbugs:com.github.spotbugs.gradle.plugin to v5.0.14

Closes https://github.com/apache/jmeter/pull/5829
See https://github.com/spotbugs/spotbugs-gradle-plugin/issues/888
---
 build-logic/checksum.xml                  | 4 ++--
 build-logic/verification/build.gradle.kts | 2 +-
 checksum.xml                              | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index bb09cb568e4..92fc3801273 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -65,8 +65,8 @@
     <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
   </trusted-keys>
   <dependencies>
-    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.13'>
-      <sha512>2B171CABD12C1E2A89EA9DFEEDC4F97F89587AADADCBB6B4B093D7C558EE3CB2F7D2A6CC66787D5D7B664CF3DC9BC7E4CDAD3737CDCE109D7AB5A0EF0D8BC925</sha512>
+    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.14'>
+      <sha512>F8768877E3B204EA886F7BDEE6B4D900DB80B1B63CF37800F56E3BB1E2D3C13B38F7BA4784160DB80A0CAB658D4948BEE1992E9FAFE519C156BEF8A4B0B3E903</sha512>
     </dependency>
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 762def2dd19..dcce20c99db 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.13")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.14")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
diff --git a/checksum.xml b/checksum.xml
index 5651ae1987f..54427135063 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -200,9 +200,6 @@
     <dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
       <sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
     </dependency>
-    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.13'>
-      <sha512>2B171CABD12C1E2A89EA9DFEEDC4F97F89587AADADCBB6B4B093D7C558EE3CB2F7D2A6CC66787D5D7B664CF3DC9BC7E4CDAD3737CDCE109D7AB5A0EF0D8BC925</sha512>
-    </dependency>
     <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.14'>
       <sha512>F8768877E3B204EA886F7BDEE6B4D900DB80B1B63CF37800F56E3BB1E2D3C13B38F7BA4784160DB80A0CAB658D4948BEE1992E9FAFE519C156BEF8A4B0B3E903</sha512>
     </dependency>

From 8f29799dd5e76ba30011c2c9fb170622b6e81791 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 10:42:13 +0300
Subject: [PATCH 0338/1037] fix(deps): update com.fasterxml.jackson.core to
 v2.15.0

See https://github.com/wrandelshofer/FastDoubleParser/issues/38
Closes https://github.com/apache/jmeter/pull/5831
---
 ...ad752b3e2b38e8e2236d7ba9321edaa5cb3202.asc | 21 +++++++++++++++++++
 .../02/a9321edaa5cb3202.fingerprints          |  1 +
 .../5b/d36db5c489baac5b.fingerprints          |  1 +
 .../91/9f621f1ae6ef2591.fingerprints          |  1 +
 .../be/2bfd7825a8984fbe.fingerprints          |  1 +
 ...2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc | 21 +++++++++++++++++++
 src/bom-thirdparty/build.gradle.kts           |  6 +++---
 src/licenses/build.gradle.kts                 |  4 ++++
 .../licenses/fastdoubleparser/LICENSE         | 21 +++++++++++++++++++
 9 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
 create mode 100644 src/licenses/licenses/fastdoubleparser/LICENSE

diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
new file mode 100644
index 00000000000..055840f5dc9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBoC2ABDACyCWLqqAo9NeThE90hBoYomtgLci5I8+7PxSYeQfzUYjXzZcnh
+6d/zHaeC0zxGhT2LNe5i3p2e36xSeFDobjG2Il/nv+4jFCgbn3TZ2hEingPuPsg5
+isodOXHBSY9iHPTKInpiu+J79MWP9GVZ6GeOOgQaNSrNN3uDE1w3rukB2SrXGdfT
+/6YZIOtwWZVzc2m9lalPmOAyI4KLI/s37C8Ozfv3c+Bx11WRVzWVpBTo94fU4DPu
+Yzkx2Wxuc4TT5k6bQJI/GHi36M7xkUauXhkRCNvBz+LFVcFjtsv6S37L6RZib6mz
+jZTW+iyD4h66gqzg3hSRxv4YzHgR/Os26Br2ioZNzH6hJFtNktR4oN/2kydmj5Od
+WYjvdMmd/dMbZheZE3f8sziUKCyvWMIddnHAM81uDTXgWcMgYSa3npOGZhfk41z+
+w9o2f1kXIfdurqlA1n8np07PLw5Rfpjvbs7EZxPTJwcc1enaNyL64fb+YIUtFrcW
+Dt1zUMEDkbcZL1UAEQEAAbkBjQRgaAtgAQwA9dZFGqc0/6pUKDUsT+2hMh0z5mIS
+Lc+x6v4wbAqiEcBE9uoKf0LniRfVeehmuJpiUPgOf3TyxNbxeWiFuJELZbnrYztA
+eRE66Zxk6i2Mv+207fdlj3mhphdEWh4f/0AJa2PAmiwlcxq1O3VJ/Wfn3huCqIU5
+cmqnmGKH9LPaW1aJBxWl9+x6mmPVySxpTaQRrnNnumZf9K5lwGEsccvpkLP7J1Nl
+v7HLO8oliPCInEMcsrVqfiKU/bybxNW1wzPJxp8LNLaCNxuLNl4RCp7tPQuZgjco
+Cnz+JwcxnmNGI+FKqSsFXBZyNTWiQJuaFUQa0QON/+Qj3p+OyW15f+FfLjHI/BkN
+Ai4ncNeeazAwuLCMJGMS+dLarHMbbAKLaH0UI062ch3Aq2Sa3io1gU6vYHvoKNMN
+fYdNwoGX85EkzX6A9fm9jBviios1RLkpfO70MoxpWjl/rwHG57GOItWZ7O53ebs6
+HrFPdUYQs0Gz/lj+BaQPwDcMxADfYtGnYMepABEBAAE=
+=xly/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
new file mode 100644
index 00000000000..41a0108c9e1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
@@ -0,0 +1 @@
+6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
new file mode 100644
index 00000000000..41a0108c9e1
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
@@ -0,0 +1 @@
+6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
new file mode 100644
index 00000000000..797d3916135
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
@@ -0,0 +1 @@
+fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
new file mode 100644
index 00000000000..797d3916135
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
@@ -0,0 +1 @@
+fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
new file mode 100644
index 00000000000..f0a6e3b5122
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGI0UjABDAC98lMPbj3vwHKSwLc8o4oAbOf9PKi/zWxjEYj7KZky4ue9JE7R
+QiaUCY387lWc/fXcq8Wa6/IteqekJBQw2KCrDaKBcAXLjnvO93q51ecc7Eo5U1w9
+xJj31YDQOR7R5XY2x2nvSSgk5CmV3czajM3ZeRYHoVqsqp6QwhjDllp+EaPJRtuS
+Fk5mWk8e//iZcZa6GK5wFEtrZMCSjjofaeE5wrsatguhrXwbtDshbN7oW48vK5Kv
+zM+zpwjLUu3gsvydyV4TPhl0Z5gzHef1GYe88WM5dus+/A8yED8BUJ7I6OkJKNbN
+ivC5aJg3BGvLZQiLCsOLZCYIcJt3ADYBgMVwHLSLmCoNym6sS61Rklu5Ig5Ax1eh
+X1aGL06v2B5oM+pHhEvl22iXIi+AQJYXYR8Lg1MBJzEz+aCaX+h46u+GcjEt0EV+
+WGzvQgBcA5qwEvbSKewu4fG/5SuyEk53ZXHwIJHC11kFQ9SPExPnqIdHHIMFjDj2
+8OG1WtLMdGzxMCkAEQEAAbkBjQRiNFIwAQwAqL0vVX+5uzucp6vQitUmOuEyiS0S
+Wz2wldKVJXKABnNKSP7Irq0pF0FbfvEne8pRGz35NVcAi7KPYwnbXtX43tmUJsO8
+w0Yti/eKBJOzPq5bxLvMabKTLaO3y/NLmRuxCBwre1zkdQGMK21O0TdGu0bxJK6Y
+EJKx/8cX+8f8WiVIlcN7IXlTgkeyz4CohaQfJibuPi0YSYmbhnjIuS8m6S/aMduC
+vAimqzIMk9rgRcbs27JafreWG+sLZ8sYYodixyBHBsLKVnGdkJXNAOwkBD6OCfQS
+W2DOZcNLpAb0yzwxk3sS6pMu7a8lqKDTmC6xCjNhdykoKn9r66AdFLZqRtld8S/i
+TwrdRyLokVZU8cfn+g7uOLe6scKYnKh4cff++QHSjDm5elY/Gr3b371N4qtngUl5
+TECiQK7M311nYBpiGnIu3e+IuB3VFET0HTTetQn5o8qTDoq0BOyhgOErQRvy9DmJ
+pKfq3cbMgRORbbJvCuZL3NSEJ8Y05rEKgmabABEBAAE=
+=Gw4I
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 735621095a8..6f9f5eaf6dd 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -50,9 +50,9 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.2.12")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
-        api("com.fasterxml.jackson.core:jackson-core:2.13.4")
-        api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.15.0")
+        api("com.fasterxml.jackson.core:jackson-core:2.15.0")
+        api("com.fasterxml.jackson.core:jackson-databind:2.15.0")
         api("com.fifesoft:rsyntaxtextarea:3.2.0")
         api("com.formdev:svgSalamander:1.1.2.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 95ad60bfefd..02655d07356 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -108,6 +108,10 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.BSD_2_Clause
     }
 
+    overrideLicense("ch.randelshofer:fastdoubleparser") {
+        expectedLicense = SpdxLicense.MIT
+    }
+
     overrideLicense("com.formdev:svgSalamander") {
         // See https://github.com/blackears/svgSalamander/blob/d6b6fe9a8ece7d0e0e7aeb3de82f027a38a6fe25/www/license/license-bsd.txt
         effectiveLicense = SpdxLicense.BSD_3_Clause
diff --git a/src/licenses/licenses/fastdoubleparser/LICENSE b/src/licenses/licenses/fastdoubleparser/LICENSE
new file mode 100644
index 00000000000..49544bf9a85
--- /dev/null
+++ b/src/licenses/licenses/fastdoubleparser/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Werner Randelshofer, Switzerland.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From eec38cc6347320164c115c668ced065d81f1f271 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 09:42:47 +0200
Subject: [PATCH 0339/1037] fix(deps): update dependency org.jsoup:jsoup to
 v1.15.4 (#5835)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6f9f5eaf6dd..4982ae40ebf 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -134,7 +134,7 @@ dependencies {
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")
         api("org.jodd:jodd-props:5.0.13")
-        api("org.jsoup:jsoup:1.15.3")
+        api("org.jsoup:jsoup:1.15.4")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.6")

From b867533713bbacbb782fbc96a09d33381321b3a4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 09:43:00 +0200
Subject: [PATCH 0340/1037] fix(deps): update dependency
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.6.4 (#5834)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4982ae40ebf..eb6b0a3683f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From 08e3bf1ea7608ccfbba09b4e693f3e4aa922c202 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 09:43:14 +0200
Subject: [PATCH 0341/1037] fix(deps): update dependency
 org.freemarker:freemarker to v2.3.32 (#5833)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index eb6b0a3683f..fa90dd1ad82 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -124,7 +124,7 @@ dependencies {
         api("org.bouncycastle:bcprov-jdk15on:1.70")
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
-        api("org.freemarker:freemarker:2.3.31")
+        api("org.freemarker:freemarker:2.3.32")
         api("org.hamcrest:hamcrest:2.2")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")

From 68fce9a2dd14f3ca93c91b1cf74f78d19ac26bd9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 11:23:38 +0300
Subject: [PATCH 0342/1037] chore: remove licenses of unused dependencies

xpp3_min has been replaced with mxparser
checker-qual not includes the license
jxlayer is no longer used after one of darklaf updates
---
 src/licenses/build.gradle.kts                 |  30 ++---
 src/licenses/licenses/checker-qual/LICENSE    |  20 ---
 src/licenses/licenses/jxlayer/LICENSE         |  28 -----
 .../licenses/xpp3_min-1.1.4c/CC0-1.0.txt      | 119 ------------------
 .../licenses/xpp3_min-1.1.4c/LICENSE.txt      |  46 -------
 5 files changed, 13 insertions(+), 230 deletions(-)
 delete mode 100644 src/licenses/licenses/checker-qual/LICENSE
 delete mode 100644 src/licenses/licenses/jxlayer/LICENSE
 delete mode 100644 src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt
 delete mode 100644 src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt

diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 02655d07356..9bcd571eec8 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -117,11 +117,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         effectiveLicense = SpdxLicense.BSD_3_Clause
     }
 
-    overrideLicense("org.swinglabs:jxlayer") {
-        // See https://repo1.maven.org/maven2/org/swinglabs/jxlayer/3.0.4/jxlayer-3.0.4-sources.jar
-        effectiveLicense = SpdxLicense.BSD_3_Clause
-    }
-
     for (mig in listOf("com.miglayout:miglayout-core", "com.miglayout:miglayout-swing")) {
         overrideLicense(mig) {
             expectedLicense = SimpleLicense("BSD", uri("http://www.debian.org/misc/bsd.license"))
@@ -137,21 +132,20 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         }
     }
 
-    overrideLicense("xpp3:xpp3_min:1.1.4c") {
-        // pom.xml contains multiple licenses
-        expectedLicense = SpdxLicense.CC0_1_0 and
+    overrideLicense("org.reactivestreams:reactive-streams") {
+        expectedLicense =
             SimpleLicense(
-                "Indiana University Extreme! Lab Software License, vesion 1.1.1",
-                uri("http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt")
+                "CC0",
+                uri("http://creativecommons.org/publicdomain/zero/1.0/")
             )
-        effectiveLicense = SpdxLicense.CC0_1_0 and ExtraLicense.Indiana_University_1_1_1
+        effectiveLicense = SpdxLicense.CC0_1_0
     }
 
     overrideLicense("org.brotli:dec:0.1.2") {
         expectedLicense = SpdxLicense.MIT
     }
 
-    overrideLicense("org.slf4j:slf4j-api:1.7.30") {
+    overrideLicense("org.slf4j:slf4j-api") {
         expectedLicense = SpdxLicense.MIT
     }
 
@@ -181,10 +175,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SimpleLicense("Java HTML Tidy License", uri("http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95"))
         effectiveLicense = SpdxLicense.BSD_3_Clause
     }
-    // https://github.com/typetools/checker-framework/issues/2798
-    overrideLicense("org.checkerframework:checker-qual:2.10.0") {
-        expectedLicense = SpdxLicense.MIT
-    }
 }
 
 val renderLicenseForSource by tasks.registering(Apache2LicenseRenderer::class) {
@@ -202,7 +192,13 @@ val renderLicenseForBinary by tasks.registering(Apache2LicenseRenderer::class) {
     artifactType.set(ArtifactType.BINARY)
     metadata.from(gatherSourceLicenses)
     metadata.from(gatherBinaryLicenses)
-    licenseCategory.put(ExtraLicense.Indiana_University_1_1_1.asExpression(), AsfLicenseCategory.A)
+    licenseCategory.put(
+        SimpleLicense(
+            "Indiana University Extreme! Lab Software License",
+            uri("https://raw.githubusercontent.com/x-stream/mxparser/master/LICENSE.txt")
+        ).expression,
+        AsfLicenseCategory.A
+    )
 }
 
 tasks.build.configure {
diff --git a/src/licenses/licenses/checker-qual/LICENSE b/src/licenses/licenses/checker-qual/LICENSE
deleted file mode 100644
index 5a4b90e2da8..00000000000
--- a/src/licenses/licenses/checker-qual/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The Checker Framework
-Copyright 2004-present by the Checker Framework developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/src/licenses/licenses/jxlayer/LICENSE b/src/licenses/licenses/jxlayer/LICENSE
deleted file mode 100644
index 64c6a33430c..00000000000
--- a/src/licenses/licenses/jxlayer/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2006-2008, Alexander Potochkin
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-  * Neither the name of the JXLayer project nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt b/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt
deleted file mode 100644
index a343ccd4335..00000000000
--- a/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
-AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
-OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
-OR WORKS PROVIDED HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer exclusive
-Copyright and Related Rights (defined below) upon the creator and subsequent
-owner(s) (each and all, an "owner") of an original work of authorship and/or
-a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later claims
-of infringement build upon, modify, incorporate in other works, reuse and
-redistribute as freely as possible in any form whatsoever and for any purposes,
-including without limitation commercial purposes. These owners may contribute
-to the Commons to promote the ideal of a free culture and the further production
-of creative, cultural and scientific works, or to gain reputation or greater
-distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with
-a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or
-her Copyright and Related Rights in the Work and the meaning and intended
-legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be protected
-by copyright and related or neighboring rights ("Copyright and Related Rights").
-Copyright and Related Rights include, but are not limited to, the following:
-
-i. the right to reproduce, adapt, distribute, perform, display, communicate,
-and translate a Work;
-
-      ii. moral rights retained by the original author(s) and/or performer(s);
-
-iii. publicity and privacy rights pertaining to a person's image or likeness
-depicted in a Work;
-
-iv. rights protecting against unfair competition in regards to a Work, subject
-to the limitations in paragraph 4(a), below;
-
-v. rights protecting the extraction, dissemination, use and reuse of data
-in a Work;
-
-vi. database rights (such as those arising under Directive 96/9/EC of the
-European Parliament and of the Council of 11 March 1996 on the legal protection
-of databases, and under any national implementation thereof, including any
-amended or successor version of such directive); and
-
-vii. other similar, equivalent or corresponding rights throughout the world
-based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time extensions),
-(iii) in any current or future medium and for any number of copies, and (iv)
-for any purpose whatsoever, including without limitation commercial, advertising
-or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
-benefit of each member of the public at large and to the detriment of Affirmer's
-heirs and successors, fully intending that such Waiver shall not be subject
-to revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account Affirmer's
-express Statement of Purpose. In addition, to the extent the Waiver is so
-judged Affirmer hereby grants to each affected person a royalty-free, non
-transferable, non sublicensable, non exclusive, irrevocable and unconditional
-license to exercise Affirmer's Copyright and Related Rights in the Work (i)
-in all territories worldwide, (ii) for the maximum duration provided by applicable
-law or treaty (including future time extensions), (iii) in any current or
-future medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional purposes
-(the "License"). The License shall be deemed effective as of the date CC0
-was applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder of
-the License, and in such case Affirmer hereby affirms that he or she will
-not (i) exercise any of his or her remaining Copyright and Related Rights
-in the Work or (ii) assert any associated claims and causes of action with
-respect to the Work, in either case contrary to Affirmer's express Statement
-of Purpose.
-
-   4. Limitations and Disclaimers.
-
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
-licensed or otherwise affected by this document.
-
-b. Affirmer offers the Work as-is and makes no representations or warranties
-of any kind concerning the Work, express, implied, statutory or otherwise,
-including without limitation warranties of title, merchantability, fitness
-for a particular purpose, non infringement, or the absence of latent or other
-defects, accuracy, or the present or absence of errors, whether or not discoverable,
-all to the greatest extent permissible under applicable law.
-
-c. Affirmer disclaims responsibility for clearing rights of other persons
-that may apply to the Work or any use thereof, including without limitation
-any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
-responsibility for obtaining any necessary consents, permissions or other
-rights required for any use of the Work.
-
-d. Affirmer understands and acknowledges that Creative Commons is not a party
-to this document and has no duty or obligation with respect to this CC0 or
-use of the Work.
diff --git a/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt b/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt
deleted file mode 100644
index 4cc7224e817..00000000000
--- a/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, 
-   must include the following acknowledgment:
-
-  "This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself, 
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
-must not be used to endorse or promote products derived from this 
-software without prior written permission. For written permission, 
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy" 
-name nor may "Indiana Univeristy" appear in their name, without prior 
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 2588c54871e1ee4cebfb2c672ee4785a5bc29849 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 10:24:40 +0200
Subject: [PATCH 0343/1037] fix(deps): update dependency org.ow2.asm:asm to
 v9.5 (#5837)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index fa90dd1ad82..0ef7970d8a0 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("org.apache.tika:tika-parsers:1.28.5")
-        api("org.ow2.asm:asm:9.3")
+        api("org.ow2.asm:asm:9.5")
 
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.4")

From f5a4f1d19d0c22a0a7926faa9155be87598d2de1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 07:44:35 +0000
Subject: [PATCH 0344/1037] chore: prepare checksums and dependencies for
 upgrading jodd

The dependency oon jodd-log should be removed once we upgrade to jodd 6
---
 checksum.xml                       | 7 +++++++
 src/protocol/http/build.gradle.kts | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/checksum.xml b/checksum.xml
index 54427135063..59eef4ec10a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -6,6 +6,7 @@
   </ignored-keys>
   <trusted-keys>
     <trusted-key id='07dbc3c1ab1f4468471656061c8d5ef0df2b70d4' group='cglib' />
+    <trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='ch.qos.logback' />
     <trusted-key id='6ead752b3e2b38e8e2236d7ba9321edaa5cb3202' group='ch.randelshofer' />
     <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
     <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
@@ -284,9 +285,15 @@
     <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.0'>
       <sha512>1D66B1C76711E0F48800BA1EDFAABC0763A21FC0D4145DED508C8D9DCA0EDF5A61A791E58985578C25861435F5BFB4EFD5E0648A8D0E85A30CDFB01AD1559C6B</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.3'>
+      <sha512>A3E69E3B8416E71842921D439A45BCE30BD00043E17923B5071A298C79F4914B1CB1FAA8DAA779CBC234B576AA54A3DE4D816C2BD7E4C2712A119C357027C2B9</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.1'>
       <sha512>44A5D6F34DB9A4BAE1C11CA10563F3A25F1C6A8F681ABD31C530C7D36C9B001AB6F345F0AB5E2AFD94AD5AB436C06D12D7B1AD9EB7F12DB3EF9487D692107921</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.4'>
+      <sha512>626213318BD0605586FC693969765FAE3BB15D2BCBBACB597C6E32AA1BDEF6430980480B6732556FCD93DE1E6BA99F9E050141AD59259AAE386D8D05A3C44C27</sha512>
+    </dependency>
     <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
       <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
     </dependency>
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index dc46d47f6de..e5e2c563130 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -46,6 +46,9 @@ dependencies {
         because("StringEscapeUtils")
     }
     implementation("org.jodd:jodd-lagarto")
+    implementation("org.jodd:jodd-log") {
+        because("jodd-lagarto 5 still uses custom jodd-log so we configure it to use slf4j")
+    }
     implementation("org.jsoup:jsoup")
     implementation("oro:oro")
     implementation("org.apache.commons:commons-collections4")

From 8f77b9c16e9d910d9ba99eb438e5cb7a43643686 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 11:21:59 +0200
Subject: [PATCH 0345/1037] fix(deps): update dependency cglib:cglib-nodep to
 v3.3.0 (#5842)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 0ef7970d8a0..8465d23eb46 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
         api("org.springframework:spring-beans:4.3.17.RELEASE")
 
         api("bsf:bsf:2.4.0")
-        api("cglib:cglib-nodep:3.2.12")
+        api("cglib:cglib-nodep:3.3.0")
         api("com.fasterxml.jackson.core:jackson-annotations:2.15.0")
         api("com.fasterxml.jackson.core:jackson-core:2.15.0")
         api("com.fasterxml.jackson.core:jackson-databind:2.15.0")

From e79c16a62bb822d982fb2981284765d469b60065 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 11:22:40 +0200
Subject: [PATCH 0346/1037] fix(deps): update dependency
 org.apache.rat:apache-rat to v0.15 (#5844)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 8465d23eb46..4431e865a3a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -114,7 +114,7 @@ dependencies {
         api("org.apache.logging.log4j:log4j-core:2.17.2")
         api("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
         api("org.apache.mina:mina-core:2.1.6")
-        api("org.apache.rat:apache-rat:0.13")
+        api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.velocity:velocity:1.7")
         api("org.apache.xmlgraphics:xmlgraphics-commons:2.7")

From 0739a2678efc4f52690ed11b23fd15133dacc7d2 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 12:34:13 +0200
Subject: [PATCH 0347/1037] fix(deps): update dependency
 org.checkerframework:checker to v3.33.0 (#5846)

---
 .../src/main/kotlin/build-logic.checkerframework.gradle.kts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index deaa45348ba..d1e0adfdd8c 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.31.0"
+        val checkerframeworkVersion = "3.33.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
             // only needed for JDK 8

From 32c6316cd8bc23ba7af2c66b7b1c7c2ea1c3be7d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 12:34:29 +0200
Subject: [PATCH 0348/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v3.14.1 (#5845)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4431e865a3a..5988235a446 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -91,7 +91,7 @@ dependencies {
         api("net.minidev:json-smart:2.4.8")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.3")
-        api("nl.jqno.equalsverifier:equalsverifier:3.10")
+        api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")

From 039712cb8660b05c412eb85f97a4f9a2126ae9c1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 15:03:34 +0300
Subject: [PATCH 0349/1037] Revert "fix(deps): update
 com.fasterxml.jackson.core to v2.15.0"

This reverts commit 8f29799dd5e76ba30011c2c9fb170622b6e81791.
---
 ...ad752b3e2b38e8e2236d7ba9321edaa5cb3202.asc | 21 -------------------
 .../02/a9321edaa5cb3202.fingerprints          |  1 -
 .../5b/d36db5c489baac5b.fingerprints          |  1 -
 .../91/9f621f1ae6ef2591.fingerprints          |  1 -
 .../be/2bfd7825a8984fbe.fingerprints          |  1 -
 ...2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc | 21 -------------------
 src/bom-thirdparty/build.gradle.kts           |  6 +++---
 src/licenses/build.gradle.kts                 |  4 ----
 .../licenses/fastdoubleparser/LICENSE         | 21 -------------------
 9 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
 delete mode 100644 src/licenses/licenses/fastdoubleparser/LICENSE

diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
deleted file mode 100644
index 055840f5dc9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBoC2ABDACyCWLqqAo9NeThE90hBoYomtgLci5I8+7PxSYeQfzUYjXzZcnh
-6d/zHaeC0zxGhT2LNe5i3p2e36xSeFDobjG2Il/nv+4jFCgbn3TZ2hEingPuPsg5
-isodOXHBSY9iHPTKInpiu+J79MWP9GVZ6GeOOgQaNSrNN3uDE1w3rukB2SrXGdfT
-/6YZIOtwWZVzc2m9lalPmOAyI4KLI/s37C8Ozfv3c+Bx11WRVzWVpBTo94fU4DPu
-Yzkx2Wxuc4TT5k6bQJI/GHi36M7xkUauXhkRCNvBz+LFVcFjtsv6S37L6RZib6mz
-jZTW+iyD4h66gqzg3hSRxv4YzHgR/Os26Br2ioZNzH6hJFtNktR4oN/2kydmj5Od
-WYjvdMmd/dMbZheZE3f8sziUKCyvWMIddnHAM81uDTXgWcMgYSa3npOGZhfk41z+
-w9o2f1kXIfdurqlA1n8np07PLw5Rfpjvbs7EZxPTJwcc1enaNyL64fb+YIUtFrcW
-Dt1zUMEDkbcZL1UAEQEAAbkBjQRgaAtgAQwA9dZFGqc0/6pUKDUsT+2hMh0z5mIS
-Lc+x6v4wbAqiEcBE9uoKf0LniRfVeehmuJpiUPgOf3TyxNbxeWiFuJELZbnrYztA
-eRE66Zxk6i2Mv+207fdlj3mhphdEWh4f/0AJa2PAmiwlcxq1O3VJ/Wfn3huCqIU5
-cmqnmGKH9LPaW1aJBxWl9+x6mmPVySxpTaQRrnNnumZf9K5lwGEsccvpkLP7J1Nl
-v7HLO8oliPCInEMcsrVqfiKU/bybxNW1wzPJxp8LNLaCNxuLNl4RCp7tPQuZgjco
-Cnz+JwcxnmNGI+FKqSsFXBZyNTWiQJuaFUQa0QON/+Qj3p+OyW15f+FfLjHI/BkN
-Ai4ncNeeazAwuLCMJGMS+dLarHMbbAKLaH0UI062ch3Aq2Sa3io1gU6vYHvoKNMN
-fYdNwoGX85EkzX6A9fm9jBviios1RLkpfO70MoxpWjl/rwHG57GOItWZ7O53ebs6
-HrFPdUYQs0Gz/lj+BaQPwDcMxADfYtGnYMepABEBAAE=
-=xly/
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
deleted file mode 100644
index 41a0108c9e1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
deleted file mode 100644
index 41a0108c9e1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
deleted file mode 100644
index 797d3916135..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
deleted file mode 100644
index 797d3916135..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
deleted file mode 100644
index f0a6e3b5122..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGI0UjABDAC98lMPbj3vwHKSwLc8o4oAbOf9PKi/zWxjEYj7KZky4ue9JE7R
-QiaUCY387lWc/fXcq8Wa6/IteqekJBQw2KCrDaKBcAXLjnvO93q51ecc7Eo5U1w9
-xJj31YDQOR7R5XY2x2nvSSgk5CmV3czajM3ZeRYHoVqsqp6QwhjDllp+EaPJRtuS
-Fk5mWk8e//iZcZa6GK5wFEtrZMCSjjofaeE5wrsatguhrXwbtDshbN7oW48vK5Kv
-zM+zpwjLUu3gsvydyV4TPhl0Z5gzHef1GYe88WM5dus+/A8yED8BUJ7I6OkJKNbN
-ivC5aJg3BGvLZQiLCsOLZCYIcJt3ADYBgMVwHLSLmCoNym6sS61Rklu5Ig5Ax1eh
-X1aGL06v2B5oM+pHhEvl22iXIi+AQJYXYR8Lg1MBJzEz+aCaX+h46u+GcjEt0EV+
-WGzvQgBcA5qwEvbSKewu4fG/5SuyEk53ZXHwIJHC11kFQ9SPExPnqIdHHIMFjDj2
-8OG1WtLMdGzxMCkAEQEAAbkBjQRiNFIwAQwAqL0vVX+5uzucp6vQitUmOuEyiS0S
-Wz2wldKVJXKABnNKSP7Irq0pF0FbfvEne8pRGz35NVcAi7KPYwnbXtX43tmUJsO8
-w0Yti/eKBJOzPq5bxLvMabKTLaO3y/NLmRuxCBwre1zkdQGMK21O0TdGu0bxJK6Y
-EJKx/8cX+8f8WiVIlcN7IXlTgkeyz4CohaQfJibuPi0YSYmbhnjIuS8m6S/aMduC
-vAimqzIMk9rgRcbs27JafreWG+sLZ8sYYodixyBHBsLKVnGdkJXNAOwkBD6OCfQS
-W2DOZcNLpAb0yzwxk3sS6pMu7a8lqKDTmC6xCjNhdykoKn9r66AdFLZqRtld8S/i
-TwrdRyLokVZU8cfn+g7uOLe6scKYnKh4cff++QHSjDm5elY/Gr3b371N4qtngUl5
-TECiQK7M311nYBpiGnIu3e+IuB3VFET0HTTetQn5o8qTDoq0BOyhgOErQRvy9DmJ
-pKfq3cbMgRORbbJvCuZL3NSEJ8Y05rEKgmabABEBAAE=
-=Gw4I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5988235a446..8fbcf576543 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -50,9 +50,9 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.15.0")
-        api("com.fasterxml.jackson.core:jackson-core:2.15.0")
-        api("com.fasterxml.jackson.core:jackson-databind:2.15.0")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
+        api("com.fasterxml.jackson.core:jackson-core:2.13.4")
+        api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
         api("com.fifesoft:rsyntaxtextarea:3.2.0")
         api("com.formdev:svgSalamander:1.1.2.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 9bcd571eec8..67077458097 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -108,10 +108,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.BSD_2_Clause
     }
 
-    overrideLicense("ch.randelshofer:fastdoubleparser") {
-        expectedLicense = SpdxLicense.MIT
-    }
-
     overrideLicense("com.formdev:svgSalamander") {
         // See https://github.com/blackears/svgSalamander/blob/d6b6fe9a8ece7d0e0e7aeb3de82f027a38a6fe25/www/license/license-bsd.txt
         effectiveLicense = SpdxLicense.BSD_3_Clause
diff --git a/src/licenses/licenses/fastdoubleparser/LICENSE b/src/licenses/licenses/fastdoubleparser/LICENSE
deleted file mode 100644
index 49544bf9a85..00000000000
--- a/src/licenses/licenses/fastdoubleparser/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Werner Randelshofer, Switzerland.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

From dba4383af6e9094b7190f9bd453e37256f5558a2 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 14:10:06 +0200
Subject: [PATCH 0350/1037] fix(deps): update dependency
 org.objenesis:objenesis to v3.3 (#5849)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 8fbcf576543..eb3f7cdadfe 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -138,7 +138,7 @@ dependencies {
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.6")
-        api("org.objenesis:objenesis:3.2")
+        api("org.objenesis:objenesis:3.3")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("org.spockframework:spock-core:2.2-groovy-3.0")

From d50c11e8ec1bb2202f6660fe3a4ab1359e30ea0f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 19:59:34 +0300
Subject: [PATCH 0351/1037] chore: create separate BOM for dependencies used in
 tests

Moving test versions for testing dependencies to a separate BOM
would make it slightly easier for the consumers to work with regular JMeter dependencies.

In other words, JMeter should not require a specific JUnit 5 version,
so JUnit5 should not be a part of the regular dependencies.
---
 .../main/kotlin/build-logic.java.gradle.kts   |  3 ++
 settings.gradle.kts                           |  1 +
 src/bom-testing/build.gradle.kts              | 51 +++++++++++++++++++
 src/bom-thirdparty/build.gradle.kts           | 13 +----
 src/testkit-wiremock/build.gradle.kts         |  1 +
 5 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 src/bom-testing/build.gradle.kts

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index b202a26b95c..807ef91b07c 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -45,6 +45,9 @@ dependencies {
     findProject(":src:bom")?.let {
         api(platform(it))
     }
+    findProject(":src:bom-testing")?.let{
+        testImplementation(platform(it))
+    }
     findProject(":src:bom-thirdparty")?.let{
         api(platform(it))
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 396df665929..fd1b385e727 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,6 +46,7 @@ includeBuild("build-logic")
 
 include(
     "src:bom",
+    "src:bom-testing",
     "src:bom-thirdparty",
     "src:bshclient",
     "src:launcher",
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
new file mode 100644
index 00000000000..7ed0f622835
--- /dev/null
+++ b/src/bom-testing/build.gradle.kts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.java-published-platform")
+}
+
+description = "A collection of versions of third-party libraries used for testing purposes by Apache JMeter"
+
+javaPlatform {
+    allowDependencies()
+}
+
+dependencies {
+    api(platform("org.junit:junit-bom:5.9.3"))
+
+    constraints {
+        // api means "the dependency is for both compilation and runtime"
+        // runtime means "the dependency is only for runtime, not for compilation"
+        // In other words, marking dependency as "runtime" would avoid accidental
+        // dependency on it during compilation
+        // Note: if there's at least single chance for the dependency to be needed on the
+        // compilation classpath (e.g. it is used as a transitive by a third-party library)
+        // then it should be declared as "api" here since we use useCompileClasspathVersions
+        // to make runtime classpath consistent with the compile one.
+        api("com.github.tomakehurst:wiremock-jre8:2.32.0")
+
+        api("junit:junit:4.13.2")
+
+        api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
+        api("org.hamcrest:hamcrest:2.2")
+        api("org.hamcrest:hamcrest-core:2.2")
+        api("org.hamcrest:hamcrest-library:2.2")
+        api("org.objenesis:objenesis:3.3")
+        api("org.spockframework:spock-core:2.2-groovy-3.0")
+    }
+}
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index eb3f7cdadfe..029de3c27a6 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("org.apache.tika:tika-parsers:1.28.5")
         api("org.ow2.asm:asm:9.5")
 
         // activemq-all should not be used as it provides secondary slf4j binding
@@ -56,7 +55,6 @@ dependencies {
         api("com.fifesoft:rsyntaxtextarea:3.2.0")
         api("com.formdev:svgSalamander:1.1.2.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
-        api("com.github.tomakehurst:wiremock-jre8:2.32.0")
         api("com.github.weisj:darklaf-core:2.7.3")
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.github.weisj:darklaf-property-loader:2.7.3")
@@ -84,14 +82,10 @@ dependencies {
         api("org.jetbrains:annotations:23.0.0")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
-        api("org.junit.jupiter:junit-jupiter:5.9.3")
-        api("org.junit.jupiter:junit-jupiter-api:5.9.3")
-        api("org.junit.jupiter:junit-jupiter-params:5.9.3")
         api("net.minidev:accessors-smart:2.4.8")
         api("net.minidev:json-smart:2.4.8")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.3")
-        api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")
@@ -116,6 +110,7 @@ dependencies {
         api("org.apache.mina:mina-core:2.1.6")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
+        api("org.apache.tika:tika-parsers:1.28.5")
         api("org.apache.velocity:velocity:1.7")
         api("org.apache.xmlgraphics:xmlgraphics-commons:2.7")
         api("org.apiguardian:apiguardian-api:1.1.2")
@@ -125,9 +120,6 @@ dependencies {
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
-        api("org.hamcrest:hamcrest:2.2")
-        api("org.hamcrest:hamcrest-core:2.2")
-        api("org.hamcrest:hamcrest-library:2.2")
         api("org.hsqldb:hsqldb:2.5.2")
         api("org.jdom:jdom:1.1.3")
         api("org.jodd:jodd-core:5.0.13")
@@ -138,16 +130,13 @@ dependencies {
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.6")
-        api("org.objenesis:objenesis:3.3")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
-        api("org.spockframework:spock-core:2.2-groovy-3.0")
         api("oro:oro:2.0.8")
         api("xalan:serializer:2.7.2")
         api("xalan:xalan:2.7.2")
         api("xerces:xercesImpl:2.12.2")
         api("xml-apis:xml-apis:1.4.01")
         api("xmlpull:xmlpull:1.1.3.1")
-        api("xpp3:xpp3_min:1.1.4c")
     }
 }
diff --git a/src/testkit-wiremock/build.gradle.kts b/src/testkit-wiremock/build.gradle.kts
index 9f877c6988c..0aa354d375a 100644
--- a/src/testkit-wiremock/build.gradle.kts
+++ b/src/testkit-wiremock/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
 }
 
 dependencies {
+    api(platform(projects.src.bomTesting))
     api("com.github.tomakehurst:wiremock-jre8")
     api("org.junit.jupiter:junit-jupiter-api")
 }

From 5cd92b0d850ed63404ccf59300c98adb517216c7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 11:01:07 +0000
Subject: [PATCH 0352/1037] fix(deps): update dependency
 com.jayway.jsonpath:json-path to v2.8.0

Fixes https://github.com/apache/jmeter/pull/5848
---
 checksum.xml                                  |  1 +
 .../54/cf9f423a7d348254.fingerprints          |  1 +
 .../91/9f621f1ae6ef2591.fingerprints          |  1 +
 .../be/2bfd7825a8984fbe.fingerprints          |  1 +
 ...2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc | 21 +++++++++++++++++++
 ...39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc | 16 ++++++++++++++
 .../ec/f6bc09712c8df6ec.fingerprints          |  1 +
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 8 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 59eef4ec10a..69b801c02ba 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -97,6 +97,7 @@
     <trusted-key id='a7892505cf1a58076453e52d7999befba1039e8b' group='net.bytebuddy' />
     <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
     <trusted-key id='d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071' group='net.javacrumbs.json-unit' />
+    <trusted-key id='2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec' group='net.minidev' />
     <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
     <trusted-key id='4f752a9878e937049ef3fba7d4012dda1f1f0f82' group='net.sf.jtidy' />
     <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='net.sf.saxon' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
new file mode 100644
index 00000000000..c97cfa3ce54
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
@@ -0,0 +1 @@
+2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
new file mode 100644
index 00000000000..797d3916135
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
@@ -0,0 +1 @@
+fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
new file mode 100644
index 00000000000..797d3916135
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
@@ -0,0 +1 @@
+fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
new file mode 100644
index 00000000000..f0a6e3b5122
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGI0UjABDAC98lMPbj3vwHKSwLc8o4oAbOf9PKi/zWxjEYj7KZky4ue9JE7R
+QiaUCY387lWc/fXcq8Wa6/IteqekJBQw2KCrDaKBcAXLjnvO93q51ecc7Eo5U1w9
+xJj31YDQOR7R5XY2x2nvSSgk5CmV3czajM3ZeRYHoVqsqp6QwhjDllp+EaPJRtuS
+Fk5mWk8e//iZcZa6GK5wFEtrZMCSjjofaeE5wrsatguhrXwbtDshbN7oW48vK5Kv
+zM+zpwjLUu3gsvydyV4TPhl0Z5gzHef1GYe88WM5dus+/A8yED8BUJ7I6OkJKNbN
+ivC5aJg3BGvLZQiLCsOLZCYIcJt3ADYBgMVwHLSLmCoNym6sS61Rklu5Ig5Ax1eh
+X1aGL06v2B5oM+pHhEvl22iXIi+AQJYXYR8Lg1MBJzEz+aCaX+h46u+GcjEt0EV+
+WGzvQgBcA5qwEvbSKewu4fG/5SuyEk53ZXHwIJHC11kFQ9SPExPnqIdHHIMFjDj2
+8OG1WtLMdGzxMCkAEQEAAbkBjQRiNFIwAQwAqL0vVX+5uzucp6vQitUmOuEyiS0S
+Wz2wldKVJXKABnNKSP7Irq0pF0FbfvEne8pRGz35NVcAi7KPYwnbXtX43tmUJsO8
+w0Yti/eKBJOzPq5bxLvMabKTLaO3y/NLmRuxCBwre1zkdQGMK21O0TdGu0bxJK6Y
+EJKx/8cX+8f8WiVIlcN7IXlTgkeyz4CohaQfJibuPi0YSYmbhnjIuS8m6S/aMduC
+vAimqzIMk9rgRcbs27JafreWG+sLZ8sYYodixyBHBsLKVnGdkJXNAOwkBD6OCfQS
+W2DOZcNLpAb0yzwxk3sS6pMu7a8lqKDTmC6xCjNhdykoKn9r66AdFLZqRtld8S/i
+TwrdRyLokVZU8cfn+g7uOLe6scKYnKh4cff++QHSjDm5elY/Gr3b371N4qtngUl5
+TECiQK7M311nYBpiGnIu3e+IuB3VFET0HTTetQn5o8qTDoq0BOyhgOErQRvy9DmJ
+pKfq3cbMgRORbbJvCuZL3NSEJ8Y05rEKgmabABEBAAE=
+=Gw4I
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
new file mode 100644
index 00000000000..67aadd287fd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE3go9oBCADHAkyReHbL6qVMzoEGSF+eqLswZmJNBZylIgMd83964tzT7i3X
+aUIouf7nHL6n14AHNxDKhs1FFq+/EFYN9Jfdw+uFauoeUGIvXXRxaem4yCjzkyNm
+VrfUlVV5AT9hSeN3+/PtlI9BT1zkK2ISQVad2lrFvyOxkHEnPzyAouCsXBd9aPcG
+9hmQ+6hZeJjXd/uQVxYP1DHg/G78zuXS/4u/3QJi1gSEe5IQilz8cmbGYyioi1WI
+cZFXayLBk3XQCEY4cejtGygk7j4kHSefV2Sfq+KynXRoUkOiE00GhbQrYYvQAm/G
+HZZV1eq23dUXXJo+nb/yI5o60uEELh5l0OpTABEBAAG5AQ0ETeCj2gEIAM/0YtIp
+nm4E21tXYmDNsq0/yaLs15qfUzQzawE+9stwxPt/cYlGNzmBahBm3YPCel1+ed88
+FAsn+vpvX89MsqI7cE5T/UapA7yRRYdnFVvAMPsOd5XXl/Rw3CH0ZkXAjJAmxgOO
+XF1ISLNVUOXjHktWrxx5+kDSkxw+2dU/zeOPJtSthCAMydvc89rwqybk7lHXjq2H
+7f+tENLOUX+3hWwuvrf41pJoG1oKPP/cUqk0a++bbozKxvj1QVnIQ4VB9sDgG/FV
+RJMAqM7hgeFLDrZgG4qeYzrzmYbNWfBHpaSeH7KyU5xYrbhFBacJPmN1zZB6uAgX
+MyMCcceijXfLkSEAEQEAAQ==
+=et1a
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints
new file mode 100644
index 00000000000..c97cfa3ce54
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints
@@ -0,0 +1 @@
+2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 029de3c27a6..499797339ea 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
         api("com.helger.commons:ph-commons:10.1.6")
         api("com.helger:ph-css:6.5.0")
-        api("com.jayway.jsonpath:json-path:2.7.0")
+        api("com.jayway.jsonpath:json-path:2.8.0")
         api("com.miglayout:miglayout-core:5.3")
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")

From 9ef39793817c92aec2c5c465f4fd14c454462c30 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 19:05:25 +0200
Subject: [PATCH 0353/1037] fix(deps): update dependency
 com.fifesoft:rsyntaxtextarea to v3.3.3 (#5847)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 499797339ea..cc43a6dfffc 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
         api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
         api("com.fasterxml.jackson.core:jackson-core:2.13.4")
         api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
-        api("com.fifesoft:rsyntaxtextarea:3.2.0")
+        api("com.fifesoft:rsyntaxtextarea:3.3.3")
         api("com.formdev:svgSalamander:1.1.2.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:2.7.3")

From 25b5f86d9637b40a6d90133512b59595fce9ef9d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 17:06:19 +0000
Subject: [PATCH 0354/1037] fix(deps): update dependency
 com.formdev:svgsalamander to v1.1.4

Fixes https://github.com/apache/jmeter/pull/5839
---
 checksum.xml                                           |  1 +
 .../51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc    | 10 ++++++++++
 .../cached-pgp-keys/51/b7e2662a7640a051.fingerprints   |  1 +
 src/bom-thirdparty/build.gradle.kts                    |  2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 69b801c02ba..9a59e418a44 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -15,6 +15,7 @@
     <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.module' />
     <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
     <trusted-key id='58f086abb0ede8f7a04b76c34c00043bec5cb7cb' group='com.fifesoft' />
+    <trusted-key id='4ac55a85d30c3499a3219500b7e2662a7640a051' group='com.formdev' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='com.formdev' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='635ee627345f3c1dd422b2e207d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
new file mode 100644
index 00000000000..790d21bd4da
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
@@ -0,0 +1,10 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGAeuPoBCADxjHFyVx9TT2s1eAeER5qcIxQfh1sR8CFcDyPQ7FsoSA0Qt8di
+3o23mEv2aP4OfezmY0eNchW0TXp2wqyuA5V0cE8RrM24dJ5p3X4PcRyVcO5KdJFk
+KfN8a0U4xwLP3A9kMQCJr84CFGqWr+EewU3MckrSJdHfOpnfge8P0yglTtKsuq6x
+ECPovrrAjEpkQ4WacgtL/4RNXVBKOSWq1inFQBE6UjRuakVkPuye586VfBtAwoAi
+9rghZGvGuUaJ/qs0/WDX+DbLd1R/Kh0Hdh5uaAwLjcl2DOvaJApfR4vkRPsZ5ZPF
+jxPbVvBBrDCWjPOZlXwhrX7EwJJoLZYZt4K3ABEBAAE=
+=mps2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints
new file mode 100644
index 00000000000..2b1d5b65bf8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints
@@ -0,0 +1 @@
+4ac55a85d30c3499a3219500b7e2662a7640a051
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index cc43a6dfffc..daa0da140c4 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
         api("com.fasterxml.jackson.core:jackson-core:2.13.4")
         api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
         api("com.fifesoft:rsyntaxtextarea:3.3.3")
-        api("com.formdev:svgSalamander:1.1.2.4")
+        api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:2.7.3")
         api("com.github.weisj:darklaf-theme:2.7.3")

From 2228e176dfca60af6e818a3528e97767164b09e3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 17:01:47 +0000
Subject: [PATCH 0355/1037] fix(deps): update dependency
 com.github.tomakehurst:wiremock-jre8 to v2.35.0

Fixes https://github.com/apache/jmeter/pull/5843
---
 checksum.xml                                               | 3 +++
 .../cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints       | 1 +
 .../18/3f999bb69041cf17e73bb1cec038787776a19d18.asc        | 7 +++++++
 .../cached-pgp-keys/18/c038787776a19d18.fingerprints       | 1 +
 src/bom-testing/build.gradle.kts                           | 2 +-
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 9a59e418a44..a9efaab334c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -97,6 +97,7 @@
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
     <trusted-key id='a7892505cf1a58076453e52d7999befba1039e8b' group='net.bytebuddy' />
     <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
+    <trusted-key id='3f999bb69041cf17e73bb1cec038787776a19d18' group='net.javacrumbs.json-unit' />
     <trusted-key id='d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071' group='net.javacrumbs.json-unit' />
     <trusted-key id='2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec' group='net.minidev' />
     <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
@@ -141,7 +142,9 @@
     <trusted-key id='8f9a3c6d105b9f57844a721d79e193516be7998f' group='org.dom4j' />
     <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
     <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty' />
+    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.eclipse.jetty' />
     <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty.http2' />
+    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.eclipse.jetty.http2' />
     <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
     <trusted-key id='1def9646901a1652e5b3e5ea694db6f419c8d1fd' group='org.exparity' />
     <trusted-key id='13ac2213964abe1d1c147c0e1939a2520bab1d90' group='org.freemarker' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
new file mode 100644
index 00000000000..c030578a397
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
@@ -0,0 +1 @@
+3f999bb69041cf17e73bb1cec038787776a19d18
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
new file mode 100644
index 00000000000..938204c788a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYg6Q3hYJKwYBBAHaRw8BAQdAmBUXcViWvUiXZezA2ukBqads/J5xG0Hzxa7b
+LfCaz6W4OARiDpDeEgorBgEEAZdVAQUBAQdAnHuAssKZBLKrqg+cWduQ2B395Sbx
++/2KAQZI8clMkmkDAQgH
+=cvFE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints
new file mode 100644
index 00000000000..c030578a397
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints
@@ -0,0 +1 @@
+3f999bb69041cf17e73bb1cec038787776a19d18
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 7ed0f622835..eb0702f7bc3 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("com.github.tomakehurst:wiremock-jre8:2.32.0")
+        api("com.github.tomakehurst:wiremock-jre8:2.35.0")
 
         api("junit:junit:4.13.2")
 

From 97d46f7150913ae2d0992704882d744f348236b9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 19:33:34 +0200
Subject: [PATCH 0356/1037] fix(deps): update dependency net.minidev:json-smart
 to v2.4.10 (#5841)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index daa0da140c4..14b6f2553a7 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -83,7 +83,7 @@ dependencies {
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
         api("net.minidev:accessors-smart:2.4.8")
-        api("net.minidev:json-smart:2.4.8")
+        api("net.minidev:json-smart:2.4.10")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.3")
         api("org.apache-extras.beanshell:bsh:2.0b6")

From a9feb21636e2ddb6841146330907f5a0c1fa279f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 20:42:57 +0300
Subject: [PATCH 0357/1037] fix(deps): update org.jodd to 5.1.5

For jodd 5.x, all the versions should be aligned

Fixes https://github.com/apache/jmeter/pull/5838
---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 src/licenses/build.gradle.kts       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 14b6f2553a7..74f7ce99149 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -122,10 +122,10 @@ dependencies {
         api("org.freemarker:freemarker:2.3.32")
         api("org.hsqldb:hsqldb:2.5.2")
         api("org.jdom:jdom:1.1.3")
-        api("org.jodd:jodd-core:5.0.13")
-        api("org.jodd:jodd-lagarto:5.0.13")
-        api("org.jodd:jodd-log:5.0.13")
-        api("org.jodd:jodd-props:5.0.13")
+        api("org.jodd:jodd-core:5.1.5")
+        api("org.jodd:jodd-lagarto:5.1.5")
+        api("org.jodd:jodd-log:5.1.5")
+        api("org.jodd:jodd-props:5.1.5")
         api("org.jsoup:jsoup:1.15.4")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 67077458097..42f19dca5d7 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -122,7 +122,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     }
 
     for (jodd in listOf("jodd-core", "jodd-lagarto", "jodd-log", "jodd-props")) {
-        overrideLicense("org.jodd:$jodd:5.0.13") {
+        overrideLicense("org.jodd:$jodd") {
             expectedLicense = SpdxLicense.BSD_2_Clause // SimpleLicense("The BSD 2-Clause License", uri("http://jodd.org/license.html"))
             licenseFiles = "jodd"
         }

From d05d6161cb5fb4707b37993962f67c826b90fb09 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 20:50:00 +0300
Subject: [PATCH 0358/1037] chore: move more testing-specific constraints to
 bom-testing

---
 renovate.json                       |  4 ++++
 src/bom-testing/build.gradle.kts    | 14 +++++++++++---
 src/bom-thirdparty/build.gradle.kts | 11 -----------
 src/dist-check/build.gradle.kts     |  1 +
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/renovate.json b/renovate.json
index ee93eef6215..ca09f371454 100644
--- a/renovate.json
+++ b/renovate.json
@@ -30,6 +30,10 @@
       "matchPackagePrefixes": ["org.apache.activemq"],
       "groupName": "org.apache.activemq"
     },
+    {
+      "matchPackagePrefixes": ["org.apache.ftpserver"],
+      "groupName": "org.apache.ftpserver"
+    },
     {
       "matchPackagePrefixes": ["org.apache.httpcomponents"],
       "groupName": "org.apache.httpcomponents"
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index eb0702f7bc3..a28f6430877 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -38,14 +38,22 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.0")
-
         api("junit:junit:4.13.2")
-
         api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
-        api("org.hamcrest:hamcrest:2.2")
+        // activemq-all should not be used as it provides secondary slf4j binding
+        api("org.apache.activemq:activemq-broker:5.16.4")
+        api("org.apache.activemq:activemq-client:5.16.4")
+        api("org.apache.activemq:activemq-spring:5.16.4")
+        api("org.apache.ftpserver:ftplet-api:1.2.0")
+        api("org.apache.ftpserver:ftpserver-core:1.2.0")
+        api("org.apache.mina:mina-core:2.1.6")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
+        api("org.hamcrest:hamcrest:2.2")
+        api("org.hsqldb:hsqldb:2.5.2")
         api("org.objenesis:objenesis:3.3")
         api("org.spockframework:spock-core:2.2-groovy-3.0")
+        api("org.springframework:spring-beans:4.3.17.RELEASE")
+        api("org.springframework:spring-context:4.3.17.RELEASE")
     }
 }
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 74f7ce99149..fea5e9c21a0 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -40,13 +40,6 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("org.ow2.asm:asm:9.5")
 
-        // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.4")
-        api("org.apache.activemq:activemq-client:5.16.4")
-        api("org.apache.activemq:activemq-spring:5.16.4")
-        api("org.springframework:spring-context:4.3.17.RELEASE")
-        api("org.springframework:spring-beans:4.3.17.RELEASE")
-
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
         api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
@@ -95,8 +88,6 @@ dependencies {
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.11.1")
         api("org.apache.commons:commons-text:1.10.0")
-        api("org.apache.ftpserver:ftplet-api:1.2.0")
-        api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.13")
@@ -107,7 +98,6 @@ dependencies {
         api("org.apache.logging.log4j:log4j-api:2.17.2")
         api("org.apache.logging.log4j:log4j-core:2.17.2")
         api("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
-        api("org.apache.mina:mina-core:2.1.6")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")
@@ -120,7 +110,6 @@ dependencies {
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
-        api("org.hsqldb:hsqldb:2.5.2")
         api("org.jdom:jdom:1.1.3")
         api("org.jodd:jodd-core:5.1.5")
         api("org.jodd:jodd-lagarto:5.1.5")
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index bbbb688d176..cd146f844d4 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
     }
 
     extraTestDependencies(platform(projects.src.bomThirdparty))
+    extraTestDependencies(platform(projects.src.bomTesting))
     extraTestDependencies("org.hsqldb:hsqldb")
     extraTestDependencies("org.apache.mina:mina-core")
     extraTestDependencies("org.apache.ftpserver:ftplet-api")

From e70c41a444c662b07b894f4def668a61bc63de46 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 19:50:28 +0200
Subject: [PATCH 0359/1037] fix(deps): update dependency
 org.jetbrains:annotations to v23.1.0 (#5853)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index fea5e9c21a0..1d5093c15f6 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -72,7 +72,7 @@ dependencies {
         api("javax.mail:mail:1.5.0-b01")
         api("jcharts:jcharts:0.7.5")
         api("junit:junit:4.13.2")
-        api("org.jetbrains:annotations:23.0.0")
+        api("org.jetbrains:annotations:23.1.0")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
         api("net.minidev:accessors-smart:2.4.8")

From 3188e93fab5cb138203fb43ed104667a081ab398 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 19:50:43 +0200
Subject: [PATCH 0360/1037] fix(deps): update dependency
 org.apache.commons:commons-jexl3 to v3.3 (#5851)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1d5093c15f6..d651a157a1d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -82,7 +82,7 @@ dependencies {
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")
-        api("org.apache.commons:commons-jexl3:3.2.1")
+        api("org.apache.commons:commons-jexl3:3.3")
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.12.0")
         api("org.apache.commons:commons-math3:3.6.1")

From 2fbac3090f456b5999bab4863946909dac39a9a6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 19:51:24 +0200
Subject: [PATCH 0361/1037] fix(deps): update dependency
 org.apache.mina:mina-core to v2.2.1 (#5855)

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index a28f6430877..156b059558e 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -46,7 +46,7 @@ dependencies {
         api("org.apache.activemq:activemq-spring:5.16.4")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
-        api("org.apache.mina:mina-core:2.1.6")
+        api("org.apache.mina:mina-core:2.2.1")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")

From fd35351c516602c7cfcd476085b015da43756efb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 21:03:19 +0300
Subject: [PATCH 0362/1037] chore: exclude dependencies on logging
 implementations when adding dependency on jodd

---
 src/components/build.gradle.kts    | 12 ++++++++++--
 src/protocol/http/build.gradle.kts |  9 ++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 55d9fe70760..6c7c6e316ae 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -51,8 +51,16 @@ dependencies {
     implementation("org.apache.commons:commons-pool2")
     implementation("commons-codec:commons-codec")
     implementation("org.ow2.asm:asm")
-    implementation("org.jodd:jodd-log")
-    implementation("org.jodd:jodd-lagarto")
+    implementation("org.jodd:jodd-log") {
+        exclude("ch.qos.logback")
+        exclude("commons-logging")
+        exclude("org.apache.logging.log4j")
+    }
+    implementation("org.jodd:jodd-lagarto") {
+        exclude("ch.qos.logback")
+        exclude("commons-logging")
+        exclude("org.apache.logging.log4j")
+    }
     implementation("com.jayway.jsonpath:json-path")
     implementation("org.apache.httpcomponents:httpasyncclient")
     implementation("org.apache.httpcomponents:httpcore-nio")
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index e5e2c563130..1d68ed064b7 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -45,9 +45,16 @@ dependencies {
     implementation("org.apache.commons:commons-text") {
         because("StringEscapeUtils")
     }
-    implementation("org.jodd:jodd-lagarto")
+    implementation("org.jodd:jodd-lagarto") {
+        exclude("ch.qos.logback")
+        exclude("commons-logging")
+        exclude("org.apache.logging.log4j")
+    }
     implementation("org.jodd:jodd-log") {
         because("jodd-lagarto 5 still uses custom jodd-log so we configure it to use slf4j")
+        exclude("ch.qos.logback")
+        exclude("commons-logging")
+        exclude("org.apache.logging.log4j")
     }
     implementation("org.jsoup:jsoup")
     implementation("oro:oro")

From bd1f98e27493dd42e08b716034b26940177a4488 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 20:04:37 +0200
Subject: [PATCH 0363/1037] fix(deps): update dependency
 net.minidev:accessors-smart to v2.4.9 (#5840)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d651a157a1d..8e436e4e940 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
         api("org.jetbrains:annotations:23.1.0")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
-        api("net.minidev:accessors-smart:2.4.8")
+        api("net.minidev:accessors-smart:2.4.9")
         api("net.minidev:json-smart:2.4.10")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.3")

From e802b98c2abd84537bd887f4e3cd6c6752cd2b1e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 21:40:37 +0300
Subject: [PATCH 0364/1037] chore: downgrade jodd back to 5.0.13 from 5.1.5
 since there are failing tests

TestHTMLParser.testSpecificParserList fails with jodd 5.1.5
---
 src/bom-thirdparty/build.gradle.kts           |  8 ++--
 .../protocol/http/parser/TestHTMLParser.java  | 37 ++++++-------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 8e436e4e940..a89fcf38a79 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -111,10 +111,10 @@ dependencies {
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
-        api("org.jodd:jodd-core:5.1.5")
-        api("org.jodd:jodd-lagarto:5.1.5")
-        api("org.jodd:jodd-log:5.1.5")
-        api("org.jodd:jodd-props:5.1.5")
+        api("org.jodd:jodd-core:5.0.13")
+        api("org.jodd:jodd-lagarto:5.0.13")
+        api("org.jodd:jodd-log:5.0.13")
+        api("org.jodd:jodd-props:5.0.13")
         api("org.jsoup:jsoup:1.15.4")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 8155eb17965..bcdea11aaa1 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -35,6 +35,11 @@
 import java.util.TreeSet;
 import java.util.Vector;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.junit.JMeterTestCaseJUnit;
@@ -395,38 +400,18 @@ private static void filetest(HTMLParser p, String file, String url, String resul
         } else {
             result = p.getEmbeddedResourceURLs(userAgent, buffer, new URL(url), c,System.getProperty("file.encoding"));
         }
+        List<String> actual = Lists.newArrayList(Iterators.transform(result, Object::toString));
         /*
          * TODO: Exact ordering is only required for some tests; change the
          * comparison to do a set compare where necessary.
          */
-        Iterator<String> expected;
-        if (orderMatters) {
-            expected = getFile(resultFile).iterator();
-        } else {
-            // Convert both to Sets
-            expected = new TreeSet<>(getFile(resultFile)).iterator();
-            TreeSet<URL> temp = new TreeSet<>(new Comparator<Object>() {
-                @Override
-                public int compare(Object o1, Object o2) {
-                    return o1.toString().compareTo(o2.toString());
-                }
-            });
-            while (result.hasNext()) {
-                temp.add(result.next());
-            }
-            result = temp.iterator();
+        List<String> expected = getFile(resultFile);
+        if (!orderMatters) {
+            Collections.sort(expected);
+            Collections.sort(actual);
         }
 
-        while (expected.hasNext()) {
-            Object next = expected.next();
-            assertTrue(userAgent+"::"+fname+"::"+parserName + "::Expecting another result " + next, result.hasNext());
-            try {
-                assertEquals(userAgent+"::"+fname+"::"+parserName + "(next)", next, result.next().toString());
-            } catch (ClassCastException e) {
-                fail(userAgent+"::"+fname+"::"+parserName + "::Expected URL, but got " + e.toString());
-            }
-        }
-        assertFalse(userAgent+"::"+fname+"::"+parserName + "::Should have reached the end of the results", result.hasNext());
+        assertEquals("userAgent=" + userAgent + ", fname=" + fname + ", parserName=" + parserName, expected, actual);
     }
 
     // Get expected results as a List

From f80edc917b2a27637cdb600a719cbcac3f237fca Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 28 Apr 2023 21:49:09 +0300
Subject: [PATCH 0365/1037] style: fix code style in TestHTMLParser

---
 .../jmeter/protocol/http/parser/TestHTMLParser.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index bcdea11aaa1..e47a9a1f946 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -28,18 +28,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.TreeSet;
 import java.util.Vector;
 import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.junit.JMeterTestCaseJUnit;
@@ -49,6 +42,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
 import junit.framework.TestSuite;
 
 public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {

From dec2dd02990d9c35770ec353bef1ab0f36b80557 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 20:52:47 +0200
Subject: [PATCH 0366/1037] fix(deps): update dependency org.hsqldb:hsqldb to
 v2.7.1 (#5856)

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 156b059558e..efca18d15b8 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")
-        api("org.hsqldb:hsqldb:2.5.2")
+        api("org.hsqldb:hsqldb:2.7.1")
         api("org.objenesis:objenesis:3.3")
         api("org.spockframework:spock-core:2.2-groovy-3.0")
         api("org.springframework:spring-beans:4.3.17.RELEASE")

From aeb98ec9075f2e77f4963301e0331070117fbd0f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 21:35:12 +0200
Subject: [PATCH 0367/1037] fix(deps): update org.apache.logging.log4j to
 v2.20.0 (#5859)

---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a89fcf38a79..c3713af1512 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -94,10 +94,10 @@ dependencies {
         api("org.apache.httpcomponents:httpcore-nio:4.4.15")
         api("org.apache.httpcomponents:httpcore:4.4.15")
         api("org.apache.httpcomponents:httpmime:4.5.13")
-        api("org.apache.logging.log4j:log4j-1.2-api:2.17.2")
-        api("org.apache.logging.log4j:log4j-api:2.17.2")
-        api("org.apache.logging.log4j:log4j-core:2.17.2")
-        api("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.20.0")
+        api("org.apache.logging.log4j:log4j-api:2.20.0")
+        api("org.apache.logging.log4j:log4j-core:2.20.0")
+        api("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")

From e7a99a4518a62f998c26ad51f2c6233264f66f51 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 21:35:29 +0200
Subject: [PATCH 0368/1037] fix(deps): update dependency
 org.apache.xmlgraphics:xmlgraphics-commons to v2.8 (#5852)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c3713af1512..087338b1a67 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -102,7 +102,7 @@ dependencies {
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")
         api("org.apache.velocity:velocity:1.7")
-        api("org.apache.xmlgraphics:xmlgraphics-commons:2.7")
+        api("org.apache.xmlgraphics:xmlgraphics-commons:2.8")
         api("org.apiguardian:apiguardian-api:1.1.2")
         api("org.bouncycastle:bcmail-jdk15on:1.70")
         api("org.bouncycastle:bcpkix-jdk15on:1.70")

From a0fc09a555f5c00ffd942bbaa8e38bd8fdd196e5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 09:15:58 +0200
Subject: [PATCH 0369/1037] fix(deps): update org.apache.httpcomponents (#5862)

---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 087338b1a67..a8be7b7d1b2 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -90,10 +90,10 @@ dependencies {
         api("org.apache.commons:commons-text:1.10.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
-        api("org.apache.httpcomponents:httpclient:4.5.13")
-        api("org.apache.httpcomponents:httpcore-nio:4.4.15")
-        api("org.apache.httpcomponents:httpcore:4.4.15")
-        api("org.apache.httpcomponents:httpmime:4.5.13")
+        api("org.apache.httpcomponents:httpclient:4.5.14")
+        api("org.apache.httpcomponents:httpcore-nio:4.4.16")
+        api("org.apache.httpcomponents:httpcore:4.4.16")
+        api("org.apache.httpcomponents:httpmime:4.5.14")
         api("org.apache.logging.log4j:log4j-1.2-api:2.20.0")
         api("org.apache.logging.log4j:log4j-api:2.20.0")
         api("org.apache.logging.log4j:log4j-core:2.20.0")

From 5d29e24f4ba720b8da3d1ef1e6ecf4c991f4fb31 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 18:50:21 +0000
Subject: [PATCH 0370/1037] fix(deps): update org.apache.activemq to v5.18.1

Fixes https://github.com/apache/jmeter/pull/5858
---
 checksum.xml                                  |  3 +++
 .../5f/ae1c126549627b5f.fingerprints          |  1 +
 .../6a/2591ba36fd00e56a.fingerprints          |  1 +
 ...407e95050fb588296690862591ba36fd00e56a.asc | 26 +++++++++++++++++++
 .../be/590c2310cee1c9be.fingerprints          |  1 +
 .../cb/6e97418b04b11dcb.fingerprints          |  1 +
 ...58f9cc982ac877e7b295dd6e97418b04b11dcb.asc | 26 +++++++++++++++++++
 src/bom-testing/build.gradle.kts              |  6 ++---
 8 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc

diff --git a/checksum.xml b/checksum.xml
index a9efaab334c..1dd61c7f858 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -86,8 +86,10 @@
     <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
+    <trusted-key id='a1483f88ba771993ab609c43590c2310cee1c9be' group='jakarta.jms' />
     <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.activation' />
+    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.annotation' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4daded739cdf2cd0e48e0ec44044edf1bb73efea' group='jaxen' />
@@ -129,6 +131,7 @@
     <trusted-key id='184454fad8697760f3e00d2e4a51a45b944ffd51' group='org.apache.tika' />
     <trusted-key id='7b9751fc3f01f134f476464cd0eb627d4885ced1' group='org.apache.velocity' />
     <trusted-key id='82d8419ba697f0e7fb85916ee91287822fdb81b1' group='org.apache.xbean' />
+    <trusted-key id='c758f9cc982ac877e7b295dd6e97418b04b11dcb' group='org.apache.xbean' />
     <trusted-key id='5c9a30ff22b2c02f30261c305b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.apiguardian' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
new file mode 100644
index 00000000000..76717d8305f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
@@ -0,0 +1 @@
+c758f9cc982ac877e7b295dd6e97418b04b11dcb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
new file mode 100644
index 00000000000..f2571636736
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
@@ -0,0 +1 @@
+84407e95050fb588296690862591ba36fd00e56a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
new file mode 100644
index 00000000000..bd7372b0b31
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu1FoEBEADiStAqNqTqBTfohIHsfAA/xERAgmYWOHkXJsxgXJXfjOVyYlIw
+6ysU1cfnT4bgcLnWRP7Eb6r8CFLt9UsmbbDj2ZYKRQ0q8Rs5x3ZUDJLnalfV55K2
+MZ7uer1Jq0ws0UqgfqsXhOnfWwzkHf58Ii778dQ7buRsgkH9tBIkodsK47gqxOFe
+QuOx42/RFhXD42OymayMN/jTR9ZhbmdxAmhON/bepC4mbyhFX3QOqGyahLLr9Xeg
+d/AgJidXPWN/6qxjQos8dS9yjf6prS3oyIprzaSP2EImSaMZNUHx+nEEsPmRoCQG
+MDF7XSUGzVQ7HAEe9Njkes3uyJaArcv57O6/Wn5HVc7s/XhKaq8KbHaJNv6j7cwj
+YsabJur+rl0aN30sGOhyICxKa40kdu+79NdPFumZnaysBB5dAjeLre3yH6rqxdOT
+InMsOs12HszW5Ix8LW0Vd4wQc6ay3QF75Vu7QEWlMrKVrru60jP4SsWOyi3hbRtM
+u9L5kaooizQ7fIT1KZ/eQLYD/RLK23vZ8vb9ByMZ+gxU+Ti93JPl24ve4BIuxPdW
+J47ZCTMIY1Z0MgIOOOwQHyVMI2rbjItyulDihaJL/Bn1xAyEksSS+yic0Ps/dbK8
+9rtvxilEBfWTZ6avbFqkWYtG9ZRcSkl+xlYRGTjY1bOBPTGjT8elscs+IwARAQAB
+uQINBFu1FoQBEADmO0nzACp8oIH0LHsswMtP6A+9knm+/cqJEfFMJuN/Dfk1BnEN
+V+IA8t7ODMQycY47qz6aMFqEUdOXpF4+5NCtfsdc5Sj3PvgnAzZUUssdeuKcZt2S
+A/ptVfqqRD3b1eYECKJaI0ztcp6CjWwcLjBcyRp2tffXjvnowPwInl0NtR3iBxAF
+VwaScCQuXGi0z/GcHyt/rZA4OWTJTdKnXrcYPqM5sh/bhwyPXxhOx2/YuiPkngHu
+c2qGElBG9cF3j68q1h8NF+24LEMYuSs7X4vcxNg13fGLSJy14siT2AbhBPKEK9pN
+HFP7RiuFJyyseqkrvVZP2cY9dJYsBqvXnlYW7L7MsLwNyq+v0LGCpjTzQo6kfNpw
+GXs2KUp4qJswmESRB0fYgPonr+3lUHxt1o2KWKtvGTBNcu1d+q+pNPtyLK4zwR9i
+mQbS7/hhyV2gZM4ZiP3PHoLDPfhNxpbJ334Ghna9ivnyq2uYiX8V7du+yn0WC2h6
+zgSX+2XWE8294AxsnwuNe6HK9dFrwOU19U3nzTaeV7aVjWK4jVUCR69ZbwgGoUo5
+X+Hs479PXrGUoQh+dtoEeb9bjdhHckn+wzMRsIIakaFl2uRTMUcWFa2JtK8Txg5p
+ODyj+It/TISPtOT0MIRwE3Rs/vzuLENIDrxRav6x8QqsETAuRxD+H+m1IwARAQAB
+=oODF
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
new file mode 100644
index 00000000000..f2571636736
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
@@ -0,0 +1 @@
+84407e95050fb588296690862591ba36fd00e56a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
new file mode 100644
index 00000000000..76717d8305f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
@@ -0,0 +1 @@
+c758f9cc982ac877e7b295dd6e97418b04b11dcb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc
new file mode 100644
index 00000000000..32d4ab0c17e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFy2ECIBEADZYOmwjnX6CJfQxuPyzEPXAkFD0C/Zy/8EECiIvCP0cxvte17y
+9J7uL1jtMAAIcACeJrtLkWBCBRSQ3UpqjV75ua9gppetXShbAEO0ME7GJjWH7ctG
+qlPd2gySjMwhKwp7lepqCQ6+sTueI8LaWXnrQC0J1iNyQGES+Gy+FYH0R+vUdRK1
+2W78a8PBycLCN7kCYS0EQUhM8AnJOz4A/u6wwwXkLH/pk/5LpT7jWfmCE99g6ap8
+TeKjTLZjyXntKUEl1swF1D7xb8bjiXuRgaHCJEF8V0zBtNT1oqtwKF/6NiBPxYen
+bC5xM9Kl470BcNGtoQ7OX3D6luTEEUJNRrUttxZsPGSX5YOEcbpnkIQxqdqzT6jf
+YRrhFhWF33Xegy820J9NDsT0xGoJSjKZ7ps2z7kiYj+YKYGypQEjZP5IEa04q5PD
+88nsyt7OJ8tBE/KT70EJsGHSsfgJzaYg+tSwMihdJ+W9sUlU9Zk3+BnDSQUTlsI5
+EGj3QJ4RZ+pF0BF6DNfogcwfA6yw2Z2tQNYCIJsKQsdZLOXHsJhVB5t0JoPx5ysj
+xpmwsSp0pf/PWTU40ByMOwPpb/WjXbzQX0udC2ccLeLmfxZ00/+gaCgx1nLuSlJ6
+XrDUkDHQ5npauknFwYmOCrjatd7XjVRwCVM2Lo5lkFe+fIh4zHUr1de2UQARAQAB
+uQINBFy2ECIBEADSHvPiR9NMdhM+lBQxLWWNr+BwKRgxC2XsYuzg4daSpO1TnQGy
+1aROHPXV2pHxx+vEmM8ftavgtxw09ki+YM8TwwrQuFWAKz4WWiGb30oTso+5a79w
+Bi5+2cxikWGYvzYDPJvAvQ5hMAxujUnrITEBx0+zo8/4Zm1UHMt7b87HE1EnPi+z
+arwRmohpqedABzOeYC36aQeuqUp0CQFLUjAqgOXEG/xw4AqBrkYLS+h0sX08y/yR
+g/BCo3OvtJOpWPXKOOhJpKITau63B61Qo2OD77O0iVi6o6P5McGYvYCwXeK0tK9Q
+USpbsPlRZqxoQl64TJmlp6KBcOEXCarYXYXyKjElBfehLxzB9DpvxOvmQjbf3VzE
+xaONd2Xrck4W0cYU0hRrqsUNGM8rcFYlFxy4RwE5AcRY3NsT52Rxc6gRpjNlZE5R
+FnC7Bkm0NaTZsIU4nTswiiHK3oFW44dJ+pcharyq/A6yHqjSSxtdW0y4zAN+3LRG
+H0yzHXmBLKWAJ8l8m7PdVbSj7fyLfRB0sl5+tFPRMAaaiClxOq67/Q6eQ+gYRyDW
+dDr/2mUqhXC5+dW0ZevKZMt9tlVbw7SfmxaRfJVZwyI0RTsoJ90hHiLbtiC/rHPC
+6OXBdp60GgzDdYXzCeVt2VzkMjd57wSfh5d/wHEkfyXL9GAoKuDPa5rVGQARAQAB
+=nhFZ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index efca18d15b8..8ccba0abcb7 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -41,9 +41,9 @@ dependencies {
         api("junit:junit:4.13.2")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.4")
-        api("org.apache.activemq:activemq-client:5.16.4")
-        api("org.apache.activemq:activemq-spring:5.16.4")
+        api("org.apache.activemq:activemq-broker:5.18.1")
+        api("org.apache.activemq:activemq-client:5.18.1")
+        api("org.apache.activemq:activemq-spring:5.18.1")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.1")

From b9d671dbd7845783e6dd9be2895402a0984ca1a3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Apr 2023 18:50:18 +0000
Subject: [PATCH 0371/1037] fix(deps): update dependency
 org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin
 to v0.10

Fixes https://github.com/apache/jmeter/pull/5857
---
 build-logic/checksum.xml                      |  9 ++++----
 .../3b/b5cb27f94f97173b.fingerprints          |  1 +
 .../45/1669c4bb543e0445.fingerprints          |  1 +
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc | 21 +++++++++++++++++++
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc | 16 ++++++++++++++
 .../ae/f6d4a1d411e9d1ae.fingerprints          |  1 +
 .../b9/5f6ba89d4b0869b9.fingerprints          |  1 +
 build-logic/root-build/build.gradle.kts       |  2 +-
 checksum.xml                                  |  4 ++--
 9 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 92fc3801273..8327562fa02 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -14,8 +14,10 @@
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='f05e5f90e43e837f9dd8c781bf935c771a8474f8' group='com.google.errorprone' />
     <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
+    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
     <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
@@ -71,11 +73,8 @@
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
     </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.5'>
-      <sha512>4A6B7FA6CD8C6FA82A517C396510E408F1C6FAB5FF6D4C68008F80718F05E5943755AA240F329C95661CCB0231114DD0F6D7C38EFBF73EE6B1ECC70850F40F7E</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
-      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
+      <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
     </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
new file mode 100644
index 00000000000..f700439be79
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
+P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
+ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
+fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
+C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
+itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
+wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
+wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
+J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
+Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
+bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
+kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
+L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
+OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
+SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
+mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
+YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
+=A08o
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
new file mode 100644
index 00000000000..317a090c834
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
+9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
+DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
+KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
+xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
+BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
+tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
+nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
+TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
+IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
+Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
+DG73NR9fZCzl1K8AEQEAAQ==
+=FVRo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
new file mode 100644
index 00000000000..3477c7db965
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
@@ -0,0 +1 @@
+bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
new file mode 100644
index 00000000000..342d5d1ccac
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
@@ -0,0 +1 @@
+7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 4d951397a06..02a7327b3c8 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -26,5 +26,5 @@ dependencies {
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
-    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:0.5")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:0.10")
 }
diff --git a/checksum.xml b/checksum.xml
index 1dd61c7f858..15fb7e23d02 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -239,8 +239,8 @@
     <dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
       <sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
     </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
-      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
+      <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
     </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>

From 46f02c76df0db7bd8603205df74dd0404d978ac0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 06:34:30 +0000
Subject: [PATCH 0372/1037] fix(deps): update spring core to v4.3.30.release

Fixes https://github.com/apache/jmeter/pull/5863
---
 build-logic/checksum.xml         | 3 +++
 checksum.xml                     | 4 ++++
 src/bom-testing/build.gradle.kts | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 8327562fa02..3bf038e7f22 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -76,6 +76,9 @@
     <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
       <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
     </dependency>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
+      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
     </dependency>
diff --git a/checksum.xml b/checksum.xml
index 15fb7e23d02..f1c40c6cc5e 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -190,6 +190,7 @@
     <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
     <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
     <trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />
+    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.springframework' />
     <trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
     <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
     <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
@@ -242,6 +243,9 @@
     <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
       <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
     </dependency>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
+      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
     </dependency>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 8ccba0abcb7..63e8e1c7ced 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
         api("org.hsqldb:hsqldb:2.7.1")
         api("org.objenesis:objenesis:3.3")
         api("org.spockframework:spock-core:2.2-groovy-3.0")
-        api("org.springframework:spring-beans:4.3.17.RELEASE")
-        api("org.springframework:spring-context:4.3.17.RELEASE")
+        api("org.springframework:spring-beans:4.3.30.RELEASE")
+        api("org.springframework:spring-context:4.3.30.RELEASE")
     }
 }

From 58339bb86a77821d7efce6e7af4b0f5a8ff2c887 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 06:34:22 +0000
Subject: [PATCH 0373/1037] fix(deps): update dependency
 org.neo4j.driver:neo4j-java-driver to v4.4.11

Fixes https://github.com/apache/jmeter/pull/5861
---
 checksum.xml                                  |  1 +
 .../94/326ba6bd408bfa94.fingerprints          |  1 +
 ...a628ffaf58480736b1079fd1031d14464180e0.asc | 26 +++++++++++++++++++
 .../e0/d1031d14464180e0.fingerprints          |  1 +
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 src/licenses/build.gradle.kts                 |  8 ++----
 .../licenses/reactive-streams/LICENSE         | 11 ++++----
 7 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints

diff --git a/checksum.xml b/checksum.xml
index f1c40c6cc5e..88cecad263f 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -183,6 +183,7 @@
     <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' />
     <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' />
     <trusted-key id='e0d98c5fd55a8af232290e58dee12b9896f97e34' group='org.pcollections' />
+    <trusted-key id='50a628ffaf58480736b1079fd1031d14464180e0' group='org.reactivestreams' />
     <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' />
     <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' />
     <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
new file mode 100644
index 00000000000..b9936758568
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
@@ -0,0 +1 @@
+50a628ffaf58480736b1079fd1031d14464180e0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
new file mode 100644
index 00000000000..c2d4f8157a9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGKFXcwBEACSech69oRvhkVobrVShZGpJzl6DA/DxMNdWME3wI5XUFHmZKp5
+pD8VDhyOdYhXiF5MosdHsJtsHCz0dr+ss6FCHk3m6LEm8HHeTMFA20rbQKDcLj2P
+8o/Rl9njB8mBIsyNc3FSBtI/Gle0pXTgbfZP1FTDRvoXpQO4WJP1GC9kU3q11HKp
+XPbKRzlxfEuxKEaAywIMumkpVORvYm46sNHkavWUKbCxaPHMGgpueURUx1t5wiHk
+PmrBc/XCN1XGt6tFQSJYYiZZl9WwwOdTA9CjaM2hEHp5yZAAtWmH9a1DS6JpJuL1
+4wGiS4z0S4VxPYWfMVuMfp6aa5fl1TGbIiHx0sujagTnyu/NmYn8IwU1Y5wLAW4x
+e4SaUr4Ue7ZzdSNHEUId1sgS6JpdfbfyQpwbnN9UN34XYkl2+c6GuLegg/2vcgeF
+PsxEIkn3t/Ecuuw1zFiKMG3/gxf4dd/sWbYC4N4rSuli/0ehByY5H0McdfjEtfjM
+THoS39Dd47jnOG8tkhRuPlQCwQl2dpFtNl71nvQRcNtUfwSKf4CXUZkC2o5qchub
+tcAM1ptMF8swGsS8lwoxlZwVIPvJLo+Z/Bw+L1Xkn2oD8ySDiypcS/cA6m1JGXon
+1NEHLOrh6HEy4uHNvxZJplRBllOHR7icF9rYcqvSczlqQq/6E0yfJkg0gwARAQAB
+uQINBGKFXcwBEAC+7NJ7OePu3xiA0k6HZwgcL1SLB3wdJcf1EetIDDE+ECv0EY2c
+961lPg//khp/TKs06ZDxe8nmAbd+piSOopdgmXcmAHvybi1DecdVU7fLcYlJUf6O
+MZ128b0gxu7XtmSWm4g2MYKisDGRgh1/aBueBbCoIRtEtDth8LSUC1OwfZG8VV0o
+UAVcq/vIru7TCHx3BQV2vysc2FcuZMXNtn93D+45bjjMxyVz7Jq1a0e9O5Au8Pye
+nQmMDAT3cB83zxish/9RDgu0omILlM+aDEaKNHWUSBGpC2Wdtg68TpLAXYKqlMXE
+oJGzOv5zU7PUgfIHEqtxYPopZqOq3n6dVUBf/GlULLa6gyxOpgIWsLMC1gaCAOQw
+//MYeKOkvmyoHVzHQnrfs+lwOm40+j5bLkBpPsJ6qmy7DFRQFsq/NzfXYY3xOgZD
+NTLP4+EdSbXgEox1gbV6R6CvK8mhHWiRXOHui063R3uBcku8CzQaIvBDFENEQXyh
+BvCMjxxSrB2nehixb3B6WnPE8L7mp982Ej3/Bgcy/1hea2VDzYGsNDprukJwE1B2
+14BLZ86E5NVEde3JKZWJLY1LhlWu/AyeR+arYze0itPEDw4oW9FBmIfR4Wb3L9lY
+TnFBn2Vb9/eIcwIK4i75Ffjk9Ty9+NcVVgqCvOV+KzHd83V5ApqMZ8PWqwARAQAB
+=HlgM
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints
new file mode 100644
index 00000000000..b9936758568
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints
@@ -0,0 +1 @@
+50a628ffaf58480736b1079fd1031d14464180e0
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a8be7b7d1b2..601338026d5 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -118,7 +118,7 @@ dependencies {
         api("org.jsoup:jsoup:1.15.4")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
-        api("org.neo4j.driver:neo4j-java-driver:4.4.6")
+        api("org.neo4j.driver:neo4j-java-driver:4.4.11")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 42f19dca5d7..338c893df6b 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -129,12 +129,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     }
 
     overrideLicense("org.reactivestreams:reactive-streams") {
-        expectedLicense =
-            SimpleLicense(
-                "CC0",
-                uri("http://creativecommons.org/publicdomain/zero/1.0/")
-            )
-        effectiveLicense = SpdxLicense.CC0_1_0
+        expectedLicense = SpdxLicense.MIT_0
     }
 
     overrideLicense("org.brotli:dec:0.1.2") {
@@ -195,6 +190,7 @@ val renderLicenseForBinary by tasks.registering(Apache2LicenseRenderer::class) {
         ).expression,
         AsfLicenseCategory.A
     )
+    licenseCategory.put(SpdxLicense.MIT_0.expression, AsfLicenseCategory.A)
 }
 
 tasks.build.configure {
diff --git a/src/licenses/licenses/reactive-streams/LICENSE b/src/licenses/licenses/reactive-streams/LICENSE
index eadae05fc84..1e141c13ddb 100644
--- a/src/licenses/licenses/reactive-streams/LICENSE
+++ b/src/licenses/licenses/reactive-streams/LICENSE
@@ -1,8 +1,7 @@
-Licensed under Public Domain (CC0)
+MIT No Attribution
 
-To the extent possible under law, the person who associated CC0 with
-this code has waived all copyright and related or neighboring
-rights to this code.
+Copyright 2014 Reactive Streams
 
-You should have received a copy of the CC0 legalcode along with this
-work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
\ No newline at end of file
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From e47c30a2f6f8819a2c4e4117e85c327e89232f3e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Apr 2023 11:04:38 +0300
Subject: [PATCH 0374/1037] chore: add org.hamcrest constraints to
 bom-thirdparty since they are needed for ApacheJMeter_junit

---
 src/bom-thirdparty/build.gradle.kts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 601338026d5..d8fe5478f9e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -71,7 +71,18 @@ dependencies {
         api("javax.activation:javax.activation-api:1.2.0")
         api("javax.mail:mail:1.5.0-b01")
         api("jcharts:jcharts:0.7.5")
-        api("junit:junit:4.13.2")
+        api("junit:junit:4.13.2") {
+            because("ApacheJMeter_junit depends on junit4")
+        }
+        api("org.hamcrest:hamcrest-core:2.2") {
+            because("ApacheJMeter_junit depends on junit4")
+        }
+        api("org.hamcrest:hamcrest-library:2.2") {
+            because("ApacheJMeter_junit depends on junit4")
+        }
+        api("org.hamcrest:hamcrest:2.2") {
+            because("ApacheJMeter_junit depends on junit4")
+        }
         api("org.jetbrains:annotations:23.1.0")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")

From 0c34b9f082d9647d8156d557b6a1edfe43360e22 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 08:18:25 +0000
Subject: [PATCH 0375/1037] fix(deps): update dependency
 org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin
 to v1

Fixes https://github.com/apache/jmeter/pull/5866
---
 build-logic/checksum.xml                                   | 7 ++-----
 .../jvm/src/main/kotlin/build-logic.kotlin.gradle.kts      | 1 -
 build-logic/root-build/build.gradle.kts                    | 2 +-
 build-logic/verification/build.gradle.kts                  | 1 +
 .../src/main/kotlin/build-logic.autostyle.gradle.kts       | 2 --
 .../src/main/kotlin/build-logic.errorprone.gradle.kts      | 1 -
 checksum.xml                                               | 7 ++-----
 7 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 3bf038e7f22..84f0965cb0d 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -73,11 +73,8 @@
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
     </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
-      <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
-      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='1.1.7'>
+      <sha512>B7B121AC6385206A03717E03A61C9514478934CF7E8BBDCD87BD2E8ECFC2DEB37B9B834DA34EAA14C16CA6F61DB6A4DCD1C89FEDEE22EEBDEF6EAE5423847CE1</sha512>
     </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 006c46bb748..65cb342e6d1 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -17,7 +17,6 @@
 
 import com.github.vlsi.gradle.dsl.configureEach
 import com.github.vlsi.gradle.properties.dsl.props
-import gradle.kotlin.dsl.accessors._86d2c9a61c3426111b16050345f09882.testImplementation
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 02a7327b3c8..a467ad083af 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -26,5 +26,5 @@ dependencies {
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
-    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:0.10")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
 }
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index dcce20c99db..ee09349fa14 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -29,5 +29,6 @@ dependencies {
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.26")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
index 0555d63650e..7117e87abad 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import gradle.kotlin.dsl.accessors._156f30e0e6722a90ad34068ddbaee49e.ide
-
 plugins {
     id("com.github.autostyle")
     id("com.github.vlsi.ide")
diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 83a0a1bac04..bbc6c5d6eab 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -16,7 +16,6 @@
  */
 
 import com.github.vlsi.gradle.dsl.configureEach
-import gradle.kotlin.dsl.accessors._8d406b70b7b518f23730b456e0c46f8d.buildParameters
 import net.ltgt.gradle.errorprone.errorprone
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
diff --git a/checksum.xml b/checksum.xml
index 88cecad263f..c0aa64838f4 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -241,11 +241,8 @@
     <dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
       <sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
     </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.10'>
-      <sha512>35C037FC0BEAAA7179C4464281868F210E3F7EC7611106B876545726E02985F927A29A96864A24E728C259F6F91CF310AFAABF166CA35DBF5CBC5343D7D9E3FD</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
-      <sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
+    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='1.1.7'>
+      <sha512>B7B121AC6385206A03717E03A61C9514478934CF7E8BBDCD87BD2E8ECFC2DEB37B9B834DA34EAA14C16CA6F61DB6A4DCD1C89FEDEE22EEBDEF6EAE5423847CE1</sha512>
     </dependency>
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>

From 6134adbf5f3e2da6596d412071acf4cb2e7c622d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 10:50:56 +0200
Subject: [PATCH 0376/1037] fix(deps): update dependency org.jsoup:jsoup to
 v1.16.1 (#5864)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d8fe5478f9e..87ebd39aaa0 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -126,7 +126,7 @@ dependencies {
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")
         api("org.jodd:jodd-props:5.0.13")
-        api("org.jsoup:jsoup:1.15.4")
+        api("org.jsoup:jsoup:1.16.1")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.11")

From e09b6116918bafa59691260cf22b361779ff622e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 12:24:19 +0200
Subject: [PATCH 0377/1037] fix(deps): update dependency com.sun.mail:all to
 v1.6.7 (#5867)

---
 src/licenses/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 338c893df6b..fccdbf8be8b 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -140,7 +140,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.MIT
     }
 
-    overrideLicense("com.sun.mail:all:1.5.0-b01") {
+    overrideLicense("com.sun.mail:all:1.6.7") {
         // Multiple licenses, specify explicitly
         expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html"))
         effectiveLicense = SpdxLicense.CDDL_1_0 and (SpdxLicense.GPL_2_0_or_later with SpdxLicenseException.Classpath_exception_2_0)

From 7132be7030bf28eacad519fdc3adcd8eeb59819a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 29 Apr 2023 12:50:13 +0200
Subject: [PATCH 0378/1037] fix(deps): update dependency
 com.helger.commons:ph-commons to v10.2.3 (#5868)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 87ebd39aaa0..a7ef4f6a7fd 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.github.weisj:darklaf-property-loader:2.7.3")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
-        api("com.helger.commons:ph-commons:10.1.6")
+        api("com.helger.commons:ph-commons:10.2.3")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
         api("com.miglayout:miglayout-core:5.3")

From a98091243a5f4a133d71784417bb20eefc5ce814 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Apr 2023 16:16:35 +0300
Subject: [PATCH 0379/1037] chore: use hsqldb-jdk8 for compatibility with Java
 8

Note: hsqldb is used in batchJDBC_TESTS only
---
 src/dist-check/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index cd146f844d4..5ca291389f3 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -44,7 +44,7 @@ dependencies {
 
     extraTestDependencies(platform(projects.src.bomThirdparty))
     extraTestDependencies(platform(projects.src.bomTesting))
-    extraTestDependencies("org.hsqldb:hsqldb")
+    extraTestDependencies("org.hsqldb:hsqldb::jdk8")
     extraTestDependencies("org.apache.mina:mina-core")
     extraTestDependencies("org.apache.ftpserver:ftplet-api")
     extraTestDependencies("org.apache.ftpserver:ftpserver-core")

From e52305d6a4a867ad96e374fadeffe0b67e514894 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Apr 2023 16:41:44 +0300
Subject: [PATCH 0380/1037] chore: use proper junit5 dependencies so the
 jupiter engine is added to test runtime classpath

---
 .../jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index 135f4da52fa..de1a35b40c4 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -24,8 +24,7 @@ plugins {
 
 dependencies {
     testImplementation("junit:junit")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.hamcrest:hamcrest")
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }

From 5d18b2ce1ea56c638666ac8b543bc7dcd66fd513 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Apr 2023 16:42:00 +0300
Subject: [PATCH 0381/1037] Revert "fix(deps): update dependency
 org.apache.commons:commons-jexl3 to v3.3 (#5851)"

This reverts commit 3188e93fab5cb138203fb43ed104667a081ab398.
---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a7ef4f6a7fd..ae5fab054df 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -93,7 +93,7 @@ dependencies {
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")
-        api("org.apache.commons:commons-jexl3:3.3")
+        api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.12.0")
         api("org.apache.commons:commons-math3:3.6.1")

From 1679a714d787da0f5eda1e29ac78bf6d5e8b528e Mon Sep 17 00:00:00 2001
From: andreaslind01 <andreaslind01@gmail.com>
Date: Fri, 5 Aug 2022 12:38:41 +0200
Subject: [PATCH 0382/1037] Use correct number format in json assertions with
 regex

---
 .../java/org/apache/jmeter/assertions/JSONPathAssertion.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 5671e278564..b8e719bb5ed 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -19,6 +19,8 @@
 
 import java.io.Serializable;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -58,7 +60,7 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab
             ThreadLocal.withInitial(JSONPathAssertion::createDecimalFormat);
 
     private static DecimalFormat createDecimalFormat() {
-        DecimalFormat decimalFormatter = new DecimalFormat("#.#");
+        DecimalFormat decimalFormatter = new DecimalFormat("#.#", new DecimalFormatSymbols(Locale.US));
         decimalFormatter.setMaximumFractionDigits(340); // java.text.DecimalFormat.DOUBLE_FRACTION_DIGITS == 340
         decimalFormatter.setMinimumFractionDigits(1);
         return decimalFormatter;

From 4846dc4e57d51e6af67b225be559d4627d519860 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 28 Apr 2023 16:15:50 +0200
Subject: [PATCH 0383/1037] Add test for JSONPathAssertion with floating point
 number

Closes PR #723
---
 .../assertions/TestJSONPathAssertion.java     | 29 +++++++++++++++++++
 xdocs/changes.xml                             |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index c01f5c5e875..a2a9c6b3ca6 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -99,6 +99,35 @@ void testGetResult_pathsWithOneResult(String data, String jsonPath, String expec
         assertFalse(result.isFailure());
     }
 
+    @Test
+    void testGetResult_positive_regexp_for_floating_point() {
+        SampleResult samplerResult = new SampleResult();
+        samplerResult.setResponseData("{\"myval\": 123.45}".getBytes(Charset.defaultCharset()));
+
+        JSONPathAssertion instance = new JSONPathAssertion();
+        instance.setJsonPath("$.myval");
+        instance.setJsonValidationBool(true);
+        instance.setExpectedValue("^\\d+\\.\\d+$");
+        AssertionResult expResult = new AssertionResult("");
+        AssertionResult result = instance.getResult(samplerResult);
+        assertEquals(expResult.getName(), result.getName());
+        assertFalse(result.isFailure());
+    }
+
+    @Test
+    void testGetResult_positive_wrong_regexp_for_floating_point() {
+        SampleResult samplerResult = new SampleResult();
+        samplerResult.setResponseData("{\"myval\": 123.45}".getBytes(Charset.defaultCharset()));
+
+        JSONPathAssertion instance = new JSONPathAssertion();
+        instance.setJsonPath("$.myval");
+        instance.setJsonValidationBool(true);
+        instance.setExpectedValue("^\\d+,\\d+$");
+        AssertionResult expResult = new AssertionResult("");
+        AssertionResult result = instance.getResult(samplerResult);
+        assertEquals(expResult.getName(), result.getName());
+        assertTrue(result.isFailure());
+    }
     @Test
     void testGetResult_positive_regexp() {
         SampleResult samplerResult = new SampleResult();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index c2769d1058d..fef507cfb9a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -147,6 +147,7 @@ Summary
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
   <li><pr>5717</pr>Add jsonpath string to jsonpath assertion error message so the error is easier to understand</li>
+  <li><pr>723</pr>Use correct number format on JSON Path Assertion. Contributed by andreaslind01 (andreaslind01 at gmail.com)</li>
 </ul>
 
 <h3>Functions</h3>
@@ -184,6 +185,7 @@ Summary
   <li>Kai Lehmann (klehmann at aservo.com)</li>
   <li>Ori Marko (orimarko at gmail.com)</li>
   <li>Stefan Seide (stefan at trilobyte-se.de)</li>
+  <li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 442d27e0c8cf2b10da37ba8c18ea98084c71e9d1 Mon Sep 17 00:00:00 2001
From: Victor Peralta <victorperalta.correo@gmail.com>
Date: Mon, 6 Mar 2023 00:51:20 +0100
Subject: [PATCH 0384/1037] add new threadName tag to
 InfluxDBRawBackendListener

---
 .../backend/influxdb/InfluxDBRawBackendListenerClient.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
index 477a25a50a0..0e781ce6108 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
@@ -122,8 +122,10 @@ private String createTags(SampleResult sampleResult) {
         // remove surrounding quotes and spaces from sample label
         String label = StringUtils.strip(sampleResult.getSampleLabel(), "\" ");
         String transaction = AbstractInfluxdbMetricsSender.tagToStringValue(label);
+        String threadName = StringUtils.deleteWhitespace(sampleResult.getThreadName());
         return "status=" + status
-                + ",transaction=" + transaction;
+                + ",transaction=" + transaction
+                + ",threadName=" + threadName;
     }
 
     private String createFields(SampleResult sampleResult) {

From 121944d73ac64de10754809544a219eb6e2f6128 Mon Sep 17 00:00:00 2001
From: Victor Peralta <victorperalta.correo@gmail.com>
Date: Mon, 6 Mar 2023 00:52:21 +0100
Subject: [PATCH 0385/1037] include threadName tag in
 InfluxDBRawBackendListener tests

---
 .../influxdb/InfluxDBRawBackendListenerClientSpec.groovy    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
index 4a2a8937773..5390a2507bc 100644
--- a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
+++ b/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
@@ -33,6 +33,7 @@ class InfluxDBRawBackendListenerClientSpec extends Specification {
         okSample.setLatency(42)
         okSample.setConnectTime(7)
         okSample.setSampleLabel("myLabel")
+        okSample.setThreadName("myThread")
         okSample.setResponseOK()
         return okSample
     }
@@ -62,7 +63,7 @@ class InfluxDBRawBackendListenerClientSpec extends Specification {
             def tags = sut.createTags(okSample)
             def fields = sut.createFields(okSample)
         then:
-            tags == "status=ok,transaction=myLabel"
+            tags == "status=ok,transaction=myLabel,threadName=myThread"
             fields == "duration=100,ttfb=42,connectTime=7"
     }
 
@@ -70,8 +71,9 @@ class InfluxDBRawBackendListenerClientSpec extends Specification {
         given:
             def koSample = new SampleResult()
             koSample.setSampleLabel("myLabel")
+            koSample.setThreadName("myThread")
         expect:
-            sut.createTags(koSample) == "status=ko,transaction=myLabel"
+            sut.createTags(koSample) == "status=ko,transaction=myLabel,threadName=myThread"
     }
 
     def "Upon handling sample result data is added to influxDBMetricsManager and written"() {

From 238a915ae30946bddd67d4d3d7e2bdae6d2eb18d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 18:05:21 +0200
Subject: [PATCH 0386/1037] Add changes for InfluxDBRawBackendListenerClient to
 changelog

---
 xdocs/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index fef507cfb9a..9f35c6479e3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -142,6 +142,8 @@ Summary
 <ul>
   <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
   <li><issue>5807</issue>Fix an ArrayIndexOutOfBoundsException on HTTP parameters line on special case when key and value are empty, i.e.: "k1=v1&amp;&#61;&amp;k2=v2"</li>
+  <li><issue>5654</issue><pr>5785</pr> Fix <code>InfluxDBRawBackendListenerClient</code> missing data. Allow InfluxDB to insert multiple entries with the
+    same <code>timestamp</code> but with different <code>threadName</code>. Contributed by Victor Peralta (vperaltac at github)</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
@@ -186,6 +188,7 @@ Summary
   <li>Ori Marko (orimarko at gmail.com)</li>
   <li>Stefan Seide (stefan at trilobyte-se.de)</li>
   <li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
+  <li>Victor Peralta (vperaltac at github)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 34dfaffb1888836b52b2ba0b4a89ebb49069dd83 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 18:35:22 +0200
Subject: [PATCH 0387/1037] Website used for testing has gone, use another one

A better fix would be to use a local setup, that would never
go away.
---
 bin/testfiles/TEST_HTTPS.jmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/testfiles/TEST_HTTPS.jmx b/bin/testfiles/TEST_HTTPS.jmx
index a2a3689c309..6ffa072c54a 100644
--- a/bin/testfiles/TEST_HTTPS.jmx
+++ b/bin/testfiles/TEST_HTTPS.jmx
@@ -30,7 +30,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="Variables pré-définies" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">analytics.usa.gov</stringProp>
+          <stringProp name="HTTPSampler.domain">jmeter.apache.org</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -48,7 +48,7 @@
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="RA_CHECK_SNI_OK" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="1071695892">&lt;meta property=&quot;og:title&quot; content=&quot;analytics.usa.gov | The US government&apos;s web traffic.&quot; /&gt;</stringProp>
+              <stringProp name="1071695892">Apache JMeter</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>

From 2f47db30a256cada938bf04a991a5269425a94b5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 18:36:42 +0200
Subject: [PATCH 0388/1037] Partly revert
 5d29e24f4ba720b8da3d1ef1e6ecf4c991f4fb31

ActiveMQ 5.17 and up can not be used with Java 8.
---
 src/bom-testing/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 63e8e1c7ced..3d2ece0ec4c 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -41,9 +41,9 @@ dependencies {
         api("junit:junit:4.13.2")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.18.1")
-        api("org.apache.activemq:activemq-client:5.18.1")
-        api("org.apache.activemq:activemq-spring:5.18.1")
+        api("org.apache.activemq:activemq-broker:5.16.4")
+        api("org.apache.activemq:activemq-client:5.16.4")
+        api("org.apache.activemq:activemq-spring:5.16.4")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.1")

From 0a65d7ae147aa5464bfb8dc997604f81a8d0749e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 29 Apr 2023 19:55:07 +0300
Subject: [PATCH 0389/1037] fix(deps): bump activemq to 5.16.6 to support Java
 8

See https://github.com/apache/jmeter/pull/5858
---
 renovate.json                    | 3 ++-
 src/bom-testing/build.gradle.kts | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/renovate.json b/renovate.json
index ca09f371454..ddf6c01605c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -28,7 +28,8 @@
     },
     {
       "matchPackagePrefixes": ["org.apache.activemq"],
-      "groupName": "org.apache.activemq"
+      "groupName": "org.apache.activemq",
+      "allowedVersions": "< 5.17.0"
     },
     {
       "matchPackagePrefixes": ["org.apache.ftpserver"],
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 3d2ece0ec4c..66c4e119554 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -41,9 +41,9 @@ dependencies {
         api("junit:junit:4.13.2")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.4")
-        api("org.apache.activemq:activemq-client:5.16.4")
-        api("org.apache.activemq:activemq-spring:5.16.4")
+        api("org.apache.activemq:activemq-broker:5.16.6")
+        api("org.apache.activemq:activemq-client:5.16.6")
+        api("org.apache.activemq:activemq-spring:5.16.6")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.1")

From 3443047c888adcd951cb70f0f2bd5a8622a3d788 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 1 Nov 2022 09:42:17 +0300
Subject: [PATCH 0390/1037] =?UTF-8?q?Use=20&copy;=20instead=20of=20=C2=A9?=
 =?UTF-8?q?=20for=20javadoc=20footer=20to=20better=20support=20non-UTF-8?=
 =?UTF-8?q?=20encodings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By default, javadoc uses defaultCharset encoding which is not reliable with non-latin characters
---
 build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 807ef91b07c..783801b9b85 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -101,7 +101,7 @@ tasks.configureEach<Javadoc> {
         addStringOption("source", "8")
         val lastEditYear: String by rootProject.extra
         bottom =
-            "Copyright © 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
+            "Copyright &copy; 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
         if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
             addBooleanOption("html5", true)
             links("https://docs.oracle.com/javase/11/docs/api/")

From 5020590c2dd6564e87cc2295e0090d2c6526c436 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 31 Oct 2022 11:49:43 +0300
Subject: [PATCH 0391/1037] test: capture stderr in KeyToolUtils explicitly

By default SystemCommand redirects stderr to stdout in case stdErr hander was not set,
which breaks output parsing when extra messages appear unexpectedly

One of such messages is "Picked up _JAVA_OPTIONS: ..."
---
 .../java/org/apache/jorphan/exec/KeyToolUtils.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index b7a5d34b4c5..bef18bfbf55 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -421,8 +421,11 @@ private static void keytool(String command, File keystore, String password, Stri
             InputStream input, OutputStream output, String ... parameters)
             throws IOException {
         final File workingDir = keystore.getParentFile();
+        ByteArrayOutputStream stdErr = new ByteArrayOutputStream();
+        // If we omit stderr, then SystemCommand redirects stderr to stdout, and it might break keytool output
+        // with message like "Picked up _JAVA_OPTIONS: ..."
         final SystemCommand nativeCommand =
-                new SystemCommand(workingDir, 0L, 0, null, input, output, null);
+                new SystemCommand(workingDir, 0L, 0, null, input, output, stdErr);
         final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
         arguments.add(command);
@@ -436,7 +439,14 @@ private static void keytool(String command, File keystore, String password, Stri
         arguments.add(alias);
         Collections.addAll(arguments, parameters);
 
-        runNativeCommand(nativeCommand, arguments);
+        try {
+            runNativeCommand(nativeCommand, arguments);
+        } catch (IOException e) {
+            if (stdErr.size() > 0) {
+                e.addSuppressed(new IOException("standard error (stderr) was: " + stdErr));
+            }
+            throw e;
+        }
     }
 
     /**

From 0a193334c473b7bf46cb9616d6d8bd3dfaa8777a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:02:01 +0300
Subject: [PATCH 0392/1037] chore: add --release 8 when compiling with Java 10+
 so the generated bytecode uses Java 8 methods only

For instance, overrides like java.nio.DoubleBuffer#clear() do not exist in Java 8,
so without "--release 8" the bytecode will not execute in Java 8.
With --release 8, javac compiles the call to java.nio.Buffer#clear() which
exists in Java 8.
---
 .../jvm/src/main/kotlin/build-logic.java.gradle.kts      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 783801b9b85..175c9740af3 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -41,6 +41,15 @@ java {
     }
 }
 
+tasks.configureEach<JavaCompile> {
+    // Use --release=8 for Java 10+ so the generated bytecode does not include methods introduced in Java 9+
+    options.release.set(
+        provider {
+            8.takeIf { javaCompiler.get().metadata.languageVersion.asInt() > 9 }
+        }
+    )
+}
+
 dependencies {
     findProject(":src:bom")?.let {
         api(platform(it))

From f88e809450b670b0cfaecf344c29cc24afa884ec Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 21:41:37 +0200
Subject: [PATCH 0393/1037] Try to overcome a deadlock in test suite

When running locally, I observed the following deadlock:

"AWT-EventQueue-1" #23 prio=6 os_prio=0 tid=0x00007f3de9bf6800 nid=0x722b2 waiting for monitor entry [0x00007f3dcb4ee000]
   java.lang.Thread.State: BLOCKED (on object monitor)
	at java.awt.Component$AccessibleAWTComponent.getLocationOnScreen(Component.java:9494)
	- waiting to lock <0x00000000e0653ef0> (a java.awt.Component$AWTTreeLock)
	at javax.swing.JComponent$AccessibleJComponent.getLocationOnScreen(JComponent.java:3663)
	at javax.swing.text.JTextComponent$AccessibleJTextComponent.<init>(JTextComponent.java:2516)
	at javax.swing.JEditorPane$AccessibleJEditorPane.<init>(JEditorPane.java:1644)
	at javax.swing.JEditorPane$JEditorPaneAccessibleHypertextSupport.<init>(JEditorPane.java:1971)
	at javax.swing.JEditorPane$AccessibleJEditorPaneHTML.getAccessibleText(JEditorPane.java:1703)
	at org.GNOME.Accessibility.AtkObject.lambda$getTFlagFromObj$0(AtkObject.java:70)
	at org.GNOME.Accessibility.AtkObject$$Lambda$317/331870887.call(Unknown Source)
	at org.GNOME.Accessibility.AtkUtil.invokeInSwing(AtkUtil.java:58)
	at org.GNOME.Accessibility.AtkObject.getTFlagFromObj(AtkObject.java:55)
	at org.GNOME.Accessibility.AtkWrapper.boundsChanged(Native Method)
	at org.GNOME.Accessibility.AtkWrapper$3.componentResized(AtkWrapper.java:235)
	at java.awt.AWTEventMulticaster.componentResized(AWTEventMulticaster.java:159)
	at java.awt.Component.processComponentEvent(Component.java:6365)
	at java.awt.Component.processEvent(Component.java:6319)
	at java.awt.Container.processEvent(Container.java:2239)
	at java.awt.Component.dispatchEventImpl(Component.java:4889)
	at java.awt.Container.dispatchEventImpl(Container.java:2297)
	at java.awt.Component.dispatchEvent(Component.java:4711)
	at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:760)
	at java.awt.EventQueue.access$500(EventQueue.java:97)
	at java.awt.EventQueue$3.run(EventQueue.java:709)
	at java.awt.EventQueue$3.run(EventQueue.java:703)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:84)
	at java.awt.EventQueue$4.run(EventQueue.java:733)
	at java.awt.EventQueue$4.run(EventQueue.java:731)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:730)
	at org.GNOME.Accessibility.AtkWrapper$6.dispatchEvent(AtkWrapper.java:717)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:205)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:82)

"Test worker" #1 prio=5 os_prio=0 tid=0x00007f3de8012000 nid=0x7228f waiting on condition [0x00007f3def695000]
   java.lang.Thread.State: WAITING (parking)
	at sun.misc.Unsafe.park(Native Method)
	- parking to wait for  <0x00000000f80386a8> (a java.util.concurrent.FutureTask)
	at java.util.concurrent.locks.LockSupport.park(LockSupport.java:175)
	at java.util.concurrent.FutureTask.awaitDone(FutureTask.java:429)
	at java.util.concurrent.FutureTask.get(FutureTask.java:191)
	at org.GNOME.Accessibility.AtkUtil.invokeInSwing(AtkUtil.java:68)
	at org.GNOME.Accessibility.AtkObject.hashCode(AtkObject.java:234)
	at org.GNOME.Accessibility.AtkWrapper.emitSignal(Native Method)
	at org.GNOME.Accessibility.AtkWrapper$5.propertyChange(AtkWrapper.java:557)
	at java.beans.PropertyChangeSupport.fire(PropertyChangeSupport.java:335)
	at java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:327)
	at java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:263)
	at javax.accessibility.AccessibleContext.firePropertyChange(AccessibleContext.java:768)
	at javax.swing.JScrollPane$AccessibleJScrollPane.stateChanged(JScrollPane.java:1506)
	at javax.swing.JViewport.fireStateChanged(JViewport.java:1369)
	at javax.swing.JViewport.reshape(JViewport.java:839)
	at java.awt.Component.setBounds(Component.java:2261)
	at java.awt.Component.setBounds(Component.java:2405)
	at javax.swing.ScrollPaneLayout.layoutContainer(ScrollPaneLayout.java:890)
	at java.awt.Container.layout(Container.java:1513)
	at java.awt.Container.doLayout(Container.java:1502)
	at java.awt.Container.validateTree(Container.java:1698)
	at java.awt.Container.validateTree(Container.java:1707)
	at java.awt.Container.validateTree(Container.java:1707)
	at java.awt.Container.validateTree(Container.java:1707)
	at java.awt.Container.validateTree(Container.java:1707)
	at java.awt.Container.validate(Container.java:1633)
	- locked <0x00000000e0653ef0> (a java.awt.Component$AWTTreeLock)
	at org.apache.jorphan.gui.ComponentUtil.centerComponentInWindow(ComponentUtil.java:67)
	at org.apache.jorphan.gui.ComponentUtil.centerComponentInWindow(ComponentUtil.java:54)
	at org.apache.jmeter.gui.action.SelectTemplatesDialog.init(SelectTemplatesDialog.java:263)
	at org.apache.jmeter.gui.action.SelectTemplatesDialog.<init>(SelectTemplatesDialog.java:105)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
	at org.apache.jmeter.junit.JMeterTest.instantiateClass(JMeterTest.java:512)
	at org.apache.jmeter.junit.JMeterTest.getObjects(JMeterTest.java:474)
	at org.apache.jmeter.junit.JMeterTest.suiteSerializableElements(JMeterTest.java:407)
	at org.apache.jmeter.junit.JMeterTest.suite(JMeterTest.java:149)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.internal.runners.SuiteMethod.testFromSuiteMethod(SuiteMethod.java:35)

I hope to get rid of this by placing the code to center the newly created dialog
in the AWT thread.

I believe the deadlock happens only in our test code, when the dialog is created
and instantaneously destroyed.
---
 .../org/apache/jmeter/gui/action/SelectTemplatesDialog.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
index 9f017d7c9e0..deb9a33720b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
@@ -47,6 +47,7 @@
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.HyperlinkEvent;
@@ -260,7 +261,9 @@ public void windowClosing(WindowEvent evt){
 
         this.pack();
         this.setMinimumSize(new Dimension(MINIMAL_BOX_WIDTH, MINIMAL_BOX_HEIGHT));
-        ComponentUtil.centerComponentInWindow(this, 50); // center position and 50% of screen size
+        SwingUtilities.invokeLater(() ->
+            ComponentUtil.centerComponentInWindow(this, 50) // center position and 50% of screen size
+        );
         populateTemplatePage();
     }
 

From c144f3c99ad18351575a542ca205eeae19bafe90 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 21:43:01 +0200
Subject: [PATCH 0394/1037] Simplify logic to reduce recursion

and correct a few typos, while we are here.
---
 .../org/apache/jorphan/gui/ComponentUtil.java     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java
index a926a78602c..754b9149396 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java
@@ -23,7 +23,7 @@
 
 /**
  * This class is a Util for awt Component and could be used to place them in
- * center of an other.
+ * center of another.
  *
  */
 public final class ComponentUtil {
@@ -36,19 +36,12 @@ public final class ComponentUtil {
      * @param component
      *            the component you want to center and set size on
      * @param percentOfScreen
-     *            the percent of the current screensize you want the component
+     *            the percent of the current screen size you want the component
      *            to be
      */
     public static void centerComponentInWindow(Component component, int percentOfScreen) {
-        if (percentOfScreen < 0) {
-            centerComponentInWindow(component, -percentOfScreen);
-            return;
-        }
-        if (percentOfScreen > 100) {
-            centerComponentInWindow(component, 100);
-            return;
-        }
-        double percent = percentOfScreen / 100.d;
+        int validPercentOfScreen = Math.min(Math.abs(percentOfScreen), 100);
+        double percent = validPercentOfScreen / 100.d;
         Rectangle bounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getBounds();
         component.setSize((int) (bounds.getWidth() * percent), (int) (bounds.getHeight() * percent));
         centerComponentInWindow(component);

From 8bcdf290cf881b1c2ac89b813fdfb596713a0f01 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 30 Apr 2023 12:12:52 +0200
Subject: [PATCH 0395/1037] Use SwingWorker for all classes on construction for
 tests

---
 .../gui/action/SelectTemplatesDialog.java     |  5 +-
 .../org/apache/jmeter/junit/JMeterTest.java   | 55 ++++++++++++-------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
index deb9a33720b..9f017d7c9e0 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
@@ -47,7 +47,6 @@
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.HyperlinkEvent;
@@ -261,9 +260,7 @@ public void windowClosing(WindowEvent evt){
 
         this.pack();
         this.setMinimumSize(new Dimension(MINIMAL_BOX_WIDTH, MINIMAL_BOX_HEIGHT));
-        SwingUtilities.invokeLater(() ->
-            ComponentUtil.centerComponentInWindow(this, 50) // center position and 50% of screen size
-        );
+        ComponentUtil.centerComponentInWindow(this, 50); // center position and 50% of screen size
         populateTemplatePage();
     }
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 9297edc5149..5d7a22076eb 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -39,7 +39,9 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
+import javax.swing.SwingUtilities;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -457,28 +459,41 @@ public static Collection<Object> getObjects(Class<?> extendsClass) throws Except
         Iterator<String> classes = ClassFinder
                 .findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { extendsClass }).iterator();
         List<Object> objects = new ArrayList<>();
-        String n = "";
+        String className = "";
         boolean caughtError = true;
-        Throwable caught = null;
+        final AtomicReference<Throwable> exceptionCatcher = new AtomicReference<>();
+        final AtomicReference<Exception> unexpectedExceptionCatcher = new AtomicReference<>();
         try {
             while (classes.hasNext()) {
-                n = classes.next();
+                className = classes.next();
                 // TODO - improve this check
-                if (n.endsWith("RemoteJMeterEngineImpl")) {
+                if (className.endsWith("RemoteJMeterEngineImpl")) {
                     continue; // Don't try to instantiate remote server
                 }
-                if (n.endsWith("RemoteSampleListenerImpl")) {
+                if (className.endsWith("RemoteSampleListenerImpl")) {
                     // TODO: Cannot start. travis-job-e984b3d5-f93f-4b0f-b6c0-50988a5ece9d is a loopback address.
                     continue;
                 }
-                caught = instantiateClass(exName, myThis, objects, n, caught);
+                String currentClassName = className;
+                // Construct classes in the AWT thread, as we may have found classes, that
+                // assume to be constructed in the AWT thread.
+                SwingUtilities.invokeAndWait(() -> {
+                    try {
+                        instantiateClass(exName, myThis, objects, currentClassName, exceptionCatcher);
+                    } catch (Exception e) {
+                        unexpectedExceptionCatcher.set(e);
+                    }
+                });
+                if (unexpectedExceptionCatcher.get() != null) {
+                    throw unexpectedExceptionCatcher.get();
+                }
             }
             caughtError = false;
         } finally {
             if (caughtError) {
-                System.out.println("Last class=" + n);
+                System.out.println("Last class=" + className);
                 System.out.println("objects.size=" + objects.size());
-                System.out.println("Last error=" + caught);
+                System.out.println("Last error=" + exceptionCatcher.get());
             }
         }
 
@@ -502,24 +517,23 @@ public static Collection<Object> getObjects(Class<?> extendsClass) throws Except
         return objects;
     }
 
-    private static Throwable instantiateClass(final String extendsClassName, final Object myThis,
-            final List<Object> objects, final String className, final Throwable oldCaught) throws Exception {
-        Throwable caught = oldCaught;
+    private static void instantiateClass(final String extendsClassName, final Object myThis,
+            final List<Object> objects, final String className, final AtomicReference<Throwable> exceptionCatcher) throws Exception {
         try {
-            Class<?> c = Class.forName(className);
+            Class<?> currentClass = Class.forName(className);
             try {
                 // Try with a parameter-less constructor first
-                objects.add(c.getDeclaredConstructor().newInstance());
+                objects.add(currentClass.getDeclaredConstructor().newInstance());
             } catch (InstantiationException | NoSuchMethodException | IllegalAccessException |
                     InvocationTargetException e) {
-                caught = e;
+                exceptionCatcher.set(e);
                 try {
                     // Events often have this constructor
-                    objects.add(c.getConstructor(new Class[] { Object.class }).newInstance(
+                    objects.add(currentClass.getConstructor(new Class[] { Object.class }).newInstance(
                             new Object[] { myThis }));
                 } catch (NoSuchMethodException f) {
                     // no luck. Ignore this class
-                    if (!Enum.class.isAssignableFrom(c)) { // ignore enums
+                    if (!Enum.class.isAssignableFrom(currentClass)) { // ignore enums
                         System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": NoSuchMethodException  " +
                             className + ", missing empty Constructor or Constructor with Object parameter");
                     }
@@ -530,22 +544,21 @@ private static Throwable instantiateClass(final String extendsClassName, final O
             System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": NoClassDefFoundError " + className + ":" + e.getMessage());
             e.printStackTrace(System.out);
         } catch (IllegalAccessException e) {
-            caught = e;
+            exceptionCatcher.set(e);
             System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": IllegalAccessException " + className + ":" + e.getMessage());
             e.printStackTrace(System.out);
             // We won't test restricted-access classes.
-        } catch (HeadlessException|ExceptionInInitializerError e) {// EIIE can be caused by Headless
-            caught = e;
+        } catch (HeadlessException | ExceptionInInitializerError e) {// EIIE can be caused by Headless
+            exceptionCatcher.set(e);
             System.out.println("o.a.j.junit.JMeterTest Error creating " + className + " " + e.toString());
         } catch (Exception e) {
-            caught = e;
+            exceptionCatcher.set(e);
             if (e instanceof RemoteException) { // not thrown, so need to check here
                 System.out.println("o.a.j.junit.JMeterTest WARN: " + "Error creating " + className + " " + e.toString());
             } else {
                 throw new Exception("Error creating " + className, e);
             }
         }
-        return caught;
     }
 
 }

From 0fb9a6f4b3e9d272912e483434cac0947ac02373 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sun, 30 Apr 2023 12:36:59 +0200
Subject: [PATCH 0396/1037] Fix a few warnings shown by IDE

---
 .../org/apache/jmeter/junit/JMeterTest.java   | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 5d7a22076eb..60d6a3f323b 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -22,7 +22,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -63,7 +62,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -122,7 +120,7 @@ public Description getDescription() {
         StringBuilder sb = new StringBuilder();
         sb.append(getName());
         if (guiItem instanceof TestBeanGUI) {
-            sb.append(" ").append(guiItem.toString());
+            sb.append(" ").append(guiItem);
         } else if (guiItem != null) {
             sb.append(" ").append(guiItem.getClass().getName());
         } else if (serObj != null) {
@@ -190,13 +188,12 @@ public void createTitleSet() throws Exception {
     }
 
     /**
-     * @return
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
-     * @throws FileNotFoundException
+     * @return first element named {@code body}
+     * @throws ParserConfigurationException when stream contains invalid XML
+     * @throws IOException when stream can not be read
+     * @throws SAXException in case of XML parsing error
      */
-    private Element getBodyFromXMLDocument(InputStream stream)
+    private org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
             throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setIgnoringElementContentWhitespace(true);
@@ -242,14 +239,14 @@ public static int scanprintMap(Map<String, Boolean> m, String t) {
         }
 
         int unseen = 0;
-        for (String key : s) {
-            if (!m.get(key).equals(Boolean.TRUE)) {
+        for (Map.Entry<String, Boolean> entry : m.entrySet()) {
+            if (!entry.getValue().equals(Boolean.TRUE)) {
                 if (unseen == 0)// first time
                 {
                     System.out.println("\nNames remaining in " + t + " Map:");
                 }
                 unseen++;
-                System.out.println(key);
+                System.out.println(entry.getKey());
             }
         }
         return unseen;
@@ -318,7 +315,7 @@ private static Test suiteBeanComponents() throws Exception {
      * Test GUI elements - run the test
      */
     public void runGUITitle() throws Exception {
-        if (guiTitles.size() > 0) {
+        if (!guiTitles.isEmpty()) {
             String title = guiItem.getDocAnchor();
             boolean ct = guiTitles.containsKey(title);
             if (ct) {
@@ -326,7 +323,7 @@ public void runGUITitle() throws Exception {
             }
             String name = guiItem.getClass().getName();
             if (// Is this a work in progress or an internal GUI component?
-                title != null && title.length() > 0 // Will be "" for internal components
+                title != null && !title.isEmpty() // Will be "" for internal components
                 && !title.toUpperCase(Locale.ENGLISH).contains("(ALPHA")
                 && !title.toUpperCase(Locale.ENGLISH).contains("(BETA")
                 && !title.toUpperCase(Locale.ENGLISH).contains("(DEPRECATED")
@@ -356,7 +353,7 @@ public void GUIComponents1() throws Exception {
             try {
                 String label = guiItem.getLabelResource();
                 assertNotNull("Label should not be null for "+name, label);
-                assertTrue("Label should not be empty for "+name, label.length() > 0);
+                assertTrue("Label should not be empty for "+name, !label.isEmpty());
                 assertFalse("'" + label + "' should be in resource file for " + name, JMeterUtils.getResString(
                         label).startsWith(JMeterUtils.RES_KEY_PFX));
             } catch (UnsupportedOperationException uoe) {

From 81536c95aad04ddfac6752afed37cada4e84fa0b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 1 May 2023 16:28:02 +0200
Subject: [PATCH 0397/1037] Markup changes

---
 xdocs/changes.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 9f35c6479e3..6ad4153dc56 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -141,14 +141,15 @@ Summary
 <h3>Listeners</h3>
 <ul>
   <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
-  <li><issue>5807</issue>Fix an ArrayIndexOutOfBoundsException on HTTP parameters line on special case when key and value are empty, i.e.: "k1=v1&amp;&#61;&amp;k2=v2"</li>
+  <li><issue>5807</issue>Fix an <code>ArrayIndexOutOfBoundsException</code> on HTTP parameters line on special case when key and value are empty,
+    i.e.: "<code>k1=v1&amp;&#61;&amp;k2=v2</code>"</li>
   <li><issue>5654</issue><pr>5785</pr> Fix <code>InfluxDBRawBackendListenerClient</code> missing data. Allow InfluxDB to insert multiple entries with the
     same <code>timestamp</code> but with different <code>threadName</code>. Contributed by Victor Peralta (vperaltac at github)</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
-  <li><pr>5717</pr>Add jsonpath string to jsonpath assertion error message so the error is easier to understand</li>
+  <li><pr>5717</pr>Add jsonpath string to JSON Path Assertion error message so the error is easier to understand</li>
   <li><pr>723</pr>Use correct number format on JSON Path Assertion. Contributed by andreaslind01 (andreaslind01 at gmail.com)</li>
 </ul>
 

From c361c4499be641b5f3e6b30f8c129df857cbefce Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 1 May 2023 15:48:16 +0200
Subject: [PATCH 0398/1037] Trim variable names in Argument objects

Should fix #5872
---
 .../jmeter/config/gui/TestArgumentsPanel.java | 18 +++++++++
 .../org/apache/jmeter/config/Argument.java    |  5 ++-
 .../apache/jmeter/config/ArgumentTest.java    | 38 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/core/src/test/java/org/apache/jmeter/config/ArgumentTest.java

diff --git a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
index 3d25260e591..47d5dd923b6 100644
--- a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
+++ b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
@@ -22,6 +22,8 @@
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 /**
  * A GUI panel allowing the user to enter name-value argument pairs. These
@@ -45,4 +47,20 @@ public void testArgumentCreation() throws Exception {
         assertEquals("=", ((Argument) ((Arguments) gui.createTestElement()).getArguments().get(0).getObjectValue())
                 .getMetaData());
     }
+
+
+    @ParameterizedTest
+    @CsvSource(value = {
+            "WITHOUT_SPACE,WITHOUT_SPACE",
+            " WITH_OUTER_SPACE ,WITH_OUTER_SPACE",
+            "WITH_SUFFIX_SPACE ,WITH_SUFFIX_SPACE",
+            " WITH_PREFIX_SPACE,WITH_PREFIX_SPACE"
+    }, ignoreLeadingAndTrailingWhitespace = false)
+    public void testArgumentNames(String name, String expectedName) throws Exception {
+        ArgumentsPanel gui = new ArgumentsPanel();
+        gui.tableModel.addRow(new Argument());
+        gui.tableModel.setValueAt(name, 0, 0);
+
+        assertEquals(expectedName, ((Argument) ((Arguments) gui.createTestElement()).getArguments().get(0).getObjectValue()).getName());
+    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/config/Argument.java b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
index 04ca8a2c8d4..b97c0fa74e1 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Argument.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
@@ -19,6 +19,7 @@
 
 import java.io.Serializable;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jorphan.util.JOrphanUtils;
@@ -92,7 +93,7 @@ public Argument(String name, String value, String metadata) {
      */
     public Argument(String name, String value, String metadata, String description) {
         if(name != null) {
-            setProperty(new StringProperty(ARG_NAME, name));
+            setProperty(new StringProperty(ARG_NAME, StringUtils.strip(name)));
         }
         if(value != null) {
             setProperty(new StringProperty(VALUE, value));
@@ -113,7 +114,7 @@ public Argument(String name, String value, String metadata, String description)
      */
     @Override
     public void setName(String newName) {
-        setProperty(new StringProperty(ARG_NAME, newName));
+        setProperty(new StringProperty(ARG_NAME, StringUtils.strip(newName)));
     }
 
     /**
diff --git a/src/core/src/test/java/org/apache/jmeter/config/ArgumentTest.java b/src/core/src/test/java/org/apache/jmeter/config/ArgumentTest.java
new file mode 100644
index 00000000000..27113227c28
--- /dev/null
+++ b/src/core/src/test/java/org/apache/jmeter/config/ArgumentTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class ArgumentTest {
+
+    @ParameterizedTest
+    @CsvSource(value = {
+            "simple_name,simple_name",
+            " with_spaces ,with_spaces",
+            "\twith_tabs\t,with_tabs"
+    },ignoreLeadingAndTrailingWhitespace = false)
+    void setName(String name, String expectedName) {
+        Argument arg = new Argument();
+        arg.setName(name);
+        assertEquals(expectedName, arg.getName());
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6ad4153dc56..5166ee17596 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -177,6 +177,7 @@ Summary
 <h3>General</h3>
 <ul>
   <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
+  <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 4f9e9bc8b6f1cdea7cbaeeebefdda7cae8182fd5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Mon, 1 May 2023 18:08:16 +0200
Subject: [PATCH 0399/1037] Remove public modifiers from JUnit5 tests

---
 .../jmeter/config/gui/TestArgumentsPanel.java  |  6 +++---
 .../http/visualizers/RequestViewHTTPTest.java  | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
index 47d5dd923b6..19bf9173630 100644
--- a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
+++ b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
@@ -30,14 +30,14 @@
  * arguments (or parameters) are usually used to provide configuration values
  * for some other component.
  */
-public class TestArgumentsPanel {
+class TestArgumentsPanel {
 
     /**
      * Test that adding an argument to the table results in an appropriate
      * TestElement being created.
      */
     @Test
-    public void testArgumentCreation() throws Exception {
+    void testArgumentCreation() throws Exception {
         ArgumentsPanel gui = new ArgumentsPanel();
         gui.tableModel.addRow(new Argument());
         gui.tableModel.setValueAt("howdy", 0, 0);
@@ -56,7 +56,7 @@ public void testArgumentCreation() throws Exception {
             "WITH_SUFFIX_SPACE ,WITH_SUFFIX_SPACE",
             " WITH_PREFIX_SPACE,WITH_PREFIX_SPACE"
     }, ignoreLeadingAndTrailingWhitespace = false)
-    public void testArgumentNames(String name, String expectedName) throws Exception {
+    void testArgumentNames(String name, String expectedName) throws Exception {
         ArgumentsPanel gui = new ArgumentsPanel();
         gui.tableModel.addRow(new Argument());
         gui.tableModel.setValueAt(name, 0, 0);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 974c9924987..4fcb3dd4620 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -33,10 +33,10 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class RequestViewHTTPTest {
+class RequestViewHTTPTest {
 
     @Test
-    public void testGetQueryMapValueContainingAmpersand() {
+    void testGetQueryMapValueContainingAmpersand() {
         // see https://bz.apache.org/bugzilla/show_bug.cgi?id=58413
         String query = "login=toto1&pwd=Welcome%261";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
@@ -57,7 +57,7 @@ public void testGetQueryMapValueContainingAmpersand() {
 
     //http://www.foo.com/test/json/getXXXX.jsp?postalCode=59115&qrcode=
     @Test
-    public void testGetQueryMapWithEmptyValue() {
+    void testGetQueryMapWithEmptyValue() {
         String query = "postalCode=59115&qrcode=";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
@@ -76,7 +76,7 @@ public void testGetQueryMapWithEmptyValue() {
     }
 
     @Test
-    public void testGetQueryMapMultipleValues() {
+    void testGetQueryMapMultipleValues() {
         String query = "param2=15&param1=12&param2=baulpismuth";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
@@ -96,7 +96,7 @@ public void testGetQueryMapMultipleValues() {
     }
 
     @Test
-    public void testGetQueryMapAmpInValue() {
+    void testGetQueryMapAmpInValue() {
         String query = "param2=15&param1=12&param3=baul%26Pismuth";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
@@ -120,7 +120,7 @@ public void testGetQueryMapAmpInValue() {
     }
 
     @Test
-    public void testGetQueryMapBug54055() {
+    void testGetQueryMapBug54055() {
         String query = "param2=15&param1=12&param3=bu4m1KzFvsozCnR4lra0%2Be69YzpnRcF09nDjc3VJvl8%3D";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
@@ -144,7 +144,7 @@ public void testGetQueryMapBug54055() {
     }
 
     @Test
-    public void testGetQueryMapBug52491() {
+    void testGetQueryMapBug52491() {
         String query = "<envelope><header><context><conversationId>119</conversationId></context></header>"
                 + "<body><call component=\"OrderTransfer\" method=\"getSourceManifestID\" id=\"2\">\n"
                 + "<params></params><refs></refs></call></body></envelope>";
@@ -161,7 +161,7 @@ public void testGetQueryMapBug52491() {
     }
 
     @Test
-    public void testGetQueryMapSoapHack() {
+    void testGetQueryMapSoapHack() {
         String query = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                 + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" +
                 "xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" +
@@ -229,7 +229,7 @@ private static Stream<Arguments> data() {
 
     @ParameterizedTest
     @MethodSource("data")
-    public void testGetQueryMapWithEmptyKeyAndValue(String query, Map<String, List<String>> expected) {
+    void testGetQueryMapWithEmptyKeyAndValue(String query, Map<String, List<String>> expected) {
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
         Assertions.assertNotNull(params);
         Assertions.assertEquals(expected.size(), params.size());

From ae75faa45755db16e0da3ea04cffaae41dab8e8d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 23 Jun 2022 16:30:53 +0300
Subject: [PATCH 0400/1037] Rework new Thread to ExecutorService in
 StandardJMeterEngine

---
 .../jmeter/engine/StandardJMeterEngine.java   | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index a2a878341b2..a72c10524b4 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.engine;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -27,7 +28,12 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.samplers.SampleEvent;
@@ -47,6 +53,7 @@
 import org.apache.jorphan.collections.ListedHashTree;
 import org.apache.jorphan.collections.SearchByClass;
 import org.apache.jorphan.util.JMeterStopTestException;
+import org.apiguardian.api.API;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +91,14 @@ public class StandardJMeterEngine implements JMeterEngine, Runnable {
     /** Whether to call System.exit(0) unconditionally at end of non-GUI test */
     private static final boolean SYSTEM_EXIT_FORCED = JMeterUtils.getPropDefault("jmeterengine.force.system.exit", false);
 
+    /**
+     * Executor service to execute management tasks like "start test", "stop test".
+     * The use of {@link ExecutorService} allows propagating the exception from the threads.
+     */
+    private final ExecutorService EXECUTOR_SERVICE = Executors.newCachedThreadPool();
+
+    private volatile Future<?> runningTest;
+
     /** Flag to show whether test is running. Set to false to stop creating more threads. */
     private volatile boolean running = false;
 
@@ -183,14 +198,18 @@ public void runTest() throws JMeterEngineException {
                     + host + " @ " + nowAsString + " (" + now.toEpochMilli() + ')');
         }
         try {
-            Thread runningThread = new Thread(this, "StandardJMeterEngine");
-            runningThread.start();
+            runningTest = EXECUTOR_SERVICE.submit(this);
         } catch (Exception err) {
             stopTest();
             throw new JMeterEngineException(err);
         }
     }
 
+    @API(status = API.Status.EXPERIMENTAL, since = "5.5.1")
+    public void awaitTermination(Duration duration) throws ExecutionException, InterruptedException, TimeoutException {
+        runningTest.get(duration.toMillis(), TimeUnit.MILLISECONDS);
+    }
+
     private String formatLikeDate(Instant instant) {
         return DateTimeFormatter
                 .ofLocalizedDateTime(FormatStyle.LONG)
@@ -265,9 +284,9 @@ public synchronized void stopTest() {
     }
 
     @Override
+    @SuppressWarnings("FutureReturnValueIgnored")
     public synchronized void stopTest(boolean now) {
-        Thread stopThread = new Thread(new StopTest(now));
-        stopThread.start();
+        EXECUTOR_SERVICE.submit(new StopTest(now));
     }
 
     private class StopTest implements Runnable {
@@ -573,21 +592,18 @@ public void askThreadsToStop() {
      * also called
      */
     @Override
+    @SuppressWarnings("FutureReturnValueIgnored")
     public void exit() {
         ClientJMeterEngine.tidyRMI(log); // This should be enough to allow server to exit.
         if (REMOTE_SYSTEM_EXIT) { // default is false
             log.warn("About to run System.exit(0) on {}", host);
             // Needs to be run in a separate thread to allow RMI call to return OK
-            Thread t = new Thread() {
-                @Override
-                public void run() {
-                    pause(1000); // Allow RMI to complete
-                    log.info("Bye from {}", host);
-                    System.out.println("Bye from "+host); // NOSONAR Intentional
-                    System.exit(0); // NOSONAR Intentional
-                }
-            };
-            t.start();
+            EXECUTOR_SERVICE.submit(() -> {
+                pause(1000); // Allow RMI to complete
+                log.info("Bye from {}", host);
+                System.out.println("Bye from "+host); // NOSONAR Intentional
+                System.exit(0); // NOSONAR Intentional
+            });
         }
     }
 

From 9865d39851ee8eec7cf1e818d36373162fbed506 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 23 Jun 2022 16:35:39 +0300
Subject: [PATCH 0401/1037] Include input string in ParseException and
 TokeninzerException in Open Model Thread Group

---
 .../org/apache/jmeter/threads/openmodel/scheduleParser.kt    | 5 +++--
 .../org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
index c7aae036453..965cc4d47fc 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleParser.kt
@@ -103,8 +103,9 @@ public class DefaultThreadSchedule(override val steps: List<ThreadScheduleStep>)
 @API(status = API.Status.EXPERIMENTAL, since = "5.5")
 public class ParserException(public val input: String, public val position: Int, message: String) :
     Exception(
-        "$message at position $position: " +
-            input.substring(position until (position + 20).coerceAtMost(input.length))
+        "$message at position $position: '" +
+            input.substring(position until (position + 20).coerceAtMost(input.length)) +
+            "' in '$input'"
     )
 
 /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
index d88fa2ec08c..3906c5ba28c 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/scheduleTokenizer.kt
@@ -24,8 +24,9 @@ import java.util.regex.Matcher
 @API(status = API.Status.EXPERIMENTAL, since = "5.5")
 public class TokenizerException(public val input: String, public val position: Int, message: String) :
     Exception(
-        "$message at position $position: " +
-            input.substring(position until (position + 20).coerceAtMost(input.length))
+        "$message at position $position: '" +
+            input.substring(position until (position + 20).coerceAtMost(input.length)) +
+            "' in '$input'"
     )
 
 /**

From 40d2fb3c6527095e58c726a3bd156406431ad774 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 23 Jun 2022 16:40:46 +0300
Subject: [PATCH 0402/1037] Allow non-LoopController, as a main controoler in a
 Thread Group

---
 .../java/org/apache/jmeter/threads/AbstractThreadGroup.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index b00f9a83c47..ea7c9d20923 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.jmeter.control.Controller;
+import org.apache.jmeter.control.IteratingController;
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.engine.StandardJMeterEngine;
 import org.apache.jmeter.engine.TreeCloner;
@@ -168,7 +169,7 @@ public void initialize() {
      * Start next iteration after an error
      */
     public void startNextLoop() {
-       ((LoopController) getSamplerController()).startNextLoop();
+       ((IteratingController) getSamplerController()).startNextLoop();
     }
 
     /**
@@ -309,7 +310,7 @@ public boolean getOnErrorStopTestNow() {
     public abstract void stop();
 
     public void breakThreadLoop() {
-        ((LoopController) getSamplerController()).breakLoop();
+        ((IteratingController) getSamplerController()).breakLoop();
     }
 
     /**

From 29157ef5edf9f4704a4e1cb5a3d41e7010a9f584 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 23 Jun 2022 16:45:59 +0300
Subject: [PATCH 0403/1037] [66139] Ensure Open Model Thread Group initializes
 config elements only once

Fixes https://github.com/apache/jmeter/issues/5682
https://bz.apache.org/bugzilla/show_bug.cgi?id=66139
---
 .../OpenModelThreadGroupConfigElementTest.kt  | 91 +++++++++++++++++++
 .../jmeter/engine/StandardJMeterEngine.java   |  2 +-
 .../threads/openmodel/OpenModelThreadGroup.kt |  6 +-
 .../OpenModelThreadGroupController.kt         | 23 +++--
 xdocs/changes.xml                             |  1 +
 5 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt

diff --git a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
new file mode 100644
index 00000000000..05ae33ccf20
--- /dev/null
+++ b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.control.TestTransactionController
+import org.apache.jmeter.engine.StandardJMeterEngine
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.modifiers.CounterConfig
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apache.jmeter.threads.AbstractThreadGroup
+import org.apache.jorphan.collections.ListedHashTree
+import org.junit.Assert
+import org.junit.Ignore
+import org.junit.Test
+import java.time.Duration
+
+class OpenModelThreadGroupConfigElementTest : JMeterTestCase() {
+    /**
+     * Create Test Plan with Open Model Thread Group and Counter Config.
+     */
+    @Test
+    @Ignore("Sometimes the listener gets no results for unknown reason")
+    fun `ensure thread group initializes counter only once for each thread`() {
+        val listener = TestTransactionController.TestSampleListener()
+
+        val tree = ListedHashTree().apply {
+            add(TestPlan()).apply {
+                val threadGroup = OpenModelThreadGroup().apply {
+                    name = "Thread Group"
+                    scheduleString = "rate(5 / sec) random_arrivals(1 sec)"
+                    setProperty(
+                        TestElementProperty(
+                            AbstractThreadGroup.MAIN_CONTROLLER, OpenModelThreadGroupController()
+                        )
+                    )
+                }
+                add(threadGroup).apply {
+                    add(listener)
+                    add(
+                        CounterConfig().apply {
+                            varName = "counter"
+                            increment = 1
+                        }
+                    )
+                    add(
+                        DebugSampler().apply {
+                            name = "\${counter}"
+                            isDisplayJMeterProperties = false
+                            isDisplayJMeterVariables = false
+                            isDisplaySystemProperties = false
+                        }
+                    )
+                }
+            }
+        }
+
+        StandardJMeterEngine().apply {
+            configure(tree)
+            runTest()
+            awaitTermination(Duration.ofSeconds(10))
+        }
+
+        // There's no guarantee that thread execute exactly in order, so we sort
+        // the labels to avoid test failure in case the thread execute out of order.
+        val actual = listener.events.map { it.result.sampleLabel }.sorted()
+
+        // Use toString for better error message
+        Assert.assertEquals(
+            "Counter values should be consequent",
+            "0\n1\n2\n3\n4",
+            actual.joinToString("\n")
+        )
+    }
+}
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index a72c10524b4..d228a4fbaa3 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -95,7 +95,7 @@ public class StandardJMeterEngine implements JMeterEngine, Runnable {
      * Executor service to execute management tasks like "start test", "stop test".
      * The use of {@link ExecutorService} allows propagating the exception from the threads.
      */
-    private final ExecutorService EXECUTOR_SERVICE = Executors.newCachedThreadPool();
+    private static final ExecutorService EXECUTOR_SERVICE = Executors.newCachedThreadPool();
 
     private volatile Future<?> runningTest;
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
index c290dd6c5b2..476f3a236b8 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -193,8 +193,10 @@ public class OpenModelThreadGroup :
                     starter.run()
                 }
             )
-        } catch (expected: Throwable) {
-            log.error("Unable to start thread group", expected)
+        } catch (t: Throwable) {
+            throw t.apply {
+                addSuppressed(IllegalArgumentException("Failed to start OpenModelThreadGroup $name-$threadGroupIndex"))
+            }
         }
     }
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
index b44272701da..a19db872515 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
@@ -18,20 +18,31 @@
 package org.apache.jmeter.threads.openmodel
 
 import org.apache.jmeter.control.GenericController
+import org.apache.jmeter.control.IteratingController
+import org.apache.jmeter.engine.event.LoopIterationEvent
 import org.apache.jmeter.samplers.Sampler
 import org.apiguardian.api.API
 
 @API(status = API.Status.EXPERIMENTAL, since = "5.5")
-public class OpenModelThreadGroupController : GenericController() {
+public class OpenModelThreadGroupController : GenericController(), IteratingController {
     public companion object {
         private const val serialVersionUID: Long = 1L
     }
 
-    override fun next(): Sampler? {
-        if (iterCount >= 1) {
-            // For now, every thread performs just one iteration
-            isDone = true
+    override fun next(): Sampler? =
+        super.next().also {
+            if (iterCount >= 1) {
+                // For now, every thread performs just one iteration
+                isDone = true
+            }
         }
-        return super.next()
+
+    override fun iterationStart(iterEvent: LoopIterationEvent?) {
+    }
+
+    override fun startNextLoop() {
+    }
+
+    override fun breakLoop() {
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5166ee17596..6a4159075b9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -69,6 +69,7 @@ Summary
 
 <h3>Thread Groups</h3>
 <ul>
+<li><issue>5682</issue><pr>717</pr> Open Model Thread Group: avoid skipping rows from CSV Data Set Config</li>
 </ul>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>

From c486aacc72080c217ec34165c399ceb0de0cef23 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 29 Jun 2022 10:53:31 +0300
Subject: [PATCH 0404/1037] test: use synchronizedList in TestSampleListener
 since it might be called from concurrent threads

---
 .../org/apache/jmeter/control/TestTransactionController.java   | 3 ++-
 .../threads/openmodel/OpenModelThreadGroupConfigElementTest.kt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
index ac54f064793..96d35f4565e 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.control;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.jmeter.assertions.ResponseAssertion;
@@ -88,7 +89,7 @@ public void testIssue57958() throws Exception {
 
     public static class TestSampleListener extends ResultCollector implements SampleListener {
         private static final long serialVersionUID = -1373192220822942714L;
-        public List<SampleEvent> events = new ArrayList<>();
+        public List<SampleEvent> events = Collections.synchronizedList(new ArrayList<>());
 
         @Override
         public void sampleOccurred(SampleEvent e) {
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
index 05ae33ccf20..ac99d0708ac 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -26,12 +26,13 @@ import org.apache.jmeter.testelement.TestPlan
 import org.apache.jmeter.testelement.property.TestElementProperty
 import org.apache.jmeter.threads.AbstractThreadGroup
 import org.apache.jorphan.collections.ListedHashTree
+import org.apache.jorphan.test.JMeterSerialTest
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
 import java.time.Duration
 
-class OpenModelThreadGroupConfigElementTest : JMeterTestCase() {
+class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest {
     /**
      * Create Test Plan with Open Model Thread Group and Counter Config.
      */

From b0692252777dbf473b713fe40b38a1d3dfdc3b9b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Jun 2022 11:10:59 +0300
Subject: [PATCH 0405/1037] test: add @Isolated to JMeterSerialTest

---
 .../src/test/java/org/apache/jorphan/test/JMeterSerialTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java b/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java
index 1fe645f8703..7f6ccd06b64 100644
--- a/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java
+++ b/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java
@@ -19,11 +19,13 @@
 
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.api.parallel.Isolated;
 
 /**
  * Used to tag tests which need to be run on their own (in serial) because
  * either, they cause other tests to fail, or they fail when run in parallel.
  */
+@Isolated
 @Execution(ExecutionMode.SAME_THREAD)
 public interface JMeterSerialTest {
 }

From f1d4844260d6b21bff7c937ccfd6a751238f8135 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 13:55:46 +0300
Subject: [PATCH 0406/1037] chore: fix condition for enableErrorprone so the
 verification is activated

---
 build-logic/build-parameters/build.gradle.kts                  | 3 ++-
 .../verification/src/main/kotlin/build-logic.style.gradle.kts  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index a7e60c8753a..90eed2e3997 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -66,7 +66,8 @@ buildParameters {
         description.set("Skip forbidden-apis verifications")
     }
     bool("enableErrorprone") {
-        defaultValue.set(true)
+        // By default, disable errorProne in CI so we don't perform the same checks in several jobs
+        defaultValue.set(System.getenv("CI") != "true")
         description.set("Enable ErrorProne verifications")
     }
     bool("skipJavadoc") {
diff --git a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
index 969cd9dfc71..c36a060738c 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -42,7 +42,7 @@ plugins.withId("java-base") {
     if (buildParameters.enableCheckerframework) {
         apply(plugin = "build-logic.checkerframework")
     }
-    if (!buildParameters.enableErrorprone) {
+    if (buildParameters.enableErrorprone) {
         apply(plugin = "build-logic.errorprone")
     }
     if (buildParameters.spotbugs) {

From df7c8bd15d845959ea4f518c0a027d63209bc23e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 13:56:27 +0300
Subject: [PATCH 0407/1037] chore: add explicit casts from long to double so
 data loss is visible in the source code

See https://errorprone.info/bugpattern/LongDoubleConversion
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts  |  1 -
 .../jmeter/visualizers/backend/SamplerMetric.java      |  8 ++++----
 .../report/processor/StatisticsSummaryConsumer.java    | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index bbc6c5d6eab..abab81ef8e4 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -59,7 +59,6 @@ if (buildParameters.enableErrorprone) {
                     "BigDecimalEquals",
                     "EmptyBlockTag",
                     "Finalize",
-                    "LongDoubleConversion",
                     "MissingSummary",
                     "StringSplitter",
                     "BanJNDI",
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index 0ae60fb88f2..3e0fc509b65 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -127,14 +127,14 @@ private synchronized void add(SampleResult result, boolean isCumulated) {
             errors.put(error, errors.getOrDefault(error, 0) + result.getErrorCount() );
         }
         long time = result.getTime();
-        allResponsesStats.addValue(time);
-        pctResponseStats.addValue(time);
+        allResponsesStats.addValue((double) time);
+        pctResponseStats.addValue((double) time);
         if(result.isSuccessful()) {
             // Should we also compute KO , all response time ?
             // only take successful requests for time computing
-            okResponsesStats.addValue(time);
+            okResponsesStats.addValue((double) time);
         }else {
-            koResponsesStats.addValue(time);
+            koResponsesStats.addValue((double) time);
         }
         addHits(result, isCumulated);
         addNetworkData(result, isCumulated);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
index 2223bd82c01..c37cd24eaf9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
@@ -81,11 +81,11 @@ private void aggregateSample(Sample sample, StatisticsSummaryData data, boolean
         }
 
         long elapsedTime = sample.getElapsedTime();
-        data.getPercentile1().addValue(elapsedTime);
-        data.getPercentile2().addValue(elapsedTime);
-        data.getPercentile3().addValue(elapsedTime);
-        data.getMean().addValue(elapsedTime);
-        data.getMedian().addValue(elapsedTime);
+        data.getPercentile1().addValue((double) elapsedTime);
+        data.getPercentile2().addValue((double) elapsedTime);
+        data.getPercentile3().addValue((double) elapsedTime);
+        data.getMean().addValue((double) elapsedTime);
+        data.getMedian().addValue((double) elapsedTime);
         data.setMin(elapsedTime);
         data.setMax(elapsedTime);
 

From 5a993bf23b63307e2011052e9b258322e2684c78 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 14:08:37 +0300
Subject: [PATCH 0408/1037] chore: remove use of deprecated Object#finalize

---
 .../main/kotlin/build-logic.errorprone.gradle.kts   |  1 -
 .../java/org/apache/jorphan/gui/MenuScroller.java   | 13 -------------
 2 files changed, 14 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index abab81ef8e4..67d798b5cc6 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -58,7 +58,6 @@ if (buildParameters.enableErrorprone) {
                 disable(
                     "BigDecimalEquals",
                     "EmptyBlockTag",
-                    "Finalize",
                     "MissingSummary",
                     "StringSplitter",
                     "BanJNDI",
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
index 60455c9ef1a..008cf60274b 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
@@ -514,19 +514,6 @@ public void dispose() {
         }
     }
 
-    /**
-     * Ensures that the <code>dispose</code> method of this MenuScroller is
-     * called when there are no more references to it.
-     *
-     * @see MenuScroller#dispose()
-     */
-    @Override
-    @SuppressWarnings("deprecation")
-    public void finalize() throws Throwable {
-        dispose();
-        super.finalize();
-    }
-
     private void refreshMenu() {
         if (menuItems != null && menuItems.length > 0 && scrollCount <= menuItems.length) {
             firstIndex = Math.max(topFixedCount, firstIndex);

From 0b371e0de29541effa7c2e238f5126100e2b4ed9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:03:14 +0300
Subject: [PATCH 0409/1037] chore: execute ErrorProne verifications when
 running with Java 11+ compiler only

ErrorProne requires Java 11, so we can't execute it with Java 8 compiler.
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 67d798b5cc6..e233841fb7d 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -38,6 +38,10 @@ if (buildParameters.enableErrorprone) {
             // Ignore warnings in test code
             options.errorprone.isEnabled.set(false)
         } else {
+            // Errorprone requires Java 11+
+            options.errorprone.isEnabled.set(
+                javaCompiler.map { it.metadata.languageVersion.canCompileOrRun(11) }
+            )
             options.compilerArgs.addAll(listOf("-Xmaxerrs", "10000", "-Xmaxwarns", "10000"))
             options.errorprone {
                 disableWarningsInGeneratedCode.set(true)

From 4a7057c994c3a4b9faadb6df04b80ea9706631c5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:13:37 +0300
Subject: [PATCH 0410/1037] style: remove redundant method overrides

The redundant overrides for clone are left intact
as they are needed for Sonar rule S2157 - "Cloneables" should implement "clone"
---
 .../kotlin/build-logic.errorprone.gradle.kts  |  3 ++-
 .../jmeter/assertions/BSFAssertion.java       |  1 +
 .../jmeter/assertions/JSR223Assertion.java    |  1 +
 .../jmeter/extractor/BSFPostProcessor.java    |  1 +
 .../extractor/BeanShellPostProcessor.java     |  1 +
 .../jmeter/extractor/JSR223PostProcessor.java |  1 +
 .../jmeter/modifiers/BSFPreProcessor.java     |  1 +
 .../modifiers/BeanShellPreProcessor.java      |  1 +
 .../jmeter/modifiers/JSR223PreProcessor.java  |  1 +
 .../org/apache/jmeter/timers/BSFTimer.java    |  1 +
 .../apache/jmeter/timers/BeanShellTimer.java  |  1 +
 .../org/apache/jmeter/timers/JSR223Timer.java |  1 +
 .../jmeter/visualizers/BSFListener.java       |  1 +
 .../jmeter/visualizers/BeanShellListener.java |  1 +
 .../jmeter/visualizers/JSR223Listener.java    |  1 +
 .../impl/BytesThroughputGraphConsumer.java    | 12 ---------
 .../impl/CodesPerSecondGraphConsumer.java     | 12 ---------
 .../impl/HitsPerSecondGraphConsumer.java      | 25 -------------------
 .../graph/impl/TotalTPSGraphConsumer.java     | 12 ---------
 .../apache/jmeter/reporters/ResultSaver.java  | 16 ------------
 .../jmeter/reporters/gui/SummariserGui.java   |  5 ----
 .../jmeter/visualizers/GenerateTreeGui.java   |  5 ----
 .../protocol/java/sampler/JSR223Sampler.java  |  1 +
 23 files changed, 17 insertions(+), 88 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index e233841fb7d..577b998892a 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -46,7 +46,8 @@ if (buildParameters.enableErrorprone) {
             options.errorprone {
                 disableWarningsInGeneratedCode.set(true)
                 enable(
-                    "PackageLocation"
+                    "PackageLocation",
+                    "RedundantOverride"
                 )
                 disable(
                     "ComplexBooleanConstant",
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
index 680eab1a01d..57ea8ae84cb 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
@@ -55,6 +55,7 @@ public AssertionResult getResult(SampleResult response) {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
index 00137ac0935..ffffe0de725 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
@@ -58,6 +58,7 @@ public AssertionResult getResult(SampleResult response) {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
index 47a03a01961..323c01daeb7 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
@@ -49,6 +49,7 @@ public void process(){
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java
index 009b8ab6019..dca4e369304 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java
@@ -73,6 +73,7 @@ public void process() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
index f823958193f..1f3d51ae660 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
@@ -49,6 +49,7 @@ public void process() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
index be90af06459..0e8a4a7e1ce 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
@@ -52,6 +52,7 @@ public void process(){
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
index ba23f105403..f01991dd657 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
@@ -68,6 +68,7 @@ public void process(){
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
index ab2421aaca0..1d2b5132ce4 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
@@ -49,6 +49,7 @@ public void process() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
index bd560749750..ae324dba7bf 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
@@ -55,6 +55,7 @@ public long delay() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
index a4f2ef5f9f1..c383f2c49b4 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
@@ -71,6 +71,7 @@ public long delay() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
index 713aff16766..6ae5ef2fd4c 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
@@ -53,6 +53,7 @@ public long delay() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
index a008c232fa0..cbdbabc31d9 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
@@ -82,6 +82,7 @@ public boolean isStats() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
index a4a14f77e96..8cbe234697e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
@@ -92,6 +92,7 @@ public boolean isStats() { // Needed by Visualizer interface
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
index dc42acdf6b6..ac066f6d7bd 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
@@ -78,6 +78,7 @@ public boolean isStats() {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
index 334c5c8254d..240d93cdbfa 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
@@ -90,18 +90,6 @@ public Iterable<String> select(Sample sample) {
                 new GroupInfo(new TimeRateAggregatorFactory(), seriesSelector, graphValueSelector, false, false));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #setGranularity(long)
-     */
-    @Override
-    public void setGranularity(long granularity) {
-        super.setGranularity(granularity);
-    }
-
     @Override
     public void initialize() {
         super.initialize();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
index b4f6d1bd655..2e4f3a41020 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
@@ -78,16 +78,4 @@ public void initialize() {
                 .getAggregatorFactory())
                 .setGranularity(getGranularity());
     }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #setGranularity(long)
-     */
-    @Override
-    public void setGranularity(long granularity) {
-        super.setGranularity(granularity);
-    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
index 68a46a35f39..0d5828bd6d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
@@ -66,19 +66,6 @@ protected Map<String, GroupInfo> createGroupInfos() {
                         new CountValueSelector(true), false, false));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #setGranularity(long)
-     */
-    @Override
-    public void setGranularity(long granularity) {
-        super.setGranularity(granularity);
-
-    }
-
     @Override
     public void initialize() {
         super.initialize();
@@ -91,16 +78,4 @@ public void initialize() {
                 AbstractGraphConsumer.DEFAULT_GROUP).getSeriesSelector())
                 .setSeriesName(getName());
     }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.AbstractSampleConsumer#setName
-     * (java.lang.String)
-     */
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
index 8d42974e6e4..05f08e35b14 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
@@ -82,18 +82,6 @@ public Iterable<String> select(Sample sample) {
                         new CountValueSelector(false), false, false));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #setGranularity(long)
-     */
-    @Override
-    public void setGranularity(long granularity) {
-        super.setGranularity(granularity);
-    }
-
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         super.initializeExtraResults(parentResult);
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
index cd9b6d565e7..657af57bd8d 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
@@ -341,22 +341,6 @@ private static class Counter{
         int num;
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
     public void setAddTimestamp(boolean selected) {
         setProperty(ADD_TIMESTAMP, selected, false);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java b/src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java
index ffb8e63eeac..66f0f11e166 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java
@@ -43,11 +43,6 @@ public String getLabelResource() {
         return "summariser_title"; //$NON-NLS-1$
     }
 
-    @Override
-    public void configure(TestElement el) {
-        super.configure(el);
-    }
-
     /**
      * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
      */
diff --git a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
index 5299724caa7..48cc24f1865 100644
--- a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
+++ b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
@@ -79,11 +79,6 @@ public String getStaticLabel() {
         return "Test Generator"; // $NON-NLS-1$
     }
 
-    @Override
-    public String getDocAnchor() {
-        return super.getDocAnchor();
-    }
-
     @Override
     public Collection<String> getMenuCategories() {
         return Arrays.asList(MenuFactory.NON_TEST_ELEMENTS);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
index e68eb36ac40..22ffd43dee1 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
@@ -95,6 +95,7 @@ public boolean applies(ConfigTestElement configElement) {
     }
 
     @Override
+    @SuppressWarnings("RedundantOverride")
     public Object clone() {
         return super.clone();
     }

From 8b413c0e1e5d10a7282cd73e0d2e1fa3f2703f10 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:27:27 +0300
Subject: [PATCH 0411/1037] style: remove unnecessary default cases in enum
 switch

See https://errorprone.info/bugpattern/UnnecessaryDefaultInEnumSwitch
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts       | 6 +++++-
 config/checkstyle/checkstyle.xml                            | 1 -
 .../apache/jmeter/visualizers/backend/SamplerMetric.java    | 2 --
 .../src/main/java/org/apache/jmeter/ProxyAuthenticator.java | 2 --
 .../java/org/apache/jmeter/gui/action/AbstractAction.java   | 1 -
 .../src/main/java/org/apache/jmeter/gui/action/Start.java   | 1 -
 .../main/java/org/apache/jmeter/save/CSVSaveService.java    | 2 --
 .../main/java/org/apache/jmeter/functions/ChangeCase.java   | 2 --
 .../main/java/org/apache/jmeter/functions/LogFunction.java  | 2 --
 .../jmeter/protocol/http/parser/LagartoBasedHtmlParser.java | 2 --
 .../org/apache/jmeter/protocol/http/proxy/ProxyControl.java | 2 --
 .../jmeter/protocol/http/sampler/HTTPAbstractImpl.java      | 5 +----
 12 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 577b998892a..6fc79a8497a 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -46,8 +46,12 @@ if (buildParameters.enableErrorprone) {
             options.errorprone {
                 disableWarningsInGeneratedCode.set(true)
                 enable(
+                    "MissingDefault",
                     "PackageLocation",
-                    "RedundantOverride"
+                    "RedundantOverride",
+                    "StronglyTypeTime",
+                    "UnescapedEntity",
+                    "UnnecessaryDefaultInEnumSwitch"
                 )
                 disable(
                     "ComplexBooleanConstant",
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 75128be884c..64b890e240c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -109,7 +109,6 @@
       <property name="classes" value="java.lang.Boolean"/>
     </module>
     <module name="IllegalThrows"/>
-    <module name="MissingSwitchDefault"/>
     <module name="ModifiedControlVariable"/>
     <module name="MultipleVariableDeclarations"/>
     <module name="NestedForDepth"/>
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index 3e0fc509b65..bacea442f40 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -187,8 +187,6 @@ public synchronized void resetForTimeInterval() {
                 stat.clear();
             }
             break;
-        default:
-            // This cannot happen
         }
         errors.clear();
         successes = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java b/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
index d4c7aced124..b4154e7dbad 100644
--- a/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
+++ b/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
@@ -60,8 +60,6 @@ protected PasswordAuthentication getPasswordAuthentication() {
                 return new PasswordAuthentication(userName, password);
             case SERVER:
                 break;
-            default:
-                break;
         }
         return null;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
index 6f81d9ab0b3..7cd714943b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
@@ -102,7 +102,6 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
                             return false;
                         }
                     case ASK:
-                    default:
                         String[] option = new String[]{JMeterUtils.getResString("concat_result"),
                                 JMeterUtils.getResString("dont_start"), JMeterUtils.getResString("replace_file")};
                         String question = MessageFormat.format(
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
index 712bb965b24..35ba7eac81b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
@@ -285,7 +285,6 @@ private ListedHashTree cloneTree(HashTree testTree, RunMode runMode) {
                 cloner = new TreeClonerNoTimer(false);
                 break;
             case AS_IS:
-            default:
                 cloner = new TreeCloner(false);
                 break;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index fc13865c553..b9da12d7ea6 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -1075,8 +1075,6 @@ public static String[] csvReadFile(BufferedReader infile, char delim)
                                     + baos.toString() + "]");
                 }
                 break;
-            default:
-                throw new IllegalStateException("Unexpected state " + state);
             } // switch(state)
             if (push) {
                 if (ch == '\r') {// Remove following \n if present
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index 56a98b9fd1b..2798ca48c5c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -90,8 +90,6 @@ protected String changeCase(String originalString, String mode) {
             case CAPITALIZE:
                 targetString = StringUtils.capitalize(originalString);
                 break;
-            default:
-                // default not doing nothing to string
             }
         } else {
             LOGGER.error("Unknown mode {}, returning {} unchanged", mode, targetString);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
index 6ea2d48d04b..cd729cb850d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
@@ -175,8 +175,6 @@ static synchronized void logDetails(Logger logger, String stringToLog, String pr
                 case TRACE:
                     logger.trace("{} {} {}", threadName, separator, stringToLog, throwable);
                     break;
-                default:
-                    throw new IllegalStateException("Invalid log level");
             }
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 781be99f617..8dcdd798ec0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -181,8 +181,6 @@ public void tag(Tag tag) {
                 break;
             case END:
                 break;
-            default:
-                throw new IllegalStateException("Unexpected tagType " + tagType);
             }
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 6c0335109f1..8fa079bc7f5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -1532,8 +1532,6 @@ private void initKeyStore() throws IOException, GeneralSecurityException {
             break;
         case NONE:
             throw new IOException("Cannot find keytool application and no keystore was provided");
-        default:
-            throw new IllegalStateException("Impossible case: " + KEYSTORE_MODE);
         }
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
index 338daa273c9..8323270f604 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
@@ -246,7 +246,6 @@ protected InetAddress getIpSourceAddress() throws UnknownHostException, SocketEx
                 ipClass = Inet6Address.class;
                 break;
             case HOSTNAME:
-            default:
                 return InetAddress.getByName(ipSource);
             }
 
@@ -596,10 +595,8 @@ protected HTTPSampleResult updateSampleResultForResourceInCache(HTTPSampleResult
                 res.setResponseMessage(RETURN_CUSTOM_STATUS_MESSAGE);
                 res.setSuccessful(true);
                 return res;
-            default:
-                // Cannot happen
-                throw new IllegalStateException("Unknown CACHED_RESOURCE_MODE");
         }
+        throw new IllegalStateException("Unknown CACHED_RESOURCE_MODE: " + CACHED_RESOURCE_MODE);
     }
 
     protected final void configureSampleLabel(SampleResult res, URL url) {

From 11466eab448ce90d4ee0502d283d193e4aa1c0ec Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:42:32 +0300
Subject: [PATCH 0412/1037] style: replace iterator with enhanced for loop

---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts      | 6 +++++-
 src/core/src/main/java/org/apache/jmeter/JMeter.java       | 7 ++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 6fc79a8497a..810d8969647 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -51,7 +51,11 @@ if (buildParameters.enableErrorprone) {
                     "RedundantOverride",
                     "StronglyTypeTime",
                     "UnescapedEntity",
-                    "UnnecessaryDefaultInEnumSwitch"
+                    "UnnecessaryAnonymousClass",
+                    "UnnecessaryDefaultInEnumSwitch",
+                )
+                warn(
+                    "ForEachIterable",
                 )
                 disable(
                     "ComplexBooleanConstant",
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index b885463dac4..9b459fd72b2 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -38,7 +38,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -971,13 +970,11 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
             if (deleteResultFile) {
                 SearchByClass<ResultCollector> resultListeners = new SearchByClass<>(ResultCollector.class);
                 clonedTree.traverse(resultListeners);
-                Iterator<ResultCollector> irc = resultListeners.getSearchResults().iterator();
-                while (irc.hasNext()) {
-                    ResultCollector rc = irc.next();
+                for (ResultCollector rc : resultListeners.getSearchResults()) {
                     File resultFile = new File(rc.getFilename());
                     if (resultFile.exists() && !resultFile.delete()) {
                         throw new IllegalStateException("Could not delete results file " + resultFile.getAbsolutePath()
-                            + "(canRead:"+resultFile.canRead()+", canWrite:"+resultFile.canWrite()+")");
+                                + "(canRead:" + resultFile.canRead() + ", canWrite:" + resultFile.canWrite() + ")");
                     }
                 }
             }

From 12aefb0c70526a61f955ba1dad7fe3e99200b0b2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 15:56:42 +0300
Subject: [PATCH 0413/1037] style: apply "private method can be static"
 inspection

See https://errorprone.info/bugpattern/MethodCanBeStatic
---
 .../kotlin/build-logic.errorprone.gradle.kts  |  1 +
 .../jmeter/assertions/CompareAssertion.java   |  4 +-
 .../jmeter/assertions/HTMLAssertion.java      |  2 +-
 .../jmeter/assertions/XMLSchemaAssertion.java |  2 +-
 .../jmeter/assertions/gui/AssertionGui.java   |  6 +--
 .../jmeter/assertions/gui/XPath2Panel.java    |  4 +-
 .../jmespath/JMESPathAssertion.java           |  2 +-
 .../org/apache/jmeter/config/CSVDataSet.java  |  2 +-
 .../jmeter/config/CSVDataSetBeanInfo.java     |  2 +-
 .../jmeter/control/IncludeController.java     |  4 +-
 .../jmeter/control/ModuleController.java      |  2 +-
 .../control/gui/ModuleControllerGui.java      |  6 +--
 .../jmeter/extractor/BoundaryExtractor.java   | 14 +++---
 .../jmeter/extractor/DebugPostProcessor.java  |  4 +-
 .../jmeter/extractor/HtmlExtractor.java       |  2 +-
 .../jmeter/extractor/JSoupExtractor.java      |  2 +-
 .../jmeter/extractor/JoddExtractor.java       |  2 +-
 .../jmeter/extractor/RegexExtractor.java      | 18 ++++----
 .../jmeter/extractor/XPath2Extractor.java     |  4 +-
 .../jmeter/extractor/XPathExtractor.java      |  4 +-
 .../extractor/gui/BoundaryExtractorGui.java   |  6 +--
 .../extractor/gui/HtmlExtractorGui.java       |  6 +--
 .../extractor/gui/RegexExtractorGui.java      |  6 +--
 .../extractor/gui/XPathExtractorGui.java      |  6 +--
 .../json/jmespath/JMESPathExtractor.java      |  8 ++--
 .../jmespath/gui/JMESPathExtractorGui.java    |  6 +--
 .../extractor/json/jsonpath/JSONManager.java  |  2 +-
 .../json/jsonpath/JSONPostProcessor.java      | 10 ++---
 .../jsonpath/gui/JSONPostProcessorGui.java    |  8 ++--
 .../json/render/RenderAsJsonRenderer.java     |  2 +-
 .../ExportTransactionAndSamplerNames.java     |  2 +-
 .../jmeter/modifiers/SampleTimeout.java       |  4 +-
 .../modifiers/gui/UserParametersGui.java      |  2 +-
 .../apache/jmeter/sampler/DebugSampler.java   |  2 +-
 .../timers/ConstantThroughputTimer.java       |  2 +-
 .../ConstantPoissonProcessGenerator.java      |  2 +-
 .../visualizers/AssertionVisualizer.java      |  2 +-
 .../apache/jmeter/visualizers/AxisGraph.java  |  4 +-
 .../jmeter/visualizers/GraphVisualizer.java   |  6 +--
 .../jmeter/visualizers/MailerVisualizer.java  |  2 +-
 .../jmeter/visualizers/RenderAsXML.java       |  8 ++--
 .../jmeter/visualizers/RenderAsXPath.java     |  2 +-
 .../jmeter/visualizers/RenderAsXPath2.java    |  4 +-
 .../visualizers/RespTimeGraphChart.java       |  4 +-
 .../visualizers/RespTimeGraphVisualizer.java  |  2 +-
 .../jmeter/visualizers/SamplerResultTab.java  |  2 +-
 .../jmeter/visualizers/SearchTreePanel.java   |  4 +-
 .../visualizers/StatGraphVisualizer.java      |  2 +-
 .../ViewResultsFullVisualizer.java            | 14 +++---
 .../XMLDefaultMutableTreeNode.java            | 12 ++---
 .../backend/BackendListenerGui.java           |  6 +--
 .../backend/influxdb/HttpMetricsSender.java   |  2 +-
 .../InfluxDBRawBackendListenerClient.java     |  4 +-
 .../main/java/org/apache/jmeter/JMeter.java   | 20 ++++-----
 .../jmeter/engine/StandardJMeterEngine.java   |  6 +--
 .../jmeter/engine/util/FunctionParser.java    |  2 +-
 .../util/ReplaceFunctionsWithStrings.java     |  2 +-
 .../jmeter/engine/util/SimpleVariable.java    |  2 +-
 .../jmeter/engine/util/ValueReplacer.java     |  4 +-
 .../jmeter/functions/gui/FunctionHelper.java  |  6 +--
 .../org/apache/jmeter/gui/GuiPackage.java     |  2 +-
 .../java/org/apache/jmeter/gui/MainFrame.java | 12 ++---
 .../org/apache/jmeter/gui/OnErrorPanel.java   |  2 +-
 .../jmeter/gui/action/AboutCommand.java       |  6 +--
 .../jmeter/gui/action/AbstractAction.java     |  2 +-
 .../jmeter/gui/action/ActionRouter.java       |  6 +--
 .../apache/jmeter/gui/action/AddParent.java   |  4 +-
 .../action/AddThinkTimeBetweenEachStep.java   |  8 ++--
 .../gui/action/ApplyNamingConvention.java     |  2 +-
 .../jmeter/gui/action/ChangeParent.java       |  2 +-
 .../gui/action/CollapseExpandTreeBranch.java  |  2 +-
 .../jmeter/gui/action/EnableComponent.java    |  4 +-
 .../gui/action/HtmlReportGenerator.java       |  4 +-
 .../jmeter/gui/action/LoadRecentProject.java  |  2 +-
 .../org/apache/jmeter/gui/action/Move.java    |  2 +-
 .../jmeter/gui/action/OpenLinkAction.java     |  2 +-
 .../org/apache/jmeter/gui/action/Paste.java   |  2 +-
 .../apache/jmeter/gui/action/RemoteStart.java |  4 +-
 .../jmeter/gui/action/SSLManagerCommand.java  |  4 +-
 .../org/apache/jmeter/gui/action/Save.java    | 12 ++---
 .../jmeter/gui/action/SaveGraphics.java       |  2 +-
 .../jmeter/gui/action/SearchTreeCommand.java  |  2 +-
 .../jmeter/gui/action/SearchTreeDialog.java   |  6 +--
 .../gui/action/SelectTemplatesDialog.java     |  6 +--
 .../org/apache/jmeter/gui/action/Start.java   |  8 ++--
 .../gui/action/template/TemplateManager.java  |  6 +--
 .../gui/menu/StaticJMeterGUIComponent.java    |  2 +-
 .../jmeter/gui/tree/JMeterTreeListener.java   |  2 +-
 .../jmeter/gui/tree/JMeterTreeModel.java      |  8 ++--
 .../apache/jmeter/gui/util/JMeterMenuBar.java |  6 +--
 .../jmeter/gui/util/JSyntaxSearchToolBar.java |  2 +-
 .../org/apache/jmeter/gui/util/MenuInfo.java  |  2 +-
 .../jmeter/gui/util/TextAreaCellRenderer.java |  2 +-
 .../jmeter/gui/util/TristateCheckBox.java     |  4 +-
 .../apache/jmeter/plugin/PluginManager.java   |  6 +--
 .../dashboard/HtmlTemplateExporter.java       | 12 ++---
 .../jmeter/report/dashboard/JsonExporter.java |  2 +-
 .../report/dashboard/ReportGenerator.java     | 24 +++++-----
 .../processor/ApdexSummaryConsumer.java       |  2 +-
 .../report/processor/CsvFileSampleSource.java |  4 +-
 .../processor/StatisticsSummaryConsumer.java  |  4 +-
 .../graph/AbstractGraphConsumer.java          |  8 ++--
 .../ResponseTimePerSampleGraphConsumer.java   |  2 +-
 ...eTimePercentilesOverTimeGraphConsumer.java | 12 ++---
 .../apache/jmeter/reporters/ResultSaver.java  |  2 +-
 .../apache/jmeter/reporters/Summariser.java   |  2 +-
 .../jmeter/reporters/gui/ResultSaverGui.java  |  8 ++--
 .../jmeter/rmi/SSLRMIClientSocketFactory.java |  2 +-
 .../jmeter/rmi/SSLRMIServerSocketFactory.java |  2 +-
 .../samplers/DataStrippingSampleSender.java   |  4 +-
 .../org/apache/jmeter/samplers/Entry.java     |  2 +-
 .../jmeter/save/SaveGraphicsService.java      |  2 +-
 .../jmeter/save/ScriptWrapperConverter.java   |  2 +-
 .../SampleSaveConfigurationConverter.java     |  2 +-
 .../apache/jmeter/services/FileServer.java    |  6 +--
 .../testbeans/gui/BooleanPropertyEditor.java  |  2 +-
 .../jmeter/testbeans/gui/FileEditor.java      |  2 +-
 .../gui/GenericTestBeanCustomizer.java        |  4 +-
 .../jmeter/testbeans/gui/TableEditor.java     |  8 ++--
 .../jmeter/testbeans/gui/TestBeanGUI.java     |  2 +-
 .../jmeter/testbeans/gui/WrapperEditor.java   | 10 ++---
 .../AbstractScopedTestElement.java            |  4 +-
 .../testelement/AbstractTestElement.java      |  2 +-
 .../apache/jmeter/threads/JMeterThread.java   | 16 +++----
 .../apache/jmeter/threads/SamplePackage.java  |  4 +-
 .../apache/jmeter/threads/TestCompiler.java   |  6 +--
 .../apache/jmeter/threads/ThreadGroup.java    |  8 ++--
 .../threads/gui/AbstractThreadGroupGui.java   |  4 +-
 .../jmeter/util/BSFJavaScriptEngine.java      |  2 +-
 .../util/HttpSSLProtocolSocketFactory.java    |  6 +--
 .../jmeter/util/keystore/JmeterKeyStore.java  | 12 ++---
 .../functions/DigestEncodeFunction.java       |  2 +-
 .../apache/jmeter/functions/JavaScript.java   |  4 +-
 .../apache/jmeter/functions/RandomDate.java   |  2 +-
 .../functions/RandomFromMultipleVars.java     |  2 +-
 .../jmeter/functions/RegexFunction.java       | 14 +++---
 .../apache/jmeter/functions/TimeShift.java    |  4 +-
 .../jmeter/visualizers/GenerateTreeGui.java   |  8 ++--
 .../commons/cli/avalon/CLArgsParser.java      |  6 +--
 .../apache/jorphan/exec/SystemCommand.java    |  2 +-
 .../apache/jorphan/gui/JMeterUIDefaults.java  |  8 ++--
 .../apache/jorphan/reflect/ClassFinder.java   |  4 +-
 .../org/apache/jorphan/reflect/Functor.java   |  8 ++--
 .../jorphan/util/AlphaNumericComparator.java  |  4 +-
 .../protocol/bolt/sampler/BoltSampler.java    |  2 +-
 .../BoltTestElementBeanInfoSupport.java       |  2 +-
 .../protocol/ftp/sampler/FTPSampler.java      |  2 +-
 .../http/config/gui/GraphQLUrlConfigGui.java  |  2 +-
 .../http/config/gui/HttpDefaultsGui.java      |  2 +-
 .../protocol/http/control/AuthManager.java    |  6 +--
 .../protocol/http/control/CacheManager.java   | 24 +++++-----
 .../protocol/http/control/CookieManager.java  |  4 +-
 .../http/control/DNSCacheManager.java         |  4 +-
 .../control/DynamicKerberosSchemeFactory.java |  2 +-
 .../control/DynamicSPNegoSchemeFactory.java   |  2 +-
 .../http/control/HC4CookieHandler.java        |  2 +-
 .../http/control/gui/HttpTestSampleGui.java   |  2 +-
 .../protocol/http/curl/BasicCurlParser.java   |  6 +--
 .../jmeter/protocol/http/gui/CookiePanel.java |  2 +-
 .../protocol/http/gui/DNSCachePanel.java      |  6 +--
 .../protocol/http/gui/HTTPFileArgsPanel.java  |  6 +--
 .../gui/action/ParseCurlCommandAction.java    | 26 +++++------
 .../http/modifier/AnchorModifier.java         | 10 ++---
 .../http/modifier/URLRewritingModifier.java   | 12 ++---
 .../modifier/gui/RegExUserParametersGui.java  |  6 +--
 .../protocol/http/parser/CssParser.java       |  2 +-
 .../protocol/http/parser/HTMLParser.java      |  2 +-
 .../protocol/http/parser/JTidyHTMLParser.java |  4 +-
 .../http/parser/RegexpHTMLParser.java         | 10 ++---
 .../http/proxy/DefaultSamplerCreator.java     |  8 ++--
 .../protocol/http/proxy/HttpRequestHdr.java   |  6 +--
 .../jmeter/protocol/http/proxy/Proxy.java     | 10 ++---
 .../protocol/http/proxy/ProxyControl.java     | 44 +++++++++----------
 .../http/proxy/gui/ProxyControlGui.java       |  6 +--
 .../protocol/http/sampler/AjpSampler.java     |  4 +-
 .../protocol/http/sampler/HTTPHC4Impl.java    | 40 ++++++++---------
 .../protocol/http/sampler/HTTPJavaImpl.java   | 16 +++----
 .../http/sampler/HTTPSamplerBase.java         | 16 +++----
 .../protocol/http/sampler/PostWriter.java     |  8 ++--
 .../sampler/hc/LaxDeflateInputStream.java     |  2 +-
 .../http/sampler/hc/LaxGZIPInputStream.java   |  2 +-
 .../protocol/http/util/HTTPFileArg.java       |  2 +-
 .../http/util/HTTPResultConverter.java        |  2 +-
 .../http/util/accesslog/SessionFilter.java    |  6 +--
 .../http/visualizers/RequestViewHTTP.java     |  6 +--
 .../java/sampler/JavaSamplerContext.java      |  4 +-
 .../jmeter/protocol/java/test/JavaTest.java   |  2 +-
 .../jmeter/protocol/java/test/SleepTest.java  |  2 +-
 .../jdbc/AbstractJDBCTestElement.java         |  6 +--
 .../config/DataSourceElementBeanInfo.java     |  4 +-
 .../jms/client/ReceiveSubscriber.java         |  4 +-
 .../protocol/jms/sampler/JMSSampler.java      |  4 +-
 .../jms/sampler/SubscriberSampler.java        |  2 +-
 .../protocol/java/sampler/JUnitSampler.java   |  4 +-
 .../ldap/config/gui/LDAPArgumentsPanel.java   |  2 +-
 .../ldap/config/gui/LdapConfigGui.java        |  2 +-
 .../ldap/config/gui/LdapExtConfigGui.java     |  2 +-
 .../protocol/ldap/sampler/LDAPExtSampler.java | 14 +++---
 .../protocol/ldap/sampler/LDAPSampler.java    |  4 +-
 .../mail/sampler/MailReaderSampler.java       |  6 +--
 .../sampler/gui/MailReaderSamplerGui.java     |  8 ++--
 .../protocol/smtp/sampler/SmtpSampler.java    | 18 ++++----
 .../sampler/gui/SecuritySettingsPanel.java    |  1 +
 .../protocol/tcp/sampler/TCPClientImpl.java   |  2 +-
 .../protocol/tcp/sampler/TCPSampler.java      | 10 ++---
 .../jmeter/wiremock/WireMockExtension.java    |  4 +-
 206 files changed, 563 insertions(+), 563 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 810d8969647..5b3dd497bf1 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -56,6 +56,7 @@ if (buildParameters.enableErrorprone) {
                 )
                 warn(
                     "ForEachIterable",
+                    "MethodCanBeStatic",
                 )
                 disable(
                     "ComplexBooleanConstant",
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
index 8092f10c666..1dafa4c4ff9 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
@@ -126,7 +126,7 @@ private void compareContent(CompareAssertionResult result) {
         }
     }
 
-    private void markContentFailure(CompareAssertionResult result, String prevContent, SampleResult prevResult,
+    private static void markContentFailure(CompareAssertionResult result, String prevContent, SampleResult prevResult,
             SampleResult currentResult, String currentContent) {
         result.setFailure(true);
         StringBuilder sb = new StringBuilder();
@@ -140,7 +140,7 @@ private void markContentFailure(CompareAssertionResult result, String prevConten
         result.setFailureMessage(JMeterUtils.getResString("comparison_differ_content")); //$NON-NLS-1$
     }
 
-    private void appendResultDetails(StringBuilder buf, SampleResult result) {
+    private static void appendResultDetails(StringBuilder buf, SampleResult result) {
         final String samplerData = result.getSamplerData();
         if (samplerData != null) {
             buf.append(samplerData.trim());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index 6e93c7e82c8..a7fbc6fb0e1 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -264,7 +264,7 @@ public void setErrorsOnly(boolean inErrorsOnly) {
         setProperty(new BooleanProperty(ERRORS_ONLY_KEY, inErrorsOnly));
     }
 
-    private long capToZero(long value) {
+    private static long capToZero(long value) {
         if (value == Long.MAX_VALUE) {
             return 0;
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
index 793ce0e47fa..17b949a204f 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
@@ -80,7 +80,7 @@ public String getXsdFileName() {
         return getPropertyAsString(XSD_FILENAME_KEY);
     }
 
-    private void setSchemaResult(AssertionResult result, String xmlStr, String xsdFileName) {
+    private static void setSchemaResult(AssertionResult result, String xmlStr, String xsdFileName) {
         try {
             DocumentBuilderFactory parserFactory = DocumentBuilderFactory.newInstance();
             parserFactory.setValidating(true);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
index 2216418ab52..c4b252c0208 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
@@ -370,20 +370,20 @@ private JPanel createFieldPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JToggleButton button, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JToggleButton button, GridBagConstraints gbc) {
         panel.add(button, gbc.clone());
         gbc.gridx++;
         gbc.fill=GridBagConstraints.HORIZONTAL;
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
index d5f89283ed3..61789d25ddb 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
@@ -102,7 +102,7 @@ private JPanel makeParameterPanel() {
 
         return panel;
     }
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
@@ -110,7 +110,7 @@ private void resetContraints(GridBagConstraints gbc) {
         gbc.fill = GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index 624be969dea..780ea8ce792 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -122,7 +122,7 @@ private String buildFailureMessage(boolean invert) {
         return message.toString();
     }
 
-    private void addNegation(boolean invert, StringBuilder message) {
+    private static void addNegation(boolean invert, StringBuilder message) {
         if (invert) {
             message.append(" not");
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index f08a5f34f08..d7364c50361 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -242,7 +242,7 @@ private void setAlias(final JMeterContext context, String alias) {
      * trim content of array varNames
      * @param varsNames
      */
-    private void trimVarNames(String[] varsNames) {
+    private static void trimVarNames(String[] varsNames) {
         for (int i = 0; i < varsNames.length; i++) {
             varsNames[i] = varsNames[i].trim();
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
index 409cbc22c88..ebbc5890a8a 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
@@ -131,7 +131,7 @@ public static String[] getShareTags() {
      * list from https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
      * @return a String[] with the list of file encoding
      */
-    private String[] getListFileEncoding() {
+    private static String[] getListFileEncoding() {
         return JOrphanUtils.split(JMeterUtils.getPropDefault("csvdataset.file.encoding_list", ""), "|"); //$NON-NLS-1$
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
index 2fd00cc725a..388dcf269eb 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
@@ -172,7 +172,7 @@ protected HashTree loadIncludedElements() {
      * @param tree HashTree included Test Plan
      * @return HashTree Subset within Test Fragment or Empty HashTree
      */
-    private HashTree getProperBranch(HashTree tree) {
+    private static HashTree getProperBranch(HashTree tree) {
         for (Object o : new ArrayList<>(tree.list())) {
             TestElement item = (TestElement) o;
 
@@ -192,7 +192,7 @@ private HashTree getProperBranch(HashTree tree) {
     }
 
 
-    private void removeDisabledItems(HashTree tree) {
+    private static void removeDisabledItems(HashTree tree) {
         for (Object o : new ArrayList<>(tree.list())) {
             TestElement item = (TestElement) o;
             if (!item.isEnabled()) {
diff --git a/src/components/src/main/java/org/apache/jmeter/control/ModuleController.java b/src/components/src/main/java/org/apache/jmeter/control/ModuleController.java
index 6bf5fe369f5..d010db4d949 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/ModuleController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/ModuleController.java
@@ -193,7 +193,7 @@ public HashTree getReplacementSubTree() {
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void createSubTree(HashTree tree, JMeterTreeNode node) {
+    private static void createSubTree(HashTree tree, JMeterTreeNode node) {
         Enumeration<?> e = node.children();
         while (e.hasMoreElements()) {
             JMeterTreeNode subNode = (JMeterTreeNode)e.nextElement();
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
index 5ace1edf505..0cf853e2ff7 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
@@ -203,7 +203,7 @@ public void configure(TestElement el) {
         reinitialize();
     }
 
-    private String renderPath(Collection<?> path) {
+    private static String renderPath(Collection<?> path) {
         Iterator<?> iter = path.iterator();
         StringBuilder buf = new StringBuilder();
         boolean first = true;
@@ -316,7 +316,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
      *
      * @return path of a found element
      */
-    private TreeNode[] findPathInTreeModel(
+    private static TreeNode[] findPathInTreeModel(
             int level, TreeNode[] testPlanPath, DefaultMutableTreeNode parent)
     {
         if (level >= testPlanPath.length) {
@@ -356,7 +356,7 @@ private void focusSelectedOnTree(JMeterTreeNode selected)
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) moduleToRunTreeNodes.getModel().getRoot();
         //treepath of test plan tree and module to run tree cannot be compared directly - moduleToRunTreeModel.getPathToRoot()
         //custom method for finding an JMeterTreeNode element in DefaultMutableTreeNode have to be used
-        TreeNode[] dmtnPath = this.findPathInTreeModel(1, filteredPath, root);
+        TreeNode[] dmtnPath = ModuleControllerGui.findPathInTreeModel(1, filteredPath, root);
         if (dmtnPath.length > 0) {
             TreePath treePath = new TreePath(dmtnPath);
             moduleToRunTreeNodes.setSelectionPath(treePath);
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index 87e910bc411..f43ba726c0e 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -162,7 +162,7 @@ private List<String> extractMatches(SampleResult previousResult, JMeterVariables
      * @param matches List of String
      * @return 0 if there is only one match, else the number of matches, this is used to remove
      */
-    private int saveMatches(JMeterVariables vars, String refName, int matchNumber, List<String> matches) {
+    private static int saveMatches(JMeterVariables vars, String refName, int matchNumber, List<String> matches) {
         if (matchNumber >=0 && matches.isEmpty()) {
             return 0;
         }
@@ -178,14 +178,14 @@ private int saveMatches(JMeterVariables vars, String refName, int matchNumber, L
         return matchCount;
     }
 
-    private void saveRandomMatch(JMeterVariables vars, String refName, List<String> matches) {
+    private static void saveRandomMatch(JMeterVariables vars, String refName, List<String> matches) {
         String match = matches.get(JMeterUtils.getRandomInt(matches.size()));
         if (match != null) {
             vars.put(refName, match);
         }
     }
 
-    private void saveOneMatch(JMeterVariables vars, String refName, List<String> matches) {
+    private static void saveOneMatch(JMeterVariables vars, String refName, List<String> matches) {
         if (matches.size() == 1) { // if not then invalid matchNum was likely supplied
             String match = matches.get(0);
             if (match != null) {
@@ -194,7 +194,7 @@ private void saveOneMatch(JMeterVariables vars, String refName, List<String> mat
         }
     }
 
-    private void saveAllMatches(JMeterVariables vars, String refName, List<String> matches) {
+    private static void saveAllMatches(JMeterVariables vars, String refName, List<String> matches) {
         vars.put(refName + REF_MATCH_NR, Integer.toString(matches.size()));
         for (int i = 0; i < matches.size(); i++) {
             String match = matches.get(i);
@@ -236,7 +236,7 @@ private String chosenInput(SampleResult result) {
         return result.getResponseDataAsString(); // Bug 36898
     }
 
-    private List<String> extract(
+    private static List<String> extract(
             String leftBoundary, String rightBoundary, int matchNumber, Stream<String> previousResults) {
         boolean allItems = matchNumber <= 0;
         return previousResults
@@ -257,7 +257,7 @@ private List<String> extract(
      * @param inputString   text in which to look for the fragments
      * @return list where the found text fragments will be placed
      */
-    private List<String> extract(String leftBoundary, String rightBoundary, int matchNumber, String inputString) {
+    private static List<String> extract(String leftBoundary, String rightBoundary, int matchNumber, String inputString) {
         if (StringUtils.isBlank(inputString)) {
             return Collections.emptyList();
         }
@@ -302,7 +302,7 @@ private List<String> extract(String leftBoundary, String rightBoundary, int matc
         return Collections.unmodifiableList(matches);
     }
 
-    public List<String> extractAll(
+    public static List<String> extractAll(
             String leftBoundary, String rightBoundary, String textToParse) {
         return extract(leftBoundary, rightBoundary, -1, textToParse);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java
index 47c99056903..c4197c974a7 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java
@@ -97,7 +97,7 @@ public void process(){
         threadContext.getPreviousResult().addSubResult(sr);
     }
 
-    private void formatPropertyIterator(StringBuilder sb, PropertyIterator iter) {
+    private static void formatPropertyIterator(StringBuilder sb, PropertyIterator iter) {
         Map<String, String> map = new HashMap<>();
         while (iter.hasNext()) {
             JMeterProperty item = iter.next();
@@ -106,7 +106,7 @@ private void formatPropertyIterator(StringBuilder sb, PropertyIterator iter) {
         formatSet(sb, map.entrySet());
     }
 
-    private void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
+    private static void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
         @SuppressWarnings("unchecked")
         List<Map.Entry<Object, Object>> al = new ArrayList<>(s);
         al.sort(AlphaNumericKeyComparator.INSTANCE);
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
index af1fe30805c..b7ed581f83d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
@@ -145,7 +145,7 @@ public void process() {
      * @param entry   the entry number in the list
      * @return MatchResult
      */
-    private String getCorrectMatch(List<String> matches, int entry) {
+    private static String getCorrectMatch(List<String> matches, int entry) {
         int matchSize = matches.size();
 
         if (matchSize <= 0 || entry > matchSize){
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
index 91ec23c7b8a..b9fbab4bba8 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
@@ -78,7 +78,7 @@ public int extract(String expression, String attribute, int matchNumber,
      * @param element Element
      * @return String value
      */
-    private String extractValue(String attribute, Element element) {
+    private static String extractValue(String attribute, Element element) {
         if (!JOrphanUtils.isBlank(attribute)) {
             return element.attr(attribute);
         } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
index 8ac009502d4..1296ce87611 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
@@ -94,7 +94,7 @@ public int extract(String expression, String attribute, int matchNumber,
     }
 
 
-    private String extractValue(String attribute, Node element) {
+    private static String extractValue(String attribute, Node element) {
         if (!JOrphanUtils.isBlank(attribute)) {
             return element.getAttribute(attribute);
         } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 6073551b3d4..c80360712b4 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -312,7 +312,7 @@ private List<java.util.regex.MatchResult> processMatches(
         return Collections.unmodifiableList(matches);
     }
 
-    private int matchStrings(int matchNumber, Perl5Matcher matcher,
+    private static int matchStrings(int matchNumber, Perl5Matcher matcher,
             Pattern pattern, List<MatchResult> matches, int found,
             String inputString) {
         PatternMatcherInput input = new PatternMatcherInput(inputString);
@@ -328,9 +328,9 @@ private int matchStrings(int matchNumber, Perl5Matcher matcher,
         return found;
     }
 
-    private int matchStrings(int matchNumber, java.util.regex.Pattern pattern,
-                             List<java.util.regex.MatchResult> matches, int found,
-                             String inputString) {
+    private static int matchStrings(int matchNumber, java.util.regex.Pattern pattern,
+            List<java.util.regex.MatchResult> matches, int found,
+            String inputString) {
         Matcher matcher = pattern.matcher(inputString);
         while (matchNumber <=0 || found != matchNumber) {
             if (matcher.find()) {
@@ -349,7 +349,7 @@ private int matchStrings(int matchNumber, java.util.regex.Pattern pattern,
      * basename_gn, where n=0...# of groups<br/>
      * basename_g = number of groups (apart from g0)
      */
-    private void saveGroups(JMeterVariables vars, String basename, MatchResult match) {
+    private static void saveGroups(JMeterVariables vars, String basename, MatchResult match) {
         StringBuilder buf = new StringBuilder();
         buf.append(basename);
         buf.append("_g"); // $NON-NLS-1$
@@ -378,7 +378,7 @@ private void saveGroups(JMeterVariables vars, String basename, MatchResult match
         }
     }
 
-    private void saveGroups(JMeterVariables vars, String basename, java.util.regex.MatchResult match) {
+    private static void saveGroups(JMeterVariables vars, String basename, java.util.regex.MatchResult match) {
         StringBuilder buf = new StringBuilder();
         buf.append(basename);
         buf.append("_g"); // $NON-NLS-1$
@@ -412,7 +412,7 @@ private void saveGroups(JMeterVariables vars, String basename, java.util.regex.M
      * basename_gn, where n=0...# of groups<br/>
      * basename_g = number of groups (apart from g0)
      */
-    private void removeGroups(JMeterVariables vars, String basename) {
+    private static void removeGroups(JMeterVariables vars, String basename) {
         StringBuilder buf = new StringBuilder();
         buf.append(basename);
         buf.append("_g"); // $NON-NLS-1$
@@ -513,7 +513,7 @@ private void initTemplate() {
      *            the entry number in the list
      * @return MatchResult
      */
-    private MatchResult getCorrectMatch(List<MatchResult> matches, int entry) {
+    private static MatchResult getCorrectMatch(List<MatchResult> matches, int entry) {
         int matchSize = matches.size();
 
         if (matchSize <= 0 || entry > matchSize){
@@ -528,7 +528,7 @@ private MatchResult getCorrectMatch(List<MatchResult> matches, int entry) {
         return matches.get(entry - 1);
     }
 
-    private java.util.regex.MatchResult getCorrectMatchJavaRegex(List<java.util.regex.MatchResult> matches, int entry) {
+    private static java.util.regex.MatchResult getCorrectMatchJavaRegex(List<java.util.regex.MatchResult> matches, int entry) {
         int matchSize = matches.size();
 
         if (matchSize <= 0 || entry > matchSize){
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
index 77683d147b5..689a8e29af3 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
@@ -75,11 +75,11 @@ public class XPath2Extractor
     private static final String MATCH_NUMBER    = "XPathExtractor2.matchNumber"; // $NON-NLS-1$
     //- JMX file attributes
 
-    private String concat(String s1,String s2){
+    private static String concat(String s1, String s2){
         return s1 + "_" + s2; // $NON-NLS-1$
     }
 
-    private String concat(String s1, int i){
+    private static String concat(String s1, int i){
         return s1 + "_" + i; // $NON-NLS-1$
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
index 38eeb129e7c..5a60bd79815 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
@@ -90,11 +90,11 @@ public class XPathExtractor extends AbstractScopedTestElement implements
     //- JMX file attributes
 
 
-    private String concat(String s1,String s2){
+    private static String concat(String s1, String s2){
         return s1 + "_" + s2; // $NON-NLS-1$
     }
 
-    private String concat(String s1, int i){
+    private static String concat(String s1, int i){
         return s1 + "_" + i; // $NON-NLS-1$
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
index 24924ccb522..b3f1f041da3 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
@@ -259,7 +259,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -269,14 +269,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
index 4c82fa6b61e..2dc6d69895b 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
@@ -210,7 +210,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -220,14 +220,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
index d04bca325ff..02aeef2c005 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
@@ -244,7 +244,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -254,14 +254,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
index 179dfd0ae93..03705316529 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
@@ -152,7 +152,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -161,14 +161,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
         panel.add(item.get(1), gbc.clone());
     }
 
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
index 324fdbbdbe3..0001124d81c 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
@@ -115,12 +115,12 @@ public void process() {
         }
     }
 
-    private void handleSingleResult(JMeterVariables vars, String refName, int matchNumber, List<String> resultList) {
+    private static void handleSingleResult(JMeterVariables vars, String refName, int matchNumber, List<String> resultList) {
         String suffix = (matchNumber < 0) ? "_1" : "";
         placeObjectIntoVars(vars, refName + suffix, resultList, 0);
     }
 
-    private void handleListResult(JMeterVariables vars, String refName, String defaultValue, int matchNumber,
+    private static void handleListResult(JMeterVariables vars, String refName, String defaultValue, int matchNumber,
             List<String> resultList) {
         if (matchNumber < 0) {
             // Extract all
@@ -149,7 +149,7 @@ private void handleListResult(JMeterVariables vars, String refName, String defau
         }
     }
 
-    private void handleNullResult(JMeterVariables vars, String refName, String defaultValue, int matchNumber) {
+    private static void handleNullResult(JMeterVariables vars, String refName, String defaultValue, int matchNumber) {
         vars.put(refName, defaultValue);
         vars.put(refName + REF_MATCH_NR, "0"); //$NON-NLS-1$
         if (matchNumber < 0) {
@@ -214,7 +214,7 @@ void clearOldRefVars(JMeterVariables vars, String refName) {
         }
     }
 
-    private void placeObjectIntoVars(JMeterVariables vars, String refName, List<String> extractedValues, int matchNr) {
+    private static void placeObjectIntoVars(JMeterVariables vars, String refName, List<String> extractedValues, int matchNr) {
         vars.put(refName, extractedValues.get(matchNr));
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
index d358149e3ef..149bc656d4a 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
@@ -144,7 +144,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -153,14 +153,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
         panel.add(item.get(1), gbc.clone());
     }
 
-    private void nextLine(GridBagConstraints gbc) {
+    private static void nextLine(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill = GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
index c3f3371e64d..6d510318c4d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
@@ -88,7 +88,7 @@ public List<Object> extractWithJsonPath(String jsonString, String jsonPath)
     }
 
     @SuppressWarnings("unchecked")
-    private String stringifyJSONObject(Object obj) {
+    private static String stringifyJSONObject(Object obj) {
         if (obj instanceof Map) {
             return new JSONObject((Map<String, ?>) obj).toJSONString();
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index a20ea14c66a..d0244919514 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -108,7 +108,7 @@ private void handleResult(JMeterVariables vars, String defaultValue, int matchNu
         }
     }
 
-    private List<Object> extractValues(List<String> jsonResponses, String currentJsonPath) throws ParseException {
+    private static List<Object> extractValues(List<String> jsonResponses, String currentJsonPath) throws ParseException {
         List<Object> extractedValues = new ArrayList<>();
         for (String jsonResponse: jsonResponses) {
             extractedValues.addAll(localMatcher.get().extractWithJsonPath(jsonResponse, currentJsonPath));
@@ -130,7 +130,7 @@ private void handleNonEmptyResult(JMeterVariables vars, String defaultValue, int
         }
     }
 
-    private void validateSameLengthOfArguments(String[] refNames, String[] jsonPathExpressions,
+    private static void validateSameLengthOfArguments(String[] refNames, String[] jsonPathExpressions,
             String[] defaultValues) {
         if (refNames.length != jsonPathExpressions.length ||
                 refNames.length != defaultValues.length) {
@@ -236,20 +236,20 @@ private List<String> extractJsonResponse(JMeterContext context, JMeterVariables
         return Collections.emptyList();
     }
 
-    private void clearOldRefVars(JMeterVariables vars, String refName) {
+    private static void clearOldRefVars(JMeterVariables vars, String refName) {
         vars.remove(refName + REF_MATCH_NR);
         for (int i=1; vars.get(refName + "_" + i) != null; i++) {
             vars.remove(refName + "_" + i);
         }
     }
 
-    private void placeObjectIntoVars(JMeterVariables vars, String currentRefName,
+    private static void placeObjectIntoVars(JMeterVariables vars, String currentRefName,
             List<Object> extractedValues, int matchNr, String defaultValue) {
         vars.put(currentRefName,
                 StringUtils.defaultString(stringify(extractedValues.get(matchNr)), defaultValue));
     }
 
-    private String stringify(Object obj) {
+    private static String stringify(Object obj) {
         return obj == null ? null : obj.toString();
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
index 1aa7f0a8ab3..2f005570cb1 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
@@ -152,7 +152,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -161,7 +161,7 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
         panel.add(item.get(1), gbc.clone());
     }
 
-    private void addField(JPanel panel, JLabel label, JCheckBox checkBox, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabel label, JCheckBox checkBox, GridBagConstraints gbc) {
         panel.add(label, gbc.clone());
         gbc.gridx++;
         gbc.weightx = 1;
@@ -169,14 +169,14 @@ private void addField(JPanel panel, JLabel label, JCheckBox checkBox, GridBagCon
         panel.add(checkBox, gbc.clone());
     }
 
-    private void nextLine(GridBagConstraints gbc) {
+    private static void nextLine(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill = GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
index 5536b29ac04..e7d856db82c 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
@@ -70,7 +70,7 @@ protected String process(String textToParse) {
         }
     }
 
-    private List<Object> extractWithTechnology(String textToParse, String expression) throws Exception {
+    private static List<Object> extractWithTechnology(String textToParse, String expression) throws Exception {
         JSONManager jsonManager = new JSONManager();
         return jsonManager.extractWithJsonPath(textToParse, expression);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
index f2ffda3bbd2..b029679d06e 100644
--- a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
+++ b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
@@ -157,7 +157,7 @@ public void doAction(ActionEvent e) {
      * @param event {@link ActionEvent}
      * @param result String
      */
-    private final void showResult(ActionEvent event, String result) {
+    private static void showResult(ActionEvent event, String result) {
         EscapeDialog messageDialog = new EscapeDialog(getParentFrame(event),
                 JMeterUtils.getResString("export_transactions_title"), false); //$NON-NLS-1$
         Container contentPane = messageDialog.getContentPane();
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java b/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
index 5c8bf29a70d..04a715a3602 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
@@ -168,11 +168,11 @@ public String toString() {
         return JMeterUtils.getResString("sample_timeout_memo"); //$NON-NLS-1$
     }
 
-    private String whoAmI(String id, TestElement o) {
+    private static String whoAmI(String id, TestElement o) {
         return id + " @" + System.identityHashCode(o)+ " '"+ o.getName() + "' " + (log.isDebugEnabled() ?  Thread.currentThread().getName() : "");
     }
 
-    private String getInfo(TestElement o) {
+    private static String getInfo(TestElement o) {
         return whoAmI(o.getClass().getSimpleName(), o);
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
index ec152921164..76976912557 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
@@ -182,7 +182,7 @@ protected String getText(Object value, int row, int column) {
         perIterationCheck.setSelected(false);
     }
 
-    private String getUserColName(int user){
+    private static String getUserColName(int user){
         return USER_COL_RESOURCE+UNDERSCORE+user;
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
index 981ce3263af..9e7fdad2f93 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
@@ -88,7 +88,7 @@ public SampleResult sample(Entry e) {
         return res;
     }
 
-    private void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
+    private static void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
         @SuppressWarnings("unchecked")
         List<Map.Entry<Object, Object>> al = new ArrayList<>(s);
         al.sort(AlphaNumericKeyComparator.INSTANCE);
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 7b745b9c0fe..945f22f5619 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -217,7 +217,7 @@ private long calculateDelay() {
         return delay;
     }
 
-    private long calculateSharedDelay(ThroughputInfo info, long milliSecPerRequest) {
+    private static long calculateSharedDelay(ThroughputInfo info, long milliSecPerRequest) {
         final long now = System.currentTimeMillis();
         final long calculatedDelay;
 
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
index 14151f0e7b8..74100387837 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
@@ -145,7 +145,7 @@ public double next() {
         return events.get(events.position() - 1);
     }
 
-    private boolean valuesAreEqualWithPrecision(double throughput, double lastThroughput) {
+    private static boolean valuesAreEqualWithPrecision(double throughput, double lastThroughput) {
         return Math.abs(throughput - lastThroughput) < PRECISION;
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java
index e435de2e2be..201c04c86a3 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java
@@ -72,7 +72,7 @@ public void clearData() {
         textArea.setText(""); // $NON-NLS-1$
     }
 
-    private String getAssertionResult(SampleResult res) {
+    private static String getAssertionResult(SampleResult res) {
         if (res != null) {
             StringBuilder display = new StringBuilder();
             AssertionResult[] assertionResults = res.getAssertionResults();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
index e261b00cb0b..cd85bd073e8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
@@ -320,7 +320,7 @@ public void paintComponent(Graphics graphics) {
         }
     }
 
-    private double findMax(double[][] _data) {
+    private static double findMax(double[][] _data) {
         double max = _data[0][0];
         for (double[] dArray : _data) {
             for (double d : dArray) {
@@ -332,7 +332,7 @@ private double findMax(double[][] _data) {
         return max;
     }
 
-    private String squeeze(String input, int _maxLength) {
+    private static String squeeze(String input, int _maxLength) {
         if (input.length() > _maxLength) {
             return input.substring(0,_maxLength-ELLIPSIS_LEN)+ELLIPSIS;
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java
index 8c3910eb259..90a3af2ced7 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java
@@ -297,7 +297,7 @@ private JTextField createYAxisField(int length) {
      * @return a panel containing both the dynamic and static parts of a Y axis
      *         label
      */
-    private JPanel createYAxisPanel(String labelResourceName, JTextField field) {
+    private static JPanel createYAxisPanel(String labelResourceName, JTextField field) {
         JPanel panel = new JPanel(new FlowLayout());
         JLabel label = new JLabel(JMeterUtils.getResString(labelResourceName));
 
@@ -437,7 +437,7 @@ private JTextField createInfoField(Color color, int length) {
      * @param field
      *            the field this label is being created for.
      */
-    private JLabel createInfoLabel(String labelResourceName, JTextField field) {
+    private static JLabel createInfoLabel(String labelResourceName, JTextField field) {
         JLabel label = new JLabel(JMeterUtils.getResString(labelResourceName));
         label.setForeground(field.getForeground());
         label.setLabelFor(field);
@@ -469,7 +469,7 @@ private JLabel createInfoLabel(String labelResourceName, JTextField field) {
      *            parameter is null, this section of the panel will be left
      *            blank.
      */
-    private Box createInfoColumn(JLabel label1, JTextField field1, JLabel label2, JTextField field2) {
+    private static Box createInfoColumn(JLabel label1, JTextField field1, JLabel label2, JTextField field2) {
         // This column actually consists of a row with two sub-columns
         // The first column contains the labels, and the second
         // column contains the fields.
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
index aaaa0583ed2..474581ad698 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
@@ -419,7 +419,7 @@ private void updateVisualizer(MailerModel model) {
     /**
      * Shows a message using a DialogBox.
      */
-    private void displayMessage(String message, boolean isError) {
+    private static void displayMessage(String message, boolean isError) {
         int type = isError ? JOptionPane.ERROR_MESSAGE : JOptionPane.INFORMATION_MESSAGE;
         JOptionPane.showMessageDialog(null, message, isError ?
                 JMeterUtils.getResString("mailer_msg_title_error") :  // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
index 8717fc7cd13..093b7af72d4 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
@@ -149,7 +149,7 @@ private void expandAll(TreePath parent) {
         }
 
         @SuppressWarnings("JdkObsolete")
-        private void applyToChildren(TreePath parent, Consumer<TreePath> method) {
+        private static void applyToChildren(TreePath parent, Consumer<TreePath> method) {
             TreeNode node = (TreeNode) parent.getLastPathComponent();
             Enumeration<?> e = node.children();
             while (e.hasMoreElements()) {
@@ -201,7 +201,7 @@ public DOMTreePanel(org.w3c.dom.Document document) {
          *
          * @param parent {@link Node}
          */
-        private Node getFirstElement(Node parent) {
+        private static Node getFirstElement(Node parent) {
             NodeList childNodes = parent.getChildNodes();
             Node toReturn = parent; // Must return a valid node, or may generate an NPE
             for (int i = 0; i < childNodes.getLength(); i++) {
@@ -241,7 +241,7 @@ public Component getTreeCellRendererComponent(
             /**
              * get the html
              */
-            private String getHTML(String str, String separator, int maxChar) {
+            private static String getHTML(String str, String separator, int maxChar) {
                 StringBuilder strBuf = new StringBuilder("<html><body bgcolor=\"yellow\"><b>"); // $NON-NLS-1$
                 char[] chars = str.toCharArray();
                 for (int i = 0; i < chars.length; i++) {
@@ -257,7 +257,7 @@ private String getHTML(String str, String separator, int maxChar) {
 
             }
 
-            private String encode(char c) {
+            private static String encode(char c) {
                 String toReturn = String.valueOf(c);
                 switch (c) {
                     case '<': // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
index f8e6ea51e8e..df39c62e71f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
@@ -157,7 +157,7 @@ private String process(String textToParse, XPathExtractor extractor) {
      * @return Document
      *
      */
-    private Document parseResponse(String unicodeData, XPathExtractor extractor)
+    private static Document parseResponse(String unicodeData, XPathExtractor extractor)
       throws IOException, ParserConfigurationException,SAXException,TidyException
     {
       //TODO: validate contentType for reasonable types?
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
index 4dd8acf151a..e36484bf90f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
@@ -143,7 +143,7 @@ private String process(String textToParse, XPath2Extractor extractor) {
     }
 
 
-    private String getDocumentNamespaces(String textToParse) {
+    private static String getDocumentNamespaces(String textToParse) {
         StringBuilder result = new StringBuilder();
         try {
             List<String[]> namespaces = XPathUtil.getNamespaces(textToParse);
@@ -280,7 +280,7 @@ private JPanel createXpathExtractorTasksPanel() {
         return panel;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.fill = GridBagConstraints.HORIZONTAL;
         gbc.gridheight = 1;
         gbc.gridwidth = 1;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
index bc1af59f487..fec8117dbd8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
@@ -369,7 +369,7 @@ private void drawSample(String _title, String[] _xAxisLabels,
         }
     }
 
-    private int getTopValue(double value, RoundingMode roundingMode) {
+    private static int getTopValue(double value, RoundingMode roundingMode) {
         String maxStr = String.valueOf(Math.round(value));
         StringBuilder divValueStr = new StringBuilder(maxStr.length()+1);
         divValueStr.append("1");
@@ -399,7 +399,7 @@ public void paintComponent(Graphics graphics) {
      * @param datas array of positive or NaN doubles
      * @return double
      */
-    private double findMax(double[][] datas) {
+    private static double findMax(double[][] datas) {
         double max = 0;
         for (double[] data : datas) {
             for (final double value : data) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index a98701c0527..99e4da7dccd 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -278,7 +278,7 @@ public RespTimeGraphVisualizer() {
         init();
     }
 
-    private String[] keys(Map<String, ?> map) {
+    private static String[] keys(Map<String, ?> map) {
         return map.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index f0115931e17..7356f172295 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -646,7 +646,7 @@ public void setBackgroundColor(Color backGround){
         this.backGround = backGround;
     }
 
-    private void setFirstColumnPreferredSize(JTable table) {
+    private static void setFirstColumnPreferredSize(JTable table) {
         TableColumn column = table.getColumnModel().getColumn(0);
         column.setMaxWidth(300);
         column.setPreferredWidth(180);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
index 3530bd125ee..e4502ff985f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
@@ -151,7 +151,7 @@ public void actionPerformed(ActionEvent e) {
     /**
      * @param searchableTreeNode
      */
-    private void doResetSearch(SearchableTreeNode searchableTreeNode) {
+    private static void doResetSearch(SearchableTreeNode searchableTreeNode) {
         searchableTreeNode.reset();
         searchableTreeNode.updateState();
         for (int i = 0; i < searchableTreeNode.getChildCount(); i++) {
@@ -178,7 +178,7 @@ private boolean doSearch() {
      * @param searcher
      * @param node
      */
-    private boolean searchInNode(Searcher searcher, SearchableTreeNode node) {
+    private static boolean searchInNode(Searcher searcher, SearchableTreeNode node) {
         node.reset();
         Object userObject = node.getUserObject();
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 7a7cf73bbab..4490b6a49b6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -336,7 +336,7 @@ static final Object[][] getGraphColumnsMsgParameters() {
         };
     }
 
-    private String[] keys(Map<String, ?> map) {
+    private static String[] keys(Map<String, ?> map) {
         return map.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 3a549ba9c1e..329e3d21b46 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -234,7 +234,7 @@ private Object getSelectedObject() {
         return oldSelectedElement;
     }
 
-    private TreePath checkExpandedOrSelected(List<TreeNode> path,
+    private static TreePath checkExpandedOrSelected(List<TreeNode> path,
             Object item, Object oldSelectedObject,
             Set<Object> oldExpandedObjects, Set<TreePath> newExpandedPaths,
             TreePath defaultPath) {
@@ -248,7 +248,7 @@ private TreePath checkExpandedOrSelected(List<TreeNode> path,
         return result;
     }
 
-    private TreePath checkExpandedOrSelected(List<TreeNode> path,
+    private static TreePath checkExpandedOrSelected(List<TreeNode> path,
             Object item, Object oldSelectedObject,
             Set<Object> oldExpandedObjects, Set<TreePath> newExpandedPaths,
             TreePath defaultPath, DefaultMutableTreeNode extensionNode) {
@@ -262,7 +262,7 @@ private TreePath checkExpandedOrSelected(List<TreeNode> path,
         return result;
     }
 
-    private Set<Object> extractExpandedObjects(final Enumeration<TreePath> expandedElements) {
+    private static Set<Object> extractExpandedObjects(final Enumeration<TreePath> expandedElements) {
         if (expandedElements != null) {
             final List<TreePath> list = EnumerationUtils.toList(expandedElements);
             log.debug("Expanded: {}", list);
@@ -310,11 +310,11 @@ private TreePath addSubResults(DefaultMutableTreeNode currNode,
         return result;
     }
 
-    private TreePath toTreePath(List<TreeNode> newPath) {
+    private static TreePath toTreePath(List<TreeNode> newPath) {
         return new TreePath(newPath.toArray(new TreeNode[newPath.size()]));
     }
 
-    private TreePath toTreePath(List<TreeNode> path,
+    private static TreePath toTreePath(List<TreeNode> path,
             DefaultMutableTreeNode extensionNode) {
         TreeNode[] result = path.toArray(new TreeNode[path.size() + 1]);
         result[result.length - 1] = extensionNode;
@@ -490,7 +490,7 @@ private Component createComboRender() {
         }
         if (VIEWERS_ORDER.length() > 0) {
             Arrays.stream(VIEWERS_ORDER.split(","))
-                    .map(this::expandToClassname)
+                    .map(ViewResultsFullVisualizer::expandToClassname)
                     .forEach(key -> {
                         ResultRenderer renderer = map.remove(key);
                         if (renderer != null) {
@@ -509,7 +509,7 @@ private Component createComboRender() {
         return selectRenderPanel;
     }
 
-    private String expandToClassname(String name) {
+    private static String expandToClassname(String name) {
         if (name.startsWith(".")) {
             return "org.apache.jmeter.visualizers" + name; // $NON-NLS-1$
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
index a87a9f86504..88f83c0c8c6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
@@ -85,7 +85,7 @@ private void initRoot(Node xmlRoot) throws SAXException {
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initNode(Node node, XMLDefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initNode(Node node, XMLDefaultMutableTreeNode mTreeNode) throws SAXException {
 
         switch (node.getNodeType()) {
         case Node.ELEMENT_NODE:
@@ -118,7 +118,7 @@ private void initNode(Node node, XMLDefaultMutableTreeNode mTreeNode) throws SAX
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initElementNode(Node node, DefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initElementNode(Node node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String nodeName = node.getNodeName();
 
         NodeList childNodes = node.getChildNodes();
@@ -140,7 +140,7 @@ private void initElementNode(Node node, DefaultMutableTreeNode mTreeNode) throws
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initAttributeNode(Node node, DefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initAttributeNode(Node node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         NamedNodeMap nm = node.getAttributes();
         for (int i = 0; i < nm.getLength(); i++) {
             Attr nmNode = (Attr) nm.item(i);
@@ -158,7 +158,7 @@ private void initAttributeNode(Node node, DefaultMutableTreeNode mTreeNode) thro
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initCommentNode(Comment node, DefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initCommentNode(Comment node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String data = node.getData();
         if (data != null && data.length() > 0) {
             String value = "<!--" + node.getData() + "-->"; // $NON-NLS-1$ $NON-NLS-2$
@@ -174,7 +174,7 @@ private void initCommentNode(Comment node, DefaultMutableTreeNode mTreeNode) thr
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initCDATASectionNode(CDATASection node, DefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initCDATASectionNode(CDATASection node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String data = node.getData();
         if (data != null && data.length() > 0) {
             String value = "<!-[CDATA" + node.getData() + "]]>"; // $NON-NLS-1$ $NON-NLS-2$
@@ -190,7 +190,7 @@ private void initCDATASectionNode(CDATASection node, DefaultMutableTreeNode mTre
      * @param mTreeNode
      * @throws SAXException
      */
-    private void initTextNode(Text node, DefaultMutableTreeNode mTreeNode) throws SAXException {
+    private static void initTextNode(Text node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String text = node.getNodeValue().trim();
         if (text != null && text.length() > 0) {
             XMLDefaultMutableTreeNode textNode = new XMLDefaultMutableTreeNode(text, node);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
index f1714269094..dc98715df5f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
@@ -192,7 +192,7 @@ public void actionPerformed(ActionEvent event) {
     }
 
 
-    private Arguments copyDefaultArguments(Map<String, String> currArgsMap, Arguments defaultArgs) {
+    private static Arguments copyDefaultArguments(Map<String, String> currArgsMap, Arguments defaultArgs) {
         Arguments newArgs = new Arguments();
         if (defaultArgs != null) {
             for (JMeterProperty jMeterProperty : defaultArgs.getArguments()) {
@@ -217,7 +217,7 @@ private Arguments copyDefaultArguments(Map<String, String> currArgsMap, Argument
     }
 
 
-    private Arguments extractDefaultArguments(BackendListenerClient client, Map<String, String> userArgMap,
+    private static Arguments extractDefaultArguments(BackendListenerClient client, Map<String, String> userArgMap,
             Arguments currentUserArguments) {
         Arguments defaultArgs = null;
         try {
@@ -234,7 +234,7 @@ private Arguments extractDefaultArguments(BackendListenerClient client, Map<Stri
     }
 
 
-    private BackendListenerClient createBackendListenerClient(String newClassName)
+    private static BackendListenerClient createBackendListenerClient(String newClassName)
             throws ReflectiveOperationException {
         return Class.forName(newClassName, true,
                 Thread.currentThread().getContextClassLoader())
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
index 7dc5ed58e04..6a346000aca 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
@@ -132,7 +132,7 @@ public void setup(String influxdbUrl, String influxDBToken) throws Exception {
      * @return {@link HttpPost}
      * @throws URISyntaxException
      */
-    private HttpPost createRequest(URL url, String token) throws URISyntaxException {
+    private static HttpPost createRequest(URL url, String token) throws URISyntaxException {
         RequestConfig defaultRequestConfig = RequestConfig.custom()
                 .setConnectTimeout(JMeterUtils.getPropDefault("backend_influxdb.connection_timeout", 1000))
                 .setSocketTimeout(JMeterUtils.getPropDefault("backend_influxdb.socket_timeout", 3000))
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
index 0e781ce6108..f959691f177 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
@@ -116,7 +116,7 @@ private void addMetricFromSampleResult(SampleResult sampleResult) {
         influxDBMetricsManager.addMetric(measurement, tags, fields, timestamp);
     }
 
-    private String createTags(SampleResult sampleResult) {
+    private static String createTags(SampleResult sampleResult) {
         boolean isError = sampleResult.getErrorCount() != 0;
         String status = isError ? TAG_KO : TAG_OK;
         // remove surrounding quotes and spaces from sample label
@@ -128,7 +128,7 @@ private String createTags(SampleResult sampleResult) {
                 + ",threadName=" + threadName;
     }
 
-    private String createFields(SampleResult sampleResult) {
+    private static String createFields(SampleResult sampleResult) {
         long duration = sampleResult.getTime();
         long latency = sampleResult.getLatency();
         long connectTime = sampleResult.getConnectTime();
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 9b459fd72b2..ffe4637d489 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -508,7 +508,7 @@ private static DateTimeFormatter getFormatter(String pattern) {
      * @param deleteReportFolder true means delete report folder
      * @throws IllegalArgumentException
      */
-    private void extractAndSetReportOutputFolder(CLArgsParser parser, boolean deleteReportFolder) {
+    private static void extractAndSetReportOutputFolder(CLArgsParser parser, boolean deleteReportFolder) {
         CLOption reportOutputFolderOpt = parser
                 .getArgumentById(REPORT_OUTPUT_FOLDER_OPT);
         if(reportOutputFolderOpt != null) {
@@ -525,7 +525,7 @@ private void extractAndSetReportOutputFolder(CLArgsParser parser, boolean delete
     /**
      * Displays as ASCII Art Apache JMeter version + Copyright notice
      */
-    private void displayAsciiArt() {
+    private static void displayAsciiArt() {
         try (InputStream inputStream = JMeter.class.getResourceAsStream("jmeter_as_ascii_art.txt")) {
             if(inputStream != null) {
                 String text = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
@@ -538,13 +538,13 @@ private void displayAsciiArt() {
     }
 
     // Update classloader if necessary
-    private void updateClassLoader() throws MalformedURLException {
+    private static void updateClassLoader() throws MalformedURLException {
         updatePath("search_paths",";", true); //$NON-NLS-1$//$NON-NLS-2$
         updatePath("user.classpath",File.pathSeparator, true);//$NON-NLS-1$
         updatePath("plugin_dependency_paths",";", false);//$NON-NLS-1$
     }
 
-    private void updatePath(String property, String sep, boolean cp) throws MalformedURLException {
+    private static void updatePath(String property, String sep, boolean cp) throws MalformedURLException {
         String userpath= JMeterUtils.getPropDefault(property,"");// $NON-NLS-1$
         if (userpath.length() <= 0) {
             return;
@@ -571,7 +571,7 @@ private void updatePath(String property, String sep, boolean cp) throws Malforme
     /**
      *
      */
-    private void startOptionalServers() {
+    private static void startOptionalServers() {
         int bshport = JMeterUtils.getPropDefault("beanshell.server.port", 0);// $NON-NLS-1$
         String bshfile = JMeterUtils.getPropDefault("beanshell.server.file", "");// $NON-NLS-1$ $NON-NLS-2$
         if (bshport > 0) {
@@ -600,7 +600,7 @@ private void startOptionalServers() {
     /**
      * Runs user configured init scripts
      */
-    void runInitScripts() {
+    static void runInitScripts() {
         // Should we run a beanshell script on startup?
         String bshinit = JMeterUtils.getProperty("beanshell.init.file");// $NON-NLS-1$
         if (bshinit != null){
@@ -650,7 +650,7 @@ void runInitScripts() {
     }
 
 
-    private Map<String, List<String>> getEnginesAndExtensions(ScriptEngineManager scriptEngineManager) {
+    private static Map<String, List<String>> getEnginesAndExtensions(ScriptEngineManager scriptEngineManager) {
         return scriptEngineManager.getEngineFactories().stream()
                 .collect(Collectors.toMap(
                         f -> f.getLanguageName() + " (" + f.getLanguageVersion() + ")",
@@ -661,7 +661,7 @@ private Map<String, List<String>> getEnginesAndExtensions(ScriptEngineManager sc
      * Sets a proxy server for the JVM if the command line arguments are
      * specified.
      */
-    private void setProxy(CLArgsParser parser) throws IllegalUserActionException {
+    private static void setProxy(CLArgsParser parser) throws IllegalUserActionException {
         if (parser.getArgumentById(PROXY_USERNAME) != null) {
             Properties jmeterProps = JMeterUtils.getJMeterProperties();
             if (parser.getArgumentById(PROXY_PASSWORD) != null) {
@@ -879,7 +879,7 @@ private void initializeProperties(CLArgsParser parser) {
      * Checks for LAST or LASTsuffix.
      * Returns the LAST name with .JMX replaced by suffix.
      */
-    private String processLAST(final String jmlogfile, final String suffix) {
+    private static String processLAST(final String jmlogfile, final String suffix) {
         if (USE_LAST_JMX.equals(jmlogfile) || USE_LAST_JMX.concat(suffix).equals(jmlogfile)){
             String last = LoadRecentProject.getRecentFile(0);// most recent
             if (last.toUpperCase(Locale.ENGLISH).endsWith(JMX_SUFFIX)){
@@ -1273,7 +1273,7 @@ private void endTest(boolean isDistributed) {
          * Runs daemon thread which waits a short while;
          * if JVM does not exit, lists remaining non-daemon threads on stdout.
          */
-        private void checkForRemainingThreads() {
+        private static void checkForRemainingThreads() {
             // This cannot be a JMeter class variable, because properties
             // are not initialised until later.
             final int pauseToCheckForRemainingThreads =
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index d228a4fbaa3..af8b226f685 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -210,7 +210,7 @@ public void awaitTermination(Duration duration) throws ExecutionException, Inter
         runningTest.get(duration.toMillis(), TimeUnit.MILLISECONDS);
     }
 
-    private String formatLikeDate(Instant instant) {
+    private static String formatLikeDate(Instant instant) {
         return DateTimeFormatter
                 .ofLocalizedDateTime(FormatStyle.LONG)
                 .withLocale(Locale.ROOT)
@@ -218,7 +218,7 @@ private String formatLikeDate(Instant instant) {
                 .format(instant);
     }
 
-    private void removeThreadGroups(List<?> elements) {
+    private static void removeThreadGroups(List<?> elements) {
         Iterator<?> iter = elements.iterator();
         while (iter.hasNext()) { // Can't use for loop here because we remove elements
             Object item = iter.next();
@@ -607,7 +607,7 @@ public void exit() {
         }
     }
 
-    private void pause(long ms){
+    private static void pause(long ms){
         try {
             TimeUnit.MILLISECONDS.sleep(ms);
         } catch (InterruptedException e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
index f1dff442f43..eeea474a5ea 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
@@ -162,7 +162,7 @@ Object makeFunction(StringReader reader) throws InvalidVariableException {
         return buffer.toString();
     }
 
-    private char firstNonSpace(StringReader reader, char defaultResult) throws IOException {
+    private static char firstNonSpace(StringReader reader, char defaultResult) throws IOException {
         char[] current = new char[1];
         while (reader.read(current) == 1) {
             if (!Character.isSpaceChar(current[0])) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index 848b215e162..e4a2d45b38f 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -133,7 +133,7 @@ private JMeterProperty transformValueWithJavaRegex(JMeterProperty prop) throws I
      * @param value given by user
      * @return regex surrounded by boundary character matches, if value is not included in parens
      */
-    private String constructPattern(String value) {
+    private static String constructPattern(String value) {
         if (value.startsWith("(") && value.endsWith(")")) {
             return value;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java
index 35314ece75a..eb9222e48a1 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java
@@ -60,7 +60,7 @@ public String toString() {
         return ret;
     }
 
-    private JMeterVariables getVariables() {
+    private static JMeterVariables getVariables() {
         JMeterContext context = JMeterContextService.getContext();
         return context.getVariables();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
index 12d51d795f0..8f7678eea00 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
@@ -81,7 +81,7 @@ public void replaceValues(TestElement el) throws InvalidVariableException {
         setProperties(el, newProps);
     }
 
-    private void setProperties(TestElement el, Collection<JMeterProperty> newProps) {
+    private static void setProperties(TestElement el, Collection<JMeterProperty> newProps) {
         el.clear();
         for (JMeterProperty jmp : newProps) {
             el.setProperty(jmp);
@@ -155,7 +155,7 @@ public void addVariables(Map<String, String> vars) {
      * @return a new {@link Collection} with all the transformed {@link JMeterProperty}s
      * @throws InvalidVariableException when <code>transform</code> throws an {@link InvalidVariableException} while transforming a value
      */
-    private Collection<JMeterProperty> replaceValues(PropertyIterator iter, ValueTransformer transform) throws InvalidVariableException {
+    private static Collection<JMeterProperty> replaceValues(PropertyIterator iter, ValueTransformer transform) throws InvalidVariableException {
         List<JMeterProperty> props = new ArrayList<>();
         while (iter.hasNext()) {
             JMeterProperty val = iter.next();
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
index d03df4000ba..3284a182295 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
@@ -266,13 +266,13 @@ public void actionPerformed(ActionEvent e) {
         }
     }
 
-    private String variablesToString(JMeterVariables jMeterVariables) {
+    private static String variablesToString(JMeterVariables jMeterVariables) {
         StringBuilder sb = new StringBuilder();
         jMeterVariables.entrySet().forEach(e->sb.append(e.getKey()).append("=").append(e.getValue()).append("\r\n"));
         return sb.toString();
     }
 
-    private String buildFunctionCallString(String functionName, Arguments args) {
+    private static String buildFunctionCallString(String functionName, Arguments args) {
         StringBuilder functionCall = new StringBuilder("${");
         functionCall.append(functionName);
         if (args.getArguments().size() > 0) {
@@ -301,7 +301,7 @@ private String buildFunctionCallString(String functionName, Arguments args) {
      * @param arg string that should be escaped
      * @return escaped string
      */
-    private String escapeCommata(String arg) {
+    private static String escapeCommata(String arg) {
         int level = 0;
         StringBuilder result = new StringBuilder(arg.length());
         try (Reader r = new StringReader(arg)) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 928b7f0f832..04b7eb1ee15 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -904,7 +904,7 @@ public boolean canUndo() {
      * @param el {@link TestElement}
      * @return int checksum
      */
-    private int getTestElementCheckSum(TestElement el) {
+    private static int getTestElementCheckSum(TestElement el) {
         int ret = el.getClass().hashCode();
         PropertyIterator it = el.propertyIterator();
         while (it.hasNext()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 23003e6879a..d4377581463 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -627,7 +627,7 @@ private JScrollPane createTreePanel() {
      *
      * @return the main scroll pane
      */
-    private JScrollPane createMainPanel() {
+    private static JScrollPane createMainPanel() {
         return new JScrollPane();
     }
 
@@ -635,7 +635,7 @@ private JScrollPane createMainPanel() {
      * Create at the down of the left a Console for Log events
      * @return {@link LoggerPanel}
      */
-    private LoggerPanel createLoggerPanel() {
+    private static LoggerPanel createLoggerPanel() {
         LoggerPanel loggerPanel = new LoggerPanel();
         loggerPanel.setMinimumSize(new Dimension(0, 100));
         loggerPanel.setPreferredSize(new Dimension(0, 150));
@@ -703,7 +703,7 @@ public String getToolTipText(MouseEvent event) {
         return treevar;
     }
 
-    private void addQuickComponentHotkeys(JTree treevar) {
+    private static void addQuickComponentHotkeys(JTree treevar) {
         Action quickComponent = new QuickComponent("Quick Component");
 
         InputMap inputMap = treevar.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
@@ -722,7 +722,7 @@ private void addQuickComponentHotkeys(JTree treevar) {
      *
      * @return a renderer to draw the test tree nodes
      */
-    private TreeCellRenderer getCellRenderer() {
+    private static TreeCellRenderer getCellRenderer() {
         return new JMeterCellRenderer();
     }
 
@@ -767,7 +767,7 @@ public void actionPerformed(ActionEvent actionEvent) {
          * Bug 62336: On Windows CTRL+6 doesn't give us an actionCommand, so
          * we have to try harder and read the KeyEvent from the EventQueue
          */
-        private String getCurrentKey(ActionEvent actionEvent) {
+        private static String getCurrentKey(ActionEvent actionEvent) {
             String actionCommand = actionEvent.getActionCommand();
             if (actionCommand != null) {
                 return actionCommand;
@@ -904,7 +904,7 @@ public void actionPerformed(ActionEvent event) {
     /**
      * Define AWT window title (WM_CLASS string) (useful on Gnome 3 / Linux)
      */
-    private void setWindowTitle() {
+    private static void setWindowTitle() {
         Class<?> xtoolkit = Toolkit.getDefaultToolkit().getClass();
         if (xtoolkit.getName().equals("sun.awt.X11.XToolkit")) { // NOSONAR (we don't want to depend on native LAF) $NON-NLS-1$
             try {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java
index 7899a1a139a..8648efb520c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java
@@ -65,7 +65,7 @@ private JPanel createOnErrorPanel() {
         return panel;
     }
 
-    private JRadioButton addRadioButton(String labelKey, ButtonGroup group, JPanel panel) {
+    private static JRadioButton addRadioButton(String labelKey, ButtonGroup group, JPanel panel) {
         JRadioButton radioButton = new JRadioButton(JMeterUtils.getResString(labelKey));
         group.add(radioButton);
         panel.add(radioButton);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
index 8faae25625a..d2003800788 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
@@ -65,7 +65,7 @@ public class AboutCommand extends AbstractAction {
     @Override
     public void doAction(ActionEvent e) {
         if (e.getActionCommand().equals(ActionNames.ABOUT)) {
-            this.about();
+            AboutCommand.about();
         }
     }
 
@@ -82,7 +82,7 @@ public Set<String> getActionNames() {
      * the product image and the copyright notice. The dialog box is centered
      * over the MainFrame.
      */
-    private void about() {
+    private static void about() {
         JFrame mainFrame = GuiPackage.getInstance().getMainFrame();
         JDialog dialog = initDialog(mainFrame);
 
@@ -98,7 +98,7 @@ private void about() {
      * @param mainFrame {@link JFrame}
      * @return {@link JDialog} initializing it if necessary
      */
-    private JDialog initDialog(JFrame mainFrame) {
+    private static JDialog initDialog(JFrame mainFrame) {
         if (about != null) {
             return about;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
index 7cd714943b3..05195624971 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
@@ -144,7 +144,7 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
      * @param event {@link ActionEvent}
      * @return parent Window
      */
-    protected final JFrame getParentFrame(ActionEvent event) {
+    protected static JFrame getParentFrame(ActionEvent event) {
         JFrame parent = null;
         Object source = event.getSource();
         if (source instanceof JMenuItem) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
index 18433ccb418..53110bd3a94 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
@@ -221,7 +221,7 @@ public void removePreActionListener(Class<?> action, ActionListener listener) {
      * @param listener {@link ActionListener}
      * @param actionListeners {@link Set} of {@link ActionListener}
      */
-    private void removeActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
+    private static void removeActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> set = actionListeners.get(action.getName());
             if (set != null) {
@@ -251,7 +251,7 @@ public void addPostActionListener(Class<?> action, ActionListener listener) {
      * @param listener {@link ActionListener}
      * @param actionListeners {@link Set}
      */
-    private void addActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
+    private static void addActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> set = actionListeners.get(action.getName());
             if (set == null) {
@@ -297,7 +297,7 @@ void postActionPerformed(Class<? extends Command> action, ActionEvent e) {
      * @param e {@link ActionEvent}
      * @param actionListeners {@link Set}
      */
-    private void actionPerformed(Class<? extends Command> action, ActionEvent e, Map<String, Set<ActionListener>> actionListeners) {
+    private static void actionPerformed(Class<? extends Command> action, ActionEvent e, Map<String, Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> listenerSet = actionListeners.get(action.getName());
             if (listenerSet != null && !listenerSet.isEmpty()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
index 97b397b6274..32dad85108c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
@@ -62,7 +62,7 @@ public Set<String> getActionNames() {
         return commands;
     }
 
-    protected void addParentToTree(TestElement newParent) {
+    protected static void addParentToTree(TestElement newParent) {
         GuiPackage guiPackage = GuiPackage.getInstance();
         JMeterTreeNode newNode = new JMeterTreeNode(newParent, guiPackage.getTreeModel());
         JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
@@ -75,7 +75,7 @@ protected void addParentToTree(TestElement newParent) {
         }
     }
 
-    private void moveNode(GuiPackage guiPackage, JMeterTreeNode node, JMeterTreeNode newParentNode) {
+    private static void moveNode(GuiPackage guiPackage, JMeterTreeNode node, JMeterTreeNode newParentNode) {
         guiPackage.getTreeModel().removeNodeFromParent(node);
         guiPackage.getTreeModel().insertNodeInto(node, newParentNode, newParentNode.getChildCount());
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
index 2c1aa299464..b7966e79469 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
@@ -82,8 +82,8 @@ public void doAction(ActionEvent e) {
      * @param parentNode Parent node of elements on which we add think times
      * @throws IllegalUserActionException
      */
-    private void addThinkTimeToChildren(GuiPackage guiPackage,
-            JMeterTreeNode parentNode) throws IllegalUserActionException {
+    private static void addThinkTimeToChildren(GuiPackage guiPackage,
+                                               JMeterTreeNode parentNode) throws IllegalUserActionException {
         guiPackage.updateCurrentNode();
         boolean insertThinkTime;
         try {
@@ -118,7 +118,7 @@ private void addThinkTimeToChildren(GuiPackage guiPackage,
      * @param childNodes Child nodes
      * @param index insertion index
      */
-    private void addNodesToTreeHierachically(GuiPackage guiPackage,
+    private static void addNodesToTreeHierachically(GuiPackage guiPackage,
             JMeterTreeNode parentNode,
             JMeterTreeNode[] childNodes,
             int index) {
@@ -134,7 +134,7 @@ private void addNodesToTreeHierachically(GuiPackage guiPackage,
      * @throws ReflectiveOperationException when class instantiation for {@value #DEFAULT_IMPLEMENTATION} fails
      * @throws IllegalUserActionException when {@link ThinkTimeCreator#createThinkTime(GuiPackage, JMeterTreeNode)} throws this
      */
-    private JMeterTreeNode[] createThinkTime(GuiPackage guiPackage, JMeterTreeNode parentNode)
+    private static JMeterTreeNode[] createThinkTime(GuiPackage guiPackage, JMeterTreeNode parentNode)
             throws ReflectiveOperationException, IllegalUserActionException  {
         Class<?> clazz = Class.forName(DEFAULT_IMPLEMENTATION);
         ThinkTimeCreator thinkTimeCreator = (ThinkTimeCreator) clazz.getDeclaredConstructor().newInstance();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
index 3721ddd974e..2cda16bb13d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
@@ -80,7 +80,7 @@ public void doAction(ActionEvent e) {
      * @param currentNode Parent node of elements on which we apply naming policy
      */
     @SuppressWarnings("JdkObsolete")
-    private void applyNamingPolicyToCurrentNode(GuiPackage guiPackage,
+    private static void applyNamingPolicyToCurrentNode(GuiPackage guiPackage,
             JMeterTreeNode currentNode) {
         TreeNodeNamingPolicy namingPolicy = guiPackage.getNamingPolicy();
         guiPackage.updateCurrentNode();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
index 5ec312c2713..3396c51fed7 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
@@ -78,7 +78,7 @@ public Set<String> getActionNames() {
         return commands;
     }
 
-    private void changeParent(TestElement newParent, GuiPackage guiPackage, JMeterTreeNode currentNode) {
+    private static void changeParent(TestElement newParent, GuiPackage guiPackage, JMeterTreeNode currentNode) {
 
         // keep the old name if it was not the default one
         Controller currentController = (Controller) currentNode.getUserObject();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
index 11460ba3341..a70509d6faf 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
@@ -79,7 +79,7 @@ public void doAction(ActionEvent e) {
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void expandCollapseNode(JTree jTree, TreePath parent, boolean collapse) {
+    private static void expandCollapseNode(JTree jTree, TreePath parent, boolean collapse) {
         TreeNode node = (TreeNode) parent.getLastPathComponent();
         if (node.isLeaf()) {
             return;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
index fbf205cbaa6..65f44071877 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
@@ -59,7 +59,7 @@ public void doAction(ActionEvent e) {
         }
     }
 
-    private void enableComponents(JMeterTreeNode[] nodes, boolean enable) {
+    private static void enableComponents(JMeterTreeNode[] nodes, boolean enable) {
         GuiPackage pack = GuiPackage.getInstance();
         for (JMeterTreeNode node : nodes) {
             node.setEnabled(enable);
@@ -67,7 +67,7 @@ private void enableComponents(JMeterTreeNode[] nodes, boolean enable) {
         }
     }
 
-    private void toggleComponents(JMeterTreeNode[] nodes) {
+    private static void toggleComponents(JMeterTreeNode[] nodes) {
         GuiPackage pack = GuiPackage.getInstance();
         for (JMeterTreeNode node : nodes) {
             boolean enable = !node.isEnabled();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index e00fee3f9c3..555e54bebcf 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -162,7 +162,7 @@ private List<String> checkArguments() {
      * @param fileToCheck the directory to check
      * @return the error message or null if the file is ok
      */
-    private String checkFile(File fileToCheck) {
+    private static String checkFile(File fileToCheck) {
         if (fileToCheck.exists() && fileToCheck.canRead() && fileToCheck.isFile()) {
             return null;
         } else {
@@ -176,7 +176,7 @@ private String checkFile(File fileToCheck) {
      * @param directoryToCheck the directory to check
      * @return the error message or an empty string if the directory is fine
      */
-    private String checkDirectory(File directoryToCheck) {
+    private static String checkDirectory(File directoryToCheck) {
         if (directoryToCheck.exists()) {
             String[] files = directoryToCheck.list();
             if (files != null && files.length > 0) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
index a75ffcdb1fe..9b684ea07cd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
@@ -74,7 +74,7 @@ public void doActionAfterCheck(ActionEvent e) {
     /**
      * Get the recent file for the menu item
      */
-    private File getRecentFile(ActionEvent e) {
+    private static File getRecentFile(ActionEvent e) {
         JMenuItem menuItem = (JMenuItem)e.getSource();
         // Get the preference for the recent files
         return new File(getRecentFile(Integer.parseInt(menuItem.getName())));
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
index f322b73b0e9..90350e2a31b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
@@ -100,7 +100,7 @@ && canAddTo(parentParentNode, currentNode)) {
         GuiPackage.getInstance().getMainFrame().repaint();
     }
 
-    private JMeterTreeNode getParentNode(JMeterTreeNode currentNode) {
+    private static JMeterTreeNode getParentNode(JMeterTreeNode currentNode) {
         JMeterTreeNode parentNode = (JMeterTreeNode) currentNode.getParent();
         TestElement te = currentNode.getTestElement();
         if (te instanceof TestPlan) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
index 0c8dad224b4..418b1b0d1b2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
@@ -90,7 +90,7 @@ public Set<String> getActionNames() {
         return commands;
     }
 
-    private void showBrowserWarning(String url) {
+    private static void showBrowserWarning(String url) {
         String problemSolver;
         if (url.startsWith(LINK_MAP.get(ActionNames.LINK_COMP_REF))
                 || url.startsWith(LINK_MAP.get(ActionNames.LINK_FUNC_REF))) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
index 1002dce62d7..6506d3faa5d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
@@ -76,7 +76,7 @@ public void doAction(ActionEvent e) {
         GuiPackage.getInstance().getMainFrame().repaint();
     }
 
-    private void addNode(JMeterTreeNode parent, JMeterTreeNode node) {
+    private static void addNode(JMeterTreeNode parent, JMeterTreeNode node) {
         try {
             // Add this node
             JMeterTreeNode newNode = GuiPackage.getInstance().getTreeModel().addComponent(node.getTestElement(), parent);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
index a29be2cf2f5..066c613a79e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
@@ -97,7 +97,7 @@ public void doAction(ActionEvent e) {
         }
     }
 
-    private List<String> getRemoteHosts() {
+    private static List<String> getRemoteHosts() {
         String remoteHostsString = JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
         StringTokenizer st = new StringTokenizer(remoteHostsString, REMOTE_HOSTS_SEPARATOR);
         List<String> list = new ArrayList<>();
@@ -112,7 +112,7 @@ public Set<String> getActionNames() {
         return commands;
     }
 
-    private HashTree getTestTree() {
+    private static HashTree getTestTree() {
         GuiPackage gui = GuiPackage.getInstance();
         HashTree testTree = gui.getTreeModel().getTestPlan();
         HashTree tree = JMeter.convertSubTree(testTree, true);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
index 7ad577c6844..37d81208a04 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
@@ -67,7 +67,7 @@ public class SSLManagerCommand extends AbstractAction {
     @Override
     public void doAction(ActionEvent e) {
         if (e.getActionCommand().equals(ActionNames.SSL_MANAGER)) {
-            this.sslManager();
+            SSLManagerCommand.sslManager();
         }
     }
 
@@ -83,7 +83,7 @@ public Set<String> getActionNames() {
      * Called by sslManager button. Raises sslManager dialog.
      * I.e. a FileChooser for PCSI12 (.p12|.P12) or JKS files.
      */
-    private void sslManager() {
+    private static void sslManager() {
         SSLManager.reset();
 
         JFileChooser keyStoreChooser = new JFileChooser(System.getProperty("user.dir")); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index bc8c69f6cac..d2a11344872 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -180,7 +180,7 @@ else if (e.getActionCommand().equals(ActionNames.SAVE_AS_TEST_FRAGMENT)) {
      * @param nodes Array of {@link JMeterTreeNode}
      * @return {@link HashTree} new test plan
      */
-    private HashTree createTestFragmentNode(JMeterTreeNode[] nodes) {
+    private static HashTree createTestFragmentNode(JMeterTreeNode[] nodes) {
         TestElement element = GuiPackage.getInstance().createTestElement(TestFragmentControllerGui.class.getName());
         HashTree hashTree = new ListedHashTree();
         HashTree tfTree = hashTree.add(new JMeterTreeNode(element, null));
@@ -197,7 +197,7 @@ private HashTree createTestFragmentNode(JMeterTreeNode[] nodes) {
     /**
      * @return String new file name or null if user want to cancel
      */
-    private String computeFileName() {
+    private static String computeFileName() {
         JFileChooser chooser = FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
                 .getCurrentNode().getName()
                 + JMX_FILE_EXTENSION);
@@ -334,7 +334,7 @@ void backupAndSave(ActionEvent e, HashTree subTree, boolean fullSave, String new
      *         properties and that should be deleted after the save operation
      *         has performed successfully
      */
-    private List<File> createBackupFile(File fileToBackup) {
+    private static List<File> createBackupFile(File fileToBackup) {
         if (!BACKUP_ENABLED || !fileToBackup.exists()) {
             return EMPTY_FILE_LIST;
         }
@@ -397,7 +397,7 @@ private List<File> createBackupFile(File fileToBackup) {
      * @param backupFiles
      *            {@link List} of {@link File}
      */
-    private int getHighestVersionNumber(Pattern backupPattern, List<File> backupFiles) {
+    private static int getHighestVersionNumber(Pattern backupPattern, List<File> backupFiles) {
         return backupFiles.stream().map(backupFile -> backupPattern.matcher(backupFile.getName()))
                 .filter(matcher -> matcher.find() && matcher.groupCount() > 0)
                 .mapToInt(matcher -> Integer.parseInt(matcher.group(1))).max().orElse(0);
@@ -411,7 +411,7 @@ private int getHighestVersionNumber(Pattern backupPattern, List<File> backupFile
      * @return list of files to be deleted based upon properties described
      *         {@link #createBackupFile(File)}
      */
-    private List<File> backupFilesToDelete(List<File> backupFiles) {
+    private static List<File> backupFilesToDelete(List<File> backupFiles) {
         List<File> filesToDelete = new ArrayList<>();
         if (BACKUP_MAX_HOURS > 0) {
             filesToDelete.addAll(expiredBackupFiles(backupFiles));
@@ -431,7 +431,7 @@ private List<File> backupFilesToDelete(List<File> backupFiles) {
      * @param backupFiles {@link List} of {@link File} to filter
      * @return {@link List} of {@link File} that are expired
      */
-    private List<File> expiredBackupFiles(List<File> backupFiles) {
+    private static List<File> expiredBackupFiles(List<File> backupFiles) {
         if (BACKUP_MAX_HOURS > 0) {
             final long expiryMillis = System.currentTimeMillis() - (1L * BACKUP_MAX_HOURS * MS_PER_HOUR);
             return backupFiles.stream().filter(file -> file.lastModified() < expiryMillis).collect(Collectors.toList());
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
index b9ecb7fc539..481809c44ee 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
@@ -90,7 +90,7 @@ public void doAction(ActionEvent e) throws IllegalUserActionException {
         }
     }
 
-    private void saveImage(JComponent comp) {
+    private static void saveImage(JComponent comp) {
 
         String filename;
         JFileChooser chooser = FileDialoger.promptToSaveFile(
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
index 38340271b6c..91f0c664527 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
@@ -54,7 +54,7 @@ public class SearchTreeCommand extends AbstractAction {
      * @return A freshly created search dialog with the parent frame that could be
      *         found, or no parent otherwise.
      */
-    private SearchTreeDialog createSearchDialog(ActionEvent event) {
+    private static SearchTreeDialog createSearchDialog(ActionEvent event) {
         JFrame parent = getParentFrame(event);
         return new SearchTreeDialog(parent);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index f1fbd6a0183..5d685a63ed8 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -226,7 +226,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         ComponentUtil.centerComponentInWindow(this);
     }
 
-    private JButton createButton(String messageKey) {
+    private static JButton createButton(String messageKey) {
         return new JButton(JMeterUtils.getResString(messageKey));
     }
 
@@ -387,7 +387,7 @@ private Pair<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, S
      * @param expand true if we want to expand
      * @param nodes Set of {@link JMeterTreeNode} to mark
      */
-    private void markConcernedNodes(boolean expand, Set<JMeterTreeNode> nodes) {
+    private static void markConcernedNodes(boolean expand, Set<JMeterTreeNode> nodes) {
         GuiPackage guiInstance = GuiPackage.getInstance();
         JTree jTree = guiInstance.getMainFrame().getTree();
         for (JMeterTreeNode jMeterTreeNode : nodes) {
@@ -451,7 +451,7 @@ private void doReplaceAll(ActionEvent e) {
      * @param caseSensitiveReplacement boolean if search is case sensitive
      * @return null if no replacement occurred or Pair of (number of replacement, current tree node)
      */
-    private Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
+    private static Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
             String regex, String replaceBy, boolean caseSensitiveReplacement) {
         try {
             if (jMeterTreeNode.getUserObject() instanceof Replaceable) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
index 9f017d7c9e0..9f4907148bf 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
@@ -205,7 +205,7 @@ void replaceTemplateParametersAndLoad(final ActionEvent actionEvent, final Templ
      * @param actionEvent {@link ActionEvent}
      * @return true if plan is not dirty or has been saved
      */
-    private boolean checkDirty(final ActionEvent actionEvent) {
+    private static boolean checkDirty(final ActionEvent actionEvent) {
         ActionRouter.getInstance().doActionNow(new ActionEvent(actionEvent.getSource(), actionEvent.getID(), ActionNames.CHECK_DIRTY));
         GuiPackage guiPackage = GuiPackage.getInstance();
         if (guiPackage.isDirty()) {
@@ -320,7 +320,7 @@ public void actionPerformed(ActionEvent e) {
      * @param template {@link Template}
      * @return true if template has not parameter
      */
-    private boolean hasParameters(Template template) {
+    private static boolean hasParameters(Template template) {
         return !(template.getParameters() == null || template.getParameters().isEmpty());
     }
 
@@ -397,7 +397,7 @@ private JPanel configureParametersPanel(Map<String, String> parameters) {
         return panel;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.WEST;
         gbc.insets = new Insets(0,0,5,0);
         gbc.fill = GridBagConstraints.NONE;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
index 35ba7eac81b..fee1a4baee5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
@@ -157,7 +157,7 @@ public void doAction(ActionEvent e) {
      * @param currentNodes jmeter tree nodes
      * @return the thread groups
      */
-    private AbstractThreadGroup[] keepOnlyThreadGroups(JMeterTreeNode[] currentNodes) {
+    private static AbstractThreadGroup[] keepOnlyThreadGroups(JMeterTreeNode[] currentNodes) {
         List<AbstractThreadGroup> nodes = new ArrayList<>();
         for (JMeterTreeNode jMeterTreeNode : currentNodes) {
             if(jMeterTreeNode.getTestElement() instanceof AbstractThreadGroup) {
@@ -229,7 +229,7 @@ private static TreeCloner createTreeClonerForValidation(boolean honorThreadClone
      * @param testTree {@link HashTree}
      * @param threadGroupsToKeep Array of {@link AbstractThreadGroup} to keep
      */
-    private void keepOnlySelectedThreadGroupsInHashTree(HashTree testTree, AbstractThreadGroup[] threadGroupsToKeep) {
+    private static void keepOnlySelectedThreadGroupsInHashTree(HashTree testTree, AbstractThreadGroup[] threadGroupsToKeep) {
         for (Object o : new ArrayList<>(testTree.list())) {
             TestElement item = (TestElement) o;
             if (o instanceof AbstractThreadGroup) {
@@ -259,7 +259,7 @@ private void keepOnlySelectedThreadGroupsInHashTree(HashTree testTree, AbstractT
      * @param threadGroups Array of {@link AbstractThreadGroup}
      * @return true if item is in threadGroups array
      */
-    private boolean isInThreadGroups(TestElement item, AbstractThreadGroup[] threadGroups) {
+    private static boolean isInThreadGroups(TestElement item, AbstractThreadGroup[] threadGroups) {
         for (AbstractThreadGroup abstractThreadGroup : threadGroups) {
             if(item == abstractThreadGroup) {
                 return true;
@@ -275,7 +275,7 @@ private boolean isInThreadGroups(TestElement item, AbstractThreadGroup[] threadG
      * @param runMode {@link RunMode} how plan will be run
      * @return {@link TreeCloner}
      */
-    private ListedHashTree cloneTree(HashTree testTree, RunMode runMode) {
+    private static ListedHashTree cloneTree(HashTree testTree, RunMode runMode) {
         TreeCloner cloner = null;
         switch (runMode) {
             case VALIDATION:
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
index 046ffba8f77..5dbab186c74 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
@@ -188,7 +188,7 @@ public Map<String, Template> parseTemplateFile(File file) throws IOException, SA
      * @param templates Map of {@link Template} referenced by name
      * @param templateNode {@link Node} the xml template node
      */
-    void parseTemplateNode(Map<String, Template> templates, Node templateNode) {
+    static void parseTemplateNode(Map<String, Template> templates, Node templateNode) {
         if (templateNode.getNodeType() == Node.ELEMENT_NODE) {
             Template template = new Template();
             Element element =  (Element) templateNode;
@@ -206,11 +206,11 @@ void parseTemplateNode(Map<String, Template> templates, Node templateNode) {
         }
     }
 
-    private String textOfFirstTag(Element element, String tagName) {
+    private static String textOfFirstTag(Element element, String tagName) {
         return element.getElementsByTagName(tagName).item(0).getTextContent();
     }
 
-    private Map<String, String> parseParameterNodes(NodeList parameterNodes) {
+    private static Map<String, String> parseParameterNodes(NodeList parameterNodes) {
         Map<String, String> parametersMap = new HashMap<>();
         for (int i = 0; i < parameterNodes.getLength(); i++) {
             Element element =  (Element) parameterNodes.item(i);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
index 0ddd7bb63f0..7c39b898ed0 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
@@ -75,7 +75,7 @@ public StaticJMeterGUIComponent(Class<?> c, TestElementMetadata metadata) {
         this.groups = getGroups(c, metadata);
     }
 
-    private List<String> getGroups(Class<?> c, TestElementMetadata metadata) {
+    private static List<String> getGroups(Class<?> c, TestElementMetadata metadata) {
         String[] groups = metadata.actionGroups();
         if (groups.length == 1 && groups[0].equals("")) {
             // Annotations can't hold null values, so we use empty string instead
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java
index e2ccf377db5..be342b80e6b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java
@@ -236,7 +236,7 @@ public void keyReleased(KeyEvent e) {
     public void keyTyped(KeyEvent e) {
     }
 
-    private boolean isRightClick(MouseEvent e) {
+    private static boolean isRightClick(MouseEvent e) {
         return e.isPopupTrigger() ||
                 (InputEvent.BUTTON2_DOWN_MASK & e.getModifiersEx()) > 0 ||
                 (InputEvent.BUTTON3_DOWN_MASK == e.getModifiersEx());
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
index 16cc5ddc9a2..f6df769cb32 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
@@ -135,7 +135,7 @@ public HashTree addSubTree(HashTree subTree, JMeterTreeNode current) throws Ille
     }
 
     @SuppressWarnings("deprecation")
-    private boolean isWorkbench(TestElement item) {
+    private static boolean isWorkbench(TestElement item) {
         return item instanceof org.apache.jmeter.testelement.WorkBench;
     }
 
@@ -185,7 +185,7 @@ public void removeNodeFromParent(JMeterTreeNode node) {
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void traverseAndFind(Class<?> type, JMeterTreeNode node, List<JMeterTreeNode> nodeList) {
+    private static void traverseAndFind(Class<?> type, JMeterTreeNode node, List<JMeterTreeNode> nodeList) {
         if (type.isInstance(node.getUserObject())) {
             nodeList.add(node);
         }
@@ -197,7 +197,7 @@ private void traverseAndFind(Class<?> type, JMeterTreeNode node, List<JMeterTree
     }
 
     @SuppressWarnings("JdkObsolete")
-    private JMeterTreeNode traverseAndFind(TestElement userObject, JMeterTreeNode node) {
+    private static JMeterTreeNode traverseAndFind(TestElement userObject, JMeterTreeNode node) {
         if (userObject == node.getUserObject()) {
             return node;
         }
@@ -324,7 +324,7 @@ private void moveWorkBenchToTestPlan(JMeterTreeNode current, HashTree workbenchT
      * </ul>
      * @param node
      */
-    private boolean isNonTestElement(Object node) {
+    private static boolean isNonTestElement(Object node) {
         JMeterTreeNode treeNode = new JMeterTreeNode((TestElement) node, null);
         Collection<String> categories = treeNode.getMenuCategories();
         if (categories != null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index e24ab319a99..e47eada3378 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -217,7 +217,7 @@ public void createMenuBar() {
         this.add(helpMenu);
     }
 
-    private List<MenuCreator> findMenuCreators() {
+    private static List<MenuCreator> findMenuCreators() {
         List<MenuCreator> creators = new ArrayList<>();
         try {
             List<String> listClasses = ClassFinder.findClassesThatExtend(
@@ -342,7 +342,7 @@ private void makeOptionsMenu() {
         addPluginsMenuItems(optionsMenu, menuCreators, MENU_LOCATION.OPTIONS);
     }
 
-    private JMenu createLaFMenu() {
+    private static JMenu createLaFMenu() {
         JMenu lafMenu = makeMenuRes("appearance", 'L');
         ButtonGroup lafGroup = new ButtonGroup();
         String currentLafCommand = LookAndFeelCommand.getPreferredLafCommand();
@@ -590,7 +590,7 @@ private void makeSearchMenu() {
      * @param menuCreators
      * @param location
      */
-    private void addPluginsMenuItems(JMenu menu, List<MenuCreator> menuCreators, MENU_LOCATION location) {
+    private static void addPluginsMenuItems(JMenu menu, List<MenuCreator> menuCreators, MENU_LOCATION location) {
         for (MenuCreator menuCreator : menuCreators) {
             JMenuItem[] menuItems = menuCreator.getMenuItemsAtLocation(location);
             if (menuItems.length != 0) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
index 4121819a5f3..b3ea493aeff 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
@@ -114,7 +114,7 @@ void toggleSearchField(JTextField textToFindField, boolean matchFound) {
         }
     }
 
-    private SearchContext createSearchContext(String text, boolean forward, boolean matchCase,
+    private static SearchContext createSearchContext(String text, boolean forward, boolean matchCase,
             boolean isRegex) {
         SearchContext context = new SearchContext();
         context.setSearchFor(text);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java
index 1b9f7530e8b..2a62b012583 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java
@@ -47,7 +47,7 @@ public MenuInfo(String label, JMeterGUIComponent item, String classFullName) {
         sortOrder = getSortOrderFromName(classFullName);
     }
 
-    private int getSortOrderFromName(String classFullName) {
+    private static int getSortOrderFromName(String classFullName) {
         try {
             GUIMenuSortOrder menuSortOrder = Class.forName(classFullName, false, MenuInfo.class.getClassLoader())
                     .getDeclaredAnnotation(GUIMenuSortOrder.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
index 366eb9e716a..cb8600a5d80 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
@@ -50,7 +50,7 @@ public Component getTableCellRendererComponent(JTable table, Object value,
      * @param value initial value
      * @return {@link JSyntaxTextArea}
      */
-    private JSyntaxTextArea createRenderer(String value) {
+    private static JSyntaxTextArea createRenderer(String value) {
         JSyntaxTextArea textArea = JSyntaxTextArea.getInstance(2, 50);
         textArea.setLanguage("text"); //$NON-NLS-1$
         textArea.setInitialText(value);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
index 5b613df095c..f875c93d60b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
@@ -343,7 +343,7 @@ private void drawLine(Graphics g, int x, int y) {
             g.drawLine(left, height - 1, right, height - 1);
         }
 
-        private void drawFlush3DBorder(Graphics g, int x, int y, int w, int h) {
+        private static void drawFlush3DBorder(Graphics g, int x, int y, int w, int h) {
             g.translate(x, y);
             g.setColor(MetalLookAndFeel.getControlDarkShadow());
             g.drawRect(0, 0, w - 2, h - 2);
@@ -355,7 +355,7 @@ private void drawFlush3DBorder(Graphics g, int x, int y, int w, int h) {
             g.translate(-x, -y);
         }
 
-        private void drawPressed3DBorder(Graphics g, int x, int y, int w, int h) {
+        private static void drawPressed3DBorder(Graphics g, int x, int y, int w, int h) {
             g.translate(x, y);
             drawFlush3DBorder(g, 0, 0, w, h);
             g.setColor(MetalLookAndFeel.getControlShadow());
diff --git a/src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java b/src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java
index 3ef997e6b14..472634297f2 100644
--- a/src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java
@@ -27,8 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 public final class PluginManager {
-    private static final PluginManager instance = new PluginManager();
-
     private static final Logger log = LoggerFactory.getLogger(PluginManager.class);
 
     private PluginManager() {
@@ -44,11 +42,11 @@ private PluginManager() {
      */
     public static void install(JMeterPlugin plugin, boolean useGui) {
         if (useGui) {
-            instance.installPlugin(plugin);
+            PluginManager.installPlugin(plugin);
         }
     }
 
-    private void installPlugin(JMeterPlugin plugin) {
+    private static void installPlugin(JMeterPlugin plugin) {
         String[][] icons = plugin.getIconMappings();
         ClassLoader classloader = plugin.getClass().getClassLoader();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 45c8ddea503..3f6de35a0ff 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -96,7 +96,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
      * @param value Value
      * @param context {@link DataContext}
      */
-    private void addToContext(String key, Object value, DataContext context) {
+    private static void addToContext(String key, Object value, DataContext context) {
         if (value instanceof String) {
             value = '"' + (String) value + '"';
         }
@@ -275,7 +275,7 @@ public boolean checkResult(DataContext dataContext, ResultData result) {
         }
     }
 
-    private boolean htmlReportFileFilter(File file) {
+    private static boolean htmlReportFileFilter(File file) {
         String fileName = file.getName();
         boolean isIndexHtmlFile = file.isFile() && fileName.equals("index.html");
         boolean isContentOrAdmin = fileName.equals("content") || fileName.startsWith("sbadmin2-");
@@ -324,7 +324,7 @@ public void export(SampleContext context, File file,
             outputDir = new File(globallyDefinedOutputDir);
         }
 
-        JOrphanUtils.canSafelyWriteToFolder(outputDir, this::htmlReportFileFilter);
+        JOrphanUtils.canSafelyWriteToFolder(outputDir, HtmlTemplateExporter::htmlReportFileFilter);
 
         if (log.isInfoEnabled()) {
             log.info("Will generate dashboard in folder: {}", outputDir.getAbsolutePath());
@@ -463,13 +463,13 @@ public void export(SampleContext context, File file,
         log.debug("End of template processing");
     }
 
-    private <T> void addResultToContext(
+    private static <T> void addResultToContext(
             String resultKey, Map<String, Object> storage,
             DataContext dataContext, ResultDataVisitor<T> visitor) {
         addResultToContext(resultKey, storage, dataContext, visitor, null, null);
     }
 
-    private <T> void addResultToContext(
+    private static <T> void addResultToContext(
             String resultKey, Map<String, Object> storage, DataContext dataContext,
             ResultDataVisitor<T> visitor, ResultCustomizer customizer, ResultChecker checker) {
         Object data = storage.get(resultKey);
@@ -485,7 +485,7 @@ private <T> void addResultToContext(
         }
     }
 
-    private long formatTimestamp(String key, DataContext context) {
+    private static long formatTimestamp(String key, DataContext context) {
         // FIXME Why convert to double then long (rounding ?)
         double result = Double.parseDouble((String) context.get(key));
         long timestamp = (long) result;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index f8bb25b7425..cc9bcf52be3 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -115,7 +115,7 @@ private File checkAndGetOutputFolder(ReportGeneratorConfiguration reportGenerato
         return outputDir;
     }
 
-    private void createStatistic(Map<String, SamplingStatistic> statistics, MapResultData resultData) {
+    private static void createStatistic(Map<String, SamplingStatistic> statistics, MapResultData resultData) {
         LOGGER.debug("Creating statistics for result data:{}", resultData);
         SamplingStatistic statistic = new SamplingStatistic();
         ListResultData listResultData = (ListResultData) resultData.getResult("data");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index d02f7837289..510f3ccc167 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -296,7 +296,7 @@ private FilterConsumer createFilterByDateRange() {
         return dateRangeFilter;
     }
 
-    private void removeTempDir(File tmpDir, boolean tmpDirCreated) {
+    private static void removeTempDir(File tmpDir, boolean tmpDirCreated) {
         if (tmpDirCreated) {
             try {
                 FileUtils.deleteDirectory(tmpDir);
@@ -306,7 +306,7 @@ private void removeTempDir(File tmpDir, boolean tmpDirCreated) {
         }
     }
 
-    private boolean createTempDir(File tmpDir) throws GenerationException {
+    private static boolean createTempDir(File tmpDir) throws GenerationException {
         if (tmpDir.exists()) {
             return false;
         }
@@ -322,7 +322,7 @@ private boolean createTempDir(File tmpDir) throws GenerationException {
         return true;
     }
 
-    private void addGraphConsumer(FilterConsumer nameFilter,
+    private static void addGraphConsumer(FilterConsumer nameFilter,
             FilterConsumer excludeControllerFilter,
             Map.Entry<String, GraphConfiguration> entryGraphCfg)
             throws GenerationException {
@@ -389,13 +389,13 @@ private void exportData(SampleContext sampleContext, String exporterName,
         }
     }
 
-    private ErrorsSummaryConsumer createErrorsSummaryConsumer() {
+    private static ErrorsSummaryConsumer createErrorsSummaryConsumer() {
         ErrorsSummaryConsumer errorsSummaryConsumer = new ErrorsSummaryConsumer();
         errorsSummaryConsumer.setName(ERRORS_SUMMARY_CONSUMER_NAME);
         return errorsSummaryConsumer;
     }
 
-    private FilterConsumer createExcludeControllerFilter() {
+    private static FilterConsumer createExcludeControllerFilter() {
         FilterConsumer excludeControllerFilter = new FilterConsumer();
         excludeControllerFilter
                 .setName(START_INTERVAL_CONTROLLER_FILTER_CONSUMER_NAME);
@@ -406,7 +406,7 @@ private FilterConsumer createExcludeControllerFilter() {
         return excludeControllerFilter;
     }
 
-    private SampleConsumer createTop5ErrorsConsumer(ReportGeneratorConfiguration configuration) {
+    private static SampleConsumer createTop5ErrorsConsumer(ReportGeneratorConfiguration configuration) {
         Top5ErrorsBySamplerConsumer top5ErrorsBySamplerConsumer = new Top5ErrorsBySamplerConsumer();
         top5ErrorsBySamplerConsumer.setName(TOP5_ERRORS_BY_SAMPLER_CONSUMER_NAME);
         top5ErrorsBySamplerConsumer.setHasOverallResult(true);
@@ -414,14 +414,14 @@ private SampleConsumer createTop5ErrorsConsumer(ReportGeneratorConfiguration con
         return top5ErrorsBySamplerConsumer;
     }
 
-    private StatisticsSummaryConsumer createStatisticsSummaryConsumer() {
+    private static StatisticsSummaryConsumer createStatisticsSummaryConsumer() {
         StatisticsSummaryConsumer statisticsSummaryConsumer = new StatisticsSummaryConsumer();
         statisticsSummaryConsumer.setName(STATISTICS_SUMMARY_CONSUMER_NAME);
         statisticsSummaryConsumer.setHasOverallResult(true);
         return statisticsSummaryConsumer;
     }
 
-    private RequestsSummaryConsumer createRequestsSummaryConsumer() {
+    private static RequestsSummaryConsumer createRequestsSummaryConsumer() {
         RequestsSummaryConsumer requestsSummaryConsumer = new RequestsSummaryConsumer();
         requestsSummaryConsumer.setName(REQUESTS_SUMMARY_CONSUMER_NAME);
         return requestsSummaryConsumer;
@@ -459,7 +459,7 @@ private ApdexSummaryConsumer createApdexSummaryConsumer() {
         return apdexSummaryConsumer;
     }
 
-    private boolean isMatching(String sampleName, String keyName) {
+    private static boolean isMatching(String sampleName, String keyName) {
         if (sampleName == null) {
             return false;
         }
@@ -497,7 +497,7 @@ private FilterConsumer createNameFilter() {
     /**
      * @return Consumer that compute the end date of the test
      */
-    private AggregateConsumer createEndDateConsumer() {
+    private static AggregateConsumer createEndDateConsumer() {
         AggregateConsumer endDateConsumer = new AggregateConsumer(
                 new MaxAggregator(), sample -> (double) sample.getEndTime());
         endDateConsumer.setName(END_DATE_CONSUMER_NAME);
@@ -507,7 +507,7 @@ private AggregateConsumer createEndDateConsumer() {
     /**
      * @return Consumer that compute the begining date of the test
      */
-    private AggregateConsumer createBeginDateConsumer() {
+    private static AggregateConsumer createBeginDateConsumer() {
         AggregateConsumer beginDateConsumer = new AggregateConsumer(
                 new MinAggregator(), sample -> (double) sample.getStartTime());
         beginDateConsumer.setName(BEGIN_DATE_CONSUMER_NAME);
@@ -528,7 +528,7 @@ private AggregateConsumer createBeginDateConsumer() {
      * @throws GenerationException    if conversion of the property value fails or reflection
      *                                throws an InvocationTargetException
      */
-    private void setProperty(String className, Object obj, Method[] methods,
+    private static void setProperty(String className, Object obj, Method[] methods,
             String propertyName, String propertyValue, String setterName)
             throws IllegalAccessException, GenerationException {
         try {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
index b62efbac06c..6fc9144ae06 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
@@ -141,7 +141,7 @@ protected void updateData(SummaryInfo info, Sample sample) {
 
     }
 
-    private double getApdex(ApdexSummaryData data) {
+    private static double getApdex(ApdexSummaryData data) {
         return (data.getSatisfiedCount() + (double) data.getToleratedCount() / 2)
                 / data.getTotalCount();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 395acec73d0..a4d2d2042f4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -141,7 +141,7 @@ private static String getFileExtension(String fName) {
     /**
      * Get the current time in milliseconds
      */
-    private long now() {
+    private static long now() {
         return System.currentTimeMillis();
     }
 
@@ -151,7 +151,7 @@ private long now() {
      *
      * @return A readable string that displays the time provided as milliseconds
      */
-    private String time(long t) {
+    private static String time(long t) {
         return TimeHelper.time(t);
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
index c37cd24eaf9..6125efa29ab 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
@@ -68,7 +68,7 @@ public StatisticsSummaryConsumer() {
      * @param data {@link StatisticsSummaryData}
      * @param isOverall boolean indicating if aggregation concerns the Overall results in which case we ignore Transaction Controller's SampleResult
      */
-    private void aggregateSample(Sample sample, StatisticsSummaryData data, boolean isOverall) {
+    private static void aggregateSample(Sample sample, StatisticsSummaryData data, boolean isOverall) {
         if(isOverall && sample.isController()) {
             return;
         }
@@ -201,7 +201,7 @@ protected ListResultData createResultTitles() {
         return titles;
     }
 
-    private String formatPercentile(String percentileLabel) {
+    private static String formatPercentile(String percentileLabel) {
         return String.format(JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
                 percentileLabel);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
index 2708e73a11a..0938510f481 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
@@ -216,13 +216,13 @@ protected AbstractGraphConsumer() {
 
     protected abstract Map<String, GroupInfo> createGroupInfos();
 
-    private void setMinResult(MapResultData result, String name, Double value) {
+    private static void setMinResult(MapResultData result, String name, Double value) {
         ValueResultData valueResult = (ValueResultData) result.getResult(name);
         valueResult.setValue(Math.min((Double) valueResult.getValue(),
                 value));
     }
 
-    private void setMaxResult(MapResultData result, String name, Double value) {
+    private static void setMaxResult(MapResultData result, String name, Double value) {
         ValueResultData valueResult = (ValueResultData) result.getResult(name);
         valueResult.setValue(Math.max((Double) valueResult.getValue(),
                 value));
@@ -375,8 +375,8 @@ protected MapResultData createSerieResult(String series, SeriesData seriesData)
     /**
      * Aggregate a value to the aggregator defined by the specified parameters.
      */
-    private void aggregateValue(AggregatorFactory factory, SeriesData data,
-                                Double key, double value) {
+    private static void aggregateValue(AggregatorFactory factory, SeriesData data,
+                                       Double key, double value) {
         Map<Double, Aggregator> aggInfo = data.getAggregatorInfo();
 
         // Get or create aggregator
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
index b16643671ba..9872ccafb20 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
@@ -72,7 +72,7 @@ protected final GraphKeysSelector createKeysSelector() {
      * @param defaultValue the default value
      * @return the group info
      */
-    private GroupInfo createGroupInfo(String propertyKey, int defaultValue) {
+    private static GroupInfo createGroupInfo(String propertyKey, int defaultValue) {
         int property = JMeterUtils.getPropDefault(propertyKey, defaultValue);
         PercentileAggregatorFactory factory = new PercentileAggregatorFactory();
         factory.setPercentileIndex(property);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
index e0d575e7ddb..148ba614378 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
@@ -74,29 +74,29 @@ protected Map<String, GroupInfo> createGroupInfos() {
         return groupInfos;
     }
 
-    private String formatPercentile(String percentileLabel) {
+    private static String formatPercentile(String percentileLabel) {
         return String.format("%sth percentile", percentileLabel);
     }
 
-    private GroupInfo createMinGroupInfo() {
+    private static GroupInfo createMinGroupInfo() {
         StaticSeriesSelector seriesSelector = new StaticSeriesSelector();
         seriesSelector.setSeriesName("Min");
         return createGroupInfo(new MinAggregatorFactory(), seriesSelector);
     }
 
-    private GroupInfo createMaxGroupInfo() {
+    private static GroupInfo createMaxGroupInfo() {
         StaticSeriesSelector seriesSelector = new StaticSeriesSelector();
         seriesSelector.setSeriesName("Max");
         return createGroupInfo(new MaxAggregatorFactory(), seriesSelector);
     }
 
-    private GroupInfo createMedianGroupInfo() {
+    private static GroupInfo createMedianGroupInfo() {
         StaticSeriesSelector seriesSelector = new StaticSeriesSelector();
         seriesSelector.setSeriesName("Median");
         return createGroupInfo(new MedianAggregatorFactory(), seriesSelector);
     }
 
-    private GroupInfo createPercentileGroupInfo(String propKey, String label) {
+    private static GroupInfo createPercentileGroupInfo(String propKey, String label) {
         String seriesName = formatPercentile(label);
         double defaultValue = new BigDecimal(label).setScale(2, RoundingMode.CEILING).doubleValue();
         double property = JMeterUtils.getPropDefault(propKey, defaultValue);
@@ -108,7 +108,7 @@ private GroupInfo createPercentileGroupInfo(String propKey, String label) {
         return createGroupInfo(factory, seriesSelector);
     }
 
-    private GroupInfo createGroupInfo(AggregatorFactory aggregationFactory, StaticSeriesSelector seriesSelector) {
+    private static GroupInfo createGroupInfo(AggregatorFactory aggregationFactory, StaticSeriesSelector seriesSelector) {
         return new GroupInfo(
                 aggregationFactory,
                 seriesSelector,
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
index 657af57bd8d..fb81c3cb436 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
@@ -223,7 +223,7 @@ private boolean ignoreSampler(SampleResult s) {
      * Create path hierarchy to parentFile
      * @param parentFile
      */
-    private void createFoldersIfNeeded(File parentFile) {
+    private static void createFoldersIfNeeded(File parentFile) {
         if(parentFile == null) {
             return;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
index 8b4ebe2e15d..6a3cf1674be 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
@@ -319,7 +319,7 @@ public void testEnded(String host) {
         }
     }
 
-    private void formatAndWriteToLog(String name, SummariserRunningSample summariserRunningSample, String type) {
+    private static void formatAndWriteToLog(String name, SummariserRunningSample summariserRunningSample, String type) {
         if (TOOUT || (TOLOG && log.isInfoEnabled())) {
             String formattedMessage = format(name, summariserRunningSample, type);
             if (TOLOG) {
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java b/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java
index 0982a90b0bc..d5ccc114cdd 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java
@@ -217,13 +217,13 @@ public void clearData() {
         // NOOP
     }
 
-    private void addField(JPanel panel, JCheckBox field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JCheckBox field, GridBagConstraints gbc) {
         gbc.weightx = 2;
         gbc.fill=GridBagConstraints.HORIZONTAL;
         panel.add(field, gbc.clone());
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -233,14 +233,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java
index 8064faa8b8b..0794553758a 100644
--- a/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java
@@ -117,7 +117,7 @@ public Socket createSocket(String host, int port) throws IOException {
         return factory.createSocket(host, port);
     }
 
-    private KeyStore loadStore(String location, char[] passphrase, String type)
+    private static KeyStore loadStore(String location, char[] passphrase, String type)
             throws IOException {
         try {
             KeyStore store = KeyStore.getInstance(type);
diff --git a/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java
index cad0c30c3a2..1579f6716db 100644
--- a/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java
@@ -142,7 +142,7 @@ public ServerSocket createServerSocket(int port) throws IOException {
         return socket;
     }
 
-    private KeyStore loadStore(String location, char[] passphrase, String type)
+    private static KeyStore loadStore(String location, char[] passphrase, String type)
             throws IOException {
         try (FileInputStream fileInputStream = new FileInputStream(location)){
             KeyStore store = KeyStore.getInstance(type);
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java
index 4261cafbbef..8df3fd7b83c 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java
@@ -107,7 +107,7 @@ public void sampleOccurred(SampleEvent event) {
         }
     }
 
-    private void stripContent(SampleResult result, int level) {
+    private static void stripContent(SampleResult result, int level) {
         if (level < 0) {
             return;
         }
@@ -123,7 +123,7 @@ private void stripContent(SampleResult result, int level) {
      * Strip response but fill in bytes field.
      * @param result {@link SampleResult}
      */
-    private void stripResponse(SampleResult result) {
+    private static void stripResponse(SampleResult result) {
         result.setBytes(result.getBytesAsLong());
         result.setResponseData(EMPTY_BA);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java b/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
index 67de578e4ec..8b19f2a7f6e 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
@@ -84,7 +84,7 @@ public void addConfigElement(ConfigElement config, Class<?> asClass) {
         }
     }
 
-    private ConfigElement cloneIfNecessary(ConfigElement config) {
+    private static ConfigElement cloneIfNecessary(ConfigElement config) {
         if (config.expectsModification()) {
             return config;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java
index eff4132455e..658f41f4947 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java
@@ -148,7 +148,7 @@ public void saveTIFFWithBatik(String filename, BufferedImage image) {
      * @param filename
      * @return output stream created from the filename
      */
-    private FileOutputStream createFile(File filename) {
+    private static FileOutputStream createFile(File filename) {
         try {
             return new FileOutputStream(filename);
         } catch (FileNotFoundException e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java b/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java
index 39a32da2589..e2089bb8d68 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java
@@ -97,7 +97,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         return wrap;
     }
 
-    private ConversionException createConversionException(Throwable e) {
+    private static ConversionException createConversionException(Throwable e) {
         final ConversionException conversionException = new ConversionException(e);
         StackTraceElement[] ste = e.getStackTrace();
         if (ste!=null){
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
index 4faf2a1778b..7bc635313ff 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
@@ -145,7 +145,7 @@ public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingCont
     }
 
     // Helper method to simplify marshall routine. Save if and only if true.
-    private void createNode(HierarchicalStreamWriter writer, boolean save, String node) {
+    private static void createNode(HierarchicalStreamWriter writer, boolean save, String node) {
         if (!save) {
             return;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index dfa6e00690b..c6db700e0a3 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -419,7 +419,7 @@ private BufferedReader getReader(String alias, boolean recycle, boolean ignoreFi
         }
     }
 
-    private BufferedReader createBufferedReader(FileEntry fileEntry) throws IOException {
+    private static BufferedReader createBufferedReader(FileEntry fileEntry) throws IOException {
         if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
             throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
         }
@@ -455,7 +455,7 @@ public synchronized void write(String filename, String value) throws IOException
         }
     }
 
-    private BufferedWriter createBufferedWriter(FileEntry fileEntry) throws IOException {
+    private static BufferedWriter createBufferedWriter(FileEntry fileEntry) throws IOException {
         OutputStream fos = Files.newOutputStream(fileEntry.file.toPath());
         OutputStreamWriter osw;
         // If file encoding is specified, write using that encoding, otherwise use default platform encoding
@@ -486,7 +486,7 @@ public synchronized void closeFile(String name) throws IOException {
         closeFile(name, fileEntry);
     }
 
-    private void closeFile(String name, FileEntry fileEntry) throws IOException {
+    private static void closeFile(String name, FileEntry fileEntry) throws IOException {
         if (fileEntry != null && fileEntry.inputOutputObject != null) {
             log.info("Close: {}", name);
             fileEntry.inputOutputObject.close();
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
index 02ec4fe6fa0..8920f1fffce 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
@@ -38,7 +38,7 @@ public String getAsText() {
         return value instanceof Boolean ?  toString((Boolean) value) : null;
     }
 
-    private String toString(Boolean value) {
+    private static String toString(Boolean value) {
         return value ? TRUE : FALSE;
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
index 63ce4753bd3..bf057e189a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
@@ -120,7 +120,7 @@ public void actionPerformed(ActionEvent e) {
         setValue(toUnix(chooser.getSelectedFile()));
     }
 
-    private String toUnix(final File selectedFile) {
+    private static String toUnix(final File selectedFile) {
         if (File.separatorChar == '\\') {
             return FilenameUtils.separatorsToUnix(selectedFile.getPath());
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
index 25ee55cfb53..1923b161c26 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
@@ -380,7 +380,7 @@ private static String getDetails(PropertyDescriptor pd) {
      * @param descriptor
      * @return the wrapper editor
      */
-    private WrapperEditor createWrapperEditor(PropertyEditor typeEditor, PropertyDescriptor descriptor) {
+    private static WrapperEditor createWrapperEditor(PropertyEditor typeEditor, PropertyDescriptor descriptor) {
         String[] editorTags = typeEditor.getTags();
         String[] additionalTags = (String[]) descriptor.getValue(TAGS);
         String[] tags;
@@ -720,7 +720,7 @@ private Integer groupOrder(String group) {
          * @param d
          * @return the property's order attribute (zero by default)
          */
-        private Integer propertyOrder(PropertyDescriptor d) {
+        private static Integer propertyOrder(PropertyDescriptor d) {
             Integer order = (Integer) d.getValue(ORDER);
             if (order == null) {
                 order = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
index ab6a8a45790..71e8794da91 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
@@ -176,7 +176,7 @@ public void setValue(Object value) {
         this.firePropertyChange();
     }
 
-    private Collection<Object> convertCollection(Collection<?> values) {
+    private static Collection<Object> convertCollection(Collection<?> values) {
         List<Object> l = new ArrayList<>();
         for(Object obj : values) {
             if(obj instanceof TestElementProperty) {
@@ -240,14 +240,14 @@ void initializeModel()
         table.addFocusListener(this);
     }
 
-    private Functor[] createWriters(List<String> propNames) {
+    private static Functor[] createWriters(List<String> propNames) {
         return propNames.stream()
                 .map(propName -> "set" + propName) // $NON-NLS-1$
                 .map(Functor::new)
                 .toArray(Functor[]::new);
     }
 
-    private Functor[] createReaders(Class<?> c, List<String> propNames) {
+    private static Functor[] createReaders(Class<?> c, List<String> propNames) {
         List<String> methodNames = Arrays.stream(c.getMethods())
                 .map(Method::getName)
                 .collect(Collectors.toList());
@@ -257,7 +257,7 @@ private Functor[] createReaders(Class<?> c, List<String> propNames) {
                 .toArray(Functor[]::new);
     }
 
-    private Class<?>[] getArgsForWriter(Class<?> c, List<String> propNames) {
+    private static Class<?>[] getArgsForWriter(Class<?> c, List<String> propNames) {
         return propNames.stream()
                 .map(propName -> Arrays.stream(c.getMethods())
                         .filter(m -> m.getName().equals("set" + propName)) // $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
index f840335b2a2..6c66e6000c7 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
@@ -260,7 +260,7 @@ public void modifyTestElement(TestElement element) {
      * @param element
      * @param name
      */
-    private void setPropertyInElement(TestElement element, String name, Object value) {
+    private static void setPropertyInElement(TestElement element, String name, Object value) {
         JMeterProperty jprop = AbstractProperty.createProperty(value);
         jprop.setName(name);
         element.setProperty(jprop);
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
index 5ad944addca..754979be12e 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
@@ -226,7 +226,7 @@ private boolean isValidValue(String text) {
      * @throws Error
      *             always throws an error.
      */
-    private void shouldNeverHappen(String msg) {
+    private static void shouldNeverHappen(String msg) {
         throw new Error(msg); // Programming error: bail out.
     }
 
@@ -238,7 +238,7 @@ private void shouldNeverHappen(String msg) {
      * @throws Error
      *             always throws one.
      */
-    private void shouldNeverHappen(Exception e) {
+    private static void shouldNeverHappen(Exception e) {
         throw new Error(e.toString()); // Programming error: bail out.
     }
 
@@ -249,7 +249,7 @@ private void shouldNeverHappen(Exception e) {
      * containing "${" as a valid expression.
      * TODO: improve, but keep returning true for "${}".
      */
-    private boolean isExpression(String text) {
+    private static boolean isExpression(String text) {
         return text.contains("${");//$NON-NLS-1$
     }
 
@@ -259,7 +259,7 @@ private boolean isExpression(String text) {
      * @param text
      * @return true if text is a String and isExpression(text).
      */
-    private boolean isExpression(Object text) {
+    private static boolean isExpression(Object text) {
         return text instanceof String && isExpression((String) text);
     }
 
@@ -354,7 +354,7 @@ public final void setValue(Object value) { /// final because called from ctor
      * Fix bug in JVMs that return true/false rather than True/False
      * from the type editor getAsText() method
      */
-    private String fixGetAsTextBug(String asText) {
+    private static String fixGetAsTextBug(String asText) {
         if (asText == null){
             return null;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
index 0ccfe024130..b0c53ae131b 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
@@ -162,12 +162,12 @@ protected List<SampleResult> getSampleList(SampleResult result) {
         return sampleList;
     }
 
-    private void recurseResults(List<SampleResult> resultList, SampleResult sampleResult) {
+    private static void recurseResults(List<SampleResult> resultList, SampleResult sampleResult) {
         Collections.addAll(resultList, sampleResult.getSubResults());
         recurseResults(resultList, sampleResult.getSubResults(), 3);
     }
 
-    private void recurseResults(List<SampleResult> resultList, SampleResult[] sampleResult, int level) {
+    private static void recurseResults(List<SampleResult> resultList, SampleResult[] sampleResult, int level) {
         if (level < 0) {
             return;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 93f8369515f..59049988c0c 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -557,7 +557,7 @@ public void setTemporary(JMeterProperty property) {
     // It doesn't merge the inner properties one by one as MultiProperty would do.
     // Therefore we must not mark the enclosed properties of TestElementProperty as
     // temporary (Bug 65336)
-    private boolean isMergingEnclosedProperties(JMeterProperty property) {
+    private static boolean isMergingEnclosedProperties(JMeterProperty property) {
         return property instanceof MultiProperty && !(property instanceof TestElementProperty);
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 1f12ecd3f48..0364fcaf0f7 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -446,7 +446,7 @@ private static void continueOnThreadLoop(FindTestElementsUpToRootTraverser pathT
      * the following method will try to find the sampler that really generate an error
      * @return {@link Sampler}
      */
-    private Sampler findRealSampler(Sampler sampler) {
+    private static Sampler findRealSampler(Sampler sampler) {
         Sampler realSampler = sampler;
         while (realSampler instanceof TransactionSampler) {
             realSampler = ((TransactionSampler) realSampler).getSubSampler();
@@ -685,7 +685,7 @@ private SampleResult doEndTransactionSampler(
      * @param transactionSampler
      * @return the listeners who should receive the sample result
      */
-    private List<SampleListener> getSampleListeners(SamplePackage samplePack, SamplePackage transactionPack, TransactionSampler transactionSampler) {
+    private static List<SampleListener> getSampleListeners(SamplePackage samplePack, SamplePackage transactionPack, TransactionSampler transactionSampler) {
         List<SampleListener> sampleListeners = samplePack.getSampleListeners();
         // Do not send subsamples to listeners which receive the transaction sample
         if(transactionSampler != null) {
@@ -713,7 +713,7 @@ private List<SampleListener> getSampleListeners(SamplePackage samplePack, Sample
     /**
      * Store {@link JMeterThread#LAST_SAMPLE_OK} in JMeter Variables context
      */
-    private void setLastSampleOk(JMeterVariables variables, boolean value) {
+    private static void setLastSampleOk(JMeterVariables variables, boolean value) {
         variables.put(LAST_SAMPLE_OK, Boolean.toString(value));
     }
 
@@ -894,7 +894,7 @@ private void stopThread() {
         log.info("Stop Thread detected by thread: {}", threadName);
     }
 
-    private void checkAssertions(List<Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
+    private static void checkAssertions(List<Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
         for (Assertion assertion : assertions) {
             TestBeanHelper.prepare((TestElement) assertion);
             if (assertion instanceof AbstractScopedAssertion) {
@@ -916,7 +916,7 @@ private void checkAssertions(List<Assertion> assertions, SampleResult parent, JM
         setLastSampleOk(threadContext.getVariables(), parent.isSuccessful());
     }
 
-    private void recurseAssertionChecks(SampleResult parent, Assertion assertion, int level) {
+    private static void recurseAssertionChecks(SampleResult parent, Assertion assertion, int level) {
         if (level < 0) {
             return;
         }
@@ -938,7 +938,7 @@ private void recurseAssertionChecks(SampleResult parent, Assertion assertion, in
         }
     }
 
-    private void processAssertion(SampleResult result, Assertion assertion) {
+    private static void processAssertion(SampleResult result, Assertion assertion) {
         AssertionResult assertionResult;
         try {
             assertionResult = assertion.getResult(result);
@@ -962,14 +962,14 @@ private void processAssertion(SampleResult result, Assertion assertion) {
         result.addAssertionResult(assertionResult);
     }
 
-    private void runPostProcessors(List<PostProcessor> extractors) {
+    private static void runPostProcessors(List<PostProcessor> extractors) {
         for (PostProcessor ex : extractors) {
             TestBeanHelper.prepare((TestElement) ex);
             ex.process();
         }
     }
 
-    private void runPreProcessors(List<PreProcessor> preProcessors) {
+    private static void runPreProcessors(List<PreProcessor> preProcessors) {
         for (PreProcessor ex : preProcessors) {
             if (log.isDebugEnabled()) {
                 log.debug("Running preprocessor: {}", ((AbstractTestElement) ex).getName());
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java b/src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java
index ea0996509a7..7265b5b7fbd 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java
@@ -95,7 +95,7 @@ public void setRunningVersion(boolean running) {
         sampler.setRunningVersion(running);
     }
 
-    private void setRunningVersion(List<?> list, boolean running) {
+    private static void setRunningVersion(List<?> list, boolean running) {
         @SuppressWarnings("unchecked") // all implementations extend TestElement
         List<TestElement> telist = (List<TestElement>)list;
         for (TestElement te : telist) {
@@ -103,7 +103,7 @@ private void setRunningVersion(List<?> list, boolean running) {
         }
     }
 
-    private void recoverRunningVersion(List<?> list) {
+    private static void recoverRunningVersion(List<?> list) {
         @SuppressWarnings("unchecked") // All implementations extend TestElement
         List<TestElement> telist = (List<TestElement>)list;
         for (TestElement te : telist) {
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index 2c0d4646528..e0c22641cb2 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -172,7 +172,7 @@ else if(child instanceof TransactionController) {
         }
     }
 
-    private void trackIterationListeners(LinkedList<TestElement> pStack) {
+    private static void trackIterationListeners(LinkedList<TestElement> pStack) {
         TestElement child = pStack.getLast();
         if (child instanceof LoopIterationListener) {
             ListIterator<TestElement> iter = pStack.listIterator(pStack.size());
@@ -271,7 +271,7 @@ private void saveTransactionControllerConfigs(TransactionController tc) {
      * @param controllers
      * @param maybeController
      */
-    private void addDirectParentControllers(List<Controller> controllers, TestElement maybeController) {
+    private static void addDirectParentControllers(List<Controller> controllers, TestElement maybeController) {
         if (maybeController instanceof Controller) {
             log.debug("adding controller: {} to sampler config", maybeController);
             controllers.add((Controller) maybeController);
@@ -304,7 +304,7 @@ public boolean equals(Object o) {
         }
     }
 
-    private void configureWithConfigElements(Sampler sam, List<ConfigTestElement> configs) {
+    private static void configureWithConfigElements(Sampler sam, List<ConfigTestElement> configs) {
         sam.clearTestElementChildren();
         for (ConfigTestElement config  : configs) {
             if (!(config instanceof NoConfigMerge))
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index 4aeb580e39c..d0084548b30 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -330,7 +330,7 @@ public boolean stopThread(String threadName, boolean now) {
      * @param jvmThread {@link Thread}
      * @param interrupt Interrupt thread or not
      */
-    private void stopThread(JMeterThread jmeterThread, Thread jvmThread, boolean interrupt) {
+    private static void stopThread(JMeterThread jmeterThread, Thread jvmThread, boolean interrupt) {
         jmeterThread.stop();
         jmeterThread.interrupt(); // interrupt sampler if possible
         if (interrupt && jvmThread != null) { // Bug 49734
@@ -434,7 +434,7 @@ public boolean verifyThreadsStopped() {
      * @param thread Thread
      * @return boolean
      */
-    private boolean verifyThreadStopped(Thread thread) {
+    private static boolean verifyThreadStopped(Thread thread) {
         boolean stopped = true;
         if (thread != null && thread.isAlive()) {
             try {
@@ -465,7 +465,7 @@ public void waitThreadsStopped() {
          * we have to check if allThreads is really empty before stopping
          */
         while (!allThreads.isEmpty()) {
-            allThreads.values().forEach(this::waitThreadStopped);
+            allThreads.values().forEach(ThreadGroup::waitThreadStopped);
         }
 
     }
@@ -474,7 +474,7 @@ public void waitThreadsStopped() {
      * Wait for thread to stop
      * @param thread Thread
      */
-    private void waitThreadStopped(Thread thread) {
+    private static void waitThreadStopped(Thread thread) {
         if (thread == null) {
             return;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
index b72dde6f276..980a3056bbc 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
@@ -82,7 +82,7 @@ public JPopupMenu createPopupMenu() {
         return pop;
     }
 
-    private JMenuItem createMenuItem(String name, String actionCommand) {
+    private static JMenuItem createMenuItem(String name, String actionCommand) {
         JMenuItem addThinkTimesToChildren = new JMenuItem(JMeterUtils.getResString(name));
         addThinkTimesToChildren.setName(name);
         addThinkTimesToChildren.addActionListener(ActionRouter.getInstance());
@@ -90,7 +90,7 @@ private JMenuItem createMenuItem(String name, String actionCommand) {
         return addThinkTimesToChildren;
     }
 
-    private JMenu createAddMenu() {
+    private static JMenu createAddMenu() {
         String addAction = ActionNames.ADD;
         JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
         addMenu.add(MenuFactory.makeMenu(MenuFactory.SAMPLERS, addAction));
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
index d0414503998..e1712fc4f8c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
@@ -157,7 +157,7 @@ public Object eval(String source, int lineNo, int columnNo, Object oscript)
      * @param t {@link Throwable}
      * @throws BSFException
      */
-    private void handleError(Throwable t) throws BSFException {
+    private static void handleError(Throwable t) throws BSFException {
         Throwable target = t;
         if (t instanceof WrappedException) {
             target = ((WrappedException) t).getWrappedException();
diff --git a/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
index 9c5e927ee3a..5714e623602 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
@@ -67,7 +67,7 @@ public HttpSSLProtocolSocketFactory(int cps) {
     }
 
 
-    private void configureSocket(Socket socket){
+    private static void configureSocket(Socket socket){
         if (!(socket instanceof SSLSocket)) {
             throw new IllegalArgumentException("Expected SSLSocket");
         }
@@ -95,7 +95,7 @@ private void configureSocket(Socket socket){
         }
     }
 
-    private String join(String[] strings) {
+    private static String join(String[] strings) {
         StringBuilder sb = new StringBuilder();
         for (int i=0;i<strings.length;i++){
             if (i>0) {
@@ -106,7 +106,7 @@ private String join(String[] strings) {
         return sb.toString();
     }
 
-    private SSLSocketFactory getSSLSocketFactory() throws IOException {
+    private static SSLSocketFactory getSSLSocketFactory() throws IOException {
         try {
             SSLContext sslContext = ((JsseSSLManager)SSLManager.getInstance()).getContext();
             return sslContext.getSocketFactory();
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index 3724715b571..5c5a23b2105 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -179,7 +179,7 @@ public void load(InputStream is, String pword)
             "directoryName", "ediPartyName", "uniformResourceIdentifier", "iPAddress", "registeredID");
 
     @SuppressWarnings("JdkObsolete")
-    private void logDetailsOnKeystore(KeyStore keystore) {
+    private static void logDetailsOnKeystore(KeyStore keystore) {
         Enumeration<String> aliases;
         try {
             aliases = keystore.aliases();
@@ -225,7 +225,7 @@ private void logDetailsOnKeystore(KeyStore keystore) {
         }
     }
 
-    private String decodeSanList(Collection<List<?>> subjectAlternativeNames) {
+    private static String decodeSanList(Collection<List<?>> subjectAlternativeNames) {
         List<Pair<String, String>> decodedEntries = new ArrayList<>();
         for (List<?> entry : subjectAlternativeNames) {
             Object indexData = entry.get(0);
@@ -242,14 +242,14 @@ private String decodeSanList(Collection<List<?>> subjectAlternativeNames) {
                 .collect(Collectors.joining(", "));
     }
 
-    private String sanDataToString(Object data) {
+    private static String sanDataToString(Object data) {
         if (data instanceof String) {
             return (String) data;
         }
         return Hex.encodeHexString((byte[]) data);
     }
 
-    private String sanGeneralNameIndexToName(Integer index) {
+    private static String sanGeneralNameIndexToName(Integer index) {
         String description;
         if (index < SAN_GENERAL_NAMES.size()) {
             description = SAN_GENERAL_NAMES.get(index);
@@ -259,7 +259,7 @@ private String sanGeneralNameIndexToName(Integer index) {
         return description;
     }
 
-    private X509Certificate[] toX509Certificates(Certificate[] chain) {
+    private static X509Certificate[] toX509Certificates(Certificate[] chain) {
         X509Certificate[] x509certs = new X509Certificate[chain.length];
         for (int i = 0; i < x509certs.length; i++) {
             x509certs[i] = (X509Certificate) chain[i];
@@ -271,7 +271,7 @@ private boolean isIndexInConfiguredRange(int index) {
         return index >= startIndex && (endIndex == -1 || index <= endIndex);
     }
 
-    private char[] toCharArrayOrNull(String pword) {
+    private static char[] toCharArrayOrNull(String pword) {
         if (pword == null) {
             return null; // NOSONAR the api used requires null for "no password used"
         }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
index 9906b42da84..70401906a8c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
@@ -97,7 +97,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
      * @param index
      * @return
      */
-    private String uppercase(String encodedString, CompoundVariable[] values, int index) {
+    private static String uppercase(String encodedString, CompoundVariable[] values, int index) {
         String shouldUpperCase = values.length > index ? values[index].execute() : null;
         if (Boolean.parseBoolean(shouldUpperCase)) {
             return encodedString.toUpperCase();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
index b478417144a..00ea98bc6f7 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
@@ -118,7 +118,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
      * @return result as String
      * @throws InvalidVariableException
      */
-    private String executeWithNashorn(SampleResult previousResult,
+    private static String executeWithNashorn(SampleResult previousResult,
             Sampler currentSampler, JMeterContext jmctx, JMeterVariables vars,
             String script, String varName)
             throws InvalidVariableException {
@@ -160,7 +160,7 @@ private String executeWithNashorn(SampleResult previousResult,
      * @return result as String
      * @throws InvalidVariableException
      */
-    private String executeWithRhino(SampleResult previousResult,
+    private static String executeWithRhino(SampleResult previousResult,
             Sampler currentSampler, JMeterContext jmctx, JMeterVariables vars,
             String script, String varName)
             throws InvalidVariableException {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index 79d17913d7b..aa9cc611635 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -203,7 +203,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
     }
 
     @SuppressWarnings("JavaTimeDefaultTimeZone")
-    private DateTimeFormatter createFormatter(LocaleFormatObject format) {
+    private static DateTimeFormatter createFormatter(LocaleFormatObject format) {
         log.debug("Create a new instance of DateTimeFormatter for format '{}' in the cache", format);
         return new DateTimeFormatterBuilder().appendPattern(format.getFormat())
                 // TODO: what if year changes? (e.g. the year changes as the test executes)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
index eacf8bcf511..7a22beca1e8 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
@@ -108,7 +108,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
      * @param vars {@link JMeterVariables}
      * @param results {@link List} where results are stored
      */
-    private void extractVariableValuesToList(String variableName,
+    private static void extractVariableValuesToList(String variableName,
             JMeterVariables vars, List<String> results) {
         String matchNumberAsStr = vars.get(variableName+"_matchNr");
         int matchNumber = 0;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index b8883addf13..a3c50e2b4e6 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -290,13 +290,13 @@ private Pattern generateOroPattern() throws InvalidVariableException {
         }
     }
 
-    private void saveGroups(java.util.regex.MatchResult result, String namep, JMeterVariables vars) {
+    private static void saveGroups(java.util.regex.MatchResult result, String namep, JMeterVariables vars) {
         for (int x = 0; x <= result.groupCount(); x++) {
             vars.put(namep + "_g" + x, result.group(x)); //$NON-NLS-1$
         }
     }
 
-    private void saveGroups(MatchResult result, String namep, JMeterVariables vars) {
+    private static void saveGroups(MatchResult result, String namep, JMeterVariables vars) {
         for (int x = 0; x < result.groups(); x++) {
             vars.put(namep + "_g" + x, result.group(x)); //$NON-NLS-1$
         }
@@ -308,7 +308,7 @@ public List<String> getArgumentDesc() {
         return desc;
     }
 
-    private String generateResult(MatchResult match, String namep, Object[] template, JMeterVariables vars) {
+    private static String generateResult(MatchResult match, String namep, Object[] template, JMeterVariables vars) {
         saveGroups(match, namep, vars);
         StringBuilder result = new StringBuilder();
         for (Object t : template) {
@@ -324,8 +324,8 @@ private String generateResult(MatchResult match, String namep, Object[] template
         return result.toString();
     }
 
-    private String generateResult(java.util.regex.MatchResult match, String namep, Object[] template,
-                                  JMeterVariables vars) {
+    private static String generateResult(java.util.regex.MatchResult match, String namep, Object[] template,
+            JMeterVariables vars) {
         saveGroups(match, namep, vars);
         StringBuilder result = new StringBuilder();
         for (Object t : template) {
@@ -361,7 +361,7 @@ private Object[] generateTemplate(String rawTemplate) {
         return generateTemplateWithOroRegex(rawTemplate);
     }
 
-    private Object[] generateTemplateWithJavaRegex(String rawTemplate) {
+    private static Object[] generateTemplateWithJavaRegex(String rawTemplate) {
         // String or Integer
         List<Object> pieces = new ArrayList<>();
         Matcher matcher = templatePatternJava.matcher(rawTemplate);
@@ -411,7 +411,7 @@ private Object[] generateTemplateWithOroRegex(String rawTemplate) {
         return combined.toArray();
     }
 
-    private boolean isFirstElementGroup(String rawData) {
+    private static boolean isFirstElementGroup(String rawData) {
         if (USE_JAVA_REGEX) {
             return FIRST_ELEMENT_PATTERN.matcher(rawData).find();
         } else {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index c7e3a2709fe..ad3f01eebfc 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -146,7 +146,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         if (!StringUtils.isEmpty(format)) {
             try {
                 LocaleFormatObject lfo = new LocaleFormatObject(format, locale);
-                formatter = dateTimeFormatterCache.get(lfo, this::createFormatter);
+                formatter = dateTimeFormatterCache.get(lfo, TimeShift::createFormatter);
             } catch (IllegalArgumentException ex) {
                 log.error("Format date pattern '{}' is invalid "
                         + "(see https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html)",
@@ -198,7 +198,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
     }
 
     @SuppressWarnings("JavaTimeDefaultTimeZone")
-    private DateTimeFormatter createFormatter(LocaleFormatObject format) {
+    private static DateTimeFormatter createFormatter(LocaleFormatObject format) {
         log.debug("Create a new instance of DateTimeFormatter for format '{}' in the cache", format);
         return new DateTimeFormatterBuilder().appendPattern(format.getFormat())
                 .parseDefaulting(ChronoField.NANO_OF_SECOND, 0)
diff --git a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
index 48cc24f1865..15a6650d8e7 100644
--- a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
+++ b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
@@ -104,7 +104,7 @@ public void actionPerformed(ActionEvent action) {
         addElements(MenuFactory.LISTENERS,       "Listeners",       guiPackage, treeModel, myTarget);
     }
 
-    private void addElements(
+    private static void addElements(
             String menuKey, String title, GuiPackage guiPackage,
             JMeterTreeModel treeModel, JMeterTreeNode myTarget) {
 
@@ -172,7 +172,7 @@ private void init() {
      * @param name  A name for the Controller
      * @return the new node
      */
-    private JMeterTreeNode addSimpleController(JMeterTreeModel model, JMeterTreeNode node, String name) {
+    private static JMeterTreeNode addSimpleController(JMeterTreeModel model, JMeterTreeNode node, String name) {
         final TestElement sc = new GenericController();
         sc.setProperty(TestElement.GUI_CLASS, LOGIC_CONTROLLER_GUI);
         sc.setProperty(TestElement.NAME, name); // Use old style
@@ -202,7 +202,7 @@ public void run() {
         }
     }
 
-    private JMeterTreeNode addToTree(final JMeterTreeModel model,
+    private static JMeterTreeNode addToTree(final JMeterTreeModel model,
             final JMeterTreeNode node, final TestElement sc) {
         RunGUI runnable = new RunGUI(model, node, sc);
         if(SwingUtilities.isEventDispatchThread()) {
@@ -227,7 +227,7 @@ private JMeterTreeNode addToTree(final JMeterTreeModel model,
      * @return the first node of the given type in the test component tree, or
      * <code>null</code> if none was found.
      */
-    private JMeterTreeNode findFirstNodeOfType(Class<?> type, JMeterTreeModel treeModel) {
+    private static JMeterTreeNode findFirstNodeOfType(Class<?> type, JMeterTreeModel treeModel) {
         return treeModel.getNodesOfType(type).stream()
                 .filter(JMeterTreeNode::isEnabled)
                 .findFirst()
diff --git a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
index b49b56f053e..0158c6212cb 100644
--- a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
+++ b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
@@ -193,7 +193,7 @@ public final String getErrorString() {
      *            the Option Descriptor
      * @return the state
      */
-    private int getStateFor(final CLOptionDescriptor descriptor) {
+    private static int getStateFor(final CLOptionDescriptor descriptor) {
         final int flags = descriptor.getFlags();
         if ((flags & CLOptionDescriptor.ARGUMENTS_REQUIRED_2) == CLOptionDescriptor.ARGUMENTS_REQUIRED_2) {
             return STATE_REQUIRE_2ARGS;
@@ -341,7 +341,7 @@ public CLArgsParser(final String[] args, final CLOptionDescriptor[] optionDescri
      *            the cut-point in element of array
      * @return the result array
      */
-    private String[] subArray(final String[] array, final int index, final int charIndex) {
+    private static String[] subArray(final String[] array, final int index, final int charIndex) {
         final int remaining = array.length - index;
         final String[] result = new String[remaining];
 
@@ -487,7 +487,7 @@ private Token nextToken(final char[] separators) {
         return new Token(TOKEN_STRING, sb.toString());
     }
 
-    private boolean isSeparator(final char ch, final char[] separators) {
+    private static boolean isSeparator(final char ch, final char[] separators) {
         for (char separator : separators) {
             if (ch == separator) {
                 return true;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
index 1c1261f0e1a..9e3cfa5a864 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
@@ -223,7 +223,7 @@ public int run(List<String> arguments1, List<String> arguments2) throws Interrup
      * @return proc exit value
      * @throws TimeoutException when timeout is reached while execution
      */
-    private int waitForEndWithTimeout(Process proc, long timeoutInMillis) throws InterruptedException, TimeoutException {
+    private static int waitForEndWithTimeout(Process proc, long timeoutInMillis) throws InterruptedException, TimeoutException {
         if (timeoutInMillis <= 0L) {
             return proc.waitFor();
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
index c0bd0cb5f3c..85b9b7feec8 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
@@ -164,7 +164,7 @@ private static Font map(Font input, Function<Font, Font> mapper) {
         return output;
     }
 
-    private void scaleIntProperties(UIDefaults defaults, float scale) {
+    private static void scaleIntProperties(UIDefaults defaults, float scale) {
         // Below are both standard and custom properties in a sorted order
         scaleIntProperty(defaults, "ArrowButton.size", scale); // $NON-NLS-1$
         scaleIntProperty(defaults, "ComboBox:\"ComboBox.arrowButton\".size", scale); // $NON-NLS-1$
@@ -173,7 +173,7 @@ private void scaleIntProperties(UIDefaults defaults, float scale) {
         scaleIntProperty(defaults, "Spinner:\"Spinner.nextButton\".size", scale); // $NON-NLS-1$
     }
 
-    private void configureRowHeight(UIDefaults defaults, float scale, String rowHeight, String font) {
+    private static void configureRowHeight(UIDefaults defaults, float scale, String rowHeight, String font) {
         if (defaults.getInt(rowHeight) == 0) {
             return;
         }
@@ -196,14 +196,14 @@ private void configureRowHeight(UIDefaults defaults, float scale, String rowHeig
     }
 
 
-    private void scaleControlsProperties(UIDefaults defaults, float scale) {
+    private static void scaleControlsProperties(UIDefaults defaults, float scale) {
         scaleIntProperty(defaults, "ScrollBar.thumbHeight", scale); // $NON-NLS-1$
         scaleIntProperty(defaults, "ScrollBar.width", scale); // $NON-NLS-1$
         scaleIntProperty(defaults, "ScrollBar:\"ScrollBar.button\".size", scale); // $NON-NLS-1$
         scaleIntProperty(defaults, "SplitPane.size", scale); // $NON-NLS-1$
     }
 
-    private void scaleIntProperty(UIDefaults defaults, String key, float scale) {
+    private static void scaleIntProperty(UIDefaults defaults, String key, float scale) {
         int value = defaults.getInt(key);
         if (value != 0) {
             defaults.put(key, Math.round(value * scale));
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 1b14005c988..7d04e1374e0 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -94,7 +94,7 @@ public boolean accept(String className) {
          * @param contextClassLoader the classloader to use
          * @return true if the class is a non-abstract, non-interface instance of at least one of the parent classes
          */
-        private boolean isChildOf(
+        private static boolean isChildOf(
                 Class<?>[] parentClasses, String strClassName, ClassLoader contextClassLoader) {
             try {
                 Class<?> targetClass = Class.forName(strClassName, false, contextClassLoader);
@@ -143,7 +143,7 @@ public boolean accept(String className) {
             return false;
         }
 
-        private boolean hasAnnotationOnMethod(
+        private static boolean hasAnnotationOnMethod(
                 Class<? extends Annotation>[] annotations,
                 String classInQuestion,
                 ClassLoader contextClassLoader) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java
index 2fc34fee189..0796ff715bd 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java
@@ -427,7 +427,7 @@ public String toString(){
         return sb.toString();
     }
 
-    private void typesToString(StringBuilder sb,Class<?>[] _types) {
+    private static void typesToString(StringBuilder sb, Class<?>[] _types) {
         sb.append("(");
         if (_types != null){
             for(int i=0; i < _types.length; i++){
@@ -440,13 +440,13 @@ private void typesToString(StringBuilder sb,Class<?>[] _types) {
         sb.append(")");
     }
 
-    private String typesToString(Class<?>[] argTypes) {
+    private static String typesToString(Class<?>[] argTypes) {
         StringBuilder sb = new StringBuilder();
         typesToString(sb,argTypes);
         return sb.toString();
     }
 
-    private Class<?> getPrimitive(Class<?> t) {
+    private static Class<?> getPrimitive(Class<?> t) {
         if (t == null) {
             return null;
         }
@@ -472,7 +472,7 @@ private Class<?> getPrimitive(Class<?> t) {
         return c;
     }
 
-    private Class<?>[] getNewArray(int i, Class<?> replacement, Class<?>[] orig) {
+    private static Class<?>[] getNewArray(int i, Class<?> replacement, Class<?>[] orig) {
         Class<?>[] newArray = new Class[orig.length];
         for (int j = 0; j < newArray.length; j++) {
             if (j == i) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
index a2380ce46fb..4b38db0aa4f 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
@@ -84,7 +84,7 @@ public int compare(T o1, T o2) {
         return 1;
     }
 
-    private int compareOneEmptyPart(String numberPart1, String numberPart2) {
+    private static int compareOneEmptyPart(String numberPart1, String numberPart2) {
         if (numberPart1.isEmpty()) {
             if (numberPart2.isEmpty()) {
                 return 0;
@@ -96,7 +96,7 @@ private int compareOneEmptyPart(String numberPart1, String numberPart2) {
         throw new IllegalArgumentException("At least one of the parameters have to be empty");
     }
 
-    private String trimLeadingZeroes(String numberPart) {
+    private static String trimLeadingZeroes(String numberPart) {
         int length = numberPart.length();
         for (int i = 0; i < length; i++) {
             if (numberPart.charAt(i) != '0') {
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
index 94ec298e204..d01cedbbefb 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
@@ -118,7 +118,7 @@ private String execute(Driver driver, String cypher, Map<String, Object> params,
         }
     }
 
-    private SampleResult handleException(SampleResult res, Exception ex) {
+    private static SampleResult handleException(SampleResult res, Exception ex) {
         res.setResponseMessage(ex.toString());
         if (ex instanceof Neo4jException) {
             res.setResponseCode(((Neo4jException)ex).code());
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
index a4c93a5cfd4..13e5f570d69 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
@@ -63,7 +63,7 @@ protected BoltTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
         propertyDescriptor.setValue(DEFAULT, 60);
     }
 
-    private String[] getListAccessModes() {
+    private static String[] getListAccessModes() {
         return Arrays.stream(AccessMode.values()).map(Enum::toString).toArray(String[]::new);
     }
 }
diff --git a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
index b615d47217e..ba0f943e58f 100644
--- a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+++ b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
@@ -305,7 +305,7 @@ public SampleResult sample(Entry e) {
         return res;
     }
 
-    private void saveResponse(SampleResult res, boolean binaryTransfer, ByteArrayOutputStream baos) {
+    private static void saveResponse(SampleResult res, boolean binaryTransfer, ByteArrayOutputStream baos) {
         res.setResponseData(baos.toByteArray());
         if (!binaryTransfer) {
             res.setDataType(SampleResult.TEXT);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index 7c0462a148f..2179941bd67 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -176,7 +176,7 @@ protected JTabbedPane getParameterPanel() {
         return paramPanel;
     }
 
-    private HTTPArgument createHTTPArgument(final String name, final String value, final boolean alwaysEncoded) {
+    private static HTTPArgument createHTTPArgument(final String name, final String value, final boolean alwaysEncoded) {
         final HTTPArgument arg = new HTTPArgument(name, value);
         arg.setUseEquals(true);
         arg.setEnabled(true);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index e97db473a7d..7732a1380ba 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -322,7 +322,7 @@ protected JPanel createEmbeddedRsrcPanel() {
         return embeddedRsrcPanel;
     }
 
-    private JTextField addTextFieldWithLabel(JPanel panel, String labelText) {
+    private static JTextField addTextFieldWithLabel(JPanel panel, String labelText) {
         JLabel label = new JLabel(labelText); // $NON-NLS-1$
         JTextField field = new JTextField(100);
         label.setLabelFor(field);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index 3e30b1c8f90..8f45c768714 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -472,7 +472,7 @@ static boolean isSupportedProtocol(URL url) {
      * @param credentialsProvider provider which should be set up
      * @param localhost name of the workstation to be used for {@link NTCredentials}
      */
-    public void setupCredentials(Authorization auth, URL url,
+    public static void setupCredentials(Authorization auth, URL url,
             HttpClientContext localContext,
             CredentialsProvider credentialsProvider,
             String localhost) {
@@ -503,7 +503,7 @@ public void setupCredentials(Authorization auth, URL url,
      * @param url to be checked
      * @return <code>true</code> when port should omitted in SPN
      */
-    private boolean isStripPort(URL url) {
+    private static boolean isStripPort(URL url) {
         if (STRIP_PORT) {
             return true;
         }
@@ -518,7 +518,7 @@ private boolean isStripPort(URL url) {
      * @param b {@link Authorization}
      * @return true if a and b match
      */
-    private boolean match(Authorization a, Authorization b){
+    private static boolean match(Authorization a, Authorization b){
         return
                 a.getURL().equals(b.getURL())&&
                 a.getDomain().equals(b.getDomain())&&
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index 9e0a426484f..4d9ee398e7a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -197,7 +197,7 @@ public void saveDetails(URLConnection conn, HTTPSampleResult res){
         }
     }
 
-    private boolean anyNotBlank(String... values) {
+    private static boolean anyNotBlank(String... values) {
         for (String value: values) {
             if (StringUtils.isNotBlank(value)) {
                 return true;
@@ -206,7 +206,7 @@ private boolean anyNotBlank(String... values) {
         return false;
     }
 
-    private Pair<String, String> getVaryHeader(String headerName, Header[] reqHeaders) {
+    private static Pair<String, String> getVaryHeader(String headerName, Header[] reqHeaders) {
         if (headerName == null) {
             return null;
         }
@@ -292,7 +292,7 @@ private void setCache(String lastModified, String cacheControl, String expires,
         }
     }
 
-    private Date extractExpiresDateFromExpires(String expires) {
+    private static Date extractExpiresDateFromExpires(String expires) {
         Date expiresDate;
         try {
             expiresDate = org.apache.http.client.utils.DateUtils
@@ -308,7 +308,7 @@ private Date extractExpiresDateFromExpires(String expires) {
     }
 
     @SuppressWarnings("JavaUtilDate")
-    private Date extractExpiresDateFromCacheControl(String lastModified,
+    private static Date extractExpiresDateFromCacheControl(String lastModified,
             String cacheControl, String expires, String etag, String url,
             String date, final String maxAge, Date defaultExpiresDate) {
         // the max-age directive overrides the Expires header,
@@ -328,7 +328,7 @@ private Date extractExpiresDateFromCacheControl(String lastModified,
     }
 
     @SuppressWarnings("JavaUtilDate")
-    private Date calcExpiresDate(String lastModified, String cacheControl,
+    private static Date calcExpiresDate(String lastModified, String cacheControl,
             String expires, String etag, String url, String date) {
         if(!StringUtils.isEmpty(lastModified) && !StringUtils.isEmpty(date)) {
             try {
@@ -360,7 +360,7 @@ private Date calcExpiresDate(String lastModified, String cacheControl,
     }
 
     // Apache HttpClient
-    private String getHeader(HttpResponse method, String name) {
+    private static String getHeader(HttpResponse method, String name) {
         org.apache.http.Header hdr = method.getLastHeader(name);
         return hdr != null ? hdr.getValue() : null;
     }
@@ -369,7 +369,7 @@ private String getHeader(HttpResponse method, String name) {
      * Is the sample result OK to cache?
      * i.e is it in the 2xx range or equal to 304, and is it a cacheable method?
      */
-    private boolean isCacheable(HTTPSampleResult res, String varyHeader){
+    private static boolean isCacheable(HTTPSampleResult res, String varyHeader){
         if ("*".equals(varyHeader)) {
             return false;
         }
@@ -380,7 +380,7 @@ private boolean isCacheable(HTTPSampleResult res, String varyHeader){
                     || "304".equals(responseCode));  // $NON-NLS-1$
     }
 
-    private boolean isCacheableMethod(HTTPSampleResult res) {
+    private static boolean isCacheableMethod(HTTPSampleResult res) {
         final String resMethod = res.getHTTPMethod();
         for(String method : CACHEABLE_METHODS) {
             if (method.equalsIgnoreCase(resMethod)) {
@@ -471,7 +471,7 @@ public boolean inCache(URL url, org.apache.jmeter.protocol.http.control.Header[]
         return entryStillValid(url, getEntry(url.toString(), asHeaders(allHeaders)));
     }
 
-    private Header[] asHeaders(
+    private static Header[] asHeaders(
             org.apache.jmeter.protocol.http.control.Header[] allHeaders) {
         final List<Header> result = new ArrayList<>(allHeaders.length);
         for (org.apache.jmeter.protocol.http.control.Header header: allHeaders) {
@@ -480,7 +480,7 @@ private Header[] asHeaders(
         return result.toArray(new Header[result.size()]);
     }
 
-    private Header[] asHeaders(String allHeaders) {
+    private static Header[] asHeaders(String allHeaders) {
         List<Header> result = new ArrayList<>();
         for (String line: allHeaders.split("\\n")) {
             String[] splitted = line.split(": ", 2);
@@ -517,7 +517,7 @@ public String getValue() {
     }
 
     @SuppressWarnings("JavaUtilDate")
-    private boolean entryStillValid(URL url, CacheEntry entry) {
+    private static boolean entryStillValid(URL url, CacheEntry entry) {
         log.debug("Check if entry {} is still valid for url {}", entry, url);
         if (entry != null && entry.getVaryHeader() == null) {
             final Date expiresDate = entry.getExpires();
@@ -562,7 +562,7 @@ private CacheEntry getEntry(String url, Header[] headers) {
         return null;
     }
 
-    private String varyUrl(String url, String headerName, String headerValue) {
+    private static String varyUrl(String url, String headerName, String headerValue) {
         return "vary-" + headerName + "-" + headerValue + "-" + url;
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
index 97906210ca4..25c921fc0f5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
@@ -257,7 +257,7 @@ public void addFile(String cookieFile) throws IOException {
         }
     }
 
-    private String cookieToString(Cookie c){
+    private static String cookieToString(Cookie c){
         StringBuilder sb=new StringBuilder(80);
         sb.append(c.getDomain());
         //flag - if all machines within a given domain can access the variable.
@@ -369,7 +369,7 @@ public void addCookieFromHeader(String cookieHeader, URL url){
      * @param b
      * @return true if cookies match
      */
-    private boolean match(Cookie a, Cookie b){
+    private static boolean match(Cookie a, Cookie b){
         return
         a.getName().equals(b.getName())
         &&
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index 1e5e2da8041..931893dc1c3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -163,7 +163,7 @@ public InetAddress[] resolve(String host) throws UnknownHostException {
         }
     }
 
-    private void logCache(String hitOrMiss, String host, InetAddress[] addresses) {
+    private static void logCache(String hitOrMiss, String host, InetAddress[] addresses) {
         if (log.isDebugEnabled()) {
             log.debug("Cache {} thread#{}: {} => {}", hitOrMiss, JMeterContextService.getContext().getThreadNum(), host,
                     Arrays.toString(addresses));
@@ -226,7 +226,7 @@ private InetAddress[] fromStaticHost(String host) {
         return new InetAddress[0];
     }
 
-    private void addAsLiteralAddress(List<InetAddress> addresses, String address) {
+    private static void addAsLiteralAddress(List<InetAddress> addresses, String address) {
         try {
             addresses.add(InetAddress.getByName(address));
         } catch (UnknownHostException e) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
index 6ea06fd8dbd..83979429a0d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
@@ -57,7 +57,7 @@ public AuthScheme create(final HttpContext context) {
         return new KerberosScheme(stripPort, isUseCanonicalHostname());
     }
 
-    private boolean isEnabled(Object contextAttribute, boolean defaultValue) {
+    private static boolean isEnabled(Object contextAttribute, boolean defaultValue) {
         if (contextAttribute instanceof Boolean) {
             return (Boolean) contextAttribute;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
index 18649bc4967..3b40ad9bb49 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
@@ -57,7 +57,7 @@ public AuthScheme create(final HttpContext context) {
         return new SPNegoScheme(stripPort, isUseCanonicalHostname());
     }
 
-    private boolean isEnabled(Object contextAttribute, boolean defaultValue) {
+    private static boolean isEnabled(Object contextAttribute, boolean defaultValue) {
         if (contextAttribute instanceof Boolean) {
             return (Boolean) contextAttribute;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
index 0dab8cac52f..19f629f2341 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
@@ -241,7 +241,7 @@ List<org.apache.http.cookie.Cookie> getCookiesForUrl(
      * Create an HttpClient cookie from a JMeter cookie
      */
     @SuppressWarnings("JavaUtilDate")
-    private org.apache.http.cookie.Cookie makeCookie(Cookie jmc) {
+    private static org.apache.http.cookie.Cookie makeCookie(Cookie jmc) {
         long exp = jmc.getExpiresMillis();
         BasicClientCookie ret = new BasicClientCookie(jmc.getName(),
                 jmc.getValue());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index 04645681eaa..c71839ec924 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -306,7 +306,7 @@ protected JPanel createEmbeddedRsrcPanel() {
         return embeddedRsrcPanel;
     }
 
-    private JTextField addTextFieldWithLabel(JPanel panel, String labelText) {
+    private static JTextField addTextFieldWithLabel(JPanel panel, String labelText) {
         JLabel label = new JLabel(labelText); // $NON-NLS-1$
         JTextField field = new JTextField(100);
         label.setLabelFor(field);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index ca869b9e000..aed6b15fdc3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -913,7 +913,7 @@ public void setAuthUserPasswd(String authentication, String url, Authorization a
     * @param mechanism     the mechanism of authorization
     * @param authorization the object of authorization
     */
-   private void setAuthMechanism(String mechanism, Authorization authorization) {
+   private static void setAuthMechanism(String mechanism, Authorization authorization) {
        switch (mechanism.toLowerCase()) {
        case "basic":
            authorization.setMechanism(Mechanism.BASIC);
@@ -932,7 +932,7 @@ private void setAuthMechanism(String mechanism, Authorization authorization) {
     * @param request                       http request
     * @param originalProxyServerParameters the parameters of proxy server
     */
-   private void setProxyServer(Request request, String originalProxyServerParameters) {
+   private static void setProxyServer(Request request, String originalProxyServerParameters) {
        String proxyServerParameters = originalProxyServerParameters;
        if (!proxyServerParameters.contains("://")) {
            proxyServerParameters = "http://" + proxyServerParameters;
@@ -960,7 +960,7 @@ private void setProxyServer(Request request, String originalProxyServerParameter
     * @param request               http request
     * @param authentication        the username and password of proxy server
     */
-   private void setProxyServerUserInfo(Request request, String authentication) {
+   private static void setProxyServerUserInfo(Request request, String authentication) {
        if (authentication.contains(":")) {
            String[] userInfo = authentication.split(":", 2);
            request.setProxyServer("username", userInfo[0]);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
index a47e73dc763..bb73d1c89c8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
@@ -238,7 +238,7 @@ private void configureButtonsState() {
         saveButton.setEnabled(hasRows);
     }
 
-    private Cookie createCookie(Object[] rowData) {
+    private static Cookie createCookie(Object[] rowData) {
         Cookie cookie = new Cookie(
                 (String) rowData[0],
                 (String) rowData[1],
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index 537cee3c26d..fae5e1cc8b5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -364,7 +364,7 @@ public void actionPerformed(ActionEvent e) {
         }
     }
 
-    private void enableTable(boolean custEnabled, boolean sysEnabled, JTable table, PowerTableModel model,
+    private static void enableTable(boolean custEnabled, boolean sysEnabled, JTable table, PowerTableModel model,
             JButton addButton, JButton deleteButton) {
         table.setEnabled(custEnabled);
         Color greyColor = new Color(240, 240, 240);
@@ -379,7 +379,7 @@ private void enableTable(boolean custEnabled, boolean sysEnabled, JTable table,
         }
     }
 
-    private void addTableRow(JTable table, PowerTableModel model, JButton button) {
+    private static void addTableRow(JTable table, PowerTableModel model, JButton button) {
         // If a table cell is being edited, we should accept the current
         // value and stop the editing before adding a new row.
         GuiUtils.stopTableEditing(table);
@@ -396,7 +396,7 @@ private void addTableRow(JTable table, PowerTableModel model, JButton button) {
         table.setRowSelectionInterval(rowToSelect, rowToSelect);
     }
 
-    private void deleteTableRow(JTable table, PowerTableModel model, JButton button) {
+    private static void deleteTableRow(JTable table, PowerTableModel model, JButton button) {
         if (model.getRowCount() > 0) {
             // If a table cell is being edited, we must cancel the editing
             // before deleting the row.
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
index f101ff5f7f4..ecdd06c2bf6 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
@@ -312,7 +312,7 @@ private void addFile(String path) {
      *
      * @return a new File object
      */
-    private String browseAndGetFilePath() {
+    private static String browseAndGetFilePath() {
         String path = ""; //$NON-NLS-1$
         JFileChooser chooser = FileDialoger.promptToOpenFile();
         if (chooser != null) {
@@ -413,7 +413,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         table.revalidate();
     }
 
-    private JScrollPane makeScrollPane(Component comp) {
+    private static JScrollPane makeScrollPane(Component comp) {
         JScrollPane pane = new JScrollPane(comp);
         pane.setPreferredSize(pane.getMinimumSize());
         return GuiUtils.emptyBorder(pane);
@@ -542,7 +542,7 @@ private void addFromClipboard(String lineDelimiter, String argDelimiter) {
         }
     }
 
-    private HTTPFileArg createHTTPFileArgFromClipboard(String[] clipboardCols) {
+    private static HTTPFileArg createHTTPFileArgFromClipboard(String[] clipboardCols) {
         if (clipboardCols.length == 1) {
             return new HTTPFileArg(clipboardCols[0]);
         } else if (clipboardCols.length == 2) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index cc3c67433cb..d9388b3050d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -192,12 +192,12 @@ private void showInputDialog(ActionEvent event) {
      * @return the first node of the given type in the test component tree, or
      *         <code>null</code> if none was found.
      */
-    private JMeterTreeNode findFirstNodeOfType(Class<?> type) {
+    private static JMeterTreeNode findFirstNodeOfType(Class<?> type) {
         JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
         return treeModel.getNodesOfType(type).stream().filter(JMeterTreeNode::isEnabled).findFirst().orElse(null);
     }
 
-    private DNSCacheManager findNodeOfTypeDnsCacheManagerByType(boolean isCustom) {
+    private static DNSCacheManager findNodeOfTypeDnsCacheManagerByType(boolean isCustom) {
         JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
         List<JMeterTreeNode> res = treeModel.getNodesOfType(DNSCacheManager.class);
         for (JMeterTreeNode jm : res) {
@@ -336,7 +336,7 @@ private HTTPSamplerProxy createSampler(Request request, String commentText) thro
         return httpSampler;
     }
 
-    private void configureTimeout(Request request, HTTPSamplerProxy httpSampler) {
+    private static void configureTimeout(Request request, HTTPSamplerProxy httpSampler) {
         double connectTimeout = request.getConnectTimeout();
         double maxTime = request.getMaxTime();
         if (connectTimeout >= 0) {
@@ -355,7 +355,7 @@ private void configureTimeout(Request request, HTTPSamplerProxy httpSampler) {
      * @param request {@link Request}
      * @return {@link HeaderManager} element
      */
-    private HeaderManager createHeaderManager(Request request) {
+    private static HeaderManager createHeaderManager(Request request) {
         HeaderManager headerManager = new HeaderManager();
         headerManager.setProperty(TestElement.GUI_CLASS, HeaderPanel.class.getName());
         headerManager.setProperty(TestElement.NAME, "HTTP HeaderManager");
@@ -409,7 +409,7 @@ private void createCookieManager(CookieManager cookieManager, Request request) {
         }
     }
 
-    private KeystoreConfig createKeystoreConfiguration() {
+    private static KeystoreConfig createKeystoreConfiguration() {
         KeystoreConfig keystoreConfig = new KeystoreConfig();
         keystoreConfig.setProperty(TestElement.GUI_CLASS, TestBeanGUI.class.getName());
         keystoreConfig.setProperty(TestElement.NAME, "Keystore Configuration");
@@ -422,7 +422,7 @@ private KeystoreConfig createKeystoreConfiguration() {
      *
      * @param request {@link Request}
      */
-    private void createAuthManager(Request request, AuthManager authManager) {
+    private static void createAuthManager(Request request, AuthManager authManager) {
         Authorization auth = request.getAuthorization();
         authManager.setProperty(TestElement.GUI_CLASS, AuthPanel.class.getName());
         authManager.setProperty(TestElement.NAME, "HTTP AuthorizationManager");
@@ -437,7 +437,7 @@ private void createAuthManager(Request request, AuthManager authManager) {
      * @param authManager {@link AuthManager} element
      * @return whether to update Authorization Manager in http request
      */
-    private boolean canAddAuthManagerInHttpRequest(Request request, AuthManager authManager) {
+    private static boolean canAddAuthManagerInHttpRequest(Request request, AuthManager authManager) {
         Authorization auth = request.getAuthorization();
         for (int i = 0; i < authManager.getAuthObjects().size(); i++) {
             if (!authManager.getAuthObjectAt(i).getUser().equals(auth.getUser())
@@ -456,7 +456,7 @@ private boolean canAddAuthManagerInHttpRequest(Request request, AuthManager auth
      * @param authManager {@link AuthManager} element
      * @return whether to update Authorization Manager in Thread Group
      */
-    private boolean canUpdateAuthManagerInThreadGroup(Request request, AuthManager authManager) {
+    private static boolean canUpdateAuthManagerInThreadGroup(Request request, AuthManager authManager) {
         Authorization auth = request.getAuthorization();
         for (int i = 0; i < authManager.getAuthObjects().size(); i++) {
             if (auth.getURL().equals(authManager.getAuthObjectAt(i).getURL())) {
@@ -466,7 +466,7 @@ private boolean canUpdateAuthManagerInThreadGroup(Request request, AuthManager a
         return true;
     }
 
-    private void createDnsServer(Request request, DNSCacheManager dnsCacheManager) {
+    private static void createDnsServer(Request request, DNSCacheManager dnsCacheManager) {
         Set<String> dnsServers = request.getDnsServers();
         dnsCacheManager.setProperty(TestElement.GUI_CLASS, DNSCachePanel.class.getName());
         dnsCacheManager.setProperty(TestElement.NAME, "DNS Cache Manager");
@@ -477,7 +477,7 @@ private void createDnsServer(Request request, DNSCacheManager dnsCacheManager) {
         }
     }
 
-    private boolean canAddDnsServerInHttpRequest(Request request, DNSCacheManager dnsCacheManager) {
+    private static boolean canAddDnsServerInHttpRequest(Request request, DNSCacheManager dnsCacheManager) {
         Set<String> currentDnsServers =new HashSet<>();
         Set<String> newDnsServers = request.getDnsServers();
         for (int i = 0; i < dnsCacheManager.getServers().size(); i++) {
@@ -486,7 +486,7 @@ private boolean canAddDnsServerInHttpRequest(Request request, DNSCacheManager dn
         return !(newDnsServers.size() == currentDnsServers.size() && newDnsServers.containsAll(currentDnsServers));
     }
 
-    private void createDnsResolver(Request request, DNSCacheManager dnsCacheManager) {
+    private static void createDnsResolver(Request request, DNSCacheManager dnsCacheManager) {
         dnsCacheManager.setProperty(TestElement.GUI_CLASS, DNSCachePanel.class.getName());
         dnsCacheManager.setProperty(TestElement.NAME, "DNS Cache Manager");
         dnsCacheManager.setCustomResolver(true);
@@ -510,7 +510,7 @@ private static String getDefaultComment() {
         return "Created from cURL on " + LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME);
     }
 
-    private boolean canAddDnsResolverInHttpRequest(Request request, DNSCacheManager dnsCacheManager) {
+    private static boolean canAddDnsResolverInHttpRequest(Request request, DNSCacheManager dnsCacheManager) {
         if (dnsCacheManager.getHosts().size() != 1) {
             return true;
         } else {
@@ -573,7 +573,7 @@ private void setFormData(Request request, HTTPSamplerProxy httpSampler) {
         }
     }
 
-    private void createProxyServer(Request request, HTTPSamplerProxy httpSampler) {
+    private static void createProxyServer(Request request, HTTPSamplerProxy httpSampler) {
         Map<String, String> proxyServer = request.getProxyServer();
         for (Map.Entry<String, String> proxyPara : proxyServer.entrySet()) {
             String key = proxyPara.getKey();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
index 13a67eb0038..32b6b04a780 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
@@ -104,7 +104,7 @@ public void process() {
         }
     }
 
-    private void modifyArgument(Argument arg, Arguments args) {
+    private static void modifyArgument(Argument arg, Arguments args) {
         if (log.isDebugEnabled()) {
             log.debug("Modifying argument: " + arg);
         }
@@ -136,7 +136,7 @@ private void modifyArgument(Argument arg, Arguments args) {
     public void addConfigElement(ConfigElement config) {
     }
 
-    private void addFormUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
+    private static void addFormUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
             List<HTTPSamplerBase> potentialLinks) {
         NodeList rootList = html.getChildNodes();
         List<HTTPSamplerBase> urls = new ArrayList<>();
@@ -155,7 +155,7 @@ private void addFormUrls(Document html, HTTPSampleResult result, HTTPSamplerBase
         }
     }
 
-    private void addAnchorUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
+    private static void addAnchorUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
             List<HTTPSamplerBase> potentialLinks) {
         String base = "";
         NodeList baseList = html.getElementsByTagName("base"); // $NON-NLS-1$
@@ -190,8 +190,8 @@ private void addAnchorUrls(Document html, HTTPSampleResult result, HTTPSamplerBa
         }
     }
 
-    private void addFramesetUrls(Document html, HTTPSampleResult result,
-       HTTPSamplerBase config, List<HTTPSamplerBase> potentialLinks) {
+    private static void addFramesetUrls(Document html, HTTPSampleResult result,
+            HTTPSamplerBase config, List<HTTPSamplerBase> potentialLinks) {
        String base = "";
        NodeList baseList = html.getElementsByTagName("base"); // $NON-NLS-1$
        if (baseList.getLength() > 0) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 312c49edd9b..858c03d7406 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -169,14 +169,14 @@ private void initRegex(String argName) {
         // quick hack anyway, so who cares.
     }
 
-    private Function<String, String> generateExtractor(String regex) {
+    private static Function<String, String> generateExtractor(String regex) {
         if (USE_JAVA_REGEX) {
             return generateExtractorWithJavaRegex(regex);
         }
         return generateExtractorWithOroRegex(regex);
     }
 
-    private Function<String, String> generateExtractorWithJavaRegex(String regex) {
+    private static Function<String, String> generateExtractorWithJavaRegex(String regex) {
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
                 regex,
                 java.util.regex.Pattern.MULTILINE);
@@ -189,7 +189,7 @@ private Function<String, String> generateExtractorWithJavaRegex(String regex) {
         };
     }
 
-    private Function<String, String> generateExtractorWithOroRegex(String regex) {
+    private static Function<String, String> generateExtractorWithOroRegex(String regex) {
         Pattern pattern = JMeterUtils.getPatternCache().getPattern(
                 regex,
                 Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
@@ -203,14 +203,14 @@ private Function<String, String> generateExtractorWithOroRegex(String regex) {
         };
     }
 
-    private Function<String, String> generateFirstMatchExtractor(String regex) {
+    private static Function<String, String> generateFirstMatchExtractor(String regex) {
         if (USE_JAVA_REGEX) {
             return generateFirstMatchExtractorWithJavaRegex(regex);
         }
         return generateFirstMatchExtractorWithOroRegex(regex);
     }
 
-    private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String regex) {
+    private static Function<String, String> generateFirstMatchExtractorWithJavaRegex(String regex) {
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(
                 regex,
                 java.util.regex.Pattern.MULTILINE);
@@ -228,7 +228,7 @@ private Function<String, String> generateFirstMatchExtractorWithJavaRegex(String
         };
     }
 
-    private Function<String, String> generateFirstMatchExtractorWithOroRegex(String regex) {
+    private static Function<String, String> generateFirstMatchExtractorWithOroRegex(String regex) {
         Pattern pattern = JMeterUtils.getPatternCache().getPattern(
                 regex,
                 Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
index ec20f4a9b8a..7ecb9c55712 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
@@ -136,7 +136,7 @@ private JPanel makeParameterPanel() {
         return panel;
     }
 
-    private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabeledTextField field, GridBagConstraints gbc) {
         List<JComponent> item = field.getComponentList();
         panel.add(item.get(0), gbc.clone());
         gbc.gridx++;
@@ -146,14 +146,14 @@ private void addField(JPanel panel, JLabeledTextField field, GridBagConstraints
     }
 
     // Next line
-    private void resetContraints(GridBagConstraints gbc) {
+    private static void resetContraints(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
         gbc.fill=GridBagConstraints.NONE;
     }
 
-    private void initConstraints(GridBagConstraints gbc) {
+    private static void initConstraints(GridBagConstraints gbc) {
         gbc.anchor = GridBagConstraints.NORTHWEST;
         gbc.fill = GridBagConstraints.NONE;
         gbc.gridheight = 1;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
index 83dffe23f50..ac014683881 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
@@ -75,7 +75,7 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] data,
         }
     }
 
-    private URLCollection orDefault(URLCollection urlCollection,
+    private static URLCollection orDefault(URLCollection urlCollection,
             URLCollection defaultValue) {
         if (urlCollection == null) {
             return Validate.notNull(defaultValue);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
index d211cdf32b9..7a0b1bf4e53 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
@@ -190,7 +190,7 @@ public Iterator<URL> getEmbeddedResourceURLs(
      * @param ieVersion Float IE version
      * @return true if IE version &lt; IE v10
      */
-    protected final boolean isEnableConditionalComments(Float ieVersion) {
+    protected static boolean isEnableConditionalComments(Float ieVersion) {
         // Conditional comment have been dropped in IE10
         // http://msdn.microsoft.com/en-us/library/ie/hh801214%28v=vs.85%29.aspx
         return ieVersion != null && ieVersion < IE_10;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
index f3505073f70..d6d3af27d14 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
@@ -75,7 +75,7 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL
      *
      * @return new base URL
      */
-    private URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws HTMLParseException {
+    private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws HTMLParseException {
         if (node == null) {
             return baseUrl;
         }
@@ -201,7 +201,7 @@ private URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws HTMLPar
      * Helper method to get an attribute value, if it exists @param attrs list
      * of attributes @param attname attribute name @return
      */
-    private String getValue(NamedNodeMap attrs, String attname) {
+    private static String getValue(NamedNodeMap attrs, String attname) {
         String v = null;
         Node n = attrs.getNamedItem(attname);
         if (n != null) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
index 6129e710d8c..0d05d0196e7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
@@ -136,15 +136,15 @@ protected RegexpHTMLParser() {
      */
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl,
-                                                 URLCollection urls, String encoding) throws HTMLParseException {
+            URLCollection urls, String encoding) throws HTMLParseException {
         if (USE_JAVA_REGEX) {
             return getEmbeddedResourceURLsWithJavaRegex(html, baseUrl, urls, encoding);
         }
         return getEmbeddedResourceURLsWithOroRegex(html, baseUrl, urls, encoding);
     }
 
-    private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL baseUrl, URLCollection urls,
-                                                               String encoding) throws HTMLParseException {
+    private static Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL baseUrl, URLCollection urls,
+            String encoding) throws HTMLParseException {
         try {
 
             // TODO: find a way to avoid the cost of creating a String here --
@@ -190,8 +190,8 @@ private Iterator<URL> getEmbeddedResourceURLsWithJavaRegex(byte[] html, URL base
         }
     }
 
-    private Iterator<URL> getEmbeddedResourceURLsWithOroRegex(byte[] html, URL baseUrl, URLCollection urls,
-                                                              String encoding) throws HTMLParseException {
+    private static Iterator<URL> getEmbeddedResourceURLsWithOroRegex(byte[] html, URL baseUrl, URLCollection urls,
+            String encoding) throws HTMLParseException {
         Pattern pattern= null;
         Perl5Matcher matcher = null;
         try {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 752e98505b2..051389da248 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -136,7 +136,7 @@ public final void populateSampler(HTTPSamplerBase sampler,
         }
     }
 
-    private void detectAndModifySamplerOnGraphQLRequest(final HTTPSamplerBase sampler, final HttpRequestHdr request) {
+    private static void detectAndModifySamplerOnGraphQLRequest(final HTTPSamplerBase sampler, final HttpRequestHdr request) {
         final String method = request.getMethod();
         final Header header = request.getHeaderManager().getFirstHeaderNamed("Content-Type");
         final boolean graphQLContentType = header != null
@@ -354,7 +354,7 @@ public boolean isErrorDetected() {
      * @param sampler {@link HTTPSamplerBase}
      * @param request {@link HttpRequestHdr}
      */
-    protected void computeSamplerName(HTTPSamplerBase sampler,
+    protected static void computeSamplerName(HTTPSamplerBase sampler,
             HttpRequestHdr request) {
         String prefix = StringUtils.defaultString(request.getPrefix(), "");
         int httpSampleNameMode = request.getHttpSampleNameMode();
@@ -366,7 +366,7 @@ protected void computeSamplerName(HTTPSamplerBase sampler,
         }
     }
 
-    private String getFormat(int httpSampleNameMode, String format) {
+    private static String getFormat(int httpSampleNameMode, String format) {
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_FORMATTER) {
             return format.replaceAll("#\\{name([,}])", "{0$1")
                     .replaceAll("#\\{path([,}])", "{1$1")
@@ -387,7 +387,7 @@ private String getFormat(int httpSampleNameMode, String format) {
         return "{1}";
     }
 
-    private String getNumberedFormat(int httpSampleNameMode) {
+    private static String getNumberedFormat(int httpSampleNameMode) {
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
             return "{0}{1}-{2}";
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index c931bcb677a..d22999f74ca 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -298,11 +298,11 @@ public String getContentType() {
         return null;
     }
 
-    private boolean isMultipart(String contentType) {
+    private static boolean isMultipart(String contentType) {
         return contentType != null && contentType.startsWith(HTTPConstants.MULTIPART_FORM_DATA);
     }
 
-    public MultipartUrlConfig getMultipartConfig(String contentType) {
+    public static MultipartUrlConfig getMultipartConfig(String contentType) {
         if(isMultipart(contentType)) {
             // Get the boundary string for the multiparts from the content type
             String boundaryString = contentType.substring(contentType.toLowerCase(java.util.Locale.ENGLISH).indexOf("boundary=") + "boundary=".length());
@@ -416,7 +416,7 @@ public String getFirstLine() {
      *            String that is partially tokenized.
      * @return The remainder
      */
-    private String getToken(StringTokenizer tk) {
+    private static String getToken(StringTokenizer tk) {
         if (tk.hasMoreTokens()) {
             return tk.nextToken();
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
index cff632a3b1e..84cc35ce7ad 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
@@ -404,7 +404,7 @@ private SSLSocketFactory getSSLSocketFactory(String host) {
      * @return the keystore entry or {@code null} if no match found
      * @throws KeyStoreException
      */
-    private String getDomainMatch(KeyStore keyStore, String host) throws KeyStoreException {
+    private static String getDomainMatch(KeyStore keyStore, String host) throws KeyStoreException {
         if (keyStore.containsAlias(host)) {
             return host;
         }
@@ -479,7 +479,7 @@ private Socket startSSL(Socket sock, String host) throws IOException {
         }
     }
 
-    private SampleResult generateErrorResult(SampleResult result, HttpRequestHdr request, Exception e) {
+    private static SampleResult generateErrorResult(SampleResult result, HttpRequestHdr request, Exception e) {
         return generateErrorResult(result, request, e, "");
     }
 
@@ -537,7 +537,7 @@ private void writeToClient(SampleResult res, OutputStream out) throws IOExceptio
      *
      * @return updated headers to be sent to client
      */
-    private String messageResponseHeaders(SampleResult res) {
+    private static String messageResponseHeaders(SampleResult res) {
         String headers = res.getResponseHeaders();
         String[] headerLines = headers.split(NEW_LINE, 0); // drop empty trailing content
         int contentLengthIndex = -1;
@@ -647,7 +647,7 @@ private void addFormEncodings(SampleResult result, String pageEncoding) {
         }
     }
 
-    private boolean isNotHtmlType(String contentType) {
+    private static boolean isNotHtmlType(String contentType) {
         for (String mimeType: NOT_HTML_TEXT_TYPES) {
             if (contentType.startsWith(mimeType)) {
                 return true;
@@ -656,7 +656,7 @@ private boolean isNotHtmlType(String contentType) {
         return false;
     }
 
-    private String getUrlWithoutQuery(URL url) {
+    private static String getUrlWithoutQuery(URL url) {
         String fullUrl = url.toString();
         String urlWithoutQuery = fullUrl;
         String query = url.getQuery();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 8fa079bc7f5..cb68ace2418 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -674,7 +674,7 @@ public synchronized void deliverSampler(final HTTPSamplerBase sampler, final Tes
      * @param result       {@link HTTPSampleResult}
      * @return {@link Authorization}
      */
-    private Authorization createAuthorization(final TestElement[] testElements, SampleResult result) {
+    private static Authorization createAuthorization(final TestElement[] testElements, SampleResult result) {
         Header authHeader;
         Authorization authorization = null;
         // Iterate over subconfig elements searching for HeaderManager
@@ -744,7 +744,7 @@ private Authorization createAuthorization(final TestElement[] testElements, Samp
         return authorization;
     }
 
-    private String computeAuthUrl(String url) {
+    private static String computeAuthUrl(String url) {
         int index = url.lastIndexOf('/');
         if (index >=0) {
             return url.substring(0, index+1);
@@ -871,7 +871,7 @@ boolean filterContentType(SampleResult result) {
      * @param sampleContentType content to check
      * @return boolean true if Matching expression
      */
-    private boolean testPattern(String expression, String sampleContentType, boolean expectedToMatch) {
+    private static boolean testPattern(String expression, String sampleContentType, boolean expectedToMatch) {
         if (expression == null || expression.isEmpty()) {
             return true;
         }
@@ -897,12 +897,12 @@ private boolean testPattern(String expression, String sampleContentType, boolean
         return true;
     }
 
-    private boolean isContainedWithJavaRegex(String expression, String sampleContentType) {
+    private static boolean isContainedWithJavaRegex(String expression, String sampleContentType) {
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression);
         return pattern.matcher(sampleContentType).find();
     }
 
-    private boolean isContainedWithOroRegex(String expression, String sampleContentType) {
+    private static boolean isContainedWithOroRegex(String expression, String sampleContentType) {
         Pattern pattern = JMeterUtils.getPatternCache().getPattern(expression,
                 Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
         return JMeterUtils.getMatcher().contains(sampleContentType, pattern);
@@ -944,7 +944,7 @@ private JMeterTreeModel getJmeterTreeModel() {
      * Helper method to add a Response Assertion
      * Called from AWT Event thread
      */
-    private void addAssertion(JMeterTreeModel model, JMeterTreeNode node) throws IllegalUserActionException {
+    private static void addAssertion(JMeterTreeModel model, JMeterTreeNode node) throws IllegalUserActionException {
         ResponseAssertion ra = new ResponseAssertion();
         ra.setProperty(TestElement.GUI_CLASS, ASSERTION_GUI);
         ra.setName(JMeterUtils.getResString("assertion_title")); // $NON-NLS-1$
@@ -953,7 +953,7 @@ private void addAssertion(JMeterTreeModel model, JMeterTreeNode node) throws Ill
     }
 
     /** Construct a new AuthManager with the provided authorization */
-    private AuthManager newAuthorizationManager(Authorization authorization) {
+    private static AuthManager newAuthorizationManager(Authorization authorization) {
         AuthManager authManager = new AuthManager();
         authManager.setProperty(TestElement.GUI_CLASS, AUTH_PANEL);
         authManager.setProperty(TestElement.TEST_CLASS, AUTH_MANAGER);
@@ -966,14 +966,14 @@ private AuthManager newAuthorizationManager(Authorization authorization) {
      * Helper method to add a Divider
      * Called from Application Thread that needs to update GUI (JMeterTreeModel)
      */
-    private void addDivider(final JMeterTreeModel model, final JMeterTreeNode node) {
+    private static void addDivider(final JMeterTreeModel model, final JMeterTreeNode node) {
         final GenericController sc = new GenericController();
         sc.setProperty(TestElement.GUI_CLASS, LOGIC_CONTROLLER_GUI);
         sc.setName("-------------------"); // $NON-NLS-1$
         safelyAddComponent(model, node, sc);
     }
 
-    private void safelyAddComponent(
+    private static void safelyAddComponent(
             final JMeterTreeModel model,
             final JMeterTreeNode node,
             final GenericController controller) {
@@ -995,7 +995,7 @@ private void safelyAddComponent(
      * @param node  Node in the tree where we will add the Controller
      * @param name  A name for the Controller
      */
-    private void addSimpleController(final JMeterTreeModel model, final JMeterTreeNode node, String name) {
+    private static void addSimpleController(final JMeterTreeModel model, final JMeterTreeNode node, String name) {
         final GenericController sc = new GenericController();
         sc.setProperty(TestElement.GUI_CLASS, LOGIC_CONTROLLER_GUI);
         sc.setName(name);
@@ -1010,7 +1010,7 @@ private void addSimpleController(final JMeterTreeModel model, final JMeterTreeNo
      * @param node  Node in the tree where we will add the Controller
      * @param name  A name for the Controller
      */
-    private void addTransactionController(final JMeterTreeModel model, final JMeterTreeNode node, String name) {
+    private static void addTransactionController(final JMeterTreeModel model, final JMeterTreeNode node, String name) {
         final TransactionController sc = new TransactionController();
         sc.setIncludeTimers(false);
         sc.setProperty(TestElement.GUI_CLASS, TRANSACTION_CONTROLLER_GUI);
@@ -1271,7 +1271,7 @@ private boolean prepareTree(final JMeterTreeModel treeModel,
         return false;
     }
 
-    private JMeterTreeNode getTargetNode(JMeterTreeNode origTarget, int cachedGroupingMode) {
+    private static JMeterTreeNode getTargetNode(JMeterTreeNode origTarget, int cachedGroupingMode) {
         if (cachedGroupingMode == GROUPING_IN_SIMPLE_CONTROLLERS ||
                 cachedGroupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
             // Find the last controller in the target to store the
@@ -1306,7 +1306,7 @@ private boolean isAddableTestElement(
         }
     }
 
-    private boolean hasCorrectInterface(Object obj, Set<Class<?>> klasses) {
+    private static boolean hasCorrectInterface(Object obj, Set<Class<?>> klasses) {
         for (Class<?> klass: klasses) {
             if (klass != null && klass.isInstance(obj)) {
                 return true;
@@ -1324,7 +1324,7 @@ private boolean hasCorrectInterface(Object obj, Set<Class<?>> klasses) {
      * @param sampler        Sampler to remove values from.
      * @param configurations ConfigTestElements in descending priority.
      */
-    private void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<ConfigTestElement> configurations) {
+    private static void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<ConfigTestElement> configurations) {
         PropertyIterator props = sampler.propertyIterator();
         while (props.hasNext()) {
             JMeterProperty prop = props.next();
@@ -1355,7 +1355,7 @@ private void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<ConfigT
         }
     }
 
-    private String generateMatchUrl(HTTPSamplerBase sampler) {
+    private static String generateMatchUrl(HTTPSamplerBase sampler) {
         StringBuilder buf = new StringBuilder(sampler.getDomain());
         buf.append(':'); // $NON-NLS-1$
         buf.append(sampler.getPort());
@@ -1367,14 +1367,14 @@ private String generateMatchUrl(HTTPSamplerBase sampler) {
         return buf.toString();
     }
 
-    private boolean matchesPatterns(String url, CollectionProperty patterns) {
+    private static boolean matchesPatterns(String url, CollectionProperty patterns) {
         if (USE_JAVA_REGEX) {
             return matchesPatternsWithJavaRegex(url, patterns);
         }
         return matchesPatternsWithOroRegex(url, patterns);
     }
 
-    private boolean matchesPatternsWithJavaRegex(String url, CollectionProperty patterns) {
+    private static boolean matchesPatternsWithJavaRegex(String url, CollectionProperty patterns) {
         for (JMeterProperty jMeterProperty : patterns) {
             String item = jMeterProperty.getStringValue();
             try {
@@ -1389,7 +1389,7 @@ private boolean matchesPatternsWithJavaRegex(String url, CollectionProperty patt
         return false;
     }
 
-    private boolean matchesPatternsWithOroRegex(String url, CollectionProperty patterns) {
+    private static boolean matchesPatternsWithOroRegex(String url, CollectionProperty patterns) {
         for (JMeterProperty jMeterProperty : patterns) {
             String item = jMeterProperty.getStringValue();
             try {
@@ -1634,7 +1634,7 @@ private void initDynamicKeyStore() throws IOException, GeneralSecurityException
     }
 
     @SuppressWarnings("deprecation")
-    private boolean isValid(String subject) {
+    private static boolean isValid(String subject) {
         String[] parts = subject.split("\\.");
         return !parts[0].endsWith("*") // not a wildcard
                 || parts.length >= 3
@@ -1685,7 +1685,7 @@ private void initJMeterKeyStore() throws IOException, GeneralSecurityException {
         }
     }
 
-    private KeyStore getKeyStore(char[] password) throws GeneralSecurityException, IOException {
+    private static KeyStore getKeyStore(char[] password) throws GeneralSecurityException, IOException {
         try (InputStream in = new BufferedInputStream(new FileInputStream(CERT_PATH))) {
             log.debug("Opened Keystore file: {}", CERT_PATH_ABS);
             KeyStore ks = KeyStore.getInstance(KEYSTORE_TYPE);
@@ -1695,11 +1695,11 @@ private KeyStore getKeyStore(char[] password) throws GeneralSecurityException, I
         }
     }
 
-    private String getPassword() {
+    private static String getPassword() {
         return PREFERENCES.get(USER_PASSWORD_KEY, null);
     }
 
-    private void setPassword(String password) {
+    private static void setPassword(String password) {
         PREFERENCES.put(USER_PASSWORD_KEY, password);
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index 7846a227437..5b7e776d092 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -363,7 +363,7 @@ protected void setExcludeListInProxyControl(ProxyControl element) {
         element.setExcludeList(excludeList);
     }
 
-    private List<String> getDataList(PowerTableModel pModel, String colName) {
+    private static List<String> getDataList(PowerTableModel pModel, String colName) {
         String[] dataArray = pModel.getData().getColumn(colName);
         List<String> list = new ArrayList<>();
         Collections.addAll(list, dataArray);
@@ -417,7 +417,7 @@ public void configure(TestElement element) {
         repaint();
     }
 
-    private void populateTable(PowerTableModel pModel, PropertyIterator iter) {
+    private static void populateTable(PowerTableModel pModel, PropertyIterator iter) {
         pModel.clearData();
         while (iter.hasNext()) {
             pModel.addRow(new Object[] { iter.next().getStringValue() });
@@ -1037,7 +1037,7 @@ private void addTargetToPanel(JPanel destPanel) {
         destPanel.add(targetNodes, "growx, span");
     }
 
-    private JScrollPane findScrollPane(JPopupMenu popup) {
+    private static JScrollPane findScrollPane(JPopupMenu popup) {
         Component[] components = popup.getComponents();
         for (Component component : components) {
             if(component instanceof JScrollPane) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
index 8a049dbc7f8..d705ae726cb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
@@ -308,7 +308,7 @@ private String setConnectionHeaders(URL url, String host, String method)
         return hbuf.toString();
     }
 
-    private String encode(String value)  {
+    private static String encode(String value)  {
         StringBuilder newValue = new StringBuilder();
         char[] chars = value.toCharArray();
         for (char c : chars) {
@@ -335,7 +335,7 @@ private String setConnectionCookies(URL url, CookieManager cookies) {
         return cookieHeader;
     }
 
-    private int translateHeader(String n) {
+    private static int translateHeader(String n) {
         for(int i=0; i < HEADER_TRANS_ARRAY.length; i++) {
             if(HEADER_TRANS_ARRAY[i].equalsIgnoreCase(n)) {
                 return i+1;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index bd6671d4509..114b268cf19 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -273,7 +273,7 @@ private Authorization getAuthorizationForAuthScope(AuthScope authScope) {
             return null;
         }
 
-        private int getPort(URL url) {
+        private static int getPort(URL url) {
             if (url.getPort() == -1) {
                 return url.getProtocol().equals("https") ? 443 : 80;
             }
@@ -356,7 +356,7 @@ public void process(HttpRequest request, HttpContext context) throws HttpExcepti
          * @param authCache
          * @param authScope
          */
-        private void fillAuthCache(HttpHost targetHost, Authorization authorization, AuthCache authCache,
+        private static void fillAuthCache(HttpHost targetHost, Authorization authorization, AuthCache authCache,
                 AuthScope authScope) {
             @SuppressWarnings("deprecation")
             Mechanism basicDigest = Mechanism.BASIC_DIGEST;
@@ -771,7 +771,7 @@ protected HTTPSampleResult sample(URL url, String method,
      * @param triple {@link MutableTriple}
      * @param localContext {@link HttpContext}
      */
-    private void saveProxyAuth(
+    private static void saveProxyAuth(
             MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
             HttpContext localContext) {
         triple.setMiddle((AuthState) localContext.getAttribute(HttpClientContext.PROXY_AUTH_STATE));
@@ -782,8 +782,8 @@ private void saveProxyAuth(
      * @param triple {@link MutableTriple} May be null if first request
      * @param localContext {@link HttpContext}
      */
-    private void setupProxyAuthState(MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
-                                HttpContext localContext) {
+    private static void setupProxyAuthState(MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
+            HttpContext localContext) {
         if (triple != null) {
             AuthState proxyAuthState = triple.getMiddle();
             localContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, proxyAuthState);
@@ -837,7 +837,7 @@ private HttpRequestBase createHttpRequest(URI uri, String method, boolean areFol
      * @param jMeterVariables {@link JMeterVariables}
      * @param localContext {@link HttpContext}
      */
-    private void extractClientContextAfterSample(JMeterVariables jMeterVariables, HttpContext localContext) {
+    private static void extractClientContextAfterSample(JMeterVariables jMeterVariables, HttpContext localContext) {
         Object userToken = localContext.getAttribute(HttpClientContext.USER_TOKEN);
         if(userToken != null) {
             log.debug("Extracted from HttpContext user token:{} storing it as JMeter variable:{}", userToken, JMETER_VARIABLE_USER_TOKEN);
@@ -854,7 +854,7 @@ private void extractClientContextAfterSample(JMeterVariables jMeterVariables, Ht
      * @param jMeterVariables {@link JMeterVariables}
      * @param localContext {@link HttpContext}
      */
-    private void setupClientContextBeforeSample(JMeterVariables jMeterVariables, HttpContext localContext) {
+    private static void setupClientContextBeforeSample(JMeterVariables jMeterVariables, HttpContext localContext) {
         Object userToken = null;
         // During recording JMeterContextService.getContext().getVariables() is null
         if(jMeterVariables != null) {
@@ -993,7 +993,7 @@ private int getHash() {
         }
 
         // Allow for null strings
-        private int getHash(String s) {
+        private static int getHash(String s) {
             return s == null ? 0 : s.hashCode();
         }
 
@@ -1223,7 +1223,7 @@ private HttpClientKey createHttpClientKey(URL url) {
      * @param clientContext {@link HttpClientContext}
      * @param mapHttpClientPerHttpClientKey Map of {@link MutableTriple} holding {@link CloseableHttpClient} and {@link PoolingHttpClientConnectionManager}
      */
-    private void resetStateIfNeeded(
+    private static void resetStateIfNeeded(
             MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
             JMeterVariables jMeterVariables,
             HttpClientContext clientContext,
@@ -1244,7 +1244,7 @@ private void resetStateIfNeeded(
     /**
      * @param mapHttpClientPerHttpClientKey
      */
-    private void closeCurrentConnections(
+    private static void closeCurrentConnections(
             Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
         for (MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple :
                 mapHttpClientPerHttpClientKey.values()) {
@@ -1334,7 +1334,7 @@ protected void setDefaultRequestHeaders(HttpRequest request) {
      * @param response containing the headers
      * @return string containing the headers, one per line
      */
-    private String getResponseHeaders(HttpResponse response) {
+    private static String getResponseHeaders(HttpResponse response) {
         Header[] rh = response.getAllHeaders();
 
         StringBuilder headerBuf = new StringBuilder(40 * (rh.length+1));
@@ -1352,7 +1352,7 @@ private String getResponseHeaders(HttpResponse response) {
      * @param headerBuffer {@link StringBuilder}
      * @param header {@link Header}
      */
-    private void writeHeader(StringBuilder headerBuffer, Header header) {
+    private static void writeHeader(StringBuilder headerBuffer, Header header) {
         if(header instanceof BufferedHeader) {
             CharArrayBuffer buffer = ((BufferedHeader)header).getBuffer();
             headerBuffer.append(buffer.buffer(), 0, buffer.length()).append('\n'); // $NON-NLS-1$
@@ -1396,7 +1396,7 @@ protected String setConnectionCookie(HttpRequest request, URL url, CookieManager
      *                      for this <code>UrlConfig</code>
      * @param cacheManager  the CacheManager (may be null)
      */
-    protected void setConnectionHeaders(HttpRequestBase request, URL url, HeaderManager headerManager, CacheManager cacheManager) {
+    protected static void setConnectionHeaders(HttpRequestBase request, URL url, HeaderManager headerManager, CacheManager cacheManager) {
         if (headerManager != null) {
             CollectionProperty headers = headerManager.getHeaders();
             if (headers != null) {
@@ -1441,7 +1441,7 @@ protected void setConnectionHeaders(HttpRequestBase request, URL url, HeaderMana
      *                        hostHeaderValue
      * @return integer representing the port for the host header
      */
-    private int getPortFromHostHeader(String hostHeaderValue, int defaultValue) {
+    private static int getPortFromHostHeader(String hostHeaderValue, int defaultValue) {
         String[] hostParts = hostHeaderValue.split(":");
         if (hostParts.length > 1) {
             String portString = hostParts[hostParts.length - 1];
@@ -1458,7 +1458,7 @@ private int getPortFromHostHeader(String hostHeaderValue, int defaultValue) {
      * @param method <code>HttpMethod</code> which represents the request
      * @return the headers as a string
      */
-    private String getAllHeadersExceptCookie(HttpRequest method) {
+    private static String getAllHeadersExceptCookie(HttpRequest method) {
         return getFromHeadersMatchingPredicate(method, ALL_EXCEPT_COOKIE);
     }
 
@@ -1468,7 +1468,7 @@ private String getAllHeadersExceptCookie(HttpRequest method) {
      * @param method <code>HttpMethod</code> which represents the request
      * @return the headers as a string
      */
-    private String getOnlyCookieFromHeaders(HttpRequest method) {
+    private static String getOnlyCookieFromHeaders(HttpRequest method) {
         String cookieHeader= getFromHeadersMatchingPredicate(method, ONLY_COOKIE).trim();
         if(!cookieHeader.isEmpty()) {
             return cookieHeader.substring(HTTPConstants.HEADER_COOKIE_IN_REQUEST.length()).trim();
@@ -1483,7 +1483,7 @@ private String getOnlyCookieFromHeaders(HttpRequest method) {
      * @param method <code>HttpMethod</code> which represents the request
      * @return the headers as a string
      */
-    private String getFromHeadersMatchingPredicate(HttpRequest method, Predicate<String> predicate) {
+    private static String getFromHeadersMatchingPredicate(HttpRequest method, Predicate<String> predicate) {
         if(method != null) {
             // Get all the request headers
             StringBuilder hdrs = new StringBuilder(150);
@@ -1681,7 +1681,7 @@ else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
      * @throws IOException
      * @throws UnsupportedEncodingException
      */
-    private void writeEntityToSB(final StringBuilder postedBody, final HttpEntity entity,
+    private static void writeEntityToSB(final StringBuilder postedBody, final HttpEntity entity,
             final ViewableFileBody[] fileBodies, final String contentEncoding)
                     throws IOException {
         if (entity.isRepeatable()){
@@ -1845,7 +1845,7 @@ private String getContentEncoding(String dflt) {
         }
     }
 
-    private void saveConnectionCookies(HttpResponse method, URL u, CookieManager cookieManager) {
+    private static void saveConnectionCookies(HttpResponse method, URL u, CookieManager cookieManager) {
         if (cookieManager != null) {
             Header[] hdrs = method.getHeaders(HTTPConstants.HEADER_SET_COOKIE);
             for (Header hdr : hdrs) {
@@ -1878,7 +1878,7 @@ protected void threadFinished() {
         closeThreadLocalConnections();
     }
 
-    private void closeThreadLocalConnections() {
+    private static void closeThreadLocalConnections() {
         // Does not need to be synchronised, as all access is from same thread
         Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>>
             mapHttpClientPerHttpClientKey = HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY.get();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index d18afbf0d27..22bb7a7e302 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -336,7 +336,7 @@ protected String getResponseHeaders(HttpURLConnection conn) {
      *            the <code>CookieManager</code> containing all the cookies
      *            for this <code>UrlConfig</code>
      */
-    private String setConnectionCookie(HttpURLConnection conn, URL u, CookieManager cookieManager) {
+    private static String setConnectionCookie(HttpURLConnection conn, URL u, CookieManager cookieManager) {
         String cookieHeader = null;
         if (cookieManager != null) {
             cookieHeader = cookieManager.getCookieHeaderForURL(u);
@@ -361,7 +361,7 @@ private String setConnectionCookie(HttpURLConnection conn, URL u, CookieManager
      *            for this <code>UrlConfig</code>
      * @param cacheManager the CacheManager (may be null)
      */
-    private void setConnectionHeaders(HttpURLConnection conn, URL u,
+    private static void setConnectionHeaders(HttpURLConnection conn, URL u,
             HeaderManager headerManager, CacheManager cacheManager) {
         // Add all the headers from the HeaderManager
         Header[] arrayOfHeaders = null;
@@ -393,7 +393,7 @@ private void setConnectionHeaders(HttpURLConnection conn, URL u,
      * @param securityHeaders Map of security Header
      * @return the headers as a string
      */
-    private String getOnlyCookieFromHeaders(HttpURLConnection conn, Map<String, String> securityHeaders) {
+    private static String getOnlyCookieFromHeaders(HttpURLConnection conn, Map<String, String> securityHeaders) {
         String cookieHeader= getFromConnectionHeaders(conn, securityHeaders, ONLY_COOKIE, false).trim();
         if(!cookieHeader.isEmpty()) {
             return cookieHeader.substring(HTTPConstants.HEADER_COOKIE_IN_REQUEST.length()).trim();
@@ -410,7 +410,7 @@ private String getOnlyCookieFromHeaders(HttpURLConnection conn, Map<String, Stri
      * @param securityHeaders Map of security Header
      * @return the headers as a string
      */
-    private String getAllHeadersExceptCookie(HttpURLConnection conn, Map<String, String> securityHeaders) {
+    private static String getAllHeadersExceptCookie(HttpURLConnection conn, Map<String, String> securityHeaders) {
         return getFromConnectionHeaders(conn, securityHeaders, ALL_EXCEPT_COOKIE, true);
     }
 
@@ -424,7 +424,7 @@ private String getAllHeadersExceptCookie(HttpURLConnection conn, Map<String, Str
      * @param predicate {@link Predicate}
      * @return the headers as a string
      */
-    private String getFromConnectionHeaders(HttpURLConnection conn, Map<String, String> securityHeaders,
+    private static String getFromConnectionHeaders(HttpURLConnection conn, Map<String, String> securityHeaders,
             Predicate<String> predicate, boolean addSecurityHeaders) {
         // Get all the request properties, which are the headers set on the connection
         StringBuilder hdrs = new StringBuilder(100);
@@ -465,7 +465,7 @@ private String getFromConnectionHeaders(HttpURLConnection conn, Map<String, Stri
      *            this <code>UrlConfig</code>
      * @return String Authorization header value or null if not set
      */
-    private Map<String, String> setConnectionAuthorization(HttpURLConnection conn, URL u, AuthManager authManager) {
+    private static Map<String, String> setConnectionAuthorization(HttpURLConnection conn, URL u, AuthManager authManager) {
         if (authManager != null) {
             Authorization auth = authManager.getAuthForURL(u);
             if (auth != null) {
@@ -662,7 +662,7 @@ protected HTTPSampleResult sample(URL url, String method, boolean areFollowingRe
         }
     }
 
-    private Header[] getHeaders(HeaderManager headerManager) {
+    private static Header[] getHeaders(HeaderManager headerManager) {
         if (headerManager != null) {
             final CollectionProperty headers = headerManager.getHeaders();
             if (headers != null) {
@@ -700,7 +700,7 @@ protected void disconnect(HttpURLConnection conn) {
      *            the <code>CookieManager</code> containing all the cookies
      *            for this <code>UrlConfig</code>
      */
-    private void saveConnectionCookies(HttpURLConnection conn, URL u, CookieManager cookieManager) {
+    private static void saveConnectionCookies(HttpURLConnection conn, URL u, CookieManager cookieManager) {
         if (cookieManager != null) {
             for (int i = 1; conn.getHeaderFieldKey(i) != null; i++) {
                 if (conn.getHeaderFieldKey(i).equalsIgnoreCase(HTTPConstants.HEADER_SET_COOKIE)) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index f806f12ef7a..dae016f253d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -442,7 +442,7 @@ public boolean getUseMultipart() {
         return getDoMultipart() || (files.length>0 && hasNoMissingFile(files) && !getSendFileAsPostBody());
     }
 
-    private boolean hasNoMissingFile(HTTPFileArg[] files) {
+    private static boolean hasNoMissingFile(HTTPFileArg[] files) {
         for (HTTPFileArg httpFileArg : files) {
             if(StringUtils.isEmpty(httpFileArg.getPath())) {
                 log.warn("File {} is invalid as no path is defined", httpFileArg);
@@ -1476,7 +1476,7 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
         return res;
     }
 
-    private Predicate<URL> generateMatcherPredicate(String regex, String explanation, boolean defaultAnswer) {
+    private static Predicate<URL> generateMatcherPredicate(String regex, String explanation, boolean defaultAnswer) {
         if (StringUtils.isEmpty(regex)) {
             return s -> defaultAnswer;
         }
@@ -1511,7 +1511,7 @@ static void registerParser(String contentType, String className) {
      * @return {@link LinkExtractorParser}
      * @throws LinkExtractorParseException
      */
-    private LinkExtractorParser getParser(HTTPSampleResult res)
+    private static LinkExtractorParser getParser(HTTPSampleResult res)
             throws LinkExtractorParseException {
         String parserClassName =
                 PARSERS_FOR_CONTENT_TYPE.get(res.getMediaType());
@@ -1525,7 +1525,7 @@ private LinkExtractorParser getParser(HTTPSampleResult res)
      * @param url URL to escape
      * @return escaped url
      */
-    private URL escapeIllegalURLCharacters(java.net.URL url) {
+    private static URL escapeIllegalURLCharacters(java.net.URL url) {
         if (url == null || "file".equals(url.getProtocol())) {
             return url;
         }
@@ -1542,7 +1542,7 @@ private URL escapeIllegalURLCharacters(java.net.URL url) {
      * @param sampleResult HTTPSampleResult
      * @return User Agent part
      */
-    private String getUserAgent(HTTPSampleResult sampleResult) {
+    private static String getUserAgent(HTTPSampleResult sampleResult) {
         String res = sampleResult.getRequestHeaders();
         int index = res.indexOf(USER_AGENT);
         if (index >= 0) {
@@ -1569,7 +1569,7 @@ private String getUserAgent(HTTPSampleResult sampleResult) {
      * @param res {@link HTTPSampleResult}
      * @param initialValue boolean
      */
-    private void setParentSampleSuccess(HTTPSampleResult res, boolean initialValue) {
+    private static void setParentSampleSuccess(HTTPSampleResult res, boolean initialValue) {
         if (!IGNORE_FAILED_EMBEDDED_RESOURCES) {
             res.setSuccessful(initialValue);
             if (!initialValue) {
@@ -1733,7 +1733,7 @@ protected HTTPSampleResult followRedirects(HTTPSampleResult res, int frameDepth)
      * @param initialMethod the initial HTTP Method
      * @return the new HTTP Method as per RFC
      */
-    private String computeMethodForRedirect(String initialMethod) {
+    private static String computeMethodForRedirect(String initialMethod) {
         if (!HTTPConstants.HEAD.equalsIgnoreCase(initialMethod)) {
             return HTTPConstants.GET;
         }
@@ -1996,7 +1996,7 @@ public byte[] readResponse(SampleResult sampleResult, InputStream in, long lengt
      * @param w {@link OutputStream}
      * @return byte array
      */
-    private byte[] toByteArray(OutputStream w) {
+    private static byte[] toByteArray(OutputStream w) {
         if(w instanceof DirectAccessByteArrayOutputStream) {
             return ((DirectAccessByteArrayOutputStream) w).toByteArray();
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index b67b1173e12..c0f2723dc2e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -373,7 +373,7 @@ private byte[] getFileMultipartEndDivider() throws IOException{
      *
      * @return the bytes used to end the multipart request
      */
-    private byte[] getMultipartEndDivider(){
+    private static byte[] getMultipartEndDivider(){
         byte[] ending = DASH_DASH_BYTES;
         byte[] completeEnding = new byte[ending.length + CRLF.length];
         System.arraycopy(ending, 0, completeEnding, 0, ending.length);
@@ -385,7 +385,7 @@ private byte[] getMultipartEndDivider(){
      * Write the start of a file multipart, up to the point where the
      * actual file content should be written
      */
-    private void writeStartFileMultipart(OutputStream out, String filename,
+    private static void writeStartFileMultipart(OutputStream out, String filename,
             String nameField, String mimetype)
             throws IOException {
         write(out, "Content-Disposition: form-data; name=\""); // $NON-NLS-1$
@@ -437,14 +437,14 @@ private void writeFormMultipart(OutputStream out, String name, String value, Str
         out.write(getMultipartDivider());
     }
 
-    private void write(OutputStream out, String value)
+    private static void write(OutputStream out, String value)
     throws UnsupportedEncodingException, IOException
     {
         out.write(value.getBytes(ENCODING));
     }
 
 
-    private void writeln(OutputStream out, String value)
+    private static void writeln(OutputStream out, String value)
     throws UnsupportedEncodingException, IOException
     {
         out.write(value.getBytes(ENCODING));
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
index 43f3e260532..1cc8899d463 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
@@ -80,7 +80,7 @@ public int read(byte[] b) throws IOException {
      * @return -1 if relax
      * @throws EOFException
      */
-    private int handleRelaxMode(final EOFException ex, final boolean relaxMode) throws EOFException {
+    private static int handleRelaxMode(final EOFException ex, final boolean relaxMode) throws EOFException {
         if(relaxMode) {
             return -1;
         } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
index 0a6bb6de06e..5938d34bd5a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
@@ -79,7 +79,7 @@ public int read(byte[] b) throws IOException {
      * @return -1 if relax
      * @throws EOFException
      */
-    private int handleRelaxMode(final EOFException ex, final boolean relaxMode) throws EOFException {
+    private static int handleRelaxMode(final EOFException ex, final boolean relaxMode) throws EOFException {
         if(relaxMode) {
             return -1;
         } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index a33fcb18d88..1b1c5eb5117 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -103,7 +103,7 @@ private static Tika createTika() {
         }
     }
 
-    private String detectMimeType(String path, String mimetype) {
+    private static String detectMimeType(String path, String mimetype) {
         if (StringUtils.isNotBlank(mimetype)) {
             return mimetype;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
index 2e759b83b53..80bea175937 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
@@ -107,7 +107,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         return res;
     }
 
-    private void retrieveHTTPItem(HierarchicalStreamReader reader,
+    private static void retrieveHTTPItem(HierarchicalStreamReader reader,
             HTTPSampleResult res, Object subItem) {
         if (subItem instanceof URL) {
             res.setURL((URL) subItem);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index 569f7fcbe54..e573aec2181 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -91,14 +91,14 @@ protected boolean hasExcPattern(String text) {
         return false;
     }
 
-    protected String getIpAddress(String logLine) {
+    protected static String getIpAddress(String logLine) {
         if (USE_JAVA_REGEX) {
             return getIpAddressWithJavaRegex(logLine);
         }
         return getIpAddressWithOroRegex(logLine);
     }
 
-    private String getIpAddressWithJavaRegex(String logLine) {
+    private static String getIpAddressWithJavaRegex(String logLine) {
         Matcher matcher = IP_PATTERN.matcher(logLine);
         if (matcher.find()) {
             return matcher.group(0);
@@ -106,7 +106,7 @@ private String getIpAddressWithJavaRegex(String logLine) {
         return "";
     }
 
-    private String getIpAddressWithOroRegex(String logLine) {
+    private static String getIpAddressWithOroRegex(String logLine) {
         Pattern incIp = JMeterUtils.getPatternCache().getPattern("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}",
                 Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.SINGLELINE_MASK);
         Perl5Matcher matcher = JMeterUtils.getMatcher();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index a4ade6e40ab..0a0790ee02d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -255,7 +255,7 @@ public void setSamplerResult(Object objectResult) {
      * @param contentType the content type header
      * @return  the boundary string
      */
-    private String extractBoundary(String contentType) {
+    private static String extractBoundary(String contentType) {
         // Get the boundary string for the multiparts from the content type
         String boundaryString = contentType.substring(contentType.toLowerCase(java.util.Locale.ENGLISH).indexOf("boundary=") + "boundary=".length());
         //TODO check in the RFC if other char can be used as separator
@@ -271,7 +271,7 @@ private String extractBoundary(String contentType) {
      * @param headers the http request headers
      * @return true if the request is multipart
      */
-    private boolean isMultipart(LinkedHashMap<String, String> headers) {
+    private static boolean isMultipart(LinkedHashMap<String, String> headers) {
         String contentType = headers.get(HTTPConstants.HEADER_CONTENT_TYPE);
         return contentType != null && contentType.startsWith(HTTPConstants.MULTIPART_FORM_DATA);
     }
@@ -406,7 +406,7 @@ private Component createRequestPane() {
         return panel;
     }
 
-    private void setFirstColumnPreferredAndMaxWidth(JTable table) {
+    private static void setFirstColumnPreferredAndMaxWidth(JTable table) {
         TableColumn column = table.getColumnModel().getColumn(0);
         column.setMaxWidth(300);
         column.setPreferredWidth(160);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
index 1fabe5e1707..44e2241f742 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
@@ -239,7 +239,7 @@ public JMeterContext getJMeterContext() {
      * Returns {@link JMeterVariables} for the current thread.
      * @return {@link JMeterVariables} for the current thread.
      */
-    public final JMeterVariables getJMeterVariables() {
+    public static JMeterVariables getJMeterVariables() {
         return JMeterContextService.getContext().getVariables();
     }
 
@@ -247,7 +247,7 @@ public final JMeterVariables getJMeterVariables() {
      * Returns JMeter properties.
      * @return {@link Properties} JMeter properties
      */
-    public final Properties getJMeterProperties() {
+    public static Properties getJMeterProperties() {
         return JMeterUtils.getJMeterProperties();
     }
 
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
index 2aaa3b7095d..83ee435a79f 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
@@ -334,7 +334,7 @@ public SampleResult runTest(JavaSamplerContext context) {
      * @param context
      *            the context which contains the initialization parameters.
      */
-    private void listParameters(JavaSamplerContext context) {
+    private static void listParameters(JavaSamplerContext context) {
         Iterator<String> argsIt = context.getParameterNamesIterator();
         while (argsIt.hasNext()) {
             String name = argsIt.next();
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
index 363899c21e1..25ddbbdadf1 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
@@ -198,7 +198,7 @@ public Arguments getDefaultParameters() {
      * @param context
      *            the context which contains the initialization parameters.
      */
-    private void listParameters(JavaSamplerContext context) {
+    private static void listParameters(JavaSamplerContext context) {
         Iterator<String> argsIt = context.getParameterNamesIterator();
         while (argsIt.hasNext()) {
             String lName = argsIt.next();
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index 2282216b1f3..b9d8d99e828 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -315,7 +315,7 @@ private void putIntoVar(final JMeterVariables jmvars, final String name,
         }
     }
 
-    private void putIntoVar(final JMeterVariables jmvars, final String name,
+    private static void putIntoVar(final JMeterVariables jmvars, final String name,
             final Clob clob) throws SQLException {
         try {
             if (clob.length() > MAX_RETAIN_SIZE) {
@@ -418,7 +418,7 @@ private int[] setArguments(PreparedStatement pstmt) throws SQLException, IOExcep
         return outputs;
     }
 
-    private void setArgument(PreparedStatement pstmt, String argument, int targetSqlType, int index) throws SQLException {
+    private static void setArgument(PreparedStatement pstmt, String argument, int targetSqlType, int index) throws SQLException {
         switch (targetSqlType) {
         case Types.INTEGER:
             pstmt.setInt(index, Integer.parseInt(argument));
@@ -582,7 +582,7 @@ private String getStringFromResultSet(ResultSet rs) throws SQLException, Unsuppo
         return sb.toString();
     }
 
-    private int processRow(ResultSet rs, ResultSetMetaData meta, StringBuilder sb, int numColumns,
+    private static int processRow(ResultSet rs, ResultSetMetaData meta, StringBuilder sb, int numColumns,
             JMeterVariables jmvars, String[] varNames, List<Map<String, Object>> results, int currentIterationIndex)
             throws SQLException, UnsupportedEncodingException {
         Map<String, Object> row = null;
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
index 7dd90467762..c3309487cad 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
@@ -150,7 +150,7 @@ public static int getTransactionIsolationMode(String tag) {
      * Get the list of JDBC driver classname for the main databases
      * @return a String[] with the list of JDBC driver classname
      */
-    private String[] getListJDBCDriverClass() {
+    private static String[] getListJDBCDriverClass() {
         return JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.jdbc.driver.class", ""), "|"); //$NON-NLS-1$
     }
 
@@ -159,7 +159,7 @@ private String[] getListJDBCDriverClass() {
      * Based in https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
      * @return a String[] with the list of check queries
      */
-    private String[] getListCheckQuery() {
+    private static String[] getListCheckQuery() {
         return JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), "|"); //$NON-NLS-1$
     }
 
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
index 9bd86593e37..93db4ea5c63 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
@@ -269,7 +269,7 @@ private ReceiveSubscriber(int queueSize, boolean useProps,
      * @return the message consumer
      * @throws JMSException
      */
-    private MessageConsumer createSubscriber(Session session,
+    private static MessageConsumer createSubscriber(Session session,
             Destination destination, String durableSubscriptionId,
             String jmsSelector) throws JMSException {
         if (isEmpty(durableSubscriptionId)) {
@@ -377,7 +377,7 @@ public void onMessage(Message message) {
      * @param s1
      * @return True if input is null, an empty string, or a white space-only string
      */
-    private boolean isEmpty(String s1) {
+    private static boolean isEmpty(String s1) {
         return s1 == null || s1.trim().isEmpty();
     }
 }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index 5d448f98c8a..61992520981 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -355,7 +355,7 @@ private String browseQueueForConsumption(Queue queue,
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void extractContent(StringBuilder buffer, StringBuilder propBuffer, Message msg) {
+    private static void extractContent(StringBuilder buffer, StringBuilder propBuffer, Message msg) {
         if (msg != null) {
             try {
                 if (msg instanceof TextMessage) {
@@ -733,7 +733,7 @@ private Context getInitialContext() throws NamingException {
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void printEnvironment(Context context) throws NamingException {
+    private static void printEnvironment(Context context) throws NamingException {
         try {
             Hashtable<?, ?> env = context.getEnvironment();
             if (env != null) {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
index babf208b33c..1361d61c600 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
@@ -266,7 +266,7 @@ private void cleanup() {
      * @param now current time
      * @return wait time
      */
-    private long calculateWait(long until, long now) {
+    private static long calculateWait(long until, long now) {
         if (until == 0) {
             return DEFAULT_WAIT; // Timeouts not active
         }
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
index ace57695c0a..c3acf2a5dd9 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
@@ -552,7 +552,7 @@ private static Object getClassInstance(String className, String label){
      * @return the method or null if an error occurred
      * (or either parameter is null)
      */
-    private Method getMethod(Object clazz, String method){
+    private static Method getMethod(Object clazz, String method){
         if (clazz != null && method != null){
             try {
                 return clazz.getClass().getMethod(method,new Class[0]);
@@ -563,7 +563,7 @@ private Method getMethod(Object clazz, String method){
         return null;
     }
 
-    private Method getMethodWithAnnotation(Object clazz, Class<? extends Annotation> annotation) {
+    private static Method getMethodWithAnnotation(Object clazz, Class<? extends Annotation> annotation) {
         if(null != clazz && null != annotation) {
             for(Method m : clazz.getClass().getMethods()) {
                 if(m.isAnnotationPresent(annotation)) {
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
index 7c8b3075c65..7a13ba6d530 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
@@ -258,7 +258,7 @@ private void addArgument() {
      *
      * @return a new LDAPArgument object
      */
-    private LDAPArgument makeNewLDAPArgument() {
+    private static LDAPArgument makeNewLDAPArgument() {
         return new LDAPArgument("", "", "");
     }
 
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
index b16ba8f4c8e..3d109eaacec 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
@@ -342,7 +342,7 @@ private JPanel createAddPanel() {
      *            text field to display
      * @return newly created panel
      */
-    private JPanel createLabelPanel(String key, JTextField field) {
+    private static JPanel createLabelPanel(String key, JTextField field) {
         JPanel addInnerPanel = new JPanel(new BorderLayout(5, 0));
         JLabel label = new JLabel(JMeterUtils.getResString(key)); // $NON-NLS-1$
         label.setLabelFor(field);
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
index e216c493662..47b62646d85 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
@@ -487,7 +487,7 @@ private JPanel createModdnPanel() {
      *            field to show and attach the label
      * @return newly constructed panel
      */
-    private JPanel createLabelPanel(String key, JTextField field) {
+    private static JPanel createLabelPanel(String key, JTextField field) {
         JPanel panel = new JPanel(new BorderLayout(5, 0));
         JLabel label = new JLabel(JMeterUtils.getResString(key)); // $NON-NLS-1$
         label.setLabelFor(field);
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
index 3531b8b6ef1..8d827792b3f 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
@@ -564,7 +564,7 @@ private ModificationItem[] getUserModAttributes() {
      *
      * @return The BasicAttributes (null means all)
      **/
-    private String[] getRequestAttributes(String reqAttr) {
+    private static String[] getRequestAttributes(String reqAttr) {
         int index;
         String[] mods;
         int count = 0;
@@ -602,7 +602,7 @@ private String[] getRequestAttributes(String reqAttr) {
      *
      * @return The BasicAttribute
      **************************************************************************/
-    private BasicAttribute getBasicAttribute(String name, String value) {
+    private static BasicAttribute getBasicAttribute(String name, String value) {
         return new BasicAttribute(name, value);
     }
 
@@ -915,7 +915,7 @@ private void writeSearchResults(final XMLBuffer xmlb, final NamingEnumeration<Se
         }
     }
 
-    private void writeSearchResult(final SearchResult sr, final XMLBuffer xmlb)
+    private static void writeSearchResult(final SearchResult sr, final XMLBuffer xmlb)
             throws NamingException
     {
         final Attributes attrs = sr.getAttributes();
@@ -955,7 +955,7 @@ private void writeSearchResult(final SearchResult sr, final XMLBuffer xmlb)
         }
     }
 
-    private void sortAttributes(final List<Attribute> sortedAttrs) {
+    private static void sortAttributes(final List<Attribute> sortedAttrs) {
         sortedAttrs.sort((o1, o2) -> {
             String nm1 = o1.getID();
             String nm2 = o2.getID();
@@ -964,7 +964,7 @@ private void sortAttributes(final List<Attribute> sortedAttrs) {
         });
     }
 
-    private void sortResults(final List<SearchResult> sortedResults) {
+    private static void sortResults(final List<SearchResult> sortedResults) {
         sortedResults.sort(new Comparator<SearchResult>() {
             private int compareToReverse(final String s1, final String s2) {
                 int len1 = s1.length();
@@ -999,7 +999,7 @@ public int compare(SearchResult o1, SearchResult o2) {
         });
     }
 
-    private String normaliseSearchDN(final SearchResult sr, final String searchBase, final String rootDn)
+    private static String normaliseSearchDN(final SearchResult sr, final String searchBase, final String rootDn)
     {
         String srName = sr.getName();
 
@@ -1019,7 +1019,7 @@ private String normaliseSearchDN(final SearchResult sr, final String searchBase,
         return srName;
     }
 
-    private String getWriteValue(final Object value) {
+    private static String getWriteValue(final Object value) {
         if (value instanceof String) {
             // assume it's sensitive data
             return StringEscapeUtils.escapeXml10((String)value);
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
index 1ddf7c539e1..4da98ed1013 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
@@ -299,7 +299,7 @@ private ModificationItem[] getUserModAttributes() {
      *
      * @return the BasicAttributes
      */
-    private ModificationItem[] getModificationItem() {
+    private static ModificationItem[] getModificationItem() {
         ModificationItem[] mods = new ModificationItem[2];
         // replace (update) attribute
         Attribute mod0 = new BasicAttribute("userpassword", "secret"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -345,7 +345,7 @@ private BasicAttributes getBasicAttributes() {
      *
      * @return the BasicAttribute
      */
-    private BasicAttribute getBasicAttribute(String name, String value) {
+    private static BasicAttribute getBasicAttribute(String name, String value) {
         BasicAttribute attr = new BasicAttribute(name, value);
         return attr;
     }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
index 50ceed04e0e..7056d962818 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
@@ -320,7 +320,7 @@ protected void addCustomProperties(Properties props) {
         }
     }
 
-    private void appendMessageData(SampleResult child, Message message)
+    private static void appendMessageData(SampleResult child, Message message)
             throws MessagingException, IOException {
         StringBuilder cdata = new StringBuilder();
         cdata.append("Date: "); // $NON-NLS-1$
@@ -363,7 +363,7 @@ private void appendMessageData(SampleResult child, Message message)
         }
     }
 
-    private void appendMultiPart(SampleResult child, StringBuilder cdata,
+    private static void appendMultiPart(SampleResult child, StringBuilder cdata,
             MimeMultipart mmp) throws MessagingException, IOException {
         String preamble = mmp.getPreamble();
         if (preamble != null ){
@@ -613,7 +613,7 @@ public void setHeaderOnly(boolean selected) {
      * @param propname the property name suffix, i.e. "starttls.require" in the example
      * @return the constructed name
      */
-    private String mailProp(String protocol, String propname) {
+    private static String mailProp(String protocol, String propname) {
         return "mail." + protocol + "." + propname;
     }
 }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
index b94ab08a54a..fbffafaff97 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
@@ -253,7 +253,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         add(settings, BorderLayout.CENTER);
     }
 
-    private void addField(JPanel panel, JLabel label, JComponent field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, JLabel label, JComponent field, GridBagConstraints gbc) {
         gbc.fill=GridBagConstraints.NONE;
         gbc.anchor = GridBagConstraints.LINE_END;
         panel.add(label, gbc);
@@ -265,17 +265,17 @@ private void addField(JPanel panel, JLabel label, JComponent field, GridBagConst
         nextLine(gbc);
     }
 
-    private void addField(JPanel panel, String text, JComponent field, GridBagConstraints gbc) {
+    private static void addField(JPanel panel, String text, JComponent field, GridBagConstraints gbc) {
         addField(panel, new JLabel(text), field, gbc);
     }
 
-    private void nextLine(GridBagConstraints gbc) {
+    private static void nextLine(GridBagConstraints gbc) {
         gbc.gridx = 0;
         gbc.gridy++;
         gbc.weightx = 0;
     }
 
-    private GridBagConstraints getConstraints() {
+    private static GridBagConstraints getConstraints() {
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridheight = 1;
         gbc.gridwidth = 1;
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index f648b48d013..5008b78ab93 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -166,7 +166,7 @@ private SampleResult createSampleResult() {
         return result;
     }
 
-    private boolean executeMessage(SampleResult result, SendMailCommand sendMailCmd, Message message) {
+    private static boolean executeMessage(SampleResult result, SendMailCommand sendMailCmd, Message message) {
         boolean didSampleSucceed = false;
         try {
             sendMailCmd.execute(message);
@@ -199,7 +199,7 @@ private long calculateMessageSize(Message message) throws IOException, Messaging
         }
     }
 
-    private byte[] processSampler(Message message) throws IOException, MessagingException {
+    private static byte[] processSampler(Message message) throws IOException, MessagingException {
         // process the sampler result
         try (InputStream is = message.getInputStream()) {
             return IOUtils.toByteArray(is);
@@ -210,11 +210,11 @@ private List<File> getAttachmentFiles() {
         final String[] attachments = getPropertyAsString(ATTACH_FILE).split(FILENAME_SEPARATOR);
         return Arrays.stream(attachments) // NOSONAR No need to close
                 .filter(s -> !s.isEmpty())
-                .map(this::attachmentToFile)
+                .map(SmtpSampler::attachmentToFile)
                 .collect(Collectors.toList());
     }
 
-    private File attachmentToFile(String attachment) { // NOSONAR False positive saying not used
+    private static File attachmentToFile(String attachment) { // NOSONAR False positive saying not used
         File file = new File(attachment);
         if (!file.isAbsolute() && !file.exists()) {
             if(log.isDebugEnabled()) {
@@ -293,7 +293,7 @@ private SendMailCommand createSendMailCommandFromProperties() throws AddressExce
         return sendMailCmd;
     }
 
-    private String getRequestHeaders(Message message) throws MessagingException {
+    private static String getRequestHeaders(Message message) throws MessagingException {
         StringBuilder sb = new StringBuilder();
         @SuppressWarnings("unchecked") // getAllHeaders() is not yet genericised
         Enumeration<Header> headers = message.getAllHeaders(); // throws ME
@@ -301,7 +301,7 @@ private String getRequestHeaders(Message message) throws MessagingException {
         return sb.toString();
     }
 
-    private String getSamplerData(Message message) throws MessagingException, IOException {
+    private static String getSamplerData(Message message) throws MessagingException, IOException {
         StringBuilder sb = new StringBuilder();
         Object content = message.getContent(); // throws ME
         if (content instanceof Multipart) {
@@ -333,7 +333,7 @@ private String getSamplerData(Message message) throws MessagingException, IOExce
     }
 
     @SuppressWarnings("JdkObsolete")
-    private void writeHeaders(Enumeration<Header> headers, StringBuilder sb) {
+    private static void writeHeaders(Enumeration<Header> headers, StringBuilder sb) {
         while (headers.hasMoreElements()) {
             Header header = headers.nextElement();
             sb.append(header.getName());
@@ -343,7 +343,7 @@ private void writeHeaders(Enumeration<Header> headers, StringBuilder sb) {
         }
     }
 
-    private void writeBodyPart(StringBuilder sb, BodyPart bodyPart)
+    private static void writeBodyPart(StringBuilder sb, BodyPart bodyPart)
             throws MessagingException, IOException {
         @SuppressWarnings("unchecked") // API not yet generic
         Enumeration<Header> allHeaders = bodyPart.getAllHeaders(); // throws ME
@@ -379,7 +379,7 @@ private List<InternetAddress> getPropAsAddresses(String propKey) throws AddressE
         }
     }
 
-    private String encodeAddress(String address) {
+    private static String encodeAddress(String address) {
         String trimmedAddress = address.trim();
         if (!StringUtils.isAsciiPrintable(trimmedAddress)) {
             try {
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
index 0ff10f40e16..9f710e721ee 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
@@ -208,6 +208,7 @@ private void cbTrustAllCertsActionPerformed( // NOSONAR This method is used thro
      * @param evt
      *            ActionEvent to be handled
      */
+    @SuppressWarnings("MethodCanBeStatic")
     private void cbEnforceStartTLSActionPerformed(ActionEvent evt) { // NOSONAR This method is used through lambda
         // NOOP
     }
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
index 66ba928ac86..12565f81f9c 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
@@ -134,7 +134,7 @@ public String read(InputStream is, SampleResult sampleResult) throws ReadExcepti
         }
     }
 
-    private String showEOL(final String input) {
+    private static String showEOL(final String input) {
         StringBuilder sb = new StringBuilder(input.length()*2);
         for(int i=0; i < input.length(); i++) {
             char ch = input.charAt(i);
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
index 2e818760059..64c4ff09c10 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
@@ -141,7 +141,7 @@ public TCPSampler() {
         log.debug("Created {}", this); //$NON-NLS-1$
     }
 
-    private String getError() {
+    private static String getError() {
         Map<String, Object> cp = tp.get();
         return (String) cp.get(ERRKEY);
     }
@@ -311,7 +311,7 @@ public String getLabel() {
         return "tcp://" + this.getServer() + ":" + this.getPort();//$NON-NLS-1$ $NON-NLS-2$
     }
 
-    private Class<?> getClass(String className) {
+    private static Class<?> getClass(String className) {
         Class<?> c = null;
         try {
             c = Class.forName(className, false, Thread.currentThread().getContextClassLoader());
@@ -429,7 +429,7 @@ public SampleResult sample(Entry e)// Entry tends to be ignored ...
      * @param protocolHandler {@link TCPClient}
      * @return boolean if sample is considered as successful
      */
-    private boolean setupSampleResult(SampleResult sampleResult,
+    private static boolean setupSampleResult(SampleResult sampleResult,
             String readResponse,
             Exception exception,
             TCPClient protocolHandler) {
@@ -470,7 +470,7 @@ private boolean setupSampleResult(SampleResult sampleResult,
      * @param rc response code
      * @return whether this represents success or not
      */
-    private boolean checkResponseCode(String rc) {
+    private static boolean checkResponseCode(String rc) {
         int responseCode = Integer.parseInt(rc);
         return responseCode >= 400 && responseCode <= 599;
     }
@@ -524,7 +524,7 @@ public void threadFinished() {
     /**
      * Closes all connections, clears Map and remove thread local Map
      */
-    private void tearDown() {
+    private static void tearDown() {
         Map<String, Object> cp = tp.get();
         cp.forEach((k, v) -> {
             if(k.startsWith(TCPKEY)) {
diff --git a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/WireMockExtension.java b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/WireMockExtension.java
index c21bc1a6ad9..4f1f124ccf4 100644
--- a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/WireMockExtension.java
+++ b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/WireMockExtension.java
@@ -50,11 +50,11 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
         return getServer(extensionContext);
     }
 
-    private ExtensionContext.Store getStore(ExtensionContext context) {
+    private static ExtensionContext.Store getStore(ExtensionContext context) {
         return context.getStore(NAMESPACE);
     }
 
-    private WireMockServer getServer(ExtensionContext context) {
+    private static WireMockServer getServer(ExtensionContext context) {
         return getStore(context).get("server", WireMockServer.class);
     }
 

From 049cc3a69443b218eaec761b56ada221842e46d0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 16:04:48 +0300
Subject: [PATCH 0414/1037] style: run "field may be final" inspection

See https://errorprone.info/bugpattern/FieldCanBeFinal
---
 .../kotlin/build-logic.errorprone.gradle.kts  |  1 +
 .../jmeter/assertions/JSONPathAssertion.java  |  2 +-
 .../ExportTransactionAndSamplerNames.java     |  2 +-
 .../modifiers/gui/UserParametersGui.java      |  2 +-
 .../jmeter/visualizers/RenderAsXML.java       |  4 +-
 .../visualizers/SearchTextExtension.java      | 10 +--
 .../visualizers/SearchableTreeNode.java       |  2 +-
 .../visualizers/StatGraphVisualizer.java      | 80 +++++++++----------
 .../jmeter/visualizers/StatVisualizer.java    |  4 +-
 .../jmeter/visualizers/SummaryReport.java     |  2 +-
 .../jmeter/visualizers/TableVisualizer.java   |  4 +-
 .../AbstractBackendListenerClient.java        |  4 +-
 .../visualizers/backend/SamplerMetric.java    | 12 +--
 .../visualizers/backend/UserMetric.java       |  2 +-
 .../InfluxdbBackendListenerClient.java        |  2 +-
 .../main/java/org/apache/jmeter/JMeter.java   |  6 +-
 .../jmeter/config/gui/ArgumentsPanel.java     |  4 +-
 .../apache/jmeter/control/IfController.java   |  2 +-
 .../org/apache/jmeter/gui/GuiPackage.java     | 12 +--
 .../apache/jmeter/gui/HtmlReportAction.java   |  2 +-
 .../org/apache/jmeter/gui/HtmlReportUI.java   |  4 +-
 .../java/org/apache/jmeter/gui/MainFrame.java |  6 +-
 .../org/apache/jmeter/gui/UndoHistory.java    |  2 +-
 .../gui/action/HtmlReportGenerator.java       |  6 +-
 .../jmeter/gui/action/RawTextSearcher.java    |  4 +-
 .../jmeter/gui/action/RegexpSearcher.java     |  4 +-
 .../apache/jmeter/gui/action/RemoteStart.java |  2 +-
 .../org/apache/jmeter/gui/action/Save.java    |  2 +-
 .../jmeter/gui/action/SearchTreeDialog.java   |  2 +-
 .../gui/action/SelectTemplatesDialog.java     |  4 +-
 .../gui/action/template/TemplateManager.java  |  4 +-
 .../jmeter/gui/logging/GuiLogEventBus.java    |  2 +-
 .../jmeter/gui/logging/LogEventObject.java    |  2 +-
 .../jmeter/gui/tree/JMeterTreeNode.java       |  2 +-
 .../gui/tree/JMeterTreeTransferHandler.java   |  4 +-
 .../apache/jmeter/gui/util/FileListPanel.java | 10 +--
 .../util/HeaderAsPropertyRendererWrapper.java |  2 +-
 .../apache/jmeter/gui/util/JMeterMenuBar.java |  8 +-
 .../jmeter/gui/util/JSyntaxSearchToolBar.java |  2 +-
 .../config/ReportGeneratorConfiguration.java  |  4 +-
 .../report/config/SubConfiguration.java       |  2 +-
 .../report/core/AbstractSampleWriter.java     |  2 +-
 .../apache/jmeter/report/core/CsvFile.java    |  2 +-
 .../jmeter/report/core/CsvSampleReader.java   | 10 +--
 .../jmeter/report/core/CsvSampleWriter.java   |  4 +-
 .../jmeter/report/core/SampleBuilder.java     |  4 +-
 .../jmeter/report/core/SampleMetadata.java    |  2 +-
 .../processor/AbstractSampleConsumer.java     |  2 +-
 .../processor/AbstractSampleProcessor.java    |  2 +-
 .../report/processor/AggregateConsumer.java   |  4 +-
 .../report/processor/CsvFileSampleSource.java |  6 +-
 .../processor/ExternalSampleSorter.java       |  4 +-
 .../report/processor/ListResultData.java      |  2 +-
 .../report/processor/MapResultData.java       |  2 +-
 .../report/processor/MeanAggregator.java      |  2 +-
 .../report/processor/SampleContext.java       |  2 +-
 .../report/processor/TaggerConsumer.java      |  2 +-
 .../processor/Top5ErrorsSummaryData.java      |  2 +-
 .../graph/AbstractGraphValueSelector.java     |  2 +-
 .../AbstractVersusRequestsGraphConsumer.java  |  6 +-
 .../org/apache/jmeter/samplers/Entry.java     |  4 +-
 .../samplers/SampleSaveConfiguration.java     |  2 +-
 .../samplers/StatisticalSampleSender.java     |  2 +-
 .../jmeter/testbeans/gui/PasswordEditor.java  |  2 +-
 .../apache/jmeter/threads/JMeterContext.java  |  2 +-
 .../threads/UnmodifiableJMeterVariables.java  |  2 +-
 ...ropertiesBasedPrefixResolverForXpath2.java |  2 +-
 .../org/apache/jmeter/util/TemplateUtil.java  |  2 +-
 .../jmeter/util/keystore/JmeterKeyStore.java  |  2 +-
 .../visualizers/SamplingStatCalculator.java   |  2 +-
 .../examples/sampler/ExampleSampler.java      |  2 +-
 .../jmeter/functions/IterationCounter.java    |  4 +-
 .../apache/jmeter/functions/RandomDate.java   |  6 +-
 .../apache/jmeter/functions/TimeShift.java    |  6 +-
 .../jmeter/visualizers/GenerateTreeGui.java   |  2 +-
 .../commons/cli/avalon/CLArgsParser.java      |  2 +-
 .../apache/jorphan/gui/JLabeledTextField.java |  4 +-
 .../org/apache/jorphan/gui/MenuScroller.java  |  4 +-
 .../apache/jorphan/gui/ObjectTableSorter.java |  8 +-
 .../jorphan/gui/layout/VerticalLayout.java    |  6 +-
 .../jorphan/util/AlphaNumericComparator.java  |  2 +-
 .../util/AlphaNumericKeyComparator.java       |  2 +-
 .../main/java/org/apache/log/ContextMap.java  |  2 +-
 .../http/config/gui/HttpDefaultsGui.java      |  4 +-
 .../http/config/gui/UrlConfigGui.java         |  4 +-
 .../protocol/http/control/AuthManager.java    |  2 +-
 .../http/control/HC4CookieHandler.java        |  2 +-
 .../http/control/HttpMirrorServer.java        |  4 +-
 .../http/control/gui/HttpTestSampleGui.java   |  4 +-
 .../protocol/http/curl/BasicCurlParser.java   | 18 ++---
 .../http/curl/FileArgumentHolder.java         |  4 +-
 .../http/curl/StringArgumentHolder.java       |  4 +-
 .../jmeter/protocol/http/gui/AuthPanel.java   |  4 +-
 .../protocol/http/gui/DNSCachePanel.java      |  2 +-
 .../jmeter/protocol/http/gui/HeaderPanel.java |  2 +-
 .../http/parser/JsoupBasedHtmlParser.java     |  4 +-
 .../http/parser/LagartoBasedHtmlParser.java   |  8 +-
 .../http/proxy/AbstractSamplerCreator.java    |  2 +-
 .../protocol/http/proxy/HttpRequestHdr.java   |  6 +-
 .../protocol/http/proxy/ProxyControl.java     | 16 ++--
 .../protocol/http/sampler/HTTPHC4Impl.java    |  6 +-
 .../protocol/http/util/EncoderCache.java      |  2 +-
 .../protocol/http/util/HTTPFileArg.java       |  2 +-
 .../http/util/LoopbackHTTPSocket.java         |  2 +-
 .../http/util/accesslog/LogFilter.java        |  4 +-
 .../jms/control/gui/JMSPropertiesPanel.java   |  2 +-
 .../jms/control/gui/JMSSamplerGui.java        | 24 +++---
 .../jms/sampler/TemporaryQueueExecutor.java   |  2 +-
 .../sampler/TimeoutEnabledQueueRequestor.java |  6 +-
 .../sampler/render/BinaryMessageRenderer.java |  2 +-
 .../sampler/render/MapMessageRenderer.java    |  2 +-
 .../java/control/gui/JUnitTestSamplerGui.java | 26 +++---
 .../ldap/config/gui/LDAPArgumentsPanel.java   |  2 +-
 .../ldap/config/gui/LdapConfigGui.java        | 32 ++++----
 .../ldap/config/gui/LdapExtConfigGui.java     | 72 ++++++++---------
 .../protocol/ldap/sampler/LDAPSampler.java    |  2 +-
 .../protocol/smtp/sampler/gui/SmtpPanel.java  |  4 +-
 117 files changed, 327 insertions(+), 326 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 5b3dd497bf1..edcd58e591c 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -55,6 +55,7 @@ if (buildParameters.enableErrorprone) {
                     "UnnecessaryDefaultInEnumSwitch",
                 )
                 warn(
+                    "FieldCanBeFinal",
                     "ForEachIterable",
                     "MethodCanBeStatic",
                 )
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index b8e719bb5ed..3e15e915ddb 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -56,7 +56,7 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab
     private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
             "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
-    private static ThreadLocal<DecimalFormat> decimalFormatter =
+    private static final ThreadLocal<DecimalFormat> decimalFormatter =
             ThreadLocal.withInitial(JSONPathAssertion::createDecimalFormat);
 
     private static DecimalFormat createDecimalFormat() {
diff --git a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
index b029679d06e..093f2173919 100644
--- a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
+++ b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
@@ -80,7 +80,7 @@ public class ExportTransactionAndSamplerNames extends AbstractAction implements
      * Visitor to collect nodes matching the name
      */
     private static class SamplerAndTransactionNameVisitor implements HashTreeTraverser {
-        private Set<String> listOfTransactions = new TreeSet<>();
+        private final Set<String> listOfTransactions = new TreeSet<>();
         public SamplerAndTransactionNameVisitor() {
             super();
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
index 76976912557..b5ee9680099 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
@@ -71,7 +71,7 @@ public class UserParametersGui extends AbstractPreProcessorGui {
 
     private PowerTableModel tableModel;
 
-    private int numUserColumns = 1;
+    private final int numUserColumns = 1;
 
     private JButton addParameterButton;
     private JButton addUserButton;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
index 093b7af72d4..5c8b6af25bc 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
@@ -111,8 +111,8 @@ public void clearData() {
     private static class ExpandPopupMenu extends JPopupMenu implements ActionListener {
 
         private static final long serialVersionUID = 1L;
-        private JMenuItem expand;
-        private JMenuItem collapse;
+        private final JMenuItem expand;
+        private final JMenuItem collapse;
         private JTree tree;
 
         ExpandPopupMenu() {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
index fc7ce416ac1..ffaab0e89b8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
@@ -64,7 +64,7 @@ public class SearchTextExtension implements ActionListener, DocumentListener {
 
     private String lastTextTofind;
 
-    private ISearchTextExtensionProvider searchProvider;
+    private final ISearchTextExtensionProvider searchProvider;
 
     private JToolBar toolBar;
 
@@ -244,11 +244,11 @@ public interface ISearchTextExtensionProvider {
      */
     public static class JEditorPaneSearchProvider implements ISearchTextExtensionProvider {
 
-        private static volatile int LAST_POSITION_DEFAULT = 0;
+        private static final int LAST_POSITION_DEFAULT = 0;
         private static final Color HIGHLIGHT_COLOR = Color.GREEN;
-        private JEditorPane results;
-        private Highlighter selection;
-        private Highlighter.HighlightPainter painter;
+        private final JEditorPane results;
+        private final Highlighter selection;
+        private final Highlighter.HighlightPainter painter;
         private int lastPosition = LAST_POSITION_DEFAULT;
 
         public JEditorPaneSearchProvider(JEditorPane results) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java
index e555d4a3127..403c33b78e0 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java
@@ -41,7 +41,7 @@ public class SearchableTreeNode extends DefaultMutableTreeNode {
 
     private boolean childrenNodesHaveMatched;
 
-    private transient DefaultTreeModel treeModel;
+    private final transient DefaultTreeModel treeModel;
 
     public SearchableTreeNode() {
         this((SampleResult) null, null);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 4490b6a49b6..c4efaa66dd5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -146,7 +146,7 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
 
     private JScrollPane myScrollPane;
 
-    private transient ObjectTableModel model;
+    private final transient ObjectTableModel model;
 
     /**
      * Lock used to protect tableRows update + model update
@@ -161,99 +161,99 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
 
     private JSplitPane spane = null;
 
-    private JTabbedPane tabbedGraph = new JTabbedPane(SwingConstants.TOP);
+    private final JTabbedPane tabbedGraph = new JTabbedPane(SwingConstants.TOP);
 
-    private JButton displayButton =
+    private final JButton displayButton =
         new JButton(JMeterUtils.getResString("aggregate_graph_display"));                //$NON-NLS-1$
 
-    private JButton saveGraph =
+    private final JButton saveGraph =
         new JButton(JMeterUtils.getResString("aggregate_graph_save"));                    //$NON-NLS-1$
 
-    private JButton saveTable =
+    private final JButton saveTable =
         new JButton(JMeterUtils.getResString("aggregate_graph_save_table"));            //$NON-NLS-1$
 
-    private JButton chooseForeColor =
+    private final JButton chooseForeColor =
         new JButton(JMeterUtils.getResString("aggregate_graph_choose_foreground_color"));            //$NON-NLS-1$
 
-    private JButton syncWithName =
+    private final JButton syncWithName =
         new JButton(JMeterUtils.getResString("aggregate_graph_sync_with_name"));            //$NON-NLS-1$
 
-    private JCheckBox saveHeaders = // should header be saved with the data?
+    private final JCheckBox saveHeaders = // should header be saved with the data?
         new JCheckBox(JMeterUtils.getResString("aggregate_graph_save_table_header"));    //$NON-NLS-1$
 
-    private JLabeledTextField graphTitle =
+    private final JLabeledTextField graphTitle =
         new JLabeledTextField(JMeterUtils.getResString("aggregate_graph_user_title"));    //$NON-NLS-1$
 
-    private JLabeledTextField maxLengthXAxisLabel =
+    private final JLabeledTextField maxLengthXAxisLabel =
         new JLabeledTextField(JMeterUtils.getResString("aggregate_graph_max_length_xaxis_label"), 8);//$NON-NLS-1$
 
-    private JLabeledTextField maxValueYAxisLabel =
+    private final JLabeledTextField maxValueYAxisLabel =
         new JLabeledTextField(JMeterUtils.getResString("aggregate_graph_yaxis_max_value"), 8);//$NON-NLS-1$
 
     /**
      * checkbox for use dynamic graph size
      */
-    private JCheckBox dynamicGraphSize = new JCheckBox(JMeterUtils.getResString("aggregate_graph_dynamic_size")); // $NON-NLS-1$
+    private final JCheckBox dynamicGraphSize = new JCheckBox(JMeterUtils.getResString("aggregate_graph_dynamic_size")); // $NON-NLS-1$
 
-    private JLabeledTextField graphWidth =
+    private final JLabeledTextField graphWidth =
         new JLabeledTextField(JMeterUtils.getResString("aggregate_graph_width"), 6);        //$NON-NLS-1$
-    private JLabeledTextField graphHeight =
+    private final JLabeledTextField graphHeight =
         new JLabeledTextField(JMeterUtils.getResString("aggregate_graph_height"), 6);        //$NON-NLS-1$
 
-    private String yAxisLabel = JMeterUtils.getResString("aggregate_graph_response_time");//$NON-NLS-1$
+    private final String yAxisLabel = JMeterUtils.getResString("aggregate_graph_response_time");//$NON-NLS-1$
 
-    private String yAxisTitle = JMeterUtils.getResString("aggregate_graph_ms");        //$NON-NLS-1$
+    private final String yAxisTitle = JMeterUtils.getResString("aggregate_graph_ms");        //$NON-NLS-1$
 
     private boolean saveGraphToFile = false;
 
-    private int defaultWidth = 400;
+    private final int defaultWidth = 400;
 
-    private int defaultHeight = 300;
+    private final int defaultHeight = 300;
 
-    private JComboBox<String> columnsList = new JComboBox<>(getLabels(GRAPH_COLUMNS, getGraphColumnsMsgParameters()));
+    private final JComboBox<String> columnsList = new JComboBox<>(getLabels(GRAPH_COLUMNS, getGraphColumnsMsgParameters()));
 
-    private List<BarGraph> eltList = new ArrayList<>();
+    private final List<BarGraph> eltList = new ArrayList<>();
 
-    private JCheckBox columnSelection = new JCheckBox(JMeterUtils.getResString("aggregate_graph_column_selection"), false); //$NON-NLS-1$
+    private final JCheckBox columnSelection = new JCheckBox(JMeterUtils.getResString("aggregate_graph_column_selection"), false); //$NON-NLS-1$
 
-    private JTextField columnMatchLabel = new JTextField();
+    private final JTextField columnMatchLabel = new JTextField();
 
-    private JButton applyFilterBtn = new JButton(JMeterUtils.getResString("graph_apply_filter")); // $NON-NLS-1$
+    private final JButton applyFilterBtn = new JButton(JMeterUtils.getResString("graph_apply_filter")); // $NON-NLS-1$
 
-    private JCheckBox caseChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_case"), false); // $NON-NLS-1$
+    private final JCheckBox caseChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_case"), false); // $NON-NLS-1$
 
-    private JCheckBox regexpChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), true); // $NON-NLS-1$
+    private final JCheckBox regexpChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), true); // $NON-NLS-1$
 
-    private JComboBox<String> titleFontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
+    private final JComboBox<String> titleFontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
 
-    private JComboBox<String> titleFontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
+    private final JComboBox<String> titleFontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
 
-    private JComboBox<String> titleFontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
+    private final JComboBox<String> titleFontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
 
-    private JComboBox<String> valueFontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
+    private final JComboBox<String> valueFontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
 
-    private JComboBox<String> valueFontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
+    private final JComboBox<String> valueFontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
 
-    private JComboBox<String> valueFontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
+    private final JComboBox<String> valueFontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
 
-    private JComboBox<String> fontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
+    private final JComboBox<String> fontNameList = new JComboBox<>(keys(StatGraphProperties.getFontNameMap()));
 
-    private JComboBox<String> fontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
+    private final JComboBox<String> fontSizeList = new JComboBox<>(StatGraphProperties.getFontSize());
 
-    private JComboBox<String> fontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
+    private final JComboBox<String> fontStyleList = new JComboBox<>(keys(StatGraphProperties.getFontStyleMap()));
 
-    private JComboBox<String> legendPlacementList = new JComboBox<>(keys(StatGraphProperties.getPlacementNameMap()));
+    private final JComboBox<String> legendPlacementList = new JComboBox<>(keys(StatGraphProperties.getPlacementNameMap()));
 
     // Default checked
-    private JCheckBox drawOutlinesBar = new JCheckBox(JMeterUtils.getResString("aggregate_graph_draw_outlines"), true); // $NON-NLS-1$
+    private final JCheckBox drawOutlinesBar = new JCheckBox(JMeterUtils.getResString("aggregate_graph_draw_outlines"), true); // $NON-NLS-1$
 
     // Default checked
-    private JCheckBox numberShowGrouping = new JCheckBox(JMeterUtils.getResString("aggregate_graph_number_grouping"), true); // $NON-NLS-1$
+    private final JCheckBox numberShowGrouping = new JCheckBox(JMeterUtils.getResString("aggregate_graph_number_grouping"), true); // $NON-NLS-1$
 
     // Default checked
-    private JCheckBox valueLabelsVertical = new JCheckBox(JMeterUtils.getResString("aggregate_graph_value_labels_vertical"), true); // $NON-NLS-1$
+    private final JCheckBox valueLabelsVertical = new JCheckBox(JMeterUtils.getResString("aggregate_graph_value_labels_vertical"), true); // $NON-NLS-1$
 
-    private Color colorBarGraph = Color.YELLOW;
+    private final Color colorBarGraph = Color.YELLOW;
 
     private Color colorForeGraph = Color.BLACK;
 
@@ -261,7 +261,7 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
 
     private Pattern pattern = null;
 
-    private Deque<SamplingStatCalculator> newRows = new ConcurrentLinkedDeque<>();
+    private final Deque<SamplingStatCalculator> newRows = new ConcurrentLinkedDeque<>();
 
     public StatGraphVisualizer() {
         super();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
index 6f062b8a51a..50dac1af032 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
@@ -79,14 +79,14 @@ public class StatVisualizer extends AbstractVisualizer implements Clearable, Act
     private final JCheckBox useGroupName = new JCheckBox(
             JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$
 
-    private transient ObjectTableModel model;
+    private final transient ObjectTableModel model;
 
     /** Lock used to protect tableRows update + model update */
     private final transient Object lock = new Object();
 
     private final Map<String, SamplingStatCalculator> tableRows = new ConcurrentHashMap<>();
 
-    private Deque<SamplingStatCalculator> newRows = new ConcurrentLinkedDeque<>();
+    private final Deque<SamplingStatCalculator> newRows = new ConcurrentLinkedDeque<>();
 
     private volatile boolean dataChanged;
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
index 85d88f57961..98785ea188c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
@@ -123,7 +123,7 @@ public class SummaryReport extends AbstractVisualizer implements Clearable, Acti
     private final JCheckBox useGroupName =
         new JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name"));            //$NON-NLS-1$
 
-    private transient ObjectTableModel model;
+    private final transient ObjectTableModel model;
 
     /**
      * Lock used to protect tableRows update + model update
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
index 8f3bbbc2056..0f7d32898f7 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
@@ -115,9 +115,9 @@ public class TableVisualizer extends AbstractVisualizer implements Clearable {
 
     private final transient Calculator calc = new Calculator();
 
-    private Format format = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$
+    private final Format format = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$
 
-    private Deque<SampleResult> newRows = new ConcurrentLinkedDeque<>();
+    private final Deque<SampleResult> newRows = new ConcurrentLinkedDeque<>();
 
     // Column renderers
     private static final TableCellRenderer[] RENDERERS =
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
index fbdc641a6dc..ec0a870e431 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
@@ -53,9 +53,9 @@ public abstract class AbstractBackendListenerClient implements BackendListenerCl
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBackendListenerClient.class);
 
-    private UserMetric userMetrics = new UserMetric();
+    private final UserMetric userMetrics = new UserMetric();
 
-    private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
 
     /* Implements BackendListenerClient.setupTest(BackendListenerContext) */
     @Override
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index bacea442f40..6222c9d8086 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -42,27 +42,27 @@ public class SamplerMetric {
     /**
      * Response times for OK samples
      */
-    private DescriptiveStatistics okResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
+    private final DescriptiveStatistics okResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
     /**
      * Response times for KO samples
      */
-    private DescriptiveStatistics koResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
+    private final DescriptiveStatistics koResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
     /**
      * Response times for All samples
      */
-    private DescriptiveStatistics allResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
+    private final DescriptiveStatistics allResponsesStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(LARGE_SLIDING_WINDOW_SIZE);
     /**
      *  OK, KO, ALL stats
      */
-    private List<DescriptiveStatistics> windowedStats = initWindowedStats();
+    private final List<DescriptiveStatistics> windowedStats = initWindowedStats();
     /**
      * Timeboxed percentiles don't makes sense
      */
-    private DescriptiveStatistics pctResponseStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(SLIDING_WINDOW_SIZE);
+    private final DescriptiveStatistics pctResponseStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(SLIDING_WINDOW_SIZE);
     private int successes;
     private int failures;
     private int hits;
-    private Map<ErrorMetric, Integer> errors = new HashMap<>();
+    private final Map<ErrorMetric, Integer> errors = new HashMap<>();
     private long sentBytes;
     private long receivedBytes;
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java
index 1c847073ac2..dafa1e132eb 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java
@@ -32,7 +32,7 @@ public class UserMetric {
     private static final int SLIDING_WINDOW_SIZE = JMeterUtils.getPropDefault("backend_metrics_window", 100); //$NON-NLS-1$
 
     // Limit to sliding window of SLIDING_WINDOW_SIZE values
-    private DescriptiveStatistics usersStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(SLIDING_WINDOW_SIZE);
+    private final DescriptiveStatistics usersStats = DescriptiveStatisticsFactory.createDescriptiveStatistics(SLIDING_WINDOW_SIZE);
 
     /**
      *
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
index cc21f8c6988..0dc8d4f7fc8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
@@ -52,7 +52,7 @@
 public class InfluxdbBackendListenerClient extends AbstractBackendListenerClient implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(InfluxdbBackendListenerClient.class);
-    private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
     // Name of the measurement
     private static final String EVENTS_FOR_ANNOTATION = "events";
 
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index ffe4637d489..1e02e7f9c28 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -1167,13 +1167,13 @@ enum RunMode {
 
         private AtomicInteger startedRemoteEngines = new AtomicInteger(0);
 
-        private ConcurrentLinkedQueue<JMeterEngine> remoteEngines = new ConcurrentLinkedQueue<>();
+        private final ConcurrentLinkedQueue<JMeterEngine> remoteEngines = new ConcurrentLinkedQueue<>();
 
         private final ReportGenerator reportGenerator;
 
-        private RunMode runMode;
+        private final RunMode runMode;
 
-        private boolean remoteStop;
+        private final boolean remoteStop;
 
         /**
          * Listener for remote test
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index d16d5bfb772..b9f6c8edebb 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -66,7 +66,7 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
     private static final long serialVersionUID = 241L;
 
     /** The title label for this component. */
-    private JLabel tableLabel;
+    private final JLabel tableLabel;
 
     /** The table containing the list of arguments. */
     private transient JTable table;
@@ -85,7 +85,7 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
     /**
      * Added background support for reporting tool
      */
-    private Color background;
+    private final Color background;
 
     /**
      * Boolean indicating whether this component is a standalone component or it
diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
index e415cecffb4..05e214a4935 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
@@ -123,7 +123,7 @@ public boolean evaluate(String testElementName, String condition) {
         }
     }
 
-    private static JsEvaluator JAVASCRIPT_EVALUATOR = USE_RHINO_ENGINE ? new RhinoJsEngine() : new NashornJsEngine();
+    private static final JsEvaluator JAVASCRIPT_EVALUATOR = USE_RHINO_ENGINE ? new RhinoJsEngine() : new NashornJsEngine();
 
     /**
      * Initialization On Demand Holder pattern
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 04b7eb1ee15..2d3919cc88a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -102,19 +102,19 @@ public final class GuiPackage implements LocaleChangeListener, HistoryListener {
      * to their corresponding GUI components.
      * <p>This enables to associate {@link UnsharedComponent} UIs with their {@link TestElement}.</p>
      */
-    private Map<TestElement, JMeterGUIComponent> nodesToGui = new HashMap<>();
+    private final Map<TestElement, JMeterGUIComponent> nodesToGui = new HashMap<>();
 
     /**
      * Map from Class to JMeterGUIComponent, mapping the Class of a GUI
      * component to an instance of that component.
      */
-    private Map<Class<?>, JMeterGUIComponent> guis = new HashMap<>();
+    private final Map<Class<?>, JMeterGUIComponent> guis = new HashMap<>();
 
     /**
      * Map from Class to TestBeanGUI, mapping the Class of a TestBean to an
      * instance of TestBeanGUI to be used to edit such components.
      */
-    private Map<Class<?>, JMeterGUIComponent> testBeanGUIs = new HashMap<>();
+    private final Map<Class<?>, JMeterGUIComponent> testBeanGUIs = new HashMap<>();
 
     /**
      * Tracks the number of times Look and Feel was changed.
@@ -149,13 +149,13 @@ public final class GuiPackage implements LocaleChangeListener, HistoryListener {
     private LoggerPanel loggerPanel;
 
     /** History for tree states */
-    private UndoHistory undoHistory = new UndoHistory();
+    private final UndoHistory undoHistory = new UndoHistory();
 
     /** GUI Logging Event Bus. */
-    private GuiLogEventBus logEventBus = new GuiLogEventBus();
+    private final GuiLogEventBus logEventBus = new GuiLogEventBus();
 
     /** Listeners for events on test plan */
-    private List<TestPlanListener> testPlanListeners = Collections.synchronizedList(new ArrayList<>());
+    private final List<TestPlanListener> testPlanListeners = Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Private constructor to permit instantiation only from within this class.
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
index 762ac8d9281..cecd111bdb5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
@@ -34,7 +34,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 
 public class HtmlReportAction extends AbstractAction implements MenuCreator {
-    private static Set<String> commands = new HashSet<>();
+    private static final Set<String> commands = new HashSet<>();
     private HtmlReportUI htmlReportPanel;
 
     static {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
index dac6458b75c..4ff62a8f1e2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
@@ -52,7 +52,7 @@
 import org.slf4j.LoggerFactory;
 
 public class HtmlReportUI implements ActionListener {
-    private static Set<String> commands = new HashSet<>();
+    private static final Set<String> commands = new HashSet<>();
     private static final Logger LOGGER = LoggerFactory.getLogger(HtmlReportUI.class);
 
     private static final String CREATE_REQUEST = "CREATE_REQUEST";
@@ -166,7 +166,7 @@ private JPanel setupButtonPanel() {
     }
 
     private class ReportGenerationWorker extends SwingWorker<List<String>, String> {
-        private JButton reportLaunchButton;
+        private final JButton reportLaunchButton;
 
         public ReportGenerationWorker(JButton reportLaunchButton) {
             this.reportLaunchButton = reportLaunchButton;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index d4377581463..10264b95db2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -187,12 +187,12 @@ public class MainFrame extends JFrame implements TestStateListener, Remoteable,
     /** LogTarget that receives ERROR or FATAL */
     private transient ErrorsAndFatalsCounterLogTarget errorsAndFatalsCounterLogTarget;
 
-    private javax.swing.Timer computeTestDurationTimer = new javax.swing.Timer(1000,
+    private final javax.swing.Timer computeTestDurationTimer = new javax.swing.Timer(1000,
             this::computeTestDuration);
 
-    private AtomicInteger errorOrFatal = new AtomicInteger(0);
+    private final AtomicInteger errorOrFatal = new AtomicInteger(0);
 
-    private javax.swing.Timer refreshErrorsTimer = new javax.swing.Timer(1000,
+    private final javax.swing.Timer refreshErrorsTimer = new javax.swing.Timer(1000,
             this::refreshErrors);
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java b/src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java
index 540c959ac99..6aa92780bba 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java
@@ -61,7 +61,7 @@ public interface HistoryListener {
     private boolean working = false;
 
     /** History listeners */
-    private List<HistoryListener> listeners = new ArrayList<>();
+    private final List<HistoryListener> listeners = new ArrayList<>();
 
     private final UndoManager manager = new UndoManager();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 555e54bebcf..781aadf45d2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -43,9 +43,9 @@ public class HtmlReportGenerator {
     private static final Logger LOGGER = LoggerFactory.getLogger(HtmlReportGenerator.class);
     private static final long COMMAND_TIMEOUT = JMeterUtils.getPropDefault("generate_report_ui.generation_timeout", 300_000L);
 
-    private String csvFilePath;
-    private String userPropertiesFilePath;
-    private String outputDirectoryPath;
+    private final String csvFilePath;
+    private final String userPropertiesFilePath;
+    private final String outputDirectoryPath;
 
     public HtmlReportGenerator(String csvFilePath, String userPropertiesFilePath, String outputDirectoryPath) {
         this.csvFilePath = csvFilePath;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
index ea77f023118..26a9782e93c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
@@ -25,8 +25,8 @@
  * Searcher implementation that searches text as is
  */
 public class RawTextSearcher implements Searcher {
-    private boolean caseSensitive;
-    private String textToSearch;
+    private final boolean caseSensitive;
+    private final String textToSearch;
 
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
index e11d2202037..ef84d3dd5a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
@@ -28,8 +28,8 @@
  */
 public class RegexpSearcher implements Searcher {
 
-    private boolean caseSensitive;
-    private String regexp;
+    private final boolean caseSensitive;
+    private final String regexp;
     /**
      * Constructor
      * @param caseSensitive is search case sensitive
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
index 066c613a79e..bb7e67148d1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
@@ -54,7 +54,7 @@ public class RemoteStart extends AbstractAction {
         commands.add(ActionNames.REMOTE_EXIT_ALL);
     }
 
-    private DistributedRunner distributedRunner = new DistributedRunner();
+    private final DistributedRunner distributedRunner = new DistributedRunner();
 
     public RemoteStart() {
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index d2a11344872..9b6c6f42368 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -463,7 +463,7 @@ void convertSubTree(HashTree tree) {
 
     private static class PrivatePatternFileFilter implements IOFileFilter {
 
-        private Pattern pattern;
+        private final Pattern pattern;
 
         public PrivatePatternFileFilter(Pattern pattern) {
             if(pattern == null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index 5d685a63ed8..8e477680916 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -105,7 +105,7 @@ public class SearchTreeDialog extends JDialog implements ActionListener { // NOS
 
     private transient Triple<String, Boolean, Boolean> lastSearchConditions = null;
 
-    private List<JMeterTreeNode> lastSearchResult = new ArrayList<>();
+    private final List<JMeterTreeNode> lastSearchResult = new ArrayList<>();
     private int currentSearchIndex;
 
     @VisibleForTesting
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
index 9f4907148bf..63a84ca5440 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
@@ -96,9 +96,9 @@ public class SelectTemplatesDialog extends JDialog implements ChangeListener, Ac
 
     private final JButton validateButton = new JButton();
 
-    private Map<String, JLabeledTextField> parametersTextFields = new LinkedHashMap<>();
+    private final Map<String, JLabeledTextField> parametersTextFields = new LinkedHashMap<>();
 
-    private JPanel actionBtnBar = new JPanel(new FlowLayout());
+    private final JPanel actionBtnBar = new JPanel(new FlowLayout());
 
     public SelectTemplatesDialog() {
         super((JFrame) null, JMeterUtils.getResString("template_title"), true); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
index 5dbab186c74..37f4e73c046 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
@@ -124,8 +124,8 @@ private Map<String, Template> readTemplates() {
     }
 
     public static final class LoggingErrorHandler implements ErrorHandler {
-        private Logger logger;
-        private File file;
+        private final Logger logger;
+        private final File file;
 
         public LoggingErrorHandler(Logger logger, File file) {
             this.logger = logger;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java
index 78166fecfdf..ef291c38483 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java
@@ -29,7 +29,7 @@ public class GuiLogEventBus {
     /**
      * Registered GUI log event listeners array.
      */
-    private List<GuiLogEventListener> listeners = new ArrayList<>();
+    private final List<GuiLogEventListener> listeners = new ArrayList<>();
 
     /**
      * Default constructor.
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
index 68d9203f5f9..65c86be2893 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
@@ -31,7 +31,7 @@ public class LogEventObject extends EventObject {
     private static final long serialVersionUID = 1L;
 
     private Level level;
-    private String seralizedString;
+    private final String seralizedString;
 
     public LogEventObject(Object source) {
         this(source, null);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java
index dfd64ac9f83..ba47df7a375 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java
@@ -47,7 +47,7 @@ public class JMeterTreeNode extends DefaultMutableTreeNode implements NamedTreeN
     private static final int TEST_PLAN_LEVEL = 1;
 
     // See Bug 54648
-    private transient Optional<JMeterTreeModel> treeModel;
+    private final transient Optional<JMeterTreeModel> treeModel;
 
     private boolean markedBySearch;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
index 3990f4a1c41..31e6fcd896e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
@@ -43,7 +43,7 @@ public class JMeterTreeTransferHandler extends TransferHandler {
     private static final Logger log = LoggerFactory.getLogger(JMeterTreeTransferHandler.class);
 
     private DataFlavor nodeFlavor;
-    private DataFlavor[] jMeterTreeNodeDataFlavors = new DataFlavor[1];
+    private final DataFlavor[] jMeterTreeNodeDataFlavors = new DataFlavor[1];
 
     // hold the nodes that should be removed on drop
     private List<JMeterTreeNode> nodesForRemoval = null;
@@ -278,7 +278,7 @@ private JMeterTreeNode[] getDraggedNodes(Transferable t) {
     }
 
     private class NodesTransferable implements Transferable {
-        JMeterTreeNode[] nodes;
+        private final JMeterTreeNode[] nodes;
 
         public NodesTransferable(JMeterTreeNode[] nodes) {
             this.nodes = nodes;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java
index f52a5056ff8..fd7e80e7afe 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java
@@ -55,15 +55,15 @@ public class FileListPanel extends JPanel implements ActionListener {
 
     private static final String LABEL_LIBRARY = "library"; // $NON-NLS-1$
 
-    private JButton browse = new JButton(JMeterUtils.getResString(ACTION_BROWSE));
+    private final JButton browse = new JButton(JMeterUtils.getResString(ACTION_BROWSE));
 
-    private JButton clear = new JButton(JMeterUtils.getResString("clear")); // $NON-NLS-1$
+    private final JButton clear = new JButton(JMeterUtils.getResString("clear")); // $NON-NLS-1$
 
-    private JButton delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
+    private final JButton delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
 
-    private List<ChangeListener> listeners = new ArrayList<>();
+    private final List<ChangeListener> listeners = new ArrayList<>();
 
-    private String title;
+    private final String title;
 
     private String filetype;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
index cdd81298396..2678c8bdec6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
@@ -32,7 +32,7 @@
  */
 public class HeaderAsPropertyRendererWrapper implements TableCellRenderer {
 
-    private TableCellRenderer delegate;
+    private final TableCellRenderer delegate;
 
     /**
      * @param renderer {@link TableCellRenderer} to delegate to
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index e47eada3378..5072aa31ada 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -78,19 +78,19 @@ public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener {
     private JMenuItem runStart;
     private JMenuItem runStartNoTimers;
     private JMenu remoteStart;
-    private Collection<JMenuItem> remoteEngineStart;
+    private final Collection<JMenuItem> remoteEngineStart;
     private JMenuItem runStop;
     private JMenuItem runShut;
     private JMenu remoteStop;
     private JMenu remoteShut;
-    private Collection<JMenuItem> remoteEngineStop;
-    private Collection<JMenuItem> remoteEngineShut;
+    private final Collection<JMenuItem> remoteEngineStop;
+    private final Collection<JMenuItem> remoteEngineShut;
     private JMenu optionsMenu;
     private JMenu helpMenu;
     private JMenu toolsMenu;
     private String[] remoteHosts;
     private JMenu remoteExit;
-    private Collection<JMenuItem> remoteEngineExit;
+    private final Collection<JMenuItem> remoteEngineExit;
     private JMenu searchMenu;
     private List<MenuCreator> menuCreators;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
index b3ea493aeff..e7e4b116fd1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
@@ -51,7 +51,7 @@ public final class JSyntaxSearchToolBar implements ActionListener {
     /**
      * The component where we Search
      */
-    private JSyntaxTextArea dataField;
+    private final JSyntaxTextArea dataField;
 
     /**
      * @param dataField {@link JSyntaxTextArea} to use for searching
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
index 029a4ef05c8..1187ebde1ad 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
@@ -281,8 +281,8 @@ void initialize(String subConfId, T subConfiguration)
     private Map<String, Long[]> apdexPerTransaction = new HashMap<>();
     private Pattern filteredSamplesPattern;
     private boolean ignoreTCFromTop5ErrorsBySampler;
-    private Map<String, ExporterConfiguration> exportConfigurations = new HashMap<>();
-    private Map<String, GraphConfiguration> graphConfigurations = new HashMap<>();
+    private final Map<String, ExporterConfiguration> exportConfigurations = new HashMap<>();
+    private final Map<String, GraphConfiguration> graphConfigurations = new HashMap<>();
 
     /**
      * Gets the overall sample filter.
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
index c8b5dccf969..bcdabeef43d 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
@@ -27,7 +27,7 @@
  */
 public class SubConfiguration {
 
-    private HashMap<String, String> properties = new HashMap<>();
+    private final HashMap<String, String> properties = new HashMap<>();
 
     /**
      * Gets the properties of the item.
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
index 34b1a4c564d..62f6ad2daa2 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
@@ -51,7 +51,7 @@ public abstract class AbstractSampleWriter extends SampleWriter {
 
     private static final String CHARSET = SaveService.getFileEncoding(StandardCharsets.UTF_8.displayName());
 
-    private static Logger log = LoggerFactory.getLogger(AbstractSampleWriter.class);
+    private static final Logger log = LoggerFactory.getLogger(AbstractSampleWriter.class);
 
     /** output writer to write samples to */
     protected PrintWriter writer;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java
index 210ace14922..7ac7f2ef3f6 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java
@@ -32,7 +32,7 @@ public class CsvFile extends File {
 
     /** The Constant serialVersionUID. */
     private static final long serialVersionUID = 4721600093557427167L;
-    private char separator;
+    private final char separator;
 
     public CsvFile(File parent, String child, char separator) {
         super(parent, child);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
index 86b134c8054..b47fcb188cd 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
@@ -61,19 +61,19 @@ public class CsvSampleReader implements Closeable{
                             SampleSaveConfiguration.DEFAULT_DELIMITER))
                     .charAt(0);
 
-    private File file;
+    private final File file;
     private InputStream fis;
     private Reader isr;
     private BufferedReader reader;
-    private char separator;
+    private final char separator;
     private long row;
-    private SampleMetadata metadata;
-    private int columnCount;
+    private final SampleMetadata metadata;
+    private final int columnCount;
     private Sample lastSampleRead;
     /**
      * Number of sample_variables if csv file has no header
      */
-    private int numberOfSampleVariablesInCsv;
+    private final int numberOfSampleVariablesInCsv;
 
     /**
      * Instantiates a new csv sample reader.
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
index 8088afbdc53..5dcb5517ae4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
@@ -38,13 +38,13 @@
 public class CsvSampleWriter extends AbstractSampleWriter {
 
     /** The number of columns for each row */
-    private int columnCount;
+    private final int columnCount;
 
     /** The separator to be used in between data on each row */
     private char separator;
 
     /** Description of the columns */
-    private SampleMetadata metadata;
+    private final SampleMetadata metadata;
 
     /** Number of samples written */
     private long sampleCount;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java
index 4214d111393..4c83e4c8ef4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java
@@ -50,9 +50,9 @@ public class SampleBuilder {
 
     private final SampleMetadata metadata;
 
-    private String[] data;
+    private final String[] data;
 
-    private NumberFormat floatFormatter;
+    private final NumberFormat floatFormatter;
 
     private int k = 0;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 9fed643602d..03fe8f76a4e 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -42,7 +42,7 @@ public class SampleMetadata {
     List<String> columns;
 
     /** Index to map column names to their corresponding indexes */
-    private TreeMap<String, Integer> index = new TreeMap<>();
+    private final TreeMap<String, Integer> index = new TreeMap<>();
 
     /** character separator used for separating columns */
     private char separator;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
index 298a9d73a8e..d62d8f966e4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
@@ -60,7 +60,7 @@ public abstract class AbstractSampleConsumer extends AbstractSampleProcessor
      * index of sample metadata consumed by this consumer. Indexed by channel
      * numbers
      */
-    private Map<Integer, SampleMetadata> consumedMetadata = new TreeMap<>();
+    private final Map<Integer, SampleMetadata> consumedMetadata = new TreeMap<>();
 
     /**
      * Gets the data identified by the specified key from the current sample
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
index 0515c267d1f..a0e40d31f47 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
@@ -30,7 +30,7 @@ public class AbstractSampleProcessor implements SampleProcessor {
 
     private SampleContext sampleContext;
 
-    private ArrayList<ChannelContext> channelContexts = new ArrayList<>();
+    private final ArrayList<ChannelContext> channelContexts = new ArrayList<>();
 
     /*
      * (non-Javadoc)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
index f21d5049111..67c34037ce1 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
@@ -32,10 +32,10 @@ public class AggregateConsumer extends AbstractSampleConsumer {
     private static final String MUST_NOT_BE_NULL = "%s must not be null";
 
     /** The aggregator. */
-    private Aggregator aggregator;
+    private final Aggregator aggregator;
 
     /** The selector. */
-    private SampleSelector<Double> selector;
+    private final SampleSelector<Double> selector;
 
     /**
      * Gets the aggregator.
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index a4d2d2042f4..31296e83745 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -69,13 +69,13 @@ public class CsvFileSampleSource extends AbstractSampleSource {
     private static final Logger LOG = LoggerFactory.getLogger(CsvFileSampleSource.class);
 
     /** input csv files to be produced */
-    private File[] inputFiles;
+    private final File[] inputFiles;
 
     /** csv readers corresponding to the input files */
-    private CsvSampleReader[] csvReaders;
+    private final CsvSampleReader[] csvReaders;
 
     /** mock producer to produce samples to its consumers */
-    private PrivateProducer producer;
+    private final PrivateProducer producer;
 
     /**
      * Build a sample source from the specified input file and character
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
index bf3a9eeb2eb..db25bb4f921 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
@@ -91,9 +91,9 @@ public class ExternalSampleSorter extends AbstractSampleConsumer {
 
     private final BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
 
-    private ThreadPoolExecutor pool;
+    private final ThreadPoolExecutor pool;
 
-    private volatile int nbProcessors;
+    private final int nbProcessors;
 
     private boolean parallelize;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
index 7d68b5578dc..da674ee0804 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
@@ -28,7 +28,7 @@
  */
 public class ListResultData implements ResultData, Iterable<ResultData> {
 
-    private List<ResultData> items = new ArrayList<>();
+    private final List<ResultData> items = new ArrayList<>();
 
     /*
      * (non-Javadoc)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
index 87c306e9e54..c52c89b3551 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
@@ -29,7 +29,7 @@
  */
 public class MapResultData implements ResultData {
 
-    private Map<String, ResultData> map = new HashMap<>();
+    private final Map<String, ResultData> map = new HashMap<>();
 
     /*
      * (non-Javadoc)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
index 9526b1b46c2..3258f946316 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
@@ -26,7 +26,7 @@
  */
 public class MeanAggregator implements Aggregator {
 
-    private Mean mean = new Mean();
+    private final Mean mean = new Mean();
 
     /*
      * (non-Javadoc)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java
index 3cb4d74c537..da19f0f4026 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java
@@ -30,7 +30,7 @@
 public class SampleContext {
 
     private File workingDirectory;
-    private Map<String, Object> data = new HashMap<>();
+    private final Map<String, Object> data = new HashMap<>();
 
     /**
      * Return the root directory that consumers are authorized to use for
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java
index 618d4fa4e4c..99817ccdc1d 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java
@@ -38,7 +38,7 @@ public class TaggerConsumer<TIndex> extends AbstractSampleConsumer {
     public static final String DEFAULT_TAG_LABEL = "Tag";
 
     // Collection of sample builders for channels
-    private ArrayList<SampleBuilder> builders = new ArrayList<>();
+    private final ArrayList<SampleBuilder> builders = new ArrayList<>();
     private SampleIndexer<TIndex> sampleIndexer;
     private String tagLabel = DEFAULT_TAG_LABEL;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
index b20fc599711..50d44c2f73c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
@@ -29,7 +29,7 @@
 public class Top5ErrorsSummaryData {
 
     private static final Long ONE = 1L;
-    private Map<String, Long> countPerError;
+    private final Map<String, Long> countPerError;
     private long total;
     private long errors;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
index aa7e6a5cc58..672c8a757f1 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
@@ -24,7 +24,7 @@
  * Base class allowing to select whether we ignore or not TC Sample Results
  */
 abstract class AbstractGraphValueSelector implements GraphValueSelector {
-    private boolean ignoreTransactionController;
+    private final boolean ignoreTransactionController;
 
     /**
      *
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
index 1738ba48ae6..59202d113d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
@@ -207,9 +207,9 @@ public CsvSampleWriter getWriter() {
         }
 
         // Collection of sample builders for channels
-        private ArrayList<SampleBuilder> builders = new ArrayList<>();
-        private ArrayList<FileInfo> fileInfos = new ArrayList<>();
-        private Map<Long, Long> counts = new HashMap<>();
+        private final ArrayList<SampleBuilder> builders = new ArrayList<>();
+        private final ArrayList<FileInfo> fileInfos = new ArrayList<>();
+        private final Map<Long, Long> counts = new HashMap<>();
         boolean createdWorkDir = false;
         private final AbstractVersusRequestsGraphConsumer parent;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java b/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
index 8b19f2a7f6e..1d8512467d2 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java
@@ -28,11 +28,11 @@
 // TODO - the class contents are not used at present - could perhaps be removed
 public class Entry {
 
-    private Map<Class<?>, ConfigElement> configSet;
+    private final Map<Class<?>, ConfigElement> configSet;
 
     private Class<?> sampler;
 
-    private List<Assertion> assertions;
+    private final List<Assertion> assertions;
 
     public Entry() {
         configSet = new HashMap<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
index 29a759208f5..66f5ba613f9 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
@@ -464,7 +464,7 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
     private boolean idleTime = IDLE_TIME;
 
     // Does not appear to be used (yet)
-    private int assertionsResultsToSave = ASSERTIONS_RESULT_TO_SAVE;
+    private final int assertionsResultsToSave = ASSERTIONS_RESULT_TO_SAVE;
 
     // Don't save this, as it is derived from the time format
     private boolean printMilliseconds = PRINT_MILLISECONDS;
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java
index 0dd942f22c2..38811e6e5ee 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java
@@ -51,7 +51,7 @@ public class StatisticalSampleSender extends AbstractSampleSender implements Ser
             DEFAULT_TIME_THRESHOLD);
 
     // should the samples be aggregated on thread name or thread group (default) ?
-    private static boolean KEY_ON_THREADNAME = JMeterUtils.getPropDefault("key_on_threadname", false);
+    private static final boolean KEY_ON_THREADNAME = JMeterUtils.getPropDefault("key_on_threadname", false);
 
     // Instance fields are constructed by the client when the instance is create in the test plan
     // and the field values are then transferred to the server copy by RMI serialisation/deserialisation
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
index 977e517ce4f..7d2a15f4ef0 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
@@ -36,7 +36,7 @@
  */
 public class PasswordEditor extends PropertyEditorSupport implements ActionListener, FocusListener {
 
-    private JPasswordField textField;
+    private final JPasswordField textField;
 
     /**
      * Value on which we started the editing. Used to avoid firing
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java
index 50e67607d0d..b8bf6815134 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java
@@ -51,7 +51,7 @@ public enum TestLogicalAction {
     private AbstractThreadGroup threadGroup;
     private int threadNum;
     private TestLogicalAction testLogicalAction = TestLogicalAction.CONTINUE;
-    private ConcurrentHashMap<String, Object> samplerContext = new ConcurrentHashMap<>(5);
+    private final ConcurrentHashMap<String, Object> samplerContext = new ConcurrentHashMap<>(5);
     private boolean recording;
 
     JMeterContext() {
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java b/src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
index 3e77e91fb4f..194bf5716fc 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
@@ -26,7 +26,7 @@
  * @since 3.3
  */
 class UnmodifiableJMeterVariables extends JMeterVariables {
-    private JMeterVariables variables;
+    private final JMeterVariables variables;
 
     /**
      * Wrap the {@code variables} to make them unmodifiable.
diff --git a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java
index 44eb5296fc4..7702c492344 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java
@@ -29,7 +29,7 @@
  * jmeter property xpath.namespace.config
  */
 public class PropertiesBasedPrefixResolverForXpath2 extends PrefixResolverDefault {
-    private Map<String, String> namespaceMap = new HashMap<>();
+    private final Map<String, String> namespaceMap = new HashMap<>();
 
     /**
      * @param xpathExpressionContext Node
diff --git a/src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java b/src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java
index 46db928bcb8..2420250bc2c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java
@@ -36,7 +36,7 @@
  */
 public final class TemplateUtil {
 
-    private static Configuration templateConfiguration = init();
+    private static final Configuration templateConfiguration = init();
 
     private TemplateUtil() {
         super();
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index 5c5a23b2105..87284099631 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -64,7 +64,7 @@ public final class JmeterKeyStore {
     private final int endIndex;
 
     /** name of the default alias */
-    private String clientCertAliasVarName;
+    private final String clientCertAliasVarName;
 
     private String[] names = new String[0];
     private Map<String, PrivateKey> privateKeyByAlias = new HashMap<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
index 6795b239af3..487d51a01f8 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
@@ -34,7 +34,7 @@ public class SamplingStatCalculator {
 
     private long firstTime;
 
-    private String label;
+    private final String label;
 
     private volatile Sample currentSample;
 
diff --git a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
index aea6540b95f..96270fc6d9a 100644
--- a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
+++ b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
@@ -47,7 +47,7 @@ public class ExampleSampler extends AbstractSampler {
     // The name of the property used to hold our data
     public static final String DATA = "ExampleSampler.data"; //$NON-NLS-1$
 
-    private static AtomicInteger classCount = new AtomicInteger(0); // keep track of classes created
+    private static final AtomicInteger classCount = new AtomicInteger(0); // keep track of classes created
 
     // (for instructional purposes only!)
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index ad435504d0c..a5c730b905f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -42,9 +42,9 @@ public class IterationCounter extends AbstractFunction implements ThreadListener
 
     private Object[] variables;
 
-    private AtomicInteger globalCounter = new AtomicInteger();
+    private final AtomicInteger globalCounter = new AtomicInteger();
 
-    private ThreadLocal<AtomicInteger> perThreadInt = ThreadLocal.withInitial(AtomicInteger::new);
+    private final ThreadLocal<AtomicInteger> perThreadInt = ThreadLocal.withInitial(AtomicInteger::new);
 
     static {
         desc.add(JMeterUtils.getResString("iteration_counter_arg_1")); //$NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index aa9cc611635..ea35ea83bd9 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -75,13 +75,13 @@ public class RandomDate extends AbstractFunction {
 
     // Ensure that these are set, even if no parameters are provided
     private Locale locale = JMeterUtils.getLocale(); // $NON-NLS-1$
-    private ZoneId systemDefaultZoneID = ZoneId.systemDefault(); // $NON-NLS-1$
+    private final ZoneId systemDefaultZoneID = ZoneId.systemDefault(); // $NON-NLS-1$
     private CompoundVariable[] values;
 
     private static final class LocaleFormatObject {
 
-        private String format;
-        private Locale locale;
+        private final String format;
+        private final Locale locale;
 
         public LocaleFormatObject(String format, Locale locale) {
             this.format = format;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index ad3f01eebfc..5b79ba5115e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -80,13 +80,13 @@ public class TimeShift extends AbstractFunction {
     private CompoundVariable amountToShiftCompound; // $NON-NLS-1$
     private Locale locale = JMeterUtils.getLocale(); // $NON-NLS-1$
     private String variableName = ""; //$NON-NLS-1$
-    private ZoneId systemDefaultZoneID = ZoneId.systemDefault();
+    private final ZoneId systemDefaultZoneID = ZoneId.systemDefault();
 
 
     private static final class LocaleFormatObject {
 
-        private String format;
-        private Locale locale;
+        private final String format;
+        private final Locale locale;
 
         public LocaleFormatObject(String format, Locale locale) {
             this.format = format;
diff --git a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
index 15a6650d8e7..76b0d0d0146 100644
--- a/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
+++ b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java
@@ -62,7 +62,7 @@ public class GenerateTreeGui extends AbstractConfigGui
 
     private static final long serialVersionUID = 1L;
 
-    private JButton generateButton = new JButton("Generate");
+    private final JButton generateButton = new JButton("Generate");
 
     public GenerateTreeGui() {
         super();
diff --git a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
index 0158c6212cb..1e258963c56 100644
--- a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
+++ b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
@@ -78,7 +78,7 @@ public final class CLArgsParser {
     // variables used while parsing options.
     private char ch;
 
-    private String[] args;
+    private final String[] args;
 
     private boolean isLong;
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java
index d7f4e5c090c..f1d126b443e 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java
@@ -41,9 +41,9 @@
 public class JLabeledTextField extends JPanel implements JLabeledField, FocusListener {
     private static final long serialVersionUID = 240L;
 
-    private JLabel mLabel;
+    private final JLabel mLabel;
 
-    private JTextField mTextField;
+    private final JTextField mTextField;
 
     private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<>(3);
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
index 008cf60274b..f20ea95a00b 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
@@ -55,8 +55,8 @@ public class MenuScroller {
 
     private JPopupMenu menu;
     private Component[] menuItems;
-    private MenuScrollItem upItem;
-    private MenuScrollItem downItem;
+    private final MenuScrollItem upItem;
+    private final MenuScrollItem downItem;
     private final MenuScrollListener menuListener = new MenuScrollListener();
     private final MouseWheelListener mouseWheelListener = new MouseScrollListener();
     private int scrollCount;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
index a21893d947d..cd7bf6f8510 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
@@ -44,7 +44,7 @@ public class ObjectTableSorter extends RowSorter<ObjectTableModel> {
      * View row with model mapping. All data relates to model.
      */
     public class Row {
-        private int index;
+        private final int index;
 
         protected Row(int index) {
             this.index = index;
@@ -74,15 +74,15 @@ public int compare(Row o1, Row o2) {
         }
     }
 
-    private ObjectTableModel model;
+    private final ObjectTableModel model;
     private SortKey sortkey;
 
     private Comparator<Row> comparator  = null;
-    private ArrayList<Row>  viewToModel = new ArrayList<>();
+    private final ArrayList<Row>  viewToModel = new ArrayList<>();
     private int[]           modelToView = new int[0];
 
     private Comparator<Row>  primaryComparator = null;
-    private Comparator<?>[]  valueComparators;
+    private final Comparator<?>[]  valueComparators;
     private Comparator<Row>  fallbackComparator;
 
     public ObjectTableSorter(ObjectTableModel model) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
index 103cfa30707..8ea4cd8157d 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
@@ -72,16 +72,16 @@ public class VerticalLayout implements LayoutManager, Serializable {
     public static final int BOTTOM = 2;
 
     /** The vertical vgap between components...defaults to 5. */
-    private int vgap;
+    private final int vgap;
 
     /** LEFT, RIGHT, CENTER or BOTH...how the components are justified. */
-    private int alignment;
+    private final int alignment;
 
     /**
      * TOP, BOTTOM or CENTER ...where are the components positioned in an
      * overlarge space.
      */
-    private int anchor;
+    private final int anchor;
 
     // Constructors
     /**
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
index 4b38db0aa4f..8281353fb90 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
@@ -31,7 +31,7 @@
  */
 public class AlphaNumericComparator<T> implements Comparator<T> {
 
-    private Function<T, String> converter;
+    private final Function<T, String> converter;
 
     /**
      * Constructs a comparator with a converter function
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
index 6b47445de70..16fc6b4c2f5 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
@@ -29,7 +29,7 @@
 public class AlphaNumericKeyComparator implements Comparator<Map.Entry<Object, Object>> {
 
     public static final AlphaNumericKeyComparator INSTANCE = new AlphaNumericKeyComparator();
-    private AlphaNumericComparator<Map.Entry<Object, Object>> comparator;
+    private final AlphaNumericComparator<Map.Entry<Object, Object>> comparator;
 
     private AlphaNumericKeyComparator() {
         // don't instantiate this class on your own.
diff --git a/src/jorphan/src/main/java/org/apache/log/ContextMap.java b/src/jorphan/src/main/java/org/apache/log/ContextMap.java
index 0996ec22c1d..25e2db56f86 100644
--- a/src/jorphan/src/main/java/org/apache/log/ContextMap.java
+++ b/src/jorphan/src/main/java/org/apache/log/ContextMap.java
@@ -53,7 +53,7 @@ public final class ContextMap
     private final ContextMap m_parent;
 
     ///Container to hold map of elements
-    private Hashtable m_map = new Hashtable();
+    private final Hashtable m_map = new Hashtable();
 
     ///Flag indicating whether this map should be readonly
     private transient boolean m_readOnly;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index 7732a1380ba..dd49fc4cafe 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -66,13 +66,13 @@ public class HttpDefaultsGui extends AbstractConfigGui {
     private JTextField embeddedAllowRE; // regular expression used to match against embedded resource URLs to allow
     private JTextField embeddedExcludeRE; // regular expression used to match against embedded resource URLs to discard
     private JTextField sourceIpAddr; // does not apply to Java implementation
-    private JComboBox<String> sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList());
+    private final JComboBox<String> sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList());
     private JTextField proxyScheme;
     private JTextField proxyHost;
     private JTextField proxyPort;
     private JTextField proxyUser;
     private JPasswordField proxyPass;
-    private JComboBox<String> httpImplementation = new JComboBox<>(HTTPSamplerFactory.getImplementations());
+    private final JComboBox<String> httpImplementation = new JComboBox<>(HTTPSamplerFactory.getImplementations());
     private JTextField connectTimeOut;
     private JTextField responseTimeOut;
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index 5a670e0bbc4..fa00b72bfb7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -107,8 +107,8 @@ public class UrlConfigGui extends JPanel implements ChangeListener {
     // Tabbed pane that contains parameters and raw body
     private AbstractValidationTabbedPane postContentTabbedPane;
 
-    private boolean showRawBodyPane;
-    private boolean showFileUploadPane;
+    private final boolean showRawBodyPane;
+    private final boolean showFileUploadPane;
 
     /**
      * Constructor which is setup to show HTTP implementation, raw body pane and
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index 8f45c768714..ea783cfb8e5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -135,7 +135,7 @@ public Principal getUserPrincipal() {
         }
     }
 
-    private KerberosManager kerberosManager = new KerberosManager();
+    private final KerberosManager kerberosManager = new KerberosManager();
 
     /**
      * Default Constructor.
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
index 19f629f2341..990b33ecca0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
@@ -72,7 +72,7 @@ public class HC4CookieHandler implements CookieHandler {
 
     private static final PublicSuffixMatcher publicSuffixMatcher = PublicSuffixMatcherLoader.getDefault();
     @SuppressWarnings("deprecation")
-    private static Registry<CookieSpecProvider> registry  =
+    private static final Registry<CookieSpecProvider> registry  =
             RegistryBuilder.<CookieSpecProvider>create()
             // case is ignored bug registry as it converts to lowerCase(Locale.US)
             .register(CookieSpecs.BEST_MATCH, new DefaultCookieSpecProvider(publicSuffixMatcher))
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
index 7b69733fd9c..995df7012cc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
@@ -92,8 +92,8 @@ private static class LazyHolder {
     private volatile Exception except;
 
     private final int daemonPort;
-    private int maxThreadPoolSize;
-    private int maxQueueSize;
+    private final int maxThreadPoolSize;
+    private final int maxQueueSize;
 
     /**
      * Create a new Daemon with the specified port and target.
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index c71839ec924..dd094513b5a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -63,13 +63,13 @@ public class HttpTestSampleGui extends AbstractSamplerGui {
     private JTextField embeddedAllowRE; // regular expression used to match against embedded resource URLs to allow
     private JTextField embeddedExcludeRE; // regular expression used to match against embedded resource URLs to exclude
     private JTextField sourceIpAddr; // does not apply to Java implementation
-    private JComboBox<String> sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList());
+    private final JComboBox<String> sourceIpType = new JComboBox<>(HTTPSamplerBase.getSourceTypeList());
     private JTextField proxyScheme;
     private JTextField proxyHost;
     private JTextField proxyPort;
     private JTextField proxyUser;
     private JPasswordField proxyPass;
-    private JComboBox<String> httpImplementation = new JComboBox<>(HTTPSamplerFactory.getImplementations());
+    private final JComboBox<String> httpImplementation = new JComboBox<>(HTTPSamplerFactory.getImplementations());
     private JTextField connectTimeOut;
     private JTextField responseTimeOut;
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index aed6b15fdc3..0574ae2e382 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -126,7 +126,7 @@ public class BasicCurlParser {
     public static final class Request {
         private boolean compressed;
         private String url;
-        private List<Pair<String, String>> headers = new ArrayList<>();
+        private final List<Pair<String, String>> headers = new ArrayList<>();
         private String method = "GET";
         private String postData;
         private String interfaceName;
@@ -134,17 +134,17 @@ public static final class Request {
         private String cookies = "";
         private String cookieInHeaders = "";
         private String filepathCookie="";
-        private Authorization authorization = new Authorization();
+        private final Authorization authorization = new Authorization();
         private String caCert = "";
-        private List<Pair<String, ArgumentHolder>> formData = new ArrayList<>();
-        private List<Pair<String, String>> formStringData = new ArrayList<>();
-        private Set<String> dnsServers = new HashSet<>();
+        private final List<Pair<String, ArgumentHolder>> formData = new ArrayList<>();
+        private final List<Pair<String, String>> formStringData = new ArrayList<>();
+        private final Set<String> dnsServers = new HashSet<>();
         private boolean isKeepAlive = true;
         private double maxTime = -1;
-        private List<String> optionsIgnored = new ArrayList<>();
-        private List<String> optionsNoSupport = new ArrayList<>();
-        private List<String> optionsInProperties = new ArrayList<>();
-        private Map<String, String> proxyServer = new LinkedHashMap<>();
+        private final List<String> optionsIgnored = new ArrayList<>();
+        private final List<String> optionsNoSupport = new ArrayList<>();
+        private final List<String> optionsInProperties = new ArrayList<>();
+        private final Map<String, String> proxyServer = new LinkedHashMap<>();
         private String dnsResolver;
         private int limitRate = 0;
         private String noproxy;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
index f19a2ef5743..df3ed241635 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
@@ -24,8 +24,8 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 public class FileArgumentHolder implements ArgumentHolder {
-    private String name;
-    private Map<String, String> metadata;
+    private final String name;
+    private final Map<String, String> metadata;
 
     private FileArgumentHolder(String name, Map<String, String> metadata) {
         this.name = name;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
index 2a72c028172..8930fa97ab0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
@@ -45,8 +45,8 @@ public boolean equals(Object obj) {
         return Objects.equals(metadata, other.metadata) && Objects.equals(name, other.name);
     }
 
-    private String name;
-    private Map<String, String> metadata;
+    private final String name;
+    private final Map<String, String> metadata;
 
     private StringArgumentHolder(String name, Map<String, String> metadata) {
         this.name = name;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
index 9eb9fc11734..28b44156d23 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
@@ -76,7 +76,7 @@ public class AuthPanel extends AbstractConfigGui implements ActionListener {
 
     private static final String CONTROLLED_BY_THREADGROUP = "Controlled_By_ThreadGroup"; //$NON-NLS-1$
 
-    private InnerTableModel tableModel;
+    private final InnerTableModel tableModel;
 
     private JCheckBox clearEachIteration;
 
@@ -449,7 +449,7 @@ public MechanismCellEditor() {
 
     private static class PasswordCellRenderer extends JPasswordField implements TableCellRenderer {
         private static final long serialVersionUID = 5169856333827579927L;
-        private Border myBorder;
+        private final Border myBorder;
 
         public PasswordCellRenderer() {
             super();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index fae5e1cc8b5..3d97369041f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -103,7 +103,7 @@ public class DNSCachePanel extends AbstractConfigGui implements ActionListener {
     private JButton addHostButton;
     private JButton deleteHostButton;
 
-    private ButtonGroup providerDNSradioGroup = new ButtonGroup();
+    private final ButtonGroup providerDNSradioGroup = new ButtonGroup();
 
     private static final String[] COLUMN_RESOURCE_NAMES = {
         JMeterUtils.getResString("dns_hostname_or_ip"), //$NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
index 08ba280e1cc..f64744731ea 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
@@ -313,7 +313,7 @@ private JPanel createButtonPanel() {
     private static class InnerTableModel extends AbstractTableModel {
         private static final long serialVersionUID = 240L;
 
-        private HeaderManager manager;
+        private final HeaderManager manager;
 
         public InnerTableModel(HeaderManager man) {
             manager = man;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
index 9141910053e..60f9c754de3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
@@ -49,8 +49,8 @@ private URLPointer(URL newUrl) {
 
     private static final class JMeterNodeVisitor implements NodeVisitor {
 
-        private URLCollection urls;
-        private URLPointer baseUrl;
+        private final URLCollection urls;
+        private final URLPointer baseUrl;
 
         /**
          * @param baseUrl base url to extract possibly missing information from urls found in <code>urls</code>
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 8dcdd798ec0..360cb7c2aa1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -61,10 +61,10 @@ private URLPointer(URL newUrl) {
 
     private static final class JMeterTagVisitor extends EmptyTagVisitor {
         private HtmlCCommentExpressionMatcher htmlCCommentExpressionMatcher;
-        private URLCollection urls;
-        private URLPointer baseUrl;
-        private Float ieVersion;
-        private Deque<Boolean> enabled = new ArrayDeque<>();
+        private final URLCollection urls;
+        private final URLPointer baseUrl;
+        private final Float ieVersion;
+        private final Deque<Boolean> enabled = new ArrayDeque<>();
 
         /**
          * @param baseUrl base url to add possibly missing information to urls found in <code>urls</code>
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
index ac27bb29b71..4befa30c1b4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
@@ -58,7 +58,7 @@ public abstract class AbstractSamplerCreator implements SamplerCreator {
     private static final boolean NUMBER_REQUESTS =
         JMeterUtils.getPropDefault("proxy.number.requests", true); // $NON-NLS-1$
 
-    private static AtomicInteger REQUEST_NUMBER = new AtomicInteger(0);// running number
+    private static final AtomicInteger REQUEST_NUMBER = new AtomicInteger(0);// running number
 
 
     static {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index d22999f74ca..0532d5adcdb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -81,11 +81,11 @@ public class HttpRequestHdr {
 
     private String firstLine; // saved copy of first line for error reports
 
-    private String prefix;
+    private final String prefix;
 
-    private int httpSampleNameMode;
+    private final int httpSampleNameMode;
 
-    private String httpSampleNameFormat;
+    private final String httpSampleNameFormat;
 
     private boolean detectGraphQLRequest;
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index cb68ace2418..421cc975cd7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -271,7 +271,7 @@ public enum KeystoreMode {
 
     private volatile boolean regexMatch = false;
 
-    private Set<Class<?>> addableInterfaces = new HashSet<>(
+    private final Set<Class<?>> addableInterfaces = new HashSet<>(
             Arrays.asList(Visualizer.class, ConfigElement.class,
                     Assertion.class, Timer.class, PreProcessor.class,
                     PostProcessor.class, SampleListener.class));
@@ -288,7 +288,7 @@ public enum KeystoreMode {
 
     private JMeterTreeModel nonGuiTreeModel;
 
-    private ArrayDeque<SamplerInfo> sampleQueue = new ArrayDeque<>();
+    private final ArrayDeque<SamplerInfo> sampleQueue = new ArrayDeque<>();
 
     // accessed from Swing-Thread, only
     private String oldPrefix = null;
@@ -1721,12 +1721,12 @@ public static boolean isDynamicMode() {
      */
     private static class SamplerInfo implements Serializable {
         private static final long serialVersionUID = 1L;
-        private HTTPSamplerBase sampler;
-        private transient TestElement[] testElements;
-        private JMeterTreeNode target;
-        private String prefix;
-        private int groupingMode;
-        private long recordedAt;
+        private final HTTPSamplerBase sampler;
+        private final transient TestElement[] testElements;
+        private final JMeterTreeNode target;
+        private final String prefix;
+        private final int groupingMode;
+        private final long recordedAt;
 
         public SamplerInfo(HTTPSamplerBase sampler, TestElement[] testElements, JMeterTreeNode target, String prefix, int groupingMode) {
             this.sampler = sampler;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 114b268cf19..8f7e624bd9a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -209,9 +209,9 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
     private static final InputStreamFactory BROTLI = BrotliInputStream::new;
 
     private static final class ManagedCredentialsProvider implements CredentialsProvider {
-        private AuthManager authManager;
-        private Credentials proxyCredentials;
-        private AuthScope proxyAuthScope;
+        private final AuthManager authManager;
+        private final Credentials proxyCredentials;
+        private final AuthScope proxyAuthScope;
 
         public ManagedCredentialsProvider(AuthManager authManager, AuthScope proxyAuthScope, Credentials proxyCredentials) {
             this.authManager = authManager;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java
index 6bcc2474dc6..d7ecbf03387 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java
@@ -29,7 +29,7 @@ public class EncoderCache {
     /** The encoding which should be usd for URLs, according to HTTP specification */
     public static final String URL_ARGUMENT_ENCODING = StandardCharsets.UTF_8.name();
 
-    private Cache cache;
+    private final Cache cache;
 
     public EncoderCache(int cacheSize) {
         cache = new CacheLRU(cacheSize);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index 1b1c5eb5117..b38d28c72b8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -53,7 +53,7 @@ public class HTTPFileArg extends AbstractTestElement implements Serializable {
     /** temporary storage area for the body header. */
     private String header;
 
-    private static Tika tika = createTika();
+    private static final Tika tika = createTika();
 
     /**
      * Constructor for an empty HTTPFileArg object
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
index 40d635d8b08..45b915987a3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
@@ -42,7 +42,7 @@ static class LoopbackOutputStream extends ByteArrayOutputStream{
 
     // wrap read() methods to track output buffer
     static class LoopBackInputStream extends ByteArrayInputStream{
-        private LoopbackOutputStream os;
+        private final LoopbackOutputStream os;
         @Override
         public synchronized int read() {
             buf=os.getBuffer();   // make sure buffer details
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index 917dea79ece..698e03953a7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -100,9 +100,9 @@ public class LogFilter implements Filter, Serializable {
 
     protected boolean PTRNFILTER = false;
 
-    private List<String> excludePatternStrings = new ArrayList<>();
+    private final List<String> excludePatternStrings = new ArrayList<>();
 
-    private  List<String> includePatternStrings = new ArrayList<>();
+    private final List<String> includePatternStrings = new ArrayList<>();
 
     protected ArrayList<Pattern> EXCPATTERNS = new ArrayList<>();
 
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
index c97d4f522fa..773de7b1cc6 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
@@ -60,7 +60,7 @@ public class JMSPropertiesPanel extends JPanel implements ActionListener {
     private static final int COL_VALUE = 1;
     private static final int COL_TYPE = 2;
 
-    private InnerTableModel tableModel;
+    private final InnerTableModel tableModel;
 
     private JTable jmsPropertiesTable;
 
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
index 381b155ff1e..8927f6d35e3 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
@@ -51,29 +51,29 @@ public class JMSSamplerGui extends AbstractSamplerGui {
 
     private static final long serialVersionUID = 240L;
 
-    private JLabeledTextField queueConnectionFactory = new JLabeledTextField(
+    private final JLabeledTextField queueConnectionFactory = new JLabeledTextField(
             JMeterUtils.getResString("jms_queue_connection_factory")); //$NON-NLS-1$
 
-    private JLabeledTextField sendQueue = new JLabeledTextField(JMeterUtils.getResString("jms_send_queue")); //$NON-NLS-1$
+    private final JLabeledTextField sendQueue = new JLabeledTextField(JMeterUtils.getResString("jms_send_queue")); //$NON-NLS-1$
 
-    private JLabeledTextField receiveQueue = new JLabeledTextField(JMeterUtils.getResString("jms_receive_queue")); //$NON-NLS-1$
+    private final JLabeledTextField receiveQueue = new JLabeledTextField(JMeterUtils.getResString("jms_receive_queue")); //$NON-NLS-1$
 
-    private JLabeledTextField timeout = new JLabeledTextField(JMeterUtils.getResString("jms_timeout"), 10); //$NON-NLS-1$
+    private final JLabeledTextField timeout = new JLabeledTextField(JMeterUtils.getResString("jms_timeout"), 10); //$NON-NLS-1$
 
-    private JLabeledTextField expiration = new JLabeledTextField(JMeterUtils.getResString("jms_expiration"), 10); //$NON-NLS-1$
+    private final JLabeledTextField expiration = new JLabeledTextField(JMeterUtils.getResString("jms_expiration"), 10); //$NON-NLS-1$
 
-    private JLabeledTextField priority = new JLabeledTextField(JMeterUtils.getResString("jms_priority"), 1); //$NON-NLS-1$
+    private final JLabeledTextField priority = new JLabeledTextField(JMeterUtils.getResString("jms_priority"), 1); //$NON-NLS-1$
 
-    private JLabeledTextField jmsSelector = new JLabeledTextField(JMeterUtils.getResString("jms_selector")); //$NON-NLS-1$
+    private final JLabeledTextField jmsSelector = new JLabeledTextField(JMeterUtils.getResString("jms_selector")); //$NON-NLS-1$
 
-    private JLabeledTextField numberOfSamplesToAggregate = new JLabeledTextField("Number of samples to aggregate"); //$NON-NLS-1$
+    private final JLabeledTextField numberOfSamplesToAggregate = new JLabeledTextField("Number of samples to aggregate"); //$NON-NLS-1$
 
-    private JSyntaxTextArea messageContent = JSyntaxTextArea.getInstance(10, 50); // $NON-NLS-1$
+    private final JSyntaxTextArea messageContent = JSyntaxTextArea.getInstance(10, 50); // $NON-NLS-1$
 
-    private JLabeledTextField initialContextFactory = new JLabeledTextField(
+    private final JLabeledTextField initialContextFactory = new JLabeledTextField(
             JMeterUtils.getResString("jms_initial_context_factory")); //$NON-NLS-1$
 
-    private JLabeledTextField providerUrl = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url")); //$NON-NLS-1$
+    private final JLabeledTextField providerUrl = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url")); //$NON-NLS-1$
 
     private static final String[] JMS_COMMUNICATION_STYLE_LABELS = new String[] {
             "request_only", // $NON-NLS-1$
@@ -83,7 +83,7 @@ public class JMSSamplerGui extends AbstractSamplerGui {
             "clear" // $NON-NLS-1$
     };
 
-    private JLabeledChoice jmsCommunicationStyle = new JLabeledChoice(
+    private final JLabeledChoice jmsCommunicationStyle = new JLabeledChoice(
             JMeterUtils.getResString("jms_communication_style"), // $NON-NLS-1$
             JMS_COMMUNICATION_STYLE_LABELS);
 
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
index 19f1d0ba046..33718a9ae5c 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
@@ -35,7 +35,7 @@ public class TemporaryQueueExecutor implements QueueExecutor {
     private static final Logger LOGGER = LoggerFactory.getLogger(TemporaryQueueExecutor.class);
     /** The sender and receiver. */
     private final TimeoutEnabledQueueRequestor requestor;
-    private int timeout;
+    private final int timeout;
 
     /**
      * Constructor.
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
index 6663a6421ee..a08590270cd 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
@@ -44,9 +44,9 @@
  */
 public class TimeoutEnabledQueueRequestor {
     private static final Logger logger = LoggerFactory.getLogger(TimeoutEnabledQueueRequestor.class);
-    private TemporaryQueue tempQueue;
-    private MessageProducer sender;
-    private MessageConsumer receiver;
+    private final TemporaryQueue tempQueue;
+    private final MessageProducer sender;
+    private final MessageConsumer receiver;
 
     /**
      * Constructor for the <code>TimeoutEnabledQueueRequestor</code> class.
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
index 5795bc75be2..23db838eba2 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
@@ -30,7 +30,7 @@
 
 class BinaryMessageRenderer implements MessageRenderer<byte[]> {
 
-    private TextMessageRenderer delegate;
+    private final TextMessageRenderer delegate;
 
     public BinaryMessageRenderer(TextMessageRenderer delegate) {
         this.delegate = delegate;
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java
index a52b5fa3a0c..77558c9f543 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java
@@ -26,7 +26,7 @@
 
 public class MapMessageRenderer implements MessageRenderer<Map<String,Object>> {
 
-    private TextMessageRenderer delegate;
+    private final TextMessageRenderer delegate;
 
     public MapMessageRenderer(TextMessageRenderer delegate) {
         this.delegate = delegate;
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
index 6e0455faf3a..da8a0540ed4 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
@@ -93,36 +93,36 @@ public class JUnitTestSamplerGui extends AbstractSamplerGui
         SPATHS = paths;
     }
 
-    private JTextField constructorLabel =
+    private final JTextField constructorLabel =
         new JTextField();
 
-    private JTextField successMsg =
+    private final JTextField successMsg =
         new JTextField();
 
-    private JTextField failureMsg =
+    private final JTextField failureMsg =
         new JTextField();
 
-    private JTextField errorMsg =
+    private final JTextField errorMsg =
         new JTextField();
 
-    private JTextField successCode =
+    private final JTextField successCode =
         new JTextField();
 
-    private JTextField failureCode =
+    private final JTextField failureCode =
         new JTextField();
 
-    private JTextField errorCode =
+    private final JTextField errorCode =
         new JTextField();
 
-    private JLabeledTextField filterpkg =
+    private final JLabeledTextField filterpkg =
         new JLabeledTextField(
             JMeterUtils.getResString("junit_pkg_filter"), 50); //$NON-NLS-1$
 
-    private JCheckBox doSetup = new JCheckBox(JMeterUtils.getResString("junit_do_setup_teardown")); //$NON-NLS-1$
-    private JCheckBox appendError = new JCheckBox(JMeterUtils.getResString("junit_append_error")); //$NON-NLS-1$
-    private JCheckBox appendExc = new JCheckBox(JMeterUtils.getResString("junit_append_exception")); //$NON-NLS-1$
-    private JCheckBox junit4 = new JCheckBox(JMeterUtils.getResString("junit_junit4")); //$NON-NLS-1$
-    private JCheckBox createInstancePerSample = new JCheckBox(JMeterUtils.getResString("junit_create_instance_per_sample")); //$NON-NLS-1$
+    private final JCheckBox doSetup = new JCheckBox(JMeterUtils.getResString("junit_do_setup_teardown")); //$NON-NLS-1$
+    private final JCheckBox appendError = new JCheckBox(JMeterUtils.getResString("junit_append_error")); //$NON-NLS-1$
+    private final JCheckBox appendExc = new JCheckBox(JMeterUtils.getResString("junit_append_exception")); //$NON-NLS-1$
+    private final JCheckBox junit4 = new JCheckBox(JMeterUtils.getResString("junit_junit4")); //$NON-NLS-1$
+    private final JCheckBox createInstancePerSample = new JCheckBox(JMeterUtils.getResString("junit_create_instance_per_sample")); //$NON-NLS-1$
 
     /** A combo box allowing the user to choose a test class. */
     private JComboBox<String> classnameCombo;
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
index 7a13ba6d530..0315e958674 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
@@ -55,7 +55,7 @@ public class LDAPArgumentsPanel extends AbstractConfigGui implements ActionListe
     private static final long serialVersionUID = 240L;
 
     /** The title label for this component. */
-    private JLabel tableLabel;
+    private final JLabel tableLabel;
 
     /** The table containing the list of arguments. */
     private transient JTable table;
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
index 3d109eaacec..09b37ed17d6 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
@@ -54,39 +54,39 @@ public class LdapConfigGui extends AbstractConfigGui implements ItemListener {
 
     private static final long serialVersionUID = 241L;
 
-    private JTextField rootdn = new JTextField(20);
+    private final JTextField rootdn = new JTextField(20);
 
-    private JTextField searchbase = new JTextField(20);
+    private final JTextField searchbase = new JTextField(20);
 
-    private JTextField searchfilter = new JTextField(20);
+    private final JTextField searchfilter = new JTextField(20);
 
-    private JTextField delete = new JTextField(20);
+    private final JTextField delete = new JTextField(20);
 
-    private JTextField add = new JTextField(20);
+    private final JTextField add = new JTextField(20);
 
-    private JTextField modify = new JTextField(20);
+    private final JTextField modify = new JTextField(20);
 
-    private JTextField servername = new JTextField(20);
+    private final JTextField servername = new JTextField(20);
 
-    private JTextField port = new JTextField(20);
+    private final JTextField port = new JTextField(20);
 
-    private JCheckBox userDefined = new JCheckBox(JMeterUtils.getResString("user_defined_test")); // $NON-NLS-1$
+    private final JCheckBox userDefined = new JCheckBox(JMeterUtils.getResString("user_defined_test")); // $NON-NLS-1$
 
-    private JRadioButton addTest = new JRadioButton(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
+    private final JRadioButton addTest = new JRadioButton(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
 
-    private JRadioButton modifyTest = new JRadioButton(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
+    private final JRadioButton modifyTest = new JRadioButton(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
 
-    private JRadioButton deleteTest = new JRadioButton(JMeterUtils.getResString("delete_test")); // $NON-NLS-1$
+    private final JRadioButton deleteTest = new JRadioButton(JMeterUtils.getResString("delete_test")); // $NON-NLS-1$
 
-    private JRadioButton searchTest = new JRadioButton(JMeterUtils.getResString("search_test")); // $NON-NLS-1$
+    private final JRadioButton searchTest = new JRadioButton(JMeterUtils.getResString("search_test")); // $NON-NLS-1$
 
-    private ButtonGroup bGroup = new ButtonGroup();
+    private final ButtonGroup bGroup = new ButtonGroup();
 
     private boolean displayName = true;
 
-    private ArgumentsPanel tableAddPanel = new ArgumentsPanel(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
+    private final ArgumentsPanel tableAddPanel = new ArgumentsPanel(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
 
-    private ArgumentsPanel tableModifyPanel = new ArgumentsPanel(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
+    private final ArgumentsPanel tableModifyPanel = new ArgumentsPanel(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
 
     private JPanel cards;
 
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
index 47b62646d85..5e0640309ff 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
@@ -58,21 +58,21 @@ public class LdapExtConfigGui extends AbstractConfigGui implements ItemListener
 
     private static final long serialVersionUID = 240L;
 
-    private JTextField rootdn = new JTextField(20);
+    private final JTextField rootdn = new JTextField(20);
 
-    private JTextField searchbase = new JTextField(20);
+    private final JTextField searchbase = new JTextField(20);
 
-    private JTextField searchfilter = new JTextField(20);
+    private final JTextField searchfilter = new JTextField(20);
 
-    private JTextField delete = new JTextField(20);
+    private final JTextField delete = new JTextField(20);
 
-    private JTextField add = new JTextField(20);
+    private final JTextField add = new JTextField(20);
 
-    private JTextField modify = new JTextField(20);
+    private final JTextField modify = new JTextField(20);
 
-    private JTextField servername = new JTextField(20);
+    private final JTextField servername = new JTextField(20);
 
-    private JTextField port = new JTextField(20);
+    private final JTextField port = new JTextField(20);
 
     /*
      * N.B. These entry indexes MUST agree with the SearchControls SCOPE_LEVELS, i.e.
@@ -102,65 +102,65 @@ public class LdapExtConfigGui extends AbstractConfigGui implements ItemListener
     private static final String CARDS_SEARCH = "Search"; // $NON-NLS-1$
     private static final String CARDS_MODIFY = "Modify"; // $NON-NLS-1$
 
-    private JLabeledChoice scope =
+    private final JLabeledChoice scope =
         new JLabeledChoice(JMeterUtils.getResString("scope"), // $NON-NLS-1$
         SCOPE_STRINGS);
 
-    private JTextField countlim = new JTextField(20);
+    private final JTextField countlim = new JTextField(20);
 
-    private JTextField timelim = new JTextField(20);
+    private final JTextField timelim = new JTextField(20);
 
-    private JTextField attribs = new JTextField(20);
+    private final JTextField attribs = new JTextField(20);
 
-    private JCheckBox retobj = new JCheckBox(JMeterUtils.getResString("retobj")); // $NON-NLS-1$
+    private final JCheckBox retobj = new JCheckBox(JMeterUtils.getResString("retobj")); // $NON-NLS-1$
 
-    private JCheckBox deref = new JCheckBox(JMeterUtils.getResString("deref")); // $NON-NLS-1$
+    private final JCheckBox deref = new JCheckBox(JMeterUtils.getResString("deref")); // $NON-NLS-1$
 
-    private JTextField userdn = new JTextField(20);
+    private final JTextField userdn = new JTextField(20);
 
-    private JTextField userpw = new JPasswordField(20);
+    private final JTextField userpw = new JPasswordField(20);
 
-    private JTextField comparedn = new JTextField(20);
+    private final JTextField comparedn = new JTextField(20);
 
-    private JTextField comparefilt = new JTextField(20);
+    private final JTextField comparefilt = new JTextField(20);
 
-    private JTextField modddn = new JTextField(20);
+    private final JTextField modddn = new JTextField(20);
 
-    private JTextField newdn = new JTextField(20);
+    private final JTextField newdn = new JTextField(20);
 
-    private JTextField connto = new JTextField(20);
+    private final JTextField connto = new JTextField(20);
 
-    private JCheckBox parseflag = new JCheckBox(JMeterUtils.getResString("ldap_parse_results")); // $NON-NLS-1$
+    private final JCheckBox parseflag = new JCheckBox(JMeterUtils.getResString("ldap_parse_results")); // $NON-NLS-1$
 
-    private JCheckBox secure = new JCheckBox(JMeterUtils.getResString("ldap_secure")); // $NON-NLS-1$
+    private final JCheckBox secure = new JCheckBox(JMeterUtils.getResString("ldap_secure")); // $NON-NLS-1$
 
-    private JCheckBox trustAll = new JCheckBox(JMeterUtils.getResString("ldap_trust_all")); // $NON-NLS-1$
+    private final JCheckBox trustAll = new JCheckBox(JMeterUtils.getResString("ldap_trust_all")); // $NON-NLS-1$
 
-    private JRadioButton addTest = new JRadioButton(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
+    private final JRadioButton addTest = new JRadioButton(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
 
-    private JRadioButton modifyTest = new JRadioButton(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
+    private final JRadioButton modifyTest = new JRadioButton(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
 
-    private JRadioButton deleteTest = new JRadioButton(JMeterUtils.getResString("deltest")); // $NON-NLS-1$
+    private final JRadioButton deleteTest = new JRadioButton(JMeterUtils.getResString("deltest")); // $NON-NLS-1$
 
-    private JRadioButton searchTest = new JRadioButton(JMeterUtils.getResString("searchtest")); // $NON-NLS-1$
+    private final JRadioButton searchTest = new JRadioButton(JMeterUtils.getResString("searchtest")); // $NON-NLS-1$
 
-    private JRadioButton bind = new JRadioButton(JMeterUtils.getResString("bind")); // $NON-NLS-1$
+    private final JRadioButton bind = new JRadioButton(JMeterUtils.getResString("bind")); // $NON-NLS-1$
 
-    private JRadioButton rename = new JRadioButton(JMeterUtils.getResString("rename")); // $NON-NLS-1$
+    private final JRadioButton rename = new JRadioButton(JMeterUtils.getResString("rename")); // $NON-NLS-1$
 
-    private JRadioButton unbind = new JRadioButton(JMeterUtils.getResString("unbind")); // $NON-NLS-1$
+    private final JRadioButton unbind = new JRadioButton(JMeterUtils.getResString("unbind")); // $NON-NLS-1$
 
-    private JRadioButton sbind = new JRadioButton(JMeterUtils.getResString("sbind")); // $NON-NLS-1$
+    private final JRadioButton sbind = new JRadioButton(JMeterUtils.getResString("sbind")); // $NON-NLS-1$
 
-    private JRadioButton compare = new JRadioButton(JMeterUtils.getResString("compare")); // $NON-NLS-1$
+    private final JRadioButton compare = new JRadioButton(JMeterUtils.getResString("compare")); // $NON-NLS-1$
 
-    private ButtonGroup bGroup = new ButtonGroup();
+    private final ButtonGroup bGroup = new ButtonGroup();
 
     private boolean displayName = true;
 
-    private ArgumentsPanel tableAddPanel = new ArgumentsPanel(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
+    private final ArgumentsPanel tableAddPanel = new ArgumentsPanel(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
 
-    private LDAPArgumentsPanel tableModifyPanel = new LDAPArgumentsPanel(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
+    private final LDAPArgumentsPanel tableModifyPanel = new LDAPArgumentsPanel(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
 
     private JPanel cards;
 
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
index 4da98ed1013..b8b02aa5a24 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
@@ -87,7 +87,7 @@ public class LDAPSampler extends AbstractSampler {
 
     // For In build test case using this counter
     // create the new entry in the server
-    private static AtomicInteger COUNTER = new AtomicInteger(0);
+    private static final AtomicInteger COUNTER = new AtomicInteger(0);
 
     private boolean searchFoundEntries;// TODO turn into parameter?
 
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
index a3f7c8ff78c..e4d867fbfda 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
@@ -86,8 +86,8 @@ public class SmtpPanel extends JPanel {
     private JButton addHeaderFieldButton;
     private JLabel headerFieldName;
     private JLabel headerFieldValue;
-    private Map<JTextField, JTextField> headerFields = new HashMap<>();
-    private Map<JButton,JTextField> removeButtons = new HashMap<>();
+    private final Map<JTextField, JTextField> headerFields = new HashMap<>();
+    private final Map<JButton,JTextField> removeButtons = new HashMap<>();
     private int headerGridY = 0;
 
     private SecuritySettingsPanel securitySettingsPanel;

From 6a0de9b70014268c3fc9b8c5f3295eb9daa088ae Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 May 2023 18:51:01 +0300
Subject: [PATCH 0415/1037] style: run "field can be static"

See https://errorprone.info/bugpattern/FieldCanBeStatic

# Conflicts:
#	build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts       | 1 +
 .../org/apache/jmeter/modifiers/gui/UserParametersGui.java  | 2 +-
 .../org/apache/jmeter/visualizers/StatGraphVisualizer.java  | 6 +++---
 .../org/apache/jmeter/samplers/SampleSaveConfiguration.java | 2 ++
 .../main/java/org/apache/jmeter/functions/RandomDate.java   | 2 +-
 .../main/java/org/apache/jmeter/functions/TimeShift.java    | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index edcd58e591c..545e660b0f2 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -56,6 +56,7 @@ if (buildParameters.enableErrorprone) {
                 )
                 warn(
                     "FieldCanBeFinal",
+                    "FieldCanBeStatic",
                     "ForEachIterable",
                     "MethodCanBeStatic",
                 )
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
index b5ee9680099..63a535e03c6 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java
@@ -71,7 +71,7 @@ public class UserParametersGui extends AbstractPreProcessorGui {
 
     private PowerTableModel tableModel;
 
-    private final int numUserColumns = 1;
+    private static final int numUserColumns = 1;
 
     private JButton addParameterButton;
     private JButton addUserButton;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index c4efaa66dd5..1d909eba6b9 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -206,9 +206,9 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
 
     private boolean saveGraphToFile = false;
 
-    private final int defaultWidth = 400;
+    private static final int defaultWidth = 400;
 
-    private final int defaultHeight = 300;
+    private static final int defaultHeight = 300;
 
     private final JComboBox<String> columnsList = new JComboBox<>(getLabels(GRAPH_COLUMNS, getGraphColumnsMsgParameters()));
 
@@ -253,7 +253,7 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
     // Default checked
     private final JCheckBox valueLabelsVertical = new JCheckBox(JMeterUtils.getResString("aggregate_graph_value_labels_vertical"), true); // $NON-NLS-1$
 
-    private final Color colorBarGraph = Color.YELLOW;
+    private final static Color colorBarGraph = Color.YELLOW;
 
     private Color colorForeGraph = Color.BLACK;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
index 66f5ba613f9..b43278448fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
@@ -464,6 +464,8 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
     private boolean idleTime = IDLE_TIME;
 
     // Does not appear to be used (yet)
+    // it is
+    @SuppressWarnings("FieldCanBeStatic")
     private final int assertionsResultsToSave = ASSERTIONS_RESULT_TO_SAVE;
 
     // Don't save this, as it is derived from the time format
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index ea35ea83bd9..83243d76f4e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -75,7 +75,7 @@ public class RandomDate extends AbstractFunction {
 
     // Ensure that these are set, even if no parameters are provided
     private Locale locale = JMeterUtils.getLocale(); // $NON-NLS-1$
-    private final ZoneId systemDefaultZoneID = ZoneId.systemDefault(); // $NON-NLS-1$
+    private static final ZoneId systemDefaultZoneID = ZoneId.systemDefault(); // $NON-NLS-1$
     private CompoundVariable[] values;
 
     private static final class LocaleFormatObject {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index 5b79ba5115e..131d360daea 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -80,7 +80,7 @@ public class TimeShift extends AbstractFunction {
     private CompoundVariable amountToShiftCompound; // $NON-NLS-1$
     private Locale locale = JMeterUtils.getLocale(); // $NON-NLS-1$
     private String variableName = ""; //$NON-NLS-1$
-    private final ZoneId systemDefaultZoneID = ZoneId.systemDefault();
+    private static final ZoneId systemDefaultZoneID = ZoneId.systemDefault();
 
 
     private static final class LocaleFormatObject {

From af92f07cc76066e1e1e0a42bb86c0b442f2be41e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 4 May 2023 18:53:49 +0300
Subject: [PATCH 0416/1037] style: prevent alignment of method parameters via
 .editorconfig

There's no much sense in alignling the parameters just like with
most the other cases for horizontal alignment.

See https://google.github.io/styleguide/javaguide.html#s4.6.3-horizontal-alignment
---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index c22898ea681..582e06e7850 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,7 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 max_line_length = 120
+ij_any_align_multiline_parameters = false
 
 [{*.sh,gradlew}]
 end_of_line = lf

From 349516aa389ab6ec2ea6fc644ef1cc60a553e3b2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 5 May 2023 13:50:07 +0300
Subject: [PATCH 0417/1037] chore: update xalan:xalan to 2.7.3

---
 checksum.xml                        | 1 +
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 src/core/build.gradle.kts           | 6 ++++++
 src/licenses/build.gradle.kts       | 7 +++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index c0aa64838f4..c5daed0bde9 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -197,6 +197,7 @@
     <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
     <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='org.xmlresolver' />
     <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.xmlunit' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xalan' />
     <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='xalan' />
     <trusted-key id='6cb87b18a453990eac9453f87d713008cc07e9ad' group='xerces' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xml-apis' />
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index ae5fab054df..4953cf3e1dc 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -133,8 +133,8 @@ dependencies {
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")
-        api("xalan:serializer:2.7.2")
-        api("xalan:xalan:2.7.2")
+        api("xalan:serializer:2.7.3")
+        api("xalan:xalan:2.7.3")
         api("xerces:xercesImpl:2.12.2")
         api("xml-apis:xml-apis:1.4.01")
         api("xmlpull:xmlpull:1.1.3.1")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index eb60e8f003a..10ba64bd4c2 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -53,6 +53,12 @@ dependencies {
     api("xalan:xalan") {
         because("PropertiesBasedPrefixResolver extends PrefixResolverDefault")
     }
+    api("xalan:serializer") {
+        because("Xalan 2.7.3 misses xalan:serializer dependency in pom.xml, see https://issues.apache.org/jira/browse/XALANJ-2649")
+    }
+    api("xml-apis:xml-apis") {
+        because("Xalan 2.7.3 misses xml-apis:xml-apis dependency in pom.xml, see https://issues.apache.org/jira/browse/XALANJ-2649")
+    }
     // Note: Saxon should go AFTER xalan so xalan XSLT is used
     // org.apache.jmeter.util.XPathUtilTest.testFormatXmlSimple assumes xalan transformer
     api("net.sf.saxon:Saxon-HE") {
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index fccdbf8be8b..e0572a9a759 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -166,6 +166,13 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SimpleLicense("Java HTML Tidy License", uri("http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95"))
         effectiveLicense = SpdxLicense.BSD_3_Clause
     }
+    // Xalan 2.7.3 misses license, see https://issues.apache.org/jira/browse/XALANJ-2650
+    overrideLicense("xalan:xalan") {
+        effectiveLicense = SpdxLicense.Apache_2_0
+    }
+    overrideLicense("xalan:serializer") {
+        effectiveLicense = SpdxLicense.Apache_2_0
+    }
 }
 
 val renderLicenseForSource by tasks.registering(Apache2LicenseRenderer::class) {

From 2dc9411d5600c8454b114ee76058e5477ba2b26f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 5 May 2023 16:59:04 +0200
Subject: [PATCH 0418/1037] Use parameter to make junit tests shorter

---
 .../assertions/TestJSONPathAssertion.java     | 76 +++++--------------
 1 file changed, 18 insertions(+), 58 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index a2a9c6b3ca6..59e442aa68f 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -99,68 +99,31 @@ void testGetResult_pathsWithOneResult(String data, String jsonPath, String expec
         assertFalse(result.isFailure());
     }
 
-    @Test
-    void testGetResult_positive_regexp_for_floating_point() {
-        SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123.45}".getBytes(Charset.defaultCharset()));
-
-        JSONPathAssertion instance = new JSONPathAssertion();
-        instance.setJsonPath("$.myval");
-        instance.setJsonValidationBool(true);
-        instance.setExpectedValue("^\\d+\\.\\d+$");
-        AssertionResult expResult = new AssertionResult("");
-        AssertionResult result = instance.getResult(samplerResult);
-        assertEquals(expResult.getName(), result.getName());
-        assertFalse(result.isFailure());
-    }
-
-    @Test
-    void testGetResult_positive_wrong_regexp_for_floating_point() {
-        SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123.45}".getBytes(Charset.defaultCharset()));
-
-        JSONPathAssertion instance = new JSONPathAssertion();
-        instance.setJsonPath("$.myval");
-        instance.setJsonValidationBool(true);
-        instance.setExpectedValue("^\\d+,\\d+$");
-        AssertionResult expResult = new AssertionResult("");
-        AssertionResult result = instance.getResult(samplerResult);
-        assertEquals(expResult.getName(), result.getName());
-        assertTrue(result.isFailure());
-    }
-    @Test
-    void testGetResult_positive_regexp() {
-        SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
-
-        JSONPathAssertion instance = new JSONPathAssertion();
-        instance.setJsonPath("$.myval");
-        instance.setJsonValidationBool(true);
-        instance.setExpectedValue("(123|456)");
-        AssertionResult expResult = new AssertionResult("");
-        AssertionResult result = instance.getResult(samplerResult);
-        assertEquals(expResult.getName(), result.getName());
-        assertFalse(result.isFailure());
-
-        samplerResult.setResponseData("{\"myval\": 456}".getBytes(Charset.defaultCharset()));
-        AssertionResult result2 = instance.getResult(samplerResult);
-        assertFalse(result2.isFailure());
-    }
-
-    @Test
-    void testGetResult_positive_invert() {
+    @ParameterizedTest
+    @CsvSource({
+            "123.45,'^\\d+\\.\\d+$',false,false",
+            "123.45,'^\\d+\\.\\d+$',true,true",
+            "123.45,'^\\d+,\\d+$',false,true",
+            "123.45,'^\\d+,\\d+$',true,false",
+            "123,'(123|456)',false,false",
+            "123,'(123|456)',true,true",
+            "456,'(123|456)',false,false",
+            "456,'(123|456)',true,true",
+            "some string,some.+,false,false",
+            "some string,some.+,true,true",
+    })
+    void testGetResult_regexp(String value, String regex, boolean inverted, boolean expectedFailure) {
         SampleResult samplerResult = new SampleResult();
-        samplerResult.setResponseData("{\"myval\": 123}".getBytes(Charset.defaultCharset()));
-
+        samplerResult.setResponseData(("{\"myval\": " + value + '}').getBytes(Charset.defaultCharset()));
         JSONPathAssertion instance = new JSONPathAssertion();
         instance.setJsonPath("$.myval");
         instance.setJsonValidationBool(true);
-        instance.setExpectedValue("123");
-        instance.setInvert(true);
+        instance.setExpectedValue(regex);
+        instance.setInvert(inverted);
         AssertionResult expResult = new AssertionResult("");
         AssertionResult result = instance.getResult(samplerResult);
-        assertTrue(result.isFailure());
         assertEquals(expResult.getName(), result.getName());
+        assertEquals(expectedFailure, result.isFailure());
     }
 
     @Test
@@ -172,9 +135,6 @@ void testGetResult_not_regexp() {
         instance.setJsonPath("$.myval");
         instance.setJsonValidationBool(true);
         instance.setExpectedValue("some.+");
-        AssertionResult result = instance.getResult(samplerResult);
-        assertFalse(result.isFailure());
-
         instance.setIsRegex(false);
         AssertionResult result2 = instance.getResult(samplerResult);
         assertTrue(result2.isFailure());

From 406f73362d4965828c40dad4e33c3a5140e2117a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 8 May 2023 07:40:45 +0200
Subject: [PATCH 0419/1037] fix(deps): update dependency
 com.helger.commons:ph-commons to v10.2.4 (#5886)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4953cf3e1dc..c7e474a2834 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.github.weisj:darklaf-property-loader:2.7.3")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
-        api("com.helger.commons:ph-commons:10.2.3")
+        api("com.helger.commons:ph-commons:10.2.4")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
         api("com.miglayout:miglayout-core:5.3")

From c254befcfdccb00787f26da6e08af7b0ce67aed4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 8 May 2023 08:00:56 +0200
Subject: [PATCH 0420/1037] fix(deps): update dependency
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.7.0 (#5889)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c7e474a2834..c5fd57769d0 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.0"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From 878b8b7df4c1afa27f4011edc81e8a77b41b4792 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 9 May 2023 10:03:15 +0300
Subject: [PATCH 0421/1037] style: simplify junit.JUmeterTest by rethrowing
 exceptions instead of catching them

Previously the exceptions might be hidden in the logs.
After the refactoring, the exceptions would propagate and fail the test.
---
 config/checkstyle/checkstyle-suppressions.xml |   1 +
 .../ComponentReferenceFunctionTest.java       |  10 +-
 .../org/apache/jmeter/junit/JMeterTest.java   | 161 +++++++-----------
 .../jmeter/testelement/TestElementTest.java   |   2 +-
 4 files changed, 67 insertions(+), 107 deletions(-)

diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index 17e98efbfe3..33bfc785678 100644
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -28,5 +28,6 @@
               files="test[\\/].*"/>
     <suppress checks="NewlineAtEndOfFile" files="test[\\/].*.xml"/>
     <suppress checks="NewlineAtEndOfFile" files="test[\\/].*.txt"/>
+    <suppress checks="IllegalThrows" files="test[\\/].*.java"/>
     <suppress checks="UnnecessaryParentheses" files=".*.java"/>
 </suppressions>
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
index 540896a78af..141f7a774e1 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
@@ -70,7 +70,7 @@ public Description getDescription() {
     /*
      * Test Functions - create the suite of tests
      */
-    private static Test suiteFunctions() throws Exception {
+    private static Test suiteFunctions() throws Throwable {
         TestSuite suite = new TestSuite("Functions");
         for (Object item : JMeterTest.getObjects(Function.class)) {
             if (item.getClass().equals(CompoundVariable.class)) {
@@ -122,7 +122,11 @@ public void createFunctionSet() throws Exception {
     }
 
     public void checkFunctionSet() throws Exception {
-        assertEquals("Should not have any names left over", 0, JMeterTest.scanprintMap(funcTitles, "Function"));
+        assertEquals(
+                "Should not have any names left over in funcTitles",
+                "[]",
+                JMeterTest.keysWithFalseValues(funcTitles).toString()
+        );
     }
 
     /*
@@ -160,7 +164,7 @@ public void runFunction2() throws Exception {
     /*
      * Use a suite to allow the tests to be generated at run-time
      */
-    public static Test suite() throws Exception {
+    public static Test suite() throws Throwable {
         TestSuite suite = new TestSuite("ComponentReferenceFunctionTest");
         suite.addTest(new ComponentReferenceFunctionTest("createFunctionSet"));
         suite.addTest(suiteFunctions());
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 60d6a3f323b..7054ff33b5c 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -18,7 +18,6 @@
 package org.apache.jmeter.junit;
 
 import java.awt.Component;
-import java.awt.HeadlessException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
@@ -28,7 +27,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
-import java.rmi.RemoteException;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,8 +36,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.swing.SwingUtilities;
 import javax.xml.parsers.DocumentBuilder;
@@ -134,7 +132,7 @@ public Description getDescription() {
     /*
      * Use a suite to allow the tests to be generated at run-time
      */
-    public static Test suite() throws Exception {
+    public static Test suite() throws Throwable {
         TestSuite suite = new TestSuite("JMeterTest");
 
         // The Locale used to instantiate the GUI objects
@@ -231,41 +229,31 @@ public void createTagSet() throws Exception {
         }
     }
 
-
-    public static int scanprintMap(Map<String, Boolean> m, String t) {
-        Set<String> s = m.keySet();
-        if (s.isEmpty()) {
-            return 0;
-        }
-
-        int unseen = 0;
-        for (Map.Entry<String, Boolean> entry : m.entrySet()) {
-            if (!entry.getValue().equals(Boolean.TRUE)) {
-                if (unseen == 0)// first time
-                {
-                    System.out.println("\nNames remaining in " + t + " Map:");
-                }
-                unseen++;
-                System.out.println(entry.getKey());
-            }
-        }
-        return unseen;
+    public static<T> List<T> keysWithFalseValues(Map<? extends T, Boolean> map) {
+        return map.entrySet().stream()
+                .filter(e -> !e.getValue().equals(Boolean.TRUE))
+                .map(Map.Entry::getKey)
+                .sorted()
+                .collect(Collectors.toList());
     }
 
-    public void checkGuiSet() throws Exception {
+    public void checkGuiSet() {
         guiTitles.remove("Example Sampler");// We don't mind if this is left over
         guiTitles.remove("Sample_Result_Save_Configuration");// Ditto, not a sampler
         assertEquals(
-                "Should not have any names left over, check name of components in EN (default) Locale, "
-                + "which must match name attribute of component, check java.awt.HeadlessException errors before, we are running with '-Djava.awt.headless="
-                + System.getProperty("java.awt.headless")+"'",
-                0, scanprintMap(guiTitles, "GUI"));
+                "Should not have any names left over in guiTitles map, check name of components in EN (default) Locale, "
+                        + "which must match name attribute of component, check java.awt.HeadlessException errors before,"
+                        + " we are running with '-Djava.awt.headless="
+                        + System.getProperty("java.awt.headless") + "'",
+                "[]",
+                keysWithFalseValues(guiTitles).toString()
+        );
     }
 
     /*
      * Test GUI elements - create the suite of tests
      */
-    private static Test suiteGUIComponents() throws Exception {
+    private static Test suiteGUIComponents() throws Throwable {
         TestSuite suite = new TestSuite("GuiComponents");
         for (Object o : getObjects(JMeterGUIComponent.class)) {
             JMeterGUIComponent item = (JMeterGUIComponent) o;
@@ -293,7 +281,7 @@ private static Test suiteGUIComponents() throws Exception {
     /*
      * Test GUI elements - create the suite of tests
      */
-    private static Test suiteBeanComponents() throws Exception {
+    private static Test suiteBeanComponents() throws Throwable {
         TestSuite suite = new TestSuite("BeanComponents");
         for (Object o : getObjects(TestBean.class)) {
             Class<?> c = o.getClass();
@@ -401,7 +389,7 @@ public void GUIComponents2() throws Exception {
     /*
      * Test serializable elements - create the suite of tests
      */
-    private static Test suiteSerializableElements() throws Exception {
+    private static Test suiteSerializableElements() throws Throwable {
         TestSuite suite = new TestSuite("SerializableElements");
         for (Object o : getObjects(Serializable.class)) {
             Serializable serObj = (Serializable) o;
@@ -450,47 +438,44 @@ private void checkElementAlias(Object item) {
         }
     }
 
-    public static Collection<Object> getObjects(Class<?> extendsClass) throws Exception {
+    public static Collection<Object> getObjects(Class<?> extendsClass) throws Throwable {
         String exName = extendsClass.getName();
-        Object myThis = "";
         Iterator<String> classes = ClassFinder
                 .findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { extendsClass }).iterator();
         List<Object> objects = new ArrayList<>();
-        String className = "";
-        boolean caughtError = true;
-        final AtomicReference<Throwable> exceptionCatcher = new AtomicReference<>();
-        final AtomicReference<Exception> unexpectedExceptionCatcher = new AtomicReference<>();
-        try {
-            while (classes.hasNext()) {
-                className = classes.next();
-                // TODO - improve this check
-                if (className.endsWith("RemoteJMeterEngineImpl")) {
-                    continue; // Don't try to instantiate remote server
-                }
-                if (className.endsWith("RemoteSampleListenerImpl")) {
-                    // TODO: Cannot start. travis-job-e984b3d5-f93f-4b0f-b6c0-50988a5ece9d is a loopback address.
-                    continue;
-                }
-                String currentClassName = className;
+        while (classes.hasNext()) {
+            String className = classes.next();
+            // TODO - improve this check
+            if (className.equals("org.apache.jmeter.gui.menu.StaticJMeterGUIComponent")) {
+                continue;
+            }
+            if (className.endsWith("RemoteJMeterEngineImpl")) {
+                continue; // Don't try to instantiate remote server
+            }
+            if (className.endsWith("RemoteSampleListenerImpl")) {
+                // TODO: Cannot start. travis-job-e984b3d5-f93f-4b0f-b6c0-50988a5ece9d is a loopback address.
+                continue;
+            }
+            try {
                 // Construct classes in the AWT thread, as we may have found classes, that
                 // assume to be constructed in the AWT thread.
                 SwingUtilities.invokeAndWait(() -> {
-                    try {
-                        instantiateClass(exName, myThis, objects, currentClassName, exceptionCatcher);
-                    } catch (Exception e) {
-                        unexpectedExceptionCatcher.set(e);
+                    Object object = instantiateClass(className);
+                    if (object != null) {
+                        objects.add(object);
                     }
                 });
-                if (unexpectedExceptionCatcher.get() != null) {
-                    throw unexpectedExceptionCatcher.get();
+            } catch (InvocationTargetException e) {
+                Throwable cause = e.getCause();
+                if (cause instanceof IllegalStateException && cause.getMessage().startsWith("Unable to instantiate ")) {
+                    cause = cause.getCause();
+                }
+                if (extendsClass.equals(Serializable.class)) {
+                    // TODO: ignore only well-known classes
+                    System.err.println("Unable to instantiate " + className + " for service " + extendsClass + ", " + cause.toString());
+                } else {
+                    throw new IllegalStateException("Unable to instantiate " + className + " for service " + extendsClass, cause);
                 }
-            }
-            caughtError = false;
-        } finally {
-            if (caughtError) {
-                System.out.println("Last class=" + className);
-                System.out.println("objects.size=" + objects.size());
-                System.out.println("Last error=" + exceptionCatcher.get());
             }
         }
 
@@ -514,48 +499,18 @@ public static Collection<Object> getObjects(Class<?> extendsClass) throws Except
         return objects;
     }
 
-    private static void instantiateClass(final String extendsClassName, final Object myThis,
-            final List<Object> objects, final String className, final AtomicReference<Throwable> exceptionCatcher) throws Exception {
+    private static Object instantiateClass(String className) {
         try {
-            Class<?> currentClass = Class.forName(className);
-            try {
-                // Try with a parameter-less constructor first
-                objects.add(currentClass.getDeclaredConstructor().newInstance());
-            } catch (InstantiationException | NoSuchMethodException | IllegalAccessException |
-                    InvocationTargetException e) {
-                exceptionCatcher.set(e);
-                try {
-                    // Events often have this constructor
-                    objects.add(currentClass.getConstructor(new Class[] { Object.class }).newInstance(
-                            new Object[] { myThis }));
-                } catch (NoSuchMethodException f) {
-                    // no luck. Ignore this class
-                    if (!Enum.class.isAssignableFrom(currentClass)) { // ignore enums
-                        System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": NoSuchMethodException  " +
-                            className + ", missing empty Constructor or Constructor with Object parameter");
-                    }
-                }
-            }
-        } catch (NoClassDefFoundError e) {
-            // no luck. Ignore this class
-            System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": NoClassDefFoundError " + className + ":" + e.getMessage());
-            e.printStackTrace(System.out);
-        } catch (IllegalAccessException e) {
-            exceptionCatcher.set(e);
-            System.out.println("o.a.j.junit.JMeterTest WARN: " + extendsClassName + ": IllegalAccessException " + className + ":" + e.getMessage());
-            e.printStackTrace(System.out);
-            // We won't test restricted-access classes.
-        } catch (HeadlessException | ExceptionInInitializerError e) {// EIIE can be caused by Headless
-            exceptionCatcher.set(e);
-            System.out.println("o.a.j.junit.JMeterTest Error creating " + className + " " + e.toString());
-        } catch (Exception e) {
-            exceptionCatcher.set(e);
-            if (e instanceof RemoteException) { // not thrown, so need to check here
-                System.out.println("o.a.j.junit.JMeterTest WARN: " + "Error creating " + className + " " + e.toString());
-            } else {
-                throw new Exception("Error creating " + className, e);
+            Class<?> aClass = Class.forName(className);
+            if (aClass.isEnum() || Modifier.isAbstract(aClass.getModifiers()) || aClass.isInterface()) {
+                return null;
             }
+            return aClass
+                    .getDeclaredConstructor()
+                    .newInstance();
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException |
+                 ClassNotFoundException e) {
+            throw new IllegalStateException("Unable to instantiate " + className, e instanceof InvocationTargetException ? e.getCause() : e);
         }
     }
-
 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
index 69b1b5f047f..a175459396e 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
@@ -49,7 +49,7 @@ public Description getDescription() {
     /*
      * Test TestElements - create the suite
      */
-    public static Test suite() throws Exception {
+    public static Test suite() throws Throwable {
         TestSuite suite = new TestSuite("TestElements");
         for (Object o : JMeterTest.getObjects(TestElement.class)) {
             TestElement item = (TestElement) o;

From 193bd552d492628e31b4c72bc2a5085ed0b14126 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Tue, 9 May 2023 15:01:44 +0200
Subject: [PATCH 0422/1037] chore: Capture build scans on ge.apache.org to
 benefit from deep build insights

Fixes https://github.com/apache/jmeter/pull/5898
---
 settings.gradle.kts | 57 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index fd1b385e727..2537f530c18 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 import java.util.*
 
@@ -24,7 +25,8 @@ pluginManagement {
 }
 
 plugins {
-    `gradle-enterprise`
+    id("com.gradle.enterprise") version "3.13.1"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 }
 
 dependencyResolutionManagement {
@@ -105,12 +107,18 @@ if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, defau
 
 val isCiServer = System.getenv().containsKey("CI")
 
-if (isCiServer) {
-    gradleEnterprise {
-        buildScan {
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
-            tag("CI")
+gradleEnterprise {
+    server = "https://ge.apache.org"
+    allowUntrustedServer = false
+
+    buildScan {
+        capture { isTaskInputFiles = true }
+        isUploadInBackground = !isCiServer
+        publishAlways()
+        this as BuildScanExtensionWithHiddenFeatures
+        publishIfAuthenticated()
+        obfuscation {
+            ipAddresses { addresses -> addresses.map { "0.0.0.0" } }
         }
     }
 }
@@ -135,32 +143,14 @@ val expectedSha512 = mapOf(
     // TODO: remove JavaEWAH-1.1.12.jar, org.eclipse.jgit-5.13.0.202109080827-r.jar, slf4j-api-1.7.30.jar when Autostyle updates jgit
     "ECBBFD1C6593AFBAA4CA7F65E10BC67B12FF75EB221E490051522FAC8D291B202A0A165644A9C5AC9E5618CD771817C9052F171E5E6210CB021DF5A6E4CBF787"
         to "JavaEWAH-1.1.12.jar",
+    "F9ED8AA41A3B085F534B5298DD9552773AA5D4194C60C1C6299F7EAC82CBD02C26C834CDE7D9B00605D5DF85F50FDE2A144653F1186B9BFC916D84569230518"
+        to "common-custom-user-data-gradle-plugin-1.10.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
-    "F7040C571C2A2727F2EED4EA772F5A7C5D9CB393828B7A2331F7167E467429486F5F3E9423883FE9A6D652FFB0484EAE722CDFB46D97180209BCBEEBF9C25DE3"
-        to "gradle-enterprise-gradle-plugin-3.4.jar",
-    "D5B49D90170DEA96E3D05D893B2B6C04E3B16F3DB6B6BB1DF82D3DE3247E5B0457721F232FAA237E689100980E97F4C04C1234FBEDBDAB7AE0CEAA91C40392C9"
-        to "gradle-enterprise-gradle-plugin-3.4.1.jar",
-    "AA8D06BDF95A6BAAEFE2B0DAE530FCD324A92238F7B790C0FF4A4B5C6454A6BE83D2C81BFEC013A7368697A0A9FC61B97E91775EF9948EF5572FA1DAA9E82052"
-        to "gradle-enterprise-gradle-plugin-3.5.jar",
-    "2A01A91008DF02AA0256D64EAB9238B23B85EA2A886E024E07C3880D642C5E4B96E66DE0D90832BCCEFE5F7C8EF045EBB9905B2A74398E38FAD6A5B28BEBA54D"
-        to "gradle-enterprise-gradle-plugin-3.6.jar",
-    "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
-        to "gradle-enterprise-gradle-plugin-3.6.3.jar",
-    "CF0F77035EC4E61E310AAAF484AD543D8FFF84D31BF6F93183D09CA6056FB1F87B10F355F08F11198140AC47DD92A4DE4E5FED16C993A8B4C93FE169A61BB3A3"
-        to "gradle-enterprise-gradle-plugin-3.7.jar",
-    "7AC5F1C070A8C0A2BD096D96E896EB147966C39E0746120ABA5E107DDBDED441FF71F31F167475CD36EE082D8430D1FB98C51D29C6B91D147CC64DCE59C66D49"
-        to "gradle-enterprise-gradle-plugin-3.7.2.jar",
-    "24A1722CB574BA3126C3C6EBEB3D4A39D2A86ECCEDD378BA96A5508626D1AEAC7BB5FFBC189929E16900B94C1D016AFA83A462DCB2BB03F634FCA9C7FDE9EBA5"
-        to "gradle-enterprise-gradle-plugin-3.8.jar",
-    "11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
-        to "gradle-enterprise-gradle-plugin-3.8.1.jar",
-    "B795B889E3E2EC6D3E3DEB7429345A62B3FCCB4E51B88014AA77FBC3F61D3BC4307E023C83B08FEDA49BF2EAC6B99A48D2995CB9425E5C3E76BBE25D4170BDC8"
-        to "gradle-enterprise-gradle-plugin-3.11.4.jar",
-    "AFC0F3E5B78359131E2BF6C24A128F1CE76F2D128F38DFA8C01F7CF74D1695527C8E953E4B6E7C3ACD925CC03A50845A53B84359AC2B0F5C1F233355E45186D1"
-        to "gradle-enterprise-gradle-plugin-3.12.6.jar",
+    "55861E14836DEC4529A19DA400D09AA31453F40DFBC790D368639F3D2105DFEAD62AE43F3ACAE69A427016CCE1BD31FB6EB34D9176E664133B6773C0856E2492"
+        to "gradle-enterprise-gradle-plugin-3.13.1.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
@@ -206,3 +196,12 @@ property("localDarklaf")?.ifBlank { "../darklaf" }?.let {
     println("Importing project '$it'")
     includeBuild(it)
 }
+
+buildCache {
+    local {
+        isEnabled = !isCiServer
+    }
+    remote(gradleEnterprise.buildCache) {
+        isEnabled = false
+    }
+}

From 45eff09fac544600e87134ebc434d387a823d254 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 9 May 2023 18:37:13 +0100
Subject: [PATCH 0423/1037] Fix NumberFormatException when counter is empty or
 not a digit on Proxy Settings panel

---
 .../jmeter/resources/messages.properties      |  2 +
 .../jmeter/resources/messages_fr.properties   |  2 +
 .../http/proxy/gui/ProxyControlGui.java       | 50 +++++++++++++------
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index dc93ac77c13..535e175cd24 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -879,6 +879,8 @@ proxy_sampler_graphql_settings=GraphQL HTTP Sampler settings
 proxy_sampler_settings=HTTP Sampler settings
 proxy_sampler_type=Type\:
 proxy_separators=Add Separators
+proxy_settings_counter_error_digits=Only digits allowed
+proxy_settings_counter_error_invalid_data=Invalid data
 proxy_settings_pause_error_digits=Only digits allowed
 proxy_settings_pause_error_invalid_data=Invalid data
 proxy_settings_port_error_digits=Only digits allowed
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index 5a68c3ebd59..fe279153c6b 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -868,6 +868,8 @@ proxy_sampler_graphql_settings=Configuration de la requête GraphQL
 proxy_sampler_settings=Paramètres Echantillon HTTP
 proxy_sampler_type=Type \:
 proxy_separators=Ajouter des séparateurs
+proxy_settings_counter_error_digits=Seuls les chiffres sont autorisés.
+proxy_settings_counter_error_invalid_data=Données invalides
 proxy_settings_pause_error_digits=Seuls les chiffres sont autorisés.
 proxy_settings_pause_error_invalid_data=Données invalides
 proxy_settings_port_error_digits=Seuls les chiffres sont autorisés.
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index 5b7e776d092..e5e99f8b0b9 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -63,6 +63,7 @@
 import javax.swing.Timer;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.control.gui.LogicControllerGui;
 import org.apache.jmeter.control.gui.TreeNodeWrapper;
@@ -237,6 +238,8 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
     private JButton start;
     private JButton restart;
 
+    private JTextField counterValue;
+
     private transient RecorderDialog recorderDialog;
 
     private JTextField httpSampleNameFormat;
@@ -265,6 +268,8 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
 
     private static final String ADD_SUGGESTED_EXCLUDES = "exclude_suggested";
 
+    private static final String SET_COUNTERS = "set_counters";
+
     static final String HTTP_SAMPLER_NAMING_MODE = "proxy_http_sampler_naming_mode"; // $NON-NLS-1$
 
     static final String PREFIX_HTTP_SAMPLER_NAME = "proxy_prefix_http_sampler_name"; // $NON-NLS-1$
@@ -410,7 +415,7 @@ public void configure(TestElement element) {
         httpSampleNameFormat.setText(model.getHttpSampleNameFormat());
 
         reinitializeTargetCombo();// Set up list of potential targets and
-                                    // enable listener
+        // enable listener
 
         populateTable(includeModel, model.getIncludePatterns().iterator());
         populateTable(excludeModel, model.getExcludePatterns().iterator());
@@ -499,6 +504,8 @@ public void actionPerformed(ActionEvent action) {
             addSuggestedExcludes(excludeTable);
             excludeModel.fireTableDataChanged();
             enableRestart();
+        } else if (command.equals(SET_COUNTERS)) {
+            setSetCounters();
         }
     }
 
@@ -589,15 +596,15 @@ protected void addFromClipboard(JTable table) {
         } catch (IOException ioe) {
             JOptionPane.showMessageDialog(this,
                     JMeterUtils.getResString("proxy_daemon_error_read_args") // $NON-NLS-1$
-                    + "\n" + ioe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),  // $NON-NLS-1$  $NON-NLS-2$
+                            + "\n" + ioe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),  // $NON-NLS-1$  $NON-NLS-2$
                     JOptionPane.ERROR_MESSAGE);
         } catch (UnsupportedFlavorException ufe) {
             JOptionPane.showMessageDialog(this,
                     JMeterUtils.getResString("proxy_daemon_error_not_retrieve") + SPACE // $NON-NLS-1$
-                        + DataFlavor.stringFlavor.getHumanPresentableName() + SPACE
-                        + JMeterUtils.getResString("proxy_daemon_error_from_clipboard") // $NON-NLS-1$
-                        + ufe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),  // $NON-NLS-1$
-                        JOptionPane.ERROR_MESSAGE);
+                            + DataFlavor.stringFlavor.getHumanPresentableName() + SPACE
+                            + JMeterUtils.getResString("proxy_daemon_error_from_clipboard") // $NON-NLS-1$
+                            + ufe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),  // $NON-NLS-1$
+                    JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -633,11 +640,11 @@ private boolean startProxy() {
                         .append("</b>&nbsp;").append(JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"));
                 sb.append("<br>").append(JMeterUtils.getResString("proxy_daemon_msg_install_as_in_doc")); // $NON-NLS-1$
                 sb.append("<br><b>").append(MessageFormat.format(
-                        JMeterUtils.getResString("proxy_daemon_msg_check_expiration"),
-                        ProxyControl.CERT_VALIDITY)) // $NON-NLS-1$
-                    .append("</b><br>");
+                                JMeterUtils.getResString("proxy_daemon_msg_check_expiration"),
+                                ProxyControl.CERT_VALIDITY)) // $NON-NLS-1$
+                        .append("</b><br>");
                 sb.append("<br>").append(JMeterUtils.getResString("proxy_daemon_msg_check_details"))
-                    .append("<ul>"); // $NON-NLS-1$
+                        .append("<ul>"); // $NON-NLS-1$
                 for(String detail : details) {
                     sb.append("<li>").append(detail).append("</li>");
                 }
@@ -656,10 +663,10 @@ private boolean startProxy() {
                 timer.start();
                 JOptionPane.showMessageDialog(this,
                         messageLabel,
-                    JMeterUtils.getResString("proxy_daemon_msg_rootca_cert") + SPACE // $NON-NLS-1$
-                    + KeyToolUtils.ROOT_CACERT_CRT_PFX + SPACE
-                    + JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"), // $NON-NLS-1$
-                    JOptionPane.INFORMATION_MESSAGE);
+                        JMeterUtils.getResString("proxy_daemon_msg_rootca_cert") + SPACE // $NON-NLS-1$
+                                + KeyToolUtils.ROOT_CACERT_CRT_PFX + SPACE
+                                + JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"), // $NON-NLS-1$
+                        JOptionPane.INFORMATION_MESSAGE);
             }
             return true;
         } catch (InvalidVariableException e) {
@@ -691,6 +698,16 @@ void enableRestart() {
         }
     }
 
+    void setSetCounters() {
+        if ((counterValue.getText().length() > 0) && NumberUtils.isParsable(counterValue.getText())) {
+            Proxy.setCounter(Integer.parseInt(counterValue.getText()));
+        } else {
+            JOptionPane.showMessageDialog(this,
+                    JMeterUtils.getResString("proxy_settings_counter_error_digits"), // $NON-NLS-1$
+                    JMeterUtils.getResString("proxy_settings_counter_error_invalid_data"), // $NON-NLS-1$
+                    JOptionPane.WARNING_MESSAGE);
+        }
+    }
     /** {@inheritDoc} */
     @Override
     public void keyPressed(KeyEvent e) {
@@ -979,10 +996,11 @@ private JPanel createHTTPSamplerPanel() {
         httpSampleNameFormat.setToolTipText(JMeterUtils.getResString("sample_naming_format_help"));
 
         JLabel labelSetCounter = new JLabel(JMeterUtils.getResString("sample_creator_counter_value"));
-        JTextField counterValue = new JTextField(10);
+        counterValue = new JTextField(10);
         labelSetCounter.setLabelFor(counterValue);
         JButton buttonSetCounter = new JButton(JMeterUtils.getResString("sample_creator_set_counter"));
-        buttonSetCounter.addActionListener(e -> Proxy.setCounter(Integer.parseInt(counterValue.getText())));
+        buttonSetCounter.setActionCommand(SET_COUNTERS);
+        buttonSetCounter.addActionListener(this);
         panel.add(labelSetCounter);
         panel.add(counterValue);
         panel.add(buttonSetCounter);

From a838243450c0b90134d748c1940396055acb0c89 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Wed, 10 May 2023 12:53:22 +0100
Subject: [PATCH 0424/1037] update changes.xml with #5901 (Fix
 NumberFormatException when counter is empty or not a digit on Proxy Settings
 panel)

---
 xdocs/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6a4159075b9..936694aa6b7 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -128,6 +128,7 @@ Summary
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
+  <li><pr>5901</pr>Fix NumberFormatException when counter is empty or not a digit on Proxy Settings panel</li>
 </ul>
 
 <h3>Other Samplers</h3>

From bfd83d52a67dd00ab5355171bdf0261e619169f1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 10 May 2023 20:30:27 +0300
Subject: [PATCH 0425/1037] Speed up CPU-bound tests by skipping
 recoverRunningVersion for elements that are shared between threads (the ones
 that implement NoThreadClone (#5899)

See https://github.com/apache/jmeter/issues/5875
---
 .../org/apache/jmeter/testelement/AbstractTestElement.java  | 6 ++++++
 xdocs/changes.xml                                           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 59049988c0c..697d5e86701 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.gui.Searchable;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.CollectionProperty;
@@ -502,6 +503,11 @@ public void setRunningVersion(boolean runningVersion) {
      */
     @Override
     public void recoverRunningVersion() {
+        if (this instanceof NoThreadClone) {
+            // The element is shared between threads, so there's nothing to recover
+            // See https://github.com/apache/jmeter/issues/5875
+            return;
+        }
         Iterator<Map.Entry<String, JMeterProperty>>  iter = propMap.entrySet().iterator();
         while (iter.hasNext()) {
             Map.Entry<String, JMeterProperty> entry = iter.next();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 936694aa6b7..2c6ace3f666 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -99,6 +99,7 @@ Summary
 <h3>General</h3>
 <ul>
   <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
+  <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 4f6d6208976b62d60dc0e2b925d0ca8b19f98de4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 11 May 2023 08:21:35 +0200
Subject: [PATCH 0426/1037] fix(deps): update dependency
 org.jetbrains:annotations to v24 (#5908)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c5fd57769d0..4ee10916f2e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -83,7 +83,7 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.jetbrains:annotations:23.1.0")
+        api("org.jetbrains:annotations:24.0.1")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
         api("net.minidev:accessors-smart:2.4.9")

From 442da17b86f04e137b709a6ade00cd0961916e91 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 11 May 2023 08:23:35 +0200
Subject: [PATCH 0427/1037] fix(deps): update dependency net.sf.saxon:saxon-he
 to v11.5 (#5854)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4ee10916f2e..ce437b74ec6 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
         api("net.minidev:accessors-smart:2.4.9")
         api("net.minidev:json-smart:2.4.10")
         api("net.sf.jtidy:jtidy:r938")
-        api("net.sf.saxon:Saxon-HE:11.3")
+        api("net.sf.saxon:Saxon-HE:11.5")
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")

From 194a1a94b793f4dbfebf3cd05c2f67f6ceb09e4e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 10:08:59 +0300
Subject: [PATCH 0428/1037] style: add .editorconfig to force braces in for,
 do, while, and if statements

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 582e06e7850..5f44ca2b086 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,10 @@ charset = utf-8
 indent_style = space
 max_line_length = 120
 ij_any_align_multiline_parameters = false
+ij_any_do_while_brace_force = always
+ij_any_for_brace_force = always
+ij_any_if_brace_force = always
+ij_any_while_brace_force = always
 
 [{*.sh,gradlew}]
 end_of_line = lf

From f051714ef75e2f5d2731e1f1e437218c6279bad6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 10:35:06 +0300
Subject: [PATCH 0429/1037] style: replace collections4.EnumerationUtils.toList
 with Java's Collections.list

---
 .../apache/jmeter/visualizers/ViewResultsFullVisualizer.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 329e3d21b46..4f44ca2219e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -61,7 +61,6 @@
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import org.apache.commons.collections4.EnumerationUtils;
 import org.apache.commons.collections4.queue.CircularFifoQueue;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.JMeter;
@@ -264,7 +263,7 @@ private static TreePath checkExpandedOrSelected(List<TreeNode> path,
 
     private static Set<Object> extractExpandedObjects(final Enumeration<TreePath> expandedElements) {
         if (expandedElements != null) {
-            final List<TreePath> list = EnumerationUtils.toList(expandedElements);
+            final List<TreePath> list = Collections.list(expandedElements);
             log.debug("Expanded: {}", list);
             Set<Object> result = list.stream()
                     .map(TreePath::getLastPathComponent)

From 8790af0faefd4f51e81e39a3530ba34071578763 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 11 May 2023 09:52:09 +0200
Subject: [PATCH 0430/1037] fix(deps): update dependency
 org.jetbrains.lets-plot:lets-plot-batik to v3.2.0 (#5907)

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index ce437b74ec6..c7de1182025 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -84,7 +84,7 @@ dependencies {
             because("ApacheJMeter_junit depends on junit4")
         }
         api("org.jetbrains:annotations:24.0.1")
-        api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0")
+        api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
         api("net.minidev:accessors-smart:2.4.9")
         api("net.minidev:json-smart:2.4.10")

From b8a1a6369c4df94c6fbb519cd81a052e2ec2f6c8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 10:56:44 +0300
Subject: [PATCH 0431/1037] chore: add checksum for
 checkerframework-gradle-plugin 0.6.27

Unfortunately, it is not yet signed with PGP
---
 build-logic/checksum.xml | 3 +++
 checksum.xml             | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 84f0965cb0d..89e5dbea481 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -91,6 +91,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
       <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.27'>
+      <sha512>2FE56362DD1FD89C2183E7C27ED6AECAEE2795FABD3CE2849EAFC86D12AB2AF4346D80C30A25536556736D6092A369CFDE05D979E97B74267DC7D57DABBDD075</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
diff --git a/checksum.xml b/checksum.xml
index c5daed0bde9..0f07b49cf5f 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -284,6 +284,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
       <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.27'>
+      <sha512>2FE56362DD1FD89C2183E7C27ED6AECAEE2795FABD3CE2849EAFC86D12AB2AF4346D80C30A25536556736D6092A369CFDE05D979E97B74267DC7D57DABBDD075</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>

From 2a2d24621ac4f3d563d4d901859847cb325375ae Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 11 May 2023 10:49:46 +0200
Subject: [PATCH 0432/1037] fix(deps): update org.checkerframework (#5887)

---
 build-logic/verification/build.gradle.kts                       | 2 +-
 .../src/main/kotlin/build-logic.checkerframework.gradle.kts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index ee09349fa14..1cc69841eb5 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.26")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.27")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index d1e0adfdd8c..1b682cd7472 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.33.0"
+        val checkerframeworkVersion = "3.34.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
             // only needed for JDK 8

From e8be4016d631cd176740eac939f216a574964bee Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 11 May 2023 08:58:20 +0000
Subject: [PATCH 0433/1037] fix(deps): update dependency
 com.google.errorprone:error_prone_core to v2.19.1

ErrorProne brings StringCaseLocaleUsage verification that forbids the use of default locale

See https://errorprone.info/bugpattern/StringCaseLocaleUsage
Closes https://github.com/apache/jmeter/pull/5914
---
 .../kotlin/build-logic.errorprone.gradle.kts  |  2 +-
 checksum.xml                                  |  4 ++++
 .../67/91a4ba316974a467.fingerprints          |  1 +
 .../bf/5e975cb00c643dbf.fingerprints          |  1 +
 ...f46bc0b86af5dc56df58f05e975cb00c643dbf.asc | 21 +++++++++++++++++++
 .../visualizers/backend/ErrorMetric.java      |  7 ++++++-
 .../visualizers/backend/WindowMode.java       |  4 +++-
 .../jmeter/config/gui/SimpleConfigGui.java    |  2 +-
 .../apache/jmeter/control/IfController.java   |  1 -
 .../jmeter/engine/StandardJMeterEngine.java   |  2 +-
 .../apache/jmeter/gui/JMeterFileFilter.java   |  3 ++-
 .../jmeter/gui/action/RawTextSearcher.java    | 15 ++++---------
 .../jmeter/gui/action/RegexpSearcher.java     |  6 +-----
 .../jmeter/gui/action/SSLManagerCommand.java  |  3 ++-
 .../report/dashboard/ReportGenerator.java     |  3 ++-
 .../jmeter/testbeans/gui/TextAreaEditor.java  |  3 ++-
 .../apache/jmeter/functions/ChangeCase.java   |  3 ++-
 .../functions/DigestEncodeFunction.java       |  3 ++-
 .../apache/jmeter/functions/LogFunction.java  |  3 ++-
 .../apache/jmeter/functions/StringToFile.java |  3 ++-
 .../jmeter/functions/ThreadGroupName.java     |  2 +-
 .../jorphan/gui/ObjectTableModelTest.java     |  3 ++-
 .../protocol/http/curl/BasicCurlParser.java   |  6 +++---
 .../http/parser/JsoupBasedHtmlParser.java     |  3 ++-
 .../http/proxy/gui/ProxyControlGui.java       |  4 ++--
 .../protocol/http/util/ConversionUtils.java   |  5 +----
 xdocs/changes.xml                             |  1 +
 27 files changed, 72 insertions(+), 42 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 545e660b0f2..f7f0061fb1e 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"("com.google.errorprone:error_prone_core:2.18.0")
+        "errorprone"("com.google.errorprone:error_prone_core:2.19.1")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/checksum.xml b/checksum.xml
index 0f07b49cf5f..825c6a90d3a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -44,6 +44,7 @@
     <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.googlejavaformat' />
     <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
     <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
+    <trusted-key id='d5f46bc0b86af5dc56df58f05e975cb00c643dbf' group='com.google.inject' />
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
     <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' />
@@ -206,6 +207,9 @@
     <dependency group='antlr' module='antlr' version='2.7.7'>
       <sha512>311C3115F9F6651D1711C52D1739E25A70F25456CACB9A2CDDE7627498C30B13D721133CC75B39462AD18812A82472EF1B3B9D64FAB5ABB0377C12BF82043A74</sha512>
     </dependency>
+    <dependency group='aopalliance' module='aopalliance' version='1.0'>
+      <sha512>3F44A932D8C00CFEEE2EB057BCD7C301A2D029063E0A916E1E20B3AEC4877D19D67A2FD8AAF58FA2D5A00133D1602128A7F50912FFB6CABC7B0FDC7FBDA3F8A1</sha512>
+    </dependency>
     <dependency group='bsf' module='bsf' version='2.4.0'>
       <sha512>CF2FF6EA53CD13EA842CAD398F1BE24539BEC68A5CBBD088492ADAB50BC782CDE6D9F4C0B6A24DEAEEE537809C90631C43F9A680FF2826C28CCF1B39380954E3</sha512>
     </dependency>
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
new file mode 100644
index 00000000000..e9592d71f98
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
@@ -0,0 +1 @@
+d5f46bc0b86af5dc56df58f05e975cb00c643dbf
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
new file mode 100644
index 00000000000..e9592d71f98
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
@@ -0,0 +1 @@
+d5f46bc0b86af5dc56df58f05e975cb00c643dbf
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc
new file mode 100644
index 00000000000..726b8c16ac9
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
+dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
+Am1Q6qWxTcJBUtVjjlTMoWcCRwFNP1229ICL6XdfM5djqxOuIcCMIHC55YTldrDK
+5WWgcXC2NZgUbRn7/8dpaCn8iFAyhYjYKAk1lS8kSxCDvQNU9DtdAWtaCosoWBZ7
+mWWIeWp21erk4jgC145GujHYeqynf7VmdIB80u5OeIV6CwJx2ap8AgrKcOCON3Kp
+kYa7fsDGxq6Lbzbc0rzaIfK1wyGo56dMySDK1eZuOY9Es/wzaYfpzx88gn3rrcaw
+HwTKBoug+9z09m/rWy1DThW1gruYMUrxjeyhcdXlEeVrv9EdNCbbfKcg6MbrZ1mu
+Wc9DIAfSQ40Lv2sKxTyubZXxvoyEhD5LTqSKC0tRt9xKjHWWWSG+cyhXu/2hYmp1
+Dq7XvS1p8NKjD6cAEQEAAbkBjQRh7yG0AQwAzUkcci2Ms35HcReeUZLQ5oEiqvbb
+JH0dUHK0IFr4venyXpC2C/2toZiZ231G6miC55MlJiH+8zjZQhb9dFPNaaxvcMX1
+1EzLmm6afnl1BXWwmTHO0fSRl8OYmkVo3vo4fxmngfMWN3D27Xx5F2e51pEGqu2/
+A7rSawKqN/Tbqa0Wmro31PT14/d7bpyRMaotsPvn409WkN+j2qZV0WdqlokcQJGi
+FBsY1YC7jmNRVmSY1l9lzMqTHrFEn1AlfSMJSgnPPueZuI327W5T0B5G3uc77Lcc
+Xx3WEJBp4KdazVixx0gk/k3+GOGkdifxN5qesEgVcYH4Lkt7vYdZmPXxH3tr0h1p
+FpmDZuIgwJrD5/Ck7nHG2ZQf3CiBUtwBE/GR8B6h7gm+E71MvH3m6eMqOWUZ4k1U
+En9mgP4s7sJikpqtG19IYxkQVXRkdo5Q9jQ+95ZCV1O/t7CMGNXmzVc75e+WO7JZ
+iTR7Io9uH5HmbXEpkUOwS+2aWd32IsotfzMbABEBAAE=
+=vpwg
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
index 675ce5203c6..3ccf49f4c53 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.visualizers.backend;
 
+import java.util.Locale;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.samplers.SampleResult;
@@ -88,7 +90,10 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return getResponseCode().toLowerCase().hashCode() + getResponseMessage().toLowerCase().hashCode();
+        int hash = 1;
+        hash = 31 * hash + getResponseCode().toLowerCase(Locale.ROOT).hashCode();
+        hash = 31 * hash + getResponseMessage().toLowerCase(Locale.ROOT).hashCode();
+        return hash;
     }
 
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java
index d02767dacc3..4a9bd0da33f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.visualizers.backend;
 
+import java.util.Locale;
+
 import org.apache.jmeter.util.JMeterUtils;
 
 /**
@@ -35,6 +37,6 @@ public enum WindowMode {
      */
     public static WindowMode get() {
         String name = JMeterUtils.getPropDefault("backend_metrics_window_mode", FIXED.name());
-        return WindowMode.valueOf(name.toUpperCase());
+        return WindowMode.valueOf(name.toUpperCase(Locale.ROOT));
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java b/src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java
index 500e8305d83..08e21c95f88 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java
@@ -215,7 +215,7 @@ private Component createTablePanel() {
      * @return a GUI panel containing the buttons
      */
     private JPanel createButtonPanel() {
-        /** A button for adding new parameters to the table. */
+        // A button for adding new parameters to the table.
         JButton add = new JButton(JMeterUtils.getResString("add")); //$NON-NLS-1$
         add.setActionCommand(ADD);
         add.addActionListener(this);
diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
index 05e214a4935..113fb075b35 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
@@ -96,7 +96,6 @@ public boolean evaluate(String testElementName, String condition) {
             try {
                 Scriptable scope = cx.initStandardObjects(null);
                 Object cxResultObject = cx.evaluateString(scope, condition
-                /** * conditionString ** */
                 , "<cmd>", 1, null);
                 result = computeResultFromString(condition, Context.toString(cxResultObject));
             } catch (Exception e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index af8b226f685..7705e985370 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -399,7 +399,7 @@ public void run() {
             JMeterUtils.reportErrorToUser("Error occurred compiling the tree: - see log file", e);
             return; // no point continuing
         }
-        /**
+        /*
          * Notification of test listeners needs to happen after function
          * replacement, but before setting RunningVersion to true.
          */
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java b/src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java
index 5d88e0b6785..04ca637c0c1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Locale;
 
 /**
  * A file filter which allows files to be filtered based on a list of allowed
@@ -71,7 +72,7 @@ public JMeterFileFilter(String[] extensions, boolean allow) {
      */
     @Override
     public boolean accept(File f) {
-        return (allowDirs && f.isDirectory()) || accept(f.getName().toLowerCase());
+        return (allowDirs && f.isDirectory()) || accept(f.getName().toLowerCase(Locale.ROOT));
         // TODO - why lower case? OK to use the default Locale?
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
index 26a9782e93c..946e9c3163e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
@@ -28,20 +28,14 @@ public class RawTextSearcher implements Searcher {
     private final boolean caseSensitive;
     private final String textToSearch;
 
-
     /**
      * Constructor
-     * @param caseSensitive is search case sensitive
+     * @param caseSensitive is search case-sensitive
      * @param textToSearch Text to search
      */
     public RawTextSearcher(boolean caseSensitive, String textToSearch) {
-        super();
         this.caseSensitive = caseSensitive;
-        if (caseSensitive) {
-            this.textToSearch = textToSearch;
-        } else {
-            this.textToSearch = textToSearch.toLowerCase();
-        }
+        this.textToSearch = textToSearch;
     }
 
     /**
@@ -50,9 +44,8 @@ public RawTextSearcher(boolean caseSensitive, String textToSearch) {
     @Override
     public boolean search(List<String> textTokens) {
         return textTokens.stream()
-                .filter(token -> !StringUtils.isEmpty(token))
-                .map(token -> caseSensitive ? token : token.toLowerCase())
-                .anyMatch(token -> token.contains(textToSearch));
+                .filter(StringUtils::isNotEmpty)
+                .anyMatch(token -> caseSensitive ? token.contains(textToSearch) : StringUtils.containsAnyIgnoreCase(token, textToSearch));
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
index ef84d3dd5a2..c672bb32808 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
@@ -18,7 +18,6 @@
 package org.apache.jmeter.gui.action;
 
 import java.util.List;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
@@ -54,10 +53,7 @@ public boolean search(List<String> textTokens) {
         }
         return textTokens.stream()
                 .filter(token -> !StringUtils.isEmpty(token))
-                .map(token -> caseSensitive ?
-                        pattern.matcher(token) :
-                        pattern.matcher(token.toLowerCase()))
-                .anyMatch(Matcher::find);
+                .anyMatch(token -> pattern.matcher(token).find());
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
index 37d81208a04..e3a1e47d5a1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.swing.JFileChooser;
@@ -127,7 +128,7 @@ public String getDescription() {
          */
         @Override
         public boolean accept(File testFile) {
-            String lowerCaseName = testFile.getName().toLowerCase();
+            String lowerCaseName = testFile.getName().toLowerCase(Locale.ROOT);
             return testFile.isDirectory()
             || lowerCaseName.endsWith(".p12")  //$NON-NLS-1$
             || lowerCaseName.endsWith(".jks")
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index 510f3ccc167..ec50e47a8e3 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
@@ -181,7 +182,7 @@ private static String getSetterName(String propertyKey) {
         Matcher matcher = POTENTIAL_CAMEL_CASE_PATTERN.matcher(propertyKey);
         StringBuffer buffer = new StringBuffer(); // NOSONAR Unfortunately Matcher does not support StringBuilder
         while (matcher.find()) {
-            matcher.appendReplacement(buffer, matcher.group(1).toUpperCase());
+            matcher.appendReplacement(buffer, matcher.group(1).toUpperCase(Locale.ROOT));
         }
         matcher.appendTail(buffer);
         return buffer.toString();
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
index 06e0a350031..76d2e9b2f45 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
@@ -24,6 +24,7 @@
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditorSupport;
+import java.util.Locale;
 
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
@@ -133,7 +134,7 @@ public void propertyChange(PropertyChangeEvent evt) {
         Object source = evt.getSource();
         if (source instanceof ComboStringEditor) {
             ComboStringEditor cse = (ComboStringEditor) source;
-            String lang = cse.getAsText().toLowerCase();
+            String lang = cse.getAsText().toLowerCase(Locale.ROOT);
             textUI.setLanguage(lang);
         }
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index 2798ca48c5c..deb5c88a05f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
@@ -78,7 +79,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
     protected String changeCase(String originalString, String mode) {
         String targetString = originalString;
         // mode is case insensitive, allow upper for example
-        ChangeCaseMode changeCaseMode = ChangeCaseMode.typeOf(mode.toUpperCase());
+        ChangeCaseMode changeCaseMode = ChangeCaseMode.typeOf(mode.toUpperCase(Locale.ROOT));
         if (changeCaseMode != null) {
             switch (changeCaseMode) {
             case UPPER:
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
index 70401906a8c..3bc2d990f57 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.StringUtils;
@@ -100,7 +101,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
     private static String uppercase(String encodedString, CompoundVariable[] values, int index) {
         String shouldUpperCase = values.length > index ? values[index].execute() : null;
         if (Boolean.parseBoolean(shouldUpperCase)) {
-            return encodedString.toUpperCase();
+            return encodedString.toUpperCase(Locale.ROOT);
         }
         return encodedString;
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
index cd729cb850d..de5b0f9a572 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
@@ -141,7 +142,7 @@ private static void printDetails(java.io.PrintStream ps, String s, Throwable t,
      */
     static synchronized void logDetails(Logger logger, String stringToLog, String priorityString, Throwable throwable,
             String comment) {
-        String prio = priorityString.trim().toUpperCase();
+        String prio = priorityString.trim().toUpperCase(Locale.ROOT);
 
         if ("OUT".equals(prio)) {//$NON-NLS-1
             printDetails(System.out, stringToLog, throwable, comment);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
index f93b7538979..25d644e8eea 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -82,7 +83,7 @@ private boolean writeToFile() throws IOException {
         String content = ((CompoundVariable) values[1]).execute();
         boolean append = true;
         if (values.length >= 3) {
-            String appendString = ((CompoundVariable) values[2]).execute().toLowerCase().trim();
+            String appendString = ((CompoundVariable) values[2]).execute().toLowerCase(Locale.ROOT).trim();
             if (!appendString.isEmpty()) {
                 append = Boolean.parseBoolean(appendString);
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
index e465f000ae7..08a4386708f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
@@ -40,10 +40,10 @@ public ThreadGroupName() {
         super(KEY, 0); //$NON-NLS-1$
     }
 
-    @Override
     /**
      * Get current thread group using sampler's context
      */
+    @Override
     public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException {
         JMeterContext context;
         if (currentSampler != null) {
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
index c3555a4e893..441de63604e 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.stream.IntStream;
 
 import javax.swing.event.TableModelEvent;
@@ -62,7 +63,7 @@ public String getC() {
     @BeforeEach
     public void init() {
         String[] headers = { "a", "b", "c" };
-        Functor[] readFunctors = Arrays.stream(headers).map(name -> "get" + name.toUpperCase()).map(Functor::new).toArray(n -> new Functor[n]);
+        Functor[] readFunctors = Arrays.stream(headers).map(name -> "get" + name.toUpperCase(Locale.ROOT)).map(Functor::new).toArray(Functor[]::new);
         Functor[] writeFunctors = new Functor[headers.length];
         Class<?>[] editorClasses = new Class<?>[headers.length];
         Arrays.fill(editorClasses, String.class);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 0574ae2e382..224ea30794a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -285,8 +285,8 @@ public int getLimitRate() {
          * @param limitRate the maximum transfer rate
          */
         public void setLimitRate(String limitRate) {
-            String unit = limitRate.substring(limitRate.length() - 1, limitRate.length()).toLowerCase();
-            int value = Integer.parseInt(limitRate.substring(0, limitRate.length() - 1).toLowerCase());
+            String unit = limitRate.substring(limitRate.length() - 1, limitRate.length()).toLowerCase(Locale.ROOT);
+            int value = Integer.parseInt(limitRate.substring(0, limitRate.length() - 1).toLowerCase(Locale.ROOT));
             switch (unit) {
             case "k":
                 this.limitRate = value * ONE_KILOBYTE_IN_CPS;
@@ -914,7 +914,7 @@ public void setAuthUserPasswd(String authentication, String url, Authorization a
     * @param authorization the object of authorization
     */
    private static void setAuthMechanism(String mechanism, Authorization authorization) {
-       switch (mechanism.toLowerCase()) {
+       switch (mechanism.toLowerCase(Locale.ROOT)) {
        case "basic":
            authorization.setMechanism(Mechanism.BASIC);
            break;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
index 60f9c754de3..10e519075a8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
@@ -20,6 +20,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
+import java.util.Locale;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
@@ -75,7 +76,7 @@ public void head(Node node, int depth) {
                 return;
             }
             Element tag = (Element) node;
-            String tagName = tag.tagName().toLowerCase();
+            String tagName = tag.tagName().toLowerCase(Locale.ROOT);
             if (tagName.equals(TAG_BODY)) {
                 extractAttribute(tag, ATT_BACKGROUND);
             } else if (tagName.equals(TAG_SCRIPT)) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index e5e99f8b0b9..7ac8c0ae97f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -1174,14 +1174,14 @@ private JPanel createTableButtonPanel(String addCommand, String deleteCommand, S
         deleteButton.addActionListener(this);
         buttonPanel.add(deleteButton);
 
-        /** A button for adding new excludes/includes to the table from the clipboard. */
+        // A button for adding new excludes/includes to the table from the clipboard.
         JButton addFromClipboard = new JButton(JMeterUtils.getResString("add_from_clipboard")); // $NON-NLS-1$
         addFromClipboard.setActionCommand(copyFromClipboard);
         addFromClipboard.addActionListener(this);
         buttonPanel.add(addFromClipboard);
 
         if(addSuggestedExcludes != null) {
-            /** A button for adding suggested excludes. */
+            // A button for adding suggested excludes.
             JButton addFromSuggestedExcludes = new JButton(JMeterUtils.getResString("add_from_suggested_excludes")); // $NON-NLS-1$
             addFromSuggestedExcludes.setActionCommand(addSuggestedExcludes);
             addFromSuggestedExcludes.addActionListener(this);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index 4355801ce6b..f4f9866955e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -182,10 +182,7 @@ public static String removeSlashDotDot(String url)
             return url;
         }
 
-        /**
-         * http://auth@host:port/path1/path2/path3/?query#anchor
-         */
-
+        // http://auth@host:port/path1/path2/path3/?query#anchor
         // get to 'path' part of the URL, preserving schema, auth, host if
         // present
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2c6ace3f666..5819e64aadd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -100,6 +100,7 @@ Summary
 <ul>
   <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
   <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
+  <li><pr>5914</pr>Use <code>Locale.ROOT</code> instead of default locale for <code>toUpperCase</code>, and <code>toLowerCase</code> to avoid surprises with dotless I in <code>tr_TR</code> locale</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From c083b2a4d3423c47cf5435b7053bee5ece88e65c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 15:02:22 +0300
Subject: [PATCH 0434/1037] fix: reduce delay for stopping JMeter in non-GUI
 mode from 60 to 1 second

https://github.com/apache/jmeter/pull/717 introduced cachedThreadPool
in StandardJMeterEngine, and it had 60 seconds inactivity timeout by default.
It caused non-GUI tests to wait for the threads to cleanup.
---
 .../apache/jmeter/engine/StandardJMeterEngine.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 7705e985370..e6eb1174926 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -30,10 +30,11 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.samplers.SampleEvent;
@@ -91,11 +92,19 @@ public class StandardJMeterEngine implements JMeterEngine, Runnable {
     /** Whether to call System.exit(0) unconditionally at end of non-GUI test */
     private static final boolean SYSTEM_EXIT_FORCED = JMeterUtils.getPropDefault("jmeterengine.force.system.exit", false);
 
+    private static final AtomicInteger THREAD_COUNTER = new AtomicInteger(0);
+
     /**
      * Executor service to execute management tasks like "start test", "stop test".
      * The use of {@link ExecutorService} allows propagating the exception from the threads.
+     * Thread keepalive time is set to 1 second, so threads are released early,
+     * so the application can shut down faster.
      */
-    private static final ExecutorService EXECUTOR_SERVICE = Executors.newCachedThreadPool();
+    private static final ExecutorService EXECUTOR_SERVICE =
+            new ThreadPoolExecutor(0, Integer.MAX_VALUE,
+                    1L, TimeUnit.SECONDS,
+                    new java.util.concurrent.SynchronousQueue<>(),
+                    (runnable) -> new Thread(runnable, "StandardJMeterEngine-" + THREAD_COUNTER.incrementAndGet()));
 
     private volatile Future<?> runningTest;
 

From fc230f6a248e806a9ddc1ff47d0123fcf84b2db0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 11 May 2023 14:10:53 +0200
Subject: [PATCH 0435/1037] fix(deps): update dependency checkstyle to v10.11.0
 (#5913)

---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 30bed085fec..f10870ed3a9 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 checkstyle {
-    toolVersion = "10.10.0"
+    toolVersion = "10.11.0"
     configProperties = mapOf(
         "cache_file" to buildDir.resolve("checkstyle/cacheFile")
     )

From 96bfab978c80c5152222a6cba01b537a90f597a6 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Thu, 11 May 2023 14:17:35 +0200
Subject: [PATCH 0436/1037] Use JMeterProperty#intValue for loop count directly
 (#5876)

This will get rid of the roundtrip over a String in case,
the prop is already an IntegerProperty.
---
 .../src/main/java/org/apache/jmeter/control/LoopController.java | 2 +-
 .../java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
index b076a19f941..50a3e2094d4 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
@@ -87,7 +87,7 @@ public int getLoops() {
                 ) {
             try {
                 JMeterProperty prop = getProperty(LOOPS);
-                nbLoops = Integer.valueOf(prop.getStringValue());
+                nbLoops = prop.getIntValue();
             } catch (NumberFormatException e) {
                 nbLoops = 0;
             }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index 61992520981..afa833b5cdb 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -597,7 +597,7 @@ public String getContextProvider() {
 
     public int getCommunicationstyle() {
         JMeterProperty prop = getProperty(JMS_COMMUNICATION_STYLE);
-        return Integer.parseInt(prop.getStringValue());
+        return prop.getIntValue();
     }
 
     public String getCommunicationstyleString() {

From b2c1f2c6d891d68fa6ed759aac05911f98993083 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 15:35:08 +0300
Subject: [PATCH 0437/1037] Use Caffeine for caching HTTP headers instead of
 commons-collections4 LRUMap (#5911)

It removes compile-time dependency on commons-collections4 from protocols:http
---
 src/protocol/http/build.gradle.kts            |  4 +-
 .../protocol/http/control/CacheManager.java   | 43 +++++++++++--------
 .../http/control/TestCacheManagerBase.java    | 17 ++++----
 .../TestCacheManagerThreadIteration.java      |  9 ++--
 .../protocol/http/parser/TestCssParser.java   |  9 ++--
 xdocs/changes.xml                             |  1 +
 6 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 1d68ed064b7..49d0c0e6354 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -58,7 +58,9 @@ dependencies {
     }
     implementation("org.jsoup:jsoup")
     implementation("oro:oro")
-    implementation("org.apache.commons:commons-collections4")
+    runtimeOnly("org.apache.commons:commons-collections4") {
+        because("commons-collections4 was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
     implementation("commons-net:commons-net")
     implementation("com.helger.commons:ph-commons") {
         // We don't really need to use/distribute jsr305
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index 4d9ee398e7a..c86f6fbe114 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -23,7 +23,6 @@
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,7 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections4.map.LRUMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -54,6 +52,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 /**
  * Handles HTTP Caching.
  */
@@ -81,7 +82,7 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
     public static final String MAX_SIZE = "maxSize";  // $NON-NLS-1$
     //-
 
-    private transient InheritableThreadLocal<Map<String, CacheEntry>> threadCache;
+    private transient InheritableThreadLocal<Cache<String, CacheEntry>> threadCache;
 
     private transient boolean useExpires; // Cached value
 
@@ -89,7 +90,7 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
      * used to share the cache between 2 cache managers
      * @see CacheManager#createCacheManagerProxy()
      * @since 3.0 */
-    private transient Map<String, CacheEntry> localCache;
+    private transient Cache<String, CacheEntry> localCache;
 
     public CacheManager() {
         setProperty(new BooleanProperty(CLEAR, false));
@@ -98,7 +99,7 @@ public CacheManager() {
         useExpires = false;
     }
 
-    CacheManager(Map<String, CacheEntry> localCache, boolean useExpires) {
+    CacheManager(Cache<String, CacheEntry> localCache, boolean useExpires) {
         this.localCache = localCache;
         this.useExpires = useExpires;
     }
@@ -282,13 +283,16 @@ private void setCache(String lastModified, String cacheControl, String expires,
             getCache().put(url, new CacheEntry(lastModified, expiresDate, etag, varyHeader.getLeft()));
             getCache().put(varyUrl(url, varyHeader.getLeft(), varyHeader.getRight()), new CacheEntry(lastModified, expiresDate, etag, null));
         } else {
-            if (getCache().get(url) != null) {
-                log.debug("Entry for {} already in cache.", url);
-                return;
-            }
-            CacheEntry cacheEntry = new CacheEntry(lastModified, expiresDate, etag, null);
-            log.debug("Set entry {} into cache for url {}", url, cacheEntry);
-            getCache().put(url, cacheEntry);
+            // Makes expiresDate effectively-final
+            Date entryExpiresDate = expiresDate;
+            getCache().get(
+                    url,
+                    key -> {
+                        CacheEntry cacheEntry = new CacheEntry(lastModified, entryExpiresDate, etag, null);
+                        log.debug("Set entry {} into cache for url {}", url, cacheEntry);
+                        return cacheEntry;
+                    }
+            );
         }
     }
 
@@ -536,7 +540,7 @@ private static boolean entryStillValid(URL url, CacheEntry entry) {
     }
 
     private CacheEntry getEntry(String url, Header[] headers) {
-        CacheEntry entry = getCache().get(url);
+        CacheEntry entry = getCache().getIfPresent(url);
         log.debug("getEntry url:{} entry:{} header:{}", url, entry, headers);
         if (entry == null) {
             log.debug("No entry found for url {}", url);
@@ -566,7 +570,7 @@ private static String varyUrl(String url, String headerName, String headerValue)
         return "vary-" + headerName + "-" + headerValue + "-" + url;
     }
 
-    private Map<String, CacheEntry> getCache() {
+    private Cache<String, CacheEntry> getCache() {
         return localCache != null ? localCache : threadCache.get();
     }
 
@@ -609,12 +613,13 @@ public void clear(){
 
     private void clearCache() {
         log.debug("Clear cache");
-        threadCache = new InheritableThreadLocal<Map<String, CacheEntry>>(){
+        // TODO: avoid re-creating the thread local every time, reset its contents instead
+        threadCache = new InheritableThreadLocal<Cache<String, CacheEntry>>(){
             @Override
-            protected Map<String, CacheEntry> initialValue(){
-                // Bug 51942 - this map may be used from multiple threads
-                Map<String, CacheEntry> map = new LRUMap<>(getMaxSize());
-                return Collections.synchronizedMap(map);
+            protected Cache<String, CacheEntry> initialValue() {
+                return Caffeine.newBuilder()
+                        .maximumSize(getMaxSize())
+                        .build();
             }
         };
     }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
index e776c2842fc..ba38114f8c8 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
@@ -29,7 +29,6 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.protocol.http.control.CacheManager.CacheEntry;
@@ -39,6 +38,8 @@
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
+import com.github.benmanes.caffeine.cache.Cache;
+
 @Execution(ExecutionMode.CONCURRENT)
 public abstract class TestCacheManagerBase extends JMeterTestCase {
     protected static final String LOCAL_HOST = "http://localhost/";
@@ -386,7 +387,7 @@ private void cacheResultWithGivenCode(String responseCode) throws Exception {
     @Test
     public void testSaveDetailsWithEmptySampleResultGivesNoCacheEntry() throws Exception {
         cacheResultWithGivenCode("");
-        assertTrue(getThreadCache().isEmpty(), "Saving details with empty SampleResult should not make cache entry.");
+        assertTrue(getThreadCache().asMap().isEmpty(), "Saving details with empty SampleResult should not make cache entry.");
     }
 
     @Test
@@ -423,13 +424,13 @@ public void testSetHeadersHttpMethodWithSampleResultWithResponseCode404GivesNoCa
 
     @Test
     public void testClearCache() throws Exception {
-        assertTrue(getThreadCache().isEmpty(), "ThreadCache should be empty initially.");
+        assertTrue(getThreadCache().asMap().isEmpty(), "ThreadCache should be empty initially.");
         cacheResultWithGivenCode("200");
         assertFalse(
-                getThreadCache().isEmpty(),
+                getThreadCache().asMap().isEmpty(),
                 "ThreadCache should be populated after saving details for HttpMethod with SampleResult with response code 200.");
         this.cacheManager.clear();
-        assertTrue(getThreadCache().isEmpty(), "ThreadCache should be emptied by call to clear.");
+        assertTrue(getThreadCache().asMap().isEmpty(), "ThreadCache should be emptied by call to clear.");
     }
 
     protected HTTPSampleResult getSampleResultWithSpecifiedResponseCode(String code) {
@@ -440,17 +441,17 @@ protected HTTPSampleResult getSampleResultWithSpecifiedResponseCode(String code)
         return sampleResult;
     }
 
-    private Map<String, CacheManager.CacheEntry> getThreadCache() throws Exception {
+    private Cache<String, CacheManager.CacheEntry> getThreadCache() throws Exception {
         Field threadLocalfield = CacheManager.class.getDeclaredField("threadCache");
         threadLocalfield.setAccessible(true);
         @SuppressWarnings("unchecked")
-        ThreadLocal<Map<String, CacheManager.CacheEntry>> threadLocal = (ThreadLocal<Map<String, CacheManager.CacheEntry>>) threadLocalfield
+        ThreadLocal<Cache<String, CacheManager.CacheEntry>> threadLocal = (ThreadLocal<Cache<String, CacheManager.CacheEntry>>) threadLocalfield
                 .get(this.cacheManager);
         return threadLocal.get();
     }
 
     protected CacheManager.CacheEntry getThreadCacheEntry(String url) throws Exception {
-        return getThreadCache().get(url);
+        return getThreadCache().getIfPresent(url);
     }
 
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
index 68c260cc9f5..f8ca9a1b702 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
@@ -31,7 +31,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -53,6 +52,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.github.benmanes.caffeine.cache.Cache;
+
 /**
  * Test {@link CacheManager} that uses HTTPHC4Impl
  */
@@ -292,17 +293,17 @@ protected void setRequestHeaders() {
         this.cacheManager.setHeaders(this.url, this.httpMethod);
     }
 
-    private Map<String, CacheManager.CacheEntry> getThreadCache() throws Exception {
+    private Cache<String, CacheManager.CacheEntry> getThreadCache() throws Exception {
         Field threadLocalfield = CacheManager.class.getDeclaredField("threadCache");
         threadLocalfield.setAccessible(true);
         @SuppressWarnings("unchecked")
-        ThreadLocal<Map<String, CacheManager.CacheEntry>> threadLocal = (ThreadLocal<Map<String, CacheManager.CacheEntry>>) threadLocalfield
+        ThreadLocal<Cache<String, CacheManager.CacheEntry>> threadLocal = (ThreadLocal<Cache<String, CacheManager.CacheEntry>>) threadLocalfield
                 .get(this.cacheManager);
         return threadLocal.get();
     }
 
     protected CacheManager.CacheEntry getThreadCacheEntry(String url) throws Exception {
-        return getThreadCache().get(url);
+        return getThreadCache().getIfPresent(url);
     }
     @Test
     public void testCacheControlCleared() throws Exception {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
index 5429c898948..0482d58261f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
@@ -25,9 +25,10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections4.IteratorUtils;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
@@ -74,10 +75,12 @@ private List<URL> extractUrls(String css) throws LinkExtractorParseException,
 
     private List<URL> extractUrls(CssParser parser, String css)
             throws LinkExtractorParseException, MalformedURLException {
-        List<URL> result = IteratorUtils.toList(parser.getEmbeddedResourceURLs(
+        List<URL> result = new ArrayList<>();
+        Iterator<URL> urlIterator = parser.getEmbeddedResourceURLs(
                 "Mozilla", css.getBytes(StandardCharsets.UTF_8), new URL(
                         "http://example.org/"), StandardCharsets.UTF_8
-                        .displayName()));
+                        .displayName());
+        urlIterator.forEachRemaining(result::add);
         return result;
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5819e64aadd..05690513a12 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -74,6 +74,7 @@ Summary
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
+  <li><pr>5911</pr> Use Caffeine for caching HTTP headers instead of commons-collections4 LRUMap</li>
 </ul>
 
 <h3>Other samplers</h3>

From 5380e59d62efbd91128e46990f14ca8a6f648c6d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 10:05:58 +0300
Subject: [PATCH 0438/1037] feat: Use Caffeine for caching compiled scripts in
 JSR223 samplers instead of commons-collections4 LRUMap

---
 .../apache/jmeter/util/JSR223TestElement.java | 122 +++++++++++-------
 .../apache/jmeter/util/ScriptCacheKey.java    | 116 +++++++++++++++++
 xdocs/changes.xml                             |   1 +
 3 files changed, 195 insertions(+), 44 deletions(-)
 create mode 100644 src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index 7ad70819f45..dded66ed6e3 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -22,9 +22,8 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.file.Files;
-import java.util.Collections;
-import java.util.Map;
 import java.util.Properties;
+import java.util.function.Function;
 
 import javax.script.Bindings;
 import javax.script.Compilable;
@@ -34,7 +33,6 @@
 import javax.script.ScriptException;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections4.map.LRUMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -46,6 +44,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 /**
  * Base class for JSR223 Test elements
  */
@@ -58,15 +59,31 @@ public abstract class JSR223TestElement extends ScriptingTestElement
     /**
      * Cache of compiled scripts
      */
-    private static final Map<String, CompiledScript> compiledScriptsCache =
-            Collections.synchronizedMap(
-                    new LRUMap<>(JMeterUtils.getPropDefault("jsr223.compiled_scripts_cache_size", 100)));
+    private static final Cache<ScriptCacheKey, CompiledScript> COMPILED_SCRIPT_CACHE =
+            Caffeine
+                    .newBuilder()
+                    .maximumSize(JMeterUtils.getPropDefault("jsr223.compiled_scripts_cache_size", 100))
+                    .build();
+
+    /**
+     * Lambdas can't throw checked exceptions, so we wrap cache loading failure with a runtime one.
+     */
+    static class ScriptCompilationInvocationTargetException extends RuntimeException {
+        public ScriptCompilationInvocationTargetException(Throwable cause) {
+            super(cause);
+        }
+
+        @Override
+        public synchronized Throwable fillInStackTrace() {
+            return this;
+        }
+    }
 
     /** If not empty then script in ScriptText will be compiled and cached */
     private String cacheKey = "";
 
     /** md5 of the script, used as an unique key for the cache */
-    private String scriptMd5 = null;
+    private ScriptCacheKey scriptMd5;
 
     /**
      * Initialization On Demand Holder pattern
@@ -172,48 +189,41 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
                 && !"bsh.engine.BshScriptEngine".equals(scriptEngine.getClass().getName()); // NOSONAR // $NON-NLS-1$
         try {
             if (!StringUtils.isEmpty(getFilename())) {
-                if (scriptFile.exists() && scriptFile.canRead()) {
-                    if (supportsCompilable) {
-                        String newCacheKey = getScriptLanguage() + "#" + // $NON-NLS-1$
-                                scriptFile.getAbsolutePath() + "#" + // $NON-NLS-1$
-                                scriptFile.lastModified();
-                        CompiledScript compiledScript = compiledScriptsCache.get(newCacheKey);
-                        if (compiledScript == null) {
-                            synchronized (compiledScriptsCache) {
-                                compiledScript = compiledScriptsCache.get(newCacheKey);
-                                if (compiledScript == null) {
-                                    try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) {
-                                        compiledScript = ((Compilable) scriptEngine).compile(fileReader);
-                                        compiledScriptsCache.put(newCacheKey, compiledScript);
-                                    }
-                                }
-                            }
-                        }
-                        return compiledScript.eval(bindings);
-                    } else {
-                        try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) {
-                            return scriptEngine.eval(fileReader, bindings);
-                        }
-                    }
-                } else {
+                if (!scriptFile.isFile()) {
+                    throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
+                            + "' is not a file for element: " + getName());
+                }
+                if (!scriptFile.canRead()) {
                     throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
-                            + "' does not exist or is unreadable for element:" + getName());
+                            + "' is not readable for element:" + getName());
+                }
+                if (!supportsCompilable) {
+                    try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) {
+                        return scriptEngine.eval(fileReader, bindings);
+                    }
                 }
+                CompiledScript compiledScript;
+                ScriptCacheKey newCacheKey =
+                        ScriptCacheKey.ofFile(getScriptLanguage(), scriptFile.getAbsolutePath(), scriptFile.lastModified());
+                compiledScript = getCompiledScript(newCacheKey, key -> {
+                    try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) {
+                        return ((Compilable) scriptEngine).compile(fileReader);
+                    } catch (IOException | ScriptException e) {
+                        throw new ScriptCompilationInvocationTargetException(e);
+                    }
+                });
+                return compiledScript.eval(bindings);
             } else if (!StringUtils.isEmpty(getScript())) {
                 if (supportsCompilable &&
                         !ScriptingBeanInfoSupport.FALSE_AS_STRING.equals(cacheKey)) {
                     computeScriptMD5();
-                    CompiledScript compiledScript = compiledScriptsCache.get(this.scriptMd5);
-                    if (compiledScript == null) {
-                        synchronized (compiledScriptsCache) {
-                            compiledScript = compiledScriptsCache.get(this.scriptMd5);
-                            if (compiledScript == null) {
-                                compiledScript = ((Compilable) scriptEngine).compile(getScript());
-                                compiledScriptsCache.put(this.scriptMd5, compiledScript);
-                            }
+                    CompiledScript compiledScript = getCompiledScript(scriptMd5, key -> {
+                        try {
+                            return ((Compilable) scriptEngine).compile(getScript());
+                        } catch (ScriptException e) {
+                            throw new ScriptCompilationInvocationTargetException(e);
                         }
-                    }
-
+                    });
                     return compiledScript.eval(bindings);
                 } else {
                     return scriptEngine.eval(getScript(), bindings);
@@ -231,6 +241,30 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
         }
     }
 
+    private static <T extends ScriptCacheKey> CompiledScript getCompiledScript(
+            T newCacheKey,
+            Function<? super ScriptCacheKey, ? extends CompiledScript> compiler
+    ) throws IOException, ScriptException {
+        try {
+            CompiledScript compiledScript = COMPILED_SCRIPT_CACHE.get(newCacheKey, compiler);
+            if (compiledScript == null) {
+                throw new ScriptException("Script compilation returned null: " + newCacheKey);
+            }
+            return compiledScript;
+        } catch (ScriptCompilationInvocationTargetException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof IOException) {
+                cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey));
+                throw (IOException) cause;
+            }
+            if (cause instanceof ScriptException) {
+                cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey));
+                throw (ScriptException) cause;
+            }
+            throw e;
+        }
+    }
+
     /**
      * @return boolean true if element is not compilable or if compilation succeeds
      * @throws IOException if script is missing
@@ -273,7 +307,7 @@ public boolean compile()
     private void computeScriptMD5() {
         // compute the md5 of the script if needed
         if(scriptMd5 == null) {
-            scriptMd5 = DigestUtils.md5Hex(getScript());
+            scriptMd5 = ScriptCacheKey.ofString(DigestUtils.md5Hex(getScript()));
         }
     }
 
@@ -320,7 +354,7 @@ public void testEnded() {
      */
     @Override
     public void testEnded(String host) {
-        compiledScriptsCache.clear();
+        COMPILED_SCRIPT_CACHE.invalidateAll();
         this.scriptMd5 = null;
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java b/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java
new file mode 100644
index 00000000000..6b7ea21c973
--- /dev/null
+++ b/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util;
+
+import java.util.Objects;
+
+interface ScriptCacheKey {
+    /**
+     * Creates a script key from a string. Note: do not use concatenation to build a key. Prefer creating a subclass.
+     * @param key cache key
+     * @return cache key
+     */
+    static ScriptCacheKey ofString(String key) {
+        return new StringScriptCacheKey(key);
+    }
+
+    /**
+     * Creates a cache key for a file contents assuming its last modified date is up to date.
+     * @param language script language
+     * @param absolutePath absolute path of the file
+     * @param lastModified file last modification date
+     * @return cache key
+     */
+    static ScriptCacheKey ofFile(String language, String absolutePath, long lastModified) {
+        return new FileScriptCacheKey(language, absolutePath, lastModified);
+    }
+
+    final class StringScriptCacheKey implements ScriptCacheKey {
+        final String contents;
+
+        StringScriptCacheKey(String contents) {
+            this.contents = contents;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            StringScriptCacheKey that = (StringScriptCacheKey) o;
+            return Objects.equals(contents, that.contents);
+        }
+
+        @Override
+        public int hashCode() {
+            return contents.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "StringScriptCacheKey{" +
+                    "contents='" + contents + '\'' +
+                    '}';
+        }
+    }
+
+    final class FileScriptCacheKey implements ScriptCacheKey {
+        final String language;
+        final String absolutePath;
+        final long lastModified;
+
+        FileScriptCacheKey(String language, String absolutePath, long lastModified) {
+            this.language = language;
+            this.absolutePath = absolutePath;
+            this.lastModified = lastModified;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            FileScriptCacheKey that = (FileScriptCacheKey) o;
+            return Objects.equals(language, that.language) && Objects.equals(absolutePath, that.absolutePath) && lastModified == that.lastModified;
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 1;
+            hash = 31 * hash + language.hashCode();
+            hash = 31 * hash + absolutePath.hashCode();
+            hash = 31 * hash + Long.hashCode(lastModified);
+            return hash;
+        }
+
+        @Override
+        public String toString() {
+            return "ScriptCacheKey{" +
+                    "language='" + language + '\'' +
+                    ", absolutePath='" + absolutePath + '\'' +
+                    ", lastModified=" + lastModified +
+                    '}';
+        }
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 05690513a12..908c6f023f9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -79,6 +79,7 @@ Summary
 
 <h3>Other samplers</h3>
 <ul>
+  <li><pr>5909</pr> Use Caffeine for caching compiled scripts in JSR223 samplers instead of commons-collections4 LRUMap</li>
 </ul>
 
 <h3>Controllers</h3>

From b34a62e1cb958e0ef80e0eae9f16b9b09c6ab813 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 15:43:56 +0300
Subject: [PATCH 0439/1037] feat: Use Caffeine for caching customizers in
 TestBeanGUI instead of commons-collections4 LRUMap (#5910)

---
 .../org/apache/jmeter/testbeans/gui/TestBeanGUI.java  | 11 ++++++++---
 xdocs/changes.xml                                     |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
index 6c66e6000c7..dfcce91dcb5 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
@@ -37,7 +37,6 @@
 
 import javax.swing.JPopupMenu;
 
-import org.apache.commons.collections4.map.LRUMap;
 import org.apache.jmeter.assertions.Assertion;
 import org.apache.jmeter.assertions.gui.AbstractAssertionGui;
 import org.apache.jmeter.config.ConfigElement;
@@ -69,6 +68,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 /**
  * JMeter GUI element editing for TestBean elements.
  * <p>
@@ -109,7 +111,10 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUI
      * needs to be limited, though, to avoid memory issues when editing very
      * large test plans.
      */
-    private final Map<TestElement, Customizer> customizers = new LRUMap<>(20);
+    private final Cache<TestElement, Customizer> customizers =
+            Caffeine.newBuilder() // TOOD: should this be made static?
+                    .maximumSize(20)
+                    .build();
 
     /** Index of the customizer in the JPanel's child component list: */
     private int customizerIndexInPanel;
@@ -325,7 +330,7 @@ private void setValues(TestElement element) {
             if (initialized){
                 remove(customizerIndexInPanel);
             }
-            Customizer c = customizers.computeIfAbsent(element, e -> {
+            Customizer c = customizers.get(element, e -> {
                 Customizer result = createCustomizer();
                 result.setObject(propertyMap);
                 return result;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 908c6f023f9..4ea39463819 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -109,6 +109,7 @@ Summary
 <ul>
   <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
   <li><pr>5710</pr>Add GitHub Issue templates</li>
+  <li><pr>5910</pr>Use Caffeine for caching customizers in TestBeanGUI instead of commons-collections4 LRUMap</li>
   <li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
   <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
   <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.

From c3a23004c4dd333c863a3580f03af32978fd60e5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 15:58:36 +0300
Subject: [PATCH 0440/1037] chore: move commons-collections from compile to
 runtime-only dependency of :src:core

commons-collections was not used in JMeter for a while, so it is time to move
the dependency in runtimeOnly.
It keeps backward compatibility, and it makes autocomplete menus smaller when
coding JMeter itself.
---
 src/core/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 10ba64bd4c2..87591219563 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
     implementation("commons-codec:commons-codec") {
         because("DigestUtils")
     }
-    implementation("commons-collections:commons-collections") {
+    runtimeOnly("commons-collections:commons-collections") {
         because("Compatibility for old plugins")
     }
     implementation("org.jetbrains.lets-plot:lets-plot-batik") {

From 5542be18d823dd092f8b04246b335c4cfe34f0d0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 16:02:19 +0300
Subject: [PATCH 0441/1037] chore: remove stale exclusions from lets-plot
 dependency declarations

---
 src/core/build.gradle.kts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 87591219563..af479d8ac18 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -92,14 +92,8 @@ dependencies {
     runtimeOnly("commons-collections:commons-collections") {
         because("Compatibility for old plugins")
     }
-    implementation("org.jetbrains.lets-plot:lets-plot-batik") {
-        // See https://github.com/JetBrains/lets-plot/issues/471
-        exclude("org.jetbrains.kotlin", "kotlin-reflect")
-    }
-    implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm") {
-        // See https://github.com/JetBrains/lets-plot/issues/471
-        exclude("org.jetbrains.kotlin", "kotlin-reflect")
-    }
+    implementation("org.jetbrains.lets-plot:lets-plot-batik")
+    implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm")
     implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3") {
         because("Mean, DescriptiveStatistics")

From eedabdd6c0c8030ee8063a937652c1ce59a4a042 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 11 May 2023 16:20:17 +0300
Subject: [PATCH 0442/1037] feat: use ServiceLoader to find implementations
 instead of searching classes in jars (#5885)

ServiceLoader is Java standard approach for locating implementaitons,
and it allows pluggability without relying on a filesystem layout.

Fixes https://github.com/apache/jmeter/issues/5883
---
 build-logic/jvm/build.gradle.kts              |   3 +-
 .../kotlin/build-logic.autoservice.gradle.kts |  50 +++++++
 .../build-logic.java-library.gradle.kts       |   1 +
 .../main/kotlin/build-logic.java.gradle.kts   |   1 +
 .../kotlin/build-logic.jvm-library.gradle.kts |   3 +-
 .../main/kotlin/build-logic.kotlin.gradle.kts |   1 +
 build-logic/root-build/build.gradle.kts       |   1 +
 .../kotlin/build-logic.root-build.gradle.kts  |   1 +
 build.gradle.kts                              |   3 +-
 gradle.properties                             |   2 +
 settings.gradle.kts                           |   1 +
 src/bom-thirdparty/build.gradle.kts           |   2 +
 .../json/render/RenderAsJmesPathRenderer.java |   3 +
 .../json/render/RenderAsJsonRenderer.java     |   4 +
 .../ExportTransactionAndSamplerNames.java     |   6 +
 .../RenderAsBoundaryExtractor.java            |   3 +
 .../jmeter/visualizers/RenderAsCssJQuery.java |   3 +
 .../jmeter/visualizers/RenderAsDocument.java  |   3 +
 .../jmeter/visualizers/RenderAsHTML.java      |   3 +
 .../visualizers/RenderAsHTMLFormatted.java    |   3 +
 .../visualizers/RenderAsHTMLWithEmbedded.java |   3 +
 .../jmeter/visualizers/RenderAsJSON.java      |   3 +
 .../jmeter/visualizers/RenderAsRegexp.java    |   3 +
 .../jmeter/visualizers/RenderAsText.java      |   3 +
 .../jmeter/visualizers/RenderAsXML.java       |   3 +
 .../jmeter/visualizers/RenderAsXPath.java     |   3 +
 .../jmeter/visualizers/RenderAsXPath2.java    |   3 +
 .../jmeter/visualizers/RenderInBrowser.java   |   3 +
 .../jmeter/visualizers/RequestPanel.java      |  43 ++----
 .../jmeter/visualizers/RequestView.java       |   3 +
 .../jmeter/visualizers/RequestViewRaw.java    |   3 +
 .../jmeter/visualizers/ResultRenderer.java    |   2 +
 .../ViewResultsFullVisualizer.java            |  43 ++----
 .../AbstractBackendListenerClient.java        |   3 +
 .../backend/BackendListenerClient.java        |   2 +
 .../backend/BackendListenerGui.java           |  34 ++---
 .../GraphiteBackendListenerClient.java        |   4 +
 .../InfluxDBRawBackendListenerClient.java     |   3 +
 .../InfluxdbBackendListenerClient.java        |   4 +
 .../jmeter/engine/util/CompoundVariable.java  |  19 +--
 .../org/apache/jmeter/functions/Function.java |   6 +-
 .../apache/jmeter/gui/HtmlReportAction.java   |   7 +
 .../jmeter/gui/action/AboutCommand.java       |   3 +
 .../jmeter/gui/action/ActionRouter.java       |   1 +
 .../apache/jmeter/gui/action/AddParent.java   |   3 +
 .../action/AddThinkTimeBetweenEachStep.java   |   3 +
 .../apache/jmeter/gui/action/AddToTree.java   |   3 +
 .../gui/action/ApplyNamingConvention.java     |   3 +
 .../jmeter/gui/action/ChangeLanguage.java     |   3 +
 .../jmeter/gui/action/ChangeParent.java       |   3 +
 .../apache/jmeter/gui/action/CheckDirty.java  |   3 +
 .../org/apache/jmeter/gui/action/Clear.java   |   3 +
 .../org/apache/jmeter/gui/action/Close.java   |   3 +
 .../jmeter/gui/action/CollapseExpand.java     |   3 +
 .../gui/action/CollapseExpandTreeBranch.java  |   3 +
 .../gui/action/CompileJSR223TestElements.java |   6 +
 .../org/apache/jmeter/gui/action/Copy.java    |   3 +
 .../gui/action/CreateFunctionDialog.java      |   3 +
 .../org/apache/jmeter/gui/action/Cut.java     |   3 +
 .../apache/jmeter/gui/action/Duplicate.java   |   3 +
 .../apache/jmeter/gui/action/EditCommand.java |   3 +
 .../jmeter/gui/action/EnableComponent.java    |   3 +
 .../apache/jmeter/gui/action/ExitCommand.java |   3 +
 .../org/apache/jmeter/gui/action/Help.java    |   3 +
 .../org/apache/jmeter/gui/action/Load.java    |   2 +
 .../jmeter/gui/action/LoadRecentProject.java  |   3 +
 .../jmeter/gui/action/LogLevelCommand.java    |   3 +
 .../gui/action/LoggerPanelEnableDisable.java  |   3 +
 .../jmeter/gui/action/LookAndFeelCommand.java |   2 +
 .../org/apache/jmeter/gui/action/Move.java    |   3 +
 .../jmeter/gui/action/OpenLinkAction.java     |   3 +
 .../org/apache/jmeter/gui/action/Paste.java   |   3 +
 .../apache/jmeter/gui/action/RemoteStart.java |   3 +
 .../org/apache/jmeter/gui/action/Remove.java  |   3 +
 .../jmeter/gui/action/ResetSearchCommand.java |   3 +
 .../org/apache/jmeter/gui/action/Restart.java |   6 +
 .../jmeter/gui/action/RevertProject.java      |   3 +
 .../jmeter/gui/action/SSLManagerCommand.java  |   3 +
 .../org/apache/jmeter/gui/action/Save.java    |   3 +
 .../jmeter/gui/action/SaveBeforeRun.java      |   3 +
 .../jmeter/gui/action/SaveGraphics.java       |   3 +
 .../jmeter/gui/action/SchematicView.java      |   6 +
 .../jmeter/gui/action/SearchTreeCommand.java  |   3 +
 .../org/apache/jmeter/gui/action/Start.java   |   3 +
 .../jmeter/gui/action/StopStoppables.java     |   3 +
 .../jmeter/gui/action/TemplatesCommand.java   |   3 +
 .../apache/jmeter/gui/action/UndoCommand.java |   3 +
 .../org/apache/jmeter/gui/action/What.java    |   3 +
 .../apache/jmeter/gui/action/ZoomInOut.java   |   3 +
 .../apache/jmeter/gui/plugin/MenuCreator.java |   3 +
 .../apache/jmeter/gui/util/JMeterMenuBar.java |  47 ++----
 .../apache/jmeter/gui/util/MenuFactory.java   |   2 +
 .../RemoteThreadsLifeCycleListener.java       |   3 +
 .../threads/RemoteThreadsListenerImpl.java    |  38 ++---
 .../org/apache/jmeter/util/JMeterUtils.java   |  75 ++++++++++
 .../org/apache/jorphan/test/AllTests.java     |   2 +
 .../org/apache/jmeter/junit/JMeterTest.java   |   1 +
 .../jmeter/testbeans/gui/PackageTest.java     |   1 +
 .../jorphan/reflect/TestClassFinder.java      |  17 ++-
 .../apache/jmeter/functions/BeanShell.java    |   3 +
 .../org/apache/jmeter/functions/CSVRead.java  |   3 +
 .../apache/jmeter/functions/ChangeCase.java   |   3 +
 .../apache/jmeter/functions/CharFunction.java |   3 +
 .../functions/DateTimeConvertFunction.java    |   3 +
 .../functions/DigestEncodeFunction.java       |   3 +
 .../apache/jmeter/functions/EscapeHtml.java   |   3 +
 .../functions/EscapeOroRegexpChars.java       |   3 +
 .../apache/jmeter/functions/EscapeXml.java    |   3 +
 .../apache/jmeter/functions/EvalFunction.java |   3 +
 .../jmeter/functions/EvalVarFunction.java     |   3 +
 .../apache/jmeter/functions/FileToString.java |   3 +
 .../apache/jmeter/functions/FileWrapper.java  |   2 +
 .../org/apache/jmeter/functions/Groovy.java   |   3 +
 .../org/apache/jmeter/functions/IntSum.java   |   3 +
 .../jmeter/functions/IsPropDefined.java       |   3 +
 .../apache/jmeter/functions/IsVarDefined.java |   3 +
 .../jmeter/functions/IterationCounter.java    |   3 +
 .../apache/jmeter/functions/JavaScript.java   |   3 +
 .../jmeter/functions/Jexl2Function.java       |   3 +
 .../jmeter/functions/Jexl3Function.java       |   3 +
 .../apache/jmeter/functions/LogFunction.java  |   3 +
 .../apache/jmeter/functions/LogFunction2.java |   3 +
 .../org/apache/jmeter/functions/LongSum.java  |   3 +
 .../apache/jmeter/functions/MachineIP.java    |   3 +
 .../apache/jmeter/functions/MachineName.java  |   3 +
 .../org/apache/jmeter/functions/Property.java |   3 +
 .../apache/jmeter/functions/Property2.java    |   3 +
 .../org/apache/jmeter/functions/Random.java   |   3 +
 .../apache/jmeter/functions/RandomDate.java   |   2 +
 .../functions/RandomFromMultipleVars.java     |   3 +
 .../apache/jmeter/functions/RandomString.java |   3 +
 .../jmeter/functions/RegexFunction.java       |   3 +
 .../apache/jmeter/functions/SamplerName.java  |   3 +
 .../apache/jmeter/functions/SetProperty.java  |   3 +
 .../jmeter/functions/SplitFunction.java       |   3 +
 .../jmeter/functions/StringFromFile.java      |   3 +
 .../apache/jmeter/functions/StringToFile.java |   3 +
 .../apache/jmeter/functions/TestPlanName.java |   3 +
 .../jmeter/functions/ThreadGroupName.java     |   3 +
 .../apache/jmeter/functions/ThreadNumber.java |   3 +
 .../apache/jmeter/functions/TimeFunction.java |   3 +
 .../apache/jmeter/functions/TimeShift.java    |   2 +
 .../org/apache/jmeter/functions/UnEscape.java |   3 +
 .../apache/jmeter/functions/UnEscapeHtml.java |   3 +
 .../apache/jmeter/functions/UrlDecode.java    |   3 +
 .../apache/jmeter/functions/UrlEncode.java    |   3 +
 .../org/apache/jmeter/functions/Uuid.java     |   3 +
 .../org/apache/jmeter/functions/Variable.java |   3 +
 .../org/apache/jmeter/functions/XPath.java    |   3 +
 .../jmeter/functions/FunctionServicesTest.kt  |  43 ++++++
 .../apache/jorphan/reflect/ClassFinder.java   | 132 ++++++++++++++++-
 .../CollectServiceLoadExceptionHandler.java   |  40 +++++
 .../IgnoreServiceLoadExceptionHandler.java    |  27 ++++
 .../apache/jorphan/reflect/JMeterService.java |  39 +++++
 ...gAndIgnoreServiceLoadExceptionHandler.java |  54 +++++++
 .../RethrowServiceLoadExceptionHandler.java   |  28 ++++
 .../reflect/ServiceLoadExceptionHandler.java  |  36 +++++
 .../jorphan/reflect/ServiceLoadFailure.java   |  51 +++++++
 .../gui/action/ParseCurlCommandAction.java    |   7 +
 .../http/proxy/DefaultSamplerCreator.java     |   2 +
 .../protocol/http/proxy/SamplerCreator.java   |   2 +
 .../http/proxy/SamplerCreatorFactory.java     |  56 +++----
 .../sampler/AccessLogSamplerBeanInfo.java     | 138 +++++++++---------
 .../protocol/http/util/accesslog/Filter.java  |   2 +
 .../http/util/accesslog/LogFilter.java        |   3 +
 .../http/util/accesslog/LogParser.java        |   2 +
 .../accesslog/OrderPreservingLogParser.java   |   3 +
 .../http/util/accesslog/SessionFilter.java    |   3 +
 .../util/accesslog/SharedTCLogParser.java     |   3 +
 .../http/util/accesslog/TCLogParser.java      |   3 +
 .../http/visualizers/RequestViewHTTP.java     |   3 +
 .../java/config/gui/JavaConfigGui.java        |  29 ++--
 .../java/sampler/JavaSamplerClient.java       |   2 +
 .../jmeter/protocol/java/test/JavaTest.java   |   5 +-
 .../jmeter/protocol/java/test/SleepTest.java  |   4 +
 .../java/control/gui/JUnitTestSamplerGui.java |  12 +-
 src/test-services/build.gradle.kts            |  25 ++++
 .../jmeter/util/services/AbstractService.kt   |  25 ++++
 .../ServiceNotImplementingInterface.kt        |  25 ++++
 .../util/services/ServiceThrowingException.kt |  31 ++++
 .../services/ServiceWithPrivateConstructor.kt |  25 ++++
 .../jmeter/util/services/WorkableService.kt   |  31 ++++
 .../jmeter/util/services/loadServices.kt      |  32 ++++
 .../src/test/kotlin/ServiceLoaderTest.kt      |  98 +++++++++++++
 xdocs/changes.xml                             |   1 +
 xdocs/usermanual/jmeter_tutorial.xml          |  54 ++++++-
 186 files changed, 1558 insertions(+), 297 deletions(-)
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
 create mode 100644 src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/CollectServiceLoadExceptionHandler.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/IgnoreServiceLoadExceptionHandler.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/JMeterService.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/RethrowServiceLoadExceptionHandler.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadExceptionHandler.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadFailure.java
 create mode 100644 src/test-services/build.gradle.kts
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/AbstractService.kt
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceNotImplementingInterface.kt
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceThrowingException.kt
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceWithPrivateConstructor.kt
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/WorkableService.kt
 create mode 100644 src/test-services/src/main/kotlin/org/apache/jmeter/util/services/loadServices.kt
 create mode 100644 src/test-services/src/test/kotlin/ServiceLoaderTest.kt

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 0c8b9388a6c..7044d76d981 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
     api(projects.verification)
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.21")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
new file mode 100644
index 00000000000..532256faa93
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.github.vlsi.gradle.dsl.configureEach
+
+plugins {
+    id("java-library")
+}
+
+dependencies {
+    annotationProcessor("com.google.auto.service:auto-service")
+    compileOnlyApi("com.google.auto.service:auto-service-annotations")
+}
+
+tasks.configureEach<JavaCompile> {
+    // Verify @AutoService annotations
+    options.compilerArgs.add("-Averify=true")
+}
+
+plugins.withId("org.jetbrains.kotlin.jvm") {
+    apply(plugin = "org.jetbrains.kotlin.kapt")
+
+    dependencies {
+        "kapt"("com.google.auto.service:auto-service")
+        // Unfortunately, plugins.withId("..kapt") can't be used as kapt plugin adds configuration via plugins.withId
+        findProject(":src:bom-thirdparty")?.let {
+            "kapt"(platform(it))
+        }
+    }
+}
+
+tasks.configureEach<Jar> {
+    manifest {
+        attributes["JMeter-Skip-Class-Scanning"] = "true"
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
index 534f894dfc1..b2d6967d718 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java-library.gradle.kts
@@ -18,4 +18,5 @@
 plugins {
     id("build-logic.java")
     id("java-library")
+    id("build-logic.autoservice")
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 175c9740af3..3f4a60691fb 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -59,6 +59,7 @@ dependencies {
     }
     findProject(":src:bom-thirdparty")?.let{
         api(platform(it))
+        annotationProcessor(platform(it))
     }
 }
 
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
index cabe6e02820..7f5f0315fd0 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
@@ -16,8 +16,7 @@
  */
 
 plugins {
-    id("build-logic.java")
-    id("java-library")
+    id("build-logic.java-library")
 }
 
 if (file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory) {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 65cb342e6d1..59a63eb01d1 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -25,6 +25,7 @@ plugins {
     id("build-logic.test-base")
     id("com.github.autostyle")
     kotlin("jvm")
+    kotlin("kapt") apply false
 }
 
 dependencies {
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index a467ad083af..5e3d3e23bd8 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,4 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
 }
diff --git a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
index 2e75d5e448a..7fcb96ff8d9 100644
--- a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
+++ b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
@@ -26,6 +26,7 @@ plugins {
     id("com.github.vlsi.ide")
     id("org.nosphere.apache.rat")
     id("org.jetbrains.gradle.plugin.idea-ext")
+    kotlin("jvm") apply false
 }
 
 ide {
diff --git a/build.gradle.kts b/build.gradle.kts
index 91cb5261d7e..50ac4136f7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,6 +61,7 @@ val notPublishedProjects by extra {
         projects.src.release,
         projects.src.testkit,
         projects.src.testkitWiremock,
+        projects.src.testServices,
     ).mapTo(mutableSetOf()) { it.dependencyProject }
 }
 
@@ -86,7 +87,7 @@ publishedProjects.forEach {project ->
             throw IllegalStateException(
                 "Project ${project.path} is listed in publishedProjects, however it misses maven-publish plugin. " +
                     "Please add maven-publish plugin (e.g. replace build-logic.jvm-library with build-logic.jvm-published-library) or " +
-                    "move the project to the list of published ones"
+                    "move the project to the list of notPublishedProjects"
             )
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 3801fc003f3..eb14a438816 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,8 @@ org.gradle.parallel=true
 org.gradle.caching=true
 #org.gradle.caching.debug=true
 
+kapt.include.compile.classpath=false
+
 # See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
 # repository.apache.org does not yet support .sha256 and .sha512 checksums
 systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2537f530c18..307ffd7b29e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -76,6 +76,7 @@ include(
     "src:release",
     "src:testkit",
     "src:testkit-wiremock",
+    "src:test-services",
     "src:dist",
     "src:dist-check"
 )
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c7de1182025..3483b7c2c5d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -42,6 +42,8 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
+        api("com.google.auto.service:auto-service:1.0.1")
+        api("com.google.auto.service:auto-service-annotations:1.0.1")
         api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
         api("com.fasterxml.jackson.core:jackson-core:2.13.4")
         api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
index d2131a3350e..45e1241d3cc 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
@@ -19,6 +19,7 @@
 
 import org.apache.jmeter.extractor.json.jmespath.JMESPathCache;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.visualizers.ResultRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,11 +27,13 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.google.auto.service.AutoService;
 
 /**
  * Implement ResultsRender for JMES Path tester
  * @since 5.2
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsJmesPathRenderer extends AbstractRenderAsJsonRenderer {
     private static final Logger log = LoggerFactory.getLogger(RenderAsJmesPathRenderer.class);
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
index e7d856db82c..0aa1a01132c 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
@@ -21,13 +21,17 @@
 
 import org.apache.jmeter.extractor.json.jsonpath.JSONManager;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.visualizers.ResultRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implement ResultsRender for JSON Path tester
  * @since 3.0
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsJsonRenderer extends AbstractRenderAsJsonRenderer {
     private static final Logger log = LoggerFactory.getLogger(RenderAsJsonRenderer.class);
 
diff --git a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
index 093f2173919..cc988f7d9f7 100644
--- a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
+++ b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
@@ -53,10 +53,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Export transactions names for web report
  * @since 3.3
  */
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class ExportTransactionAndSamplerNames extends AbstractAction implements MenuCreator {
     private static final Logger log = LoggerFactory.getLogger(ExportTransactionAndSamplerNames.class);
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
index e48002e246f..236d2db7f33 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
@@ -41,9 +41,12 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implement ResultsRender for Boundary Extractor tester
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsBoundaryExtractor implements ResultRenderer, ActionListener {
 
     private static final String BOUNDARY_EXTRACTOR_TESTER_COMMAND = "boundary_extractor_tester"; // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
index e802246feab..aa0be670a02 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
@@ -49,10 +49,13 @@
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implement ResultsRender for CSS/JQuery tester
  * @since 2.10
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsCssJQuery implements ResultRenderer, ActionListener {
 
     private static final String CSSJQUEY_TESTER_COMMAND = "cssjquery_tester"; // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java
index d7fde8f6419..0bb01d437d0 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java
@@ -23,6 +23,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsDocument extends SamplerResultTab implements ResultRenderer {
 
     private static final Logger log = LoggerFactory.getLogger(RenderAsDocument.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
index 043e7bc9f9e..cd26262a158 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
@@ -33,6 +33,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsHTML extends SamplerResultTab implements ResultRenderer {
     private static final Logger log = LoggerFactory.getLogger(RenderAsHTML.class);
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
index cfbb7d208e2..66b2b84ab47 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
@@ -21,6 +21,9 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.jsoup.Jsoup;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsHTMLFormatted extends SamplerResultTab implements ResultRenderer {
 
     /** {@inheritDoc} */
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java
index d92f150120c..4fa67e05694 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java
@@ -20,6 +20,9 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsHTMLWithEmbedded extends RenderAsHTML
     implements ResultRenderer {
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
index b1550a754b0..b99d3d6c590 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
@@ -29,6 +29,9 @@
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsJSON extends SamplerResultTab implements ResultRenderer {
     private static final String TAB_SEPARATOR = "    "; //$NON-NLS-1$
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index 375d90299d5..01d8358e033 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -50,9 +50,12 @@
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implement ResultsRender for Regexp tester
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsRegexp implements ResultRenderer, ActionListener {
 
     private static final String REGEXP_TESTER_COMMAND = "regexp_tester"; // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java
index 34616fe9824..5d315677a52 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java
@@ -20,6 +20,9 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsText extends SamplerResultTab implements ResultRenderer {
 
     /** {@inheritDoc} */
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
index 5c8b6af25bc..beb976f2ad0 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
@@ -53,6 +53,9 @@
 import org.w3c.tidy.Tidy;
 import org.xml.sax.SAXException;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(ResultRenderer.class)
 public class RenderAsXML extends SamplerResultTab
     implements ResultRenderer {
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
index df39c62e71f..6058ce7ca3f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
@@ -59,10 +59,13 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
+import com.google.auto.service.AutoService;
+
 
 /**
  * Implement ResultsRender for XPath tester
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsXPath implements ResultRenderer, ActionListener {
 
     private static final Logger log = LoggerFactory.getLogger(RenderAsXPath.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
index e36484bf90f..42214a70afe 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
@@ -48,9 +48,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implement ResultsRender for XPath tester
  */
+@AutoService(ResultRenderer.class)
 public class RenderAsXPath2 implements ResultRenderer, ActionListener {
 
     private static final Logger log = LoggerFactory.getLogger(RenderAsXPath2.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
index 575313c359a..eab0bfd39ac 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
@@ -27,6 +27,8 @@
 import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
 
+import com.google.auto.service.AutoService;
+
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -43,6 +45,7 @@
  * {@link ResultRenderer} implementation that uses JAVAFX WebEngine to render as browser do
  * @since 3.2
  */
+@AutoService(ResultRenderer.class)
 public class RenderInBrowser extends SamplerResultTab implements ResultRenderer {
 
     private JFXPanel jfxPanel;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
index ac3a6a09e17..2b668a8ec39 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
@@ -18,11 +18,9 @@
 package org.apache.jmeter.visualizers;
 
 import java.awt.BorderLayout;
-import java.io.IOException;
 import java.util.ArrayDeque;
-import java.util.Collections;
 import java.util.Deque;
-import java.util.List;
+import java.util.ServiceLoader;
 
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
@@ -30,6 +28,7 @@
 
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,37 +51,23 @@ public class RequestPanel {
      */
     public RequestPanel() {
         listRequestView = new ArrayDeque<>();
-        List<String> classesToAdd = Collections.<String> emptyList();
-        try {
-            classesToAdd = JMeterUtils.findClassesThatExtend(RequestView.class);
-        } catch (IOException e1) {
-            // ignored
-        }
         String rawTab = JMeterUtils.getResString(RequestViewRaw.KEY_LABEL); // $NON-NLS-1$
-        Object rawObject = null;
-        for (String clazz : classesToAdd) {
-            try {
-                // Instantiate requestview classes
-                final RequestView requestView = Class.forName(clazz)
-                        .asSubclass(RequestView.class)
-                        .getDeclaredConstructor().newInstance();
-                if (rawTab.equals(requestView.getLabel())) {
-                    rawObject = requestView; // use later
-                } else {
-                    listRequestView.add(requestView);
-                }
-            }
-            catch (NoClassDefFoundError e) {
-                log.error("Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing",
-                        clazz, RequestView.class, e);
-            } catch (Exception e) {
-                log.error("Exception registering implementation: [{}] of interface: [{}], a jar is probably missing",
-                        clazz, RequestView.class, e);
+        RequestView rawObject = null;
+        for (RequestView requestView : JMeterUtils.loadServicesAndScanJars(
+                RequestView.class,
+                ServiceLoader.load(RequestView.class),
+                Thread.currentThread().getContextClassLoader(),
+                new LogAndIgnoreServiceLoadExceptionHandler(log)
+        )) {
+            if (rawTab.equals(requestView.getLabel())) {
+                rawObject = requestView; // use later
+            } else {
+                listRequestView.add(requestView);
             }
         }
         // place raw tab in first position (first tab)
         if (rawObject != null) {
-            listRequestView.addFirst((RequestView) rawObject);
+            listRequestView.addFirst(rawObject);
         }
 
         // Prepare the Request tabbed pane
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java
index 792f5e2ffcb..e84cc4c0388 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java
@@ -19,12 +19,15 @@
 
 import javax.swing.JPanel;
 
+import org.apache.jorphan.reflect.JMeterService;
+
 /**
  * Interface for request panel in View Results Tree
  * All classes which implements this interface is display
  * on bottom tab in request panel
  *
  */
+@JMeterService
 public interface RequestView {
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
index c721a152d55..b253e0381d7 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
@@ -30,10 +30,13 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.GuiUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * (historical) Panel to view request data
  *
  */
+@AutoService(RequestView.class)
 public class RequestViewRaw implements RequestView {
 
     // Used by Request Panel
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java
index 3f9e5f22b98..dba2ba3e580 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java
@@ -22,11 +22,13 @@
 import javax.swing.JTabbedPane;
 
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.reflect.JMeterService;
 
 
 /**
  * Interface to results render
  */
+@JMeterService
 public interface ResultRenderer {
 
     void clearData();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 4f44ca2219e..5ec83c5e5c6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -25,7 +25,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.io.IOException;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,6 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -73,6 +73,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
 import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.apache.jorphan.util.StringWrap;
 import org.apiguardian.api.API;
 import org.slf4j.Logger;
@@ -454,38 +455,24 @@ private Component createComboRender() {
         selectRenderPanel.addActionListener(this);
 
         // if no results render in jmeter.properties, load Standard (default)
-        List<String> classesToAdd = Collections.<String>emptyList();
-        try {
-            classesToAdd = JMeterUtils.findClassesThatExtend(ResultRenderer.class);
-        } catch (IOException e1) {
-            // ignored
-        }
         String defaultRenderer = expandToClassname(".RenderAsText"); // $NON-NLS-1$
         if (VIEWERS_ORDER.length() > 0) {
             defaultRenderer = expandToClassname(VIEWERS_ORDER.split(",", 2)[0]);
         }
-        Object defaultObject = null;
-        Map<String, ResultRenderer> map = new HashMap<>(classesToAdd.size());
-        for (String clazz : classesToAdd) {
-            try {
-                // Instantiate render classes
-                final ResultRenderer renderer = Class.forName(clazz)
-                        .asSubclass(ResultRenderer.class)
-                        .getDeclaredConstructor().newInstance();
-                if (defaultRenderer.equals(clazz)) {
-                    defaultObject=renderer;
-                }
-                renderer.setBackgroundColor(getBackground());
-                map.put(renderer.getClass().getName(), renderer);
-            } catch (NoClassDefFoundError e) { // NOSONAR See bug 60583
-                if (e.getMessage() != null && e.getMessage().contains("javafx")) {
-                    log.info("Add JavaFX to your Java installation if you want to use renderer: {}", clazz);
-                } else {
-                    log.warn("Error loading result renderer: {}", clazz, e);
-                }
-            } catch (Exception e) {
-                log.warn("Error loading result renderer: {}", clazz, e);
+        ResultRenderer defaultObject = null;
+        Map<String, ResultRenderer> map = new HashMap<>();
+        for (ResultRenderer renderer : JMeterUtils.loadServicesAndScanJars(
+                ResultRenderer.class,
+                ServiceLoader.load(ResultRenderer.class),
+                Thread.currentThread().getContextClassLoader(),
+                new LogAndIgnoreServiceLoadExceptionHandler(log)
+        )) {
+            // Instantiate render classes
+            if (defaultRenderer.equals(renderer.getClass().getName())) {
+                defaultObject = renderer;
             }
+            renderer.setBackgroundColor(getBackground());
+            map.put(renderer.getClass().getName(), renderer);
         }
         if (VIEWERS_ORDER.length() > 0) {
             Arrays.stream(VIEWERS_ORDER.split(","))
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
index ec0a870e431..79cdd58a6ec 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
@@ -24,6 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * An abstract implementation of the BackendListenerClient interface. This
  * implementation provides default implementations of most of the methods in the
@@ -49,6 +51,7 @@
  * @see BackendListener#sampleOccurred(org.apache.jmeter.samplers.SampleEvent)
  * @since 2.13
  */
+@AutoService(BackendListenerClient.class)
 public abstract class AbstractBackendListenerClient implements BackendListenerClient {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBackendListenerClient.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
index e3aee0aa100..b8ab2dc4e79 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
@@ -21,6 +21,7 @@
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * This interface defines the interactions between the {@link BackendListener}
@@ -63,6 +64,7 @@
  *
  * @since 2.13
  */
+@JMeterService
 public interface BackendListenerClient {
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
index dc98715df5f..2e79427ed17 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
@@ -20,11 +20,10 @@
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import javax.swing.ComboBoxModel;
@@ -33,7 +32,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
@@ -45,7 +43,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.gui.AbstractListenerGui;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +75,6 @@ public class BackendListenerGui extends AbstractListenerGui implements ActionLis
     /** The current className of the Backend listener **/
     private String className;
 
-
     /**
      * Create a new BackendListenerGui as a standalone component.
      */
@@ -117,25 +114,18 @@ private void init() {// called from ctor, so must not be overridable
      * @return a panel containing the relevant components
      */
     private JPanel createClassnamePanel() {
-        List<String> possibleClasses = new ArrayList<>();
-
-        try {
-            // Find all the classes which implement the BackendListenerClient
-            // interface.
-            possibleClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
-                    new Class[] { BackendListenerClient.class });
-
-            // Remove the BackendListener class from the list since it only
-            // implements the interface for error conditions.
-
-            possibleClasses.remove(BackendListener.class.getName() + "$ErrorBackendListenerClient");
-        } catch (Exception e) {
-            log.debug("Exception getting interfaces.", e);
-        }
-
         JLabel label = new JLabel(JMeterUtils.getResString("backend_listener_classname")); // $NON-NLS-1$
 
-        classnameCombo = new JComboBox<>(possibleClasses.toArray(ArrayUtils.EMPTY_STRING_ARRAY));
+        String[] listenerClasses = JMeterUtils.loadServicesAndScanJars(
+                        BackendListenerClient.class,
+                        ServiceLoader.load(BackendListenerClient.class),
+                        Thread.currentThread().getContextClassLoader(),
+                        new LogAndIgnoreServiceLoadExceptionHandler(log)
+                ).stream()
+                .map(s -> s.getClass().getName())
+                .sorted()
+                .toArray(String[]::new);
+        classnameCombo = new JComboBox<>(listenerClasses);
         classnameCombo.addActionListener(this);
         classnameCombo.setEditable(false);
         label.setLabelFor(classnameCombo);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
index 16d8b4a7dbc..36ad35ec000 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
@@ -37,17 +37,21 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
+import org.apache.jmeter.visualizers.backend.BackendListenerClient;
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
 import org.apache.jmeter.visualizers.backend.SamplerMetric;
 import org.apache.jmeter.visualizers.backend.UserMetric;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Graphite based Listener using Pickle Protocol
  * @see <a href="http://graphite.readthedocs.org/en/latest/overview.html">Graphite Overview</a>
  * @since 2.13
  */
+@AutoService(BackendListenerClient.class)
 public class GraphiteBackendListenerClient extends AbstractBackendListenerClient implements Runnable {
 
     //+ Argument names
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
index f959691f177..57be7a8a39f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
@@ -29,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implementation of {@link BackendListenerClient} to write the response times
  * of every sample to InfluxDB. If more "raw" information is required in InfluxDB
@@ -38,6 +40,7 @@
  *
  * @since 5.3
  */
+@AutoService(BackendListenerClient.class)
 public class InfluxDBRawBackendListenerClient implements BackendListenerClient {
 
     private static final Logger log = LoggerFactory.getLogger(InfluxDBRawBackendListenerClient.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
index 0dc8d4f7fc8..11a8739b8c9 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
@@ -36,6 +36,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
+import org.apache.jmeter.visualizers.backend.BackendListenerClient;
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
 import org.apache.jmeter.visualizers.backend.ErrorMetric;
 import org.apache.jmeter.visualizers.backend.SamplerMetric;
@@ -43,12 +44,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implementation of {@link AbstractBackendListenerClient} to write to InfluxDB
  * using a custom schema; since JMeter 5.2, this also support the InfluxDB v2.
  *
  * @since 3.2
  */
+@AutoService(BackendListenerClient.class)
 public class InfluxdbBackendListenerClient extends AbstractBackendListenerClient implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(InfluxdbBackendListenerClient.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
index 1059d4675da..b298fde061d 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 
 import org.apache.jmeter.functions.Function;
 import org.apache.jmeter.functions.InvalidVariableException;
@@ -30,7 +31,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,15 +70,15 @@ public class CompoundVariable implements Function {
                 log.info("Note: Function class names must not contain the string: '{}'", notContain);
             }
 
-            List<String> classes = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
-                    new Class[] { Function.class }, true, contain, notContain);
-            for (String clazzName : classes) {
-                Function tempFunc = Class.forName(clazzName)
-                        .asSubclass(Function.class)
-                        .getDeclaredConstructor().newInstance();
-                String referenceKey = tempFunc.getReferenceKey();
+            for (Function function : JMeterUtils.loadServicesAndScanJars(
+                    Function.class,
+                    ServiceLoader.load(Function.class),
+                    Thread.currentThread().getContextClassLoader(),
+                    new LogAndIgnoreServiceLoadExceptionHandler(log)
+            )) {
+                String referenceKey = function.getReferenceKey();
                 if (referenceKey.length() > 0) { // ignore self
-                    functions.put(referenceKey, tempFunc.getClass());
+                    functions.put(referenceKey, function.getClass());
                 }
             }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/Function.java b/src/core/src/main/java/org/apache/jmeter/functions/Function.java
index ff27cd5595a..fb4d759d108 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/Function.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/Function.java
@@ -23,18 +23,20 @@
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * Methods that a function must implement
  */
+@JMeterService
 public interface Function {
     /**
      * Given the previous SampleResult and the current Sampler, return a string
      * to use as a replacement value for the function call. Assume
      * "setParameter" was previously called.
      *
-     * This method must be threadsafe - multiple threads will be using the same
-     * object.
+     * <p>This method must be thread-safe - multiple threads will be using the same
+     * object.</p>
      * @param previousResult The previous {@link SampleResult}
      * @param currentSampler The current {@link Sampler}
      * @return The replacement value, which was generated by the function
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
index cecd111bdb5..42e1e175ef2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java
@@ -30,9 +30,16 @@
 import org.apache.jmeter.gui.action.AbstractAction;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
+import org.apache.jmeter.gui.action.Command;
 import org.apache.jmeter.gui.plugin.MenuCreator;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class HtmlReportAction extends AbstractAction implements MenuCreator {
     private static final Set<String> commands = new HashSet<>();
     private HtmlReportUI htmlReportPanel;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
index d2003800788..4be2b383893 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java
@@ -42,10 +42,13 @@
 import org.apache.jmeter.gui.util.EscapeDialog;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * About Command. It may be extended in the future to add a list of installed
  * protocols, config options, etc.
  */
+@AutoService(Command.class)
 public class AboutCommand extends AbstractAction {
     private static final Set<String> commandSet;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
index 53110bd3a94..49b66206c14 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
@@ -309,6 +309,7 @@ private static void actionPerformed(Class<? extends Command> action, ActionEvent
         }
     }
 
+    @SuppressWarnings("deprecation")
     private static List<String> findClassesThatExtend(String className, String excluding, String[] searchPath) throws IOException, ClassNotFoundException {
 
         return ClassFinder.findClassesThatExtend(
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
index 32dad85108c..4e8b9b8b420 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java
@@ -28,9 +28,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Add Parent menu command
  */
+@AutoService(Command.class)
 public class AddParent extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(AddParent.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
index b7966e79469..44ec34fc653 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
@@ -33,10 +33,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Add ThinkTime (TestAction + UniformRandomTimer)
  * @since 3.2
  */
+@AutoService(Command.class)
 public class AddThinkTimeBetweenEachStep extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(AddThinkTimeBetweenEachStep.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java
index 8de19b98042..ecd423060c3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java
@@ -32,6 +32,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(Command.class)
 public class AddToTree extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(AddToTree.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
index 2cda16bb13d..01ea85f2692 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java
@@ -32,10 +32,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Allows to apply naming convention on nodes
  * @since 3.2
  */
+@AutoService(Command.class)
 public class ApplyNamingConvention extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(ApplyNamingConvention.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java
index 1cb28073816..2d72b1f041f 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java
@@ -28,9 +28,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Change language
  */
+@AutoService(Command.class)
 public class ChangeLanguage extends AbstractActionWithNoRunningTest {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
index 3396c51fed7..8c9729416a9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
@@ -38,9 +38,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Allows to change Controller implementation
  */
+@AutoService(Command.class)
 public class ChangeParent extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(ChangeParent.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java
index 3ab37b81e55..eb3885d32cd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java
@@ -33,10 +33,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Check if the TestPlan has been changed since it was last saved
  *
  */
+@AutoService(Command.class)
 public class CheckDirty extends AbstractAction implements HashTreeTraverser, ActionListener {
     private static final Logger log = LoggerFactory.getLogger(CheckDirty.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
index 1f6964d0b87..a3f3a3998b7 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
@@ -28,12 +28,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Handles the following actions:
  * - Clear (Data)
  * - Clear All (Data)
  * - Reset (Clear GUI)
  */
+@AutoService(Command.class)
 public class Clear extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(Clear.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Close.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Close.java
index 405f39bb8b9..a0c8348ed4c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Close.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Close.java
@@ -29,11 +29,14 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * This command clears the existing test plan, allowing the creation of a New
  * test plan.
  *
  */
+@AutoService(Command.class)
 public class Close extends AbstractActionWithNoRunningTest {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java
index 1008ef763ca..72da59d65fa 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java
@@ -25,10 +25,13 @@
 
 import org.apache.jmeter.gui.GuiPackage;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Processes the Collapse All and Expand All options.
  *
  */
+@AutoService(Command.class)
 public class CollapseExpand extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
index a70509d6faf..2b7af0730c5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java
@@ -30,9 +30,12 @@
 import org.apache.jmeter.gui.tree.JMeterTreeListener;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Processes the collapse and expand of a tree branch
  */
+@AutoService(Command.class)
 public class CollapseExpandTreeBranch extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
index f2dd30e9854..7539d09d6d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
@@ -38,10 +38,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Compile JSR223 Test Element that use Compilable script language
  * @since 5.1
  */
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class CompileJSR223TestElements extends AbstractAction implements MenuCreator {
     private static final Logger log = LoggerFactory.getLogger(CompileJSR223TestElements.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
index 96165d07d74..3979512efe2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
@@ -37,9 +37,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Copy menu command
  */
+@AutoService(Command.class)
 public class Copy extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(Copy.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java
index 371a7e15a25..5e4d43a6f0a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java
@@ -23,6 +23,9 @@
 
 import org.apache.jmeter.functions.gui.FunctionHelper;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(Command.class)
 public class CreateFunctionDialog extends AbstractAction {
 
     private static final Set<String> commands;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java
index 43e2ffbb09b..a5a8f201a3b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java
@@ -24,9 +24,12 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Cut menu item command
  */
+@AutoService(Command.class)
 public class Cut extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
index 683a4d8495e..996cc149e8d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
@@ -26,9 +26,12 @@
 import org.apache.jmeter.gui.tree.JMeterTreeModel;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Duplicate menu command
  */
+@AutoService(Command.class)
 public class Duplicate extends AbstractAction {
 
     private static final HashSet<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java
index 705286de042..a6e8c8025e9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java
@@ -25,9 +25,12 @@
 import org.apache.jmeter.gui.JMeterGUIComponent;
 import org.apache.jorphan.gui.ui.TextComponentUI;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Edit menu item.
  */
+@AutoService(Command.class)
 public class EditCommand extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
index 65f44071877..e5b9a225ed3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
@@ -26,9 +26,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Enable menu item.
  */
+@AutoService(Command.class)
 public class EnableComponent extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(EnableComponent.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java
index e9478721f06..3868e3c844d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java
@@ -26,6 +26,9 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(Command.class)
 public class ExitCommand extends AbstractActionWithNoRunningTest {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
index ab39e349ee8..78f9767b5a8 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
@@ -35,9 +35,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Help menu item.
  */
+@AutoService(Command.class)
 public class Help extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(Help.class);
     private static final boolean USE_LOCAL_HELP =
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java
index 0755b855b63..10b997d141d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java
@@ -42,6 +42,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.StreamException;
 
@@ -49,6 +50,7 @@
  * Handles the Open (load a new file) and Merge commands.
  *
  */
+@AutoService(Command.class)
 public class Load extends AbstractActionWithNoRunningTest {
     private static final Logger log = LoggerFactory.getLogger(Load.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
index 9b684ea07cd..0b394a749b4 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
@@ -34,10 +34,13 @@
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Handles the loading of recent files, and also the content and
  * visibility of menu items for loading the recent files
  */
+@AutoService(Command.class)
 public class LoadRecentProject extends Load {
     /** Prefix for the user preference key */
     private static final String USER_PREFS_KEY = "recent_file_"; //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java
index a21473f19c6..b00337f774a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java
@@ -29,10 +29,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements log level setting menu item.
  * @since 3.2
  */
+@AutoService(Command.class)
 public class LogLevelCommand extends AbstractAction {
 
     private static final Logger log = LoggerFactory.getLogger(LogLevelCommand.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
index 7b7c30ee42c..f3b3c3e1d97 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
@@ -26,10 +26,13 @@
 
 import org.apache.jmeter.gui.GuiPackage;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Hide / unhide LoggerPanel.
  *
  */
+@AutoService(Command.class)
 public class LoggerPanelEnableDisable extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 260c59f4f83..0821b8a05d3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -40,10 +40,12 @@
 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.theme.DarculaTheme;
 import com.github.weisj.darklaf.theme.Theme;
+import com.google.auto.service.AutoService;
 
 /**
  * Implements the Look and Feel menu item.
  */
+@AutoService(Command.class)
 public class LookAndFeelCommand extends AbstractAction {
     private static final String JMETER_LAF = "jmeter.laf"; // $NON-NLS-1$
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
index 90350e2a31b..d39bde84a55 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java
@@ -33,10 +33,13 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Move a node up/down/left/right
  *
  */
+@AutoService(Command.class)
 public class Move extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
index 418b1b0d1b2..be6ea6c430d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java
@@ -29,6 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(Command.class)
 public class OpenLinkAction extends AbstractAction {
 
     private static final Logger log = LoggerFactory.getLogger(OpenLinkAction.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
index 6506d3faa5d..cc6f6703288 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java
@@ -33,9 +33,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Places a copied JMeterTreeNode under the selected node.
  */
+@AutoService(Command.class)
 public class Paste extends AbstractAction {
 
     private static final Logger log = LoggerFactory.getLogger(Paste.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
index bb7e67148d1..7ca26794da8 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java
@@ -33,6 +33,9 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(Command.class)
 public class RemoteStart extends AbstractAction {
 
     private static final String LOCAL_HOST = "127.0.0.1"; // NOSONAR $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java
index 3e18f68e88a..d3a95d85172 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java
@@ -29,9 +29,12 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Implements the Remove menu item.
  */
+@AutoService(Command.class)
 public class Remove extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java
index d10be439acd..32ae567bf0c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java
@@ -26,9 +26,12 @@
 import org.apache.jmeter.gui.Searchable;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Reset Search
  */
+@AutoService(Command.class)
 public class ResetSearchCommand extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
index 2b49b694988..e2fcc1d39fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
@@ -39,11 +39,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Restart JMeter
  * Based on https://dzone.com/articles/programmatically-restart-java
  * @since 5.0
  */
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class Restart extends AbstractActionWithNoRunningTest implements MenuCreator {
     private static final Logger log = LoggerFactory.getLogger(Restart.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java
index 23f5e5bc307..f05ebba94b6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java
@@ -27,10 +27,13 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Handles the Revert Project command.
  *
  */
+@AutoService(Command.class)
 public class RevertProject extends AbstractActionWithNoRunningTest {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
index e3a1e47d5a1..9b0ec71ec37 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java
@@ -32,6 +32,8 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.SSLManager;
 
+import com.google.auto.service.AutoService;
+
 //
 /**
  * SSL Manager Command. The SSL Manager provides a mechanism to change your
@@ -52,6 +54,7 @@
  * already defined via the property.
  *
  */
+@AutoService(Command.class)
 public class SSLManagerCommand extends AbstractAction {
     private static final Set<String> commandSet;
     static {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index 9b6c6f42368..32e3846cac3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -56,12 +56,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Save the current test plan; implements:
  * Save
  * Save TestPlan As
  * Save (Selection) As
  */
+@AutoService(Command.class)
 public class Save extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(Save.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java
index ac4e1929f06..39191e52962 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java
@@ -23,11 +23,14 @@
 
 import org.apache.jmeter.gui.GuiPackage;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Save Before Run Action To save test plan before GUI execution
  *
  * @since 4.0
  */
+@AutoService(Command.class)
 public class SaveBeforeRun extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
index 481809c44ee..c73cabefc3d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
@@ -34,6 +34,8 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.Printable;
 
+import com.google.auto.service.AutoService;
+
 /**
  * SaveGraphics action is meant to be a generic reusable Action. The class will
  * use GUIPackage to get the current gui. Once it does, it checks to see if the
@@ -42,6 +44,7 @@
  * file if no extension is provided. If either .png or .tif is in the filename,
  * it will call SaveGraphicsService to save in the format.
  */
+@AutoService(Command.class)
 public class SaveGraphics extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
index 33ec59f9442..8b0f1c9b645 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
@@ -47,10 +47,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Schematic view of Test Plan
  * @since 5.1
  */
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class SchematicView extends AbstractAction implements MenuCreator {
     private static final Logger log = LoggerFactory.getLogger(SchematicView.class);
     private static final String DEFAULT_XSL_FILE =
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
index 91f0c664527..0661c17a63f 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
@@ -23,10 +23,13 @@
 
 import javax.swing.JFrame;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Search nodes for a text
  * TODO Enhance search dialog to select kind of nodes ....
  */
+@AutoService(Command.class)
 public class SearchTreeCommand extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
index fee1a4baee5..b31d1f3d734 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
@@ -45,6 +45,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Set of Actions to:
  * <ul>
@@ -57,6 +59,7 @@
  *      <li>Validate a set of Thread Groups with/without sleeping on the timers depending on jmeter properties</li>
  * </ul>
  */
+@AutoService(Command.class)
 public class Start extends AbstractAction {
 
     private static final Logger log = LoggerFactory.getLogger(Start.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java b/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
index c92b6a09169..f4f5ff60a6e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
@@ -26,10 +26,13 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.Stoppable;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Stops stopables (Proxy, Mirror)
  * @since 2.5.1
  */
+@AutoService(Command.class)
 public class StopStoppables extends AbstractAction implements ActionListener {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java
index 4896ae4e2a6..58b6c58b264 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java
@@ -21,10 +21,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Open Templates
  * @since 2.10
  */
+@AutoService(Command.class)
 public class TemplatesCommand extends AbstractActionWithNoRunningTest {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java
index a4a56f66375..fdae2d28cec 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java
@@ -26,10 +26,13 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jorphan.collections.HashTree;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Menu command to serve Undo/Redo
  * @since 2.12
  */
+@AutoService(Command.class)
 public class UndoCommand extends AbstractAction {
 
     private static final Set<String> commands = new HashSet<>();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/What.java b/src/core/src/main/java/org/apache/jmeter/gui/action/What.java
index 1d202e30c29..08384fc606a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/What.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/What.java
@@ -35,6 +35,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  *
  * Debug class to show details of the currently selected object
@@ -43,6 +45,7 @@
  * Also enables/disables debug for the test element.
  *
  */
+@AutoService(Command.class)
 public class What extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(What.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java
index a6b496fe723..7209bfe7402 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java
@@ -24,10 +24,13 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JMeterUIDefaults;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Zoom IN/OUT
  * @since 3.2
  */
+@AutoService(Command.class)
 public class ZoomInOut extends AbstractAction {
     private static final Set<String> commands = new HashSet<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java b/src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java
index c4b902df6c9..3d03fed1e17 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java
@@ -21,9 +21,12 @@
 import javax.swing.JMenuItem;
 import javax.swing.MenuElement;
 
+import org.apache.jorphan.reflect.JMeterService;
+
 /**
  * @since 2.10
  */
+@JMeterService
 public interface MenuCreator {
     enum MENU_LOCATION {
         FILE,
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index 5072aa31ada..cef9cd26901 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -19,14 +19,13 @@
 
 import java.awt.Component;
 import java.awt.event.KeyEvent;
-import java.io.IOException;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.ServiceLoader;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBoxMenuItem;
@@ -54,7 +53,7 @@
 import org.apache.jmeter.util.LocaleChangeEvent;
 import org.apache.jmeter.util.LocaleChangeListener;
 import org.apache.jmeter.util.SSLManager;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.logging.log4j.Level;
 import org.slf4j.Logger;
@@ -92,7 +91,13 @@ public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener {
     private JMenu remoteExit;
     private final Collection<JMenuItem> remoteEngineExit;
     private JMenu searchMenu;
-    private List<MenuCreator> menuCreators;
+    private final Collection<MenuCreator> menuCreators =
+            JMeterUtils.loadServicesAndScanJars(
+                    MenuCreator.class,
+                    ServiceLoader.load(MenuCreator.class),
+                    Thread.currentThread().getContextClassLoader(),
+                    new LogAndIgnoreServiceLoadExceptionHandler(log)
+            );
 
     public static final String SYSTEM_LAF = "System"; // $NON-NLS-1$
     public static final String CROSS_PLATFORM_LAF = "CrossPlatform"; // $NON-NLS-1$
@@ -192,9 +197,6 @@ public void setEditAddEnabled(boolean enabled) {
      * should be defined in a file somewhere, but that is for later.
      */
     public void createMenuBar() {
-
-        this.menuCreators = findMenuCreators();
-
         makeFileMenu();
         makeEditMenu();
         makeRunMenu();
@@ -217,35 +219,6 @@ public void createMenuBar() {
         this.add(helpMenu);
     }
 
-    private static List<MenuCreator> findMenuCreators() {
-        List<MenuCreator> creators = new ArrayList<>();
-        try {
-            List<String> listClasses = ClassFinder.findClassesThatExtend(
-                    JMeterUtils.getSearchPaths(),
-                    new Class[] {MenuCreator.class });
-            for (String strClassName : listClasses) {
-                try {
-                    log.debug("Loading menu creator class: {}", strClassName);
-                    Class<?> commandClass = Class.forName(strClassName);
-                    if (!Modifier.isAbstract(commandClass.getModifiers())) {
-                        log.debug("Instantiating: {}", commandClass);
-                        MenuCreator creator = (MenuCreator) commandClass.getDeclaredConstructor().newInstance();
-                        creators.add(creator);
-                    }
-                } catch (NoClassDefFoundError e) {
-                    log.error("Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing",
-                            strClassName, MenuCreator.class, e);
-                } catch (Exception e) {
-                    log.error("Exception registering implementation: [{}] of interface: [{}], a jar is probably missing",
-                            strClassName, MenuCreator.class, e);
-                }
-            }
-        } catch (IOException e) {
-            log.error("Exception finding implementations of {}", MenuCreator.class, e);
-        }
-        return creators;
-    }
-
     private void makeHelpMenu() {
         helpMenu = makeMenuRes("help",'H'); //$NON-NLS-1$
 
@@ -590,7 +563,7 @@ private void makeSearchMenu() {
      * @param menuCreators
      * @param location
      */
-    private static void addPluginsMenuItems(JMenu menu, List<MenuCreator> menuCreators, MENU_LOCATION location) {
+    private static void addPluginsMenuItems(JMenu menu, Collection<MenuCreator> menuCreators, MENU_LOCATION location) {
         for (MenuCreator menuCreator : menuCreators) {
             JMenuItem[] menuItems = menuCreator.getMenuItemsAtLocation(location);
             if (menuItems.length != 0) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
index 4aafa803415..bc84feb9167 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
@@ -124,6 +124,8 @@ private static Set<String> classesToSkip() {
     private static void initializeMenus(
             Map<String, List<MenuInfo>> menus, Set<String> elementsToSkip) {
         try {
+            // TODO: migrate to ServiceLoader or something else
+            @SuppressWarnings("deprecation")
             List<String> guiClasses = ClassFinder
                     .findClassesThatExtend(
                             JMeterUtils.getSearchPaths(),
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java
index f2c8d99012d..83dd5b71ba5 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java
@@ -17,10 +17,13 @@
 
 package org.apache.jmeter.threads;
 
+import org.apache.jorphan.reflect.JMeterService;
+
 /**
  * Interface notified when number of active threads changes
  * @since 2.10
  */
+@JMeterService
 public interface RemoteThreadsLifeCycleListener {
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
index adb0f593a49..058702827ae 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
@@ -17,18 +17,16 @@
 
 package org.apache.jmeter.threads;
 
-import java.io.IOException;
-import java.lang.reflect.Modifier;
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
+import java.util.ServiceLoader;
 
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.rmi.RmiUtils;
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +37,14 @@
 public class RemoteThreadsListenerImpl extends UnicastRemoteObject implements
         RemoteThreadsListener, ThreadListener {
     private static final Logger log = LoggerFactory.getLogger(RemoteThreadsListenerImpl.class);
-    private final List<RemoteThreadsLifeCycleListener> listeners = new ArrayList<>();
+
+    private final Collection<RemoteThreadsLifeCycleListener> listeners =
+            JMeterUtils.loadServicesAndScanJars(
+                    RemoteThreadsLifeCycleListener.class,
+                    ServiceLoader.load(RemoteThreadsLifeCycleListener.class),
+                    Thread.currentThread().getContextClassLoader(),
+                    new LogAndIgnoreServiceLoadExceptionHandler(log)
+            );
 
     /**
      *
@@ -56,27 +61,6 @@ public class RemoteThreadsListenerImpl extends UnicastRemoteObject implements
      */
     public RemoteThreadsListenerImpl() throws RemoteException {
         super(DEFAULT_LOCAL_PORT, RmiUtils.createClientSocketFactory(), RmiUtils.createServerSocketFactory());
-        try {
-            List<String> listClasses = ClassFinder.findClassesThatExtend(
-                    JMeterUtils.getSearchPaths(),
-                    new Class[] {RemoteThreadsLifeCycleListener.class });
-            for (String strClassName : listClasses) {
-                try {
-                    log.debug("Loading class: {}", strClassName);
-                    Class<?> commandClass = Class.forName(strClassName);
-                    if (!Modifier.isAbstract(commandClass.getModifiers())) {
-                        log.debug("Instantiating: {}", commandClass);
-                        RemoteThreadsLifeCycleListener listener = (RemoteThreadsLifeCycleListener) commandClass.getDeclaredConstructor().newInstance();
-                        listeners.add(listener);
-                    }
-                } catch (Exception e) {
-                    log.error("Exception registering {} with implementation: {}", RemoteThreadsLifeCycleListener.class,
-                            strClassName, e);
-                }
-            }
-        } catch (IOException e) {
-            log.error("Exception finding implementations of {}", RemoteThreadsLifeCycleListener.class, e);
-        }
     }
 
     private static int addOffset(int port, int offset) {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 3a8408bb2a7..de46f1b6841 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -27,19 +27,25 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.ResourceBundle;
+import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
@@ -59,6 +65,7 @@
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JMeterUIDefaults;
 import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.ServiceLoadExceptionHandler;
 import org.apache.jorphan.test.UnitTestManager;
 import org.apache.jorphan.util.JMeterError;
 import org.apache.jorphan.util.JOrphanUtils;
@@ -316,6 +323,71 @@ public void initializeProperties(String file) {
         getProperties(file);
     }
 
+    /**
+     * Loads services implementing a given interface and scans JMeter search path for the implementations.
+     * This is a transition replacement for {@link ClassFinder}, and JMeter would migrate to {@link ServiceLoader}-only
+     * lookup in the future.
+     * <p>Note: it is not always safe to cache the result as {@code search_paths} property might change over time</p>
+     *
+     * @param service interface that services should extend.
+     * @param serviceLoader ServiceLoader to fetch services.
+     * @param classLoader classLoader to use when searching for classes on the search path.
+     * @param exceptionHandler exception handler to use for services that fail to load.
+     * @return collection of services that load successfully
+     * @param <S> type of service (class or interface)
+     */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    public static <S> Collection<S> loadServicesAndScanJars(
+            @SuppressWarnings("BoundedWildcard") Class<S> service,
+            ServiceLoader<S> serviceLoader,
+            ClassLoader classLoader,
+            ServiceLoadExceptionHandler<? super S> exceptionHandler
+    ) {
+        Collection<S> services = ClassFinder.loadServices(service, serviceLoader, exceptionHandler);
+
+        List<String> classesFromJars;
+        try (ClassFinder.Closeable ignored = ClassFinder.skipJarsWithJmeterSkipClassScanningAttribute()) {
+            classesFromJars = findClassesThatExtend(service);
+        } catch (IOException e) {
+            log.warn("Unable to lookup {} with ClassFinder.findClassesThatExtend. " +
+                    "Will use only results from ServiceLoader ({} items found)", service, services.size(), e);
+            return services;
+        }
+
+        if (classesFromJars.isEmpty()) {
+            return services;
+        }
+
+        Set<String> loadedClasses = new HashSet<>((int) (services.size() / 0.75f) + 1);
+        for (S s : services) {
+            loadedClasses.add(s.getClass().getName());
+        }
+
+        List<S> result = new ArrayList<>(services.size() + classesFromJars.size());
+        result.addAll(services);
+        for (String className : classesFromJars) {
+            // Ignore classes that we loaded previously (e.g. with a ServiceLoader)
+            if (!loadedClasses.add(className)) {
+                continue;
+            }
+            try {
+                Class<? extends S> klass = Class.forName(className, false, classLoader)
+                        .asSubclass(service);
+                if (!Modifier.isAbstract(klass.getModifiers())) {
+                    continue;
+                }
+                result.add(klass.getDeclaredConstructor().newInstance());
+            } catch (Throwable e) {
+                if (e instanceof InvocationTargetException) {
+                    //noinspection AssignmentToCatchBlockParameter
+                    e = e.getCause();
+                }
+                exceptionHandler.handle(service, className, e);
+            }
+        }
+        return result;
+    }
+
     /**
      * Convenience method for
      * {@link ClassFinder#findClassesThatExtend(String[], Class[], boolean)}
@@ -325,7 +397,10 @@ public void initializeProperties(String file) {
      * @param superClass - single class to search for
      * @return List of Strings containing discovered class names.
      * @throws IOException when the used {@link ClassFinder} throws one while searching for the class
+     * @deprecated use {@link #loadServicesAndScanJars(Class, ServiceLoader, ClassLoader, ServiceLoadExceptionHandler)} instead
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findClassesThatExtend(Class<?> superClass)
         throws IOException {
         return ClassFinder.findClassesThatExtend(getSearchPaths(), new Class[]{superClass}, false);
diff --git a/src/core/src/test/java/org/apache/jorphan/test/AllTests.java b/src/core/src/test/java/org/apache/jorphan/test/AllTests.java
index bbbeefa46f4..e64fb568de8 100644
--- a/src/core/src/test/java/org/apache/jorphan/test/AllTests.java
+++ b/src/core/src/test/java/org/apache/jorphan/test/AllTests.java
@@ -321,8 +321,10 @@ private static void initializeManager(String[] args) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     private static List<String> findJMeterJUnitTests(String searchPathString) throws IOException {
         final String[] searchPaths = JOrphanUtils.split(searchPathString, ",");
+        // TODO: do we really need class searching here?
         return ClassFinder.findClasses(searchPaths, new JunitTestFilter());
     }
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 7054ff33b5c..19152c90ab7 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -440,6 +440,7 @@ private void checkElementAlias(Object item) {
 
     public static Collection<Object> getObjects(Class<?> extendsClass) throws Throwable {
         String exName = extendsClass.getName();
+        @SuppressWarnings("deprecation")
         Iterator<String> classes = ClassFinder
                 .findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { extendsClass }).iterator();
         List<Object> objects = new ArrayList<>();
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
index 03e9704f31e..f076fb32837 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
@@ -171,6 +171,7 @@ public void checkAllNecessaryKeysPresent() {
     public static Test suite() throws Exception {
         TestSuite suite = new TestSuite("Bean Resource Test Suite");
 
+        @SuppressWarnings("deprecation")
         List<String> testBeanClassNames = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { TestBean.class });
 
         boolean errorDetected = false;
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
index a8a355670fd..a035d321422 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
@@ -48,6 +48,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testFindClassesThatExtendStringArrayClassOfQArray() throws IOException {
+        @SuppressWarnings("deprecation")
         List<String> findClassesThatExtend = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { Exception.class });
@@ -56,6 +57,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArray() throws IOExcepti
 
     @Test
     public void testFindClassesThatExtendStringArrayClassOfQArrayTrue() throws Exception {
+        @SuppressWarnings("deprecation")
         List<String> findClassesThatExtend = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { Object.class },
@@ -66,6 +68,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayTrue() throws Excep
 
     @Test
     public void testFindClassesThatExtendStringArrayClassOfQArrayFalse() throws Exception {
+        @SuppressWarnings("deprecation")
         List<String> findClassesThatExtend = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { Exception.class },
@@ -77,6 +80,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayFalse() throws Exce
 
     @Test
     public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringString() throws Exception {
+        @SuppressWarnings("deprecation")
         List<String> findClassesThatExtend = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { Exception.class },
@@ -90,6 +94,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringString
 
     @Test
     public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringStringTrue() throws Exception {
+        @SuppressWarnings("deprecation")
         List<String> annotatedClasses = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { java.beans.Transient.class },
@@ -102,7 +107,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringString
 
     @Test
     public void testFindAnnotatedClasses() throws Exception {
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({"deprecation", "unchecked"})
         List<String> annotatedClasses = ClassFinder.findAnnotatedClasses(
                 libDirs,
                 new Class[] { java.beans.Transient.class});
@@ -111,7 +116,7 @@ public void testFindAnnotatedClasses() throws Exception {
 
     @Test
     public void testFindAnnotatedInnerClasses() throws Exception {
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({"deprecation", "unchecked"})
         List<String> annotatedClasses = ClassFinder.findAnnotatedClasses(libDirs,
                 new Class[] { java.lang.Deprecated.class}, true);
         Assert.assertTrue(annotatedClasses.stream().anyMatch(s->s.contains("$")));
@@ -119,12 +124,16 @@ public void testFindAnnotatedInnerClasses() throws Exception {
 
     @Test
     public void testFindClasses() throws IOException {
-        Assert.assertFalse(ClassFinder.findClasses(libDirs, className -> true).isEmpty());
+        @SuppressWarnings("deprecation")
+        List<String> classes = ClassFinder.findClasses(libDirs, className -> true);
+        Assert.assertFalse(classes.isEmpty());
     }
 
     @Test
     public void testFindClassesNone() throws IOException {
-        Assert.assertTrue(ClassFinder.findClasses(libDirs, className -> false).isEmpty());
+        @SuppressWarnings("deprecation")
+        List<String> classes = ClassFinder.findClasses(libDirs, className -> false);
+        Assert.assertTrue(classes.isEmpty());
     }
 
 }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
index 88d64cd8e6b..f72284c877b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
@@ -32,10 +32,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * A function which understands BeanShell
  * @since 1.X
  */
+@AutoService(Function.class)
 public class BeanShell extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(BeanShell.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
index c9a80a34a5b..612a83ec1cb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
@@ -28,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * The function represented by this class allows data to be read from CSV files.
  * Syntax is similar to StringFromFile function. The function allows the test to
@@ -53,6 +55,7 @@
  * {@code __CSVRead(*ONE,1);}, etc.
  * @since 1.9
  */
+@AutoService(Function.class)
 public class CSVRead extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(CSVRead.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index deb5c88a05f..38e15271a2d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -31,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Change Case Function
  *
@@ -45,6 +47,7 @@
  * @since 4.0
  *
  */
+@AutoService(Function.class)
 public class ChangeCase extends AbstractFunction {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChangeCase.class);
     private static final List<String> DESC = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
index 94e5df40c12..482c7ed6e6d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
@@ -28,10 +28,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to generate chars from a list of decimal or hex values
  * @since 2.3.3
  */
+@AutoService(Function.class)
 public class CharFunction extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(CharFunction.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
index c382ba17476..47e9a0d612e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
@@ -31,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * DateConvert function to change date format
  * Can optionally store it in a variable.
@@ -38,6 +40,7 @@
  * @since 4.0
  *
  */
+@AutoService(Function.class)
 public class DateTimeConvertFunction extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(DateTimeConvertFunction.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
index 3bc2d990f57..36c9f479e84 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
@@ -34,6 +34,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Digest Encode Function that provides computing of different SHA-XXX, can
  * uppercase the result and store it in a variable.
@@ -44,6 +46,7 @@
  *
  * @since 4.0
  */
+@AutoService(Function.class)
 public class DigestEncodeFunction extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(DigestEncodeFunction.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
index 4b3d4186c81..8606779ad07 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
@@ -27,6 +27,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * <p>Function which escapes the characters in a <code>String</code> using HTML entities.</p>
  *
@@ -46,6 +48,7 @@
  * @see StringEscapeUtils#escapeHtml4(String) (Commons Lang)
  * @since 2.3.3
  */
+@AutoService(Function.class)
 public class EscapeHtml extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
index 91c8d99641b..a3fbf62aa6c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java
@@ -30,10 +30,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Escape ORO meta characters
  * @since 2.9
  */
+@AutoService(Function.class)
 public class EscapeOroRegexpChars extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(EscapeOroRegexpChars.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
index 4dce679a768..ac83b05b777 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
@@ -27,6 +27,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * <p>Function which escapes the characters in a <code>String</code> using XML 1.0 entities.</p>
  *
@@ -43,6 +45,7 @@
  * @see StringEscapeUtils#escapeXml10(String) (Commons Lang)
  * @since 3.2
  */
+@AutoService(Function.class)
 public class EscapeXml extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java
index 33c90be05f4..e5126c77311 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java
@@ -26,6 +26,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to evaluate a string which may contain variable or function references.
  *
@@ -34,6 +36,7 @@
  * Returns: the evaluated value
  * @since 2.3.1
  */
+@AutoService(Function.class)
 public class EvalFunction extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java
index 4d3521e81e3..71fc5bf4099 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java
@@ -29,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to evaluate a string which may contain variable or function references.
  *
@@ -37,6 +39,7 @@
  * Returns: the evaluated value
  * @since 2.3.1
  */
+@AutoService(Function.class)
 public class EvalVarFunction extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(EvalVarFunction.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
index 519fb699193..5f71500b708 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
@@ -32,6 +32,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * FileToString Function to read a complete file into a String.
  * <p>
@@ -50,6 +52,7 @@
  * </ul>
  * @since 2.4
  */
+@AutoService(Function.class)
 public class FileToString extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(FileToString.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
index a26b482643f..30710df41f6 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * This class wraps the FileRowColContainer for use across multiple threads.
  * <p>
@@ -34,6 +35,7 @@
  * together with the current line number.
  *
  */
+//@AutoService(Function.class)
 public final class FileWrapper {
 
     private static final Logger log = LoggerFactory.getLogger(FileWrapper.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
index 5e23c7b5a36..23612d0eb23 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
@@ -41,11 +41,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * __groovy function
  * Provides a Groovy interpreter
  * @since 3.1
  */
+@AutoService(Function.class)
 public class Groovy extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(Groovy.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java b/src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java
index 92019be77c7..fb2db081ded 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java
@@ -27,12 +27,15 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides an intSum function that adds two or more integer values.
  *
  * @see LongSum
  * @since 1.8.1
  */
+@AutoService(Function.class)
 public class IntSum extends AbstractFunction {
     private static final List<String> desc = new ArrayList<>();
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java b/src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java
index eb86e50151f..b50922d6a2b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java
@@ -26,11 +26,14 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Test if a JMeter property is defined
  *
  * @since 4.0
  */
+@AutoService(Function.class)
 public class IsPropDefined extends AbstractFunction {
     private static final List<String> desc = new ArrayList<>();
     private static final String KEY = "__isPropDefined";
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java b/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
index edb8515e6a9..99a2e9e1b7c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
@@ -27,11 +27,14 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Test if a JMeter variable is defined
  *
  * @since 4.0
  */
+@AutoService(Function.class)
 public class IsVarDefined extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index a5c730b905f..4742a9c560b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -29,11 +29,14 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Counter that can be referenced anywhere in the Thread Group. It can be configured per User (Thread Local)
  * or globally.
  * @since 1.X
  */
+@AutoService(Function.class)
 public class IterationCounter extends AbstractFunction implements ThreadListener {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
index 00ea98bc6f7..bc4729b6a2f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
@@ -40,10 +40,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * javaScript function implementation that executes a piece of JavaScript (not Java!) code and returns its value
  * @since 1.9
  */
+@AutoService(Function.class)
 public class JavaScript extends AbstractFunction {
     private static final String NASHORN_ENGINE_NAME = "nashorn"; //$NON-NLS-1$
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
index 7b6c185b27e..1d90bca74ca 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
@@ -36,11 +36,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * A function which understands Commons JEXL2
  * @since 2.6
  */
 // For unit tests, see TestJexlFunction
+@AutoService(Function.class)
 public class Jexl2Function extends AbstractFunction implements ThreadListener {
 
     private static final Logger log = LoggerFactory.getLogger(Jexl2Function.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
index ac74281d479..6c37bc92b09 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
@@ -37,11 +37,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * A function which understands Commons JEXL3
  * @since 3.0
  */
 // For unit tests, see TestJexlFunction
+@AutoService(Function.class)
 public class Jexl3Function extends AbstractFunction implements ThreadListener {
 
     private static final Logger log = LoggerFactory.getLogger(Jexl3Function.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
index de5b0f9a572..a40d6d668dd 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
@@ -30,6 +30,8 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 
+import com.google.auto.service.AutoService;
+
 /**
  * <p>
  * Function to log a message.
@@ -46,6 +48,7 @@
  * Returns: - the input string
  * @since 2.2
  */
+@AutoService(Function.class)
 public class LogFunction extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(LogFunction.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
index 9f45af1ae44..23901d84508 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
@@ -28,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * <p>
  * Function to log a message.
@@ -43,6 +45,7 @@
  * Returns: - Empty String (so can be used where return value would be a nuisance)
  * @since 2.2
  */
+@AutoService(Function.class)
 public class LogFunction2 extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(LogFunction2.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java b/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
index 37a8e8de517..b29a3551d6d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
@@ -27,11 +27,14 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides a longSum function that adds two or more long values.
  * @see IntSum
  * @since 2.3.2
  */
+@AutoService(Function.class)
 public class LongSum extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java b/src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java
index 82acc7183b6..e80a944d748 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java
@@ -19,10 +19,13 @@
 
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Return Machine IP
  * @since 2.6
  */
+@AutoService(Function.class)
 public class MachineIP extends AbstractHostIPName {
 
     private static final String KEY = "__machineIP"; //$NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java b/src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java
index 50898adff74..8218b8e41fc 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java
@@ -19,10 +19,13 @@
 
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Return Machine Host
  * @since 1.X
  */
+@AutoService(Function.class)
 public class MachineName extends AbstractHostIPName {
 
     private static final String KEY = "__machineName"; //$NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Property.java b/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
index b2168a307fa..db4be23411c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
@@ -27,6 +27,8 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to get a JMeter property, and optionally store it
  *
@@ -41,6 +43,7 @@
  * - the property name itself
  * @since 2.0
  */
+@AutoService(Function.class)
 public class Property extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Property2.java b/src/functions/src/main/java/org/apache/jmeter/functions/Property2.java
index 701dd0fd46a..0694219ba67 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Property2.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Property2.java
@@ -26,6 +26,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to get a JMeter property, or a default. Does not offer the option to
  * store the value, as it is just as easy to refetch it. This is a
@@ -46,6 +48,7 @@
  * not present - "1" (suitable for use in ThreadGroup GUI)
  * @since 2.0
  */
+@AutoService(Function.class)
 public class Property2 extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Random.java b/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
index 20921a187d1..bfffeb7c7aa 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
@@ -28,11 +28,14 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides a Random function which returns a random long integer between a min
  * (first argument) and a max (second argument).
  * @since 1.9
  */
+@AutoService(Function.class)
 public class Random extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index 83243d76f4e..d28e815546f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -41,6 +41,7 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.auto.service.AutoService;
 
 /**
  * RandomDate Function generates a date in a specific range
@@ -59,6 +60,7 @@
  *
  * @since 3.3
  */
+@AutoService(Function.class)
 public class RandomDate extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(RandomDate.class);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
index 7a22beca1e8..897fd48f11c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
@@ -31,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides a RandomFromMultipleVars function which returns a random element from a multi valued extracted variable.
  * Those kind of variables are extracted by:
@@ -41,6 +43,7 @@
  *
  * @since 3.1
  */
+@AutoService(Function.class)
 public class RandomFromMultipleVars extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(RandomFromMultipleVars.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
index 1dd00483928..e0528d1c770 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
@@ -31,11 +31,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides a RandomString function which returns a random String of length (first argument)
  * using characters (second argument)
  * @since 2.6
  */
+@AutoService(Function.class)
 public class RandomString extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(RandomString.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index a3c50e2b4e6..8ea9e820194 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -39,6 +39,8 @@
 import org.apache.oro.text.regex.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import com.google.auto.service.AutoService;
 /**
  * Implements regular expression parsing of sample results and variables
  * @since 1.X
@@ -46,6 +48,7 @@
 
 // @see TestRegexFunction for unit tests
 
+@AutoService(Function.class)
 public class RegexFunction extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(RegexFunction.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java b/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
index eedb707b96f..fa624db65f9 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
@@ -27,10 +27,13 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to return the name of the current sampler.
  * @since 2.5
  */
+@AutoService(Function.class)
 public class SamplerName extends AbstractFunction {
 
     private static final String KEY = "__samplerName"; //$NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java b/src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java
index 7811c5686c1..5e8bce06cfa 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java
@@ -27,6 +27,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to set a JMeter property
  *
@@ -40,6 +42,7 @@
  * Returns: nothing or original value if the 3rd parameter is true
  * @since 2.1
  */
+@AutoService(Function.class)
 public class SetProperty extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
index 17e8bb10120..825f0d8a629 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
@@ -31,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 // @see org.apache.jmeter.functions.PackageTest for unit tests
 
 /**
@@ -53,6 +55,7 @@
  * </ul>
  * @since 2.0.2
  */
+@AutoService(Function.class)
 public class SplitFunction extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(SplitFunction.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
index fc2207feeeb..5e7081e1b01 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
@@ -37,6 +37,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * <p>StringFromFile Function to read a String from a text file.</p>
  *
@@ -70,6 +72,7 @@
  * Because function instances are shared, it does not make sense to use the thread number as part of the file name.
  * @since 1.9
  */
+@AutoService(Function.class)
 public class StringFromFile extends AbstractFunction implements TestStateListener {
     private static final Logger log = LoggerFactory.getLogger(StringFromFile.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
index 25d644e8eea..41a363976be 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
@@ -41,6 +41,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * StringToFile Function to write a String to a file
  *
@@ -55,6 +57,7 @@
  *
  * @since 5.2
  */
+@AutoService(Function.class)
 public class StringToFile extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(StringToFile.class);
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java b/src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java
index c0ab9e8a943..ba298545ac2 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java
@@ -26,10 +26,13 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.services.FileServer;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Returns Test Plan name
  * @since 2.6
  */
+@AutoService(Function.class)
 public class TestPlanName extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
index 08a4386708f..36c6b38f46a 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java
@@ -26,11 +26,14 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Returns Thread Group Name
  *
  * @since 5.0
  */
+@AutoService(Function.class)
 public class ThreadGroupName extends AbstractFunctionByKey {
     private static final String KEY = "__threadGroupName"; //$NON-NLS-1$
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java
index 0c353c32e6c..12d3221e0ba 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java
@@ -25,10 +25,13 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to return the current thread number.
  * @since 1.X
  */
+@AutoService(Function.class)
 public class ThreadNumber extends AbstractFunction {
 
     private static final String KEY = "__threadNum"; //$NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index 65e6c01a9dd..1dd087b7ed5 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -35,12 +35,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 // See org.apache.jmeter.functions.TestTimeFunction for unit tests
 
 /**
  * __time() function - returns the current time in milliseconds
  * @since 2.2
  */
+@AutoService(Function.class)
 public class TimeFunction extends AbstractFunction {
 
     private static final String KEY = "__time"; // $NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index 131d360daea..2b011401b81 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -43,6 +43,7 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.auto.service.AutoService;
 
 /**
  * timeShifting Function permit to shift a date
@@ -65,6 +66,7 @@
  *
  * @since 3.3
  */
+@AutoService(Function.class)
 public class TimeShift extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(TimeShift.class);
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
index 910c4bb48f6..933af1421e5 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
@@ -28,6 +28,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to unescape any Java literals found in the String.
  * For example, it will turn a sequence of '\' and 'n' into a newline character,
@@ -36,6 +38,7 @@
  * @see StringEscapeUtils#unescapeJava(String)
  * @since 2.3.3
  */
+@AutoService(Function.class)
 public class UnEscape extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
index 97a8bafa9c7..85f57bbe731 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
@@ -28,6 +28,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to unescape a string containing entity escapes
  * to a string containing the actual Unicode characters corresponding to the escapes.
@@ -42,6 +44,7 @@
  * @see StringEscapeUtils#unescapeHtml4(String)
  * @since 2.3.3
  */
+@AutoService(Function.class)
 public class UnEscapeHtml extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java b/src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java
index a31f1aa2a40..9890ec650cd 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java
@@ -30,11 +30,14 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to decode a application/x-www-form-urlencoded string.
  *
  * @since 2.10
  */
+@AutoService(Function.class)
 public class UrlDecode extends AbstractFunction {
 
     private static final String CHARSET_ENCODING = StandardCharsets.UTF_8.name();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java b/src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java
index 410ac89a585..e890c4383cc 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java
@@ -30,11 +30,14 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to encode a string to a application/x-www-form-urlencoded string.
  *
  * @since 2.10
  */
+@AutoService(Function.class)
 public class UrlEncode extends AbstractFunction {
 
     private static final String CHARSET_ENCODING = StandardCharsets.UTF_8.name();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java b/src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java
index 16461968ccd..b4b2ee370fb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java
@@ -26,6 +26,8 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to create a UUID
  *
@@ -36,6 +38,7 @@
  * - A pseudo random UUID 4
  * @since 2.9
  */
+@AutoService(Function.class)
 public class Uuid extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Variable.java b/src/functions/src/main/java/org/apache/jmeter/functions/Variable.java
index 18ee52db415..ce83531819d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Variable.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Variable.java
@@ -27,6 +27,8 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Function to get a JMeter Variable
  *
@@ -39,6 +41,7 @@
  * - the default value if set, and if not the variable name itself
  * @since 2.3RC3
  */
+@AutoService(Function.class)
 public class Variable extends AbstractFunction {
 
     private static final List<String> desc = new ArrayList<>();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/XPath.java b/src/functions/src/main/java/org/apache/jmeter/functions/XPath.java
index 1200ccc55a1..a2fe3adf688 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/XPath.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/XPath.java
@@ -29,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 // @see org.apache.jmeter.functions.PackageTest for unit tests
 
 /**
@@ -45,6 +47,7 @@
  * is opened and used for all threads.
  * @since 2.0.3
  */
+@AutoService(Function.class)
 public class XPath extends AbstractFunction {
     private static final Logger log = LoggerFactory.getLogger(XPath.class);
 
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
new file mode 100644
index 00000000000..32ad1d29132
--- /dev/null
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.functions
+
+import org.apache.jmeter.util.JMeterUtils
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import java.util.ServiceLoader
+
+class FunctionServicesTest {
+    @Test
+    fun `__counter loads`() {
+        val functions = JMeterUtils.loadServicesAndScanJars(
+            Function::class.java,
+            ServiceLoader.load(Function::class.java),
+            Thread.currentThread().contextClassLoader
+        ) { service, className, throwable ->
+            throw IllegalStateException(
+                "Failed to load $service implementations, implementation: $className",
+                throwable
+            )
+        }.map { it.referenceKey }
+
+        Assertions.assertTrue("__counter" in functions) {
+            "__counter function should be discoverable with ServiceLoader.load(Function), all found functions are $functions"
+        }
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 7d04e1374e0..22d08caed99 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -26,18 +26,24 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
+import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.jar.JarFile;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.apiguardian.api.API;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This class finds classes that extend one of a set of parent classes
+ * This class finds classes that extend one of a set of parent classes.
  */
 public final class ClassFinder {
     private static final Logger log = LoggerFactory.getLogger(ClassFinder.class);
@@ -46,10 +52,99 @@ public final class ClassFinder {
     private static final String DOT_CLASS = ".class"; // $NON-NLS-1$
     private static final int DOT_CLASS_LEN = DOT_CLASS.length();
 
+    private static final ThreadLocal<Boolean> SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE = new ThreadLocal<>();
+
+    public static final String JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE = "JMeter-Skip-Class-Scanning";
+
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public interface Closeable extends AutoCloseable {
+        @Override
+        void close();
+    }
+
     // static only
     private ClassFinder() {
     }
 
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public static boolean getSkipJarsWithJmeterSkipClassScanningAttribute() {
+        return Objects.equals(SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE.get(), Boolean.TRUE);
+    }
+
+    /**
+     * Configures if {@link ClassFinder} should skip jar files that have {@code JMeter-Skip-Class-Scanning: true}
+     * manifest attribute.
+     * JMeter will skip such jars when it uses both {@link java.util.ServiceLoader} and {@link ClassFinder}.
+     * However, {@link ClassFinder} was public, so it was possible that custom plugins could use it, and they should
+     * be able to find the implementations even if they are in jars with {@code JMeter-Skip-Class-Scanning: true}.
+     * <p>
+     * Sample usage:
+     * <pre>
+     * List&lt;String&gt; classNames;
+     * try (ClassFinder.Closeable ignored = ClassFinder.skipJarsWithJmeterSkipClassScanningAttribute()) {
+     *   // findClassesThatExtend will not skip jars with JMeter-Skip-Class-Scanning: true manifest attribute
+     *   classNames = ClassFinder.findClassesThatExtend(...);
+     * </pre>
+     *
+     * @return closeable that will reset "skip jar files with manifest entry" flag when closed. Use it in try-with-resources
+     */
+    @API(status = API.Status.INTERNAL, since = "5.6")
+    public static Closeable skipJarsWithJmeterSkipClassScanningAttribute() {
+        SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE.set(true);
+        return SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE::remove;
+    }
+
+    /**
+     * Loads services implementing a given interface.
+     * This is an intended replacement for {@code findClassesThatExtend}.
+     *
+     * @param service interface that services should extend.
+     * @param serviceLoader ServiceLoader to fetch services.
+     * @param exceptionHandler exception handler to use for services that fail to load.
+     * @return collection of services that load successfully
+     * @param <S> type of service (class or interface)
+     */
+    public static <S> Collection<S> loadServices(
+            @SuppressWarnings("BoundedWildcard") Class<S> service,
+            ServiceLoader<S> serviceLoader,
+            ServiceLoadExceptionHandler<? super S> exceptionHandler
+    ) {
+        List<S> result = new ArrayList<>();
+        @SuppressWarnings("ForEachIterable")
+        Iterator<S> it = serviceLoader.iterator();
+        while (it.hasNext()) {
+            try {
+                // This can't be for-each loop because we need to catch exceptions from next()
+                result.add(it.next());
+            } catch (ServiceConfigurationError e) {
+                // Java does not expose class name of the problematic class in question, so we extract it
+                // from the message
+                String message = e.getMessage();
+                String className = "";
+                if (message.startsWith(service.getName())) {
+                    if (message.endsWith(" Unable to get public no-arg constructor")) {
+                        className = message.substring(
+                                service.getName().length() + ": ".length(),
+                                message.length() - " Unable to get public no-arg constructor".length()
+                        );
+                    } else if (message.endsWith(" not a subtype")) {
+                        className = message.substring(
+                                service.getName().length() + ": ".length(),
+                                message.length() - " not a subtype".length()
+                        );
+                    } else if (message.endsWith(" could not be instantiated")) {
+                        className = message.substring(
+                                service.getName().length() + ": ".length() + "Provider ".length(),
+                                message.length() - " could not be instantiated".length()
+                        );
+                    }
+                }
+                exceptionHandler.handle(service, className, e);
+            }
+        }
+        return Collections.unmodifiableCollection(result);
+    }
+
     /**
      * Filter updates by only storing classes
      * that extend one of the parent classes
@@ -176,7 +271,9 @@ public String toString() {
      * @param superClasses required parent class(es)
      * @return List of Strings containing discovered class names.
      * @throws IOException when scanning the classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @Deprecated
     public static List<String> findClassesThatExtend(String[] paths, Class<?>[] superClasses)
             throws IOException {
         return findClassesThatExtend(paths, superClasses, false);
@@ -206,7 +303,9 @@ private static Set<File> addJarsInPath(String[] paths) {
      * @param innerClasses   should we include inner classes?
      * @return List containing discovered classes
      * @throws IOException when scanning for classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @Deprecated
     public static List<String> findClassesThatExtend(String[] strPathsOrJars,
             final Class<?>[] superClasses, final boolean innerClasses)
             throws IOException  {
@@ -223,7 +322,10 @@ public static List<String> findClassesThatExtend(String[] strPathsOrJars,
      * @param notContains    classname should not contain this string
      * @return List containing discovered classes
      * @throws IOException when scanning classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findClassesThatExtend(String[] strPathsOrJars,
             final Class<?>[] superClasses, final boolean innerClasses,
             String contains, String notContains)
@@ -239,7 +341,10 @@ public static List<String> findClassesThatExtend(String[] strPathsOrJars,
      * @param innerClasses   should we include inner classes?
      * @return List containing discovered classes
      * @throws IOException when scanning classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findAnnotatedClasses(String[] strPathsOrJars,
             final Class<? extends Annotation>[] annotations, final boolean innerClasses)
             throws IOException  {
@@ -254,7 +359,10 @@ public static List<String> findAnnotatedClasses(String[] strPathsOrJars,
      * @param annotations    required annotations
      * @return List containing discovered classes
      * @throws IOException when scanning classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findAnnotatedClasses(String[] strPathsOrJars,
             final Class<? extends Annotation>[] annotations)
             throws IOException  {
@@ -272,7 +380,10 @@ public static List<String> findAnnotatedClasses(String[] strPathsOrJars,
      * @param annotations       true if classnames are annotations
      * @return List containing discovered classes
      * @throws IOException when scanning classes fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findClassesThatExtend(String[] searchPathsOrJars,
                 final Class<?>[] classNames, final boolean innerClasses,
                 String contains, String notContains, boolean annotations)
@@ -307,7 +418,10 @@ public static List<String> findClassesThatExtend(String[] searchPathsOrJars,
      *                          conform to
      * @return list of all classes in the jars, that conform to {@code filter}
      * @throws IOException when reading the jar files fails
+     * @deprecated use {@link #loadServices(Class, ServiceLoader, ServiceLoadExceptionHandler)} or {@code JMeterUtils#loadServicesAndScanJars}
      */
+    @API(status = API.Status.DEPRECATED, since = "5.6")
+    @Deprecated
     public static List<String> findClasses(String[] searchPathsOrJars, ClassFilter filter) throws IOException {
         if (log.isDebugEnabled()) {
             log.debug("findClasses with searchPathsOrJars : {} and classFilter : {}",
@@ -352,10 +466,22 @@ private static String fixClassName(String strClassName) {
     }
 
 
-    private static void findClassesInOnePath(File file, Set<String> listClasses, ClassFilter filter) throws IOException {
+    private static void findClassesInOnePath(File file, Set<String> listClasses, ClassFilter filter) {
         if (file.isDirectory()) {
             findClassesInPathsDir(file.getAbsolutePath(), file, listClasses, filter);
         } else if (file.exists()) {
+            if (getSkipJarsWithJmeterSkipClassScanningAttribute() && file.getName().endsWith(DOT_JAR)) {
+                // Ignore jars with JMeter-Skip-Class-Scanning attribute
+                try (JarFile jar = new JarFile(file)) {
+                    String value = jar.getManifest().getMainAttributes().getValue(JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE);
+                    if (Boolean.parseBoolean(value)) {
+                        log.info("Jar {} is skipped for scanning since it has {}={} attribute", file, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE, value);
+                        return;
+                    }
+                } catch (IOException e) {
+                    log.warn("Can not open the jar {}, message: {}", file.getAbsolutePath(), e.getLocalizedMessage(), e);
+                }
+            }
             try (ZipFile zipFile = new ZipFile(file);
                  Stream<? extends ZipEntry> entries = zipFile.stream()) {
                 entries.filter(entry -> entry.getName().endsWith(DOT_CLASS))
@@ -371,7 +497,7 @@ private static void findClassesInOnePath(File file, Set<String> listClasses, Cla
     }
 
 
-    private static void findClassesInPathsDir(String strPathElement, File dir, Set<String> listClasses, ClassFilter filter) throws IOException {
+    private static void findClassesInPathsDir(String strPathElement, File dir, Set<String> listClasses, ClassFilter filter) {
         File[] list = dir.listFiles();
         if (list == null) {
             log.warn("{} is not a folder", dir.getAbsolutePath());
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/CollectServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/CollectServiceLoadExceptionHandler.java
new file mode 100644
index 00000000000..41f80d4df87
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/CollectServiceLoadExceptionHandler.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Collects all the failures in a collection.
+ * @param <S> the service type
+ */
+public class CollectServiceLoadExceptionHandler<S> implements ServiceLoadExceptionHandler<S> {
+    private final List<ServiceLoadFailure<S>> failures = new ArrayList<>();
+
+    @Override
+    public void handle(Class<? extends S> service, String className, Throwable throwable) {
+        failures.add(new ServiceLoadFailure<>(service, className, throwable));
+    }
+
+    public Collection<ServiceLoadFailure<S>> toCollection() {
+        return Collections.unmodifiableCollection(failures);
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/IgnoreServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/IgnoreServiceLoadExceptionHandler.java
new file mode 100644
index 00000000000..3ee2cf88b4b
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/IgnoreServiceLoadExceptionHandler.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+/**
+ * Ignores all failures.
+ */
+public class IgnoreServiceLoadExceptionHandler implements ServiceLoadExceptionHandler<Object> {
+    @Override
+    public void handle(Class<?> service, String className, Throwable throwable) {
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/JMeterService.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/JMeterService.java
new file mode 100644
index 00000000000..c641256f03c
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/JMeterService.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * This is a marker annotation that describes JMeter will try using {@link java.util.ServiceLoader} to find the implementations.
+ * If the plugin exposes the service via service loader (META-INF/services) then it will improve JMeter startup.
+ * <p>Note: JMeter will still try scanning the classes in the jars for backward compatibility reasons,
+ * so if you expose services, then consider adding {@code JMeter-Skip-Class-Scanning: true} manifest attribute
+ * to your jar file. JMeter will skip scanning class files in such jars</p>
+ * @since 5.6
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public @interface JMeterService {
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
new file mode 100644
index 00000000000..5959bb54cc7
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+import org.slf4j.Logger;
+
+/**
+ * Logs all the failures to agiven {@link Logger} and ignores them.
+ */
+public class LogAndIgnoreServiceLoadExceptionHandler implements ServiceLoadExceptionHandler<Object> {
+    private final Logger log;
+
+    public LogAndIgnoreServiceLoadExceptionHandler(Logger log) {
+        this.log = log;
+    }
+
+    @Override
+    public void handle(Class<?> service, String className, Throwable throwable) {
+        if (throwable instanceof NoClassDefFoundError) {
+            if (throwable.getMessage().contains("javafx")) {
+                log.error(
+                        "Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing. " +
+                                "Add JavaFX to your Java installation if you want to use renderer: {}",
+                        className, service, className, throwable
+                );
+            } else {
+                log.error(
+                        "Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing",
+                        className, service, throwable
+                );
+            }
+        } else {
+            log.error(
+                    "Exception registering implementation: [{}] of interface: [{}], a jar is probably missing",
+                    className, service, throwable
+            );
+        }
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/RethrowServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/RethrowServiceLoadExceptionHandler.java
new file mode 100644
index 00000000000..91400f3c8ee
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/RethrowServiceLoadExceptionHandler.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+/**
+ * Rethrows service loading failures as {@link IllegalStateException}.
+ */
+public class RethrowServiceLoadExceptionHandler implements ServiceLoadExceptionHandler<Object> {
+    @Override
+    public void handle(Class<?> service, String className, Throwable throwable) {
+        throw new IllegalStateException("Can't load class " + className + " for instantiating service " + service, throwable);
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadExceptionHandler.java
new file mode 100644
index 00000000000..816c2931db6
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadExceptionHandler.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+import org.apiguardian.api.API;
+
+/**
+ * Service loading might fail (e.g. due to a missing dependency).
+ * This handler enables client code factor the failure handing.
+ *
+ * @param <S> type of the service
+ * @since 5.6
+ * @see IgnoreServiceLoadExceptionHandler
+ * @see LogAndIgnoreServiceLoadExceptionHandler
+ * @see RethrowServiceLoadExceptionHandler
+ */
+@FunctionalInterface
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public interface ServiceLoadExceptionHandler<S> {
+    void handle(Class<? extends S> service, String className, Throwable throwable);
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadFailure.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadFailure.java
new file mode 100644
index 00000000000..825f39aeb6f
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ServiceLoadFailure.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.reflect;
+
+public class ServiceLoadFailure<S> {
+    private final Class<? extends S> service;
+    private final String className;
+    private final Throwable throwable;
+
+    public ServiceLoadFailure(Class<? extends S> service, String className, Throwable throwable) {
+        this.service = service;
+        this.className = className;
+        this.throwable = throwable;
+    }
+
+    public Class<? extends S> getService() {
+        return service;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public Throwable getThrowable() {
+        return throwable;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceLoadFailure{" +
+                "service=" + service +
+                ", className='" + className + '\'' +
+                ", throwable=" + throwable +
+                '}';
+    }
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index d9388b3050d..966c3502af4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -63,6 +63,7 @@
 import org.apache.jmeter.gui.action.AbstractAction;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
+import org.apache.jmeter.gui.action.Command;
 import org.apache.jmeter.gui.plugin.MenuCreator;
 import org.apache.jmeter.gui.tree.JMeterTreeModel;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
@@ -110,12 +111,18 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Opens a popup where user can enter a cURL command line and create a test plan
  * from it
  *
  * @since 5.1
  */
+@AutoService({
+        Command.class,
+        MenuCreator.class
+})
 public class ParseCurlCommandAction extends AbstractAction implements MenuCreator, ActionListener { // NOSONAR
     private static final Logger LOGGER = LoggerFactory.getLogger(ParseCurlCommandAction.class);
     private static final String ACCEPT_ENCODING = "Accept-Encoding";
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 051389da248..27b9894be67 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -57,10 +57,12 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.auto.service.AutoService;
 
 /**
  * Default implementation that handles classical HTTP textual + Multipart requests
  */
+@AutoService(SamplerCreator.class)
 public class DefaultSamplerCreator extends AbstractSamplerCreator {
     private static final Logger log = LoggerFactory.getLogger(DefaultSamplerCreator.class);
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java
index 81bc9d99f55..54768d353d7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java
@@ -23,10 +23,12 @@
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * Factory of sampler
  */
+@JMeterService
 public interface SamplerCreator {
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
index 3f3549cfb38..679db1dbe8b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
@@ -17,14 +17,12 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
-import java.io.IOException;
-import java.lang.reflect.Modifier;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,41 +57,27 @@ public void setCounter(int value) {
      * Initialize factory from classpath
      */
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
-        try {
-            List<String> listClasses = ClassFinder.findClassesThatExtend(
-                    JMeterUtils.getSearchPaths(),
-                    new Class[] {SamplerCreator.class });
-            for (String strClassName : listClasses) {
-                try {
-                    if(log.isDebugEnabled()) {
-                        log.debug("Loading class: {}", strClassName);
+        for (SamplerCreator creator : JMeterUtils.loadServicesAndScanJars(
+                SamplerCreator.class,
+                ServiceLoader.load(SamplerCreator.class),
+                Thread.currentThread().getContextClassLoader(),
+                new LogAndIgnoreServiceLoadExceptionHandler(log)
+        )) {
+            try {
+                String[] contentTypes = creator.getManagedContentTypes();
+                for (String contentType : contentTypes) {
+                    log.debug("Registering samplerCreator {} for content type:{}",
+                            creator.getClass().getName(), contentType);
+                    SamplerCreator oldSamplerCreator = samplerCreatorMap.put(contentType, creator);
+                    if (oldSamplerCreator != null) {
+                        log.warn("A sampler creator was already registered for:{}, class:{}, it will be replaced",
+                                contentType, oldSamplerCreator.getClass());
                     }
-                    Class<?> commandClass = Class.forName(strClassName);
-                    if (!Modifier.isAbstract(commandClass.getModifiers())) {
-                        if(log.isDebugEnabled()) {
-                            log.debug("Instantiating: {}", commandClass.getName());
-                        }
-                        SamplerCreator creator = (SamplerCreator) commandClass.getDeclaredConstructor().newInstance();
-                        String[] contentTypes = creator.getManagedContentTypes();
-                        for (String contentType : contentTypes) {
-                            if(log.isDebugEnabled()) {
-                                log.debug("Registering samplerCreator {} for content type:{}",
-                                        commandClass.getName(), contentType);
-                            }
-                            SamplerCreator oldSamplerCreator = samplerCreatorMap.put(contentType, creator);
-                            if(oldSamplerCreator!=null) {
-                                log.warn("A sampler creator was already registered for:{}, class:{}, it will be replaced",
-                                        contentType, oldSamplerCreator.getClass());
-                            }
-                        }
-                    }
-                } catch (Exception e) {
-                    log.error("Exception registering {} with implementation:{}",
-                            SamplerCreator.class.getName(),strClassName, e);
                 }
+            } catch (Exception e) {
+                log.error("Exception registering {} with implementation:{}",
+                        SamplerCreator.class.getName(), creator.getClass(), e);
             }
-        } catch (IOException e) {
-            log.error("Exception finding implementations of {}", SamplerCreator.class, e);
         }
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
index 45aa4e1b917..24955272148 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
@@ -18,90 +18,92 @@
 package org.apache.jmeter.protocol.http.sampler;
 
 import java.beans.PropertyDescriptor;
-import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
+import java.util.ServiceLoader;
+import java.util.stream.Collectors;
 
 import org.apache.jmeter.protocol.http.util.accesslog.Filter;
 import org.apache.jmeter.protocol.http.util.accesslog.LogParser;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.testbeans.gui.FileEditor;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AccessLogSamplerBeanInfo extends BeanInfoSupport {
     private static final Logger log = LoggerFactory.getLogger(AccessLogSamplerBeanInfo.class);
-    private static final List<String> LOG_PARSER_CLASSES = logParsers();
-
-    private static List<String> logParsers() {
-        try {
-            return ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { LogParser.class });
-        } catch (IOException e) {
-            log.warn("Could not find log parsers.", e);
-            return Collections.emptyList();
-        }
-    }
+    private static final List<String> LOG_PARSER_CLASSES =
+            JMeterUtils.loadServicesAndScanJars(
+                    LogParser.class,
+                    ServiceLoader.load(LogParser.class),
+                    Thread.currentThread().getContextClassLoader(),
+                    new LogAndIgnoreServiceLoadExceptionHandler(log)
+            ).stream()
+                    .map(s -> s.getClass().getName())
+                    .sorted()
+                    .collect(Collectors.toList());
 
     public AccessLogSamplerBeanInfo() {
         super(AccessLogSampler.class);
         log.debug("Entered access log sampler bean info");
-        try {
-            createPropertyGroup("defaults",  // $NON-NLS-1$
-                    new String[] { "protocol", "domain", "portString", "imageParsing" });// $NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
-
-            createPropertyGroup("plugins",  // $NON-NLS-1$
-                    new String[] { "parserClassName", "filterClassName" }); // $NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
-
-            createPropertyGroup("accesslogfile",  // $NON-NLS-1$
-                    new String[] { "logFile" }); // $NON-NLS-1$
-
-            PropertyDescriptor p;
-
-            p = property("parserClassName");
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, AccessLogSampler.DEFAULT_CLASS);
-            p.setValue(NOT_OTHER, Boolean.TRUE);
-            p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-
-            log.debug("found parsers: {}", LOG_PARSER_CLASSES);
-            p.setValue(TAGS, LOG_PARSER_CLASSES.toArray(new String[LOG_PARSER_CLASSES.size()]));
-
-            p = property("filterClassName"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.FALSE);
-            p.setValue(DEFAULT, ""); // $NON-NLS-1$
-            p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-            List<String> classes = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
-                    new Class[] { Filter.class }, false);
-            p.setValue(TAGS, classes.toArray(new String[classes.size()]));
-
-            p = property("logFile"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, "");
-            p.setPropertyEditorClass(FileEditor.class);
-
-            p = property("domain"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, "");
-
-            p = property("protocol"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, "http"); // $NON-NLS-1$
-            p.setValue(DEFAULT_NOT_SAVED, Boolean.TRUE);
-
-            p = property("portString"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, ""); // $NON-NLS-1$
-
-            p = property("imageParsing"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(DEFAULT, Boolean.FALSE);
-            p.setValue(NOT_OTHER, Boolean.TRUE);
-        } catch (IOException e) {
-            log.warn("couldn't find classes and set up properties", e);
-            throw new RuntimeException("Could not find classes with class finder", e);
-        }
+        createPropertyGroup("defaults",  // $NON-NLS-1$
+                new String[] { "protocol", "domain", "portString", "imageParsing" });// $NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+
+        createPropertyGroup("plugins",  // $NON-NLS-1$
+                new String[] { "parserClassName", "filterClassName" }); // $NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+
+        createPropertyGroup("accesslogfile",  // $NON-NLS-1$
+                new String[] { "logFile" }); // $NON-NLS-1$
+
+        PropertyDescriptor p;
+
+        p = property("parserClassName");
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, AccessLogSampler.DEFAULT_CLASS);
+        p.setValue(NOT_OTHER, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+
+        log.debug("found parsers: {}", LOG_PARSER_CLASSES);
+        p.setValue(TAGS, LOG_PARSER_CLASSES.toArray(new String[0]));
+
+        p = property("filterClassName"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.FALSE);
+        p.setValue(DEFAULT, ""); // $NON-NLS-1$
+        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        String[] classes = JMeterUtils.loadServicesAndScanJars(
+                        Filter.class,
+                        ServiceLoader.load(Filter.class),
+                        Thread.currentThread().getContextClassLoader(),
+                        new LogAndIgnoreServiceLoadExceptionHandler(log)
+                ).stream()
+                .map(s -> s.getClass().getName())
+                .sorted()
+                .toArray(String[]::new);
+        p.setValue(TAGS, classes);
+
+        p = property("logFile"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, "");
+        p.setPropertyEditorClass(FileEditor.class);
+
+        p = property("domain"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, "");
+
+        p = property("protocol"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, "http"); // $NON-NLS-1$
+        p.setValue(DEFAULT_NOT_SAVED, Boolean.TRUE);
+
+        p = property("portString"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, ""); // $NON-NLS-1$
+
+        p = property("imageParsing"); // $NON-NLS-1$
+        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_OTHER, Boolean.TRUE);
         log.debug("Got to end of access log sampler bean info init");
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java
index 182c361b1fa..f78d6bf170b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.protocol.http.util.accesslog;
 
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * Description:<br>
@@ -35,6 +36,7 @@
  *
  */
 
+@JMeterService
 public interface Filter {
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
index 698e03953a7..ce9487fb127 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
@@ -29,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Description:<br>
  * <br>
@@ -69,6 +71,7 @@
  * that should be replaced.
  */
 @SuppressWarnings("InconsistentCapitalization")
+@AutoService(Filter.class)
 public class LogFilter implements Filter, Serializable {
 
     private static final long serialVersionUID = 241L;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java
index d08809c9e56..c29fa43b356 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.protocol.http.util.accesslog;
 
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * Description:<br>
@@ -34,6 +35,7 @@
  *
  */
 
+@JMeterService
 public interface LogParser {
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java
index 581a21acdcd..3f1f5dbc7bc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java
@@ -19,6 +19,9 @@
 
 import org.apache.jmeter.testelement.TestElement;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(LogParser.class)
 public class OrderPreservingLogParser extends SharedTCLogParser {
 
     public OrderPreservingLogParser() {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index e573aec2181..6ffef587c35 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -37,9 +37,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Provides Session Filtering for the AccessLog Sampler.
  */
+@AutoService(Filter.class)
 public class SessionFilter implements Filter, Serializable, TestCloneable,ThreadListener {
     private static final java.util.regex.Pattern IP_PATTERN = java.util.regex.Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
     private static final long serialVersionUID = 233L;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
index 9e429e03e18..d0702169561 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
@@ -23,6 +23,9 @@
 import org.apache.jmeter.testelement.TestCloneable;
 import org.apache.jmeter.testelement.TestElement;
 
+import com.google.auto.service.AutoService;
+
+@AutoService(LogParser.class)
 public class SharedTCLogParser extends TCLogParser implements TestCloneable {
 
     public SharedTCLogParser() {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
index ce79dd0bab9..72a45b25d2e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
@@ -36,6 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Description:<br>
  * <br>
@@ -72,6 +74,7 @@
  */
 
 @SuppressWarnings("InconsistentCapitalization")
+@AutoService(LogParser.class)
 public class TCLogParser implements LogParser {
     protected static final Logger log = LoggerFactory.getLogger(TCLogParser.class);
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index 0a0790ee02d..5eb198062ed 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -56,9 +56,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Specializer panel to view a HTTP request parsed
  */
+@AutoService(RequestView.class)
 public class RequestViewHTTP implements RequestView {
 
     private static final Logger log = LoggerFactory.getLogger(RequestViewHTTP.class);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
index 53b128ce785..ea25256a6ee 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
@@ -18,12 +18,13 @@
 package org.apache.jmeter.protocol.java.config.gui;
 
 import java.awt.BorderLayout;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -47,7 +48,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JLabeledChoice;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -136,21 +137,15 @@ private final void init() {// called from ctor, so must not be overridable
      * @return a panel containing the relevant components
      */
     private JPanel createClassnamePanel() {
-        List<String> possibleClasses = new ArrayList<>();
-
-        try {
-            // Find all the classes which implement the JavaSamplerClient
-            // interface.
-            possibleClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
-                    new Class[] { JavaSamplerClient.class });
-
-            // Remove the JavaConfig class from the list since it only
-            // implements the interface for error conditions.
-
-            possibleClasses.remove(JavaSampler.class.getName() + "$ErrorSamplerClient");
-        } catch (Exception e) {
-            log.debug("Exception getting interfaces.", e);
-        }
+        List<String> possibleClasses = JMeterUtils.loadServicesAndScanJars(
+                JavaSamplerClient.class,
+                ServiceLoader.load(JavaSamplerClient.class),
+                Thread.currentThread().getContextClassLoader(),
+                new LogAndIgnoreServiceLoadExceptionHandler(log)
+        ).stream()
+                .map(s -> s.getClass().getName())
+                .sorted()
+                .collect(Collectors.toList());
 
         classNameLabeledChoice = new JLabeledChoice(
                 JMeterUtils.getResString("protocol_java_classname"),
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java
index ea884511a02..fdfff46b6fb 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java
@@ -19,6 +19,7 @@
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.reflect.JMeterService;
 
 /**
  * This interface defines the interactions between the JavaSampler and external
@@ -59,6 +60,7 @@
  * how to implement this interface.
  *
  */
+@JMeterService
 public interface JavaSamplerClient {
     /**
      * Do any initialization required by this client. It is generally
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
index 83ee435a79f..5efcb1fe189 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
@@ -23,6 +23,7 @@
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
+import org.apache.jmeter.protocol.java.sampler.JavaSamplerClient;
 import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
 import org.apache.jmeter.samplers.Interruptible;
 import org.apache.jmeter.samplers.SampleResult;
@@ -30,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * The <code>JavaTest</code> class is a simple sampler which is intended for
  * use when developing test plans. The sampler generates results internally, so
@@ -66,7 +69,7 @@
  * Note: this class was derived from {@link SleepTest}.
  *
  */
-
+@AutoService(JavaSamplerClient.class)
 public class JavaTest extends AbstractJavaSamplerClient implements Serializable, Interruptible {
 
     private static final Logger LOG = LoggerFactory.getLogger(JavaTest.class);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
index 25ddbbdadf1..3a8ee150848 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java
@@ -23,6 +23,7 @@
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
+import org.apache.jmeter.protocol.java.sampler.JavaSamplerClient;
 import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
 import org.apache.jmeter.samplers.Interruptible;
 import org.apache.jmeter.samplers.SampleResult;
@@ -30,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.auto.service.AutoService;
+
 /**
  * The <code>SleepTest</code> class is a simple example class for a JMeter
  * Java protocol client. The class implements the <code>JavaSamplerClient</code>
@@ -47,6 +50,7 @@
  * time.
  *
  */
+@AutoService(JavaSamplerClient.class)
 public class SleepTest extends AbstractJavaSamplerClient implements Serializable, Interruptible {
 
     private static final Logger LOG = LoggerFactory.getLogger(SleepTest.class);
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
index da8a0540ed4..b2dc6e81759 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
@@ -171,10 +171,14 @@ private void setupClasslist(boolean initialize){
             if(initialize) {
                 synchronized (IS_INITILIAZED) {
                     if(IS_INITILIAZED.compareAndSet(false, true)) {
-                        annotatedTestClasses = ClassFinder.findAnnotatedClasses(SPATHS,
-                            new Class[] {Test.class}, false);
-                        junitTestClasses = ClassFinder.findClassesThatExtend(SPATHS,
-                             new Class[] { TestCase.class });
+                        @SuppressWarnings("deprecation")
+                        List<String> annotatedClasses = ClassFinder.findAnnotatedClasses(SPATHS,
+                                new Class[]{Test.class}, false);
+                        annotatedTestClasses = annotatedClasses;
+                        @SuppressWarnings("deprecation")
+                        List<String> junitClasses = ClassFinder.findClassesThatExtend(SPATHS,
+                                new Class[]{TestCase.class});
+                        junitTestClasses = junitClasses;
                     }
                     if (junit4.isSelected()){
                         classList = annotatedTestClasses;
diff --git a/src/test-services/build.gradle.kts b/src/test-services/build.gradle.kts
new file mode 100644
index 00000000000..9efcceed316
--- /dev/null
+++ b/src/test-services/build.gradle.kts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("build-logic.jvm-library")
+}
+
+dependencies {
+    implementation(projects.src.jorphan)
+    implementation(projects.src.core)
+}
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/AbstractService.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/AbstractService.kt
new file mode 100644
index 00000000000..b3cc906b979
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/AbstractService.kt
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import com.google.auto.service.AutoService
+
+@AutoService(AbstractServiceInterface::class)
+public abstract class AbstractService : AbstractServiceInterface
+
+public interface AbstractServiceInterface
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceNotImplementingInterface.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceNotImplementingInterface.kt
new file mode 100644
index 00000000000..e70ff8f82c0
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceNotImplementingInterface.kt
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import com.google.auto.service.AutoService
+
+@AutoService(NotImplementedInterface::class)
+public class ServiceNotImplementingInterface
+
+public interface NotImplementedInterface
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceThrowingException.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceThrowingException.kt
new file mode 100644
index 00000000000..7c16a54ae6c
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceThrowingException.kt
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import com.google.auto.service.AutoService
+
+@AutoService(ServiceThrowingExceptionInterface::class)
+public class ServiceThrowingException : ServiceThrowingExceptionInterface {
+    init {
+        throw ServiceFailureException("exception in constructor for test purposes")
+    }
+}
+
+public class ServiceFailureException(message: String) : Throwable(message)
+
+public interface ServiceThrowingExceptionInterface
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceWithPrivateConstructor.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceWithPrivateConstructor.kt
new file mode 100644
index 00000000000..2710984ea71
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/ServiceWithPrivateConstructor.kt
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import com.google.auto.service.AutoService
+
+@AutoService(ServiceWithPrivateConstructorInterface::class)
+public class ServiceWithPrivateConstructor private constructor() : ServiceWithPrivateConstructorInterface
+
+public interface ServiceWithPrivateConstructorInterface
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/WorkableService.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/WorkableService.kt
new file mode 100644
index 00000000000..af134427d2d
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/WorkableService.kt
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import com.google.auto.service.AutoService
+
+@AutoService(WorkableServiceInterface::class)
+public class WorkableService : WorkableServiceInterface {
+    override val name: String = "test service"
+
+    override fun toString(): String = name
+}
+
+public interface WorkableServiceInterface {
+    public val name: String
+}
diff --git a/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/loadServices.kt b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/loadServices.kt
new file mode 100644
index 00000000000..81102d72056
--- /dev/null
+++ b/src/test-services/src/main/kotlin/org/apache/jmeter/util/services/loadServices.kt
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util.services
+
+import org.apache.jmeter.util.JMeterUtils
+import org.apache.jorphan.reflect.ServiceLoadExceptionHandler
+import java.util.ServiceLoader
+
+public inline fun <reified S : Any> loadServices(
+    exceptionHandler: ServiceLoadExceptionHandler<S>
+): Collection<S> =
+    JMeterUtils.loadServicesAndScanJars(
+        S::class.java,
+        ServiceLoader.load(S::class.java),
+        Thread.currentThread().contextClassLoader,
+        exceptionHandler
+    )
diff --git a/src/test-services/src/test/kotlin/ServiceLoaderTest.kt b/src/test-services/src/test/kotlin/ServiceLoaderTest.kt
new file mode 100644
index 00000000000..3c4d1d1957a
--- /dev/null
+++ b/src/test-services/src/test/kotlin/ServiceLoaderTest.kt
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.jmeter.util.services.AbstractServiceInterface
+import org.apache.jmeter.util.services.NotImplementedInterface
+import org.apache.jmeter.util.services.ServiceThrowingExceptionInterface
+import org.apache.jmeter.util.services.ServiceWithPrivateConstructorInterface
+import org.apache.jmeter.util.services.WorkableServiceInterface
+import org.apache.jmeter.util.services.loadServices
+import org.apache.jorphan.reflect.CollectServiceLoadExceptionHandler
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
+
+class ServiceLoaderTest {
+    @Test
+    fun `service without public constructor`() {
+        assertServiceLoad<ServiceWithPrivateConstructorInterface>(
+            "[]",
+            "[service: org.apache.jmeter.util.services.ServiceWithPrivateConstructorInterface, className: org.apache.jmeter.util.services.ServiceWithPrivateConstructor, exceptionClass: java.util.ServiceConfigurationError, causeClass: java.lang.NoSuchMethodException]"
+        )
+    }
+
+    @Test
+    fun `service not implementing interface`() {
+        assertServiceLoad<NotImplementedInterface>(
+            "[]",
+            "[service: org.apache.jmeter.util.services.NotImplementedInterface, className: org.apache.jmeter.util.services.ServiceNotImplementingInterface, exceptionClass: java.util.ServiceConfigurationError, causeClass: null]"
+        )
+    }
+
+    @Test
+    fun `service failing in constructor`() {
+        assertServiceLoad<ServiceThrowingExceptionInterface>(
+            "[]",
+            "[service: org.apache.jmeter.util.services.ServiceThrowingExceptionInterface, className: org.apache.jmeter.util.services.ServiceThrowingException, exceptionClass: java.util.ServiceConfigurationError, causeClass: org.apache.jmeter.util.services.ServiceFailureException]"
+        )
+    }
+
+    @Test
+    fun `abstract service`() {
+        assertServiceLoad<AbstractServiceInterface>(
+            "[]",
+            "[service: org.apache.jmeter.util.services.AbstractServiceInterface, className: org.apache.jmeter.util.services.AbstractService, exceptionClass: java.util.ServiceConfigurationError, causeClass: java.lang.InstantiationException]"
+        )
+    }
+
+    @Test
+    fun `service loads`() {
+        assertServiceLoad<WorkableServiceInterface>(
+            "[test service]",
+            "[]"
+        )
+    }
+
+    private inline fun <reified S : Any> assertServiceLoad(
+        successMessage: String,
+        failureMessage: String,
+    ) {
+        val failures = CollectServiceLoadExceptionHandler<S>()
+        val successes = loadServices<S>(failures)
+        val allFailures = failures.toCollection()
+        assertAll(
+            {
+                assertEquals(successMessage, successes.toString()) {
+                    "Successfully loaded services for ${S::class.java.name}"
+                }
+            },
+            {
+                assertEquals(
+                    failureMessage,
+                    allFailures.map {
+                        "service: ${it.service.name}, " +
+                            "className: ${it.className}, " +
+                            "exceptionClass: ${it.throwable::class.java.name}, " +
+                            "causeClass: ${it.throwable.cause?.let { it::class.java.name }}"
+                    }.toString(),
+                ) {
+                    "All failures when loading service ${S::class.java.name} are $allFailures"
+                }
+            }
+        )
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4ea39463819..f212ecfbf51 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -103,6 +103,7 @@ Summary
   <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
   <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
   <li><pr>5914</pr>Use <code>Locale.ROOT</code> instead of default locale for <code>toUpperCase</code>, and <code>toLowerCase</code> to avoid surprises with dotless I in <code>tr_TR</code> locale</li>
+  <li><pr>5885</pr>Use Java's <code>ServiceLoader</code> for loading plugins instead of classpath scanning. It enables faster startup</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
diff --git a/xdocs/usermanual/jmeter_tutorial.xml b/xdocs/usermanual/jmeter_tutorial.xml
index f32a8d0f887..04dfec7578f 100644
--- a/xdocs/usermanual/jmeter_tutorial.xml
+++ b/xdocs/usermanual/jmeter_tutorial.xml
@@ -168,7 +168,49 @@ write.
 
 </subsection>
 
-<subsection name="&sect-num;.2 JMeter Gui – TestElement Contract" anchor="testelement-contract">
+  <subsection name="&sect-num;.2 JMeter Gui – Service lookup" anchor="service-lookup">
+    <p>
+      JMeter uses classpath scanning to detect plugins (e.g. functions, components, views). However, classpath scanning
+      is expensive,
+      so JMeter also provides a service lookup mechanism to allow plugins to be found without scanning the classpath.
+      That is if a plugin registers a Java service with <code>META-INF/services</code>, then JMeter won't need to scan
+      the classpath to find it.
+    </p>
+
+    <p>
+      Some of the existing features already use the new service lookup mechanism, but it is not yet used for all
+      features.
+      The interfaces that are supported for service loading are marked with
+      <code>org.apache.jorphan.reflect.JMeterService</code>
+      annotation.
+    </p>
+
+    <p>
+      Implementing a service the same as regular interface implementation, except you need to register the service
+      in a <code>META-INF/services/fully.qualified.interface.name</code>.
+      For instance you could use <code>@AutoService</code> to generate the file automatically at the build time.
+      Here's how <code>__counter</code> function is declared in JMeter itself:
+<source>
+import com.google.auto.service.AutoService;
+
+@AutoService(Function.class)
+public class IterationCounter extends AbstractFunction implements ThreadListener {
+</source>
+    </p>
+
+    <p>
+      For backward compatibility reasons, JMeter would still try searching the implementations with classpath scanning,
+      so you don't have to use <code>META-INF/services</code> for registering services. However, service lookup is much
+      faster, so exposing services would improve startup time, especially when there are many plugins.
+    </p>
+
+    <p>
+      As you add <code>META-INF/services</code> to your plugins, you can add <code>JMeter-Skip-Class-Scanning: true</code>
+      manifest attribute so JMeter knows there's no need to scan the jar as it provides all the plugins via services.
+    </p>
+  </subsection>
+
+<subsection name="&sect-num;.3 JMeter Gui – TestElement Contract" anchor="testelement-contract">
 
 <p>
 When writing any JMeter component, there are certain contracts you must be aware of – ways a
@@ -327,7 +369,7 @@ Writing Visualizers is somewhat of a special case, however.
 
 </subsection>
 
-<subsection name="&sect-num;.3 Writing a Visualizer" anchor="visualizer">
+<subsection name="&sect-num;.4 Writing a Visualizer" anchor="visualizer">
 <note>Load Testing in GUI mode being a bad practice, you should not develop such plugin. Have
 a look at more up to date components like:
 <ul>
@@ -537,7 +579,7 @@ added so that users can save a screen capture of any given visualizer.
 
 </subsection>
 
-<subsection name="&sect-num;.4 GraphListener" anchor="graphlistener">
+<subsection name="&sect-num;.5 GraphListener" anchor="graphlistener">
 <note>Load Testing in GUI mode being a bad practice, you should not develop such plugin. Have
 a look at more up to date components like:
 <ul>
@@ -571,7 +613,7 @@ implement the interface, please look at <code>GraphVisualizer</code>.
 
 </subsection>
 
-<subsection name="&sect-num;.5 Writing Custom Graphs" anchor="custom-graphs">
+<subsection name="&sect-num;.6 Writing Custom Graphs" anchor="custom-graphs">
 <note>Load Testing in GUI mode being a bad practice, you should not develop such plugin. Have
 a look at more up to date components like:
 <ul>
@@ -715,7 +757,7 @@ and predictable.
 
 </subsection>
 
-<subsection name="&sect-num;.6 Making a TestBean Plugin For JMeter" anchor="testbean">
+<subsection name="&sect-num;.7 Making a TestBean Plugin For JMeter" anchor="testbean">
 
 <p>
 In this part, we will go through the process of creating a simple component for JMeter that uses
@@ -860,7 +902,7 @@ p.setPropertyEditorClass(FileEditor.class);
 
 </subsection>
 
-<subsection name="&sect-num;.6 Building JMeter" anchor="building">
+<subsection name="&sect-num;.8 Building JMeter" anchor="building">
 
 <p>
 JMeter uses Gradle to compile and build the distribution. JMeter has

From d0bdbafd7bbedb5e9fc32855740b52cda4282638 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 2 Mar 2023 11:14:47 +0300
Subject: [PATCH 0443/1037] fix: disable FunctionProperty caching

Previously it cached the values based on iteration number only
which triggered wrong results on concurrent executions.

The previous behavior can be temporary restored with
function.cache.per.iteration=true property.
---
 bin/jmeter.properties                         |  7 +++++++
 .../property/FunctionProperty.java            | 19 +++++++++++++++++--
 xdocs/changes.xml                             |  4 ++++
 xdocs/usermanual/properties_reference.xml     |  9 +++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 69b77d46bdf..410ae168199 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1055,6 +1055,13 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
 # ORO PatternCacheLRU size
 #oro.patterncache.size=1000
 
+# Cache function execution during test execution
+# By default, JMeter caches function properties, however, it might cause unexpected results
+# when the component is shared across threads and the expression depends on the thread variables.
+# The caching behaviour would likely change in the upcoming versions
+# Deprecation notice: the setting will likely disappear, so if you need it, consider raising an issue with the use-case.
+#function.cache.per.iteration=false
+
 #TestBeanGui
 #
 #propertyEditorSearchPath=null
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
index a4adf027747..238ec0184f3 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
@@ -21,19 +21,28 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * Class that implements the Function property
  */
 public class FunctionProperty extends AbstractProperty {
     private static final long serialVersionUID = 233L;
+    private static final boolean FUNCTION_CACHE_PER_ITERATION =
+            JMeterUtils.getPropDefault("function.cache.per.iteration", false);
 
     private transient CompoundVariable function;
 
     private int testIteration = -1;
 
+    /**
+     * The cache will be removed in the subsequent releases.
+     * For now, it is kept for backward compatibility.
+     */
     private String cacheValue;
 
+    private String overrideValue;
+
     public FunctionProperty(String name, CompoundVariable func) {
         super(name);
         function = func;
@@ -48,7 +57,7 @@ public void setObjectValue(Object v) {
         if (v instanceof CompoundVariable && !isRunningVersion()) {
             function = (CompoundVariable) v;
         } else {
-            cacheValue = v.toString();
+            overrideValue = v.toString();
         }
     }
 
@@ -87,7 +96,11 @@ public String getStringValue() {
             log.debug("Not running version, return raw function string");
             return function.getRawParameters();
         }
-        if(!ctx.isSamplingStarted()) {
+        String overrideValue = this.overrideValue;
+        if (overrideValue != null) {
+            return overrideValue;
+        }
+        if (!FUNCTION_CACHE_PER_ITERATION || !ctx.isSamplingStarted()) {
             return function.execute();
         }
         log.debug("Running version, executing function");
@@ -115,6 +128,7 @@ public Object getObjectValue() {
     public FunctionProperty clone() {
         FunctionProperty prop = (FunctionProperty) super.clone();
         prop.cacheValue = cacheValue;
+        prop.overrideValue = overrideValue;
         prop.testIteration = testIteration;
         prop.function = function;
         return prop;
@@ -126,5 +140,6 @@ public FunctionProperty clone() {
     @Override
     public void recoverRunningVersion(TestElement owner) {
         cacheValue = null;
+        overrideValue = null;
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f212ecfbf51..449fa8f4818 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -104,6 +104,10 @@ Summary
   <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
   <li><pr>5914</pr>Use <code>Locale.ROOT</code> instead of default locale for <code>toUpperCase</code>, and <code>toLowerCase</code> to avoid surprises with dotless I in <code>tr_TR</code> locale</li>
   <li><pr>5885</pr>Use Java's <code>ServiceLoader</code> for loading plugins instead of classpath scanning. It enables faster startup</li>
+  <li><pr>5788</pr><code>FunctionProperty</code> no longer caches the value.
+    Previously it cached the values based on iteration number only which triggered wrong results on concurrent executions.
+    The previous behavior can be temporary restored with <code>function.cache.per.iteration</code> property.
+  </li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index 68441b1bb82..cb32afcefa9 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1339,6 +1339,15 @@ JMETER-SERVER</source>
     ORO PatternCacheLRU size.<br/>
     Defaults to: <code>1000</code>
 </property>
+<property name="function.cache.per.iteration">
+    <p>Cache function execution during test execution.</p>
+    <p>By default, JMeter caches function properties during a test iteration, however,
+    it might cause unexpected results when a component is shared across threads and the expression depends on
+    the thread variables.</p>
+    <note>The property will likely be removed in an upcoming version, so if you need it consider raising
+     an issue with your use-case.</note>
+    Defaults to: <code>false</code>
+</property>
 <property name="propertyEditorSearchPath">
     TestBeanGui<br/>
     Defaults to: <code>null</code>

From 41981f0aa46957e89f5b69f354f1c4cf1484ed7c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 5 May 2023 22:42:41 +0300
Subject: [PATCH 0444/1037] fix: avoid calling getScript and getFilename two
 times in BeanShellSampler, and JSR223TestSampler

Previously, BeanShellSampler called getScript several times which
might cause wrong results when the script included a function that
changes on each call (e.g. couter).
Now getScript is called only once per sample.
---
 .../jmeter/util/BeanShellTestElement.java     | 33 ++++++++++-
 .../apache/jmeter/util/JSR223TestElement.java | 21 ++++---
 src/protocol/java/build.gradle.kts            |  6 ++
 .../java/sampler/BeanShellSampler.java        | 10 +---
 .../java/sampler/BeanShellSamplerTest.kt      | 57 +++++++++++++++++++
 5 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
index a58a992f094..816b3299e1d 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
@@ -19,6 +19,7 @@
 
 import java.io.Serializable;
 
+import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.ThreadListener;
@@ -130,12 +131,31 @@ public Object clone() {
      * <li>Parameters</li>
      * <li>bsh.args</li>
      * </ul>
-     * @param bsh the interpreter, not {@code null}
+     *
+     * @param bsh          the interpreter, not {@code null}
      * @return the result of the script, may be {@code null}
+     * @throws JMeterException when working with the bsh fails
+     */
+    protected Object processFileOrScript(BeanShellInterpreter bsh) throws JMeterException {
+        return processFileOrScript(bsh, null);
+    }
+
+    /**
+     * Process the file or script from the test element.
+     * <p>
+     * Sets the following script variables:
+     * <ul>
+     * <li>FileName</li>
+     * <li>Parameters</li>
+     * <li>bsh.args</li>
+     * </ul>
      *
+     * @param bsh          the interpreter, not {@code null}
+     * @param sampleResult sampler result to set {@code setSamplerData} or {@code null}
+     * @return the result of the script, may be {@code null}
      * @throws JMeterException when working with the bsh fails
      */
-    protected Object processFileOrScript(BeanShellInterpreter bsh) throws JMeterException{
+    protected Object processFileOrScript(BeanShellInterpreter bsh, SampleResult sampleResult) throws JMeterException {
         String fileName = getFilename();
         String params = getParameters();
 
@@ -147,7 +167,14 @@ protected Object processFileOrScript(BeanShellInterpreter bsh) throws JMeterExce
                 JOrphanUtils.split(params, " "));//$NON-NLS-1$
 
         if (fileName.length() == 0) {
-            return bsh.eval(getScript());
+            String bshScript = getScript();
+            if (sampleResult != null) {
+                sampleResult.setSamplerData(bshScript);
+            }
+            return bsh.eval(bshScript);
+        }
+        if (sampleResult != null) {
+            sampleResult.setSamplerData(fileName);
         }
         return bsh.source(fileName);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index dded66ed6e3..b46b555d152 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -182,13 +182,14 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
             bindings = scriptEngine.createBindings();
         }
         populateBindings(bindings);
-        File scriptFile = new File(getFilename());
+        String filename = getFilename();
+        File scriptFile = new File(filename);
         // Hack: bsh-2.0b5.jar BshScriptEngine implements Compilable but throws
         // "java.lang.Error: unimplemented"
         boolean supportsCompilable = scriptEngine instanceof Compilable
                 && !"bsh.engine.BshScriptEngine".equals(scriptEngine.getClass().getName()); // NOSONAR // $NON-NLS-1$
         try {
-            if (!StringUtils.isEmpty(getFilename())) {
+            if (!StringUtils.isEmpty(filename)) {
                 if (!scriptFile.isFile()) {
                     throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
                             + "' is not a file for element: " + getName());
@@ -213,20 +214,22 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
                     }
                 });
                 return compiledScript.eval(bindings);
-            } else if (!StringUtils.isEmpty(getScript())) {
+            }
+            String script = getScript();
+            if (!StringUtils.isEmpty(script)) {
                 if (supportsCompilable &&
                         !ScriptingBeanInfoSupport.FALSE_AS_STRING.equals(cacheKey)) {
-                    computeScriptMD5();
+                    computeScriptMD5(script);
                     CompiledScript compiledScript = getCompiledScript(scriptMd5, key -> {
                         try {
-                            return ((Compilable) scriptEngine).compile(getScript());
+                            return ((Compilable) scriptEngine).compile(script);
                         } catch (ScriptException e) {
                             throw new ScriptCompilationInvocationTargetException(e);
                         }
                     });
                     return compiledScript.eval(bindings);
                 } else {
-                    return scriptEngine.eval(getScript(), bindings);
+                    return scriptEngine.eval(script, bindings);
                 }
             } else {
                 throw new ScriptException("Both script file and script text are empty for element:" + getName());
@@ -304,10 +307,10 @@ public boolean compile()
     /**
      * compute MD5 if it is null
      */
-    private void computeScriptMD5() {
+    private void computeScriptMD5(String script) {
         // compute the md5 of the script if needed
         if(scriptMd5 == null) {
-            scriptMd5 = ScriptCacheKey.ofString(DigestUtils.md5Hex(getScript()));
+            scriptMd5 = ScriptCacheKey.ofString(DigestUtils.md5Hex(script));
         }
     }
 
@@ -355,7 +358,7 @@ public void testEnded() {
     @Override
     public void testEnded(String host) {
         COMPILED_SCRIPT_CACHE.invalidateAll();
-        this.scriptMd5 = null;
+        scriptMd5 = null;
     }
 
     public String getScriptLanguage() {
diff --git a/src/protocol/java/build.gradle.kts b/src/protocol/java/build.gradle.kts
index 4f4211d0745..4a3cb322ec3 100644
--- a/src/protocol/java/build.gradle.kts
+++ b/src/protocol/java/build.gradle.kts
@@ -30,4 +30,10 @@ dependencies {
     }
 
     testImplementation(project(":src:core", "testClasses"))
+    testImplementation(projects.src.functions) {
+        because("We need __counter function for tests")
+    }
+    testImplementation("org.apache-extras.beanshell:bsh") {
+        because("BeanShellTest needs BeanShell, and previously :protocol:java was not including a dependency on BeanShell")
+    }
 }
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
index e95bf87141b..45f215eb2e3 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
@@ -102,14 +102,6 @@ public SampleResult sample(Entry e)// Entry tends to be ignored ...
             return res;
         }
         try {
-            String request = getScript();
-            String fileName = getFilename();
-            if (fileName.length() == 0) {
-                res.setSamplerData(request);
-            } else {
-                res.setSamplerData(fileName);
-            }
-
             bshInterpreter.set("SampleResult", res); //$NON-NLS-1$
 
             // Set default values
@@ -120,7 +112,7 @@ public SampleResult sample(Entry e)// Entry tends to be ignored ...
             res.setDataType(SampleResult.TEXT); // assume text output - script can override if necessary
 
             savedBsh = bshInterpreter;
-            Object bshOut = processFileOrScript(bshInterpreter);
+            Object bshOut = processFileOrScript(bshInterpreter, res);
             savedBsh = null;
 
             if (bshOut != null) {// Set response data
diff --git a/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt b/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt
new file mode 100644
index 00000000000..143b91a75fb
--- /dev/null
+++ b/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.java.sampler
+
+import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.FunctionProperty
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class BeanShellSamplerTest {
+    // TODO: move to TestElement itself?
+    private fun TestElement.setFunctionProperty(name: String, expression: String) {
+        setProperty(
+            FunctionProperty(
+                name,
+                CompoundVariable(expression).function
+            )
+        )
+    }
+
+    @Test
+    fun `getScript executes only once`() {
+        val sampler = BeanShellSampler().apply {
+            name = "BeanShell Sampler"
+            setFunctionProperty(
+                BeanShellSampler.SCRIPT,
+                """ResponseMessage="COUNTER=${"$"}{__counter(FALSE)}""""
+            )
+            setProperty(BeanShellSampler.FILENAME, "")
+            setProperty(BeanShellSampler.PARAMETERS, "")
+            isRunningVersion = true
+        }
+        val result = sampler.sample(null)
+        assertEquals(
+            "COUNTER=1",
+            result.responseMessage,
+            "__counter(false) should return 1 on the first execution. If the value is different, it might mean " +
+                "the script was evaluated several times"
+        )
+    }
+}

From 91e421ddfc95dce528c9fdebd36545013268edab Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 May 2023 22:38:05 +0300
Subject: [PATCH 0445/1037] chore: bump lets-plot-kotlin-jvm to 4.4.1

org.jetbrains.lets-plot dependencies should be upgraded together otherwise
NoSuchMethodError is possible.
---
 renovate.json                       | 4 ++++
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index ddf6c01605c..5dc94b3f3aa 100644
--- a/renovate.json
+++ b/renovate.json
@@ -51,6 +51,10 @@
       "matchPackagePrefixes": ["org.checkerframework"],
       "groupName": "org.checkerframework"
     },
+    {
+      "matchPackagePrefixes": ["org.jetbrains.lets-plot"],
+      "groupName": "org.jetbrains.lets-plot"
+    },
     {
       "matchPackagePrefixes": ["org.jodd"],
       "groupName": "org.jodd"
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 3483b7c2c5d..531f9d17539 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
         }
         api("org.jetbrains:annotations:24.0.1")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
-        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
         api("net.minidev:accessors-smart:2.4.9")
         api("net.minidev:json-smart:2.4.10")
         api("net.sf.jtidy:jtidy:r938")

From bce4e6996d5bee16ec0642fd66d046db85f78d5b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 13 May 2023 22:56:01 +0300
Subject: [PATCH 0446/1037] test: add test for overriding FunctionProperty
 value while test is runing

Previously, it was possible to override FunctionProperty value
when the test is running with #setObjectValue.
It is not clear what was the use case, but the possibility was there.

So here's a test so we don't accidentally break that when removing
FunctionProperty caching.
---
 .../property/FunctionPropertyTest.kt          | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/testelement/property/FunctionPropertyTest.kt

diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/FunctionPropertyTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/FunctionPropertyTest.kt
new file mode 100644
index 00000000000..eddf700021c
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/FunctionPropertyTest.kt
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.threads.JMeterContextService
+import org.apache.jmeter.threads.JMeterVariables
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class FunctionPropertyTest {
+    @Test
+    fun `override value when running`() {
+        JMeterContextService.getContext().apply {
+            variables = JMeterVariables().apply {
+                put("test_variable", "1")
+            }
+        }
+        val p = FunctionProperty(
+            "test",
+            CompoundVariable("test_variable=\${test_variable}").function
+        )
+        p.isRunningVersion = true
+
+        Assertions.assertEquals("test_variable=1", p.stringValue, "function should read value from the variables")
+
+        p.objectValue = "overridden with setObjectValue"
+
+        Assertions.assertEquals(
+            "overridden with setObjectValue",
+            p.stringValue,
+            "function should read value passed with setObjectValue"
+        )
+
+        p.recoverRunningVersion(null)
+
+        JMeterContextService.getContext().variables.put("test_variable", "2")
+
+        Assertions.assertEquals(
+            "test_variable=2",
+            p.stringValue,
+            "function should read value from the variables after recoverRunningVersion"
+        )
+    }
+}

From 4a444d03701d7248d2567394271a976029ba27f5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 14 May 2023 18:38:28 +0000
Subject: [PATCH 0447/1037] fix(deps): update dependency
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.7.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 531f9d17539..5d3c38f2478 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.0"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From 5f1c8db5e58943d8c775cb8435b8eb957e75b326 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 11:27:03 +0300
Subject: [PATCH 0448/1037] style: fix import order in RenderInBrowser

---
 .../java/org/apache/jmeter/visualizers/RenderInBrowser.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
index eab0bfd39ac..4f3d71cb7d5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
@@ -27,11 +27,11 @@
 import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
 
-import com.google.auto.service.AutoService;
-
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
+import com.google.auto.service.AutoService;
+
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;

From 6d9716da91ea071d50dcea84443e0c1984de716f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 11:39:30 +0300
Subject: [PATCH 0449/1037] fix: account for Provider ... is not a subtype
 errors in ClassFinder#loadServices

---
 .../main/java/org/apache/jorphan/reflect/ClassFinder.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 22d08caed99..35babc7c5c3 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -134,10 +134,13 @@ public static <S> Collection<S> loadServices(
                         );
                     } else if (message.endsWith(" could not be instantiated")) {
                         className = message.substring(
-                                service.getName().length() + ": ".length() + "Provider ".length(),
+                                service.getName().length() + ": ".length(),
                                 message.length() - " could not be instantiated".length()
                         );
                     }
+                    if (className.startsWith("Provider ")) {
+                        className = className.substring("Provider ".length());
+                    }
                 }
                 exceptionHandler.handle(service, className, e);
             }

From da0f2d198042bc1d712ab81f63460c03daa4acca Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 19:06:44 +0300
Subject: [PATCH 0450/1037] test: remove exception class from the assertion in
 ServiceLoaderTest as it varies across Java implementations

We still assert that we properly fetch "problematic service implementation class".
---
 .../src/test/kotlin/ServiceLoaderTest.kt      | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/test-services/src/test/kotlin/ServiceLoaderTest.kt b/src/test-services/src/test/kotlin/ServiceLoaderTest.kt
index 3c4d1d1957a..441967754da 100644
--- a/src/test-services/src/test/kotlin/ServiceLoaderTest.kt
+++ b/src/test-services/src/test/kotlin/ServiceLoaderTest.kt
@@ -31,7 +31,7 @@ class ServiceLoaderTest {
     fun `service without public constructor`() {
         assertServiceLoad<ServiceWithPrivateConstructorInterface>(
             "[]",
-            "[service: org.apache.jmeter.util.services.ServiceWithPrivateConstructorInterface, className: org.apache.jmeter.util.services.ServiceWithPrivateConstructor, exceptionClass: java.util.ServiceConfigurationError, causeClass: java.lang.NoSuchMethodException]"
+            "[service: org.apache.jmeter.util.services.ServiceWithPrivateConstructorInterface, implementationClass: org.apache.jmeter.util.services.ServiceWithPrivateConstructor]"
         )
     }
 
@@ -39,7 +39,7 @@ class ServiceLoaderTest {
     fun `service not implementing interface`() {
         assertServiceLoad<NotImplementedInterface>(
             "[]",
-            "[service: org.apache.jmeter.util.services.NotImplementedInterface, className: org.apache.jmeter.util.services.ServiceNotImplementingInterface, exceptionClass: java.util.ServiceConfigurationError, causeClass: null]"
+            "[service: org.apache.jmeter.util.services.NotImplementedInterface, implementationClass: org.apache.jmeter.util.services.ServiceNotImplementingInterface]"
         )
     }
 
@@ -47,7 +47,7 @@ class ServiceLoaderTest {
     fun `service failing in constructor`() {
         assertServiceLoad<ServiceThrowingExceptionInterface>(
             "[]",
-            "[service: org.apache.jmeter.util.services.ServiceThrowingExceptionInterface, className: org.apache.jmeter.util.services.ServiceThrowingException, exceptionClass: java.util.ServiceConfigurationError, causeClass: org.apache.jmeter.util.services.ServiceFailureException]"
+            "[service: org.apache.jmeter.util.services.ServiceThrowingExceptionInterface, implementationClass: org.apache.jmeter.util.services.ServiceThrowingException]"
         )
     }
 
@@ -55,7 +55,7 @@ class ServiceLoaderTest {
     fun `abstract service`() {
         assertServiceLoad<AbstractServiceInterface>(
             "[]",
-            "[service: org.apache.jmeter.util.services.AbstractServiceInterface, className: org.apache.jmeter.util.services.AbstractService, exceptionClass: java.util.ServiceConfigurationError, causeClass: java.lang.InstantiationException]"
+            "[service: org.apache.jmeter.util.services.AbstractServiceInterface, implementationClass: org.apache.jmeter.util.services.AbstractService]"
         )
     }
 
@@ -81,16 +81,24 @@ class ServiceLoaderTest {
                 }
             },
             {
-                assertEquals(
-                    failureMessage,
-                    allFailures.map {
-                        "service: ${it.service.name}, " +
-                            "className: ${it.className}, " +
-                            "exceptionClass: ${it.throwable::class.java.name}, " +
-                            "causeClass: ${it.throwable.cause?.let { it::class.java.name }}"
-                    }.toString(),
-                ) {
-                    "All failures when loading service ${S::class.java.name} are $allFailures"
+                try {
+                    assertEquals(
+                        failureMessage,
+                        allFailures.map {
+                            // it.throwable is not included here as it is not stable across different JVM implementations
+                            "service: ${it.service.name}, " +
+                                "implementationClass: ${it.className}"
+                        }.toString(),
+                    ) {
+                        "All failures when loading service ${S::class.java.name} are $allFailures"
+                    }
+                } catch (e: Throwable) {
+                    // Attach load failure exceptions to the assertion failure, so
+                    // the failure message includes the instantiation failure reason
+                    allFailures.forEach { loadFailure ->
+                        loadFailure.throwable?.let { e.addSuppressed(it) }
+                    }
+                    throw e
                 }
             }
         )

From 968f0f5b9ca11d0f81ed02eff7525afc5feeab31 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 17 May 2023 13:50:17 +0000
Subject: [PATCH 0451/1037] fix(deps): update com.fasterxml.jackson.core to
 v2.15.1

---
 src/bom-thirdparty/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5d3c38f2478..37e21d39916 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -44,9 +44,9 @@ dependencies {
         api("cglib:cglib-nodep:3.3.0")
         api("com.google.auto.service:auto-service:1.0.1")
         api("com.google.auto.service:auto-service-annotations:1.0.1")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
-        api("com.fasterxml.jackson.core:jackson-core:2.13.4")
-        api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.15.1")
+        api("com.fasterxml.jackson.core:jackson-core:2.15.1")
+        api("com.fasterxml.jackson.core:jackson-databind:2.15.1")
         api("com.fifesoft:rsyntaxtextarea:3.3.3")
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")

From 365ddd29a7091eea59f3648d32895a349fb5bd80 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 17 May 2023 15:50:10 +0000
Subject: [PATCH 0452/1037] fix(deps): update dependency commons-io:commons-io
 to v2.12.0

Closes https://github.com/apache/jmeter/pull/5924
---
 src/bom-thirdparty/build.gradle.kts                            | 2 +-
 .../src/main/java/org/apache/jmeter/services/FileServer.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 37e21d39916..6ceb04daf08 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.20")
         api("commons-codec:commons-codec:1.15")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.11.0")
+        api("commons-io:commons-io:2.12.0")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.2")
         api("commons-net:commons-net:3.9.0")
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index c6db700e0a3..3b7e94326d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -423,6 +423,9 @@ private static BufferedReader createBufferedReader(FileEntry fileEntry) throws I
         if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
             throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
         }
+        // TODO: figure out the proper way to use BOMInputStream.builder()
+        //   See https://issues.apache.org/jira/browse/IO-792
+        @SuppressWarnings("deprecation")
         BOMInputStream fis = new BOMInputStream(Files.newInputStream(fileEntry.file.toPath())); //NOSONAR
         InputStreamReader isr = null;
         // If file encoding is specified, read using that encoding, otherwise use default platform encoding

From 2a24991b9d6487a870cf3ec96fe741b66a2a1fa0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 17 May 2023 19:38:36 +0300
Subject: [PATCH 0453/1037] chore: replace deprecated
 NullOutputStream.NULL_OUTPUT_STREAM with NullOutputStream.INSTANCE

See https://github.com/apache/jmeter/pull/5924
---
 .../java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java | 2 +-
 .../org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
index ba0f943e58f..5808730a494 100644
--- a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+++ b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
@@ -237,7 +237,7 @@ public SampleResult sample(Entry e) {
                                 }
                             }
                             if (target == null){
-                                target = NullOutputStream.NULL_OUTPUT_STREAM;
+                                target = NullOutputStream.INSTANCE;
                             }
                             input = ftp.retrieveFileStream(remote);
                             if (input == null){// Could not access file or other error
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index 5008b78ab93..60c6aff2ff8 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -191,7 +191,7 @@ private static boolean executeMessage(SampleResult result, SendMailCommand sendM
     private long calculateMessageSize(Message message) throws IOException, MessagingException {
         if (getPropertyAsBoolean(MESSAGE_SIZE_STATS)) {
             // calculate message size
-            CountingOutputStream cs = new CountingOutputStream(NullOutputStream.NULL_OUTPUT_STREAM);
+            CountingOutputStream cs = new CountingOutputStream(NullOutputStream.INSTANCE);
             message.writeTo(cs);
             return cs.getByteCount();
         } else {

From 75754ce637145c8b8cb0aa803e008b6d04746975 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 15 Jan 2022 20:01:09 +0300
Subject: [PATCH 0454/1037] ci: add randomized matrix for better test coverage

See https://github.com/vlsi/github-actions-random-matrix
---
 .github/workflows/main.yml                    |  68 +++--
 .github/workflows/matrix.js                   | 164 ++++++++++++
 .github/workflows/matrix_builder.js           | 242 ++++++++++++++++++
 .../kotlin/build-logic.test-base.gradle.kts   |   9 +
 src/core/build.gradle.kts                     |   6 +-
 xdocs/changes.xml                             |   1 +
 6 files changed, 464 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/matrix.js
 create mode 100644 .github/workflows/matrix_builder.js

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 73f1f9f5fe1..4dfcc413452 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,40 +18,58 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  windows:
-    name: 'Windows (JDK 17)'
-    runs-on: windows-latest
+  matrix_prep:
+    name: Matrix Preparation
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    env:
+      # Number of jobs to generate in matrix.js
+      MATRIX_JOBS: 4
     steps:
-    - uses: actions/checkout@v3
-    - name: 'Set up JDK 17'
-      uses: actions/setup-java@v3
-      with:
-        java-version: 17
-        distribution: 'zulu'
-    - uses: burrunan/gradle-cache-action@v1
-      name: Test
-      with:
-        job-id: jdk17
-        multi-cache-enabled: false
-        # An explicit skip for Sha512 tasks is required due to https://github.com/gradle/gradle/issues/16789
-        arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512
+      - uses: actions/checkout@v3
+      - id: set-matrix
+        run: |
+          node .github/workflows/matrix.js
 
-  mac:
-    name: 'macOS (JDK 17)'
-    runs-on: macos-latest
+  test:
+    needs: matrix_prep
+    name: '${{ matrix.name }}'
+    runs-on: ${{ matrix.os }}
+    env:
+      TZ: ${{ matrix.tz }}
+    strategy:
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
+      fail-fast: false
+      # max-parallel: 4
     steps:
-    - uses: actions/checkout@v3
-    - name: 'Set up JDK 17'
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 50
+    - name: Set up Java ${{ matrix.java_version }}, ${{ matrix.java_distribution }}
       uses: actions/setup-java@v3
       with:
-        java-version: 17
-        distribution: 'zulu'
+        java-version: ${{ matrix.java_version }}
+        distribution: ${{ matrix.java_distribution }}
+        architecture: x64
+    - name: Steps to reproduce
+      uses: actions/github-script@v6
+      with:
+        script: |
+          console.log('The following command might help reproducing CI results, use Java ${{ matrix.java_version }}')
+          console.log('TZ="${{ matrix.tz }}" _JAVA_OPTIONS="${{ matrix.extraJvmArgs }}" ./gradlew build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512 ${{ matrix.extraGradleArgs }} -PtestExtraJvmArgs="${{ matrix.testExtraJvmArgs }}" -PtestDisableCaching="${{ matrix.testDisableCaching }}"')
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       with:
-        job-id: jdk14
+        job-id: jdk${{ matrix.java_version }}
         multi-cache-enabled: false
-        arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512 -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
+        # An explicit skip for Sha512 tasks is required due to https://github.com/gradle/gradle/issues/16789
+        arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512 ${{ matrix.extraGradleArgs }}
+        properties: |
+          testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}
+          testDisableCaching=${{ matrix.testDisableCaching }}
+      env:
+        _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
 
   errorprone:
     name: 'Error Prone (JDK 11)'
diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
new file mode 100644
index 00000000000..20c32abeb71
--- /dev/null
+++ b/.github/workflows/matrix.js
@@ -0,0 +1,164 @@
+// The script generates a random subset of valid jdk, os, timezone, and other axes.
+// You can preview the results by running "node matrix.js"
+// See https://github.com/vlsi/github-actions-random-matrix
+let fs = require('fs');
+let os = require('os');
+let {MatrixBuilder} = require('./matrix_builder');
+const matrix = new MatrixBuilder();
+matrix.addAxis({
+  name: 'java_distribution',
+  values: [
+    {value: 'corretto', weight: 1},
+    {value: 'liberica', weight: 1},
+    {value: 'microsoft', weight: 1},
+    {value: 'oracle', weight: 1},
+    {value: 'semeru', weight: 4},
+    {value: 'temurin', weight: 1},
+    {value: 'zulu', weight: 1},
+  ]
+});
+
+matrix.addAxis({
+  name: 'java_version',
+  // Strings allow versions like 18-ea
+  values: [
+    '8',
+    '11',
+    '17',
+  ]
+});
+
+matrix.addAxis({
+  name: 'tz',
+  values: [
+    'America/New_York',
+    'Pacific/Chatham',
+    'UTC'
+  ]
+});
+
+matrix.addAxis({
+  name: 'os',
+  title: x => x.replace('-latest', ''),
+  values: [
+    // TODO: X11 is not available. Un-comment when https://github.com/burrunan/gradle-cache-action/issues/48 is resolved
+    // 'ubuntu-latest',
+    'windows-latest',
+    'macos-latest'
+  ]
+});
+
+// Test cases when Object#hashCode produces the same results
+// It allows capturing cases when the code uses hashCode as a unique identifier
+matrix.addAxis({
+  name: 'hash',
+  values: [
+    {value: 'regular', title: '', weight: 42},
+    {value: 'same', title: 'same hashcode', weight: 1}
+  ]
+});
+matrix.addAxis({
+  name: 'locale',
+  title: x => x.language + '_' + x.country,
+  values: [
+    {language: 'de', country: 'DE'},
+    {language: 'fr', country: 'FR'},
+    // TODO: fix :src:dist-check:batchBUG_62847
+    // Fails with "ERROR o.a.j.u.JMeterUtils: Could not find resources for 'ru_EN'"
+    // {language: 'ru', country: 'RU'},
+    {language: 'tr', country: 'TR'},
+  ]
+});
+
+matrix.setNamePattern(['java_version', 'java_distribution', 'hash', 'os', 'tz', 'locale']);
+
+// Semeru uses OpenJ9 jit which has no option for making hash codes the same
+matrix.exclude({java_distribution: {value: 'semeru'}, hash: {value: 'same'}});
+// Microsoft Java has no distribution for 8
+matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
+// Oracle JDK is only supported for JDK 17 and later
+matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']});
+// Ensure at least one job with "same" hashcode exists
+matrix.generateRow({hash: {value: 'same'}});
+// Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)
+matrix.generateRow({os: 'windows-latest'});
+// TODO: un-comment when xvfb will be possible
+// matrix.generateRow({os: 'ubuntu-latest'});
+// Ensure there will be at least one job with Java 8
+matrix.generateRow({java_version: "8"});
+// Ensure there will be at least one job with Java 11
+matrix.generateRow({java_version: "11"});
+// Ensure there will be at least one job with Java 17
+matrix.generateRow({java_version: "17"});
+const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
+if (include.length === 0) {
+  throw new Error('Matrix list is empty');
+}
+include.sort((a, b) => a.name.localeCompare(b.name, undefined, {numeric: true}));
+include.forEach(v => {
+  // Pass locale via Gradle arguments in case it won't be inherited from _JAVA_OPTIONS
+  // In fact, _JAVA_OPTIONS is non-standard and might be ignored by some JVMs
+  let gradleArgs = [
+    `-Duser.country=${v.locale.country}`,
+    `-Duser.language=${v.locale.language}`,
+  ];
+  if (v.hash.value === 'same' && v.java_version <= 8) {
+    // processSiteXslt fails with VerifyError when running with Java 8 and the same hashcode
+    // Skip the task in that case
+    //java.lang.VerifyError: (class: website_style, method: issue_separator signature: (Lcom/sun/org/apache/xala...)
+    // Illegal target of jump or branch
+    gradleArgs.push('-x :src:dist:processSiteXslt');
+    // javadoc tool seems take too much CPU when there are many hash collisions
+    gradleArgs.push('-x :src:dist:javadocAggregate');
+  }
+  v.extraGradleArgs = gradleArgs.join(' ');
+});
+include.forEach(v => {
+  let jvmArgs = [];
+  // Extra JVM arguments passed to test execution
+  let testJvmArgs = [];
+  if (v.hash.value === 'same') {
+    testJvmArgs.push('-XX:+UnlockExperimentalVMOptions', '-XX:hashCode=2');
+  }
+  // Gradle does not work in tr_TR locale, so pass locale to test only: https://github.com/gradle/gradle/issues/17361
+  jvmArgs.push(`-Duser.country=${v.locale.country}`);
+  jvmArgs.push(`-Duser.language=${v.locale.language}`);
+  v.java_distribution = v.java_distribution.value;
+  if (v.java_distribution !== 'semeru' && Math.random() > 0.5) {
+    // The following options randomize instruction selection in JIT compiler
+    // so it might reveal missing synchronization in TestNG code
+    v.name += ', stress JIT';
+    v.testDisableCaching = 'JIT randomization should not be cached';
+    jvmArgs.push('-XX:+UnlockDiagnosticVMOptions');
+    if (v.java_version >= 8) {
+      // Randomize instruction scheduling in GCM
+      // share/opto/c2_globals.hpp
+      jvmArgs.push('-XX:+StressGCM');
+      // Randomize instruction scheduling in LCM
+      // share/opto/c2_globals.hpp
+      jvmArgs.push('-XX:+StressLCM');
+    }
+    if (v.java_version >= 16) {
+      // Randomize worklist traversal in IGVN
+      // share/opto/c2_globals.hpp
+      jvmArgs.push('-XX:+StressIGVN');
+    }
+    if (v.java_version >= 17) {
+      // Randomize worklist traversal in CCP
+      // share/opto/c2_globals.hpp
+      jvmArgs.push('-XX:+StressCCP');
+    }
+  }
+  v.extraJvmArgs = jvmArgs.join(' ');
+  v.testExtraJvmArgs = testJvmArgs.join(' ::: ');
+  delete v.hash;
+});
+
+console.log(include);
+
+let filePath = process.env['GITHUB_OUTPUT'] || '';
+if (filePath) {
+    fs.appendFileSync(filePath, `matrix<<MATRIX_BODY${os.EOL}${JSON.stringify({include})}${os.EOL}MATRIX_BODY${os.EOL}`, {
+        encoding: 'utf8'
+    });
+}
diff --git a/.github/workflows/matrix_builder.js b/.github/workflows/matrix_builder.js
new file mode 100644
index 00000000000..fd765117e8b
--- /dev/null
+++ b/.github/workflows/matrix_builder.js
@@ -0,0 +1,242 @@
+// License: Apache-2.0
+// Copyright Vladimir Sitnikov, 2021
+// See https://github.com/vlsi/github-actions-random-matrix
+
+class Axis {
+  constructor({name, title, values}) {
+    this.name = name;
+    this.title = title;
+    this.values = values;
+    // If all entries have same weight, the axis has uniform distribution
+    this.uniform = values.reduce((a, b) => a === (b.weight || 1) ? a : 0, values[0].weight || 1) !== 0
+    this.totalWeight = this.uniform ? values.length : values.reduce((a, b) => a + (b.weight || 1), 0);
+  }
+
+  static matches(row, filter) {
+    if (typeof filter === 'function') {
+      return filter(row);
+    }
+    if (Array.isArray(filter)) {
+      // e.g. row={os: 'windows'}; filter=[{os: 'linux'}, {os: 'linux'}]
+      return filter.find(v => Axis.matches(row, v));
+    }
+    if (typeof filter === 'object') {
+      // e.g. row={jdk: {name: 'openjdk', version: 8}}; filter={jdk: {version: 8}}
+      for (const [key, value] of Object.entries(filter)) {
+        if (!row.hasOwnProperty(key) || !Axis.matches(row[key], value)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return row === filter;
+  }
+
+  pickValue(filter) {
+    let values = this.values;
+    if (filter) {
+      values = values.filter(v => Axis.matches(v, filter));
+    }
+    if (values.length === 0) {
+      const filterStr = typeof filter === 'string' ? filter.toString() : JSON.stringify(filter);
+      throw Error(`No values produces for axis '${this.name}' from ${JSON.stringify(this.values)}, filter=${filterStr}`);
+    }
+    if (values.length === 1) {
+      return values[0];
+    }
+    if (this.uniform) {
+      return values[Math.floor(Math.random() * values.length)];
+    }
+    const totalWeight = !filter ? this.totalWeight : values.reduce((a, b) => a + (b.weight || 1), 0);
+    let weight = Math.random() * totalWeight;
+    for (let i = 0; i < values.length; i++) {
+      const value = values[i];
+      weight -= value.weight || 1;
+      if (weight <= 0) {
+        return value;
+      }
+    }
+    return values[values.length - 1];
+  }
+}
+
+class MatrixBuilder {
+  constructor() {
+    this.axes = [];
+    this.axisByName = {};
+    this.rows = [];
+    this.duplicates = {};
+    this.excludes = [];
+    this.includes = [];
+    this.failOnUnsatisfiableFilters = false;
+  }
+
+  /**
+   * Specifies include filter (all the generated rows would comply with all the include filters)
+   * @param filter
+   */
+  include(filter) {
+    this.includes.push(filter);
+  }
+
+  /**
+   * Specifies exclude filter (e.g. exclude a forbidden combination)
+   * @param filter
+   */
+  exclude(filter) {
+    this.excludes.push(filter);
+  }
+
+  addAxis({name, title, values}) {
+    const axis = new Axis({name, title, values});
+    this.axes.push(axis);
+    this.axisByName[name] = axis;
+    return axis;
+  }
+
+  setNamePattern(names) {
+    this.namePattern = names;
+  }
+
+  /**
+   * Returns true if the row matches the include and exclude filters.
+   * @param row input row
+   * @returns {boolean}
+   */
+  matches(row) {
+    return (this.excludes.length === 0 || !this.excludes.find(f => Axis.matches(row, f))) &&
+           (this.includes.length === 0 || this.includes.find(f => Axis.matches(row, f)));
+  }
+
+  failOnUnsatisfiableFilters(value) {
+    this.failOnUnsatisfiableFilters = value;
+  }
+
+  /**
+   * Adds a row that matches the given filter to the resulting matrix.
+   * filter values could be
+   *  - literal values: filter={os: 'windows-latest'}
+   *  - arrays: filter={os: ['windows-latest', 'linux-latest']}
+   *  - functions: filter={os: x => x!='windows-latest'}
+   * @param filter object with keys matching axes names
+   * @returns {*}
+   */
+  generateRow(filter) {
+    let res;
+    if (filter) {
+      // If matching row already exists, no need to generate more
+      res = this.rows.find(v => Axis.matches(v, filter));
+      if (res) {
+        return res;
+      }
+    }
+    for (let i = 0; i < 142; i++) {
+      res = this.axes.reduce(
+        (prev, next) =>
+          Object.assign(prev, {
+            [next.name]: next.pickValue(filter ? filter[next.name] : undefined)
+          }),
+        {}
+      );
+      if (!this.matches(res)) {
+        continue;
+      }
+      const key = JSON.stringify(res);
+      if (!this.duplicates.hasOwnProperty(key)) {
+        this.duplicates[key] = true;
+        res.name =
+          this.namePattern.map(axisName => {
+            let value = res[axisName];
+            const title = value.title;
+            if (typeof title != 'undefined') {
+              return title;
+            }
+            const computeTitle = this.axisByName[axisName].title;
+            if (computeTitle) {
+                return computeTitle(value);
+            }
+            if (typeof value === 'object' && value.hasOwnProperty('value')) {
+                return value.value;
+            }
+            return value;
+          }).filter(Boolean).join(", ");
+        this.rows.push(res);
+        return res;
+      }
+    }
+    const filterStr = typeof filter === 'string' ? filter.toString() : JSON.stringify(filter);
+    const msg = `Unable to generate row for ${filterStr}. Please check include and exclude filters`;
+    if (this.failOnUnsatisfiableFilters) {
+      throw Error(msg);
+    } else {
+      console.warn(msg);
+    }
+  }
+
+  generateRows(maxRows, filter) {
+    for (let i = 0; this.rows.length < maxRows && i < maxRows; i++) {
+      this.generateRow(filter);
+    }
+    return this.rows;
+  }
+
+  /**
+   * Computes the number of all the possible combinations.
+   * @returns {{bad: number, good: number}}
+   */
+  summary() {
+   let position = -1;
+   let indices = [];
+   let values = {};
+   const axes = this.axes;
+   function resetValuesUpTo(nextPosition) {
+     for(let i=0; i<nextPosition; i++) {
+       const axis = axes[i];
+       values[axis.name] = axis.values[0];
+       indices[i] = 1; // next index
+     }
+     position = 0;
+   }
+
+   function nextAvailablePosition() {
+    let size = axes.length;
+    for (let i = position; i < size; i++) {
+      if (indices[i] < axes[i].values.length) {
+        return i;
+      }
+    }
+    return -1;
+   }
+   // The first initialization of the values
+   resetValuesUpTo(this.axes.length);
+   let good = 0;
+   let bad = 0;
+   while (true) {
+     if (indices[position] < this.axes[position].values.length) {
+       // Advance iterator at the current position if possible
+       const axis = this.axes[position];
+       values[axis.name] = axis.values[indices[position]];
+       indices[position]++;
+     } else {
+       // Advance the next iterator, and reset [0..nextPosition)
+       position++;
+       let nextPosition = nextAvailablePosition();
+       if (nextPosition === -1) {
+         break;
+       }
+       const axis = this.axes[nextPosition];
+       values[axis.name] = axis.values[indices[nextPosition]];
+       indices[nextPosition]++;
+       resetValuesUpTo(nextPosition);
+     }
+     if (this.matches(values)) {
+       good++;
+     } else {
+       bad++;
+     }
+   }
+   return {good: good, bad: bad};
+  }
+}
+
+module.exports = {Axis, MatrixBuilder};
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
index 320d0b68a90..1f92a9c96c2 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 import com.github.vlsi.gradle.dsl.configureEach
+import com.github.vlsi.gradle.properties.dsl.props
 import org.gradle.api.JavaVersion
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -46,6 +47,14 @@ tasks.configureEach<Test> {
     }.forEach {
         systemProperty(it.key.toString().substring("jmeter.properties.".length), it.value)
     }
+    props.string("testExtraJvmArgs").trim().takeIf { it.isNotBlank() }?.let {
+        jvmArgs(it.split(" ::: "))
+    }
+    props.string("testDisableCaching").trim().takeIf { it.isNotBlank() }?.let {
+        outputs.doNotCacheIf(it) {
+            true
+        }
+    }
     passProperty("java.awt.headless")
     passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
     // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index af479d8ac18..7572f30d061 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 import com.github.autostyle.gradle.AutostyleTask
+import com.github.vlsi.gradle.ide.IdeExtension
 
 plugins {
     id("build-logic.jvm-published-library")
@@ -140,7 +141,10 @@ val versionClass by tasks.registering(Sync::class) {
     into(generatedVersionDir)
 }
 
-ide {
+// For some reason, using `ide { ... }` sometimes causes
+// Caused by: java.lang.IllegalStateException: couldn't find inline method
+// Lorg/gradle/kotlin/dsl/Accessorslkzxmv806rumtqvft7195qyhKt;.getIde(Lorg/gradle/api/Project;)Lcom/github/vlsi/gradle/ide/IdeExtension;
+configure<IdeExtension> {
     generatedJavaSources(versionClass.get(), generatedVersionDir)
 }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 449fa8f4818..7d28fa3cb88 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -130,6 +130,7 @@ Summary
   <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
   <li>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
   <li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
+  <li>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 7c1603414fa3fde9880d22d9750b08791f105925 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 31 Oct 2022 12:15:23 +0300
Subject: [PATCH 0455/1037] test: ignore ChangeCaseSpec in tr_TR locale

__changeCase uses java-default locale, so the test does not support
tr_TR locale.


See https://github.com/apache/jmeter/issues/5723
---
 .../groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy b/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy
index 15624ae98ac..e86e5c9fb03 100644
--- a/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy
+++ b/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy
@@ -22,12 +22,15 @@ import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
 
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 import spock.lang.Unroll
 
 @Unroll
 class ChangeCaseSpec extends Specification {
 
+    // See https://github.com/apache/jmeter/issues/5723
+    @IgnoreIf({ 'i'.toUpperCase() != 'I' || 'I'.toLowerCase() != 'i' })
     def "convert '#input' using mode #mode to '#output'"() {
         given:
             def changeCase = new ChangeCase()

From 42f91f7fa8a5e2bab255d087363b9f7b5c0380f3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 30 Apr 2023 09:24:30 +0300
Subject: [PATCH 0456/1037] Avoid wrong results when Object.hashCode()
 collides, use IdentityHashMap instead of HashMap when key is TestElement

See https://github.com/apache/jmeter/pull/693
---
 .../timers/ConstantThroughputTimer.java       | 14 ++---
 .../PreciseThroughputTimer.java               | 13 ++++-
 .../jmeter/control/GenericController.java     | 16 +++---
 .../org/apache/jmeter/gui/GuiPackage.java     |  3 +-
 .../jmeter/testbeans/gui/TestBeanGUI.java     |  3 +-
 .../testelement/AbstractTestElement.java      |  6 +-
 .../jmeter/threads/AbstractThreadGroup.java   | 13 +++--
 .../apache/jmeter/threads/TestCompiler.java   |  9 ++-
 .../jorphan/collections/SearchByClassTest.kt  | 41 ++++++++++++++
 .../apache/jorphan/collections/HashTree.java  | 52 +++++++++++++++---
 .../jorphan/collections/ListedHashTree.java   | 18 +++++-
 .../jorphan/collections/SearchByClass.java    |  5 +-
 .../apache/jorphan/collections/IdentityKey.kt | 38 +++++++++++++
 .../jorphan/collections/IdentityKeyTest.kt    | 55 +++++++++++++++++++
 .../http/util/accesslog/SessionFilter.java    |  4 +-
 .../util/accesslog/TestSessionFilter.java     |  4 +-
 .../protocol/java/sampler/JavaSampler.java    | 11 ++--
 xdocs/changes.xml                             |  1 +
 18 files changed, 249 insertions(+), 57 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/collections/IdentityKey.kt
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/collections/IdentityKeyTest.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 945f22f5619..4a764cf7be4 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -37,6 +37,7 @@
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.collections.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,10 +104,10 @@ public String toString() {
     private static final ThroughputInfo allThreadsInfo = new ThroughputInfo();
 
     //For holding the ThroughputInfo objects for all ThreadGroups. Keyed by AbstractThreadGroup objects
-    private static final ConcurrentMap<AbstractThreadGroup, ThroughputInfo> threadGroupsInfoMap =
+    //TestElements can't be used as keys in HashMap.
+    private static final ConcurrentMap<IdentityKey<AbstractThreadGroup>, ThroughputInfo> threadGroupsInfoMap =
             new ConcurrentHashMap<>();
 
-
     /**
      * Constructor for a non-configured ConstantThroughputTimer.
      */
@@ -198,13 +199,10 @@ private long calculateDelay() {
         case AllActiveThreadsInCurrentThreadGroup_Shared: //All threads in this group - alternate calculation
             final org.apache.jmeter.threads.AbstractThreadGroup group =
                 JMeterContextService.getContext().getThreadGroup();
-            ThroughputInfo groupInfo = threadGroupsInfoMap.get(group);
+            IdentityKey<AbstractThreadGroup> key = new IdentityKey<>(group);
+            ThroughputInfo groupInfo = threadGroupsInfoMap.get(key);
             if (groupInfo == null) {
-                groupInfo = new ThroughputInfo();
-                ThroughputInfo previous = threadGroupsInfoMap.putIfAbsent(group, groupInfo);
-                if (previous != null) { // We did not replace the entry
-                    groupInfo = previous; // so use the existing one
-                }
+                groupInfo = threadGroupsInfoMap.computeIfAbsent(key, (k) -> new ThroughputInfo());
             }
             delay = calculateSharedDelay(groupInfo,Math.round(msPerRequest));
             break;
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
index 48a6a75233d..fc3c4a9f187 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
@@ -28,6 +28,7 @@
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.timers.Timer;
+import org.apache.jorphan.collections.IdentityKey;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.apiguardian.api.API;
 import org.slf4j.Logger;
@@ -44,7 +45,10 @@ public class PreciseThroughputTimer extends AbstractTestElement implements Clone
     private static final Logger log = LoggerFactory.getLogger(PreciseThroughputTimer.class);
 
     private static final long serialVersionUID = 4;
-    private static final ConcurrentMap<AbstractThreadGroup, EventProducer> groupEvents = new ConcurrentHashMap<>();
+
+    // TestElements can't be used as keys in a HashMap, so we use IdentityHashMap
+    private static final ConcurrentMap<IdentityKey<AbstractThreadGroup>, EventProducer> groupEvents =
+            new ConcurrentHashMap<>();
 
     /**
      * Desired throughput configured as {@code throughput/throughputPeriod} per second.
@@ -134,9 +138,14 @@ public long delay() {
 
     private EventProducer getEventProducer() {
         AbstractThreadGroup tg = getThreadContext().getThreadGroup();
+        IdentityKey<AbstractThreadGroup> key = new IdentityKey<>(tg);
+        EventProducer eventProducer = groupEvents.get(key);
+        if (eventProducer != null) {
+            return eventProducer;
+        }
         Long seed = randomSeed == null || randomSeed == 0 ? null : randomSeed;
         return
-                groupEvents.computeIfAbsent(tg, x -> new ConstantPoissonProcessGenerator(
+                groupEvents.computeIfAbsent(key, x -> new ConstantPoissonProcessGenerator(
                         () -> PreciseThroughputTimer.this.getThroughput() / throughputPeriod,
                         batchSize, batchThreadDelay, this, seed, true));
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
index 4d9d721395d..2fff0cf5f61 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
@@ -21,10 +21,9 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
@@ -58,7 +57,7 @@ public class GenericController extends AbstractTestElement implements Controller
     private transient Deque<LoopIterationListener> iterationListeners = new ArrayDeque<>();
 
     // Only create the map if it is required
-    private transient ConcurrentMap<TestElement, Object> children = new ConcurrentHashMap<>();
+    private transient IdentityHashMap<TestElement, Object> children = new IdentityHashMap<>();
 
     private static final Object DUMMY = new Object();
 
@@ -353,10 +352,13 @@ public void addTestElement(TestElement child) {
      * {@inheritDoc}
      */
     @Override
+    @SuppressWarnings("SynchronizeOnNonFinalField")
     public final boolean addTestElementOnce(TestElement child){
-        if (children.putIfAbsent(child, DUMMY) == null) {
-            addTestElement(child);
-            return true;
+        synchronized (children) {
+            if (children.putIfAbsent(child, DUMMY) == null) {
+                addTestElement(child);
+                return true;
+            }
         }
         return false;
     }
@@ -414,7 +416,7 @@ protected void resetIterCount() {
 
     protected Object readResolve(){
         iterationListeners = new ArrayDeque<>();
-        children = new ConcurrentHashMap<>();
+        children = new IdentityHashMap<>();
         subControllersAndSamplers = new ArrayList<>();
 
         return this;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 2d3919cc88a..18e0a548e2b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -102,7 +103,7 @@ public final class GuiPackage implements LocaleChangeListener, HistoryListener {
      * to their corresponding GUI components.
      * <p>This enables to associate {@link UnsharedComponent} UIs with their {@link TestElement}.</p>
      */
-    private final Map<TestElement, JMeterGUIComponent> nodesToGui = new HashMap<>();
+    private final IdentityHashMap<TestElement, JMeterGUIComponent> nodesToGui = new IdentityHashMap<>();
 
     /**
      * Map from Class to JMeterGUIComponent, mapping the Class of a GUI
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
index dfcce91dcb5..59c0fb4e9d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
@@ -112,7 +112,8 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUI
      * large test plans.
      */
     private final Cache<TestElement, Customizer> customizers =
-            Caffeine.newBuilder() // TOOD: should this be made static?
+            Caffeine.newBuilder()  // TODO: should this be made static?
+                    .weakKeys() // So test elements are compared using identity == rather than .equals
                     .maximumSize(20)
                     .build();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 697d5e86701..3b756498970 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -122,14 +122,12 @@ public boolean equals(Object o) {
         }
     }
 
-    // TODO temporary hack to avoid unnecessary bug reports for subclasses
-
     /**
      * {@inheritDoc}
      */
     @Override
-    public int hashCode(){
-        return System.identityHashCode(this);
+    public int hashCode() {
+        return propMap.hashCode();
     }
 
     /*
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index ea7c9d20923..16773bb50b0 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -19,8 +19,7 @@
 
 import java.io.Serializable;
 import java.time.Duration;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.IdentityHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.jmeter.control.Controller;
@@ -51,7 +50,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
     private static final long serialVersionUID = 240L;
 
     // Only create the map if it is required
-    private final transient ConcurrentMap<TestElement, Object> children = new ConcurrentHashMap<>();
+    private final transient IdentityHashMap<TestElement, Object> children = new IdentityHashMap<>();
 
     private static final Object DUMMY = new Object();
 
@@ -136,9 +135,11 @@ public void addTestElement(TestElement child) {
      */
     @Override
     public final boolean addTestElementOnce(TestElement child){
-        if (children.putIfAbsent(child, DUMMY) == null) {
-            addTestElement(child);
-            return true;
+        synchronized (children) {
+            if (children.putIfAbsent(child, DUMMY) == null) {
+                addTestElement(child);
+                return true;
+            }
         }
         return false;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index e0c22641cb2..c3cc460c319 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -18,12 +18,11 @@
 package org.apache.jmeter.threads;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.jmeter.assertions.Assertion;
@@ -69,10 +68,10 @@ public class TestCompiler implements HashTreeTraverser {
     // TODO: replace with ArrayDequeue
     private final LinkedList<TestElement> stack = new LinkedList<>();
 
-    private final Map<Sampler, SamplePackage> samplerConfigMap = new HashMap<>();
+    private final IdentityHashMap<Sampler, SamplePackage> samplerConfigMap = new IdentityHashMap<>();
 
-    private final Map<TransactionController, SamplePackage> transactionControllerConfigMap =
-            new HashMap<>();
+    private final IdentityHashMap<TransactionController, SamplePackage> transactionControllerConfigMap =
+            new IdentityHashMap<>();
 
     private final HashTree testTree;
 
diff --git a/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt b/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
new file mode 100644
index 00000000000..655808fd0ea
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.collections
+
+import org.apache.jmeter.threads.AbstractThreadGroup
+import org.apache.jmeter.threads.ThreadGroup
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class SearchByClassTest {
+    @Test
+    fun `search finds all matching elements`() {
+        val tree = ListedHashTree()
+        val count = 100000
+        for (i in 0 until count) {
+            tree.add(ThreadGroup())
+        }
+        val searcher = SearchByClass(
+            AbstractThreadGroup::class.java
+        )
+        tree.traverse(searcher)
+        Assertions.assertEquals(count, searcher.searchResults.size) {
+            "Test plan included $count ThreadGroup elements, so SearchByClass should find all of them"
+        }
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
index b3b56d56b6b..8d3879e7b0d 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -54,7 +55,7 @@ public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable
     private static final String FOUND = "found"; // $NON-NLS-1$
 
     // N.B. The keys can be either JMeterTreeNode or TestElement
-    protected final Map<Object, HashTree> data;
+    protected final IdentityHashMap<Object, HashTree> data;
 
     /**
      * Creates an empty new HashTree.
@@ -78,7 +79,7 @@ protected HashTree(Map<Object, HashTree> _map) {
      *            name of the new top-level node
      */
     public HashTree(Object key) {
-        this(new HashMap<Object, HashTree>(), key);
+        this(new IdentityHashMap<>(), key);
     }
 
     /**
@@ -94,9 +95,17 @@ public HashTree(Object key) {
      */
     private HashTree(Map<Object, HashTree> _map, Object key) {
         if(_map != null) {
-            data = _map;
+            if (_map instanceof IdentityHashMap) {
+                data = (IdentityHashMap<Object, HashTree>) _map;
+            } else {
+                // Technically speaking, TestElements can't be placed in HashMapk keys,
+                // so we have to convert the map to an IdentityHashMap.
+                @SuppressWarnings("IdentityHashMapUsage")
+                IdentityHashMap<Object, HashTree> identityMap = new IdentityHashMap<>(_map);
+                data = identityMap;
+            }
         } else {
-            data = new HashMap<>();
+            data = new IdentityHashMap<>();
         }
         if(key != null) {
             data.put(key, new HashTree());
@@ -213,7 +222,7 @@ public void add(HashTree newTree) {
      *            a collection of objects to be added to the created HashTree.
      */
     public HashTree(Collection<?> keys) {
-        data = new HashMap<>();
+        data = new IdentityHashMap<>();
         for (Object o : keys) {
             data.put(o, new HashTree());
         }
@@ -227,7 +236,7 @@ public HashTree(Collection<?> keys) {
      *            array with names for the new top-level nodes
      */
     public HashTree(Object[] keys) {
-        data = new HashMap<>();
+        data = new IdentityHashMap<>();
         for (Object key : keys) {
             data.put(key, new HashTree());
         }
@@ -873,7 +882,24 @@ protected HashTree getTreePath(Collection<?> treePath) {
      */
     @Override
     public int hashCode() {
-        return data.hashCode() * 7;
+        int xor = 0;
+        int sum = 0;
+        int mul = 0;
+        // Unordered hash function which uses reference equality for keys, and object equality for values
+        // We use several commutative functions to reduce the possibility of collisions.
+        // Note: IdentityHashMap.hashCode uses reference equality for both keys and values, so we can't use it.
+        for (Entry<Object, HashTree> objectHashTreeEntry : data.entrySet()) {
+            int key = System.identityHashCode(objectHashTreeEntry.getKey());
+            int value = objectHashTreeEntry.getValue().hashCode();
+            xor = xor + key ^ value;
+            sum = sum + key + value;
+            mul = mul + (key|1) * (value|1);
+        }
+        int hash = 1;
+        hash = hash * 31 + xor;
+        hash = hash * 31 + sum;
+        hash = hash * 31 + mul;
+        return hash;
     }
 
     /**
@@ -887,6 +913,9 @@ public int hashCode() {
      */
     @Override
     public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        }
         if (!(o instanceof HashTree)) {
             return false;
         }
@@ -894,7 +923,14 @@ public boolean equals(Object o) {
         if (oo.size() != this.size()) {
             return false;
         }
-        return data.equals(oo.data);
+        // data.equals(oo.data); uses reference identity for keys
+        for (Entry<Object, HashTree> entry : data.entrySet()) {
+            HashTree otherValue = oo.data.get(entry.getKey());
+            if (!entry.getValue().equals(otherValue)) {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
index 1a7d58e34b9..8164b82b94e 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
@@ -175,7 +175,9 @@ public Collection<Object> list() {
     /** {@inheritDoc} */
     @Override
     public HashTree remove(Object key) {
-        order.remove(key);
+        if (data.containsKey(key)) {
+            order.removeIf(x -> x == key);
+        }
         return data.remove(key);
     }
 
@@ -190,7 +192,9 @@ public Object[] getArray() {
     @Override
     public int hashCode() {
         int hc = 17;
-        hc = hc * 37 + (order == null ? 0 : order.hashCode());
+        for (Object o : order) {
+            hc = hc * 37 + System.identityHashCode(o);
+        }
         hc = hc * 37 + super.hashCode();
         return hc;
     }
@@ -202,7 +206,15 @@ public boolean equals(Object o) {
             return false;
         }
         ListedHashTree lht = (ListedHashTree) o;
-        return super.equals(lht) && order.equals(lht.order);
+        if (!super.equals(lht)) {
+            return false;
+        }
+        for (int i = 0; i < order.size(); i++) {
+            if (order.get(i) != lht.order.get(i)) {
+                return false;
+            }
+        }
+        return true;
     }
 
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java
index 22786324935..2d676239eb6 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java
@@ -19,9 +19,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Useful for finding all nodes in the tree that represent objects of a
@@ -54,7 +53,7 @@
 public class SearchByClass<T> implements HashTreeTraverser {
     private final List<T> objectsOfClass = new ArrayList<>();
 
-    private final Map<Object, ListedHashTree> subTrees = new HashMap<>();
+    private final IdentityHashMap<Object, ListedHashTree> subTrees = new IdentityHashMap<>();
 
     private final Class<T> searchClass;
 
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/IdentityKey.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/IdentityKey.kt
new file mode 100644
index 00000000000..05bb891d0ea
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/IdentityKey.kt
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.collections
+
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Wraps an object so [equals] and [hashCode] compare object identities.
+ * One of the common usages is to create [ConcurrentHashMap] where
+ * keys are distinguished by their identities instead of [Object.equals].
+ */
+public class IdentityKey<out T>(
+    public val value: T
+) {
+    override fun equals(other: Any?): Boolean =
+        other is IdentityKey<*> && other.value === value
+
+    override fun hashCode(): Int =
+        System.identityHashCode(value)
+
+    override fun toString(): String =
+        "IdentityKey{$value}"
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/IdentityKeyTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/IdentityKeyTest.kt
new file mode 100644
index 00000000000..619ddabe29c
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/IdentityKeyTest.kt
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.collections
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
+import java.util.concurrent.ConcurrentHashMap
+
+class IdentityKeyTest {
+    data class Key(val value: Int)
+
+    @Test
+    fun `concurrentHashMap with same keys`() {
+        val map = ConcurrentHashMap<IdentityKey<Key?>, Int>()
+        val k1 = IdentityKey(Key(1))
+        map[k1] = 1
+        val k2 = IdentityKey(Key(1))
+        map[k2] = 2
+        val kNull = IdentityKey<Key?>(null)
+        map[kNull] = 3
+        assertAll(
+            {
+                assertEquals(3, map.size) {
+                    "Map should contain 3 elements, actual map is $map"
+                }
+            },
+            { assertEquals(1, map[k1], "map[Key(1)]") },
+            { assertEquals(2, map[k2], "map[Key(1)]") },
+            { assertEquals(3, map[kNull], "map[null]") },
+        )
+    }
+
+    @Test
+    fun `toString test`() {
+        assertEquals("IdentityKey{contents}", IdentityKey("contents").toString()) {
+            """IdentityKey("contents").toString()"""
+        }
+    }
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index 6ffef587c35..e7ed3b6d5ec 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -19,7 +19,7 @@
 
 import java.io.Serializable;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -69,7 +69,7 @@ public class SessionFilter implements Filter, Serializable, TestCloneable,Thread
      * Creates a new SessionFilter and initializes its fields to new collections
      */
     public SessionFilter() {
-        this(new ConcurrentHashMap<>(), Collections.synchronizedSet(new HashSet<>()));
+        this(new ConcurrentHashMap<>(), Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>())));
     }
 
     /**
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
index 04b852ca4b4..48b3849bd5a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -66,7 +66,7 @@ public void testGetCookieManagerLastUse() {
     public void testIsFiltered() throws Exception {
         Map<String, CookieManager> cm = new ConcurrentHashMap<>();
         Set<CookieManager> inUse = Collections
-                .synchronizedSet(new HashSet<CookieManager>());
+                .synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>()));
         SessionFilter filter = new SessionFilter(cm, inUse);
         HTTPSampler sampler = new HTTPSampler();
         filter.isFiltered("1.2.3.4 ...", sampler);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
index 0d8534bebb3..630c28168f5 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
@@ -19,7 +19,6 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,6 +32,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jorphan.collections.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,8 +58,8 @@ public class JavaSampler extends AbstractSampler implements TestStateListener, I
      * Set used to register instances which implement tearDownTest.
      * This is used so that the JavaSamplerClient can be notified when the test ends.
      */
-    private static final Set<JavaSampler> TEAR_DOWN_SET =
-            Collections.newSetFromMap(new ConcurrentHashMap<JavaSampler,Boolean>());
+    private static final Set<IdentityKey<JavaSampler>> TEAR_DOWN_SET =
+            ConcurrentHashMap.newKeySet();
 
     /**
      * Property key representing the classname of the JavaSamplerClient to user.
@@ -226,7 +226,7 @@ private JavaSamplerClient createJavaClient() {
             }
 
             if(isToBeRegistered) {
-                TEAR_DOWN_SET.add(this);
+                TEAR_DOWN_SET.add(new IdentityKey<>(this));
             }
         } catch (Exception e) {
             if (log.isErrorEnabled()) {
@@ -292,7 +292,8 @@ public void testEnded() {
             log.debug("{}\ttestEnded", whoAmI());
         }
         synchronized (TEAR_DOWN_SET) {
-            for (JavaSampler javaSampler : TEAR_DOWN_SET) {
+            for (IdentityKey<JavaSampler> key : TEAR_DOWN_SET) {
+                JavaSampler javaSampler = key.getValue();
                 JavaSamplerClient client = javaSampler.javaClient;
                 if (client != null) {
                     client.teardownTest(javaSampler.context);
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7d28fa3cb88..ce782ec80be 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -191,6 +191,7 @@ Summary
 <ul>
   <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
   <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
+  <li><pr>693</pr>Avoid wrong results when <code>Object.hashCode()</code> happen to collide. Use <code>IdentityHashMap</code> instead of <code>HashMap</code> when key is <code>TestElement</code></li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 957ec02b2c4e53bda8e2ba7a48faeb84a33ddfa7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 18 May 2023 14:08:37 +0300
Subject: [PATCH 0457/1037] style: replace remove redundant type parameters
 with diamond operators

---
 .../java/org/apache/jmeter/visualizers/TableVisualizer.java  | 2 +-
 src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java | 2 +-
 .../org/apache/jmeter/visualizers/CachingStatCalculator.java | 2 +-
 .../java/org/apache/jorphan/util/AlphaNumericComparator.java | 5 +++--
 .../org/apache/jorphan/util/AlphaNumericKeyComparator.java   | 2 +-
 .../apache/jmeter/protocol/http/control/CacheManager.java    | 2 +-
 .../java/org/apache/jmeter/protocol/http/proxy/Daemon.java   | 4 ++--
 .../jmeter/protocol/jdbc/config/DataSourceElement.java       | 2 +-
 .../jmeter/protocol/jms/control/gui/JMSPublisherGui.java     | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
index 0f7d32898f7..6dbd9b8f48f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java
@@ -243,7 +243,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
                         }));
         for (int i=0; i<model.getColumnCount(); i++) {
             if (model.getColumnClass(i).equals(String.class)) {
-                rowSorter.setValueComparator(i, new AlphaNumericComparator<Object>(o -> o.toString()));
+                rowSorter.setValueComparator(i, AlphaNumericComparator.TO_STRING_COMPARATOR);
             }
         }
         table.setRowSorter(rowSorter);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 18e0a548e2b..7b695660824 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -714,7 +714,7 @@ public void updateUIForHiddenComponents() {
 
     private String testPlanFile;
 
-    private final List<Stoppable> stoppables = Collections.synchronizedList(new ArrayList<Stoppable>());
+    private final List<Stoppable> stoppables = Collections.synchronizedList(new ArrayList<>());
 
     private TreeNodeNamingPolicy namingPolicy;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
index 881ce941463..d163765a49e 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java
@@ -28,7 +28,7 @@
  */
 public class CachingStatCalculator extends SamplingStatCalculator {
 
-    private final List<Sample> storedValues = Collections.synchronizedList(new ArrayList<Sample>());
+    private final List<Sample> storedValues = Collections.synchronizedList(new ArrayList<>());
 
     public CachingStatCalculator(String string) {
         super(string);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
index 8281353fb90..ec12c26c00b 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericComparator.java
@@ -30,14 +30,15 @@
  * Heavily influenced by https://codereview.stackexchange.com/questions/37192/number-aware-string-sorting-with-comparator
  */
 public class AlphaNumericComparator<T> implements Comparator<T> {
+    public static final Comparator<?> TO_STRING_COMPARATOR = new AlphaNumericComparator<>(Object::toString);
 
-    private final Function<T, String> converter;
+    private final Function<? super T, String> converter;
 
     /**
      * Constructs a comparator with a converter function
      * @param converter that generates a String value from the arguments given to {@link Comparator#compare(Object, Object)}
      */
-    public AlphaNumericComparator(Function<T, String> converter) {
+    public AlphaNumericComparator(Function<? super T, String> converter) {
         this.converter = converter;
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
index 16fc6b4c2f5..d7b8d458a70 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/AlphaNumericKeyComparator.java
@@ -33,7 +33,7 @@ public class AlphaNumericKeyComparator implements Comparator<Map.Entry<Object, O
 
     private AlphaNumericKeyComparator() {
         // don't instantiate this class on your own.
-        this.comparator = new AlphaNumericComparator<Map.Entry<Object, Object>>(e -> e.getKey().toString());
+        this.comparator = new AlphaNumericComparator<>(e -> e.getKey().toString());
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index c86f6fbe114..0a6a42bd12a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -214,7 +214,7 @@ private static Pair<String, String> getVaryHeader(String headerName, Header[] re
         final Set<String> names = new HashSet<>(Arrays.asList(headerName.split(",\\s*")));
         final Map<String, List<String>> values = new HashMap<>();
         for (final String name: names) {
-            values.put(name, new ArrayList<String>());
+            values.put(name, new ArrayList<>());
         }
         for (Header header: reqHeaders) {
             if (names.contains(header.getName())) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
index fbdd33e7d2f..8afc14ac152 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java
@@ -116,8 +116,8 @@ public void run() {
         log.info("Test Script Recorder up and running!");
 
         // Maps to contain page and form encodings
-        Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<String, String>());
-        Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<String, String>());
+        Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<>());
+        Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<>());
         pageEncodings.put(AbstractSamplerCreator.DEFAULT_ENCODING_KEY, target.getDefaultEncoding());
 
         try {
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 35a0e669326..703c5143cbb 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -121,7 +121,7 @@ public void testStarted() {
             log.error("JDBC data source already defined for: {}", poolName);
         } else {
             String maxPool = getPoolMax();
-            perThreadPoolSet = Collections.synchronizedSet(new HashSet<BasicDataSource>());
+            perThreadPoolSet = Collections.synchronizedSet(new HashSet<>());
             if (maxPool.equals("0")){ // i.e. if we want per thread pooling
                 variables.putObject(poolName, new DataSourceComponentImpl()); // pool will be created later
             } else {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
index aeb62a7d629..8f0d5ebd896 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
@@ -235,7 +235,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         mainPanel.add(jmsPropertiesPanel, "span, growx");
 
         mainPanel.add(msgChoice, "span");
-        fileEncoding = new JComboBox<String>(PublisherSampler.getSupportedEncodings());
+        fileEncoding = new JComboBox<>(PublisherSampler.getSupportedEncodings());
         fileEncoding.setEditable(true);
         mainPanel.add(JMeterUtils.labelFor(fileEncoding, "content_encoding"));
         mainPanel.add(fileEncoding, "span, growx");

From e94f69cceeed785f1e0dd23e968f28c483851b01 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 18 May 2023 14:38:33 +0300
Subject: [PATCH 0458/1037] style: use bounded wildcards for private, and
 static methods

The changes are generated by IDEA, however, the public API changes
were not included in this commit.
---
 .../org/apache/jmeter/extractor/RegexExtractor.java    |  8 ++++----
 .../org/apache/jmeter/extractor/XPath2Extractor.java   |  2 +-
 .../org/apache/jmeter/extractor/XPathExtractor.java    |  2 +-
 .../org/apache/jmeter/visualizers/RenderAsXML.java     |  2 +-
 .../jmeter/visualizers/ViewResultsFullVisualizer.java  |  6 +++---
 .../backend/graphite/PickleGraphiteMetricsSender.java  |  4 ++--
 .../backend/graphite/TextGraphiteMetricsSender.java    |  4 ++--
 src/core/src/main/java/org/apache/jmeter/JMeter.java   |  6 +++---
 .../org/apache/jmeter/config/gui/ArgumentsPanel.java   |  4 ++--
 .../org/apache/jmeter/engine/StandardJMeterEngine.java |  4 ++--
 .../org/apache/jmeter/engine/util/ValueReplacer.java   |  2 +-
 .../java/org/apache/jmeter/gui/GlobalUndoableEdit.java |  4 ++--
 .../org/apache/jmeter/gui/action/ActionRouter.java     |  6 +++---
 .../apache/jmeter/gui/action/LoadRecentProject.java    |  2 +-
 .../java/org/apache/jmeter/gui/action/Restart.java     |  2 +-
 .../main/java/org/apache/jmeter/gui/action/Save.java   |  6 +++---
 .../org/apache/jmeter/gui/action/SearchTreeDialog.java |  2 +-
 .../jmeter/gui/action/template/TemplateManager.java    |  2 +-
 .../org/apache/jmeter/gui/tree/JMeterTreeModel.java    |  2 +-
 .../java/org/apache/jmeter/gui/util/JMeterMenuBar.java |  2 +-
 .../java/org/apache/jmeter/gui/util/MenuFactory.java   |  6 +++---
 .../report/config/ReportGeneratorConfiguration.java    |  2 +-
 .../apache/jmeter/report/config/SubConfiguration.java  |  2 +-
 .../apache/jmeter/report/dashboard/JsonExporter.java   |  2 +-
 .../jmeter/report/dashboard/ReportGenerator.java       |  2 +-
 .../org/apache/jmeter/samplers/AsynchSampleSender.java |  4 ++--
 .../jmeter/testelement/AbstractScopedTestElement.java  |  4 ++--
 .../apache/jmeter/testelement/AbstractTestElement.java |  2 +-
 .../java/org/apache/jmeter/threads/JMeterThread.java   | 10 +++++-----
 .../java/org/apache/jmeter/threads/TestCompiler.java   |  4 ++--
 .../main/java/org/apache/jmeter/util/XPathUtil.java    |  6 +++---
 .../apache/jmeter/util/keystore/JmeterKeyStore.java    |  2 +-
 .../jmeter/functions/RandomFromMultipleVars.java       |  2 +-
 .../java/org/apache/jorphan/collections/HashTree.java  |  2 +-
 .../main/java/org/apache/jorphan/gui/DynamicStyle.java |  4 ++--
 .../src/main/java/org/apache/jorphan/gui/JFactory.java |  2 +-
 .../java/org/apache/jorphan/gui/JMeterUIDefaults.java  |  4 ++--
 .../java/org/apache/jorphan/reflect/ClassFinder.java   |  6 +++---
 .../java/org/apache/jorphan/util/JOrphanUtils.java     |  2 +-
 .../src/main/java/org/apache/jmeter/NewDriver.java     |  2 +-
 .../jmeter/protocol/http/control/DNSCacheManager.java  |  2 +-
 .../jmeter/protocol/http/modifier/AnchorModifier.java  |  6 +++---
 .../jmeter/protocol/http/parser/URLCollection.java     |  4 ++--
 .../jmeter/protocol/http/proxy/FormCharSetFinder.java  |  2 +-
 .../jmeter/protocol/http/proxy/ProxyControl.java       |  4 ++--
 .../jmeter/protocol/http/sampler/HTTPHC4Impl.java      | 10 +++++-----
 .../jmeter/protocol/http/sampler/HTTPJavaImpl.java     |  2 +-
 .../jmeter/protocol/jdbc/AbstractJDBCTestElement.java  |  2 +-
 .../jmeter/protocol/ldap/sampler/LDAPExtSampler.java   |  6 +++---
 .../jmeter/protocol/smtp/sampler/SmtpSampler.java      |  2 +-
 50 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index c80360712b4..3194e9d1247 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -313,7 +313,7 @@ private List<java.util.regex.MatchResult> processMatches(
     }
 
     private static int matchStrings(int matchNumber, Perl5Matcher matcher,
-            Pattern pattern, List<MatchResult> matches, int found,
+            Pattern pattern, List<? super MatchResult> matches, int found,
             String inputString) {
         PatternMatcherInput input = new PatternMatcherInput(inputString);
         while (matchNumber <=0 || found != matchNumber) {
@@ -329,7 +329,7 @@ private static int matchStrings(int matchNumber, Perl5Matcher matcher,
     }
 
     private static int matchStrings(int matchNumber, java.util.regex.Pattern pattern,
-            List<java.util.regex.MatchResult> matches, int found,
+            List<? super java.util.regex.MatchResult> matches, int found,
             String inputString) {
         Matcher matcher = pattern.matcher(inputString);
         while (matchNumber <=0 || found != matchNumber) {
@@ -513,7 +513,7 @@ private void initTemplate() {
      *            the entry number in the list
      * @return MatchResult
      */
-    private static MatchResult getCorrectMatch(List<MatchResult> matches, int entry) {
+    private static MatchResult getCorrectMatch(List<? extends MatchResult> matches, int entry) {
         int matchSize = matches.size();
 
         if (matchSize <= 0 || entry > matchSize){
@@ -528,7 +528,7 @@ private static MatchResult getCorrectMatch(List<MatchResult> matches, int entry)
         return matches.get(entry - 1);
     }
 
-    private static java.util.regex.MatchResult getCorrectMatchJavaRegex(List<java.util.regex.MatchResult> matches, int entry) {
+    private static java.util.regex.MatchResult getCorrectMatchJavaRegex(List<? extends java.util.regex.MatchResult> matches, int entry) {
         int matchSize = matches.size();
 
         if (matchSize <= 0 || entry > matchSize){
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
index 689a8e29af3..1d51ad4e155 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
@@ -222,7 +222,7 @@ public void setFragment(boolean selected) {
      * @throws SaxonApiException
      * @throws FactoryConfigurationError
      */
-    private void getValuesForXPath(String query, List<String> matchStrings, int matchNumber, String responseData)
+    private void getValuesForXPath(String query, List<? super String> matchStrings, int matchNumber, String responseData)
             throws SaxonApiException, FactoryConfigurationError {
         XPathUtil.putValuesForXPathInListUsingSaxon(responseData, query, matchStrings, getFragment(), matchNumber, getNamespaces());
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
index 5a60bd79815..170435f9265 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
@@ -318,7 +318,7 @@ private Document parseResponse(String unicodeData)
      *
      * @throws TransformerException
      */
-    private void getValuesForXPath(Document d,String query, List<String> matchStrings, int matchNumber)
+    private void getValuesForXPath(Document d,String query, List<? super String> matchStrings, int matchNumber)
         throws TransformerException {
         XPathUtil.putValuesForXPathInList(d, query, matchStrings, getFragment(), matchNumber);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
index beb976f2ad0..22ca4d8c8f3 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
@@ -152,7 +152,7 @@ private void expandAll(TreePath parent) {
         }
 
         @SuppressWarnings("JdkObsolete")
-        private static void applyToChildren(TreePath parent, Consumer<TreePath> method) {
+        private static void applyToChildren(TreePath parent, Consumer<? super TreePath> method) {
             TreeNode node = (TreeNode) parent.getLastPathComponent();
             Enumeration<?> e = node.children();
             while (e.hasMoreElements()) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 5ec83c5e5c6..44216aa7115 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -236,7 +236,7 @@ private Object getSelectedObject() {
 
     private static TreePath checkExpandedOrSelected(List<TreeNode> path,
             Object item, Object oldSelectedObject,
-            Set<Object> oldExpandedObjects, Set<TreePath> newExpandedPaths,
+            Set<Object> oldExpandedObjects, Set<? super TreePath> newExpandedPaths,
             TreePath defaultPath) {
         TreePath result = defaultPath;
         if (oldSelectedObject == item) {
@@ -250,7 +250,7 @@ private static TreePath checkExpandedOrSelected(List<TreeNode> path,
 
     private static TreePath checkExpandedOrSelected(List<TreeNode> path,
             Object item, Object oldSelectedObject,
-            Set<Object> oldExpandedObjects, Set<TreePath> newExpandedPaths,
+            Set<Object> oldExpandedObjects, Set<? super TreePath> newExpandedPaths,
             TreePath defaultPath, DefaultMutableTreeNode extensionNode) {
         TreePath result = defaultPath;
         if (oldSelectedObject == item) {
@@ -279,7 +279,7 @@ private static Set<Object> extractExpandedObjects(final Enumeration<TreePath> ex
 
     private TreePath addSubResults(DefaultMutableTreeNode currNode,
             SampleResult res, List<TreeNode> path, Object selectedObject,
-            Set<Object> oldExpandedObjects, Set<TreePath> newExpandedPaths) {
+            Set<Object> oldExpandedObjects, Set<? super TreePath> newExpandedPaths) {
         SampleResult[] subResults = res.getSubResults();
 
         int leafIndex = 0;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
index bd33c81c755..b0e450452fd 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
@@ -55,7 +55,7 @@ class PickleGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
     private List<MetricTuple> metrics = new ArrayList<>();
 
     private SocketConnectionInfos socketConnectionInfos;
-    private GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
+    private GenericKeyedObjectPool<? super SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
     private String prefix;
 
     PickleGraphiteMetricsSender() {
@@ -79,7 +79,7 @@ public void setup(String graphiteHost, int graphitePort, String prefix) {
 
     /** Setup used for testing, or if explicit customisation is required. */
     public void setup(SocketConnectionInfos socketConnectionInfos,
-                      GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool,
+                      GenericKeyedObjectPool<? super SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool,
                       String prefix) {
         this.socketConnectionInfos = socketConnectionInfos;
         this.socketOutputStreamPool = socketOutputStreamPool;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
index 5b6b4052e6e..e72a2531bf5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
@@ -39,7 +39,7 @@ class TextGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
     private List<MetricTuple> metrics = new ArrayList<>();
 
     private SocketConnectionInfos socketConnectionInfos;
-    private GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
+    private GenericKeyedObjectPool<? super SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
     private String prefix;
 
     TextGraphiteMetricsSender() {
@@ -63,7 +63,7 @@ public void setup(String graphiteHost, int graphitePort, String prefix) {
 
     /** Setup used for testing, or if explicit customisation is required. */
     public void setup(SocketConnectionInfos socketConnectionInfos,
-                      GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool,
+                      GenericKeyedObjectPool<? super SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool,
                       String prefix) {
         this.socketConnectionInfos = socketConnectionInfos;
         this.socketOutputStreamPool = socketOutputStreamPool;
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 1e02e7f9c28..fa8aeb3584c 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -1187,7 +1187,7 @@ public ListenToTest(RunMode runMode, boolean remoteStop, ReportGenerator reportG
             this.reportGenerator = reportGenerator;
         }
 
-        public void setStartedRemoteEngines(List<JMeterEngine> engines) {
+        public void setStartedRemoteEngines(List<? extends JMeterEngine> engines) {
             if (runMode != RunMode.REMOTE) {
                 throw new IllegalArgumentException("This method should only be called in RunMode.REMOTE");
             }
@@ -1355,7 +1355,7 @@ public static boolean isNonGUI(){
         return "true".equals(System.getProperty(JMeter.JMETER_NON_GUI)); //$NON-NLS-1$
     }
 
-    private static void startUdpDdaemon(final List<JMeterEngine> engines) {
+    private static void startUdpDdaemon(final List<? extends JMeterEngine> engines) {
         int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port", UDP_PORT_DEFAULT); // $NON-NLS-1$
         int maxPort = JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
         if (port > 1000){
@@ -1375,7 +1375,7 @@ public void run() {
         }
     }
 
-    private static void waitForSignals(final List<JMeterEngine> engines, DatagramSocket socket) {
+    private static void waitForSignals(final List<? extends JMeterEngine> engines, DatagramSocket socket) {
         byte[] buf = new byte[80];
         System.out.println("Waiting for possible Shutdown/StopTestNow/HeapDump/ThreadDump message on port "+socket.getLocalPort());//NOSONAR
         DatagramPacket request = new DatagramPacket(buf, buf.length);
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index b9f6c8edebb..7fe323b9a5d 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -108,7 +108,7 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
     /** Disable buttons :Detail, Add, Add from Clipboard, Delete, Up and Down*/
     private final boolean disableButtons;
 
-    private final Function<String[], Argument> argCreator;
+    private final Function<String[], ? extends Argument> argCreator;
 
     /** Command for adding a row to the table. */
     private static final String ADD = "add"; // $NON-NLS-1$
@@ -250,7 +250,7 @@ public ArgumentsPanel(String label, Color bkg, boolean enableUpDown, boolean sta
      * @param argCreator function to create {@link Argument}s from Strings taken from clipboard
      */
     public ArgumentsPanel(String label, Color bkg, boolean enableUpDown, boolean standalone, ObjectTableModel model,
-            boolean disableButtons, Function<String[], Argument> argCreator) {
+            boolean disableButtons, Function<String[], ? extends Argument> argCreator) {
         tableLabel = new JLabel(label);
         this.enableUpDown = enableUpDown;
         this.disableButtons = disableButtons;
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index e6eb1174926..db68aa7132a 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -237,7 +237,7 @@ private static void removeThreadGroups(List<?> elements) {
         }
     }
 
-    private void notifyTestListenersOfStart(SearchByClass<TestStateListener> testListeners) {
+    private void notifyTestListenersOfStart(SearchByClass<? extends TestStateListener> testListeners) {
         for (TestStateListener tl : testListeners.getSearchResults()) {
             if (tl instanceof TestBean) {
                 TestBeanHelper.prepare((TestElement) tl);
@@ -250,7 +250,7 @@ private void notifyTestListenersOfStart(SearchByClass<TestStateListener> testLis
         }
     }
 
-    private void notifyTestListenersOfEnd(SearchByClass<TestStateListener> testListeners) {
+    private void notifyTestListenersOfEnd(SearchByClass<? extends TestStateListener> testListeners) {
         log.info("Notifying test listeners of end of test");
         for (TestStateListener tl : testListeners.getSearchResults()) {
             try {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
index 8f7678eea00..dab214267b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
@@ -81,7 +81,7 @@ public void replaceValues(TestElement el) throws InvalidVariableException {
         setProperties(el, newProps);
     }
 
-    private static void setProperties(TestElement el, Collection<JMeterProperty> newProps) {
+    private static void setProperties(TestElement el, Collection<? extends JMeterProperty> newProps) {
         el.clear();
         for (JMeterProperty jmp : newProps) {
             el.setProperty(jmp);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java b/src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java
index b00f32bd0ac..6bdfbc79c52 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java
@@ -28,9 +28,9 @@ public final class GlobalUndoableEdit extends AbstractUndoableEdit {
     private static final long serialVersionUID = -4964577622742131354L;
     private final UndoHistoryItem item;
     private final UndoHistoryItem previous;
-    private final Consumer<UndoHistoryItem> loader;
+    private final Consumer<? super UndoHistoryItem> loader;
 
-    public GlobalUndoableEdit(UndoHistoryItem item, UndoHistoryItem previous, Consumer<UndoHistoryItem> loader) {
+    public GlobalUndoableEdit(UndoHistoryItem item, UndoHistoryItem previous, Consumer<? super UndoHistoryItem> loader) {
         this.item = item;
         this.previous = previous;
         this.loader = loader;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
index 49b66206c14..24536f7ec74 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
@@ -221,7 +221,7 @@ public void removePreActionListener(Class<?> action, ActionListener listener) {
      * @param listener {@link ActionListener}
      * @param actionListeners {@link Set} of {@link ActionListener}
      */
-    private static void removeActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
+    private static void removeActionListener(Class<?> action, ActionListener listener, Map<? super String, Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> set = actionListeners.get(action.getName());
             if (set != null) {
@@ -251,7 +251,7 @@ public void addPostActionListener(Class<?> action, ActionListener listener) {
      * @param listener {@link ActionListener}
      * @param actionListeners {@link Set}
      */
-    private static void addActionListener(Class<?> action, ActionListener listener, Map<String, Set<ActionListener>> actionListeners) {
+    private static void addActionListener(Class<?> action, ActionListener listener, Map<? super String, Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> set = actionListeners.get(action.getName());
             if (set == null) {
@@ -297,7 +297,7 @@ void postActionPerformed(Class<? extends Command> action, ActionEvent e) {
      * @param e {@link ActionEvent}
      * @param actionListeners {@link Set}
      */
-    private static void actionPerformed(Class<? extends Command> action, ActionEvent e, Map<String, Set<ActionListener>> actionListeners) {
+    private static void actionPerformed(Class<? extends Command> action, ActionEvent e, Map<String, ? extends Set<ActionListener>> actionListeners) {
         if (action != null) {
             Set<ActionListener> listenerSet = actionListeners.get(action.getName());
             if (listenerSet != null && !listenerSet.isEmpty()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
index 0b394a749b4..a75554ca6a1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
@@ -254,7 +254,7 @@ private static void removeRecentFile(int index) {
      * @param fileLoadRecentFiles List of JMenuItem
      * @return true if at least on JMenuItem is visible
      */
-    public static boolean hasVisibleMenuItem(List<JComponent> fileLoadRecentFiles) {
+    public static boolean hasVisibleMenuItem(List<? extends JComponent> fileLoadRecentFiles) {
         return fileLoadRecentFiles.stream()
                 .anyMatch(JComponent::isVisible);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
index e2fcc1d39fd..9c0597735c0 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
@@ -177,7 +177,7 @@ public void run() {
      * @param processArgs arguments to be given to ProcessBuilder
      * @param mainCommand original command line split at spaces
      */
-    private static void processRemainingArgs(List<String> processArgs, String[] mainCommand) {
+    private static void processRemainingArgs(List<? super String> processArgs, String[] mainCommand) {
         boolean paramValue = false;
         StringBuilder partialParamValue = new StringBuilder();
         for (int i = 1; i < mainCommand.length; i++) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index 32e3846cac3..2cb8051072b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -400,7 +400,7 @@ private static List<File> createBackupFile(File fileToBackup) {
      * @param backupFiles
      *            {@link List} of {@link File}
      */
-    private static int getHighestVersionNumber(Pattern backupPattern, List<File> backupFiles) {
+    private static int getHighestVersionNumber(Pattern backupPattern, List<? extends File> backupFiles) {
         return backupFiles.stream().map(backupFile -> backupPattern.matcher(backupFile.getName()))
                 .filter(matcher -> matcher.find() && matcher.groupCount() > 0)
                 .mapToInt(matcher -> Integer.parseInt(matcher.group(1))).max().orElse(0);
@@ -414,7 +414,7 @@ private static int getHighestVersionNumber(Pattern backupPattern, List<File> bac
      * @return list of files to be deleted based upon properties described
      *         {@link #createBackupFile(File)}
      */
-    private static List<File> backupFilesToDelete(List<File> backupFiles) {
+    private static List<File> backupFilesToDelete(List<? extends File> backupFiles) {
         List<File> filesToDelete = new ArrayList<>();
         if (BACKUP_MAX_HOURS > 0) {
             filesToDelete.addAll(expiredBackupFiles(backupFiles));
@@ -434,7 +434,7 @@ private static List<File> backupFilesToDelete(List<File> backupFiles) {
      * @param backupFiles {@link List} of {@link File} to filter
      * @return {@link List} of {@link File} that are expired
      */
-    private static List<File> expiredBackupFiles(List<File> backupFiles) {
+    private static List<File> expiredBackupFiles(List<? extends File> backupFiles) {
         if (BACKUP_MAX_HOURS > 0) {
             final long expiryMillis = System.currentTimeMillis() - (1L * BACKUP_MAX_HOURS * MS_PER_HOUR);
             return backupFiles.stream().filter(file -> file.lastModified() < expiryMillis).collect(Collectors.toList());
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index 8e477680916..97d64e456f6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -387,7 +387,7 @@ private Pair<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, S
      * @param expand true if we want to expand
      * @param nodes Set of {@link JMeterTreeNode} to mark
      */
-    private static void markConcernedNodes(boolean expand, Set<JMeterTreeNode> nodes) {
+    private static void markConcernedNodes(boolean expand, Set<? extends JMeterTreeNode> nodes) {
         GuiPackage guiInstance = GuiPackage.getInstance();
         JTree jTree = guiInstance.getMainFrame().getTree();
         for (JMeterTreeNode jMeterTreeNode : nodes) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
index 37f4e73c046..a41f6dd86f6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
@@ -188,7 +188,7 @@ public Map<String, Template> parseTemplateFile(File file) throws IOException, SA
      * @param templates Map of {@link Template} referenced by name
      * @param templateNode {@link Node} the xml template node
      */
-    static void parseTemplateNode(Map<String, Template> templates, Node templateNode) {
+    static void parseTemplateNode(Map<? super String, ? super Template> templates, Node templateNode) {
         if (templateNode.getNodeType() == Node.ELEMENT_NODE) {
             Template template = new Template();
             Element element =  (Element) templateNode;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
index f6df769cb32..47c4b2403b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
@@ -185,7 +185,7 @@ public void removeNodeFromParent(JMeterTreeNode node) {
     }
 
     @SuppressWarnings("JdkObsolete")
-    private static void traverseAndFind(Class<?> type, JMeterTreeNode node, List<JMeterTreeNode> nodeList) {
+    private static void traverseAndFind(Class<?> type, JMeterTreeNode node, List<? super JMeterTreeNode> nodeList) {
         if (type.isInstance(node.getUserObject())) {
             nodeList.add(node);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index cef9cd26901..5e8c4e8647a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -563,7 +563,7 @@ private void makeSearchMenu() {
      * @param menuCreators
      * @param location
      */
-    private static void addPluginsMenuItems(JMenu menu, Collection<MenuCreator> menuCreators, MENU_LOCATION location) {
+    private static void addPluginsMenuItems(JMenu menu, Collection<? extends MenuCreator> menuCreators, MENU_LOCATION location) {
         for (MenuCreator menuCreator : menuCreators) {
             JMenuItem[] menuItems = menuCreator.getMenuItemsAtLocation(location);
             if (menuItems.length != 0) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
index bc84feb9167..96fd5ee5196 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
@@ -225,14 +225,14 @@ private static JMeterGUIComponent getGUIComponent(
         return item;
     }
 
-    private static void sortMenus(Collection<List<MenuInfo>> menus) {
+    private static void sortMenus(Collection<? extends List<MenuInfo>> menus) {
         for (List<MenuInfo> menu : menus) {
             menu.sort(Comparator.comparing(MenuInfo::getLabel));
             menu.sort(Comparator.comparingInt(MenuInfo::getSortOrder));
         }
     }
 
-    private static void separateItemsWithExplicitOrder(Collection<List<MenuInfo>> menus) {
+    private static void separateItemsWithExplicitOrder(Collection<? extends List<MenuInfo>> menus) {
         for (List<MenuInfo> menu : menus) {
             Optional<MenuInfo> firstDefaultSortItem = menu.stream()
                     .filter(info -> info.getSortOrder() == MenuInfo.SORT_ORDER_DEFAULT)
@@ -468,7 +468,7 @@ public static JMenu makeMenu(String category, String actionCommand) {
      * @return the menu
      */
     private static JMenu makeMenu(
-            Collection<MenuInfo> menuInfo, String actionCommand, String menuName) {
+            Collection<? extends MenuInfo> menuInfo, String actionCommand, String menuName) {
 
         JMenu menu = new JMenu(menuName);
         menuInfo.stream()
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
index 1187ebde1ad..1291c6627d5 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
@@ -483,7 +483,7 @@ public static String getGraphPropertyKey(String graphId, String propertyName) {
      *             thrown when the property cannot be cast to the specified type
      */
     private static <TProperty> TProperty getProperty(Props props, String key,
-            TProperty defaultValue, Class<TProperty> clazz)
+            TProperty defaultValue, @SuppressWarnings("BoundedWildcard") Class<TProperty> clazz)
             throws ConfigurationException {
         String value = props.getValue(key);
         if (value == null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
index bcdabeef43d..39a0ffc3d1f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java
@@ -54,7 +54,7 @@ public final Map<String, String> getProperties() {
      *             if cannot convert property
      */
     public final <TProperty> TProperty getProperty(String key,
-            TProperty defaultValue, Class<TProperty> clazz)
+            TProperty defaultValue, @SuppressWarnings("BoundedWildcard") Class<TProperty> clazz)
                     throws ConfigurationException {
         String value = properties.get(key);
         TProperty result;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index cc9bcf52be3..9ad3a0a4356 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -115,7 +115,7 @@ private File checkAndGetOutputFolder(ReportGeneratorConfiguration reportGenerato
         return outputDir;
     }
 
-    private static void createStatistic(Map<String, SamplingStatistic> statistics, MapResultData resultData) {
+    private static void createStatistic(Map<? super String, ? super SamplingStatistic> statistics, MapResultData resultData) {
         LOGGER.debug("Creating statistics for result data:{}", resultData);
         SamplingStatistic statistic = new SamplingStatistic();
         ListResultData listResultData = (ListResultData) resultData.getResult("data");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index ec50e47a8e3..8c3f9f42e76 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -325,7 +325,7 @@ private static boolean createTempDir(File tmpDir) throws GenerationException {
 
     private static void addGraphConsumer(FilterConsumer nameFilter,
             FilterConsumer excludeControllerFilter,
-            Map.Entry<String, GraphConfiguration> entryGraphCfg)
+            Map.Entry<String, ? extends GraphConfiguration> entryGraphCfg)
             throws GenerationException {
         String graphName = entryGraphCfg.getKey();
         GraphConfiguration graphConfiguration = entryGraphCfg.getValue();
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
index 5f7a27942b9..bd1337150c6 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
@@ -129,11 +129,11 @@ public void sampleOccurred(SampleEvent e) {
 
     private static class Worker extends Thread {
 
-        private final BlockingQueue<SampleEvent> queue;
+        private final BlockingQueue<? extends SampleEvent> queue;
 
         private final RemoteSampleListener listener;
 
-        private Worker(BlockingQueue<SampleEvent> q, RemoteSampleListener l){
+        private Worker(BlockingQueue<? extends SampleEvent> q, RemoteSampleListener l){
             queue = q;
             listener = l;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
index b0c53ae131b..fd96f8bfbbe 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
@@ -162,12 +162,12 @@ protected List<SampleResult> getSampleList(SampleResult result) {
         return sampleList;
     }
 
-    private static void recurseResults(List<SampleResult> resultList, SampleResult sampleResult) {
+    private static void recurseResults(List<? super SampleResult> resultList, SampleResult sampleResult) {
         Collections.addAll(resultList, sampleResult.getSubResults());
         recurseResults(resultList, sampleResult.getSubResults(), 3);
     }
 
-    private static void recurseResults(List<SampleResult> resultList, SampleResult[] sampleResult, int level) {
+    private static void recurseResults(List<? super SampleResult> resultList, SampleResult[] sampleResult, int level) {
         if (level < 0) {
             return;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 3b756498970..439c8711a0f 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -660,7 +660,7 @@ public List<String> getSearchableTokens() {
      * @param result List of values of propertyNames
      * @param propertyNames Set of names of properties to extract
      */
-    protected final void addPropertiesValues(List<String> result, Set<String> propertyNames) {
+    protected final void addPropertiesValues(List<? super String> result, Set<String> propertyNames) {
         PropertyIterator iterator = propertyIterator();
         while(iterator.hasNext()) {
             JMeterProperty jMeterProperty = iterator.next();
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 0364fcaf0f7..f7735d42ac9 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -353,7 +353,7 @@ public void run() {
      * @param consumer Consumer that will process the tree of elements up to root node
      */
     private void triggerLoopLogicalActionOnParentControllers(Sampler sampler, JMeterContext threadContext,
-            Consumer<FindTestElementsUpToRootTraverser> consumer) {
+            Consumer<? super FindTestElementsUpToRootTraverser> consumer) {
         TransactionSampler transactionSampler = null;
         if (sampler instanceof TransactionSampler) {
             transactionSampler = (TransactionSampler) sampler;
@@ -894,7 +894,7 @@ private void stopThread() {
         log.info("Stop Thread detected by thread: {}", threadName);
     }
 
-    private static void checkAssertions(List<Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
+    private static void checkAssertions(List<? extends Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
         for (Assertion assertion : assertions) {
             TestBeanHelper.prepare((TestElement) assertion);
             if (assertion instanceof AbstractScopedAssertion) {
@@ -962,14 +962,14 @@ private static void processAssertion(SampleResult result, Assertion assertion) {
         result.addAssertionResult(assertionResult);
     }
 
-    private static void runPostProcessors(List<PostProcessor> extractors) {
+    private static void runPostProcessors(List<? extends PostProcessor> extractors) {
         for (PostProcessor ex : extractors) {
             TestBeanHelper.prepare((TestElement) ex);
             ex.process();
         }
     }
 
-    private static void runPreProcessors(List<PreProcessor> preProcessors) {
+    private static void runPreProcessors(List<? extends PreProcessor> preProcessors) {
         for (PreProcessor ex : preProcessors) {
             if (log.isDebugEnabled()) {
                 log.debug("Running preprocessor: {}", ((AbstractTestElement) ex).getName());
@@ -988,7 +988,7 @@ private static void runPreProcessors(List<PreProcessor> preProcessors) {
      *
      * @param timers to be used for calculating the delay
      */
-    private void delay(List<Timer> timers) {
+    private void delay(List<? extends Timer> timers) {
         long totalDelay = 0;
         for (Timer timer : timers) {
             TestBeanHelper.prepare((TestElement) timer);
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index c3cc460c319..b2c1d7330be 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -270,7 +270,7 @@ private void saveTransactionControllerConfigs(TransactionController tc) {
      * @param controllers
      * @param maybeController
      */
-    private static void addDirectParentControllers(List<Controller> controllers, TestElement maybeController) {
+    private static void addDirectParentControllers(List<? super Controller> controllers, TestElement maybeController) {
         if (maybeController instanceof Controller) {
             log.debug("adding controller: {} to sampler config", maybeController);
             controllers.add((Controller) maybeController);
@@ -303,7 +303,7 @@ public boolean equals(Object o) {
         }
     }
 
-    private static void configureWithConfigElements(Sampler sam, List<ConfigTestElement> configs) {
+    private static void configureWithConfigElements(Sampler sam, List<? extends ConfigTestElement> configs) {
         sam.clearTestElementChildren();
         for (ConfigTestElement config  : configs) {
             if (!(config instanceof NoConfigMerge))
diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
index d183e7da5ea..e8deab16ebf 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
@@ -359,7 +359,7 @@ public static NodeList selectNodeList(Document document, String xPathExpression)
      */
     public static void putValuesForXPathInList(Document document,
             String xPathQuery,
-            List<String> matchStrings, boolean fragment) throws TransformerException {
+            List<? super String> matchStrings, boolean fragment) throws TransformerException {
         putValuesForXPathInList(document, xPathQuery, matchStrings, fragment, -1);
     }
 
@@ -372,7 +372,7 @@ public static void putValuesForXPathInList(Document document,
      * @param matchNumber match number
      * @throws TransformerException when the internally used xpath engine fails
      */
-    public static void putValuesForXPathInList(Document document, String xPathQuery, List<String> matchStrings, boolean fragment, int matchNumber)
+    public static void putValuesForXPathInList(Document document, String xPathQuery, List<? super String> matchStrings, boolean fragment, int matchNumber)
             throws TransformerException {
         String val = null;
         XObject xObject = XPathAPI.eval(document, xPathQuery, getPrefixResolver(document));
@@ -414,7 +414,7 @@ public static void putValuesForXPathInList(Document document, String xPathQuery,
 
     public static void putValuesForXPathInListUsingSaxon(
             String xmlFile, String xPathQuery,
-            List<String> matchStrings, boolean fragment,
+            List<? super String> matchStrings, boolean fragment,
             int matchNumber, String namespaces)
             throws SaxonApiException, FactoryConfigurationError {
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index 87284099631..e93e720eb4c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -225,7 +225,7 @@ private static void logDetailsOnKeystore(KeyStore keystore) {
         }
     }
 
-    private static String decodeSanList(Collection<List<?>> subjectAlternativeNames) {
+    private static String decodeSanList(Collection<? extends List<?>> subjectAlternativeNames) {
         List<Pair<String, String>> decodedEntries = new ArrayList<>();
         for (List<?> entry : subjectAlternativeNames) {
             Object indexData = entry.get(0);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
index 897fd48f11c..ff5554de5d1 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
@@ -112,7 +112,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
      * @param results {@link List} where results are stored
      */
     private static void extractVariableValuesToList(String variableName,
-            JMeterVariables vars, List<String> results) {
+            JMeterVariables vars, List<? super String> results) {
         String matchNumberAsStr = vars.get(variableName+"_matchNr");
         int matchNumber = 0;
         if(!StringUtils.isEmpty(matchNumberAsStr)) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
index 8d3879e7b0d..1dd9bda9cea 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -93,7 +93,7 @@ public HashTree(Object key) {
      *            the object to be used as the key for the root node (may be
      *            <code>null</code>, in which case no root node will be created)
      */
-    private HashTree(Map<Object, HashTree> _map, Object key) {
+    private HashTree(Map<Object, ? extends HashTree> _map, Object key) {
         if(_map != null) {
             if (_map instanceof IdentityHashMap) {
                 data = (IdentityHashMap<Object, HashTree>) _map;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
index 7fb01971e6f..41511488a79 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
@@ -60,7 +60,7 @@ public class DynamicStyle {
      * @return input component (e.g. for fluent APIs)
      */
     @API(since = "5.3", status = API.Status.EXPERIMENTAL)
-    public <T extends JComponent> T withDynamic(T component, Consumer<T> onUpdateUi) {
+    public <T extends JComponent> T withDynamic(T component, Consumer<? super T> onUpdateUi) {
         // Explicit component update is required since the component already exists
         // and we can't want to wait for the next LaF change
         onUpdateUi.accept(component);
@@ -183,7 +183,7 @@ private void updateComponent(JComponent component) {
         }
     }
 
-    private static void collectComponents(Component root, List<Component> components) {
+    private static void collectComponents(Component root, List<? super Component> components) {
         if (root == null) {
             // E.g. getTabComponentAt might return null
             // https://stackoverflow.com/questions/988734/jtabbedpane-gettabcomponentatint-returning-null
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
index 99e94634519..3c54558d554 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
@@ -172,7 +172,7 @@ public static JLabel warning(JLabel component) {
      * @return input component (e.g. for fluent APIs)
      */
     @API(since = "5.3", status = API.Status.EXPERIMENTAL)
-    public static <T extends JComponent> T withDynamic(T component, Consumer<T> onUpdateUi) {
+    public static <T extends JComponent> T withDynamic(T component, Consumer<? super T> onUpdateUi) {
         return STYLE.withDynamic(component, onUpdateUi);
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
index 85b9b7feec8..b8e98da783a 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/JMeterUIDefaults.java
@@ -150,11 +150,11 @@ private static void addScaledFont(UIDefaults defaults, String output, String inp
         addDerivedFont(defaults, output, input, f -> f.deriveFont(f.getSize2D() * scale));
     }
 
-    private static void addDerivedFont(UIDefaults defaults, String output, String input, Function<Font, Font> f) {
+    private static void addDerivedFont(UIDefaults defaults, String output, String input, Function<? super Font, ? extends Font> f) {
         defaults.put(output, (UIDefaults.LazyValue) d -> map(d.getFont(input), f));
     }
 
-    private static Font map(Font input, Function<Font, Font> mapper) {
+    private static Font map(Font input, Function<? super Font, ? extends Font> mapper) {
         Font output = mapper.apply(input);
         // Note: we drop UIResource here so LaF treats the font as user-provided rather than
         // LaF-provided.
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 35babc7c5c3..cc96f91ebf9 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -469,7 +469,7 @@ private static String fixClassName(String strClassName) {
     }
 
 
-    private static void findClassesInOnePath(File file, Set<String> listClasses, ClassFilter filter) {
+    private static void findClassesInOnePath(File file, Set<? super String> listClasses, ClassFilter filter) {
         if (file.isDirectory()) {
             findClassesInPathsDir(file.getAbsolutePath(), file, listClasses, filter);
         } else if (file.exists()) {
@@ -500,7 +500,7 @@ private static void findClassesInOnePath(File file, Set<String> listClasses, Cla
     }
 
 
-    private static void findClassesInPathsDir(String strPathElement, File dir, Set<String> listClasses, ClassFilter filter) {
+    private static void findClassesInPathsDir(String strPathElement, File dir, Set<? super String> listClasses, ClassFilter filter) {
         File[] list = dir.listFiles();
         if (list == null) {
             log.warn("{} is not a folder", dir.getAbsolutePath());
@@ -528,7 +528,7 @@ private static void findClassesInPathsDir(String strPathElement, File dir, Set<S
      * @param filter {@link ClassFilter}
      * @param className Full class name
      */
-    private static void applyFiltering(Set<String> classesSet, ClassFilter filter, String className) {
+    private static void applyFiltering(Set<? super String> classesSet, ClassFilter filter, String className) {
         try {
             if (filter.accept(className)) {
                 classesSet.add(className);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 27f583cd178..8120ef25fd5 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -718,7 +718,7 @@ public static Object[] replaceAllWithRegex(
      * @param setter        that gets called with the replaced value
      * @return number of matches that were replaced
      */
-    public static int replaceValue(String regex, String replaceBy, boolean caseSensitive, String value, Consumer<String> setter) {
+    public static int replaceValue(String regex, String replaceBy, boolean caseSensitive, String value, Consumer<? super String> setter) {
         if (StringUtils.isBlank(value)) {
             return 0;
         }
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 95a53501543..1e2a7715843 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -268,7 +268,7 @@ public static void main(String[] args) {
      * @param exceptionsInInit List of {@link Exception}
      * @return String
      */
-    private static String exceptionsToString(List<Exception> exceptionsInInit) {
+    private static String exceptionsToString(List<? extends Exception> exceptionsInInit) {
         StringBuilder builder = new StringBuilder();
         for (Exception exception : exceptionsInInit) {
             StringWriter stringWriter = new StringWriter();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index 931893dc1c3..22ed001a72a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -226,7 +226,7 @@ private InetAddress[] fromStaticHost(String host) {
         return new InetAddress[0];
     }
 
-    private static void addAsLiteralAddress(List<InetAddress> addresses, String address) {
+    private static void addAsLiteralAddress(List<? super InetAddress> addresses, String address) {
         try {
             addresses.add(InetAddress.getByName(address));
         } catch (UnknownHostException e) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
index 32b6b04a780..40846bfaec2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
@@ -137,7 +137,7 @@ public void addConfigElement(ConfigElement config) {
     }
 
     private static void addFormUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
-            List<HTTPSamplerBase> potentialLinks) {
+            List<? super HTTPSamplerBase> potentialLinks) {
         NodeList rootList = html.getChildNodes();
         List<HTTPSamplerBase> urls = new ArrayList<>();
         for (int x = 0; x < rootList.getLength(); x++) {
@@ -156,7 +156,7 @@ private static void addFormUrls(Document html, HTTPSampleResult result, HTTPSamp
     }
 
     private static void addAnchorUrls(Document html, HTTPSampleResult result, HTTPSamplerBase config,
-            List<HTTPSamplerBase> potentialLinks) {
+            List<? super HTTPSamplerBase> potentialLinks) {
         String base = "";
         NodeList baseList = html.getElementsByTagName("base"); // $NON-NLS-1$
         if (baseList.getLength() > 0) {
@@ -191,7 +191,7 @@ private static void addAnchorUrls(Document html, HTTPSampleResult result, HTTPSa
     }
 
     private static void addFramesetUrls(Document html, HTTPSampleResult result,
-            HTTPSamplerBase config, List<HTTPSamplerBase> potentialLinks) {
+            HTTPSamplerBase config, List<? super HTTPSamplerBase> potentialLinks) {
        String base = "";
        NodeList baseList = html.getElementsByTagName("base"); // $NON-NLS-1$
        if (baseList.getLength() > 0) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index dfd9b526b0c..6a68dd20704 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -105,9 +105,9 @@ public Iterator<URL> iterator() {
      * Private iterator used to unwrap the URL from the URLString class
      */
     private static class UrlIterator implements Iterator<URL> {
-        private final Iterator<URLString> iter;
+        private final Iterator<? extends URLString> iter;
 
-        UrlIterator(Iterator<URLString> i) {
+        UrlIterator(Iterator<? extends URLString> i) {
             iter = i;
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index d577f320284..936807905d7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -48,7 +48,7 @@ public FormCharSetFinder() {
      * @param pageEncoding the encoding used for the whole page
      * @throws HTMLParseException when parsing the <code>html</code> fails
      */
-    public void addFormActionsAndCharSet(String html, Map<String, String> formEncodings, String pageEncoding)
+    public void addFormActionsAndCharSet(String html, Map<? super String, ? super String> formEncodings, String pageEncoding)
             throws HTMLParseException {
         log.debug("Parsing html of: {}", html);
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 421cc975cd7..9b5a6623c96 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -1324,7 +1324,7 @@ private static boolean hasCorrectInterface(Object obj, Set<Class<?>> klasses) {
      * @param sampler        Sampler to remove values from.
      * @param configurations ConfigTestElements in descending priority.
      */
-    private static void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<ConfigTestElement> configurations) {
+    private static void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<? extends ConfigTestElement> configurations) {
         PropertyIterator props = sampler.propertyIterator();
         while (props.hasNext()) {
             JMeterProperty prop = props.next();
@@ -1414,7 +1414,7 @@ private static boolean matchesPatternsWithOroRegex(String url, CollectionPropert
      * @param variables Collection of Arguments to use to do the replacement, ordered
      *                  by ascending priority.
      */
-    private void replaceValues(TestElement sampler, TestElement[] configs, Collection<Arguments> variables) {
+    private void replaceValues(TestElement sampler, TestElement[] configs, Collection<? extends Arguments> variables) {
         // Build the replacer from all the variables in the collection:
         ValueReplacer replacer = new ValueReplacer();
         for (Arguments variable : variables) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 8f7e624bd9a..b338faef4e3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -772,7 +772,7 @@ protected HTTPSampleResult sample(URL url, String method,
      * @param localContext {@link HttpContext}
      */
     private static void saveProxyAuth(
-            MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
+            MutableTriple<CloseableHttpClient, ? super AuthState, PoolingHttpClientConnectionManager> triple,
             HttpContext localContext) {
         triple.setMiddle((AuthState) localContext.getAttribute(HttpClientContext.PROXY_AUTH_STATE));
     }
@@ -782,7 +782,7 @@ private static void saveProxyAuth(
      * @param triple {@link MutableTriple} May be null if first request
      * @param localContext {@link HttpContext}
      */
-    private static void setupProxyAuthState(MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
+    private static void setupProxyAuthState(MutableTriple<CloseableHttpClient, ? extends AuthState, PoolingHttpClientConnectionManager> triple,
             HttpContext localContext) {
         if (triple != null) {
             AuthState proxyAuthState = triple.getMiddle();
@@ -1227,7 +1227,7 @@ private static void resetStateIfNeeded(
             MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
             JMeterVariables jMeterVariables,
             HttpClientContext clientContext,
-            Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
+            Map<HttpClientKey, ? extends MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
         if (resetStateOnThreadGroupIteration.get()) {
             closeCurrentConnections(mapHttpClientPerHttpClientKey);
             clientContext.removeAttribute(HttpClientContext.USER_TOKEN);
@@ -1245,7 +1245,7 @@ private static void resetStateIfNeeded(
      * @param mapHttpClientPerHttpClientKey
      */
     private static void closeCurrentConnections(
-            Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
+            Map<HttpClientKey, ? extends MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
         for (MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple :
                 mapHttpClientPerHttpClientKey.values()) {
             PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = triple.getRight();
@@ -1483,7 +1483,7 @@ private static String getOnlyCookieFromHeaders(HttpRequest method) {
      * @param method <code>HttpMethod</code> which represents the request
      * @return the headers as a string
      */
-    private static String getFromHeadersMatchingPredicate(HttpRequest method, Predicate<String> predicate) {
+    private static String getFromHeadersMatchingPredicate(HttpRequest method, Predicate<? super String> predicate) {
         if(method != null) {
             // Get all the request headers
             StringBuilder hdrs = new StringBuilder(150);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 22bb7a7e302..46936887d8f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -425,7 +425,7 @@ private static String getAllHeadersExceptCookie(HttpURLConnection conn, Map<Stri
      * @return the headers as a string
      */
     private static String getFromConnectionHeaders(HttpURLConnection conn, Map<String, String> securityHeaders,
-            Predicate<String> predicate, boolean addSecurityHeaders) {
+            Predicate<? super String> predicate, boolean addSecurityHeaders) {
         // Get all the request properties, which are the headers set on the connection
         StringBuilder hdrs = new StringBuilder(100);
         Map<String, List<String>> requestHeaders = conn.getRequestProperties();
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index b9d8d99e828..b464a20e569 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -583,7 +583,7 @@ private String getStringFromResultSet(ResultSet rs) throws SQLException, Unsuppo
     }
 
     private static int processRow(ResultSet rs, ResultSetMetaData meta, StringBuilder sb, int numColumns,
-            JMeterVariables jmvars, String[] varNames, List<Map<String, Object>> results, int currentIterationIndex)
+            JMeterVariables jmvars, String[] varNames, List<? super Map<String, Object>> results, int currentIterationIndex)
             throws SQLException, UnsupportedEncodingException {
         Map<String, Object> row = null;
         currentIterationIndex++;
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
index 8d827792b3f..ce490d0c264 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
@@ -880,7 +880,7 @@ scope, getCountlimAsLong(),
      * unless the number of results exceeds {@link #MAX_SORTED_RESULTS} in which case just stream
      * the results out without sorting.
      */
-    private void writeSearchResults(final XMLBuffer xmlb, final NamingEnumeration<SearchResult> srch)
+    private void writeSearchResults(final XMLBuffer xmlb, final NamingEnumeration<? extends SearchResult> srch)
             throws NamingException
     {
 
@@ -955,7 +955,7 @@ private static void writeSearchResult(final SearchResult sr, final XMLBuffer xml
         }
     }
 
-    private static void sortAttributes(final List<Attribute> sortedAttrs) {
+    private static void sortAttributes(final List<? extends Attribute> sortedAttrs) {
         sortedAttrs.sort((o1, o2) -> {
             String nm1 = o1.getID();
             String nm2 = o2.getID();
@@ -964,7 +964,7 @@ private static void sortAttributes(final List<Attribute> sortedAttrs) {
         });
     }
 
-    private static void sortResults(final List<SearchResult> sortedResults) {
+    private static void sortResults(final List<? extends SearchResult> sortedResults) {
         sortedResults.sort(new Comparator<SearchResult>() {
             private int compareToReverse(final String s1, final String s2) {
                 int len1 = s1.length();
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index 60c6aff2ff8..3ac30303d2e 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -333,7 +333,7 @@ private static String getSamplerData(Message message) throws MessagingException,
     }
 
     @SuppressWarnings("JdkObsolete")
-    private static void writeHeaders(Enumeration<Header> headers, StringBuilder sb) {
+    private static void writeHeaders(Enumeration<? extends Header> headers, StringBuilder sb) {
         while (headers.hasMoreElements()) {
             Header header = headers.nextElement();
             sb.append(header.getName());

From d13f120e2f8a1df2089e260a2a6fc1aef8794506 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 11:41:59 +0300
Subject: [PATCH 0459/1037] perf: Improve HTTP HeaderManager performance when
 it contains many headers: skip reinitialization on each iteration

AbstractTestElement#recoverRunningVersion resets all the properties on each iteration,
and it is used for loop-like elements mostly.
However, HTTP HeaderManager does not modify its state during the execution,
so there's no need to reset its state.

See also https://github.com/apache/jmeter/issues/5875#issuecomment-1533357690
---
 .../apache/jmeter/protocol/http/control/HeaderManager.java   | 5 +++++
 xdocs/changes.xml                                            | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 5b63c98b491..5a9af45e44f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -57,6 +57,11 @@ public HeaderManager() {
         setProperty(new CollectionProperty(HEADERS, new ArrayList<>()));
     }
 
+    @Override
+    public void recoverRunningVersion() {
+        // The component does not modify fields during the run
+    }
+
     /** {@inheritDoc} */
     @Override
     public void clear() {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ce782ec80be..76b01fa7822 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -108,6 +108,7 @@ Summary
     Previously it cached the values based on iteration number only which triggered wrong results on concurrent executions.
     The previous behavior can be temporary restored with <code>function.cache.per.iteration</code> property.
   </li>
+  <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From a87989a65ce9582a8a32ef14bd90bf27229cfa89 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 18 May 2023 17:45:04 +0300
Subject: [PATCH 0460/1037] Support custom thread group implementations in "Add
 think time" and "Save as test fragment" actions

---
 .../apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java | 4 ++--
 src/core/src/main/java/org/apache/jmeter/gui/action/Save.java | 4 ++--
 xdocs/changes.xml                                             | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
index 44ec34fc653..5424109c1fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
@@ -28,7 +28,7 @@
 import org.apache.jmeter.gui.action.thinktime.ThinkTimeCreator;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@ public void doAction(ActionEvent e) {
         JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
         if (!
                 (currentNode.getUserObject() instanceof Controller ||
-                        currentNode.getUserObject() instanceof ThreadGroup)
+                        currentNode.getUserObject() instanceof AbstractThreadGroup)
                 ) {
             Toolkit.getDefaultToolkit().beep();
             return;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index 2cb8051072b..9572619b8fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -49,7 +49,7 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
-import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
@@ -451,7 +451,7 @@ private static List<File> expiredBackupFiles(List<? extends File> backupFiles) {
      */
     private static boolean checkAcceptableForTestFragment(JMeterTreeNode[] nodes) {
         return Arrays.stream(nodes).map(DefaultMutableTreeNode::getUserObject)
-                .noneMatch(o -> o instanceof ThreadGroup || o instanceof TestPlan);
+                .noneMatch(o -> o instanceof AbstractThreadGroup || o instanceof TestPlan);
     }
 
     // package protected to allow access from test code
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 76b01fa7822..b0f6a9a1642 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -70,6 +70,7 @@ Summary
 <h3>Thread Groups</h3>
 <ul>
 <li><issue>5682</issue><pr>717</pr> Open Model Thread Group: avoid skipping rows from CSV Data Set Config</li>
+  <li>Support custom thread group implementations in "Add think time" and "Save as test fragment" actions</li>
 </ul>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>

From c6c363c511a53472aaa472a2356db48b5e0cd1db Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 18 May 2023 19:31:06 +0300
Subject: [PATCH 0461/1037] chore: remove unused kotlin-test-junit5 dependency
 from the test classpath

Too many testing libraries make it hard to select the right `@Test` annotation.
---
 build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts | 4 ----
 .../apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt   | 2 +-
 .../jmeter/threads/openmodel/PoissonArrivalsRampTest.kt       | 2 +-
 .../threads/openmodel/ThreadScheduleProcessGeneratorTest.kt   | 2 +-
 .../org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt | 2 +-
 .../org/apache/jmeter/threads/openmodel/TokenizerTest.kt      | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 59a63eb01d1..62e8d6daaf4 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -28,10 +28,6 @@ plugins {
     kotlin("kapt") apply false
 }
 
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-}
-
 val String.v: String get() = rootProject.extra["$this.version"] as String
 
 kotlin {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
index 7f9ea58f165..ce42a67133f 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.threads.openmodel
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.Locale
-import kotlin.test.assertEquals
 
 class EvenArrivalsRampTest {
     class Case(val beginRate: Double, val endRate: Double, val duration: Double, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
index 29123629e7c..6a9bb0cb92f 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
@@ -17,13 +17,13 @@
 
 package org.apache.jmeter.threads.openmodel
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.Locale
 import java.util.Random
-import kotlin.test.assertEquals
 
 class PoissonArrivalsRampTest {
     class Case(
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
index b889ccf3f67..952b738360e 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
@@ -17,13 +17,13 @@
 
 package org.apache.jmeter.threads.openmodel
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.Locale
 import java.util.Random
-import kotlin.test.assertEquals
 
 class ThreadScheduleProcessGeneratorTest {
     class Case(val schedule: String, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
index e2ee2ab1432..fc822109463 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.threads.openmodel
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import kotlin.test.assertEquals
 
 class ThreadScheduleTest {
     class Case(val input: String, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
index 438bcc494d3..2d49c540a1e 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.threads.openmodel
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import kotlin.test.assertEquals
 
 class TokenizerTest {
     class Case(val input: String, val expected: String) {

From 268930acd835ab0fa57ecd43b992932f9961f16c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 08:30:03 +0300
Subject: [PATCH 0462/1037] chore: add constraints to renovate.json so it
 suggests Java 8-compatible versions

---
 renovate.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/renovate.json b/renovate.json
index 5dc94b3f3aa..47e06ca30fd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -10,6 +10,11 @@
       "matchPackagePrefixes": ["com.fasterxml.jackson.core"],
       "groupName": "com.fasterxml.jackson.core"
     },
+    {
+      "matchPackagePrefixes": ["com.github.ben-manes.caffeine"],
+      "description": "TODO: Caffeine 3.0 requires Java 11",
+      "allowedVersions": "< 3.0"
+    },
     {
       "matchPackagePrefixes": ["com.github.vlsi"],
       "groupName": "com.github.vlsi"
@@ -22,13 +27,24 @@
       "matchPackagePrefixes": ["com.helger"],
       "groupName": "com.helger"
     },
+    {
+      "matchPackagePrefixes": ["net.minidev:accessors-smart", "net.minidev:json-smart"],
+      "groupName": "net.minidev json-smart"
+    },
     {
       "matchPackagePrefixes": ["com.miglayout"],
       "groupName": "com.miglayout"
     },
+    {
+      "matchPackagePrefixes": ["org.ajoberstar.grgit"],
+      "groupName": "org.ajoberstar.grgit",
+      "description": "TODO: grgit 5.0 requires Java 11",
+      "allowedVersions": "< 5.0"
+    },
     {
       "matchPackagePrefixes": ["org.apache.activemq"],
       "groupName": "org.apache.activemq",
+      "description": "TODO: activemq 5.17.0 requires Java 11",
       "allowedVersions": "< 5.17.0"
     },
     {
@@ -51,6 +67,12 @@
       "matchPackagePrefixes": ["org.checkerframework"],
       "groupName": "org.checkerframework"
     },
+    {
+      "matchPackagePrefixes": ["org.eclipse.jgit"],
+      "groupName": "org.eclipse.jgit",
+      "description": "TODO: jgit 6.0 requires Java 11",
+      "allowedVersions": "< 6.0"
+    },
     {
       "matchPackagePrefixes": ["org.jetbrains.lets-plot"],
       "groupName": "org.jetbrains.lets-plot"
@@ -64,6 +86,12 @@
       "groupName": "org.slf4j",
       "allowedVersions": "< 2.0.0"
     },
+    {
+      "matchPackagePrefixes": ["org.spockframework"],
+      "groupName": "org.spockframework",
+      "description": "TODO: change when we upgrade to Groovy 4.0",
+      "allowedVersions": "/.*-groovy-3.0/"
+    },
     {
       "matchPackagePatterns": ["^src:protocol"],
       "enabled": false

From c63fa696684566a28b084eef8b3b5a55cd04512b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 08:34:01 +0300
Subject: [PATCH 0463/1037] chore: bump plugin com.gradle.enterprise to v3.13.2

---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 307ffd7b29e..edc6fd6ea76 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.13.1"
+    id("com.gradle.enterprise") version "3.13.2"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 }
 
@@ -150,8 +150,8 @@ val expectedSha512 = mapOf(
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
-    "55861E14836DEC4529A19DA400D09AA31453F40DFBC790D368639F3D2105DFEAD62AE43F3ACAE69A427016CCE1BD31FB6EB34D9176E664133B6773C0856E2492"
-        to "gradle-enterprise-gradle-plugin-3.13.1.jar",
+    "2625BD9FF15E17D47F678453B856E161E70E9460DB4DC05275CFE1EF7F6ACF8D2DC2CA8F2D59BB1B6E6DD1AD9CA617A41358FA03840A4D9FF18E231278FCAE13"
+        to "gradle-enterprise-gradle-plugin-3.13.2.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"

From 9b40f19100f211d0885a7ebdab2d37ec5578213a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 May 2023 05:35:57 +0000
Subject: [PATCH 0464/1037] fix(deps): update dependency
 org.spockframework:spock-core to v2.3-groovy-3.0

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 66c4e119554..0812deffa6a 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2")
         api("org.hsqldb:hsqldb:2.7.1")
         api("org.objenesis:objenesis:3.3")
-        api("org.spockframework:spock-core:2.2-groovy-3.0")
+        api("org.spockframework:spock-core:2.3-groovy-3.0")
         api("org.springframework:spring-beans:4.3.30.RELEASE")
         api("org.springframework:spring-context:4.3.30.RELEASE")
     }

From 4ca29de0ada7daa4a367b21de4e6be8fb38ef945 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 May 2023 05:35:53 +0000
Subject: [PATCH 0465/1037] fix(deps): update net.minidev json-smart to v2.4.11

---
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6ceb04daf08..199b6e19f5f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -88,8 +88,8 @@ dependencies {
         api("org.jetbrains:annotations:24.0.1")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
-        api("net.minidev:accessors-smart:2.4.9")
-        api("net.minidev:json-smart:2.4.10")
+        api("net.minidev:accessors-smart:2.4.11")
+        api("net.minidev:json-smart:2.4.11")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.5")
         api("org.apache-extras.beanshell:bsh:2.0b6")

From 21d003939dfe167fe05c0d45762f88cdfc348784 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 09:32:26 +0300
Subject: [PATCH 0466/1037] chore: add expected checksums for the newer jgit
 versions

---
 settings.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index edc6fd6ea76..964187de101 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -144,10 +144,14 @@ val expectedSha512 = mapOf(
     // TODO: remove JavaEWAH-1.1.12.jar, org.eclipse.jgit-5.13.0.202109080827-r.jar, slf4j-api-1.7.30.jar when Autostyle updates jgit
     "ECBBFD1C6593AFBAA4CA7F65E10BC67B12FF75EB221E490051522FAC8D291B202A0A165644A9C5AC9E5618CD771817C9052F171E5E6210CB021DF5A6E4CBF787"
         to "JavaEWAH-1.1.12.jar",
+    "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
+        to "JavaEWAH-1.1.13.jar",
     "F9ED8AA41A3B085F534B5298DD9552773AA5D4194C60C1C6299F7EAC82CBD02C26C834CDE7D9B00605D5DF85F50FDE2A144653F1186B9BFC916D84569230518"
         to "common-custom-user-data-gradle-plugin-1.10.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
+    "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"
+        to "org.eclipse.jgit-5.13.1.202206130422-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
     "2625BD9FF15E17D47F678453B856E161E70E9460DB4DC05275CFE1EF7F6ACF8D2DC2CA8F2D59BB1B6E6DD1AD9CA617A41358FA03840A4D9FF18E231278FCAE13"

From 1076baf68f76deb282a01f522428909c139771f3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 May 2023 07:10:47 +0000
Subject: [PATCH 0467/1037] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v5.13.1.202206130422-r

---
 build-logic/batchtest/build.gradle.kts | 2 +-
 settings.gradle.kts                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/batchtest/build.gradle.kts b/build-logic/batchtest/build.gradle.kts
index f36e54aae8b..72b7467a275 100644
--- a/build-logic/batchtest/build.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -21,5 +21,5 @@ plugins {
 
 dependencies {
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 964187de101..62aaa53a422 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -132,7 +132,7 @@ buildscript {
             exclude("org.jetbrains.kotlin", "kotlin-stdlib")
         }
         // Remove when Autostyle updates jgit dependency
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r")
     }
     repositories {
         gradlePluginPortal()

From e60961016006fe4c91d61309bb64ad336ad5d865 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 11:18:36 +0300
Subject: [PATCH 0468/1037] chore: remove unused build-logic.testing.gradle.kts

---
 .../src/main/kotlin/build-logic.java.gradle.kts |  1 -
 .../main/kotlin/build-logic.testing.gradle.kts  | 17 -----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 3f4a60691fb..32c5d4fbd68 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -26,7 +26,6 @@ plugins {
     id("idea")
     id("com.github.vlsi.crlf")
     id("com.github.vlsi.gradle-extensions")
-    id("build-logic.testing")
     id("build-logic.test-base")
     id("build-logic.build-params")
     id("build-logic.style")
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
deleted file mode 100644
index 4b9a3e85b6d..00000000000
--- a/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-

From c69730cfe78cd855eb37ce31bcfd2198c9388788 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 11:19:11 +0300
Subject: [PATCH 0469/1037] style: remove use of deprecated API in FileServer

---
 .../main/java/org/apache/jmeter/services/FileServer.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index 3b7e94326d9..1f9b836a282 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -423,10 +423,8 @@ private static BufferedReader createBufferedReader(FileEntry fileEntry) throws I
         if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
             throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
         }
-        // TODO: figure out the proper way to use BOMInputStream.builder()
-        //   See https://issues.apache.org/jira/browse/IO-792
-        @SuppressWarnings("deprecation")
-        BOMInputStream fis = new BOMInputStream(Files.newInputStream(fileEntry.file.toPath())); //NOSONAR
+
+        BOMInputStream fis = BOMInputStream.builder().setFile(fileEntry.file).get();
         InputStreamReader isr = null;
         // If file encoding is specified, read using that encoding, otherwise use default platform encoding
         String charsetName = fileEntry.charSetEncoding;

From 6cc575132c7d9d332d7136e7f027d931585744d5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 11:31:36 +0300
Subject: [PATCH 0470/1037] test: fix assertions in BoltSamplerSpec

response.getTime() returns the response time, and it might be 0
in case the response is fast.

Fixes https://github.com/apache/jmeter/issues/5919
---
 .../protocol/bolt/sampler/BoltSamplerSpec.groovy  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
index a6062c7949e..65e6b09efe0 100644
--- a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
+++ b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
@@ -65,7 +65,9 @@ class BoltSamplerSpec extends Specification {
             str.endsWith("Records: Skipped")
             response.getSampleCount() == 1
             response.getErrorCount() == 0
-            response.getTime() > 0
+            //  The sampler was executed, so start and end times should be set
+            response.getStartTime() > 0
+            response.getEndTime() > 0
     }
 
     def "should not display results by default"() {
@@ -99,7 +101,9 @@ class BoltSamplerSpec extends Specification {
             str.endsWith("Mock for type 'Record'")
             response.getSampleCount() == 1
             response.getErrorCount() == 0
-            response.getTime() > 0
+            //  The sampler was executed, so start and end times should be set
+            response.getStartTime() > 0
+            response.getEndTime() > 0
     }
 
     def "should return error on failed query"() {
@@ -116,7 +120,9 @@ class BoltSamplerSpec extends Specification {
             str.contains("a message")
             response.getSampleCount() == 1
             response.getErrorCount() == 1
-            response.getTime() > 0
+            //  The sampler was executed, so start and end times should be set
+            response.getStartTime() > 0
+            response.getEndTime() > 0
     }
 
     def "should return error on invalid parameters"() {
@@ -133,6 +139,9 @@ class BoltSamplerSpec extends Specification {
             str.contains("Unexpected character")
             response.getSampleCount() == 1
             response.getErrorCount() == 1
+            // The sampler fails at parameter preparation, so no time is recorded
+            response.getStartTime() == 0
+            response.getEndTime() == 0
             response.getTime() == 0
     }
 

From e669b83d25a913bc5220b358a94f863d759302b4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 May 2023 08:25:18 +0000
Subject: [PATCH 0471/1037] chore(deps): update actions/checkout action to v3

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4dfcc413452..cfa58362b12 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       # max-parallel: 4
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, ${{ matrix.java_distribution }}

From a6178f9c67d983f142d2b42281fa6aa7b194346e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 5 May 2023 12:25:16 +0300
Subject: [PATCH 0472/1037] perf: use AtomicInteger and AtomicLong instead of
 synchronized primitives for JMeterContextService#numberOfThreads

---
 .../jmeter/threads/JMeterContextService.java  | 68 +++++++++----------
 xdocs/changes.xml                             |  1 +
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java
index 32d1356bfaf..c5ee9a9cda9 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java
@@ -17,6 +17,9 @@
 
 package org.apache.jmeter.threads;
 
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.jmeter.util.JMeterUtils;
 
 /**
@@ -26,20 +29,15 @@
 public final class JMeterContextService {
     private static final ThreadLocal<JMeterContext> threadContext = ThreadLocal.withInitial(JMeterContext::new);
 
-    //@GuardedBy(JMeterContextService.class)
-    private static long testStart = 0;
+    private static final AtomicLong testStart = new AtomicLong();
 
-    //@GuardedBy(JMeterContextService.class)
-    private static int numberOfActiveThreads = 0;
+    private static final AtomicInteger NUMBER_OF_ACTIVE_THREADS = new AtomicInteger();
 
-    //@GuardedBy(JMeterContextService.class)
-    private static int numberOfThreadsStarted = 0;
+    private static final AtomicInteger NUMBER_OF_THREADS_STARTED = new AtomicInteger();
 
-    //@GuardedBy(JMeterContextService.class)
-    private static int numberOfThreadsFinished = 0;
+    private static final AtomicInteger NUMBER_OF_THREADS_FINISHED = new AtomicInteger();
 
-    //@GuardedBy(JMeterContextService.class)
-    private static int totalThreads = 0;
+    private static final AtomicInteger TOTAL_THREADS = new AtomicInteger();
 
     private static UnmodifiableJMeterVariables variables;
 
@@ -84,40 +82,40 @@ public static void replaceContext(JMeterContext context) {
      * Saves current time in a field and in the JMeter property "TESTSTART.MS"
      */
     public static synchronized void startTest() {
-        if (testStart == 0) {
-            numberOfActiveThreads = 0;
-            testStart = System.currentTimeMillis();
-            JMeterUtils.setProperty("TESTSTART.MS",Long.toString(testStart));// $NON-NLS-1$
+        if (testStart.get() == 0) {
+            NUMBER_OF_ACTIVE_THREADS.set(0);
+            testStart.set(System.currentTimeMillis());
+            JMeterUtils.setProperty("TESTSTART.MS", Long.toString(testStart.get()));// $NON-NLS-1$
         }
     }
 
     /**
      * Increment number of active threads.
      */
-    static synchronized void incrNumberOfThreads() {
-        numberOfActiveThreads++;
-        numberOfThreadsStarted++;
+    static void incrNumberOfThreads() {
+        NUMBER_OF_ACTIVE_THREADS.incrementAndGet();
+        NUMBER_OF_THREADS_STARTED.incrementAndGet();
     }
 
     /**
      * Decrement number of active threads.
      */
-    static synchronized void decrNumberOfThreads() {
-        numberOfActiveThreads--;
-        numberOfThreadsFinished++;
+    static void decrNumberOfThreads() {
+        NUMBER_OF_ACTIVE_THREADS.decrementAndGet();
+        NUMBER_OF_THREADS_FINISHED.incrementAndGet();
     }
 
     /**
      * Get the number of currently active threads
      * @return active thread count
      */
-    public static synchronized int getNumberOfThreads() {
-        return numberOfActiveThreads;
+    public static int getNumberOfThreads() {
+        return NUMBER_OF_ACTIVE_THREADS.get();
     }
 
     // return all the associated counts together
-    public static synchronized ThreadCounts getThreadCounts() {
-        return new ThreadCounts(numberOfActiveThreads, numberOfThreadsStarted, numberOfThreadsFinished);
+    public static ThreadCounts getThreadCounts() {
+        return new ThreadCounts(NUMBER_OF_ACTIVE_THREADS.get(), NUMBER_OF_THREADS_STARTED.get(), NUMBER_OF_THREADS_FINISHED.get());
     }
 
     /**
@@ -125,37 +123,37 @@ public static synchronized ThreadCounts getThreadCounts() {
      * Clears start time field.
      */
     public static synchronized void endTest() {
-        testStart = 0;
+        testStart.set(0);
         resetClientSideVariables();
     }
 
-    public static synchronized long getTestStartTime() {
-        return testStart;
+    public static long getTestStartTime() {
+        return testStart.get();
     }
 
     /**
      * Get the total number of threads (&gt;= active)
      * @return total thread count
      */
-    public static synchronized int getTotalThreads() {
-        return totalThreads;
+    public static int getTotalThreads() {
+        return TOTAL_THREADS.get();
     }
 
     /**
      * Update the total number of threads
      * @param thisGroup number of threads in this thread group
      */
-    public static synchronized void addTotalThreads(int thisGroup) {
-        totalThreads += thisGroup;
+    public static void addTotalThreads(int thisGroup) {
+        TOTAL_THREADS.addAndGet(thisGroup);
     }
 
     /**
      * Set total threads to zero; also clears started and finished counts
      */
-    public static synchronized void clearTotalThreads() {
-        totalThreads = 0;
-        numberOfThreadsStarted = 0;
-        numberOfThreadsFinished = 0;
+    public static void clearTotalThreads() {
+        TOTAL_THREADS.set(0);
+        NUMBER_OF_THREADS_STARTED.set(0);
+        NUMBER_OF_THREADS_FINISHED.set(0);
     }
 
     /**
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b0f6a9a1642..91fcde54d36 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -110,6 +110,7 @@ Summary
     The previous behavior can be temporary restored with <code>function.cache.per.iteration</code> property.
   </li>
   <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
+  <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 010a5f023e95567869e9cbd4fabd481cce8b0c59 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 10:08:07 +0300
Subject: [PATCH 0473/1037] perf: cache bean properties in TestBeanHelper and
 avoid synchronization, so test plans with TestBean-based elements is faster

The key changes are:
1) Property information is cached, so it does not need to be computed on each element preparation
2) Certain methods like PropertyDescriptor#getWriteMethod are synchronized,
  and it causes unwanted thread synchronization
---
 .../jmeter/testbeans/TestBeanHelper.java      | 104 +++++++++++++-----
 xdocs/changes.xml                             |   1 +
 2 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
index fa19b19d8cb..5b5cec7f1d1 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
@@ -25,6 +25,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testbeans.gui.TableEditor;
@@ -53,52 +54,103 @@ public class TestBeanHelper {
     protected static final Logger log = LoggerFactory.getLogger(TestBeanHelper.class);
 
     /**
-     * Prepare the bean for work by populating the bean's properties from the
-     * property value map.
-     * <p>
-     *
-     * @param el the TestElement to be prepared
+     * This class extracts information from {@link CachedPropertyDescriptor} in such a way so it
+     * does not need to synchronize.
      */
-    public static void prepare(TestElement el) {
-        if (!(el instanceof TestBean)) {
-            return;
+    static class CachedPropertyDescriptor {
+        final PropertyDescriptor descriptor;
+        /**
+         * Cached value for {@link PropertyDescriptor#getWriteMethod()}.
+         * {@code getWriteMethod} is {@code synchronized} in OpenJDK 17.
+         *
+         * @see PropertyDescriptor#getWriteMethod()
+         */
+        final Method writeMethod;
+        /**
+         * Cached value for {@link PropertyDescriptor#getPropertyType()}.
+         * {@code getPropertyType} is {@code synchronized} in OpenJDK 17.
+         *
+         * @see PropertyDescriptor#getPropertyType()
+         */
+        final Class<?> propertyType;
+
+        CachedPropertyDescriptor(PropertyDescriptor descriptor) {
+            this.descriptor = descriptor;
+            this.writeMethod = descriptor.getWriteMethod();
+            this.propertyType = descriptor.getPropertyType();
         }
-        try {
-            BeanInfo beanInfo = Introspector.getBeanInfo(el.getClass());
-            PropertyDescriptor[] descs = beanInfo.getPropertyDescriptors();
+    }
+
+    /**
+     * Cache property information, so preparing test elements does not need to perform reflective and
+     * synchronization again.
+     */
+    private static final ClassValue<List<CachedPropertyDescriptor>> GOOD_PROPS = new ClassValue<List<CachedPropertyDescriptor>>() {
+        @Override
+        protected List<CachedPropertyDescriptor> computeValue(Class type) {
+            PropertyDescriptor[] descs;
+            try {
+                BeanInfo beanInfo = Introspector.getBeanInfo(type);
+                descs = beanInfo.getPropertyDescriptors();
+            } catch (IntrospectionException e) {
+                log.error("Couldn't set properties for {}", type, e);
+                throw new IllegalArgumentException("Couldn't set properties for " + type, e);
+            }
 
             if (log.isDebugEnabled()) {
-                log.debug("Preparing {}", el.getClass());
+                log.debug("Preparing {}", type);
             }
 
+            List<CachedPropertyDescriptor> descriptors = new ArrayList<>(descs.length);
             for (PropertyDescriptor desc : descs) {
                 if (isDescriptorIgnored(desc)) {
                     if (log.isDebugEnabled()) {
-                        log.debug("Ignoring property '{}' in {}", desc.getName(), el.getClass().getCanonicalName());
+                        log.debug("Ignoring property '{}' in {}", desc.getName(), type.getCanonicalName());
                     }
                     continue;
                 }
+                Method writeMethod = desc.getWriteMethod();
+                if (writeMethod == null) {
+                    continue;
+                }
+                descriptors.add(new CachedPropertyDescriptor(desc));
+            }
+            return descriptors;
+        }
+    };
+
+    /**
+     * Prepare the bean for work by populating the bean's properties from the
+     * property value map.
+     * <p>
+     *
+     * @param el the TestElement to be prepared
+     */
+    public static void prepare(TestElement el) {
+        if (!(el instanceof TestBean)) {
+            return;
+        }
+        // Avoid allocating array for every method call
+        Object[] tmp = new Object[1];
+        try {
+            for (CachedPropertyDescriptor desc : GOOD_PROPS.get(el.getClass())) {
                 // Obtain a value of the appropriate type for this property.
-                JMeterProperty jprop = el.getProperty(desc.getName());
-                Class<?> type = desc.getPropertyType();
-                Object value = unwrapProperty(desc, jprop, type);
+                JMeterProperty jprop = el.getProperty(desc.descriptor.getName());
+                Class<?> type = desc.propertyType;
+                Object value = unwrapProperty(desc.descriptor, jprop, type);
 
                 if (log.isDebugEnabled()) {
                     log.debug("Setting {}={}", jprop.getName(), value);
                 }
 
                 // Set the bean's property to the value we just obtained:
-                if (value != null || !type.isPrimitive())
                 // We can't assign null to primitive types.
-                {
-                    Method writeMethod = desc.getWriteMethod();
-                    if (writeMethod!=null) {
-                        invokeOrBailOut(el, writeMethod, new Object[] {value});
-                    }
+                if (value != null || !type.isPrimitive()) {
+                    Method writeMethod = desc.writeMethod;
+                    tmp[0] = value;
+                    invokeOrBailOut(el, writeMethod, tmp);
                 }
             }
-        } catch (IntrospectionException e) {
-            log.error("Couldn't set properties for {}", el.getClass(), e);
         } catch (UnsatisfiedLinkError ule) { // Can occur running headless on Jenkins
             log.error("Couldn't set properties for {}", el.getClass());
             throw ule;
@@ -164,8 +216,10 @@ private static Object unwrapCollection(MultiProperty prop, String type)
     private static Object invokeOrBailOut(Object invokee, Method method, Object[] params) {
         try {
             return method.invoke(invokee, params);
-        } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
+        } catch (IllegalArgumentException | IllegalAccessException e) {
             throw new Error(createMessage(invokee, method, params), e);
+        } catch (InvocationTargetException e) {
+            throw new Error(createMessage(invokee, method, params), e.getCause());
         }
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 91fcde54d36..e476a6b6517 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -111,6 +111,7 @@ Summary
   </li>
   <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
   <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
+  <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 10096a3003f3f65ed56cec5b4e9d5dee17eabf27 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 17 May 2023 13:55:58 +0300
Subject: [PATCH 0474/1037] perf: use LongAdder and LongAccumulator to avoid
 synchronization in Calculator

---
 .../jmeter/visualizers/SummaryReport.java     |  30 ++--
 .../org/apache/jmeter/util/Calculator.java    | 153 ++++++++++--------
 xdocs/changes.xml                             |   1 +
 3 files changed, 108 insertions(+), 76 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
index 98785ea188c..a31d442687d 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java
@@ -221,21 +221,25 @@ public String getLabelResource() {
 
     @Override
     public void add(final SampleResult res) {
-        Calculator row = tableRows.computeIfAbsent(res.getSampleLabel(useGroupName.isSelected()), label -> {
-            Calculator newRow = new Calculator(label);
-            newRows.add(newRow);
-            return newRow;
-        });
-        /*
-         * Synch is needed because multiple threads can update the counts.
-         */
-        synchronized (row) {
-            row.addSample(res);
+        Map<String, Calculator> tableRows = this.tableRows;
+        String sampleLabel = res.getSampleLabel(useGroupName.isSelected());
+
+        // There are two reasons to avoid calling computeIfAbsent:
+        // 1) Lambda in computeIfAbsent is capturing, so it allocates some memory
+        // 2) computeIfAbsent might synchronize in OpenJDK 1.8..17 even when the key is already present in the map.
+        //    Synchronization might happen when the key sits somewhere in the collision chain.
+        Calculator row = tableRows.get(sampleLabel);
+        if (row == null) {
+            row = tableRows.computeIfAbsent(sampleLabel, label -> {
+                Calculator newRow = new Calculator(label);
+                newRows.add(newRow);
+                return newRow;
+            });
         }
+        // Calculator is thread-safe
+        row.addSample(res);
         Calculator tot = tableRows.get(TOTAL_ROW_LABEL);
-        synchronized (lock) {
-            tot.addSample(res);
-        }
+        tot.addSample(res);
         dataChanged = true;
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
index 539e570f65f..345d01df3c5 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
@@ -17,6 +17,11 @@
 
 package org.apache.jmeter.util;
 
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.DoubleAdder;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.concurrent.atomic.LongAdder;
+
 import org.apache.jmeter.samplers.SampleResult;
 
 /**
@@ -30,31 +35,27 @@
  */
 public class Calculator {
 
-    private double sum = 0;
-
-    private double sumOfSquares = 0;
+    private final DoubleAdder sum = new DoubleAdder();
 
-    private double mean = 0;
+    private final DoubleAdder sumOfSquares = new DoubleAdder();
 
-    private double deviation = 0;
+    private final LongAdder count = new LongAdder();
 
-    private int count = 0;
+    private final LongAdder bytes = new LongAdder();
 
-    private long bytes = 0;
+    private final LongAdder sentBytes = new LongAdder();
 
-    private long sentBytes = 0;
+    private final AtomicLong maximum = new AtomicLong();
 
-    private long maximum = Long.MIN_VALUE;
+    private final AtomicLong minimum = new AtomicLong();
 
-    private long minimum = Long.MAX_VALUE;
-
-    private int errors = 0;
+    private final LongAdder errors = new LongAdder();
 
     private final String label;
 
-    private long startTime = 0;
+    private final AtomicLong startTime = new AtomicLong(Long.MAX_VALUE);
 
-    private long elapsedTime = 0;
+    private final LongAccumulator elapsedTime = new LongAccumulator(Math::max, Long.MIN_VALUE);
 
     public Calculator() {
         this("");
@@ -65,18 +66,16 @@ public Calculator(String label) {
     }
 
     public void clear() {
-        maximum = Long.MIN_VALUE;
-        minimum = Long.MAX_VALUE;
-        sum = 0;
-        sumOfSquares = 0;
-        mean = 0;
-        deviation = 0;
-        count = 0;
-        bytes = 0;
-        sentBytes = 0;
-        errors = 0;
-        startTime = 0;
-        elapsedTime = 0;
+        maximum.set(Long.MIN_VALUE);
+        minimum.set(Long.MAX_VALUE);
+        sum.reset();
+        sumOfSquares.reset();
+        count.reset();
+        bytes.reset();
+        sentBytes.reset();
+        errors.reset();
+        startTime.set(Long.MAX_VALUE);
+        elapsedTime.reset();
     }
 
     /**
@@ -87,23 +86,31 @@ public void clear() {
      * @param sampleCount number of samples included in the value
      */
     private void addValue(long newValue, int sampleCount) {
-        count += sampleCount;
-        double currentVal = newValue;
-        sum += currentVal;
-        if (sampleCount > 1){
-            minimum=Math.min(newValue/sampleCount, minimum);
-            maximum=Math.max(newValue/sampleCount, maximum);
+        count.add(sampleCount);
+        sum.add((double) newValue);
+        long value;
+        double extraSumOfSquares;
+        if (sampleCount > 1) {
+            value = newValue / sampleCount;
             // For n values in an aggregate sample the average value = (val/n)
             // So need to add n * (val/n) * (val/n) = val * val / n
-            sumOfSquares += (currentVal * currentVal) / sampleCount;
+            extraSumOfSquares = ((double) newValue * (double) newValue) / sampleCount;
         } else { // no point dividing by 1
-            minimum=Math.min(newValue, minimum);
-            maximum=Math.max(newValue, maximum);
-            sumOfSquares += currentVal * currentVal;
+            value = newValue;
+            extraSumOfSquares = (double) newValue * (double) newValue;
+        }
+        sumOfSquares.add(extraSumOfSquares);
+
+        long currentMinimum = minimum.get();
+        if (currentMinimum > value) {
+            // We don't expect minimum to update often
+            minimum.accumulateAndGet(value, Math::min);
+        }
+        long currentMaximum = maximum.get();
+        if (currentMaximum < value) {
+            // We don't expect the maximum to update often
+            maximum.accumulateAndGet(value, Math::max);
         }
-        // Calculate each time, as likely to be called for each add
-        mean = sum / count;
-        deviation = Math.sqrt((sumOfSquares / count) - (mean * mean));
     }
 
     /**
@@ -115,13 +122,14 @@ public void addSample(SampleResult res) {
         addBytes(res.getBytesAsLong());
         addSentBytes(res.getSentBytes());
         addValue(res.getTime(),res.getSampleCount());
-        errors+=res.getErrorCount(); // account for multiple samples
-        if (startTime == 0){ // not yet initialised
-            startTime=res.getStartTime();
-        } else {
-            startTime = Math.min(startTime, res.getStartTime());
+        errors.add(res.getErrorCount()); // account for multiple samples
+        long testStarted = startTime.get();
+        // accumulateAndGet always performs the mutation, however, the "test start" timestamp is stable,
+        // so we expect only a few operations to go through the slow path of accumulateAndGet
+        if (res.getStartTime() < testStarted) {
+            testStarted = startTime.accumulateAndGet(res.getStartTime(), Math::min);
         }
-        elapsedTime = Math.max(elapsedTime, res.getEndTime()-startTime);
+        elapsedTime.accumulate(res.getEndTime() - testStarted);
     }
 
     /**
@@ -129,7 +137,7 @@ public void addSample(SampleResult res) {
      * @param newValue received bytes
      */
     public void addBytes(long newValue) {
-        bytes += newValue;
+        bytes.add(newValue);
     }
 
     /**
@@ -137,36 +145,54 @@ public void addBytes(long newValue) {
      * @param value sent bytes
      */
     private void addSentBytes(long value) {
-        sentBytes += value;
+        sentBytes.add(value);
     }
 
     public long getTotalBytes() {
-        return bytes;
+        return bytes.sum();
     }
 
 
     public double getMean() {
-        return mean;
+        double sum = this.sum.sum();
+        double count = this.count.sum();
+        if (count == 0) {
+            return 0.0;
+        }
+        return sum / count;
     }
 
     public Number getMeanAsNumber() {
-        return (long) mean;
+        // It was long in previous releases, so let's keep it that way for now
+        return (long) getMean();
     }
 
     public double getStandardDeviation() {
-        return deviation;
+        double sum = this.sum.sum();
+        double sumOfSquares = this.sumOfSquares.sum();
+        double count = this.count.sum();
+        // Just in case
+        if (count == 0) {
+            return 0.0;
+        }
+        double mean = sum / count;
+        return Math.sqrt((sumOfSquares / count) - (mean * mean));
     }
 
     public long getMin() {
-        return minimum;
+        return minimum.get();
     }
 
     public long getMax() {
-        return maximum;
+        return maximum.get();
     }
 
     public int getCount() {
-        return count;
+        return (int) getCountLong();
+    }
+
+    public long getCountLong() {
+        return count.sum();
     }
 
     public String getLabel() {
@@ -181,13 +207,11 @@ public String getLabel() {
      *         that were recorded.
      */
     public double getErrorPercentage() {
-        double rval = 0.0;
-
+        long count = this.count.sum();
         if (count == 0) {
-            return rval;
+            return 0.0;
         }
-        rval = (double) errors / (double) count;
-        return rval;
+        return errors.sum() / (double) count;
     }
 
     /**
@@ -199,7 +223,7 @@ public double getErrorPercentage() {
      * @return throughput associated to this sampler in requests per second
      */
     public double getRate() {
-        return getRatePerSecond(count);
+        return getRatePerSecond(count.sum());
     }
 
     /**
@@ -209,8 +233,10 @@ public double getRate() {
      * @return average page size in bytes
      */
     public double getAvgPageBytes() {
+        long count = this.count.sum();
+        long bytes = this.bytes.sum();
         if (count > 0 && bytes > 0) {
-            return (double) bytes / count;
+            return ((double) bytes) / count;
         }
         return 0.0;
     }
@@ -221,7 +247,7 @@ public double getAvgPageBytes() {
      * @return throughput in bytes/second
      */
     public double getBytesPerSecond() {
-        return getRatePerSecond(bytes);
+        return getRatePerSecond(bytes.sum());
     }
 
     /**
@@ -239,7 +265,7 @@ public double getKBPerSecond() {
      * @return throughput in bytes/second
      */
     public double getSentBytesPerSecond() {
-        return getRatePerSecond(sentBytes);
+        return getRatePerSecond(sentBytes.sum());
     }
 
     /**
@@ -257,6 +283,7 @@ public double getSentKBPerSecond() {
      * @return double rate
      */
     private double getRatePerSecond(long value) {
+        long elapsedTime = this.elapsedTime.get();
         if (elapsedTime > 0) {
             return value / ((double) elapsedTime / 1000); // 1000 = millisecs/sec
         }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e476a6b6517..5aa76f5ba2b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -112,6 +112,7 @@ Summary
   <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
   <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
   <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
+  <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From a8317d0fdb563ea7580317b9bd123f0e2797bb48 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 16 May 2023 10:37:30 +0300
Subject: [PATCH 0475/1037] perf: reduce synchronization contention on
 AbstractTestElement that are shared between threads

Use read-write locks for guarding modification of the properties, and
use ConcurrentHashMap#get for retrieving properties when accessing shared elements
like NoThreadClone objects and ThreadGroups.

In practice, acquiring read lock with ReadWriteLock is expensive, so even thought it might
sound right to acquire read lock in getProperty, it would be visible in both CPU and allocation
profiles while extra guarantees would be minimal.


It looks like having a concurrent map is fine there:
* It supports reads concurrently with writes (it does not crash)
* Writes will become visible anyway
* JMeter did not provide explicit guarantees on behavior when user alters
  a shared element during the test under load.

The shared elements are typically read-only, so we can improve concurrency
by using read-write locks in such cases
---
 .../testelement/AbstractTestElement.java      | 260 ++++++++++++++----
 xdocs/changes.xml                             |   1 +
 2 files changed, 214 insertions(+), 47 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 439c8711a0f..4d1e70e56bd 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -26,6 +26,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.gui.Searchable;
@@ -41,8 +44,10 @@
 import org.apache.jmeter.testelement.property.PropertyIteratorImpl;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
+import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,12 +58,50 @@ public abstract class AbstractTestElement implements TestElement, Serializable,
 
     private static final Logger log = LoggerFactory.getLogger(AbstractTestElement.class);
 
+    /**
+     * Protects access to {@link #propMap} and {@link #temporaryProperties} when the element is shared across threads.
+     * The assumption is that the properties are not changed during a test run, so read locks are used
+     * to allow concurrent reads.
+     * Note: acquiring locks (read or write) allocates memory, and accesses {@link ThreadLocal}, so it can be expensive
+     * in both CPU and allocation terms.
+     */
+    private transient final ReadWriteLock lock =
+            this instanceof NoThreadClone
+                    || this instanceof AbstractThreadGroup
+                    ? new ReentrantReadWriteLock()
+                    : null;
+
+    /**
+     * When the element is shared between threads, then {@link #lock} protects the access,
+     * however, when element in not shared, then adds overhead as every lock and unlock allocates memory.
+     * So in case of cloned-per-thread elements, we use {@link Collections#synchronizedMap(Map)} instead.
+     */
+    @GuardedBy("lock")
     private final Map<String, JMeterProperty> propMap =
-        Collections.synchronizedMap(new LinkedHashMap<String, JMeterProperty>());
+            lock != null
+                    ? new LinkedHashMap<>()
+                    : Collections.synchronizedMap(new LinkedHashMap<>());
+
+    /**
+     * Every shared element has a concurrent map with properties, so that we can read values without acquiring locks.
+     * The contents of the map must exactly match {@link #propMap}, so if {@link #propMap} is modified, then
+     * this map should be updated as well.
+     * Note: test plan serialization needs to have a consistent element order on load and save,
+     * so we can't use {@link ConcurrentHashMap} for {@link #propMap} in case a test element is shared between threads.
+     * <p>The purpose of this map is to avoid synchronization and acquiring logs on read-only operations.
+     * For instance, every {@link org.apache.jmeter.samplers.SampleEvent} calls {@link ThreadGroup#getName()},
+     * which calls {@link #getProperty(String)}, so it is important to keep the read path as fast as possible.</p>
+     */
+    private final transient Map<String, JMeterProperty> propMapConcurrent =
+            lock != null
+                    ? new ConcurrentHashMap<>()
+                    : null;
+
 
     /**
      * Holds properties added when isRunningVersion is true
      */
+    @GuardedBy("lock")
     private transient Set<JMeterProperty> temporaryProperties;
 
     private transient boolean runningVersion = false;
@@ -89,7 +132,40 @@ public Object clone() {
      */
     @Override
     public void clear() {
-        propMap.clear();
+        writeLock();
+        try {
+            propMap.clear();
+            Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+            if (propMapConcurrent != null) {
+                propMapConcurrent.clear();
+            }
+        } finally {
+            writeUnlock();
+        }
+    }
+
+    private void writeLock() {
+        if (lock != null) {
+            lock.writeLock().lock();
+        }
+    }
+
+    private void writeUnlock() {
+        if (lock != null) {
+            lock.writeLock().unlock();
+        }
+    }
+
+    private void readLock() {
+        if (lock != null) {
+            lock.readLock().lock();
+        }
+    }
+
+    private void readUnlock() {
+        if (lock != null) {
+            lock.readLock().unlock();
+        }
     }
 
     /**
@@ -107,7 +183,16 @@ public void clearTestElementChildren(){
      */
     @Override
     public void removeProperty(String key) {
-        propMap.remove(key);
+        writeLock();
+        try {
+            propMap.remove(key);
+            Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+            if (propMapConcurrent != null) {
+                propMapConcurrent.remove(key);
+            }
+        } finally {
+            writeUnlock();
+        }
     }
 
     /**
@@ -116,7 +201,12 @@ public void removeProperty(String key) {
     @Override
     public boolean equals(Object o) {
         if (o instanceof AbstractTestElement) {
-            return ((AbstractTestElement) o).propMap.equals(propMap);
+            readLock();
+            try {
+                return ((AbstractTestElement) o).propMap.equals(propMap);
+            } finally {
+                readUnlock();
+            }
         } else {
             return false;
         }
@@ -179,7 +269,7 @@ public String getComment(){
      */
     @Override
     public JMeterProperty getProperty(String key) {
-        JMeterProperty prop = propMap.get(key);
+        JMeterProperty prop = getRawProperty(key);
         if (prop == null) {
             prop = new NullProperty(key);
         }
@@ -193,17 +283,27 @@ public JMeterProperty getProperty(String key) {
      * @since 3.1
      */
     private JMeterProperty getRawProperty(String key) {
+        Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+        if (propMapConcurrent != null) {
+            return propMapConcurrent.get(key);
+        }
+
         return propMap.get(key);
     }
 
     @Override
     public void traverse(TestElementTraverser traverser) {
-        PropertyIterator iter = propertyIterator();
-        traverser.startTestElement(this);
-        while (iter.hasNext()) {
-            traverseProperty(traverser, iter.next());
+        readLock();
+        try {
+            PropertyIterator iter = propertyIterator();
+            traverser.startTestElement(this);
+            while (iter.hasNext()) {
+                traverseProperty(traverser, iter.next());
+            }
+            traverser.endTestElement(this);
+        } finally {
+            readUnlock();
         }
-        traverser.endTestElement(this);
     }
 
     protected void traverseProperty(TestElementTraverser traverser, JMeterProperty value) {
@@ -303,7 +403,16 @@ protected void addProperty(JMeterProperty property, boolean clone) {
         JMeterProperty prop = getProperty(property.getName());
 
         if (prop instanceof NullProperty || (prop instanceof StringProperty && prop.getStringValue().isEmpty())) {
-            propMap.put(property.getName(), propertyToPut);
+            writeLock();
+            try {
+                propMap.put(property.getName(), propertyToPut);
+                Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+                if (propMapConcurrent != null) {
+                    propMapConcurrent.put(property.getName(), propertyToPut);
+                }
+            } finally {
+                writeUnlock();
+            }
         } else {
             prop.mergeIn(propertyToPut);
         }
@@ -322,8 +431,13 @@ protected void addProperty(JMeterProperty property) {
      * @param property {@link JMeterProperty}
      */
     protected void clearTemporary(JMeterProperty property) {
-        if (temporaryProperties != null) {
-            temporaryProperties.remove(property);
+        writeLock();
+        try {
+            if (temporaryProperties != null) {
+                temporaryProperties.remove(property);
+            }
+        } finally {
+            writeUnlock();
         }
     }
 
@@ -352,7 +466,16 @@ public void setProperty(JMeterProperty property) {
                 getProperty(property.getName()).setObjectValue(property.getObjectValue());
             }
         } else {
-            propMap.put(property.getName(), property);
+            writeLock();
+            try {
+                propMap.put(property.getName(), property);
+                Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+                if (propMapConcurrent != null) {
+                    propMapConcurrent.put(property.getName(), property);
+                }
+            } finally {
+                writeUnlock();
+            }
         }
     }
 
@@ -458,6 +581,12 @@ public void setProperty(String name, long value, long dflt) {
 
     @Override
     public PropertyIterator propertyIterator() {
+        Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+        if (propMapConcurrent != null) {
+            return new PropertyIteratorImpl(propMapConcurrent.values());
+        }
+
+        // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
         return new PropertyIteratorImpl(propMap.values());
     }
 
@@ -466,10 +595,15 @@ public PropertyIterator propertyIterator() {
      * @param element {@link TestElement}
      */
     protected void mergeIn(TestElement element) {
-        PropertyIterator iter = element.propertyIterator();
-        while (iter.hasNext()) {
-            JMeterProperty prop = iter.next();
-            addProperty(prop, false);
+        writeLock();
+        try {
+            PropertyIterator iter = element.propertyIterator();
+            while (iter.hasNext()) {
+                JMeterProperty prop = iter.next();
+                addProperty(prop, false);
+            }
+        } finally {
+            writeUnlock();
         }
     }
 
@@ -489,10 +623,20 @@ public boolean isRunningVersion() {
      */
     @Override
     public void setRunningVersion(boolean runningVersion) {
-        this.runningVersion = runningVersion;
-        PropertyIterator iter = propertyIterator();
-        while (iter.hasNext()) {
-            iter.next().setRunningVersion(runningVersion);
+        writeLock();
+        try {
+            this.runningVersion = runningVersion;
+            PropertyIterator iter = propertyIterator();
+            Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+            while (iter.hasNext()) {
+                JMeterProperty property = iter.next();
+                property.setRunningVersion(runningVersion);
+                if (propMapConcurrent != null) {
+                    propMapConcurrent.put(property.getName(), property);
+                }
+            }
+        } finally {
+            writeUnlock();
         }
     }
 
@@ -501,12 +645,12 @@ public void setRunningVersion(boolean runningVersion) {
      */
     @Override
     public void recoverRunningVersion() {
-        if (this instanceof NoThreadClone) {
+        if (lock != null) {
             // The element is shared between threads, so there's nothing to recover
             // See https://github.com/apache/jmeter/issues/5875
             return;
         }
-        Iterator<Map.Entry<String, JMeterProperty>>  iter = propMap.entrySet().iterator();
+        Iterator<Map.Entry<String, JMeterProperty>> iter = propMap.entrySet().iterator();
         while (iter.hasNext()) {
             Map.Entry<String, JMeterProperty> entry = iter.next();
             JMeterProperty prop = entry.getValue();
@@ -524,8 +668,13 @@ public void recoverRunningVersion() {
      * Clears temporaryProperties
      */
     protected void emptyTemporary() {
-        if (temporaryProperties != null) {
-            temporaryProperties.clear();
+        writeLock();
+        try {
+            if (temporaryProperties != null) {
+                temporaryProperties.clear();
+            }
+        } finally {
+            writeUnlock();
         }
     }
 
@@ -534,10 +683,11 @@ protected void emptyTemporary() {
      */
     @Override
     public boolean isTemporary(JMeterProperty property) {
-        if (temporaryProperties == null) {
-            return false;
-        } else {
-            return temporaryProperties.contains(property);
+        readLock();
+        try {
+            return temporaryProperties != null && temporaryProperties.contains(property);
+        } finally {
+            readUnlock();
         }
     }
 
@@ -546,14 +696,20 @@ public boolean isTemporary(JMeterProperty property) {
      */
     @Override
     public void setTemporary(JMeterProperty property) {
-        if (temporaryProperties == null) {
-            temporaryProperties = new LinkedHashSet<>();
-        }
-        temporaryProperties.add(property);
-        if (isMergingEnclosedProperties(property)) {
-            for (JMeterProperty jMeterProperty : (MultiProperty) property) {
-                setTemporary(jMeterProperty);
+        writeLock();
+        try {
+            if (temporaryProperties == null) {
+                LinkedHashSet<JMeterProperty> set = new LinkedHashSet<>();
+                temporaryProperties = lock != null ? set : Collections.synchronizedSet(set) ;
             }
+            temporaryProperties.add(property);
+            if (isMergingEnclosedProperties(property)) {
+                for (JMeterProperty jMeterProperty : (MultiProperty) property) {
+                    setTemporary(jMeterProperty);
+                }
+            }
+        } finally {
+            writeUnlock();
         }
     }
 
@@ -646,11 +802,16 @@ public void setEnabled(boolean enabled) {
     @Override
     public List<String> getSearchableTokens() {
         List<String> result = new ArrayList<>(25);
-        PropertyIterator iterator = propertyIterator();
-        while(iterator.hasNext()) {
-            JMeterProperty jMeterProperty = iterator.next();
-            result.add(jMeterProperty.getName());
-            result.add(jMeterProperty.getStringValue());
+        readLock();
+        try {
+            PropertyIterator iterator = propertyIterator();
+            while(iterator.hasNext()) {
+                JMeterProperty jMeterProperty = iterator.next();
+                result.add(jMeterProperty.getName());
+                result.add(jMeterProperty.getStringValue());
+            }
+        } finally {
+            readUnlock();
         }
         return result;
     }
@@ -661,12 +822,17 @@ public List<String> getSearchableTokens() {
      * @param propertyNames Set of names of properties to extract
      */
     protected final void addPropertiesValues(List<? super String> result, Set<String> propertyNames) {
-        PropertyIterator iterator = propertyIterator();
-        while(iterator.hasNext()) {
-            JMeterProperty jMeterProperty = iterator.next();
-            if(propertyNames.contains(jMeterProperty.getName())) {
-                result.add(jMeterProperty.getStringValue());
+        readLock();
+        try {
+            PropertyIterator iterator = propertyIterator();
+            while (iterator.hasNext()) {
+                JMeterProperty jMeterProperty = iterator.next();
+                if (propertyNames.contains(jMeterProperty.getName())) {
+                    result.add(jMeterProperty.getStringValue());
+                }
             }
+        } finally {
+            readUnlock();
         }
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5aa76f5ba2b..e9628c58b7b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -113,6 +113,7 @@ Summary
   <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
   <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
   <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
+  <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From a1ed3a2ac61ffea91033edd86a7a690857d87920 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 6 Mar 2023 14:02:41 +0100
Subject: [PATCH 0476/1037] Update website copyright year to 2023

Do we really need the year here?
---
 xdocs/stylesheets/website-style.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index 445d5810ab0..9832f58a930 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -38,7 +38,7 @@
   <xsl:param name="cssdir" select="concat($relative-path, '/css')" />
   <xsl:param name="apidir" select="concat($relative-path, '/api')" />
   <xsl:param name="jakarta-site" select="'https://jakarta.apache.org'" />
-  <xsl:param name="year" select="'2022'" />
+  <xsl:param name="year" select="'2023'" />
   <xsl:param name="max-img-width" select="'600'" />
 
   <!-- Output method -->

From 6e637e9f7a3de4234fe411348a7b46dfa3c88a0d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 26 Mar 2023 12:31:08 +0200
Subject: [PATCH 0477/1037] perf: cache datetime formatter in __time function

Previous JMeter version used SimpleDateFormat for the time format,
and u had a different meaning.
We log a warning only at the first encounter of a problematic pattern.

This implementation has a few loopholes/problems:
 * 'u' could still be used for something different and the year
   could be coming from a 'YYYY' format string

Co-authored-by: Felix Schumacher <felix.schumacher@internetallee.de>

Part of #5694
Closes https://github.com/apache/jmeter/pull/5796
---
 .../jmeter/resources/messages.properties      |  2 +-
 .../jmeter/resources/messages_fr.properties   |  2 +-
 .../apache/jmeter/functions/TimeFunction.java | 71 +++++++++++++++----
 xdocs/changes.xml                             |  1 +
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 535e175cd24..851b4a63ed8 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -1333,7 +1333,7 @@ throughput_control_perthread_label=Per User
 throughput_control_title=Throughput Controller
 throughput_control_tplabel=Throughput
 time_format=Format string for SimpleDateFormat (optional)
-time_format_changed=Formatters for time function has been changed from SimpleDateFormat to DateTimeFormatter. Especially the meaning of 'u' has changed from day-of-week to year. Please check and update your format strings accordingly
+time_format_changed=Formatters for time function has been changed from SimpleDateFormat to DateTimeFormatter. Especially the meaning of ''u'' has changed from day-of-week to year. Please check and update your format strings accordingly: {0}
 time_format_random=Format string for DateTimeFormatter (optional) (default yyyy-MM-dd)
 time_format_shift=Format string for DateTimeFormatter (optional) (default unix timestamp in millisecond)
 timelim=Time limit
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index fe279153c6b..c904d122cba 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -1322,7 +1322,7 @@ throughput_control_perthread_label=Par utilisateur
 throughput_control_title=Contrôleur Débit
 throughput_control_tplabel=Débit \:
 time_format=Chaîne de formatage sur le modèle SimpleDateFormat (optionnel)
-time_format_changed=Les formateurs pour la fonction de temps ont été modifiés de SimpleDateFormat à DateTimeFormatter. En particulier, la signification de 'u' a changé du jour de la semaine à l'année. Veuillez vérifier et mettre à jour vos chaînes de format en conséquence
+time_format_changed=Le format de la fonction __time a été modifié de SimpleDateFormat à DateTimeFormatter. En particulier, la signification de ''u'' a changé de jour de la semaine à l''année. Veuillez vérifier et mettre à jour vos chaînes de formatage en conséquence: {0}
 time_format_random=Chaîne de formatage sur le modèle DateTimeFormatter (optionnel) ( défaut \: yyyy-MM-dd )
 time_format_shift=Chaîne de formatage sur le modèle DateTimeFormatter (optionnel) ( défaut \: unix timestamp en millisecondes )
 timelim=Limiter le temps de réponses à (ms)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index 1dd087b7ed5..f7049852865 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -17,24 +17,30 @@
 
 package org.apache.jmeter.functions;
 
+import java.text.MessageFormat;
 import java.time.Instant;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.auto.service.AutoService;
 
 // See org.apache.jmeter.functions.TestTimeFunction for unit tests
@@ -44,7 +50,7 @@
  * @since 2.2
  */
 @AutoService(Function.class)
-public class TimeFunction extends AbstractFunction {
+public class TimeFunction extends AbstractFunction implements TestStateListener {
 
     private static final String KEY = "__time"; // $NON-NLS-1$
 
@@ -57,6 +63,34 @@ public class TimeFunction extends AbstractFunction {
 
     private static final Logger log = LoggerFactory.getLogger(TimeFunction.class);
 
+    private static final LoadingCache<String, Supplier<String>> DATE_TIME_FORMATTER_CACHE =
+            Caffeine.newBuilder()
+                    .maximumSize(1000)
+                    .build((fmt) -> {
+                        if (DIVISOR_PATTERN.matcher(fmt).matches()) {
+                            long div = Long.parseLong(fmt.substring(1)); // should never case NFE
+                            return () -> Long.toString(System.currentTimeMillis() / div);
+                        }
+                        DateTimeFormatter df = DateTimeFormatter
+                                .ofPattern(fmt)
+                                .withZone(ZoneId.systemDefault());
+                        if (isPossibleUsageOfUInFormat(df, fmt)) {
+                            log.warn(
+                                    MessageFormat.format(
+                                            JMeterUtils.getResString("time_format_changed"),
+                                            fmt));
+                        }
+                        return () -> df.format(Instant.now());
+                    });
+
+    private static boolean isPossibleUsageOfUInFormat(DateTimeFormatter df, String fmt) {
+        ZoneId mst = ZoneId.of("-07:00");
+        return fmt.contains("u") &&
+                df.withZone(mst)
+                        .format(ZonedDateTime.of(2006, 1, 2, 15, 4, 5, 6, mst))
+                        .contains("2006");
+    }
+
     static {
         desc.add(JMeterUtils.getResString("time_format")); //$NON-NLS-1$
         desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$
@@ -95,18 +129,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
             if (fmt == null) {
                 fmt = format;// Not found
             }
-            if (DIVISOR_PATTERN.matcher(fmt).matches()) { // divisor is a positive number
-                long div = Long.parseLong(fmt.substring(1)); // should never case NFE
-                datetime = Long.toString(System.currentTimeMillis() / div);
-            } else {
-                if (fmt.contains("u")) {
-                    log.warn(JMeterUtils.getResString("time_format_changed"));
-                }
-                DateTimeFormatter df = DateTimeFormatter // Not synchronised, so can't be shared
-                        .ofPattern(fmt)
-                        .withZone(ZoneId.systemDefault());
-                datetime = df.format(Instant.now());
-            }
+            datetime = DATE_TIME_FORMATTER_CACHE.get(fmt).get();
         }
 
         if (!variable.isEmpty()) {
@@ -148,4 +171,26 @@ public String getReferenceKey() {
     public List<String> getArgumentDesc() {
         return desc;
     }
+
+    @Override
+    public void testStarted() {
+        // We invalidate the cache so it will parse the formats again and will raise a warning if there are
+        // %u usages.
+        DATE_TIME_FORMATTER_CACHE.invalidateAll();
+    }
+
+    @Override
+    public void testStarted(String host) {
+        testStarted();
+    }
+
+    @Override
+    public void testEnded() {
+        DATE_TIME_FORMATTER_CACHE.invalidateAll();
+    }
+
+    @Override
+    public void testEnded(String host) {
+        testEnded();
+    }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e9628c58b7b..ea98f66f172 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -114,6 +114,7 @@ Summary
   <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
   <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
   <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
+  <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From ebc1615acdb20c001828e21e93b7a3af69f442f8 Mon Sep 17 00:00:00 2001
From: rollno748 <rollno748@gmail.com>
Date: Fri, 6 May 2022 23:49:55 +0100
Subject: [PATCH 0478/1037] Added Shortcut key event for Reset search

Fixes https://github.com/apache/jmeter/issues/5666
---
 .../org/apache/jmeter/gui/action/KeyStrokes.java |  1 +
 .../jmeter/gui/action/SearchTreeDialog.java      | 16 ++++++++++++++++
 .../apache/jmeter/gui/util/JMeterMenuBar.java    |  2 +-
 xdocs/changes.xml                                |  2 ++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java b/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
index d141a76e8bd..ff85b2a4788 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java
@@ -77,6 +77,7 @@ private static int getMenuShortcutKeyMask() {
     public static final KeyStroke SAVE              = KeyStroke.getKeyStroke(KeyEvent.VK_S, CONTROL_MASK);
     public static final KeyStroke SAVE_ALL_AS       = KeyStroke.getKeyStroke(KeyEvent.VK_S, CONTROL_MASK | InputEvent.SHIFT_DOWN_MASK);
     public static final KeyStroke SEARCH_TREE       = KeyStroke.getKeyStroke(KeyEvent.VK_F, CONTROL_MASK);
+    public static final KeyStroke RESET_SEARCH_TREE = KeyStroke.getKeyStroke(KeyEvent.VK_F, CONTROL_MASK | InputEvent.ALT_DOWN_MASK);
     public static final KeyStroke TOGGLE            = KeyStroke.getKeyStroke(KeyEvent.VK_T, CONTROL_MASK);
     public static final KeyStroke PASTE             = KeyStroke.getKeyStroke(KeyEvent.VK_V, CONTROL_MASK);
     public static final KeyStroke WHAT_CLASS        = KeyStroke.getKeyStroke(KeyEvent.VK_W, CONTROL_MASK);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index 97d64e456f6..51f0f7c63ac 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -90,6 +90,8 @@ public class SearchTreeDialog extends JDialog implements ActionListener { // NOS
 
     private JButton replaceAndFindButton;
 
+    private JButton resetSearchButton;
+
     private JButton cancelButton;
 
     private JTextField searchTF;
@@ -187,6 +189,10 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         searchPanel.add(replaceTF);
         searchPanel.add(statusLabel, "span 2");
         searchPanel.add(searchCriterionPanel, "span 2");
+        resetSearchButton = createButton("menu_search_reset");
+        resetSearchButton.addActionListener(this);
+        searchPanel.add(resetSearchButton);
+
 
         JPanel buttonsPanel = new JPanel(new GridLayout(9, 1));
         searchButton = createButton("search_search_all"); //$NON-NLS-1$
@@ -256,9 +262,19 @@ public void actionPerformed(ActionEvent e) {
                 doReplace();
             }
             doNavigateToSearchResult(true);
+        } else if(source == resetSearchButton) {
+            doResetSearch(e);
         }
     }
 
+
+    /**
+    * Provides Reset Search Action
+    */
+    private static void doResetSearch(ActionEvent event) {
+        ActionRouter.getInstance().doActionNow(new ActionEvent(event.getSource(), event.getID(), ActionNames.SEARCH_RESET));
+    }
+
     /**
      *
      */
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index 5e8c4e8647a..4f829e9d2ea 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -548,7 +548,7 @@ private void makeSearchMenu() {
         searchMenu.add(search);
         search.setEnabled(true);
 
-        JMenuItem searchReset = makeMenuItemRes("menu_search_reset", 'R', ActionNames.SEARCH_RESET); //$NON-NLS-1$
+        JMenuItem searchReset = makeMenuItemRes("menu_search_reset", 'R', ActionNames.SEARCH_RESET, KeyStrokes.RESET_SEARCH_TREE); //$NON-NLS-1$
         searchMenu.add(searchReset);
         searchReset.setEnabled(true);
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ea98f66f172..1c0b11a1e1c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,7 @@ Summary
   <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
   <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
   <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
+  <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
@@ -212,6 +213,7 @@ Summary
   <li>Stefan Seide (stefan at trilobyte-se.de)</li>
   <li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
   <li>Victor Peralta (vperaltac at github)</li>
+  <li>Mohamed Ibrahim (rollno748 at github)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 0977e1440732e3fb3be107e0511bd3b8e1703dd8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 19:54:56 +0300
Subject: [PATCH 0479/1037] chore: update expected_release_jars.csv according
 to the current main branch

---
 src/dist/src/dist/expected_release_jars.csv | 103 ++++++++++----------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 2b9c6c63f0d..f47c4c0ca06 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,8 +1,8 @@
-29524,accessors-smart-2.4.8.jar
-29371,annotations-23.0.0.jar
+29904,accessors-smart-2.4.11.jar
+30651,annotations-24.0.1.jar
 6806,apiguardian-api-1.1.2.jar
-122176,asm-9.3.jar
-582079,base-portable-jvm-3.1.0.jar
+121863,asm-9.5.jar
+582588,base-portable-jvm-3.2.0.jar
 485898,batik-anim-1.16.jar
 424607,batik-awt-util-1.16.jar
 704905,batik-bridge-1.16.jar
@@ -29,7 +29,7 @@
 588337,commons-collections-3.2.2.jar
 751914,commons-collections4-4.4.jar
 211301,commons-dbcp2-2.9.0.jar
-327135,commons-io-2.11.0.jar
+474305,commons-io-2.12.0.jar
 267634,commons-jexl-2.1.1.jar
 462124,commons-jexl3-3.2.1.jar
 587402,commons-lang3-3.12.0.jar
@@ -50,28 +50,31 @@
 98115,dec-0.1.2.jar
 320748,dnsjava-2.1.9.jar
 15992,error_prone_annotations-2.10.0.jar
-1715750,freemarker-2.3.31.jar
+1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8023771,groovy-3.0.11.jar
-19460,groovy-datetime-3.0.11.jar
-11688,groovy-dateutil-3.0.11.jar
-137554,groovy-jmx-3.0.11.jar
-133032,groovy-json-3.0.11.jar
-21298,groovy-jsr223-3.0.11.jar
-83198,groovy-sql-3.0.11.jar
-98476,groovy-templates-3.0.11.jar
-296089,groovy-xml-3.0.11.jar
+8038657,groovy-3.0.17.jar
+15178,groovy-datetime-3.0.17.jar
+7405,groovy-dateutil-3.0.17.jar
+132953,groovy-jmx-3.0.17.jar
+128879,groovy-json-3.0.17.jar
+16838,groovy-jsr223-3.0.17.jar
+78915,groovy-sql-3.0.17.jar
+94160,groovy-templates-3.0.17.jar
+291717,groovy-xml-3.0.17.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
-780321,httpclient-4.5.13.jar
-328324,httpcore-4.4.15.jar
-369486,httpcore-nio-4.4.15.jar
-41790,httpmime-4.5.13.jar
-75717,jackson-annotations-2.13.4.jar
-374895,jackson-core-2.13.4.jar
-1531681,jackson-databind-2.13.4.2.jar
+785639,httpclient-4.5.14.jar
+797934,httpclient5-5.1.3.jar
+327891,httpcore-4.4.16.jar
+368896,httpcore-nio-4.4.16.jar
+850808,httpcore5-5.1.3.jar
+232137,httpcore5-h2-5.1.3.jar
+41727,httpmime-4.5.14.jar
+75564,jackson-annotations-2.15.1.jar
+546100,jackson-core-2.15.1.jar
+1620059,jackson-databind-2.15.1.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -81,9 +84,9 @@
 220475,jodd-lagarto-5.0.13.jar
 19858,jodd-log-5.0.13.jar
 26047,jodd-props-5.0.13.jar
-271159,json-path-2.7.0.jar
-119545,json-smart-2.4.8.jar
-438018,jsoup-1.15.3.jar
+277582,json-path-2.8.0.jar
+120205,json-smart-2.4.11.jar
+443295,jsoup-1.16.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
@@ -91,47 +94,47 @@
 221490,kotlin-stdlib-common-1.8.21.jar
 963,kotlin-stdlib-jdk7-1.8.21.jar
 968,kotlin-stdlib-jdk8-1.8.21.jar
-1492143,kotlinx-coroutines-core-jvm-1.6.1.jar
-10026,kotlinx-coroutines-swing-1.6.1.jar
+1548432,kotlinx-coroutines-core-jvm-1.7.1.jar
+9964,kotlinx-coroutines-swing-1.7.1.jar
 792176,kotlinx-html-jvm-0.7.3.jar
-185204,lets-plot-batik-3.1.0.jar
-4819710,lets-plot-common-3.1.0.jar
-303443,log4j-1.2-api-2.17.2.jar
-302511,log4j-api-2.17.2.jar
-1811089,log4j-core-2.17.2.jar
-24248,log4j-slf4j-impl-2.17.2.jar
+199113,lets-plot-batik-3.2.0.jar
+4918373,lets-plot-common-3.2.0.jar
+344375,log4j-1.2-api-2.20.0.jar
+313296,log4j-api-2.20.0.jar
+1847550,log4j-core-2.20.0.jar
+23862,log4j-slf4j-impl-2.20.0.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
 419054,mongo-java-driver-2.11.3.jar
 29680,mxparser-1.2.2.jar
-4888362,neo4j-java-driver-4.4.6.jar
+5052937,neo4j-java-driver-4.4.11.jar
 65261,oro-2.0.8.jar
-1308773,ph-commons-10.1.6.jar
+1314577,ph-commons-10.2.4.jar
 530791,ph-css-6.5.0.jar
-1235840,plot-api-jvm-4.3.0.jar
-1138257,plot-base-portable-jvm-3.1.0.jar
-1065661,plot-builder-portable-jvm-3.1.0.jar
-206691,plot-common-portable-jvm-3.1.0.jar
-893288,plot-config-portable-jvm-3.1.0.jar
-11369,reactive-streams-1.0.3.jar
+1256127,plot-api-jvm-4.4.1.jar
+1169629,plot-base-portable-jvm-3.2.0.jar
+1096918,plot-builder-portable-jvm-3.2.0.jar
+206691,plot-common-portable-jvm-3.2.0.jar
+923713,plot-config-portable-jvm-3.2.0.jar
+11640,reactive-streams-1.0.4.jar
 1383644,rhino-1.7.14.jar
-1248250,rsyntaxtextarea-3.2.0.jar
-5111311,Saxon-HE-11.3.jar
-276420,serializer-2.7.2.jar
+1297243,rsyntaxtextarea-3.3.3.jar
+5098540,Saxon-HE-11.5.jar
+283536,serializer-2.7.3.jar
 41125,slf4j-api-1.7.36.jar
-301279,svgSalamander-1.1.2.4.jar
+320794,svgSalamander-1.1.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
 736051,tika-core-1.28.5.jar
 1588025,tika-parsers-1.28.5.jar
-182638,vis-svg-portable-jvm-3.1.0.jar
-3154938,xalan-2.7.2.jar
+183438,vis-svg-portable-jvm-3.2.0.jar
+3455761,xalan-2.7.3.jar
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
-675889,xmlgraphics-commons-2.7.jar
+676840,xmlgraphics-commons-2.8.jar
 7188,xmlpull-1.1.3.1.jar
-1027759,xmlresolver-4.2.0-data.jar
-150259,xmlresolver-4.2.0.jar
+1027769,xmlresolver-4.6.4-data.jar
+157695,xmlresolver-4.6.4.jar
 644649,xstream-1.4.20.jar

From 3722961e0a2bb15a46de35d9cc01122a32ed8a69 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 21:59:10 +0300
Subject: [PATCH 0480/1037] chore: bump httpclient5 to 5.2.1 from 5.1.3

---
 renovate.json                               | 12 ++++++++++--
 src/bom-thirdparty/build.gradle.kts         | 17 ++++++++++-------
 src/dist/src/dist/expected_release_jars.csv | 10 +++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/renovate.json b/renovate.json
index 47e06ca30fd..d3286892a76 100644
--- a/renovate.json
+++ b/renovate.json
@@ -23,6 +23,10 @@
       "matchPackagePrefixes": ["com.github.weisj"],
       "groupName": "com.github.weisj"
     },
+    {
+      "matchPackagePrefixes": ["com.google.errorprone", "net.ltgt.errorprone"],
+      "groupName": "com.google.errorprone"
+    },
     {
       "matchPackagePrefixes": ["com.helger"],
       "groupName": "com.helger"
@@ -52,8 +56,12 @@
       "groupName": "org.apache.ftpserver"
     },
     {
-      "matchPackagePrefixes": ["org.apache.httpcomponents"],
-      "groupName": "org.apache.httpcomponents"
+      "matchPackagePrefixes": ["org.apache.httpcomponents:"],
+      "groupName": "org.apache.httpcomponents4"
+    },
+    {
+      "matchPackagePrefixes": ["org.apache.httpcomponents.client5:"],
+      "groupName": "org.apache.httpcomponents5"
     },
     {
       "matchPackagePrefixes": ["org.apache.logging.log4j"],
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 199b6e19f5f..f7f3dfc12a6 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -42,8 +42,6 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.google.auto.service:auto-service:1.0.1")
-        api("com.google.auto.service:auto-service-annotations:1.0.1")
         api("com.fasterxml.jackson.core:jackson-annotations:2.15.1")
         api("com.fasterxml.jackson.core:jackson-core:2.15.1")
         api("com.fasterxml.jackson.core:jackson-databind:2.15.1")
@@ -51,9 +49,12 @@ dependencies {
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:2.7.3")
-        api("com.github.weisj:darklaf-theme:2.7.3")
-        api("com.github.weisj:darklaf-property-loader:2.7.3")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
+        api("com.github.weisj:darklaf-property-loader:2.7.3")
+        api("com.github.weisj:darklaf-theme:2.7.3")
+        api("com.google.auto.service:auto-service-annotations:1.0.1")
+        api("com.google.auto.service:auto-service:1.0.1")
+        api("com.google.errorprone:error_prone_annotations:2.19.1")
         api("com.helger.commons:ph-commons:10.2.4")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
@@ -76,6 +77,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
+        api("org.checkerframework:checker-qual:3.34.0")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
@@ -85,9 +87,6 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.jetbrains:annotations:24.0.1")
-        api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
-        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
         api("net.minidev:accessors-smart:2.4.11")
         api("net.minidev:json-smart:2.4.11")
         api("net.sf.jtidy:jtidy:r938")
@@ -102,6 +101,7 @@ dependencies {
         api("org.apache.commons:commons-pool2:2.11.1")
         api("org.apache.commons:commons-text:1.10.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
+        api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.14")
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
@@ -124,6 +124,9 @@ dependencies {
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
+        api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
+        api("org.jetbrains:annotations:24.0.1")
         api("org.jodd:jodd-core:5.0.13")
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index f47c4c0ca06..a64ed489940 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -24,7 +24,7 @@
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
-222143,checker-qual-3.19.0.jar
+224447,checker-qual-3.34.0.jar
 353793,commons-codec-1.15.jar
 588337,commons-collections-3.2.2.jar
 751914,commons-collections4-4.4.jar
@@ -49,7 +49,7 @@
 217795,darklaf-windows-2.7.3.jar
 98115,dec-0.1.2.jar
 320748,dnsjava-2.1.9.jar
-15992,error_prone_annotations-2.10.0.jar
+16477,error_prone_annotations-2.19.1.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8038657,groovy-3.0.17.jar
@@ -66,11 +66,11 @@
 109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
-797934,httpclient5-5.1.3.jar
+839626,httpclient5-5.2.1.jar
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
-850808,httpcore5-5.1.3.jar
-232137,httpcore5-h2-5.1.3.jar
+852871,httpcore5-5.2.jar
+236827,httpcore5-h2-5.2.jar
 41727,httpmime-4.5.14.jar
 75564,jackson-annotations-2.15.1.jar
 546100,jackson-core-2.15.1.jar

From a67b5e04787ade309475c164b851331867eb19c7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 22:06:48 +0300
Subject: [PATCH 0481/1037] chore: ensure verifyReleaseDependencies can be
 executed several times in snapshot builds

Previously the second execution was UP-TO-DATE, so the task did not print the diff.
---
 src/dist/build.gradle.kts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 39b0c4e7c5c..f0a2f28983e 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -173,6 +173,13 @@ val verifyReleaseDependencies by tasks.registering {
     inputs.file(expectedLibs)
     val actualLibs = File(buildDir, "dist/expected_release_jars.csv")
     outputs.file(actualLibs)
+    val ignoreJarsMismatch = version.toString().endsWith("-SNAPSHOT")
+    if (ignoreJarsMismatch || updateExpectedJars) {
+        // The task does not fail in case of -SNAPSHOT version, so we make the task never UP-TO-DATE
+        // in that case. Otherwise, the task never executes on the second request, even if the user runs with
+        // -PupdateExpectedJars
+        outputs.upToDateWhen { false }
+    }
     doLast {
         val caseInsensitive: Comparator<String> = compareBy(String.CASE_INSENSITIVE_ORDER, { it })
 
@@ -237,7 +244,7 @@ val verifyReleaseDependencies by tasks.registering {
         if (updateExpectedJars) {
             println("Updating ${expectedLibs.relativeTo(rootDir)}")
             actualLibs.copyTo(expectedLibs, overwrite = true)
-        } else if (version.toString().endsWith("-SNAPSHOT")) {
+        } else if (ignoreJarsMismatch) {
             // Renovate requires self-hosted runner for executing postUpgradeTasks,
             // so we can't make Renovate to update expected_release_jars.csv at the moment
             logger.lifecycle(sb.toString())

From 29abbcf883da94dd065191ef828faa65028689bf Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 24 May 2023 01:16:01 +0300
Subject: [PATCH 0482/1037] fix: remove excessive "class should not be
 abstract" check from JMeterUtils#loadServicesAndScanJars

findClassesThatExtend already ensures it does not return and abstract class
or interface, so one more check is not needed.

The extra verification was incorrct, and it always discarded non-abstract classes.
---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index de46f1b6841..e5b3139baea 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -373,9 +373,6 @@ public static <S> Collection<S> loadServicesAndScanJars(
             try {
                 Class<? extends S> klass = Class.forName(className, false, classLoader)
                         .asSubclass(service);
-                if (!Modifier.isAbstract(klass.getModifiers())) {
-                    continue;
-                }
                 result.add(klass.getDeclaredConstructor().newInstance());
             } catch (Throwable e) {
                 if (e instanceof InvocationTargetException) {

From 86f3d406f9036cd487fefe14150404a08ee69123 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 24 May 2023 02:33:57 +0300
Subject: [PATCH 0483/1037] style: remove unused import

---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index e5b3139baea..380b68a480f 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -27,7 +27,6 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;

From 0d4c51221059d71d9dd5f100b1109401cb1dfb20 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 10:21:56 +0300
Subject: [PATCH 0484/1037] doc: silence excessive logging in ClassFinder

---
 .../src/main/java/org/apache/jorphan/reflect/ClassFinder.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index cc96f91ebf9..81613cae0c8 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -478,9 +478,10 @@ private static void findClassesInOnePath(File file, Set<? super String> listClas
                 try (JarFile jar = new JarFile(file)) {
                     String value = jar.getManifest().getMainAttributes().getValue(JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE);
                     if (Boolean.parseBoolean(value)) {
-                        log.info("Jar {} is skipped for scanning since it has {}={} attribute", file, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE, value);
+                        log.debug("Will skip scanning jar {} with filter {} since the jar has {}={} attribute", file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE, value);
                         return;
                     }
+                    log.info("Will scan jar {} with filter {}. Consider exposing JMeter plugins via META-INF/services, and add {}=true manifest attribute so JMeter can skip classfile scanning", file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE);
                 } catch (IOException e) {
                     log.warn("Can not open the jar {}, message: {}", file.getAbsolutePath(), e.getLocalizedMessage(), e);
                 }

From 89c69b47d31d776553fb18b332b1314fbb4f742c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 10:28:16 +0300
Subject: [PATCH 0485/1037] deps: bump auto-service to 1.1.0 from 1.0.1

AutoService 1.1.0 improves the verifications, and it enables verifications by default.
For instance, it rejects the use of @AutoService for interfaces and abstract classes
since they can't be instantiated anyway.
---
 .../jvm/src/main/kotlin/build-logic.autoservice.gradle.kts   | 5 -----
 renovate.json                                                | 4 ++++
 src/bom-thirdparty/build.gradle.kts                          | 4 ++--
 .../visualizers/backend/AbstractBackendListenerClient.java   | 3 ---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
index 532256faa93..ef80b5909df 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -26,11 +26,6 @@ dependencies {
     compileOnlyApi("com.google.auto.service:auto-service-annotations")
 }
 
-tasks.configureEach<JavaCompile> {
-    // Verify @AutoService annotations
-    options.compilerArgs.add("-Averify=true")
-}
-
 plugins.withId("org.jetbrains.kotlin.jvm") {
     apply(plugin = "org.jetbrains.kotlin.kapt")
 
diff --git a/renovate.json b/renovate.json
index d3286892a76..619cadbc0e8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -23,6 +23,10 @@
       "matchPackagePrefixes": ["com.github.weisj"],
       "groupName": "com.github.weisj"
     },
+    {
+      "matchPackagePrefixes": ["com.google.auto.service"],
+      "groupName": "com.google.auto.service"
+    },
     {
       "matchPackagePrefixes": ["com.google.errorprone", "net.ltgt.errorprone"],
       "groupName": "com.google.errorprone"
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f7f3dfc12a6..194151d5221 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,8 +52,8 @@ dependencies {
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
         api("com.github.weisj:darklaf-property-loader:2.7.3")
         api("com.github.weisj:darklaf-theme:2.7.3")
-        api("com.google.auto.service:auto-service-annotations:1.0.1")
-        api("com.google.auto.service:auto-service:1.0.1")
+        api("com.google.auto.service:auto-service-annotations:1.1.0")
+        api("com.google.auto.service:auto-service:1.1.0")
         api("com.google.errorprone:error_prone_annotations:2.19.1")
         api("com.helger.commons:ph-commons:10.2.4")
         api("com.helger:ph-css:6.5.0")
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
index 79cdd58a6ec..ec0a870e431 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
@@ -24,8 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.auto.service.AutoService;
-
 /**
  * An abstract implementation of the BackendListenerClient interface. This
  * implementation provides default implementations of most of the methods in the
@@ -51,7 +49,6 @@
  * @see BackendListener#sampleOccurred(org.apache.jmeter.samplers.SampleEvent)
  * @since 2.13
  */
-@AutoService(BackendListenerClient.class)
 public abstract class AbstractBackendListenerClient implements BackendListenerClient {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBackendListenerClient.class);

From b15439e340b6c566fddc41874257d7a200455496 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 11:13:44 +0300
Subject: [PATCH 0486/1037] feat: use ServiceLoader for loading
 jmeter.gui.action.Command

---
 .../jmeter/gui/action/ActionRouter.java       | 72 ++++---------------
 .../org/apache/jmeter/gui/action/Command.java |  2 +
 2 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
index 24536f7ec74..af91e3b52a3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java
@@ -20,17 +20,13 @@
 import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.CodeSource;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import javax.swing.SwingUtilities;
@@ -38,7 +34,7 @@
 import org.apache.jmeter.exceptions.IllegalUserActionException;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFinder;
+import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
 import org.apache.jorphan.util.JMeterError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -309,35 +305,6 @@ private static void actionPerformed(Class<? extends Command> action, ActionEvent
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private static List<String> findClassesThatExtend(String className, String excluding, String[] searchPath) throws IOException, ClassNotFoundException {
-
-        return ClassFinder.findClassesThatExtend(
-                searchPath, // strPathsOrJars - pathNames or jar files to search for classes
-                new Class[] { Class.forName(className) },
-                false, // innerClasses - should we include inner classes?
-                null, // contains - className should contain this string
-                // Ignore the classes which are specific to the reporting tool
-                excluding, // notContains - className should not contain this string
-                false); // annotations - true if classNames are annotations
-    }
-
-    private static Optional<String[]> getCodeSourceSearchPath() {
-        CodeSource codeSource = ActionRouter.class.getProtectionDomain().getCodeSource();
-        if (codeSource != null) {
-            try {
-                URL ownLocation = codeSource.getLocation();
-                File ownPath = new File(ownLocation.toURI());
-                if (ownPath.exists()) {
-                    return Optional.of(new String[] { ownPath.getAbsolutePath() });
-                }
-            } catch (URISyntaxException ex) {
-                log.debug("Can't get location for class sources", ex);
-            }
-        }
-        return Optional.empty();
-    }
-
     /**
      * Only for use by the JMeter.startGui.
      * This method must not be called by getInstance() as was done previously.
@@ -348,28 +315,19 @@ public void populateCommandMap() {
             return; // already done
         }
         try {
-            List<String> listClasses = findClassesThatExtend("org.apache.jmeter.gui.action.Command", // $NON-NLS-1$
-                    "org.apache.jmeter.report.gui", // $NON-NLS-1$
-                    JMeterUtils.getSearchPaths());
-
-            if (listClasses.isEmpty()) {
-                //fallback
-                Optional<String[]> codeSourceSearchPath = getCodeSourceSearchPath();
-                if (codeSourceSearchPath.isPresent()) {
-                    log.info("Using fallback search path");
-                    listClasses = findClassesThatExtend("org.apache.jmeter.gui.action.Command", // $NON-NLS-1$
-                            "org.apache.jmeter.report.gui", // $NON-NLS-1$
-                            codeSourceSearchPath.get());
-                }
-            }
-
-            if (listClasses.isEmpty()) {
-                log.error("!!!!!Uh-oh, didn't find any action handlers!!!!!");
-                throw new JMeterError("No action handlers found - check JMeterHome and libraries");
+            Collection<Command> commandServices = JMeterUtils.loadServicesAndScanJars(
+                    Command.class,
+                    ServiceLoader.load(Command.class),
+                    Thread.currentThread().getContextClassLoader(),
+                    new LogAndIgnoreServiceLoadExceptionHandler(log)
+            );
+
+            if (commandServices.isEmpty()) {
+                String message = "No implementations of " + Command.class + " found. Please ensure the classpath contains JMeter commands";
+                log.error(message);
+                throw new JMeterError(message);
             }
-            for (String strClassName : listClasses) {
-                Class<?> commandClass = Class.forName(strClassName);
-                Command command = (Command) commandClass.getDeclaredConstructor().newInstance();
+            for (Command command : commandServices) {
                 for (String commandName : command.getActionNames()) {
                     Set<Command> commandObjects = commands.computeIfAbsent(commandName, k -> new HashSet<>());
                     commandObjects.add(command);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Command.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Command.java
index 97dcd1e70b7..e7284f8fecc 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Command.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Command.java
@@ -21,7 +21,9 @@
 import java.util.Set;
 
 import org.apache.jmeter.exceptions.IllegalUserActionException;
+import org.apache.jorphan.reflect.JMeterService;
 
+@JMeterService
 public interface Command {
     void doAction(ActionEvent e) throws IllegalUserActionException;
 

From d74c5aa48a77b0a6b04673f30f5799db5fe2ba5b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 11:14:02 +0300
Subject: [PATCH 0487/1037] style: wrap excessively long lines in ClassFinder

---
 .../java/org/apache/jorphan/reflect/ClassFinder.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 81613cae0c8..2c0507f8c6e 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -478,10 +478,17 @@ private static void findClassesInOnePath(File file, Set<? super String> listClas
                 try (JarFile jar = new JarFile(file)) {
                     String value = jar.getManifest().getMainAttributes().getValue(JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE);
                     if (Boolean.parseBoolean(value)) {
-                        log.debug("Will skip scanning jar {} with filter {} since the jar has {}={} attribute", file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE, value);
+                        log.debug(
+                                "Will skip scanning jar {} with filter {} since the jar has {}={} attribute",
+                                file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE, value
+                        );
                         return;
                     }
-                    log.info("Will scan jar {} with filter {}. Consider exposing JMeter plugins via META-INF/services, and add {}=true manifest attribute so JMeter can skip classfile scanning", file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE);
+                    log.info(
+                            "Will scan jar {} with filter {}. Consider exposing JMeter plugins via META-INF/services, " +
+                                    "and add {}=true manifest attribute so JMeter can skip classfile scanning",
+                            file, filter, JMETER_SKIP_CLASS_SCANNING_ATTRIBUTE
+                    );
                 } catch (IOException e) {
                     log.warn("Can not open the jar {}, message: {}", file.getAbsolutePath(), e.getLocalizedMessage(), e);
                 }

From 088fedeaed8d31c78c7d508556219c87e4c549c3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 11:18:08 +0300
Subject: [PATCH 0488/1037] fix: adjust progress points in the startup splash
 screen

MainFrame initialization takes noticeable time
---
 .../org/apache/jmeter/JMeterGuiLauncher.kt    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index dcb19e9da3c..df4a2adde5a 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -85,36 +85,34 @@ public object JMeterGuiLauncher {
     private suspend fun startGuiInternal(testFile: String?) {
         setupLaF()
         val splash = SplashScreen()
+        splash.showScreen()
+        yield()
         suspend fun setProgress(progress: Int) {
             splash.setProgress(progress)
             // Allow UI updates
             yield()
         }
-        splash.showScreen()
-        setProgress(10)
+        setProgress(1)
         JMeterUtils.applyHiDPIOnFonts()
-        setProgress(20)
-        log.debug("Configure PluginManager")
-        setProgress(30)
         log.debug("Setup tree")
+        setProgress(5)
         val treeModel = JMeterTreeModel()
         val treeLis = JMeterTreeListener(treeModel)
         val instance = ActionRouter.getInstance()
-        setProgress(40)
+        setProgress(10)
         withContext(Dispatchers.Default) {
             log.debug("populate command map")
             instance.populateCommandMap()
         }
-        setProgress(60)
+        setProgress(20)
         treeLis.setActionHandler(instance)
         log.debug("init instance")
-        setProgress(70)
         GuiPackage.initInstance(treeLis, treeModel)
-        setProgress(80)
         log.debug("constructing main frame")
         val main = MainFrame(treeModel, treeLis)
-        setProgress(90)
+        setProgress(56)
         ComponentUtil.centerComponentInWindow(main, 80)
+        setProgress(82)
         main.setLocationRelativeTo(splash)
         main.isVisible = true
         main.toFront()
@@ -127,7 +125,7 @@ public object JMeterGuiLauncher {
             jTree.selectionPath = path
             FocusRequester.requestFocus(jTree)
         }
-        setProgress(100)
+        setProgress(93)
         splash.close()
     }
 

From 8b379c7afce5a298db887f5afef4cfdab6eb6fda Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 15:29:47 +0300
Subject: [PATCH 0489/1037] test: skip @AutoService verifications in
 test-services project

test-services has tests that verify ill services that do not implement
the target interface, so we disable verifications for the test purposes.
---
 src/test-services/build.gradle.kts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test-services/build.gradle.kts b/src/test-services/build.gradle.kts
index 9efcceed316..24a4319b871 100644
--- a/src/test-services/build.gradle.kts
+++ b/src/test-services/build.gradle.kts
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+import com.github.vlsi.gradle.dsl.configureEach
+import org.jetbrains.kotlin.gradle.tasks.Kapt
+
 plugins {
     id("build-logic.jvm-library")
 }
@@ -23,3 +26,11 @@ dependencies {
     implementation(projects.src.jorphan)
     implementation(projects.src.core)
 }
+
+tasks.configureEach<Kapt> {
+    // ServiceNotImplementingInterface does not implement the service interface for testing purposes,
+    // so we disable AutoService verifications
+    annotationProcessorOptionProviders.add(
+        listOf(CommandLineArgumentProvider { listOf("-Averify=false") })
+    )
+}

From da93b6e857d9ff2ca2aa4b40678321a81b1d8f36 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 25 May 2023 15:59:50 +0300
Subject: [PATCH 0490/1037] fix: ensure JMeter still calls
 recoverRunningVersion for ThreadGroups as it was doing in 5.5

In fact, ThreadGroup elements are cloned for each thread, so they might need
recoverRunningVersion.

See https://github.com/apache/jmeter/pull/5920
---
 .../org/apache/jmeter/testelement/AbstractTestElement.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 4d1e70e56bd..cdff85ef0fe 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -67,6 +67,10 @@ public abstract class AbstractTestElement implements TestElement, Serializable,
      */
     private transient final ReadWriteLock lock =
             this instanceof NoThreadClone
+                    // Note: thread groups are cloned for every thread, however, JMeterContext contains a reference
+                    // to a non-cloned ThreadGroup instance.
+                    // That causes jmeterContext.getThreadGroup().getName() to access the same ThreadGroup instance
+                    // even though each thread has its own copy, so we use read-write lock approach for ThreadGroups
                     || this instanceof AbstractThreadGroup
                     ? new ReentrantReadWriteLock()
                     : null;
@@ -645,7 +649,7 @@ public void setRunningVersion(boolean runningVersion) {
      */
     @Override
     public void recoverRunningVersion() {
-        if (lock != null) {
+        if (this instanceof NoThreadClone) {
             // The element is shared between threads, so there's nothing to recover
             // See https://github.com/apache/jmeter/issues/5875
             return;

From 4d9d99a364d0533782e14209a399b60672fa7032 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 26 May 2023 16:24:53 +0300
Subject: [PATCH 0491/1037] fix: refresh UI when dragging JMeter window from
 one monitor to another, so rich syntax text areas are properly editable after
 window movement

Different monitors might have different scaling factors, so JMeter should
refresh DPI when graphics configuration changes.
---
 src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java | 4 ++++
 xdocs/changes.xml                                           | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 10264b95db2..8bed41363f6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -257,6 +257,10 @@ public MainFrame(TreeModel treeModel, JMeterTreeListener treeListener) {
                 JMeterUtils.refreshUI();
             }
         });
+        addPropertyChangeListener("graphicsConfiguration", evt -> {
+            // Update UI when JMeter window moves to a different monitor as it might have different scaling settings
+            JMeterUtils.refreshUI();
+        });
     }
 
     /**
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1c0b11a1e1c..75293c340c4 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -200,6 +200,7 @@ Summary
   <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
   <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
   <li><pr>693</pr>Avoid wrong results when <code>Object.hashCode()</code> happen to collide. Use <code>IdentityHashMap</code> instead of <code>HashMap</code> when key is <code>TestElement</code></li>
+  <li>Refresh UI when dragging JMeter window from one monitor to another, so rich syntax text areas are properly editable after window movement</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From f33e61efc45dd0fd328393953aa4ea9144aa8162 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 1 Jun 2023 17:31:35 +0300
Subject: [PATCH 0492/1037] perf: remove excessive BufferedInputStream from
 HTTP sampler

HTTPSamplerBase.readResponse uses byte[8192] array anyway, so creating
BufferedInputStream is not useful there.
---
 .../jmeter/protocol/http/sampler/HTTPJavaImpl.java  | 13 ++++++-------
 .../jmeter/protocol/http/sampler/PostWriter.java    |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 46936887d8f..3a1a04c6560 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -228,7 +227,7 @@ protected HttpURLConnection setupConnection(URL u, String method, HTTPSampleResu
      *                if an I/O exception occurs
      */
     protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws IOException {
-        BufferedInputStream in;
+        InputStream in;
 
         final long contentLength = conn.getContentLength();
         if ((contentLength == 0)
@@ -245,9 +244,9 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
         try {
             instream = new CountingInputStream(conn.getInputStream());
             if (gzipped) {
-                in = new BufferedInputStream(new GZIPInputStream(instream));
+                in = new GZIPInputStream(instream);
             } else {
-                in = new BufferedInputStream(instream);
+                in = instream;
             }
         } catch (IOException e) {
             if (! (e.getCause() instanceof FileNotFoundException))
@@ -277,9 +276,9 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
             }
 
             if (gzipped) {
-                in = new BufferedInputStream(new GZIPInputStream(errorStream));
+                in = new GZIPInputStream(errorStream);
             } else {
-                in = new BufferedInputStream(errorStream);
+                in = errorStream;
             }
         } catch (Exception e) {
             log.error("readResponse: {}", e.toString());
@@ -290,7 +289,7 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
                     throw (Error)cause;
                 }
             }
-            in = new BufferedInputStream(conn.getErrorStream());
+            in = conn.getErrorStream();
         }
         // N.B. this closes 'in'
         byte[] responseData = readResponse(res, in, contentLength);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index c0f2723dc2e..59746d0d17f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -17,16 +17,16 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -412,7 +412,7 @@ private static void writeFileToStream(String filename, OutputStream out) throws
         // uploads were being done. Could be fixed by increasing the evacuation
         // ratio in bin/jmeter[.bat], but this is better.
         int read;
-        try (InputStream in = new BufferedInputStream(new FileInputStream(filename))) {
+        try (InputStream in = Files.newInputStream(Paths.get(filename))) {
             while ((read = in.read(buf)) > 0) {
                 out.write(buf, 0, read);
             }

From 264654d0f48ed70ff6d89351b0137bad6ab63ced Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 1 Jun 2023 18:33:50 +0300
Subject: [PATCH 0493/1037] perf: avoid String.replaceAll in HTTPJavaImpl

---
 .../apache/jorphan/util/StringUtilities.java  | 51 +++++++++++++++++++
 .../jorphan/util/StringUtilitiesTest.kt       | 37 ++++++++++++++
 .../protocol/http/sampler/HTTPJavaImpl.java   | 10 +++-
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/util/StringUtilitiesTest.kt

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
new file mode 100644
index 00000000000..413a87c8a95
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+import org.apiguardian.api.API;
+
+/**
+ * Functions that are missing in other libraries.
+ *
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class StringUtilities {
+    private StringUtilities() {
+    }
+
+    /**
+     * Counts the number of times a given char is present in the string.
+     *
+     * @param input input string
+     * @param ch    char to search
+     * @return number of times the character is present in the string, or 0 if no char found
+     */
+    public static int count(String input, char ch) {
+        if (input.isEmpty()) {
+            return 0;
+        }
+        int count = 0;
+        int idx = 0;
+        while ((idx = input.indexOf(ch, idx)) != -1) {
+            count++;
+            idx++;
+        }
+        return count;
+    }
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/util/StringUtilitiesTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/StringUtilitiesTest.kt
new file mode 100644
index 00000000000..f3d6aadcf8a
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/StringUtilitiesTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+class StringUtilitiesTest {
+    @ParameterizedTest
+    @CsvSource(
+        "2,t,test",
+        "0,w,test",
+        "1,e,test",
+        "0,e,\"\"",
+    )
+    fun count(expected: Int, char: Char, input: String) {
+        Assertions.assertEquals(expected, StringUtilities.count(input, char)) {
+            "StringUtilities.count($input, $char)"
+        }
+    }
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 3a1a04c6560..da3a7ebc8c9 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -46,6 +46,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.SSLManager;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -616,8 +617,13 @@ protected HTTPSampleResult sample(URL url, String method, boolean areFollowingRe
             }
 
             // record headers size to allow HTTPSampleResult.getBytes() with different options
-            res.setHeadersSize(responseHeaders.replaceAll("\n", "\r\n") // $NON-NLS-1$ $NON-NLS-2$
-                    .length() + 2); // add 2 for a '\r\n' at end of headers (before data)
+            // It used to be responseHeaders.replaceAll("\n", "\r\n").length(),
+            // however we don't need the resulting string, just the length
+            // So we add the number of \n in the string to account for \n
+            res.setHeadersSize(
+                    responseHeaders.length()
+                            + StringUtilities.count(responseHeaders, '\n')
+                            + 2); // add 2 for a '\r\n' at end of headers (before data)
             if (log.isDebugEnabled()) {
                 log.debug("Response headersSize={}, bodySize={}, Total={}",
                         res.getHeadersSize(),  res.getBodySizeAsLong(),

From 92df9fe68946cf6f2fe3fc6a3c306055f7a6e5d4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 1 Jun 2023 12:56:07 +0300
Subject: [PATCH 0494/1037] perf: avoid string concatenation in
 HTPHC4.HttpClientKey

---
 .../protocol/http/sampler/HTTPHC4Impl.java    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index b338faef4e3..7d5bad22a60 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -945,7 +946,8 @@ private CloseableHttpResponse executeRequest(final CloseableHttpClient httpClien
      */
     private static final class HttpClientKey {
 
-        private final String target; // protocol://[user:pass@]host:[port]
+        private final String protocol;
+        private final String authority;
         private final boolean hasProxy;
         private final String proxyScheme;
         private final String proxyHost;
@@ -968,7 +970,8 @@ public HttpClientKey(URL url, boolean hasProxy, String proxyScheme, String proxy
                 int proxyPort, String proxyUser, String proxyPass) {
             // N.B. need to separate protocol from authority otherwise http://server would match https://erver (<= sic, not typo error)
             // could use separate fields, but simpler to combine them
-            this.target = url.getProtocol()+"://"+url.getAuthority();
+            this.protocol = url.getProtocol();
+            this.authority = url.getAuthority();
             this.hasProxy = hasProxy;
             this.proxyScheme = proxyScheme;
             this.proxyHost = proxyHost;
@@ -988,7 +991,8 @@ private int getHash() {
                 hash = hash*31 + getHash(proxyUser);
                 hash = hash*31 + getHash(proxyPass);
             }
-            hash = hash*31 + target.hashCode();
+            hash = hash*31 + getHash(protocol);
+            hash = hash*31 + getHash(authority);
             return hash;
         }
 
@@ -1006,26 +1010,21 @@ public boolean equals(Object obj) {
                 return false;
             }
             HttpClientKey other = (HttpClientKey) obj;
-            if (this.hasProxy) { // otherwise proxy String fields may be null
-                if (proxyScheme == null) {
-                    if (other.proxyScheme != null) {
-                        return false;
-                    }
-                } else if (!proxyScheme.equals(other.proxyScheme)) {
-                    return false;
-                }
-                return
-                this.hasProxy == other.hasProxy &&
+            if (!Objects.equals(authority, other.authority) ||
+                    !Objects.equals(protocol, other.protocol) ||
+                    hasProxy != other.hasProxy) {
+                return false;
+            }
+            if (!hasProxy) {
+                // No proxy, so don't check proxy fields
+                return true;
+            }
+            return
                 this.proxyPort == other.proxyPort &&
+                Objects.equals(proxyScheme, other.proxyScheme) &&
                 this.proxyHost.equals(other.proxyHost) &&
                 this.proxyUser.equals(other.proxyUser) &&
-                this.proxyPass.equals(other.proxyPass) &&
-                this.target.equals(other.target);
-            }
-            // No proxy, so don't check proxy fields
-            return
-                this.hasProxy == other.hasProxy &&
-                this.target.equals(other.target);
+                this.proxyPass.equals(other.proxyPass);
         }
 
         @Override
@@ -1037,7 +1036,9 @@ public int hashCode(){
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append(target);
+            sb.append(protocol);
+            sb.append("://");
+            sb.append(authority);
             if (hasProxy) {
                 sb.append(" via ");
                 sb.append(proxyUser);

From 15284a832b28bfe79c5348f4b81415c2b2563e4a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 10:13:17 +0300
Subject: [PATCH 0495/1037] fix: PropertyIterator.remove should remove
 properties from both collections in TestElement

This is a fixup to https://github.com/apache/jmeter/commit/a8317d0fdb563ea7580317b9bd123f0e2797bb48
---
 .../testelement/AbstractTestElement.java      |  2 +-
 .../property/PropertyIteratorImpl.java        | 23 +++++++--
 .../TestElementPropertyIteratorTest.kt        | 51 +++++++++++++++++++
 3 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/testelement/property/TestElementPropertyIteratorTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index cdff85ef0fe..c1af18a23bd 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -587,7 +587,7 @@ public void setProperty(String name, long value, long dflt) {
     public PropertyIterator propertyIterator() {
         Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
         if (propMapConcurrent != null) {
-            return new PropertyIteratorImpl(propMapConcurrent.values());
+            return new PropertyIteratorImpl(this, propMapConcurrent.values());
         }
 
         // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
index 364d2b5530f..6f54e598b9d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
@@ -20,12 +20,21 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.jmeter.testelement.TestElement;
+
 public class PropertyIteratorImpl implements PropertyIterator {
 
-    private final Iterator<JMeterProperty> iter;
+    private final TestElement owner;
+    private final Iterator<? extends JMeterProperty> iter;
+    private String lastPropertyName;
 
     public PropertyIteratorImpl(Collection<JMeterProperty> value) {
-        iter = value.iterator();
+        this(null, value);
+    }
+
+    public PropertyIteratorImpl(TestElement owner, Iterable<? extends JMeterProperty> properties) {
+        this.owner = owner;
+        this.iter = properties.iterator();
     }
 
     /** {@inheritDoc} */
@@ -37,13 +46,21 @@ public boolean hasNext() {
     /** {@inheritDoc} */
     @Override
     public JMeterProperty next() {
-        return iter.next();
+        JMeterProperty last = iter.next();
+        if (owner != null) {
+            lastPropertyName = last.getName();
+        }
+        return last;
     }
 
     /** {@inheritDoc} */
     @Override
     public void remove() {
         iter.remove();
+        if (lastPropertyName != null) {
+            owner.removeProperty(lastPropertyName);
+            lastPropertyName = null;
+        }
     }
 
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/TestElementPropertyIteratorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/TestElementPropertyIteratorTest.kt
new file mode 100644
index 00000000000..8a1f2f0bdc2
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/TestElementPropertyIteratorTest.kt
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.apache.jmeter.engine.util.NoThreadClone
+import org.apache.jmeter.testelement.AbstractTestElement
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+class TestElementPropertyIteratorTest {
+    class TempConfig : AbstractTestElement(), NoThreadClone
+
+    @Test
+    fun `iterator remove from nocloneelement`() {
+        val a = TempConfig().apply {
+            setProperty("present", "1")
+        }
+        val b = TempConfig().apply {
+            setProperty("present", "1")
+            setProperty("to_remove", "to be removed")
+        }
+        val it = b.propertyIterator()
+        while (it.hasNext()) {
+            val prop = it.next()
+            if (prop.name == "to_remove") {
+                it.remove()
+            }
+        }
+        assertTrue(a == b) {
+            "Elements should be equal after removal of property <<to_remove>> with iterator.remove(). " +
+                "If properties look the same, it might mean propMap and propMapConcurrent diverged. " +
+                "Properties of a default element: ${a.propertyIterator().asSequence().joinToString { "${it.name}=${it.stringValue}" }}, " +
+                "Properties of element after removal: ${b.propertyIterator().asSequence().joinToString { "${it.name}=${it.stringValue}" }}"
+        }
+    }
+}

From 7037a661984aa0207bcbfc79bd913934b8eceb45 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 13:38:07 +0300
Subject: [PATCH 0496/1037] feat: configure Kotlin to produce default methods
 in Java interfaces

---
 build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 62e8d6daaf4..fcdbb3cdcf5 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -43,6 +43,7 @@ tasks.configureEach<KotlinCompile> {
         if (!name.startsWith("compileTest")) {
             apiVersion = "kotlin.api".v
         }
+        freeCompilerArgs += "-Xjvm-default=all"
         jvmTarget = java.targetCompatibility.toString()
     }
 }

From 1060db385e5a224cc537a995177282c6d2ff988b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 14:53:29 +0300
Subject: [PATCH 0497/1037] chore: allocate Xmx1500m for the build

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index eb14a438816..bd8776dd3d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-org.gradle.jvmargs=-Xmx768m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m
 org.gradle.parallel=true
 # Build cache can be disabled with --no-build-cache option
 org.gradle.caching=true

From a2690e8a6d22420869eb89643c116901cc5c5bce Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 09:07:32 +0300
Subject: [PATCH 0498/1037] test: Add OpenJDK JMH for creating microbenchmarks
 in JMeter code

This enables creating benchmark for tracking performance of low-level code.

The way to add a benchmark is to add src/jmh folder (side by side with src/main).
Then benchmark jar can be generated with ./gradlew jmhJar, or the benchmark
can be executed from IDE if there's a corresponding main method.

See ResultCollectorBenchmark
---
 build-logic/checksum.xml                      |  6 ++
 .../4b/71499a87dc1ff84b.fingerprints          |  1 +
 ...d16069219c90212a974d119ae296fd02e9f65b.asc | 26 ++++++
 .../5b/9ae296fd02e9f65b.fingerprints          |  1 +
 .../71/c45d01093dcfc371.fingerprints          |  1 +
 ...9082bc00e0324e2aef4cf00d3b328562a119a7.asc | 26 ++++++
 .../a7/0d3b328562a119a7.fingerprints          |  1 +
 .../ad/0da8a5ec02d11ead.fingerprints          |  1 +
 ...7b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc | 24 ++++++
 .../e3/2f3c9eeb05d1d1e3.fingerprints          |  1 +
 build-logic/jvm/build.gradle.kts              |  1 +
 .../main/kotlin/build-logic.jmh.gradle.kts    | 79 +++++++++++++++++++
 .../kotlin/build-logic.jvm-library.gradle.kts |  4 +
 checksum.xml                                  | 11 +++
 ...d16069219c90212a974d119ae296fd02e9f65b.asc | 26 ++++++
 .../5b/9ae296fd02e9f65b.fingerprints          |  1 +
 .../71/c45d01093dcfc371.fingerprints          |  1 +
 ...9082bc00e0324e2aef4cf00d3b328562a119a7.asc | 26 ++++++
 .../a7/0d3b328562a119a7.fingerprints          |  1 +
 .../e3/2f3c9eeb05d1d1e3.fingerprints          |  1 +
 src/bom-testing/build.gradle.kts              |  2 +
 .../reporters/ResultCollectorBenchmark.java   | 72 +++++++++++++++++
 .../samplers/SampleSaveConfiguration.java     |  4 +
 xdocs/changes.xml                             |  1 +
 24 files changed, 318 insertions(+)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
 create mode 100644 build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
 create mode 100644 src/core/src/jmh/java/org/apache/jmeter/reporters/ResultCollectorBenchmark.java

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 89e5dbea481..5448d553a1e 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -36,9 +36,11 @@
     <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
     <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
+    <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
     <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
+    <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
     <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
@@ -60,6 +62,7 @@
     <trusted-key id='f3184bcd55f4d016e30d4c9bf42e87f9665015c9' group='org.jsoup' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.jupiter' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.platform' />
+    <trusted-key id='019082bc00e0324e2aef4cf00d3b328562a119a7' group='org.openjdk.jmh' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
     <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
     <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
@@ -79,6 +82,9 @@
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
     </dependency>
+    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.1'>
+      <sha512>D0B6A85CA7261FCEF0B2796F8FAD16C1044822AFE5ECD896B1103D7015FF690E806EC969B01150E9CA3FF96607AB53B6468ED2D5F3260C019CAE953B2291E7A4</sha512>
+    </dependency>
     <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
       <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
     </dependency>
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
new file mode 100644
index 00000000000..8f7648dd909
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
@@ -0,0 +1 @@
+517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
new file mode 100644
index 00000000000..5a57652271a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
+r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
+W6/+MOieKsNTghAogNiTOp6dgrFn6Uw2iCFgRUr8Z8dPUSRwtoPtw359nyIIllEf
+lBt8ZPbmTZ3rn6y9TYviFIbO+pIVc5iGuHCyr+9NXdOpNKpUKd4h2TLtixtcNWY0
+6TRLhbd4COwZVL9ZZwAlyKhQ4TbvvKvVCS9+HPd9onQ55s9iqUTA9xeRW3D5aVOA
+0VgXrFnAq5HE2x7+j1qZQRqMNpVTDgUptpDG5lj7rIdgMaYj+vL/bgmK8thg9su4
+8TdPgza1ex5Q4Hb0tbxg/H7Ucasxys0MJ9ktG91vgR0oHP0y0Lf/3uyoCyhKilKO
+yDqkKFeKcTx9TCZfV29gDs4dumH1Eirpg5ikKjPExhaITZgtV401CDsS+DgXHqEk
+YN9R59qJ27AUV6J3dAAumzXECXBDcvyLdb7pEIBs5/QtdgE2ivCH8BwFlmcdqe0+
+uKL0jgylMDsfiADVhzagv899MqrmQh8po6Sj78G0gwdfCF9neZgX2czolSFYFSy0
+rmSwUetem6IPwaXpV5r3852P+MqEvI2s86c3ZIyGFO0ltK5KSZq62DANqwARAQAB
+uQINBEzH8KcBEAC+7OdU8Xc38u7HpPQQPAmBHw5UIACUFP3/xrsh6dDj2B0TMlsb
+mKP1MDAN3qb9lwci2NEUgLKWrByQdTMMYfOuJuGwFYZ2gU0awpvaD4mb07gQ8qxV
+pHfpHSdpLMYscViIKhTcqAY4RIB85FUN26F8lpetQ93kKxSegMdLW1kwB9UTH6ik
+86hvTCT5ggbupzWdsUh1Sd+0UJBpgLn+NBQwjv7pzPVdSx8+9XA/G77iZPNeVihe
+VTtUfoubpN3BpKoRrJVieZX8YjF2RJmzSjPBzt4mLKPec8AGPxDzc7f4/NXX445k
+BkOyDJCQxwCTHjmF1LEJbxipdPTGrWiIw467U1LrFCsuqc+ewGJBZWMkXEWWMzQF
+axbIDKy8txnTgi9nkEYW/s0QjXa7+1jWUye52aVsBpNc5t/bh4JxJ53u5qcXwQYP
+hTL0o2pXkgoXpRAbwhoZ1IpRGL+FMyAONYdEPRtv4Q4udUQx3DEeNZw3oMpXHHFd
+S7KUiLhQfESgHyR7kugpZYwbCQO+feSCWys3rMKL3s+8kQq8LqjG/xXOLiLJRDku
+7n/y9FUWZzNCgpx8pftU3bQRpDLA7yow8FXRoeQbmSM4aVydYJhaehYRoEmrlJ0R
+MwlnG0OV7kgTipJgaxaBfrxP2N8Khgf4dbhdxslkZPmpD6+scgT2U6MgqwARAQAB
+=tJcb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
new file mode 100644
index 00000000000..3145005c70d
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
@@ -0,0 +1 @@
+12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
new file mode 100644
index 00000000000..78a05175483
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
@@ -0,0 +1 @@
+019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
new file mode 100644
index 00000000000..24e073b181f
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
+0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
+wojLPkIr5tVo4ybeVIbQ3N4+FnqzpNfs571KZHUOa2unwdgGK7OGMTxTkP8oaRwP
+H5VenaKoknbLbp2CUchQT3pkv3Yio+NIDGgZ1VmgOTqczI2KZe1viqRY32rBVKr1
+684Bgygf0ZfzMyKd1xK5UvDGhfQU+uDZrV9f81YMqJ9dZFjbZsyIhsEtIloTp0/Y
+kDtUMlkXF1c8EExpqTEUwEBwV+ow3IKVv3YDNNpZ8g8TQa7wKcpOia7UmEdXraY6
+PdP5tzClCqV0PqOxdNh+En9tw3VNKqAjQ9EE/nSbRz5d0JgdIA6SfPeXqAK5hxuT
+fdOdleywcOa1HRVN4xoEsOljfQiS1dz2xzou0mR1NpnD4PuGRdx4wwYGmkqulbbt
+1wQJRd/psyFfnpxrqk9I4frouzxMcrPUDH+T5qAVfkX3LG5XRGFkScWbZ65SXXB6
+wg6DsFNUXl1is01Wfda0TvBXdjO19RdcVSyD/DlAlXukmQb36Av3pHatR5Y8k7xN
+c1tU4G6dSfiD/JjwnCTzfqmHBnS4c2d1JKscPGRy+Y82Ghj2lPmunn6D9QARAQAB
+uQINBE4rG7gBEADdSXw7MJF5zFEN7siT74kGxyBO40gfhW2HTIbGXyUHKGpknHOH
+V3KYS0GEtvLc8QGOHv5qLfYlCejD5cYpzoDcWIUo1KZiaqG6LulcAy8sDuX3o5z0
+LpUikutXeIxGTgxdpc3SfYPhb43ir6pPI42MhgFOOAAhHLo9yE24G5FYna5S5OZx
+eOWiwelhYUxBMTIyA+vwCUii91ZSO5ByPU9d0QJBS2Y1Xwp0SDDa5z1x+SYRx1XO
+a8aD7/tb+K1G+giuedY5J2eVKvxFB0ABqdTNT1tj9bZmXqfKEjpaziXa9WVSNNU0
+De6IYZFsDJ9yC/3mYBB4rNd3iqQnlH6bTIaSWGA1I13JZQUm0dJet9IwxP7rCgM8
+lSsPXjvdTvHZItIIYQaMihUp3360G16ESiVRXIXwRyUztm9MMNhVzTkFXkJ9G5WX
++3Og8inNjzJViJGfqgZ4KNlXql9/BtqlsPcmTeMoZf2LCz86uTfUrhf18AVJJq2E
+B/R9M+TWQ7R9SEpQ49RoZUfVXb/HKVnWw9OjJyGFhc58MBGyT1VNGpvwDEzceJfG
+ri71lnyCAddNc10wNyfeF069wVoGTZyWklWgC7UB6dUn+9TYN2/ZpHtDzzdAoEOp
+pFdqib0+xfeY0mt9k0/jPvK2wqXMY3Vi2nvVDQNUEEJxMLSFBiqAA88EDwARAQAB
+=ZVwp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
new file mode 100644
index 00000000000..78a05175483
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
@@ -0,0 +1 @@
+019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
new file mode 100644
index 00000000000..8f7648dd909
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
@@ -0,0 +1 @@
+517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
new file mode 100644
index 00000000000..013825e272e
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
+2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
+gjkS5eq8L04f5CSuXO7r1eLTOch9iDl/ESaI5Nhq9A3mRQIhQalum+FjzwCgx0PK
+hoC4MVPVGXzOQPc5sG4jzAUD/0OX9c/yKQqjHUs38HTCgrjseM40iPhp8NfbWenP
+IwUMSWXE3lz0MMeKrGcEOcZOGWsjyepkLHXwj8DDOeGxhfh9bhFRJssdfzOCKBpf
+6S70A3fanzqOAvddxCqF/zOwDaieDmWvVntVpmZO9d+pgR/sZN0JgSIm7qGDdNqG
+Aq6eBACyywfwuVoY6lfNz70ZZqYjYuUkbKnKqpG0XmI+m5LYrUW7QuKJqaNdg+ZL
+vVgX/TdkWVSIoSRS5+eYm3fRD++cg3ZgoR6ZY4WEa7SRSp2zoidtQijWOzp8WeHs
+30rIaXBrb5wHR4GQ4FYsBGRuWkmIaferusllUmHCHFJI4ldvgbkCDQRNyzHzEAgA
+1rD70DvCcy91ShQKP2snZ4cLJnFwKArulDUcxoBZ0AG0qMbaE8jiiJTHIwgVrqsK
+aS1JENv6tVdUS8xHswu30zvd0obaj+4IGXlMVdc6052Y4SLAGNbGVw99Ah1OkQ7o
+v92gmYAYfqppOtRt1tylz7Jf+F6er0umdVBZm8fJ+QjzTw36AwERj2bjVbc6ogM7
+OsTyru5oZGOJ+oJU+M9/mh/Gq3AyrcfU8c6bL2pacXwylME4lxy4fBB7BsMogPXX
+iplZ2XRH7RmlZiAfLHv3StxVB1RrLXVcjdnqIO2guVYrK6mxH9WMG4LnOGvcnYTf
+GtWexEmNA5l8IOSgsK+InwADBQgA037clDFi3XWaZBVXst7IfkU6bKq9vhmphS4f
+uBx4wp7MBA62k0kGDmZWcbinZWnybypili9ihYSHlp3EYzCNTbUMWlbhc/ffYHuv
+rZsIT2DxMPb2iCnjPu5HMGegTM8iTTotW4xYmJUsEDIvgQUz0/UNsPHTX5XU09So
+cL3YOP5MxcEbgO0Fpjny3X76rc+ETAd9TmDJi7HOm24grKdOQXHQJr65j7nTc9M3
+zWnTxOP3fL9jcVnGTnLGRVoR7kedDpa5FsoFqtY8YMaFvNPVvI4+m+jozjNwTg2d
+GG6nU2dEC0qgDEeKMSJwF1wgO3Fe6mXHvxratgNrqfdY/rtEGQ==
+=PkzR
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
new file mode 100644
index 00000000000..3145005c70d
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
@@ -0,0 +1 @@
+12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 7044d76d981..493223adb11 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -22,6 +22,7 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
+    api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
new file mode 100644
index 00000000000..4dfce3ff86d
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import net.ltgt.gradle.errorprone.ErrorProneOptions
+import net.ltgt.gradle.errorprone.errorprone
+
+plugins {
+    id("build-logic.jvm-library")
+    id("me.champeau.jmh")
+}
+
+if (file("src/jmh/kotlin").isDirectory) {
+    apply(plugin = "build-logic.kotlin")
+}
+
+dependencies {
+    findProject(":src:bom-testing")?.let{
+        jmhImplementation(platform(it))
+    }
+    jmhImplementation("org.openjdk.jmh:jmh-core")
+    jmhImplementation("org.openjdk.jmh:jmh-generator-annprocess")
+}
+
+tasks.jmh {
+    outputs.upToDateWhen {
+        false
+    }
+}
+
+tasks.jmhCompileGeneratedClasses {
+    options.annotationProcessorPath = configurations.jmhAnnotationProcessor.get()
+}
+
+plugins.withId("net.ltgt.errorprone") {
+    tasks.jmhCompileGeneratedClasses {
+        options.errorprone {
+            // JMH generates duplicate field names like byte p000, p001, p002
+            disable("HidingField")
+        }
+    }
+}
+
+jmh {
+    // Add memory allocation profiling by default
+    profilers.add("gc")
+}
+
+// See https://github.com/melix/jmh-gradle-plugin
+// Unfortunately, current jmh-gradle-plugin does not allow to customize jmh parameters from the
+// command line, so the workarounds are:
+// a) Build and execute the jar itself: ./gradlew jmhJar && java -jar build/libs/calcite-...jar JMH_OPTIONS
+// b) Execute benchmarks via .main() methods from IDE (you might want to activate "power save mode"
+//    in the IDE to minimize the impact of the IDE itself on the benchmark results)
+
+tasks.withType<JavaExec>().configureEach {
+    // Execution of .main methods from IDEA should re-generate benchmark classes if required
+    dependsOn("jmhCompileGeneratedClasses")
+    doFirst {
+        // At best jmh plugin should add the generated directories to the Gradle model, however,
+        // currently it builds the jar only :-/
+        // IntelliJ IDEA "execute main method" adds a JavaExec task, so we configure it
+        classpath(File(buildDir, "jmh-generated-classes"))
+        classpath(File(buildDir, "jmh-generated-resources"))
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
index 7f5f0315fd0..1b38aec8296 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
@@ -26,3 +26,7 @@ if (file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory)
 if (file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory) {
     apply(plugin = "build-logic.kotlin")
 }
+
+if (file("src/jmh").isDirectory) {
+    apply(plugin = "build-logic.jmh")
+}
diff --git a/checksum.xml b/checksum.xml
index 825c6a90d3a..ac89439db47 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -116,6 +116,7 @@
     <trusted-key id='1aa8cf92d409a73393d0b736bff2ee42c8282e76' group='org.apache.activemq' />
     <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.bcel' />
+    <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.commons' />
     <trusted-key id='3692c12c7e3d336a452beb254e066e0459cd109b' group='org.apache.commons' />
     <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
@@ -180,6 +181,7 @@
     <trusted-key id='e9af5293c334c7c0b583227d2f45f85cdf082e68' group='org.mozilla' />
     <trusted-key id='07a4fa67a8222f1b39f9edaef8052e4e1bd0db31' group='org.neo4j.driver' />
     <trusted-key id='e85aed155021af8a6c6b7a4a7c7d8456294423ba' group='org.objenesis' />
+    <trusted-key id='019082bc00e0324e2aef4cf00d3b328562a119a7' group='org.openjdk.jmh' />
     <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
     <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' />
     <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' />
@@ -258,6 +260,9 @@
     <dependency group='javax.inject' module='javax.inject' version='1'>
       <sha512>E126B7CCF3E42FD1984A0BEEF1004A7269A337C202E59E04E8E2AF714280D2F2D8D2BA5E6F59481B8DCD34AAF35C966A688D0B48EC7E96F102C274DC0D3B381E</sha512>
     </dependency>
+    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.1'>
+      <sha512>D0B6A85CA7261FCEF0B2796F8FAD16C1044822AFE5ECD896B1103D7015FF690E806EC969B01150E9CA3FF96607AB53B6468ED2D5F3260C019CAE953B2291E7A4</sha512>
+    </dependency>
     <dependency group='net.jcip' module='jcip-annotations' version='1.0'>
       <sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>
     </dependency>
@@ -306,12 +311,18 @@
     <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.3'>
       <sha512>A3E69E3B8416E71842921D439A45BCE30BD00043E17923B5071A298C79F4914B1CB1FAA8DAA779CBC234B576AA54A3DE4D816C2BD7E4C2712A119C357027C2B9</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.20.2'>
+      <sha512>8B31FEED38FCEE2CBD0705587D0E960DA508ED59F2EC51EB1C4789F3093937F5B0CF87C21B13967AB22E718E7FBFF7BD3CA4B4D0CA872EB408448583E3F45C8F</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.1'>
       <sha512>44A5D6F34DB9A4BAE1C11CA10563F3A25F1C6A8F681ABD31C530C7D36C9B001AB6F345F0AB5E2AFD94AD5AB436C06D12D7B1AD9EB7F12DB3EF9487D692107921</sha512>
     </dependency>
     <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.4'>
       <sha512>626213318BD0605586FC693969765FAE3BB15D2BCBBACB597C6E32AA1BDEF6430980480B6732556FCD93DE1E6BA99F9E050141AD59259AAE386D8D05A3C44C27</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.7.1'>
+      <sha512>89CA3D64D42938DCB50AC58CD53D1DAEAF6EA0BF69CC01DEFE7467D2D1F23BE7932D005861A6E08C2C81980EE1F8EFB9A944B939FE02AF99518753704383C086</sha512>
+    </dependency>
     <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
       <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
     </dependency>
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
new file mode 100644
index 00000000000..5a57652271a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
+r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
+W6/+MOieKsNTghAogNiTOp6dgrFn6Uw2iCFgRUr8Z8dPUSRwtoPtw359nyIIllEf
+lBt8ZPbmTZ3rn6y9TYviFIbO+pIVc5iGuHCyr+9NXdOpNKpUKd4h2TLtixtcNWY0
+6TRLhbd4COwZVL9ZZwAlyKhQ4TbvvKvVCS9+HPd9onQ55s9iqUTA9xeRW3D5aVOA
+0VgXrFnAq5HE2x7+j1qZQRqMNpVTDgUptpDG5lj7rIdgMaYj+vL/bgmK8thg9su4
+8TdPgza1ex5Q4Hb0tbxg/H7Ucasxys0MJ9ktG91vgR0oHP0y0Lf/3uyoCyhKilKO
+yDqkKFeKcTx9TCZfV29gDs4dumH1Eirpg5ikKjPExhaITZgtV401CDsS+DgXHqEk
+YN9R59qJ27AUV6J3dAAumzXECXBDcvyLdb7pEIBs5/QtdgE2ivCH8BwFlmcdqe0+
+uKL0jgylMDsfiADVhzagv899MqrmQh8po6Sj78G0gwdfCF9neZgX2czolSFYFSy0
+rmSwUetem6IPwaXpV5r3852P+MqEvI2s86c3ZIyGFO0ltK5KSZq62DANqwARAQAB
+uQINBEzH8KcBEAC+7OdU8Xc38u7HpPQQPAmBHw5UIACUFP3/xrsh6dDj2B0TMlsb
+mKP1MDAN3qb9lwci2NEUgLKWrByQdTMMYfOuJuGwFYZ2gU0awpvaD4mb07gQ8qxV
+pHfpHSdpLMYscViIKhTcqAY4RIB85FUN26F8lpetQ93kKxSegMdLW1kwB9UTH6ik
+86hvTCT5ggbupzWdsUh1Sd+0UJBpgLn+NBQwjv7pzPVdSx8+9XA/G77iZPNeVihe
+VTtUfoubpN3BpKoRrJVieZX8YjF2RJmzSjPBzt4mLKPec8AGPxDzc7f4/NXX445k
+BkOyDJCQxwCTHjmF1LEJbxipdPTGrWiIw467U1LrFCsuqc+ewGJBZWMkXEWWMzQF
+axbIDKy8txnTgi9nkEYW/s0QjXa7+1jWUye52aVsBpNc5t/bh4JxJ53u5qcXwQYP
+hTL0o2pXkgoXpRAbwhoZ1IpRGL+FMyAONYdEPRtv4Q4udUQx3DEeNZw3oMpXHHFd
+S7KUiLhQfESgHyR7kugpZYwbCQO+feSCWys3rMKL3s+8kQq8LqjG/xXOLiLJRDku
+7n/y9FUWZzNCgpx8pftU3bQRpDLA7yow8FXRoeQbmSM4aVydYJhaehYRoEmrlJ0R
+MwlnG0OV7kgTipJgaxaBfrxP2N8Khgf4dbhdxslkZPmpD6+scgT2U6MgqwARAQAB
+=tJcb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
new file mode 100644
index 00000000000..3145005c70d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
@@ -0,0 +1 @@
+12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
new file mode 100644
index 00000000000..78a05175483
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
@@ -0,0 +1 @@
+019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
new file mode 100644
index 00000000000..24e073b181f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
+0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
+wojLPkIr5tVo4ybeVIbQ3N4+FnqzpNfs571KZHUOa2unwdgGK7OGMTxTkP8oaRwP
+H5VenaKoknbLbp2CUchQT3pkv3Yio+NIDGgZ1VmgOTqczI2KZe1viqRY32rBVKr1
+684Bgygf0ZfzMyKd1xK5UvDGhfQU+uDZrV9f81YMqJ9dZFjbZsyIhsEtIloTp0/Y
+kDtUMlkXF1c8EExpqTEUwEBwV+ow3IKVv3YDNNpZ8g8TQa7wKcpOia7UmEdXraY6
+PdP5tzClCqV0PqOxdNh+En9tw3VNKqAjQ9EE/nSbRz5d0JgdIA6SfPeXqAK5hxuT
+fdOdleywcOa1HRVN4xoEsOljfQiS1dz2xzou0mR1NpnD4PuGRdx4wwYGmkqulbbt
+1wQJRd/psyFfnpxrqk9I4frouzxMcrPUDH+T5qAVfkX3LG5XRGFkScWbZ65SXXB6
+wg6DsFNUXl1is01Wfda0TvBXdjO19RdcVSyD/DlAlXukmQb36Av3pHatR5Y8k7xN
+c1tU4G6dSfiD/JjwnCTzfqmHBnS4c2d1JKscPGRy+Y82Ghj2lPmunn6D9QARAQAB
+uQINBE4rG7gBEADdSXw7MJF5zFEN7siT74kGxyBO40gfhW2HTIbGXyUHKGpknHOH
+V3KYS0GEtvLc8QGOHv5qLfYlCejD5cYpzoDcWIUo1KZiaqG6LulcAy8sDuX3o5z0
+LpUikutXeIxGTgxdpc3SfYPhb43ir6pPI42MhgFOOAAhHLo9yE24G5FYna5S5OZx
+eOWiwelhYUxBMTIyA+vwCUii91ZSO5ByPU9d0QJBS2Y1Xwp0SDDa5z1x+SYRx1XO
+a8aD7/tb+K1G+giuedY5J2eVKvxFB0ABqdTNT1tj9bZmXqfKEjpaziXa9WVSNNU0
+De6IYZFsDJ9yC/3mYBB4rNd3iqQnlH6bTIaSWGA1I13JZQUm0dJet9IwxP7rCgM8
+lSsPXjvdTvHZItIIYQaMihUp3360G16ESiVRXIXwRyUztm9MMNhVzTkFXkJ9G5WX
++3Og8inNjzJViJGfqgZ4KNlXql9/BtqlsPcmTeMoZf2LCz86uTfUrhf18AVJJq2E
+B/R9M+TWQ7R9SEpQ49RoZUfVXb/HKVnWw9OjJyGFhc58MBGyT1VNGpvwDEzceJfG
+ri71lnyCAddNc10wNyfeF069wVoGTZyWklWgC7UB6dUn+9TYN2/ZpHtDzzdAoEOp
+pFdqib0+xfeY0mt9k0/jPvK2wqXMY3Vi2nvVDQNUEEJxMLSFBiqAA88EDwARAQAB
+=ZVwp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
new file mode 100644
index 00000000000..78a05175483
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
@@ -0,0 +1 @@
+019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
new file mode 100644
index 00000000000..3145005c70d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
@@ -0,0 +1 @@
+12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 0812deffa6a..272decda054 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -52,6 +52,8 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2")
         api("org.hsqldb:hsqldb:2.7.1")
         api("org.objenesis:objenesis:3.3")
+        api("org.openjdk.jmh:jmh-core:1.36")
+        api("org.openjdk.jmh:jmh-generator-annprocess:1.36")
         api("org.spockframework:spock-core:2.3-groovy-3.0")
         api("org.springframework:spring-beans:4.3.30.RELEASE")
         api("org.springframework:spring-context:4.3.30.RELEASE")
diff --git a/src/core/src/jmh/java/org/apache/jmeter/reporters/ResultCollectorBenchmark.java b/src/core/src/jmh/java/org/apache/jmeter/reporters/ResultCollectorBenchmark.java
new file mode 100644
index 00000000000..60f07a7bc04
--- /dev/null
+++ b/src/core/src/jmh/java/org/apache/jmeter/reporters/ResultCollectorBenchmark.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.reporters;
+
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.profile.GCProfiler;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+@Fork(value = 1, jvmArgsPrepend = {"-Xmx128m"})
+@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class ResultCollectorBenchmark {
+    ResultCollector collector;
+
+    @Param("true")
+    boolean success;
+
+    @Setup
+    public void setup() {
+        collector = new ResultCollector();
+        collector.setName("Sample colelctor");
+        collector.setComment("Comment");
+        collector.setRunningVersion(true);
+    }
+
+    @Benchmark
+    public boolean isSampleWanted() {
+        return collector.isSampleWanted(success);
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(ResultCollectorBenchmark.class.getSimpleName())
+                .addProfiler(GCProfiler.class)
+                .detectJvmArgs()
+                .build();
+        new Runner(opt).run();
+    }
+}
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
index b43278448fd..2aff60a108f 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
@@ -283,6 +283,10 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
     // Read in the properties having to do with saving from a properties file.
     static {
         Properties props = JMeterUtils.getJMeterProperties();
+        if (props == null) {
+            // If properties are not initialized, proceed with defaults
+            props = new Properties();
+        }
 
         SUB_RESULTS      = TRUE.equalsIgnoreCase(props.getProperty(SUBRESULTS_PROP, TRUE));
         ASSERTIONS      = TRUE.equalsIgnoreCase(props.getProperty(ASSERTIONS_PROP, TRUE));
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 75293c340c4..fdb4faa17b5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -139,6 +139,7 @@ Summary
   <li>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
   <li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
   <li>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
+  <li><pr>5960</pr>Add OpenJDK JMH for creating microbenchmarks in JMeter code</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From f2f7dc65c5a3be7c848b7f7dc74d709fc2c57639 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 22:40:47 +0300
Subject: [PATCH 0499/1037] test: reduce the number of iterations in
 SearchByClassTest

It is enough to find a first collision, so we can make the test faster
---
 .../jorphan/collections/SearchByClassTest.kt     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt b/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
index 655808fd0ea..1c0e3f5440b 100644
--- a/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jorphan/collections/SearchByClassTest.kt
@@ -26,16 +26,22 @@ class SearchByClassTest {
     @Test
     fun `search finds all matching elements`() {
         val tree = ListedHashTree()
-        val count = 100000
-        for (i in 0 until count) {
-            tree.add(ThreadGroup())
+        val hashes = mutableSetOf<Int>()
+        for (i in 0 until 100000) {
+            val tg = ThreadGroup()
+            tree.add(tg)
+            if (!hashes.add(tg.hashCode())) {
+                // We already have a duplicate hashcode, so there's no need to continue
+                break
+            }
         }
         val searcher = SearchByClass(
             AbstractThreadGroup::class.java
         )
         tree.traverse(searcher)
-        Assertions.assertEquals(count, searcher.searchResults.size) {
-            "Test plan included $count ThreadGroup elements, so SearchByClass should find all of them"
+        val expectedCount = hashes.size + 1
+        Assertions.assertEquals(expectedCount, searcher.searchResults.size) {
+            "Test plan included $expectedCount ThreadGroup elements, so SearchByClass should find all of them"
         }
     }
 }

From 1a295da0d629c66f9c462f3e98aa72251fc5b769 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 22:47:01 +0300
Subject: [PATCH 0500/1037] Revert "fix(deps): update dependency
 com.sun.mail:all to v1.6.7 (#5867)"

This reverts commit e09b6116918bafa59691260cf22b361779ff622e.
---
 src/licenses/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index e0572a9a759..f1b45341e1c 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -140,7 +140,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.MIT
     }
 
-    overrideLicense("com.sun.mail:all:1.6.7") {
+    overrideLicense("com.sun.mail:all") {
         // Multiple licenses, specify explicitly
         expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html"))
         effectiveLicense = SpdxLicense.CDDL_1_0 and (SpdxLicense.GPL_2_0_or_later with SpdxLicenseException.Classpath_exception_2_0)

From 7951ac469f7cd81f493942cc0ab4f485df6edb9d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 08:42:48 +0300
Subject: [PATCH 0501/1037] chore: rename TestElement.java to TestElement.kt
 before migration to Kotlin

Renaming the file first helps Git to track history better
---
 .../org/apache/jmeter/testelement/TestElement.kt}                 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/core/src/main/{java/org/apache/jmeter/testelement/TestElement.java => kotlin/org/apache/jmeter/testelement/TestElement.kt} (100%)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestElement.java b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
similarity index 100%
rename from src/core/src/main/java/org/apache/jmeter/testelement/TestElement.java
rename to src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt

From a4eb604c263b7b49eed1b50134ad72dbefb42f4b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 08:49:12 +0300
Subject: [PATCH 0502/1037] chore: migrate TestElement to Kotlin

It enables better control over nullability of the parameters and return types,
and it enables declaring "operator fun get", and "operator fun set" so
TestElements are easier to use in Kotlin.
---
 .../apache/jmeter/testelement/TestElement.kt  | 272 +++++++-----------
 xdocs/changes.xml                             |   1 +
 2 files changed, 99 insertions(+), 174 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index d2e1992dc68..3d99ed40756 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -15,289 +15,230 @@
  * limitations under the License.
  */
 
-package org.apache.jmeter.testelement;
-
-import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.NullProperty;
-import org.apache.jmeter.testelement.property.PropertyIterator;
-import org.apache.jmeter.threads.JMeterContext;
-
-public interface TestElement extends Cloneable {
-    String NAME = "TestElement.name"; //$NON-NLS-1$
-
-    String GUI_CLASS = "TestElement.gui_class"; //$NON-NLS-1$
-
-    String ENABLED = "TestElement.enabled"; //$NON-NLS-1$
-
-    String TEST_CLASS = "TestElement.test_class"; //$NON-NLS-1$
-
-    // Needed by AbstractTestElement.
-    // Also TestElementConverter and TestElementPropertyConverter for handling empty comments
-    String COMMENTS = "TestPlan.comments"; //$NON-NLS-1$
-    // N.B. Comments originally only applied to Test Plans, hence the name - which can now not be easily changed
+package org.apache.jmeter.testelement
+
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.NullProperty
+import org.apache.jmeter.testelement.property.PropertyIterator
+import org.apache.jmeter.threads.JMeterContext
+
+public interface TestElement : Cloneable {
+    public companion object {
+        public const val NAME: String = "TestElement.name" // $NON-NLS-1$
+        public const val GUI_CLASS: String = "TestElement.gui_class" // $NON-NLS-1$
+        public const val ENABLED: String = "TestElement.enabled" // $NON-NLS-1$
+        public const val TEST_CLASS: String = "TestElement.test_class" // $NON-NLS-1$
+
+        // Needed by AbstractTestElement.
+        // Also TestElementConverter and TestElementPropertyConverter for handling empty comments
+        public const val COMMENTS: String = "TestPlan.comments" // $NON-NLS-1$
+    }
 
-    void addTestElement(TestElement child);
+    public fun addTestElement(child: TestElement)
 
     /**
      * This method should clear any test element properties that are merged
-     * by {@link #addTestElement(TestElement)}.
+     * by [.addTestElement].
      */
-    void clearTestElementChildren();
-
-    void setProperty(String key, String value);
-
-    void setProperty(String key, String value, String dflt);
-
-    void setProperty(String key, boolean value);
-
-    void setProperty(String key, boolean value, boolean dflt);
-
-    void setProperty(String key, int value);
-
-    void setProperty(String key, int value, int dflt);
-
-    void setProperty(String name, long value);
-
-    void setProperty(String name, long value, long dflt);
+    public fun clearTestElementChildren()
+    public fun setProperty(key: String, value: String)
+    public fun setProperty(key: String, value: String, dflt: String)
+    public fun setProperty(key: String, value: Boolean)
+    public fun setProperty(key: String, value: Boolean, dflt: Boolean)
+    public fun setProperty(key: String, value: Int)
+    public fun setProperty(key: String, value: Int, dflt: Int)
+    public fun setProperty(name: String, value: Long)
+    public fun setProperty(name: String, value: Long, dflt: Long)
 
     /**
-     * Check if ENABLED property is present and true ; defaults to true
-     *
-     * @return true if element is enabled
-     */
-    boolean isEnabled();
-
-    /**
-     * Set the enabled status of the test element
-     * @param enabled the status to set
+     * Configures if the current test element should be enabled or not.
      */
-    void setEnabled(boolean enabled);
+    public var isEnabled: Boolean
 
     /**
-     * Returns true or false whether the element is the running version.
+     * Make the test element the running version, or make it no longer the
+     * running version. This tells the test element that it's current state must
+     * be retrievable by a call to recoverRunningVersion(). It is kind of like
+     * making the TestElement Read-Only, but not as strict. Changes can be made
+     * and the element can be modified, but the state of the element at the time
+     * of the call to setRunningVersion() must be recoverable.
      *
-     * @return <code>true</code> if the element is the running version
+     * flag whether this element should be the running version
      */
-    boolean isRunningVersion();
+    public var isRunningVersion: Boolean
 
     /**
      * Test whether a given property is only a temporary resident of the
      * TestElement
      *
-     * @param property
-     *            the property to be tested
-     * @return <code>true</code> if property is temporary
+     * @param property the property to be tested
+     * @return `true` if property is temporary
      */
-    boolean isTemporary(JMeterProperty property);
+    public fun isTemporary(property: JMeterProperty): Boolean
 
     /**
      * Indicate that the given property should be only a temporary property in
-     * the TestElement
+     * the TestElement.
      *
-     * @param property
-     *            void
+     * @param property property to set as temporary one
      */
-    void setTemporary(JMeterProperty property);
+    public fun setTemporary(property: JMeterProperty)
 
     /**
      * Return a property as a boolean value.
      *
-     * @param key
-     *            the name of the property to get
+     * @param key the name of the property to get
      * @return the value of the property
      */
-    boolean getPropertyAsBoolean(String key);
+    public fun getPropertyAsBoolean(key: String): Boolean
 
     /**
      * Return a property as a boolean value or a default value if no property
      * could be found.
      *
-     * @param key
-     *            the name of the property to get
-     * @param defaultValue
-     *            the default value to use
-     * @return the value of the property, or <code>defaultValue</code> if no
-     *         property could be found
+     * @param key the name of the property to get
+     * @param defaultValue the default value to use
+     * @return the value of the property, or `defaultValue` if no property could be found
      */
-    boolean getPropertyAsBoolean(String key, boolean defaultValue);
+    public fun getPropertyAsBoolean(key: String, defaultValue: Boolean): Boolean
 
     /**
      * Return a property as a long value.
      *
-     * @param key
-     *            the name of the property to get
+     * @param key the name of the property to get
      * @return the value of the property
      */
-    long getPropertyAsLong(String key);
+    public fun getPropertyAsLong(key: String): Long
 
     /**
      * Return a property as a long value or a default value if no property
      * could be found.
      *
-     * @param key
-     *            the name of the property to get
-     * @param defaultValue
-     *            the default value to use
-     * @return the value of the property, or <code>defaultValue</code> if no
-     *         property could be found
+     * @param key the name of the property to get
+     * @param defaultValue the default value to use
+     * @return the value of the property, or `defaultValue` if no property could be found
      */
-    long getPropertyAsLong(String key, long defaultValue);
+    public fun getPropertyAsLong(key: String, defaultValue: Long): Long
 
     /**
      * Return a property as an int value.
      *
      * @param key
-     *            the name of the property to get
+     * the name of the property to get
      * @return the value of the property
      */
-    int getPropertyAsInt(String key);
+    public fun getPropertyAsInt(key: String): Int
 
     /**
      * Return a property as an int value or a default value if no property
      * could be found.
      *
-     * @param key
-     *            the name of the property to get
-     * @param defaultValue
-     *            the default value to use
-     * @return the value of the property, or <code>defaultValue</code> if no
-     *         property could be found
+     * @param key the name of the property to get
+     * @param defaultValue the default value to use
+     * @return the value of the property, or `defaultValue` if no property could be found
      */
-    int getPropertyAsInt(String key, int defaultValue);
+    public fun getPropertyAsInt(key: String, defaultValue: Int): Int
 
     /**
      * Return a property as a float value.
      *
      * @param key
-     *            the name of the property to get
+     * the name of the property to get
      * @return the value of the property
      */
-    float getPropertyAsFloat(String key);
+    public fun getPropertyAsFloat(key: String): Float
 
     /**
      * Return a property as a double value.
      *
      * @param key
-     *            the name of the property to get
+     * the name of the property to get
      * @return the value of the property
      */
-    double getPropertyAsDouble(String key);
-
-    /**
-     * Make the test element the running version, or make it no longer the
-     * running version. This tells the test element that it's current state must
-     * be retrievable by a call to recoverRunningVersion(). It is kind of like
-     * making the TestElement Read- Only, but not as strict. Changes can be made
-     * and the element can be modified, but the state of the element at the time
-     * of the call to setRunningVersion() must be recoverable.
-     *
-     * @param run
-     *            flag whether this element should be the running version
-     */
-    void setRunningVersion(boolean run);
+    public fun getPropertyAsDouble(key: String): Double
 
     /**
      * Tells the test element to return to the state it was in when
      * setRunningVersion(true) was called.
      */
-    void recoverRunningVersion();
+    public fun recoverRunningVersion()
 
     /**
      * Clear the TestElement of all data.
      */
-    void clear();
+    public fun clear()
 
     /**
      * Return a property as a string value.
      *
-     * @param key
-     *            the name of the property to get
+     * @param key the name of the property to get
      * @return the value of the property
      */
-    String getPropertyAsString(String key);
+    public fun getPropertyAsString(key: String): String
 
     /**
      * Return a property as an string value or a default value if no property
      * could be found.
      *
      * @param key
-     *            the name of the property to get
+     * the name of the property to get
      * @param defaultValue
-     *            the default value to use
-     * @return the value of the property, or <code>defaultValue</code> if no
-     *         property could be found
+     * the default value to use
+     * @return the value of the property, or `defaultValue` if no
+     * property could be found
      */
-    String getPropertyAsString(String key, String defaultValue);
+    public fun getPropertyAsString(key: String, defaultValue: String): String
 
     /**
      * Sets and overwrites a property in the TestElement. This call will be
      * ignored if the TestElement is currently a "running version".
      *
-     * @param property
-     *            the property to be set
+     * @param property the property to be set
      */
-    void setProperty(JMeterProperty property);
+    public fun setProperty(property: JMeterProperty)
 
     /**
      * Given the name of the property, returns the appropriate property from
-     * JMeter. If it is null, a NullProperty object will be returned.
+     * JMeter. If it is null, a [NullProperty] object will be returned.
      *
-     * @param propName
-     *            the name of the property to get
-     * @return {@link JMeterProperty} stored under the name, or
-     *         {@link NullProperty} if no property can be found
+     * @param propName the name of the property to get
+     * @return [JMeterProperty] stored under the name, or [NullProperty] if no property can be found
      */
-    JMeterProperty getProperty(String propName);
+    public fun getProperty(propName: String): JMeterProperty
 
     /**
      * Get a Property Iterator for the TestElements properties.
      *
      * @return PropertyIterator
      */
-    PropertyIterator propertyIterator();
+    public fun propertyIterator(): PropertyIterator
 
     /**
-     * Remove property stored under the <code>key</code>
+     * Remove property stored under the `key`
      *
-     * @param key
-     *            name of the property to be removed
+     * @param key name of the property to be removed
      */
-    void removeProperty(String key);
+    public fun removeProperty(key: String)
 
     // lifecycle methods
-
-    Object clone();
+    public override fun clone(): Any
 
     /**
      * Convenient way to traverse a test element.
      *
-     * @param traverser
-     *            The traverser that is notified of the contained elements
-     */
-    void traverse(TestElementTraverser traverser);
-
-    /**
-     * @return Returns the threadContext.
-     */
-    JMeterContext getThreadContext();
-
-    /**
-     * @param threadContext
-     *            The threadContext to set.
+     * @param traverser The traverser that is notified of the contained elements
      */
-    void setThreadContext(JMeterContext threadContext);
+    public fun traverse(traverser: TestElementTraverser)
 
     /**
-     * Returns the threadName.
-     * @return the threadName.
+     * Associates a thread context with this element.
      */
-    String getThreadName();
+    public var threadContext: JMeterContext
 
     /**
-     * Configures thread name.
-     * @param threadName the threadName to set.
+     * Associates a thread name with this element.
      */
-    void setThreadName(String threadName);
+    public var threadName: String
 
     /**
      * Called by Remove to determine if it is safe to remove the element. The
@@ -306,40 +247,23 @@ public interface TestElement extends Cloneable {
      *
      * @return true if safe to remove the element
      */
-    boolean canRemove();
-
-    /**
-     * Get the name of this test element
-     * @return name of this element
-     */
-    String getName();
+    public fun canRemove(): Boolean
 
     /**
      * Associates a name with this element.
-     * @param name
-     *            to be associated
      */
-    void setName(String name);
+    public var name: String?
 
     /**
-     * Returns comment associated with this element.
-     * @return comment associated with this element
-     */
-    String getComment();
-
-    /**
-     * Associates a comment with this element
-     *
-     * @param comment
-     *            to be associated
+     * Associates a comment with this element.
      */
-    void setComment(String comment);
+    public var comment: String?
 
     /**
      * Called when the test element is removed from the test plan.
      * Must not throw any exception
      */
-    default void removed() {
+    public fun removed() {
         // NOOP
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index fdb4faa17b5..7a19aca80c3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -116,6 +116,7 @@ Summary
   <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
   <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
   <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
+  <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 6f5936b5eb1412da27d369de3c2892e20b04e5b4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 21:26:55 +0300
Subject: [PATCH 0503/1037] doc: use Dokka instead of Javadoc for building
 documentation in modules that contain Kotlin code in src/main

Java's Javadoc can't build documentation for Kotlin code, so we need something else.

Dokka can create documentation for both Kotlin and Java.

See https://kotlinlang.org/docs/dokka-introduction.html
---
 .../kotlin/build-logic.dokka-javadoc.gradle.kts | 17 ++++++++++++++++-
 .../main/kotlin/build-logic.kotlin.gradle.kts   |  5 +++++
 checksum.xml                                    |  1 +
 .../3a/03281aa0289ff53a.fingerprints            |  1 +
 ...1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc | 16 ++++++++++++++++
 .../52/74237ad167ffee52.fingerprints            |  1 +
 6 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
index 9215287335b..1be932a5730 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
@@ -25,6 +25,16 @@ java {
     withJavadocJar()
 }
 
+tasks.named<Jar>("javadocJar") {
+    // Set a custom classifier, so we can distinguish it from Dokka-generated javadoc
+    archiveClassifier.set("javadoc_java")
+}
+
+tasks.dokkaJavadoc {
+    moduleName.set("Apache JMeter ${project.name}")
+    mustRunAfter("kaptKotlin")
+}
+
 val dokkaJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
     description = "Assembles a jar archive containing javadoc"
@@ -32,4 +42,9 @@ val dokkaJar by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
 }
 
-configurations[JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME].outgoing.artifact(dokkaJar)
+configurations[JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME].outgoing {
+    // Avoid publishing Java-generated javadoc
+    artifacts.clear()
+    // Publish Dokka-generated javadoc instead
+    artifact(dokkaJar)
+}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index fcdbb3cdcf5..628bbda55e4 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -47,3 +47,8 @@ tasks.configureEach<KotlinCompile> {
         jvmTarget = java.targetCompatibility.toString()
     }
 }
+
+if (file("src/main/kotlin").isDirectory) {
+    // When main code contains Kotlin, use Dokka instead of Javadoc
+    apply(plugin = "build-logic.dokka-javadoc")
+}
diff --git a/checksum.xml b/checksum.xml
index ac89439db47..efa173c7986 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -58,6 +58,7 @@
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
     <trusted-key id='06d34ed6ff73de368a772a781063fe98bcecb758' group='com.puppycrawl.tools' />
+    <trusted-key id='1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a' group='com.soywiz.korlibs.korte' />
     <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='com.sun.activation' />
     <trusted-key id='31fae244a81d64507b47182e1b2718089ce964b8' group='com.thoughtworks.qdox' />
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='com.thoughtworks.xstream' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
new file mode 100644
index 00000000000..ccdffe0272d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
@@ -0,0 +1 @@
+1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
new file mode 100644
index 00000000000..da0794018ce
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGBJD1kBCAC2OgrVeUz5GtDnUh1fSKqEDN+3tjFKmCKj92buwiDLz8sWtzEE
+ncMlGSic0yAVxMTNIlfq0ec1AFWIFKsMkcpYX435UapQz8S19XhIIROsy5i/bZcg
+6bg4ddzAMs5CbpyLFmjzW49tOaZKQbUm0zb5c4NR4B6v7E5DWh/TCJAeqXd5yDQN
+q2CAeeolJCv5Vuw76IjcaNlGFBt9/lAr/sjOyT4Tfl/8HA+x1RujVYcv+yxeevGX
+zJOWRxO59i2EU3XgCOZXPE3F43cNNfwYpUlQso4nB4c7+vcK4D83PlmAH6t/N6G+
+6EbsOS5OsAFmV3yve2ydS9BvF0TQsOcJFKRhABEBAAG5AQ0EYEkPWQEIAOJ14ajv
+2BVqQW8oVD4EI5k7iKq1nYKquP4+63pgbx1MTMfkRAEpc6qtxSk5LasO19QkoV60
+Wf+mB2CV/USfmQQfZcqREFLF2F3bY5cy964lWcZU0yPevGFg3uLKIqGa26/zQIpX
+x3oF6QPV6sdO2vfqIMNQr08flW9BRep5WMtgvEBoAmaUyNBgYlGhdGauqahiI8ZK
+oFuPW5E63HNajErH8na5BVaGziJUoq2XjY922tooGJ0Qi4dDUtOmrqEpqBrS8oKY
+R1wszQ+USEpB90IuLd5kwut5AvIljjKe0v38o0f6T8nETfkxngdnYGjNoQt8Tbx5
+zF4deq+2ojju7jUAEQEAAQ==
+=lBfl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints
new file mode 100644
index 00000000000..ccdffe0272d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints
@@ -0,0 +1 @@
+1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a

From 9b6cddfa1cb71e08805e9109f7d6b1756cf03ab9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 3 Jun 2023 22:08:12 +0300
Subject: [PATCH 0504/1037] chore: publish Gradle Build Scans from GitHub
 Actions CI

See https://ge.apache.org/
---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cfa58362b12..b25c8a08a27 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,6 +70,7 @@ jobs:
           testDisableCaching=${{ matrix.testDisableCaching }}
       env:
         _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
+        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
   errorprone:
     name: 'Error Prone (JDK 11)'
@@ -87,3 +88,5 @@ jobs:
         job-id: errprone
         multi-cache-enabled: false
         arguments: --scan --no-parallel --no-daemon -PenableErrorprone classes
+      env:
+        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

From 5f6bb607be1bb9c139b36134a441e807a4104197 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 3 Jun 2023 23:34:46 +0300
Subject: [PATCH 0505/1037] chore: reduce verbosity of the build logs

Ignore "missing javadoc" warnings
---
 .../jvm/src/main/kotlin/build-logic.java.gradle.kts       | 4 +++-
 gradle.properties                                         | 4 ++++
 .../java/org/apache/jmeter/testbeans/TestBeanHelper.java  | 1 -
 .../src/main/java/org/apache/jorphan/util/HeapDumper.java | 8 ++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 32c5d4fbd68..1ba372687af 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -108,12 +108,14 @@ tasks.configureEach<Javadoc> {
         windowTitle = "Apache JMeter ${project.name} API"
         header = "<b>Apache JMeter</b>"
         addStringOption("source", "8")
+        addStringOption("Xmaxwarns", "10")
+        addBooleanOption("Xdoclint:all,-missing", true)
         val lastEditYear: String by rootProject.extra
         bottom =
             "Copyright &copy; 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
         if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
             addBooleanOption("html5", true)
-            links("https://docs.oracle.com/javase/11/docs/api/")
+            links("https://docs.oracle.com/en/java/javase/11/docs/api/")
         } else {
             links("https://docs.oracle.com/javase/8/docs/api/")
         }
diff --git a/gradle.properties b/gradle.properties
index bd8776dd3d4..6fdcffab113 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,3 +40,7 @@ com.github.vlsi.checksum-dependency.version=1.88
 kotlin.api.version=1.5
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
 kotlin.explicitApi=true
+
+# com.github.vlsi.gradle-extensions prints only failing or slow test results
+slowTestLogThreshold=1000
+slowSuiteLogThreshold=2000
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
index 5b5cec7f1d1..3c81ccc5a47 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
@@ -122,7 +122,6 @@ protected List<CachedPropertyDescriptor> computeValue(Class type) {
     /**
      * Prepare the bean for work by populating the bean's properties from the
      * property value map.
-     * <p>
      *
      * @param el the TestElement to be prepared
      */
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
index eef6b52e463..e943f04d1fa 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
@@ -108,7 +108,7 @@ public static void dumpHeap(String fileName, boolean live) throws Exception{
 
     /**
      * Dumps live objects from the heap to the outputFile file in the same format as the hprof heap dump.
-     * <p>
+     *
      * @see #dumpHeap(String, boolean)
      * @param fileName name of the heap dump file. Must be creatable, i.e. must not exist.
      * @throws Exception if the MXBean cannot be found, or if there is a problem during invocation
@@ -122,7 +122,7 @@ public static void dumpHeap(String fileName) throws Exception{
      * <p>
      * Creates the dump using the file name: dump_yyyyMMdd_hhmmss_SSS.hprof
      * The dump is created in the current directory.
-     * <p>
+     * </p>
      * @see #dumpHeap(boolean)
      * @return the name of the dump file that was created
      * @throws Exception if the MXBean cannot be found, or if there is a problem during invocation
@@ -136,7 +136,7 @@ public static String dumpHeap() throws Exception{
      * <p>
      * Creates the dump using the file name: dump_yyyyMMdd_hhmmss_SSS.hprof
      * The dump is created in the current directory.
-     * <p>
+     * </p>
      * @see #dumpHeap(String, boolean)
      * @param live true id only live objects are to be dumped.
      *
@@ -152,7 +152,7 @@ public static String dumpHeap(boolean live) throws Exception {
      * The dump is created in the specified directory.
      * <p>
      * Creates the dump using the file name: dump_yyyyMMdd_hhmmss_SSS.hprof
-     * <p>
+     * </p>
      * @see #dumpHeap(String, boolean)
      * @param basedir File object for the target base directory.
      * @param live true id only live objects are to be dumped.

From 209af907f1dc477c364c9f6b7edf20f6c9694db1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 4 Jun 2023 09:06:24 +0300
Subject: [PATCH 0506/1037] fix: wrap recoverRunningVersion with a writeLock

Previously, there was no synchronization, however, we'd better hold a write lock
as we might to modify the properties.

This is a fixup to https://github.com/apache/jmeter/commit/a8317d0fdb563ea7580317b9bd123f0e2797bb48
---
 .../testelement/AbstractTestElement.java      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index c1af18a23bd..0e461f809a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -654,18 +654,23 @@ public void recoverRunningVersion() {
             // See https://github.com/apache/jmeter/issues/5875
             return;
         }
-        Iterator<Map.Entry<String, JMeterProperty>> iter = propMap.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, JMeterProperty> entry = iter.next();
-            JMeterProperty prop = entry.getValue();
-            if (isTemporary(prop)) {
-                iter.remove();
-                clearTemporary(prop);
-            } else {
-                prop.recoverRunningVersion(this);
+        writeLock();
+        try {
+            Iterator<Map.Entry<String, JMeterProperty>> iter = propMap.entrySet().iterator();
+            while (iter.hasNext()) {
+                Map.Entry<String, JMeterProperty> entry = iter.next();
+                JMeterProperty prop = entry.getValue();
+                if (isTemporary(prop)) {
+                    iter.remove();
+                    clearTemporary(prop);
+                } else {
+                    prop.recoverRunningVersion(this);
+                }
             }
+            emptyTemporary();
+        } finally {
+            writeUnlock();
         }
-        emptyTemporary();
     }
 
     /**

From ae8c1ec2ba18c74f7900a474989877d26d369915 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 29 Apr 2023 13:08:15 +0200
Subject: [PATCH 0507/1037] Add more variables to template to compute sampler
 names

The new variables are
 * method - HTTP method of the request
 * host   - host of the URL recorded (called domain in the sampler)
 * scheme - scheme of the URL recorded (called protocol in the sampler)
 * port   - port of the URL recorded
 * url    - URL as recorded

Issue #5820

Co-authored-by: Alex Schwartz <alexschwartz01@gmail.com>

Guard message formats that might have been given by user

As Vladimir pointed out, we might have users, that construct
a format string with a part, that might be interpreted by
MessageFormat. So let us guard those.

asdf
---
 .../jmeter/resources/messages.properties      |  2 +-
 .../http/proxy/DefaultSamplerCreator.java     | 42 ++++++++++---
 .../http/proxy/DefaultSamplerCreatorTest.java | 59 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 xdocs/usermanual/component_reference.xml      |  2 +-
 5 files changed, 97 insertions(+), 9 deletions(-)
 create mode 100644 src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreatorTest.java

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 851b4a63ed8..5a37083f585 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -1037,7 +1037,7 @@ sample_name_prefix=Prefix
 sample_name_suffix=Suffix
 sample_naming_scheme=Naming scheme
 sample_name_transaction=Transaction name
-sample_naming_format_help=<html>Format for the names of the samplers.<br> The counter, path and transaction names can be given with the placeholders <tt>#{counter}</tt>, <tt>#{path}</tt> and <tt>#{name}</tt>.</html>
+sample_naming_format_help=<html>Format for the names of the samplers.<br> The following placeholders can be used<br> <tt>#{counter}</tt>, <tt>#{path}</tt>, <tt>#{name}</tt>, <tt>#{method}</tt>, <tt>#{host}</tt>, <tt>#{scheme}</tt>, <tt>#{port}</tt> and <tt>#{url}</tt></html>
 salt_string=Salt to be used for hashing (optional)
 sample_result_save_configuration=Sample Result Save Configuration
 sample_scope=Apply to:
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 27b9894be67..a972399ca9b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -23,6 +23,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import javax.xml.XMLConstants;
@@ -361,18 +363,44 @@ protected static void computeSamplerName(HTTPSamplerBase sampler,
         String prefix = StringUtils.defaultString(request.getPrefix(), "");
         int httpSampleNameMode = request.getHttpSampleNameMode();
         String format = getFormat(httpSampleNameMode, request.getHttpSampleNameFormat());
+        String url;
+        try {
+            url = sampler.getUrl().toString();
+        } catch (MalformedURLException e) {
+            // If path could not be converted to URL, retain path component
+            url = sampler.getPath();
+            log.warn("Could not get URL to name sample", e);
+        }
+        List<Object> values = Arrays.asList(
+                prefix,
+                sampler.getPath(),
+                sampler.getMethod(),
+                sampler.getDomain(),
+                sampler.getProtocol(),
+                sampler.getPort(),
+                url
+        );
+        Object[] valuesArray;
         if (!HTTPConstants.CONNECT.equals(request.getMethod()) && isNumberRequests()) {
-            sampler.setName(MessageFormat.format(format, prefix, sampler.getPath(), incrementRequestNumberAndGet()));
+            valuesArray = values.toArray(new Object[values.size() + 1]);
+            valuesArray[values.size()] = incrementRequestNumberAndGet();
         } else {
-            sampler.setName(MessageFormat.format(format, prefix, sampler.getPath()));
+            valuesArray = values.toArray();
         }
+        sampler.setName(MessageFormat.format(format,valuesArray));
     }
 
     private static String getFormat(int httpSampleNameMode, String format) {
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_FORMATTER) {
-            return format.replaceAll("#\\{name([,}])", "{0$1")
+            return format.replaceAll("\\{(\\d+(,[^}]*)?)\\}", "'{'$1'}'")
+                    .replaceAll("#\\{name([,}])", "{0$1")
                     .replaceAll("#\\{path([,}])", "{1$1")
-                    .replaceAll("#\\{counter([,}])", "{2$1");
+                    .replaceAll("#\\{method([,}])", "{2$1")
+                    .replaceAll("#\\{host([,}])", "{3$1")
+                    .replaceAll("#\\{scheme([,}])", "{4$1")
+                    .replaceAll("#\\{port([,}])", "{5$1")
+                    .replaceAll("#\\{url([,}])", "{6$1")
+                    .replaceAll("#\\{counter([,}])", "{7$1");
         }
         if (isNumberRequests()) {
             return getNumberedFormat(httpSampleNameMode);
@@ -391,13 +419,13 @@ private static String getFormat(int httpSampleNameMode, String format) {
 
     private static String getNumberedFormat(int httpSampleNameMode) {
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
-            return "{0}{1}-{2}";
+            return "{0}{1}-{7}";
         }
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
-            return "{0}-{2}";
+            return "{0}-{7}";
         }
         if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_SUFFIX) {
-            return "{0}-{2} {1}";
+            return "{0}-{7} {1}";
         }
         return "{1}";
     }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreatorTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreatorTest.java
new file mode 100644
index 00000000000..86872e6be3f
--- /dev/null
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreatorTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.proxy;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class DefaultSamplerCreatorTest {
+
+    @ParameterizedTest
+    @CsvSource({
+            "3,#{name} - #{counter} - #{scheme}://#{host}:#{port}#{path},prefix| - 42 - https://jmeter.invalid:443/some/path",
+            "3,#{counter} - #{path},42 - /some/path",
+            "3,#{url},https://jmeter.invalid/some/path",
+            "3,{0},{0}",
+            "3,'{0,number,#.##}','{0,number,#.##}'",
+            "0,,prefix|/some/path-42",
+            "1,,prefix|-42",
+            "2,,prefix|-42 /some/path",
+            "4,,/some/path"
+    })
+    void computeSamplerNameWithCounter(int sampleNameMode, String format, String expectedName) {
+        DefaultSamplerCreator samplerCreator = new DefaultSamplerCreator();
+        HTTPSamplerBase sampler = new HTTPSampler();
+        sampler.setPath("/some/path");
+        sampler.setDomain("jmeter.invalid");
+        sampler.setMethod("GET");
+        sampler.setPort(443);
+        sampler.setProtocol("https");
+        HttpRequestHdr request = new HttpRequestHdr(
+                "prefix|",
+                "samplerName",
+                sampleNameMode,
+                format
+        );
+        samplerCreator.setCounter(41);
+        samplerCreator.computeSamplerName(sampler, request);
+        assertEquals(expectedName, sampler.getName());
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7a19aca80c3..79300f56dd9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -217,6 +217,7 @@ Summary
   <li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
   <li>Victor Peralta (vperaltac at github)</li>
   <li>Mohamed Ibrahim (rollno748 at github)</li>
+  <li>Alex Schwartz (alexsch01 at github)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index f78ae49b46b..8a5f438c232 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6961,7 +6961,7 @@ Both Chrome and Internet Explorer use the same trust store for certificates.
         <property name="Regex Matching" required="Yes">Use Regex Matching when replacing variables? If checked replacement will use word boundaries, i.e. it will only replace word matching values of variable, not part of a word. A word boundary follows Perl5 definition and is equivalent to <code>\b</code>. More information below in the paragraph about "<code>User Defined Variable replacement</code>".</property>
         <property name="Prefix/Transaction name" required="No">Add a prefix to sampler name during recording (Prefix mode). Or replace sampler name by user chosen name (Transaction name)</property>
         <property name="Naming scheme" required="No">Select the naming scheme for sampler names during recording. Default is <code>Transaction name</code></property>
-        <property name="Naming format" required="No">If <code>Use format string</code> is selected as naming scheme, a freestyle format can be given. Placeholders for the transaction name, path and counter can be given by <code>#{name}</code>, <code>#{path}</code> and <code>#{counter}</code>. A simple format could be "<code>#{name}-#{counter}</code>", which would be equivalent to the numbered default naming scheme. For more complex formatting Java formatting for MessageFormat can be used, as in "<code>#{counter,number,000}: #{name}-#{path}</code>", which would print the counter filled with up to three zeroes. Default is an empty string.</property>
+        <property name="Naming format" required="No">If <code>Use format string</code> is selected as naming scheme, a freestyle format can be given. Placeholders for the transaction name, scheme, host, port, path and counter can be given by <code>#{name}</code>, <code>#{scheme}</code>, <code>#{host}</code>, <code>#{port}</code>, <code>#{path}</code>, <code>#{url}</code> and <code>#{counter}</code>. A simple format could be "<code>#{name}-#{counter}</code>", which would be equivalent to the numbered default naming scheme. For more complex formatting Java formatting for MessageFormat can be used, as in "<code>#{counter,number,000}: #{name}-#{path}</code>", which would print the counter filled with up to three zeroes. Note that scheme is called <code>protocol</code> in the sampler GUI and host is called <code>domain</code>. Default is an empty string.</property>
         <property name="Counter start value" required="No">Can be used to reset the counter to a given value. Note, that the next sample will first increment and then use the value. If the first sampler should start with <code>1</code>, reset the counter to <code>0</code>.</property>
         <property name="Create new transaction after request (ms)">Inactivity time between two requests needed to consider them in two separate groups.</property>
         <property name="Type" required="Yes">Which type of sampler to generate (the HTTPClient default or Java)</property>

From 6d6479ba7a387a4bd9de4759f595dbcf9d644101 Mon Sep 17 00:00:00 2001
From: matthewt-assurity <matthew.tansley@assurity.co.nz>
Date: Mon, 29 May 2023 15:27:40 +1200
Subject: [PATCH 0508/1037] Update HTML parser to pick up `preload` attribute
 for `rel`

---
 .../org/apache/jmeter/protocol/http/parser/HTMLParser.java  | 1 +
 .../apache/jmeter/protocol/http/parser/JTidyHTMLParser.java | 3 ++-
 .../jmeter/protocol/http/parser/JsoupBasedHtmlParser.java   | 6 ++++--
 .../jmeter/protocol/http/parser/LagartoBasedHtmlParser.java | 3 ++-
 xdocs/changes.xml                                           | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
index 7a0b1bf4e53..af67dc063ce 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
@@ -63,6 +63,7 @@ public abstract class HTMLParser extends BaseParser {
 
     protected static final String SHORTCUT_ICON     = "shortcut icon";
     protected static final String ICON              = "icon";
+    protected static final String PRELOAD           = "preload";
 
     protected static final String IE_UA             = "MSIE ([0-9]+.[0-9]+)";// $NON-NLS-1$
     protected static final Pattern IE_UA_PATTERN    = Pattern.compile(IE_UA);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
index d6d3af27d14..782ef9c2f19 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
@@ -148,7 +148,8 @@ private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws
             if (TAG_LINK.equalsIgnoreCase(name) &&
                     (STYLESHEET.equalsIgnoreCase(getValue(attrs, ATT_REL))
                             || SHORTCUT_ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
-                            || ICON.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
+                            || ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
+                            || PRELOAD.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
                 urls.addURL(getValue(attrs, ATT_HREF), baseUrl);
                 break;
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
index 10e519075a8..3e2ab33d563 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
@@ -127,8 +127,10 @@ public void head(Node node, int depth) {
             } else if (tagName.equals(TAG_LINK)) {
                 String relAttr = tag.attr(ATT_REL);
                 // Putting the string first means it works even if the attribute is null
-                if (STYLESHEET.equalsIgnoreCase(relAttr) || ICON.equalsIgnoreCase(relAttr)
-                        || SHORTCUT_ICON.equalsIgnoreCase(relAttr)) {
+                if (STYLESHEET.equalsIgnoreCase(relAttr)
+                        || ICON.equalsIgnoreCase(relAttr)
+                        || SHORTCUT_ICON.equalsIgnoreCase(relAttr)
+                        || PRELOAD.equalsIgnoreCase(relAttr)) {
                     extractAttribute(tag, ATT_HREF);
                 }
             } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 360cb7c2aa1..a14b6bace15 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -167,7 +167,8 @@ public void tag(Tag tag) {
                     if (relAttribute != null &&
                             (CharSequenceUtil.equalsIgnoreCase(STYLESHEET,relAttribute)
                                     || CharSequenceUtil.equalsIgnoreCase(ICON, relAttribute)
-                                    || CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute))) {
+                                    || CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute)
+                                    || CharSequenceUtil.equalsIgnoreCase(PRELOAD, relAttribute))) {
                         extractAttribute(tag, ATT_HREF);
                     }
                 } else {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 79300f56dd9..2359237d512 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -76,6 +76,7 @@ Summary
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
   <li><pr>5911</pr> Use Caffeine for caching HTTP headers instead of commons-collections4 LRUMap</li>
+  <li><pr>5947</pr> Fetch resources referenced in <code>&lt;link "rel"="preload"...&gt;</code> elements</li>
 </ul>
 
 <h3>Other samplers</h3>
@@ -218,6 +219,7 @@ Summary
   <li>Victor Peralta (vperaltac at github)</li>
   <li>Mohamed Ibrahim (rollno748 at github)</li>
   <li>Alex Schwartz (alexsch01 at github)</li>
+  <li>Matt Tansley (matthewt-assurity at github)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>

From 31e42426238ec74e4f355baa927e55df780c3057 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 5 Jun 2023 19:07:53 +0300
Subject: [PATCH 0509/1037] Deprecate TestElement.threadName as it is not
 related to TestElement

Samplers should use JMeterContextService.getContext().thread.threadName
instead.

Fixes https://github.com/apache/jmeter/issues/5961
---
 .../jmeter/testelement/AbstractTestElement.java       |  2 ++
 .../java/org/apache/jmeter/threads/JMeterThread.java  |  7 ++++++-
 .../org/apache/jmeter/testelement/TestElement.kt      | 11 +++++++++++
 xdocs/changes.xml                                     |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 0e461f809a2..579464e57fd 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -763,6 +763,7 @@ public void setThreadContext(JMeterContext inthreadContext) {
      * @return Returns the threadName.
      */
     @Override
+    @SuppressWarnings("deprecation")
     public String getThreadName() {
         return threadName;
     }
@@ -772,6 +773,7 @@ public String getThreadName() {
      *            The threadName to set.
      */
     @Override
+    @SuppressWarnings("deprecation")
     public void setThreadName(String inthreadName) {
         if (threadName != null) {
             if (!threadName.equals(inthreadName)) {
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index f7735d42ac9..8b7f13f7900 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -634,7 +634,7 @@ private void executeSamplePackage(Sampler current,
      */
     private SampleResult doSampling(JMeterContext threadContext, Sampler sampler) {
         sampler.setThreadContext(threadContext);
-        sampler.setThreadName(threadName);
+        setSamplerThreadName(sampler);
         TestBeanHelper.prepare(sampler);
 
         // Perform the actual sample
@@ -659,6 +659,11 @@ private SampleResult doSampling(JMeterContext threadContext, Sampler sampler) {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    private void setSamplerThreadName(Sampler sampler) {
+        sampler.setThreadName(threadName);
+    }
+
     private SampleResult doEndTransactionSampler(
             TransactionSampler transactionSampler, Sampler parent,
             SamplePackage transactionPack, JMeterContext threadContext) {
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 3d99ed40756..ee5fd7d36ce 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -21,6 +21,7 @@ import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apache.jmeter.testelement.property.NullProperty
 import org.apache.jmeter.testelement.property.PropertyIterator
 import org.apache.jmeter.threads.JMeterContext
+import org.apiguardian.api.API
 
 public interface TestElement : Cloneable {
     public companion object {
@@ -237,7 +238,17 @@ public interface TestElement : Cloneable {
 
     /**
      * Associates a thread name with this element.
+     * @deprecated Use `JMeterContextService.getContext().thread.threadName` instead
      */
+    @Deprecated(
+        message = "Use JMeterContextService.getContext().thread.threadName instead",
+        replaceWith = ReplaceWith(
+            "JMeterContextService.getContext().thread.threadName",
+            imports = ["org.apache.jmeter.threads.JMeterContextService"]
+        )
+    )
+    @get:API(status = API.Status.DEPRECATED, since = "5.6")
+    @set:API(status = API.Status.DEPRECATED, since = "5.6")
     public var threadName: String
 
     /**
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2359237d512..faecc676d3b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -142,6 +142,7 @@ Summary
   <li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
   <li>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
   <li><pr>5960</pr>Add OpenJDK JMH for creating microbenchmarks in JMeter code</li>
+  <li><issue>5961</issue>Deprecate TestElement.threadName as it is not related to TestElement</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 4bf88b55ecef7369ebdb313410c02321db9d8a1b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 5 Jun 2023 19:24:11 +0300
Subject: [PATCH 0510/1037] test: add Xmx128m when executing keytool for the
 tests

---
 .../src/main/java/org/apache/jorphan/exec/KeyToolUtils.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index bef18bfbf55..f4f489743e2 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -145,6 +145,7 @@ public static void genkeypair(final File keystore, String alias, final String pa
         final SystemCommand nativeCommand = new SystemCommand(workingDir, null);
         final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
+        arguments.add("-J-Xmx128m");
         arguments.add("-genkeypair"); // $NON-NLS-1$
         arguments.add("-alias"); // $NON-NLS-1$
         arguments.add(alias);
@@ -350,6 +351,7 @@ public static String list(final File keystore, final String storePass) throws IO
         final SystemCommand nativeCommand = new SystemCommand(workingDir, null);
         final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
+        arguments.add("-J-Xmx128m");
         arguments.add("-list"); // $NON-NLS-1$
         arguments.add("-v"); // $NON-NLS-1$
 
@@ -428,6 +430,7 @@ private static void keytool(String command, File keystore, String password, Stri
                 new SystemCommand(workingDir, 0L, 0, null, input, output, stdErr);
         final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
+        arguments.add("-J-Xmx128m");
         arguments.add(command);
         arguments.add("-keystore"); // $NON-NLS-1$
         arguments.add(keystore.getName());
@@ -479,6 +482,7 @@ private static boolean checkKeytool(String keytoolPath) {
         final SystemCommand nativeCommand = new SystemCommand(null, null);
         final List<String> arguments = new ArrayList<>();
         arguments.add(keytoolPath);
+        arguments.add("-J-Xmx128m");
         arguments.add("-help"); // $NON-NLS-1$
         try {
             int status = nativeCommand.run(arguments);

From ff5cb45708b46e880759a933ae697ea7e77f2a68 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 19 May 2023 16:57:29 +0300
Subject: [PATCH 0511/1037] doc: update the next version to be 5.6

---
 gradle.properties                             |  2 +-
 .../jmeter/engine/StandardJMeterEngine.java   |  2 +-
 src/dist/build.gradle.kts                     |  1 +
 xdocs/changes.xml                             | 84 +++++++++++++------
 4 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6fdcffab113..baa0755d586 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.5.1
+jmeter.version=5.6
 
 # Plugins
 com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index db68aa7132a..2aea22251e2 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -214,7 +214,7 @@ public void runTest() throws JMeterEngineException {
         }
     }
 
-    @API(status = API.Status.EXPERIMENTAL, since = "5.5.1")
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public void awaitTermination(Duration duration) throws ExecutionException, InterruptedException, TimeoutException {
         runningTest.get(duration.toMillis(), TimeUnit.MILLISECONDS);
     }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index f0a2f28983e..0da859dc64f 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -171,6 +171,7 @@ val verifyReleaseDependencies by tasks.registering {
     dependsOn(configurations.runtimeClasspath)
     val expectedLibs = file("src/dist/expected_release_jars.csv")
     inputs.file(expectedLibs)
+    inputs.property("updateExpectedJars", updateExpectedJars)
     val actualLibs = File(buildDir, "dist/expected_release_jars.csv")
     outputs.file(actualLibs)
     val ignoreJarsMismatch = version.toString().endsWith("-SNAPSHOT")
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index faecc676d3b..e0be23c383e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -46,9 +46,9 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 </note>
 
 
-<!--  =================== 5.5.1 =================== -->
+<!--  =================== 5.6 =================== -->
 
-<h1>Version 5.5.1</h1>
+<h1>Version 5.6</h1>
 <p>
 Summary
 </p>
@@ -77,6 +77,7 @@ Summary
 <ul>
   <li><pr>5911</pr> Use Caffeine for caching HTTP headers instead of commons-collections4 LRUMap</li>
   <li><pr>5947</pr> Fetch resources referenced in <code>&lt;link "rel"="preload"...&gt;</code> elements</li>
+  <li><pr>5869</pr> Allow more templates to format sampler names in the recorder: <code>#{url}</code>, <code>#{method}</code>, <code>#{scheme}</code>, <code>#{host}</code>, <code>#{port}</code></li>
 </ul>
 
 <h3>Other samplers</h3>
@@ -125,22 +126,44 @@ Summary
   <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
   <li><pr>5710</pr>Add GitHub Issue templates</li>
   <li><pr>5910</pr>Use Caffeine for caching customizers in TestBeanGUI instead of commons-collections4 LRUMap</li>
-  <li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
+  <li><pr>5713</pr><pr>5931</pr>Update Spock to 2.3-groovy-3.0 (from 2.1-groovy-3.0)</li>
   <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
-  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
-     Based on a patch by Ori Marko (orimarko at gmail.com)</li>
-  <li><pr>5718</pr>Update Apache commons-text to 1.10.0 (from 1.9)</li>
-  <li><pr>5725</pr>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
-  <li><pr>5725</pr>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
+  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default</li>
+  <li><pr>5924</pr>Update Apache commons-io to 2.12.0 (from 2.11.0)</li>
+  <li><pr>5921</pr>Update Jackson Core to 2.15.1 (from 2.13.3)</li>
+  <li><pr>5921</pr>Update Jackson Databind to 2.15.1 (from 2.13.3)</li>
   <li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
-  <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
+  <li><pr>5725</pr>Update JSoup to 1.16.1 (from 1.15.1)</li>
   <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
-  <li><pr>5763</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
-  <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
-  <li>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
-  <li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
-  <li>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
+  <li><pr>5763</pr><pr>5814</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
+  <li><pr>5854</pr>Added Apache Httpclient5 5.1.3</li>
+  <li><pr>5833</pr>Update Apache Freemarker to 2.3.32 (from 2.3.31)</li>
+  <li><pr>5830</pr>Update Apache Groovy to 3.0.17 (from 3.0.11)</li>
+  <li><pr>5862</pr>Update Apache Httpclient to 4.5.14 (from 4.5.13)</li>
+  <li><pr>5880</pr>Update Apache Xalan to 2.7.3 (from 2.7.2)</li>
+  <li><pr>5854</pr>Update Saxon-HE to 11.5 (from 11.5)</li>
+  <li><pr>5840</pr><pr>5930</pr>Update accessors-smart to 2.4.11 (from 2.4.8)</li>
+  <li><pr>5837</pr>Update asm to 9.5 (from 9.3)</li>
+  <li><pr>5840</pr><pr>5930</pr>Update json-smart to 2.4.11 (from 2.4.8)</li>
+  <li><pr>5814</pr>Update kotlin-stdlib to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-core to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-swing to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5907</pr>Update lets-plot-batik to 3.2.0 (from 2.1.1)</li>
+  <li><pr>5907</pr>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
+  <li><pr>5859</pr>Update log4j-1.2-api to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-api to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-core to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-slf4j-impl to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5861</pr>Update neo4j-java-driver to 4.4.11 (from 4.4.6)</li>
+  <li><pr>5853</pr>Update org.jetbrains:annotations to 24.0.1 (from 23.0.0)</li>
+  <li><pr>5868</pr><pr>5886</pr>Update ph-commons to 10.2.4 (from 10.1.6)</li>
+  <li><pr>5861</pr>Update reactive-streams to 1.0.4 (from 1.0.3)</li>
+  <li><pr>5847</pr>Update rsyntaxtextarea to 3.3.3 (from 3.2.0)</li>
+  <li><pr>5839</pr>Update svgSalamander to 1.1.4 (from 1.1.2.4)</li>
+  <li><pr>5852</pr>Update xmlgraphics-commons to 2.8 (from 2.7)</li>
+  <li><pr>5854</pr>Update xmlresolver to 4.6.4 (from 4.2.0)</li>
+  <li><pr>693</pr>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
   <li><pr>5960</pr>Add OpenJDK JMH for creating microbenchmarks in JMeter code</li>
   <li><issue>5961</issue>Deprecate TestElement.threadName as it is not related to TestElement</li>
 </ul>
@@ -213,14 +236,21 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
-  <li>Kai Lehmann (klehmann at aservo.com)</li>
-  <li>Ori Marko (orimarko at gmail.com)</li>
-  <li>Stefan Seide (stefan at trilobyte-se.de)</li>
-  <li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
-  <li>Victor Peralta (vperaltac at github)</li>
-  <li>Mohamed Ibrahim (rollno748 at github)</li>
-  <li>Alex Schwartz (alexsch01 at github)</li>
-  <li>Matt Tansley (matthewt-assurity at github)</li>
+  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
+  <li>Andreas Lind, <a href="https://github.com/andreaslind01">@andreaslind01</a></li>
+  <li>Arnout Engelen, <a href="https://github.com/raboof">@raboof</a></li>
+  <li>Clay Johnson, <a href="https://github.com/clayburn">@clayburn</a></li>
+  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
+  <li>Kai Lehmann, <a href="https://github.com/lehmannk">@lehmannk</a></li>
+  <li>kaola89, <a href="https://github.com/kaola89">@kaola89</a></li>
+  <li>Matt Tansley, <a href="https://github.com/matthewt-assurity">@matthewt-assurity</a></li>
+  <li>Mohamed Ibrahim, <a href="https://github.com/rollno748">@rollno748</a></li>
+  <li>Ori Marko, <a href="https://github.com/orimarko">@orimarko</a></li>
+  <li>PJ Fanning, <a href="https://github.com/pjfanning">@pjfanning</a></li>
+  <li>Sandra Thieme, <a href="https://github.com/sandra-thieme">@sandra-thieme</a></li>
+  <li>Stefan Seide, <a href="https://github.com/sseide">@sseide</a></li>
+  <li>Victor Peralta, <a href="https://github.com/vperaltac">@vperaltac</a></li>
+  <li>Vincent DABURON, <a href="https://github.com/vdaburon">@vdaburon</a></li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
@@ -309,11 +339,11 @@ With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jep
 mkdir lib/modules
 pushd lib/modules
 wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
 popd
 export JVM_ARGS="--module-path $PWD/lib/modules"
 ./bin/jmeter

From cc7d677da9395ff0ca6d407e739e99826cf274f4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 2 Jun 2023 13:46:33 +0300
Subject: [PATCH 0512/1037] feat: Add API to declare TestElement schemas

See https://github.com/apache/jmeter/issues/5946
---
 .../PropertyGetBooleanBenchmarkJava.java      | 102 ++++++
 .../PropertyGetBooleanBenchmarkKotlin.kt      | 100 ++++++
 .../main/java/org/apache/jmeter/JMeter.java   |  24 ++
 .../testelement/AbstractTestElement.java      |  34 +-
 .../JMeterPropertySchemaUnchecked.kt          |  33 ++
 .../apache/jmeter/testelement/TestElement.kt  | 302 ++++++++++++++++++
 .../jmeter/testelement/TestElementSchema.kt   |  46 +++
 .../apache/jmeter/testelement/removeOrSet.kt  |  28 ++
 .../schema/BooleanPropertyDescriptor.kt       |  61 ++++
 .../schema/ClassPropertyDescriptor.kt         |  70 ++++
 .../schema/CollectionPropertyDescriptor.kt    |  72 +++++
 .../schema/DoublePropertyDescriptor.kt        |  61 ++++
 .../schema/EmptyTestElementSchema.kt          | 130 ++++++++
 .../schema/FloatPropertyDescriptor.kt         |  61 ++++
 .../schema/IntegerPropertyDescriptor.kt       |  61 ++++
 .../schema/LongPropertyDescriptor.kt          |  61 ++++
 .../testelement/schema/PropertiesAccessor.kt  | 298 +++++++++++++++++
 .../testelement/schema/PropertyDescriptor.kt  |  52 +++
 .../schema/StringPropertyDescriptor.kt        |  57 ++++
 .../schema/TestElementPropertyDescriptor.kt   |  74 +++++
 .../property/JMeterElementSchemaTest.kt       | 139 ++++++++
 xdocs/changes.xml                             |   1 +
 22 files changed, 1851 insertions(+), 16 deletions(-)
 create mode 100644 src/core/src/jmh/java/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkJava.java
 create mode 100644 src/core/src/jmh/kotlin/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkKotlin.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/JMeterPropertySchemaUnchecked.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/removeOrSet.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt

diff --git a/src/core/src/jmh/java/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkJava.java b/src/core/src/jmh/java/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkJava.java
new file mode 100644
index 00000000000..0afc405787a
--- /dev/null
+++ b/src/core/src/jmh/java/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkJava.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.jmeter.testelement.TestElementSchema;
+import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.profile.GCProfiler;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+@Fork(value = 1, jvmArgsPrepend = {"-Xmx128m"})
+@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class PropertyGetBooleanBenchmarkJava {
+    TestPlan testPlan;
+    BooleanPropertyDescriptor<TestElementSchema> enabled;
+
+    @Setup
+    public void setup() {
+        testPlan = new TestPlan();
+        testPlan.setName("test plan name");
+        testPlan.setComment("test plan comment");
+        testPlan.setSerialized(true);
+        enabled = TestElementSchema.INSTANCE.getEnabled();
+    }
+
+    @Benchmark
+    public TestPlan configure_and_getBoolean() {
+        // Does not allocate heap
+        testPlan.getProps().invoke(
+                (plan, klass) -> {
+                    // Note: set.. would allocate BooleanProperty, so we test get here
+                    if (!plan.get(klass.getEnabled())) {
+                        throw new IllegalStateException("enabled must be true");
+                    }
+                }
+        );
+        return testPlan;
+    }
+
+    @Benchmark
+    public boolean props_klass_prop_getBoolean() {
+        return testPlan.getProps().getSchema().getEnabled().get(testPlan);
+    }
+
+    @Benchmark
+    public boolean booleanDescriptor_getBoolean() {
+        return enabled.get(testPlan);
+    }
+
+    @Benchmark
+    public boolean props_getBoolean() {
+        return testPlan.getProps().get(enabled);
+    }
+
+    @Benchmark
+    public boolean props_selector_getBoolean() {
+        return testPlan.getProps().get(TestElementSchema::getEnabled);
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(PropertyGetBooleanBenchmarkJava.class.getSimpleName())
+                .addProfiler(GCProfiler.class)
+                .detectJvmArgs()
+                .build();
+        new Runner(opt).run();
+    }
+}
diff --git a/src/core/src/jmh/kotlin/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkKotlin.kt b/src/core/src/jmh/kotlin/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkKotlin.kt
new file mode 100644
index 00000000000..1b87c02231e
--- /dev/null
+++ b/src/core/src/jmh/kotlin/org/apache/jmeter/testelement/property/PropertyGetBooleanBenchmarkKotlin.kt
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.openjdk.jmh.annotations.Benchmark
+import org.openjdk.jmh.annotations.BenchmarkMode
+import org.openjdk.jmh.annotations.Fork
+import org.openjdk.jmh.annotations.Measurement
+import org.openjdk.jmh.annotations.Mode
+import org.openjdk.jmh.annotations.OutputTimeUnit
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.Setup
+import org.openjdk.jmh.annotations.State
+import org.openjdk.jmh.annotations.Warmup
+import org.openjdk.jmh.profile.GCProfiler
+import org.openjdk.jmh.runner.Runner
+import org.openjdk.jmh.runner.options.Options
+import org.openjdk.jmh.runner.options.OptionsBuilder
+import java.util.concurrent.TimeUnit
+
+@Fork(value = 1, jvmArgsPrepend = ["-Xmx129m"])
+@Measurement(iterations = 500, time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+open class PropertyGetBooleanBenchmarkKotlin {
+    lateinit var testPlan: TestPlan
+    lateinit var enabled: BooleanPropertyDescriptor<TestElementSchema>
+
+    @Setup
+    fun setup() {
+        testPlan = TestPlan().apply {
+            name = "test plan name"
+            comment = "test plan comment"
+            isSerialized = true
+        }
+        enabled = TestElementSchema.enabled
+    }
+
+    @Benchmark
+    fun getBoolean(): Boolean =
+        testPlan.isSerialized
+
+    @Benchmark
+    fun configure_and_getBoolean(): TestPlan {
+        // Does not allocate heap
+        testPlan.props {
+            // Note: set.. would allocate BooleanProperty, so we test get here
+            if (!it[enabled]) {
+                throw IllegalStateException("enabled must be true")
+            }
+        }
+        return testPlan
+    }
+
+    @Benchmark
+    open fun props_klass_prop_getBoolean(): Boolean =
+        testPlan.props.schema.enabled[testPlan]
+
+    @Benchmark
+    fun booleanDescriptor_getBoolean(): Boolean =
+        enabled[testPlan]
+
+    @Benchmark
+    fun props_getBoolean(): Boolean =
+        testPlan.props[enabled]
+
+    @Benchmark
+    fun props_selector_getBoolean(): Boolean =
+        testPlan.props[ { enabled }]
+}
+
+fun main() {
+    println(PropertyGetBooleanBenchmarkKotlin::class.java.simpleName)
+    val opt: Options = OptionsBuilder()
+        .include(PropertyGetBooleanBenchmarkKotlin::class.java.simpleName)
+        .addProfiler(GCProfiler::class.java)
+        .detectJvmArgs()
+        .build()
+    Runner(opt).run()
+}
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index fa8aeb3584c..8592d4fd865 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -84,6 +84,7 @@
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestElementSchema;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.RemoteThreadsListenerTestElement;
 import org.apache.jmeter.util.BeanShellInterpreter;
@@ -426,6 +427,29 @@ public void start(String[] args) {
             JMeterUtils.setProperty("START.YMD", getFormatter("yyyyMMdd").format(now));// $NON-NLS-1$ $NON-NLS-2$
             JMeterUtils.setProperty("START.HMS", getFormatter("HHmmss").format(now));// $NON-NLS-1$ $NON-NLS-2$
 
+            // For unknown reason, TestElementSchema might fail to initialize in remote execution mode
+            // It reproduces with Java 11.0.13, and the error is StackOverflowError with the following stacktrace
+            // The workaround is to initialize Kotlin reflection before deserializing the test plan.
+            //  at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:174) ~[?:?]
+            //  at java.net.URLClassLoader.defineClass(URLClassLoader.java:555) ~[?:?]
+            //  at java.net.URLClassLoader$1.run(URLClassLoader.java:458) ~[?:?]
+            //  at java.net.URLClassLoader$1.run(URLClassLoader.java:452) ~[?:?]
+            //  at java.security.AccessController.doPrivileged(Native Method) ~[?:?]
+            //  at java.net.URLClassLoader.findClass(URLClassLoader.java:451) ~[?:?]
+            //  at java.lang.ClassLoader.loadClass(ClassLoader.java:589) ~[?:?]
+            //  at org.apache.jmeter.DynamicClassLoader.loadClass(DynamicClassLoader.java:81) ~[ApacheJMeter.jar:5.5.1-SNAPSHOT]
+            //  at java.lang.ClassLoader.loadClass(ClassLoader.java:522) ~[?:?]
+            //  at kotlin.jvm.internal.ClassReference.<clinit>(ClassReference.kt:156) ~[kotlin-stdlib-1.8.21.jar:1.8.21-release-380(1.8.21)]
+            //  at kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinClass(ReflectionFactory.java:30) ~[kotlin-stdlib-1.8.21.jar)]
+            //  at kotlin.jvm.internal.Reflection.getOrCreateKotlinClass(Reflection.java:60) ~[kotlin-stdlib-1.8.21.jar:1.8.21-release-380(1.8.21)]
+            //  at org.apache.jmeter.testelement.TestElementSchema.<init>(TestElementSchema.kt:33) ~[ApacheJMeter_core.jar:5.5.1-SNAPSHOT]
+            //  at org.apache.jmeter.testelement.TestElementSchema$INSTANCE.<init>(TestElementSchema.kt:26) ~[ApacheJMeter_core.jar:5.5.1-SNAPSHOT]
+            //  at org.apache.jmeter.testelement.TestElementSchema$INSTANCE.<init>(TestElementSchema.kt) ~[ApacheJMeter_core.jar:5.5.1-SNAPSHOT]
+            //  at org.apache.jmeter.testelement.TestElementSchema.<clinit>(TestElementSchema.kt) ~[ApacheJMeter_core.jar:5.5.1-SNAPSHOT]
+            //  at org.apache.jmeter.protocol.java.sampler.BeanShellSampler.<clinit>(BeanShellSampler.java:53) ~[ApacheJMeter_java.jar:5.5.1-SNAPSHOT]
+            //  at jdk.internal.misc.Unsafe.ensureClassInitialized0(Native Method) ~[?:?]
+            TestElementSchema.INSTANCE.getGuiClass();
+
             if (parser.getArgumentById(VERSION_OPT) != null) {
                 displayAsciiArt();
             } else if (parser.getArgumentById(HELP_OPT) != null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 579464e57fd..6bbf3bad48d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -47,6 +47,7 @@
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
+import org.apiguardian.api.API;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -273,7 +274,7 @@ public String getComment(){
      */
     @Override
     public JMeterProperty getProperty(String key) {
-        JMeterProperty prop = getRawProperty(key);
+        JMeterProperty prop = getPropertyOrNull(key);
         if (prop == null) {
             prop = new NullProperty(key);
         }
@@ -281,12 +282,12 @@ public JMeterProperty getProperty(String key) {
     }
 
     /**
-     * Null property are wrapped in a {@link NullProperty}
-     * This method avoids this wrapping
-     * for internal use only
-     * @since 3.1
+     * {@inheritDoc}
+     * @since 5.6
      */
-    private JMeterProperty getRawProperty(String key) {
+    @Override
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public JMeterProperty getPropertyOrNull(String key) {
         Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
         if (propMapConcurrent != null) {
             return propMapConcurrent.get(key);
@@ -342,7 +343,7 @@ public int getPropertyAsInt(String key) {
 
     @Override
     public int getPropertyAsInt(String key, int defaultValue) {
-        JMeterProperty jmp = getRawProperty(key);
+        JMeterProperty jmp = getPropertyOrNull(key);
         return jmp == null || jmp instanceof NullProperty ? defaultValue : jmp.getIntValue();
     }
 
@@ -353,7 +354,7 @@ public boolean getPropertyAsBoolean(String key) {
 
     @Override
     public boolean getPropertyAsBoolean(String key, boolean defaultVal) {
-        JMeterProperty jmp = getRawProperty(key);
+        JMeterProperty jmp = getPropertyOrNull(key);
         return jmp == null || jmp instanceof NullProperty ? defaultVal : jmp.getBooleanValue();
     }
 
@@ -369,7 +370,7 @@ public long getPropertyAsLong(String key) {
 
     @Override
     public long getPropertyAsLong(String key, long defaultValue) {
-        JMeterProperty jmp = getRawProperty(key);
+        JMeterProperty jmp = getPropertyOrNull(key);
         return jmp == null || jmp instanceof NullProperty ? defaultValue : jmp.getLongValue();
     }
 
@@ -385,7 +386,7 @@ public String getPropertyAsString(String key) {
 
     @Override
     public String getPropertyAsString(String key, String defaultValue) {
-        JMeterProperty jmp = getRawProperty(key);
+        JMeterProperty jmp = getPropertyOrNull(key);
         return jmp == null || jmp instanceof NullProperty ? defaultValue : jmp.getStringValue();
     }
 
@@ -585,13 +586,14 @@ public void setProperty(String name, long value, long dflt) {
 
     @Override
     public PropertyIterator propertyIterator() {
-        Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
-        if (propMapConcurrent != null) {
-            return new PropertyIteratorImpl(this, propMapConcurrent.values());
+        // Note: can't use ConcurrentMap here as it would return elements in unpredictable order
+        readLock();
+        try {
+            // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
+            return new PropertyIteratorImpl(this, propMap.values());
+        } finally {
+            readUnlock();
         }
-
-        // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
-        return new PropertyIteratorImpl(propMap.values());
     }
 
     /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/JMeterPropertySchemaUnchecked.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/JMeterPropertySchemaUnchecked.kt
new file mode 100644
index 00000000000..d0e89d7f101
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/JMeterPropertySchemaUnchecked.kt
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+/**
+ * Annotation that marks methods which access [TestElement] properties without verifying
+ * if the property belongs to the test element or not.
+ * Prefer using
+ *    testElement.props[ElementClass.property] = ...
+ *    testElement.props { it[property] = ... }
+ * instead of
+ *    testElement[ElementClass.property]
+ *
+ * As the latter does not verify if testElement and ElementClass are related.
+ */
+@DslMarker
+@Retention(AnnotationRetention.BINARY)
+public annotation class JMeterPropertySchemaUnchecked()
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index ee5fd7d36ce..b8fbec60fce 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -17,9 +17,28 @@
 
 package org.apache.jmeter.testelement
 
+import org.apache.jmeter.testelement.property.BooleanProperty
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.apache.jmeter.testelement.property.DoubleProperty
+import org.apache.jmeter.testelement.property.FloatProperty
+import org.apache.jmeter.testelement.property.IntegerProperty
 import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.LongProperty
 import org.apache.jmeter.testelement.property.NullProperty
 import org.apache.jmeter.testelement.property.PropertyIterator
+import org.apache.jmeter.testelement.property.StringProperty
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.ClassPropertyDescriptor
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor
+import org.apache.jmeter.testelement.schema.DoublePropertyDescriptor
+import org.apache.jmeter.testelement.schema.FloatPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.LongPropertyDescriptor
+import org.apache.jmeter.testelement.schema.PropertiesAccessor
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
 import org.apache.jmeter.threads.JMeterContext
 import org.apiguardian.api.API
 
@@ -35,6 +54,17 @@ public interface TestElement : Cloneable {
         public const val COMMENTS: String = "TestPlan.comments" // $NON-NLS-1$
     }
 
+    public val schema: TestElementSchema
+        get() = TestElementSchema
+
+    /**
+     * Allows type-safe accessors to the properties of the current element.
+     * Note: when overriding the method, ensure you emit wildcards.
+     * For instance: [JMeterElementInstance<? extends TestPlanClass> getProps() { return ... }]
+     */
+    public val props: PropertiesAccessor<@JvmWildcard TestElement, @JvmWildcard TestElementSchema>
+        get() = PropertiesAccessor(this, schema)
+
     public fun addTestElement(child: TestElement)
 
     /**
@@ -207,6 +237,278 @@ public interface TestElement : Cloneable {
      */
     public fun getProperty(propName: String): JMeterProperty
 
+    /**
+     * Retrieve property or return `null` if the property is unset.
+     *
+     * Note: the result of the method does not account the default value,
+     * so consider using `get(PropertyDescriptor)` methods if you need
+     * to account for default values.
+     *
+     * @param propName the name of the property to get
+     * @return [JMeterProperty] or `null` if the property is unset
+     * @since 5.6
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun getPropertyOrNull(propName: String): JMeterProperty? =
+        getProperty(propName).takeIf { it !is NullProperty }
+
+    /**
+     * Retrieve property or return `null` if the property is unset.
+     *
+     * Note: the result of the method does not account the default value,
+     * so consider using `get(PropertyDescriptor)` methods if you need
+     * to account for default values.
+     *
+     * @param property descriptor of the property to retrieve
+     * @return [JMeterProperty] or `null` if the property is unset
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun getPropertyOrNull(property: PropertyDescriptor<*, *>): JMeterProperty? =
+        getPropertyOrNull(property.name)
+
+    /**
+     * Retrieve property name as string.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: StringPropertyDescriptor<*>): String =
+        getPropertyOrNull(property)?.stringValue ?: property.defaultValue ?: ""
+
+    /**
+     * Read property value as string, and return default value if the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun getString(property: PropertyDescriptor<*, *>): String =
+        getPropertyOrNull(property)?.stringValue ?: property.defaultValueAsString ?: ""
+
+    /**
+     * Set property as string, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: PropertyDescriptor<*, *>, value: String) {
+        removeOrSet(property.defaultValueAsString == value, property.name) {
+            StringProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve boolean property value.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: BooleanPropertyDescriptor<*>): Boolean =
+        getPropertyOrNull(property)?.booleanValue ?: property.defaultValue ?: false
+
+    /**
+     * Set property as boolean, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: BooleanPropertyDescriptor<*>, value: Boolean) {
+        removeOrSet(property.defaultValue == value, property.name) {
+            BooleanProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve integer property value.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: IntegerPropertyDescriptor<*>): Int =
+        getPropertyOrNull(property)?.intValue ?: property.defaultValue ?: 0
+
+    /**
+     * Set property as integer, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: IntegerPropertyDescriptor<*>, value: Int) {
+        removeOrSet(property.defaultValue == value, property.name) {
+            IntegerProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve long property value.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: LongPropertyDescriptor<*>): Long =
+        getPropertyOrNull(property)?.longValue ?: property.defaultValue ?: 0
+
+    /**
+     * Set property as long, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: LongPropertyDescriptor<*>, value: Long) {
+        removeOrSet(property.defaultValue != value, property.name) {
+            LongProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve float property value.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: FloatPropertyDescriptor<*>): Float =
+        getPropertyOrNull(property)?.floatValue ?: property.defaultValue ?: 0.0f
+
+    /**
+     * Set property as float, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: FloatPropertyDescriptor<*>, value: Float) {
+        removeOrSet(property.defaultValue != value, property.name) {
+            FloatProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve double property value.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: DoublePropertyDescriptor<*>): Double =
+        getPropertyOrNull(property)?.doubleValue ?: property.defaultValue ?: 0.0
+
+    /**
+     * Set property as double, or remove it if the given value matches the default one for the property.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: DoublePropertyDescriptor<*>, value: Double) {
+        removeOrSet(property.defaultValue != value, property.name) {
+            DoubleProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve [Class] property value, or throw [NoSuchElementException] in case the property is unset.
+     * @throws NoSuchElementException if the property is unset
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun <ValueClass : Any> get(property: ClassPropertyDescriptor<*, ValueClass>): Class<out ValueClass> =
+        getPropertyOrNull(property)?.objectValue?.let {
+            Class.forName(getString(property), false, Thread.currentThread().contextClassLoader)
+                .asSubclass(property.klass)
+        } ?: property.defaultValue
+            ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+
+    /**
+     * Set property as [Class], or remove it if the given value matches the default one for the property.
+     * The value is set as [StringProperty] with the name of the given class.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun <ValueClass : Any> set(property: ClassPropertyDescriptor<*, ValueClass>, value: Class<out ValueClass>?) {
+        removeOrSet(value == null || property.defaultValue != value, property.name) {
+            StringProperty(it, value!!.name)
+        }
+    }
+
+    /**
+     * Retrieve [TestElement] property value, or throw [NoSuchElementException] in case the property is unset.
+     * @throws NoSuchElementException if the property is unset
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun <TestElementClass : TestElement> get(
+        property: TestElementPropertyDescriptor<*, TestElementClass>
+    ): TestElementClass =
+        getPropertyOrNull(property)?.objectValue?.let { property.klass.cast(it) }
+            ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+
+    /**
+     * Retrieve [TestElement] property value, or create one and set it the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun <TestElementClass : TestElement> getOrCreate(
+        property: TestElementPropertyDescriptor<*, TestElementClass>,
+        ifMissing: () -> TestElementClass
+    ): TestElementClass =
+        getPropertyOrNull(property)?.objectValue?.let { property.klass.cast(it) }
+            ?: ifMissing().also { set(property, it) }
+
+    /**
+     * Set property as [TestElement], or remove it if the given [TestElement] is `null`.
+     * The values of collection will be converted to [JMeterProperty] as in [CollectionProperty.addItem].
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun <TestElementClass : TestElement> set(property: TestElementPropertyDescriptor<*, TestElementClass>, value: TestElementClass?) {
+        removeOrSet(value == null, property.name) {
+            TestElementProperty(it, value)
+        }
+    }
+
+    /**
+     * Retrieve [Collection] property value, or throw [NoSuchElementException] in case the property is unset.
+     * @throws NoSuchElementException if the property is unset
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun get(property: CollectionPropertyDescriptor<*>): Collection<JMeterProperty> =
+        getPropertyOrNull(property)?.let {
+            @Suppress("UNCHECKED_CAST")
+            (it as CollectionProperty).objectValue as Collection<JMeterProperty>
+        } ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+
+    /**
+     * Retrieve [Collection] property value, or create one and set it the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun getOrCreate(
+        property: CollectionPropertyDescriptor<*>,
+        ifMissing: () -> Collection<JMeterProperty>
+    ): Collection<JMeterProperty> =
+        getPropertyOrNull(property)?.let {
+            @Suppress("UNCHECKED_CAST")
+            (it as CollectionProperty).objectValue as Collection<JMeterProperty>
+        } ?: ifMissing().also { set(property, it) }
+
+    /**
+     * Set property as [Collection], or remove it if the given [Collection] is `null`.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public operator fun set(property: CollectionPropertyDescriptor<*>, value: Collection<*>?) {
+        removeOrSet(value == null, property.name) {
+            CollectionProperty(it, value)
+        }
+    }
+
     /**
      * Get a Property Iterator for the TestElements properties.
      *
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
new file mode 100644
index 00000000000..0557836b516
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+import org.apache.jmeter.gui.JMeterGUIComponent
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.ClassPropertyDescriptor
+import org.apache.jmeter.testelement.schema.EmptyTestElementSchema
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [TestElement].
+ * @see TestElement
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class TestElementSchema protected constructor() : EmptyTestElementSchema() {
+    public companion object INSTANCE : TestElementSchema()
+
+    public val name: StringPropertyDescriptor<TestElementSchema> =
+        string("TestElement.name")
+    public val comments: StringPropertyDescriptor<TestElementSchema> =
+        string("TestElement.comments")
+    public open val guiClass: ClassPropertyDescriptor<TestElementSchema, JMeterGUIComponent> =
+        classProperty(JMeterGUIComponent::class, "TestElement.gui_class")
+    public val testClass: ClassPropertyDescriptor<TestElementSchema, Any> =
+        classProperty(Any::class, "TestElement.testClass")
+    public val enabled: BooleanPropertyDescriptor<TestElementSchema> =
+        boolean("TestElement.enabled", default = true)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/removeOrSet.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/removeOrSet.kt
new file mode 100644
index 00000000000..0dbd0eab690
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/removeOrSet.kt
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+import org.apache.jmeter.testelement.property.JMeterProperty
+
+internal inline fun TestElement.removeOrSet(remove: Boolean, name: String, factory: (String) -> JMeterProperty) {
+    if (remove) {
+        removeProperty(name)
+    } else {
+        setProperty(factory(name))
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
new file mode 100644
index 00000000000..1e72dbbae63
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.BooleanProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [BooleanProperty]: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.boolean] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class BooleanPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Boolean?
+) : PropertyDescriptor<Schema, Boolean> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "BooleanPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Boolean =
+        target[this]
+
+    public operator fun set(target: TestElement, value: Boolean) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Boolean {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Boolean) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
new file mode 100644
index 00000000000..ddfb0db225d
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [JMeterProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.classProperty] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class ClassPropertyDescriptor<in Schema : TestElementSchema, ValueClass : Any>(
+    public val klass: Class<ValueClass>,
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Class<ValueClass>? = null
+) : PropertyDescriptor<Schema, Class<ValueClass>> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override val defaultValueAsString: String?
+        get() = defaultValue?.name
+
+    override fun toString(): String = "ClassPropertyDescriptor(name='$name', klass='$klass', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Class<out ValueClass> =
+        target[this]
+
+    public operator fun set(target: TestElement, klass: Class<out ValueClass>?) {
+        target[this] = klass
+    }
+
+    public operator fun set(target: TestElement, klass: KClass<out ValueClass>?) {
+        set(target, klass?.java)
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Class<out ValueClass> {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Class<out ValueClass>?) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
new file mode 100644
index 00000000000..d1f0e1ffdda
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [CollectionProperty]: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.collection] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class CollectionPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+) : PropertyDescriptor<Schema, Collection<JMeterProperty>> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    public override val defaultValue: Collection<JMeterProperty>? = null
+
+    override fun toString(): String = "CollectionPropertyDescriptor(name='$name')"
+
+    /**
+     * Retrieve [Collection] property value, or throw [NoSuchElementException] in case the property is unset.
+     * @throws NoSuchElementException if the property is unset
+     */
+    public operator fun get(target: TestElement): Collection<JMeterProperty> =
+        target[this]
+
+    /**
+     * Retrieve [Collection] property value, or create one and set it the property is unset.
+     */
+    public fun getOrCreate(target: TestElement, ifMissing: () -> Collection<JMeterProperty>): Collection<JMeterProperty> =
+        target.getOrCreate(this, ifMissing)
+
+    public operator fun set(target: TestElement, value: Collection<*>?) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Collection<JMeterProperty> {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Collection<JMeterProperty>) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
new file mode 100644
index 00000000000..1378480342d
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.DoubleProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [DoubleProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.double] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class DoublePropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Double?
+) : PropertyDescriptor<Schema, Double> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "DoublePropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Double =
+        target[this]
+
+    public operator fun set(target: TestElement, value: Double) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Double {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Double) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt
new file mode 100644
index 00000000000..a75fcda25f3
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apiguardian.api.API
+import kotlin.reflect.KClass
+
+/**
+ * Describes properties available for configuration of well-known [TestElement].
+ * Style guide:
+ * * avoid using "is" prefixes. The properties are declare [PropertyDescriptor] rather than property itself,
+ *   so "is" is not needed
+ * * declare default value when declaring a property. It would help users.
+ *
+ * TODO: decide if boolean, int, long, etc values must always have a default
+ *
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class EmptyTestElementSchema {
+    private val propertyDescriptors: MutableMap<String, PropertyDescriptor<*, *>> = mutableMapOf()
+
+    public val properties: Map<String, PropertyDescriptor<*, *>> = propertyDescriptors
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> string(
+        name: String,
+        default: String? = null
+    ): StringPropertyDescriptor<Schema> =
+        StringPropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+
+    protected fun <Schema : TestElementSchema, ValueClass : Any> classProperty(
+        klass: KClass<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor<Schema, ValueClass> =
+        classProperty(klass.java, name)
+
+    protected fun <Schema : TestElementSchema, ValueClass : Any> classProperty(
+        klass: Class<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor<Schema, ValueClass> =
+        ClassPropertyDescriptor<Schema, ValueClass>(klass, name).also {
+            propertyDescriptors[name] = it
+        }
+
+    protected inline fun <Schema : TestElementSchema, reified TestElementClass : TestElement> testElement(
+        name: String
+    ): TestElementPropertyDescriptor<Schema, TestElementClass> =
+        testElement(TestElementClass::class.java, name)
+
+    protected fun <Schema : TestElementSchema, TestElementClass : TestElement> testElement(
+        klass: Class<TestElementClass>,
+        name: String
+    ): TestElementPropertyDescriptor<Schema, TestElementClass> =
+        TestElementPropertyDescriptor<Schema, TestElementClass>(klass, name).also {
+            propertyDescriptors[name] = it
+        }
+
+    protected fun <Schema : TestElementSchema, ValueClass : Any> collection(
+        klass: Class<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor<Schema, ValueClass> =
+        ClassPropertyDescriptor<Schema, ValueClass>(klass, name).also {
+            propertyDescriptors[name] = it
+        }
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> boolean(
+        name: String,
+        default: Boolean? = null
+    ): BooleanPropertyDescriptor<Schema> =
+        BooleanPropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> integer(
+        name: String,
+        default: Int? = null
+    ): IntegerPropertyDescriptor<Schema> =
+        IntegerPropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> long(
+        name: String,
+        default: Long? = null
+    ): LongPropertyDescriptor<Schema> =
+        LongPropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> float(
+        name: String,
+        default: Float? = null
+    ): FloatPropertyDescriptor<Schema> =
+        FloatPropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+
+    @JvmOverloads
+    protected fun <Schema : TestElementSchema> double(
+        name: String,
+        default: Double? = null
+    ): DoublePropertyDescriptor<Schema> =
+        DoublePropertyDescriptor<Schema>(name, default).also {
+            propertyDescriptors[name] = it
+        }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
new file mode 100644
index 00000000000..ec8a9c4b818
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.FloatProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [FloatProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.float] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class FloatPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Float?
+) : PropertyDescriptor<Schema, Float> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "FloatPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Float =
+        target[this]
+
+    public operator fun set(target: TestElement, value: Float) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Float {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Float) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
new file mode 100644
index 00000000000..185c715b967
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.IntegerProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [IntegerProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.integer] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class IntegerPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Int?
+) : PropertyDescriptor<Schema, Int> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "IntegerPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Int =
+        target[this]
+
+    public operator fun set(target: TestElement, value: Int) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Int {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Int) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
new file mode 100644
index 00000000000..7d32ca41636
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.LongProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [LongProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.long] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class LongPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: Long?
+) : PropertyDescriptor<Schema, Long> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "LongPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): Long =
+        target[this]
+
+    public operator fun set(target: TestElement, value: Long) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Long {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Long) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
new file mode 100644
index 00000000000..a255b5e23bb
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
@@ -0,0 +1,298 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.reflect.KClass
+
+/**
+ * Enables type-safe access to [TestElement] properties.
+ * For instance:
+ *     testPlan.props[TestPlanClass.serializeThreadGroups] // succeeds
+ *     testPlan.props[{ serializeThreadGroups }] // succeeds
+ *     httpSampler.props[TestPlanClass.serializeThreadGroups] // fails as HTTP Sampler is not related to TestPlanClass
+ *     httpSampler.props[{ enabled }] // succeeds since "enabled" property exists in the superclass of HTTP Sampler
+ *
+ * If you need configuring several properties, you might use `element.props { ... }` syntax:
+ *
+ *     testPlan.props {
+ *         it[serializeThreadGroups] = true
+ *         it[enabled] = false
+ *     }
+ *
+ * The same in Java would be
+ *    testPlan.getProps().invoke((it, schema) -> {
+ *      it.set(schema.getSerializeThreadGroups(), true);
+ *      it.set(schema.getEnabled(), false);
+ *    });
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class PropertiesAccessor<out TestElementClass : TestElement, out Schema : TestElementSchema>(
+    public val target: TestElementClass,
+    public val schema: Schema
+) {
+    /**
+     * This interface makes `invoke` function easier to use from Java.
+     * ` -> Unit` functions require to return `Unit.INSTANCE` from Java,
+     * so we add an interface
+     */
+    public fun interface InstanceConfigurator<in TestElementClass : TestElement, in Schema : TestElementSchema> {
+        public fun configure(testElement: PropertiesAccessor<TestElementClass, Schema>, klass: Schema)
+    }
+
+    /**
+     * Function types are idiomatic in Kotlin, however they require `return Unit.INSTANCE` in Java,
+     * so we hide the method from Java.
+     */
+    @JvmSynthetic
+    public inline operator fun invoke(body: Schema.(PropertiesAccessor<TestElementClass, Schema>) -> Unit) {
+        body(schema, this)
+    }
+
+    /**
+     * Function types are idiomatic in Kotlin, however they require `return Unit.INSTANCE` in Java,
+     * so we hide the method from Java.
+     * This is not intended to be used from Kotlin, however, there's no way to easily prevent it.
+     * @see [KT-36439](https://youtrack.jetbrains.com/issue/KT-36439/PlatformOnly-annotation-to-hide-symbols-from-Kotlin)
+     */
+    public fun invoke(body: InstanceConfigurator<TestElementClass, Schema>) {
+        body.configure(this, schema)
+    }
+
+    // All properties can be removed
+    public fun remove(property: PropertyDescriptor<Schema, *>) {
+        target.removeProperty(property.name)
+    }
+
+    // All properties can be set as strings
+    public operator fun set(property: PropertyDescriptor<Schema, *>, value: String) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> PropertyDescriptor<Schema, *>,
+        value: String
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    public fun getString(property: PropertyDescriptor<Schema, *>): String =
+        property.getString(target)
+
+    public inline fun getString(propertySelector: Schema.() -> PropertyDescriptor<Schema, *>): String =
+        propertySelector(schema).getString(target)
+
+    /**
+     * Returns a property or null if it is not set.
+     */
+    public fun getPropertyOrNull(property: PropertyDescriptor<Schema, *>): JMeterProperty? =
+        target.getPropertyOrNull(property)
+
+    // Boolean properties
+    public operator fun get(property: BooleanPropertyDescriptor<Schema>): Boolean =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> BooleanPropertyDescriptor<Schema>): Boolean =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: BooleanPropertyDescriptor<Schema>, value: Boolean) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> BooleanPropertyDescriptor<Schema>,
+        value: Boolean
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // String properties
+    public operator fun get(property: StringPropertyDescriptor<Schema>): String =
+        property.getString(target)
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> StringPropertyDescriptor<Schema>): String =
+        propertySelector(schema).getString(target)
+
+    // Class properties
+    public operator fun <ValueClass : Any> get(property: ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public operator fun <ValueClass : Any> get(propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+        get(propertySelector(schema))
+
+    public operator fun <ValueClass : Any> set(
+        property: ClassPropertyDescriptor<Schema, ValueClass>,
+        value: KClass<out ValueClass>
+    ) {
+        target[property] = value.java
+    }
+
+    public inline operator fun <ValueClass : Any> set(
+        propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>,
+        value: KClass<ValueClass>
+    ) {
+        set(propertySelector, value.java)
+    }
+
+    public operator fun <ValueClass : Any> set(
+        property: ClassPropertyDescriptor<Schema, ValueClass>,
+        value: Class<out ValueClass>
+    ) {
+        target[property] = value
+    }
+
+    public inline operator fun <ValueClass : Any> set(
+        propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>,
+        value: Class<ValueClass>
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // Integer properties
+    public operator fun get(property: IntegerPropertyDescriptor<Schema>): Int =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> IntegerPropertyDescriptor<Schema>): Int =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: IntegerPropertyDescriptor<Schema>, value: Int) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> IntegerPropertyDescriptor<Schema>,
+        value: Int
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // Long properties
+    public operator fun get(property: LongPropertyDescriptor<Schema>): Long =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> LongPropertyDescriptor<Schema>): Long =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: LongPropertyDescriptor<Schema>, value: Long) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> LongPropertyDescriptor<Schema>,
+        value: Long
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // Float properties
+    public operator fun get(property: FloatPropertyDescriptor<Schema>): Float =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> FloatPropertyDescriptor<Schema>): Float =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: FloatPropertyDescriptor<Schema>, value: Float) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> FloatPropertyDescriptor<Schema>,
+        value: Float
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // Double properties
+    public operator fun get(property: DoublePropertyDescriptor<Schema>): Double =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> DoublePropertyDescriptor<Schema>): Double =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: DoublePropertyDescriptor<Schema>, value: Double) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> DoublePropertyDescriptor<Schema>,
+        value: Double
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // TestElement properties
+    public operator fun <ValueClass : TestElement> get(property: TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun <ValueClass : TestElement> get(propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+        target[propertySelector(schema)]
+
+    public operator fun <ValueClass : TestElement> set(
+        property: TestElementPropertyDescriptor<Schema, ValueClass>,
+        value: ValueClass
+    ) {
+        target[property] = value
+    }
+
+    public inline operator fun <ValueClass : TestElement> set(
+        propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>,
+        value: ValueClass
+    ) {
+        target[propertySelector(schema)] = value
+    }
+
+    // Collection properties
+    public operator fun get(property: CollectionPropertyDescriptor<Schema>): Collection<JMeterProperty> =
+        target[property]
+
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline operator fun get(propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>): Collection<JMeterProperty> =
+        target[propertySelector(schema)]
+
+    public operator fun set(property: CollectionPropertyDescriptor<Schema>, value: Collection<*>) {
+        target[property] = value
+    }
+
+    public inline operator fun set(
+        propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>,
+        value: Collection<*>
+    ) {
+        target[propertySelector(schema)] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
new file mode 100644
index 00000000000..569622b7565
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.JMeterPropertySchemaUnchecked
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apiguardian.api.API
+import java.io.Serializable
+
+/**
+ * Describes a [JMeterProperty]: name, default value, and provides accessors for properties.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public interface PropertyDescriptor<in Schema : TestElementSchema, Value> : Serializable {
+    public val name: String
+    public val defaultValue: Value?
+
+    public val defaultValueAsString: String?
+        get() = defaultValue?.toString()
+
+    @JMeterPropertySchemaUnchecked
+    public fun remove(target: TestElement) {
+        target.removeProperty(name)
+    }
+
+    public operator fun set(target: TestElement, value: String) {
+        target[this] = value
+    }
+
+    public fun getString(target: TestElement): String =
+        target.getString(this)
+
+    public val asString: StringPropertyDescriptor<Schema>
+        get() = if (this is StringPropertyDescriptor) this else StringPropertyDescriptor(name, defaultValueAsString)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
new file mode 100644
index 00000000000..cc7c0467f1b
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.StringProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [StringProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.string] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class StringPropertyDescriptor<in Schema : TestElementSchema>(
+    public override val name: String,
+    /** Default value, null means there's no default */
+    public override val defaultValue: String?
+) : PropertyDescriptor<Schema, String> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    override fun toString(): String = "StringPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
+
+    public operator fun get(target: TestElement): String =
+        target[this]
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): String {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: String) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
new file mode 100644
index 00000000000..75b26c3c757
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KProperty
+
+/**
+ * Describes a [TestElementProperty] that contains class reference: name, default value, and provides accessors for properties.
+ * Use [EmptyTestElementSchema.testElement] for building the property descriptors.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class TestElementPropertyDescriptor<in Schema : TestElementSchema, TestElementClass : TestElement>(
+    public val klass: Class<TestElementClass>,
+    public override val name: String,
+) : PropertyDescriptor<Schema, Class<TestElementClass>> {
+    private companion object {
+        private const val serialVersionUID: Long = 1
+    }
+
+    /** Test Elements have no default values */
+    public override val defaultValue: Class<TestElementClass>? = null
+
+    override fun toString(): String = "TestElementPropertyDescriptor(name='$name', klass='$klass')"
+
+    /**
+     * Retrieve [TestElement] property value, or throw [NoSuchElementException] in case the property is unset.
+     * @throws NoSuchElementException if the property is unset
+     */
+    public operator fun get(target: TestElement): TestElementClass =
+        target[this]
+
+    /**
+     * Retrieve [TestElement] property value, or create one and set it the property is unset.
+     * @since 5.6
+     */
+    public fun getOrCreate(target: TestElement, ifMissing: () -> TestElementClass): TestElementClass =
+        target.getOrCreate(this, ifMissing)
+
+    public operator fun set(target: TestElement, value: TestElementClass?) {
+        target[this] = value
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): TestElementClass {
+        return testElement[this]
+    }
+
+    @JvmSynthetic
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: TestElementClass?) {
+        testElement[this] = value
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
new file mode 100644
index 00000000000..deb63264935
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.apache.jmeter.control.gui.TestPlanGui
+import org.apache.jmeter.testelement.AbstractTestElement
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.PropertiesAccessor
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+
+class JMeterElementSchemaTest {
+    open class WarpDriveElementSchema : TestElementSchema() {
+        companion object INSTANCE : WarpDriveElementSchema()
+
+        val warpFactor = integer<WarpDriveElementSchema>("WarpDriveElement.warpFactor", default = 7)
+    }
+
+    open class WarpDriveElement : AbstractTestElement() {
+        override val schema: WarpDriveElementSchema
+            get() = WarpDriveElementSchema
+        override val props: PropertiesAccessor<WarpDriveElement, WarpDriveElementSchema>
+            get() = PropertiesAccessor(this, schema)
+    }
+
+    @Test
+    fun `getPropertyOrNull returns null for unset props`() {
+        val warpDrive = WarpDriveElement()
+        assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.warpFactor)) {
+            "${WarpDriveElementSchema.warpFactor} should be null for newly created element, getPropertyOrNull(PropertyDescriptor)"
+        }
+        assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.warpFactor.name)) {
+            "${WarpDriveElementSchema.warpFactor} should be null for newly created element, getPropertyOrNull(String)"
+        }
+    }
+
+    @Test
+    fun `get returns default value`() {
+        val warpDrive = WarpDriveElement()
+        assertGetWarpFactor(7, warpDrive, "element is empty, so default value expected")
+    }
+
+    @Test
+    fun `set modifies value`() {
+        val warpDrive = WarpDriveElement()
+        warpDrive[warpDrive.schema.warpFactor] = 8
+
+        assertGetWarpFactor(8, warpDrive, "value was modified with [warpFactor] = 8")
+    }
+
+    @Test
+    fun `props set modifies value`() {
+        val warpDrive = WarpDriveElement()
+        warpDrive.props {
+            it[warpFactor] = 8
+        }
+
+        assertGetWarpFactor(8, warpDrive, "value was modified with props { it[warpFactor] = 8 }")
+    }
+
+    @Test
+    fun `test string setter`() {
+        val warpDrive = WarpDriveElement()
+        warpDrive.props {
+            it[warpFactor] = "\${hello}"
+        }
+        assertEquals("\${hello}", warpDrive.getString(warpDrive.schema.warpFactor)) {
+            "Int property should support get and set with String value for expressions purposes"
+        }
+    }
+
+    private fun assertGetWarpFactor(expected: Int, warpDrive: WarpDriveElement, message: String) {
+        assertEquals(expected, warpDrive[warpDrive.schema.warpFactor]) {
+            "get(warpFactor): ${WarpDriveElementSchema.warpFactor}, $message"
+        }
+        assertEquals(expected, warpDrive.props[ { warpDrive.schema.warpFactor }]) {
+            "props.get[{warpFactor}]: ${WarpDriveElementSchema.warpFactor}, $message"
+        }
+        assertEquals(expected.toString(), warpDrive.getString(warpDrive.schema.warpFactor)) {
+            "getString(warpFactor): ${WarpDriveElementSchema.warpFactor}, $message"
+        }
+    }
+
+    @Suppress("UNUSED_VARIABLE", "ReplaceGetOrSet")
+    fun `compilation succeeds`() {
+        // Below code does not make much sense, and it tests different styles of using the properties
+        lateinit var base: TestElement
+        lateinit var warpDrive: WarpDriveElement
+
+        base.props {
+            it[name] = "test"
+            // Does not compile
+            // it[WarpDriveElementSchema.warpFactor] = ""
+        }
+        warpDrive.props[WarpDriveElementSchema.warpFactor] = 8
+        warpDrive.props[WarpDriveElementSchema.name] = "true"
+        warpDrive.props[ { name }] = "true"
+        warpDrive.props.set({ warpFactor }, "true")
+
+        warpDrive.props {
+            it[warpFactor] = 5
+            it[name] = "test"
+        }
+
+        warpDrive.props[WarpDriveElementSchema.guiClass] = TestPlanGui::class
+        warpDrive.props[WarpDriveElementSchema.guiClass] = TestPlanGui::class.java
+        val gc = warpDrive.props[WarpDriveElementSchema.guiClass]
+        // ok: can't pass non-GUI class to guiClass property
+        // warpDrive.props[WarpDriveElementSchema.guiClass] = WarpDriveElement::class
+        val x: Int = warpDrive.props[WarpDriveElementSchema.warpFactor]
+        val y: Int = warpDrive.props[ { warpFactor }]
+        val z: String = warpDrive.props[WarpDriveElementSchema.name]
+
+        WarpDriveElementSchema.guiClass.getString(warpDrive)
+        val guiClassAsString1 = warpDrive.props.getString { guiClass }
+        val guiClassAsString2 = warpDrive.props.getString(WarpDriveElementSchema.guiClass)
+
+        // ok: Fails to compile since TestElement does not have WarpDriveElement::warpFactor property
+        // base.props[WarpDriveElement.warpFactor] = "true"
+        base.props[WarpDriveElementSchema.name] = "true"
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e0be23c383e..78b5614d5c9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -119,6 +119,7 @@ Summary
   <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
   <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
   <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
+  <li><pr>5944</pr>Add PI for declaring <code>TestElement</code> schemas so element properties are easier to access in code (see <code>TestElementSchema</code>, <code>TestElement#getSchema()</code>, <code>TestElement#getProps()</code>)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 9e1582536d4b77c132ce33ce14d302c2f65e0b8c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 13:37:40 +0300
Subject: [PATCH 0513/1037] feat: introduce PropertyTransformer interface
 instead of ValueTransformer

The existing ValueTransformer includes "master function" and "variables"
that make no sense for most transformers.

The old interface is kept for backward compatibility
---
 .../engine/util/AbstractTransformer.java      |   1 +
 .../util/ReplaceStringWithFunctions.java      |   2 +
 .../jmeter/engine/util/ValueReplacer.java     |   9 +-
 .../jmeter/engine/util/ValueTransformer.java  |  17 ++-
 .../engine/util/DeepPropertyTransformer.kt    | 105 ++++++++++++++++++
 .../jmeter/engine/util/PropertyTransformer.kt |  31 ++++++
 .../util/TestElementPropertyTransformer.kt    |  44 ++++++++
 .../util/TransformStringsIntoFunctions.kt     |  53 +++++++++
 .../apache/jmeter/engine/util/AssertionsKt.kt |  29 +++++
 .../util/DeepPropertyTransformerTest.kt       |  41 +++++++
 .../util/TransformStringsIntoFunctionsTest.kt |  53 +++++++++
 .../jmeter/engine/util/UseFunctionsTest.kt    |  82 ++++++++++++++
 12 files changed, 461 insertions(+), 6 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformer.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/engine/util/PropertyTransformer.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/engine/util/TestElementPropertyTransformer.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctions.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/engine/util/AssertionsKt.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformerTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctionsTest.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java
index 0d00e6d7c0c..64cd33306da 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java
@@ -19,6 +19,7 @@
 
 import java.util.Map;
 
+@SuppressWarnings("deprecation")
 abstract class AbstractTransformer implements ValueTransformer {
 
     private CompoundVariable masterFunction;
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
index 11ce879a0f8..0d79d26a218 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
@@ -27,6 +27,8 @@
  * Replaces a String containing functions with their Function properties equivalent, example:
  * ${__time()}_${__threadNum()}_${__machineName()} will become a FunctionProperty of
  * a CompoundVariable containing  3 functions
+ * @see TransformStringsIntoFunctions
+ * @see TestElementPropertyTransformer#USE_FUNCTIONS
  */
 public class ReplaceStringWithFunctions extends AbstractTransformer {
     public ReplaceStringWithFunctions(CompoundVariable masterFunction, Map<String, String> variables) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
index dab214267b3..42d37651f7c 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
@@ -151,11 +151,10 @@ public void addVariables(Map<String, String> vars) {
      * {@link org.apache.jmeter.testelement.property.FunctionProperty} of
      * a {@link CompoundVariable} containing three functions
      * @param iter the {@link PropertyIterator} over all properties, in which the values should be replaced
-     * @param transform the {@link ValueTransformer}, that should do transformation
+     * @param transform the {@link PropertyTransformer}, that should do transformation
      * @return a new {@link Collection} with all the transformed {@link JMeterProperty}s
-     * @throws InvalidVariableException when <code>transform</code> throws an {@link InvalidVariableException} while transforming a value
      */
-    private static Collection<JMeterProperty> replaceValues(PropertyIterator iter, ValueTransformer transform) throws InvalidVariableException {
+    private static Collection<JMeterProperty> replaceValues(PropertyIterator iter, PropertyTransformer transform) {
         List<JMeterProperty> props = new ArrayList<>();
         while (iter.hasNext()) {
             JMeterProperty val = iter.next();
@@ -166,11 +165,11 @@ private static Collection<JMeterProperty> replaceValues(PropertyIterator iter, V
                 // Must not convert TestElement.gui_class etc
                 if (!val.getName().equals(TestElement.GUI_CLASS) &&
                         !val.getName().equals(TestElement.TEST_CLASS)) {
-                    val = transform.transformValue(val);
+                    val = transform.transform(val);
                     log.debug("Replacement result: {}", val);
                 }
             } else if (val instanceof NumberProperty) {
-                val = transform.transformValue(val);
+                val = transform.transform(val);
                 log.debug("Replacement result: {}", val);
             } else if (val instanceof MultiProperty) {
                 MultiProperty multiVal = (MultiProperty) val;
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java
index 0792990e9ee..d139ceccfa7 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java
@@ -21,8 +21,23 @@
 
 import org.apache.jmeter.functions.InvalidVariableException;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apiguardian.api.API;
+
+/**
+ * @deprecated use {@link PropertyTransformer} instead
+ */
+@Deprecated
+@API(status = API.Status.DEPRECATED, since = "5.6")
+interface ValueTransformer extends PropertyTransformer {
+    @Override
+    default JMeterProperty transform(JMeterProperty input) {
+        try {
+            return transformValue(input);
+        } catch (InvalidVariableException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-interface ValueTransformer {
     /**
      * Transform the given property and return the new version.
      *
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformer.kt b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformer.kt
new file mode 100644
index 00000000000..48eab568ac2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformer.kt
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.MultiProperty
+import org.apiguardian.api.API
+import org.slf4j.LoggerFactory
+
+/**
+ * Transforms [JMeterProperty] and including the contents of [MultiProperty].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class DeepPropertyTransformer(
+    private val simpleTransformer: PropertyTransformer
+) : PropertyTransformer {
+    private companion object {
+        private val log = LoggerFactory.getLogger(DeepPropertyTransformer::class.java)
+    }
+
+    override fun transform(input: JMeterProperty): JMeterProperty {
+        log.debug("Processing property {}", input)
+
+        return when (input) {
+            is MultiProperty ->
+                processMultiProperty(input) ?: input
+
+            else ->
+                simpleTransformer.transform(input)
+        }
+    }
+
+    /**
+     * Transforms a [MultiProperty]. Currently, there's no way to "clone MultiProperty with new values",
+     * so we use old approach of "clear and add all values again".
+     * @return the modified property or null if no modifications were made
+     */
+    private fun processMultiProperty(input: MultiProperty): MultiProperty? {
+        // TODO move this to JMeterProperty.accept(visitor) returns JMeter Property
+        // so we can avoid mutating the properties in-place
+        // Modifying input property makes it harder to understand if it was modified or not
+        return getNewPropsOrNull(input)?.let { props ->
+            log.debug("About to replace values in MultiProperty {} with new ones: {}", input, props)
+            input.clear()
+            for (prop in props) {
+                input.addProperty(prop)
+            }
+            input
+        }
+    }
+
+    /**
+     * Return the new list of transformed properties, or null if no transformations were made.
+     */
+    private fun getNewPropsOrNull(
+        input: MultiProperty,
+    ): MutableList<JMeterProperty>? {
+        // We don't know if there will be transformations, so we need to store
+        // all the properties.
+        val props = mutableListOf<JMeterProperty>()
+        var hasTransformations = false
+        val it = input.iterator()
+        while (it.hasNext()) {
+            val property = it.next()
+
+            // MultiProperty is replaced in-place, so we ask the function to set hasModifications flag on changes
+            val newValue = when (property) {
+                is MultiProperty -> {
+                    val res = processMultiProperty(property)
+                    res?.also { hasTransformations = true } ?: property
+                }
+
+                else ->
+                    when (property.name) {
+                        // Avoid replacing vital properties
+                        TestElement.GUI_CLASS, TestElement.TEST_CLASS -> property
+                        else -> transform(property)
+                    }
+            }
+            if (property !== newValue) {
+                // If the value is different, it was transformed
+                hasTransformations = true
+            }
+            props.add(newValue)
+        }
+        return props.takeIf { hasTransformations }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/engine/util/PropertyTransformer.kt b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/PropertyTransformer.kt
new file mode 100644
index 00000000000..d3e46d5017b
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/PropertyTransformer.kt
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+
+/**
+ * Transform [JMeterProperty] into a different [JMeterProperty].
+ * The transformer should not modify the source property.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public fun interface PropertyTransformer {
+    public fun transform(input: JMeterProperty): JMeterProperty
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TestElementPropertyTransformer.kt b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TestElementPropertyTransformer.kt
new file mode 100644
index 00000000000..3aa8a13fb74
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TestElementPropertyTransformer.kt
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apiguardian.api.API
+
+/**
+ * Transforms properties of the input [TestElement] with given [PropertyTransformer].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class TestElementPropertyTransformer(
+    propertyTransformer: PropertyTransformer
+) {
+    public companion object {
+        @JvmField
+        public val USE_FUNCTIONS: TestElementPropertyTransformer =
+            TestElementPropertyTransformer(TransformStringsIntoFunctions)
+    }
+
+    private val transformer = DeepPropertyTransformer(propertyTransformer)
+
+    public fun visit(testElement: TestElement) {
+        // For now, DeepPropertyTransformer mutates MultiProperties inplace, so
+        transformer.transform(TestElementProperty("temp", testElement))
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctions.kt b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctions.kt
new file mode 100644
index 00000000000..8498efc5321
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctions.kt
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.FunctionProperty
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.StringProperty
+import org.apiguardian.api.API
+
+/**
+ * Converts a [StringProperty] containing functions to the corresponding [FunctionProperty] equivalent, example:
+ * ${__time()}_${__threadNum()}_${__machineName()} will become a FunctionProperty of
+ * a [CompoundVariable] containing  3 functions.
+ *
+ * Note: this implementation does not convert nested properties, use [TestElementPropertyTransformer.USE_FUNCTIONS]
+ * if you need process all properties of a [TestElement].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public object TransformStringsIntoFunctions : PropertyTransformer {
+    private val parser = CompoundVariable()
+
+    override fun transform(input: JMeterProperty): JMeterProperty {
+        if (input !is StringProperty) {
+            return input
+        }
+        synchronized(parser) {
+            // TODO: move parsing logic out of CompoundVariable
+            parser.clear()
+            parser.setParameters(input.stringValue)
+            if (parser.hasFunction()) {
+                return FunctionProperty(input.getName(), parser.function)
+            }
+        }
+        return input
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/AssertionsKt.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/AssertionsKt.kt
new file mode 100644
index 00000000000..10f1666ff13
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/AssertionsKt.kt
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.property.FunctionProperty
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.junit.jupiter.api.Assertions
+
+fun assertFunctionProperty(expected: String, property: JMeterProperty?, message: () -> String) {
+    Assertions.assertInstanceOf(FunctionProperty::class.java, property) {
+        message() + ", got $property"
+    }
+    Assertions.assertEquals(expected, property?.stringValue)
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformerTest.kt
new file mode 100644
index 00000000000..1ca9065a9f4
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/DeepPropertyTransformerTest.kt
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class DeepPropertyTransformerTest {
+    @Test
+    fun collection() {
+        val input = CollectionProperty(
+            "collection_prop",
+            mutableListOf("test", "\${variable}", "test")
+        )
+
+        val output = DeepPropertyTransformer(TransformStringsIntoFunctions).transform(input)
+        Assertions.assertInstanceOf(CollectionProperty::class.java, output) {
+            "DeepPropertyTransformer(TransformStringsIntoFunctions).transform($input)"
+        }
+        output as CollectionProperty
+        assertFunctionProperty("\${variable}", output[1]) {
+            "DeepPropertyTransformer(TransformStringsIntoFunctions).transform($input)[1]"
+        }
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctionsTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctionsTest.kt
new file mode 100644
index 00000000000..822d9872796
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/TransformStringsIntoFunctionsTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.property.StringProperty
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertSame
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
+
+class TransformStringsIntoFunctionsTest {
+    @Test
+    fun `no modifications`() {
+        val input = StringProperty("not_modified_property", "original value")
+        val output = TransformStringsIntoFunctions.transform(input)
+        assertAll(
+            {
+                assertSame(input, output) {
+                    "TransformStringsIntoFunctions should return input value when no modifications happen"
+                }
+            },
+            {
+                assertEquals("original value", input.stringValue) {
+                    "TransformStringsIntoFunctions should not modify the input value"
+                }
+            },
+        )
+    }
+
+    @Test
+    fun `with functions`() {
+        val input = StringProperty("modified_property", "\${variable}")
+        val output = TransformStringsIntoFunctions.transform(input)
+        assertFunctionProperty("\${variable}", output) {
+            "TransformStringsIntoFunctions.transform($input)"
+        }
+    }
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
new file mode 100644
index 00000000000..fdc240634e5
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.engine.util
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertInstanceOf
+import org.junit.jupiter.api.Test
+
+/**
+ * Verifies [TestElementPropertyTransformer.USE_FUNCTIONS].
+ */
+class UseFunctionsTest {
+
+    @Test
+    fun `property replaces with function`() {
+        val input = TestPlan().apply {
+            props {
+                it[enabled] = "\${test}"
+            }
+        }
+
+        TestElementPropertyTransformer.USE_FUNCTIONS.visit(input)
+
+        val output = input.props.getPropertyOrNull(input.schema.enabled)
+        assertFunctionProperty("\${test}", output) {
+            "TestElementPropertyTransformer.USE_FUNCTIONS($input)"
+        }
+    }
+
+    @Test
+    fun `nested collection property replaces with function`() {
+        val sampleProp = CollectionPropertyDescriptor<TestElementSchema>("test.prop")
+
+        val input = TestPlan().apply {
+            props {
+                it[sampleProp] = mutableListOf(mutableListOf("\${test}"))
+            }
+        }
+
+        TestElementPropertyTransformer.USE_FUNCTIONS.visit(input)
+
+        val output = input.props[ { sampleProp }]
+
+        // These assertions verify CollectionProperty behavior rather than USE_FUNCTIONS behavior
+        // However, we can't extract deeply-nested item right away
+        assertEquals(1, output.size) {
+            "size of first level collection should be 1, actual: $output"
+        }
+        val nested = output.first()
+        assertInstanceOf(CollectionProperty::class.java, nested) {
+            "element of the top-level collection should be CollectionProperty as well, got $nested"
+        }
+        nested as CollectionProperty
+        assertEquals(1, nested.size()) {
+            "size of the nested collection should be 1, actual: $nested"
+        }
+
+        // Now is the real test:
+        assertFunctionProperty("\${test}", nested.get(0)) {
+            "the first element of collection $nested"
+        }
+    }
+}

From 0ab4bb00723232ce99b97ecc87134317df6b9907 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 26 May 2023 17:05:17 +0300
Subject: [PATCH 0514/1037] feat: Enable usage of ${...} expressions for
 checkbox controls

The checkbox can be converted to an editable field by calling a context menu:
* right-click on the checkbox
* or press shift+F10

The editable box converts back to a checkbox if you select "true" or "false"

Fixes https://github.com/apache/jmeter/issues/1252
See https://github.com/apache/jmeter/pull/5761
---
 .../jmeter/gui/JBooleanPropertyEditor.kt      |  79 +++++++
 .../jmeter/resources/messages.properties      |   1 +
 .../jmeter/resources/messages_fr.properties   |   1 +
 .../java/org/apache/jorphan/gui/JFactory.java |   6 +
 ...rdLayoutWithSizeOfCurrentVisibleElement.kt |  50 +++++
 .../apache/jorphan/gui/JEditableCheckBox.kt   | 201 ++++++++++++++++++
 xdocs/changes.xml                             |   1 +
 7 files changed, 339 insertions(+)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
new file mode 100644
index 00000000000..3ff38b33b26
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.BooleanProperty
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.util.JMeterUtils
+import org.apache.jorphan.gui.JEditableCheckBox
+import org.apiguardian.api.API
+
+/**
+ * Provides editor component for boolean properties that accommodate both true/false and expression string.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class JBooleanPropertyEditor(
+    private val propertyDescriptor: BooleanPropertyDescriptor<*>,
+    label: String,
+) : JEditableCheckBox(label, DEFAULT_CONFIGURATION) {
+    private companion object {
+        @JvmField
+        val DEFAULT_CONFIGURATION: Configuration = Configuration(
+            startEditing = JMeterUtils.getResString("editable_checkbox.use_expression"),
+            trueValue = "true",
+            falseValue = "false",
+            extraValues = listOf(
+                "\${__P(property_name)}",
+                "\${variable_name}",
+            )
+        )
+    }
+
+    public fun reset() {
+        value = Value.of(propertyDescriptor.defaultValue ?: false)
+    }
+
+    /**
+     * Update [TestElement] based on the state of the UI.
+     * TODO: we might better use PropertiesAccessor<TestElement, ElementSchema>
+     *     However, it would require callers to pass element.getProps() which might allocate.
+     * @param testElement element to update
+     */
+    public fun updateElement(testElement: TestElement) {
+        when (val value = value) {
+            is Value.Boolean -> testElement[propertyDescriptor] = value.value
+            is Value.Text -> testElement[propertyDescriptor] = value.value
+        }
+    }
+
+    /**
+     * Update UI based on the state of the given [TestElement].
+     * TODO: we might better use PropertiesAccessor<TestElement, ElementSchema>
+     *     However, it would require callers to pass element.getProps() which might allocate.
+     * @param testElement element to get the state from
+     */
+    public fun updateUi(testElement: TestElement) {
+        value = when (val value = testElement.getPropertyOrNull(propertyDescriptor)) {
+            is BooleanProperty, null -> Value.of(value?.booleanValue ?: propertyDescriptor.defaultValue ?: false)
+            // TODO: should we rather fail in case we detect an unknown property?
+            else -> Value.Text(value.stringValue)
+        }
+    }
+}
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 5a37083f585..260107ae9ef 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -314,6 +314,7 @@ duration_assertion_label=Duration in milliseconds\:
 duration_assertion_title=Duration Assertion
 duration_tooltip=Elapsed time of current running Test
 edit=Edit
+editable_checkbox.use_expression=Use Expression
 email_results_title=Email Results
 en=English
 enable=Enable
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index c904d122cba..667eb598986 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -309,6 +309,7 @@ duration_assertion_label=Durée en millisecondes \:
 duration_assertion_title=Assertion Durée
 duration_tooltip=Temps passé depuis le début du test en cours
 edit=Editer
+editable_checkbox.use_expression=Utiliser l'expression
 email_results_title=Résultat d'email
 en=Anglais
 enable=Activer
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
index 3c54558d554..bafdcf13744 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/JFactory.java
@@ -107,6 +107,12 @@ public static JCheckBox small(JCheckBox component) {
         return STYLE.withFont(component, JMeterUIDefaults.CHECKBOX_SMALL_FONT);
     }
 
+    @API(since = "5.6", status = API.Status.EXPERIMENTAL)
+    public static JEditableCheckBox small(JEditableCheckBox component) {
+        component.makeSmall();
+        return component;
+    }
+
     @API(since = "5.3", status = API.Status.EXPERIMENTAL)
     public static JLabel big(JLabel component) {
         return STYLE.withFont(component, JMeterUIDefaults.LABEL_BIG_FONT);
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
new file mode 100644
index 00000000000..21101a0f570
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.gui
+
+import org.apiguardian.api.API
+import java.awt.CardLayout
+import java.awt.Container
+import java.awt.Dimension
+import java.awt.Insets
+
+/**
+ * An alternative [CardLayout] that computes the size based on the currently visible component only.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class CardLayoutWithSizeOfCurrentVisibleElement : CardLayout() {
+    override fun preferredLayoutSize(parent: Container): Dimension {
+        synchronized(parent.treeLock) {
+            val current = parent.components.firstOrNull { it.isVisible } ?: return super.preferredLayoutSize(parent)
+            return addInsets(current.preferredSize, parent.insets)
+        }
+    }
+
+    override fun minimumLayoutSize(parent: Container): Dimension {
+        synchronized(parent.treeLock) {
+            val current = parent.components.firstOrNull { it.isVisible } ?: return super.minimumLayoutSize(parent)
+            return addInsets(current.minimumSize, parent.insets)
+        }
+    }
+
+    private fun addInsets(size: Dimension, insets: Insets) = Dimension(
+        size.width + insets.left + insets.right + hgap * 2,
+        size.height + insets.top + insets.bottom + vgap * 2
+    )
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt
new file mode 100644
index 00000000000..4ca3c5f8cd1
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.gui
+
+import org.apiguardian.api.API
+import java.awt.Container
+import java.awt.FlowLayout
+import javax.swing.Box
+import javax.swing.JCheckBox
+import javax.swing.JComboBox
+import javax.swing.JLabel
+import javax.swing.JPanel
+import javax.swing.JPopupMenu
+import javax.swing.SwingUtilities
+import javax.swing.event.ChangeEvent
+
+/**
+ * A Checkbox that can be converted to an editable field and back.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class JEditableCheckBox(
+    label: String,
+    private val configuration: Configuration
+) : JPanel() {
+    public companion object {
+        public const val CHECKBOX_CARD: String = "checkbox"
+        public const val EDITABLE_CARD: String = "editable"
+    }
+
+    /**
+     * The representation of the state.
+     */
+    public sealed interface Value {
+        public companion object {
+            @JvmStatic
+            public fun of(value: kotlin.Boolean): Boolean =
+                if (value) Boolean.TRUE else Boolean.FALSE
+        }
+
+        /**
+         * The value is a checkbox.
+         */
+        public sealed interface Boolean : Value {
+            public val value: kotlin.Boolean
+
+            public object TRUE : Boolean {
+                override val value: kotlin.Boolean
+                    get() = true
+            }
+
+            public object FALSE : Boolean {
+                override val value: kotlin.Boolean
+                    get() = false
+            }
+        }
+
+        /**
+         * The value is a free text.
+         */
+        public data class Text(val value: String) : Value
+    }
+
+    /**
+     * Supplies the parameters to [JEditableCheckBox].
+     */
+    public data class Configuration(
+        /** Menu item title to "start editing" the checkbox value. */
+        val startEditing: String = "Use Expression",
+        /** The title to be used for "true" value in the checkbox. */
+        val trueValue: String = "true",
+        /** The title to be used for "false" value in the checkbox. */
+        val falseValue: String = "false",
+        /** Extra values to be added for the combobox. */
+        val extraValues: List<String> = listOf(),
+    )
+
+    private val cards = CardLayoutWithSizeOfCurrentVisibleElement()
+
+    private val checkbox: JCheckBox = JCheckBox(label).apply {
+        componentPopupMenu = JPopupMenu().apply {
+            add(configuration.startEditing).apply {
+                addActionListener {
+                    cards.next(this@JEditableCheckBox)
+                    comboBox.requestFocusInWindow()
+                }
+            }
+        }
+    }
+
+    private val comboBox: JComboBox<String> = JComboBox<String>().apply {
+        isEditable = true
+        configuration.extraValues.forEach {
+            addItem(it)
+        }
+        addItem(configuration.trueValue)
+        addItem(configuration.falseValue)
+        addActionListener {
+            val jComboBox = it.source as JComboBox<*>
+            SwingUtilities.invokeLater {
+                if (jComboBox.isPopupVisible) {
+                    return@invokeLater
+                }
+                when (val value = jComboBox.selectedItem as String) {
+                    configuration.trueValue, configuration.falseValue -> {
+                        checkbox.isSelected = value == configuration.trueValue
+                        cards.show(this@JEditableCheckBox, CHECKBOX_CARD)
+                        checkbox.requestFocusInWindow()
+                    }
+                }
+            }
+        }
+    }
+
+    private val textFieldLabel = JLabel(label).apply {
+        labelFor = comboBox
+    }
+
+    @Transient
+    private var changeEvent: ChangeEvent? = null
+
+    init {
+        layout = cards
+        add(
+            // A dummy container ensures popup menu appears on top of the checkbox
+            Container().apply {
+                layout = FlowLayout(FlowLayout.LEADING, 0, 0)
+                add(checkbox)
+            },
+            CHECKBOX_CARD
+        )
+        add(
+            Container().apply {
+                // FlowLayout adds horizontal gap before the first element, so we set zero gaps
+                // and add the gap between the components manually.
+                layout = FlowLayout(FlowLayout.LEADING, 0, 0)
+                add(comboBox)
+                add(Box.createHorizontalStrut(5))
+                add(textFieldLabel)
+            },
+            EDITABLE_CARD
+        )
+    }
+
+    public var value: Value
+        get() = when (components.indexOfFirst { it.isVisible }) {
+            0 -> if (checkbox.isSelected) Value.Boolean.TRUE else Value.Boolean.FALSE
+            else -> Value.Text(comboBox.selectedItem as String)
+        }
+        set(value) {
+            when (value) {
+                is Value.Boolean -> {
+                    comboBox.selectedItem = ""
+                    checkbox.isSelected = value.value
+                    cards.show(this, CHECKBOX_CARD)
+                }
+
+                is Value.Text -> {
+                    checkbox.isSelected = false
+                    comboBox.selectedItem = value.value
+                    cards.show(this, EDITABLE_CARD)
+                }
+            }
+        }
+
+    @get:JvmSynthetic
+    public var booleanValue: Boolean
+        @Deprecated(message = "write-only property", level = DeprecationLevel.HIDDEN)
+        get() = TODO()
+        set(value) {
+            this.value = Value.of(value)
+        }
+
+    @get:JvmSynthetic
+    public var stringValue: String
+        @Deprecated(message = "write-only property", level = DeprecationLevel.HIDDEN)
+        get() = TODO()
+        set(value) {
+            this.value = Value.Text(value)
+        }
+
+    public fun makeSmall() {
+        JFactory.small(checkbox)
+        // We do not make combobox small as the expression migh be hard to read
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 78b5614d5c9..4a295d713f7 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -120,6 +120,7 @@ Summary
   <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
   <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
   <li><pr>5944</pr>Add PI for declaring <code>TestElement</code> schemas so element properties are easier to access in code (see <code>TestElementSchema</code>, <code>TestElement#getSchema()</code>, <code>TestElement#getProps()</code>)</li>
+  <li><pr>5944</pr>Enable usage of <code>${...}</code> expressions for checkbox controls (see context menus for checkboxes, however, the individual components should be adapted individually)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From f3ed1db13946a70d5d007a5459c06717b86ff933 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 13:45:23 +0300
Subject: [PATCH 0515/1037] feat: Migrate BeanShellSampler to BeanShellSchema

---
 .../java/control/gui/BeanShellSamplerGui.java | 33 ++++++------
 .../java/sampler/BeanShellSampler.java        | 51 +++++++++++++++----
 .../java/sampler/BeanShellSamplerSchema.kt    | 48 +++++++++++++++++
 .../java/sampler/BeanShellSamplerTest.kt      | 26 +++-------
 4 files changed, 113 insertions(+), 45 deletions(-)
 create mode 100644 src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt

diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
index 181e08de743..08f300d0da1 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
@@ -20,20 +20,20 @@
 import java.awt.BorderLayout;
 
 import javax.swing.Box;
-import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.FilePanelEntry;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.protocol.java.sampler.BeanShellSampler;
+import org.apache.jmeter.protocol.java.sampler.BeanShellSamplerSchema;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.util.JMeterUtils;
 
 @TestElementMetadata(labelResource = "bsh_sampler_title")
@@ -41,7 +41,11 @@ public class BeanShellSamplerGui extends AbstractSamplerGui {
 
     private static final long serialVersionUID = 240L;
 
-    private JCheckBox resetInterpreter;// reset the bsh.Interpreter before each execution
+    // reset the bsh.Interpreter before each execution
+    private final JBooleanPropertyEditor resetInterpreter =
+            new JBooleanPropertyEditor(
+                    BeanShellSamplerSchema.INSTANCE.getResetInterpreter(),
+                    JMeterUtils.getResString("bsh_script_reset_interpreter"));
 
     private final FilePanelEntry filename = new FilePanelEntry(JMeterUtils.getResString("bsh_script_file"),".bsh"); // script file name (if present)
 
@@ -55,11 +59,11 @@ public BeanShellSamplerGui() {
 
     @Override
     public void configure(TestElement element) {
-        scriptField.setInitialText(element.getPropertyAsString(BeanShellSampler.SCRIPT));
+        scriptField.setInitialText(element.get(BeanShellSamplerSchema.INSTANCE.getScript()));
         scriptField.setCaretPosition(0);
-        filename.setFilename(element.getPropertyAsString(BeanShellSampler.FILENAME));
-        parameters.setText(element.getPropertyAsString(BeanShellSampler.PARAMETERS));
-        resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellSampler.RESET_INTERPRETER));
+        filename.setFilename(element.get(BeanShellSamplerSchema.INSTANCE.getFilename()));
+        parameters.setText(element.get(BeanShellSamplerSchema.INSTANCE.getParameters()));
+        resetInterpreter.updateUi(element);
         super.configure(element);
     }
 
@@ -79,10 +83,10 @@ public TestElement createTestElement() {
     public void modifyTestElement(TestElement te) {
         te.clear();
         super.configureTestElement(te);
-        te.setProperty(BeanShellSampler.SCRIPT, scriptField.getText());
-        te.setProperty(BeanShellSampler.FILENAME, filename.getFilename());
-        te.setProperty(BeanShellSampler.PARAMETERS, parameters.getText());
-        te.setProperty(new BooleanProperty(BeanShellSampler.RESET_INTERPRETER, resetInterpreter.isSelected()));
+        te.set(BeanShellSamplerSchema.INSTANCE.getScript(), scriptField.getText());
+        te.set(BeanShellSamplerSchema.INSTANCE.getFilename(), filename.getFilename());
+        te.set(BeanShellSamplerSchema.INSTANCE.getParameters(), parameters.getText());
+        resetInterpreter.updateElement(te);
     }
 
     /**
@@ -95,7 +99,7 @@ public void clearGui() {
         filename.setFilename(""); //$NON-NLS-1$
         parameters.setText(""); //$NON-NLS-1$
         scriptField.setInitialText(""); //$NON-NLS-1$
-        resetInterpreter.setSelected(false);
+        resetInterpreter.reset();
     }
 
     @Override
@@ -115,7 +119,7 @@ private JPanel createParameterPanel() {
         JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_parameters")); // $NON-NLS-1$
 
         parameters = new JTextField(10);
-        parameters.setName(BeanShellSampler.PARAMETERS);
+        parameters.setName(BeanShellSamplerSchema.INSTANCE.getParameters().getName());
         label.setLabelFor(parameters);
 
         JPanel parameterPanel = new JPanel(new BorderLayout(5, 0));
@@ -125,9 +129,6 @@ private JPanel createParameterPanel() {
     }
 
     private JPanel createResetPanel() {
-        resetInterpreter = new JCheckBox(JMeterUtils.getResString("bsh_script_reset_interpreter")); // $NON-NLS-1$
-        resetInterpreter.setName(BeanShellSampler.PARAMETERS);
-
         JPanel resetInterpreterPanel = new JPanel(new BorderLayout());
         resetInterpreterPanel.add(resetInterpreter, BorderLayout.WEST);
         return resetInterpreterPanel;
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
index 45f215eb2e3..424faf2f928 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
@@ -29,6 +29,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.BeanShellInterpreter;
 import org.apache.jmeter.util.BeanShellTestElement;
 import org.apache.jorphan.util.JMeterException;
@@ -49,41 +50,71 @@ public class BeanShellSampler extends BeanShellTestElement implements Sampler, I
 
     private static final long serialVersionUID = 4;
 
-    public static final String FILENAME = "BeanShellSampler.filename"; //$NON-NLS-1$
+    /**
+     * @deprecated use {@link BeanShellSamplerSchema#getFilename()} instead
+     */
+    @Deprecated
+    public static final String FILENAME = BeanShellSamplerSchema.INSTANCE.getFilename().getName();
 
-    public static final String SCRIPT = "BeanShellSampler.query"; //$NON-NLS-1$
+    /**
+     * @deprecated use {@link BeanShellSamplerSchema#getFilename()} instead
+     */
+    @Deprecated
+    public static final String SCRIPT = BeanShellSamplerSchema.INSTANCE.getScript().getName();
 
-    public static final String PARAMETERS = "BeanShellSampler.parameters"; //$NON-NLS-1$
+    /**
+     * @deprecated use {@link BeanShellSamplerSchema#getParameters()} instead
+     */
+    @Deprecated
+    public static final String PARAMETERS = BeanShellSamplerSchema.INSTANCE.getParameters().getName();
 
-    public static final String INIT_FILE = "beanshell.sampler.init"; //$NON-NLS-1$
+    /**
+     * @deprecated use {@link BeanShellSamplerSchema#getInitFile()} instead
+     */
+    @Deprecated
+    public static final String INIT_FILE = BeanShellSamplerSchema.INSTANCE.getInitFile().getName();
 
-    public static final String RESET_INTERPRETER = "BeanShellSampler.resetInterpreter"; //$NON-NLS-1$
+    /**
+     * @deprecated use {@link BeanShellSamplerSchema#getResetInterpreter()} instead
+     */
+    @Deprecated
+    public static final String RESET_INTERPRETER = BeanShellSamplerSchema.INSTANCE.getResetInterpreter().getName();
 
     private transient volatile BeanShellInterpreter savedBsh = null;
 
+    @Override
+    public BeanShellSamplerSchema getSchema() {
+        return BeanShellSamplerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends BeanShellSampler, ? extends BeanShellSamplerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     protected String getInitFileProperty() {
-        return INIT_FILE;
+        return BeanShellSamplerSchema.INSTANCE.getInitFile().getName();
     }
 
     @Override
     public String getScript() {
-        return this.getPropertyAsString(SCRIPT);
+        return get(getSchema().getScript());
     }
 
     @Override
     public String getFilename() {
-        return getPropertyAsString(FILENAME);
+        return get(getSchema().getFilename());
     }
 
     @Override
     public String getParameters() {
-        return getPropertyAsString(PARAMETERS);
+        return get(getSchema().getParameters());
     }
 
     @Override
     public boolean isResetInterpreter() {
-        return getPropertyAsBoolean(RESET_INTERPRETER);
+        return get(getSchema().getResetInterpreter());
     }
 
     @Override
diff --git a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
new file mode 100644
index 00000000000..d71bd1b9926
--- /dev/null
+++ b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.java.sampler
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [BeanShellSampler].
+ * @see BeanShellSampler
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class BeanShellSamplerSchema : TestElementSchema() {
+    public companion object INSTANCE : BeanShellSamplerSchema()
+
+    public val resetInterpreter: BooleanPropertyDescriptor<BeanShellSamplerSchema> =
+        boolean("BeanShellSampler.resetInterpreter", default = false)
+
+    public val script: StringPropertyDescriptor<BeanShellSamplerSchema> =
+        string("BeanShellSampler.query")
+
+    public val parameters: StringPropertyDescriptor<BeanShellSamplerSchema> =
+        string("BeanShellSampler.parameters")
+
+    public val initFile: StringPropertyDescriptor<BeanShellSamplerSchema> =
+        string("beanshell.sampler.init")
+
+    public val filename: StringPropertyDescriptor<BeanShellSamplerSchema> =
+        string("BeanShellSampler.filename")
+}
diff --git a/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt b/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt
index 143b91a75fb..4239f18d0ba 100644
--- a/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt
+++ b/src/protocol/java/src/test/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerTest.kt
@@ -17,33 +17,21 @@
 
 package org.apache.jmeter.protocol.java.sampler
 
-import org.apache.jmeter.engine.util.CompoundVariable
-import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.property.FunctionProperty
+import org.apache.jmeter.engine.util.TestElementPropertyTransformer
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class BeanShellSamplerTest {
-    // TODO: move to TestElement itself?
-    private fun TestElement.setFunctionProperty(name: String, expression: String) {
-        setProperty(
-            FunctionProperty(
-                name,
-                CompoundVariable(expression).function
-            )
-        )
-    }
-
     @Test
     fun `getScript executes only once`() {
         val sampler = BeanShellSampler().apply {
             name = "BeanShell Sampler"
-            setFunctionProperty(
-                BeanShellSampler.SCRIPT,
-                """ResponseMessage="COUNTER=${"$"}{__counter(FALSE)}""""
-            )
-            setProperty(BeanShellSampler.FILENAME, "")
-            setProperty(BeanShellSampler.PARAMETERS, "")
+            props {
+                it[script] = """ResponseMessage="COUNTER=${"$"}{__counter(FALSE)}""""
+                it[filename] = ""
+                it[parameters] = ""
+            }
+            TestElementPropertyTransformer.USE_FUNCTIONS.visit(this)
             isRunningVersion = true
         }
         val result = sampler.sample(null)

From ac1bcf4bf0d7007fef90b8142d3ae6a97d8d132f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 13:45:35 +0300
Subject: [PATCH 0516/1037] feat: Migrate ThreadGroup and OpenModelThreadGroup
 to editable checkboxes

---
 .../OpenModelThreadGroupConfigElementTest.kt  | 17 +++---
 .../jmeter/threads/AbstractThreadGroup.java   | 39 +++++++++-----
 .../apache/jmeter/threads/ThreadGroup.java    | 25 ++++++---
 .../jmeter/threads/gui/ThreadGroupGui.java    | 33 +++++++-----
 .../threads/AbstractThreadGroupSchema.kt      | 44 +++++++++++++++
 .../jmeter/threads/ThreadGroupSchema.kt       | 53 +++++++++++++++++++
 .../threads/openmodel/OpenModelThreadGroup.kt | 49 ++++++++++++-----
 .../OpenModelThreadGroupController.kt         |  2 +-
 .../openmodel/OpenModelThreadGroupSchema.kt   | 39 ++++++++++++++
 .../openmodel/gui/OpenModelThreadGroupGui.kt  |  4 --
 .../gui/action/ParseCurlCommandAction.java    |  3 +-
 11 files changed, 246 insertions(+), 62 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt

diff --git a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
index ac99d0708ac..c6e02d6cec7 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -23,12 +23,9 @@ import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.modifiers.CounterConfig
 import org.apache.jmeter.sampler.DebugSampler
 import org.apache.jmeter.testelement.TestPlan
-import org.apache.jmeter.testelement.property.TestElementProperty
-import org.apache.jmeter.threads.AbstractThreadGroup
 import org.apache.jorphan.collections.ListedHashTree
 import org.apache.jorphan.test.JMeterSerialTest
 import org.junit.Assert
-import org.junit.Ignore
 import org.junit.Test
 import java.time.Duration
 
@@ -37,7 +34,8 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
      * Create Test Plan with Open Model Thread Group and Counter Config.
      */
     @Test
-    @Ignore("Sometimes the listener gets no results for unknown reason")
+    // Un-comment if you want try running the test multiple times locally:
+    // @RepeatedTest(value = 10)
     fun `ensure thread group initializes counter only once for each thread`() {
         val listener = TestTransactionController.TestSampleListener()
 
@@ -45,12 +43,9 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
             add(TestPlan()).apply {
                 val threadGroup = OpenModelThreadGroup().apply {
                     name = "Thread Group"
-                    scheduleString = "rate(5 / sec) random_arrivals(1 sec)"
-                    setProperty(
-                        TestElementProperty(
-                            AbstractThreadGroup.MAIN_CONTROLLER, OpenModelThreadGroupController()
-                        )
-                    )
+                    // 5 samples within 100ms
+                    // Then 2 sec pause to let all the threads to finish, especially the ones that start at 99ms
+                    scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(2 s)"
                 }
                 add(threadGroup).apply {
                     add(listener)
@@ -78,7 +73,7 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
             awaitTermination(Duration.ofSeconds(10))
         }
 
-        // There's no guarantee that thread execute exactly in order, so we sort
+        // There's no guarantee that threads execute exactly in order, so we sort
         // the labels to avoid test failure in case the thread execute out of order.
         val actual = listener.events.map { it.result.sampleLabel }.sorted()
 
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index 16773bb50b0..aebe888157b 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -31,13 +31,12 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.apiguardian.api.API;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * ThreadGroup holds the settings for a JMeter thread group.
@@ -77,16 +76,32 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
     public static final String ON_SAMPLE_ERROR_STOPTEST_NOW = "stoptestnow";
 
     /** Number of threads in the thread group */
-    public static final String NUM_THREADS = "ThreadGroup.num_threads";
+    @Deprecated
+    public static final String NUM_THREADS =
+            AbstractThreadGroupSchema.INSTANCE.getNumThreads().getName();
 
-    public static final String MAIN_CONTROLLER = "ThreadGroup.main_controller";
+    public static final String MAIN_CONTROLLER =
+            AbstractThreadGroupSchema.INSTANCE.getMainController().getName();
 
     /** The same user or different users */
-    public static final String IS_SAME_USER_ON_NEXT_ITERATION = "ThreadGroup.same_user_on_next_iteration";
+    @Deprecated
+    public static final String IS_SAME_USER_ON_NEXT_ITERATION =
+            AbstractThreadGroupSchema.INSTANCE.getSameUserOnNextIteration().getName();
 
 
     private final AtomicInteger numberOfThreads = new AtomicInteger(0); // Number of active threads in this group
 
+    @Override
+    public AbstractThreadGroupSchema getSchema() {
+        return AbstractThreadGroupSchema.INSTANCE;
+    }
+
+    @NotNull
+    @Override
+    public PropertiesAccessor<? extends AbstractThreadGroup, ? extends AbstractThreadGroupSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean isDone() {
@@ -105,7 +120,7 @@ public Sampler next() {
      * @return the sampler controller.
      */
     public Controller getSamplerController() {
-        return (Controller) getProperty(MAIN_CONTROLLER).getObjectValue();
+        return get(getSchema().getMainController());
     }
 
     /**
@@ -116,7 +131,7 @@ public Controller getSamplerController() {
      */
     public void setSamplerController(LoopController c) {
         c.setContinueForever(false);
-        setProperty(new TestElementProperty(MAIN_CONTROLLER, c));
+        set(getSchema().getMainController(), c);
     }
 
     /**
@@ -188,7 +203,7 @@ public void triggerEndOfLoop() {
      *            the number of threads.
      */
     public void setNumThreads(int numThreads) {
-        setProperty(new IntegerProperty(NUM_THREADS, numThreads));
+        set(getSchema().getNumThreads(), numThreads);
     }
 
     /**
@@ -220,7 +235,7 @@ public int getNumberOfThreads() {
      * @return the number of threads.
      */
     public int getNumThreads() {
-        return this.getPropertyAsInt(AbstractThreadGroup.NUM_THREADS);
+        return get(getSchema().getNumThreads());
     }
 
     /**
@@ -322,7 +337,7 @@ public void breakThreadLoop() {
      *            false is a different user on next iteration of loop
      */
     public void setIsSameUserOnNextIteration(boolean isSameUserOnNextIteration) {
-        setProperty(new BooleanProperty(IS_SAME_USER_ON_NEXT_ITERATION, isSameUserOnNextIteration));
+        set(getSchema().getSameUserOnNextIteration(), isSameUserOnNextIteration);
     }
 
     /**
@@ -334,7 +349,7 @@ public void setIsSameUserOnNextIteration(boolean isSameUserOnNextIteration) {
      * @return the kind of user.
      */
     public boolean isSameUserOnNextIteration() {
-        return getPropertyAsBoolean(ThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION, true);
+        return get(getSchema().getSameUserOnNextIteration());
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index d0084548b30..e9a4925ca79 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -28,9 +28,11 @@
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.LongProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.apache.jorphan.util.JMeterStopTestException;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,19 +57,20 @@ public class ThreadGroup extends AbstractThreadGroup {
     //+ JMX entries - do not change the string values
 
     /** Ramp-up time */
-    public static final String RAMP_TIME = "ThreadGroup.ramp_time";
+    public static final String RAMP_TIME = ThreadGroupSchema.INSTANCE.getRampTime().getName();
 
     /** Whether thread startup is delayed until required */
-    public static final String DELAYED_START = "ThreadGroup.delayedStart";
+    @Deprecated
+    public static final String DELAYED_START = ThreadGroupSchema.INSTANCE.getDelayedStart().getName();
 
     /** Whether scheduler is being used */
-    public static final String SCHEDULER = "ThreadGroup.scheduler";
+    public static final String SCHEDULER = ThreadGroupSchema.INSTANCE.getUseScheduler().getName();
 
     /** Scheduler duration, overrides end time */
-    public static final String DURATION = "ThreadGroup.duration";
+    public static final String DURATION = ThreadGroupSchema.INSTANCE.getDuration().getName();
 
     /** Scheduler start delay, overrides start time */
-    public static final String DELAY = "ThreadGroup.delay";
+    public static final String DELAY = ThreadGroupSchema.INSTANCE.getDelay().getName();
     //- JMX entries
 
     private transient Thread threadStarter;
@@ -99,6 +102,16 @@ public ThreadGroup() {
         super();
     }
 
+    @Override
+    public ThreadGroupSchema getSchema() {
+        return ThreadGroupSchema.INSTANCE;
+    }
+
+    @Override
+    public @NotNull PropertiesAccessor<? extends ThreadGroup, ? extends ThreadGroupSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Set whether scheduler is being used
      *
@@ -175,7 +188,7 @@ public int getRampUp() {
     }
 
     private boolean isDelayedStartup() {
-        return getPropertyAsBoolean(DELAYED_START);
+        return get(getSchema().getDelayedStart());
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
index e7eec63d2a7..80fa3a85a15 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -31,11 +31,14 @@
 
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.control.gui.LoopControlPanel;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.threads.AbstractThreadGroup;
+import org.apache.jmeter.threads.AbstractThreadGroupSchema;
 import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.threads.ThreadGroupSchema;
 import org.apache.jmeter.util.JMeterUtils;
 
 import net.miginfocom.swing.MigLayout;
@@ -56,7 +59,7 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
 
     private final boolean showDelayedStart;
 
-    private JCheckBox delayedStart;
+    private JBooleanPropertyEditor delayedStart;
 
     private final JCheckBox scheduler = new JCheckBox(JMeterUtils.getResString("scheduler"));
 
@@ -66,8 +69,10 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
     private final JTextField delay = new JTextField(); // Relative start-up time
     private final JLabel delayLabel = labelFor(delay, "delay");
 
-    private final JCheckBox sameUserBox =
-            new JCheckBox(JMeterUtils.getResString("threadgroup_same_user"));
+    private final JBooleanPropertyEditor sameUserBox =
+            new JBooleanPropertyEditor(
+                    AbstractThreadGroupSchema.INSTANCE.getSameUserOnNextIteration(),
+                    JMeterUtils.getResString("threadgroup_same_user"));
 
     public ThreadGroupGui() {
         this(true);
@@ -98,26 +103,25 @@ public void modifyTestElement(TestElement tg) {
         if (tg instanceof AbstractThreadGroup) {
             ((AbstractThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
         }
-
-        tg.setProperty(AbstractThreadGroup.NUM_THREADS, threadInput.getText());
+        tg.set(AbstractThreadGroupSchema.INSTANCE.getNumThreads(), threadInput.getText());
         tg.setProperty(ThreadGroup.RAMP_TIME, rampInput.getText());
         if (showDelayedStart) {
-            tg.setProperty(ThreadGroup.DELAYED_START, delayedStart.isSelected(), false);
+            delayedStart.updateElement(tg);
         }
         tg.setProperty(new BooleanProperty(ThreadGroup.SCHEDULER, scheduler.isSelected()));
         tg.setProperty(ThreadGroup.DURATION, duration.getText());
         tg.setProperty(ThreadGroup.DELAY, delay.getText());
-        tg.setProperty(AbstractThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION,sameUserBox.isSelected());
+        sameUserBox.updateElement(tg);
     }
 
     @Override
     public void configure(TestElement tg) {
         super.configure(tg);
-        threadInput.setText(tg.getPropertyAsString(AbstractThreadGroup.NUM_THREADS));
+        threadInput.setText(tg.getString(AbstractThreadGroupSchema.INSTANCE.getNumThreads()));
         rampInput.setText(tg.getPropertyAsString(ThreadGroup.RAMP_TIME));
         loopPanel.configure((TestElement) tg.getProperty(AbstractThreadGroup.MAIN_CONTROLLER).getObjectValue());
         if (showDelayedStart) {
-            delayedStart.setSelected(tg.getPropertyAsBoolean(ThreadGroup.DELAYED_START));
+            delayedStart.updateUi(tg);
         }
         scheduler.setSelected(tg.getPropertyAsBoolean(ThreadGroup.SCHEDULER));
 
@@ -125,8 +129,7 @@ public void configure(TestElement tg) {
 
         duration.setText(tg.getPropertyAsString(ThreadGroup.DURATION));
         delay.setText(tg.getPropertyAsString(ThreadGroup.DELAY));
-        final boolean isSameUser = tg.getPropertyAsBoolean(AbstractThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION, true);
-        sameUserBox.setSelected(isSameUser);
+        sameUserBox.updateUi(tg);
     }
 
     @Override
@@ -172,12 +175,12 @@ private void initGui(){
         rampInput.setText("1"); // $NON-NLS-1$
         loopPanel.clearGui();
         if (showDelayedStart) {
-            delayedStart.setSelected(false);
+            delayedStart.reset();
         }
         scheduler.setSelected(false);
         delay.setText(""); // $NON-NLS-1$
         duration.setText(""); // $NON-NLS-1$
-        sameUserBox.setSelected(true);
+        sameUserBox.reset();
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
@@ -203,7 +206,9 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         threadPropsPanel.add(loopController.getLoops());
         threadPropsPanel.add(sameUserBox, "span 2");
         if (showDelayedStart) {
-            delayedStart = new JCheckBox(JMeterUtils.getResString("delayed_start")); // $NON-NLS-1$
+            delayedStart = new JBooleanPropertyEditor(
+                    ThreadGroupSchema.INSTANCE.getDelayedStart(),
+                    JMeterUtils.getResString("delayed_start")); // $NON-NLS-1$
             threadPropsPanel.add(delayedStart, "span 2");
         }
         scheduler.addItemListener(this);
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
new file mode 100644
index 00000000000..30d348aff78
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads
+
+import org.apache.jmeter.control.Controller
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [AbstractThreadGroup].
+ * @see AbstractThreadGroup
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class AbstractThreadGroupSchema protected constructor() : TestElementSchema() {
+    public companion object INSTANCE : AbstractThreadGroupSchema()
+
+    public val numThreads: IntegerPropertyDescriptor<AbstractThreadGroupSchema> =
+        integer("ThreadGroup.num_threads")
+
+    public val mainController: TestElementPropertyDescriptor<AbstractThreadGroupSchema, Controller> =
+        testElement("ThreadGroup.main_controller")
+
+    public val sameUserOnNextIteration: BooleanPropertyDescriptor<AbstractThreadGroupSchema> =
+        boolean("ThreadGroup.same_user_on_next_iteration", default = true)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
new file mode 100644
index 00000000000..cced287135e
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads
+
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.LongPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [ThreadGroup].
+ * @see ThreadGroup
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class ThreadGroupSchema : AbstractThreadGroupSchema() {
+    public companion object INSTANCE : ThreadGroupSchema()
+
+    /** Whether thread startup is delayed until required */
+    public val delayedStart: BooleanPropertyDescriptor<ThreadGroupSchema> =
+        boolean("ThreadGroup.delayedStart", default = false)
+
+    /** Ramp-up time */
+    public val rampTime: IntegerPropertyDescriptor<ThreadGroupSchema> =
+        integer("ThreadGroup.ramp_time")
+
+    /** Whether scheduler is being used */
+    public val useScheduler: BooleanPropertyDescriptor<ThreadGroupSchema> =
+        boolean("ThreadGroup.scheduler")
+
+    /** Scheduler start delay, overrides start time */
+    public val delay: LongPropertyDescriptor<ThreadGroupSchema> =
+        long("ThreadGroup.delay")
+
+    /** Scheduler duration, overrides end time */
+    public val duration: LongPropertyDescriptor<ThreadGroupSchema> =
+        long("ThreadGroup.duration")
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
index 476f3a236b8..a97e2dc2549 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -20,6 +20,7 @@ package org.apache.jmeter.threads.openmodel
 import org.apache.jmeter.control.Controller
 import org.apache.jmeter.engine.StandardJMeterEngine
 import org.apache.jmeter.gui.GUIMenuSortOrder
+import org.apache.jmeter.testelement.schema.PropertiesAccessor
 import org.apache.jmeter.threads.AbstractThreadGroup
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterThread
@@ -57,10 +58,26 @@ public class OpenModelThreadGroup :
         private val log = LoggerFactory.getLogger(OpenModelThreadGroup::class.java)
 
         /** Thread group schedule. See [ThreadSchedule]. */
-        public const val SCHEDULE: String = "OpenModelThreadGroup.schedule"
+        @Deprecated(
+            message = "Use OpenModelThreadGroupSchema instead",
+            replaceWith = ReplaceWith(
+                "OpenModelThreadGroupSchema.getSchedule",
+                imports = ["org.apache.jmeter.threads.openmodel.OpenModelThreadGroupSchema"]
+            ),
+            DeprecationLevel.WARNING
+        )
+        public val SCHEDULE: String = OpenModelThreadGroupSchema.schedule.name
 
         /** The seed for reproducible workloads. 0 means no seed, so the schedule would be new on every execution */
-        public const val RANDOM_SEED: String = "OpenModelThreadGroup.random_seed"
+        @Deprecated(
+            message = "Use OpenModelThreadGroupSchema instead",
+            replaceWith = ReplaceWith(
+                "OpenModelThreadGroupSchema.randomSeed",
+                imports = ["org.apache.jmeter.threads.openmodel.OpenModelThreadGroupSchema"]
+            ),
+            DeprecationLevel.WARNING
+        )
+        public val RANDOM_SEED: String = OpenModelThreadGroupSchema.randomSeed.name
 
         /**
          * A thread pool for "thread starter thread".
@@ -79,25 +96,27 @@ public class OpenModelThreadGroup :
     private val threadStarterFuture = AtomicReference<Future<*>?>()
     private val activeThreads = ConcurrentHashMap<JMeterThread, Future<*>>()
 
+    override val schema: OpenModelThreadGroupSchema
+        get() = OpenModelThreadGroupSchema
+
+    override val props: PropertiesAccessor<@JvmWildcard OpenModelThreadGroup, @JvmWildcard OpenModelThreadGroupSchema>
+        get() = PropertiesAccessor(this, schema)
+
     /**
      * Schedule expression (see [ThreadSchedule]).
      */
-    public var scheduleString: String
-        get() = getPropertyAsString(SCHEDULE)
-        set(value) {
-            setProperty(SCHEDULE, value)
-        }
+    public var scheduleString: String by OpenModelThreadGroupSchema.schedule
 
-    public val randomSeed: Long get() = getPropertyAsLong(RANDOM_SEED)
+    public val randomSeed: Long by OpenModelThreadGroupSchema.randomSeed
 
     /**
      * Random seed for building reproducible schedules. 0 means random seed.
      */
-    public var randomSeedString: String
-        get() = getPropertyAsString(RANDOM_SEED)
-        set(value) {
-            setProperty(RANDOM_SEED, value)
-        }
+    public var randomSeedString: String by OpenModelThreadGroupSchema.randomSeed.asString
+
+    init {
+        this[OpenModelThreadGroupSchema.mainController] = OpenModelThreadGroupController()
+    }
 
     private class ThreadsStarter(
         private val testStartTime: Long,
@@ -165,6 +184,10 @@ public class OpenModelThreadGroup :
         }
     }
 
+    override fun recoverRunningVersion() {
+        // There's no state in OpenModelThreadGroup, so we can skip recoverRunningVersion
+    }
+
     override fun start(
         threadGroupIndex: Int,
         notifier: ListenerNotifier,
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
index a19db872515..8448d5b6f03 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupController.kt
@@ -25,7 +25,7 @@ import org.apiguardian.api.API
 
 @API(status = API.Status.EXPERIMENTAL, since = "5.5")
 public class OpenModelThreadGroupController : GenericController(), IteratingController {
-    public companion object {
+    private companion object {
         private const val serialVersionUID: Long = 1L
     }
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
new file mode 100644
index 00000000000..9bf810675a7
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.testelement.schema.LongPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apache.jmeter.threads.AbstractThreadGroupSchema
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [OpenModelThreadGroup].
+ * @see OpenModelThreadGroup
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class OpenModelThreadGroupSchema protected constructor() : AbstractThreadGroupSchema() {
+    public companion object INSTANCE : OpenModelThreadGroupSchema()
+
+    public val schedule: StringPropertyDescriptor<OpenModelThreadGroupSchema> =
+        string("OpenModelThreadGroup.schedule")
+
+    public val randomSeed: LongPropertyDescriptor<OpenModelThreadGroupSchema> =
+        long("OpenModelThreadGroup.random_seed")
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
index e23541f2a51..055ed329fb5 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
@@ -21,12 +21,9 @@ import net.miginfocom.swing.MigLayout
 import org.apache.jmeter.engine.util.CompoundVariable
 import org.apache.jmeter.gui.TestElementMetadata
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.property.TestElementProperty
-import org.apache.jmeter.threads.AbstractThreadGroup
 import org.apache.jmeter.threads.gui.AbstractThreadGroupGui
 import org.apache.jmeter.threads.openmodel.DefaultThreadSchedule
 import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
-import org.apache.jmeter.threads.openmodel.OpenModelThreadGroupController
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
 import org.apache.jmeter.threads.openmodel.asSeconds
@@ -136,7 +133,6 @@ public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
 
     override fun createTestElement(): TestElement =
         OpenModelThreadGroup().also {
-            it.setProperty(TestElementProperty(AbstractThreadGroup.MAIN_CONTROLLER, OpenModelThreadGroupController()))
             modifyTestElement(it)
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 966c3502af4..a0c7e17b4e1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -97,6 +97,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.threads.AbstractThreadGroup;
+import org.apache.jmeter.threads.AbstractThreadGroupSchema;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jmeter.threads.gui.ThreadGroupGui;
 import org.apache.jmeter.util.JMeterUtils;
@@ -225,7 +226,7 @@ private void createTestPlan(ActionEvent e, Request request, String statusText)
         ThreadGroup threadGroup = new ThreadGroup();
         threadGroup.setProperty(TestElement.GUI_CLASS, ThreadGroupGui.class.getName());
         threadGroup.setProperty(TestElement.NAME, "Thread Group");
-        threadGroup.setProperty(AbstractThreadGroup.NUM_THREADS, "${__P(threads,10)}");
+        threadGroup.set(AbstractThreadGroupSchema.INSTANCE.getNumThreads(), "${__P(threads,10)}");
         threadGroup.setProperty(ThreadGroup.RAMP_TIME,"${__P(rampup,30)}");
         threadGroup.setScheduler(true);
         threadGroup.setProperty(ThreadGroup.DURATION,"${__P(duration,3600)}");

From 96b5d5c4b67bb46bb4a374b4a089aef48f08f2db Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 14:17:15 +0300
Subject: [PATCH 0517/1037] feat: Use editable checkboxes in TestPlan GUI

---
 .../jmeter/control/gui/TestPlanGui.java       | 40 ++++++++------
 .../apache/jmeter/testelement/TestPlan.java   | 53 ++++++++-----------
 .../jmeter/testelement/TestPlanSchema.kt      | 49 +++++++++++++++++
 3 files changed, 95 insertions(+), 47 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
index 349aacd661d..49bded9be04 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
@@ -20,7 +20,6 @@
 import java.awt.BorderLayout;
 import java.util.Collection;
 
-import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -29,6 +28,7 @@
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
 import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.util.FileListPanel;
@@ -36,6 +36,7 @@
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.TestPlanSchema;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -52,11 +53,20 @@ public class TestPlanGui extends AbstractJMeterGuiComponent {
      * A checkbox allowing the user to specify whether or not JMeter should do
      * functional testing.
      */
-    private final JCheckBox functionalMode;
+    private final JBooleanPropertyEditor functionalMode =
+            new JBooleanPropertyEditor(
+                    TestPlanSchema.INSTANCE.getFunctionalMode(),
+                    JMeterUtils.getResString("functional_mode"));
 
-    private final JCheckBox serializedMode;
+    private final JBooleanPropertyEditor serializedMode =
+            new JBooleanPropertyEditor(
+                    TestPlanSchema.INSTANCE.getSerializeThreadgroups(),
+                    JMeterUtils.getResString("testplan.serialized"));
 
-    private final JCheckBox tearDownOnShutdown;
+    private final JBooleanPropertyEditor tearDownOnShutdown =
+            new JBooleanPropertyEditor(
+                    TestPlanSchema.INSTANCE.getTearDownOnShutdown(),
+                    JMeterUtils.getResString("teardown_on_shutdown"));
 
     /** A panel allowing the user to define variables. */
     private final ArgumentsPanel argsPanel;
@@ -69,9 +79,6 @@ public class TestPlanGui extends AbstractJMeterGuiComponent {
     public TestPlanGui() {
         browseJar = new FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar"); // $NON-NLS-1$ $NON-NLS-2$
         argsPanel = new ArgumentsPanel(JMeterUtils.getResString("user_defined_variables")); // $NON-NLS-1$
-        serializedMode = new JCheckBox(JMeterUtils.getResString("testplan.serialized")); // $NON-NLS-1$
-        functionalMode = new JCheckBox(JMeterUtils.getResString("functional_mode")); // $NON-NLS-1$
-        tearDownOnShutdown = new JCheckBox(JMeterUtils.getResString("teardown_on_shutdown"), true); // $NON-NLS-1$
         init();
     }
 
@@ -124,9 +131,10 @@ public void modifyTestElement(TestElement plan) {
         super.configureTestElement(plan);
         if (plan instanceof TestPlan) {
             TestPlan tp = (TestPlan) plan;
-            tp.setFunctionalMode(functionalMode.isSelected());
-            tp.setTearDownOnShutdown(tearDownOnShutdown.isSelected());
-            tp.setSerialized(serializedMode.isSelected());
+            functionalMode.updateElement(tp);
+            tearDownOnShutdown.updateElement(tp);
+            serializedMode.updateElement(tp);
+            // TODO: set expression to TestPlan somehow
             tp.setUserDefinedVariables((Arguments) argsPanel.createTestElement());
             tp.setTestPlanClasspathArray(browseJar.getFiles());
         }
@@ -164,9 +172,9 @@ public void configure(TestElement el) {
         super.configure(el);
         if (el instanceof TestPlan) {
             TestPlan tp = (TestPlan) el;
-            functionalMode.setSelected(tp.isFunctionalMode());
-            serializedMode.setSelected(tp.isSerialized());
-            tearDownOnShutdown.setSelected(tp.isTearDownOnShutdown());
+            functionalMode.updateUi(tp);
+            serializedMode.updateUi(tp);
+            tearDownOnShutdown.updateUi(tp);
             final JMeterProperty udv = tp.getUserDefinedVariablesAsProperty();
             if (udv != null) {
                 argsPanel.configure((Arguments) udv.getObjectValue());
@@ -200,9 +208,9 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
     @Override
     public void clearGui() {
         super.clearGui();
-        functionalMode.setSelected(false);
-        serializedMode.setSelected(false);
-        tearDownOnShutdown.setSelected(true);
+        functionalMode.reset();
+        serializedMode.reset();
+        tearDownOnShutdown.reset();
         argsPanel.clear();
         browseJar.clearFiles();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
index 4688a37e6ff..0f19947ee28 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
@@ -27,9 +27,8 @@
 import org.apache.jmeter.NewDriver;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.services.FileServer;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
@@ -40,19 +39,6 @@ public class TestPlan extends AbstractTestElement implements Serializable, TestS
 
     private static final Logger log = LoggerFactory.getLogger(TestPlan.class);
 
-    //+ JMX field names - do not change values
-    private static final String FUNCTIONAL_MODE = "TestPlan.functional_mode"; //$NON-NLS-1$
-
-    private static final String USER_DEFINED_VARIABLES = "TestPlan.user_defined_variables"; //$NON-NLS-1$
-
-    private static final String SERIALIZE_THREADGROUPS = "TestPlan.serialize_threadgroups"; //$NON-NLS-1$
-
-    private static final String CLASSPATHS = "TestPlan.user_define_classpath"; //$NON-NLS-1$
-
-    private static final String TEARDOWN_ON_SHUTDOWN = "TestPlan.tearDown_on_shutdown"; //$NON-NLS-1$
-
-    //- JMX field names
-
     private static final String CLASSPATH_SEPARATOR = ","; //$NON-NLS-1$
 
     private static final String BASEDIR = "basedir";
@@ -70,6 +56,16 @@ public TestPlan(String name) {
         setName(name);
     }
 
+    @Override
+    public TestPlanSchema getSchema() {
+        return TestPlanSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends TestPlan, ? extends TestPlanSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     // create transient item
     protected Object readResolve(){
         threadGroups = new ArrayList<>();
@@ -87,15 +83,15 @@ public void prepareForPreCompile()
      * @return functional mode
      */
     public boolean isFunctionalMode() {
-        return getPropertyAsBoolean(FUNCTIONAL_MODE);
+        return get(getSchema().getFunctionalMode());
     }
 
     public void setUserDefinedVariables(Arguments vars) {
-        setProperty(new TestElementProperty(USER_DEFINED_VARIABLES, vars));
+        set(getSchema().getUserDefinedVariables(), vars);
     }
 
     public JMeterProperty getUserDefinedVariablesAsProperty() {
-        return getProperty(USER_DEFINED_VARIABLES);
+        return getProperty(getSchema().getUserDefinedVariables().getName());
     }
 
     public String getBasedir() {
@@ -117,16 +113,11 @@ public Map<String, String> getUserDefinedVariables() {
     }
 
     private Arguments getVariables() {
-        Arguments args = (Arguments) getProperty(USER_DEFINED_VARIABLES).getObjectValue();
-        if (args == null) {
-            args = new Arguments();
-            setUserDefinedVariables(args);
-        }
-        return args;
+        return getSchema().getUserDefinedVariables().getOrCreate(this, Arguments::new);
     }
 
     public void setFunctionalMode(boolean funcMode) {
-        setProperty(new BooleanProperty(FUNCTIONAL_MODE, funcMode));
+        set(getSchema().getFunctionalMode(), funcMode);
         setGlobalFunctionalMode(funcMode);
     }
 
@@ -148,15 +139,15 @@ public static boolean getFunctionalMode() {
     }
 
     public void setSerialized(boolean serializeTGs) {
-        setProperty(new BooleanProperty(SERIALIZE_THREADGROUPS, serializeTGs));
+        set(getSchema().getSerializeThreadgroups(), serializeTGs);
     }
 
     public void setTearDownOnShutdown(boolean tearDown) {
-        setProperty(TEARDOWN_ON_SHUTDOWN, tearDown, false);
+        set(getSchema().getTearDownOnShutdown(), tearDown);
     }
 
     public boolean isTearDownOnShutdown() {
-        return getPropertyAsBoolean(TEARDOWN_ON_SHUTDOWN, false);
+        return get(getSchema().getTearDownOnShutdown());
     }
 
     /**
@@ -168,7 +159,7 @@ public boolean isTearDownOnShutdown() {
      *            the classpath to be set
      */
     public void setTestPlanClasspath(String text) {
-        setProperty(CLASSPATHS,text);
+        set(getSchema().getTestPlanClasspath(), text);
     }
 
     public void setTestPlanClasspathArray(String[] text) {
@@ -191,7 +182,7 @@ public String[] getTestPlanClasspathArray() {
      * @return classpath
      */
     public String getTestPlanClasspath() {
-        return getPropertyAsString(CLASSPATHS);
+        return get(getSchema().getTestPlanClasspath());
     }
 
     /**
@@ -200,7 +191,7 @@ public String getTestPlanClasspath() {
      * @return serialized setting
      */
     public boolean isSerialized() {
-        return getPropertyAsBoolean(SERIALIZE_THREADGROUPS);
+        return get(getSchema().getSerializeThreadgroups());
     }
 
     public void addParameter(String name, String value) {
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
new file mode 100644
index 00000000000..3bf1d410cc2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+import org.apache.jmeter.config.Arguments
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [TestPlan].
+ * @see TestPlan
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class TestPlanSchema protected constructor() : TestElementSchema() {
+    public companion object INSTANCE : TestPlanSchema()
+
+    public val functionalMode: BooleanPropertyDescriptor<TestPlanSchema> =
+        boolean("TestPlan.functional_mode")
+
+    public val serializeThreadgroups: BooleanPropertyDescriptor<TestPlanSchema> =
+        boolean("TestPlan.serialize_threadgroups")
+
+    public val tearDownOnShutdown: BooleanPropertyDescriptor<TestPlanSchema> =
+        boolean("TestPlan.tearDown_on_shutdown", false)
+
+    public val userDefinedVariables: TestElementPropertyDescriptor<TestPlanSchema, Arguments> =
+        testElement("TestPlan.user_defined_variables")
+
+    public val testPlanClasspath: StringPropertyDescriptor<TestPlanSchema> =
+        string("TestPlan.user_define_classpath")
+}

From 5bb56691f93bb7c6b6bee03a2f9a66a562199f51 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 31 May 2023 21:12:41 +0300
Subject: [PATCH 0518/1037] feat: support properties and expressions for HTTP
 Sampler use_keepalive, use_multipart_post, and browser_compatible_multipart

fixes https://github.com/apache/jmeter/issues/1252
---
 .../http/config/gui/UrlConfigGui.java         | 46 ++++++++++---------
 .../http/sampler/HTTPSamplerBase.java         | 36 ++++++++++-----
 .../http/sampler/HTTPSamplerBaseSchema.kt     | 44 ++++++++++++++++++
 3 files changed, 93 insertions(+), 33 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index fa00b72bfb7..5a591a50522 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -32,12 +32,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel;
 import org.apache.jmeter.protocol.http.gui.HTTPFileArgsPanel;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
@@ -90,11 +92,11 @@ public class UrlConfigGui extends JPanel implements ChangeListener {
 
     private JCheckBox autoRedirects;
 
-    private JCheckBox useKeepAlive;
+    private JBooleanPropertyEditor useKeepAlive;
 
-    private JCheckBox useMultipart;
+    private JBooleanPropertyEditor useMultipart;
 
-    private JCheckBox useBrowserCompatibleMultipartMode;
+    private JBooleanPropertyEditor useBrowserCompatibleMultipartMode;
 
     private JLabeledChoice method;
 
@@ -158,9 +160,8 @@ public void clear() {
             followRedirects.setSelected(getUrlConfigDefaults().isFollowRedirects());
             autoRedirects.setSelected(getUrlConfigDefaults().isAutoRedirects());
             method.setText(getUrlConfigDefaults().getDefaultMethod());
-            useKeepAlive.setSelected(getUrlConfigDefaults().isUseKeepAlive());
-            useMultipart.setSelected(getUrlConfigDefaults().isUseMultipart());
-            useBrowserCompatibleMultipartMode.setSelected(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
+            useKeepAlive.setBooleanValue(getUrlConfigDefaults().isUseKeepAlive());
+            useBrowserCompatibleMultipartMode.setBooleanValue(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
         }
         path.setText(""); // $NON-NLS-1$
         port.setText(""); // $NON-NLS-1$
@@ -225,11 +226,9 @@ public void modifyTestElement(TestElement element) {
             element.setProperty(HTTPSamplerBase.METHOD, method.getText());
             element.setProperty(new BooleanProperty(HTTPSamplerBase.FOLLOW_REDIRECTS, followRedirects.isSelected()));
             element.setProperty(new BooleanProperty(HTTPSamplerBase.AUTO_REDIRECTS, autoRedirects.isSelected()));
-            element.setProperty(new BooleanProperty(HTTPSamplerBase.USE_KEEPALIVE, useKeepAlive.isSelected()));
-            element.setProperty(new BooleanProperty(HTTPSamplerBase.DO_MULTIPART_POST, useMultipart.isSelected()));
-            element.setProperty(HTTPSamplerBase.BROWSER_COMPATIBLE_MULTIPART,
-                    useBrowserCompatibleMultipartMode.isSelected(),
-                    HTTPSamplerBase.BROWSER_COMPATIBLE_MULTIPART_MODE_DEFAULT);
+            useKeepAlive.updateElement(element);
+            useMultipart.updateElement(element);
+            useBrowserCompatibleMultipartMode.updateElement(element);
         }
     }
 
@@ -308,10 +307,9 @@ public void configure(TestElement el) {
             method.setText(el.getPropertyAsString(HTTPSamplerBase.METHOD));
             followRedirects.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.FOLLOW_REDIRECTS));
             autoRedirects.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.AUTO_REDIRECTS));
-            useKeepAlive.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.USE_KEEPALIVE));
-            useMultipart.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.DO_MULTIPART_POST));
-            useBrowserCompatibleMultipartMode.setSelected(el.getPropertyAsBoolean(
-                    HTTPSamplerBase.BROWSER_COMPATIBLE_MULTIPART, HTTPSamplerBase.BROWSER_COMPATIBLE_MULTIPART_MODE_DEFAULT));
+            useKeepAlive.updateUi(el);
+            useMultipart.updateUi(el);
+            useBrowserCompatibleMultipartMode.updateUi(el);
         }
     }
 
@@ -391,19 +389,25 @@ protected Component getPathPanel() {
             autoRedirects.setSelected(getUrlConfigDefaults().isAutoRedirects());// Default changed in 2.3 and again in 2.4
             autoRedirects.setVisible(getUrlConfigDefaults().isAutoRedirectsVisible());
 
-            useKeepAlive = new JCheckBox(JMeterUtils.getResString("use_keepalive")); // $NON-NLS-1$
+            useKeepAlive = new JBooleanPropertyEditor(
+                    HTTPSamplerBaseSchema.INSTANCE.getUseKeepalive(),
+                    JMeterUtils.getResString("use_keepalive"));
             JFactory.small(useKeepAlive);
-            useKeepAlive.setSelected(getUrlConfigDefaults().isUseKeepAlive());
+            useKeepAlive.setBooleanValue(getUrlConfigDefaults().isUseKeepAlive());
             useKeepAlive.setVisible(getUrlConfigDefaults().isUseKeepAliveVisible());
 
-            useMultipart = new JCheckBox(JMeterUtils.getResString("use_multipart_for_http_post")); // $NON-NLS-1$
+            useMultipart = new JBooleanPropertyEditor(
+                    HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost(),
+                    JMeterUtils.getResString("use_multipart_for_http_post")); // $NON-NLS-1$
             JFactory.small(useMultipart);
-            useMultipart.setSelected(getUrlConfigDefaults().isUseMultipart());
+            useMultipart.setBooleanValue(getUrlConfigDefaults().isUseMultipart());
             useMultipart.setVisible(getUrlConfigDefaults().isUseMultipartVisible());
 
-            useBrowserCompatibleMultipartMode = new JCheckBox(JMeterUtils.getResString("use_multipart_mode_browser")); // $NON-NLS-1$
+            useBrowserCompatibleMultipartMode = new JBooleanPropertyEditor(
+                    HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart(),
+                    JMeterUtils.getResString("use_multipart_mode_browser")); // $NON-NLS-1$
             JFactory.small(useBrowserCompatibleMultipartMode);
-            useBrowserCompatibleMultipartMode.setSelected(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
+            useBrowserCompatibleMultipartMode.setBooleanValue(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
             useBrowserCompatibleMultipartMode.setVisible(getUrlConfigDefaults().isUseBrowserCompatibleMultipartModeVisible());
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index dae016f253d..1706587d21c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -85,6 +85,7 @@
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
@@ -165,7 +166,7 @@ public abstract class HTTPSamplerBase extends AbstractSampler
 
     public static final String PATH = "HTTPSampler.path"; // $NON-NLS-1$
 
-    public static final String FOLLOW_REDIRECTS = "HTTPSampler.follow_redirects"; // $NON-NLS-1$
+    public static final String FOLLOW_REDIRECTS = HTTPSamplerBaseSchema.INSTANCE.getFollowRedirects().getName();
 
     public static final String AUTO_REDIRECTS = "HTTPSampler.auto_redirects"; // $NON-NLS-1$
 
@@ -184,11 +185,12 @@ public abstract class HTTPSamplerBase extends AbstractSampler
 
     public static final String IP_SOURCE_TYPE = "HTTPSampler.ipSourceType"; // $NON-NLS-1$
 
-    public static final String USE_KEEPALIVE = "HTTPSampler.use_keepalive"; // $NON-NLS-1$
+    public static final String USE_KEEPALIVE = HTTPSamplerBaseSchema.INSTANCE.getUseKeepalive().getName();
 
-    public static final String DO_MULTIPART_POST = "HTTPSampler.DO_MULTIPART_POST"; // $NON-NLS-1$
+    public static final String DO_MULTIPART_POST = HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost().getName();
 
-    public static final String BROWSER_COMPATIBLE_MULTIPART  = "HTTPSampler.BROWSER_COMPATIBLE_MULTIPART"; // $NON-NLS-1$
+    public static final String BROWSER_COMPATIBLE_MULTIPART =
+            HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart().getName();
 
     public static final String CONCURRENT_DWN = "HTTPSampler.concurrentDwn"; // $NON-NLS-1$
 
@@ -353,6 +355,16 @@ protected HTTPSamplerBase() {
         setArguments(new Arguments());
     }
 
+    @Override
+    public HTTPSamplerBaseSchema getSchema() {
+        return HTTPSamplerBaseSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends HTTPSamplerBase, ? extends HTTPSamplerBaseSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     public enum SourceType {
         HOSTNAME("web_testing_source_ip_hostname"), //$NON-NLS-1$
         DEVICE("web_testing_source_ip_device"), //$NON-NLS-1$
@@ -515,11 +527,11 @@ public String getPath() {
     }
 
     public void setFollowRedirects(boolean value) {
-        setProperty(new BooleanProperty(FOLLOW_REDIRECTS, value));
+        set(getSchema().getFollowRedirects(), value);
     }
 
     public boolean getFollowRedirects() {
-        return getPropertyAsBoolean(FOLLOW_REDIRECTS);
+        return get(getSchema().getFollowRedirects());
     }
 
     public void setAutoRedirects(boolean value) {
@@ -556,11 +568,11 @@ public String getContentEncoding() {
     }
 
     public void setUseKeepAlive(boolean value) {
-        setProperty(new BooleanProperty(USE_KEEPALIVE, value));
+        set(getSchema().getUseKeepalive(), value);
     }
 
     public boolean getUseKeepAlive() {
-        return getPropertyAsBoolean(USE_KEEPALIVE);
+        return get(getSchema().getUseKeepalive());
     }
 
     /**
@@ -582,19 +594,19 @@ public boolean getDoMultipartPost() {
     }
 
     public void setDoMultipart(boolean value) {
-        setProperty(new BooleanProperty(DO_MULTIPART_POST, value));
+        set(getSchema().getUseMultipartPost(), value);
     }
 
     public boolean getDoMultipart() {
-        return getPropertyAsBoolean(DO_MULTIPART_POST, false);
+        return get(getSchema().getUseMultipartPost());
     }
 
     public void setDoBrowserCompatibleMultipart(boolean value) {
-        setProperty(BROWSER_COMPATIBLE_MULTIPART, value, BROWSER_COMPATIBLE_MULTIPART_MODE_DEFAULT);
+        set(getSchema().getUseBrowserCompatibleMultipart(), value);
     }
 
     public boolean getDoBrowserCompatibleMultipart() {
-        return getPropertyAsBoolean(BROWSER_COMPATIBLE_MULTIPART, BROWSER_COMPATIBLE_MULTIPART_MODE_DEFAULT);
+        return get(getSchema().getUseBrowserCompatibleMultipart());
     }
 
     public void setMonitor(String value) {
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
new file mode 100644
index 00000000000..fbfe9a7bbbc
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HTTPSamplerBase].
+ * @see HTTPSamplerBase
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class HTTPSamplerBaseSchema : TestElementSchema() {
+    public companion object INSTANCE : HTTPSamplerBaseSchema()
+
+    public val followRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
+        boolean("HTTPSampler.follow_redirects")
+
+    public val useKeepalive: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
+        boolean("HTTPSampler.use_keepalive")
+
+    public val useMultipartPost: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
+        boolean("HTTPSampler.DO_MULTIPART_POST")
+
+    public val useBrowserCompatibleMultipart: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
+        boolean("HTTPSampler.BROWSER_COMPATIBLE_MULTIPART", default = false)
+}

From 4e5b9df4579489f13d4c4ca3da4ff4ca6bc06c03 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 6 Jun 2023 12:54:41 +0300
Subject: [PATCH 0519/1037] chore: bump vlsi-release-plugins to 1.89

It should reduce the number of created threads, and it should resolve
UnsupportedOperationException when filesystem contains inaccessible files.
---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 build-logic/gradle.properties                 | 4 ++--
 build-logic/jvm/build.gradle.kts              | 4 ++--
 build-logic/root-build/build.gradle.kts       | 6 +++---
 build-logic/verification/build.gradle.kts     | 4 ++--
 gradle.properties                             | 4 ++--
 settings.gradle.kts                           | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 90eed2e3997..6278bab90aa 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("org.gradlex.build-parameters") version "1.4.3"
-    id("com.github.vlsi.gradle-extensions") version "1.88"
+    id("com.github.vlsi.gradle-extensions") version "1.89"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
 
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
index ca3a5f9a95c..1e5396a5a99 100644
--- a/build-logic/gradle.properties
+++ b/build-logic/gradle.properties
@@ -15,5 +15,5 @@
 # limitations under the License.
 #
 
-com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
-com.github.vlsi.checksum-dependency.version=1.88
+com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
+com.github.vlsi.checksum-dependency.version=1.89
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 493223adb11..973bc9274f0 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     api(projects.buildParameters)
     api(projects.verification)
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.89")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.21")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 5e3d3e23bd8..10fbdf5503c 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -22,9 +22,9 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.88")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.89")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.89")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 1cc69841eb5..cdd40c71edc 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -24,8 +24,8 @@ dependencies {
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.14")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.88")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.88")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.89")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.27")
diff --git a/gradle.properties b/gradle.properties
index baa0755d586..1633723884c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,8 +34,8 @@ kotlin.code.style=official
 jmeter.version=5.6
 
 # Plugins
-com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
-com.github.vlsi.checksum-dependency.version=1.88
+com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
+com.github.vlsi.checksum-dependency.version=1.89
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 62aaa53a422..1c613ef91bf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,7 +20,7 @@ import java.util.*
 
 pluginManagement {
     plugins {
-        id("com.github.vlsi.stage-vote-release") version "1.88"
+        id("com.github.vlsi.stage-vote-release") version "1.89"
     }
 }
 

From 8fe60243b3c879087f8b20dec361eb6aa1be005a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 7 Jun 2023 19:06:55 +0300
Subject: [PATCH 0520/1037] doc: use PR#<num> references instead of Pull
 request #<num> in the docs to make changelog cleaner

---
 xdocs/stylesheets/website-style.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index 9832f58a930..ac1fa44a49e 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -568,14 +568,14 @@
 
   <xsl:template match="pr">
     <a href="https://github.com/apache/jmeter/pull/{./text()}">
-      Pull request #<xsl:value-of select="./text()" />
+      PR#<xsl:value-of select="./text()" />
     </a>
     <xsl:call-template name="issue_separator"/>
   </xsl:template>
 
   <xsl:template match="issue">
     <a href="https://github.com/apache/jmeter/issues/{./text()}">
-      Issue #<xsl:value-of select="./text()" />
+      Issue#<xsl:value-of select="./text()" />
     </a>
     <xsl:call-template name="issue_separator"/>
   </xsl:template>

From f4d312c26f0b859f8a68007c4c5e649d259998aa Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 7 Jun 2023 19:17:31 +0300
Subject: [PATCH 0521/1037] UI: force relayout when
 CardLayoutWithSizeOfCurrentVisibleElement changes visible element

By default, CardLayout consumes the space which accomodates all its children,
however CardLayoutWithSizeOfCurrentVisibleElement consumes only the space
needed for the currently visible element.

That is why CardLayout does not need to trigger layout on changes.

Fixes https://github.com/apache/jmeter/pull/5944#issuecomment-1580212591
---
 ...rdLayoutWithSizeOfCurrentVisibleElement.kt | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
index 21101a0f570..33cdc807645 100644
--- a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/CardLayoutWithSizeOfCurrentVisibleElement.kt
@@ -47,4 +47,34 @@ public class CardLayoutWithSizeOfCurrentVisibleElement : CardLayout() {
         size.width + insets.left + insets.right + hgap * 2,
         size.height + insets.top + insets.bottom + vgap * 2
     )
+
+    override fun next(parent: Container) {
+        super.next(parent)
+        // Force re-layout since the newly visible element might have different dimensions
+        parent.revalidate()
+    }
+
+    override fun previous(parent: Container) {
+        super.previous(parent)
+        // Force re-layout since the newly visible element might have different dimensions
+        parent.revalidate()
+    }
+
+    override fun first(parent: Container) {
+        super.first(parent)
+        // Force re-layout since the newly visible element might have different dimensions
+        parent.revalidate()
+    }
+
+    override fun last(parent: Container) {
+        super.last(parent)
+        // Force re-layout since the newly visible element might have different dimensions
+        parent.revalidate()
+    }
+
+    override fun show(parent: Container, name: String) {
+        super.show(parent, name)
+        // Force re-layout since the newly visible element might have different dimensions
+        parent.revalidate()
+    }
 }

From cabc3fbe15a71300c9b11fab19d13ff0c4d7373e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 8 Jun 2023 11:15:46 +0300
Subject: [PATCH 0522/1037] chore: use testFixtures sourceset instead of
 depending on all the test classes

This change enables cleaner separation between "actual tests" and "support classes for the tests".

For instance, `:src:core` might provide dummy samplers like `ThreadSleep` for testing purposes.
`ThreadSleep` would depend on `src/test/main` (since it would `extend AbstractSampler`),
 and other modules (e.g. tests in `:src:protocols:http`) might need that `ThreadSleep` sampler.

It won't be practical to create `core-testkit` modules for every module,
so we move those reusable test classes to `testFixtures/...` source set.

See https://docs.gradle.org/current/userguide/java_testing.html#sec:java_test_fixtures
---
 build-logic/build-parameters/build.gradle.kts |  4 ++++
 .../main/kotlin/build-logic.java.gradle.kts   | 22 +++----------------
 .../build-logic.publish-to-central.gradle.kts |  5 +++++
 src/components/build.gradle.kts               |  2 +-
 src/core/build.gradle.kts                     |  9 +++++++-
 .../jmeter/junit/spock/JMeterSpec.groovy      |  0
 .../apache/jmeter/junit/JMeterTestCase.java   |  0
 .../jmeter/junit/JMeterTestCaseJUnit.java     |  0
 .../apache/jmeter/junit/JMeterTestUtils.java  |  0
 .../categories/ExcludeCategoryFilter.java     |  0
 .../jmeter/junit/categories/NeedGuiTests.java |  0
 .../jmeter/junit/stubs/TestSampler.java       |  0
 .../apache/jmeter/resources/PackageTest.java  |  0
 .../resources/ResourceKeyUsageTest.java       |  0
 .../apache/jmeter/samplers/NullSampler.java   |  0
 .../threads/TestJMeterContextService.java     |  0
 .../jmeter/util/JMeterContextExtension.java   |  0
 .../resources/XPathUtilTestXml.xml            |  0
 .../resources/log4j2.xml                      |  0
 src/dist-check/build.gradle.kts               |  4 +++-
 src/dist/build.gradle.kts                     |  6 -----
 src/functions/build.gradle.kts                |  2 +-
 src/jorphan/build.gradle.kts                  |  3 +++
 .../apache/jorphan/test/JMeterSerialTest.java |  0
 src/protocol/bolt/build.gradle.kts            |  2 +-
 src/protocol/ftp/build.gradle.kts             |  2 +-
 src/protocol/http/build.gradle.kts            |  4 +---
 src/protocol/java/build.gradle.kts            |  2 +-
 src/protocol/jdbc/build.gradle.kts            |  2 +-
 src/protocol/jms/build.gradle.kts             |  3 +--
 src/protocol/junit-sample/build.gradle.kts    |  2 +-
 src/protocol/junit/build.gradle.kts           |  2 +-
 src/protocol/ldap/build.gradle.kts            |  2 +-
 src/protocol/mail/build.gradle.kts            |  2 +-
 src/protocol/mongodb/build.gradle.kts         |  2 +-
 src/protocol/native/build.gradle.kts          |  2 +-
 src/protocol/tcp/build.gradle.kts             |  2 +-
 xdocs/usermanual/jmeter_tutorial.xml          |  1 +
 38 files changed, 42 insertions(+), 45 deletions(-)
 rename src/core/src/{test => testFixtures}/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/JMeterTestCase.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/JMeterTestUtils.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/categories/NeedGuiTests.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/junit/stubs/TestSampler.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/resources/PackageTest.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/samplers/NullSampler.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/threads/TestJMeterContextService.java (100%)
 rename src/core/src/{test => testFixtures}/java/org/apache/jmeter/util/JMeterContextExtension.java (100%)
 rename src/core/src/{test => testFixtures}/resources/XPathUtilTestXml.xml (100%)
 rename src/core/src/{test => testFixtures}/resources/log4j2.xml (100%)
 rename src/{core/src/test => jorphan/src/testFixtures}/java/org/apache/jorphan/test/JMeterSerialTest.java (100%)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 6278bab90aa..b160323b603 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -65,6 +65,10 @@ buildParameters {
         defaultValue.set(true)
         description.set("Skip forbidden-apis verifications")
     }
+    bool("suppressPomMetadataWarnings") {
+        defaultValue.set(true)
+        description.set("Skip suppressPomMetadataWarningsFor warnings triggered by inability to map test fixtures dependences to Maven pom.xml")
+    }
     bool("enableErrorprone") {
         // By default, disable errorProne in CI so we don't perform the same checks in several jobs
         defaultValue.set(System.getenv("CI") != "true")
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 1ba372687af..df91b33dd10 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -55,6 +55,9 @@ dependencies {
     }
     findProject(":src:bom-testing")?.let{
         testImplementation(platform(it))
+        plugins.withId("java-test-fixtures") {
+            "testFixturesImplementation"(platform(it))
+        }
     }
     findProject(":src:bom-thirdparty")?.let{
         api(platform(it))
@@ -149,22 +152,3 @@ tasks.configureEach<Jar> {
         attributes["Implementation-Version"] = rootProject.version
     }
 }
-
-// <editor-fold defaultstate="collapsed" desc="TODO: remove dependencies between testClasses of the different projects">
-val testClasses by configurations.creating {
-}
-
-if (file("src/test").isDirectory) {
-    // Do not generate test jars when src/test folder is missing (e.g. "config.jar")
-    val testJar by tasks.registering(Jar::class) {
-        val sourceSets: SourceSetContainer by project
-        archiveClassifier.set("test")
-        from(sourceSets["test"].output)
-    }
-
-    // Parenthesis needed to use Project#getArtifacts
-    (artifacts) {
-        testClasses(testJar)
-    }
-}
-// </editor-fold>
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
index b3b1d25e468..2a67d64ee6f 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
@@ -17,6 +17,7 @@
 
 plugins {
     id("maven-publish")
+    id("build-logic.build-params")
     id("build-logic.publish-to-tmp-maven-repo")
 }
 
@@ -24,6 +25,10 @@ val repoUrl = "https://github.com/apache/jmeter"
 
 publishing {
     publications.withType<MavenPublication>().configureEach {
+        if (buildParameters.suppressPomMetadataWarnings) {
+            suppressPomMetadataWarningsFor("testFixturesApiElements")
+            suppressPomMetadataWarningsFor("testFixturesRuntimeElements")
+        }
         // Use the resolved versions in pom.xml
         // Gradle might have different resolution rules, so we set the versions
         // that were used in Gradle build/test.
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 6c7c6e316ae..272bf4cdb1f 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     api(projects.src.core)
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 
     api("org.apache-extras.beanshell:bsh") {
         because(
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 7572f30d061..5a5e5c7e48e 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -19,13 +19,14 @@ import com.github.autostyle.gradle.AutostyleTask
 import com.github.vlsi.gradle.ide.IdeExtension
 
 plugins {
+    id("java-test-fixtures")
     id("build-logic.jvm-published-library")
 }
 
 dependencies {
     api(projects.src.launcher)
     api(projects.src.jorphan)
-    testImplementation(project(":src:jorphan", "testClasses"))
+    testImplementation(testFixtures(projects.src.jorphan))
 
     api("bsf:bsf") {
         because("protected BSFManager BSFTestElement#getManager()")
@@ -120,6 +121,12 @@ dependencies {
 
     testImplementation("commons-net:commons-net")
     testRuntimeOnly("org.spockframework:spock-core")
+
+    testFixturesApi(testFixtures(projects.src.jorphan))
+    testFixturesImplementation("junit:junit")
+    testFixturesImplementation("org.spockframework:spock-core")
+    testFixturesImplementation(projects.src.testkit)
+    testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
 
 val generatedVersionDir = File(buildDir, "generated/sources/version")
diff --git a/src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy b/src/core/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
rename to src/core/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestUtils.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestUtils.java
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/categories/NeedGuiTests.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/stubs/TestSampler.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/stubs/TestSampler.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/junit/stubs/TestSampler.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/junit/stubs/TestSampler.java
diff --git a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/NullSampler.java b/src/core/src/testFixtures/java/org/apache/jmeter/samplers/NullSampler.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/samplers/NullSampler.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/samplers/NullSampler.java
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterContextService.java b/src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/threads/TestJMeterContextService.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java
diff --git a/src/core/src/test/java/org/apache/jmeter/util/JMeterContextExtension.java b/src/core/src/testFixtures/java/org/apache/jmeter/util/JMeterContextExtension.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jmeter/util/JMeterContextExtension.java
rename to src/core/src/testFixtures/java/org/apache/jmeter/util/JMeterContextExtension.java
diff --git a/src/core/src/test/resources/XPathUtilTestXml.xml b/src/core/src/testFixtures/resources/XPathUtilTestXml.xml
similarity index 100%
rename from src/core/src/test/resources/XPathUtilTestXml.xml
rename to src/core/src/testFixtures/resources/XPathUtilTestXml.xml
diff --git a/src/core/src/test/resources/log4j2.xml b/src/core/src/testFixtures/resources/log4j2.xml
similarity index 100%
rename from src/core/src/test/resources/log4j2.xml
rename to src/core/src/testFixtures/resources/log4j2.xml
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 5ca291389f3..5486acd4cf9 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -21,6 +21,7 @@ import org.apache.jmeter.buildtools.batchtest.BatchTestServer
 import java.time.Duration
 
 plugins {
+    id("java-test-fixtures")
     id("build-logic.batchtest")
     id("com.github.vlsi.gradle-extensions")
     id("build-logic.jvm-library")
@@ -31,7 +32,8 @@ val loggingClasspath by configurations.creating
 
 dependencies {
     api(projects.src.dist)
-    testImplementation(project(":src:dist", "allTestClasses"))
+
+    testImplementation(testFixtures(projects.src.core))
     testImplementation("org.apache.commons:commons-lang3") {
         because("StringUtils")
     }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 0da859dc64f..dfba9c2f19e 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -80,17 +80,11 @@ val srcLicense by configurations.creating {
     isCanBeConsumed = false
 }
 
-val allTestClasses by configurations.creating {
-    isCanBeConsumed = true
-    isCanBeResolved = false
-}
-
 // Note: you can inspect final classpath (list of jars in the binary distribution)  via
 // gw dependencies --configuration runtimeClasspath
 dependencies {
     for (p in jars) {
         api(project(p))
-        allTestClasses(project(p, "testClasses"))
     }
 
     binLicense(project(":src:licenses", "binLicense"))
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 0673b2a61e1..180dfbf9e7c 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     api(projects.src.components)
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 
     implementation("org.mozilla:rhino")
     implementation("commons-codec:commons-codec")
diff --git a/src/jorphan/build.gradle.kts b/src/jorphan/build.gradle.kts
index ee914aa9e3c..4143caaa938 100644
--- a/src/jorphan/build.gradle.kts
+++ b/src/jorphan/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 plugins {
+    id("java-test-fixtures")
     id("build-logic.jvm-published-library")
 }
 
@@ -28,4 +29,6 @@ dependencies {
     implementation("org.apache.commons:commons-lang3")
     implementation("org.apache.commons:commons-math3")
     implementation("org.apache.commons:commons-text")
+
+    testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
diff --git a/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java b/src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java
similarity index 100%
rename from src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java
rename to src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java
diff --git a/src/protocol/bolt/build.gradle.kts b/src/protocol/bolt/build.gradle.kts
index 3bee4a4d445..431d0d658f1 100644
--- a/src/protocol/bolt/build.gradle.kts
+++ b/src/protocol/bolt/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ftp/build.gradle.kts b/src/protocol/ftp/build.gradle.kts
index c853600ff2d..52a1a5765f2 100644
--- a/src/protocol/ftp/build.gradle.kts
+++ b/src/protocol/ftp/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
         because("StringUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 49d0c0e6354..6e82081a8b1 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     api(projects.src.components) {
         because("we need SearchTextExtension")
     }
-    testImplementation(project(":src:components", "testClasses"))
 
     api("com.thoughtworks.xstream:xstream") {
         because("HTTPResultConverter uses XStream in public API")
@@ -77,6 +76,7 @@ dependencies {
     implementation("com.miglayout:miglayout-swing")
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation(testFixtures(projects.src.core))
     testImplementation(testFixtures(projects.src.testkitWiremock))
     testImplementation("com.github.tomakehurst:wiremock-jre8")
     // For some reason JMeter bundles just tika-core and tika-parsers without transitive
@@ -87,6 +87,4 @@ dependencies {
     runtimeOnly("org.apache.tika:tika-parsers") {
         isTransitive = false
     }
-
-    testImplementation(project(":src:core", "testClasses"))
 }
diff --git a/src/protocol/java/build.gradle.kts b/src/protocol/java/build.gradle.kts
index 4a3cb322ec3..3b10dad423e 100644
--- a/src/protocol/java/build.gradle.kts
+++ b/src/protocol/java/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
         because("IOUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
     testImplementation(projects.src.functions) {
         because("We need __counter function for tests")
     }
diff --git a/src/protocol/jdbc/build.gradle.kts b/src/protocol/jdbc/build.gradle.kts
index 936a3ac110d..3503b81c607 100644
--- a/src/protocol/jdbc/build.gradle.kts
+++ b/src/protocol/jdbc/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
         because("IOUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/jms/build.gradle.kts b/src/protocol/jms/build.gradle.kts
index 4479af072af..dda2009c79b 100644
--- a/src/protocol/jms/build.gradle.kts
+++ b/src/protocol/jms/build.gradle.kts
@@ -22,7 +22,6 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    testImplementation(project(":src:core", "testClasses"))
     api("com.github.ben-manes.caffeine:caffeine") {
         because("MessageRenderer#getValueFromFile(..., caffeine.cache.Cache)")
     }
@@ -37,5 +36,5 @@ dependencies {
     }
     implementation("com.miglayout:miglayout-swing")
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/junit-sample/build.gradle.kts b/src/protocol/junit-sample/build.gradle.kts
index 66de3f9e8e5..9b1760442d6 100644
--- a/src/protocol/junit-sample/build.gradle.kts
+++ b/src/protocol/junit-sample/build.gradle.kts
@@ -24,5 +24,5 @@ dependencies {
 
     api("junit:junit")
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/junit/build.gradle.kts b/src/protocol/junit/build.gradle.kts
index f56ec620813..4f291a368da 100644
--- a/src/protocol/junit/build.gradle.kts
+++ b/src/protocol/junit/build.gradle.kts
@@ -31,5 +31,5 @@ dependencies {
     }
     implementation("com.miglayout:miglayout-swing")
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ldap/build.gradle.kts b/src/protocol/ldap/build.gradle.kts
index 1dd9372f043..482a2259e00 100644
--- a/src/protocol/ldap/build.gradle.kts
+++ b/src/protocol/ldap/build.gradle.kts
@@ -29,5 +29,5 @@ dependencies {
         because("StringUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/mail/build.gradle.kts b/src/protocol/mail/build.gradle.kts
index f4e1f17d7c0..1b37e852da3 100644
--- a/src/protocol/mail/build.gradle.kts
+++ b/src/protocol/mail/build.gradle.kts
@@ -37,5 +37,5 @@ dependencies {
         because("IOUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/mongodb/build.gradle.kts b/src/protocol/mongodb/build.gradle.kts
index f1bef7c0243..bdd7e16ceb5 100644
--- a/src/protocol/mongodb/build.gradle.kts
+++ b/src/protocol/mongodb/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
         because("StringUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/native/build.gradle.kts b/src/protocol/native/build.gradle.kts
index 6288c95d059..faa55ac0b94 100644
--- a/src/protocol/native/build.gradle.kts
+++ b/src/protocol/native/build.gradle.kts
@@ -26,5 +26,5 @@ dependencies {
         because("StringUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/tcp/build.gradle.kts b/src/protocol/tcp/build.gradle.kts
index 4f4211d0745..a4f388fc3f5 100644
--- a/src/protocol/tcp/build.gradle.kts
+++ b/src/protocol/tcp/build.gradle.kts
@@ -29,5 +29,5 @@ dependencies {
         because("IOUtils")
     }
 
-    testImplementation(project(":src:core", "testClasses"))
+    testImplementation(testFixtures(projects.src.core))
 }
diff --git a/xdocs/usermanual/jmeter_tutorial.xml b/xdocs/usermanual/jmeter_tutorial.xml
index 04dfec7578f..1f7ff285fb7 100644
--- a/xdocs/usermanual/jmeter_tutorial.xml
+++ b/xdocs/usermanual/jmeter_tutorial.xml
@@ -97,6 +97,7 @@ The folders inside of <code>apache-jmeter</code>
   <dt><code>lib/ext</code></dt><dd>contains the core jar files for JMeter and the protocols</dd>
   <dt><code>src</code></dt><dd>contains subdirectory for each protocol and component</dd>
   <dt><code>src/*/test</code></dt><dd>unit test related directory</dd>
+  <dt><code>src/testFixtures</code></dt><dd>Directory that contains test-related code that might be reused in other modules</dd>
   <dt><code>xdocs</code></dt><dd>XML files for documentation. JMeter generates its documentation from XML.</dd>
 </dl>
 

From 9793459774fcdc4e0d69c05349a6e9a46edc6de8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 14 Jun 2023 13:31:46 +0300
Subject: [PATCH 0523/1037] perf: add PropertyIteratorImpl.EMPTY_ITERATOR when
 iterating over an empty collection

---
 .../org/apache/jmeter/testelement/AbstractTestElement.java     | 3 +++
 .../apache/jmeter/testelement/property/AbstractProperty.java   | 3 +++
 .../jmeter/testelement/property/PropertyIteratorImpl.java      | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 6bbf3bad48d..2361b26fead 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -589,6 +589,9 @@ public PropertyIterator propertyIterator() {
         // Note: can't use ConcurrentMap here as it would return elements in unpredictable order
         readLock();
         try {
+            if (propMap.isEmpty()) {
+                return PropertyIteratorImpl.EMPTY_ITERATOR;
+            }
             // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
             return new PropertyIteratorImpl(this, propMap.values());
         } finally {
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
index 37fc659d817..0b0ff4ef6c4 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
@@ -77,6 +77,9 @@ public void setRunningVersion(boolean runningVersion) {
     }
 
     protected PropertyIterator getIterator(Collection<JMeterProperty> values) {
+        if (values.isEmpty()) {
+            return PropertyIteratorImpl.EMPTY_ITERATOR;
+        }
         return new PropertyIteratorImpl(values);
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
index 6f54e598b9d..ca043f5f9b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java
@@ -18,11 +18,13 @@
 package org.apache.jmeter.testelement.property;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 
 import org.apache.jmeter.testelement.TestElement;
 
 public class PropertyIteratorImpl implements PropertyIterator {
+    public static final PropertyIterator EMPTY_ITERATOR = new PropertyIteratorImpl(Collections.emptyList());
 
     private final TestElement owner;
     private final Iterator<? extends JMeterProperty> iter;

From 88423edfb1a354a6170ca608d3fb074bb5b7f2ff Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 14 Jun 2023 12:27:45 +0300
Subject: [PATCH 0524/1037] fix: AbstractTestElement#clone might produce
 non-identical clones if element constructor adds a non-default property value

Historically AbstractTestElement calls default constructor in order to create a clone.
It might be that a constructor would add properties (e.g. LoopController,
HeaderManager), so we might get invalid clones if the clone source
_removes_ a property which was added in the constructor.
---
 .../testelement/AbstractTestElement.java      |  9 ++++
 .../testelement/AbstractTestElementTest.kt    | 53 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 3 files changed, 63 insertions(+)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 2361b26fead..eb3766dd9f1 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -121,6 +121,15 @@ public Object clone() {
         try {
             TestElement clonedElement = this.getClass().getDeclaredConstructor().newInstance();
 
+            // Default constructor might be configuring non-default properties, and we want
+            // the clone to be identical to the source, so we remove properties before copying.
+            // For example, LoopController in JMeter 5.5
+            // Note: clonedElement.clear(); might set unwanted options as well.
+            PropertyIterator clonedProps = clonedElement.propertyIterator();
+            while (clonedProps.hasNext()) {
+                clonedProps.next();
+                clonedProps.remove();
+            }
             PropertyIterator iter = propertyIterator();
             while (iter.hasNext()) {
                 clonedElement.setProperty(iter.next().clone());
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt
new file mode 100644
index 00000000000..10347c23a2a
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class AbstractTestElementTest {
+    @Test
+    fun `clone can remove properties`() {
+        class ElementWithDefaultComment : AbstractTestElement() {
+            init {
+                set(TestElementSchema.comments, "initialized in constructor")
+            }
+        }
+
+        val source = ElementWithDefaultComment().apply {
+            removeProperty(TestElementSchema.comments.name)
+        }
+
+        val cloned = source.clone() as ElementWithDefaultComment
+
+        cloned.propertyIterator().asSequence().toList()
+
+        assertEquals(
+            source.propertyIterator().asSequence().toList().joinToString("\n") { it.name + " = " + it.stringValue },
+            cloned.propertyIterator().asSequence().toList().joinToString("\n") { it.name + " = " + it.stringValue },
+        ) {
+            "The properties after cloning the element should match the original properites. " +
+                "Note that comments is added in constructor, however, we remove <<comments>> property before cloning"
+        }
+
+        assertEquals(source, cloned) {
+            "The cloned element should be be equal the original element. " +
+                "Note that comments is added in constructor, however, we remove <<comments>> property before cloning"
+        }
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4a295d713f7..8d169f75e4a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -230,6 +230,7 @@ Summary
   <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
   <li><pr>693</pr>Avoid wrong results when <code>Object.hashCode()</code> happen to collide. Use <code>IdentityHashMap</code> instead of <code>HashMap</code> when key is <code>TestElement</code></li>
   <li>Refresh UI when dragging JMeter window from one monitor to another, so rich syntax text areas are properly editable after window movement</li>
+  <li><pr>5984</pr><code>AbstractTestElement#clone</code> might produce non-identical clones if element constructor adds a non-default property value</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From ff8d401b2a2dbec44354676dc0c7345879d7de12 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 11 Jun 2023 11:45:20 +0300
Subject: [PATCH 0525/1037] feat: add TestElement.remove(PropertyDescriptor),
 TestElement.getOrNull(..)

---
 .../apache/jmeter/testelement/TestElement.kt  | 51 ++++++++++++++++---
 .../schema/ClassPropertyDescriptor.kt         |  6 +++
 .../schema/CollectionPropertyDescriptor.kt    |  6 +++
 .../schema/TestElementPropertyDescriptor.kt   |  6 +++
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index b8fbec60fce..4461d5abb74 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -411,11 +411,19 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun <ValueClass : Any> get(property: ClassPropertyDescriptor<*, ValueClass>): Class<out ValueClass> =
+        getOrNull(property) ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+
+    /**
+     * Retrieve [Class] property value, or return `null` in case the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun <ValueClass : Any> getOrNull(property: ClassPropertyDescriptor<*, ValueClass>): Class<out ValueClass>? =
         getPropertyOrNull(property)?.objectValue?.let {
             Class.forName(getString(property), false, Thread.currentThread().contextClassLoader)
                 .asSubclass(property.klass)
         } ?: property.defaultValue
-            ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
 
     /**
      * Set property as [Class], or remove it if the given value matches the default one for the property.
@@ -430,6 +438,17 @@ public interface TestElement : Cloneable {
         }
     }
 
+    /**
+     * Retrieve [TestElement] property value, or return null in case the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun <TestElementClass : TestElement> getOrNull(
+        property: TestElementPropertyDescriptor<*, TestElementClass>
+    ): TestElementClass? =
+        getPropertyOrNull(property)?.objectValue?.let { property.klass.cast(it) }
+
     /**
      * Retrieve [TestElement] property value, or throw [NoSuchElementException] in case the property is unset.
      * @throws NoSuchElementException if the property is unset
@@ -440,8 +459,7 @@ public interface TestElement : Cloneable {
     public operator fun <TestElementClass : TestElement> get(
         property: TestElementPropertyDescriptor<*, TestElementClass>
     ): TestElementClass =
-        getPropertyOrNull(property)?.objectValue?.let { property.klass.cast(it) }
-            ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+        getOrNull(property) ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
 
     /**
      * Retrieve [TestElement] property value, or create one and set it the property is unset.
@@ -477,10 +495,19 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun get(property: CollectionPropertyDescriptor<*>): Collection<JMeterProperty> =
+        getOrNull(property) ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+
+    /**
+     * Retrieve [Collection] property value, or return `null` in case the property is unset.
+     * @since 5.6
+     */
+    @JMeterPropertySchemaUnchecked
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun getOrNull(property: CollectionPropertyDescriptor<*>): Collection<JMeterProperty>? =
         getPropertyOrNull(property)?.let {
             @Suppress("UNCHECKED_CAST")
             (it as CollectionProperty).objectValue as Collection<JMeterProperty>
-        } ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
+        }
 
     /**
      * Retrieve [Collection] property value, or create one and set it the property is unset.
@@ -492,10 +519,7 @@ public interface TestElement : Cloneable {
         property: CollectionPropertyDescriptor<*>,
         ifMissing: () -> Collection<JMeterProperty>
     ): Collection<JMeterProperty> =
-        getPropertyOrNull(property)?.let {
-            @Suppress("UNCHECKED_CAST")
-            (it as CollectionProperty).objectValue as Collection<JMeterProperty>
-        } ?: ifMissing().also { set(property, it) }
+        getOrNull(property) ?: ifMissing().also { set(property, it) }
 
     /**
      * Set property as [Collection], or remove it if the given [Collection] is `null`.
@@ -523,6 +547,17 @@ public interface TestElement : Cloneable {
      */
     public fun removeProperty(key: String)
 
+    /**
+     * Remove property stored under the `key`
+     *
+     * @param key name of the property to be removed
+     * @since 5.6
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6")
+    public fun removeProperty(property: PropertyDescriptor<*, *>) {
+        removeProperty(property.name)
+    }
+
     // lifecycle methods
     public override fun clone(): Any
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
index ddfb0db225d..d892fc29c2f 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
@@ -48,6 +48,12 @@ public class ClassPropertyDescriptor<in Schema : TestElementSchema, ValueClass :
     public operator fun get(target: TestElement): Class<out ValueClass> =
         target[this]
 
+    /**
+     * Retrieve [Class] property value, or return `null` in case the property is unset.
+     */
+    public fun getOrNull(target: TestElement): Class<out ValueClass>? =
+        target.getOrNull(this)
+
     public operator fun set(target: TestElement, klass: Class<out ValueClass>?) {
         target[this] = klass
     }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
index d1f0e1ffdda..81f7ca5b942 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
@@ -48,6 +48,12 @@ public class CollectionPropertyDescriptor<in Schema : TestElementSchema>(
     public operator fun get(target: TestElement): Collection<JMeterProperty> =
         target[this]
 
+    /**
+     * Retrieve [Collection] property value, or return `null` in case the property is unset.
+     */
+    public fun getOrNull(target: TestElement): Collection<JMeterProperty>? =
+        target.getOrNull(this)
+
     /**
      * Retrieve [Collection] property value, or create one and set it the property is unset.
      */
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
index 75b26c3c757..bd2b8b55f3b 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
@@ -49,6 +49,12 @@ public class TestElementPropertyDescriptor<in Schema : TestElementSchema, TestEl
     public operator fun get(target: TestElement): TestElementClass =
         target[this]
 
+    /**
+     * Retrieve [TestElement] property value, or return `null` in case the property is unset.
+     */
+    public fun getOrNull(target: TestElement): TestElementClass? =
+        target.getOrNull(this)
+
     /**
      * Retrieve [TestElement] property value, or create one and set it the property is unset.
      * @since 5.6

From ef61d4eb0e7c9c08b8fa5ad73386a4ac17be804a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 6 Jun 2023 19:16:13 +0300
Subject: [PATCH 0526/1037] feat: add DSL for programmatic test plan creation

---
 ...ModelThreadGroupConfigElementJavaTest.java |  91 ++++++++
 .../OpenModelThreadGroupConfigElementTest.kt  |  47 ++---
 .../org/apache/jmeter/treebuilder/Action.kt   |  26 +++
 .../apache/jmeter/treebuilder/TreeBuilder.kt  | 195 ++++++++++++++++++
 .../jmeter/treebuilder/dsl/TreeBuilders.kt    |  31 +++
 .../jmeter/treebuilder/TreeBuilderTest.kt     | 135 ++++++++++++
 src/dist/build.gradle.kts                     |   3 +
 .../jorphan/collections/ListedHashTree.java   |  15 +-
 xdocs/changes.xml                             |   1 +
 .../usermanual/build-jms-topic-test-plan.xml  |   2 +-
 .../build-programmatic-test-plan.xml          | 168 +++++++++++++++
 xdocs/usermanual/get-started.xml              |   1 +
 xdocs/usermanual/index.xml                    |   2 +
 xdocs/usermanual/listeners.xml                |   2 +-
 14 files changed, 685 insertions(+), 34 deletions(-)
 create mode 100644 src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/treebuilder/dsl/TreeBuilders.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/treebuilder/TreeBuilderTest.kt
 create mode 100644 xdocs/usermanual/build-programmatic-test-plan.xml

diff --git a/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
new file mode 100644
index 00000000000..83c0e60193d
--- /dev/null
+++ b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel;
+
+import static org.apache.jmeter.treebuilder.dsl.TreeBuilders.testTree;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+
+import org.apache.jmeter.control.TestTransactionController;
+import org.apache.jmeter.engine.JMeterEngineException;
+import org.apache.jmeter.engine.StandardJMeterEngine;
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jmeter.modifiers.CounterConfig;
+import org.apache.jmeter.sampler.DebugSampler;
+import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.test.JMeterSerialTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class OpenModelThreadGroupConfigElementJavaTest extends JMeterTestCase implements JMeterSerialTest {
+    /**
+     * Create Test Plan with Open Model Thread Group and Counter Config.
+     */
+    @Test
+    // Un-comment if you want try running the test multiple times locally:
+    // @RepeatedTest(value = 10)
+    void ensure_thread_group_initializes_counter_only_once_for_each_thread()
+            throws JMeterEngineException, ExecutionException, InterruptedException, TimeoutException {
+        TestTransactionController.TestSampleListener listener = new TestTransactionController.TestSampleListener();
+
+        HashTree tree = testTree(b -> {
+            b.add(TestPlan.class, tp -> {
+                b.add(OpenModelThreadGroup.class, tg -> {
+                    tg.setName("Thread Group");
+                    // 5 samples within 100ms
+                    // Then 2 sec pause to let all the threads to finish, especially the ones that start at 99ms
+                    tg.setScheduleString("rate(50 / sec) random_arrivals(100 ms) pause(2 s)");
+                    b.add(listener);
+                    b.add(CounterConfig.class, c -> {
+                        c.setVarName("counter");
+                        c.setIncrement(1);
+                    });
+                    b.add(DebugSampler.class, dbg -> {
+                        dbg.setName("${counter}");
+                        dbg.setDisplayJMeterProperties(false);
+                        dbg.setDisplayJMeterVariables(false);
+                        dbg.setDisplaySystemProperties(false);
+                    });
+                });
+            });
+        });
+        StandardJMeterEngine engine = new StandardJMeterEngine();
+        engine.configure(tree);
+        engine.runTest();
+        engine.awaitTermination(Duration.ofSeconds(10));
+
+        // There's no guarantee that threads execute exactly in order, so we sort
+        // the labels to avoid test failure in case the thread execute out of order.
+        List<String> actual = listener.events.stream()
+                .map(e -> e.getResult().getSampleLabel())
+                .sorted()
+                .collect(Collectors.toList());
+
+        // Use toString for better error message
+        Assertions.assertEquals(
+                "0\n1\n2\n3\n4",
+                String.join("\n", actual),
+                "Test should produce 5 iterations, so ${counter} should yield 0..4"
+        );
+    }
+}
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
index c6e02d6cec7..69537283f04 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -23,10 +23,10 @@ import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.modifiers.CounterConfig
 import org.apache.jmeter.sampler.DebugSampler
 import org.apache.jmeter.testelement.TestPlan
-import org.apache.jorphan.collections.ListedHashTree
+import org.apache.jmeter.treebuilder.dsl.testTree
 import org.apache.jorphan.test.JMeterSerialTest
-import org.junit.Assert
-import org.junit.Test
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 import java.time.Duration
 
 class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest {
@@ -39,34 +39,27 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
     fun `ensure thread group initializes counter only once for each thread`() {
         val listener = TestTransactionController.TestSampleListener()
 
-        val tree = ListedHashTree().apply {
-            add(TestPlan()).apply {
-                val threadGroup = OpenModelThreadGroup().apply {
+        val tree = testTree {
+            TestPlan::class {
+                OpenModelThreadGroup::class {
                     name = "Thread Group"
                     // 5 samples within 100ms
                     // Then 2 sec pause to let all the threads to finish, especially the ones that start at 99ms
                     scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(2 s)"
-                }
-                add(threadGroup).apply {
-                    add(listener)
-                    add(
-                        CounterConfig().apply {
-                            varName = "counter"
-                            increment = 1
-                        }
-                    )
-                    add(
-                        DebugSampler().apply {
-                            name = "\${counter}"
-                            isDisplayJMeterProperties = false
-                            isDisplayJMeterVariables = false
-                            isDisplaySystemProperties = false
-                        }
-                    )
+                    listener()
+                    CounterConfig::class {
+                        varName = "counter"
+                        increment = 1
+                    }
+                    DebugSampler::class {
+                        name = "\${counter}"
+                        isDisplayJMeterProperties = false
+                        isDisplayJMeterVariables = false
+                        isDisplaySystemProperties = false
+                    }
                 }
             }
         }
-
         StandardJMeterEngine().apply {
             configure(tree)
             runTest()
@@ -78,10 +71,10 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
         val actual = listener.events.map { it.result.sampleLabel }.sorted()
 
         // Use toString for better error message
-        Assert.assertEquals(
-            "Counter values should be consequent",
+        Assertions.assertEquals(
             "0\n1\n2\n3\n4",
-            actual.joinToString("\n")
+            actual.joinToString("\n"),
+            "Test should produce 5 iterations, so \${counter} should yield 0..4"
         )
     }
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
new file mode 100644
index 00000000000..ad66ce9ee6f
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.treebuilder
+
+public fun interface Action<in T> : (T) -> Unit {
+    public fun T.execute()
+
+    override operator fun invoke(receiver: T) {
+        receiver.run { execute() }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
new file mode 100644
index 00000000000..cf799f877dd
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.treebuilder
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jorphan.collections.ListedHashTree
+import org.apiguardian.api.API
+import kotlin.reflect.KClass
+
+/**
+ * Provides a programmatic way to build test plans.
+ *
+ * Sample Kotlin:
+ *
+ *     treeBuilder {
+ *         TestPlan::class {
+ *             OpenModelThreadGroup::class {
+ *                 name = "Thread Group"
+ *                 scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(2 s)"
+ *                 +DebugSampler()
+ *             }
+ *         }
+ *     }
+ *
+ * Sample Java:
+ *
+ *     treeBuilder(b -> {
+ *         b.add(TestPlan.class, tp -> {
+ *             b.add(OpenModelThreadGroup.class, tg ->{
+ *                 name = "Thread Group"
+ *                 scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(2 s)"
+ *                 b.add(new DebugSampler());
+ *             });
+ *         });
+ *     });
+ *
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class TreeBuilder {
+    /**
+     * Resulting tree.
+     */
+    public val tree: ListedHashTree = ListedHashTree()
+
+    private var currentSubtreePrivate: ListedHashTree = tree
+
+    /**
+     * Subtree for the currently built element.
+     */
+    public val currentSubtree: ListedHashTree get() = currentSubtreePrivate
+
+    private val elementStackPrivate = mutableListOf<TestElement>()
+
+    /**
+     * Path to the current element from the root.
+     * The first element is the root, and the last element is the recently added one.
+     */
+    public val elementStack: List<TestElement> get() = elementStackPrivate
+
+    public val currentElement: TestElement get() = elementStack.last()
+
+    public val parent: TestElement? get() = elementStack.getOrNull(elementStack.lastIndex - 1)
+
+    /**
+     * Contains the stack of configuration actions. The action will be discarded after the builder scope finishes,
+     * and every scope can contain a list of actions which is null when no actions exist in the scope.
+     */
+    private val actionsStack = mutableListOf<MutableList<Action<TestElement>>?>(null)
+
+    /**
+     * Adds a test element to the test tree.
+     */
+    @JvmName("add")
+    public operator fun TestElement.unaryPlus() {
+        currentSubtreePrivate.add(this)
+        runConfigurations(this)
+    }
+
+    /**
+     * Adds a test element to the test tree.
+     */
+    @JvmName("add")
+    public operator fun <T : TestElement> KClass<T>.unaryPlus() {
+        +this.java
+    }
+
+    /**
+     * Adds a test element to the test tree.
+     */
+    @JvmName("add")
+    public operator fun <T : TestElement> Class<T>.unaryPlus() {
+        +getDeclaredConstructor().newInstance()
+    }
+
+    /**
+     * Creates a test element and adds it to the test tree.
+     * The test element class should have a no-argument constructor.
+     * @param configure block that configures the newly created test element, and optionally adds children elements
+     */
+    @JvmName("add")
+    public operator fun <T : TestElement> KClass<T>.invoke(configure: Action<T> = Action {}) {
+        java(configure)
+    }
+
+    /**
+     * Creates a test element and adds it to the test tree.
+     * The test element class should have a no-argument constructor.
+     * @param configure block that configures the newly created test element, and optionally adds children elements
+     */
+    @JvmName("add")
+    public operator fun <T : TestElement> Class<T>.invoke(configure: Action<T> = Action {}) {
+        getDeclaredConstructor().newInstance()(configure)
+    }
+
+    /**
+     * Adds a test element to the test tree.
+     * @param configure block that configures the test element, and optionally adds children elements
+     */
+    @JvmName("add")
+    public operator fun <T : TestElement> T.invoke(configure: Action<T> = Action {}) {
+        val prevTree = currentSubtreePrivate
+        try {
+            currentSubtreePrivate = currentSubtreePrivate.add(this)
+            elementStackPrivate.add(this)
+            actionsStack.add(null)
+            configure.run { execute() }
+            // Execute configurations after user-provided "constructor" actions were run
+            runConfigurations(this)
+        } finally {
+            currentSubtreePrivate = prevTree
+            elementStackPrivate.removeLast()
+            actionsStack.removeLast()
+        }
+    }
+
+    private fun runConfigurations(testElement: TestElement) {
+        for (actions in actionsStack) {
+            actions?.forEach { it(testElement) }
+        }
+    }
+
+    /**
+     * Add an [Action] that will be executed after each element is added to the tree.
+     */
+    public fun configureAll(configure: Action<TestElement>) {
+        configureEach<TestElement>(configure)
+    }
+
+    /**
+     * Add an [Action] that will be executed after elements of given type (or its subtype) are added to the tree.
+     */
+    public inline fun <reified T : TestElement> configureEach(configure: Action<T>) {
+        configureEach(T::class, configure)
+    }
+
+    /**
+     * Add an [Action] that will be executed after elements of given type (or its subtype) are added to the tree.
+     */
+    public fun <T : TestElement> configureEach(klass: KClass<T>, configure: Action<T>) {
+        configureEach(klass.java, configure)
+    }
+
+    /**
+     * Add an [Action] that will be executed after elements of given type (or its subtype) are added to the tree.
+     */
+    public fun <T : TestElement> configureEach(klass: Class<T>, configure: Action<T>) {
+        // TODO: should we configure already created elements in the scope?
+        var actions = actionsStack.last()
+        if (actions == null) {
+            actions = mutableListOf()
+            actionsStack[actionsStack.lastIndex] = actions
+        }
+        actions += Action {
+            if (klass.isInstance(this)) {
+                configure(klass.cast(this))
+            }
+        }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/dsl/TreeBuilders.kt b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/dsl/TreeBuilders.kt
new file mode 100644
index 00000000000..6b4bd09c3a2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/dsl/TreeBuilders.kt
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("TreeBuilders")
+package org.apache.jmeter.treebuilder.dsl
+
+import org.apache.jmeter.treebuilder.Action
+import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jorphan.collections.ListedHashTree
+import org.apiguardian.api.API
+
+/**
+ * Creates a test tree.
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public fun testTree(body: Action<TreeBuilder>): ListedHashTree =
+    TreeBuilder().apply(body).tree
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/treebuilder/TreeBuilderTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/treebuilder/TreeBuilderTest.kt
new file mode 100644
index 00000000000..1743e980e8e
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/treebuilder/TreeBuilderTest.kt
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.treebuilder
+
+import org.apache.jmeter.reporters.Summariser
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.dsl.testTree
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+class TreeBuilderTest {
+    @Test
+    fun `extending DSL`() {
+        fun TreeBuilder.threadGroup(
+            name: String,
+            numThreads: Int = 1,
+            rampUp: Duration = 3.seconds,
+            body: Action<ThreadGroup>
+        ) {
+            ThreadGroup::class {
+                this.name = name
+                this.numThreads = numThreads
+                this.rampUp = rampUp.inWholeSeconds.toInt()
+                +Summariser::class
+                body(this)
+            }
+        }
+
+        testTree {
+            TestPlan::class {
+                threadGroup(name = "Test Thread", numThreads = 5, rampUp = 1.seconds) {
+                    // other elements
+                }
+            }
+        }
+    }
+
+    @Test
+    fun configureEach() {
+        val tree = testTree {
+            configureEach<TestElement> {
+                name = "sample name"
+            }
+            +TestPlan::class
+        }
+
+        Assertions.assertEquals(
+            "sample name",
+            (tree.list().firstOrNull() as? TestPlan)?.props?.get { name },
+            "Name should be generated by configureEach action"
+        )
+    }
+
+    @Test
+    fun autonumber() {
+        val autonumber = object : Action<TestElement> {
+            private var seq = 1
+
+            override fun TestElement.execute() {
+                name = "$name $seq"
+                seq += 1
+            }
+        }
+
+        val tree = testTree {
+            configureEach<TestElement>(autonumber)
+            TestPlan::class {
+                name = "Named plan"
+            }
+            TestPlan::class {
+                name = "Another plan"
+            }
+            // Unnamed plan
+            +TestPlan::class
+        }
+
+        Assertions.assertEquals(
+            "Named plan 1, Another plan 2,  3",
+            tree.list()
+                .asSequence()
+                .filterIsInstance<TestPlan>()
+                .joinToString { it.name.toString() },
+            "Name should be generated by configureEach action"
+        )
+    }
+
+    @Test
+    fun `hierarchical names`() {
+        val tree = testTree {
+            configureEach<TestElement> {
+                parent?.let {
+                    name = "${it.name} / $name"
+                }
+            }
+            TestPlan::class {
+                name = "Test Plan"
+
+                ThreadGroup::class {
+                    name = "Thread Group"
+
+                    +Summariser::class
+                }
+            }
+        }
+
+        Assertions.assertEquals(
+            "[Test Plan, Test Plan / Thread Group, Test Plan / ]",
+            listOf(
+                tree.list().first().let { (it as TestElement).name },
+                tree.values.first().list().first().let { (it as TestElement).name },
+                tree.values.first().values.first().list().first().let { (it as TestElement).name },
+            ).toString(),
+            "Names should build up hierarchically"
+        )
+    }
+}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index dfba9c2f19e..000f95af264 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -498,6 +498,9 @@ val previewSite by tasks.registering(Sync::class) {
         gitattributes(gitProps)
         siteLayout()
     }
+    doLast {
+        println("Site preview synchronized to $previewSiteDir/index.html")
+    }
 }
 
 val distributionGroup = "distribution"
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
index 8164b82b94e..1539b83acbb 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
@@ -76,6 +76,11 @@ public Object clone() {
         return newTree;
     }
 
+    @Override
+    public ListedHashTree getTree(Object key) {
+        return (ListedHashTree) super.getTree(key);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void set(Object key, Object value) {
@@ -138,27 +143,27 @@ public void replaceKey(Object currentKey, Object newKey) {
 
     /** {@inheritDoc} */
     @Override
-    public HashTree createNewTree() {
+    public ListedHashTree createNewTree() {
         return new ListedHashTree();
     }
 
     /** {@inheritDoc} */
     @Override
-    public HashTree createNewTree(Object key) {
+    public ListedHashTree createNewTree(Object key) {
         return new ListedHashTree(key);
     }
 
     /** {@inheritDoc} */
     @Override
-    public HashTree createNewTree(Collection<?> values) {
+    public ListedHashTree createNewTree(Collection<?> values) {
         return new ListedHashTree(values);
     }
 
     /** {@inheritDoc} */
     @Override
-    public HashTree add(Object key) {
+    public ListedHashTree add(Object key) {
         if (!data.containsKey(key)) {
-            HashTree newTree = createNewTree();
+            ListedHashTree newTree = createNewTree();
             data.put(key, newTree);
             order.add(key);
             return newTree;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 8d169f75e4a..750d22f97b3 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -121,6 +121,7 @@ Summary
   <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
   <li><pr>5944</pr>Add PI for declaring <code>TestElement</code> schemas so element properties are easier to access in code (see <code>TestElementSchema</code>, <code>TestElement#getSchema()</code>, <code>TestElement#getProps()</code>)</li>
   <li><pr>5944</pr>Enable usage of <code>${...}</code> expressions for checkbox controls (see context menus for checkboxes, however, the individual components should be adapted individually)</li>
+  <li><pr>678</pr>Experimental Kotlin and Java DSL for programmatic test plan generation (see <a href="usermanual/build-programmatic-test-plan.html#treebuilder_kotlin_dsl">Creating a plan with Kotlin DSL</a>)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
diff --git a/xdocs/usermanual/build-jms-topic-test-plan.xml b/xdocs/usermanual/build-jms-topic-test-plan.xml
index 4d0cd2b31aa..3d32f04bb41 100644
--- a/xdocs/usermanual/build-jms-topic-test-plan.xml
+++ b/xdocs/usermanual/build-jms-topic-test-plan.xml
@@ -20,7 +20,7 @@
 [
 <!ENTITY sect-num '11'>
 ]>
-<document prev="build-jms-point-to-point-test-plan.html" next="listeners.html" id="$Id$">
+<document prev="build-jms-point-to-point-test-plan.html" next="build-programmatic-test-plan.html" id="$Id$">
 
 <properties>
   <title>User's Manual: Building a JMS (Java Messaging Service) Test Plan</title>
diff --git a/xdocs/usermanual/build-programmatic-test-plan.xml b/xdocs/usermanual/build-programmatic-test-plan.xml
new file mode 100644
index 00000000000..a457e33e9a7
--- /dev/null
+++ b/xdocs/usermanual/build-programmatic-test-plan.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE document>
+<document prev="build-jms-topic-test-plan.html" next="listeners.html" id="$Id$">
+
+  <properties>
+    <title>User's Manual: Building a Test Plan Programmatically</title>
+  </properties>
+
+  <body>
+
+    <section name="Building a Test Plan Programmatically" anchor="building">
+      <note>
+        JMeter 5.6 brings experimental classes and methods to build test plans programmatically, so please feel free to provide your feedback.
+      </note>
+      <p>In this section, you will learn how to create a <a href="build-test-plan.html">Test Plan</a> with JMeter APIs.</p>
+
+      <p>The Test Plan is a collection of elements arranged in a tree-like manner. However, in JMeter APIs, the elements do not form a tree.
+        Parent-child relationships are stored in a separate structure: <code>ListedHashTree</code>.
+      </p>
+    </section>
+
+    <section name="Creating a plan with low-level APIs" anchor="low_level_api">
+      <p>Let us create <code>Test Plan =&gt; Thread Group =&gt; Debug Sampler</code> plan</p>
+
+      <p>
+        <source>
+ListedHashTree root = new ListedHashTree(); // (1)
+TestPlan testPlan = new TestPlan();
+ListedHashTree testPlanSubtree = root.add(testPlan); // (2)
+TestPlan threadGroup = new ThreadGroup();
+threadGroup.setName("Search Order Thread Group");
+ListedHashTree threadGroupSubtree = testPlanSubtree.add(threadGroup); // (3)
+DebugSampler debugSampler = new DebugSampler();
+threadGroupSubtree.add(debugSampler);</source>
+        <ul>
+          <li>Firstly, we create the tree at <code>(1)</code></li>
+          <li>Then we create elements, and add them to the tree in <code>(2)</code></li>
+          <li>Note how adding element returns the subtree, so we add <code>threadGroup</code> under <code>testPlan</code> in <code>(2)</code></li>
+        </ul>
+        <note>
+          Don't confuse <code>ListedHashTree</code> with <code>HashTree</code>. <code>HashTree</code> does not honour element order, so the generated elements might shuffle unexpectedly.
+        </note>
+      </p>
+    </section>
+
+    <section name="Creating a plan with Kotlin DSL" anchor="treebuilder_kotlin_dsl">
+      <p>JMeter 5.6 introduces Kotlin DSL which might make it easier to create and maintain test plans as the structure of the code
+        would resemble the structure of the generated test plan tree</p>
+
+      <p>
+        <source>
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.dsl.testTree
+
+val root = testTree { // (1)
+  TestPlan::class { // (2)
+    ThreadGroup::class {
+       name = "Search Order Thread Group"
+       +DebugSampler::class // (3)
+       +DebugSampler() // (4)
+    }
+  }
+}</source>
+        <ul>
+          <li>Firstly, we create a <code>TreeBuilder</code> at <code>(1)</code></li>
+          <li>Then we add elements to the tree in <code>(2)</code>, and populate its children</li>
+          <li>Note how adding element returns the subtree, so we add <code>threadGroup</code> under <code>testPlan</code> in <code>(2)</code></li>
+          <li>If no children needed, the element can be appended to the tree with a unary plus operator as in <code>(3)</code></li>
+          <li>By default, JMeter uses no-argument constructors to create elements, however, you can add <code>TestElement</code> instances to the tree as well, see <code>(4)</code></li>
+        </ul>
+      </p>
+    </section>
+
+    <section name="Extending Kotlin DSL" anchor="extending_treebuilder_kotlin_dsl">
+      <p>As you use the DSL for test plan generation, you might want to factor out the common patterns.
+      For instance, imagine you want factor out <code>Thread Group</code> creation so it always has a <code>Summariser</code> element.</p>
+
+      <p>
+        <source>
+import kotlin.time.Duration.Companion.seconds
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.dsl.testTree
+
+fun TreeBuilder.threadGroup( // (1)
+    name: String,
+    numThreads: Int = 10,
+    rampUp: Duration = 3.seconds,
+    body: Action&lt;ThreadGroup&gt;
+) {
+    ThreadGroup::class { // (2)
+        this.name = name
+        this.numThreads = numThreads
+        this.rampUp = rampUp.inWholeSeconds.toInt()
+        +Summariser::class
+        body(this) // (3)
+    }
+}
+
+fun buildTree() {
+  val root = testTree {
+    TestPlan::class {
+      threadGroup(name = "Search Order Thread Group", rampUp = 1.seconds) { // (4)
+         +DebugSampler::class
+      }
+    }
+  }</source>
+        <ul>
+          <li>Firstly, you can factor test element creation logic as an extension function for <code>TreeBuilder</code> as in <code>(1)</code>.
+          It uses regular DSL to add an element (see <code>(2)</code>), and then it calls the lambda body in <code>(3)</code> to fill thread group children.</li>
+          <li>You can use the extension by calling it when you need it in the test plan, see <code>(4)</code></li>
+          <li>Note how named parameters, and default values keep the code readable</li>
+        </ul>
+      </p>
+    </section>
+
+    <section name="Creating a plan with Java DSL" anchor="treebuilder_java_dsl">
+      <p>JMeter 5.6 introduces Java DSL which might make it easier to create and maintain test plans as the structure of the code
+        would resemble the structure of the generated test plan tree</p>
+
+      <p>
+        <source>
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.threads.ThreadGroup
+import static org.apache.jmeter.treebuilder.dsl.TreeBuilders.testTree
+
+ListedHashTree root = treeBuilder(b -> { // (1)
+  b.add(TestPlan.class, tp -> { // (2)
+    b.add(ThreadGroup.class, tg -> {
+       tg.setName("Search Order Thread Group");
+       b.add(DebugSampler.class); // (3)
+       b.add(new DebugSampler()); // (4)
+    });
+  });
+});</source>
+        <ul>
+          <li>Firstly, we create a <code>TreeBuilder</code> at <code>(1)</code>.
+            Note how this builder reference should be used to append all the elements</li>
+          <li>Then we add elements to the tree in <code>(2)</code>, and populate its children.
+            The lambda parameters correspond to the added elements, so you can configure their properties</li>
+          <li>Note how adding element returns the subtree, so we add <code>threadGroup</code> under <code>testPlan</code> in <code>(2)</code></li>
+          <li>If no children needed, you could omit the lambda parameter as in <code>(3)</code></li>
+          <li>By default, JMeter uses no-argument constructors to create elements, however, you can add <code>TestElement</code> instances to the tree as well, see <code>(4)</code></li>
+        </ul>
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 44f77841e80..9446ef63ac6 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -102,6 +102,7 @@ The other specific Test Plan sections are:
 <li><a href="build-ldap-test-plan.html">LDAP</a></li>
 <li><a href="build-ldapext-test-plan.html">LDAP Extended</a></li>
 <li><a href="build-ws-test-plan.html">WebServices (SOAP)</a></li>
+<li><a href="build-programmatic-test-plan.html">Building Test Plan programmatically</a></li>
 </ul>
 </p>
 <p>Once you are comfortable with building and running JMeter Test Plans, you can look into the
diff --git a/xdocs/usermanual/index.xml b/xdocs/usermanual/index.xml
index 4d5f607e590..1e8ca203fa6 100644
--- a/xdocs/usermanual/index.xml
+++ b/xdocs/usermanual/index.xml
@@ -42,6 +42,7 @@
   <li><a href="#build-ws-test-plan">+</a>...<a href="build-ws-test-plan.html">9. Building a Webservice Test Plan</a></li>
   <li><a href="#build-jms-point-to-point-test-plan">+</a>...<a href="build-jms-point-to-point-test-plan.html">10. Building a JMS Point to point Test Plan</a></li>
   <li><a href="#build-jms-topic-test-plan">+</a>...<a href="build-jms-topic-test-plan.html">11. Building a JMS Topic Test Plan</a></li>
+  <li><a href="#build-programmatic-test-plan">+</a>...<a href="build-programmatic-test-plan.html">11. Building a Test Plan Programmatically</a></li>
   <li><a href="#listeners">+</a>...<a href="listeners.html">12. Listeners</a></li>
   <li><a href="#remote-test">+</a>...<a href="remote-test.html">13. Remote Testing</a></li>
   <li><a href="#generating-dashboard">+</a>...<a href="generating-dashboard.html">14. Dashboard Report</a></li>
@@ -187,6 +188,7 @@
  <li><a name="build-ws-test-plan"/><a href="build-ws-test-plan.html">9. Building a Webservice Test Plan</a></li>
  <li><a name="build-jms-point-to-point-test-plan"/><a href="build-jms-point-to-point-test-plan.html">10. Building a JMS Point to point Test Plan</a></li>
  <li><a name="build-jms-topic-test-plan"/><a href="build-jms-topic-test-plan.html">11. Building a JMS topic Test Plan</a></li>
+ <li><a name="build-programmatic-test-plan"/><a href="build-programmatic-test-plan.html">11. Building a Test Plan Programatically</a></li>
  <li><a name="listeners"/><a href="listeners.html">12. Introduction to Listeners</a></li>
  <li><a name="remote-test"/><a href="remote-test.html">13. Remote Testing</a></li>
  <li><a name="generating-dashboard"/><a href="generating-dashboard.html">14. Dashboard Report</a>
diff --git a/xdocs/usermanual/listeners.xml b/xdocs/usermanual/listeners.xml
index c4d16233533..d915e2f7b63 100644
--- a/xdocs/usermanual/listeners.xml
+++ b/xdocs/usermanual/listeners.xml
@@ -25,7 +25,7 @@
 <!ENTITY vellip   "&#x022EE;" >
 ]>
 
-<document prev="build-jms-topic-test-plan.html" next="remote-test.html" id="$Id$">
+<document prev="build-programmatic-test-plan.html" next="remote-test.html" id="$Id$">
 
 <properties>
   <title>User's Manual: Listeners</title>

From 34e3848a1b77bbf92898cd43baabfa5b62965044 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 7 Jun 2023 22:19:08 +0300
Subject: [PATCH 0527/1037] test: add test that verifies if thread groups
 interrupt the running threads

---
 .../apache/jmeter/testelement/TestElement.kt  |  8 +-
 .../openmodel/ThreadsInterruptAtFinishTest.kt | 80 +++++++++++++++++++
 .../assertions/executePlanAndCollectEvents.kt | 45 +++++++++++
 .../test/samplers/CollectSamplesListener.kt   | 45 +++++++++++
 .../jmeter/test/samplers/ThreadSleep.kt       | 62 ++++++++++++++
 5 files changed, 236 insertions(+), 4 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
 create mode 100644 src/core/src/testFixtures/kotlin/org/apache/jmeter/test/assertions/executePlanAndCollectEvents.kt
 create mode 100644 src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
 create mode 100644 src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 4461d5abb74..1c92a69026c 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -356,7 +356,7 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: LongPropertyDescriptor<*>, value: Long) {
-        removeOrSet(property.defaultValue != value, property.name) {
+        removeOrSet(property.defaultValue == value, property.name) {
             LongProperty(it, value)
         }
     }
@@ -377,7 +377,7 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: FloatPropertyDescriptor<*>, value: Float) {
-        removeOrSet(property.defaultValue != value, property.name) {
+        removeOrSet(property.defaultValue == value, property.name) {
             FloatProperty(it, value)
         }
     }
@@ -398,7 +398,7 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: DoublePropertyDescriptor<*>, value: Double) {
-        removeOrSet(property.defaultValue != value, property.name) {
+        removeOrSet(property.defaultValue == value, property.name) {
             DoubleProperty(it, value)
         }
     }
@@ -433,7 +433,7 @@ public interface TestElement : Cloneable {
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun <ValueClass : Any> set(property: ClassPropertyDescriptor<*, ValueClass>, value: Class<out ValueClass>?) {
-        removeOrSet(value == null || property.defaultValue != value, property.name) {
+        removeOrSet(property.defaultValue == value, property.name) {
             StringProperty(it, value!!.name)
         }
     }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
new file mode 100644
index 00000000000..6e79eb81401
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads.openmodel
+
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.test.samplers.ThreadSleep
+import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.TreeBuilder
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Timeout
+import org.junit.jupiter.api.fail
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.seconds
+
+class ThreadsInterruptAtFinishTest : JMeterTestCase() {
+    @Test
+    @Timeout(5, unit = TimeUnit.SECONDS)
+    fun `openmodel interrupts sleep`() {
+        executePlanAndCollectEvents(10.seconds) {
+            OpenModelThreadGroup::class {
+                scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(1 s)"
+                ThreadSleep::class {
+                    duration = 20.seconds
+                }
+            }
+        }
+    }
+
+    @Test
+    @Disabled("ThreadGroup does not interrupt threads automatically. TODO: make ThreadGroup stop threads on scheduler finish")
+    @Timeout(5, unit = TimeUnit.SECONDS)
+    fun `threadgroup interrupts sleep`() {
+        assertInterruptionsPresent {
+            ThreadGroup::class {
+                numThreads = 5
+                rampUp = 0
+                scheduler = true
+                delay = 0
+                duration = 1
+                setSamplerController(
+                    LoopController().apply {
+                        loops = 1
+                        setContinueForever(false)
+                    }
+                )
+
+                ThreadSleep::class {
+                    duration = 20.seconds
+                }
+            }
+        }
+    }
+
+    private fun assertInterruptionsPresent(testBody: TreeBuilder.() -> Unit) {
+        val events = executePlanAndCollectEvents(10.seconds, testBody)
+        val eventCodes = events.map { it.result.responseCode }
+
+        if ("InterruptedException" !in eventCodes) {
+            fail("There should be at least one result with InterruptedException code. Actual response codes were: $eventCodes")
+        }
+    }
+}
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/assertions/executePlanAndCollectEvents.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/assertions/executePlanAndCollectEvents.kt
new file mode 100644
index 00000000000..dac794ea261
--- /dev/null
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/assertions/executePlanAndCollectEvents.kt
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.test.assertions
+
+import org.apache.jmeter.engine.StandardJMeterEngine
+import org.apache.jmeter.samplers.SampleEvent
+import org.apache.jmeter.test.samplers.CollectSamplesListener
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.dsl.testTree
+import kotlin.time.Duration
+import kotlin.time.toJavaDuration
+
+fun executePlanAndCollectEvents(duration: Duration, testBody: TreeBuilder.() -> Unit): List<SampleEvent> {
+    val listener = CollectSamplesListener()
+
+    val tree = testTree {
+        TestPlan::class {
+            +listener
+            testBody()
+        }
+    }
+    StandardJMeterEngine().apply {
+        configure(tree)
+        runTest()
+        awaitTermination(duration.toJavaDuration())
+    }
+
+    return listener.events
+}
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
new file mode 100644
index 00000000000..05c7aca0d35
--- /dev/null
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.test.samplers
+
+import org.apache.jmeter.reporters.AbstractListenerElement
+import org.apache.jmeter.samplers.SampleEvent
+import org.apache.jmeter.samplers.SampleListener
+import java.util.Collections
+
+/**
+ * Collects [SampleEvent] to a list.
+ */
+class CollectSamplesListener : AbstractListenerElement(), SampleListener {
+    private val mutableEvents: MutableList<SampleEvent> = Collections.synchronizedList(mutableListOf<SampleEvent>())
+
+    // Copy the events to prevent late arrivals after the test has finished
+    val events: List<SampleEvent> get() = mutableEvents.toList()
+
+    override fun sampleOccurred(e: SampleEvent) {
+        mutableEvents += e
+    }
+
+    override fun sampleStarted(e: SampleEvent) {
+        mutableEvents += e
+    }
+
+    override fun sampleStopped(e: SampleEvent) {
+        mutableEvents += e
+    }
+}
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
new file mode 100644
index 00000000000..a77888f8f8b
--- /dev/null
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.test.samplers
+
+import org.apache.jmeter.samplers.AbstractSampler
+import org.apache.jmeter.samplers.Entry
+import org.apache.jmeter.samplers.SampleResult
+import org.apache.jmeter.testelement.TestElementSchema
+import kotlin.time.Duration
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+/**
+ * Sampler that uses explicit [Thread.sleep] in order to verify if thread groups would interrupt the sleep.
+ * Default JMeter's timers might use a different strategy. They might compute the time till
+ * the end of the test, so we can't use timers to reliably verify interrupt behovoir.
+ */
+class ThreadSleep : AbstractSampler() {
+    open class Schema : TestElementSchema() {
+        companion object INSTANCE : Schema()
+
+        val duration = long<Schema>("ThreadSleep.duration")
+    }
+
+    var duration: Duration
+        get() = durationMillis.toDuration(DurationUnit.MILLISECONDS)
+        set(value) {
+            durationMillis = value.inWholeMilliseconds
+        }
+
+    var durationMillis by Schema.duration
+    var durationString by Schema.duration.asString
+
+    override fun sample(e: Entry?): SampleResult {
+        val res = SampleResult()
+        res.sampleStart()
+        try {
+            Thread.sleep(durationMillis)
+            res.responseCode = "Sleep $durationMillis succeeded"
+        } catch (t: InterruptedException) {
+            res.responseCode = "InterruptedException"
+        } finally {
+            res.sampleEnd()
+        }
+        return res
+    }
+}

From 14986056c8b2441ebe4c2edafa996206073cb511 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 8 Jun 2023 11:42:19 +0300
Subject: [PATCH 0528/1037] Open Model Thread Group: interrupt pending HTTP
 requests and other Interruptible test elements on test stop

Previously, OMTG was just issuing java.lang.Thread.interrupt(),
however certain samplers require special treatment.

So now OMTG calls JMeterThread.interrupt() as well, so Interruptible
elements are interrupted as well.
---
 .../threads/openmodel/OpenModelThreadGroup.kt |  7 ++
 .../protocol/http/HttpRequestInterruptTest.kt | 69 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
index a97e2dc2549..167e17f628f 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -175,6 +175,7 @@ public class OpenModelThreadGroup :
                     log.info("Terminating thread {}", thread)
                     // Safe stop the thread
                     thread.stop()
+                    thread.interrupt()
                     // Interrupt it
                     future.cancel(true)
                 }
@@ -261,6 +262,12 @@ public class OpenModelThreadGroup :
         // Graceful stop
         stop()
         log.info("Interrupting the threads")
+        activeThreads.forEach { (thread, future) ->
+            log.info("Interrupting thread {}", thread)
+            // Interrupting the thread
+            thread.interrupt()
+            future.cancel(true)
+        }
         // Interrupting all the threads
         // shutdownNow will interrupt the threads
         executorService?.shutdownNow()?.forEach {
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
new file mode 100644
index 00000000000..ac3f54e9759
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http
+
+import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.get
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
+import com.github.tomakehurst.wiremock.junit5.WireMockTest
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy
+import org.apache.jmeter.samplers.SampleEvent
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Timeout
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+@WireMockTest
+class HttpRequestInterruptTest : JMeterTestCase() {
+    @Test
+    @Timeout(5, unit = TimeUnit.SECONDS)
+    fun `httpClient4 interrupts`(server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            get("/delayed")
+                .willReturn(
+                    aResponse()
+                        .withStatus(200)
+                        .withFixedDelay(1.minutes.inWholeMilliseconds.toInt())
+                )
+        )
+
+        val events = executePlanAndCollectEvents(50.seconds) {
+            OpenModelThreadGroup::class {
+                scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(1 s)"
+                HTTPSamplerProxy::class {
+                    method = "GET"
+                    protocol = "http"
+                    domain = "localhost"
+                    port = server.httpPort
+                    path = "/delayed"
+                }
+            }
+        }
+
+        assertEquals(
+            listOf<SampleEvent>(),
+            events,
+            "No samples expected as all the threads should be interrupted before the request completes"
+        )
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 750d22f97b3..52d5520bee5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -71,6 +71,7 @@ Summary
 <ul>
 <li><issue>5682</issue><pr>717</pr> Open Model Thread Group: avoid skipping rows from CSV Data Set Config</li>
   <li>Support custom thread group implementations in "Add think time" and "Save as test fragment" actions</li>
+  <li>Open Model Thread Group: interrupt pending HTTP requests and other <code>Interruptible</code> test elements on test stop</li>
 </ul>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>

From c0e942fbe4e3734186c7457857353a1ab4982e58 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 8 Jun 2023 17:27:57 +0300
Subject: [PATCH 0529/1037] test: add test for replacing variables in Include
 Controller

See https://github.com/apache/jmeter/pull/679
---
 .../jmeter/control/IncludeControllerTest.kt   | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 src/components/src/test/kotlin/org/apache/jmeter/control/IncludeControllerTest.kt

diff --git a/src/components/src/test/kotlin/org/apache/jmeter/control/IncludeControllerTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/control/IncludeControllerTest.kt
new file mode 100644
index 00000000000..b8e6a350934
--- /dev/null
+++ b/src/components/src/test/kotlin/org/apache/jmeter/control/IncludeControllerTest.kt
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.save.SaveService
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.testelement.TestPlan
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.apache.jmeter.treebuilder.dsl.testTree
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Path
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.outputStream
+import kotlin.time.Duration.Companion.seconds
+
+class IncludeControllerTest : JMeterTestCase() {
+    @TempDir
+    lateinit var tmpDir: Path
+
+    @Test
+    @Disabled("Variables in Include Controllers are not replaced yet")
+    fun `include controller with variables`() {
+        val includedTree = testTree {
+            TestPlan::class {
+                DebugSampler::class {
+                    name = "imported sampler"
+                }
+            }
+        }
+
+        val includedFile = tmpDir.resolve("included.jmx")
+
+        includedFile.outputStream().buffered().use {
+            SaveService.saveTree(includedTree, it)
+        }
+
+        executePlanAndCollectEvents(5.seconds) {
+            (currentElement as TestPlan).apply {
+                arguments.addArgument("includePath", includedFile.absolutePathString())
+            }
+
+            OpenModelThreadGroup::class {
+                scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(2 s)"
+                IncludeController::class {
+                    name = "Include Controller"
+                    includePath = "\${includePath}"
+                }
+            }
+        }
+
+        // TODO: assert that includePath is replaced within IncludeController
+    }
+}

From 7fa39e87ad01475b8865c1882c28d7f062e43c52 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 8 Jun 2023 23:17:04 +0300
Subject: [PATCH 0530/1037] Add short names to the properties

---
 .../apache/jmeter/testelement/TestElement.kt  |   8 +-
 .../jmeter/testelement/TestElementSchema.kt   |  24 +-
 .../jmeter/testelement/TestPlanSchema.kt      |  20 +-
 .../schema/BaseTestElementSchema.kt           | 266 ++++++++++++++++++
 .../schema/BooleanPropertyDescriptor.kt       |  13 +-
 .../schema/ClassPropertyDescriptor.kt         |  19 +-
 .../schema/CollectionPropertyDescriptor.kt    |  12 +-
 .../schema/DoublePropertyDescriptor.kt        |  13 +-
 .../schema/EmptyTestElementSchema.kt          | 130 ---------
 .../schema/FloatPropertyDescriptor.kt         |  13 +-
 .../schema/IntegerPropertyDescriptor.kt       |  13 +-
 .../schema/LongPropertyDescriptor.kt          |  13 +-
 .../testelement/schema/PropertiesAccessor.kt  |   5 +-
 .../testelement/schema/PropertyDescriptor.kt  |  13 +-
 .../schema/StringPropertyDescriptor.kt        |  15 +-
 .../schema/TestElementPropertyDescriptor.kt   |  17 +-
 .../threads/AbstractThreadGroupSchema.kt      |  12 +-
 .../jmeter/threads/ThreadGroupSchema.kt       |  20 +-
 .../openmodel/OpenModelThreadGroupSchema.kt   |   8 +-
 .../jmeter/engine/util/UseFunctionsTest.kt    |   3 +-
 .../property/JMeterElementSchemaTest.kt       |  15 +-
 .../jmeter/test/samplers/ThreadSleep.kt       |   2 +-
 .../http/sampler/HTTPSamplerBaseSchema.kt     |  16 +-
 .../java/sampler/BeanShellSamplerSchema.kt    |  20 +-
 24 files changed, 414 insertions(+), 276 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
 delete mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 1c92a69026c..438519c6fb0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -72,8 +72,8 @@ public interface TestElement : Cloneable {
      * by [.addTestElement].
      */
     public fun clearTestElementChildren()
-    public fun setProperty(key: String, value: String)
-    public fun setProperty(key: String, value: String, dflt: String)
+    public fun setProperty(key: String, value: String?)
+    public fun setProperty(key: String, value: String?, dflt: String)
     public fun setProperty(key: String, value: Boolean)
     public fun setProperty(key: String, value: Boolean, dflt: Boolean)
     public fun setProperty(key: String, value: Int)
@@ -292,8 +292,8 @@ public interface TestElement : Cloneable {
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-    public operator fun set(property: PropertyDescriptor<*, *>, value: String) {
-        removeOrSet(property.defaultValueAsString == value, property.name) {
+    public operator fun set(property: PropertyDescriptor<*, *>, value: String?) {
+        removeOrSet(value.isNullOrEmpty() || property.defaultValueAsString == value, property.name) {
             StringProperty(it, value)
         }
     }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
index 0557836b516..bd623338f2e 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
@@ -18,9 +18,9 @@
 package org.apache.jmeter.testelement
 
 import org.apache.jmeter.gui.JMeterGUIComponent
+import org.apache.jmeter.testelement.schema.BaseTestElementSchema
 import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
 import org.apache.jmeter.testelement.schema.ClassPropertyDescriptor
-import org.apache.jmeter.testelement.schema.EmptyTestElementSchema
 import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
 import org.apiguardian.api.API
 
@@ -30,17 +30,17 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class TestElementSchema protected constructor() : EmptyTestElementSchema() {
+public open class TestElementSchema protected constructor() : BaseTestElementSchema() {
     public companion object INSTANCE : TestElementSchema()
 
-    public val name: StringPropertyDescriptor<TestElementSchema> =
-        string("TestElement.name")
-    public val comments: StringPropertyDescriptor<TestElementSchema> =
-        string("TestElement.comments")
-    public open val guiClass: ClassPropertyDescriptor<TestElementSchema, JMeterGUIComponent> =
-        classProperty(JMeterGUIComponent::class, "TestElement.gui_class")
-    public val testClass: ClassPropertyDescriptor<TestElementSchema, Any> =
-        classProperty(Any::class, "TestElement.testClass")
-    public val enabled: BooleanPropertyDescriptor<TestElementSchema> =
-        boolean("TestElement.enabled", default = true)
+    public val name: StringPropertyDescriptor<TestElementSchema>
+        by string("TestElement.name")
+    public val comments: StringPropertyDescriptor<TestElementSchema>
+        by string("TestPlan.comments")
+    public val guiClass: ClassPropertyDescriptor<TestElementSchema, JMeterGUIComponent>
+        by classProperty(JMeterGUIComponent::class, "TestElement.gui_class")
+    public val testClass: ClassPropertyDescriptor<TestElementSchema, Any>
+        by classProperty(Any::class, "TestElement.test_class")
+    public val enabled: BooleanPropertyDescriptor<TestElementSchema>
+        by boolean("TestElement.enabled", default = true)
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
index 3bf1d410cc2..25d4735a4ce 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
@@ -32,18 +32,18 @@ import org.apiguardian.api.API
 public open class TestPlanSchema protected constructor() : TestElementSchema() {
     public companion object INSTANCE : TestPlanSchema()
 
-    public val functionalMode: BooleanPropertyDescriptor<TestPlanSchema> =
-        boolean("TestPlan.functional_mode")
+    public val functionalMode: BooleanPropertyDescriptor<TestPlanSchema>
+        by boolean("TestPlan.functional_mode")
 
-    public val serializeThreadgroups: BooleanPropertyDescriptor<TestPlanSchema> =
-        boolean("TestPlan.serialize_threadgroups")
+    public val serializeThreadgroups: BooleanPropertyDescriptor<TestPlanSchema>
+        by boolean("TestPlan.serialize_threadgroups")
 
-    public val tearDownOnShutdown: BooleanPropertyDescriptor<TestPlanSchema> =
-        boolean("TestPlan.tearDown_on_shutdown", false)
+    public val tearDownOnShutdown: BooleanPropertyDescriptor<TestPlanSchema>
+        by boolean("TestPlan.tearDown_on_shutdown", false)
 
-    public val userDefinedVariables: TestElementPropertyDescriptor<TestPlanSchema, Arguments> =
-        testElement("TestPlan.user_defined_variables")
+    public val userDefinedVariables: TestElementPropertyDescriptor<TestPlanSchema, Arguments>
+        by testElement("TestPlan.user_defined_variables")
 
-    public val testPlanClasspath: StringPropertyDescriptor<TestPlanSchema> =
-        string("TestPlan.user_define_classpath")
+    public val testPlanClasspath: StringPropertyDescriptor<TestPlanSchema>
+        by string("TestPlan.user_define_classpath")
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
new file mode 100644
index 00000000000..830d59d49fa
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
@@ -0,0 +1,266 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
+
+/**
+ * Describes properties available for configuration of well-known [TestElement].
+ * Style guide:
+ * * avoid using "is" prefixes. The properties are declare [PropertyDescriptor] rather than property itself,
+ *   so "is" is not needed
+ * * declare default value when declaring a property. It would help users.
+ *
+ * TODO: decide if boolean, int, long, etc values must always have a default
+ *
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class BaseTestElementSchema {
+    private val propertyDescriptors: MutableMap<String, PropertyDescriptor<*, *>> = mutableMapOf()
+
+    public val properties: Map<String, PropertyDescriptor<*, *>> = propertyDescriptors
+
+    private fun <Property : PropertyDescriptor<*, *>> Property.register(): Property {
+        propertyDescriptors[name] = this
+        return this
+    }
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema, Property : PropertyDescriptor<Schema, *>> Property.getValue(
+        that: Schema,
+        property: KProperty<*>
+    ): Property =
+        this
+
+    // String
+
+    /**
+     * Creates [StringPropertyDescriptor] that describes a string property.
+     */
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> stringDescriptor(
+        shortName: String,
+        name: String,
+        default: String? = null
+    ): StringPropertyDescriptor<Schema> =
+        StringPropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.string(
+        name: String,
+        default: String? = null
+    ): PropertyDescriptor.Builder<Schema, String> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, String>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): StringPropertyDescriptor<Schema> =
+        that.stringDescriptor(property.name, name, default)
+
+    // Class
+
+    protected fun <Schema : BaseTestElementSchema, ValueClass : Any> classPropertyDescriptor(
+        shortName: String,
+        klass: Class<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor<Schema, ValueClass> =
+        ClassPropertyDescriptor<Schema, ValueClass>(shortName, klass, name).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema, ValueClass : Any> Schema.classProperty(
+        klass: KClass<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor.Builder<Schema, ValueClass> =
+        classProperty(klass.java, name)
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema, ValueClass : Any> Schema.classProperty(
+        klass: Class<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor.Builder<Schema, ValueClass> =
+        ClassPropertyDescriptor.Builder(klass, name)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema, ValueClass : Any> ClassPropertyDescriptor.Builder<Schema, ValueClass>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): ClassPropertyDescriptor<Schema, ValueClass> = that.classPropertyDescriptor(property.name, klass, name)
+
+    // TestElement
+
+    protected fun <Schema : BaseTestElementSchema, TestElementClass : TestElement> testElementDescriptor(
+        shortName: String,
+        klass: Class<TestElementClass>,
+        name: String
+    ): TestElementPropertyDescriptor<Schema, TestElementClass> =
+        TestElementPropertyDescriptor<Schema, TestElementClass>(shortName, klass, name).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema, reified TestElementClass : TestElement> Schema.testElement(
+        name: String
+    ): TestElementPropertyDescriptor.Builder<Schema, TestElementClass> =
+        TestElementPropertyDescriptor.Builder(TestElementClass::class.java, name)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema, TestElementClass : TestElement> TestElementPropertyDescriptor.Builder<Schema, TestElementClass>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): TestElementPropertyDescriptor<Schema, TestElementClass> = that.testElementDescriptor(property.name, klass, name)
+
+    // Collection
+
+    protected fun <Schema : BaseTestElementSchema> collectionDescriptor(
+        shortName: String,
+        name: String
+    ): CollectionPropertyDescriptor<Schema> =
+        CollectionPropertyDescriptor<Schema>(shortName, name).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.collection(
+        name: String
+    ): PropertyDescriptor.Builder<Schema, Collection<JMeterProperty>> =
+        PropertyDescriptor.Builder(name, null)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Collection<JMeterProperty>>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): CollectionPropertyDescriptor<Schema> = that.collectionDescriptor(property.name, name)
+
+    // Boolean
+
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> booleanDescriptor(
+        shortName: String,
+        name: String,
+        default: Boolean? = null
+    ): BooleanPropertyDescriptor<Schema> =
+        BooleanPropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.boolean(
+        name: String,
+        default: Boolean? = false
+    ): PropertyDescriptor.Builder<Schema, Boolean> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Boolean>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>,
+    ): BooleanPropertyDescriptor<Schema> = that.booleanDescriptor(property.name, name, default)
+
+    // Integer
+
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> intDescriptor(
+        shortName: String,
+        name: String,
+        default: Int? = null,
+    ): IntegerPropertyDescriptor<Schema> =
+        IntegerPropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.int(
+        name: String,
+        default: Int? = null,
+    ): PropertyDescriptor.Builder<Schema, Int> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Int>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>,
+    ): IntegerPropertyDescriptor<Schema> = that.intDescriptor(property.name, name, default)
+
+    // Long
+
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> longDescriptor(
+        shortName: String,
+        name: String,
+        default: Long? = null,
+    ): LongPropertyDescriptor<Schema> =
+        LongPropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.long(
+        name: String,
+        default: Long? = null,
+    ): PropertyDescriptor.Builder<Schema, Long> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Long>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>,
+    ): LongPropertyDescriptor<Schema> = that.longDescriptor(property.name, name, default)
+
+    // Float
+
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> floatDescriptor(
+        shortName: String,
+        name: String,
+        default: Float? = null
+    ): FloatPropertyDescriptor<Schema> =
+        FloatPropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.float(
+        name: String,
+        default: Float? = null,
+    ): PropertyDescriptor.Builder<Schema, Float> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Float>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): FloatPropertyDescriptor<Schema> = that.floatDescriptor(property.name, name, default)
+
+    // Double
+
+    @JvmOverloads
+    protected fun <Schema : BaseTestElementSchema> doubleDescriptor(
+        shortName: String,
+        name: String,
+        default: Double? = null,
+    ): DoublePropertyDescriptor<Schema> =
+        DoublePropertyDescriptor<Schema>(shortName, name, default).register()
+
+    @JvmSynthetic
+    protected inline fun <reified Schema : BaseTestElementSchema> Schema.double(
+        name: String,
+        default: Double? = null,
+    ): PropertyDescriptor.Builder<Schema, Double> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun <Schema : BaseTestElementSchema> PropertyDescriptor.Builder<Schema, Double>.provideDelegate(
+        that: Schema,
+        property: KProperty<*>
+    ): DoublePropertyDescriptor<Schema> = that.doubleDescriptor(property.name, name, default)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
index 1e72dbbae63..d21566d1417 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.BooleanProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [BooleanProperty]: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.boolean] for building the property descriptors.
+ * Use [BaseTestElementSchema.boolean] or [BaseTestElementSchema.booleanDescriptor] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class BooleanPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: Boolean?
+public data class BooleanPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: Boolean?,
 ) : PropertyDescriptor<Schema, Boolean> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "BooleanPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Boolean =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
index d892fc29c2f..c8bc8c280fb 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ClassPropertyDescriptor.kt
@@ -18,7 +18,6 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KClass
@@ -26,25 +25,29 @@ import kotlin.reflect.KProperty
 
 /**
  * Describes a [JMeterProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.classProperty] for building the property descriptors.
+ * Use [BaseTestElementSchema.classProperty] or [BaseTestElementSchema.classPropertyDescriptor] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class ClassPropertyDescriptor<in Schema : TestElementSchema, ValueClass : Any>(
+public data class ClassPropertyDescriptor<in Schema : BaseTestElementSchema, ValueClass : Any>(
+    override val shortName: String,
     public val klass: Class<ValueClass>,
-    public override val name: String,
+    override val name: String,
     /** Default value, null means there's no default */
-    public override val defaultValue: Class<ValueClass>? = null
-) : PropertyDescriptor<Schema, Class<ValueClass>> {
+    override val defaultValue: Class<out ValueClass>? = null
+) : PropertyDescriptor<Schema, Class<out ValueClass>> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
+    public class Builder<in Schema : BaseTestElementSchema, ValueClass : Any>(
+        public val klass: Class<ValueClass>,
+        name: String
+    ) : PropertyDescriptor.Builder<Schema, Class<ValueClass>>(name, null)
+
     override val defaultValueAsString: String?
         get() = defaultValue?.name
 
-    override fun toString(): String = "ClassPropertyDescriptor(name='$name', klass='$klass', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Class<out ValueClass> =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
index 81f7ca5b942..1aa22ecae3f 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
@@ -18,7 +18,6 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.CollectionProperty
 import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apiguardian.api.API
@@ -26,20 +25,19 @@ import kotlin.reflect.KProperty
 
 /**
  * Describes a [CollectionProperty]: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.collection] for building the property descriptors.
+ * Use [BaseTestElementSchema.collection] or [BaseTestElementSchema.collectionDescriptor] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class CollectionPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
+public data class CollectionPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
 ) : PropertyDescriptor<Schema, Collection<JMeterProperty>> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    public override val defaultValue: Collection<JMeterProperty>? = null
-
-    override fun toString(): String = "CollectionPropertyDescriptor(name='$name')"
+    override val defaultValue: Collection<JMeterProperty>? = null
 
     /**
      * Retrieve [Collection] property value, or throw [NoSuchElementException] in case the property is unset.
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
index 1378480342d..7354ff9b751 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/DoublePropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.DoubleProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [DoubleProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.double] for building the property descriptors.
+ * Use [BaseTestElementSchema.double] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class DoublePropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: Double?
+public data class DoublePropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: Double?,
 ) : PropertyDescriptor<Schema, Double> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "DoublePropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Double =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt
deleted file mode 100644
index a75fcda25f3..00000000000
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/EmptyTestElementSchema.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.testelement.schema
-
-import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
-import org.apiguardian.api.API
-import kotlin.reflect.KClass
-
-/**
- * Describes properties available for configuration of well-known [TestElement].
- * Style guide:
- * * avoid using "is" prefixes. The properties are declare [PropertyDescriptor] rather than property itself,
- *   so "is" is not needed
- * * declare default value when declaring a property. It would help users.
- *
- * TODO: decide if boolean, int, long, etc values must always have a default
- *
- * @since 5.6
- */
-@API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public abstract class EmptyTestElementSchema {
-    private val propertyDescriptors: MutableMap<String, PropertyDescriptor<*, *>> = mutableMapOf()
-
-    public val properties: Map<String, PropertyDescriptor<*, *>> = propertyDescriptors
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> string(
-        name: String,
-        default: String? = null
-    ): StringPropertyDescriptor<Schema> =
-        StringPropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-
-    protected fun <Schema : TestElementSchema, ValueClass : Any> classProperty(
-        klass: KClass<ValueClass>,
-        name: String
-    ): ClassPropertyDescriptor<Schema, ValueClass> =
-        classProperty(klass.java, name)
-
-    protected fun <Schema : TestElementSchema, ValueClass : Any> classProperty(
-        klass: Class<ValueClass>,
-        name: String
-    ): ClassPropertyDescriptor<Schema, ValueClass> =
-        ClassPropertyDescriptor<Schema, ValueClass>(klass, name).also {
-            propertyDescriptors[name] = it
-        }
-
-    protected inline fun <Schema : TestElementSchema, reified TestElementClass : TestElement> testElement(
-        name: String
-    ): TestElementPropertyDescriptor<Schema, TestElementClass> =
-        testElement(TestElementClass::class.java, name)
-
-    protected fun <Schema : TestElementSchema, TestElementClass : TestElement> testElement(
-        klass: Class<TestElementClass>,
-        name: String
-    ): TestElementPropertyDescriptor<Schema, TestElementClass> =
-        TestElementPropertyDescriptor<Schema, TestElementClass>(klass, name).also {
-            propertyDescriptors[name] = it
-        }
-
-    protected fun <Schema : TestElementSchema, ValueClass : Any> collection(
-        klass: Class<ValueClass>,
-        name: String
-    ): ClassPropertyDescriptor<Schema, ValueClass> =
-        ClassPropertyDescriptor<Schema, ValueClass>(klass, name).also {
-            propertyDescriptors[name] = it
-        }
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> boolean(
-        name: String,
-        default: Boolean? = null
-    ): BooleanPropertyDescriptor<Schema> =
-        BooleanPropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> integer(
-        name: String,
-        default: Int? = null
-    ): IntegerPropertyDescriptor<Schema> =
-        IntegerPropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> long(
-        name: String,
-        default: Long? = null
-    ): LongPropertyDescriptor<Schema> =
-        LongPropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> float(
-        name: String,
-        default: Float? = null
-    ): FloatPropertyDescriptor<Schema> =
-        FloatPropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-
-    @JvmOverloads
-    protected fun <Schema : TestElementSchema> double(
-        name: String,
-        default: Double? = null
-    ): DoublePropertyDescriptor<Schema> =
-        DoublePropertyDescriptor<Schema>(name, default).also {
-            propertyDescriptors[name] = it
-        }
-}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
index ec8a9c4b818..7b572ae5734 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/FloatPropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.FloatProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [FloatProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.float] for building the property descriptors.
+ * Use [BaseTestElementSchema.float] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class FloatPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: Float?
+public data class FloatPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: Float?,
 ) : PropertyDescriptor<Schema, Float> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "FloatPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Float =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
index 185c715b967..8a31a4d4e82 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/IntegerPropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.IntegerProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [IntegerProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.integer] for building the property descriptors.
+ * Use [BaseTestElementSchema.int] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class IntegerPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: Int?
+public data class IntegerPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: Int?,
 ) : PropertyDescriptor<Schema, Int> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "IntegerPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Int =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
index 7d32ca41636..6a65be855de 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/LongPropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.LongProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [LongProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.long] for building the property descriptors.
+ * Use [BaseTestElementSchema.long] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class LongPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: Long?
+public data class LongPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: Long?,
 ) : PropertyDescriptor<Schema, Long> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "LongPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): Long =
         target[this]
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
index a255b5e23bb..271823825d8 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
@@ -18,7 +18,6 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apiguardian.api.API
 import kotlin.experimental.ExperimentalTypeInference
@@ -46,7 +45,7 @@ import kotlin.reflect.KClass
  *    });
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class PropertiesAccessor<out TestElementClass : TestElement, out Schema : TestElementSchema>(
+public class PropertiesAccessor<out TestElementClass : TestElement, out Schema : BaseTestElementSchema>(
     public val target: TestElementClass,
     public val schema: Schema
 ) {
@@ -55,7 +54,7 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
      * ` -> Unit` functions require to return `Unit.INSTANCE` from Java,
      * so we add an interface
      */
-    public fun interface InstanceConfigurator<in TestElementClass : TestElement, in Schema : TestElementSchema> {
+    public fun interface InstanceConfigurator<in TestElementClass : TestElement, in Schema : BaseTestElementSchema> {
         public fun configure(testElement: PropertiesAccessor<TestElementClass, Schema>, klass: Schema)
     }
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
index 569622b7565..68ac0560bca 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
@@ -19,7 +19,6 @@ package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.JMeterPropertySchemaUnchecked
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apiguardian.api.API
 import java.io.Serializable
 
@@ -28,7 +27,13 @@ import java.io.Serializable
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public interface PropertyDescriptor<in Schema : TestElementSchema, Value> : Serializable {
+public interface PropertyDescriptor<in Schema : BaseTestElementSchema, Value> : Serializable {
+    public open class Builder<in Schema : BaseTestElementSchema, DefaultType : Any>(
+        public val name: String,
+        public val default: DefaultType?
+    )
+
+    public val shortName: String
     public val name: String
     public val defaultValue: Value?
 
@@ -40,7 +45,7 @@ public interface PropertyDescriptor<in Schema : TestElementSchema, Value> : Seri
         target.removeProperty(name)
     }
 
-    public operator fun set(target: TestElement, value: String) {
+    public operator fun set(target: TestElement, value: String?) {
         target[this] = value
     }
 
@@ -48,5 +53,5 @@ public interface PropertyDescriptor<in Schema : TestElementSchema, Value> : Seri
         target.getString(this)
 
     public val asString: StringPropertyDescriptor<Schema>
-        get() = if (this is StringPropertyDescriptor) this else StringPropertyDescriptor(name, defaultValueAsString)
+        get() = if (this is StringPropertyDescriptor) this else StringPropertyDescriptor(shortName, name, defaultValueAsString)
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
index cc7c0467f1b..a2b03946b6f 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/StringPropertyDescriptor.kt
@@ -18,28 +18,25 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.StringProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [StringProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.string] for building the property descriptors.
+ * Use [BaseTestElementSchema.string] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class StringPropertyDescriptor<in Schema : TestElementSchema>(
-    public override val name: String,
-    /** Default value, null means there's no default */
-    public override val defaultValue: String?
+public data class StringPropertyDescriptor<in Schema : BaseTestElementSchema>(
+    override val shortName: String,
+    override val name: String,
+    override val defaultValue: String?,
 ) : PropertyDescriptor<Schema, String> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    override fun toString(): String = "StringPropertyDescriptor(name='$name', defaultValue='$defaultValue')"
-
     public operator fun get(target: TestElement): String =
         target[this]
 
@@ -51,7 +48,7 @@ public class StringPropertyDescriptor<in Schema : TestElementSchema>(
 
     @JvmSynthetic
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: String) {
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: String?) {
         testElement[this] = value
     }
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
index bd2b8b55f3b..e179f79da64 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/TestElementPropertyDescriptor.kt
@@ -18,29 +18,32 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
-import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.property.TestElementProperty
 import org.apiguardian.api.API
 import kotlin.reflect.KProperty
 
 /**
  * Describes a [TestElementProperty] that contains class reference: name, default value, and provides accessors for properties.
- * Use [EmptyTestElementSchema.testElement] for building the property descriptors.
+ * Use [BaseTestElementSchema.testElementDescriptor] for building the property descriptors.
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public class TestElementPropertyDescriptor<in Schema : TestElementSchema, TestElementClass : TestElement>(
+public data class TestElementPropertyDescriptor<in Schema : BaseTestElementSchema, TestElementClass : TestElement>(
+    override val shortName: String,
     public val klass: Class<TestElementClass>,
-    public override val name: String,
+    override val name: String,
 ) : PropertyDescriptor<Schema, Class<TestElementClass>> {
     private companion object {
         private const val serialVersionUID: Long = 1
     }
 
-    /** Test Elements have no default values */
-    public override val defaultValue: Class<TestElementClass>? = null
+    public class Builder<in Schema : BaseTestElementSchema, TestElementClass : TestElement>(
+        public val klass: Class<TestElementClass>,
+        name: String,
+    ) : PropertyDescriptor.Builder<Schema, Class<TestElementClass>>(name, null)
 
-    override fun toString(): String = "TestElementPropertyDescriptor(name='$name', klass='$klass')"
+    /** Test Elements have no default values */
+    override val defaultValue: Class<TestElementClass>? = null
 
     /**
      * Retrieve [TestElement] property value, or throw [NoSuchElementException] in case the property is unset.
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
index 30d348aff78..0aa37ecf670 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
@@ -33,12 +33,12 @@ import org.apiguardian.api.API
 public open class AbstractThreadGroupSchema protected constructor() : TestElementSchema() {
     public companion object INSTANCE : AbstractThreadGroupSchema()
 
-    public val numThreads: IntegerPropertyDescriptor<AbstractThreadGroupSchema> =
-        integer("ThreadGroup.num_threads")
+    public val numThreads: IntegerPropertyDescriptor<AbstractThreadGroupSchema>
+        by int("ThreadGroup.num_threads")
 
-    public val mainController: TestElementPropertyDescriptor<AbstractThreadGroupSchema, Controller> =
-        testElement("ThreadGroup.main_controller")
+    public val mainController: TestElementPropertyDescriptor<AbstractThreadGroupSchema, Controller>
+        by testElement("ThreadGroup.main_controller")
 
-    public val sameUserOnNextIteration: BooleanPropertyDescriptor<AbstractThreadGroupSchema> =
-        boolean("ThreadGroup.same_user_on_next_iteration", default = true)
+    public val sameUserOnNextIteration: BooleanPropertyDescriptor<AbstractThreadGroupSchema>
+        by boolean("ThreadGroup.same_user_on_next_iteration", default = true)
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
index cced287135e..32caed00048 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
@@ -32,22 +32,22 @@ public open class ThreadGroupSchema : AbstractThreadGroupSchema() {
     public companion object INSTANCE : ThreadGroupSchema()
 
     /** Whether thread startup is delayed until required */
-    public val delayedStart: BooleanPropertyDescriptor<ThreadGroupSchema> =
-        boolean("ThreadGroup.delayedStart", default = false)
+    public val delayedStart: BooleanPropertyDescriptor<ThreadGroupSchema>
+        by boolean("ThreadGroup.delayedStart", default = false)
 
     /** Ramp-up time */
-    public val rampTime: IntegerPropertyDescriptor<ThreadGroupSchema> =
-        integer("ThreadGroup.ramp_time")
+    public val rampTime: IntegerPropertyDescriptor<ThreadGroupSchema>
+        by int("ThreadGroup.ramp_time")
 
     /** Whether scheduler is being used */
-    public val useScheduler: BooleanPropertyDescriptor<ThreadGroupSchema> =
-        boolean("ThreadGroup.scheduler")
+    public val useScheduler: BooleanPropertyDescriptor<ThreadGroupSchema>
+        by boolean("ThreadGroup.scheduler")
 
     /** Scheduler start delay, overrides start time */
-    public val delay: LongPropertyDescriptor<ThreadGroupSchema> =
-        long("ThreadGroup.delay")
+    public val delay: LongPropertyDescriptor<ThreadGroupSchema>
+        by long("ThreadGroup.delay")
 
     /** Scheduler duration, overrides end time */
-    public val duration: LongPropertyDescriptor<ThreadGroupSchema> =
-        long("ThreadGroup.duration")
+    public val duration: LongPropertyDescriptor<ThreadGroupSchema>
+        by long("ThreadGroup.duration")
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
index 9bf810675a7..09a5d4b4df6 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
@@ -31,9 +31,9 @@ import org.apiguardian.api.API
 public open class OpenModelThreadGroupSchema protected constructor() : AbstractThreadGroupSchema() {
     public companion object INSTANCE : OpenModelThreadGroupSchema()
 
-    public val schedule: StringPropertyDescriptor<OpenModelThreadGroupSchema> =
-        string("OpenModelThreadGroup.schedule")
+    public val schedule: StringPropertyDescriptor<OpenModelThreadGroupSchema>
+        by string("OpenModelThreadGroup.schedule")
 
-    public val randomSeed: LongPropertyDescriptor<OpenModelThreadGroupSchema> =
-        long("OpenModelThreadGroup.random_seed")
+    public val randomSeed: LongPropertyDescriptor<OpenModelThreadGroupSchema>
+        by long("OpenModelThreadGroup.random_seed")
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
index fdc240634e5..d1cfca98700 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test
  * Verifies [TestElementPropertyTransformer.USE_FUNCTIONS].
  */
 class UseFunctionsTest {
-
     @Test
     fun `property replaces with function`() {
         val input = TestPlan().apply {
@@ -48,7 +47,7 @@ class UseFunctionsTest {
 
     @Test
     fun `nested collection property replaces with function`() {
-        val sampleProp = CollectionPropertyDescriptor<TestElementSchema>("test.prop")
+        val sampleProp = CollectionPropertyDescriptor<TestElementSchema>("sampleProp", "test.prop")
 
         val input = TestPlan().apply {
             props {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
index deb63264935..e63272b676b 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
@@ -22,7 +22,9 @@ import org.apache.jmeter.testelement.AbstractTestElement
 import org.apache.jmeter.testelement.TestElement
 import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.schema.PropertiesAccessor
+import org.apache.jmeter.threads.ThreadGroupSchema
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 
@@ -30,7 +32,7 @@ class JMeterElementSchemaTest {
     open class WarpDriveElementSchema : TestElementSchema() {
         companion object INSTANCE : WarpDriveElementSchema()
 
-        val warpFactor = integer<WarpDriveElementSchema>("WarpDriveElement.warpFactor", default = 7)
+        val warpFactor by int("WarpDriveElement.warpFactor", default = 7)
     }
 
     open class WarpDriveElement : AbstractTestElement() {
@@ -75,6 +77,17 @@ class JMeterElementSchemaTest {
         assertGetWarpFactor(8, warpDrive, "value was modified with props { it[warpFactor] = 8 }")
     }
 
+    @Test
+    fun `property descriptor equals`() {
+        assertEquals(TestElementSchema.name, ThreadGroupSchema.name) {
+            "TestElementSchema.name and ThreadGroupSchema.name should be equal"
+        }
+
+        assertNotEquals(TestElementSchema.name, TestElementSchema.comments) {
+            "TestElementSchema.name and TestElementSchema.comments should NOT be equal"
+        }
+    }
+
     @Test
     fun `test string setter`() {
         val warpDrive = WarpDriveElement()
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
index a77888f8f8b..e4ffda855a4 100644
--- a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
@@ -34,7 +34,7 @@ class ThreadSleep : AbstractSampler() {
     open class Schema : TestElementSchema() {
         companion object INSTANCE : Schema()
 
-        val duration = long<Schema>("ThreadSleep.duration")
+        val duration by long("ThreadSleep.duration")
     }
 
     var duration: Duration
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index fbfe9a7bbbc..10576f58cbc 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -30,15 +30,15 @@ import org.apiguardian.api.API
 public open class HTTPSamplerBaseSchema : TestElementSchema() {
     public companion object INSTANCE : HTTPSamplerBaseSchema()
 
-    public val followRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
-        boolean("HTTPSampler.follow_redirects")
+    public val followRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.follow_redirects")
 
-    public val useKeepalive: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
-        boolean("HTTPSampler.use_keepalive")
+    public val useKeepalive: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.use_keepalive")
 
-    public val useMultipartPost: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
-        boolean("HTTPSampler.DO_MULTIPART_POST")
+    public val useMultipartPost: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.DO_MULTIPART_POST")
 
-    public val useBrowserCompatibleMultipart: BooleanPropertyDescriptor<HTTPSamplerBaseSchema> =
-        boolean("HTTPSampler.BROWSER_COMPATIBLE_MULTIPART", default = false)
+    public val useBrowserCompatibleMultipart: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.BROWSER_COMPATIBLE_MULTIPART", default = false)
 }
diff --git a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
index d71bd1b9926..b5bd1154a38 100644
--- a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
+++ b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
@@ -31,18 +31,18 @@ import org.apiguardian.api.API
 public open class BeanShellSamplerSchema : TestElementSchema() {
     public companion object INSTANCE : BeanShellSamplerSchema()
 
-    public val resetInterpreter: BooleanPropertyDescriptor<BeanShellSamplerSchema> =
-        boolean("BeanShellSampler.resetInterpreter", default = false)
+    public val resetInterpreter: BooleanPropertyDescriptor<BeanShellSamplerSchema>
+        by boolean("BeanShellSampler.resetInterpreter", default = false)
 
-    public val script: StringPropertyDescriptor<BeanShellSamplerSchema> =
-        string("BeanShellSampler.query")
+    public val script: StringPropertyDescriptor<BeanShellSamplerSchema>
+        by string("BeanShellSampler.query")
 
-    public val parameters: StringPropertyDescriptor<BeanShellSamplerSchema> =
-        string("BeanShellSampler.parameters")
+    public val parameters: StringPropertyDescriptor<BeanShellSamplerSchema>
+        by string("BeanShellSampler.parameters")
 
-    public val initFile: StringPropertyDescriptor<BeanShellSamplerSchema> =
-        string("beanshell.sampler.init")
+    public val initFile: StringPropertyDescriptor<BeanShellSamplerSchema>
+        by string("beanshell.sampler.init")
 
-    public val filename: StringPropertyDescriptor<BeanShellSamplerSchema> =
-        string("BeanShellSampler.filename")
+    public val filename: StringPropertyDescriptor<BeanShellSamplerSchema>
+        by string("BeanShellSampler.filename")
 }

From 1398670f2e68c5f1608f6b298c3805b73d34d543 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 18:16:46 +0300
Subject: [PATCH 0531/1037] chore: use abstract classes for schemas

A single instance for the schema is enough, so it would be better
using abstract class so the users know they don't need instantiate it.
---
 .../kotlin/org/apache/jmeter/testelement/TestElementSchema.kt   | 2 +-
 .../main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt | 2 +-
 .../apache/jmeter/testelement/schema/BaseTestElementSchema.kt   | 2 ++
 .../org/apache/jmeter/threads/AbstractThreadGroupSchema.kt      | 2 +-
 .../main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt  | 2 +-
 .../jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt      | 2 +-
 .../jmeter/testelement/property/JMeterElementSchemaTest.kt      | 2 +-
 .../kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt       | 2 +-
 .../jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt       | 2 +-
 .../jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt      | 2 +-
 10 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
index bd623338f2e..abd7661c46d 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElementSchema.kt
@@ -30,7 +30,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class TestElementSchema protected constructor() : BaseTestElementSchema() {
+public abstract class TestElementSchema : BaseTestElementSchema() {
     public companion object INSTANCE : TestElementSchema()
 
     public val name: StringPropertyDescriptor<TestElementSchema>
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
index 25d4735a4ce..784604a55b1 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestPlanSchema.kt
@@ -29,7 +29,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class TestPlanSchema protected constructor() : TestElementSchema() {
+public abstract class TestPlanSchema : TestElementSchema() {
     public companion object INSTANCE : TestPlanSchema()
 
     public val functionalMode: BooleanPropertyDescriptor<TestPlanSchema>
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
index 830d59d49fa..9065682ea1a 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
@@ -29,6 +29,8 @@ import kotlin.reflect.KProperty
  * * avoid using "is" prefixes. The properties are declare [PropertyDescriptor] rather than property itself,
  *   so "is" is not needed
  * * declare default value when declaring a property. It would help users.
+ * * declare schemas as abstract classes or make constructor protected. Users might need extending the schema,
+ *   however, there's no much sense in creating several instances, so instances should be shared as singletones.
  *
  * TODO: decide if boolean, int, long, etc values must always have a default
  *
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
index 0aa37ecf670..f9fb49416c0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
@@ -30,7 +30,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class AbstractThreadGroupSchema protected constructor() : TestElementSchema() {
+public abstract class AbstractThreadGroupSchema : TestElementSchema() {
     public companion object INSTANCE : AbstractThreadGroupSchema()
 
     public val numThreads: IntegerPropertyDescriptor<AbstractThreadGroupSchema>
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
index 32caed00048..784459f74c9 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/ThreadGroupSchema.kt
@@ -28,7 +28,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class ThreadGroupSchema : AbstractThreadGroupSchema() {
+public abstract class ThreadGroupSchema : AbstractThreadGroupSchema() {
     public companion object INSTANCE : ThreadGroupSchema()
 
     /** Whether thread startup is delayed until required */
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
index 09a5d4b4df6..76942e946c0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupSchema.kt
@@ -28,7 +28,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class OpenModelThreadGroupSchema protected constructor() : AbstractThreadGroupSchema() {
+public abstract class OpenModelThreadGroupSchema : AbstractThreadGroupSchema() {
     public companion object INSTANCE : OpenModelThreadGroupSchema()
 
     public val schedule: StringPropertyDescriptor<OpenModelThreadGroupSchema>
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
index e63272b676b..58f6869f09c 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 
 class JMeterElementSchemaTest {
-    open class WarpDriveElementSchema : TestElementSchema() {
+    abstract class WarpDriveElementSchema : TestElementSchema() {
         companion object INSTANCE : WarpDriveElementSchema()
 
         val warpFactor by int("WarpDriveElement.warpFactor", default = 7)
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
index e4ffda855a4..131b099bd0f 100644
--- a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/ThreadSleep.kt
@@ -31,7 +31,7 @@ import kotlin.time.toDuration
  * the end of the test, so we can't use timers to reliably verify interrupt behovoir.
  */
 class ThreadSleep : AbstractSampler() {
-    open class Schema : TestElementSchema() {
+    abstract class Schema : TestElementSchema() {
         companion object INSTANCE : Schema()
 
         val duration by long("ThreadSleep.duration")
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index 10576f58cbc..d28320ad8ef 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -27,7 +27,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class HTTPSamplerBaseSchema : TestElementSchema() {
+public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
     public companion object INSTANCE : HTTPSamplerBaseSchema()
 
     public val followRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
diff --git a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
index b5bd1154a38..33b506d469b 100644
--- a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
+++ b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
@@ -28,7 +28,7 @@ import org.apiguardian.api.API
  * @since 5.6
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-public open class BeanShellSamplerSchema : TestElementSchema() {
+public abstract class BeanShellSamplerSchema : TestElementSchema() {
     public companion object INSTANCE : BeanShellSamplerSchema()
 
     public val resetInterpreter: BooleanPropertyDescriptor<BeanShellSamplerSchema>

From 7a7e946ea8236a2718235ecb2da50876bb99b653 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 10 Jun 2023 00:03:26 +0300
Subject: [PATCH 0532/1037] feat: add Copy Code action to copy test element as
 code

It produces a draft code, so it is easier to start using DSL
by generating code from the UI.
---
 .../apache/jmeter/gui/action/ActionNames.java |   1 +
 .../apache/jmeter/gui/util/MenuFactory.java   |   3 +
 .../apache/jmeter/dsl/DslPrinterTraverser.kt  | 238 ++++++++++++++++++
 .../jmeter/gui/action/CopyCodeAction.kt       |  51 ++++
 .../apache/jmeter/treebuilder/TreeBuilder.kt  |   8 +-
 .../jmeter/resources/messages.properties      |   1 +
 .../jmeter/resources/messages_fr.properties   |   1 +
 .../dsl/action/DslPrinterTraverserTest.kt     |  89 +++++++
 .../copy_code/http_sampler_copy_code.png      | Bin 0 -> 31868 bytes
 .../build-programmatic-test-plan.xml          |  93 ++++++-
 10 files changed, 482 insertions(+), 3 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/action/CopyCodeAction.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
 create mode 100644 xdocs/images/screenshots/copy_code/http_sampler_copy_code.png

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java
index ef8d96a9669..c0b60b5aa5e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java
@@ -46,6 +46,7 @@ public final class ActionNames {
     public static final String COLLAPSE_ALL     = "collapse all"; // $NON-NLS-1$
     public static final String COMPILE_JSR223   = "compile_jsr223"; // $NON-NLS-1$
     public static final String COPY             = "Copy"; // $NON-NLS-1$
+    public static final String COPY_CODE = "copy_code"; // $NON-NLS-1$
     public static final String CUT              = "Cut"; // $NON-NLS-1$
     public static final String DEBUG_ON         = "debug_on"; // $NON-NLS-1$
     public static final String DEBUG_OFF        = "debug_off"; // $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
index 96fd5ee5196..5c908326f9a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
@@ -291,6 +291,9 @@ public static void addFileMenu(JPopupMenu menu, boolean addSaveTestFragmentMenu)
                     ActionNames.SAVE_AS_TEST_FRAGMENT));
         }
         addSeparator(menu);
+        JMenuItem saveKotlinDsl = makeMenuItemRes("copy_code", // $NON-NLS-1$
+                ActionNames.COPY_CODE);
+        menu.add(saveKotlinDsl);
         JMenuItem savePicture = makeMenuItemRes("save_as_image",// $NON-NLS-1$
                 ActionNames.SAVE_GRAPHICS,
                 KeyStrokes.SAVE_GRAPHICS);
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
new file mode 100644
index 00000000000..0c2fb52632c
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.dsl
+
+import org.apache.jmeter.gui.tree.JMeterTreeNode
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.property.BooleanProperty
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.apache.jmeter.testelement.property.DoubleProperty
+import org.apache.jmeter.testelement.property.FloatProperty
+import org.apache.jmeter.testelement.property.IntegerProperty
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.LongProperty
+import org.apache.jmeter.testelement.property.MultiProperty
+import org.apache.jmeter.testelement.property.StringProperty
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apache.jorphan.collections.HashTree
+import org.apache.jorphan.collections.HashTreeTraverser
+import org.apiguardian.api.API
+import java.io.StringWriter
+
+/**
+ * Prints [HashTree] or [TestElement] as JMeter DSL.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public class DslPrinterTraverser(
+    private val detailLevel: DetailLevel = DetailLevel.NON_DEFAULT
+) : HashTreeTraverser {
+    public enum class DetailLevel {
+        ALL, NON_DEFAULT
+    }
+    private companion object {
+        val SPECIAL_CHARS = Regex("[\"\n\r\t\b\\\\$]")
+    }
+
+    private val sw = StringWriter()
+    private var level = 0
+    private var plusPosition = -1
+
+    override fun toString(): String = sw.toString()
+
+    public fun append(testElement: TestElement): DslPrinterTraverser {
+        addNode(testElement, HashTree())
+        subtractNode()
+        return this
+    }
+
+    override fun addNode(node: Any, subTree: HashTree) {
+        if (sw.buffer.isNotEmpty()) {
+            append('\n')
+        }
+        when (node) {
+            is TestElement -> appendElement(node)
+            is JMeterTreeNode -> appendElement(node.testElement)
+        }
+    }
+
+    private fun appendElement(te: TestElement) {
+        indent()
+        plusPosition = sw.buffer.length
+        append(te::class.java.name).append("::class {\n")
+        level += 1
+        appendProperties(te, true)
+    }
+
+    override fun subtractNode() {
+        level -= 1
+        // Omit empty braces in case the element did not have properties
+        // Note: if all the properties are default, we do not print them,
+        // so we don't use "properties.isEmpty" condition
+        if (sw.buffer.endsWith(" {\n")) {
+            sw.buffer.setLength(sw.buffer.length - " {\n".length)
+            sw.buffer.insert(plusPosition, '+')
+            append("\n")
+        } else {
+            indent().append("}\n")
+        }
+    }
+
+    override fun processPath() {
+    }
+
+    private fun appendProperties(te: TestElement, canSkipTestClass: Boolean) {
+        val emptyTe = te::class.java.getDeclaredConstructor().newInstance()
+
+        val schema = te.schema
+        val schemaProps = mutableMapOf<String, JMeterProperty>()
+        val otherProps = mutableListOf<JMeterProperty>()
+        for (property in te.propertyIterator()) {
+            if (emptyTe.getPropertyOrNull(property.name) == property && detailLevel != DetailLevel.ALL) {
+                // If the property is the same as in newly created element, avoid printing it in the DSL
+                continue
+            }
+            val prop = schema.properties[property.name]
+            if (detailLevel != DetailLevel.ALL) {
+                val stringValue = property.stringValue
+                if (prop == TestElementSchema.testClass && stringValue == te::class.java.name && canSkipTestClass) {
+                    continue
+                }
+                if ((property is StringProperty && stringValue.isNullOrEmpty()) ||
+                    stringValue == prop?.defaultValueAsString
+                ) {
+                    continue
+                }
+            }
+
+            if (prop == null) {
+                otherProps += property
+                continue
+            }
+
+            schemaProps[prop.shortName] = property
+        }
+        if (schemaProps.isNotEmpty()) {
+            indent().append("props {\n")
+            level += 1
+            for ((name, value) in schemaProps) {
+                indent().append("it[").append(name).append("] = ")
+                appendPropertyValue(value)
+                append('\n')
+            }
+            level -= 1
+            indent().append("}\n")
+        }
+
+        for (property in otherProps) {
+            if (property is StringProperty && property.stringValue == "") {
+                continue
+            }
+            indent()
+                .append("setProperty(")
+            // For TestElementProperty we have to use setProperty(Property) method
+            // which lacks property name argument, so we generate property name argument
+            // only for simple properties
+            val usePropertyConstructor = property is TestElementProperty || property is MultiProperty
+            if (usePropertyConstructor) {
+                append(property::class.java.simpleName).append('(')
+            }
+            appendLiteral(property.name).append(", ")
+            appendPropertyValue(property)
+            if (usePropertyConstructor) {
+                append(')')
+            }
+            append(")\n")
+        }
+    }
+
+    private fun appendPropertyValue(property: JMeterProperty): DslPrinterTraverser = apply {
+        when (property) {
+            is BooleanProperty, is IntegerProperty -> append(property.stringValue)
+            is DoubleProperty -> append(property.stringValue)
+            is FloatProperty -> append(property.stringValue).append('f')
+            is LongProperty -> append(property.stringValue).append('d')
+            is StringProperty -> appendLiteral(property.stringValue)
+
+            is TestElementProperty -> {
+                val element = property.element
+                append(element::class.java.name).append("()").append(".apply {\n")
+                level += 1
+                appendProperties(element, canSkipTestClass = false)
+                level -= 1
+                if (sw.buffer.endsWith(".apply {\n")) {
+                    sw.buffer.setLength(sw.buffer.length - ".apply {\n".length)
+                } else {
+                    indent().append("}")
+                }
+            }
+
+            is CollectionProperty -> {
+                append("listOf(\n")
+                level += 1
+                for (property1 in property.iterator()) {
+                    indent()
+                    appendPropertyValue(property1)
+                    append(",\n")
+                }
+                level -= 1
+                if (sw.buffer.endsWith("(\n")) {
+                    sw.buffer.setLength(sw.buffer.length - 1)
+                    append(")")
+                } else {
+                    indent().append(")")
+                }
+            }
+
+            else -> append("/* unsupported property type ${property::class.java.simpleName}*/").appendLiteral(property.stringValue)
+        }
+    }
+
+    private fun append(value: String) = apply { sw.append(value) }
+
+    private fun append(value: Char) = apply { sw.append(value) }
+
+    private fun appendLiteral(literal: String): DslPrinterTraverser {
+        return apply {
+            append('"')
+            append(
+                literal.replace(SPECIAL_CHARS) {
+                    when (it.value) {
+                        "\"" -> "\\\""
+                        "\n" -> "\\n"
+                        "\r" -> "\\r"
+                        "\t" -> "\\t"
+                        "\b" -> "\\b"
+                        "\\" -> "\\\\"
+                        "$" -> "\\$"
+                        else -> "\\${it.value}"
+                    }
+                }
+            )
+            append('"')
+        }
+    }
+
+    private fun indent(): DslPrinterTraverser = apply {
+        repeat(level) {
+            sw.append("    ")
+        }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/action/CopyCodeAction.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/action/CopyCodeAction.kt
new file mode 100644
index 00000000000..beb360ed037
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/action/CopyCodeAction.kt
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui.action
+
+import com.google.auto.service.AutoService
+import org.apache.jmeter.dsl.DslPrinterTraverser
+import org.apache.jmeter.gui.GuiPackage
+import org.apache.jorphan.gui.GuiUtils
+import org.slf4j.LoggerFactory
+import java.awt.event.ActionEvent
+
+@AutoService(Command::class)
+public class CopyCodeAction : AbstractAction() {
+    private companion object {
+        private val log = LoggerFactory.getLogger(CopyCodeAction::class.java)
+    }
+    private val actionNames = setOf(ActionNames.COPY_CODE)
+
+    override fun getActionNames(): Set<String> = actionNames
+
+    override fun doAction(e: ActionEvent) {
+        val gui = GuiPackage.getInstance()
+        val selectedNodes = gui?.treeListener?.selectedNodes ?: return
+        val dslWriter = DslPrinterTraverser()
+        for (node in selectedNodes) {
+            val tree = gui.treeModel.getCurrentSubTree(node)
+            try {
+                tree.traverse(dslWriter)
+            } catch (e: Throwable) {
+                log.warn("Unable to copy DSL for node {}", node, e)
+                return
+            }
+        }
+        GuiUtils.copyTextToClipboard(dslWriter.toString())
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
index cf799f877dd..3ce80794cdb 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/TreeBuilder.kt
@@ -18,6 +18,7 @@
 package org.apache.jmeter.treebuilder
 
 import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jorphan.collections.ListedHashTree
 import org.apiguardian.api.API
 import kotlin.reflect.KClass
@@ -27,7 +28,7 @@ import kotlin.reflect.KClass
  *
  * Sample Kotlin:
  *
- *     treeBuilder {
+ *     testTree {
  *         TestPlan::class {
  *             OpenModelThreadGroup::class {
  *                 name = "Thread Group"
@@ -39,7 +40,7 @@ import kotlin.reflect.KClass
  *
  * Sample Java:
  *
- *     treeBuilder(b -> {
+ *     testTree(b -> {
  *         b.add(TestPlan.class, tp -> {
  *             b.add(OpenModelThreadGroup.class, tg ->{
  *                 name = "Thread Group"
@@ -150,6 +151,9 @@ public class TreeBuilder {
     }
 
     private fun runConfigurations(testElement: TestElement) {
+        if (testElement.getPropertyOrNull(TestElementSchema.testClass) == null) {
+            testElement[TestElementSchema.testClass] = testElement::class.java
+        }
         for (actions in actionsStack) {
             actions?.forEach { it(testElement) }
         }
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 260107ae9ef..23721c4b4c9 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -235,6 +235,7 @@ cookie_options=Options
 cookies_stored=User-Defined Cookies
 cookie_clear_controlled_by_threadgroup=Use Thread Group configuration to control cookie clearing
 copy=Copy
+copy_code=Copy Code
 counter_config_title=Counter
 counter_per_user=Track counter independently for each user
 counter_reset_per_tg_iteration=Reset counter on each Thread Group Iteration
diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index 667eb598986..ed0f7be54d1 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -230,6 +230,7 @@ cookie_options=Options
 cookies_stored=Cookies stockés
 cookie_clear_controlled_by_threadgroup=Utiliser thread group pour contrôler l'effacement des cookies
 copy=Copier
+copy_code=Copier Code
 counter_config_title=Compteur
 counter_per_user=Suivre le compteur indépendamment pour chaque unité de test
 counter_reset_per_tg_iteration=Réinitialiser le compteur à chaque itération du groupe d'unités
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
new file mode 100644
index 00000000000..bbe2998f5ce
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.dsl.action
+
+import org.apache.jmeter.control.IfController
+import org.apache.jmeter.control.WhileController
+import org.apache.jmeter.dsl.DslPrinterTraverser
+import org.apache.jmeter.reporters.Summariser
+import org.apache.jmeter.test.samplers.ThreadSleep
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.apache.jmeter.treebuilder.dsl.testTree
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class DslPrinterTraverserTest {
+    @Test
+    fun threadGroup() {
+        val d = testTree {
+            OpenModelThreadGroup::class {
+                name = "thread\n group"
+                props {
+                    it[enabled] = "\${var_name}"
+                }
+                scheduleString = "rate(50/sec)"
+
+                +Summariser::class
+
+                WhileController::class {
+                    condition = "while \"condition\" \$ "
+                    IfController::class {
+                        condition = "\${__P(abc, def)}"
+                        ThreadSleep::class {
+                            isEnabled = false
+                        }
+                    }
+                }
+            }
+        }
+
+        val str = DslPrinterTraverser()
+            .also { d.traverse(it) }
+            .toString()
+
+        assertEquals(
+            """
+            org.apache.jmeter.threads.openmodel.OpenModelThreadGroup::class {
+                props {
+                    it[name] = "thread\n group"
+                    it[enabled] = "\${'$'}{var_name}"
+                    it[schedule] = "rate(50/sec)"
+                }
+
+                +org.apache.jmeter.reporters.Summariser::class
+
+                org.apache.jmeter.control.WhileController::class {
+                    setProperty("WhileController.condition", "while \"condition\" \${'$'} ")
+
+                    org.apache.jmeter.control.IfController::class {
+                        setProperty("IfController.condition", "\${'$'}{__P(abc, def)}")
+
+                        org.apache.jmeter.test.samplers.ThreadSleep::class {
+                            props {
+                                it[enabled] = false
+                            }
+                        }
+                    }
+                }
+            }
+
+            """.trimIndent().replace("\r\n", "\n"),
+            str.replace("\r\n", "\n")
+        )
+    }
+}
diff --git a/xdocs/images/screenshots/copy_code/http_sampler_copy_code.png b/xdocs/images/screenshots/copy_code/http_sampler_copy_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..aad40b2302f156b1f2c744c3873d10d4e0868faa
GIT binary patch
literal 31868
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
Zd2iy2aj3&G>3_q?bhV5$YwkHj{y$>+gaH5m

literal 0
HcmV?d00001

diff --git a/xdocs/usermanual/build-programmatic-test-plan.xml b/xdocs/usermanual/build-programmatic-test-plan.xml
index a457e33e9a7..121c6bda208 100644
--- a/xdocs/usermanual/build-programmatic-test-plan.xml
+++ b/xdocs/usermanual/build-programmatic-test-plan.xml
@@ -59,6 +59,97 @@ threadGroupSubtree.add(debugSampler);</source>
       </p>
     </section>
 
+    <section name="Generating code from UI" anchor="generating_code">
+      <p>To aid with creating code, JMeter implements <code>Copy Code</code> context action, so you could
+      generate code for any element in the plan. It would generate code for the element and its children.</p>
+
+      <figure width="380" height="258" image="copy_code/http_sampler_copy_code.png">Copy Code context action</figure>
+
+      <p>Here's the generated code (Kotlin DSL):
+      <source>
+org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+    props {
+        it[arguments] = org.apache.jmeter.config.Arguments().apply {
+            props {
+                it[arguments] = listOf(
+                    org.apache.jmeter.protocol.http.util.HTTPArgument().apply {
+                        props {
+                            it[value] = "World"
+                            it[metadata] = "="
+                            it[useEquals] = true
+                            it[argumentName] = "user"
+                        }
+                    },
+                    org.apache.jmeter.protocol.http.util.HTTPArgument().apply {
+                        props {
+                            it[alwaysEncode] = true
+                            it[value] = "test_value"
+                            it[metadata] = "="
+                            it[useEquals] = true
+                            it[argumentName] = "test"
+                        }
+                    },
+                )
+                it[name] = "User Defined Variables"
+                it[guiClass] = "org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel"
+                it[testClass] = "org.apache.jmeter.config.Arguments"
+            }
+        }
+        it[domain] = "example.com"
+        it[path] = "/api/v1/login"
+        it[method] = "GET"
+        it[followRedirects] = true
+        it[useKeepalive] = true
+        it[proxy.scheme] = "https"
+        it[proxy.host] = "localhost"
+        it[proxy.port] = "8080"
+        it[proxy.username] = "secret"
+        it[proxy.password] = "password1"
+        it[name] = "/login"
+        it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
+    }
+
+    org.apache.jmeter.extractor.RegexExtractor::class {
+        props {
+            it[guiClass] = "org.apache.jmeter.extractor.gui.RegexExtractorGui"
+            it[name] = "extract user id"
+            it[referenceName] = "regexVar"
+            it[regularExpression] = "hello\\s+?world"
+            it[template] = "\$1\$"
+        }
+    }
+
+    org.apache.jmeter.protocol.http.control.HeaderManager::class {
+        props {
+            it[headers] = listOf(
+                org.apache.jmeter.protocol.http.control.Header().apply {
+                    props {
+                        it[headerName] = "Accept"
+                        it[value] = "text/plain"
+                    }
+                },
+                org.apache.jmeter.protocol.http.control.Header().apply {
+                    props {
+                        it[headerName] = "User-Agent"
+                        it[value] = "JMeter"
+                    }
+                },
+                org.apache.jmeter.protocol.http.control.Header().apply {
+                    props {
+                        it[headerName] = "X-JMeter-Thread"
+                        it[value] = "Thread \${__threadNum}"
+                    }
+                },
+            )
+            it[guiClass] = "org.apache.jmeter.protocol.http.gui.HeaderPanel"
+            it[name] = "HTTP Header Manager"
+        }
+    }
+}
+</source>
+      </p>
+    </section>
+
     <section name="Creating a plan with Kotlin DSL" anchor="treebuilder_kotlin_dsl">
       <p>JMeter 5.6 introduces Kotlin DSL which might make it easier to create and maintain test plans as the structure of the code
         would resemble the structure of the generated test plan tree</p>
@@ -144,7 +235,7 @@ import org.apache.jmeter.testelement.TestPlan
 import org.apache.jmeter.threads.ThreadGroup
 import static org.apache.jmeter.treebuilder.dsl.TreeBuilders.testTree
 
-ListedHashTree root = treeBuilder(b -> { // (1)
+ListedHashTree root = testTree(b -> { // (1)
   b.add(TestPlan.class, tp -> { // (2)
     b.add(ThreadGroup.class, tg -> {
        tg.setName("Search Order Thread Group");

From 61cb8ff0514728d46f65d87a56e81e33333d56bb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 12 Jun 2023 14:19:46 +0300
Subject: [PATCH 0533/1037] feat: add ability to factor properties into
 subgroups

It enables creating a subgroup and attach it to a schema or to another group.
---
 .../apache/jmeter/dsl/DslPrinterTraverser.kt  |  12 +-
 .../schema/BasePropertyGroupSchema.kt         | 191 ++++++++++++++++++
 .../schema/BaseTestElementSchema.kt           |  80 ++++++++
 .../schema/ParentSchemaReference.kt           |  30 +++
 .../property/PropertyGroupSchemaTest.kt       | 161 +++++++++++++++
 5 files changed, 470 insertions(+), 4 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BasePropertyGroupSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ParentSchemaReference.kt
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/testelement/property/PropertyGroupSchemaTest.kt

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
index 0c2fb52632c..81702d19ab7 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
@@ -102,7 +102,7 @@ public class DslPrinterTraverser(
         val emptyTe = te::class.java.getDeclaredConstructor().newInstance()
 
         val schema = te.schema
-        val schemaProps = mutableMapOf<String, JMeterProperty>()
+        val schemaProps = mutableMapOf<PropertyDescriptor<*, *>, JMeterProperty>()
         val otherProps = mutableListOf<JMeterProperty>()
         for (property in te.propertyIterator()) {
             if (emptyTe.getPropertyOrNull(property.name) == property && detailLevel != DetailLevel.ALL) {
@@ -127,13 +127,17 @@ public class DslPrinterTraverser(
                 continue
             }
 
-            schemaProps[prop.shortName] = property
+            schemaProps[prop] = property
         }
         if (schemaProps.isNotEmpty()) {
             indent().append("props {\n")
             level += 1
-            for ((name, value) in schemaProps) {
-                indent().append("it[").append(name).append("] = ")
+            for ((prop, value) in schemaProps) {
+                indent().append("it[")
+                for (item in schema.getGroupPath(prop)) {
+                    append(item).append('.')
+                }
+                append(prop.shortName).append("] = ")
                 appendPropertyValue(value)
                 append('\n')
             }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BasePropertyGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BasePropertyGroupSchema.kt
new file mode 100644
index 00000000000..0d724231379
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BasePropertyGroupSchema.kt
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apiguardian.api.API
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
+
+/**
+ * Factors parameters into a group, so it can be reused or accessed in a grouped manner.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class BasePropertyGroupSchema<Schema : BaseTestElementSchema> : BaseTestElementSchema() {
+    /**
+     * A reference to a parent schema declaration.
+     * It can be either [Schema] or [BasePropertyGroupSchema].
+     */
+    public lateinit var parent: ParentSchemaReference
+        internal set
+
+    public operator fun <Group : BasePropertyGroupSchema<Schema>> Group.getValue(
+        that: BasePropertyGroupSchema<Schema>,
+        prop: KProperty<*>
+    ): Group =
+        this
+
+    @JvmSynthetic
+    public operator fun <Property : PropertyDescriptor<Schema, *>> Property.getValue(
+        that: BasePropertyGroupSchema<Schema>,
+        prop: KProperty<*>
+    ): Property =
+        this
+
+    // boolean
+
+    @JvmSynthetic
+    protected fun boolean(
+        name: String,
+        default: Boolean? = false
+    ): PropertyDescriptor.Builder<Schema, Boolean> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Boolean>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): BooleanPropertyDescriptor<Schema> = that.booleanDescriptor(property.name, name, default)
+
+    // string
+
+    @JvmSynthetic
+    protected fun string(
+        name: String,
+        default: String? = null
+    ): PropertyDescriptor.Builder<Schema, String> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, String>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>
+    ): StringPropertyDescriptor<Schema> =
+        that.stringDescriptor(property.name, name, default)
+
+    // int
+
+    @JvmSynthetic
+    protected fun int(
+        name: String,
+        default: Int? = null,
+    ): PropertyDescriptor.Builder<Schema, Int> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Int>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): IntegerPropertyDescriptor<Schema> = that.intDescriptor(property.name, name, default)
+
+    // long
+
+    @JvmSynthetic
+    protected fun long(
+        name: String,
+        default: Long? = null,
+    ): PropertyDescriptor.Builder<Schema, Long> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Long>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): LongPropertyDescriptor<Schema> = that.longDescriptor(property.name, name, default)
+
+    // float
+
+    @JvmSynthetic
+    protected fun float(
+        name: String,
+        default: Float? = null,
+    ): PropertyDescriptor.Builder<Schema, Float> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Float>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): FloatPropertyDescriptor<Schema> = that.floatDescriptor(property.name, name, default)
+
+    // float
+
+    @JvmSynthetic
+    protected fun double(
+        name: String,
+        default: Double? = null,
+    ): PropertyDescriptor.Builder<Schema, Double> =
+        PropertyDescriptor.Builder(name, default)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Double>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): DoublePropertyDescriptor<Schema> = that.doubleDescriptor(property.name, name, default)
+
+    // test element
+    @JvmSynthetic
+    protected inline fun <reified TestElementClass : TestElement> testElement(
+        name: String
+    ): TestElementPropertyDescriptor.Builder<Schema, TestElementClass> =
+        TestElementPropertyDescriptor.Builder(TestElementClass::class.java, name)
+
+    @JvmSynthetic
+    protected operator fun <TestElementClass : TestElement> TestElementPropertyDescriptor.Builder<Schema, TestElementClass>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>
+    ): TestElementPropertyDescriptor<Schema, TestElementClass> = that.testElementDescriptor(property.name, klass, name)
+
+    // class
+
+    @JvmSynthetic
+    protected fun <ValueClass : Any> classProperty(
+        klass: KClass<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor.Builder<Schema, ValueClass> =
+        classProperty(klass.java, name)
+
+    @JvmSynthetic
+    protected fun <ValueClass : Any> classProperty(
+        klass: Class<ValueClass>,
+        name: String
+    ): ClassPropertyDescriptor.Builder<Schema, ValueClass> =
+        ClassPropertyDescriptor.Builder(klass, name)
+
+    @JvmSynthetic
+    protected operator fun <ValueClass : Any> ClassPropertyDescriptor.Builder<Schema, ValueClass>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>
+    ): ClassPropertyDescriptor<Schema, ValueClass> = that.classPropertyDescriptor(property.name, klass, name)
+
+    // collection
+
+    @JvmSynthetic
+    protected fun collection(
+        name: String
+    ): PropertyDescriptor.Builder<Schema, Collection<JMeterProperty>> =
+        PropertyDescriptor.Builder(name, null)
+
+    @JvmSynthetic
+    protected operator fun PropertyDescriptor.Builder<Schema, Collection<JMeterProperty>>.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>
+    ): CollectionPropertyDescriptor<Schema> = that.collectionDescriptor(property.name, name)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
index 9065682ea1a..4b845869cd4 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BaseTestElementSchema.kt
@@ -40,8 +40,20 @@ import kotlin.reflect.KProperty
 public abstract class BaseTestElementSchema {
     private val propertyDescriptors: MutableMap<String, PropertyDescriptor<*, *>> = mutableMapOf()
 
+    /**
+     * Associates JMeter property name (e.g. `TestPlan.enabled`) with the corresponding [PropertyDescriptor]
+     */
     public val properties: Map<String, PropertyDescriptor<*, *>> = propertyDescriptors
 
+    private val groupDescriptors: MutableMap<String, BasePropertyGroupSchema<*>> = mutableMapOf()
+
+    /**
+     * Associates subgroup name with the corresponding group schema.
+     */
+    public val groups: Map<String, BasePropertyGroupSchema<*>> = groupDescriptors
+
+    private val propertyGroups = mutableMapOf<PropertyDescriptor<*, *>, BasePropertyGroupSchema<*>>()
+
     private fun <Property : PropertyDescriptor<*, *>> Property.register(): Property {
         propertyDescriptors[name] = this
         return this
@@ -54,6 +66,74 @@ public abstract class BaseTestElementSchema {
     ): Property =
         this
 
+    /**
+     * It enables configuring a group of properties inside [TestElement.props] block:
+     *
+     *     httpSampler.props { // this: HttpSamplerBaseSchema, it: PropertiesAccessor<HttpSamplerBase, HttpSamplerBaseSchema>
+     *         proxy { // <-- this is Group.invoke
+     *           it[proxyPort] = 8080
+     *         }
+     *     }
+     */
+    public operator fun <Group : BasePropertyGroupSchema<*>> Group.invoke(body: Group.() -> Unit): Unit = run(body)
+
+    protected fun <Schema : BaseTestElementSchema, Group : BasePropertyGroupSchema<Schema>> addSubgroup(name: String, group: Group): Group {
+        group.parent = ParentSchemaReference(this, name)
+        groupDescriptors[name] = group
+        group.properties.values.forEach {
+            it.register()
+            // If the property is not declared in th the subgroup, assume it is declared in the group itself
+            propertyGroups[it] = group.getSubgroup(it) ?: group
+        }
+        return group
+    }
+
+    public fun <Schema : BaseTestElementSchema> getSubgroup(property: PropertyDescriptor<Schema, *>): BasePropertyGroupSchema<Schema>? {
+        @Suppress("UNCHECKED_CAST")
+        return propertyGroups[property] as BasePropertyGroupSchema<Schema>?
+    }
+
+    /**
+     * Returns a list of group names that are required to access the property by its short name.
+     * If the property is declared in the current schema, the list is empty.
+     */
+    public fun getGroupPath(property: PropertyDescriptor<*, *>): List<String> {
+        var group: ParentSchemaReference? = getSubgroup(property)?.parent ?: return listOf()
+        val res = mutableListOf<String>()
+        while (group != null && group.schema.groups[group.groupName] != this) {
+            res += group.groupName
+            group = (group.schema as? BasePropertyGroupSchema<*>)?.parent
+        }
+        res.reverse()
+        return res
+    }
+
+    /**
+     * It enables attach a group of properties to the current schema.
+     */
+    public operator fun <Schema : BaseTestElementSchema, Group : BasePropertyGroupSchema<Schema>> Group.provideDelegate(
+        that: Schema,
+        property: KProperty<*>,
+    ): Group {
+        return that.addSubgroup(property.name, this@provideDelegate)
+    }
+
+    /**
+     * It enables attach a group of properties to the current group of properties
+     */
+    public operator fun <Schema : BaseTestElementSchema, Group : BasePropertyGroupSchema<Schema>> Group.provideDelegate(
+        that: BasePropertyGroupSchema<Schema>,
+        property: KProperty<*>,
+    ): Group {
+        return that.addSubgroup(property.name, this@provideDelegate)
+    }
+
+    public operator fun <Schema : BaseTestElementSchema, Group : BasePropertyGroupSchema<Schema>> Group.getValue(
+        that: Schema,
+        prop: KProperty<*>
+    ): Group =
+        this
+
     // String
 
     /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ParentSchemaReference.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ParentSchemaReference.kt
new file mode 100644
index 00000000000..6e04073a973
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/ParentSchemaReference.kt
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.schema
+
+import org.apiguardian.api.API
+
+/**
+ * Holds information on the name of the subgroup in the parent group.
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public data class ParentSchemaReference(
+    val schema: BaseTestElementSchema,
+    val groupName: String
+)
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/PropertyGroupSchemaTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/PropertyGroupSchemaTest.kt
new file mode 100644
index 00000000000..63fd10af4b8
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/PropertyGroupSchemaTest.kt
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.apache.jmeter.testelement.AbstractTestElement
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.BasePropertyGroupSchema
+import org.apache.jmeter.testelement.schema.BaseTestElementSchema
+import org.apache.jmeter.testelement.schema.PropertiesAccessor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class PropertyGroupSchemaTest {
+    open class ProxyConfigurationGroup<Schema : BaseTestElementSchema>(
+        prefix: String
+    ) : BasePropertyGroupSchema<Schema>() {
+        val hostname: StringPropertyDescriptor<Schema> by string("$prefix.hostname")
+        val port by int("$prefix.port")
+    }
+    open class WarpDriveUrlGroup<Schema : WarpDriveElementSchema> : BasePropertyGroupSchema<Schema>() {
+        val hostname by string("WarpDriveElement.hostname")
+        val port by int("WarpDriveElement.port")
+
+        val proxy by ProxyConfigurationGroup<Schema>("WarpDriveElement.proxy")
+    }
+
+    open class WarpDriveElementSchema : TestElementSchema() {
+        companion object INSTANCE : WarpDriveElementSchema()
+
+        val warpFactor by int("WarpDriveElement.warpFactor", default = 7)
+
+        val mainUrl by WarpDriveUrlGroup()
+    }
+
+    open class WarpDriveElement : AbstractTestElement() {
+        override val schema: WarpDriveElementSchema
+            get() = WarpDriveElementSchema
+        override val props: PropertiesAccessor<WarpDriveElement, WarpDriveElementSchema>
+            get() = PropertiesAccessor(this, schema)
+    }
+
+    @Test
+    fun `group parameters`() {
+        val warpDrive = WarpDriveElement()
+        warpDrive.props {
+            it[mainUrl.hostname] = "localhost"
+            it[mainUrl.port] = 443
+        }
+        assertEquals("localhost", warpDrive[warpDrive.schema.mainUrl.hostname]) {
+            "warpDrive[warpDrive.schema.mainUrl.hostname]"
+        }
+        assertEquals(443, warpDrive[warpDrive.schema.mainUrl.port]) {
+            "warpDrive[warpDrive.schema.mainUrl.port]"
+        }
+    }
+
+    @Test
+    fun `nested group parameters`() {
+        val warpDrive = WarpDriveElement()
+        warpDrive.props {
+            mainUrl {
+                proxy {
+                    it[hostname] = "proxyHost"
+                    it[port] = 8080
+                }
+            }
+            it[mainUrl.hostname] = "localhost"
+            it[mainUrl.port] = 443
+        }
+        assertEquals("localhost", warpDrive[warpDrive.schema.mainUrl.hostname]) {
+            "warpDrive[warpDrive.schema.mainUrl.hostname]"
+        }
+        assertEquals(443, warpDrive[warpDrive.schema.mainUrl.port]) {
+            "warpDrive[warpDrive.schema.mainUrl.port]"
+        }
+        assertEquals("proxyHost", warpDrive[warpDrive.schema.mainUrl.proxy.hostname]) {
+            "warpDrive[warpDrive.schema.mainUrl.proxy.hostname]"
+        }
+        assertEquals(8080, warpDrive[warpDrive.schema.mainUrl.proxy.port]) {
+            "warpDrive[warpDrive.schema.proxy.port]"
+        }
+    }
+
+    @Test
+    fun `schema contains properties from all the subgroups`() {
+        val schema = WarpDriveElementSchema
+        assertEquals(
+            """
+            TestElement.name=StringPropertyDescriptor(shortName=name, name=TestElement.name, defaultValue=null)
+            TestPlan.comments=StringPropertyDescriptor(shortName=comments, name=TestPlan.comments, defaultValue=null)
+            TestElement.gui_class=ClassPropertyDescriptor(shortName=guiClass, klass=interface org.apache.jmeter.gui.JMeterGUIComponent, name=TestElement.gui_class, defaultValue=null)
+            TestElement.test_class=ClassPropertyDescriptor(shortName=testClass, klass=class java.lang.Object, name=TestElement.test_class, defaultValue=null)
+            TestElement.enabled=BooleanPropertyDescriptor(shortName=enabled, name=TestElement.enabled, defaultValue=true)
+            WarpDriveElement.warpFactor=IntegerPropertyDescriptor(shortName=warpFactor, name=WarpDriveElement.warpFactor, defaultValue=7)
+            WarpDriveElement.hostname=StringPropertyDescriptor(shortName=hostname, name=WarpDriveElement.hostname, defaultValue=null)
+            WarpDriveElement.port=IntegerPropertyDescriptor(shortName=port, name=WarpDriveElement.port, defaultValue=null)
+            WarpDriveElement.proxy.hostname=StringPropertyDescriptor(shortName=hostname, name=WarpDriveElement.proxy.hostname, defaultValue=null)
+            WarpDriveElement.proxy.port=IntegerPropertyDescriptor(shortName=port, name=WarpDriveElement.proxy.port, defaultValue=null)
+            """.trimIndent().replace("\r\n", "\n"),
+            schema.properties.asSequence().joinToString("\n")
+        ) {
+            "warpDrive.schema.properties"
+        }
+    }
+
+    @Test
+    fun `full property path`() {
+        val schema = WarpDriveElementSchema
+        assertEquals(
+            """
+            TestElement.name = []
+            TestPlan.comments = []
+            TestElement.gui_class = []
+            TestElement.test_class = []
+            TestElement.enabled = []
+            WarpDriveElement.warpFactor = []
+            WarpDriveElement.hostname = [mainUrl]
+            WarpDriveElement.port = [mainUrl]
+            WarpDriveElement.proxy.hostname = [mainUrl, proxy]
+            WarpDriveElement.proxy.port = [mainUrl, proxy]
+            """.trimIndent(),
+            schema.properties.asSequence().joinToString("\n") {
+                it.key + " = " + schema.getGroupPath(it.value)
+            }
+        )
+    }
+
+    @Test
+    fun `mainUrl getFullPathOrNull port`() {
+        val schema = WarpDriveElementSchema
+        assertEquals(
+            "[]",
+            schema.mainUrl.getGroupPath(schema.mainUrl.port).toString()
+        )
+    }
+
+    @Test
+    fun `mainUrl getFullPathOrNull proxy port`() {
+        val schema = WarpDriveElementSchema
+        assertEquals(
+            "[proxy]",
+            schema.mainUrl.getGroupPath(schema.mainUrl.proxy.port).toString()
+        )
+    }
+}

From 95c41874e5d224e0f025f3c58c2a852e1a92b8ed Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 10 Jun 2023 20:37:21 +0300
Subject: [PATCH 0534/1037] chore: use schema in AbstractTestElement for
 properties

---
 .../jmeter/testelement/AbstractTestElement.java   | 12 ++++++------
 .../org/apache/jmeter/testelement/TestElement.kt  | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index eb3766dd9f1..fc885f89c29 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -259,22 +259,22 @@ public void addTestElement(TestElement el) {
 
     @Override
     public void setName(String name) {
-        setProperty(TestElement.NAME, name);
+        set(getSchema().getName(), name);
     }
 
     @Override
     public String getName() {
-        return getPropertyAsString(TestElement.NAME);
+        return get(getSchema().getName());
     }
 
     @Override
     public void setComment(String comment){
-        setProperty(new StringProperty(TestElement.COMMENTS, comment));
+        set(getSchema().getComments(), comment);
     }
 
     @Override
     public String getComment(){
-        return getProperty(TestElement.COMMENTS).getStringValue();
+        return get(getSchema().getComments());
     }
 
     /**
@@ -813,12 +813,12 @@ public boolean canRemove() {
     // Moved from JMeter class
     @Override
     public boolean isEnabled() {
-        return getProperty(TestElement.ENABLED) instanceof NullProperty || getPropertyAsBoolean(TestElement.ENABLED);
+        return get(getSchema().getEnabled());
     }
 
     @Override
     public void setEnabled(boolean enabled) {
-        setProperty(new BooleanProperty(TestElement.ENABLED, enabled));
+        set(getSchema().getEnabled(), enabled);
     }
 
     /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 438519c6fb0..a01c3247f48 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -44,14 +44,19 @@ import org.apiguardian.api.API
 
 public interface TestElement : Cloneable {
     public companion object {
-        public const val NAME: String = "TestElement.name" // $NON-NLS-1$
-        public const val GUI_CLASS: String = "TestElement.gui_class" // $NON-NLS-1$
-        public const val ENABLED: String = "TestElement.enabled" // $NON-NLS-1$
-        public const val TEST_CLASS: String = "TestElement.test_class" // $NON-NLS-1$
+        @JvmField
+        public val NAME: String = TestElementSchema.name.name
+        @JvmField
+        public val GUI_CLASS: String = TestElementSchema.guiClass.name
+        @JvmField
+        public val ENABLED: String = TestElementSchema.enabled.name
+        @JvmField
+        public val TEST_CLASS: String = TestElementSchema.testClass.name
 
         // Needed by AbstractTestElement.
         // Also TestElementConverter and TestElementPropertyConverter for handling empty comments
-        public const val COMMENTS: String = "TestPlan.comments" // $NON-NLS-1$
+        @JvmField
+        public val COMMENTS: String = TestElementSchema.comments.name
     }
 
     public val schema: TestElementSchema

From bb9dd3f0a66a04368941c4d9cf7acb3456a424e9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 10 Jun 2023 21:20:08 +0300
Subject: [PATCH 0535/1037] chore: use TestElement.setEnabled instead of using
 the property name

---
 .../java/org/apache/jmeter/gui/tree/JMeterTreeModel.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
index 47c4b2403b3..c9ec94b808a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
@@ -297,7 +297,7 @@ private void moveWorkBenchToTestPlan(JMeterTreeNode current, HashTree workbenchT
                     HashTree tree = new HashTree();
                     tree.add(node);
                     tree.add(node, subtree);
-                    ((TestElement) node).setProperty(TestElement.ENABLED, false);
+                    ((TestElement) node).setEnabled(false);
                     addSubTree(tree, current);
                 }
             }
@@ -306,9 +306,9 @@ private void moveWorkBenchToTestPlan(JMeterTreeNode current, HashTree workbenchT
         if (!workbenchTree.isEmpty()) {
             HashTree testFragmentTree = new HashTree();
             TestFragmentController testFragmentController = new TestFragmentController();
-            testFragmentController.setProperty(TestElement.NAME, "WorkBench Test Fragment");
+            testFragmentController.setName("WorkBench Test Fragment");
             testFragmentController.setProperty(TestElement.GUI_CLASS, TestFragmentControllerGui.class.getName());
-            testFragmentController.setProperty(TestElement.ENABLED, false);
+            testFragmentController.setEnabled(false);
             testFragmentTree.add(testFragmentController);
             testFragmentTree.add(testFragmentController, workbenchTree);
             addSubTree(testFragmentTree, current);

From 76b7f3500b347f1cdc1c0fac0f7eb5fe4fe9ba04 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 10 Jun 2023 21:53:20 +0300
Subject: [PATCH 0536/1037] feat: add GenericControllerSchema, and
 LoopControllerSchema

---
 .../jmeter/control/TestLoopController.java    |  3 +-
 .../jmeter/control/GenericController.java     | 11 +++++
 .../apache/jmeter/control/LoopController.java | 49 +++++++------------
 .../jmeter/control/GenericControllerSchema.kt | 30 ++++++++++++
 .../jmeter/control/LoopControllerSchema.kt    | 49 +++++++++++++++++++
 .../gui/action/ParseCurlCommandAction.java    |  2 +-
 6 files changed, 112 insertions(+), 32 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/control/GenericControllerSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt

diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java b/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
index 3bfef0021d9..dcaeb3a64f6 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
@@ -139,7 +139,8 @@ public void testBug54467() throws Exception {
         ReplaceStringWithFunctions transformer = new ReplaceStringWithFunctions(new CompoundVariable(), variables);
         jmctx.setVariables(new JMeterVariables());
 
-        StringProperty prop = new StringProperty(LoopController.LOOPS, "${__Random(1,12,)}");
+        StringProperty prop =
+                new StringProperty(LoopControllerSchema.INSTANCE.getLoops().getName(), "${__Random(1,12,)}");
         JMeterProperty newProp = transformer.transformValue(prop);
         newProp.setRunningVersion(true);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
index 2fff0cf5f61..ff88a79315d 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
@@ -30,6 +30,7 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.TestCompilerHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,6 +91,16 @@ public class GenericController extends AbstractTestElement implements Controller
     public GenericController() {
     }
 
+    @Override
+    public GenericControllerSchema getSchema() {
+        return GenericControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends GenericController, ? extends GenericControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     public void initialize() {
         resetCurrent();
diff --git a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
index 50a3e2094d4..83e7a04903b 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
@@ -22,10 +22,7 @@
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
-import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,23 +33,10 @@ public class LoopController extends GenericController implements Serializable, I
 
     public static final int INFINITE_LOOP_COUNT = -1; // $NON-NLS-1$
 
-    public static final String LOOPS = "LoopController.loops"; // $NON-NLS-1$
+    public static final String LOOPS = LoopControllerSchema.INSTANCE.getLoops().getName();
 
     private static final long serialVersionUID = 7833960784370272300L;
     private static final Logger LOGGER = LoggerFactory.getLogger(LoopController.class);
-    /**
-     * In spite of the name, this is actually used to determine if the loop controller is repeatable.
-     *
-     * The value is only used in nextIsNull() when the loop end condition has been detected:
-     * If forever==true, then it calls resetLoopCount(), otherwise it calls setDone(true).
-     *
-     * Loop Controllers always set forever=true, so that they will be executed next time
-     * the parent invokes them.
-     *
-     * Thread Group sets the value false, so nextIsNull() sets done, and the Thread Group will not be repeated.
-     * However, it's not clear that a Thread Group could ever be repeated.
-     */
-    private static final String CONTINUE_FOREVER = "LoopController.continue_forever"; // $NON-NLS-1$
 
     private transient int loopCount = 0;
 
@@ -65,15 +49,25 @@ public class LoopController extends GenericController implements Serializable, I
     private boolean breakLoop;
 
     public LoopController() {
-        setContinueForeverPrivate(true);
+        set(getSchema().getContinueForever(), true);
+    }
+
+    @Override
+    public LoopControllerSchema getSchema() {
+        return LoopControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends LoopController, ? extends LoopControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
     }
 
     public void setLoops(int loops) {
-        setProperty(new IntegerProperty(LOOPS, loops));
+        set(getSchema().getLoops(), loops);
     }
 
     public void setLoops(String loopValue) {
-        setProperty(new StringProperty(LOOPS, loopValue));
+        set(getSchema().getLoops(), loopValue);
     }
 
     public int getLoops() {
@@ -86,8 +80,7 @@ public int getLoops() {
                 nbLoops ==INFINITE_LOOP_COUNT // Number of iteration is set to infinite
                 ) {
             try {
-                JMeterProperty prop = getProperty(LOOPS);
-                nbLoops = prop.getIntValue();
+                nbLoops = get(getSchema().getLoops());
             } catch (NumberFormatException e) {
                 nbLoops = 0;
             }
@@ -96,7 +89,7 @@ public int getLoops() {
     }
 
     public String getLoopString() {
-        return getPropertyAsString(LOOPS);
+        return getString(getSchema().getLoops());
     }
 
     /**
@@ -106,15 +99,11 @@ public String getLoopString() {
      *            true if the loop must be reset after ending a run
      */
     public void setContinueForever(boolean forever) {
-        setContinueForeverPrivate(forever);
-    }
-
-    private void setContinueForeverPrivate(boolean forever) {
-        setProperty(new BooleanProperty(CONTINUE_FOREVER, forever));
+        set(getSchema().getContinueForever(), forever);
     }
 
     private boolean getContinueForever() {
-        return getPropertyAsBoolean(CONTINUE_FOREVER);
+        return get(getSchema().getContinueForever());
     }
 
     /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/GenericControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/GenericControllerSchema.kt
new file mode 100644
index 00000000000..b3caca34d02
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/GenericControllerSchema.kt
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [GenericController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class GenericControllerSchema : TestElementSchema() {
+    public companion object INSTANCE : GenericControllerSchema()
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt
new file mode 100644
index 00000000000..3eea874f77d
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [LoopController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class LoopControllerSchema : GenericControllerSchema() {
+    public companion object INSTANCE : LoopControllerSchema()
+
+    public val loops: IntegerPropertyDescriptor<LoopControllerSchema>
+        by int("LoopController.loops")
+
+    /**
+     * In spite of the name, this is actually used to determine if the loop controller is repeatable.
+     *
+     * The value is only used in nextIsNull() when the loop end condition has been detected:
+     * If forever==true, then it calls resetLoopCount(), otherwise it calls setDone(true).
+     *
+     * Loop Controllers always set forever=true, so that they will be executed next time
+     * the parent invokes them.
+     *
+     * Thread Group sets the value false, so nextIsNull() sets done, and the Thread Group will not be repeated.
+     * However, it's not clear that a Thread Group could ever be repeated.
+     */
+    public val continueForever: BooleanPropertyDescriptor<LoopControllerSchema>
+        by boolean("LoopController.continue_forever")
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index a0c7e17b4e1..12db65f1895 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -232,7 +232,7 @@ private void createTestPlan(ActionEvent e, Request request, String statusText)
         threadGroup.setProperty(ThreadGroup.DURATION,"${__P(duration,3600)}");
         threadGroup.setDelay(5);
         LoopController loopCtrl = new LoopController();
-        loopCtrl.setProperty(LoopController.LOOPS,"${__P(iterations,-1)}");
+        loopCtrl.setLoops("${__P(iterations,-1)}");
         loopCtrl.setContinueForever(false);
         threadGroup.setSamplerController(loopCtrl);
         TestPlan testPlan = new TestPlan();

From 5b36de1b0a4f1423815323878bb5455020b383e9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 17:05:08 +0300
Subject: [PATCH 0537/1037] feat: add ArgumentSchema, ArgumentsSchema

---
 .../org/apache/jmeter/config/Argument.java    | 54 +++++++++++--------
 .../org/apache/jmeter/config/Arguments.java   | 21 ++++++--
 .../jmeter/config/ConfigTestElement.java      | 11 ++++
 .../apache/jmeter/config/ArgumentSchema.kt    | 43 +++++++++++++++
 .../apache/jmeter/config/ArgumentsSchema.kt   | 33 ++++++++++++
 .../jmeter/config/ConfigTestElementSchema.kt  | 24 +++++++++
 .../jmeter/protocol/system/SystemSampler.java |  4 +-
 7 files changed, 160 insertions(+), 30 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentsSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/config/ConfigTestElementSchema.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/config/Argument.java b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
index b97c0fa74e1..252e1b70e1e 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Argument.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
@@ -21,7 +21,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jorphan.util.JOrphanUtils;
 
 /**
@@ -33,18 +33,16 @@ public class Argument extends AbstractTestElement implements Serializable {
     private static final long serialVersionUID = 240L;
 
     /** Name used to store the argument's name. */
-    public static final String ARG_NAME = "Argument.name"; // $NON-NLS-1$
+    public static final String ARG_NAME = ArgumentSchema.INSTANCE.getArgumentName().getName();
 
     /** Name used to store the argument's value. */
-    public static final String VALUE = "Argument.value"; // $NON-NLS-1$
+    public static final String VALUE = ArgumentSchema.INSTANCE.getValue().getName();
 
     /** Name used to store the argument's description. */
-    public static final String DESCRIPTION = "Argument.desc"; // $NON-NLS-1$
-
-    private static final String DFLT_DESCRIPTION = ""; // $NON-NLS-1$
+    public static final String DESCRIPTION = ArgumentSchema.INSTANCE.getDescription().getName();
 
     /** Name used to store the argument's metadata. */
-    public static final String METADATA = "Argument.metadata"; // $NON-NLS-1$
+    public static final String METADATA = ArgumentSchema.INSTANCE.getMetadata().getName();
 
     /**
      * Create a new Argument without a name, value, or metadata.
@@ -92,20 +90,30 @@ public Argument(String name, String value, String metadata) {
      *            the argument description
      */
     public Argument(String name, String value, String metadata, String description) {
-        if(name != null) {
-            setProperty(new StringProperty(ARG_NAME, StringUtils.strip(name)));
+        if (name != null) {
+            setName(name);
         }
-        if(value != null) {
-            setProperty(new StringProperty(VALUE, value));
+        if (value != null) {
+            setValue(value);
         }
-        if(metadata != null) {
-            setProperty(new StringProperty(METADATA, metadata));
+        if (metadata != null) {
+            setMetaData(metadata);
         }
         if(description != null) {
-            setProperty(DESCRIPTION, description, DFLT_DESCRIPTION);
+            setDescription(description);
         }
     }
 
+    @Override
+    public ArgumentSchema getSchema() {
+        return ArgumentSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends Argument, ? extends ArgumentSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Set the name of the Argument.
      *
@@ -114,7 +122,7 @@ public Argument(String name, String value, String metadata, String description)
      */
     @Override
     public void setName(String newName) {
-        setProperty(new StringProperty(ARG_NAME, StringUtils.strip(newName)));
+        set(getSchema().getArgumentName(), StringUtils.strip(newName));
     }
 
     /**
@@ -124,7 +132,7 @@ public void setName(String newName) {
      */
     @Override
     public String getName() {
-        return getPropertyAsString(ARG_NAME);
+        return get(getSchema().getArgumentName());
     }
 
     /**
@@ -134,7 +142,7 @@ public String getName() {
      *            the new value
      */
     public void setValue(String newValue) {
-        setProperty(new StringProperty(VALUE, newValue));
+        set(getSchema().getValue(), newValue);
     }
 
     /**
@@ -143,7 +151,7 @@ public void setValue(String newValue) {
      * @return the attribute's value
      */
     public String getValue() {
-        return getPropertyAsString(VALUE);
+        return get(getSchema().getValue());
     }
 
     /**
@@ -153,7 +161,7 @@ public String getValue() {
      *            the new description
      */
     public void setDescription(String description) {
-        setProperty(DESCRIPTION, description, DFLT_DESCRIPTION);
+        set(getSchema().getDescription(), description);
     }
 
     /**
@@ -162,7 +170,7 @@ public void setDescription(String description) {
      * @return the MetaData value
      */
     public String getDescription() {
-        return getPropertyAsString(DESCRIPTION, DFLT_DESCRIPTION);
+        return get(getSchema().getDescription());
     }
 
     /**
@@ -172,7 +180,7 @@ public String getDescription() {
      *            the new metadata
      */
     public void setMetaData(String newMetaData) {
-        setProperty(new StringProperty(METADATA, newMetaData));
+        set(getSchema().getMetadata(), newMetaData);
     }
 
     /**
@@ -181,13 +189,13 @@ public void setMetaData(String newMetaData) {
      * @return the MetaData value
      */
     public String getMetaData() {
-        return getPropertyAsString(METADATA);
+        return get(getSchema().getMetadata());
     }
 
     @Override
     public String toString() {
         final String desc = getDescription();
-        if (DFLT_DESCRIPTION.equals(desc)) {
+        if (desc == null || desc.isEmpty()) {
             return getName() + getMetaData() + getValue();
         } else {
             return getName() + getMetaData() + getValue() + " //" + getDescription();
diff --git a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
index 7d5ed6efed3..966d6924cd5 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
@@ -27,6 +27,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 
 /**
  * A set of Argument objects.
@@ -36,13 +37,23 @@ public class Arguments extends ConfigTestElement implements Serializable, Iterab
     private static final long serialVersionUID = 240L;
 
     /** The name of the property used to store the arguments. */
-    public static final String ARGUMENTS = "Arguments.arguments"; //$NON-NLS-1$
+    public static final String ARGUMENTS = ArgumentsSchema.INSTANCE.getArguments().getName();
 
     /**
      * Create a new Arguments object with no arguments.
      */
     public Arguments() {
-        setProperty(new CollectionProperty(ARGUMENTS, new ArrayList<Argument>()));
+        setArguments(new ArrayList<>());
+    }
+
+    @Override
+    public ArgumentsSchema getSchema() {
+        return ArgumentsSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends Arguments, ? extends ArgumentsSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
     }
 
     /**
@@ -51,7 +62,7 @@ public Arguments() {
      * @return the arguments
      */
     public CollectionProperty getArguments() {
-        return (CollectionProperty) getProperty(ARGUMENTS);
+        return (CollectionProperty) getPropertyOrNull(getSchema().getArguments());
     }
 
     /**
@@ -60,7 +71,7 @@ public CollectionProperty getArguments() {
     @Override
     public void clear() {
         super.clear();
-        setProperty(new CollectionProperty(ARGUMENTS, new ArrayList<Argument>()));
+        setArguments(new ArrayList<>());
     }
 
     /**
@@ -70,7 +81,7 @@ public void clear() {
      *            the new arguments
      */
     public void setArguments(List<Argument> arguments) {
-        setProperty(new CollectionProperty(ARGUMENTS, arguments));
+        set(getSchema().getArguments(), arguments);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java b/src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java
index 3c8b72673ca..5e867945b4b 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java
@@ -21,6 +21,7 @@
 
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 
 public class ConfigTestElement extends AbstractTestElement implements Serializable, ConfigElement {
     private static final long serialVersionUID = 240L;
@@ -32,6 +33,16 @@ public class ConfigTestElement extends AbstractTestElement implements Serializab
     public ConfigTestElement() {
     }
 
+    @Override
+    public ConfigTestElementSchema getSchema() {
+        return ConfigTestElementSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends ConfigTestElement, ? extends ConfigTestElementSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     public void addTestElement(TestElement parm1) {
         if (parm1 instanceof ConfigTestElement) {
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentSchema.kt
new file mode 100644
index 00000000000..41bd12f3fda
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentSchema.kt
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.config
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [Argument].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class ArgumentSchema : TestElementSchema() {
+    public companion object INSTANCE : ArgumentSchema()
+
+    public val argumentName: StringPropertyDescriptor<ArgumentSchema>
+        by string("Argument.name")
+
+    public val value: StringPropertyDescriptor<ArgumentSchema>
+        by string("Argument.value")
+
+    public val description: StringPropertyDescriptor<ArgumentSchema>
+        by string("Argument.desc")
+
+    public val metadata: StringPropertyDescriptor<ArgumentSchema>
+        by string("Argument.metadata")
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentsSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentsSchema.kt
new file mode 100644
index 00000000000..d5140fbeeef
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/config/ArgumentsSchema.kt
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.config
+
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [Arguments].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class ArgumentsSchema : ConfigTestElementSchema() {
+    public companion object INSTANCE : ArgumentsSchema()
+
+    public val arguments: CollectionPropertyDescriptor<ArgumentsSchema>
+        by collection("Arguments.arguments")
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/config/ConfigTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/config/ConfigTestElementSchema.kt
new file mode 100644
index 00000000000..5e77cf93ed2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/config/ConfigTestElementSchema.kt
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.config
+
+import org.apache.jmeter.testelement.TestElementSchema
+
+public abstract class ConfigTestElementSchema : TestElementSchema() {
+    public companion object INSTANCE : ConfigTestElementSchema()
+}
diff --git a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
index c8b90ac6964..31c04bc1056 100644
--- a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
+++ b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
@@ -113,7 +113,7 @@ public SampleResult sample(Entry entry) {
         cmds.add(command);
         for (int i=0;i<args.getArgumentCount();i++) {
             Argument arg = args.getArgument(i);
-            cmds.add(arg.getPropertyAsString(Argument.VALUE));
+            cmds.add(arg.getValue());
             cmdLine.append(" ");
             cmdLine.append(cmds.get(i+1));
         }
@@ -121,7 +121,7 @@ public SampleResult sample(Entry entry) {
         Map<String,String> env = new HashMap<>();
         for (int i=0;i<environment.getArgumentCount();i++) {
             Argument arg = environment.getArgument(i);
-            env.put(arg.getName(), arg.getPropertyAsString(Argument.VALUE));
+            env.put(arg.getName(), arg.getValue());
         }
 
         File directory;

From d57e4e535ae96ae88819c0b5b17cab996c578938 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 10 Jun 2023 22:22:44 +0300
Subject: [PATCH 0538/1037] feat: add HTTPArgumentSchema

---
 .../protocol/http/util/HTTPArgument.java      | 32 ++++++++-------
 .../protocol/http/util/HTTPArgumentSchema.kt  | 41 +++++++++++++++++++
 2 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPArgumentSchema.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
index 687b8b8eafc..3353589b1f8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
@@ -25,8 +25,8 @@
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,18 +37,10 @@
  * Represents an Argument for HTTP requests.
  */
 public class HTTPArgument extends Argument implements Serializable {
-    private static final String DEFAULT_CONTENT_TYPE = "text/plain";
-
     private static final Logger log = LoggerFactory.getLogger(HTTPArgument.class);
 
     private static final long serialVersionUID = 241L;
 
-    private static final String ALWAYS_ENCODE = "HTTPArgument.always_encode";
-
-    private static final String USE_EQUALS = "HTTPArgument.use_equals";
-
-    private static final String CONTENT_TYPE = "HTTPArgument.content_type";
-
     private static final EncoderCache cache = new EncoderCache(1000);
 
     /**
@@ -68,17 +60,27 @@ public HTTPArgument(String name, String value, String metadata) {
         this.setMetaData(metadata);
     }
 
+    @Override
+    public HTTPArgumentSchema getSchema() {
+        return HTTPArgumentSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends HTTPArgument, ? extends HTTPArgumentSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     public void setUseEquals(boolean ue) {
         if (ue) {
             setMetaData("=");
         } else {
             setMetaData("");
         }
-        setProperty(new BooleanProperty(USE_EQUALS, ue));
+        set(getSchema().getUseEquals(), ue);
     }
 
     public boolean isUseEquals() {
-        boolean eq = getPropertyAsBoolean(USE_EQUALS);
+        boolean eq = get(getSchema().getUseEquals());
         if (getMetaData().equals("=") || (getValue() != null && getValue().length() > 0)) {
             setUseEquals(true);
             return true;
@@ -88,19 +90,19 @@ public boolean isUseEquals() {
     }
 
     public void setContentType(String ct) {
-        setProperty(CONTENT_TYPE, ct, HTTPArgument.DEFAULT_CONTENT_TYPE);
+        set(getSchema().getContentType(), ct);
     }
 
     public String getContentType() {
-        return getPropertyAsString(CONTENT_TYPE, HTTPArgument.DEFAULT_CONTENT_TYPE);
+        return get(getSchema().getContentType());
     }
 
     public void setAlwaysEncoded(boolean ae) {
-        setProperty(new BooleanProperty(ALWAYS_ENCODE, ae));
+        set(getSchema().getAlwaysEncode(), ae);
     }
 
     public boolean isAlwaysEncoded() {
-        return getPropertyAsBoolean(ALWAYS_ENCODE);
+        return get(getSchema().getAlwaysEncode());
     }
 
     /**
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPArgumentSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPArgumentSchema.kt
new file mode 100644
index 00000000000..0c2cec15ed3
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPArgumentSchema.kt
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.util
+
+import org.apache.jmeter.config.ArgumentSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HTTPArgument].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class HTTPArgumentSchema : ArgumentSchema() {
+    public companion object INSTANCE : HTTPArgumentSchema()
+
+    public val alwaysEncode: BooleanPropertyDescriptor<HTTPArgumentSchema>
+        by boolean("HTTPArgument.always_encode")
+
+    public val useEquals: BooleanPropertyDescriptor<HTTPArgumentSchema>
+        by boolean("HTTPArgument.use_equals")
+
+    public val contentType: StringPropertyDescriptor<HTTPArgumentSchema>
+        by string("HTTPArgument.content_type", "text/plain")
+}

From 86083488c134945170e27f5157dabab1e2fa5dcb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 11 Jun 2023 11:45:37 +0300
Subject: [PATCH 0539/1037] feat: add HttpSamplerBaseSchema

---
 .../http/config/gui/GraphQLUrlConfigGui.java  |   4 +-
 .../http/config/gui/HttpDefaultsGui.java      | 110 ++++-----
 .../http/config/gui/UrlConfigGui.java         |  44 ++--
 .../http/control/gui/HttpTestSampleGui.java   |  37 +--
 .../http/sampler/AccessLogSampler.java        |  13 +-
 .../http/sampler/HTTPSamplerBase.java         | 225 +++++++++---------
 .../http/util/accesslog/TCLogParser.java      |   7 +-
 .../http/sampler/HTTPSamplerBaseSchema.kt     |  91 +++++++
 .../sampler/HTTPSamplerProxyParamsSchema.kt   |  47 ++++
 .../protocol/http/config/UrlConfigTest.java   |   3 +-
 .../protocol/http/sampler/PackageTest.java    |   3 +-
 .../sampler/ParallelResourcesAndIpSource.java |   5 +-
 .../http/sampler/HttpSamplerPrintDslTest.kt   | 164 +++++++++++++
 13 files changed, 514 insertions(+), 239 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxyParamsSchema.kt
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index 2179941bd67..9f461e61001 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -30,11 +30,11 @@
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.util.GraphQLRequestParamUtils;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
 
@@ -128,7 +128,7 @@ public void modifyTestElement(TestElement element) {
             args.addArgument(createHTTPArgument("", GraphQLRequestParamUtils.toPostBodyString(params), false));
         }
 
-        element.setProperty(new TestElementProperty(HTTPSamplerBase.ARGUMENTS, args));
+        element.set(HTTPSamplerBaseSchema.INSTANCE.getArguments(), args);
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index dd49fc4cafe..e0672815ce4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -38,12 +38,10 @@
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JFactory;
 
@@ -108,62 +106,35 @@ public void modifyTestElement(TestElement config) {
         cfg.clear();
         cfg.addConfigElement(el);
         super.configureTestElement(config);
-        if (retrieveEmbeddedResources.isSelected()) {
-            config.setProperty(new BooleanProperty(HTTPSamplerBase.IMAGE_PARSER, true));
-        } else {
-            config.removeProperty(HTTPSamplerBase.IMAGE_PARSER);
-        }
+        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        config.set(httpSchema.getRetrieveEmbeddedResources(), retrieveEmbeddedResources.isSelected());
         enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
-        if (concurrentDwn.isSelected()) {
-            config.setProperty(new BooleanProperty(HTTPSamplerBase.CONCURRENT_DWN, true));
-        } else {
-            // The default is false, so we can remove the property to simplify JMX files
-            // This also allows HTTPDefaults to work for this checkbox
-            config.removeProperty(HTTPSamplerBase.CONCURRENT_DWN);
-        }
-        if(!StringUtils.isEmpty(concurrentPool.getText())) {
-            config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL,
-                    concurrentPool.getText()));
-        } else {
-            config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL,
-                    String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE)));
-        }
-        if(useMD5.isSelected()) {
-            config.setProperty(new BooleanProperty(HTTPSamplerBase.MD5, true));
-        } else {
-            config.removeProperty(HTTPSamplerBase.MD5);
-        }
-        if (!StringUtils.isEmpty(embeddedAllowRE.getText())) {
-            config.setProperty(new StringProperty(HTTPSamplerBase.EMBEDDED_URL_RE,
-                    embeddedAllowRE.getText()));
-        } else {
-            config.removeProperty(HTTPSamplerBase.EMBEDDED_URL_RE);
-        }
-        if (!StringUtils.isEmpty(embeddedExcludeRE.getText())) {
-            config.setProperty(new StringProperty(HTTPSamplerBase.EMBEDDED_URL_EXCLUDE_RE,
-                    embeddedExcludeRE.getText()));
+        config.set(httpSchema.getConcurrentDownload(), retrieveEmbeddedResources.isSelected());
+        if (!StringUtils.isEmpty(concurrentPool.getText())) {
+            config.set(httpSchema.getConcurrentDownloadPoolSize(), concurrentPool.getText());
         } else {
-            config.removeProperty(HTTPSamplerBase.EMBEDDED_URL_EXCLUDE_RE);
+            config.removeProperty(httpSchema.getConcurrentDownloadPoolSize());
         }
+        config.set(httpSchema.getStoreAsMD5(), useMD5.isSelected());
+        config.set(httpSchema.getEmbeddedUrlAllowRegex(), embeddedAllowRE.getText());
+        config.set(httpSchema.getEmbeddedUrlExcludeRegex(), embeddedExcludeRE.getText());
 
         if(!StringUtils.isEmpty(sourceIpAddr.getText())) {
-            config.setProperty(new StringProperty(HTTPSamplerBase.IP_SOURCE,
-                    sourceIpAddr.getText()));
-            config.setProperty(new IntegerProperty(HTTPSamplerBase.IP_SOURCE_TYPE,
-                    sourceIpType.getSelectedIndex()));
+            config.set(httpSchema.getIpSource(), sourceIpAddr.getText());
+            config.set(httpSchema.getIpSourceType(), sourceIpType.getSelectedIndex());
         } else {
-            config.removeProperty(HTTPSamplerBase.IP_SOURCE);
-            config.removeProperty(HTTPSamplerBase.IP_SOURCE_TYPE);
+            config.removeProperty(httpSchema.getIpSource());
+            config.removeProperty(httpSchema.getIpSourceType());
         }
 
-        config.setProperty(HTTPSamplerBase.PROXYSCHEME, proxyScheme.getText(),"");
-        config.setProperty(HTTPSamplerBase.PROXYHOST, proxyHost.getText(),"");
-        config.setProperty(HTTPSamplerBase.PROXYPORT, proxyPort.getText(),"");
-        config.setProperty(HTTPSamplerBase.PROXYUSER, proxyUser.getText(),"");
-        config.setProperty(HTTPSamplerBase.PROXYPASS, String.valueOf(proxyPass.getPassword()),"");
-        config.setProperty(HTTPSamplerBase.IMPLEMENTATION, httpImplementation.getSelectedItem().toString(),"");
-        config.setProperty(HTTPSamplerBase.CONNECT_TIMEOUT, connectTimeOut.getText());
-        config.setProperty(HTTPSamplerBase.RESPONSE_TIMEOUT, responseTimeOut.getText());
+        config.set(httpSchema.getProxy().getScheme(), proxyScheme.getText());
+        config.set(httpSchema.getProxy().getHost(), proxyHost.getText());
+        config.set(httpSchema.getProxy().getPort(), proxyPort.getText());
+        config.set(httpSchema.getProxy().getUsername(), proxyUser.getText());
+        config.set(httpSchema.getProxy().getPassword(), String.valueOf(proxyPass.getPassword()));
+        config.set(httpSchema.getImplementation(), String.valueOf(httpImplementation.getSelectedItem()));
+        config.set(httpSchema.getConnectTimeout(), connectTimeOut.getText());
+        config.set(httpSchema.getResponseTimeout(), responseTimeOut.getText());
     }
 
     /**
@@ -197,25 +168,24 @@ public void configure(TestElement el) {
         super.configure(el);
         AbstractTestElement samplerBase = (AbstractTestElement) el;
         urlConfigGui.configure(el);
-        retrieveEmbeddedResources.setSelected(samplerBase.getPropertyAsBoolean(HTTPSamplerBase.IMAGE_PARSER));
-        concurrentDwn.setSelected(samplerBase.getPropertyAsBoolean(HTTPSamplerBase.CONCURRENT_DWN));
-        concurrentPool.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.CONCURRENT_POOL));
-        useMD5.setSelected(samplerBase.getPropertyAsBoolean(HTTPSamplerBase.MD5, false));
-        embeddedAllowRE.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.EMBEDDED_URL_RE, ""));//$NON-NLS-1$
-        embeddedExcludeRE.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.EMBEDDED_URL_EXCLUDE_RE, ""));//$NON-NLS-1$
-        sourceIpAddr.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.IP_SOURCE)); //$NON-NLS-1$
-        sourceIpType.setSelectedIndex(
-                samplerBase.getPropertyAsInt(HTTPSamplerBase.IP_SOURCE_TYPE,
-                        HTTPSamplerBase.SOURCE_TYPE_DEFAULT));
-
-        proxyScheme.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYSCHEME));
-        proxyHost.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYHOST));
-        proxyPort.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYPORT));
-        proxyUser.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYUSER));
-        proxyPass.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYPASS));
-        httpImplementation.setSelectedItem(samplerBase.getPropertyAsString(HTTPSamplerBase.IMPLEMENTATION));
-        connectTimeOut.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.CONNECT_TIMEOUT));
-        responseTimeOut.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.RESPONSE_TIMEOUT));
+        HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        retrieveEmbeddedResources.setSelected(samplerBase.get(httpSchema.getRetrieveEmbeddedResources()));
+        concurrentDwn.setSelected(samplerBase.get(httpSchema.getConcurrentDownload()));
+        concurrentPool.setText(samplerBase.getString(httpSchema.getConcurrentDownloadPoolSize()));
+        useMD5.setSelected(samplerBase.get(httpSchema.getStoreAsMD5()));
+        embeddedAllowRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlAllowRegex()));
+        embeddedExcludeRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlExcludeRegex()));
+        sourceIpAddr.setText(samplerBase.get(httpSchema.getIpSource()));
+        sourceIpType.setSelectedIndex(samplerBase.get(httpSchema.getIpSourceType()));
+
+        proxyScheme.setText(samplerBase.getString(httpSchema.getProxy().getScheme()));
+        proxyHost.setText(samplerBase.getString(httpSchema.getProxy().getHost()));
+        proxyPort.setText(samplerBase.getString(httpSchema.getProxy().getPort()));
+        proxyUser.setText(samplerBase.getString(httpSchema.getProxy().getUsername()));
+        proxyPass.setText(samplerBase.getString(httpSchema.getProxy().getPassword()));
+        httpImplementation.setSelectedItem(samplerBase.getString(httpSchema.getImplementation()));
+        connectTimeOut.setText(samplerBase.getString(httpSchema.getConnectTimeout()));
+        responseTimeOut.setText(samplerBase.getString(httpSchema.getResponseTimeout()));
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index 5a591a50522..ba451fc9113 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -42,9 +42,7 @@
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JLabeledChoice;
@@ -215,17 +213,18 @@ public void modifyTestElement(TestElement element) {
         if(showFileUploadPane) {
             filesPanel.modifyTestElement(element);
         }
-        element.setProperty(HTTPSamplerBase.POST_BODY_RAW, useRaw, HTTPSamplerBase.POST_BODY_RAW_DEFAULT);
-        element.setProperty(new TestElementProperty(HTTPSamplerBase.ARGUMENTS, args));
-        element.setProperty(HTTPSamplerBase.DOMAIN, domain.getText());
-        element.setProperty(HTTPSamplerBase.PORT, port.getText());
-        element.setProperty(HTTPSamplerBase.PROTOCOL, protocol.getText());
-        element.setProperty(HTTPSamplerBase.CONTENT_ENCODING, contentEncoding.getText());
-        element.setProperty(HTTPSamplerBase.PATH, path.getText());
+        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        element.set(httpSchema.getPostBodyRaw(), useRaw);
+        element.set(httpSchema.getArguments(), args);
+        element.set(httpSchema.getDomain(), domain.getText());
+        element.set(httpSchema.getPort(), port.getText());
+        element.set(httpSchema.getProtocol(), protocol.getText());
+        element.set(httpSchema.getContentEncoding(), contentEncoding.getText());
+        element.set(httpSchema.getPath(), path.getText());
         if (notConfigOnly){
-            element.setProperty(HTTPSamplerBase.METHOD, method.getText());
-            element.setProperty(new BooleanProperty(HTTPSamplerBase.FOLLOW_REDIRECTS, followRedirects.isSelected()));
-            element.setProperty(new BooleanProperty(HTTPSamplerBase.AUTO_REDIRECTS, autoRedirects.isSelected()));
+            element.set(httpSchema.getMethod(), method.getText());
+            element.set(httpSchema.getFollowRedirects(), followRedirects.isSelected());
+            element.set(httpSchema.getAutoRedirects(), autoRedirects.isSelected());
             useKeepAlive.updateElement(element);
             useMultipart.updateElement(element);
             useBrowserCompatibleMultipartMode.updateElement(element);
@@ -269,10 +268,11 @@ private static String computePostBody(Arguments arguments, boolean crlfToLF) {
      */
     public void configure(TestElement el) {
         setName(el.getName());
-        Arguments arguments = (Arguments) el.getProperty(HTTPSamplerBase.ARGUMENTS).getObjectValue();
+        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        Arguments arguments = el.get(httpSchema.getArguments());
 
         if (showRawBodyPane) {
-            boolean useRaw = el.getPropertyAsBoolean(HTTPSamplerBase.POST_BODY_RAW, HTTPSamplerBase.POST_BODY_RAW_DEFAULT);
+            boolean useRaw = el.get(httpSchema.getPostBodyRaw());
             if(useRaw) {
                 String postBody = computePostBody(arguments, true); // Convert CRLF to CR, see modifyTestElement
                 postBodyContent.setInitialText(postBody);
@@ -290,9 +290,9 @@ public void configure(TestElement el) {
             filesPanel.configure(el);
         }
 
-        domain.setText(el.getPropertyAsString(HTTPSamplerBase.DOMAIN));
+        domain.setText(el.getString(httpSchema.getDomain()));
 
-        String portString = el.getPropertyAsString(HTTPSamplerBase.PORT);
+        String portString = el.getString(httpSchema.getPort());
 
         // Only display the port number if it is meaningfully specified
         if (portString.equals(HTTPSamplerBase.UNSPECIFIED_PORT_AS_STRING)) {
@@ -300,13 +300,13 @@ public void configure(TestElement el) {
         } else {
             port.setText(portString);
         }
-        protocol.setText(el.getPropertyAsString(HTTPSamplerBase.PROTOCOL));
-        contentEncoding.setText(el.getPropertyAsString(HTTPSamplerBase.CONTENT_ENCODING));
-        path.setText(el.getPropertyAsString(HTTPSamplerBase.PATH));
+        protocol.setText(el.getString(httpSchema.getProtocol()));
+        contentEncoding.setText(el.getString(httpSchema.getContentEncoding()));
+        path.setText(el.getString(httpSchema.getPath()));
         if (notConfigOnly){
-            method.setText(el.getPropertyAsString(HTTPSamplerBase.METHOD));
-            followRedirects.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.FOLLOW_REDIRECTS));
-            autoRedirects.setSelected(el.getPropertyAsBoolean(HTTPSamplerBase.AUTO_REDIRECTS));
+            method.setText(el.getString(httpSchema.getMethod()));
+            followRedirects.setSelected(el.get(httpSchema.getFollowRedirects()));
+            autoRedirects.setSelected(el.get(httpSchema.getAutoRedirects()));
             useKeepAlive.updateUi(el);
             useMultipart.updateUi(el);
             useBrowserCompatibleMultipartMode.updateUi(el);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index dd094513b5a..3459a73168d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -37,6 +37,7 @@
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.protocol.http.config.gui.UrlConfigGui;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
@@ -93,6 +94,7 @@ protected HttpTestSampleGui(boolean ajp) {
     public void configure(TestElement element) {
         super.configure(element);
         final HTTPSamplerBase samplerBase = (HTTPSamplerBase) element;
+        HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
         urlConfigGui.configure(element);
         retrieveEmbeddedResources.setSelected(samplerBase.isImageParser());
         concurrentDwn.setSelected(samplerBase.isConcurrentDwn());
@@ -103,14 +105,15 @@ public void configure(TestElement element) {
         if (!isAJP) {
             sourceIpAddr.setText(samplerBase.getIpSource());
             sourceIpType.setSelectedIndex(samplerBase.getIpSourceType());
-            proxyScheme.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYSCHEME));
-            proxyHost.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYHOST));
-            proxyPort.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYPORT));
-            proxyUser.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYUSER));
-            proxyPass.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.PROXYPASS));
-            httpImplementation.setSelectedItem(samplerBase.getPropertyAsString(HTTPSamplerBase.IMPLEMENTATION));
-            connectTimeOut.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.CONNECT_TIMEOUT));
-            responseTimeOut.setText(samplerBase.getPropertyAsString(HTTPSamplerBase.RESPONSE_TIMEOUT));
+
+            proxyScheme.setText(samplerBase.getString(httpSchema.getProxy().getScheme()));
+            proxyHost.setText(samplerBase.getString(httpSchema.getProxy().getHost()));
+            proxyPort.setText(samplerBase.getString(httpSchema.getProxy().getPort()));
+            proxyUser.setText(samplerBase.getString(httpSchema.getProxy().getUsername()));
+            proxyPass.setText(samplerBase.getString(httpSchema.getProxy().getPassword()));
+            httpImplementation.setSelectedItem(samplerBase.getString(httpSchema.getImplementation()));
+            connectTimeOut.setText(samplerBase.getString(httpSchema.getConnectTimeout()));
+            responseTimeOut.setText(samplerBase.getString(httpSchema.getResponseTimeout()));
         }
     }
 
@@ -134,6 +137,7 @@ public void modifyTestElement(TestElement sampler) {
         sampler.clear();
         urlConfigGui.modifyTestElement(sampler);
         final HTTPSamplerBase samplerBase = (HTTPSamplerBase) sampler;
+        HTTPSamplerBaseSchema httpSchema = samplerBase.getSchema();
         samplerBase.setImageParser(retrieveEmbeddedResources.isSelected());
         enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
         samplerBase.setConcurrentDwn(concurrentDwn.isSelected());
@@ -144,14 +148,15 @@ public void modifyTestElement(TestElement sampler) {
         if (!isAJP) {
             samplerBase.setIpSource(sourceIpAddr.getText());
             samplerBase.setIpSourceType(sourceIpType.getSelectedIndex());
-            samplerBase.setProperty(HTTPSamplerBase.PROXYSCHEME, proxyScheme.getText(),"");
-            samplerBase.setProperty(HTTPSamplerBase.PROXYHOST, proxyHost.getText(),"");
-            samplerBase.setProperty(HTTPSamplerBase.PROXYPORT, proxyPort.getText(),"");
-            samplerBase.setProperty(HTTPSamplerBase.PROXYUSER, proxyUser.getText(),"");
-            samplerBase.setProperty(HTTPSamplerBase.PROXYPASS, String.valueOf(proxyPass.getPassword()),"");
-            samplerBase.setProperty(HTTPSamplerBase.IMPLEMENTATION, httpImplementation.getSelectedItem().toString(),"");
-            samplerBase.setProperty(HTTPSamplerBase.CONNECT_TIMEOUT, connectTimeOut.getText());
-            samplerBase.setProperty(HTTPSamplerBase.RESPONSE_TIMEOUT, responseTimeOut.getText());
+
+            samplerBase.set(httpSchema.getProxy().getScheme(), proxyScheme.getText());
+            samplerBase.set(httpSchema.getProxy().getHost(), proxyHost.getText());
+            samplerBase.set(httpSchema.getProxy().getPort(), proxyPort.getText());
+            samplerBase.set(httpSchema.getProxy().getUsername(), proxyUser.getText());
+            samplerBase.set(httpSchema.getProxy().getPassword(), String.valueOf(proxyPass.getPassword()));
+            samplerBase.set(httpSchema.getImplementation(), String.valueOf(httpImplementation.getSelectedItem()));
+            samplerBase.set(httpSchema.getConnectTimeout(), connectTimeOut.getText());
+            samplerBase.set(httpSchema.getResponseTimeout(), responseTimeOut.getText());
         }
         super.configureTestElement(sampler);
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
index b25e218f3a2..a48146247df 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
@@ -20,7 +20,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.protocol.http.control.CookieManager;
-import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.accesslog.Filter;
 import org.apache.jmeter.protocol.http.util.accesslog.LogParser;
 import org.apache.jmeter.samplers.Entry;
@@ -265,7 +264,7 @@ public void setImageParsing(boolean imageParsing) {
      * @return Returns the port.
      */
     public String getPortString() {
-        return super.getPropertyAsString(HTTPSamplerBase.PORT);
+        return getString(getSchema().getPort());
     }
 
     /**
@@ -273,7 +272,7 @@ public String getPortString() {
      *            The port to set.
      */
     public void setPortString(String port) {
-        super.setProperty(HTTPSamplerBase.PORT, port);
+        set(getSchema().getPort(), port);
     }
 
     /**
@@ -282,7 +281,7 @@ public void setPortString(String port) {
      */
     @Override
     public void setProtocol(String value) {
-        setProperty(PROTOCOL, value.toLowerCase(java.util.Locale.ENGLISH));
+        super.setProtocol(value);
     }
 
     /**
@@ -292,11 +291,7 @@ public void setProtocol(String value) {
      */
     @Override
     public String getProtocol() {
-        String protocol = getPropertyAsString(PROTOCOL);
-        if (StringUtils.isEmpty(protocol)) {
-            return HTTPConstants.PROTOCOL_HTTP;
-        }
-        return protocol;
+        return super.getProtocol();
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 1706587d21c..5a527042073 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -78,14 +79,12 @@
 import org.apache.jmeter.testelement.TestIterationListener;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.ThreadListener;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.CollectionProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
-import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
+import org.apache.jmeter.testelement.schema.PropertyDescriptor;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
@@ -122,83 +121,83 @@ public abstract class HTTPSamplerBase extends AbstractSampler
                     "org.apache.jmeter.testbeans.gui.TestBeanGUI"
             ));
 
+    private static final HTTPSamplerBaseSchema SCHEMA = HTTPSamplerBaseSchema.INSTANCE;
+
     //+ JMX names - do not change
-    public static final String ARGUMENTS = "HTTPsampler.Arguments"; // $NON-NLS-1$
+    public static final String ARGUMENTS = SCHEMA.getArguments().getName();
 
-    public static final String AUTH_MANAGER = "HTTPSampler.auth_manager"; // $NON-NLS-1$
+    public static final String AUTH_MANAGER = SCHEMA.getAuthManager().getName();
 
-    public static final String COOKIE_MANAGER = "HTTPSampler.cookie_manager"; // $NON-NLS-1$
+    public static final String COOKIE_MANAGER = SCHEMA.getCookieManager().getName();
 
-    public static final String KEYSTORE_CONFIG = "HTTPSampler.keystore_configuration"; // $NON-NLS-1$
+    public static final String KEYSTORE_CONFIG = SCHEMA.getCookieManager().getName();
 
     public static final String SAMPLE_TIMEOUT = "HTTPSampler.sample_timeout"; // $NON-NLS-1$
 
-    public static final String CACHE_MANAGER = "HTTPSampler.cache_manager"; // $NON-NLS-1$
+    public static final String CACHE_MANAGER = SCHEMA.getCacheManager().getName();
 
-    public static final String HEADER_MANAGER = "HTTPSampler.header_manager"; // $NON-NLS-1$
+    public static final String HEADER_MANAGER = SCHEMA.getHeaderManager().getName();
 
-    public static final String DNS_CACHE_MANAGER = "HTTPSampler.dns_cache_manager"; // $NON-NLS-1$
+    public static final String DNS_CACHE_MANAGER = SCHEMA.getDnsCacheManager().getName();
 
-    public static final String DOMAIN = "HTTPSampler.domain"; // $NON-NLS-1$
+    public static final String DOMAIN = SCHEMA.getDomain().getName();
 
-    public static final String PORT = "HTTPSampler.port"; // $NON-NLS-1$
+    public static final String PORT = SCHEMA.getPort().getName();
 
-    public static final String PROXYSCHEME = "HTTPSampler.proxyScheme"; // $NON-NLS-1$
+    public static final String PROXYSCHEME = SCHEMA.getProxy().getScheme().getName();
 
-    public static final String PROXYHOST = "HTTPSampler.proxyHost"; // $NON-NLS-1$
+    public static final String PROXYHOST = SCHEMA.getProxy().getHost().getName();
 
-    public static final String PROXYPORT = "HTTPSampler.proxyPort"; // $NON-NLS-1$
+    public static final String PROXYPORT = SCHEMA.getProxy().getPort().getName();
 
-    public static final String PROXYUSER = "HTTPSampler.proxyUser"; // $NON-NLS-1$
+    public static final String PROXYUSER = SCHEMA.getProxy().getUsername().getName();
 
-    public static final String PROXYPASS = "HTTPSampler.proxyPass"; // $NON-NLS-1$
+    public static final String PROXYPASS = SCHEMA.getProxy().getPassword().getName();
 
-    public static final String CONNECT_TIMEOUT = "HTTPSampler.connect_timeout"; // $NON-NLS-1$
+    public static final String CONNECT_TIMEOUT = SCHEMA.getConnectTimeout().getName();
 
-    public static final String RESPONSE_TIMEOUT = "HTTPSampler.response_timeout"; // $NON-NLS-1$
+    public static final String RESPONSE_TIMEOUT = SCHEMA.getResponseTimeout().getName();
 
-    public static final String METHOD = "HTTPSampler.method"; // $NON-NLS-1$
+    public static final String METHOD = SCHEMA.getMethod().getName();
 
     /** This is the encoding used for the content, i.e. the charset name, not the header "Content-Encoding" */
-    public static final String CONTENT_ENCODING = "HTTPSampler.contentEncoding"; // $NON-NLS-1$
+    public static final String CONTENT_ENCODING = SCHEMA.getContentEncoding().getName();
 
-    public static final String IMPLEMENTATION = "HTTPSampler.implementation"; // $NON-NLS-1$
+    public static final String IMPLEMENTATION = SCHEMA.getImplementation().getName();
 
-    public static final String PATH = "HTTPSampler.path"; // $NON-NLS-1$
+    public static final String PATH = SCHEMA.getPath().getName();
 
-    public static final String FOLLOW_REDIRECTS = HTTPSamplerBaseSchema.INSTANCE.getFollowRedirects().getName();
+    public static final String FOLLOW_REDIRECTS = SCHEMA.getFollowRedirects().getName();
 
-    public static final String AUTO_REDIRECTS = "HTTPSampler.auto_redirects"; // $NON-NLS-1$
+    public static final String AUTO_REDIRECTS = SCHEMA.getAutoRedirects().getName();
 
-    public static final String PROTOCOL = "HTTPSampler.protocol"; // $NON-NLS-1$
+    public static final String PROTOCOL = SCHEMA.getProtocol().getName();
 
     static final String PROTOCOL_FILE = "file"; // $NON-NLS-1$
 
-    private static final String DEFAULT_PROTOCOL = HTTPConstants.PROTOCOL_HTTP;
-
     public static final String URL = "HTTPSampler.URL"; // $NON-NLS-1$
 
     /**
      * IP source to use - does not apply to Java HTTP implementation currently
      */
-    public static final String IP_SOURCE = "HTTPSampler.ipSource"; // $NON-NLS-1$
+    public static final String IP_SOURCE = SCHEMA.getIpSource().getName();
 
-    public static final String IP_SOURCE_TYPE = "HTTPSampler.ipSourceType"; // $NON-NLS-1$
+    public static final String IP_SOURCE_TYPE = SCHEMA.getIpSourceType().getName();
 
-    public static final String USE_KEEPALIVE = HTTPSamplerBaseSchema.INSTANCE.getUseKeepalive().getName();
+    public static final String USE_KEEPALIVE = SCHEMA.getUseKeepalive().getName();
 
-    public static final String DO_MULTIPART_POST = HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost().getName();
+    public static final String DO_MULTIPART_POST = SCHEMA.getUseMultipartPost().getName();
 
     public static final String BROWSER_COMPATIBLE_MULTIPART =
-            HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart().getName();
+            SCHEMA.getUseBrowserCompatibleMultipart().getName();
 
-    public static final String CONCURRENT_DWN = "HTTPSampler.concurrentDwn"; // $NON-NLS-1$
+    public static final String CONCURRENT_DWN = SCHEMA.getConcurrentDownload().getName();
 
-    public static final String CONCURRENT_POOL = "HTTPSampler.concurrentPool"; // $NON-NLS-1$
+    public static final String CONCURRENT_POOL = SCHEMA.getConcurrentDownloadPoolSize().getName();
 
-    public static final int CONCURRENT_POOL_SIZE = 6; // Default concurrent pool size for download embedded resources
-
-    private static final String CONCURRENT_POOL_DEFAULT = Integer.toString(CONCURRENT_POOL_SIZE); // default for concurrent pool
+    // Default concurrent pool size for download embedded resources
+    @SuppressWarnings("DataFlowIssue")
+    public static final int CONCURRENT_POOL_SIZE = SCHEMA.getConcurrentDownloadPoolSize().getDefaultValue();
 
     private static final String USER_AGENT = "User-Agent"; // $NON-NLS-1$
 
@@ -266,18 +265,18 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     public static final String CONTENT_TYPE = "HTTPSampler.CONTENT_TYPE"; // $NON-NLS-1$
 
     // IMAGE_PARSER now really means EMBEDDED_PARSER
-    public static final String IMAGE_PARSER = "HTTPSampler.image_parser"; // $NON-NLS-1$
+    public static final String IMAGE_PARSER = SCHEMA.getRetrieveEmbeddedResources().getName();
 
     // Embedded URLs must match this RE (if provided)
-    public static final String EMBEDDED_URL_RE = "HTTPSampler.embedded_url_re"; // $NON-NLS-1$
+    public static final String EMBEDDED_URL_RE = SCHEMA.getEmbeddedUrlAllowRegex().getName();
 
     // Embedded URLs must not match this RE (if provided)
-    public static final String EMBEDDED_URL_EXCLUDE_RE = "HTTPSampler.embedded_url_exclude_re"; // $NON-NLS-1$
+    public static final String EMBEDDED_URL_EXCLUDE_RE = SCHEMA.getEmbeddedUrlExcludeRegex().getName();
 
     public static final String MONITOR = "HTTPSampler.monitor"; // $NON-NLS-1$
 
     // Store MD5 hash instead of storing response
-    public static final String MD5 = "HTTPSampler.md5"; // $NON-NLS-1$
+    public static final String MD5 = SCHEMA.getStoreAsMD5().getName();
 
     /** A number to indicate that the port has not been set. */
     public static final int UNSPECIFIED_PORT = 0;
@@ -291,9 +290,10 @@ public abstract class HTTPSamplerBase extends AbstractSampler
 
     protected static final String NON_HTTP_RESPONSE_MESSAGE = "Non HTTP response message";
 
-    public static final String POST_BODY_RAW = "HTTPSampler.postBodyRaw";
+    public static final String POST_BODY_RAW = SCHEMA.getPostBodyRaw().getName();
 
-    public static final boolean POST_BODY_RAW_DEFAULT = false;
+    @SuppressWarnings("DataFlowIssue")
+    public static final boolean POST_BODY_RAW_DEFAULT = SCHEMA.getPostBodyRaw().getDefaultValue();
 
     private static final String ARG_VAL_SEP = "="; // $NON-NLS-1$
 
@@ -465,7 +465,7 @@ private static boolean hasNoMissingFile(HTTPFileArg[] files) {
     }
 
     public void setProtocol(String value) {
-        setProperty(PROTOCOL, value.toLowerCase(java.util.Locale.ENGLISH));
+        set(getSchema().getProtocol(), value.toLowerCase(java.util.Locale.ENGLISH));
     }
 
     /**
@@ -474,9 +474,9 @@ public void setProtocol(String value) {
      * @return the protocol
      */
     public String getProtocol() {
-        String protocol = getPropertyAsString(PROTOCOL);
+        String protocol = getString(getSchema().getProtocol());
         if (protocol == null || protocol.isEmpty()) {
-            return DEFAULT_PROTOCOL;
+            return HTTPConstants.PROTOCOL_HTTP;
         }
         return protocol;
     }
@@ -510,19 +510,20 @@ public void setPath(String path, String contentEncoding) {
         if (!fullUrl && getOrDelete) {
             int index = path.indexOf(QRY_PFX);
             if (index > -1) {
-                setProperty(PATH, path.substring(0, index));
+
+                set(getSchema().getPath(), path.substring(0, index));
                 // Parse the arguments in querystring, assuming specified encoding for values
                 parseArguments(path.substring(index + 1), contentEncoding);
             } else {
-                setProperty(PATH, path);
+                set(getSchema().getPath(), path);
             }
         } else {
-            setProperty(PATH, path);
+            set(getSchema().getPath(), path);
         }
     }
 
     public String getPath() {
-        String p = getPropertyAsString(PATH);
+        String p = get(getSchema().getPath());
         return encodeSpaces(p);
     }
 
@@ -535,19 +536,19 @@ public boolean getFollowRedirects() {
     }
 
     public void setAutoRedirects(boolean value) {
-        setProperty(new BooleanProperty(AUTO_REDIRECTS, value));
+        set(getSchema().getAutoRedirects(), value);
     }
 
     public boolean getAutoRedirects() {
-        return getPropertyAsBoolean(AUTO_REDIRECTS);
+        return get(getSchema().getAutoRedirects());
     }
 
     public void setMethod(String value) {
-        setProperty(METHOD, value);
+        set(getSchema().getMethod(), value);
     }
 
     public String getMethod() {
-        return getPropertyAsString(METHOD);
+        return get(getSchema().getMethod());
     }
 
     /**
@@ -556,7 +557,7 @@ public String getMethod() {
      * @param charsetName the name of the encoding to be used
      */
     public void setContentEncoding(String charsetName) {
-        setProperty(CONTENT_ENCODING, charsetName);
+        set(getSchema().getContentEncoding(), charsetName);
     }
 
     /**
@@ -564,7 +565,7 @@ public void setContentEncoding(String charsetName) {
      * @return the encoding of the content, i.e. its charset name
      */
     public String getContentEncoding() {
-        return getPropertyAsString(CONTENT_ENCODING);
+        return get(getSchema().getContentEncoding());
     }
 
     public void setUseKeepAlive(boolean value) {
@@ -636,19 +637,19 @@ public boolean isMonitor() {
     }
 
     public void setImplementation(String value) {
-        this.setProperty(IMPLEMENTATION, value);
+        set(getSchema().getImplementation(), value);
     }
 
     public String getImplementation() {
-        return this.getPropertyAsString(IMPLEMENTATION);
+        return get(getSchema().getImplementation());
     }
 
     public boolean useMD5() {
-        return this.getPropertyAsBoolean(MD5, false);
+        return get(getSchema().getStoreAsMD5());
     }
 
-    public void setMD5(boolean truth) {
-        this.setProperty(MD5, truth, false);
+    public void setMD5(boolean value) {
+        set(getSchema().getStoreAsMD5(), value);
     }
 
     /**
@@ -756,11 +757,11 @@ public void addTestElement(TestElement el) {
      */
     @Override
     public void clearTestElementChildren() {
-        removeProperty(HEADER_MANAGER);
+        removeProperty(getSchema().getHeaderManager());
     }
 
     public void setPort(int value) {
-        setProperty(new IntegerProperty(PORT, value));
+        set(getSchema().getPort(), value);
     }
 
     /**
@@ -787,7 +788,7 @@ public static int getDefaultPort(String protocol, int port) {
      * @return port number or UNSPECIFIED_PORT (== 0)
      */
     public int getPortIfSpecified() {
-        String portAsString = getPropertyAsString(PORT);
+        String portAsString = getString(getSchema().getPort());
         if(portAsString == null || portAsString.isEmpty()) {
             return UNSPECIFIED_PORT;
         }
@@ -840,27 +841,27 @@ public int getPort() {
     }
 
     public void setDomain(String value) {
-        setProperty(DOMAIN, value);
+        set(getSchema().getDomain(), value);
     }
 
     public String getDomain() {
-        return getPropertyAsString(DOMAIN);
+        return getString(getSchema().getDomain());
     }
 
     public void setConnectTimeout(String value) {
-        setProperty(CONNECT_TIMEOUT, value, "");
+        set(getSchema().getConnectTimeout(), value);
     }
 
     public int getConnectTimeout() {
-        return getPropertyAsInt(CONNECT_TIMEOUT, 0);
+        return get(getSchema().getConnectTimeout());
     }
 
     public void setResponseTimeout(String value) {
-        setProperty(RESPONSE_TIMEOUT, value, "");
+        set(getSchema().getResponseTimeout(), value);
     }
 
     public int getResponseTimeout() {
-        return getPropertyAsInt(RESPONSE_TIMEOUT, 0);
+        return get(getSchema().getResponseTimeout());
     }
 
     public String getProxyScheme() {
@@ -868,62 +869,62 @@ public String getProxyScheme() {
     }
 
     public void setProxyScheme(String schema) {
-        setProperty(PROXYSCHEME, schema);
+        set(getSchema().getProxy().getScheme(), schema);
     }
 
     public String getProxyHost() {
-        return getPropertyAsString(PROXYHOST);
+        return get(getSchema().getProxy().getHost());
     }
 
     public void setProxyHost(String host) {
-        setProperty(PROXYHOST, host);
+        set(getSchema().getProxy().getHost(), host);
     }
 
     public int getProxyPortInt() {
-        return getPropertyAsInt(PROXYPORT, 0);
+        return get(getSchema().getProxy().getPort());
     }
 
     public void setProxyPortInt(String port) {
-        setProperty(PROXYPORT, port);
+        set(getSchema().getProxy().getPort(), port);
     }
 
     public String getProxyUser() {
-        return getPropertyAsString(PROXYUSER);
+        return get(getSchema().getProxy().getUsername());
     }
 
     public void setProxyUser(String user) {
-        setProperty(PROXYUSER, user);
+        set(getSchema().getProxy().getUsername(), user);
     }
 
     public String getProxyPass() {
-        return getPropertyAsString(PROXYPASS);
+        return get(getSchema().getProxy().getPassword());
     }
 
     public void setProxyPass(String pass) {
-        setProperty(PROXYPASS, pass);
+        set(getSchema().getProxy().getPassword(), pass);
     }
 
     // gets called from ctor, so has to be final
     public final void setArguments(Arguments value) {
-        setProperty(new TestElementProperty(ARGUMENTS, value));
+        set(getSchema().getArguments(), value);
     }
 
     public Arguments getArguments() {
-        return (Arguments) getProperty(ARGUMENTS).getObjectValue();
+        return getOrNull(getSchema().getArguments());
     }
 
     /**
      * @param value Boolean that indicates body will be sent as is
      */
     public void setPostBodyRaw(boolean value) {
-        setProperty(POST_BODY_RAW, value, POST_BODY_RAW_DEFAULT);
+        set(getSchema().getPostBodyRaw(), value);
     }
 
     /**
      * @return boolean that indicates body will be sent as is
      */
     public boolean getPostBodyRaw() {
-        return getPropertyAsBoolean(POST_BODY_RAW, POST_BODY_RAW_DEFAULT);
+        return get(getSchema().getPostBodyRaw());
     }
 
     public void setAuthManager(AuthManager value) {
@@ -933,11 +934,11 @@ public void setAuthManager(AuthManager value) {
                 log.warn("Existing AuthManager {} superseded by {}", mgr.getName(), value.getName());
             }
         }
-        setProperty(new TestElementProperty(AUTH_MANAGER, value));
+        set(getSchema().getAuthManager(), value);
     }
 
     public AuthManager getAuthManager() {
-        return (AuthManager) getProperty(AUTH_MANAGER).getObjectValue();
+        return getOrNull(getSchema().getAuthManager());
     }
 
     public void setHeaderManager(final HeaderManager value) {
@@ -952,16 +953,16 @@ public void setHeaderManager(final HeaderManager value) {
                 }
             }
         }
-        setProperty(new TestElementProperty(HEADER_MANAGER, lValue));
+        set(getSchema().getHeaderManager(), lValue);
     }
 
     public HeaderManager getHeaderManager() {
-        return (HeaderManager) getProperty(HEADER_MANAGER).getObjectValue();
+        return getOrNull(getSchema().getHeaderManager());
     }
 
     // private method to allow AsyncSample to reset the value without performing checks
     private void setCookieManagerProperty(CookieManager value) {
-        setProperty(new TestElementProperty(COOKIE_MANAGER, value));
+        set(getSchema().getCookieManager(), value);;
     }
 
     public void setCookieManager(CookieManager value) {
@@ -975,15 +976,15 @@ public void setCookieManager(CookieManager value) {
     }
 
     public CookieManager getCookieManager() {
-        return (CookieManager) getProperty(COOKIE_MANAGER).getObjectValue();
+        return getOrNull(getSchema().getCookieManager());
     }
 
     // private method to allow AsyncSample to reset the value without performing checks
     private void setCacheManagerProperty(CacheManager value) {
-        setProperty(new TestElementProperty(CACHE_MANAGER, value));
+        set(getSchema().getCacheManager(), value);
     }
     private void setKeystoreConfigProperty(KeystoreConfig value) {
-        setProperty(new TestElementProperty(KEYSTORE_CONFIG, value));
+        set(getSchema().getKeystoreConfig(), value);
     }
 
     public void setKeystoreConfig(KeystoreConfig value) {
@@ -995,7 +996,7 @@ public void setKeystoreConfig(KeystoreConfig value) {
     }
 
     public KeystoreConfig getKeystoreConfig() {
-        return (KeystoreConfig) getProperty(KEYSTORE_CONFIG).getObjectValue();
+        return getOrNull(getSchema().getKeystoreConfig());
     }
 
     public void setCacheManager(CacheManager value) {
@@ -1009,11 +1010,11 @@ public void setCacheManager(CacheManager value) {
     }
 
     public CacheManager getCacheManager() {
-        return (CacheManager) getProperty(CACHE_MANAGER).getObjectValue();
+        return getOrNull(getSchema().getCacheManager());
     }
 
     public DNSCacheManager getDNSResolver() {
-        return (DNSCacheManager) getProperty(DNS_CACHE_MANAGER).getObjectValue();
+        return getOrNull(getSchema().getDnsCacheManager());
     }
 
     public void setDNSResolver(DNSCacheManager cacheManager) {
@@ -1023,15 +1024,15 @@ public void setDNSResolver(DNSCacheManager cacheManager) {
                 log.warn("Existing DNSCacheManager {} superseded by {}", mgr.getName(), cacheManager.getName());
             }
         }
-        setProperty(new TestElementProperty(DNS_CACHE_MANAGER, cacheManager));
+        set(getSchema().getDnsCacheManager(), cacheManager);
     }
 
     public boolean isImageParser() {
-        return getPropertyAsBoolean(IMAGE_PARSER, false);
+        return get(getSchema().getRetrieveEmbeddedResources());
     }
 
     public void setImageParser(boolean parseImages) {
-        setProperty(IMAGE_PARSER, parseImages, false);
+        set(getSchema().getRetrieveEmbeddedResources(), parseImages);
     }
 
     /**
@@ -1040,22 +1041,22 @@ public void setImageParser(boolean parseImages) {
      * @return regular expression (or empty) string
      */
     public String getEmbeddedUrlRE() {
-        return getPropertyAsString(EMBEDDED_URL_RE, "");
+        return get(getSchema().getEmbeddedUrlAllowRegex());
     }
 
     public void setEmbeddedUrlRE(String regex) {
-        setProperty(new StringProperty(EMBEDDED_URL_RE, regex));
+        set(getSchema().getEmbeddedUrlAllowRegex(), regex);
     }
 
     /**
      * @return the regular (as String) expression that embedded URLs must not match
      */
     public String getEmbededUrlExcludeRE() {
-        return getPropertyAsString(EMBEDDED_URL_EXCLUDE_RE, "");
+        return get(getSchema().getEmbeddedUrlExcludeRegex());
     }
 
     public void setEmbeddedUrlExcludeRE(String regex) {
-        setProperty(EMBEDDED_URL_EXCLUDE_RE, regex, "");
+        set(getSchema().getEmbeddedUrlExcludeRegex(), regex);
     }
 
     /**
@@ -2079,7 +2080,7 @@ void mergeFileProperties() {
      * @param value IP source to use
      */
     public void setIpSource(String value) {
-        setProperty(IP_SOURCE, value, "");
+        set(getSchema().getIpSource(), value);
     }
 
     /**
@@ -2088,7 +2089,7 @@ public void setIpSource(String value) {
      * @return IP source to use
      */
     public String getIpSource() {
-        return getPropertyAsString(IP_SOURCE, "");
+        return get(getSchema().getIpSource());
     }
 
     /**
@@ -2097,7 +2098,7 @@ public String getIpSource() {
      * @param value type of the IP/address source
      */
     public void setIpSourceType(int value) {
-        setProperty(IP_SOURCE_TYPE, value, SOURCE_TYPE_DEFAULT);
+        set(getSchema().getIpSourceType(), value);
     }
 
     /**
@@ -2106,7 +2107,7 @@ public void setIpSourceType(int value) {
      * @return address source type
      */
     public int getIpSourceType() {
-        return getPropertyAsInt(IP_SOURCE_TYPE, SOURCE_TYPE_DEFAULT);
+        return get(getSchema().getIpSourceType());
     }
 
     /**
@@ -2115,11 +2116,11 @@ public int getIpSourceType() {
      * @return true if used
      */
     public boolean isConcurrentDwn() {
-        return getPropertyAsBoolean(CONCURRENT_DWN, false);
+        return get(getSchema().getConcurrentDownload());
     }
 
     public void setConcurrentDwn(boolean concurrentDwn) {
-        setProperty(CONCURRENT_DWN, concurrentDwn, false);
+        set(getSchema().getConcurrentDownload(), concurrentDwn);
     }
 
     /**
@@ -2128,11 +2129,11 @@ public void setConcurrentDwn(boolean concurrentDwn) {
      * @return the pool size
      */
     public String getConcurrentPool() {
-        return getPropertyAsString(CONCURRENT_POOL, CONCURRENT_POOL_DEFAULT);
+        return getString(getSchema().getConcurrentDownloadPoolSize());
     }
 
     public void setConcurrentPool(String poolSize) {
-        setProperty(CONCURRENT_POOL, poolSize, CONCURRENT_POOL_DEFAULT);
+        set(getSchema().getConcurrentDownloadPoolSize(), poolSize);
     }
 
 
@@ -2204,8 +2205,8 @@ public int replace(String regex, String replaceBy, boolean caseSensitive) throws
 
         totalReplaced += JOrphanUtils.replaceValue(regex, replaceBy, caseSensitive, getPath(), this::setPath);
         totalReplaced += JOrphanUtils.replaceValue(regex, replaceBy, caseSensitive, getDomain(), this::setDomain);
-        for (String key: Arrays.asList(PORT, PROTOCOL)) {
-            totalReplaced += JOrphanUtils.replaceValue(regex, replaceBy, caseSensitive, getPropertyAsString(key), s -> setProperty(key, s));
+        for (PropertyDescriptor<HTTPSamplerBaseSchema, ? extends Serializable> key : Arrays.asList(getSchema().getPort(), getSchema().getProtocol())) {
+            totalReplaced += JOrphanUtils.replaceValue(regex, replaceBy, caseSensitive, getString(key), s -> set(key, s));
         }
 
         return totalReplaced;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
index 72a45b25d2e..b5ccf2e3496 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
@@ -32,6 +32,7 @@
 import java.util.zip.GZIPInputStream;
 
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.testelement.TestElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -284,7 +285,7 @@ protected int parseLine(String line, TestElement el) {
         String cleanedLine = this.cleanURL(line);
         log.debug("parsing line: {}", line);
         // now we set request method
-        el.setProperty(HTTPSamplerBase.METHOD, RMETHOD);
+        el.set(HTTPSamplerBaseSchema.INSTANCE.getMethod(), RMETHOD);
         if (FILTER != null) {
             log.debug("filter is not null");
             if (!FILTER.isFiltered(line,el)) {
@@ -421,10 +422,10 @@ public String stripFile(String url, TestElement el) {
         if (url.contains("?")) {
             StringTokenizer tokens = this.tokenize(url, "?");
             this.URL_PATH = tokens.nextToken();
-            el.setProperty(HTTPSamplerBase.PATH, URL_PATH);
+            el.set(HTTPSamplerBaseSchema.INSTANCE.getPath(), URL_PATH);
             return tokens.hasMoreTokens() ? tokens.nextToken() : null;
         }
-        el.setProperty(HTTPSamplerBase.PATH, url);
+        el.set(HTTPSamplerBaseSchema.INSTANCE.getPath(), url);
         return null;
     }
 
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index d28320ad8ef..9e80186afaf 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -17,8 +17,19 @@
 
 package org.apache.jmeter.protocol.http.sampler
 
+import org.apache.jmeter.config.Arguments
+import org.apache.jmeter.config.KeystoreConfig
+import org.apache.jmeter.protocol.http.control.AuthManager
+import org.apache.jmeter.protocol.http.control.CacheManager
+import org.apache.jmeter.protocol.http.control.CookieManager
+import org.apache.jmeter.protocol.http.control.DNSCacheManager
+import org.apache.jmeter.protocol.http.control.HeaderManager
+import org.apache.jmeter.protocol.http.util.HTTPConstants
 import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
 import org.apiguardian.api.API
 
 /**
@@ -30,9 +41,62 @@ import org.apiguardian.api.API
 public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
     public companion object INSTANCE : HTTPSamplerBaseSchema()
 
+    public val arguments: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, Arguments>
+        by testElement("HTTPsampler.Arguments")
+
+    public val authManager: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, AuthManager>
+        by testElement("HTTPSampler.auth_manager")
+
+    public val cookieManager: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, CookieManager>
+        by testElement("HTTPSampler.cookie_manager")
+
+    public val keystoreConfig: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, KeystoreConfig>
+        by testElement("HTTPSampler.keystore_configuration")
+
+    public val cacheManager: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, CacheManager>
+        by testElement("HTTPSampler.cache_manager")
+
+    public val headerManager: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, HeaderManager>
+        by testElement("HTTPSampler.header_manager")
+
+    public val dnsCacheManager: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, DNSCacheManager>
+        by testElement("HTTPSampler.dns_cache_manager")
+
+    public val method: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.method")
+
+    public val protocol: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.protocol", default = HTTPConstants.PROTOCOL_HTTP)
+
+    public val domain: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.domain")
+
+    public val port: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
+        by int("HTTPSampler.port")
+
+    public val path: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.path")
+
+    public val proxy: HTTPSamplerProxyParamsSchema<HTTPSamplerBaseSchema> by HTTPSamplerProxyParamsSchema()
+
+    public val contentEncoding: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.contentEncoding")
+
+    public val implementation: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.implementation")
+
+    public val connectTimeout: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
+        by int("HTTPSampler.connect_timeout")
+
+    public val responseTimeout: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
+        by int("HTTPSampler.response_timeout")
+
     public val followRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
         by boolean("HTTPSampler.follow_redirects")
 
+    public val autoRedirects: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.auto_redirects")
+
     public val useKeepalive: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
         by boolean("HTTPSampler.use_keepalive")
 
@@ -41,4 +105,31 @@ public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
 
     public val useBrowserCompatibleMultipart: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
         by boolean("HTTPSampler.BROWSER_COMPATIBLE_MULTIPART", default = false)
+
+    public val concurrentDownload: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.concurrentDwn", default = false)
+
+    public val concurrentDownloadPoolSize: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
+        by int("HTTPSampler.concurrentPool", default = 6)
+
+    public val retrieveEmbeddedResources: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.image_parser", default = false)
+
+    public val embeddedUrlAllowRegex: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.embedded_url_re")
+
+    public val embeddedUrlExcludeRegex: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.embedded_url_exclude_re")
+
+    public val storeAsMD5: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.md5", default = false)
+
+    public val postBodyRaw: BooleanPropertyDescriptor<HTTPSamplerBaseSchema>
+        by boolean("HTTPSampler.postBodyRaw", default = false)
+
+    public val ipSource: StringPropertyDescriptor<HTTPSamplerBaseSchema>
+        by string("HTTPSampler.ipSource")
+
+    public val ipSourceType: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
+        by int("HTTPSampler.ipSourceType", default = HTTPSamplerBase.SourceType.HOSTNAME.ordinal)
 }
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxyParamsSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxyParamsSchema.kt
new file mode 100644
index 00000000000..05ce921a00a
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxyParamsSchema.kt
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import org.apache.jmeter.testelement.schema.BasePropertyGroupSchema
+import org.apache.jmeter.testelement.schema.BaseTestElementSchema
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HTTPSamplerBase].
+ * @see HTTPSamplerBase
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public open class HTTPSamplerProxyParamsSchema<Schema : BaseTestElementSchema> : BasePropertyGroupSchema<Schema>() {
+    public val scheme: StringPropertyDescriptor<Schema>
+        by string("HTTPSampler.proxyScheme")
+
+    public val host: StringPropertyDescriptor<Schema>
+        by string("HTTPSampler.proxyHost")
+
+    public val port: IntegerPropertyDescriptor<Schema>
+        by int("HTTPSampler.proxyPort")
+
+    public val username: StringPropertyDescriptor<Schema>
+        by string("HTTPSampler.proxyUser")
+
+    public val password: StringPropertyDescriptor<Schema>
+        by string("HTTPSampler.proxyPass")
+}
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
index 4193692f033..39f8eb1c0b5 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
@@ -27,7 +27,6 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.NullProperty;
-import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -48,7 +47,7 @@ public void setUp() {
         config.setProperty(HTTPSamplerBase.DOMAIN, "www.lazer.com");
         config.setProperty(HTTPSamplerBase.PATH, "login.jsp");
         config.setProperty(HTTPSamplerBase.METHOD, HTTPConstants.POST);
-        config.setProperty(new TestElementProperty(HTTPSamplerBase.ARGUMENTS, args));
+        config.setArguments(args);
         defaultConfig = new HTTPNullSampler();
         defaultConfig.setName("default");
         defaultConfig.setProperty(HTTPSamplerBase.DOMAIN, "www.xerox.com");
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
index 4a7a810943f..c13a5900662 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
@@ -19,7 +19,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.junit.categories.NeedGuiTests;
 import org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui;
@@ -40,7 +39,7 @@ public void testConfiguring() throws Exception {
     private void configure(HTTPSamplerBase sampler) throws Exception {
         sampler.addArgument("arg1", "val1");
         ConfigTestElement config = (ConfigTestElement) new HttpDefaultsGui().createTestElement();
-        ((Arguments) config.getProperty(HTTPSamplerBase.ARGUMENTS).getObjectValue()).addArgument(new HTTPArgument(
+        config.get(HTTPSamplerBaseSchema.INSTANCE.getArguments()).addArgument(new HTTPArgument(
                 "config1", "configValue"));
         config.setRunningVersion(true);
         sampler.setRunningVersion(true);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
index 9b50751b0b6..7f0bff9637a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
@@ -160,7 +160,10 @@ public void test(String httpImplementation, String targetHost, InetAddress sourc
         http.setPath("/index.html");
         http.setFollowRedirects(true);
         http.setUseKeepAlive(true);
-        http.setProperty(new FunctionProperty(HTTPSampler.IP_SOURCE, new CompoundVariable("${IP_ADDR}")));
+        http.setProperty(
+                new FunctionProperty(
+                        HTTPSamplerBaseSchema.INSTANCE.getIpSource().getName(),
+                        new CompoundVariable("${IP_ADDR}")));
         http.setImageParser(true);
         http.setConcurrentDwn(true);
         http.setConcurrentPool("6");
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
new file mode 100644
index 00000000000..2baf053e046
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import org.apache.jmeter.dsl.DslPrinterTraverser
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.treebuilder.dsl.testTree
+import org.apache.jmeter.util.JMeterUtils
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.parallel.ResourceLock
+import org.junit.jupiter.api.parallel.Resources
+import java.util.Locale
+
+@ResourceLock(value = Resources.LOCALE)
+class HttpSamplerPrintDslTest : JMeterTestCase() {
+    companion object {
+        private var locale = JMeterUtils.getLocale()
+
+        @JvmStatic
+        @BeforeAll
+        fun setup() {
+            // Ensure DSL uses English text, otherwise we can't reliably compare expected values
+            JMeterUtils.setLocale(Locale.ENGLISH)
+        }
+
+        @JvmStatic
+        @AfterAll
+        fun tearDown() {
+            JMeterUtils.setLocale(locale)
+        }
+    }
+
+    @Test
+    fun `http sampler created with UI`() {
+        val ui = HttpTestSampleGui()
+        val element = ui.createTestElement()
+        val tree = testTree {
+            +element
+        }
+
+        assertEquals(
+            """
+            org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+                props {
+                    it[arguments] = org.apache.jmeter.config.Arguments().apply {
+                        props {
+                            it[name] = "User Defined Variables"
+                            it[guiClass] = "org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel"
+                            it[testClass] = "org.apache.jmeter.config.Arguments"
+                        }
+                    }
+                    it[method] = "GET"
+                    it[followRedirects] = true
+                    it[useKeepalive] = true
+                    it[implementation] = "HttpClient4"
+                    it[name] = "HTTP Request"
+                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
+                }
+            }
+
+            """.trimIndent().replace("\r\n", "\n"),
+            DslPrinterTraverser().also { tree.traverse(it) }.toString().replace("\r\n", "\n")
+        )
+    }
+
+    @Test
+    fun `http sampler created with DSL`() {
+        val createdWithUi = HttpTestSampleGui().createTestElement()
+        val createdWithDsl = testTree {
+            org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+                props {
+                    it[arguments] = org.apache.jmeter.config.Arguments().apply {
+                        props {
+                            it[name] = "User Defined Variables"
+                            it[guiClass] = "org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel"
+                            it[testClass] = "org.apache.jmeter.config.Arguments"
+                        }
+                    }
+                    it[method] = "GET"
+                    it[followRedirects] = true
+                    it[useKeepalive] = true
+                    it[implementation] = "HttpClient4"
+                    it[name] = "HTTP Request"
+                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
+                }
+            }
+        }.keys.first() as TestElement
+
+        // We compare elements manually, and call assertEquals(toString, toString) so
+        // the test output looks better (diff in IDE) in case of the failure
+        // If we use just assertEquals(createdWithUi, createdWithDsl), then there will be no "diff in IDE"
+        if (createdWithUi != createdWithDsl) {
+            assertEquals(
+                DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(createdWithUi).toString(),
+                DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(createdWithDsl).toString()
+            ) {
+                "Elements created with UI and DSL should match since DSL was generated based on the UI-generated element"
+            }
+        }
+    }
+
+    @Test
+    fun `dsl for proxy`() {
+        val createdWithDsl = testTree {
+            org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+                props {
+                    proxy {
+                        it[host] = "proxyhost"
+                        it[port] = 8080
+                        it[username] = "username"
+                        it[password] = "password"
+                    }
+                }
+            }
+        }.keys.first() as TestElement
+
+        assertEquals(
+            """
+            org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+                props {
+                    it[proxy.host] = "proxyhost"
+                    it[proxy.port] = 8080
+                    it[proxy.username] = "username"
+                    it[proxy.password] = "password"
+                }
+            }
+
+            """.trimIndent(),
+            DslPrinterTraverser().append(createdWithDsl).toString()
+        ) {
+            "Proxy parameters added with a group should be printed with DslPrinterTraverser"
+        }
+        assertEquals(
+            "proxyhost",
+            createdWithDsl.getPropertyAsString("HTTPSampler.proxyHost"),
+            """getPropertyAsString("HTTPSampler.proxyHost")"""
+        )
+        assertEquals(
+            8080,
+            createdWithDsl.getPropertyAsInt("HTTPSampler.proxyPort"),
+            """getPropertyAsInt("HTTPSampler.proxyPort")"""
+        )
+    }
+}

From be9b3e5972b7dba221fd9a4600d257adb6963437 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 12:39:05 +0300
Subject: [PATCH 0540/1037] feat: Add AbstractThreadGroupSchema.onSampleError

---
 .../apache/jmeter/threads/AbstractThreadGroup.java | 14 +++++++++-----
 .../jmeter/threads/gui/AbstractThreadGroupGui.java |  4 ++--
 .../jmeter/threads/AbstractThreadGroupSchema.kt    |  6 ++++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index aebe888157b..c4f550562bf 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -58,7 +58,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
                     JMeterUtils.getPropDefault("jmeterengine.threadstop.wait", 5 * 1000L));
 
     /** Action to be taken when a Sampler error occurs */
-    public static final String ON_SAMPLE_ERROR = "ThreadGroup.on_sample_error"; // int
+    public static final String ON_SAMPLE_ERROR = AbstractThreadGroupSchema.INSTANCE.getOnSampleError().getName();
 
     /** Continue, i.e. ignore sampler errors */
     public static final String ON_SAMPLE_ERROR_CONTINUE = "continue";
@@ -238,13 +238,17 @@ public int getNumThreads() {
         return get(getSchema().getNumThreads());
     }
 
+    private String getOnSampleError() {
+        return get(getSchema().getOnSampleError());
+    }
+
     /**
      * Check if a sampler error should cause thread to start next loop.
      *
      * @return true if thread should start next loop
      */
     public boolean getOnErrorStartNextLoop() {
-        return getPropertyAsString(AbstractThreadGroup.ON_SAMPLE_ERROR).equalsIgnoreCase(ON_SAMPLE_ERROR_START_NEXT_LOOP);
+        return getOnSampleError().equalsIgnoreCase(ON_SAMPLE_ERROR_START_NEXT_LOOP);
     }
 
     /**
@@ -253,7 +257,7 @@ public boolean getOnErrorStartNextLoop() {
      * @return true if thread should stop
      */
     public boolean getOnErrorStopThread() {
-        return getPropertyAsString(AbstractThreadGroup.ON_SAMPLE_ERROR).equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTHREAD);
+        return getOnSampleError().equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTHREAD);
     }
 
     /**
@@ -262,7 +266,7 @@ public boolean getOnErrorStopThread() {
      * @return true if test (all threads) should stop
      */
     public boolean getOnErrorStopTest() {
-        return getPropertyAsString(AbstractThreadGroup.ON_SAMPLE_ERROR).equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTEST);
+        return getOnSampleError().equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTEST);
     }
 
     /**
@@ -271,7 +275,7 @@ public boolean getOnErrorStopTest() {
      * @return true if test (all threads) should stop immediately
      */
     public boolean getOnErrorStopTestNow() {
-        return getPropertyAsString(AbstractThreadGroup.ON_SAMPLE_ERROR).equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTEST_NOW);
+        return getOnSampleError().equalsIgnoreCase(ON_SAMPLE_ERROR_STOPTEST_NOW);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
index 980a3056bbc..7abf48fa68b 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
@@ -36,8 +36,8 @@
 import org.apache.jmeter.gui.util.MenuFactory;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.AbstractThreadGroup;
+import org.apache.jmeter.threads.AbstractThreadGroupSchema;
 import org.apache.jmeter.util.JMeterUtils;
 
 import net.miginfocom.swing.MigLayout;
@@ -212,7 +212,7 @@ public void configure(TestElement tg) {
    @Override
     protected void configureTestElement(TestElement tg) {
         super.configureTestElement(tg);
-        tg.setProperty(new StringProperty(AbstractThreadGroup.ON_SAMPLE_ERROR, onSampleError()));
+        tg.set(AbstractThreadGroupSchema.INSTANCE.getOnSampleError(), onSampleError());
     }
 
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
index f9fb49416c0..9ddce456ea9 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/AbstractThreadGroupSchema.kt
@@ -21,6 +21,7 @@ import org.apache.jmeter.control.Controller
 import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
 import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
 import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
 import org.apiguardian.api.API
 
@@ -41,4 +42,9 @@ public abstract class AbstractThreadGroupSchema : TestElementSchema() {
 
     public val sameUserOnNextIteration: BooleanPropertyDescriptor<AbstractThreadGroupSchema>
         by boolean("ThreadGroup.same_user_on_next_iteration", default = true)
+
+    // TODO: implement EnumPropertyDescriptor or TransformedPropertyDescriptor, so that we can use enum values
+    //  in get and set
+    public val onSampleError: StringPropertyDescriptor<AbstractThreadGroupSchema>
+        by string("ThreadGroup.on_sample_error", default = AbstractThreadGroup.ON_SAMPLE_ERROR_CONTINUE)
 }

From 50523586440ba36f7b19b54f085100d4b420c422 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 12:48:42 +0300
Subject: [PATCH 0541/1037] feat: add http.HeaderSchema

---
 .../jmeter/protocol/http/control/Header.java  | 24 +++++++-----
 .../protocol/http/control/HeaderSchema.kt     | 37 +++++++++++++++++++
 2 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderSchema.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java
index 6e38c32d5cb..7b10ee3cb7c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java
@@ -21,6 +21,7 @@
 
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 
 /**
  * This class is an HTTP Header encapsulator.
@@ -30,11 +31,6 @@ public class Header extends AbstractTestElement implements Serializable {
 
     private static final long serialVersionUID = 240L;
 
-    private static final String HNAME = "Header.name";  //$NON-NLS-1$
-    // See TestElementPropertyConverter
-
-    private static final String VALUE = "Header.value"; //$NON-NLS-1$
-
     /**
      * Create the header. Uses an empty name and value as default
      */
@@ -55,6 +51,16 @@ public Header(String name, String value) {
         this.setValue(value);
     }
 
+    @Override
+    public HeaderSchema getSchema() {
+        return HeaderSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends Header, ? extends HeaderSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     public void addConfigElement(ConfigElement config) {
     }
 
@@ -69,7 +75,7 @@ public boolean expectsModification() {
      */
     @Override
     public String getName() {
-        return getPropertyAsString(HNAME);
+        return get(getSchema().getHeaderName());
     }
 
     /**
@@ -79,7 +85,7 @@ public String getName() {
      */
     @Override
     public void setName(String name) {
-        this.setProperty(HNAME, name);
+        set(getSchema().getHeaderName(), name);
     }
 
     /**
@@ -88,7 +94,7 @@ public void setName(String name) {
      * @return the value of this header
      */
     public String getValue() {
-        return getPropertyAsString(VALUE);
+        return get(getSchema().getValue());
     }
 
     /**
@@ -97,7 +103,7 @@ public String getValue() {
      * @param value the value of this header
      */
     public void setValue(String value) {
-        this.setProperty(VALUE, value);
+        set(getSchema().getValue(), value);
     }
 
     /**
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderSchema.kt
new file mode 100644
index 00000000000..c6c43d36801
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderSchema.kt
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.control
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [Header].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class HeaderSchema : TestElementSchema() {
+    public companion object INSTANCE : HeaderSchema()
+
+    public val headerName: StringPropertyDescriptor<HeaderSchema>
+        by string("Header.name")
+
+    public val value: StringPropertyDescriptor<HeaderSchema>
+        by string("Header.value")
+}

From 2c26623a589429679f6342015758401620bdc72b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 16:22:04 +0300
Subject: [PATCH 0542/1037] feat: add RegexExtractorSchema

---
 .../jmeter/extractor/RegexExtractor.java      | 74 ++++++++++---------
 .../jmeter/extractor/RegexExtractorSchema.kt  | 55 ++++++++++++++
 .../AbstractScopedTestElement.java            | 10 +++
 .../AbstractScopedTestElementSchema.kt        | 34 +++++++++
 4 files changed, 137 insertions(+), 36 deletions(-)
 create mode 100644 src/components/src/main/kotlin/org/apache/jmeter/extractor/RegexExtractorSchema.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/testelement/AbstractScopedTestElementSchema.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 3194e9d1247..6c6f7077f2f 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -28,7 +28,7 @@
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
-import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.Document;
@@ -49,9 +49,6 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
 
     private static final Logger log = LoggerFactory.getLogger(RegexExtractor.class);
 
-    // What to match against. N.B. do not change the string value or test plans will break!
-    private static final String MATCH_AGAINST = "RegexExtractor.useHeaders"; // $NON-NLS-1$
-
     /*
      * Permissible values:
      *  true - match against headers
@@ -70,24 +67,25 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
     public static final String USE_CODE = "code"; // $NON-NLS-1$
     public static final String USE_MESSAGE = "message"; // $NON-NLS-1$
 
-    private static final String REGEX_PROP = "RegexExtractor.regex"; // $NON-NLS-1$
-    private static final String REFNAME_PROP = "RegexExtractor.refname"; // $NON-NLS-1$
-    private static final String MATCH_NUMBER_PROP = "RegexExtractor.match_number"; // $NON-NLS-1$
-    private static final String DEFAULT_PROP = "RegexExtractor.default"; // $NON-NLS-1$
-    private static final String DEFAULT_EMPTY_VALUE_PROP = "RegexExtractor.default_empty_value"; // $NON-NLS-1$
-    private static final String TEMPLATE_PROP = "RegexExtractor.template"; // $NON-NLS-1$
-
     private static final String REF_MATCH_NR = "_matchNr"; // $NON-NLS-1$
 
     private static final String UNDERSCORE = "_";  // $NON-NLS-1$
 
-    private static final boolean DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE = false;
-
     private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
             "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
     private transient List<Object> template;
 
+    @Override
+    public RegexExtractorSchema getSchema() {
+        return RegexExtractorSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends RegexExtractor, ? extends RegexExtractorSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Parses the response data using regular expressions and saving the results
      * into variables for use later in the test.
@@ -548,7 +546,7 @@ private static java.util.regex.MatchResult getCorrectMatchJavaRegex(List<? exten
      * @param regex The string representation of the regex
      */
     public void setRegex(String regex) {
-        setProperty(REGEX_PROP, regex);
+        set(getSchema().getRegularExpression(), regex);
     }
 
     /**
@@ -556,7 +554,7 @@ public void setRegex(String regex) {
      * @return string representing the regex
      */
     public String getRegex() {
-        return getPropertyAsString(REGEX_PROP);
+        return get(getSchema().getRegularExpression());
     }
 
     /**
@@ -564,7 +562,7 @@ public String getRegex() {
      * @param refName prefix of the variables to be used
      */
     public void setRefName(String refName) {
-        setProperty(REFNAME_PROP, refName);
+        set(getSchema().getReferenceName(), refName);
     }
 
     /**
@@ -572,7 +570,7 @@ public void setRefName(String refName) {
      * @return The prefix of the variables to be used
      */
     public String getRefName() {
-        return getPropertyAsString(REFNAME_PROP);
+        return get(getSchema().getReferenceName());
     }
 
     /**
@@ -585,19 +583,19 @@ public String getRefName() {
      *            random match should be used.
      */
     public void setMatchNumber(int matchNumber) {
-        setProperty(new IntegerProperty(MATCH_NUMBER_PROP, matchNumber));
+        set(getSchema().getMatchNumber(), matchNumber);
     }
 
     public void setMatchNumber(String matchNumber) {
-        setProperty(MATCH_NUMBER_PROP, matchNumber);
+        set(getSchema().getMatchNumber(), matchNumber);
     }
 
     public int getMatchNumber() {
-        return getPropertyAsInt(MATCH_NUMBER_PROP);
+        return get(getSchema().getMatchNumber());
     }
 
     public String getMatchNumberAsString() {
-        return getPropertyAsString(MATCH_NUMBER_PROP);
+        return getString(getSchema().getMatchNumber());
     }
 
     /**
@@ -606,7 +604,7 @@ public String getMatchNumberAsString() {
      * @param defaultValue The default value for the variable
      */
     public void setDefaultValue(String defaultValue) {
-        setProperty(DEFAULT_PROP, defaultValue);
+        set(getSchema().getDefault(), defaultValue);
     }
 
     /**
@@ -615,7 +613,7 @@ public void setDefaultValue(String defaultValue) {
      * @param defaultEmptyValue The default value for the variable
      */
     public void setDefaultEmptyValue(boolean defaultEmptyValue) {
-        setProperty(DEFAULT_EMPTY_VALUE_PROP, defaultEmptyValue, DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE);
+        set(getSchema().getDefaultIsEmpty(), defaultEmptyValue);
     }
 
     /**
@@ -625,7 +623,7 @@ public void setDefaultEmptyValue(boolean defaultEmptyValue) {
      * @return The default value for the variable
      */
     public String getDefaultValue() {
-        return getPropertyAsString(DEFAULT_PROP);
+        return get(getSchema().getDefault());
     }
 
     /**
@@ -633,57 +631,61 @@ public String getDefaultValue() {
      * @return true if we should set default value to "" if variable cannot be extracted
      */
     public boolean isEmptyDefaultValue() {
-        return getPropertyAsBoolean(DEFAULT_EMPTY_VALUE_PROP, DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE);
+        return get(getSchema().getDefaultIsEmpty());
     }
 
     public void setTemplate(String template) {
-        setProperty(TEMPLATE_PROP, template);
+        set(getSchema().getTemplate(), template);
     }
 
     public String getTemplate() {
-        return getPropertyAsString(TEMPLATE_PROP);
+        return get(getSchema().getTemplate());
+    }
+
+    private String getMatchTarget() {
+        return get(getSchema().getMatchTarget());
     }
 
     public boolean useHeaders() {
-        return USE_HDRS.equalsIgnoreCase( getPropertyAsString(MATCH_AGAINST));
+        return USE_HDRS.equalsIgnoreCase(getMatchTarget());
     }
 
     public boolean useRequestHeaders() {
-        return USE_REQUEST_HDRS.equalsIgnoreCase(getPropertyAsString(MATCH_AGAINST));
+        return USE_REQUEST_HDRS.equalsIgnoreCase(getMatchTarget());
     }
 
     // Allow for property not yet being set (probably only applies to Test cases)
     public boolean useBody() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return prop.isEmpty() || USE_BODY.equalsIgnoreCase(prop);// $NON-NLS-1$
     }
 
     public boolean useUnescapedBody() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return USE_BODY_UNESCAPED.equalsIgnoreCase(prop);// $NON-NLS-1$
     }
 
     public boolean useBodyAsDocument() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return USE_BODY_AS_DOCUMENT.equalsIgnoreCase(prop);// $NON-NLS-1$
     }
 
     public boolean useUrl() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return USE_URL.equalsIgnoreCase(prop);
     }
 
     public boolean useCode() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return USE_CODE.equalsIgnoreCase(prop);
     }
 
     public boolean useMessage() {
-        String prop = getPropertyAsString(MATCH_AGAINST);
+        String prop = getMatchTarget();
         return USE_MESSAGE.equalsIgnoreCase(prop);
     }
 
     public void setUseField(String actionCommand) {
-        setProperty(MATCH_AGAINST,actionCommand);
+        set(getSchema().getMatchTarget(), actionCommand);
     }
 }
diff --git a/src/components/src/main/kotlin/org/apache/jmeter/extractor/RegexExtractorSchema.kt b/src/components/src/main/kotlin/org/apache/jmeter/extractor/RegexExtractorSchema.kt
new file mode 100644
index 00000000000..b2e94fae83f
--- /dev/null
+++ b/src/components/src/main/kotlin/org/apache/jmeter/extractor/RegexExtractorSchema.kt
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.extractor
+
+import org.apache.jmeter.testelement.AbstractScopedTestElementSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [RegexExtractor].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class RegexExtractorSchema : AbstractScopedTestElementSchema() {
+    public companion object INSTANCE : RegexExtractorSchema()
+
+    public val matchTarget: StringPropertyDescriptor<RegexExtractorSchema>
+    // Note: useHeaders is a historic naming, false means "use body for the match"
+        by string("RegexExtractor.useHeaders", default = "false")
+
+    public val regularExpression: StringPropertyDescriptor<RegexExtractorSchema>
+        by string("RegexExtractor.regex")
+
+    public val referenceName: StringPropertyDescriptor<RegexExtractorSchema>
+        by string("RegexExtractor.refname")
+
+    public val matchNumber: IntegerPropertyDescriptor<RegexExtractorSchema>
+        by int("RegexExtractor.match_number")
+
+    public val default: StringPropertyDescriptor<RegexExtractorSchema>
+        by string("RegexExtractor.default")
+
+    public val defaultIsEmpty: BooleanPropertyDescriptor<RegexExtractorSchema>
+        by boolean("RegexExtractor.default_empty_value", default = false)
+
+    public val template: StringPropertyDescriptor<RegexExtractorSchema>
+        by string("RegexExtractor.template")
+}
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
index fd96f8bfbbe..dcab876d246 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 
 /**
  * <p>
@@ -51,6 +52,15 @@ public abstract class AbstractScopedTestElement extends AbstractTestElement {
     private static final String SCOPE_VARIABLE_NAME = "Scope.variable"; // $NON-NLS-1$
     //- JMX
 
+    @Override
+    public AbstractScopedTestElementSchema getSchema() {
+        return AbstractScopedTestElementSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends AbstractScopedTestElement, ? extends AbstractScopedTestElementSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
 
     protected String getScopeName() {
         return SCOPE;
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/AbstractScopedTestElementSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/AbstractScopedTestElementSchema.kt
new file mode 100644
index 00000000000..b34a58e0b11
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/AbstractScopedTestElementSchema.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement
+
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [AbstractScopedTestElement].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class AbstractScopedTestElementSchema : TestElementSchema() {
+    public companion object INSTANCE : AbstractScopedTestElementSchema()
+    public open val scopeName: String get() = "Sample.scope"
+
+    public val scope: StringPropertyDescriptor<AbstractScopedTestElementSchema>
+        by string(scopeName)
+}

From 10556346ea6f893b91b1bd09426c84423d6345f2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 16:39:57 +0300
Subject: [PATCH 0543/1037] feat: add DebugSamplerSchema

---
 .../apache/jmeter/sampler/DebugSampler.java   | 11 +++++
 .../jmeter/sampler/DebugSamplerSchema.kt      | 40 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/components/src/main/kotlin/org/apache/jmeter/sampler/DebugSamplerSchema.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
index 9e7fdad2f93..1ab81e4cc7a 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java
@@ -32,6 +32,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.AlphaNumericKeyComparator;
@@ -52,6 +53,16 @@ public class DebugSampler extends AbstractSampler implements TestBean {
     private boolean displayJMeterProperties;
     private boolean displaySystemProperties;
 
+    @Override
+    public DebugSamplerSchema getSchema() {
+        return DebugSamplerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends DebugSampler, ? extends DebugSamplerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     public SampleResult sample(Entry e) {
         SampleResult res = new SampleResult();
diff --git a/src/components/src/main/kotlin/org/apache/jmeter/sampler/DebugSamplerSchema.kt b/src/components/src/main/kotlin/org/apache/jmeter/sampler/DebugSamplerSchema.kt
new file mode 100644
index 00000000000..77cbe5c43d6
--- /dev/null
+++ b/src/components/src/main/kotlin/org/apache/jmeter/sampler/DebugSamplerSchema.kt
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.sampler
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [DebugSampler].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class DebugSamplerSchema : TestElementSchema() {
+    public companion object INSTANCE : DebugSamplerSchema()
+
+    public val displayJMeterVariables: BooleanPropertyDescriptor<DebugSamplerSchema>
+        by boolean("displayJMeterVariables", default = true)
+
+    public val displayJMeterProperties: BooleanPropertyDescriptor<DebugSamplerSchema>
+        by boolean("displayJMeterProperties", default = false)
+
+    public val displaySystemProperties: BooleanPropertyDescriptor<DebugSamplerSchema>
+        by boolean("displaySystemProperties", default = false)
+}

From 9c56e2c9444a17c5c62cb15db610a26674d88ebe Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 16:40:11 +0300
Subject: [PATCH 0544/1037] feat: add HeaderManagerSchema

---
 .../protocol/http/control/HeaderManager.java  | 19 ++++++++---
 .../http/control/HeaderManagerSchema.kt       | 34 +++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderManagerSchema.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 5a9af45e44f..c64080bc97d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -33,6 +33,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jorphan.util.JOrphanUtils;
 
 /**
@@ -44,7 +45,7 @@ public class HeaderManager extends ConfigTestElement implements Serializable, Re
 
     private static final long serialVersionUID = 240L;
 
-    public static final String HEADERS = "HeaderManager.headers";// $NON-NLS-1$
+    public static final String HEADERS = HeaderManagerSchema.INSTANCE.getHeaders().getName();
 
     private static final String[] COLUMN_RESOURCE_NAMES = {
           "name",             // $NON-NLS-1$
@@ -54,7 +55,17 @@ public class HeaderManager extends ConfigTestElement implements Serializable, Re
     private static final int COLUMN_COUNT = COLUMN_RESOURCE_NAMES.length;
 
     public HeaderManager() {
-        setProperty(new CollectionProperty(HEADERS, new ArrayList<>()));
+        set(getSchema().getHeaders(), new ArrayList<>());
+    }
+
+    @Override
+    public HeaderManagerSchema getSchema() {
+        return HeaderManagerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends HeaderManager, ? extends HeaderManagerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
     }
 
     @Override
@@ -66,7 +77,7 @@ public void recoverRunningVersion() {
     @Override
     public void clear() {
         super.clear();
-        setProperty(new CollectionProperty(HEADERS, new ArrayList<>()));
+        set(getSchema().getHeaders(), new ArrayList<>());
     }
 
     /**
@@ -75,7 +86,7 @@ public void clear() {
      * @return the header collection property
      */
     public CollectionProperty getHeaders() {
-        return (CollectionProperty) getProperty(HEADERS);
+        return (CollectionProperty) getPropertyOrNull(getSchema().getHeaders());
     }
 
     public int getColumnCount() {
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderManagerSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderManagerSchema.kt
new file mode 100644
index 00000000000..0a62d3a48e0
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/control/HeaderManagerSchema.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.control
+
+import org.apache.jmeter.config.ConfigTestElementSchema
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HeaderManager].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class HeaderManagerSchema : ConfigTestElementSchema() {
+    public companion object INSTANCE : HeaderManagerSchema()
+
+    public val headers: CollectionPropertyDescriptor<HeaderManagerSchema>
+        by collection("HeaderManager.headers")
+}

From f2332f72ccfc39e5a51193ad386669bca6997a1a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 16:43:59 +0300
Subject: [PATCH 0545/1037] feat: add WhileControllerSchema

---
 .../jmeter/control/WhileController.java       | 18 +++++++---
 .../jmeter/control/WhileControllerSchema.kt   | 33 +++++++++++++++++++
 .../dsl/action/DslPrinterTraverserTest.kt     |  4 ++-
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/control/WhileControllerSchema.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/control/WhileController.java b/src/core/src/main/java/org/apache/jmeter/control/WhileController.java
index 169d6474c30..ab433c1455d 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/WhileController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/WhileController.java
@@ -22,7 +22,7 @@
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterThread;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -36,14 +36,22 @@ public class WhileController extends GenericController implements Serializable,
 
     private static final long serialVersionUID = 233L;
 
-    private static final String CONDITION = "WhileController.condition"; // $NON-NLS-1$
-
     private boolean breakLoop;
 
     public WhileController() {
         super();
     }
 
+    @Override
+    public WhileControllerSchema getSchema() {
+        return WhileControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends WhileController, ? extends WhileControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Evaluate the condition, which can be:
      * blank or LAST = was the last sampler OK?
@@ -130,14 +138,14 @@ protected void resetLoopCount() {
      */
     public void setCondition(String string) {
         log.debug("setCondition({})", string);
-        setProperty(new StringProperty(CONDITION, string));
+        set(getSchema().getCondition(), string);
     }
 
     /**
      * @return the condition
      */
     public String getCondition() {
-        JMeterProperty prop=getProperty(CONDITION);
+        JMeterProperty prop=getProperty(getSchema().getCondition().getName());
         prop.recoverRunningVersion(this);
         return prop.getStringValue();
     }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/WhileControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/WhileControllerSchema.kt
new file mode 100644
index 00000000000..40468e5771c
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/WhileControllerSchema.kt
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [WhileController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class WhileControllerSchema : GenericControllerSchema() {
+    public companion object INSTANCE : WhileControllerSchema()
+
+    public val condition: StringPropertyDescriptor<WhileControllerSchema>
+        by string("WhileController.condition")
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
index bbe2998f5ce..795f2bb5227 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
@@ -68,7 +68,9 @@ class DslPrinterTraverserTest {
                 +org.apache.jmeter.reporters.Summariser::class
 
                 org.apache.jmeter.control.WhileController::class {
-                    setProperty("WhileController.condition", "while \"condition\" \${'$'} ")
+                    props {
+                        it[condition] = "while \"condition\" \$ "
+                    }
 
                     org.apache.jmeter.control.IfController::class {
                         setProperty("IfController.condition", "\${'$'}{__P(abc, def)}")

From c2df644093aef11549a1b7d89729990d3cb04a6a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 16:48:15 +0300
Subject: [PATCH 0546/1037] feat: add TransactionControllerSchema

---
 .../jmeter/control/TransactionController.java | 26 ++++++++------
 .../control/TransactionControllerSchema.kt    | 36 +++++++++++++++++++
 2 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/control/TransactionControllerSchema.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
index 6fecee7a244..467aaf2fa30 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
@@ -23,7 +23,7 @@
 import org.apache.jmeter.samplers.SampleListener;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterThread;
@@ -51,14 +51,8 @@ public class TransactionController extends GenericController implements SampleLi
 
     private static final String TRUE = Boolean.toString(true); // i.e. "true"
 
-    private static final String GENERATE_PARENT_SAMPLE = "TransactionController.parent";// $NON-NLS-1$
-
-    private static final String INCLUDE_TIMERS = "TransactionController.includeTimers";// $NON-NLS-1$
-
     private static final Logger log = LoggerFactory.getLogger(TransactionController.class);
 
-    private static final boolean DEFAULT_VALUE_FOR_INCLUDE_TIMERS = true; // default true for compatibility
-
     /**
      * Only used in parent Mode
      */
@@ -103,6 +97,16 @@ public TransactionController() {
         lnf = new ListenerNotifier();
     }
 
+    @Override
+    public TransactionControllerSchema getSchema() {
+        return TransactionControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends TransactionController, ? extends TransactionControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     protected Object readResolve(){
         super.readResolve();
@@ -114,14 +118,14 @@ protected Object readResolve(){
      * @param generateParent flag whether a parent sample should be generated.
      */
     public void setGenerateParentSample(boolean generateParent) {
-        setProperty(new BooleanProperty(GENERATE_PARENT_SAMPLE, generateParent));
+        set(getSchema().getGenearteParentSample(), generateParent);
     }
 
     /**
      * @return {@code true} if a parent sample will be generated
      */
     public boolean isGenerateParentSample() {
-        return getPropertyAsBoolean(GENERATE_PARENT_SAMPLE);
+        return get(getSchema().getGenearteParentSample());
     }
 
     /**
@@ -335,7 +339,7 @@ public void sampleStopped(SampleEvent e) {
      * @param includeTimers Flag whether timers and pre/post processor should be included in overall sample
      */
     public void setIncludeTimers(boolean includeTimers) {
-        setProperty(INCLUDE_TIMERS, includeTimers, DEFAULT_VALUE_FOR_INCLUDE_TIMERS);
+        set(getSchema().getIncludeTimers(), includeTimers);
     }
 
     /**
@@ -344,6 +348,6 @@ public void setIncludeTimers(boolean includeTimers) {
      * @return boolean (defaults to true for backwards compatibility)
      */
     public boolean isIncludeTimers() {
-        return getPropertyAsBoolean(INCLUDE_TIMERS, DEFAULT_VALUE_FOR_INCLUDE_TIMERS);
+        return get(getSchema().getIncludeTimers());
     }
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/TransactionControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/TransactionControllerSchema.kt
new file mode 100644
index 00000000000..3ea45e31bba
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/TransactionControllerSchema.kt
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [TransactionController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class TransactionControllerSchema : GenericControllerSchema() {
+    public companion object INSTANCE : TransactionControllerSchema()
+
+    public val genearteParentSample: BooleanPropertyDescriptor<TransactionControllerSchema>
+        by boolean("TransactionController.parent")
+
+    public val includeTimers: BooleanPropertyDescriptor<TransactionControllerSchema>
+        by boolean("TransactionController.includeTimers", default = true)
+}

From bad9cb12856fe6b47da7c90248cb7edeba0933de Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 13 Jun 2023 18:53:16 +0300
Subject: [PATCH 0547/1037] feat: add IfControllerSchema

---
 .../apache/jmeter/control/IfController.java   | 30 ++++++++------
 .../jmeter/control/IfControllerSchema.kt      | 40 +++++++++++++++++++
 .../dsl/action/DslPrinterTraverserTest.kt     |  4 +-
 3 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/control/IfControllerSchema.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
index 113fb075b35..f19e2cdde13 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
@@ -26,7 +26,7 @@
 
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.ThreadListener;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
@@ -67,12 +67,6 @@ public class IfController extends GenericController implements Serializable, Thr
 
     private static final String NASHORN_ENGINE_NAME = "nashorn"; //$NON-NLS-1$
 
-    private static final String CONDITION = "IfController.condition"; //$NON-NLS-1$
-
-    private static final String EVALUATE_ALL = "IfController.evaluateAll"; //$NON-NLS-1$
-
-    private static final String USE_EXPRESSION = "IfController.useExpression"; //$NON-NLS-1$
-
     private static final String USE_RHINO_ENGINE_PROPERTY = "javascript.use_rhino"; //$NON-NLS-1$
 
     private static final boolean USE_RHINO_ENGINE =
@@ -153,12 +147,22 @@ public IfController(String condition) {
         this.setCondition(condition);
     }
 
+    @Override
+    public IfControllerSchema getSchema() {
+        return IfControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends IfController, ? extends IfControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Condition Accessor - this is gonna be like <code>${count} &lt; 10</code>
      * @param condition The condition for this controller
      */
     public void setCondition(String condition) {
-        setProperty(new StringProperty(CONDITION, condition));
+        set(getSchema().getCondition(), condition);
     }
 
     /**
@@ -166,7 +170,7 @@ public void setCondition(String condition) {
      * @return the condition associated with this controller
      */
     public String getCondition() {
-        return getPropertyAsString(CONDITION).trim();
+        return get(getSchema().getCondition()).trim();
     }
 
     /**
@@ -254,19 +258,19 @@ public void triggerEndOfLoop() {
     }
 
     public boolean isEvaluateAll() {
-        return getPropertyAsBoolean(EVALUATE_ALL,false);
+        return get(getSchema().getEvaluateAll());
     }
 
     public void setEvaluateAll(boolean b) {
-        setProperty(EVALUATE_ALL,b);
+        set(getSchema().getEvaluateAll(), b);
     }
 
     public boolean isUseExpression() {
-        return getPropertyAsBoolean(USE_EXPRESSION, false);
+        return get(getSchema().getUseExpression());
     }
 
     public void setUseExpression(boolean selected) {
-        setProperty(USE_EXPRESSION, selected, false);
+        set(getSchema().getUseExpression(), selected);
     }
 
     @Override
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/IfControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/IfControllerSchema.kt
new file mode 100644
index 00000000000..9d8b194fcc9
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/IfControllerSchema.kt
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [IfController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class IfControllerSchema : GenericControllerSchema() {
+    public companion object INSTANCE : IfControllerSchema()
+
+    public val condition: StringPropertyDescriptor<IfControllerSchema>
+        by string("IfController.condition")
+
+    public val evaluateAll: BooleanPropertyDescriptor<IfControllerSchema>
+        by boolean("IfController.evaluateAll", default = false)
+
+    public val useExpression: BooleanPropertyDescriptor<IfControllerSchema>
+        by boolean("IfController.useExpression", default = false)
+}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
index 795f2bb5227..d7f262e9478 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/dsl/action/DslPrinterTraverserTest.kt
@@ -73,7 +73,9 @@ class DslPrinterTraverserTest {
                     }
 
                     org.apache.jmeter.control.IfController::class {
-                        setProperty("IfController.condition", "\${'$'}{__P(abc, def)}")
+                        props {
+                            it[condition] = "\${'$'}{__P(abc, def)}"
+                        }
 
                         org.apache.jmeter.test.samplers.ThreadSleep::class {
                             props {

From 31d598f07ebdb2938da358044d75f56f1443ba88 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 12:37:42 +0300
Subject: [PATCH 0548/1037] doc: explain the reason for using
 org.apache.jmeter.treebuilder.Action interface

Java's interfaces are bad since they have no declaration side type variance.
Kotlin's ... -> Unit is hard to use in Java as it would require "return Unit.INSTANCE"

Regular Kotlin's functions A->B are fine though.
---
 .../kotlin/org/apache/jmeter/treebuilder/Action.kt     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
index ad66ce9ee6f..73c27467a46 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/treebuilder/Action.kt
@@ -17,6 +17,16 @@
 
 package org.apache.jmeter.treebuilder
 
+import java.util.function.Consumer
+
+/**
+ * Performs an action on a receiver.
+ *
+ * It enables to write DSL that works great in Java and Kotlin at the same time.
+ * The issue with [Consumer] is that it does not declare type variance.
+ * Kotlin's `T.() -> Unit` (function that returns `Unit`) is problematic to use from
+ * Java since it requires explicit `return Unit.INSTANCE`.
+ */
 public fun interface Action<in T> : (T) -> Unit {
     public fun T.execute()
 

From be45aae7260c74febf6bdb8251b568325292880b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 22:28:52 +0300
Subject: [PATCH 0549/1037] perf: cache UTF-8 representation of "<actual file
 content, not shown here>" in HttpClient4

---
 .../org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 7d5bad22a60..cda36226a8a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -1503,6 +1503,8 @@ private static String getFromHeadersMatchingPredicate(HttpRequest method, Predic
 
     // Helper class so we can generate request data without dumping entire file contents
     private static class ViewableFileBody extends FileBody {
+        private static final byte[] CONTENTS_OMITTED =
+                "<actual file content, not shown here>".getBytes(StandardCharsets.UTF_8);
         private boolean hideFileData;
 
         public ViewableFileBody(File file, ContentType contentType) {
@@ -1513,7 +1515,7 @@ public ViewableFileBody(File file, ContentType contentType) {
         @Override
         public void writeTo(final OutputStream out) throws IOException {
             if (hideFileData) {
-                out.write("<actual file content, not shown here>".getBytes(StandardCharsets.UTF_8));
+                out.write(CONTENTS_OMITTED);
             } else {
                 super.writeTo(out);
             }

From c0897715dc5d1ed7d02049062c3db8837a29cdb6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 22:16:39 +0300
Subject: [PATCH 0550/1037] test: add @Isolated to tests that extend
 JMeterTestCase

JMeterTestCase initializes jmeter properties, so the tests must not
be executed concurrently.
---
 .../java/org/apache/jmeter/junit/JMeterTestCase.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
index 1296969f758..ebf7adeb10f 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
@@ -30,12 +30,16 @@
 import org.apache.jmeter.functions.AbstractFunction;
 import org.apache.jmeter.functions.InvalidVariableException;
 import org.apache.jmeter.util.JMeterUtils;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /*
- * Common setup for JUnit4 test cases
+ * Common setup for JUnit4 test cases.
+ * It initializes JMeterProperties, so it is unsafe to execute several such tests concurrently, so it is marked with
+ * {@code @Isolated}.
  */
+@Isolated
 public abstract class JMeterTestCase {
     // Used by findTestFile
     private static final String filePrefix;

From 43797046fafcd5f79d9215fc84e3521ff7494649 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 23:10:40 +0300
Subject: [PATCH 0551/1037] fix: restore public static final String references
 to literals for backward compatibility

Previously, TestElement.NAME and similar constants were coded as literals,
and it was possible to use those references in annotation values.

If the replace literals with method calls, then it would be impossible to use
the fields in annotation values.

So the static fields are reverted to literals.

This partially reverts commits like https://github.com/apache/jmeter/pull/678,
---
 .../org/apache/jmeter/config/Argument.java    |  8 +-
 .../org/apache/jmeter/config/Arguments.java   |  2 +-
 .../apache/jmeter/control/LoopController.java |  2 +-
 .../jmeter/threads/AbstractThreadGroup.java   | 13 +--
 .../apache/jmeter/threads/ThreadGroup.java    | 11 ++-
 .../apache/jmeter/testelement/TestElement.kt  | 15 ++--
 .../jmeter/testelement/TestElementTest.java   | 34 ++++++++
 .../protocol/http/control/HeaderManager.java  |  2 +-
 .../http/sampler/HTTPSamplerBase.java         | 80 +++++++++----------
 .../java/sampler/BeanShellSampler.java        | 30 ++-----
 10 files changed, 97 insertions(+), 100 deletions(-)
 create mode 100644 src/core/src/test/java/org/apache/jmeter/testelement/TestElementTest.java

diff --git a/src/core/src/main/java/org/apache/jmeter/config/Argument.java b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
index 252e1b70e1e..570d201de88 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Argument.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
@@ -33,16 +33,16 @@ public class Argument extends AbstractTestElement implements Serializable {
     private static final long serialVersionUID = 240L;
 
     /** Name used to store the argument's name. */
-    public static final String ARG_NAME = ArgumentSchema.INSTANCE.getArgumentName().getName();
+    public static final String ARG_NAME = "Argument.name"; // $NON-NLS-1$
 
     /** Name used to store the argument's value. */
-    public static final String VALUE = ArgumentSchema.INSTANCE.getValue().getName();
+    public static final String VALUE = "Argument.value"; // $NON-NLS-1$
 
     /** Name used to store the argument's description. */
-    public static final String DESCRIPTION = ArgumentSchema.INSTANCE.getDescription().getName();
+    public static final String DESCRIPTION = "Argument.desc"; // $NON-NLS-1$
 
     /** Name used to store the argument's metadata. */
-    public static final String METADATA = ArgumentSchema.INSTANCE.getMetadata().getName();
+    public static final String METADATA = "Argument.metadata"; // $NON-NLS-1$
 
     /**
      * Create a new Argument without a name, value, or metadata.
diff --git a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
index 966d6924cd5..8139afc00eb 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
@@ -37,7 +37,7 @@ public class Arguments extends ConfigTestElement implements Serializable, Iterab
     private static final long serialVersionUID = 240L;
 
     /** The name of the property used to store the arguments. */
-    public static final String ARGUMENTS = ArgumentsSchema.INSTANCE.getArguments().getName();
+    public static final String ARGUMENTS = "Arguments.arguments"; //$NON-NLS-1$
 
     /**
      * Create a new Arguments object with no arguments.
diff --git a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
index 83e7a04903b..bde3aa19e8b 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
@@ -33,7 +33,7 @@ public class LoopController extends GenericController implements Serializable, I
 
     public static final int INFINITE_LOOP_COUNT = -1; // $NON-NLS-1$
 
-    public static final String LOOPS = LoopControllerSchema.INSTANCE.getLoops().getName();
+    public static final String LOOPS = "LoopController.loops"; // $NON-NLS-1$
 
     private static final long serialVersionUID = 7833960784370272300L;
     private static final Logger LOGGER = LoggerFactory.getLogger(LoopController.class);
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index c4f550562bf..37b3f104b25 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -58,7 +58,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
                     JMeterUtils.getPropDefault("jmeterengine.threadstop.wait", 5 * 1000L));
 
     /** Action to be taken when a Sampler error occurs */
-    public static final String ON_SAMPLE_ERROR = AbstractThreadGroupSchema.INSTANCE.getOnSampleError().getName();
+    public static final String ON_SAMPLE_ERROR = "ThreadGroup.on_sample_error"; // int
 
     /** Continue, i.e. ignore sampler errors */
     public static final String ON_SAMPLE_ERROR_CONTINUE = "continue";
@@ -76,17 +76,12 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
     public static final String ON_SAMPLE_ERROR_STOPTEST_NOW = "stoptestnow";
 
     /** Number of threads in the thread group */
-    @Deprecated
-    public static final String NUM_THREADS =
-            AbstractThreadGroupSchema.INSTANCE.getNumThreads().getName();
+    public static final String NUM_THREADS = "ThreadGroup.num_threads";
 
-    public static final String MAIN_CONTROLLER =
-            AbstractThreadGroupSchema.INSTANCE.getMainController().getName();
+    public static final String MAIN_CONTROLLER = "ThreadGroup.main_controller";
 
     /** The same user or different users */
-    @Deprecated
-    public static final String IS_SAME_USER_ON_NEXT_ITERATION =
-            AbstractThreadGroupSchema.INSTANCE.getSameUserOnNextIteration().getName();
+    public static final String IS_SAME_USER_ON_NEXT_ITERATION = "ThreadGroup.same_user_on_next_iteration";
 
 
     private final AtomicInteger numberOfThreads = new AtomicInteger(0); // Number of active threads in this group
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index e9a4925ca79..ac483d4bcea 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -57,20 +57,19 @@ public class ThreadGroup extends AbstractThreadGroup {
     //+ JMX entries - do not change the string values
 
     /** Ramp-up time */
-    public static final String RAMP_TIME = ThreadGroupSchema.INSTANCE.getRampTime().getName();
+    public static final String RAMP_TIME = "ThreadGroup.ramp_time";
 
     /** Whether thread startup is delayed until required */
-    @Deprecated
-    public static final String DELAYED_START = ThreadGroupSchema.INSTANCE.getDelayedStart().getName();
+    public static final String DELAYED_START = "ThreadGroup.delayedStart";
 
     /** Whether scheduler is being used */
-    public static final String SCHEDULER = ThreadGroupSchema.INSTANCE.getUseScheduler().getName();
+    public static final String SCHEDULER = "ThreadGroup.scheduler";
 
     /** Scheduler duration, overrides end time */
-    public static final String DURATION = ThreadGroupSchema.INSTANCE.getDuration().getName();
+    public static final String DURATION = "ThreadGroup.duration";
 
     /** Scheduler start delay, overrides start time */
-    public static final String DELAY = ThreadGroupSchema.INSTANCE.getDelay().getName();
+    public static final String DELAY = "ThreadGroup.delay";
     //- JMX entries
 
     private transient Thread threadStarter;
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index a01c3247f48..438519c6fb0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -44,19 +44,14 @@ import org.apiguardian.api.API
 
 public interface TestElement : Cloneable {
     public companion object {
-        @JvmField
-        public val NAME: String = TestElementSchema.name.name
-        @JvmField
-        public val GUI_CLASS: String = TestElementSchema.guiClass.name
-        @JvmField
-        public val ENABLED: String = TestElementSchema.enabled.name
-        @JvmField
-        public val TEST_CLASS: String = TestElementSchema.testClass.name
+        public const val NAME: String = "TestElement.name" // $NON-NLS-1$
+        public const val GUI_CLASS: String = "TestElement.gui_class" // $NON-NLS-1$
+        public const val ENABLED: String = "TestElement.enabled" // $NON-NLS-1$
+        public const val TEST_CLASS: String = "TestElement.test_class" // $NON-NLS-1$
 
         // Needed by AbstractTestElement.
         // Also TestElementConverter and TestElementPropertyConverter for handling empty comments
-        @JvmField
-        public val COMMENTS: String = TestElementSchema.comments.name
+        public const val COMMENTS: String = "TestPlan.comments" // $NON-NLS-1$
     }
 
     public val schema: TestElementSchema
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
new file mode 100644
index 00000000000..7eae7520e36
--- /dev/null
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class TestElementTest {
+    /**
+     * Verifies that {@code TestElement.NAME} is workable in annotations.
+     */
+    @ParameterizedTest
+    @ValueSource(strings = {TestElement.NAME})
+    public void fieldBackwardCompatibility(String name) {
+        assertEquals("TestElement.name", name);
+    }
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index c64080bc97d..71cb01490d2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -45,7 +45,7 @@ public class HeaderManager extends ConfigTestElement implements Serializable, Re
 
     private static final long serialVersionUID = 240L;
 
-    public static final String HEADERS = HeaderManagerSchema.INSTANCE.getHeaders().getName();
+    public static final String HEADERS = "HeaderManager.headers";// $NON-NLS-1$
 
     private static final String[] COLUMN_RESOURCE_NAMES = {
           "name",             // $NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 5a527042073..58bf9b86975 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -121,57 +121,55 @@ public abstract class HTTPSamplerBase extends AbstractSampler
                     "org.apache.jmeter.testbeans.gui.TestBeanGUI"
             ));
 
-    private static final HTTPSamplerBaseSchema SCHEMA = HTTPSamplerBaseSchema.INSTANCE;
-
     //+ JMX names - do not change
-    public static final String ARGUMENTS = SCHEMA.getArguments().getName();
+    public static final String ARGUMENTS = "HTTPsampler.Arguments"; // $NON-NLS-1$
 
-    public static final String AUTH_MANAGER = SCHEMA.getAuthManager().getName();
+    public static final String AUTH_MANAGER = "HTTPSampler.auth_manager"; // $NON-NLS-1$
 
-    public static final String COOKIE_MANAGER = SCHEMA.getCookieManager().getName();
+    public static final String COOKIE_MANAGER = "HTTPSampler.cookie_manager"; // $NON-NLS-1$
 
-    public static final String KEYSTORE_CONFIG = SCHEMA.getCookieManager().getName();
+    public static final String KEYSTORE_CONFIG = "HTTPSampler.keystore_configuration"; // $NON-NLS-1$
 
     public static final String SAMPLE_TIMEOUT = "HTTPSampler.sample_timeout"; // $NON-NLS-1$
 
-    public static final String CACHE_MANAGER = SCHEMA.getCacheManager().getName();
+    public static final String CACHE_MANAGER = "HTTPSampler.cache_manager"; // $NON-NLS-1$
 
-    public static final String HEADER_MANAGER = SCHEMA.getHeaderManager().getName();
+    public static final String HEADER_MANAGER = "HTTPSampler.header_manager"; // $NON-NLS-1$
 
-    public static final String DNS_CACHE_MANAGER = SCHEMA.getDnsCacheManager().getName();
+    public static final String DNS_CACHE_MANAGER = "HTTPSampler.dns_cache_manager"; // $NON-NLS-1$
 
-    public static final String DOMAIN = SCHEMA.getDomain().getName();
+    public static final String DOMAIN = "HTTPSampler.domain"; // $NON-NLS-1$
 
-    public static final String PORT = SCHEMA.getPort().getName();
+    public static final String PORT = "HTTPSampler.port"; // $NON-NLS-1$
 
-    public static final String PROXYSCHEME = SCHEMA.getProxy().getScheme().getName();
+    public static final String PROXYSCHEME = "HTTPSampler.proxyScheme"; // $NON-NLS-1$
 
-    public static final String PROXYHOST = SCHEMA.getProxy().getHost().getName();
+    public static final String PROXYHOST = "HTTPSampler.proxyHost"; // $NON-NLS-1$
 
-    public static final String PROXYPORT = SCHEMA.getProxy().getPort().getName();
+    public static final String PROXYPORT = "HTTPSampler.proxyPort"; // $NON-NLS-1$
 
-    public static final String PROXYUSER = SCHEMA.getProxy().getUsername().getName();
+    public static final String PROXYUSER = "HTTPSampler.proxyUser"; // $NON-NLS-1$
 
-    public static final String PROXYPASS = SCHEMA.getProxy().getPassword().getName();
+    public static final String PROXYPASS = "HTTPSampler.proxyPass"; // $NON-NLS-1$
 
-    public static final String CONNECT_TIMEOUT = SCHEMA.getConnectTimeout().getName();
+    public static final String CONNECT_TIMEOUT = "HTTPSampler.connect_timeout"; // $NON-NLS-1$
 
-    public static final String RESPONSE_TIMEOUT = SCHEMA.getResponseTimeout().getName();
+    public static final String RESPONSE_TIMEOUT = "HTTPSampler.response_timeout"; // $NON-NLS-1$
 
-    public static final String METHOD = SCHEMA.getMethod().getName();
+    public static final String METHOD = "HTTPSampler.method"; // $NON-NLS-1$
 
     /** This is the encoding used for the content, i.e. the charset name, not the header "Content-Encoding" */
-    public static final String CONTENT_ENCODING = SCHEMA.getContentEncoding().getName();
+    public static final String CONTENT_ENCODING = "HTTPSampler.contentEncoding"; // $NON-NLS-1$
 
-    public static final String IMPLEMENTATION = SCHEMA.getImplementation().getName();
+    public static final String IMPLEMENTATION = "HTTPSampler.implementation"; // $NON-NLS-1$
 
-    public static final String PATH = SCHEMA.getPath().getName();
+    public static final String PATH = "HTTPSampler.path"; // $NON-NLS-1$
 
-    public static final String FOLLOW_REDIRECTS = SCHEMA.getFollowRedirects().getName();
+    public static final String FOLLOW_REDIRECTS = HTTPSamplerBaseSchema.INSTANCE.getFollowRedirects().getName();
 
-    public static final String AUTO_REDIRECTS = SCHEMA.getAutoRedirects().getName();
+    public static final String AUTO_REDIRECTS = "HTTPSampler.auto_redirects"; // $NON-NLS-1$
 
-    public static final String PROTOCOL = SCHEMA.getProtocol().getName();
+    public static final String PROTOCOL = "HTTPSampler.protocol"; // $NON-NLS-1$
 
     static final String PROTOCOL_FILE = "file"; // $NON-NLS-1$
 
@@ -180,24 +178,21 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     /**
      * IP source to use - does not apply to Java HTTP implementation currently
      */
-    public static final String IP_SOURCE = SCHEMA.getIpSource().getName();
+    public static final String IP_SOURCE = "HTTPSampler.ipSource"; // $NON-NLS-1$
 
-    public static final String IP_SOURCE_TYPE = SCHEMA.getIpSourceType().getName();
+    public static final String IP_SOURCE_TYPE = "HTTPSampler.ipSourceType"; // $NON-NLS-1$
 
-    public static final String USE_KEEPALIVE = SCHEMA.getUseKeepalive().getName();
+    public static final String USE_KEEPALIVE = "HTTPSampler.use_keepalive"; // $NON-NLS-1$
 
-    public static final String DO_MULTIPART_POST = SCHEMA.getUseMultipartPost().getName();
+    public static final String DO_MULTIPART_POST = "HTTPSampler.DO_MULTIPART_POST"; // $NON-NLS-1$
 
-    public static final String BROWSER_COMPATIBLE_MULTIPART =
-            SCHEMA.getUseBrowserCompatibleMultipart().getName();
+    public static final String BROWSER_COMPATIBLE_MULTIPART  = "HTTPSampler.BROWSER_COMPATIBLE_MULTIPART"; // $NON-NLS-1$
 
-    public static final String CONCURRENT_DWN = SCHEMA.getConcurrentDownload().getName();
+    public static final String CONCURRENT_DWN = "HTTPSampler.concurrentDwn"; // $NON-NLS-1$
 
-    public static final String CONCURRENT_POOL = SCHEMA.getConcurrentDownloadPoolSize().getName();
+    public static final String CONCURRENT_POOL = "HTTPSampler.concurrentPool"; // $NON-NLS-1$
 
-    // Default concurrent pool size for download embedded resources
-    @SuppressWarnings("DataFlowIssue")
-    public static final int CONCURRENT_POOL_SIZE = SCHEMA.getConcurrentDownloadPoolSize().getDefaultValue();
+    public static final int CONCURRENT_POOL_SIZE = 6; // Default concurrent pool size for download embedded resources
 
     private static final String USER_AGENT = "User-Agent"; // $NON-NLS-1$
 
@@ -265,18 +260,18 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     public static final String CONTENT_TYPE = "HTTPSampler.CONTENT_TYPE"; // $NON-NLS-1$
 
     // IMAGE_PARSER now really means EMBEDDED_PARSER
-    public static final String IMAGE_PARSER = SCHEMA.getRetrieveEmbeddedResources().getName();
+    public static final String IMAGE_PARSER = "HTTPSampler.image_parser"; // $NON-NLS-1$
 
     // Embedded URLs must match this RE (if provided)
-    public static final String EMBEDDED_URL_RE = SCHEMA.getEmbeddedUrlAllowRegex().getName();
+    public static final String EMBEDDED_URL_RE = "HTTPSampler.embedded_url_re"; // $NON-NLS-1$
 
     // Embedded URLs must not match this RE (if provided)
-    public static final String EMBEDDED_URL_EXCLUDE_RE = SCHEMA.getEmbeddedUrlExcludeRegex().getName();
+    public static final String EMBEDDED_URL_EXCLUDE_RE = "HTTPSampler.embedded_url_exclude_re"; // $NON-NLS-1$
 
     public static final String MONITOR = "HTTPSampler.monitor"; // $NON-NLS-1$
 
     // Store MD5 hash instead of storing response
-    public static final String MD5 = SCHEMA.getStoreAsMD5().getName();
+    public static final String MD5 = "HTTPSampler.md5"; // $NON-NLS-1$
 
     /** A number to indicate that the port has not been set. */
     public static final int UNSPECIFIED_PORT = 0;
@@ -290,10 +285,9 @@ public abstract class HTTPSamplerBase extends AbstractSampler
 
     protected static final String NON_HTTP_RESPONSE_MESSAGE = "Non HTTP response message";
 
-    public static final String POST_BODY_RAW = SCHEMA.getPostBodyRaw().getName();
+    public static final String POST_BODY_RAW = "HTTPSampler.postBodyRaw";
 
-    @SuppressWarnings("DataFlowIssue")
-    public static final boolean POST_BODY_RAW_DEFAULT = SCHEMA.getPostBodyRaw().getDefaultValue();
+    public static final boolean POST_BODY_RAW_DEFAULT = false;
 
     private static final String ARG_VAL_SEP = "="; // $NON-NLS-1$
 
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
index 424faf2f928..0039237c7ff 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
@@ -50,35 +50,15 @@ public class BeanShellSampler extends BeanShellTestElement implements Sampler, I
 
     private static final long serialVersionUID = 4;
 
-    /**
-     * @deprecated use {@link BeanShellSamplerSchema#getFilename()} instead
-     */
-    @Deprecated
-    public static final String FILENAME = BeanShellSamplerSchema.INSTANCE.getFilename().getName();
+    public static final String FILENAME = "BeanShellSampler.filename"; //$NON-NLS-1$
 
-    /**
-     * @deprecated use {@link BeanShellSamplerSchema#getFilename()} instead
-     */
-    @Deprecated
-    public static final String SCRIPT = BeanShellSamplerSchema.INSTANCE.getScript().getName();
+    public static final String SCRIPT = "BeanShellSampler.query"; //$NON-NLS-1$
 
-    /**
-     * @deprecated use {@link BeanShellSamplerSchema#getParameters()} instead
-     */
-    @Deprecated
-    public static final String PARAMETERS = BeanShellSamplerSchema.INSTANCE.getParameters().getName();
+    public static final String PARAMETERS = "BeanShellSampler.parameters"; //$NON-NLS-1$
 
-    /**
-     * @deprecated use {@link BeanShellSamplerSchema#getInitFile()} instead
-     */
-    @Deprecated
-    public static final String INIT_FILE = BeanShellSamplerSchema.INSTANCE.getInitFile().getName();
+    public static final String INIT_FILE = "beanshell.sampler.init"; //$NON-NLS-1$
 
-    /**
-     * @deprecated use {@link BeanShellSamplerSchema#getResetInterpreter()} instead
-     */
-    @Deprecated
-    public static final String RESET_INTERPRETER = BeanShellSamplerSchema.INSTANCE.getResetInterpreter().getName();
+    public static final String RESET_INTERPRETER = "BeanShellSampler.resetInterpreter"; //$NON-NLS-1$
 
     private transient volatile BeanShellInterpreter savedBsh = null;
 

From 7ebbd98c6f24bcb6df7d807f030b215046d10416 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 08:35:31 +0300
Subject: [PATCH 0552/1037] test: add SampleEvent.toString and
 SampleResult.toDebugString for better debug representation

---
 .../apache/jmeter/samplers/SampleEvent.java   | 23 ++++++++
 .../apache/jmeter/samplers/SampleResult.java  | 56 +++++++++++++++++++
 .../samplers/StatisticalSampleResult.java     |  7 +++
 .../http/sampler/HTTPSampleResult.java        |  8 +++
 4 files changed, 94 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java
index ff7dd02691b..d42ec38a128 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java
@@ -224,4 +224,27 @@ public boolean isTransactionSampleEvent() {
         return isTransactionSampleEvent;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("SampleEvent{");
+        sb.append("hostname='").append(hostname).append('\'');
+        sb.append(", threadGroup='").append(threadGroup).append('\'');
+        sb.append(", isTransactionSampleEvent=").append(isTransactionSampleEvent);
+        if (values != null && values.length > 0) {
+            sb.append("values=[");
+            for (int i = 0; i < variableNames.length; i++) {
+                if (i > 0) {
+                    sb.append(", ");
+                }
+                sb.append('\'').append(variableNames[i]).append("', '").append(values[i]).append('\'');
+            }
+            sb.append(']');
+        }
+        if (result != null) {
+            sb.append(", result=").append(result.toDebugString());
+        }
+        sb.append('}');
+        return sb.toString();
+    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index a8eb8915831..2518f26c318 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -936,6 +936,62 @@ public String toString() {
         return getSampleLabel();
     }
 
+    public String toDebugString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName()).append('{');
+        appendDebugParameters(sb);
+        sb.append('}');
+        return sb.toString();
+    }
+
+    protected void appendDebugParameters(StringBuilder sb) {
+        sb.append("label='").append(label).append('\'');
+        sb.append(", success=").append(success);
+        sb.append(", saveConfig=").append(saveConfig);
+        if (parent != null) {
+            sb.append(", parent=").append(parent.toDebugString());
+        }
+        sb.append(", responseCode='").append(responseCode).append('\'');
+        sb.append(", resultFileName='").append(resultFileName).append('\'');
+        sb.append(", samplerData='").append(samplerData).append('\'');
+        sb.append(", threadName='").append(threadName).append('\'');
+        sb.append(", responseMessage='").append(responseMessage).append('\'');
+        sb.append(", responseHeaders='").append(responseHeaders).append('\'');
+        sb.append(", requestHeaders='").append(requestHeaders).append('\'');
+        sb.append(", timeStamp=").append(timeStamp);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", idleTime=").append(idleTime);
+        sb.append(", pauseTime=").append(pauseTime);
+        sb.append(", assertionResults=").append(assertionResults);
+        sb.append(", subResults=").append(subResults);
+        sb.append(", dataType='").append(dataType).append('\'');
+        sb.append(", files=").append(files);
+        sb.append(", dataEncoding='").append(dataEncoding).append('\'');
+        sb.append(", contentType='").append(contentType).append('\'');
+        sb.append(", elapsedTime=").append(elapsedTime);
+        sb.append(", latency=").append(latency);
+        sb.append(", connectTime=").append(connectTime);
+        sb.append(", testLogicalAction=").append(testLogicalAction);
+        sb.append(", stopThread=").append(stopThread);
+        sb.append(", stopTest=").append(stopTest);
+        sb.append(", stopTestNow=").append(stopTestNow);
+        sb.append(", sampleCount=").append(sampleCount);
+        sb.append(", bytes=").append(bytes);
+        sb.append(", headersSize=").append(headersSize);
+        sb.append(", bodySize=").append(bodySize);
+        sb.append(", groupThreads=").append(groupThreads);
+        sb.append(", allThreads=").append(allThreads);
+        sb.append(", nanoTimeOffset=").append(nanoTimeOffset);
+        sb.append(", useNanoTime=").append(useNanoTime);
+        sb.append(", nanoThreadSleep=").append(nanoThreadSleep);
+        sb.append(", sentBytes=").append(sentBytes);
+        sb.append(", location=").append(location);
+        sb.append(", ignore=").append(ignore);
+        sb.append(", subResultIndex=").append(subResultIndex);
+        sb.append(", responseDataAsString='").append(getResponseDataAsString()).append('\'');
+    }
+
     /**
      * Returns the dataEncoding or the default if no dataEncoding was provided.
      *
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java
index 2177d5cf7ca..77b1bf65c65 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java
@@ -134,4 +134,11 @@ public static String getKey(SampleEvent event, boolean keyOnThreadName) {
         }
         return sb.toString();
     }
+
+    @Override
+    protected void appendDebugParameters(StringBuilder sb) {
+        super.appendDebugParameters(sb);
+        sb.append(", errorCount=").append(errorCount);
+        sb.append(", elapsed=").append(elapsed);
+    }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
index 0b30eaefbf5..29919f47280 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
@@ -280,4 +280,12 @@ public List<String> getSearchableTokens() throws Exception {
         list.add(getUrlAsString());
         return list;
     }
+
+    @Override
+    protected void appendDebugParameters(StringBuilder sb) {
+        super.appendDebugParameters(sb);
+        sb.append(", method='").append(method).append('\'');
+        sb.append(", redirectLocation='").append(redirectLocation).append('\'');
+        sb.append(", queryString='").append(queryString).append('\'');
+    }
 }

From c46e37a4f0ef8a0aa87c2ea4fe2cab9e0423c49d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 08:38:03 +0300
Subject: [PATCH 0553/1037] test: CollectSamplesListener should be
 NoThreadClone, so it collects all the events

Previously, HttpRequestInterruptTest received no events because the
listener was cloned, however, the test assumed there were no events because
the sampling was interrupted.
---
 .../openmodel/ThreadsInterruptAtFinishTest.kt |  4 +--
 .../test/samplers/CollectSamplesListener.kt   |  3 +-
 .../protocol/http/HttpRequestInterruptTest.kt | 30 +++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
index 6e79eb81401..34d5586a652 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadsInterruptAtFinishTest.kt
@@ -32,9 +32,9 @@ import kotlin.time.Duration.Companion.seconds
 
 class ThreadsInterruptAtFinishTest : JMeterTestCase() {
     @Test
-    @Timeout(5, unit = TimeUnit.SECONDS)
+    @Timeout(10, unit = TimeUnit.SECONDS)
     fun `openmodel interrupts sleep`() {
-        executePlanAndCollectEvents(10.seconds) {
+        assertInterruptionsPresent {
             OpenModelThreadGroup::class {
                 scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(1 s)"
                 ThreadSleep::class {
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
index 05c7aca0d35..10869b82c7b 100644
--- a/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/test/samplers/CollectSamplesListener.kt
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.test.samplers
 
+import org.apache.jmeter.engine.util.NoThreadClone
 import org.apache.jmeter.reporters.AbstractListenerElement
 import org.apache.jmeter.samplers.SampleEvent
 import org.apache.jmeter.samplers.SampleListener
@@ -25,7 +26,7 @@ import java.util.Collections
 /**
  * Collects [SampleEvent] to a list.
  */
-class CollectSamplesListener : AbstractListenerElement(), SampleListener {
+class CollectSamplesListener : AbstractListenerElement(), SampleListener, NoThreadClone {
     private val mutableEvents: MutableList<SampleEvent> = Collections.synchronizedList(mutableListOf<SampleEvent>())
 
     // Copy the events to prevent late arrivals after the test has finished
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
index ac3f54e9759..90e25213d2e 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
@@ -22,35 +22,39 @@ import com.github.tomakehurst.wiremock.client.WireMock.get
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
 import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy
-import org.apache.jmeter.samplers.SampleEvent
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
 import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 @WireMockTest
 class HttpRequestInterruptTest : JMeterTestCase() {
-    @Test
-    @Timeout(5, unit = TimeUnit.SECONDS)
-    fun `httpClient4 interrupts`(server: WireMockRuntimeInfo) {
+    @ParameterizedTest
+    @Timeout(10, unit = TimeUnit.SECONDS)
+    @ValueSource(strings = [HTTPSamplerFactory.IMPL_HTTP_CLIENT4, HTTPSamplerFactory.HTTP_SAMPLER_JAVA])
+    fun `http request interrupts`(httpImplementation: String, server: WireMockRuntimeInfo) {
         server.wireMock.register(
             get("/delayed")
                 .willReturn(
                     aResponse()
-                        .withStatus(200)
                         .withFixedDelay(1.minutes.inWholeMilliseconds.toInt())
+                        .withStatus(200)
                 )
         )
 
-        val events = executePlanAndCollectEvents(50.seconds) {
+        val events = executePlanAndCollectEvents(5.seconds) {
             OpenModelThreadGroup::class {
                 scheduleString = "rate(50 / sec) random_arrivals(100 ms) pause(1 s)"
                 HTTPSamplerProxy::class {
+                    implementation = httpImplementation
                     method = "GET"
                     protocol = "http"
                     domain = "localhost"
@@ -60,10 +64,12 @@ class HttpRequestInterruptTest : JMeterTestCase() {
             }
         }
 
-        assertEquals(
-            listOf<SampleEvent>(),
-            events,
-            "No samples expected as all the threads should be interrupted before the request completes"
-        )
+        assertEquals(5, events.size) { "5 events expected, got $events" }
+        if (events.any { it.result.isSuccessful || it.result.isResponseCodeOK || it.result.time < 500 }) {
+            fail(
+                "All events should be failing, and they should take more than 500ms since the requests " +
+                    "should have been cancelled after 1sec. Results are: $events"
+            )
+        }
     }
 }

From ab65d235daf7935aa935db4f14742e89e46c0684 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 22:14:28 +0300
Subject: [PATCH 0554/1037] fix: return collection properties as
 CollectionProperties since it is the most often used scenario

This is a follow-up to https://github.com/apache/jmeter/pull/678
---
 .../org/apache/jmeter/config/Arguments.java   |  2 +-
 .../apache/jmeter/testelement/TestElement.kt  | 17 +++---
 .../schema/CollectionPropertyDescriptor.kt    | 14 ++---
 .../testelement/schema/PropertiesAccessor.kt  | 53 ++++++++++++++-----
 .../jmeter/engine/util/UseFunctionsTest.kt    |  2 +-
 .../protocol/http/control/HeaderManager.java  |  2 +-
 6 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
index 8139afc00eb..e6a060dd7fb 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
@@ -62,7 +62,7 @@ public ArgumentsSchema getSchema() {
      * @return the arguments
      */
     public CollectionProperty getArguments() {
-        return (CollectionProperty) getPropertyOrNull(getSchema().getArguments());
+        return getOrNull(getSchema().getArguments());
     }
 
     /**
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 438519c6fb0..9de8162814d 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -488,29 +488,28 @@ public interface TestElement : Cloneable {
     }
 
     /**
-     * Retrieve [Collection] property value, or throw [NoSuchElementException] in case the property is unset.
+     * Retrieve [CollectionProperty] property value, or throw [NoSuchElementException] in case the property is unset.
      * @throws NoSuchElementException if the property is unset
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-    public operator fun get(property: CollectionPropertyDescriptor<*>): Collection<JMeterProperty> =
+    public operator fun get(property: CollectionPropertyDescriptor<*>): CollectionProperty =
         getOrNull(property) ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
 
     /**
-     * Retrieve [Collection] property value, or return `null` in case the property is unset.
+     * Retrieve [CollectionProperty] property value, or return `null` in case the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-    public fun getOrNull(property: CollectionPropertyDescriptor<*>): Collection<JMeterProperty>? =
+    public fun getOrNull(property: CollectionPropertyDescriptor<*>): CollectionProperty? =
         getPropertyOrNull(property)?.let {
-            @Suppress("UNCHECKED_CAST")
-            (it as CollectionProperty).objectValue as Collection<JMeterProperty>
+            it as CollectionProperty
         }
 
     /**
-     * Retrieve [Collection] property value, or create one and set it the property is unset.
+     * Retrieve [CollectionProperty] property value, or create one and set it the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -518,8 +517,8 @@ public interface TestElement : Cloneable {
     public fun getOrCreate(
         property: CollectionPropertyDescriptor<*>,
         ifMissing: () -> Collection<JMeterProperty>
-    ): Collection<JMeterProperty> =
-        getOrNull(property) ?: ifMissing().also { set(property, it) }
+    ): CollectionProperty =
+        getOrNull(property) ?: CollectionProperty(property.name, ifMissing()).also { setProperty(it) }
 
     /**
      * Set property as [Collection], or remove it if the given [Collection] is `null`.
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
index 1aa22ecae3f..13ca4a2ee14 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/CollectionPropertyDescriptor.kt
@@ -40,22 +40,22 @@ public data class CollectionPropertyDescriptor<in Schema : BaseTestElementSchema
     override val defaultValue: Collection<JMeterProperty>? = null
 
     /**
-     * Retrieve [Collection] property value, or throw [NoSuchElementException] in case the property is unset.
+     * Retrieve [CollectionProperty] property value, or throw [NoSuchElementException] in case the property is unset.
      * @throws NoSuchElementException if the property is unset
      */
-    public operator fun get(target: TestElement): Collection<JMeterProperty> =
+    public operator fun get(target: TestElement): CollectionProperty =
         target[this]
 
     /**
-     * Retrieve [Collection] property value, or return `null` in case the property is unset.
+     * Retrieve [CollectionProperty] property value, or return `null` in case the property is unset.
      */
-    public fun getOrNull(target: TestElement): Collection<JMeterProperty>? =
+    public fun getOrNull(target: TestElement): CollectionProperty? =
         target.getOrNull(this)
 
     /**
-     * Retrieve [Collection] property value, or create one and set it the property is unset.
+     * Retrieve [CollectionProperty] property value, or create one and set it the property is unset.
      */
-    public fun getOrCreate(target: TestElement, ifMissing: () -> Collection<JMeterProperty>): Collection<JMeterProperty> =
+    public fun getOrCreate(target: TestElement, ifMissing: () -> Collection<JMeterProperty>): CollectionProperty =
         target.getOrCreate(this, ifMissing)
 
     public operator fun set(target: TestElement, value: Collection<*>?) {
@@ -64,7 +64,7 @@ public data class CollectionPropertyDescriptor<in Schema : BaseTestElementSchema
 
     @JvmSynthetic
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): Collection<JMeterProperty> {
+    public inline operator fun getValue(testElement: TestElement, property: KProperty<*>): CollectionProperty {
         return testElement[this]
     }
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
index 271823825d8..05c6f0b5ce9 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
@@ -18,6 +18,7 @@
 package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.CollectionProperty
 import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apiguardian.api.API
 import kotlin.experimental.ExperimentalTypeInference
@@ -136,14 +137,22 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
         propertySelector(schema).getString(target)
 
     // Class properties
-    public operator fun <ValueClass : Any> get(property: ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+    public operator fun <ValueClass : Any> get(property: ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass> =
         target[property]
 
+    public fun <ValueClass : Any> getOrNull(property: ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+        target.getOrNull(property)
+
     @OptIn(ExperimentalTypeInference::class)
     @OverloadResolutionByLambdaReturnType
-    public operator fun <ValueClass : Any> get(propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+    public operator fun <ValueClass : Any> get(propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass> =
         get(propertySelector(schema))
 
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public fun <ValueClass : Any> getOrNull(propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>): Class<out ValueClass>? =
+        getOrNull(propertySelector(schema))
+
     public operator fun <ValueClass : Any> set(
         property: ClassPropertyDescriptor<Schema, ValueClass>,
         value: KClass<out ValueClass>
@@ -153,21 +162,21 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
 
     public inline operator fun <ValueClass : Any> set(
         propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>,
-        value: KClass<ValueClass>
+        value: KClass<ValueClass>?
     ) {
-        set(propertySelector, value.java)
+        set(propertySelector, value?.java)
     }
 
     public operator fun <ValueClass : Any> set(
         property: ClassPropertyDescriptor<Schema, ValueClass>,
-        value: Class<out ValueClass>
+        value: Class<out ValueClass>?
     ) {
         target[property] = value
     }
 
     public inline operator fun <ValueClass : Any> set(
         propertySelector: Schema.() -> ClassPropertyDescriptor<Schema, ValueClass>,
-        value: Class<ValueClass>
+        value: Class<ValueClass>?
     ) {
         target[propertySelector(schema)] = value
     }
@@ -253,44 +262,60 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
     }
 
     // TestElement properties
-    public operator fun <ValueClass : TestElement> get(property: TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+    public operator fun <ValueClass : TestElement> get(property: TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass =
         target[property]
 
+    public fun <ValueClass : TestElement> getOrNull(property: TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+        target.getOrNull(property)
+
     @OptIn(ExperimentalTypeInference::class)
     @OverloadResolutionByLambdaReturnType
-    public inline operator fun <ValueClass : TestElement> get(propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+    public inline operator fun <ValueClass : TestElement> get(propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass =
         target[propertySelector(schema)]
 
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline fun <ValueClass : TestElement> getOrNull(propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>): ValueClass? =
+        target.getOrNull(propertySelector(schema))
+
     public operator fun <ValueClass : TestElement> set(
         property: TestElementPropertyDescriptor<Schema, ValueClass>,
-        value: ValueClass
+        value: ValueClass?
     ) {
         target[property] = value
     }
 
     public inline operator fun <ValueClass : TestElement> set(
         propertySelector: Schema.() -> TestElementPropertyDescriptor<Schema, ValueClass>,
-        value: ValueClass
+        value: ValueClass?
     ) {
         target[propertySelector(schema)] = value
     }
 
     // Collection properties
-    public operator fun get(property: CollectionPropertyDescriptor<Schema>): Collection<JMeterProperty> =
+    public operator fun get(property: CollectionPropertyDescriptor<Schema>): CollectionProperty =
         target[property]
 
+    public fun getOrNull(property: CollectionPropertyDescriptor<Schema>): CollectionProperty? =
+        target.getOrNull(property)
+
     @OptIn(ExperimentalTypeInference::class)
     @OverloadResolutionByLambdaReturnType
-    public inline operator fun get(propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>): Collection<JMeterProperty> =
+    public inline operator fun get(propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>): CollectionProperty =
         target[propertySelector(schema)]
 
-    public operator fun set(property: CollectionPropertyDescriptor<Schema>, value: Collection<*>) {
+    @OptIn(ExperimentalTypeInference::class)
+    @OverloadResolutionByLambdaReturnType
+    public inline fun getOrNull(propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>): CollectionProperty? =
+        target.getOrNull(propertySelector(schema))
+
+    public operator fun set(property: CollectionPropertyDescriptor<Schema>, value: Collection<*>?) {
         target[property] = value
     }
 
     public inline operator fun set(
         propertySelector: Schema.() -> CollectionPropertyDescriptor<Schema>,
-        value: Collection<*>
+        value: Collection<*>?
     ) {
         target[propertySelector(schema)] = value
     }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
index d1cfca98700..13a9b6d3f94 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/UseFunctionsTest.kt
@@ -61,7 +61,7 @@ class UseFunctionsTest {
 
         // These assertions verify CollectionProperty behavior rather than USE_FUNCTIONS behavior
         // However, we can't extract deeply-nested item right away
-        assertEquals(1, output.size) {
+        assertEquals(1, output.size()) {
             "size of first level collection should be 1, actual: $output"
         }
         val nested = output.first()
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 71cb01490d2..1ce98e1a5bb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -86,7 +86,7 @@ public void clear() {
      * @return the header collection property
      */
     public CollectionProperty getHeaders() {
-        return (CollectionProperty) getPropertyOrNull(getSchema().getHeaders());
+        return getOrNull(getSchema().getHeaders());
     }
 
     public int getColumnCount() {

From 13793b74d96576731062e83b3c365b2adbe6a8df Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 15 Jun 2023 22:31:45 +0300
Subject: [PATCH 0555/1037] fix: encode unicode characters in filenames when
 sending files in HTTP Sampler

Fixes https://github.com/apache/jmeter/issues/4546
Fixes https://github.com/apache/jmeter/issues/5701
Fixes https://github.com/apache/jmeter/issues/5982
Fixes https://github.com/apache/jmeter/issues/5758
---
 .../protocol/http/sampler/HTTPHC4Impl.java    |  5 +-
 .../http/sampler/HTTPSamplerBase.java         | 13 +--
 .../protocol/http/sampler/PostWriter.java     |  3 +-
 .../protocol/http/util/ConversionUtils.java   | 18 ++++
 .../protocol/http/util/HTTPFileArg.java       | 44 +++++----
 .../protocol/http/util/HTTPFileArgs.java      | 22 +++--
 .../http/sampler/HTTPSamplerBaseSchema.kt     |  4 +
 .../protocol/http/util/HTTPFileArgSchema.kt   | 43 ++++++++
 .../protocol/http/util/HTTPFileArgsSchema.kt  | 34 +++++++
 .../protocol/http/sampler/HttpSamplerTest.kt  | 99 +++++++++++++++++++
 .../protocol/http/util/ConversionUtilsTest.kt | 42 ++++++++
 xdocs/changes.xml                             |  1 +
 12 files changed, 289 insertions(+), 39 deletions(-)
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgSchema.kt
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgsSchema.kt
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index cda36226a8a..09c9d875f6f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -150,6 +150,7 @@
 import org.apache.jmeter.protocol.http.sampler.hc.LaxDeflateInputStream;
 import org.apache.jmeter.protocol.http.sampler.hc.LaxGZIPInputStream;
 import org.apache.jmeter.protocol.http.sampler.hc.LazyLayeredConnectionSocketFactory;
+import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jmeter.protocol.http.util.EncoderCache;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -1508,7 +1509,9 @@ private static class ViewableFileBody extends FileBody {
         private boolean hideFileData;
 
         public ViewableFileBody(File file, ContentType contentType) {
-            super(file, contentType);
+            // Note: HttpClient4 does not support encoding the file name, so we explicitly encode it here
+            // See https://issues.apache.org/jira/browse/HTTPCLIENT-293
+            super(file, contentType, ConversionUtils.percentEncode(file.getName()));
             hideFileData = false;
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 58bf9b86975..7efb81e4e6c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -82,7 +82,6 @@
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
-import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.testelement.schema.PropertyDescriptor;
 import org.apache.jmeter.threads.JMeterContext;
@@ -92,6 +91,7 @@
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Matcher;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -248,7 +248,6 @@ public abstract class HTTPSamplerBase extends AbstractSampler
 
     // @see mergeFileProperties
     // Must be private, as the file list needs special handling
-    private static final String FILE_ARGS = "HTTPsampler.Files"; // $NON-NLS-1$
     // MIMETYPE is kept for backward compatibility with old test plans
     private static final String MIMETYPE = "HTTPSampler.mimetype"; // $NON-NLS-1$
     // FILE_NAME is kept for backward compatibility with old test plans
@@ -1829,18 +1828,14 @@ protected static String encodeBackSlashes(String value) {
      *   HTTPFileArgs object that stores file list to be uploaded.
      */
     private void setHTTPFileArgs(HTTPFileArgs value) {
-        if (value.getHTTPFileArgCount() > 0) {
-            setProperty(new TestElementProperty(FILE_ARGS, value));
-        } else {
-            removeProperty(FILE_ARGS); // no point saving an empty list
-        }
+        set(getSchema().getFileArguments(), value.getHTTPFileArgCount() == 0 ? null : value);
     }
 
     /*
      * Method to get files list to be uploaded.
      */
-    private HTTPFileArgs getHTTPFileArgs() {
-        return (HTTPFileArgs) getProperty(FILE_ARGS).getObjectValue();
+    private @Nullable HTTPFileArgs getHTTPFileArgs() {
+        return getOrNull(getSchema().getFileArguments());
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index 59746d0d17f..c604c760ef3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -28,6 +28,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
@@ -391,7 +392,7 @@ private static void writeStartFileMultipart(OutputStream out, String filename,
         write(out, "Content-Disposition: form-data; name=\""); // $NON-NLS-1$
         write(out, nameField);
         write(out, "\"; filename=\"");// $NON-NLS-1$
-        write(out, new File(filename).getName());
+        write(out, ConversionUtils.percentEncode(new File(filename).getName()));
         writeln(out, "\""); // $NON-NLS-1$
         writeln(out, "Content-Type: " + mimetype); // $NON-NLS-1$
         writeln(out, "Content-Transfer-Encoding: binary"); // $NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index f4f9866955e..2c71d8888af 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -32,6 +32,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apiguardian.api.API;
 
 // @see TestHTTPUtils for unit tests
 
@@ -95,6 +96,23 @@ public static String getEncodingFromContentType(String contentType){
         return charSet;
     }
 
+    /**
+     * Encodes the string according to RFC7578 and RFC3986.
+     * The string is UTF-8 encoded, and non-ASCII bytes are represented as {@code %XX}.
+     * It is close to UrlEncode, however, {@code percentEncode} does not replace space with +.
+     * @param value input value to convert
+     * @return converted value
+     * @since 5.6
+     */
+    @API(status = API.Status.MAINTAINED, since = "5.6")
+    public static String percentEncode(String value) {
+        try {
+            return new URI(null, null, value, null).toASCIIString();
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Can't encode value " + value, e);
+        }
+    }
+
     /**
      * Generate an absolute URL from a possibly relative location,
      * allowing for extraneous leading "../" segments.
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index b38d28c72b8..18ba242ae17 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -24,7 +24,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
+import org.apache.jmeter.testelement.schema.PropertyDescriptor;
 import org.apache.tika.Tika;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
@@ -41,15 +42,6 @@ public class HTTPFileArg extends AbstractTestElement implements Serializable {
 
     private static final long serialVersionUID = 240L;
 
-    /** Name used to store the file's path. */
-    private static final String FILEPATH = "File.path";
-
-    /** Name used to store the file's paramname. */
-    private static final String PARAMNAME = "File.paramname";
-
-    /** Name used to store the file's mimetype. */
-    private static final String MIMETYPE = "File.mimetype";
-
     /** temporary storage area for the body header. */
     private String header;
 
@@ -139,14 +131,24 @@ public HTTPFileArg(JMeterProperty path, JMeterProperty paramname, JMeterProperty
         if (path == null || paramname == null || mimetype == null){
             throw new IllegalArgumentException("Parameters must not be null");
         }
-        setProperty(FILEPATH, path);
-        setProperty(MIMETYPE, mimetype);
-        setProperty(PARAMNAME, paramname);
+        setProperty(getSchema().getPath(), path);
+        setProperty(getSchema().getMimeType(), mimetype);
+        setProperty(getSchema().getParameterName(), paramname);
+    }
+
+    @Override
+    public HTTPFileArgSchema getSchema() {
+        return HTTPFileArgSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends HTTPFileArg, ? extends HTTPFileArgSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
     }
 
-    private void setProperty(String name, JMeterProperty prop) {
+    private void setProperty(PropertyDescriptor<?, ?> descriptor, JMeterProperty prop) {
         JMeterProperty jmp = prop.clone();
-        jmp.setName(name);
+        jmp.setName(descriptor.getName());
         setProperty(jmp);
     }
 
@@ -170,7 +172,7 @@ public HTTPFileArg(HTTPFileArg file) {
      * the new http parameter name
      */
     public void setParamName(String newParamName) {
-        setProperty(new StringProperty(PARAMNAME, newParamName));
+        set(getSchema().getParameterName(), newParamName);
     }
 
     /**
@@ -179,7 +181,7 @@ public void setParamName(String newParamName) {
      * @return the http parameter name
      */
     public String getParamName() {
-        return getPropertyAsString(PARAMNAME);
+        return get(getSchema().getParameterName());
     }
 
     /**
@@ -189,7 +191,7 @@ public String getParamName() {
      * the new mimetype
      */
     public void setMimeType(String newMimeType) {
-        setProperty(new StringProperty(MIMETYPE, newMimeType));
+        set(getSchema().getMimeType(), newMimeType);
     }
 
     /**
@@ -198,7 +200,7 @@ public void setMimeType(String newMimeType) {
      * @return the http parameter mimetype
      */
     public String getMimeType() {
-        return getPropertyAsString(MIMETYPE);
+        return get(getSchema().getMimeType());
     }
 
     /**
@@ -209,7 +211,7 @@ public String getMimeType() {
      */
     public void setPath(String newPath) {
         setMimeType(detectMimeType(newPath, getMimeType()));
-        setProperty(new StringProperty(FILEPATH, newPath));
+        set(getSchema().getPath(), newPath);
     }
 
     /**
@@ -218,7 +220,7 @@ public void setPath(String newPath) {
      * @return the file's path
      */
     public String getPath() {
-        return getPropertyAsString(FILEPATH);
+        return get(getSchema().getPath());
     }
 
    /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java
index e1427223b6a..bd0d6611af1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java
@@ -25,6 +25,7 @@
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 
 /**
  * A set of HTTPFileArg objects.
@@ -34,14 +35,21 @@ public class HTTPFileArgs extends ConfigTestElement implements Serializable {
 
     private static final long serialVersionUID = 240L;
 
-    /** The name of the property used to store the files. */
-    private static final String HTTP_FILE_ARGS = "HTTPFileArgs.files"; //$NON-NLS-1$
-
     /**
      * Create a new HTTPFileArgs object with no files.
      */
     public HTTPFileArgs() {
-        setProperty(new CollectionProperty(HTTP_FILE_ARGS, new ArrayList<HTTPFileArg>()));
+        setHTTPFileArgs(new ArrayList<>());
+    }
+
+    @Override
+    public HTTPFileArgsSchema getSchema() {
+        return HTTPFileArgsSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends HTTPFileArgs, ? extends HTTPFileArgsSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
     }
 
     /**
@@ -50,7 +58,7 @@ public HTTPFileArgs() {
      * @return the files
      */
     public CollectionProperty getHTTPFileArgsCollection() {
-        return (CollectionProperty) getProperty(HTTP_FILE_ARGS);
+        return getOrNull(getSchema().getFileArguments());
     }
 
     /**
@@ -59,7 +67,7 @@ public CollectionProperty getHTTPFileArgsCollection() {
     @Override
     public void clear() {
         super.clear();
-        setProperty(new CollectionProperty(HTTP_FILE_ARGS, new ArrayList<HTTPFileArg>()));
+        setHTTPFileArgs(new ArrayList<>());
     }
 
     /**
@@ -68,7 +76,7 @@ public void clear() {
      * @param files the new files
      */
     public void setHTTPFileArgs(List<HTTPFileArg> files) {
-        setProperty(new CollectionProperty(HTTP_FILE_ARGS, files));
+        set(getSchema().getFileArguments(), files);
     }
 
     /**
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index 9e80186afaf..ed67101b18a 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -25,6 +25,7 @@ import org.apache.jmeter.protocol.http.control.CookieManager
 import org.apache.jmeter.protocol.http.control.DNSCacheManager
 import org.apache.jmeter.protocol.http.control.HeaderManager
 import org.apache.jmeter.protocol.http.util.HTTPConstants
+import org.apache.jmeter.protocol.http.util.HTTPFileArgs
 import org.apache.jmeter.testelement.TestElementSchema
 import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
 import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
@@ -132,4 +133,7 @@ public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
 
     public val ipSourceType: IntegerPropertyDescriptor<HTTPSamplerBaseSchema>
         by int("HTTPSampler.ipSourceType", default = HTTPSamplerBase.SourceType.HOSTNAME.ordinal)
+
+    public val fileArguments: TestElementPropertyDescriptor<HTTPSamplerBaseSchema, HTTPFileArgs>
+        by testElement("HTTPsampler.Files")
 }
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgSchema.kt
new file mode 100644
index 00000000000..8e79ec7e99f
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgSchema.kt
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.util
+
+import org.apache.jmeter.config.ConfigTestElementSchema
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HTTPFileArg].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class HTTPFileArgSchema : ConfigTestElementSchema() {
+    public companion object INSTANCE : HTTPFileArgSchema()
+
+    /** File's path */
+    public val path: StringPropertyDescriptor<HTTPFileArgSchema>
+        by string("File.path")
+
+    /** Name of the parameter that stores the file */
+    public val parameterName: StringPropertyDescriptor<HTTPFileArgSchema>
+        by string("File.paramname")
+
+    /** File's mimetype */
+    public val mimeType: StringPropertyDescriptor<HTTPFileArgSchema>
+        by string("File.mimetype")
+}
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgsSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgsSchema.kt
new file mode 100644
index 00000000000..7f36a15d6fa
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/util/HTTPFileArgsSchema.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.util
+
+import org.apache.jmeter.config.ConfigTestElementSchema
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [HTTPFileArgs].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class HTTPFileArgsSchema : ConfigTestElementSchema() {
+    public companion object INSTANCE : HTTPFileArgsSchema()
+
+    public val fileArguments: CollectionPropertyDescriptor<HTTPFileArgsSchema>
+        by collection("HTTPFileArgs.files")
+}
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
new file mode 100644
index 00000000000..f5337637879
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import com.github.tomakehurst.wiremock.client.WireMock.aMultipart
+import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.containing
+import com.github.tomakehurst.wiremock.client.WireMock.equalTo
+import com.github.tomakehurst.wiremock.client.WireMock.post
+import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
+import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
+import com.github.tomakehurst.wiremock.junit5.WireMockTest
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.util.HTTPFileArg
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.threads.ThreadGroup
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import java.nio.file.Path
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.writeText
+import kotlin.time.Duration.Companion.seconds
+
+@WireMockTest
+class HttpSamplerTest : JMeterTestCase() {
+    @TempDir
+    lateinit var dir: Path
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `upload file uses percent encoding for filename`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/upload")
+                .willReturn(
+                    aResponse()
+                        .withStatus(200)
+                )
+        )
+
+        // Quote is invalid character for a filename in Windows, so we do not test it here
+        // See ConversionUtilsTest for escaping quotes.
+        val testFile = dir.resolve("testfile привет %.txt")
+        testFile.writeText("hello, привет")
+
+        executePlanAndCollectEvents(10.seconds) {
+            ThreadGroup::class {
+                numThreads = 1
+                rampUp = 0
+                setSamplerController(
+                    LoopController().apply {
+                        loops = 1
+                    }
+                )
+                org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+                    name = "Upload file"
+                    implementation = httpImplementation
+                    method = "POST"
+                    domain = "localhost"
+                    port = server.httpPort
+                    path = "/upload"
+                    httpFiles = arrayOf(
+                        HTTPFileArg(testFile.absolutePathString(), "file_parameter", "application/octet-stream")
+                    )
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/upload"))
+                .withAnyRequestBodyPart(
+                    aMultipart("file_parameter")
+                        .withHeader(
+                            "Content-Disposition",
+                            containing("filename=\"testfile%20%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%25.txt\"")
+                        )
+                        .withBody(equalTo("hello, привет"))
+                )
+        )
+    }
+}
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt
new file mode 100644
index 00000000000..eed34b6ee70
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.util
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+class ConversionUtilsTest {
+    @ParameterizedTest
+    @CsvSource(
+        ignoreLeadingAndTrailingWhitespace = false,
+        value = [
+            "hello,hello",
+            "%,%25",
+            "\",%22",
+            " ,%20",
+            "😃,%F0%9F%98%83",
+            "comment ça va?,comment%20%C3%A7a%20va%3F",
+        ]
+    )
+    fun percentEncode(input: String, output: String) {
+        assertEquals(output, ConversionUtils.percentEncode(input)) {
+            "ConversionUtils.percentEncode($input)"
+        }
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 52d5520bee5..1718c6c2416 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -179,6 +179,7 @@ Summary
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
   <li><pr>5901</pr>Fix NumberFormatException when counter is empty or not a digit on Proxy Settings panel</li>
+  <li><pr>5987</pr><issue>4546</issue>Encode unicode characters in filenames when sending files in HTTP Sampler</li>
 </ul>
 
 <h3>Other Samplers</h3>

From 049697b00b2b37e212cb8beb274bc78808964529 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 09:28:50 +0300
Subject: [PATCH 0556/1037] fix: support unmodifiable collections as input for
 CollectionProperty

Previously, CollectionProperty.normalizeCollection failed to create a copy
of the input collection, and it resulted in null value.

How we create ArrayList or LinkedHashSet instead.
---
 .../property/AbstractProperty.java            | 21 ++++++++++--
 .../property/CollectionPropertyTest.kt        | 34 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src/core/src/test/java/org/apache/jmeter/testelement/property/CollectionPropertyTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
index 0b0ff4ef6c4..5c6fcb8dc1f 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
@@ -17,8 +17,12 @@
 
 package org.apache.jmeter.testelement.property;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.jmeter.testelement.TestElement;
 import org.slf4j.Logger;
@@ -296,13 +300,26 @@ protected static JMeterProperty getBlankProperty(Object item) {
      */
     protected Collection<JMeterProperty> normalizeList(Collection<?> coll) {
         try {
-            @SuppressWarnings("unchecked") // empty collection
-            Collection<JMeterProperty> newColl = coll.getClass().getDeclaredConstructor().newInstance();
+            Collection<JMeterProperty> newColl;
+            try {
+                @SuppressWarnings("unchecked")
+                Collection<JMeterProperty> tmp = coll.getClass().getDeclaredConstructor().newInstance();
+                newColl = tmp;
+            } catch (Exception e) {
+                if (coll instanceof List) {
+                    newColl = new ArrayList<>(coll.size());
+                } else if (coll instanceof Set) {
+                    newColl = new LinkedHashSet<>();
+                } else {
+                    throw e;
+                }
+            }
             for (Object item : coll) {
                 newColl.add(convertObject(item));
             }
             return newColl;
         } catch (Exception e) {// should not happen
+            // TODO: replace with throwing an error, however it might break backward compatibility
             log.error("Cannot create copy of {}", coll.getClass(), e);
             return null;
         }
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/CollectionPropertyTest.kt b/src/core/src/test/java/org/apache/jmeter/testelement/property/CollectionPropertyTest.kt
new file mode 100644
index 00000000000..57d6c73b7c1
--- /dev/null
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/CollectionPropertyTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.testelement.property
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class CollectionPropertyTest {
+    @Test
+    fun `creates with immutable list`() {
+        val inputValues = listOf(1, 2)
+        val prop = CollectionProperty("property_name", inputValues)
+        Assertions.assertEquals(
+            inputValues.toString(),
+            (prop.objectValue as? List<*>).toString(),
+            "CollectionProperty should contain the same elements as in the input"
+        )
+    }
+}

From 234e959c2a617593c7e4a710090d14aae7340348 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 09:35:37 +0300
Subject: [PATCH 0557/1037] test: skip executing HttpSamplerTest on filesystems
 that do not support unicode filenames

---
 .../jmeter/protocol/http/sampler/HttpSamplerTest.kt   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
index f5337637879..72b6eea1c7d 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
@@ -31,9 +31,11 @@ import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.protocol.http.util.HTTPFileArg
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
 import org.apache.jmeter.threads.ThreadGroup
+import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import java.nio.file.InvalidPathException
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.writeText
@@ -57,7 +59,14 @@ class HttpSamplerTest : JMeterTestCase() {
 
         // Quote is invalid character for a filename in Windows, so we do not test it here
         // See ConversionUtilsTest for escaping quotes.
-        val testFile = dir.resolve("testfile привет %.txt")
+        val testFile = try {
+            dir.resolve("testfile привет %.txt")
+        } catch (e: InvalidPathException) {
+            assumeTrue(false) {
+                "Skipping the test as the filesystem does not suppport unicode filenames"
+            }
+            TODO("This is never reached as the assumption above throws error")
+        }
         testFile.writeText("hello, привет")
 
         executePlanAndCollectEvents(10.seconds) {

From f7e9673b899bb3c63806e435bb72319a3dbeebc4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 10:04:03 +0300
Subject: [PATCH 0558/1037] test: fix
 AbstractPropertyTest.testNormalizeListWithEmptyList so it accounts for
 unmodifiable collection in normalizeList

---
 .../jmeter/testelement/property/AbstractPropertyTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
index 1299092dd08..9d424151283 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
@@ -69,7 +69,7 @@ public Object getObjectValue() {
     public void testNormalizeListWithEmptyList() {
         Collection<JMeterProperty> emptyCollection = Collections.emptyList();
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(emptyCollection);
-        assertThat(newCollection, CoreMatchers.nullValue());
+        assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
     }
 
     @Test

From 4e219c063556c3d60d8008a00dfaf5194be49815 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 16 Jun 2023 10:10:03 +0300
Subject: [PATCH 0559/1037] test: use <> diamond operator in Java tests

---
 .../jmeter/testelement/property/AbstractPropertyTest.java     | 4 ++--
 .../apache/jmeter/testelement/property/MapPropertyTest.java   | 2 +-
 .../src/test/java/org/apache/jmeter/util/XPathUtilTest.java   | 2 +-
 .../apache/jmeter/protocol/http/parser/TestHTMLParser.java    | 4 ++--
 .../apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
index 9d424151283..f9d3d008fc5 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
@@ -74,7 +74,7 @@ public void testNormalizeListWithEmptyList() {
 
     @Test
     public void testNormalizeListWithEmptyArrayList() {
-        Collection<JMeterProperty> emptyCollection = new ArrayList<JMeterProperty>();
+        Collection<JMeterProperty> emptyCollection = new ArrayList<>();
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(emptyCollection);
         assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(emptyCollection)));
         assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
@@ -82,7 +82,7 @@ public void testNormalizeListWithEmptyArrayList() {
 
     @Test
     public void testNormalizeListWithFilledArrayList() {
-        List<JMeterProperty> filledCollection = new ArrayList<JMeterProperty>();
+        List<JMeterProperty> filledCollection = new ArrayList<>();
         filledCollection.add(new StringProperty("key", "value"));
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(filledCollection);
         assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(filledCollection)));
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
index 3355f1b13cf..d229f7619c9 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
@@ -35,7 +35,7 @@ public void testBug62281MapProperty() {
 
     @Test
     public void testGetPropertyTypeOfEmptyMap() {
-        MapProperty props = new MapProperty("foo", new HashMap<Object, Object>());
+        MapProperty props = new MapProperty("foo", new HashMap<>());
         assertThat(props.getPropertyType(), CoreMatchers.equalTo(NullProperty.class));
     }
 
diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index d916487f10d..5a719c81b29 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -80,7 +80,7 @@ public void testBug63033() throws SaxonApiException {
     @Test
     public void testputValuesForXPathInListUsingSaxon() throws SaxonApiException, FactoryConfigurationError{
         String xPathQuery="//Employees/Employee/role";
-        ArrayList<String> matchStrings = new ArrayList<String>();
+        ArrayList<String> matchStrings = new ArrayList<>();
         boolean fragment = false;
         String namespaces = "age=http://www.w3.org/2003/01/geo/wgs84_pos#";
         int matchNumber = 3;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index e47a9a1f946..b76ebc3f7c9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -368,7 +368,7 @@ public void testParserSet() throws Exception {
     public void testParserList() throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedList,
-                new Vector<URLString>(), true, TESTS[testNumber].userAgent);
+                new Vector<>(), true, TESTS[testNumber].userAgent);
     }
 
     public void testSpecificParserList() throws Exception {
@@ -376,7 +376,7 @@ public void testSpecificParserList() throws Exception {
         filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
                 SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
                 SPECIFIC_PARSER_TESTS[testNumber].expectedList,
-                new ArrayList<URLString>(), true,
+                new ArrayList<>(), true,
                 SPECIFIC_PARSER_TESTS[testNumber].userAgent);
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index bbfc09e3d2a..cc4e609cab0 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -646,8 +646,8 @@ private HTTPSamplerBase getSamplerForRequest(String url, String request, String
         }
         req.parse(bis);
         bis.close();
-        Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<String, String>());
-        Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<String, String>());
+        Map<String, String> pageEncodings = Collections.synchronizedMap(new HashMap<>());
+        Map<String, String> formEncodings = Collections.synchronizedMap(new HashMap<>());
         if(url != null && contentEncoding != null) {
             pageEncodings.put(url, contentEncoding);
         }

From e024bf3703b9ca459fa531997d5874c9eaae8e36 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sat, 17 Jun 2023 09:03:55 +0100
Subject: [PATCH 0560/1037] prepare new version 5.6

---
 xdocs/download_jmeter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 448648f793b..05b3bd16f08 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.5'>
+<!ENTITY release '5.6'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
 

From b8e2439ea373a4ec6700e5fd025af5b18b00c4e6 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 23 Jun 2023 13:56:33 +0100
Subject: [PATCH 0561/1037] Add the 5.6 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 99e8aa4d08b..6aa29ad57e0 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -321,6 +321,13 @@
         <revision>5.5 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2023-06-23</created>
+        <revision>5.6 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From d4c8c33fab09f537bdf0fc0732feff24e936c166 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Jun 2023 16:54:27 +0300
Subject: [PATCH 0562/1037] doc: update changelog for 5.6.1

---
 gradle.properties         |   2 +-
 xdocs/changes.xml         | 108 +-------------
 xdocs/changes_history.xml | 288 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 291 insertions(+), 107 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1633723884c..4a09bcd5cea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.6
+jmeter.version=5.6.1
 
 # Plugins
 com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1718c6c2416..63a3ff9f61e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -46,9 +46,9 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 </note>
 
 
-<!--  =================== 5.6 =================== -->
+<!--  =================== 5.6.1 =================== -->
 
-<h1>Version 5.6</h1>
+<h1>Version 5.6.1</h1>
 <p>
 Summary
 </p>
@@ -69,21 +69,14 @@ Summary
 
 <h3>Thread Groups</h3>
 <ul>
-<li><issue>5682</issue><pr>717</pr> Open Model Thread Group: avoid skipping rows from CSV Data Set Config</li>
-  <li>Support custom thread group implementations in "Add think time" and "Save as test fragment" actions</li>
-  <li>Open Model Thread Group: interrupt pending HTTP requests and other <code>Interruptible</code> test elements on test stop</li>
 </ul>
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
-  <li><pr>5911</pr> Use Caffeine for caching HTTP headers instead of commons-collections4 LRUMap</li>
-  <li><pr>5947</pr> Fetch resources referenced in <code>&lt;link "rel"="preload"...&gt;</code> elements</li>
-  <li><pr>5869</pr> Allow more templates to format sampler names in the recorder: <code>#{url}</code>, <code>#{method}</code>, <code>#{scheme}</code>, <code>#{host}</code>, <code>#{port}</code></li>
 </ul>
 
 <h3>Other samplers</h3>
 <ul>
-  <li><pr>5909</pr> Use Caffeine for caching compiled scripts in JSR223 samplers instead of commons-collections4 LRUMap</li>
 </ul>
 
 <h3>Controllers</h3>
@@ -104,72 +97,10 @@ Summary
 
 <h3>General</h3>
 <ul>
-  <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
-  <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
-  <li><pr>5914</pr>Use <code>Locale.ROOT</code> instead of default locale for <code>toUpperCase</code>, and <code>toLowerCase</code> to avoid surprises with dotless I in <code>tr_TR</code> locale</li>
-  <li><pr>5885</pr>Use Java's <code>ServiceLoader</code> for loading plugins instead of classpath scanning. It enables faster startup</li>
-  <li><pr>5788</pr><code>FunctionProperty</code> no longer caches the value.
-    Previously it cached the values based on iteration number only which triggered wrong results on concurrent executions.
-    The previous behavior can be temporary restored with <code>function.cache.per.iteration</code> property.
-  </li>
-  <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
-  <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
-  <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
-  <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
-  <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
-  <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
-  <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
-  <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
-  <li><pr>5944</pr>Add PI for declaring <code>TestElement</code> schemas so element properties are easier to access in code (see <code>TestElementSchema</code>, <code>TestElement#getSchema()</code>, <code>TestElement#getProps()</code>)</li>
-  <li><pr>5944</pr>Enable usage of <code>${...}</code> expressions for checkbox controls (see context menus for checkboxes, however, the individual components should be adapted individually)</li>
-  <li><pr>678</pr>Experimental Kotlin and Java DSL for programmatic test plan generation (see <a href="usermanual/build-programmatic-test-plan.html#treebuilder_kotlin_dsl">Creating a plan with Kotlin DSL</a>)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
-  <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
-  <li><pr>5710</pr>Add GitHub Issue templates</li>
-  <li><pr>5910</pr>Use Caffeine for caching customizers in TestBeanGUI instead of commons-collections4 LRUMap</li>
-  <li><pr>5713</pr><pr>5931</pr>Update Spock to 2.3-groovy-3.0 (from 2.1-groovy-3.0)</li>
-  <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
-  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default</li>
-  <li><pr>5924</pr>Update Apache commons-io to 2.12.0 (from 2.11.0)</li>
-  <li><pr>5921</pr>Update Jackson Core to 2.15.1 (from 2.13.3)</li>
-  <li><pr>5921</pr>Update Jackson Databind to 2.15.1 (from 2.13.3)</li>
-  <li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
-  <li><pr>5725</pr>Update JSoup to 1.16.1 (from 1.15.1)</li>
-  <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
-  <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
-  <li><pr>5763</pr><pr>5814</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
-  <li><pr>5854</pr>Added Apache Httpclient5 5.1.3</li>
-  <li><pr>5833</pr>Update Apache Freemarker to 2.3.32 (from 2.3.31)</li>
-  <li><pr>5830</pr>Update Apache Groovy to 3.0.17 (from 3.0.11)</li>
-  <li><pr>5862</pr>Update Apache Httpclient to 4.5.14 (from 4.5.13)</li>
-  <li><pr>5880</pr>Update Apache Xalan to 2.7.3 (from 2.7.2)</li>
-  <li><pr>5854</pr>Update Saxon-HE to 11.5 (from 11.5)</li>
-  <li><pr>5840</pr><pr>5930</pr>Update accessors-smart to 2.4.11 (from 2.4.8)</li>
-  <li><pr>5837</pr>Update asm to 9.5 (from 9.3)</li>
-  <li><pr>5840</pr><pr>5930</pr>Update json-smart to 2.4.11 (from 2.4.8)</li>
-  <li><pr>5814</pr>Update kotlin-stdlib to 1.8.21 (from 1.6.21)</li>
-  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-core to 1.8.21 (from 1.6.21)</li>
-  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-swing to 1.8.21 (from 1.6.21)</li>
-  <li><pr>5907</pr>Update lets-plot-batik to 3.2.0 (from 2.1.1)</li>
-  <li><pr>5907</pr>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
-  <li><pr>5859</pr>Update log4j-1.2-api to 2.20.0 (from 2.17.2)</li>
-  <li><pr>5859</pr>Update log4j-api to 2.20.0 (from 2.17.2)</li>
-  <li><pr>5859</pr>Update log4j-core to 2.20.0 (from 2.17.2)</li>
-  <li><pr>5859</pr>Update log4j-slf4j-impl to 2.20.0 (from 2.17.2)</li>
-  <li><pr>5861</pr>Update neo4j-java-driver to 4.4.11 (from 4.4.6)</li>
-  <li><pr>5853</pr>Update org.jetbrains:annotations to 24.0.1 (from 23.0.0)</li>
-  <li><pr>5868</pr><pr>5886</pr>Update ph-commons to 10.2.4 (from 10.1.6)</li>
-  <li><pr>5861</pr>Update reactive-streams to 1.0.4 (from 1.0.3)</li>
-  <li><pr>5847</pr>Update rsyntaxtextarea to 3.3.3 (from 3.2.0)</li>
-  <li><pr>5839</pr>Update svgSalamander to 1.1.4 (from 1.1.2.4)</li>
-  <li><pr>5852</pr>Update xmlgraphics-commons to 2.8 (from 2.7)</li>
-  <li><pr>5854</pr>Update xmlresolver to 4.6.4 (from 4.2.0)</li>
-  <li><pr>693</pr>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
-  <li><pr>5960</pr>Add OpenJDK JMH for creating microbenchmarks in JMeter code</li>
-  <li><issue>5961</issue>Deprecate TestElement.threadName as it is not related to TestElement</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -178,13 +109,10 @@ Summary
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
-  <li><pr>5901</pr>Fix NumberFormatException when counter is empty or not a digit on Proxy Settings panel</li>
-  <li><pr>5987</pr><issue>4546</issue>Encode unicode characters in filenames when sending files in HTTP Sampler</li>
 </ul>
 
 <h3>Other Samplers</h3>
 <ul>
-  <li><pr>5736</pr><issue>5733</issue>Allow <code>SampleResult#setEndTime</code> be set in <code>JSR223Sampler</code></li>
 </ul>
 
 <h3>Controllers</h3>
@@ -193,17 +121,10 @@ Summary
 
 <h3>Listeners</h3>
 <ul>
-  <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
-  <li><issue>5807</issue>Fix an <code>ArrayIndexOutOfBoundsException</code> on HTTP parameters line on special case when key and value are empty,
-    i.e.: "<code>k1=v1&amp;&#61;&amp;k2=v2</code>"</li>
-  <li><issue>5654</issue><pr>5785</pr> Fix <code>InfluxDBRawBackendListenerClient</code> missing data. Allow InfluxDB to insert multiple entries with the
-    same <code>timestamp</code> but with different <code>threadName</code>. Contributed by Victor Peralta (vperaltac at github)</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
-  <li><pr>5717</pr>Add jsonpath string to JSON Path Assertion error message so the error is easier to understand</li>
-  <li><pr>723</pr>Use correct number format on JSON Path Assertion. Contributed by andreaslind01 (andreaslind01 at gmail.com)</li>
 </ul>
 
 <h3>Functions</h3>
@@ -216,24 +137,14 @@ Summary
 
 <h3>Report / Dashboard</h3>
 <ul>
-  <li><bug>66140</bug>Guess the delimiter of the CSV source, when configured one seems wrong.
-    This is in line with the behaviour of CSVSaveService.</li>
 </ul>
 
 <h3>Documentation</h3>
 <ul>
-  <li><issue>5694</issue>Document changed formatter for <funclink name="__time()"/>. A warning will be logged,
-  if the code <code>u</code> is found in the format string, as the meaning for that code has changed from <em>day-of-week</em>
-  to <em>year</em>.</li>
 </ul>
 
 <h3>General</h3>
 <ul>
-  <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
-  <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
-  <li><pr>693</pr>Avoid wrong results when <code>Object.hashCode()</code> happen to collide. Use <code>IdentityHashMap</code> instead of <code>HashMap</code> when key is <code>TestElement</code></li>
-  <li>Refresh UI when dragging JMeter window from one monitor to another, so rich syntax text areas are properly editable after window movement</li>
-  <li><pr>5984</pr><code>AbstractTestElement#clone</code> might produce non-identical clones if element constructor adds a non-default property value</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -242,21 +153,6 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
-  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
-  <li>Andreas Lind, <a href="https://github.com/andreaslind01">@andreaslind01</a></li>
-  <li>Arnout Engelen, <a href="https://github.com/raboof">@raboof</a></li>
-  <li>Clay Johnson, <a href="https://github.com/clayburn">@clayburn</a></li>
-  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
-  <li>Kai Lehmann, <a href="https://github.com/lehmannk">@lehmannk</a></li>
-  <li>kaola89, <a href="https://github.com/kaola89">@kaola89</a></li>
-  <li>Matt Tansley, <a href="https://github.com/matthewt-assurity">@matthewt-assurity</a></li>
-  <li>Mohamed Ibrahim, <a href="https://github.com/rollno748">@rollno748</a></li>
-  <li>Ori Marko, <a href="https://github.com/orimarko">@orimarko</a></li>
-  <li>PJ Fanning, <a href="https://github.com/pjfanning">@pjfanning</a></li>
-  <li>Sandra Thieme, <a href="https://github.com/sandra-thieme">@sandra-thieme</a></li>
-  <li>Stefan Seide, <a href="https://github.com/sseide">@sseide</a></li>
-  <li>Victor Peralta, <a href="https://github.com/vperaltac">@vperaltac</a></li>
-  <li>Vincent DABURON, <a href="https://github.com/vdaburon">@vdaburon</a></li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index bff95888506..777dd2e9d28 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -42,6 +42,294 @@ Current changes are detailed in <a href="changes.html">Changes</a>.
 <p><b>Changes sections are chronologically ordered from top (most recent) to bottom
 (least recent)</b></p>
 
+<!--  =================== 5.6 =================== -->
+
+<h1>Version 5.6</h1>
+<p>
+Summary
+</p>
+<ul>
+<li><a href="#New and Noteworthy">New and Noteworthy</a></li>
+<li><a href="#Incompatible changes">Incompatible changes</a></li>
+<li><a href="#Bug fixes">Bug fixes</a></li>
+<li><a href="#Improvements">Improvements</a></li>
+<li><a href="#Non-functional changes">Non-functional changes</a></li>
+<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
+<li><a href="#Thanks">Thanks</a></li>
+
+</ul>
+
+<ch_section>New and Noteworthy</ch_section>
+
+<ch_section>Improvements</ch_section>
+
+<h3>Thread Groups</h3>
+<ul>
+<li><issue>5682</issue><pr>717</pr> Open Model Thread Group: avoid skipping rows from CSV Data Set Config</li>
+  <li>Support custom thread group implementations in "Add think time" and "Save as test fragment" actions</li>
+  <li>Open Model Thread Group: interrupt pending HTTP requests and other <code>Interruptible</code> test elements on test stop</li>
+</ul>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><pr>5911</pr> Use Caffeine for caching HTTP headers instead of commons-collections4 LRUMap</li>
+  <li><pr>5947</pr> Fetch resources referenced in <code>&lt;link "rel"="preload"...&gt;</code> elements</li>
+  <li><pr>5869</pr> Allow more templates to format sampler names in the recorder: <code>#{url}</code>, <code>#{method}</code>, <code>#{scheme}</code>, <code>#{host}</code>, <code>#{port}</code></li>
+</ul>
+
+<h3>Other samplers</h3>
+<ul>
+  <li><pr>5909</pr> Use Caffeine for caching compiled scripts in JSR223 samplers instead of commons-collections4 LRUMap</li>
+</ul>
+
+<h3>General</h3>
+<ul>
+  <li><pr>5792</pr>Add KeyStroke for start_no_timers (Start no pauses: CRTL+SHIFT+n)</li>
+  <li><pr>5899</pr>Speed up CPU-bound tests by skipping <code>recoverRunningVersion</code> for elements that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
+  <li><pr>5914</pr>Use <code>Locale.ROOT</code> instead of default locale for <code>toUpperCase</code>, and <code>toLowerCase</code> to avoid surprises with dotless I in <code>tr_TR</code> locale</li>
+  <li><pr>5885</pr>Use Java's <code>ServiceLoader</code> for loading plugins instead of classpath scanning. It enables faster startup</li>
+  <li><pr>5788</pr><code>FunctionProperty</code> no longer caches the value.
+    Previously it cached the values based on iteration number only which triggered wrong results on concurrent executions.
+    The previous behavior can be temporary restored with <code>function.cache.per.iteration</code> property.
+  </li>
+  <li><pr>5920</pr>Improve HTTP HeaderManager performance when it contains many headers: skip reinitialization on each iteration</li>
+  <li><pr>5920</pr>Use AtomicInteger and AtomicLong instead of synchronized primitives for JMeterContextService#numberOfThreads</li>
+  <li><pr>5920</pr>Cache bean properties in <code>TestBeanHelper</code> and avoid synchronization, so test plans with <code>TestBean</code>-based elements is faster</li>
+  <li><pr>5920</pr>Improve computation when many threads actively produce samplers by using <code>LongAdder</code> and similar concurrency classes to avoid synchronization in <code>Calculator</code></li>
+  <li><pr>5920</pr>Reduce synchronization contention on <code>AbstractTestElement</code> that are shared between threads (the ones that implement <code>NoThreadClone</code>)</li>
+  <li><pr>5934</pr>Added caching for date formatters for <code>__time</code> function</li>
+  <li><pr>710</pr><issue>5666</issue>Added Shortcut key event for Reset search: <code>ctrl + alt + F</code>, <code>cmd + alt + F</code></li>
+  <li><pr>5959</pr><code>TestElement</code> has been migrated to Kotlin, so nullable types are annotated better</li>
+  <li><pr>5944</pr>Add PI for declaring <code>TestElement</code> schemas so element properties are easier to access in code (see <code>TestElementSchema</code>, <code>TestElement#getSchema()</code>, <code>TestElement#getProps()</code>)</li>
+  <li><pr>5944</pr>Enable usage of <code>${...}</code> expressions for checkbox controls (see context menus for checkboxes, however, the individual components should be adapted individually)</li>
+  <li><pr>678</pr>Experimental Kotlin and Java DSL for programmatic test plan generation (see <a href="usermanual/build-programmatic-test-plan.html#treebuilder_kotlin_dsl">Creating a plan with Kotlin DSL</a>)</li>
+</ul>
+
+<ch_section>Non-functional changes</ch_section>
+<ul>
+  <li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
+  <li><pr>5710</pr>Add GitHub Issue templates</li>
+  <li><pr>5910</pr>Use Caffeine for caching customizers in TestBeanGUI instead of commons-collections4 LRUMap</li>
+  <li><pr>5713</pr><pr>5931</pr>Update Spock to 2.3-groovy-3.0 (from 2.1-groovy-3.0)</li>
+  <li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
+  <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default</li>
+  <li><pr>5924</pr>Update Apache commons-io to 2.12.0 (from 2.11.0)</li>
+  <li><pr>5921</pr>Update Jackson Core to 2.15.1 (from 2.13.3)</li>
+  <li><pr>5921</pr>Update Jackson Databind to 2.15.1 (from 2.13.3)</li>
+  <li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+  <li><pr>5725</pr>Update JSoup to 1.16.1 (from 1.15.1)</li>
+  <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
+  <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
+  <li><pr>5763</pr><pr>5814</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
+  <li><pr>5854</pr>Added Apache Httpclient5 5.1.3</li>
+  <li><pr>5833</pr>Update Apache Freemarker to 2.3.32 (from 2.3.31)</li>
+  <li><pr>5830</pr>Update Apache Groovy to 3.0.17 (from 3.0.11)</li>
+  <li><pr>5862</pr>Update Apache Httpclient to 4.5.14 (from 4.5.13)</li>
+  <li><pr>5880</pr>Update Apache Xalan to 2.7.3 (from 2.7.2)</li>
+  <li><pr>5854</pr>Update Saxon-HE to 11.5 (from 11.5)</li>
+  <li><pr>5840</pr><pr>5930</pr>Update accessors-smart to 2.4.11 (from 2.4.8)</li>
+  <li><pr>5837</pr>Update asm to 9.5 (from 9.3)</li>
+  <li><pr>5840</pr><pr>5930</pr>Update json-smart to 2.4.11 (from 2.4.8)</li>
+  <li><pr>5814</pr>Update kotlin-stdlib to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-core to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5889</pr><pr>5918</pr><pr>5814</pr>Update kotlinx-coroutines-swing to 1.8.21 (from 1.6.21)</li>
+  <li><pr>5907</pr>Update lets-plot-batik to 3.2.0 (from 2.1.1)</li>
+  <li><pr>5907</pr>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
+  <li><pr>5859</pr>Update log4j-1.2-api to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-api to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-core to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5859</pr>Update log4j-slf4j-impl to 2.20.0 (from 2.17.2)</li>
+  <li><pr>5861</pr>Update neo4j-java-driver to 4.4.11 (from 4.4.6)</li>
+  <li><pr>5853</pr>Update org.jetbrains:annotations to 24.0.1 (from 23.0.0)</li>
+  <li><pr>5868</pr><pr>5886</pr>Update ph-commons to 10.2.4 (from 10.1.6)</li>
+  <li><pr>5861</pr>Update reactive-streams to 1.0.4 (from 1.0.3)</li>
+  <li><pr>5847</pr>Update rsyntaxtextarea to 3.3.3 (from 3.2.0)</li>
+  <li><pr>5839</pr>Update svgSalamander to 1.1.4 (from 1.1.2.4)</li>
+  <li><pr>5852</pr>Update xmlgraphics-commons to 2.8 (from 2.7)</li>
+  <li><pr>5854</pr>Update xmlresolver to 4.6.4 (from 4.2.0)</li>
+  <li><pr>693</pr>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
+  <li><pr>5960</pr>Add OpenJDK JMH for creating microbenchmarks in JMeter code</li>
+  <li><issue>5961</issue>Deprecate TestElement.threadName as it is not related to TestElement</li>
+</ul>
+
+ <!-- =================== Bug fixes =================== -->
+
+<ch_section>Bug fixes</ch_section>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><pr>5901</pr>Fix NumberFormatException when counter is empty or not a digit on Proxy Settings panel</li>
+  <li><pr>5987</pr><issue>4546</issue>Encode unicode characters in filenames when sending files in HTTP Sampler</li>
+</ul>
+
+<h3>Other Samplers</h3>
+<ul>
+  <li><pr>5736</pr><issue>5733</issue>Allow <code>SampleResult#setEndTime</code> be set in <code>JSR223Sampler</code></li>
+</ul>
+
+<h3>Listeners</h3>
+<ul>
+  <li><issue>5740</issue><pr>5741</pr>Fix Aggregated Graph component to cope with empty names of samplers</li>
+  <li><issue>5807</issue>Fix an <code>ArrayIndexOutOfBoundsException</code> on HTTP parameters line on special case when key and value are empty,
+    i.e.: "<code>k1=v1&amp;&#61;&amp;k2=v2</code>"</li>
+  <li><issue>5654</issue><pr>5785</pr> Fix <code>InfluxDBRawBackendListenerClient</code> missing data. Allow InfluxDB to insert multiple entries with the
+    same <code>timestamp</code> but with different <code>threadName</code>. Contributed by Victor Peralta (vperaltac at github)</li>
+</ul>
+
+<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+<ul>
+  <li><pr>5717</pr>Add jsonpath string to JSON Path Assertion error message so the error is easier to understand</li>
+  <li><pr>723</pr>Use correct number format on JSON Path Assertion. Contributed by andreaslind01 (andreaslind01 at gmail.com)</li>
+</ul>
+
+<h3>Report / Dashboard</h3>
+<ul>
+  <li><bug>66140</bug>Guess the delimiter of the CSV source, when configured one seems wrong.
+    This is in line with the behaviour of CSVSaveService.</li>
+</ul>
+
+<h3>Documentation</h3>
+<ul>
+  <li><issue>5694</issue>Document changed formatter for <funclink name="__time()"/>. A warning will be logged,
+  if the code <code>u</code> is found in the format string, as the meaning for that code has changed from <em>day-of-week</em>
+  to <em>year</em>.</li>
+</ul>
+
+<h3>General</h3>
+<ul>
+  <li><bug>66157</bug><pr>719</pr>Correct theme for darklaf on rsyntaxtextarea</li>
+  <li><issue>5872</issue><pr>5874</pr>Trim name in Argument objects.</li>
+  <li><pr>693</pr>Avoid wrong results when <code>Object.hashCode()</code> happen to collide. Use <code>IdentityHashMap</code> instead of <code>HashMap</code> when key is <code>TestElement</code></li>
+  <li>Refresh UI when dragging JMeter window from one monitor to another, so rich syntax text areas are properly editable after window movement</li>
+  <li><pr>5984</pr><code>AbstractTestElement#clone</code> might produce non-identical clones if element constructor adds a non-default property value</li>
+</ul>
+
+ <!--  =================== Thanks =================== -->
+
+<ch_section>Thanks</ch_section>
+<p>We thank all contributors mentioned in bug and improvement sections above:
+</p>
+<ul>
+  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
+  <li>Andreas Lind, <a href="https://github.com/andreaslind01">@andreaslind01</a></li>
+  <li>Arnout Engelen, <a href="https://github.com/raboof">@raboof</a></li>
+  <li>Clay Johnson, <a href="https://github.com/clayburn">@clayburn</a></li>
+  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
+  <li>Kai Lehmann, <a href="https://github.com/lehmannk">@lehmannk</a></li>
+  <li>kaola89, <a href="https://github.com/kaola89">@kaola89</a></li>
+  <li>Matt Tansley, <a href="https://github.com/matthewt-assurity">@matthewt-assurity</a></li>
+  <li>Mohamed Ibrahim, <a href="https://github.com/rollno748">@rollno748</a></li>
+  <li>Ori Marko, <a href="https://github.com/orimarko">@orimarko</a></li>
+  <li>PJ Fanning, <a href="https://github.com/pjfanning">@pjfanning</a></li>
+  <li>Sandra Thieme, <a href="https://github.com/sandra-thieme">@sandra-thieme</a></li>
+  <li>Stefan Seide, <a href="https://github.com/sseide">@sseide</a></li>
+  <li>Victor Peralta, <a href="https://github.com/vperaltac">@vperaltac</a></li>
+  <li>Vincent DABURON, <a href="https://github.com/vdaburon">@vdaburon</a></li>
+</ul>
+<p>We also thank bug reporters who helped us improve JMeter.</p>
+<ul>
+</ul>
+<p>
+Apologies if we have omitted anyone else.
+</p>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
+
+<ch_section>Known problems and workarounds</ch_section>
+<ul>
+  <li><pr>5987</pr>HTTP sampler sends filenames with percent-encoded UTF-8, however it is not aligned with the browsers. The workaround is to refrain non-ASCII filenames</li>
+
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
+
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
+popd
+export JVM_ARGS="--module-path $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
+
+</ul>
+
 <!--  =================== 5.5 =================== -->
 
 <h1>Version 5.5</h1>

From ddb75f6749ea59be58445407a9dd032ad2e7995e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Jun 2023 14:49:29 +0300
Subject: [PATCH 0563/1037] docs: add release-drafter for populating GitHub
 releases info based on the PRs

---
 .github/release-drafter.yml           | 75 +++++++++++++++++++++++++++
 .github/workflows/release-drafter.yml | 27 ++++++++++
 xdocs/changes.xml                     |  1 +
 3 files changed, 103 insertions(+)
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/workflows/release-drafter.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 00000000000..92d20e03fe4
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,75 @@
+# See https://github.com/release-drafter/release-drafter#configuration-options
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+# Filter previous releases to consider only those with the target matching the current branch
+filter-by-commitish: true
+tag-prefix: REL
+exclude-labels:
+  - 'skip-changelog'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+      - 'defect'
+  - title: '📝 Documentation'
+    labels:
+      - 'documentation'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+  - title: '⬆️ Dependencies'
+    collapse-after: 8
+    labels:
+      - 'dependencies'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES
+# See https://github.com/release-drafter/release-drafter#autolabeler
+# This is more like a reference, since auto-labelling PRs seems to require too much privileges
+autolabeler:
+  - label: 'dependencies'
+    files:
+      - 'gradle-wrapper.properties'
+    title:
+      - '/^fix\(deps\)/i'
+      - '/^chore:\s*bump/i'
+  - label: 'chore'
+    files:
+      - '*gradle*'
+    branch:
+      - '/docs{0,1}\/.+/'
+    title:
+      - '/^chore/i'
+  - label: 'documentation'
+    files:
+      - '*.md'
+      - 'docs/**'
+  - label: 'bug'
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/^fix/i'
+  - label: 'enhancement'
+    branch:
+      - '/feature\/.+/'
+    title:
+      - '/^feat/i'
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000000..e6905e48f32
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,27 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+      - 'release/**'
+  # pull_request_target allows PR from forks to access secrets, so please NEVER add pull_request_target
+
+jobs:
+  update_release_draft:
+    # Skip release drafts in forks
+    if: github.repository_owner == 'apache'
+    name: Update Release Draft
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - name: Update release body draft
+        uses: release-drafter/release-drafter@569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e # v5
+        id: prepare_release
+        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+        with:
+        #   config-name: my-config.yml
+           disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 63a3ff9f61e..799b20e8a8f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -101,6 +101,7 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+  <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 367041330291ad5cfc5a0979b339ac5faba277e0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Jun 2023 16:59:10 +0300
Subject: [PATCH 0564/1037] chore: ASF uses rel/v... tags instead of v...

---
 .github/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 92d20e03fe4..f6010e0a3e6 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,6 +1,6 @@
 # See https://github.com/release-drafter/release-drafter#configuration-options
 name-template: 'v$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
+tag-template: 'rel/v$RESOLVED_VERSION'
 # Filter previous releases to consider only those with the target matching the current branch
 filter-by-commitish: true
 tag-prefix: REL

From 1ee08f4e28d597715783c2766fb8a73f527ea60b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 17 Jun 2023 14:28:54 +0300
Subject: [PATCH 0565/1037] chore: use Gradle toolchains for JDK provisioning

It enables automatic JDK provisioning (e.g. download), and it enables
using different JDKs for executing Gradle and for building JMeter

Java version can be specified when building with -PjdkVersion=11

You could use ./gradlew -q javaToolchains to list the detected toolchains.

See https://docs.gradle.org/8.0/userguide/toolchains.html#sec:consuming

Fixes https://github.com/apache/jmeter/issues/5986
---
 .github/workflows/main.yml                    | 18 +++++++-
 .github/workflows/matrix.js                   | 29 +++++++++----
 .github/workflows/matrix_builder.js           | 23 ++++++++---
 README.md                                     | 18 +++++++-
 build-logic/basics/build.gradle.kts           |  4 ++
 .../src/main/kotlin/ToolchainProperties.kt    | 37 +++++++++++++++++
 .../src/main/kotlin/configureToolchain.kt     | 41 +++++++++++++++++++
 build-logic/build-parameters/build.gradle.kts | 29 +++++++++++++
 .../main/kotlin/build-logic.groovy.gradle.kts | 12 ++++++
 .../main/kotlin/build-logic.java.gradle.kts   | 23 +++++++++--
 .../main/kotlin/build-logic.kotlin.gradle.kts | 18 +++++++-
 .../kotlin/build-logic.test-base.gradle.kts   | 27 +++++++++---
 .../kotlin/build-logic.root-build.gradle.kts  |  6 +++
 .../build-logic.checkerframework.gradle.kts   |  6 +--
 .../main/kotlin/build-logic.style.gradle.kts  |  2 +-
 gradle.md                                     |  2 +-
 settings.gradle.kts                           |  5 +++
 src/bom-testing/build.gradle.kts              |  1 +
 src/components/build.gradle.kts               | 21 +---------
 src/dist/build.gradle.kts                     |  3 ++
 xdocs/changes.xml                             |  1 +
 21 files changed, 274 insertions(+), 52 deletions(-)
 create mode 100644 build-logic/basics/src/main/kotlin/ToolchainProperties.kt
 create mode 100644 build-logic/basics/src/main/kotlin/configureToolchain.kt

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b25c8a08a27..7577181def8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,10 +46,19 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 50
-    - name: Set up Java ${{ matrix.java_version }}, ${{ matrix.java_distribution }}
+    - name: Set up Java ${{ matrix.java_version }}, oracle
+      if: ${{ matrix.oracle_java_website != '' }}
+      uses: oracle-actions/setup-java@1611a647972adb8b04779be3529a044d650fd510 # v1
+      with:
+        website: ${{ matrix.oracle_java_website }}
+        release: ${{ matrix.java_version }}
+    - name: Set up Java 17 and ${{ matrix.non_ea_java_version }}, ${{ matrix.java_distribution }}
       uses: actions/setup-java@v3
       with:
-        java-version: ${{ matrix.java_version }}
+        # The latest one will be the default, so we use Java 17 for launching Gradle
+        java-version: |
+          ${{ matrix.non_ea_java_version }}
+          17
         distribution: ${{ matrix.java_distribution }}
         architecture: x64
     - name: Steps to reproduce
@@ -68,6 +77,11 @@ jobs:
         properties: |
           testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}
           testDisableCaching=${{ matrix.testDisableCaching }}
+          jdkBuildVersion=17
+          jdkTestVersion=${{ matrix.java_version }}
+          jdkTestVendor=${{ matrix.java_vendor }}
+          # We provision JDKs with GitHub Actions for caching purposes, so Gradle should rather fail in case JDK is not found
+          org.gradle.java.installations.auto-download=false
       env:
         _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 20c32abeb71..1a75468db36 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -8,16 +8,18 @@ const matrix = new MatrixBuilder();
 matrix.addAxis({
   name: 'java_distribution',
   values: [
-    {value: 'corretto', weight: 1},
-    {value: 'liberica', weight: 1},
-    {value: 'microsoft', weight: 1},
-    {value: 'oracle', weight: 1},
-    {value: 'semeru', weight: 4},
-    {value: 'temurin', weight: 1},
-    {value: 'zulu', weight: 1},
+    {value: 'corretto', vendor: 'amazon', weight: 1},
+    {value: 'liberica', vendor: 'bellsoft', weight: 1},
+    {value: 'microsoft', vendor: 'microsoft', weight: 1},
+    {value: 'oracle', vendor: 'oracle', weight: 1},
+    {value: 'semeru', vendor: 'ibm', weight: 4},
+    {value: 'temurin', vendor: 'eclipse', weight: 1},
+    {value: 'zulu', vendor: 'azul', weight: 1},
   ]
 });
 
+const eaJava = '21';
+
 matrix.addAxis({
   name: 'java_version',
   // Strings allow versions like 18-ea
@@ -25,6 +27,7 @@ matrix.addAxis({
     '8',
     '11',
     '17',
+    eaJava,
   ]
 });
 
@@ -74,10 +77,13 @@ matrix.setNamePattern(['java_version', 'java_distribution', 'hash', 'os', 'tz',
 
 // Semeru uses OpenJ9 jit which has no option for making hash codes the same
 matrix.exclude({java_distribution: {value: 'semeru'}, hash: {value: 'same'}});
+// Semeru 8 fails when Semeru 17 is on the PATH (we use 17 for build)
+matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '8'});
 // Microsoft Java has no distribution for 8
 matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
 // Oracle JDK is only supported for JDK 17 and later
 matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']});
+matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
 // Ensure at least one job with "same" hashcode exists
 matrix.generateRow({hash: {value: 'same'}});
 // Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)
@@ -90,6 +96,8 @@ matrix.generateRow({java_version: "8"});
 matrix.generateRow({java_version: "11"});
 // Ensure there will be at least one job with Java 17
 matrix.generateRow({java_version: "17"});
+// Ensure there will be at least one job with Java EA
+matrix.generateRow({java_version: eaJava});
 const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
 if (include.length === 0) {
   throw new Error('Matrix list is empty');
@@ -124,9 +132,14 @@ include.forEach(v => {
   jvmArgs.push(`-Duser.country=${v.locale.country}`);
   jvmArgs.push(`-Duser.language=${v.locale.language}`);
   v.java_distribution = v.java_distribution.value;
+  v.java_vendor = v.java_distribution.vendor;
+  if (v.java_distribution === 'oracle') {
+      v.oracle_java_website = v.java_version === eaJava ? 'jdk.java.net' : 'oracle.com';
+  }
+  v.non_ea_java_version = v.java_version === eaJava ? '' : v.java_version;
   if (v.java_distribution !== 'semeru' && Math.random() > 0.5) {
     // The following options randomize instruction selection in JIT compiler
-    // so it might reveal missing synchronization in TestNG code
+    // so it might reveal missing synchronization
     v.name += ', stress JIT';
     v.testDisableCaching = 'JIT randomization should not be cached';
     jvmArgs.push('-XX:+UnlockDiagnosticVMOptions');
diff --git a/.github/workflows/matrix_builder.js b/.github/workflows/matrix_builder.js
index fd765117e8b..0c17190eded 100644
--- a/.github/workflows/matrix_builder.js
+++ b/.github/workflows/matrix_builder.js
@@ -18,7 +18,7 @@ class Axis {
     }
     if (Array.isArray(filter)) {
       // e.g. row={os: 'windows'}; filter=[{os: 'linux'}, {os: 'linux'}]
-      return filter.find(v => Axis.matches(row, v));
+      return filter.some(v => Axis.matches(row, v));
     }
     if (typeof filter === 'object') {
       // e.g. row={jdk: {name: 'openjdk', version: 8}}; filter={jdk: {version: 8}}
@@ -68,6 +68,7 @@ class MatrixBuilder {
     this.duplicates = {};
     this.excludes = [];
     this.includes = [];
+    this.implications = [];
     this.failOnUnsatisfiableFilters = false;
   }
 
@@ -80,13 +81,23 @@ class MatrixBuilder {
   }
 
   /**
-   * Specifies exclude filter (e.g. exclude a forbidden combination)
+   * Specifies exclude filter (e.g. exclude a forbidden combination).
    * @param filter
    */
   exclude(filter) {
     this.excludes.push(filter);
   }
 
+  /**
+   * Adds implication like `antecedent -> consequent`.
+   * In other words, if `antecedent` holds, then `consequent` must also hold.
+   * @param antecedent
+   * @param consequent
+   */
+  imply(antecedent, consequent) {
+    this.implications.push({antecedent: antecedent, consequent: consequent});
+  }
+
   addAxis({name, title, values}) {
     const axis = new Axis({name, title, values});
     this.axes.push(axis);
@@ -104,8 +115,10 @@ class MatrixBuilder {
    * @returns {boolean}
    */
   matches(row) {
-    return (this.excludes.length === 0 || !this.excludes.find(f => Axis.matches(row, f))) &&
-           (this.includes.length === 0 || this.includes.find(f => Axis.matches(row, f)));
+    return (this.excludes.length === 0 || !this.excludes.some(f => Axis.matches(row, f))) &&
+           (this.includes.length === 0 || this.includes.some(f => Axis.matches(row, f))) &&
+           (this.implications.length === 0 || (
+               this.implications.every(i => !Axis.matches(row, i.antecedent) || Axis.matches(row, i.consequent))));
   }
 
   failOnUnsatisfiableFilters(value) {
@@ -125,7 +138,7 @@ class MatrixBuilder {
     let res;
     if (filter) {
       // If matching row already exists, no need to generate more
-      res = this.rows.find(v => Axis.matches(v, filter));
+      res = this.rows.some(v => Axis.matches(v, filter));
       if (res) {
         return res;
       }
diff --git a/README.md b/README.md
index 1255834304f..711bc5f9b95 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,12 @@ systemProp.https.proxyPassword=your_password
 
 ### Test builds
 
-JMeter is built using Gradle.
+JMeter is built using Gradle, and it uses [Gradle's Toolchains for JVM projects](https://docs.gradle.org/current/userguide/toolchains.html)
+for provisioning JDKs. It means the code would search for the needed JDKs locally, or download them
+if they are not found.
+
+By default, the code would use JDK 17 for build purposes, however it would set the target release to 8,
+so the resulting artifacts would be compatible with Java 8.
 
 The following command builds and tests JMeter:
 
@@ -183,6 +188,15 @@ The following command builds and tests JMeter:
 ./gradlew build
 ```
 
+If you want to use a custom JDK for building you can set `-PjdkBuildVersion=11`,
+and you can select `-PjdkTestVersion=21` if you want to use a different JDK for testing.
+
+You can list the available build parameters by executing
+
+```sh
+./gradlew parameters
+```
+
 If the system does not have a GUI display then:
 
 ```sh
@@ -196,7 +210,7 @@ The following command would compile the application and enable you to run `jmete
 from the `bin` directory.
 
 > **Note** that it completely refreshes `lib/` contents,
-so it would remove custom plugins should you have them installed.
+so it would remove custom plugins should you have them installed to `lib/`. However, it would keep `lib/ext/` plugins intact.
 
 ```sh
 ./gradlew createDist
diff --git a/build-logic/basics/build.gradle.kts b/build-logic/basics/build.gradle.kts
index d8c115622bb..a6dfaea5899 100644
--- a/build-logic/basics/build.gradle.kts
+++ b/build-logic/basics/build.gradle.kts
@@ -18,3 +18,7 @@
 plugins {
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
+
+dependencies {
+    api(projects.buildParameters)
+}
diff --git a/build-logic/basics/src/main/kotlin/ToolchainProperties.kt b/build-logic/basics/src/main/kotlin/ToolchainProperties.kt
new file mode 100644
index 00000000000..d5b0c201e34
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/ToolchainProperties.kt
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import buildparameters.BuildParametersExtension
+import org.gradle.api.JavaVersion
+
+class ToolchainProperties(
+    val version: Int,
+    val vendor: String?,
+    val implementation: String?,
+)
+
+val BuildParametersExtension.buildJdk: ToolchainProperties?
+    get() = jdkBuildVersion.takeIf { it != 0 }
+        ?.let { ToolchainProperties(it, jdkBuildVendor.orNull, jdkBuildImplementation.orNull) }
+
+val BuildParametersExtension.buildJdkVersion: Int
+    get() = buildJdk?.version ?: JavaVersion.current().majorVersion.toInt()
+
+val BuildParametersExtension.testJdk: ToolchainProperties?
+    get() = jdkTestVersion.orNull?.takeIf { it != 0 }
+        ?.let { ToolchainProperties(it, jdkTestVendor.orNull, jdkTestImplementation.orNull) }
+        ?: buildJdk
diff --git a/build-logic/basics/src/main/kotlin/configureToolchain.kt b/build-logic/basics/src/main/kotlin/configureToolchain.kt
new file mode 100644
index 00000000000..d797e7c4d6c
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/configureToolchain.kt
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.api.provider.Provider
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JavaLauncher
+import org.gradle.jvm.toolchain.JavaToolchainService
+import org.gradle.jvm.toolchain.JavaToolchainSpec
+import org.gradle.jvm.toolchain.JvmImplementation
+import org.gradle.jvm.toolchain.JvmVendorSpec
+
+fun JavaToolchainService.launcherFor(jdk: ToolchainProperties): Provider<JavaLauncher> = launcherFor {
+    configureToolchain(jdk)
+}
+
+fun JavaToolchainSpec.configureToolchain(jdk: ToolchainProperties?) {
+    if (jdk == null) {
+        return
+    }
+    languageVersion.set(JavaLanguageVersion.of(jdk.version))
+    jdk.vendor?.let {
+        vendor.set(JvmVendorSpec.matching(it))
+    }
+    if (jdk.implementation.equals("J9", ignoreCase = true)) {
+        implementation.set(JvmImplementation.J9)
+    }
+}
diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index b160323b603..bd0c6c6d803 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -29,10 +29,39 @@ buildParameters {
         defaultValue.set(true)
         description.set("Add mavenLocal() to repositories")
     }
+    bool("enableJavaFx") {
+        defaultValue.set(false)
+        description.set("Build and include classes that depend on JavaFX. Disabled by default since JavaFX is not included in the default Java distributions")
+    }
     bool("coverage") {
         defaultValue.set(false)
         description.set("Collect test coverage")
     }
+    integer("targetJavaVersion") {
+        defaultValue.set(8)
+        mandatory.set(true)
+        description.set("Java version for source and target compatibility")
+    }
+    integer("jdkBuildVersion") {
+        defaultValue.set(17)
+        mandatory.set(true)
+        description.set("JDK version to use for building JMeter. If the value is 0, then the current Java is used. (see https://docs.gradle.org/8.0/userguide/toolchains.html#sec:consuming)")
+    }
+    string("jdkBuildVendor") {
+        description.set("JDK vendor to use building JMeter (see https://docs.gradle.org/8.0/userguide/toolchains.html#sec:vendors)")
+    }
+    string("jdkBuildImplementation") {
+        description.set("Vendor-specific virtual machine implementation to use building JMeter (see https://docs.gradle.org/8.0/userguide/toolchains.html#selecting_toolchains_by_virtual_machine_implementation)")
+    }
+    integer("jdkTestVersion") {
+        description.set("JDK version to use for testing JMeter. If the value is 0, then the current Java is used. (see https://docs.gradle.org/8.0/userguide/toolchains.html#sec:consuming)")
+    }
+    string("jdkTestVendor") {
+        description.set("JDK vendor to use testing JMeter (see https://docs.gradle.org/8.0/userguide/toolchains.html#sec:vendors)")
+    }
+    string("jdkTestImplementation") {
+        description.set("Vendor-specific virtual machine implementation to use testing JMeter (see https://docs.gradle.org/8.0/userguide/toolchains.html#selecting_toolchains_by_virtual_machine_implementation)")
+    }
     bool("spotbugs") {
         defaultValue.set(false)
         description.set("Run SpotBugs verifications")
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
index 976a9a3cd81..1acd72cc948 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
@@ -15,8 +15,20 @@
  * limitations under the License.
  */
 
+import com.github.vlsi.gradle.dsl.configureEach
+
 plugins {
     id("java")
     id("groovy")
     id("build-logic.test-spock")
+    id("com.github.vlsi.gradle-extensions")
+    id("build-logic.build-params")
+}
+
+tasks.configureEach<GroovyCompile> {
+    buildParameters.testJdk?.let {
+        javaLauncher.convention(javaToolchains.launcherFor(it))
+    }
+    // Support jdk-release to configure the target Java release when compiling the bytecode
+    // See https://issues.apache.org/jira/browse/GROOVY-11105
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index df91b33dd10..01ad87f1dc8 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -33,8 +33,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        configureToolchain(buildParameters.buildJdk)
+    }
     consistentResolution {
         useCompileClasspathVersions()
     }
@@ -44,11 +45,25 @@ tasks.configureEach<JavaCompile> {
     // Use --release=8 for Java 10+ so the generated bytecode does not include methods introduced in Java 9+
     options.release.set(
         provider {
-            8.takeIf { javaCompiler.get().metadata.languageVersion.asInt() > 9 }
+            buildParameters.targetJavaVersion.takeIf {
+                javaCompiler.get().metadata.languageVersion.asInt() > 9
+            }
         }
     )
 }
 
+tasks.configureEach<JavaExec> {
+    buildParameters.testJdk?.let {
+        javaLauncher.convention(javaToolchains.launcherFor(it))
+    }
+}
+
+tasks.configureEach<Checkstyle> {
+    buildParameters.buildJdk?.let {
+        javaLauncher.convention(javaToolchains.launcherFor(it))
+    }
+}
+
 dependencies {
     findProject(":src:bom")?.let {
         api(platform(it))
@@ -116,7 +131,7 @@ tasks.configureEach<Javadoc> {
         val lastEditYear: String by rootProject.extra
         bottom =
             "Copyright &copy; 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
-        if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
+        if (buildParameters.buildJdkVersion > 8) {
             addBooleanOption("html5", true)
             links("https://docs.oracle.com/en/java/javase/11/docs/api/")
         } else {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 628bbda55e4..ca509a7c337 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("java-library")
+    id("build-logic.build-params")
     id("build-logic.java")
     id("build-logic.test-base")
     id("com.github.autostyle")
@@ -36,6 +37,9 @@ kotlin {
     if (props.bool("kotlin.explicitApi", default = true)) {
         explicitApi()
     }
+    jvmToolchain {
+        configureToolchain(buildParameters.buildJdk)
+    }
 }
 
 tasks.configureEach<KotlinCompile> {
@@ -44,7 +48,19 @@ tasks.configureEach<KotlinCompile> {
             apiVersion = "kotlin.api".v
         }
         freeCompilerArgs += "-Xjvm-default=all"
-        jvmTarget = java.targetCompatibility.toString()
+        val jdkRelease = buildParameters.targetJavaVersion.let {
+            when {
+                it < 9 -> "1.8"
+                else -> it.toString()
+            }
+        }
+        // jdk-release requires Java 9+
+        buildParameters.buildJdkVersion
+            .takeIf { it > 8 }
+            ?.let {
+                freeCompilerArgs += "-Xjdk-release=$jdkRelease"
+            }
+        kotlinOptions.jvmTarget = jdkRelease
     }
 }
 
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
index 1f92a9c96c2..830174dca29 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
@@ -17,13 +17,12 @@
 
 import com.github.vlsi.gradle.dsl.configureEach
 import com.github.vlsi.gradle.properties.dsl.props
-import org.gradle.api.JavaVersion
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.kotlin.dsl.project
 
 plugins {
     id("java-library")
+    id("build-logic.build-params")
 }
 
 dependencies {
@@ -37,6 +36,9 @@ tasks.configureEach<Test> {
         exceptionFormat = TestExceptionFormat.FULL
         showStandardStreams = true
     }
+    buildParameters.testJdk?.let {
+        javaLauncher.convention(javaToolchains.launcherFor(it))
+    }
     // Pass the property to tests
     fun passProperty(name: String, default: String? = null) {
         val value = System.getProperty(name) ?: default
@@ -57,9 +59,22 @@ tasks.configureEach<Test> {
     }
     passProperty("java.awt.headless")
     passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
-    // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
+    // Enable testing ByteBuddy with EA Java versions
+    passProperty("net.bytebuddy.experimental", "true")
+    // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively,
+    // So we pass --add-opens
     // See https://github.com/apache/jmeter/pull/5763
-    if (JavaVersion.current().isJava9Compatible) {
-        jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-    }
+    jvmArgumentProviders += AddOpensArgumentsProvider(javaLauncher.map { it.metadata.languageVersion })
+}
+
+class AddOpensArgumentsProvider(
+    @Input val javaLanguageVersion: Provider<JavaLanguageVersion>
+): CommandLineArgumentProvider {
+    override fun asArguments(): Iterable<String> =
+        if (javaLanguageVersion.get().asInt() <= 8) {
+            // Jave 1.8 does not need add-opens, so we omit it
+            listOf()
+        } else {
+            listOf("--add-opens=java.base/java.lang=ALL-UNNAMED")
+        }
 }
diff --git a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
index 7fcb96ff8d9..fd2f72337e9 100644
--- a/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
+++ b/build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts
@@ -66,3 +66,9 @@ if (buildParameters.coverage) {
         }
     }
 }
+
+tasks.register("parameters") {
+    group = HelpTasksPlugin.HELP_GROUP
+    description = "Displays the supported build parameters."
+    dependsOn(gradle.includedBuild("build-logic").task(":build-parameters:parameters"))
+}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index 1b682cd7472..88ac070c2ee 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import org.gradle.api.JavaVersion
 import org.gradle.kotlin.dsl.dependencies
 
 plugins {
+    id("build-logic.build-params")
     id("org.checkerframework")
 }
 
@@ -28,14 +28,14 @@ dependencies {
         ?.let {
             val checkerframeworkVersion = it.get()
             "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
-            if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+            if (buildParameters.buildJdkVersion == 8) {
                 // only needed for JDK 8
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
         val checkerframeworkVersion = "3.34.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
-        if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
             "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
         }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
index c36a060738c..fa56eaa38f4 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -28,7 +28,7 @@ if (!buildParameters.skipAutostyle) {
 
 val skipCheckstyle = buildParameters.skipCheckstyle || run {
     logger.info("Checkstyle requires Java 11+")
-    !JavaVersion.current().isJava11Compatible
+    buildParameters.buildJdkVersion < 11
 }
 
 if (!skipCheckstyle) {
diff --git a/gradle.md b/gradle.md
index 048b50580e2..24b0aed5e1d 100644
--- a/gradle.md
+++ b/gradle.md
@@ -24,7 +24,7 @@ Useful commands (`gw` comes from https://github.com/dougborg/gdub, otherwise `./
 ## List available build parameters
 
       # List all build parameters
-      gw :build-logic:build-parameters:parameters
+      gw parameters
 
 ## Cleaning build directories
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c613ef91bf..b28f8fce777 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,6 +27,7 @@ pluginManagement {
 plugins {
     id("com.gradle.enterprise") version "3.13.2"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 dependencyResolutionManagement {
@@ -164,6 +165,10 @@ val expectedSha512 = mapOf(
         to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
         to "okio-2.2.2.jar",
+    "B9F87DECE28EABCCEDA58C77C3B602AEAE7A8AEF3D30DA838F4924A620B18C05D9DF86C5876BDE8AB5597C8C0CE808AD083CAF89C3A5AAC60C1E980C6C144A17"
+        to "foojay-resolver-0.5.0.jar",
+    "10BF91C79AB151B684834E3CA8BA7D7E19742A3EEB580BDE690FBA433F9FFFE3ABBD79ED3FE3F97986C3A2BADC4D14E28835A8EF89167B4B9CC6014242338769"
+        to "gson-2.9.1.jar",
     settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()
         to "checksum-dependency-plugin.jar"
 )
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 272decda054..bd4ecf3265d 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.0")
         api("junit:junit:4.13.2")
+        api("net.bytebuddy:byte-buddy:1.14.5")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.6")
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 272bf4cdb1f..05a51f2efe5 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 plugins {
+    id("build-logic.build-params")
     id("build-logic.jvm-published-library")
 }
 
@@ -88,25 +89,7 @@ dependencies {
     testImplementation(testFixtures(projects.src.testkitWiremock))
 }
 
-fun String?.toBool(nullAs: Boolean, blankAs: Boolean, default: Boolean) =
-    when {
-        this == null -> nullAs
-        isBlank() -> blankAs
-        default -> !equals("false", ignoreCase = true)
-        else -> equals("true", ignoreCase = true)
-    }
-
-fun classExists(name: String) =
-    try {
-        Class.forName(name)
-        true
-    } catch (e: Throwable) {
-        false
-    }
-
-if (!(project.findProperty("enableJavaFx") as? String)
-    .toBool(nullAs = classExists("javafx.application.Platform"), blankAs = true, default = false)
-) {
+if (!buildParameters.enableJavaFx) {
     // JavaFX is not present in Maven Central, so exclude the file unless explicitly asked by
     // -PenableJavaFx
     logger.lifecycle("RenderInBrowser is excluded from compilation. If you want to compile it, add -PenableJavaFx")
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 000f95af264..a41d732dd7a 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -632,6 +632,9 @@ val runGui by tasks.registering(JavaExec::class) {
     group = "Development"
     description = "Builds and starts JMeter GUI"
     dependsOn(createDist)
+    buildParameters.testJdk?.let {
+        javaLauncher.set(javaToolchains.launcherFor(it))
+    }
 
     workingDir = File(project.rootDir, "bin")
     mainClass.set("org.apache.jmeter.NewDriver")
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 799b20e8a8f..d87170a6fe2 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -102,6 +102,7 @@ Summary
 <ch_section>Non-functional changes</ch_section>
 <ul>
   <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
+  <li><pr>5989</pr>Use Gradle toolchains for JDK provisioning, enable building and testing with different JDKs, start testing with Java 21</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

From 5f2e86ddd05537e0025476c27445cbc5854a6e0d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 24 Jun 2023 14:40:09 +0300
Subject: [PATCH 0566/1037] test: replace
 TestTransactionController.TestSampleListener with CollectSamplesListener

---
 .../control/TestTransactionController.java    | 34 +++----------------
 ...ModelThreadGroupConfigElementJavaTest.java |  6 ++--
 .../OpenModelThreadGroupConfigElementTest.kt  |  4 +--
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
index 96d35f4565e..eb8c52f7635 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
@@ -17,16 +17,10 @@
 
 package org.apache.jmeter.control;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.jmeter.assertions.ResponseAssertion;
 import org.apache.jmeter.junit.JMeterTestCase;
-import org.apache.jmeter.reporters.ResultCollector;
 import org.apache.jmeter.sampler.DebugSampler;
-import org.apache.jmeter.samplers.SampleEvent;
-import org.apache.jmeter.samplers.SampleListener;
+import org.apache.jmeter.test.samplers.CollectSamplesListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterThread;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -44,7 +38,7 @@ public class TestTransactionController extends JMeterTestCase {
     public void testIssue57958() throws Exception {
         JMeterContextService.getContext().setVariables(new JMeterVariables());
 
-        TestSampleListener listener = new TestSampleListener();
+        CollectSamplesListener listener = new CollectSamplesListener();
 
         TransactionController transactionController = new TransactionController();
         transactionController.setGenerateParentSample(true);
@@ -81,29 +75,9 @@ public void testIssue57958() throws Exception {
         thread.setOnErrorStopThread(true);
         thread.run();
 
-        Assertions.assertEquals(1, listener.events.size(),
+        Assertions.assertEquals(1, listener.getEvents().size(),
                 "Must one transaction samples with parent debug sample");
         Assertions.assertEquals("Number of samples in transaction : 1, number of failing samples : 1",
-                listener.events.get(0).getResult().getResponseMessage());
-    }
-
-    public static class TestSampleListener extends ResultCollector implements SampleListener {
-        private static final long serialVersionUID = -1373192220822942714L;
-        public List<SampleEvent> events = Collections.synchronizedList(new ArrayList<>());
-
-        @Override
-        public void sampleOccurred(SampleEvent e) {
-            events.add(e);
-        }
-
-        @Override
-        public void sampleStarted(SampleEvent e) {
-            events.add(e);
-        }
-
-        @Override
-        public void sampleStopped(SampleEvent e) {
-            events.add(e);
-        }
+                listener.getEvents().get(0).getResult().getResponseMessage());
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
index 83c0e60193d..955082cfca5 100644
--- a/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
@@ -25,12 +25,12 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import org.apache.jmeter.control.TestTransactionController;
 import org.apache.jmeter.engine.JMeterEngineException;
 import org.apache.jmeter.engine.StandardJMeterEngine;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.modifiers.CounterConfig;
 import org.apache.jmeter.sampler.DebugSampler;
+import org.apache.jmeter.test.samplers.CollectSamplesListener;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.test.JMeterSerialTest;
@@ -46,7 +46,7 @@ class OpenModelThreadGroupConfigElementJavaTest extends JMeterTestCase implement
     // @RepeatedTest(value = 10)
     void ensure_thread_group_initializes_counter_only_once_for_each_thread()
             throws JMeterEngineException, ExecutionException, InterruptedException, TimeoutException {
-        TestTransactionController.TestSampleListener listener = new TestTransactionController.TestSampleListener();
+        CollectSamplesListener listener = new CollectSamplesListener();
 
         HashTree tree = testTree(b -> {
             b.add(TestPlan.class, tp -> {
@@ -76,7 +76,7 @@ void ensure_thread_group_initializes_counter_only_once_for_each_thread()
 
         // There's no guarantee that threads execute exactly in order, so we sort
         // the labels to avoid test failure in case the thread execute out of order.
-        List<String> actual = listener.events.stream()
+        List<String> actual = listener.getEvents().stream()
                 .map(e -> e.getResult().getSampleLabel())
                 .sorted()
                 .collect(Collectors.toList());
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
index 69537283f04..cedf89d2e07 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -17,11 +17,11 @@
 
 package org.apache.jmeter.threads.openmodel
 
-import org.apache.jmeter.control.TestTransactionController
 import org.apache.jmeter.engine.StandardJMeterEngine
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.modifiers.CounterConfig
 import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.test.samplers.CollectSamplesListener
 import org.apache.jmeter.testelement.TestPlan
 import org.apache.jmeter.treebuilder.dsl.testTree
 import org.apache.jorphan.test.JMeterSerialTest
@@ -37,7 +37,7 @@ class OpenModelThreadGroupConfigElementTest : JMeterTestCase(), JMeterSerialTest
     // Un-comment if you want try running the test multiple times locally:
     // @RepeatedTest(value = 10)
     fun `ensure thread group initializes counter only once for each thread`() {
-        val listener = TestTransactionController.TestSampleListener()
+        val listener = CollectSamplesListener()
 
         val tree = testTree {
             TestPlan::class {

From c9cb9add59d9639cc77bf9335ee32c0c8f8b8ef6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 24 Jun 2023 15:51:55 +0000
Subject: [PATCH 0567/1037] fix(deps): update com.github.vlsi to v1.90

---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 build-logic/jvm/build.gradle.kts              | 4 ++--
 build-logic/root-build/build.gradle.kts       | 6 +++---
 build-logic/verification/build.gradle.kts     | 4 ++--
 settings.gradle.kts                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index bd0c6c6d803..32db188ef63 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("org.gradlex.build-parameters") version "1.4.3"
-    id("com.github.vlsi.gradle-extensions") version "1.89"
+    id("com.github.vlsi.gradle-extensions") version "1.90"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
 
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 973bc9274f0..e858e69380f 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     api(projects.buildParameters)
     api(projects.verification)
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.89")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.21")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 10fbdf5503c..0e44fd8285d 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -22,9 +22,9 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.89")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.89")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index cdd40c71edc..ff7d741d51f 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -24,8 +24,8 @@ dependencies {
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.14")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.89")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.89")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.27")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b28f8fce777..0f7c0e8c87c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,7 +20,7 @@ import java.util.*
 
 pluginManagement {
     plugins {
-        id("com.github.vlsi.stage-vote-release") version "1.89"
+        id("com.github.vlsi.stage-vote-release") version "1.90"
     }
 }
 

From b5de0df70e7ca641cc497cccd4df19195bdad9f7 Mon Sep 17 00:00:00 2001
From: Alex Schwartz <alexschwartz01@gmail.com>
Date: Tue, 27 Jun 2023 08:26:34 -0400
Subject: [PATCH 0568/1037] bump placeholders to 5.6

---
 .github/ISSUE_TEMPLATE/bug_report.yaml      | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +-
 .github/ISSUE_TEMPLATE/regression.yaml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 00a07cd91a7..502aadfbe82 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,7 +42,7 @@ body:
       description: |
         What JMeter version and edition did you use?
         Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
-      placeholder: ex. 5.5
+      placeholder: ex. 5.6
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index f85d623f2f5..85fc221b752 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -41,7 +41,7 @@ body:
     attributes:
       label: JMeter Version
       description: What JMeter version and edition did you use?
-      placeholder: ex. 5.5
+      placeholder: ex. 5.6
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/regression.yaml b/.github/ISSUE_TEMPLATE/regression.yaml
index 14e09d220af..d27609c5810 100644
--- a/.github/ISSUE_TEMPLATE/regression.yaml
+++ b/.github/ISSUE_TEMPLATE/regression.yaml
@@ -42,7 +42,7 @@ body:
       description: |
         What JMeter version and edition did you use?
         Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
-      placeholder: ex. 5.5
+      placeholder: ex. 5.6
     validations:
       required: true
   - type: input

From 8534cb9d5ce93634effc084d3322e2b40bab329c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 27 Jun 2023 13:53:38 +0300
Subject: [PATCH 0569/1037] fix: after disabling the Java Request sampler, it
 cannot be enabled again

Java sampler was inheriting "enabled" status from its config element
as internally, Java Sampler UI always creates a config element and merges it
to the java sampler.

The solution is to move "configureTestElement(sampler);" to the very end of
modifyTestElement so all the base properties are populated based on
the element properties rather than "config element" properties.

Ideally we should somehow limit "mergeIn", and we should refrain from merging
unexpected properties.

Fixes https://github.com/apache/jmeter/issues/6004
---
 .../gui/AbstractJMeterGuiComponent.java       |  2 +-
 .../gui/AbstractJMeterGuiComponentTest.kt     | 45 +++++++++++++++++++
 .../java/control/gui/JavaTestSamplerGui.java  |  4 +-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
index b9666382156..f9920f194f9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
@@ -69,7 +69,7 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete
     /** Logging */
     private static final Logger log = LoggerFactory.getLogger(AbstractJMeterGuiComponent.class);
 
-    /** Flag indicating whether or not this component is enabled. */
+    /** Flag indicating whether this component is enabled. */
     private boolean enabled = true;
 
     /**
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt
new file mode 100644
index 00000000000..38c17c4bba4
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import javax.swing.JPopupMenu
+
+class AbstractJMeterGuiComponentTest {
+    @Test
+    fun isEnabled() {
+        val element = object : AbstractJMeterGuiComponent() {
+            override fun getLabelResource(): String = "dummy_element_for_tests"
+
+            override fun createTestElement(): TestElement = TODO()
+
+            override fun modifyTestElement(element: TestElement?) = TODO()
+
+            override fun createPopupMenu(): JPopupMenu = TODO()
+
+            override fun getMenuCategories(): MutableCollection<String> = TODO()
+        }
+
+        assertEquals(true, element.isEnabled, "element.isEnabled after creation of the element")
+
+        element.clearGui()
+        assertEquals(true, element.isEnabled, "element.isEnabled after element.clearGui()")
+    }
+}
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
index 6877c488ec2..78a3b0502c5 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
@@ -78,8 +78,10 @@ public TestElement createTestElement() {
     public void modifyTestElement(TestElement sampler) {
         sampler.clear();
         JavaConfig config = (JavaConfig) javaPanel.createTestElement();
-        configureTestElement(sampler);
         sampler.addTestElement(config);
+        // Set base parameters (name, description, enabled) from the main control
+        // to avoid merging them from the config element above
+        configureTestElement(sampler);
     }
 
     /* Overrides AbstractJMeterGuiComponent.configure(TestElement) */

From 9a86b6c2a46c0f802c7e82714187138a35ec2ce4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 27 Jun 2023 15:37:55 +0300
Subject: [PATCH 0570/1037] doc: add changelog entry for "Java Sampler can't be
 enabled"

---
 xdocs/changes.xml         | 1 +
 xdocs/changes_history.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d87170a6fe2..ccda1461a90 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,7 @@ Summary
 
 <h3>Other Samplers</h3>
 <ul>
+  <li><pr>6012</pr> Java Request sampler cannot be enabled again after disabling in UI (regression since 5.6)</li>
 </ul>
 
 <h3>Controllers</h3>
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index 777dd2e9d28..78c3adb9e32 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -238,6 +238,8 @@ Apologies if we have omitted anyone else.
 <ul>
   <li><pr>5987</pr>HTTP sampler sends filenames with percent-encoded UTF-8, however it is not aligned with the browsers. The workaround is to refrain non-ASCII filenames</li>
 
+  <li><issue>6004</issue>Java Request sampler cannot be enabled again after disabling in UI (fixed in 5.6.1, <pr>6012</pr>)</li>
+
 <li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
 but otherwise its behaviour is not consistent (or clearly specified).</li>
 

From f96c40da9ebf5be7d7637dea94e91104db869d6e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 27 Jun 2023 16:03:13 +0300
Subject: [PATCH 0571/1037] doc: mention contributors in changelog

---
 xdocs/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ccda1461a90..5917eae9ff5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -156,9 +156,12 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
+  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
+  <li>LeeBaul, <a href="https://github.com/libaolu">@libaolu</a></li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.

From 6cc553f46838f4c3cfef2b0a6545ee4dda80c808 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 27 Jun 2023 07:50:40 +0300
Subject: [PATCH 0572/1037] fix: default value for
 LoopController.continue_forever rather than initializing in the constructor

Previously LoopController initialized continue_forever=true in the constructor,
however, and ThreadGroup.setMainController flipped the value to false.

It caused inconsistency since non-GUI launch does not call ThreadGroup.setMainController.

Using default=true enables to treat "false" as non-standard, so =false is saved
t the jmx, and it gets loaded in non-GUI as well.

Fixes https://github.com/apache/jmeter/issues/6008
---
 .../main/java/org/apache/jmeter/control/LoopController.java | 4 ----
 .../org/apache/jmeter/control/LoopControllerSchema.kt       | 2 +-
 xdocs/changes.xml                                           | 6 ++++++
 xdocs/changes_history.xml                                   | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
index bde3aa19e8b..c973cf4d74a 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
@@ -48,10 +48,6 @@ public class LoopController extends GenericController implements Serializable, I
 
     private boolean breakLoop;
 
-    public LoopController() {
-        set(getSchema().getContinueForever(), true);
-    }
-
     @Override
     public LoopControllerSchema getSchema() {
         return LoopControllerSchema.INSTANCE;
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt b/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt
index 3eea874f77d..23c0e095513 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/control/LoopControllerSchema.kt
@@ -45,5 +45,5 @@ public abstract class LoopControllerSchema : GenericControllerSchema() {
      * However, it's not clear that a Thread Group could ever be repeated.
      */
     public val continueForever: BooleanPropertyDescriptor<LoopControllerSchema>
-        by boolean("LoopController.continue_forever")
+        by boolean("LoopController.continue_forever", default = true /* previous releases initialized value in constructor */)
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5917eae9ff5..f4fa544022a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -109,6 +109,12 @@ Summary
 
 <ch_section>Bug fixes</ch_section>
 
+<h3>Thread Groups</h3>
+<ul>
+  <li><pr>6011</pr>Regression since 5.6: ThreadGroups are running endlessly in non-gui mode: use default value
+    for LoopController.continue_forever rather than initializing it in the constructor</li>
+</ul>
+
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
 </ul>
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index 78c3adb9e32..deae2544edf 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -236,6 +236,8 @@ Apologies if we have omitted anyone else.
 
 <ch_section>Known problems and workarounds</ch_section>
 <ul>
+  <li><issue>6008</issue> ThreadGroups are running endlessly in non-gui mode (fixed in 5.6.1, see <pr>6011</pr>)</li>
+
   <li><pr>5987</pr>HTTP sampler sends filenames with percent-encoded UTF-8, however it is not aligned with the browsers. The workaround is to refrain non-ASCII filenames</li>
 
   <li><issue>6004</issue>Java Request sampler cannot be enabled again after disabling in UI (fixed in 5.6.1, <pr>6012</pr>)</li>

From 1e45414004b0ebbe9891d4ec3468d8c1fb2a7ef8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 27 Jun 2023 19:17:45 +0300
Subject: [PATCH 0573/1037] test: add test that verifies test element does not
 change after save+load roundtrip

ProxyControl initialized collection properties with HashSet which caused
CollectionProperty.equals to return false.
CollectionProperty is normalized to ArrayList on save, so we should not pass
HashSet to the CollectionProperty in the first place.
---
 .../testelement/AbstractTestElement.java      | 14 +++-
 .../apache/jmeter/dsl/DslPrinterTraverser.kt  |  2 +-
 .../org/apache/jmeter/junit/JMeterTest.java   | 78 +++++++++++++++++++
 .../apache/jmeter/save/TestSaveService.java   |  2 +-
 .../protocol/http/proxy/ProxyControl.java     | 13 +++-
 5 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index fc885f89c29..0486721475a 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -482,10 +482,16 @@ public void setProperty(JMeterProperty property) {
         } else {
             writeLock();
             try {
-                propMap.put(property.getName(), property);
-                Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
-                if (propMapConcurrent != null) {
-                    propMapConcurrent.put(property.getName(), property);
+                if (property instanceof StringProperty && property.getStringValue() == null) {
+                    // Avoid storing properties with null values since they will be skipped anyway when saving
+                    // the test plan
+                    removeProperty(property.getName());
+                } else {
+                    propMap.put(property.getName(), property);
+                    Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
+                    if (propMapConcurrent != null) {
+                        propMapConcurrent.put(property.getName(), property);
+                    }
                 }
             } finally {
                 writeUnlock();
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
index 81702d19ab7..a17022298c8 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
@@ -173,7 +173,7 @@ public class DslPrinterTraverser(
             is DoubleProperty -> append(property.stringValue)
             is FloatProperty -> append(property.stringValue).append('f')
             is LongProperty -> append(property.stringValue).append('d')
-            is StringProperty -> appendLiteral(property.stringValue)
+            is StringProperty -> property.stringValue?.let { appendLiteral(it) } ?: run { append("null") }
 
             is TestElementProperty -> {
                 val element = property.element
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 19152c90ab7..f7463cbcd9e 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -28,6 +28,7 @@
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,6 +36,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -45,6 +47,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.gui.ObsoleteGui;
+import org.apache.jmeter.dsl.DslPrinterTraverser;
 import org.apache.jmeter.gui.JMeterGUIComponent;
 import org.apache.jmeter.gui.UnsharedComponent;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
@@ -52,6 +55,8 @@
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.reflect.ClassFinder;
 import org.apache.jorphan.util.JOrphanUtils;
@@ -270,6 +275,8 @@ private static Test suiteGUIComponents() throws Throwable {
                 System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping some tests " + item.getClass().getName());
             } else {
                 ts.addTest(new JMeterTest("GUIComponents2", item));
+                ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
+                ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
                 ts.addTest(new JMeterTest("runGUITitle", item));
             }
             suite.addTest(ts);
@@ -289,6 +296,8 @@ private static Test suiteBeanComponents() throws Throwable {
                 JMeterGUIComponent item = new TestBeanGUI(c);
                 TestSuite ts = new TestSuite(item.getClass().getName());
                 ts.addTest(new JMeterTest("GUIComponents2", item));
+                ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
+                ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
                 ts.addTest(new JMeterTest("runGUITitle", item));
                 suite.addTest(ts);
             } catch (IllegalArgumentException e) {
@@ -386,6 +395,75 @@ public void GUIComponents2() throws Exception {
         assertEquals("Modify Test: Failed on " + name, "hey, new name!:", el2.getName());
     }
 
+    public void propertiesShouldNotBeInitializedToNullValues() {
+        TestElement el = guiItem.createTestElement();
+        PropertyIterator it = el.propertyIterator();
+        while (it.hasNext()) {
+            JMeterProperty property = it.next();
+            if (property.getObjectValue() == null) {
+                fail(
+                        "Property " + property.getName() + " is initialized with NULL OBJECT value in " +
+                                " test element " + el + " created with " + guiItem + ".createTestElement() " +
+                                "Please refrain from that since null properties consume memory, and they will be " +
+                                "removed when saving and loading the plan anyway"
+                );
+            }
+            if (property.getStringValue() == null) {
+                fail(
+                        "Property " + property.getName() + " is initialized with NULL STRING value in " +
+                                " test element " + el + " created with " + guiItem + ".createTestElement() " +
+                                "Please refrain from that since null properties consume memory, and they will be " +
+                                "removed when saving and loading the plan anyway"
+                );
+            }
+        }
+    }
+
+    public void saveLoadShouldKeepElementIntact() throws IOException {
+        TestElement expected = guiItem.createTestElement();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        SaveService.saveElement(expected, bos);
+        byte[] serializedBytes = bos.toByteArray();
+        TestElement actual = (TestElement) SaveService.loadElement(new ByteArrayInputStream(serializedBytes));
+        compareAllProperties(expected, actual, serializedBytes);
+    }
+
+    private static void compareAllProperties(TestElement expected, TestElement actual, byte[] serializedBytes) {
+        // JMeter restores "enabled" as StringProperty, see
+        // org.apache.jmeter.save.converters.ConversionHelp.restoreSpecialProperties
+        // So we normalize it back to BooleanProperty
+        JMeterProperty expEnabled = expected.getPropertyOrNull(expected.getSchema().getEnabled());
+        if (expEnabled != null && (expEnabled.getStringValue().equals("true") || expEnabled.getStringValue().equals("false"))) {
+            JMeterProperty actEnabled = actual.getPropertyOrNull(actual.getSchema().getEnabled());
+            if (actEnabled != null && actEnabled.getStringValue().equals(expEnabled.getStringValue())) {
+                actual.setProperty(expEnabled);
+            }
+        }
+
+        String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
+        if (!Objects.equals(expected, actual)) {
+            boolean abc = Objects.equals(expected, actual);
+            assertEquals(
+                    "TestElement after 'save+load' should match the one created in GUI\n" +
+                            "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
+                    expectedStr,
+                    new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString()
+            );
+            fail("TestElement after 'save+load' should match the one created in GUI. " +
+                    "DSL representation is the same, however TestElement#equals says the elements are different. " +
+                    "DSL is " + expectedStr + "\n" +
+                    "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
+        }
+        assertEquals(
+                "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
+                "DSL representation is the same, however TestElement#hashCode says the elements are different. " +
+                "DSL is " + expectedStr + "\n" +
+                "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
+                expected.hashCode(),
+                actual.hashCode()
+        );
+    }
+
     /*
      * Test serializable elements - create the suite of tests
      */
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 9b44acc7d71..6a64173910a 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -117,7 +117,7 @@ private boolean loadAndSave(File testFile, String fileName, boolean checkSize, F
         final FileStats origStats = getFileStats(testFile);
         final FileStats savedStats = getFileStats(savedFile);
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream(1000000);
+        ByteArrayOutputStream out = new ByteArrayOutputStream(Math.toIntExact(testFile.length()));
         try {
             HashTree tree = SaveService.loadTree(testFile);
             SaveService.saveTree(tree, out);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 9b5a6623c96..01155e769ac 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -45,6 +45,7 @@
 import java.util.Set;
 import java.util.prefs.Preferences;
 import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -398,11 +399,19 @@ public void setNotifyChildSamplerListenerOfFilteredSamplers(boolean b) {
     }
 
     public void setIncludeList(Collection<String> list) {
-        setProperty(new CollectionProperty(INCLUDE_LIST, new HashSet<>(list)));
+        if (list.size() >= 2) {
+            // Deduplicate if there is more than one element in the list
+            list = list.stream().distinct().collect(Collectors.toList());
+        }
+        setProperty(new CollectionProperty(INCLUDE_LIST, list));
     }
 
     public void setExcludeList(Collection<String> list) {
-        setProperty(new CollectionProperty(EXCLUDE_LIST, new HashSet<>(list)));
+        if (list.size() >= 2) {
+            // Deduplicate if there is more than one element in the list
+            list = list.stream().distinct().collect(Collectors.toList());
+        }
+        setProperty(new CollectionProperty(EXCLUDE_LIST, list));
     }
 
     public void setRegexMatch(boolean b) {

From 1ec151bc5314a5667a064381d0183b0d379488c2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 19 Jun 2023 00:56:46 +0000
Subject: [PATCH 0574/1037] fix(deps): update com.fasterxml.jackson.core to
 v2.15.2

---
 src/bom-thirdparty/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 194151d5221..6373cbcf21c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -42,9 +42,9 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.15.1")
-        api("com.fasterxml.jackson.core:jackson-core:2.15.1")
-        api("com.fasterxml.jackson.core:jackson-databind:2.15.1")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.15.2")
+        api("com.fasterxml.jackson.core:jackson-core:2.15.2")
+        api("com.fasterxml.jackson.core:jackson-databind:2.15.2")
         api("com.fifesoft:rsyntaxtextarea:3.3.3")
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")

From 6f11f23b964d38744a69c40a85972bf06d8a1393 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 28 Jun 2023 19:40:16 +0000
Subject: [PATCH 0575/1037] fix(deps): update kotlin monorepo to v1.8.22

---
 build-logic/jvm/build.gradle.kts        | 4 ++--
 build-logic/root-build/build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index e858e69380f..a7fb4d31ea7 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
-    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.21")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.22")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.22")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
 }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 0e44fd8285d..b14b02b1b20 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.22")
 }

From 6c1a229ff71864bffd0c4414abd31ba6188a7849 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 28 Jun 2023 19:40:12 +0000
Subject: [PATCH 0576/1037] fix(deps): update dependency org.hsqldb:hsqldb to
 v2.7.2

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index bd4ecf3265d..8c24fb0f5f6 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")
-        api("org.hsqldb:hsqldb:2.7.1")
+        api("org.hsqldb:hsqldb:2.7.2")
         api("org.objenesis:objenesis:3.3")
         api("org.openjdk.jmh:jmh-core:1.36")
         api("org.openjdk.jmh:jmh-generator-annprocess:1.36")

From 7003e6979958f6aedf5bcd4f1d4a3ed35beb2ffe Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 28 Jun 2023 19:40:04 +0000
Subject: [PATCH 0577/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v3.14.3

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 8c24fb0f5f6..8da810a16ec 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         api("com.github.tomakehurst:wiremock-jre8:2.35.0")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.5")
-        api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
+        api("nl.jqno.equalsverifier:equalsverifier:3.14.3")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.6")
         api("org.apache.activemq:activemq-client:5.16.6")

From 3e022f3f0bf0763cb6da5b7424220542f82ee129 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 28 Jun 2023 23:15:02 +0000
Subject: [PATCH 0578/1037] chore(deps): update release-drafter/release-drafter
 digest to 65c5fb4

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index e6905e48f32..f938e609b3a 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
-        uses: release-drafter/release-drafter@569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e # v5
+        uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5
         id: prepare_release
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:

From 506b465d33b2de131feeb34e09e4480d1d4ef2fb Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 28 Jun 2023 19:40:09 +0000
Subject: [PATCH 0579/1037] fix(deps): update dependency
 org.apache.mina:mina-core to v2.2.2

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 8da810a16ec..25bf1357a54 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
         api("org.apache.activemq:activemq-spring:5.16.6")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
-        api("org.apache.mina:mina-core:2.2.1")
+        api("org.apache.mina:mina-core:2.2.2")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")

From 7f5920a9e6c5402056d3bed4dfd3a16e6bf770fb Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 19 Jun 2023 04:09:19 +0000
Subject: [PATCH 0580/1037] fix(deps): update dependency
 com.helger.commons:ph-commons to v10.2.5

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6373cbcf21c..4b1b98cf080 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -55,7 +55,7 @@ dependencies {
         api("com.google.auto.service:auto-service-annotations:1.1.0")
         api("com.google.auto.service:auto-service:1.1.0")
         api("com.google.errorprone:error_prone_annotations:2.19.1")
-        api("com.helger.commons:ph-commons:10.2.4")
+        api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
         api("com.miglayout:miglayout-core:5.3")

From 948be2854ec657016c314f32e408d046ea0ab5d6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 19 Jun 2023 14:41:47 +0000
Subject: [PATCH 0581/1037] chore(deps): update plugin com.gradle.enterprise to
 v3.13.4

Fixes https://github.com/apache/jmeter/pull/5990
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0f7c0e8c87c..7ab44f2a932 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.13.2"
+    id("com.gradle.enterprise") version "3.13.4"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
@@ -155,8 +155,8 @@ val expectedSha512 = mapOf(
         to "org.eclipse.jgit-5.13.1.202206130422-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
-    "2625BD9FF15E17D47F678453B856E161E70E9460DB4DC05275CFE1EF7F6ACF8D2DC2CA8F2D59BB1B6E6DD1AD9CA617A41358FA03840A4D9FF18E231278FCAE13"
-        to "gradle-enterprise-gradle-plugin-3.13.2.jar",
+    "F669488ABCCD8F6A0C631809C951BC2DADD606217C1AD99DABCBDAB11EDD85B08FF71283A18FF954290681EEDE80FD358C5D18F4C482C35F252DF8051306EF05"
+        to "gradle-enterprise-gradle-plugin-3.13.4.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"

From 0f33883e56000216913a99a5b22eee49cbf4f31a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 19 Jun 2023 04:09:15 +0000
Subject: [PATCH 0582/1037] fix(deps): update com.google.auto.service to v1.1.1

Fixes https://github.com/apache/jmeter/pull/5992
---
 checksum.xml                        | 1 +
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index efa173c7986..98e95987c1d 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -46,6 +46,7 @@
     <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
     <trusted-key id='d5f46bc0b86af5dc56df58f05e975cb00c643dbf' group='com.google.inject' />
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
+    <trusted-key id='eb1b3de71713c9ec2e87cc26ee92349ad86de446' group='com.google.j2objc' />
     <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
     <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' />
     <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4b1b98cf080..c5b6a7a5769 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,8 +52,8 @@ dependencies {
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
         api("com.github.weisj:darklaf-property-loader:2.7.3")
         api("com.github.weisj:darklaf-theme:2.7.3")
-        api("com.google.auto.service:auto-service-annotations:1.1.0")
-        api("com.google.auto.service:auto-service:1.1.0")
+        api("com.google.auto.service:auto-service-annotations:1.1.1")
+        api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.19.1")
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")

From e636ecffed8dae0b6e8b5b76a22d87929e1bdd37 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 29 Jun 2023 05:14:52 +0000
Subject: [PATCH 0583/1037] fix(deps): update dependency checkstyle to v10.12.1

---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index f10870ed3a9..cfe92743fd3 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 checkstyle {
-    toolVersion = "10.11.0"
+    toolVersion = "10.12.1"
     configProperties = mapOf(
         "cache_file" to buildDir.resolve("checkstyle/cacheFile")
     )

From bfff137cebf7b07b39a589a221a717b19cd25cca Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 29 Jun 2023 05:14:44 +0000
Subject: [PATCH 0584/1037] fix(deps): update dependency
 org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin to v1.8.20

---
 build-logic/jvm/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index a7fb4d31ea7..4f53411004f 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.22")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.22")
-    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.10")
+    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.20")
 }

From f55fd3a61398ee12ca5fd63aed2e5bab84321945 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 29 Jun 2023 05:14:49 +0000
Subject: [PATCH 0585/1037] fix(deps): update com.google.errorprone to v2.20.0

Fixes https://github.com/apache/jmeter/pull/6020
---
 .../kotlin/build-logic.errorprone.gradle.kts  |  2 +-
 checksum.xml                                  |  3 +++
 ...1b3de71713c9ec2e87cc26ee92349ad86de446.asc | 16 ++++++++++++++
 .../46/ee92349ad86de446.fingerprints          |  1 +
 ...86bbf993566d8c2f4f7ed7d945e643368fef62.asc | 21 +++++++++++++++++++
 .../62/d945e643368fef62.fingerprints          |  1 +
 ...7366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc | 21 +++++++++++++++++++
 .../64/9987b20c8f6a3064.fingerprints          |  1 +
 .../69/e68665c8f91bde69.fingerprints          |  1 +
 .../ad/a8d88140c35897ad.fingerprints          |  1 +
 .../c3/80cfa7c482552dc3.fingerprints          |  1 +
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 .../graphite/PickleGraphiteMetricsSender.java |  7 +------
 .../graphite/TextGraphiteMetricsSender.java   |  7 +------
 .../jmeter/engine/ClientJMeterEngine.java     |  3 ++-
 .../jmeter/engine/RemoteJMeterEngine.java     |  1 +
 .../jmeter/engine/RemoteJMeterEngineImpl.java |  1 +
 .../jmeter/engine/util/FunctionParser.java    |  2 ++
 .../graph/AbstractGraphConsumer.java          |  1 +
 .../report/processor/graph/GroupData.java     |  1 +
 .../apache/jmeter/threads/TestCompiler.java   |  1 +
 .../org/apache/jmeter/util/JMeterUtils.java   |  1 +
 .../http/parser/HtmlParsingUtils.java         |  2 +-
 .../http/visualizers/RequestViewHTTP.java     |  2 +-
 24 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index f7f0061fb1e..be71ef36e8d 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"("com.google.errorprone:error_prone_core:2.19.1")
+        "errorprone"("com.google.errorprone:error_prone_core:2.20.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/checksum.xml b/checksum.xml
index 98e95987c1d..8ac0c334253 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -37,6 +37,7 @@
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
     <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
+    <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.errorprone' />
     <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.errorprone' />
     <trusted-key id='ee0ca873074092f806f59b65d364abaa39a47320' group='com.google.errorprone' />
@@ -47,6 +48,7 @@
     <trusted-key id='d5f46bc0b86af5dc56df58f05e975cb00c643dbf' group='com.google.inject' />
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='eb1b3de71713c9ec2e87cc26ee92349ad86de446' group='com.google.j2objc' />
+    <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.protobuf' />
     <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
     <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' />
     <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
@@ -85,6 +87,7 @@
     <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' />
     <trusted-key id='c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e' group='io.burt' />
     <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='7186bbf993566d8c2f4f7ed7d945e643368fef62' group='io.github.eisop' />
     <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
     <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
new file mode 100644
index 00000000000..f97a22c518d
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo
+P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2
+SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q
+SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo
+TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg
+MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG5AQ0EY73VqQEIANJPIYj9
+IsxKKOWLOkWvxAg9o9krIkohBMaOGRsx4RxQyArOCUoaG/qsG3aVOi8wML8hQK6q
+oXADJ6FBGxQ67G8pperzRSj1O3BJILB6Fd1X8w40S6hSvUAZs+DM1FMuD4mf6ydu
+yZUVIghGRExNeSb/vfn4KVPqdSAD7uWeQiIUYveaXrwot8+U8tRNgv+LQpCjhm5h
+vWyIuxxpI+k5N07V9y0yRGWiBbgqdmfHVwdEbUSM0sMYUJUZKW+iwf5tZig9LZu3
+HAf/vyXjBWG6zkkjwO8onKFLuhL4jkygHGSawJHwYRgtlknUZ0DMVc451bbhuFHE
+0dcgQCdAYJsI66MAEQEAAQ==
+=EMGn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
new file mode 100644
index 00000000000..9b688ce838f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
@@ -0,0 +1 @@
+eb1b3de71713c9ec2e87cc26ee92349ad86de446
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
new file mode 100644
index 00000000000..e06fcadb8d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD
+jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr
+vscz83dU6wpXxhFgTryUclqj0Nf6xZ9kxGAbMgP4JUZGkME/q3e6gOnwfLvbM4/t
+M8XcjLLJNKdBHQGAcuQJxTp0db4ets+VgleqQKOPP2g+oeF92uiAZ5Wz3AEMRvnH
+9TjGwXxiHv4gganqbaBq4cPH+bqoi1xxqSnj6qctbZxkfsICW03MF7Ydf16vbzzH
+48KxYkBN83M2jOIptrZVsP3vLJzelsZTI/rkmgyfigEsog+JD/1Za3+L7x8hWhY5
+arQ+QmSLJ7wyqccFexZO8gdtXkmfNQsIf/kFe1vifdRRYhuG0jrxXixa/zcj7VxZ
+waFrCbh5SqNMqhUoTwvB9WrH3BPOQGmURynvXAeklE1kR18rxiAO6Bp3QV7BGXEX
+ReYo+ITho5aGDhEAEQEAAbkBjQRcyckyAQwAwNKgqINPHy7O4nHdaaJxa6qNPBvD
+fxHsWR4mDcWlWWVBA2pQyQnvLDuNQ+QXK/+MHeYhZtuiV+SzS51ohkk+X4hSbFFk
+ngrgnY3gNJbeSNoaXIr4UgCNpBXGcUoS1pBo/XVMcgTSsmco+bH6D6152XdUEJEU
+SlXc+hcEI3H2SZT+c+nlwSv6PMdIlDjbCY8JZ+FPJxbA+QqYMJIrOA8RoTD1FWb9
+2nUxnxdEKgr3LVvfxFUAjRfXmpXHOxysZD4phzGgiqyg/fvBXdAv1fJx+zAhQSK+
+ac6TNSN62pAfwOXP+PiYWC8/T3wDZDi6YiTDLml2K2iA/2vrKuAbtIAQR409s5VF
+q9M41VbDdR/cjocNq199btp1nb9rbis6n27FGgCE7gj5IO2T3lmFnhwYIZNNhqfR
+Tz5hSvDLidvEDGv3RnYCP3NibZX1lqljlDTk7Y0EQ0DFyahDuWREdVGJ3mnO6k6b
+GMfZ4pgRyWkr4CLbD97W69aHbteZVOOS5HJRABEBAAE=
+=D0Xc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
new file mode 100644
index 00000000000..ecc6985d262
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
@@ -0,0 +1 @@
+7186bbf993566d8c2f4f7ed7d945e643368fef62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
new file mode 100644
index 00000000000..1ceea503257
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
+aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
+BnwoRUe0OsTItUQA+vLH8K2Uywd9f3OV9KQnqItUFMptaFhUC144hZhj3c0xhITS
+k45zucoXLKO9yqA+tlqav7taAJMrWbhRcRWXizK1wOZLyhu8NdIMUSL4Ei0blR90
+uA9i62XlOhpyvfpaC7oRh+jXHOCFK9sXe2vnvnTtJ1yqdXH4EOCYLjoheQN1R0u4
+6f6XoAy9c3tOSOZM9vwE56iOZJwv0bca6ZENnhHnYwWhbQwrY0JMIon0sUpx9RB2
+w4E7AeU8/maQG9hdB7s7vrAJFarlFQvc7kJ5FMTKFmWPalUTcT6yXntIQ3+xiH9l
+Oq0jGlAmQWYUvzHJ0SFjz1xJGBDM3GH9KfHbeoS3Xz5Emmw8YwEDUe9gt9po8bmw
+8qnA85uMZY2puh0AEQEAAbkBjQRiRjMaAQwAtcqYEeHIX/zszjNyKDyLONoZphIy
+efYlWpbrbAFgwgJVEWiIWGo1Du0f5P6g3p29QD9wSJrZ2pz8TUwUIhwpCxA50ceT
+PzEXi523znqWlXmOwdBuV6XjD7Bi0ZELg+QrumZfSDlAGb7fU6O39To1mDqg3SI1
+jybBk6OOlPYfdfII72z+1smEaUikOpXeJbnXwqkAaB8jQBgGikciACVruP8jMRwE
+Op1JcMj1hTOMjsbNYYx6s3NY8OPJvg9RqWfWAC1V6fsEBESlYVnw3IU5sMJzw949
+h60btqFFjgg6GDjD9Xk6RJQjIZti9XQVsIOAswQ2tUHYj7KmjX/5h6U+xmZtFRYS
+kPXMAjj7q31t3+Lj7Vhcm4FZGidY0AwwZAQLP6tiR2rcEtJ2E1xXqmAM9nT15eyW
+wfOVh/VVuU/DDaOlbBQyqwlTuKYxCj4UyWGVVqgSwByFzYpaKkWw91RX008eT94j
+9sj+m3Vqe5Q8VT3lRwju+TBaQz0V6Z/kKgJjABEBAAE=
+=eVjF
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
new file mode 100644
index 00000000000..883e7879034
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
@@ -0,0 +1 @@
+187366a3ffe6bf8f94b9136a9987b20c8f6a3064
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
new file mode 100644
index 00000000000..9b688ce838f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
@@ -0,0 +1 @@
+eb1b3de71713c9ec2e87cc26ee92349ad86de446
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
new file mode 100644
index 00000000000..ecc6985d262
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
@@ -0,0 +1 @@
+7186bbf993566d8c2f4f7ed7d945e643368fef62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints
new file mode 100644
index 00000000000..883e7879034
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints
@@ -0,0 +1 @@
+187366a3ffe6bf8f94b9136a9987b20c8f6a3064
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c5b6a7a5769..98867e132e9 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
-        api("com.google.errorprone:error_prone_annotations:2.19.1")
+        api("com.google.errorprone:error_prone_annotations:2.20.0")
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
index b0e450452fd..0f6ae38d5e8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
@@ -95,12 +95,7 @@ public void setup(SocketConnectionInfos socketConnectionInfos,
      */
     @Override
     public void addMetric(long timestamp, String contextName, String metricName, String metricValue) {
-        String name = new StringBuilder(50)
-                .append(prefix)
-                .append(contextName)
-                .append(".")
-                .append(metricName)
-                .toString();
+        String name = prefix + contextName + "." + metricName;
         synchronized (lock) {
             metrics.add(new MetricTuple(name, timestamp, metricValue));
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
index e72a2531bf5..e24bb686930 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
@@ -75,12 +75,7 @@ public void setup(SocketConnectionInfos socketConnectionInfos,
      */
     @Override
     public void addMetric(long timestamp, String contextName, String metricName, String metricValue) {
-        String name = new StringBuilder(50)
-                .append(prefix)
-                .append(contextName)
-                .append(".")
-                .append(metricName)
-                .toString();
+        String name = prefix + contextName + "." + metricName;
         synchronized (lock) {
             metrics.add(new MetricTuple(name, timestamp, metricValue));
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
index 44a8d51294b..030be3b94e3 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
@@ -177,7 +177,8 @@ public void runTest() throws JMeterEngineException {
         }
     }
 
-    private static final HashMap<String, String> toHashMapOfString(Properties properties) {
+    @SuppressWarnings("NonApiType")
+    private static HashMap<String, String> toHashMapOfString(Properties properties) {
         return new HashMap<>(
                 properties.entrySet().stream().collect(Collectors.toMap(
                         e -> e.getKey().toString(),
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java
index 5bb052a0977..05b7d8a12bd 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java
@@ -36,6 +36,7 @@ public interface RemoteJMeterEngine extends Remote {
 
     void rreset() throws RemoteException;
 
+    @SuppressWarnings("NonApiType")
     void rsetProperties(HashMap<String,String> p) throws RemoteException;
 
     void rexit() throws RemoteException;
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
index 087130cafe7..89feca75393 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
@@ -220,6 +220,7 @@ public void rexit() throws RemoteException {
     }
 
     @Override
+    @SuppressWarnings("NonApiType")
     public void rsetProperties(HashMap<String, String> map) throws RemoteException { // NOSONAR
         checkOwner("setProperties");
         if(remotelySetProperties != null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
index eeea474a5ea..d4a00763d6b 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
@@ -49,6 +49,7 @@ class FunctionParser {
      * @return list of Strings or Objects representing functions
      * @throws InvalidVariableException when evaluation of variables fail
      */
+    @SuppressWarnings("NonApiType")
     ArrayList<Object> compileString(String value) throws InvalidVariableException {
         StringReader reader = new StringReader(value);
         ArrayList<Object> result = new ArrayList<>();
@@ -186,6 +187,7 @@ private static char firstNonSpace(StringReader reader, char defaultResult) throw
      * @return a list of CompoundVariable elements
      * @throws InvalidVariableException when evaluation of variables fail
      */
+    @SuppressWarnings("NonApiType")
     ArrayList<CompoundVariable> parseParams(StringReader reader) throws InvalidVariableException {
         ArrayList<CompoundVariable> result = new ArrayList<>();
         StringBuilder buffer = new StringBuilder();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
index 0938510f481..673722df7ec 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
@@ -105,6 +105,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
      *
      * @return the group information
      */
+    @SuppressWarnings("NonApiType")
     protected final HashMap<String, GroupInfo> getGroupInfos() {
         return groupInfos;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java
index 2028af4c9d5..b27a423a00b 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java
@@ -33,6 +33,7 @@ public class GroupData {
      *
      * @return the series data map
      */
+    @SuppressWarnings("NonApiType")
     public final HashMap<String, SeriesData> getSeriesInfo() {
         return seriesData;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index b2c1d7330be..f212dda90a9 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -171,6 +171,7 @@ else if(child instanceof TransactionController) {
         }
     }
 
+    @SuppressWarnings("NonApiType")
     private static void trackIterationListeners(LinkedList<TestElement> pStack) {
         TestElement child = pStack.getLast();
         if (child instanceof LoopIterationListener) {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 380b68a480f..32f8f2be718 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -1243,6 +1243,7 @@ private static void getLocalHostDetails(){
      *            multi-line string headers
      * @return a map name/value for each header
      */
+    @SuppressWarnings("NonApiType")
     public static LinkedHashMap<String, String> parseHeaders(String headers) {
         LinkedHashMap<String, String> linkedHeaders = new LinkedHashMap<>();
         String[] list = headers.split("\n"); // $NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index bd914405c23..8521315d5f8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -355,7 +355,7 @@ public static List<HTTPSamplerBase> createURLFromForm(Node doc, URL context) {
     }
 
     // N.B. Since the tags are extracted from an HTML Form, any values must already have been encoded
-    @SuppressWarnings("JdkObsolete")
+    @SuppressWarnings({"JdkObsolete", "NonApiType"})
     private static boolean recurseForm(Node tempNode, LinkedList<HTTPSamplerBase> urlConfigs, URL context, String selectName,
             boolean inForm) {
         NamedNodeMap nodeAtts = tempNode.getAttributes();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index 5eb198062ed..b71257e39fe 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -274,7 +274,7 @@ private static String extractBoundary(String contentType) {
      * @param headers the http request headers
      * @return true if the request is multipart
      */
-    private static boolean isMultipart(LinkedHashMap<String, String> headers) {
+    private static boolean isMultipart(Map<String, String> headers) {
         String contentType = headers.get(HTTPConstants.HEADER_CONTENT_TYPE);
         return contentType != null && contentType.startsWith(HTTPConstants.MULTIPART_FORM_DATA);
     }

From c6ea946334e1958df4e5c1c478094a7b9edf96b0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 29 Jun 2023 10:24:48 +0300
Subject: [PATCH 0586/1037] style: fix raw type usage in
 TestElementPropertyConverter

---
 .../jmeter/save/converters/TestElementPropertyConverter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
index 50bfbff5876..2344d87b5a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
@@ -100,7 +100,8 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
             prop.setName(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)));
             String element = reader.getAttribute(ConversionHelp.ATT_ELEMENT_TYPE);
             boolean isHeader = HEADER_CLASSNAME.equals(element);
-            prop.setObjectValue(mapper().realClass(element).getDeclaredConstructor().newInstance());// Always decode
+            Class<?> aClass = mapper().realClass(element);
+            prop.setObjectValue(aClass.asSubclass(TestElement.class).getDeclaredConstructor().newInstance());// Always decode
             TestElement te = (TestElement)prop.getObjectValue();
             // No need to check version, just process the attributes if present
             ConversionHelp.restoreSpecialProperties(te, reader);

From cf5b41f1e17fad19600826d2cff36bc4feaf4cf9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 29 Jun 2023 10:56:05 +0300
Subject: [PATCH 0587/1037] doc: reduce severity from error to info when
 logging "JavaFX is missing"

---
 ...ogAndIgnoreServiceLoadExceptionHandler.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
index 5959bb54cc7..edec94c6b60 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/LogAndIgnoreServiceLoadExceptionHandler.java
@@ -33,11 +33,19 @@ public LogAndIgnoreServiceLoadExceptionHandler(Logger log) {
     public void handle(Class<?> service, String className, Throwable throwable) {
         if (throwable instanceof NoClassDefFoundError) {
             if (throwable.getMessage().contains("javafx")) {
-                log.error(
-                        "Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing. " +
-                                "Add JavaFX to your Java installation if you want to use renderer: {}",
-                        className, service, className, throwable
-                );
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "Unable to load class {} for interface {}. The class depends on JavaFX which is missing in the current JVM. " +
+                                    "Use JVM distribution with JavaFX, or add it as a library for the class to work",
+                            className, service, throwable
+                    );
+                } else {
+                    log.info(
+                            "Class {} depends on JavaFX which is missing in the current JVM. " +
+                                    "Use JVM distribution with JavaFX, or add it as a library for the class to work",
+                            className
+                    );
+                }
             } else {
                 log.error(
                         "Exception registering implementation: [{}] of interface: [{}], a dependency used by the plugin class is missing",

From 5f2762c17b716c523ac3015af45211bac1db9fd3 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 29 Jun 2023 07:32:49 +0000
Subject: [PATCH 0588/1037] chore(deps): update plugin
 com.gradle.common-custom-user-data-gradle-plugin to v1.11

Fixes https://github.com/apache/jmeter/pull/6022
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ab44f2a932..a8f897d5da8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.enterprise") version "3.13.4"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
@@ -147,8 +147,8 @@ val expectedSha512 = mapOf(
         to "JavaEWAH-1.1.12.jar",
     "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
         to "JavaEWAH-1.1.13.jar",
-    "F9ED8AA41A3B085F534B5298DD9552773AA5D4194C60C1C6299F7EAC82CBD02C26C834CDE7D9B00605D5DF85F50FDE2A144653F1186B9BFC916D84569230518"
-        to "common-custom-user-data-gradle-plugin-1.10.jar",
+    "761746DE12A20A9D04D395D1454220636770FE33399A49AE2D2F8E22177B261A9884FC36CB47F13CCBE5A9E9644A4EC9B1E0F657BA12ACA95E603D3A5C29E60B"
+        to "common-custom-user-data-gradle-plugin-1.11.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"

From 143ac9681a4bd16df56b4ef578ca265840407e15 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 29 Jun 2023 07:32:53 +0000
Subject: [PATCH 0589/1037] fix(deps): update org.checkerframework

Fixes https://github.com/apache/jmeter/pull/6023
---
 build-logic/checksum.xml                                   | 7 ++-----
 build-logic/verification/build.gradle.kts                  | 2 +-
 .../main/kotlin/build-logic.checkerframework.gradle.kts    | 2 +-
 checksum.xml                                               | 7 ++-----
 src/bom-thirdparty/build.gradle.kts                        | 2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 5448d553a1e..9c2f78f61d2 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -94,11 +94,8 @@
     <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
       <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
     </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
-      <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.27'>
-      <sha512>2FE56362DD1FD89C2183E7C27ED6AECAEE2795FABD3CE2849EAFC86D12AB2AF4346D80C30A25536556736D6092A369CFDE05D979E97B74267DC7D57DABBDD075</sha512>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
+      <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
     </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index ff7d741d51f..b40fcecfce0 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.27")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.28")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index 88ac070c2ee..11fc8723c05 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.34.0"
+        val checkerframeworkVersion = "3.35.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/checksum.xml b/checksum.xml
index 8ac0c334253..b0e6bc50d78 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -295,11 +295,8 @@
     <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
       <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
     </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.26'>
-      <sha512>D72392AFFCF4F5147AC268D506341A2EBC5F96C6B43D2E8FE22EC1774228E3D60BF36FA21A81E17B2E5B0F64955012E8783645744D9C9C60196A55B7E810951D</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.27'>
-      <sha512>2FE56362DD1FD89C2183E7C27ED6AECAEE2795FABD3CE2849EAFC86D12AB2AF4346D80C30A25536556736D6092A369CFDE05D979E97B74267DC7D57DABBDD075</sha512>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
+      <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
     </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 98867e132e9..a5cbfa3fb85 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.34.0")
+        api("org.checkerframework:checker-qual:3.35.0")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }

From 7450e4b0497c9a37c44852912e8d3dc2d0ee644e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 26 Jun 2023 18:17:07 +0300
Subject: [PATCH 0590/1037] fix: use UTF-8 as a default encoding in HTTP
 sampler

In PR 5987 HTTP sampler encoded filenames with percent encoding,
however, it should not encode all the characters.

Fixes https://github.com/apache/jmeter/issues/6005
This is a fixup to https://github.com/apache/jmeter/pull/5987
---
 bin/testfiles/HTMLParserTestFile_2.xml        |  16 +-
 bin/testfiles/TEST_HTTP.jmx                   |   4 +-
 .../apache/jmeter/samplers/SampleResult.java  |   2 +-
 .../http/proxy/DefaultSamplerCreator.java     |  32 +-
 .../protocol/http/proxy/HttpRequestHdr.java   |   2 +-
 .../protocol/http/sampler/HTTPHC4Impl.java    |  85 ++----
 .../http/sampler/HTTPSamplerBase.java         |   6 +-
 .../protocol/http/sampler/PostWriter.java     | 191 +++++-------
 .../protocol/http/sampler/PutWriter.java      |   3 -
 .../protocol/http/util/ConversionUtils.java   |  84 ++++-
 .../http/sampler/HTTPSamplerBaseSchema.kt     |   3 +-
 .../http/proxy/TestHttpRequestHdr.java        |  63 ++--
 .../protocol/http/sampler/PostWriterTest.java |  14 +-
 ...stHTTPSamplersAgainstHttpMirrorServer.java |  40 +--
 .../protocol/http/sampler/HttpSamplerTest.kt  | 289 +++++++++++++++++-
 .../protocol/http/util/ConversionUtilsTest.kt |  49 ++-
 xdocs/changes.xml                             |   1 +
 17 files changed, 583 insertions(+), 301 deletions(-)

diff --git a/bin/testfiles/HTMLParserTestFile_2.xml b/bin/testfiles/HTMLParserTestFile_2.xml
index 3a47e4de8ab..36dc54f77f4 100644
--- a/bin/testfiles/HTMLParserTestFile_2.xml
+++ b/bin/testfiles/HTMLParserTestFile_2.xml
@@ -10,7 +10,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2.html</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="1321" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="1321" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -29,7 +29,7 @@
       <queryString class="java.lang.String"></queryString>
       <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL>
     </httpSample>
-    <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="5421" sc="1" ec="0" ng="0" na="0">
+    <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="5421" sc="1" ec="0" ng="0" na="0">
       <responseHeader class="java.lang.String"></responseHeader>
       <requestHeader class="java.lang.String"></requestHeader>
       <responseFile class="java.lang.String"></responseFile>
@@ -46,7 +46,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-3" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8584" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-3" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="8584" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -55,7 +55,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/jakarta-logo.gif</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-4" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8886" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-4" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="8886" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -64,7 +64,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/logo.jpg</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-5" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3064" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-5" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="3064" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -73,7 +73,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/http-config-example.png</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-6" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2395" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-6" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="2395" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -82,7 +82,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping1.png</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-7" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2641" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-7" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="2641" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
@@ -91,7 +91,7 @@
     <queryString class="java.lang.String"></queryString>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping2.png</java.net.URL>
   </httpSample>
-  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-8" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3260" sc="1" ec="0" ng="1" na="1">
+  <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-8" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="3260" sc="1" ec="0" ng="1" na="1">
     <responseHeader class="java.lang.String"></responseHeader>
     <requestHeader class="java.lang.String"></requestHeader>
     <responseFile class="java.lang.String"></responseFile>
diff --git a/bin/testfiles/TEST_HTTP.jmx b/bin/testfiles/TEST_HTTP.jmx
index 30e7ae16fd2..da93b79e0a8 100644
--- a/bin/testfiles/TEST_HTTP.jmx
+++ b/bin/testfiles/TEST_HTTP.jmx
@@ -932,7 +932,7 @@ mirrorServer.start();</stringProp>
             <stringProp name="cacheKey">true</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
-            <stringProp name="script">String textToCheck =  &apos;Content-Disposition: form-data; name=&quot;?_param&quot;&apos;;
+            <stringProp name="script">String textToCheck =  &apos;Content-Disposition: form-data; name=&quot;安_param&quot;&apos;;
 if(prev.getSamplerData().indexOf(textToCheck) &lt; 0) {
 	AssertionResult.setFailure(true);
 	AssertionResult.setFailureMessage(&quot;Request does not contains &apos;&quot;+textToCheck+&quot;&apos;&quot;);
@@ -1005,7 +1005,7 @@ if(prev.getSamplerData().indexOf(textToCheck) &lt; 0) {
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
               <stringProp name="-1049865380">nv_contentType</stringProp>
-              <stringProp name="817335912">text/plain</stringProp>
+              <stringProp name="1947100436">text/plain; charset=UTF-8</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index 2518f26c318..137755b8f47 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -56,7 +56,7 @@ public class SampleResult implements Serializable, Cloneable, Searchable {
      * The default encoding to be used if not overridden.
      * The value is ISO-8859-1.
      */
-    public static final String DEFAULT_HTTP_ENCODING = StandardCharsets.ISO_8859_1.name();
+    public static final String DEFAULT_HTTP_ENCODING = StandardCharsets.UTF_8.name();
 
     private static final String OK_CODE = Integer.toString(HttpURLConnection.HTTP_OK);
     private static final String OK_MSG = "OK"; // $NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index a972399ca9b..75206a91080 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -43,7 +43,6 @@
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
-import org.apache.jmeter.protocol.http.sampler.PostWriter;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jmeter.protocol.http.util.GraphQLRequestParamUtils;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -218,24 +217,10 @@ protected void computeFromPostBody(HTTPSamplerBase sampler,
             final String contentType = request.getContentType();
             MultipartUrlConfig urlConfig = request.getMultipartConfig(contentType);
             String contentEncoding = sampler.getContentEncoding();
-            // Get the post data using the content encoding of the request
-            String postData = null;
-            if (log.isDebugEnabled()) {
-                if(!StringUtils.isEmpty(contentEncoding)) {
-                    log.debug("Using encoding {} for request body", contentEncoding);
-                }
-                else {
-                    log.debug("No encoding found, using JRE default encoding for request body");
-                }
-            }
-
+            log.debug("Using encoding {} for request body", contentEncoding);
 
-            if (!StringUtils.isEmpty(contentEncoding)) {
-                postData = new String(request.getRawPostData(), contentEncoding);
-            } else {
-                // Use default encoding
-                postData = new String(request.getRawPostData(), PostWriter.ENCODING);
-            }
+            // Get the post data using the content encoding of the request
+            String postData = new String(request.getRawPostData(), contentEncoding);
 
             if (urlConfig != null) {
                 urlConfig.parseArguments(postData);
@@ -436,16 +421,7 @@ private static String getNumberedFormat(int httpSampleNameMode) {
      * @param request {@link HttpRequestHdr}
      */
     protected void computePath(HTTPSamplerBase sampler, HttpRequestHdr request) {
-        if(sampler.getContentEncoding() != null) {
-            sampler.setPath(request.getPath(), sampler.getContentEncoding());
-        }
-        else {
-            // Although the spec says UTF-8 should be used for encoding URL parameters,
-            // most browser use ISO-8859-1 for default if encoding is not known.
-            // We use null for contentEncoding, then the url parameters will be added
-            // with the value in the URL, and the "encode?" flag set to false
-            sampler.setPath(request.getPath(), null);
-        }
+        sampler.setPath(request.getPath(), sampler.getContentEncoding());
         if (log.isDebugEnabled()) {
             log.debug("Proxy: finished setting path: {}", sampler.getPath());
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index 0532d5adcdb..b118ea659fe 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -165,7 +165,7 @@ public byte[] parse(InputStream in) throws IOException {
                     inHeaders = false;
                     firstLine = false; // cannot be first line either
                 }
-                final String reqLine = line.toString(StandardCharsets.ISO_8859_1.name());
+                final String reqLine = line.toString(StandardCharsets.UTF_8.name());
                 if (firstLine) {
                     parseFirstLine(reqLine);
                     firstLine = false;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 09c9d875f6f..bc4478eecb3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -103,7 +103,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.FormBodyPart;
 import org.apache.http.entity.mime.FormBodyPartBuilder;
-import org.apache.http.entity.mime.MIME;
+import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.StringBody;
@@ -151,7 +151,6 @@
 import org.apache.jmeter.protocol.http.sampler.hc.LaxGZIPInputStream;
 import org.apache.jmeter.protocol.http.sampler.hc.LazyLayeredConnectionSocketFactory;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jmeter.protocol.http.util.EncoderCache;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
@@ -1508,13 +1507,18 @@ private static class ViewableFileBody extends FileBody {
                 "<actual file content, not shown here>".getBytes(StandardCharsets.UTF_8);
         private boolean hideFileData;
 
-        public ViewableFileBody(File file, ContentType contentType) {
-            // Note: HttpClient4 does not support encoding the file name, so we explicitly encode it here
+        public ViewableFileBody(File file, ContentType contentType, Charset charset) {
+            // Note: HttpClient4 does not support encoding the file name, and it always encodes names in IS88
             // See https://issues.apache.org/jira/browse/HTTPCLIENT-293
-            super(file, contentType, ConversionUtils.percentEncode(file.getName()));
+            super(file, contentType, encodeFilename(file.getName(), charset));
             hideFileData = false;
         }
 
+        private static String encodeFilename(String fileName, Charset charset) {
+            return ConversionUtils.percentEncode(
+                    ConversionUtils.encodeWithEntities(fileName, charset));
+        }
+
         @Override
         public void writeTo(final OutputStream out) throws IOException {
             if (hideFileData) {
@@ -1535,8 +1539,9 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
         StringBuilder postedBody = new StringBuilder(1000);
         HTTPFileArg[] files = getHTTPFiles();
 
-        final String contentEncoding = getContentEncodingOrNull();
-        final boolean haveContentEncoding = contentEncoding != null;
+        final String contentEncoding = getContentEncoding();
+        Charset charset = Charset.forName(contentEncoding);
+        final boolean haveContentEncoding = true;
 
         // Check if we should do a multipart/form-data or an
         // application/x-www-form-urlencoded post request
@@ -1547,25 +1552,22 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
                         Arrays.asList(entityEnclosingRequest.getHeaders(HTTPConstants.HEADER_CONTENT_TYPE)));
                 entityEnclosingRequest.removeHeaders(HTTPConstants.HEADER_CONTENT_TYPE);
             }
-            // If a content encoding is specified, we use that as the
-            // encoding of any parameter values
-            Charset charset;
-            if(haveContentEncoding) {
-                charset = Charset.forName(contentEncoding);
-            } else {
-                charset = MIME.DEFAULT_CHARSET;
-            }
 
+            // doBrowserCompatibleMultipart means "use charset for encoding MIME headers",
+            // while RFC6532 means "use UTF-8 for encoding MIME headers"
+            boolean doBrowserCompatibleMultipart = getDoBrowserCompatibleMultipart();
             if(log.isDebugEnabled()) {
                 log.debug("Building multipart with:getDoBrowserCompatibleMultipart(): {}, with charset:{}, haveContentEncoding:{}",
-                        getDoBrowserCompatibleMultipart(), charset, haveContentEncoding);
+                        doBrowserCompatibleMultipart, charset, haveContentEncoding);
             }
             // Write the request to our own stream
             MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
-            if(getDoBrowserCompatibleMultipart()) {
+            multipartEntityBuilder.setCharset(charset);
+            if (doBrowserCompatibleMultipart) {
                 multipartEntityBuilder.setLaxMode();
             } else {
-                multipartEntityBuilder.setStrictMode();
+                // Use UTF-8 for encoding header names and values
+                multipartEntityBuilder.setMode(HttpMultipartMode.RFC6532);
             }
             // Create the parts
             // Add any parameters
@@ -1596,7 +1598,8 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
                 HTTPFileArg file = files[i];
 
                 File reservedFile = FileServer.getFileServer().getResolvedFile(file.getPath());
-                fileBodies[i] = new ViewableFileBody(reservedFile, ContentType.parse(file.getMimeType()));
+                Charset filenameCharset = doBrowserCompatibleMultipart ? charset : StandardCharsets.UTF_8;
+                fileBodies[i] = new ViewableFileBody(reservedFile, ContentType.parse(file.getMimeType()), filenameCharset);
                 multipartEntityBuilder.addPart(file.getParamName(), fileBodies[i] );
             }
 
@@ -1652,12 +1655,7 @@ else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
                     StringBuilder postBody = new StringBuilder();
                     for (JMeterProperty jMeterProperty : getArguments()) {
                         HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
-                        // Note: if "Encoded?" is not selected, arg.getEncodedValue is equivalent to arg.getValue
-                        if (haveContentEncoding) {
-                            postBody.append(arg.getEncodedValue(contentEncoding));
-                        } else {
-                            postBody.append(arg.getEncodedValue());
-                        }
+                        postBody.append(arg.getEncodedValue(contentEncoding));
                     }
                     // Let StringEntity perform the encoding
                     StringEntity requestEntity = new StringEntity(postBody.toString(), contentEncoding);
@@ -1669,8 +1667,7 @@ else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
                     if(!hasContentTypeHeader && ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
                         entityEnclosingRequest.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
                     }
-                    String urlContentEncoding = contentEncoding;
-                    UrlEncodedFormEntity entity = createUrlEncodedFormEntity(urlContentEncoding);
+                    UrlEncodedFormEntity entity = createUrlEncodedFormEntity(contentEncoding);
                     entityEnclosingRequest.setEntity(entity);
                     writeEntityToSB(postedBody, entity, EMPTY_FILE_BODIES, contentEncoding);
                 }
@@ -1742,7 +1739,7 @@ protected String sendEntityData( HttpEntityEnclosingRequestBase entity) throws I
 
         // Check for local contentEncoding (charset) override; fall back to default for content body
         // we do this here rather so we can use the same charset to retrieve the data
-        final String charset = getContentEncoding(HTTP.DEF_CONTENT_CHARSET.name());
+        final String charset = getContentEncoding();
 
         // Only create this if we are overriding whatever default there may be
         // If there are no arguments, we can send a file as the body of the request
@@ -1775,7 +1772,7 @@ else if(getSendParameterValuesAsPostBody()) {
             entity.setEntity(requestEntity);
         } else if (hasArguments()) {
             hasEntityBody = true;
-            entity.setEntity(createUrlEncodedFormEntity(getContentEncodingOrNull()));
+            entity.setEntity(createUrlEncodedFormEntity(getContentEncoding()));
         }
         // Check if we have any content to send for body
         if(hasEntityBody) {
@@ -1792,20 +1789,15 @@ else if(getSendParameterValuesAsPostBody()) {
 
     /**
      * Create UrlEncodedFormEntity from parameters
-     * @param contentEncoding Content encoding may be null or empty
+     * @param urlContentEncoding Content encoding may be null or empty
      * @return {@link UrlEncodedFormEntity}
      * @throws UnsupportedEncodingException
      */
-    private UrlEncodedFormEntity createUrlEncodedFormEntity(final String contentEncoding) throws UnsupportedEncodingException {
+    private UrlEncodedFormEntity createUrlEncodedFormEntity(final String urlContentEncoding) throws UnsupportedEncodingException {
         // It is a normal request, with parameter names and values
         // Add the parameters
         PropertyIterator args = getArguments().iterator();
         List<NameValuePair> nvps = new ArrayList<>();
-        String urlContentEncoding = contentEncoding;
-        if (urlContentEncoding == null || urlContentEncoding.length() == 0) {
-            // Use the default encoding for urls
-            urlContentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
-        }
         while (args.hasNext()) {
             HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
             // The HTTPClient always urlencodes both name and value,
@@ -1830,27 +1822,6 @@ private UrlEncodedFormEntity createUrlEncodedFormEntity(final String contentEnco
         return new UrlEncodedFormEntity(nvps, urlContentEncoding);
     }
 
-
-    /**
-     * @return the value of {@link #getContentEncoding()}; forced to null if empty
-     */
-    private String getContentEncodingOrNull() {
-        return getContentEncoding(null);
-    }
-
-    /**
-     * @param dflt the default to be used
-     * @return the value of {@link #getContentEncoding()}; default if null or empty
-     */
-    private String getContentEncoding(String dflt) {
-        String ce = getContentEncoding();
-        if (isNullOrEmptyTrimmed(ce)) {
-            return dflt;
-        } else {
-            return ce;
-        }
-    }
-
     private static void saveConnectionCookies(HttpResponse method, URL u, CookieManager cookieManager) {
         if (cookieManager != null) {
             Header[] hdrs = method.getHeaders(HTTPConstants.HEADER_SET_COOKIE);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 7efb81e4e6c..3b3b37d0141 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -558,7 +558,11 @@ public void setContentEncoding(String charsetName) {
      * @return the encoding of the content, i.e. its charset name
      */
     public String getContentEncoding() {
-        return get(getSchema().getContentEncoding());
+        String encoding = get(getSchema().getContentEncoding());
+        if (encoding.isEmpty()) {
+            return getSchema().getContentEncoding().getDefaultValue();
+        }
+        return encoding;
     }
 
     public void setUseKeepAlive(boolean value) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index c604c760ef3..60d01217525 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -22,8 +22,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.URLConnection;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -32,7 +34,6 @@
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
-import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 
 /**
@@ -49,7 +50,9 @@ public class PostWriter {
 
     private static final byte[] CRLF = { 0x0d, 0x0A };
 
-    public static final String ENCODING = StandardCharsets.ISO_8859_1.name();
+    private static final String CRLF_STRING = "\r\n";
+
+    public static final String ENCODING = StandardCharsets.UTF_8.name();
 
     /** The form data that is going to be sent as url encoded */
     protected byte[] formDataUrlEncoded;
@@ -58,6 +61,9 @@ public class PostWriter {
     /** The boundary string for multipart */
     private final String boundary;
 
+    private final String multipartDivider;
+    private final byte[] multipartDividerBytes;
+
     /**
      * Constructor for PostWriter.
      * Uses the PostWriter.BOUNDARY as the boundary string
@@ -74,6 +80,8 @@ public PostWriter() {
      */
     public PostWriter(String boundary) {
         this.boundary = boundary;
+        this.multipartDivider = DASH_DASH + boundary;
+        this.multipartDividerBytes = multipartDivider.getBytes(StandardCharsets.UTF_8);
     }
 
     /**
@@ -94,9 +102,6 @@ public String sendPostData(URLConnection connection, HTTPSamplerBase sampler) th
         HTTPFileArg[] files = sampler.getHTTPFiles();
 
         String contentEncoding = sampler.getContentEncoding();
-        if(contentEncoding == null || contentEncoding.length() == 0) {
-            contentEncoding = ENCODING;
-        }
 
         // Check if we should do a multipart/form-data or an
         // application/x-www-form-urlencoded post request
@@ -111,11 +116,16 @@ public String sendPostData(URLConnection connection, HTTPSamplerBase sampler) th
             postedBody.append(new String(formDataPostBody, contentEncoding));
 
             // Add any files
-            for (int i=0; i < files.length; i++) {
-                HTTPFileArg file = files[i];
+            for (HTTPFileArg file : files) {
+                out.write(multipartDividerBytes);
+                out.write(CRLF);
+                postedBody.append(multipartDivider);
+                postedBody.append("\r\n");
+
                 // First write the start multipart file
                 final String headerValue = file.getHeader();
-                byte[] header = headerValue.getBytes(ENCODING);
+                // TODO: reuse the bytes prepared in org.apache.jmeter.protocol.http.sampler.PostWriter.setHeaders
+                byte[] header = headerValue.getBytes(contentEncoding);
                 out.write(header);
                 // Retrieve the formatted data using the same encoding used to create it
                 postedBody.append(headerValue);
@@ -123,22 +133,15 @@ public String sendPostData(URLConnection connection, HTTPSamplerBase sampler) th
                 writeFileToStream(file.getPath(), out);
                 // We just add placeholder text for file content
                 postedBody.append("<actual file content, not shown here>"); // $NON-NLS-1$
-                // Write the end of multipart file
-                byte[] fileMultipartEndDivider = getFileMultipartEndDivider();
-                out.write(fileMultipartEndDivider);
-                // Retrieve the formatted data using the same encoding used to create it
-                postedBody.append(new String(fileMultipartEndDivider, ENCODING));
-                if(i + 1 < files.length) {
-                    out.write(CRLF);
-                    postedBody.append(new String(CRLF, SampleResult.DEFAULT_HTTP_ENCODING));
-                }
+                out.write(CRLF);
+                postedBody.append(CRLF_STRING);
             }
-            // Write end of multipart
-            byte[] multipartEndDivider = getMultipartEndDivider();
-            out.write(multipartEndDivider);
-            postedBody.append(new String(multipartEndDivider, ENCODING));
-
-            out.flush();
+            // Write end of multipart: --, boundary, --, CRLF
+            out.write(multipartDividerBytes);
+            out.write(DASH_DASH_BYTES);
+            out.write(CRLF);
+            postedBody.append(multipartDivider);
+            postedBody.append("--\r\n");
             out.close();
         }
         else {
@@ -172,9 +175,6 @@ else if (formDataUrlEncoded != null){ // may be null for PUT
     public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws IOException {
         // Get the encoding to use for the request
         String contentEncoding = sampler.getContentEncoding();
-        if(contentEncoding == null || contentEncoding.length() == 0) {
-            contentEncoding = ENCODING;
-        }
         long contentLength = 0L;
         HTTPFileArg[] files = sampler.getHTTPFiles();
 
@@ -188,9 +188,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
 
             // Write the form section
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-            // First the multipart start divider
-            bos.write(getMultipartDivider());
+            OutputStreamWriter osw = new OutputStreamWriter(bos, contentEncoding);
             // Add any parameters
             for (JMeterProperty jMeterProperty : sampler.getArguments()) {
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
@@ -198,49 +196,40 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
                 if (arg.isSkippable(parameterName)) {
                     continue;
                 }
-                // End the previous multipart
-                bos.write(CRLF);
                 // Write multipart for parameter
-                writeFormMultipart(bos, parameterName, arg.getValue(), contentEncoding, sampler.getDoBrowserCompatibleMultipart());
+                writeFormMultipart(osw, contentEncoding, parameterName, arg.getValue(), sampler.getDoBrowserCompatibleMultipart());
             }
-            // If there are any files, we need to end the previous multipart
-            if(files.length > 0) {
-                // End the previous multipart
-                bos.write(CRLF);
-            }
-            bos.flush();
+            osw.flush();
             // Keep the content, will be sent later
             formDataPostBody = bos.toByteArray();
-            bos.close();
             contentLength = formDataPostBody.length;
 
             // Now we just construct any multipart for the files
             // We only construct the file multipart start, we do not write
             // the actual file content
-            for (int i=0; i < files.length; i++) {
+            for (int i = 0; i < files.length; i++) {
+                bos.reset();
+                contentLength += multipartDividerBytes.length + CRLF.length;
                 HTTPFileArg file = files[i];
                 // Write multipart for file
-                bos = new ByteArrayOutputStream();
-                writeStartFileMultipart(bos, file.getPath(), file.getParamName(), file.getMimeType());
-                bos.flush();
-                String header = bos.toString(contentEncoding);// TODO is this correct?
+                writeStartFileMultipart(osw, contentEncoding, file.getPath(), file.getParamName(), file.getMimeType());
+                osw.flush();
+                // Technically speaking, we should refrain from decoding the header to string
+                // since we will have to encode it again when sending the request
+                // However, HTTPFileArg#setHeaer(byte[]) does not exist yet
+                String header = bos.toString(contentEncoding);
                 // If this is not the first file we can't write its header now
                 // for simplicity we always save it, even if there is only one file
                 file.setHeader(header);
-                bos.close();
-                contentLength += header.length();
+                contentLength += bos.size();
                 // Add also the length of the file content
                 File uploadFile = new File(file.getPath());
                 contentLength += uploadFile.length();
-                // And the end of the file multipart
-                contentLength += getFileMultipartEndDivider().length;
-                if(i+1 < files.length) {
-                    contentLength += CRLF.length;
-                }
+                contentLength += CRLF.length;
             }
 
             // Add the end of multipart
-            contentLength += getMultipartEndDivider().length;
+            contentLength += multipartDividerBytes.length + DASH_DASH_BYTES.length + CRLF.length;
 
             // Set the content length
             connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_LENGTH, Long.toString(contentLength));
@@ -343,60 +332,33 @@ protected String getBoundary() {
         return boundary;
     }
 
-    /**
-     * Get the bytes used to separate multiparts
-     * Encoded using ENCODING
-     *
-     * @return the bytes used to separate multiparts
-     * @throws IOException
-     */
-    private byte[] getMultipartDivider() throws IOException {
-        return (DASH_DASH + getBoundary()).getBytes(ENCODING);
-    }
-
-    /**
-     * Get the bytes used to end a file multipart
-     * Encoded using ENCODING
-     *
-     * @return the bytes used to end a file multipart
-     * @throws IOException
-     */
-    private byte[] getFileMultipartEndDivider() throws IOException{
-        byte[] ending = getMultipartDivider();
-        byte[] completeEnding = new byte[ending.length + CRLF.length];
-        System.arraycopy(CRLF, 0, completeEnding, 0, CRLF.length);
-        System.arraycopy(ending, 0, completeEnding, CRLF.length, ending.length);
-        return completeEnding;
-    }
-
-    /**
-     * Get the bytes used to end the multipart request
-     *
-     * @return the bytes used to end the multipart request
-     */
-    private static byte[] getMultipartEndDivider(){
-        byte[] ending = DASH_DASH_BYTES;
-        byte[] completeEnding = new byte[ending.length + CRLF.length];
-        System.arraycopy(ending, 0, completeEnding, 0, ending.length);
-        System.arraycopy(CRLF, 0, completeEnding, ending.length, CRLF.length);
-        return completeEnding;
-    }
-
     /**
      * Write the start of a file multipart, up to the point where the
      * actual file content should be written
      */
-    private static void writeStartFileMultipart(OutputStream out, String filename,
+    private static void writeStartFileMultipart(
+            Writer out,
+            String contentEncoding,
+            String filePath,
             String nameField, String mimetype)
             throws IOException {
         write(out, "Content-Disposition: form-data; name=\""); // $NON-NLS-1$
-        write(out, nameField);
+        // See quoting in (line is wrapped to avoid checkstyle warnings)
+        // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/network/form_data_encoder.cc
+        // ;l=142;drc=4cd749d0d82138ff31ed3a2bc5d925bb6d83fe16
+        write(out, ConversionUtils.percentEncode(nameField));
         write(out, "\"; filename=\"");// $NON-NLS-1$
-        write(out, ConversionUtils.percentEncode(new File(filename).getName()));
+        String filename = new File(filePath).getName();
+        // See quoting in
+        // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/network/form_data_encoder.cc
+        // ;l=190;drc=4cd749d0d82138ff31ed3a2bc5d925bb6d83fe16
+        Charset charset = Charset.forName(contentEncoding);
+        write(out, ConversionUtils.percentEncode(ConversionUtils.encodeWithEntities(filename, charset)));
         writeln(out, "\""); // $NON-NLS-1$
-        writeln(out, "Content-Type: " + mimetype); // $NON-NLS-1$
+        write(out, "Content-Type: "); // $NON-NLS-1$
+        writeln(out, mimetype);
         writeln(out, "Content-Transfer-Encoding: binary"); // $NON-NLS-1$
-        out.write(CRLF);
+        out.write(CRLF_STRING);
     }
 
     /**
@@ -423,32 +385,33 @@ private static void writeFileToStream(String filename, OutputStream out) throws
     /**
      * Writes form data in multipart format.
      */
-    private void writeFormMultipart(OutputStream out, String name, String value, String charSet,
+    private void writeFormMultipart(
+            Writer out,
+            String contentEncoding,
+            String name, String value,
             boolean browserCompatibleMultipart)
         throws IOException {
-        writeln(out, "Content-Disposition: form-data; name=\"" + name + "\""); // $NON-NLS-1$ // $NON-NLS-2$
+        writeln(out, multipartDivider);
+        write(out, "Content-Disposition: form-data; name=\"");
+        write(out, ConversionUtils.percentEncode(name));
+        writeln(out, "\""); // $NON-NLS-1$ // $NON-NLS-2$
         if (!browserCompatibleMultipart){
-            writeln(out, "Content-Type: text/plain; charset=" + charSet); // $NON-NLS-1$
+            write(out, "Content-Type: text/plain; charset="); // $NON-NLS-1$
+            writeln(out, contentEncoding);
             writeln(out, "Content-Transfer-Encoding: 8bit"); // $NON-NLS-1$
         }
-        out.write(CRLF);
-        out.write(value.getBytes(charSet));
-        out.write(CRLF);
-        // Write boundary end marker
-        out.write(getMultipartDivider());
+        out.write(CRLF_STRING);
+        out.write(value);
+        out.write(CRLF_STRING);
     }
 
-    private static void write(OutputStream out, String value)
-    throws UnsupportedEncodingException, IOException
-    {
-        out.write(value.getBytes(ENCODING));
+    private static void write(Writer out, String value) throws IOException {
+        out.write(value);
     }
 
 
-    private static void writeln(OutputStream out, String value)
-    throws UnsupportedEncodingException, IOException
-    {
-        out.write(value.getBytes(ENCODING));
-        out.write(CRLF);
+    private static void writeln(Writer out, String value) throws IOException {
+        out.write(value);
+        out.write(CRLF_STRING);
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
index 1b46936df90..d6f5c87cd59 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
@@ -44,9 +44,6 @@ public PutWriter() {
     public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws IOException {
         // Get the encoding to use for the request
         String contentEncoding = sampler.getContentEncoding();
-        if(contentEncoding == null || contentEncoding.length() == 0) {
-            contentEncoding = ENCODING;
-        }
         long contentLength = 0L;
         boolean hasPutBody = false;
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index 2c71d8888af..add440fe693 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -22,7 +22,12 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -97,20 +102,85 @@ public static String getEncodingFromContentType(String contentType){
     }
 
     /**
-     * Encodes the string according to RFC7578 and RFC3986.
-     * The string is UTF-8 encoded, and non-ASCII bytes are represented as {@code %XX}.
-     * It is close to UrlEncode, however, {@code percentEncode} does not replace space with +.
+     * Encodes strings for {@code multipart/form-data} names and values.
+     * The encoding is {@code "} as {@code %22}, {@code CR} as {@code %0D}, and {@code LF} as {@code %0A}.
+     * Note: {@code %} is not encoded, so it creates ambiguity which might be resolved in a later specification version.
+     * @see <a href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">Multipart form data specification</a>
+     * @see <a href="https://github.com/whatwg/html/issues/7575">Escaping % in multipart/form-data</a>
      * @param value input value to convert
      * @return converted value
      * @since 5.6
      */
     @API(status = API.Status.MAINTAINED, since = "5.6")
     public static String percentEncode(String value) {
-        try {
-            return new URI(null, null, value, null).toASCIIString();
-        } catch (URISyntaxException e) {
-            throw new IllegalStateException("Can't encode value " + value, e);
+        if (value.indexOf('"') == -1 && value.indexOf('\r') == -1 && value.indexOf('\n') == -1) {
+            return value;
+        }
+        StringBuilder sb = new StringBuilder(value.length() + 2);
+        for (int i = 0; i < value.length(); i++) {
+            char c = value.charAt(i);
+            switch (c) {
+                case '"':
+                    sb.append("%22");
+                    break;
+                case 0x0A:
+                    sb.append("%0A");
+                    break;
+                case 0x0D:
+                    sb.append("%0D");
+                    break;
+                default:
+                    sb.append(c);
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Encodes non-encodable characters as HTML entities like e.g. &amp;#128514; for 😂.
+     * @param value value to encode
+     * @param charset charset that will be used for encoding, defaults to UTF-8 if null
+     * @return input value with non-encodable characters replaced with HTML entities
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6.1")
+    public static String encodeWithEntities(String value, Charset charset) {
+        // See the reason at
+        // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/network/form_data_encoder.cc;
+        // l=162-191;drc=4cd749d0d82138ff31ed3a2bc5d925bb6d83fe16
+
+        if (charset == null) {
+            charset = StandardCharsets.UTF_8;
+        }
+        CharsetEncoder encoder = charset.newEncoder();
+        if (encoder.canEncode(value)) {
+            // When the strinc can be encoded, leave it intact
+            return value;
+        }
+        // Some of the characters can't be encoded, so replace them with HTML entities
+        StringBuilder sb = new StringBuilder(value.length() + 10);
+        encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
+        CharBuffer input = CharBuffer.wrap(value);
+        ByteBuffer output = ByteBuffer.allocate(Math.min(1000, (int) (encoder.maxBytesPerChar() * value.length())));
+        int lastPos = 0;
+        while (input.position() < input.limit()) {
+            output.clear();
+            CoderResult cr = encoder.encode(input, output, true);
+
+            // Append successfully encoded chars
+            if (input.position() > lastPos) {
+                sb.append(value, lastPos, input.position());
+                lastPos = input.position();
+            }
+
+            if (cr.isUnmappable()) {
+                int codePoint = value.codePointAt(input.position());
+                sb.append("&#").append(codePoint);
+                input.position(input.position() + Character.charCount(codePoint));
+                lastPos = input.position();
+            }
         }
+        return sb.toString();
     }
 
     /**
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index ed67101b18a..587d9ed19f4 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -32,6 +32,7 @@ import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
 import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
 import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor
 import org.apiguardian.api.API
+import java.nio.charset.StandardCharsets
 
 /**
  * Lists properties of a [HTTPSamplerBase].
@@ -81,7 +82,7 @@ public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
     public val proxy: HTTPSamplerProxyParamsSchema<HTTPSamplerBaseSchema> by HTTPSamplerProxyParamsSchema()
 
     public val contentEncoding: StringPropertyDescriptor<HTTPSamplerBaseSchema>
-        by string("HTTPSampler.contentEncoding")
+        by string("HTTPSampler.contentEncoding", default = StandardCharsets.UTF_8.name())
 
     public val implementation: StringPropertyDescriptor<HTTPSamplerBaseSchema>
         by string("HTTPSampler.implementation")
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index cc4e609cab0..c0b1326b76e 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -24,7 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -215,16 +215,25 @@ private void testEncodedArguments(String url) throws Exception {
         // know the encoding for the page
         HTTPSamplerBase s = getSamplerForRequest(null, testGetRequest, null);
         assertEquals(HTTPConstants.GET, s.getMethod());
-        assertEquals(queryString, s.getQueryString());
-        assertEquals(contentEncoding, s.getContentEncoding());
+        // %20 and + are interchangeable in the URL, so we should expect any of them
+        String actualQueryString = s.getQueryString();
+        String alternativeExpectedQueryString = queryString.replaceAll("%20", "+");
+        if (!queryString.equals(actualQueryString) && !alternativeExpectedQueryString.equals(actualQueryString)) {
+            assertEquals(
+                    "%20 is the same as +, so expecting either " +
+                            queryString + " or " + alternativeExpectedQueryString,
+                    queryString,
+                    actualQueryString);
+        }
+        assertEquals("UTF-8", s.getContentEncoding());
 
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(3, arguments.getArgumentCount());
         // When the encoding is not known, the argument will get the encoded value, and the "encode?" set to false
-        checkArgument((HTTPArgument)arguments.getArgument(0), "abc%3FSPACE", "a+b", "a+b", contentEncoding, false);
-        checkArgument((HTTPArgument)arguments.getArgument(1), "space", "a%20b", "a%20b", contentEncoding, false);
-        checkArgument((HTTPArgument)arguments.getArgument(2), "query", "What%3F", "What%3F", contentEncoding, false);
+        checkArgument((HTTPArgument)arguments.getArgument(0), "abc?SPACE", "a b", "a+b", contentEncoding, true);
+        checkArgument((HTTPArgument)arguments.getArgument(1), "space", "a b", "a+b", contentEncoding, true);
+        checkArgument((HTTPArgument)arguments.getArgument(2), "query", "What?", "What%3F", contentEncoding, true);
 
         // A HTTP GET request, with UTF-8 encoding
         contentEncoding = "UTF-8";
@@ -258,17 +267,24 @@ private void testEncodedArguments(String url) throws Exception {
         // know the encoding for the page
         s = getSamplerForRequest(null, testPostRequest, null);
         assertEquals(HTTPConstants.POST, s.getMethod());
-        assertEquals(queryString, s.getQueryString());
-        assertEquals(contentEncoding, s.getContentEncoding());
+        alternativeExpectedQueryString = expectedQueryString.replaceAll("%20", "+");
+        if (!queryString.equals(actualQueryString) && !alternativeExpectedQueryString.equals(actualQueryString)) {
+            assertEquals(
+                    "%20 is the same as +, so expecting either " +
+                            queryString + " or " + alternativeExpectedQueryString,
+                    queryString,
+                    actualQueryString);
+        }
+        assertEquals("UTF-8", s.getContentEncoding());
         assertFalse(s.getDoMultipart());
 
         // Check arguments
         arguments = s.getArguments();
         assertEquals(3, arguments.getArgumentCount());
         // When the encoding is not known, the argument will get the encoded value, and the "encode?" set to false
-        checkArgument((HTTPArgument)arguments.getArgument(0), "abc%3FSPACE", "a+b", "a+b", contentEncoding, false);
-        checkArgument((HTTPArgument)arguments.getArgument(1), "space", "a%20b", "a%20b", contentEncoding, false);
-        checkArgument((HTTPArgument)arguments.getArgument(2), "query", "What%3F", "What%3F", contentEncoding, false);
+        checkArgument((HTTPArgument)arguments.getArgument(0), "abc?SPACE", "a b", "a+b", contentEncoding, true);
+        checkArgument((HTTPArgument)arguments.getArgument(1), "space", "a b", "a+b", contentEncoding, true);
+        checkArgument((HTTPArgument)arguments.getArgument(2), "query", "What?", "What%3F", contentEncoding, true);
 
         // A HTTP POST request, with UTF-8 encoding
         contentEncoding = "UTF-8";
@@ -318,13 +334,13 @@ private void testGetRequestEncodings(String url) throws Exception {
         // know the encoding for the page
         HTTPSamplerBase s = getSamplerForRequest(null, testGetRequest, null);
         assertEquals(HTTPConstants.GET, s.getMethod());
-        assertEquals(contentEncoding, s.getContentEncoding());
+        assertEquals("Default content encoding is UTF-8", "UTF-8", s.getContentEncoding());
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(2, arguments.getArgumentCount());
         checkArgument((HTTPArgument)arguments.getArgument(0), "param1", param1Value, param1Value, contentEncoding, false);
-        // When the encoding is not known, the argument will get the encoded value, and the "encode?" set to false
-        checkArgument((HTTPArgument)arguments.getArgument(1), "param2", param2ValueEncoded, param2ValueEncoded, contentEncoding, false);
+        // When the encoding is not known, it should assume UTF-8 by default
+        checkArgument((HTTPArgument)arguments.getArgument(1), "param2", param2Value, param2ValueEncoded, contentEncoding, true);
 
         // A HTTP GET request, with UTF-8 encoding
         contentEncoding = "UTF-8";
@@ -384,13 +400,13 @@ public void testPostRequestEncodings() throws Exception {
         // know the encoding for the page
         HTTPSamplerBase s = getSamplerForRequest(null, testPostRequest, null);
         assertEquals(HTTPConstants.POST, s.getMethod());
-        assertEquals(contentEncoding, s.getContentEncoding());
+        assertEquals("Default content encoding is UTF-8", "UTF-8", s.getContentEncoding());
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(2, arguments.getArgumentCount());
         checkArgument((HTTPArgument)arguments.getArgument(0), "param1", param1Value, param1Value, contentEncoding, false);
-        // When the encoding is not known, the argument will get the encoded value, and the "encode?" set to false
-        checkArgument((HTTPArgument)arguments.getArgument(1), "param2", param2ValueEncoded, param2ValueEncoded, contentEncoding, false);
+        // When the encoding is not known, we expect UTF-8 by default
+        checkArgument((HTTPArgument)arguments.getArgument(1), "param2", param2Value, param2ValueEncoded, contentEncoding, true);
 
         // A HTTP POST request, with UTF-8 encoding
         contentEncoding = "UTF-8";
@@ -638,11 +654,10 @@ private HTTPSamplerBase getSamplerForRequest(String url, String request, String
         ByteArrayInputStream bis = null;
         if(contentEncoding != null) {
             bis = new ByteArrayInputStream(request.getBytes(contentEncoding));
-
         }
         else {
-            // Most browsers use ISO-8859-1 as default encoding, even if spec says UTF-8
-            bis = new ByteArrayInputStream(request.getBytes("ISO-8859-1"));
+            // Most browsers use UTF-8 by default
+            bis = new ByteArrayInputStream(request.getBytes(StandardCharsets.UTF_8));
         }
         req.parse(bis);
         bis.close();
@@ -671,8 +686,8 @@ private void checkArgument(
             assertEquals(expectedEncodedValue, arg.getEncodedValue(contentEncoding));
         }
         else {
-            // Most browsers use ISO-8859-1 as default encoding, even if spec says UTF-8
-            assertEquals(expectedEncodedValue, arg.getEncodedValue("ISO-8859-1"));
+            // Most browsers use UTF-8 as default encoding
+            assertEquals(expectedEncodedValue, arg.getEncodedValue(StandardCharsets.UTF_8.name()));
         }
         assertPrimitiveEquals(expectedEncoded, arg.isAlwaysEncoded());
     }
@@ -682,8 +697,8 @@ private int getBodyLength(String postBody, String contentEncoding) throws IOExce
             return postBody.getBytes(contentEncoding).length;
         }
         else {
-            // Most browsers use ISO-8859-1 as default encoding, even if spec says UTF-8
-            return postBody.getBytes(Charset.defaultCharset()).length; // TODO - charset?
+            // Most browsers use UTF-8
+            return postBody.getBytes(StandardCharsets.UTF_8).length; // TODO - charset?
         }
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
index 8de0d14c694..cae9635384e 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
@@ -114,8 +114,8 @@ public void testSendPostData() throws IOException {
 
         checkContentTypeMultipart(connection, PostWriter.BOUNDARY);
         byte[] expectedFormBody = createExpectedOutput(PostWriter.BOUNDARY, null, titleValue, descriptionValue, TEST_FILE_CONTENT);
-        checkContentLength(connection, expectedFormBody.length);
         checkArraysHaveSameContent(expectedFormBody, connection.getOutputStreamContent());
+        checkContentLength(connection, expectedFormBody.length);
         connection.disconnect();
 
         // Test sending data as ISO-8859-1
@@ -545,14 +545,14 @@ public void testSendFormData_Urlencoded() throws IOException {
 
         checkNoContentType(connection);
         StringBuilder sb = new StringBuilder();
-        expectedUrl = sb.append("title=").append(titleValue.replaceAll("%20", "+").replaceAll("%C3%85", "%C5"))
-                .append("&description=").append(descriptionValue.replaceAll("%C3%85", "%C5")).toString().getBytes("US-ASCII");
-        checkContentLength(connection, expectedUrl.length);
+        expectedUrl = sb.append("title=").append(titleValue.replaceAll("%20", "+"))
+                .append("&description=").append(descriptionValue).toString().getBytes(StandardCharsets.UTF_8);
         checkArraysHaveSameContent(expectedUrl, connection.getOutputStreamContent());
+        checkContentLength(connection, expectedUrl.length);
         assertEquals(
-                // HTTPSampler uses ISO-8859-1 as default encoding
-                URLDecoder.decode(new String(expectedUrl, "US-ASCII"), "ISO-8859-1"),
-                URLDecoder.decode(new String(connection.getOutputStreamContent(), "US-ASCII"), "ISO-8859-1"));
+                // HTTPSampler uses UTF-8 as default encoding
+                URLDecoder.decode(new String(expectedUrl, StandardCharsets.UTF_8), "UTF-8"),
+                URLDecoder.decode(new String(connection.getOutputStreamContent(), StandardCharsets.UTF_8), "UTF-8"));
         connection.disconnect();
 
         // Test sending data as ISO-8859-1
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 1ca676f0c6b..1467ce5affe 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -70,6 +70,8 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
     private static final String ISO_8859_1 = "ISO-8859-1"; // $NON-NLS-1$
     private static final String US_ASCII = "US-ASCII"; // $NON-NLS-1$
 
+    private static final String DEFAULT_HTTP_CONTENT_ENCODING = StandardCharsets.UTF_8.name();
+
     private static final String CONTENT_TYPE_TEXT_PLAIN = "text/plain";
 
     private static final byte[] CRLF = {0x0d, 0x0A};
@@ -151,21 +153,21 @@ public void itemised_testPostRequest_UrlEncoded3() throws Exception {
     }
 
     public void testPostRequest_FormMultipart_0() throws Exception {
-        testPostRequest_FormMultipart(HTTP_SAMPLER, ISO_8859_1);
+        testPostRequest_FormMultipart(HTTP_SAMPLER);
     }
 
     public void testPostRequest_FormMultipart3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
-        testPostRequest_FormMultipart(HTTP_SAMPLER3, US_ASCII);
+        testPostRequest_FormMultipart(HTTP_SAMPLER3);
     }
 
     public void testPostRequest_FileUpload() throws Exception {
-        testPostRequest_FileUpload(HTTP_SAMPLER, ISO_8859_1);
+        testPostRequest_FileUpload(HTTP_SAMPLER);
     }
 
     public void testPostRequest_FileUpload3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
-        testPostRequest_FileUpload(HTTP_SAMPLER3, US_ASCII);
+        testPostRequest_FileUpload(HTTP_SAMPLER3);
     }
 
     public void testPostRequest_BodyFromParameterValues() throws Exception {
@@ -352,7 +354,7 @@ private void testPostRequest_UrlEncoded(int samplerType, String samplerDefaultEn
         }
     }
 
-    private void testPostRequest_FormMultipart(int samplerType, String samplerDefaultEncoding) throws Exception {
+    private void testPostRequest_FormMultipart(int samplerType) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -365,7 +367,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         setupFormData(sampler, false, titleField, titleValue, descriptionField, descriptionValue);
         sampler.setDoMultipart(true);
         HTTPSampleResult res = executeSampler(sampler);
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue);
 
@@ -376,7 +378,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         setupFormData(sampler, false, titleField, titleValue, descriptionField, descriptionValue);
         sampler.setDoMultipart(true);
         res = executeSampler(sampler);
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue);
 
@@ -389,7 +391,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         setupFormData(sampler, false, titleField, titleValue, descriptionField, descriptionValue);
         sampler.setDoMultipart(true);
         res = executeSampler(sampler);
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue);
 
@@ -403,7 +405,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         setupFormData(sampler, false, titleField, titleValue, descriptionField, descriptionValue);
         sampler.setDoMultipart(true);
         res = executeSampler(sampler);
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue);
 
@@ -418,7 +420,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         res = executeSampler(sampler);
         String expectedTitleValue = "mytitle/=";
         String expectedDescriptionValue = "mydescription   /\\";
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, expectedTitleValue,
                 descriptionField, expectedDescriptionValue);
 
@@ -431,7 +433,7 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         setupFormData(sampler, false, titleField, titleValue, descriptionField, descriptionValue);
         sampler.setDoMultipart(true);
         res = executeSampler(sampler);
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue);
 
@@ -459,12 +461,12 @@ private void testPostRequest_FormMultipart(int samplerType, String samplerDefaul
         res = executeSampler(sampler);
         expectedTitleValue = "a test\u00c5mytitle\u0153\u20a1\u0115\u00c5";
         expectedDescriptionValue = "mydescription\u0153\u20a1\u0115\u00c5the_end";
-        checkPostRequestFormMultipart(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFormMultipart(sampler, res,
                 contentEncoding, titleField, expectedTitleValue,
                 descriptionField, expectedDescriptionValue);
     }
 
-    private void testPostRequest_FileUpload(int samplerType, String samplerDefaultEncoding) throws Exception {
+    private void testPostRequest_FileUpload(int samplerType) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -480,7 +482,7 @@ private void testPostRequest_FileUpload(int samplerType, String samplerDefaultEn
                 descriptionField, descriptionValue, fileField, temporaryFile,
                 fileMimeType);
         HTTPSampleResult res = executeSampler(sampler);
-        checkPostRequestFileUpload(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFileUpload(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue, fileField, temporaryFile, fileMimeType,
                 TEST_FILE_CONTENT);
@@ -493,7 +495,7 @@ private void testPostRequest_FileUpload(int samplerType, String samplerDefaultEn
                 descriptionField, descriptionValue, fileField, temporaryFile,
                 fileMimeType);
         res = executeSampler(sampler);
-        checkPostRequestFileUpload(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFileUpload(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue, fileField, temporaryFile, fileMimeType,
                 TEST_FILE_CONTENT);
@@ -508,7 +510,7 @@ private void testPostRequest_FileUpload(int samplerType, String samplerDefaultEn
                 descriptionField, descriptionValue, fileField, temporaryFile,
                 fileMimeType);
         res = executeSampler(sampler);
-        checkPostRequestFileUpload(sampler, res, samplerDefaultEncoding,
+        checkPostRequestFileUpload(sampler, res,
                 contentEncoding, titleField, titleValue, descriptionField,
                 descriptionValue, fileField, temporaryFile, fileMimeType,
                 TEST_FILE_CONTENT);
@@ -868,14 +870,13 @@ private void checkPostRequestUrlEncoded(
     private void checkPostRequestFormMultipart(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
-            String samplerDefaultEncoding,
             String contentEncoding,
             String titleField,
             String titleValue,
             String descriptionField,
             String descriptionValue) throws IOException {
         if (contentEncoding == null || contentEncoding.isEmpty()) {
-            contentEncoding = samplerDefaultEncoding;
+            contentEncoding = DEFAULT_HTTP_CONTENT_ENCODING;
         }
         // Check URL
         assertEquals(sampler.getUrl(), res.getURL());
@@ -913,7 +914,6 @@ private void checkPostRequestFormMultipart(
     private void checkPostRequestFileUpload(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
-            String samplerDefaultEncoding,
             String contentEncoding,
             String titleField,
             String titleValue,
@@ -924,7 +924,7 @@ private void checkPostRequestFileUpload(
             String fileMimeType,
             byte[] fileContent) throws IOException {
         if (contentEncoding == null || contentEncoding.isEmpty()) {
-            contentEncoding = samplerDefaultEncoding;
+            contentEncoding = DEFAULT_HTTP_CONTENT_ENCODING;
         }
         // Check URL
         assertEquals(sampler.getUrl(), res.getURL());
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
index 72b6eea1c7d..c3bd08825e0 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
@@ -21,16 +21,19 @@ import com.github.tomakehurst.wiremock.client.WireMock.aMultipart
 import com.github.tomakehurst.wiremock.client.WireMock.aResponse
 import com.github.tomakehurst.wiremock.client.WireMock.containing
 import com.github.tomakehurst.wiremock.client.WireMock.equalTo
+import com.github.tomakehurst.wiremock.client.WireMock.matching
 import com.github.tomakehurst.wiremock.client.WireMock.post
 import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
 import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
 import org.apache.jmeter.control.LoopController
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.protocol.http.util.HTTPFileArg
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
 import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.TreeBuilder
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
@@ -46,6 +49,30 @@ class HttpSamplerTest : JMeterTestCase() {
     @TempDir
     lateinit var dir: Path
 
+    fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
+        ThreadGroup::class {
+            numThreads = 1
+            rampUp = 0
+            setSamplerController(
+                LoopController().apply {
+                    loops = 1
+                }
+            )
+            body()
+        }
+    }
+
+    fun TreeBuilder.httpPost(body: HTTPSamplerProxy.() -> Unit) {
+        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+            name = "Upload file"
+            method = "POST"
+            domain = "localhost"
+            path = "/upload"
+            doMultipart = true
+            body()
+        }
+    }
+
     @ParameterizedTest
     @ValueSource(strings = ["Java", "HttpClient4"])
     fun `upload file uses percent encoding for filename`(httpImplementation: String, server: WireMockRuntimeInfo) {
@@ -63,28 +90,17 @@ class HttpSamplerTest : JMeterTestCase() {
             dir.resolve("testfile привет %.txt")
         } catch (e: InvalidPathException) {
             assumeTrue(false) {
-                "Skipping the test as the filesystem does not suppport unicode filenames"
+                "Skipping the test as the filesystem does not support unicode filenames"
             }
             TODO("This is never reached as the assumption above throws error")
         }
         testFile.writeText("hello, привет")
 
         executePlanAndCollectEvents(10.seconds) {
-            ThreadGroup::class {
-                numThreads = 1
-                rampUp = 0
-                setSamplerController(
-                    LoopController().apply {
-                        loops = 1
-                    }
-                )
-                org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
-                    name = "Upload file"
+            oneRequest {
+                httpPost {
                     implementation = httpImplementation
-                    method = "POST"
-                    domain = "localhost"
                     port = server.httpPort
-                    path = "/upload"
                     httpFiles = arrayOf(
                         HTTPFileArg(testFile.absolutePathString(), "file_parameter", "application/octet-stream")
                     )
@@ -99,10 +115,253 @@ class HttpSamplerTest : JMeterTestCase() {
                     aMultipart("file_parameter")
                         .withHeader(
                             "Content-Disposition",
-                            containing("filename=\"testfile%20%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%25.txt\"")
+                            // Only CR, LF, and % should be percent-encoded
+                            containing("filename=\"testfile привет %.txt\"")
                         )
                         .withBody(equalTo("hello, привет"))
                 )
         )
     }
+
+    fun RequestPatternBuilder.withRequestBody(
+        httpImplementation: String,
+        body: String
+    ) = apply {
+        // normalize line endings to CRLF
+        val normalizedBody = body.replace("\r\n", "\n").replace("\n", "\r\n")
+        withRequestBody(
+            if (httpImplementation == "Java") {
+                equalTo(normalizedBody)
+            } else {
+                matching(
+                    normalizedBody
+                        .replace(PostWriter.BOUNDARY, "[^ \\n\\r]{1,69}?")
+                )
+            }
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `one parameter`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/upload").willReturn(aResponse().withStatus(200))
+        )
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpPost {
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("hello", "world")
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/upload"))
+                .withRequestBodyPart(
+                    aMultipart("hello")
+                        .withBody(equalTo("world"))
+                        .build()
+                )
+                .withRequestBody(
+                    httpImplementation,
+                    """
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="hello"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    world
+                    -----------------------------7d159c1302d0y0--
+
+                    """.trimIndent()
+                )
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `two parameters`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/upload").willReturn(aResponse().withStatus(200))
+        )
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpPost {
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("hello", "world")
+                    addArgument("name", "Tim")
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/upload"))
+                .withRequestBodyPart(
+                    aMultipart("hello").withBody(equalTo("world")).build()
+                )
+                .withRequestBodyPart(
+                    aMultipart("name").withBody(equalTo("Tim")).build()
+                )
+                .withRequestBody(
+                    httpImplementation,
+                    """
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="hello"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    world
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="name"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    Tim
+                    -----------------------------7d159c1302d0y0--
+
+                    """.trimIndent()
+                )
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `two parameters and file`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/upload").willReturn(aResponse().withStatus(200))
+        )
+
+        val testFile = dir.resolve("testfile.txt").apply {
+            writeText("file contents")
+        }
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpPost {
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("hello", "world")
+                    addArgument("name", "Tim")
+                    httpFiles = arrayOf(
+                        HTTPFileArg(testFile.absolutePathString(), "file_parameter", "application/octet-stream")
+                    )
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/upload"))
+                .withRequestBodyPart(
+                    aMultipart("hello").withBody(equalTo("world")).build()
+                )
+                .withRequestBodyPart(
+                    aMultipart("name").withBody(equalTo("Tim")).build()
+                )
+                .withRequestBody(
+                    httpImplementation,
+                    """
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="hello"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    world
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="name"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    Tim
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="file_parameter"; filename="testfile.txt"
+                    Content-Type: application/octet-stream
+                    Content-Transfer-Encoding: binary
+
+                    file contents
+                    -----------------------------7d159c1302d0y0--
+
+                    """.trimIndent()
+                )
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `two parameters and two files`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/upload").willReturn(aResponse().withStatus(200))
+        )
+
+        val testFile1 = dir.resolve("testfile1.txt").apply {
+            writeText("file contents1")
+        }
+        val testFile2 = dir.resolve("testfile2.txt").apply {
+            writeText("file contents2")
+        }
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpPost {
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("hello", "world")
+                    addArgument("name", "Tim")
+                    httpFiles = arrayOf(
+                        HTTPFileArg(testFile1.absolutePathString(), "file_parameter", "application/octet-stream"),
+                        HTTPFileArg(testFile2.absolutePathString(), "file_parameter", "application/octet-stream"),
+                    )
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/upload"))
+                .withRequestBodyPart(
+                    aMultipart("hello").withBody(equalTo("world")).build()
+                )
+                .withRequestBodyPart(
+                    aMultipart("name").withBody(equalTo("Tim")).build()
+                )
+                .withRequestBody(
+                    httpImplementation,
+                    """
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="hello"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    world
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="name"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    Tim
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="file_parameter"; filename="testfile1.txt"
+                    Content-Type: application/octet-stream
+                    Content-Transfer-Encoding: binary
+
+                    file contents1
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="file_parameter"; filename="testfile2.txt"
+                    Content-Type: application/octet-stream
+                    Content-Transfer-Encoding: binary
+
+                    file contents2
+                    -----------------------------7d159c1302d0y0--
+
+                    """.trimIndent()
+                )
+        )
+    }
 }
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt
index eed34b6ee70..d05a2544ee1 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/ConversionUtilsTest.kt
@@ -19,24 +19,49 @@ package org.apache.jmeter.protocol.http.util
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.Arguments.arguments
+import org.junit.jupiter.params.provider.MethodSource
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
 
 class ConversionUtilsTest {
+    companion object {
+        @JvmStatic
+        fun percentEncodeValues() =
+            listOf(
+                arguments("hello", "hello"),
+                arguments("%", "%"),
+                arguments("\"", "%22"),
+                arguments(" ", " "),
+                arguments("\r", "%0D"),
+                arguments("\n", "%0A"),
+                arguments("\r\r\n\n", "%0D%0D%0A%0A"),
+                arguments("😃", "😃"),
+                arguments("comment ça va?", "comment ça va?"),
+                arguments("quoted \"content\"", "quoted %22content%22"),
+            )
+
+        @JvmStatic
+        fun htmlEntityValues() =
+            listOf(
+                arguments("Hello, 😃, world", "Hello, 😃, world", StandardCharsets.UTF_8),
+                arguments("Hello, 😃, world", "Hello, &#128515, world", StandardCharsets.ISO_8859_1),
+                arguments("丈, 😃, and नि", "丈, 😃, and नि", StandardCharsets.UTF_8),
+                arguments("丈, 😃, and नि", "&#19976, &#128515, and &#2344&#2367", StandardCharsets.ISO_8859_1),
+            )
+    }
+
     @ParameterizedTest
-    @CsvSource(
-        ignoreLeadingAndTrailingWhitespace = false,
-        value = [
-            "hello,hello",
-            "%,%25",
-            "\",%22",
-            " ,%20",
-            "😃,%F0%9F%98%83",
-            "comment ça va?,comment%20%C3%A7a%20va%3F",
-        ]
-    )
+    @MethodSource("percentEncodeValues")
     fun percentEncode(input: String, output: String) {
         assertEquals(output, ConversionUtils.percentEncode(input)) {
             "ConversionUtils.percentEncode($input)"
         }
     }
+
+    @ParameterizedTest
+    @MethodSource("htmlEntityValues")
+    fun htmlEntities(input: String, output: String, charset: Charset) {
+        assertEquals(output, ConversionUtils.encodeWithEntities(input, charset))
+    }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f4fa544022a..0d26e161dc1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -73,6 +73,7 @@ Summary
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
+  <li><pr>6010</pr>Use UTF-8 as a default encoding in HTTP sampler. It enables sending parameter names, and filenames with unicode characters</li>
 </ul>
 
 <h3>Other samplers</h3>

From 3543bc4080738f3c8242a1fe21e8c4b0204f66e0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 29 Jun 2023 12:43:50 +0300
Subject: [PATCH 0591/1037] test: avoid HttpSamplerTest failure when platform
 default charset is not UTF-8

This fix is needed to workaround https://issues.apache.org/jira/browse/FILEUPLOAD-206
---
 .../protocol/http/sampler/HttpSamplerTest.kt       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
index c3bd08825e0..fb82fe4adf6 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
@@ -30,6 +30,7 @@ import com.github.tomakehurst.wiremock.junit5.WireMockTest
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
 import org.apache.jmeter.control.LoopController
 import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.control.Header
 import org.apache.jmeter.protocol.http.util.HTTPFileArg
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
 import org.apache.jmeter.threads.ThreadGroup
@@ -38,6 +39,7 @@ import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import java.nio.charset.Charset
 import java.nio.file.InvalidPathException
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
@@ -104,6 +106,18 @@ class HttpSamplerTest : JMeterTestCase() {
                     httpFiles = arrayOf(
                         HTTPFileArg(testFile.absolutePathString(), "file_parameter", "application/octet-stream")
                     )
+                    if (!Charset.defaultCharset().name().equals("UTF-8")) {
+                        // Content-Encoding: UTF-8 header is not really required, however Wiremock uses commons-fileupload
+                        // to parse Content-Disposition, and we need Content-Encoding to workaround
+                        // https://issues.apache.org/jira/browse/FILEUPLOAD-206
+                        org.apache.jmeter.protocol.http.control.HeaderManager::class {
+                            add(Header("Content-Encoding", "UTF-8"))
+                            props {
+                                // guiClass is needed for org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.applies
+                                it[guiClass] = "org.apache.jmeter.protocol.http.gui.HeaderPanel"
+                            }
+                        }
+                    }
                 }
             }
         }

From 45db4c561bc4b416d84551ff544cb0f60836551b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 29 Jun 2023 11:30:11 +0300
Subject: [PATCH 0592/1037] doc: update changelog for 5.6.1

---
 src/dist/src/dist/expected_release_jars.csv | 20 +++---
 xdocs/changes.xml                           | 70 ++-------------------
 2 files changed, 16 insertions(+), 74 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index a64ed489940..c1ec956f3a8 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -24,7 +24,7 @@
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
-224447,checker-qual-3.34.0.jar
+224450,checker-qual-3.35.0.jar
 353793,commons-codec-1.15.jar
 588337,commons-collections-3.2.2.jar
 751914,commons-collections4-4.4.jar
@@ -49,7 +49,7 @@
 217795,darklaf-windows-2.7.3.jar
 98115,dec-0.1.2.jar
 320748,dnsjava-2.1.9.jar
-16477,error_prone_annotations-2.19.1.jar
+16826,error_prone_annotations-2.20.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8038657,groovy-3.0.17.jar
@@ -72,9 +72,9 @@
 852871,httpcore5-5.2.jar
 236827,httpcore5-h2-5.2.jar
 41727,httpmime-4.5.14.jar
-75564,jackson-annotations-2.15.1.jar
-546100,jackson-core-2.15.1.jar
-1620059,jackson-databind-2.15.1.jar
+75567,jackson-annotations-2.15.2.jar
+549207,jackson-core-2.15.2.jar
+1620088,jackson-databind-2.15.2.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -90,10 +90,10 @@
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
-1670468,kotlin-stdlib-1.8.21.jar
-221490,kotlin-stdlib-common-1.8.21.jar
-963,kotlin-stdlib-jdk7-1.8.21.jar
-968,kotlin-stdlib-jdk8-1.8.21.jar
+1670469,kotlin-stdlib-1.8.22.jar
+221491,kotlin-stdlib-common-1.8.22.jar
+963,kotlin-stdlib-jdk7-1.8.22.jar
+969,kotlin-stdlib-jdk8-1.8.22.jar
 1548432,kotlinx-coroutines-core-jvm-1.7.1.jar
 9964,kotlinx-coroutines-swing-1.7.1.jar
 792176,kotlinx-html-jvm-0.7.3.jar
@@ -110,7 +110,7 @@
 29680,mxparser-1.2.2.jar
 5052937,neo4j-java-driver-4.4.11.jar
 65261,oro-2.0.8.jar
-1314577,ph-commons-10.2.4.jar
+1314621,ph-commons-10.2.5.jar
 530791,ph-css-6.5.0.jar
 1256127,plot-api-jvm-4.4.1.jar
 1169629,plot-base-portable-jvm-3.2.0.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0d26e161dc1..420500cd68a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -67,43 +67,21 @@ Summary
 
 <ch_section>Improvements</ch_section>
 
-<h3>Thread Groups</h3>
-<ul>
-</ul>
-
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
   <li><pr>6010</pr>Use UTF-8 as a default encoding in HTTP sampler. It enables sending parameter names, and filenames with unicode characters</li>
-</ul>
-
-<h3>Other samplers</h3>
-<ul>
-</ul>
-
-<h3>Controllers</h3>
-<ul>
-</ul>
-
-<h3>Listeners</h3>
-<ul>
-</ul>
-
-<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
-<ul>
-</ul>
-
-<h3>Report / Dashboard</h3>
-<ul>
-</ul>
-
-<h3>General</h3>
-<ul>
+  <li><pr>6010</pr>Test Recorder will use UTF-8 encoding by default, so it will infer human-readable arguments rather than percent-encoded ones</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
   <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
   <li><pr>5989</pr>Use Gradle toolchains for JDK provisioning, enable building and testing with different JDKs, start testing with Java 21</li>
+  <li><pr>5991</pr>Update jackson-core, jackson-databind, jackson-annotations to 2.15.2 (from 2.15.1)</li>
+  <li><pr>5993</pr>Update ph-commons to 10.2.5 (from 10.2.4)</li>
+  <li><pr>6017</pr>Update kotlin-stdlib to 1.8.22 (from 1.8.21)</li>
+  <li><pr>6020</pr>Update error_prone_annotations to 2.20.0 (from 2.19.1)</li>
+  <li><pr>6023</pr>Update checker-qual to 3.35.0 (from 3.34.0)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -116,47 +94,11 @@ Summary
     for LoopController.continue_forever rather than initializing it in the constructor</li>
 </ul>
 
-<h3>HTTP Samplers and Test Script Recorder</h3>
-<ul>
-</ul>
-
 <h3>Other Samplers</h3>
 <ul>
   <li><pr>6012</pr> Java Request sampler cannot be enabled again after disabling in UI (regression since 5.6)</li>
 </ul>
 
-<h3>Controllers</h3>
-<ul>
-</ul>
-
-<h3>Listeners</h3>
-<ul>
-</ul>
-
-<h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
-<ul>
-</ul>
-
-<h3>Functions</h3>
-<ul>
-</ul>
-
-<h3>I18N</h3>
-<ul>
-</ul>
-
-<h3>Report / Dashboard</h3>
-<ul>
-</ul>
-
-<h3>Documentation</h3>
-<ul>
-</ul>
-
-<h3>General</h3>
-<ul>
-</ul>
-
  <!--  =================== Thanks =================== -->
 
 <ch_section>Thanks</ch_section>

From 2fcc6fd625aa2902f423edaf8ddc3d98e3470b5f Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Thu, 29 Jun 2023 16:33:10 +0100
Subject: [PATCH 0593/1037] prepare new version 5.6.1

---
 xdocs/download_jmeter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 05b3bd16f08..e8b6f623b81 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.6'>
+<!ENTITY release '5.6.1'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
 

From c1a2a0c8fd7840165f7c1d5f48bcd224024713dc Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 30 Jun 2023 16:12:23 +0300
Subject: [PATCH 0594/1037] fix: treat null or blank values as empty for saved
 properties

It turned out it was impossible to modify element while iterating over its
properties since ReentrantReadWriteLock is not upgradable in Java.

So this commit adds upgrading locks for writeLock paths

Fixes https://github.com/apache/jmeter/issues/6026
See https://www.javaspecialists.eu/archive/Issue279-Upgrading-ReadWriteLock.html>Issue279-Upgrading-ReadWriteLock
---
 .../testelement/AbstractTestElement.java      | 148 ++++++++----------
 .../apache/jmeter/testelement/TestElement.kt  |  59 +++----
 .../schema/BooleanPropertyDescriptor.kt       |   4 +-
 .../org/apache/jmeter/junit/JMeterTest.java   |  13 +-
 .../jmeter/loadsave/IsEnabledNormalizer.kt    |  47 ++++++
 .../http/config/gui/HttpDefaultsGui.java      |  18 ++-
 .../http/config/gui/UrlConfigGui.java         |  11 +-
 .../http/sampler/HttpSamplerPrintDslTest.kt   |  37 +++++
 8 files changed, 198 insertions(+), 139 deletions(-)
 create mode 100644 src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 0486721475a..95c65cc2abd 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.jmeter.engine.util.NoThreadClone;
@@ -66,7 +65,7 @@ public abstract class AbstractTestElement implements TestElement, Serializable,
      * Note: acquiring locks (read or write) allocates memory, and accesses {@link ThreadLocal}, so it can be expensive
      * in both CPU and allocation terms.
      */
-    private transient final ReadWriteLock lock =
+    private transient final ReentrantReadWriteLock lock =
             this instanceof NoThreadClone
                     // Note: thread groups are cloned for every thread, however, JMeterContext contains a reference
                     // to a non-cloned ThreadGroup instance.
@@ -76,6 +75,39 @@ public abstract class AbstractTestElement implements TestElement, Serializable,
                     ? new ReentrantReadWriteLock()
                     : null;
 
+    private transient final ResourceLock readUnlock = lock == null ? null : lock.readLock()::unlock;
+
+    /**
+     * Downgrades input lock from write to read on close.
+     * It enables using {@link #writeLock()} in try-with-resources to upgrade the lock.
+     */
+    interface ResourceLock extends AutoCloseable {
+        @Override
+        void close();
+
+        ResourceLock NO_LOCK = () -> { };
+
+        /**
+         * Upgrades lock to write if needed, and returns a callback for releasing the write lock and restoring read locks.
+         * @see <a href="https://www.javaspecialists.eu/archive/Issue279-Upgrading-ReadWriteLock.html>Issue279-Upgrading-ReadWriteLock</a>
+         */
+        static ResourceLock releaseWrite(ReentrantReadWriteLock lock) {
+            int readHoldCount = lock.getWriteHoldCount() == 0 ? lock.getReadHoldCount() : 0;
+            // We need to unlock read locks since ReentrantReadWriteLock does not support lock upgrade
+            for (int i = 0; i < readHoldCount; i++) {
+                lock.readLock().unlock();
+            }
+            lock.writeLock().lock();
+            // Restore locks on close
+            return () -> {
+                for (int i = 0; i < readHoldCount; i++) {
+                    lock.readLock().lock();
+                }
+                lock.writeLock().unlock();
+            };
+        }
+    }
+
     /**
      * When the element is shared between threads, then {@link #lock} protects the access,
      * however, when element in not shared, then adds overhead as every lock and unlock allocates memory.
@@ -146,40 +178,33 @@ public Object clone() {
      */
     @Override
     public void clear() {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             propMap.clear();
             Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
             if (propMapConcurrent != null) {
                 propMapConcurrent.clear();
             }
-        } finally {
-            writeUnlock();
-        }
-    }
-
-    private void writeLock() {
-        if (lock != null) {
-            lock.writeLock().lock();
         }
     }
 
-    private void writeUnlock() {
-        if (lock != null) {
-            lock.writeLock().unlock();
-        }
-    }
-
-    private void readLock() {
-        if (lock != null) {
-            lock.readLock().lock();
+    /**
+     * Acquires write lock, and upgrades the current read lock to write lock if needed.
+     * Note: this should be used in try-with-resources for automatic cleanup.
+     * @return ResourceLock to close when the write lock is no longer needed
+     */
+    private ResourceLock writeLock() {
+        if (lock == null) {
+            return ResourceLock.NO_LOCK;
         }
+        return ResourceLock.releaseWrite(lock);
     }
 
-    private void readUnlock() {
-        if (lock != null) {
-            lock.readLock().unlock();
+    private ResourceLock readLock() {
+        if (lock == null) {
+            return ResourceLock.NO_LOCK;
         }
+        lock.readLock().lock();
+        return readUnlock;
     }
 
     /**
@@ -197,15 +222,12 @@ public void clearTestElementChildren(){
      */
     @Override
     public void removeProperty(String key) {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             propMap.remove(key);
             Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
             if (propMapConcurrent != null) {
                 propMapConcurrent.remove(key);
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -215,11 +237,8 @@ public void removeProperty(String key) {
     @Override
     public boolean equals(Object o) {
         if (o instanceof AbstractTestElement) {
-            readLock();
-            try {
+            try (ResourceLock ignored = readLock()) {
                 return ((AbstractTestElement) o).propMap.equals(propMap);
-            } finally {
-                readUnlock();
             }
         } else {
             return false;
@@ -307,16 +326,13 @@ public JMeterProperty getPropertyOrNull(String key) {
 
     @Override
     public void traverse(TestElementTraverser traverser) {
-        readLock();
-        try {
+        try (ResourceLock ignored = readLock()) {
             PropertyIterator iter = propertyIterator();
             traverser.startTestElement(this);
             while (iter.hasNext()) {
                 traverseProperty(traverser, iter.next());
             }
             traverser.endTestElement(this);
-        } finally {
-            readUnlock();
         }
     }
 
@@ -417,15 +433,12 @@ protected void addProperty(JMeterProperty property, boolean clone) {
         JMeterProperty prop = getProperty(property.getName());
 
         if (prop instanceof NullProperty || (prop instanceof StringProperty && prop.getStringValue().isEmpty())) {
-            writeLock();
-            try {
+            try (ResourceLock ignored = writeLock()) {
                 propMap.put(property.getName(), propertyToPut);
                 Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
                 if (propMapConcurrent != null) {
                     propMapConcurrent.put(property.getName(), propertyToPut);
                 }
-            } finally {
-                writeUnlock();
             }
         } else {
             prop.mergeIn(propertyToPut);
@@ -445,13 +458,10 @@ protected void addProperty(JMeterProperty property) {
      * @param property {@link JMeterProperty}
      */
     protected void clearTemporary(JMeterProperty property) {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             if (temporaryProperties != null) {
                 temporaryProperties.remove(property);
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -480,8 +490,7 @@ public void setProperty(JMeterProperty property) {
                 getProperty(property.getName()).setObjectValue(property.getObjectValue());
             }
         } else {
-            writeLock();
-            try {
+            try (ResourceLock ignored = writeLock()) {
                 if (property instanceof StringProperty && property.getStringValue() == null) {
                     // Avoid storing properties with null values since they will be skipped anyway when saving
                     // the test plan
@@ -493,8 +502,6 @@ public void setProperty(JMeterProperty property) {
                         propMapConcurrent.put(property.getName(), property);
                     }
                 }
-            } finally {
-                writeUnlock();
             }
         }
     }
@@ -602,15 +609,12 @@ public void setProperty(String name, long value, long dflt) {
     @Override
     public PropertyIterator propertyIterator() {
         // Note: can't use ConcurrentMap here as it would return elements in unpredictable order
-        readLock();
-        try {
+        try (ResourceLock ignored = readLock()) {
             if (propMap.isEmpty()) {
                 return PropertyIteratorImpl.EMPTY_ITERATOR;
             }
             // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?
             return new PropertyIteratorImpl(this, propMap.values());
-        } finally {
-            readUnlock();
         }
     }
 
@@ -619,15 +623,12 @@ public PropertyIterator propertyIterator() {
      * @param element {@link TestElement}
      */
     protected void mergeIn(TestElement element) {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             PropertyIterator iter = element.propertyIterator();
             while (iter.hasNext()) {
                 JMeterProperty prop = iter.next();
                 addProperty(prop, false);
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -647,8 +648,7 @@ public boolean isRunningVersion() {
      */
     @Override
     public void setRunningVersion(boolean runningVersion) {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             this.runningVersion = runningVersion;
             PropertyIterator iter = propertyIterator();
             Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
@@ -659,8 +659,6 @@ public void setRunningVersion(boolean runningVersion) {
                     propMapConcurrent.put(property.getName(), property);
                 }
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -674,8 +672,7 @@ public void recoverRunningVersion() {
             // See https://github.com/apache/jmeter/issues/5875
             return;
         }
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             Iterator<Map.Entry<String, JMeterProperty>> iter = propMap.entrySet().iterator();
             while (iter.hasNext()) {
                 Map.Entry<String, JMeterProperty> entry = iter.next();
@@ -688,8 +685,6 @@ public void recoverRunningVersion() {
                 }
             }
             emptyTemporary();
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -697,13 +692,10 @@ public void recoverRunningVersion() {
      * Clears temporaryProperties
      */
     protected void emptyTemporary() {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             if (temporaryProperties != null) {
                 temporaryProperties.clear();
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -712,11 +704,8 @@ protected void emptyTemporary() {
      */
     @Override
     public boolean isTemporary(JMeterProperty property) {
-        readLock();
-        try {
+        try (ResourceLock ignored = readLock()) {
             return temporaryProperties != null && temporaryProperties.contains(property);
-        } finally {
-            readUnlock();
         }
     }
 
@@ -725,8 +714,7 @@ public boolean isTemporary(JMeterProperty property) {
      */
     @Override
     public void setTemporary(JMeterProperty property) {
-        writeLock();
-        try {
+        try (ResourceLock ignored = writeLock()) {
             if (temporaryProperties == null) {
                 LinkedHashSet<JMeterProperty> set = new LinkedHashSet<>();
                 temporaryProperties = lock != null ? set : Collections.synchronizedSet(set) ;
@@ -737,8 +725,6 @@ public void setTemporary(JMeterProperty property) {
                     setTemporary(jMeterProperty);
                 }
             }
-        } finally {
-            writeUnlock();
         }
     }
 
@@ -833,16 +819,13 @@ public void setEnabled(boolean enabled) {
     @Override
     public List<String> getSearchableTokens() {
         List<String> result = new ArrayList<>(25);
-        readLock();
-        try {
+        try (ResourceLock ignored = readLock()) {
             PropertyIterator iterator = propertyIterator();
             while(iterator.hasNext()) {
                 JMeterProperty jMeterProperty = iterator.next();
                 result.add(jMeterProperty.getName());
                 result.add(jMeterProperty.getStringValue());
             }
-        } finally {
-            readUnlock();
         }
         return result;
     }
@@ -853,8 +836,7 @@ public List<String> getSearchableTokens() {
      * @param propertyNames Set of names of properties to extract
      */
     protected final void addPropertiesValues(List<? super String> result, Set<String> propertyNames) {
-        readLock();
-        try {
+        try (ResourceLock ignored = readLock()) {
             PropertyIterator iterator = propertyIterator();
             while (iterator.hasNext()) {
                 JMeterProperty jMeterProperty = iterator.next();
@@ -862,8 +844,6 @@ protected final void addPropertiesValues(List<? super String> result, Set<String
                     result.add(jMeterProperty.getStringValue());
                 }
             }
-        } finally {
-            readUnlock();
         }
     }
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index 9de8162814d..d6cb9ec99f7 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -21,9 +21,7 @@ import org.apache.jmeter.testelement.property.BooleanProperty
 import org.apache.jmeter.testelement.property.CollectionProperty
 import org.apache.jmeter.testelement.property.DoubleProperty
 import org.apache.jmeter.testelement.property.FloatProperty
-import org.apache.jmeter.testelement.property.IntegerProperty
 import org.apache.jmeter.testelement.property.JMeterProperty
-import org.apache.jmeter.testelement.property.LongProperty
 import org.apache.jmeter.testelement.property.NullProperty
 import org.apache.jmeter.testelement.property.PropertyIterator
 import org.apache.jmeter.testelement.property.StringProperty
@@ -269,7 +267,7 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property.name)
 
     /**
-     * Retrieve property name as string.
+     * Retrieve property as string, or default value, or empty string if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -278,7 +276,7 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.stringValue ?: property.defaultValue ?: ""
 
     /**
-     * Read property value as string, and return default value if the property is unset.
+     * Read property value as string, or default value, or empty string if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -287,19 +285,19 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.stringValue ?: property.defaultValueAsString ?: ""
 
     /**
-     * Set property as string, or remove it if the given value matches the default one for the property.
+     * Set property as string, or remove it if the given value is `null` or empty.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: PropertyDescriptor<*, *>, value: String?) {
-        removeOrSet(value.isNullOrEmpty() || property.defaultValueAsString == value, property.name) {
+        removeOrSet(value.isNullOrEmpty(), property.name) {
             StringProperty(it, value)
         }
     }
 
     /**
-     * Retrieve boolean property value.
+     * Retrieve boolean property value, or default value, or `false` if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -308,14 +306,14 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.booleanValue ?: property.defaultValue ?: false
 
     /**
-     * Set property as boolean, or remove it if the given value matches the default one for the property.
+     * Set property as boolean, or remove it if the given value is null.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
-    public operator fun set(property: BooleanPropertyDescriptor<*>, value: Boolean) {
-        removeOrSet(property.defaultValue == value, property.name) {
-            BooleanProperty(it, value)
+    public operator fun set(property: BooleanPropertyDescriptor<*>, value: Boolean?) {
+        removeOrSet(value == null, property.name) {
+            BooleanProperty(it, value!!)
         }
     }
 
@@ -329,19 +327,17 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.intValue ?: property.defaultValue ?: 0
 
     /**
-     * Set property as integer, or remove it if the given value matches the default one for the property.
+     * Set property as integer.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: IntegerPropertyDescriptor<*>, value: Int) {
-        removeOrSet(property.defaultValue == value, property.name) {
-            IntegerProperty(it, value)
-        }
+        setProperty(property.name, value)
     }
 
     /**
-     * Retrieve long property value.
+     * Retrieve long property value, or default value, or `0` if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -350,19 +346,17 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.longValue ?: property.defaultValue ?: 0
 
     /**
-     * Set property as long, or remove it if the given value matches the default one for the property.
+     * Set property as long.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: LongPropertyDescriptor<*>, value: Long) {
-        removeOrSet(property.defaultValue == value, property.name) {
-            LongProperty(it, value)
-        }
+        setProperty(property.name, value)
     }
 
     /**
-     * Retrieve float property value.
+     * Retrieve float property value, or default value, or `0.0f` if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -371,19 +365,17 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.floatValue ?: property.defaultValue ?: 0.0f
 
     /**
-     * Set property as float, or remove it if the given value matches the default one for the property.
+     * Set property as float.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: FloatPropertyDescriptor<*>, value: Float) {
-        removeOrSet(property.defaultValue == value, property.name) {
-            FloatProperty(it, value)
-        }
+        setProperty(FloatProperty(property.name, value))
     }
 
     /**
-     * Retrieve double property value.
+     * Retrieve double property value, or default value, or `0.0` if the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -392,19 +384,17 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.doubleValue ?: property.defaultValue ?: 0.0
 
     /**
-     * Set property as double, or remove it if the given value matches the default one for the property.
+     * Set property as double.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: DoublePropertyDescriptor<*>, value: Double) {
-        removeOrSet(property.defaultValue == value, property.name) {
-            DoubleProperty(it, value)
-        }
+        setProperty(DoubleProperty(property.name, value))
     }
 
     /**
-     * Retrieve [Class] property value, or throw [NoSuchElementException] in case the property is unset.
+     * Retrieve [Class] property value, or default value, or throw [NoSuchElementException] in case the property is unset.
      * @throws NoSuchElementException if the property is unset
      * @since 5.6
      */
@@ -414,7 +404,7 @@ public interface TestElement : Cloneable {
         getOrNull(property) ?: throw NoSuchElementException("Property ${property.name} is unset for element $this")
 
     /**
-     * Retrieve [Class] property value, or return `null` in case the property is unset.
+     * Retrieve [Class] property value, or default value, or `null` in case the property is unset.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
@@ -426,14 +416,14 @@ public interface TestElement : Cloneable {
         } ?: property.defaultValue
 
     /**
-     * Set property as [Class], or remove it if the given value matches the default one for the property.
+     * Set property as [Class], or remove it if the given value is `null`.
      * The value is set as [StringProperty] with the name of the given class.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun <ValueClass : Any> set(property: ClassPropertyDescriptor<*, ValueClass>, value: Class<out ValueClass>?) {
-        removeOrSet(property.defaultValue == value, property.name) {
+        removeOrSet(value == null, property.name) {
             StringProperty(it, value!!.name)
         }
     }
@@ -583,7 +573,6 @@ public interface TestElement : Cloneable {
             imports = ["org.apache.jmeter.threads.JMeterContextService"]
         )
     )
-    @get:API(status = API.Status.DEPRECATED, since = "5.6")
     @set:API(status = API.Status.DEPRECATED, since = "5.6")
     public var threadName: String
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
index d21566d1417..0553e20d66d 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/BooleanPropertyDescriptor.kt
@@ -40,7 +40,7 @@ public data class BooleanPropertyDescriptor<in Schema : BaseTestElementSchema>(
     public operator fun get(target: TestElement): Boolean =
         target[this]
 
-    public operator fun set(target: TestElement, value: Boolean) {
+    public operator fun set(target: TestElement, value: Boolean?) {
         target[this] = value
     }
 
@@ -52,7 +52,7 @@ public data class BooleanPropertyDescriptor<in Schema : BaseTestElementSchema>(
 
     @JvmSynthetic
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Boolean) {
+    public inline operator fun setValue(testElement: TestElement, property: KProperty<*>, value: Boolean?) {
         testElement[this] = value
     }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index f7463cbcd9e..3ed11e88c1a 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -51,6 +51,7 @@
 import org.apache.jmeter.gui.JMeterGUIComponent;
 import org.apache.jmeter.gui.UnsharedComponent;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.loadsave.IsEnabledNormalizer;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@@ -429,16 +430,8 @@ public void saveLoadShouldKeepElementIntact() throws IOException {
     }
 
     private static void compareAllProperties(TestElement expected, TestElement actual, byte[] serializedBytes) {
-        // JMeter restores "enabled" as StringProperty, see
-        // org.apache.jmeter.save.converters.ConversionHelp.restoreSpecialProperties
-        // So we normalize it back to BooleanProperty
-        JMeterProperty expEnabled = expected.getPropertyOrNull(expected.getSchema().getEnabled());
-        if (expEnabled != null && (expEnabled.getStringValue().equals("true") || expEnabled.getStringValue().equals("false"))) {
-            JMeterProperty actEnabled = actual.getPropertyOrNull(actual.getSchema().getEnabled());
-            if (actEnabled != null && actEnabled.getStringValue().equals(expEnabled.getStringValue())) {
-                actual.setProperty(expEnabled);
-            }
-        }
+        expected.traverse(IsEnabledNormalizer.INSTANCE);
+        actual.traverse(IsEnabledNormalizer.INSTANCE);
 
         String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
         if (!Objects.equals(expected, actual)) {
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt
new file mode 100644
index 00000000000..3521a6fa81f
--- /dev/null
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.loadsave
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementTraverser
+import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.StringProperty
+
+/**
+ * Normalize "enabled" property to boolean if the property is set.
+ * JMeter loads "enabled" as [StringProperty], see
+ * [org.apache.jmeter.save.converters.ConversionHelp.restoreSpecialProperties],
+ * so we need to normalize it back if we want comparing elements
+ */
+object IsEnabledNormalizer : TestElementTraverser {
+    override fun startTestElement(el: TestElement) {
+        el.getPropertyOrNull(el.schema.enabled)
+            ?.stringValue
+            ?.toBooleanStrictOrNull()
+            ?.let { el.isEnabled = it }
+    }
+
+    override fun endTestElement(el: TestElement) {
+    }
+
+    override fun startProperty(key: JMeterProperty) {
+    }
+
+    override fun endProperty(key: JMeterProperty) {
+    }
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index e0672815ce4..8d8dd64b32d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -94,6 +94,13 @@ public TestElement createTestElement() {
         return config;
     }
 
+    /**
+     * Treat unset checkbox as empty, so "unset" checkboxes do not override values in HTTP Request Samplers.
+     */
+    private static Boolean nullIfUnset(JCheckBox checkBox) {
+        return checkBox.isSelected() ? true : null;
+    }
+
     /**
      * Modifies a given TestElement to mirror the data in the gui components.
      *
@@ -107,15 +114,16 @@ public void modifyTestElement(TestElement config) {
         cfg.addConfigElement(el);
         super.configureTestElement(config);
         HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
-        config.set(httpSchema.getRetrieveEmbeddedResources(), retrieveEmbeddedResources.isSelected());
+        config.set(httpSchema.getRetrieveEmbeddedResources(), nullIfUnset(retrieveEmbeddedResources));
         enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
-        config.set(httpSchema.getConcurrentDownload(), retrieveEmbeddedResources.isSelected());
-        if (!StringUtils.isEmpty(concurrentPool.getText())) {
+        if (concurrentDwn.isSelected()) {
+            config.set(httpSchema.getConcurrentDownload(), true);
             config.set(httpSchema.getConcurrentDownloadPoolSize(), concurrentPool.getText());
         } else {
+            config.removeProperty(httpSchema.getConcurrentDownload());
             config.removeProperty(httpSchema.getConcurrentDownloadPoolSize());
         }
-        config.set(httpSchema.getStoreAsMD5(), useMD5.isSelected());
+        config.set(httpSchema.getStoreAsMD5(), nullIfUnset(useMD5));
         config.set(httpSchema.getEmbeddedUrlAllowRegex(), embeddedAllowRE.getText());
         config.set(httpSchema.getEmbeddedUrlExcludeRegex(), embeddedExcludeRE.getText());
 
@@ -171,7 +179,7 @@ public void configure(TestElement el) {
         HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
         retrieveEmbeddedResources.setSelected(samplerBase.get(httpSchema.getRetrieveEmbeddedResources()));
         concurrentDwn.setSelected(samplerBase.get(httpSchema.getConcurrentDownload()));
-        concurrentPool.setText(samplerBase.getString(httpSchema.getConcurrentDownloadPoolSize()));
+        concurrentPool.setText(samplerBase.getPropertyAsString(httpSchema.getConcurrentDownloadPoolSize().getName(), ""));
         useMD5.setSelected(samplerBase.get(httpSchema.getStoreAsMD5()));
         embeddedAllowRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlAllowRegex()));
         embeddedExcludeRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlExcludeRegex()));
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index ba451fc9113..39062621fa3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -214,7 +214,9 @@ public void modifyTestElement(TestElement element) {
             filesPanel.modifyTestElement(element);
         }
         HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
-        element.set(httpSchema.getPostBodyRaw(), useRaw);
+        // Treat "unset" checkbox as "property removal" for HTTP Request Defaults component
+        // Regular sampler should save both true and false values
+        element.set(httpSchema.getPostBodyRaw(), useRaw ? Boolean.TRUE : (notConfigOnly ? false : null));
         element.set(httpSchema.getArguments(), args);
         element.set(httpSchema.getDomain(), domain.getText());
         element.set(httpSchema.getPort(), port.getText());
@@ -300,8 +302,11 @@ public void configure(TestElement el) {
         } else {
             port.setText(portString);
         }
-        protocol.setText(el.getString(httpSchema.getProtocol()));
-        contentEncoding.setText(el.getString(httpSchema.getContentEncoding()));
+        // We explicitly
+        String protocol = el.getPropertyAsString(httpSchema.getProtocol().getName(), "");
+        this.protocol.setText(protocol);
+        String encoding = el.getPropertyAsString(httpSchema.getContentEncoding().getName(), "");
+        contentEncoding.setText(encoding);
         path.setText(el.getString(httpSchema.getPath()));
         if (notConfigOnly){
             method.setText(el.getString(httpSchema.getMethod()));
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
index 2baf053e046..d9348448f9b 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
@@ -21,6 +21,8 @@ import org.apache.jmeter.dsl.DslPrinterTraverser
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
 import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.TestElementTraverser
+import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apache.jmeter.treebuilder.dsl.testTree
 import org.apache.jmeter.util.JMeterUtils
 import org.junit.jupiter.api.AfterAll
@@ -50,6 +52,38 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
         }
     }
 
+    object RemoveDefaultValues : TestElementTraverser {
+        private val elements = mutableListOf<TestElement>()
+        private val defaultProps = mutableListOf<MutableList<String>>()
+
+        override fun startTestElement(el: TestElement) {
+            elements += el
+            defaultProps += mutableListOf<String>()
+        }
+
+        override fun endTestElement(el: TestElement) {
+            val element = elements.removeLast()
+            for (propertyName in defaultProps.removeLast()) {
+                element.removeProperty(propertyName)
+            }
+        }
+
+        override fun startProperty(key: JMeterProperty) {
+            val element = elements.last()
+            val defaultProp = defaultProps.last()
+            element.schema.properties[key.name]?.let {
+                if (key.stringValue == it.defaultValueAsString) {
+                    // We can't remove property here as it would break ongoing iterator
+                    // So we remove properties in endTestElement instead
+                    defaultProp += key.name
+                }
+            }
+        }
+
+        override fun endProperty(key: JMeterProperty) {
+        }
+    }
+
     @Test
     fun `http sampler created with UI`() {
         val ui = HttpTestSampleGui()
@@ -106,10 +140,13 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
             }
         }.keys.first() as TestElement
 
+        createdWithUi.traverse(RemoveDefaultValues)
+
         // We compare elements manually, and call assertEquals(toString, toString) so
         // the test output looks better (diff in IDE) in case of the failure
         // If we use just assertEquals(createdWithUi, createdWithDsl), then there will be no "diff in IDE"
         if (createdWithUi != createdWithDsl) {
+            val abc = createdWithDsl.equals(createdWithDsl)
             assertEquals(
                 DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(createdWithUi).toString(),
                 DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(createdWithDsl).toString()

From 4340b2a048b04169b98d54f6a1a1fb4ca7059cc7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 3 Jul 2023 10:12:17 +0300
Subject: [PATCH 0595/1037] doc: update documentation for
 sampleresult.default.encoding default value

sampleresult.default.encoding defaults to DEFAULT_HTTP_ENCODING which moved
to UTF-8, so updating the documentation accordingly.

See https://github.com/apache/jmeter/issues/6005#issuecomment-1617473097
---
 bin/jmeter.properties                                      | 4 ++--
 .../main/java/org/apache/jmeter/samplers/SampleResult.java | 7 +------
 xdocs/changes.xml                                          | 5 +++++
 xdocs/usermanual/properties_reference.xml                  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 410ae168199..24a6798e4c0 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1101,8 +1101,8 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
 # List of extra HTTP methods that should be available in select box
 #httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY
 
-# The encoding to be used if none is provided (default ISO-8859-1)
-#sampleresult.default.encoding=ISO-8859-1
+# The encoding to be used if none is provided (default UTF-8 since JMeter 5.6.1)
+#sampleresult.default.encoding=UTF-8
 
 # CookieManager behaviour - should cookies with null/empty values be deleted?
 # Default is true. Use false to revert to original behaviour
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index 137755b8f47..66589162432 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -63,15 +63,10 @@ public class SampleResult implements Serializable, Cloneable, Searchable {
     private static final String INVALID_CALL_SEQUENCE_MSG = "Invalid call sequence"; // $NON-NLS-1$
 
 
-    // Bug 33196 - encoding ISO-8859-1 is only suitable for Western countries
-    // However the suggested System.getProperty("file.encoding") is Cp1252 on
-    // Windows
-    // So use a new property with the original value as default
-    // needs to be accessible from test code
     /**
      * The default encoding to be used to decode the responseData byte array.
      * The value is defined by the property "sampleresult.default.encoding"
-     * with a default of DEFAULT_HTTP_ENCODING if that is not defined.
+     * with a default of {@link #DEFAULT_HTTP_ENCODING} if that is not defined.
      */
     protected static final String DEFAULT_ENCODING
             = JMeterUtils.getPropDefault("sampleresult.default.encoding", // $NON-NLS-1$
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 420500cd68a..d6e06bc493e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -84,6 +84,11 @@ Summary
   <li><pr>6023</pr>Update checker-qual to 3.35.0 (from 3.34.0)</li>
 </ul>
 
+<h3>Other Samplers</h3>
+<ul>
+  <li><pr>6028</pr> Change default value for <code>sampleresult.default.encoding</code> to UTF-8 (it inherits default HTTP encoding which was modified in <pr>6010</pr>)</li>
+</ul>
+
  <!-- =================== Bug fixes =================== -->
 
 <ch_section>Bug fixes</ch_section>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index cb32afcefa9..cb9cd3ba2cd 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1399,7 +1399,7 @@ JMETER-SERVER</source>
 </property>
 <property name="sampleresult.default.encoding">
     The encoding to be used if none is provided.<br/>
-    Defaults to: <code>ISO-8859-1</code>
+    Defaults to: <code>UTF-8</code> (since 5.6.1)
 </property>
 <property name="CookieManager.delete_null_cookies">
     CookieManager behaviour - should cookies with null/empty values be deleted?<br/>

From ede7cb93f87e10e244048ea29a917492a2d06214 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 3 Jul 2023 18:07:32 +0300
Subject: [PATCH 0596/1037] chore: trim dependencyManagement and optional
 dependencies from pom.xml

Fixes https://github.com/apache/jmeter/issues/6030
See https://github.com/gradle/gradle/issues/14936
---
 .../build-logic.publish-to-central.gradle.kts | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
index 2a67d64ee6f..d289c58a71d 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
@@ -1,3 +1,6 @@
+import groovy.util.Node
+import groovy.util.NodeList
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -45,6 +48,28 @@ publishing {
             }
         }
         pom {
+            withXml {
+                val pom = asNode()
+                // Maven does not support dependencyManagement, so remove it anyway
+                for (dependencyManagement in (pom["dependencyManagement"] as NodeList)) {
+                    pom.remove(dependencyManagement as Node)
+                }
+                // Gradle maps test fixtures to optional=true, so we remove those elements form the POM to avoid
+                // confusion
+                // See https://github.com/gradle/gradle/issues/14936
+                // See https://github.com/apache/jmeter/issues/6030
+                val dependencies = pom["dependencies"] as NodeList
+                for (dependenciesNode in dependencies) {
+                    dependenciesNode as Node
+                    for (dependency in (dependenciesNode["dependency"] as NodeList)) {
+                        dependency as Node
+                        if ((dependency["optional"] as? NodeList)?.firstOrNull()?.let { it as? Node }
+                                ?.text() == "true") {
+                            dependenciesNode.remove(dependency)
+                        }
+                    }
+                }
+            }
             name.set("Apache JMeter ${project.name.replaceFirstChar { it.titlecaseChar() }}")
             // This code might be executed before project-related build.gradle.kts is evaluated
             // So we delay access to project.description

From 9f803e313abfef04516bd7b4c1e50f85b619f4f3 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 4 Jul 2023 10:45:03 +0100
Subject: [PATCH 0597/1037] Adding note for next Java supported version for
 next major release of JMeter

---
 xdocs/changes.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d6e06bc493e..9bc1877d35e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -45,6 +45,12 @@ h3 { color: #960000; }
 Earlier changes are detailed in the <a href="changes_history.html">History of Previous Changes</a>.
 </note>
 
+<br></br>
+<note>
+JMeter 5.6.1 requires Java 8 or later for execution (Java 17 or later recommended).
+<br></br>
+<b>The next major release would require Java 11 or later.</b>
+</note>
 
 <!--  =================== 5.6.1 =================== -->
 

From 7a3d3e4c4ae3968e0263e9f87f65fea85480b094 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Mon, 10 Jul 2023 15:14:26 +0100
Subject: [PATCH 0598/1037] Add the 5.6.1 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 6aa29ad57e0..9f2047b1387 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -328,6 +328,13 @@
         <revision>5.6 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2023-07-10</created>
+        <revision>5.6.1 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From e424b5fa99c0cf91766263437fec7a87f6f1394d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 11 Jul 2023 10:58:36 +0300
Subject: [PATCH 0599/1037] chore: Fix compatibility with Maven's pom.xml
 parser by adding explicit versions for
 com.google.auto.service:auto-service-annotations

Fixes https://github.com/apache/jmeter/issues/6041

See https://github.com/gradle/gradle/issues/25712
---
 .../kotlin/build-logic.autoservice.gradle.kts |   4 +-
 .../main/kotlin/build-logic.java.gradle.kts   |   1 +
 .../build-logic.publish-to-central.gradle.kts |   7 +-
 gradle.properties                             |   2 +-
 xdocs/changes.xml                             |  52 +-----
 xdocs/changes_history.xml                     | 172 ++++++++++++++++++
 6 files changed, 188 insertions(+), 50 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
index ef80b5909df..282a954623e 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -23,7 +23,9 @@ plugins {
 
 dependencies {
     annotationProcessor("com.google.auto.service:auto-service")
-    compileOnlyApi("com.google.auto.service:auto-service-annotations")
+    // Technically speaking, the version is already declared with bom-thirdparty,
+    // however we have to duplicate it here to workaround https://github.com/gradle/gradle/issues/25712
+    compileOnlyApi("com.google.auto.service:auto-service-annotations:1.1.1")
 }
 
 plugins.withId("org.jetbrains.kotlin.jvm") {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 01ad87f1dc8..0afbb66fd44 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -77,6 +77,7 @@ dependencies {
     findProject(":src:bom-thirdparty")?.let{
         api(platform(it))
         annotationProcessor(platform(it))
+        compileOnlyApi(platform(it))
     }
 }
 
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
index d289c58a71d..31ea7fefdc1 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
@@ -1,5 +1,6 @@
 import groovy.util.Node
 import groovy.util.NodeList
+import java.lang.IllegalStateException
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,9 +64,13 @@ publishing {
                     dependenciesNode as Node
                     for (dependency in (dependenciesNode["dependency"] as NodeList)) {
                         dependency as Node
-                        if ((dependency["optional"] as? NodeList)?.firstOrNull()?.let { it as? Node }
+                        if ((dependency["optional"] as NodeList).firstOrNull()?.let { it as? Node }
                                 ?.text() == "true") {
                             dependenciesNode.remove(dependency)
+                            continue
+                        }
+                        if ((dependency["version"] as NodeList).isEmpty()) {
+                            throw IllegalStateException("Generated pom.xml contains a dependency without <version> for dependency ${dependency}. It will cause issues with Maven resolution, see https://github.com/apache/jmeter/issues/6041")
                         }
                     }
                 }
diff --git a/gradle.properties b/gradle.properties
index 4a09bcd5cea..aa8745682ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.6.1
+jmeter.version=5.6.2
 
 # Plugins
 com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 9bc1877d35e..24977285a1e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -47,67 +47,28 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 
 <br></br>
 <note>
-JMeter 5.6.1 requires Java 8 or later for execution (Java 17 or later recommended).
+JMeter 5.6.x requires Java 8 or later for execution (Java 17 or later recommended).
 <br></br>
 <b>The next major release would require Java 11 or later.</b>
 </note>
 
-<!--  =================== 5.6.1 =================== -->
+<!--  =================== 5.6.2 =================== -->
 
-<h1>Version 5.6.1</h1>
+<h1>Version 5.6.2 </h1>
 <p>
 Summary
 </p>
 <ul>
-<li><a href="#New and Noteworthy">New and Noteworthy</a></li>
-<li><a href="#Incompatible changes">Incompatible changes</a></li>
 <li><a href="#Bug fixes">Bug fixes</a></li>
-<li><a href="#Improvements">Improvements</a></li>
-<li><a href="#Non-functional changes">Non-functional changes</a></li>
-<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
-<li><a href="#Thanks">Thanks</a></li>
-
-</ul>
-
-<ch_section>New and Noteworthy</ch_section>
-
-<ch_section>Improvements</ch_section>
-
-<h3>HTTP Samplers and Test Script Recorder</h3>
-<ul>
-  <li><pr>6010</pr>Use UTF-8 as a default encoding in HTTP sampler. It enables sending parameter names, and filenames with unicode characters</li>
-  <li><pr>6010</pr>Test Recorder will use UTF-8 encoding by default, so it will infer human-readable arguments rather than percent-encoded ones</li>
-</ul>
-
-<ch_section>Non-functional changes</ch_section>
-<ul>
-  <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
-  <li><pr>5989</pr>Use Gradle toolchains for JDK provisioning, enable building and testing with different JDKs, start testing with Java 21</li>
-  <li><pr>5991</pr>Update jackson-core, jackson-databind, jackson-annotations to 2.15.2 (from 2.15.1)</li>
-  <li><pr>5993</pr>Update ph-commons to 10.2.5 (from 10.2.4)</li>
-  <li><pr>6017</pr>Update kotlin-stdlib to 1.8.22 (from 1.8.21)</li>
-  <li><pr>6020</pr>Update error_prone_annotations to 2.20.0 (from 2.19.1)</li>
-  <li><pr>6023</pr>Update checker-qual to 3.35.0 (from 3.34.0)</li>
-</ul>
-
-<h3>Other Samplers</h3>
-<ul>
-  <li><pr>6028</pr> Change default value for <code>sampleresult.default.encoding</code> to UTF-8 (it inherits default HTTP encoding which was modified in <pr>6010</pr>)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
 
 <ch_section>Bug fixes</ch_section>
 
-<h3>Thread Groups</h3>
-<ul>
-  <li><pr>6011</pr>Regression since 5.6: ThreadGroups are running endlessly in non-gui mode: use default value
-    for LoopController.continue_forever rather than initializing it in the constructor</li>
-</ul>
-
-<h3>Other Samplers</h3>
+<h3>General</h3>
 <ul>
-  <li><pr>6012</pr> Java Request sampler cannot be enabled again after disabling in UI (regression since 5.6)</li>
+  <li><pr></pr><issue>6041</issue>Fix compatibility with Maven's pom.xml parser by adding explicit versions for <code>com.google.auto.service:auto-service-annotations</code> (regression since 5.6.1)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -116,12 +77,9 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
-  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
-  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
-  <li>LeeBaul, <a href="https://github.com/libaolu">@libaolu</a></li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index deae2544edf..ef64c33ad29 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -42,6 +42,178 @@ Current changes are detailed in <a href="changes.html">Changes</a>.
 <p><b>Changes sections are chronologically ordered from top (most recent) to bottom
 (least recent)</b></p>
 
+<!--  =================== 5.6.1 =================== -->
+
+<h1>Version 5.6.1</h1>
+<p>
+Summary
+</p>
+<ul>
+<li><a href="#New and Noteworthy">New and Noteworthy</a></li>
+<li><a href="#Incompatible changes">Incompatible changes</a></li>
+<li><a href="#Bug fixes">Bug fixes</a></li>
+<li><a href="#Improvements">Improvements</a></li>
+<li><a href="#Non-functional changes">Non-functional changes</a></li>
+<li><a href="#Known problems and workarounds">Known problems and workarounds</a></li>
+<li><a href="#Thanks">Thanks</a></li>
+
+</ul>
+
+<ch_section>New and Noteworthy</ch_section>
+
+<ch_section>Improvements</ch_section>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><pr>6010</pr>Use UTF-8 as a default encoding in HTTP sampler. It enables sending parameter names, and filenames with unicode characters</li>
+  <li><pr>6010</pr>Test Recorder will use UTF-8 encoding by default, so it will infer human-readable arguments rather than percent-encoded ones</li>
+</ul>
+
+<ch_section>Non-functional changes</ch_section>
+<ul>
+  <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
+  <li><pr>5989</pr>Use Gradle toolchains for JDK provisioning, enable building and testing with different JDKs, start testing with Java 21</li>
+  <li><pr>5991</pr>Update jackson-core, jackson-databind, jackson-annotations to 2.15.2 (from 2.15.1)</li>
+  <li><pr>5993</pr>Update ph-commons to 10.2.5 (from 10.2.4)</li>
+  <li><pr>6017</pr>Update kotlin-stdlib to 1.8.22 (from 1.8.21)</li>
+  <li><pr>6020</pr>Update error_prone_annotations to 2.20.0 (from 2.19.1)</li>
+  <li><pr>6023</pr>Update checker-qual to 3.35.0 (from 3.34.0)</li>
+</ul>
+
+<h3>Other Samplers</h3>
+<ul>
+  <li><pr>6028</pr> Change default value for <code>sampleresult.default.encoding</code> to UTF-8 (it inherits default HTTP encoding which was modified in <pr>6010</pr>)</li>
+</ul>
+
+ <!-- =================== Bug fixes =================== -->
+
+<ch_section>Bug fixes</ch_section>
+
+<h3>Thread Groups</h3>
+<ul>
+  <li><pr>6011</pr>Regression since 5.6: ThreadGroups are running endlessly in non-gui mode: use default value
+    for LoopController.continue_forever rather than initializing it in the constructor</li>
+</ul>
+
+<h3>Other Samplers</h3>
+<ul>
+  <li><pr>6012</pr> Java Request sampler cannot be enabled again after disabling in UI (regression since 5.6)</li>
+</ul>
+
+ <!--  =================== Thanks =================== -->
+
+<ch_section>Thanks</ch_section>
+<p>We thank all contributors mentioned in bug and improvement sections above:
+</p>
+<ul>
+  <li>Alex Schwartz, <a href="https://github.com/alexsch01">@alexsch01</a></li>
+</ul>
+<p>We also thank bug reporters who helped us improve JMeter.</p>
+<ul>
+  <li>David Getzlaff, <a href="https://github.com/dgetzlaf">@dgetzlaf</a></li>
+  <li>LeeBaul, <a href="https://github.com/libaolu">@libaolu</a></li>
+</ul>
+<p>
+Apologies if we have omitted anyone else.
+</p>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
+
+<ch_section>Known problems and workarounds</ch_section>
+<ul>
+  <li><code>pom.xml</code> misses <code>&lt;version&gt;</code> tags for <code>auto-service-annotations</code>, so Maven can't infer transitive dependencies. The issue is resolved in 5.6.2</li>
+
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
+
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
+popd
+export JVM_ARGS="--module-path $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
+
+</ul>
+
 <!--  =================== 5.6 =================== -->
 
 <h1>Version 5.6</h1>

From f99eb5ea930fa2e04ecc0cd01ff30c579ceffdfe Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 11 Jul 2023 13:18:03 +0100
Subject: [PATCH 0600/1037] Add PR number and mention regression since JMeter
 5.6. See #6041

---
 xdocs/changes.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 24977285a1e..811752b5f20 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -68,7 +68,8 @@ Summary
 
 <h3>General</h3>
 <ul>
-  <li><pr></pr><issue>6041</issue>Fix compatibility with Maven's pom.xml parser by adding explicit versions for <code>com.google.auto.service:auto-service-annotations</code> (regression since 5.6.1)</li>
+  <li><pr>6042</pr><issue>6041</issue>Fix compatibility with Maven's pom.xml parser by adding explicit versions for
+    <code>com.google.auto.service:auto-service-annotations</code> (regression since 5.6)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From e663d1d585e60a6d7c3fb51631f5868945202351 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 11 Jul 2023 13:19:58 +0100
Subject: [PATCH 0601/1037] prepare new version 5.6.2

---
 xdocs/download_jmeter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index e8b6f623b81..225efcf975f 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.6.1'>
+<!ENTITY release '5.6.2'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
 

From 8e612ec7cc30464eccc12fe63b61f2339e7d4648 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Tue, 11 Jul 2023 17:07:22 +0100
Subject: [PATCH 0602/1037] Add the 5.6.2 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 9f2047b1387..c4367e3d984 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -335,6 +335,13 @@
         <revision>5.6.1 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2023-07-11</created>
+        <revision>5.6.2 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From ce1f32af87009886fc4c3eea18aae7f4772407c5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 12 Jul 2023 13:18:41 +0300
Subject: [PATCH 0603/1037] Fix computation of min in Summary report

Fixes https://github.com/apache/jmeter/issues/6043
---
 gradle.properties                             |   2 +-
 .../org/apache/jmeter/util/Calculator.java    |   3 +-
 .../org/apache/jmeter/util/CalculatorTest.kt  | 149 ++++++++++++++++++
 xdocs/changes.xml                             |   7 +-
 xdocs/changes_history.xml                     | 135 ++++++++++++++++
 5 files changed, 290 insertions(+), 6 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/util/CalculatorTest.kt

diff --git a/gradle.properties b/gradle.properties
index aa8745682ff..123dfc216c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ kotlin.code.style=official
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.6.2
+jmeter.version=5.6.3
 
 # Plugins
 com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
diff --git a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
index 345d01df3c5..0107186160c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
@@ -53,7 +53,7 @@ public class Calculator {
 
     private final String label;
 
-    private final AtomicLong startTime = new AtomicLong(Long.MAX_VALUE);
+    private final AtomicLong startTime = new AtomicLong();
 
     private final LongAccumulator elapsedTime = new LongAccumulator(Math::max, Long.MIN_VALUE);
 
@@ -63,6 +63,7 @@ public Calculator() {
 
     public Calculator(String label) {
         this.label = label;
+        clear();
     }
 
     public void clear() {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/util/CalculatorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/util/CalculatorTest.kt
new file mode 100644
index 00000000000..d4be64a6b4f
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/util/CalculatorTest.kt
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.util
+
+import org.apache.jmeter.samplers.SampleResult
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import kotlin.math.pow
+import kotlin.math.sqrt
+
+class CalculatorTest {
+    val calculator = Calculator()
+
+    @Test
+    fun min() {
+        assertEquals(Long.MAX_VALUE, calculator.min, "min()")
+        calculator.addSample(SampleResult(10, 42))
+        assertEquals(42, calculator.min, "min(42)")
+        calculator.addSample(SampleResult(10, 40))
+        assertEquals(40, calculator.min, "min(42, 40)")
+        calculator.addSample(SampleResult(10, 50))
+        assertEquals(40, calculator.min, "min(42, 40, 50)")
+        calculator.addSample(SampleResult(10, 50).apply { sampleCount = 2 })
+        assertEquals(25, calculator.min, "min(42, 40, 50, 50/2)")
+    }
+
+    @Test
+    fun max() {
+        assertEquals(Long.MIN_VALUE, calculator.max, "max()")
+        calculator.addSample(SampleResult(10, 40))
+        assertEquals(40, calculator.max, "max(40)")
+        calculator.addSample(SampleResult(10, 42))
+        assertEquals(42, calculator.max, "max(40, 42)")
+        calculator.addSample(SampleResult(10, 30))
+        assertEquals(42, calculator.max, "max(40, 42, 30)")
+        calculator.addSample(SampleResult(10, 90).apply { sampleCount = 2 })
+        assertEquals(45, calculator.max, "max(40, 42, 30, 90/2)")
+    }
+
+    @Test
+    fun countLong() {
+        assertEquals(0, calculator.countLong, "countLong()")
+        calculator.addSample(SampleResult(10, 40))
+        assertEquals(1, calculator.countLong, "countLong(40)")
+        calculator.addSample(SampleResult(10, 42))
+        assertEquals(2, calculator.countLong, "countLong(40, 42)")
+        calculator.addSample(SampleResult(10, 42).apply { sampleCount = 2 })
+        assertEquals(4, calculator.countLong, "countLong(40, 42, 42/2)")
+    }
+
+    @Test
+    fun mean() {
+        assertEquals(0.0, calculator.mean, "mean()")
+        calculator.addSample(SampleResult(10, 40))
+        assertEquals(40.0, calculator.mean, 0.001, "mean(40)")
+        calculator.addSample(SampleResult(10, 42))
+        assertEquals((40.0 + 42.0) / 2, calculator.mean, 0.001, "mean(40, 42)")
+        calculator.addSample(SampleResult(10, 48).apply { sampleCount = 2 })
+        assertEquals((40.0 + 42.0 + 48) / 4, calculator.mean, 0.001, "mean(40, 42, 48/2)")
+    }
+
+    @Test
+    fun standardDeviation() {
+        assertEquals(0.0, calculator.standardDeviation, "standardDeviation()")
+        calculator.addSample(SampleResult(10, 40))
+        assertEquals(0.0, calculator.standardDeviation, "standardDeviation(40)")
+        calculator.addSample(SampleResult(10, 42))
+        assertEquals(1.0, calculator.standardDeviation, "standardDeviation(40, 42)")
+        calculator.addSample(SampleResult(10, 43))
+        // Math.sqrt((sumOfSquares / count) - (mean * mean))
+        assertEquals(
+            sqrt((40 * 40 + 42 * 42 + 43 * 43) / 3.0 - ((40.0 + 42 + 43) / 3).pow(2)),
+            calculator.standardDeviation,
+            0.001,
+            "standardDeviation(40, 42, 43)"
+        )
+        calculator.addSample(SampleResult(10, 48).apply { sampleCount = 2 })
+        assertEquals(
+            sqrt((40 * 40 + 42 * 42 + 43 * 43 + 24 * 24 + 24 * 24) / 5.0 - ((40.0 + 42 + 43 + 24 + 24) / 5.0).pow(2)),
+            calculator.standardDeviation,
+            0.001,
+            "standardDeviation(40, 42, 43, 48/2)"
+        )
+    }
+
+    @Test
+    fun errorPercentage() {
+        assertEquals(0.0, calculator.errorPercentage, 0.001, "errorPercentage()")
+        calculator.addSample(SampleResult(10, 40).apply { isSuccessful = false })
+        assertEquals(1.0, calculator.errorPercentage, 0.001, "errorPercentage(KO)")
+        calculator.addSample(SampleResult(10, 42).apply { isSuccessful = false })
+        assertEquals(1.0, calculator.errorPercentage, 0.001, "errorPercentage(KO, KO)")
+        calculator.addSample(SampleResult(10, 42).apply { isSuccessful = true })
+        assertEquals(0.666, calculator.errorPercentage, 0.001, "errorPercentage(KO, KO, OK)")
+    }
+
+    @Test
+    fun bytesPerSecond() {
+        assertEquals(0.0, calculator.bytesPerSecond, "bytesPerSecond()")
+        calculator.addSample(SampleResult(40, 30).apply { setBodySize(50L) })
+        assertEquals(
+            50.0 * 1000 / (40 - 10.0),
+            calculator.bytesPerSecond,
+            0.001,
+            "bytesPerSecond({50bytes, 10ms..40ms})"
+        )
+        calculator.addSample(SampleResult(60, 20).apply { setBodySize(70L) })
+        assertEquals(
+            (50 + 70.0) * 1000 / (60 - 10.0),
+            calculator.bytesPerSecond,
+            0.001,
+            "bytesPerSecond({50bytes, 10ms..40ms}, {70bytes, 40ms..60ms})"
+        )
+    }
+
+    @Test
+    fun sentBytesPerSecond() {
+        assertEquals(0.0, calculator.sentBytesPerSecond, "sentBytesPerSecond()")
+        calculator.addSample(SampleResult(40, 30).apply { sentBytes = 50L })
+        assertEquals(
+            50.0 * 1000 / (40 - 10.0),
+            calculator.sentBytesPerSecond,
+            0.001,
+            "sentBytesPerSecond({sent=50bytes, 10ms..40ms})"
+        )
+        calculator.addSample(SampleResult(60, 20).apply { sentBytes = 70L })
+        assertEquals(
+            (50 + 70.0) * 1000 / (60 - 10.0),
+            calculator.sentBytesPerSecond,
+            0.001,
+            "sentBytesPerSecond({sent=50bytes, 10ms..40ms}, {sent=70bytes, 40ms..60ms})"
+        )
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 811752b5f20..81842e2e84e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -52,9 +52,9 @@ JMeter 5.6.x requires Java 8 or later for execution (Java 17 or later recommende
 <b>The next major release would require Java 11 or later.</b>
 </note>
 
-<!--  =================== 5.6.2 =================== -->
+<!--  =================== 5.6.3 =================== -->
 
-<h1>Version 5.6.2 </h1>
+<h1>Version 5.6.3 </h1>
 <p>
 Summary
 </p>
@@ -68,8 +68,7 @@ Summary
 
 <h3>General</h3>
 <ul>
-  <li><pr>6042</pr><issue>6041</issue>Fix compatibility with Maven's pom.xml parser by adding explicit versions for
-    <code>com.google.auto.service:auto-service-annotations</code> (regression since 5.6)</li>
+  <li><pr></pr><issue>6043</issue>Fix computation of <code>min</code> in <code>Summary report</code> (regression since 5.6.0)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index ef64c33ad29..7a52370a97a 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -42,6 +42,137 @@ Current changes are detailed in <a href="changes.html">Changes</a>.
 <p><b>Changes sections are chronologically ordered from top (most recent) to bottom
 (least recent)</b></p>
 
+<!--  =================== 5.6.2 =================== -->
+
+<h1>Version 5.6.2 </h1>
+<p>
+Summary
+</p>
+<ul>
+<li><a href="#Bug fixes">Bug fixes</a></li>
+</ul>
+
+ <!-- =================== Bug fixes =================== -->
+
+<ch_section>Bug fixes</ch_section>
+
+<h3>General</h3>
+<ul>
+  <li><pr>6042</pr><issue>6041</issue>Fix compatibility with Maven's pom.xml parser by adding explicit versions for
+    <code>com.google.auto.service:auto-service-annotations</code> (regression since 5.6)</li>
+</ul>
+
+ <!--  =================== Thanks =================== -->
+
+<ch_section>Thanks</ch_section>
+<p>We thank all contributors mentioned in bug and improvement sections above:
+</p>
+<ul>
+</ul>
+<p>We also thank bug reporters who helped us improve JMeter.</p>
+<ul>
+</ul>
+<p>
+Apologies if we have omitted anyone else.
+</p>
+ <!--  =================== Known bugs or issues related to JAVA Bugs =================== -->
+
+<ch_section>Known problems and workarounds</ch_section>
+<ul>
+  <li><issue>6043</issue> <code>Min</code> is always <code>0</code> in <code>Summary Report</code> (fixed in 5.6.3)</li>
+
+<li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).</li>
+
+<li>
+The numbers that appear to the left of the green box are the number of active threads / total number of threads,
+the total number of threads only applies to a locally run test, otherwise it will show <code>0</code> (see <bugzilla>55510</bugzilla>).
+</li>
+
+<li>
+Note that under some windows systems you may have this WARNING:
+<source>
+java.util.prefs.WindowsPreferences
+WARNING: Could not open/create prefs root node Software\JavaSoft\Prefs at root 0
+x80000002. Windows RegCreateKeyEx(&hellip;) returned error code 5.
+</source>
+The fix is to run JMeter as Administrator, it will create the registry key for you, then you can restart JMeter as a normal user and you won't have the warning anymore.
+</li>
+
+<li>
+You may encounter the following error:
+<source>java.security.cert.CertificateException: Certificates does not conform to algorithm constraints</source>
+ if you run a HTTPS request on a web site with a SSL certificate (itself or one of SSL certificates in its chain of trust) with a signature
+ algorithm using MD2 (like <code>md2WithRSAEncryption</code>) or with a SSL certificate with a size lower than 1024 bits.
+This error is related to increased security in Java 8+.
+<br></br>
+To allow you to perform your HTTPS request, you can downgrade the security of your Java installation by editing
+the Java <code>jdk.certpath.disabledAlgorithms</code> property. Remove the MD2 value or the constraint on size, depending on your case.
+<br></br>
+This property is in this file:
+<source>JAVA_HOME/jre/lib/security/java.security</source>
+See  <bugzilla>56357</bugzilla> for details.
+</li>
+
+<li>
+Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
+This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
+The fix is to use JDK8_u45 or later.
+</li>
+
+<li>
+View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
+This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
+See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
+The fix is to use JDK9 b65 or later.
+</li>
+
+<li>
+JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
+This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
+The fix is to use JDK 8 b132 or later.
+</li>
+
+<li>
+Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
+Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
+<source>
+Warning: Nashorn engine is planned to be removed from a future JDK release
+</source>
+To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
+That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
+<source>
+export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
+</source>
+</li>
+
+<li>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+  <dl>
+    <dt>Use Mozilla Rhino</dt>
+    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
+    <dt>Use OpenJDK Nashorn</dt>
+    <dd>
+      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
+      <source>
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
+popd
+export JVM_ARGS="--module-path $PWD/lib/modules"
+./bin/jmeter
+      </source>
+    </dd>
+  </dl>
+</li>
+
+</ul>
+
 <!--  =================== 5.6.1 =================== -->
 
 <h1>Version 5.6.1</h1>
@@ -122,6 +253,8 @@ Apologies if we have omitted anyone else.
 <ul>
   <li><code>pom.xml</code> misses <code>&lt;version&gt;</code> tags for <code>auto-service-annotations</code>, so Maven can't infer transitive dependencies. The issue is resolved in 5.6.2</li>
 
+  <li><issue>6043</issue> <code>Min</code> is always <code>0</code> in <code>Summary Report</code> (fixed in 5.6.3)</li>
+
 <li>The Once Only controller behaves correctly under a Thread Group or Loop Controller,
 but otherwise its behaviour is not consistent (or clearly specified).</li>
 
@@ -410,6 +543,8 @@ Apologies if we have omitted anyone else.
 <ul>
   <li><issue>6008</issue> ThreadGroups are running endlessly in non-gui mode (fixed in 5.6.1, see <pr>6011</pr>)</li>
 
+  <li><issue>6043</issue> <code>Min</code> is always <code>0</code> in <code>Summary Report</code> (fixed in 5.6.3)</li>
+
   <li><pr>5987</pr>HTTP sampler sends filenames with percent-encoded UTF-8, however it is not aligned with the browsers. The workaround is to refrain non-ASCII filenames</li>
 
   <li><issue>6004</issue>Java Request sampler cannot be enabled again after disabling in UI (fixed in 5.6.1, <pr>6012</pr>)</li>

From 52c0bf25478219d797820088252403e69a1c241d Mon Sep 17 00:00:00 2001
From: pochopsp <50794441+pochopsp@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:24:41 +0200
Subject: [PATCH 0604/1037] Add space before stopping_test_host

Edited MainFrame.java in order to add a space before stopping_test_host message string in showStoppingMessage(String host) to separate this message string from the stopping_test one
---
 src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 8bed41363f6..969bed78c3b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -409,7 +409,7 @@ public void showStoppingMessage(String host) {
         stoppingMessage = new EscapeDialog(this, JMeterUtils.getResString("stopping_test_title"), true); //$NON-NLS-1$
         String label = JMeterUtils.getResString("stopping_test"); //$NON-NLS-1
         if (!StringUtils.isEmpty(host)) {
-            label = label + JMeterUtils.getResString("stopping_test_host")+ ": " + host;
+            label = label + " " + JMeterUtils.getResString("stopping_test_host") + ": " + host;
         }
         JLabel stopLabel = new JLabel(label); //$NON-NLS-1$$NON-NLS-2$
         stopLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));

From 94a85af30333c19224bd708aa78aa2ceffa9312d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 12 Jul 2023 17:15:30 +0300
Subject: [PATCH 0605/1037] Add references to boms in the generated pom.xml
 files

---
 .../src/main/kotlin/build-logic.autoservice.gradle.kts |  4 +---
 .../jvm/src/main/kotlin/build-logic.java.gradle.kts    |  2 +-
 .../jvm/src/main/kotlin/build-logic.jmh.gradle.kts     |  1 -
 .../kotlin/build-logic.publish-to-central.gradle.kts   | 10 ++++------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
index 282a954623e..ef80b5909df 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -23,9 +23,7 @@ plugins {
 
 dependencies {
     annotationProcessor("com.google.auto.service:auto-service")
-    // Technically speaking, the version is already declared with bom-thirdparty,
-    // however we have to duplicate it here to workaround https://github.com/gradle/gradle/issues/25712
-    compileOnlyApi("com.google.auto.service:auto-service-annotations:1.1.1")
+    compileOnlyApi("com.google.auto.service:auto-service-annotations")
 }
 
 plugins.withId("org.jetbrains.kotlin.jvm") {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 0afbb66fd44..08f5c67f60e 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -37,7 +37,7 @@ java {
         configureToolchain(buildParameters.buildJdk)
     }
     consistentResolution {
-        useCompileClasspathVersions()
+        useRuntimeClasspathVersions()
     }
 }
 
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
index 4dfce3ff86d..bd176572c4b 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import net.ltgt.gradle.errorprone.ErrorProneOptions
 import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
index 31ea7fefdc1..2901612eb75 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.publish-to-central.gradle.kts
@@ -44,17 +44,13 @@ publishing {
         plugins.withId("java") {
             versionMapping {
                 usage(Usage.JAVA_API) {
-                    fromResolutionOf("runtimeClasspath")
+                    fromResolutionResult()
                 }
             }
         }
         pom {
             withXml {
                 val pom = asNode()
-                // Maven does not support dependencyManagement, so remove it anyway
-                for (dependencyManagement in (pom["dependencyManagement"] as NodeList)) {
-                    pom.remove(dependencyManagement as Node)
-                }
                 // Gradle maps test fixtures to optional=true, so we remove those elements form the POM to avoid
                 // confusion
                 // See https://github.com/gradle/gradle/issues/14936
@@ -70,7 +66,9 @@ publishing {
                             continue
                         }
                         if ((dependency["version"] as NodeList).isEmpty()) {
-                            throw IllegalStateException("Generated pom.xml contains a dependency without <version> for dependency ${dependency}. It will cause issues with Maven resolution, see https://github.com/apache/jmeter/issues/6041")
+                            throw IllegalStateException(
+                                "Generated pom.xml contains a dependency without <version> for dependency ${dependency}. " +
+                                "Technically speaking, the version is not mandatory, however, having explicit versions would make it easier to review the dependencies in pom")
                         }
                     }
                 }

From c94db9741f0547235f9a67b1ece40389add6b742 Mon Sep 17 00:00:00 2001
From: sebbASF <sebbASF@users.noreply.github.com>
Date: Wed, 19 Jul 2023 01:04:30 +0100
Subject: [PATCH 0606/1037] Fix link to bug database

---
 doap_JMeter.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index c4367e3d984..5f662ebe957 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -29,7 +29,7 @@
     <asfext:pmc rdf:resource="http://jmeter.apache.org/" />
     <shortdesc>Pure Java application for load and functional testing</shortdesc>
     <description>Apache JMeter may be used to test performance both on static and dynamic resources (files, Servlets, Perl scripts, Java Objects, Data Bases and Queries, FTP Servers and more). It can be used to simulate a heavy load on a server, network or object to test its strength or to analyze overall performance under different load types. You can use it to make a graphical analysis of performance or to test your server/script/object behavior under heavy concurrent load. </description>
-    <bug-database rdf:resource="https://bz.apache.org/bugzilla/" />
+    <bug-database rdf:resource="https://github.com/apache/jmeter/issues" />
     <mailing-list rdf:resource="http://jmeter.apache.org/mail2.html" />
     <download-page rdf:resource="http://jmeter.apache.org/download_jmeter.cgi" />
     <programming-language>Java</programming-language>

From 91d8aea7c42b10c68767e2f0a2a955389477f03f Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Tue, 5 Sep 2023 09:38:23 -0500
Subject: [PATCH 0607/1037] Resolve checkstyle cache miss

Instead of the absolute path to checkstyle cacheFile which was causing a cache miss, use the relative path from configDir for cacheFile path
---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts     | 8 +++++---
 config/checkstyle/checkstyle.xml                          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index cfe92743fd3..f5bdcd09f94 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -24,9 +24,12 @@ plugins {
 }
 
 checkstyle {
+    // TOOD: move to /config
+    val configDir = File(rootDir, "config/checkstyle")
+
     toolVersion = "10.12.1"
     configProperties = mapOf(
-        "cache_file" to buildDir.resolve("checkstyle/cacheFile")
+        "cache_file" to buildDir.resolve("checkstyle/cacheFile").relativeTo(configDir)
     )
 
     providers.gradleProperty("checkstyle.version")
@@ -34,8 +37,7 @@ checkstyle {
         ?.let { toolVersion = it.get() }
 
     isShowViolations = true
-    // TOOD: move to /config
-    val configDir = File(rootDir, "config/checkstyle")
+
     configDirectory.set(configDir)
     configFile = configDir.resolve("checkstyle.xml")
 }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 64b890e240c..e54989ba38a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -22,7 +22,7 @@
 
 <module name="Checker">
 
-  <property name="cacheFile" value="${cache_file}"/>
+  <property name="cacheFile" value="${config_loc}/${cache_file}"/>
 
   <property name="localeLanguage" value="en"/>
   <property name="charset" value="UTF-8"/>

From 9ee70beb6fe34452a7a53b3bbd5e96612552e6b5 Mon Sep 17 00:00:00 2001
From: MarkHoo <markhoo911@hotmail.com>
Date: Wed, 6 Sep 2023 21:20:59 +0800
Subject: [PATCH 0608/1037] Fixed Chinese translation errors in multiple
 languages

---
 .../org/apache/jmeter/resources/messages_zh_CN.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index 71dfbaa56c0..26cff3b953f 100644
--- a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -595,7 +595,7 @@ proxy_cl_error=如果指定代理服务器，主机和端口必须指定
 proxy_headers=记录HTTP信息头
 proxy_separators=添加分隔符
 proxy_target=目标控制器：
-proxy_title=HTTP代理服务器
+proxy_title=HTTP(S)测试脚本记录器
 pt_br=葡萄牙语（巴西）
 ramp_up=Ramp-Up时间（秒）：
 random_control_title=随机控制器

From 2a4fc061d41f0a63b39ce2364aaba8de7795e467 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 10 Jul 2023 04:54:30 +0000
Subject: [PATCH 0609/1037] fix(deps): update dependency
 org.neo4j.driver:neo4j-java-driver to v4.4.12

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a5cbfa3fb85..3a40e836dd9 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -134,7 +134,7 @@ dependencies {
         api("org.jsoup:jsoup:1.16.1")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
-        api("org.neo4j.driver:neo4j-java-driver:4.4.11")
+        api("org.neo4j.driver:neo4j-java-driver:4.4.12")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")

From 6c3a1fd14aa829dde1eeeb32dc99e414b073e46f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 25 Jul 2023 19:50:18 +0000
Subject: [PATCH 0610/1037] fix(deps): update dependency
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.7.3

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 3a40e836dd9..2457b3c0368 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From aa52a5ab14c6bab40007348451cfd10ffba83348 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 10 Jul 2023 00:50:48 +0000
Subject: [PATCH 0611/1037] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v5.13.2.202306221912-r

---
 build-logic/batchtest/build.gradle.kts | 2 +-
 settings.gradle.kts                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/batchtest/build.gradle.kts b/build-logic/batchtest/build.gradle.kts
index 72b7467a275..22472a2bbee 100644
--- a/build-logic/batchtest/build.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -21,5 +21,5 @@ plugins {
 
 dependencies {
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a8f897d5da8..494d627c3e5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -133,7 +133,7 @@ buildscript {
             exclude("org.jetbrains.kotlin", "kotlin-stdlib")
         }
         // Remove when Autostyle updates jgit dependency
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r")
     }
     repositories {
         gradlePluginPortal()

From 241f50d3321ae4ad3e398178784baa88cb15f9d5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 05:12:38 +0000
Subject: [PATCH 0612/1037] fix(deps): update dependency
 org.codehaus.groovy:groovy-bom to v3.0.19

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 2457b3c0368..1e01c95d6c1 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:3.0.17"))
+    api(platform("org.codehaus.groovy:groovy-bom:3.0.19"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 
     constraints {

From 1c58dad1a660ec3193aa7b992676b2890aa45498 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 09:47:25 +0300
Subject: [PATCH 0613/1037] chore: add checksum for jgit-5.13.2.202306221912

---
 settings.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 494d627c3e5..40dd2098b1a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,6 +153,8 @@ val expectedSha512 = mapOf(
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"
         to "org.eclipse.jgit-5.13.1.202206130422-r.jar",
+    "37ED7485AF83C40D3FC1965512F88E73D139D1CD099CFC71A7E87A38B2D2CD14BB34918718EC7F19A155AC0632B97BAC77295CFFC49F11275B1F7D82D0655357"
+        to "org.eclipse.jgit-5.13.2.202306221912-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
     "F669488ABCCD8F6A0C631809C951BC2DADD606217C1AD99DABCBDAB11EDD85B08FF71283A18FF954290681EEDE80FD358C5D18F4C482C35F252DF8051306EF05"

From caa75cecb12a3ab96f4e08a909c696dc997917a9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sun, 8 Oct 2023 10:49:24 +0000
Subject: [PATCH 0614/1037] fix(deps): update com.miglayout to v11

Fixes https://github.com/apache/jmeter/pull/5894
---
 checksum.xml                        | 1 +
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index b0e6bc50d78..dd8bb45ac4b 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -57,6 +57,7 @@
     <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger.commons' />
     <trusted-key id='41d266db4427983a1a4afb0c3684155e9365c30e' group='com.jayway.jsonpath' />
     <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
+    <trusted-key id='764be739ddae10f4473fecf0aef385ed6ca815ae' group='com.miglayout' />
     <trusted-key id='817ea1255546d6070a23aa00db45d3a62a183ce2' group='com.miglayout' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1e01c95d6c1..b1c18ba7b67 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -58,8 +58,8 @@ dependencies {
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
-        api("com.miglayout:miglayout-core:5.3")
-        api("com.miglayout:miglayout-swing:5.3")
+        api("com.miglayout:miglayout-core:11.2")
+        api("com.miglayout:miglayout-swing:11.2")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.20")
         api("commons-codec:commons-codec:1.15")

From 597ea90ec95f6eae4d8d436478044efc27289341 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 09:56:33 +0300
Subject: [PATCH 0615/1037] chore: group JMH updates in Renovate

---
 renovate.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/renovate.json b/renovate.json
index 619cadbc0e8..fcbe1d40571 100644
--- a/renovate.json
+++ b/renovate.json
@@ -93,6 +93,10 @@
       "matchPackagePrefixes": ["org.jodd"],
       "groupName": "org.jodd"
     },
+    {
+      "matchPackagePrefixes": ["org.openjdk.jmh"],
+      "groupName": "org.openjdk.jmh"
+    },
     {
       "matchPackagePrefixes": ["org.slf4j"],
       "groupName": "org.slf4j",

From eadc5561bd22d9516944988a5132a482900753fb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 09:56:44 +0300
Subject: [PATCH 0616/1037] chore: group jmespath updates in Renovate

---
 renovate.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/renovate.json b/renovate.json
index fcbe1d40571..c999657662a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -35,6 +35,10 @@
       "matchPackagePrefixes": ["com.helger"],
       "groupName": "com.helger"
     },
+    {
+      "matchPackagePrefixes": ["io.burt"],
+      "groupName": "io.burt"
+    },
     {
       "matchPackagePrefixes": ["net.minidev:accessors-smart", "net.minidev:json-smart"],
       "groupName": "net.minidev json-smart"

From ad083e60fd05e00c20148fcd0e5301c40c16bbf9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 10:32:37 +0300
Subject: [PATCH 0617/1037] Revert "fix(deps): update com.miglayout to v11"

This reverts commit caa75cecb12a3ab96f4e08a909c696dc997917a9.
---
 checksum.xml                        | 1 -
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index dd8bb45ac4b..b0e6bc50d78 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -57,7 +57,6 @@
     <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger.commons' />
     <trusted-key id='41d266db4427983a1a4afb0c3684155e9365c30e' group='com.jayway.jsonpath' />
     <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='764be739ddae10f4473fecf0aef385ed6ca815ae' group='com.miglayout' />
     <trusted-key id='817ea1255546d6070a23aa00db45d3a62a183ce2' group='com.miglayout' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
     <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b1c18ba7b67..1e01c95d6c1 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -58,8 +58,8 @@ dependencies {
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
-        api("com.miglayout:miglayout-core:11.2")
-        api("com.miglayout:miglayout-swing:11.2")
+        api("com.miglayout:miglayout-core:5.3")
+        api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.20")
         api("commons-codec:commons-codec:1.15")

From 15f5ca036b49dc38e1873046aa725f1177051e17 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 10:34:07 +0300
Subject: [PATCH 0618/1037] chore: miglayout 11.0+ requires Java 11, so we
 can't upgrade yet

---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index c999657662a..4b78197a54d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -45,7 +45,8 @@
     },
     {
       "matchPackagePrefixes": ["com.miglayout"],
-      "groupName": "com.miglayout"
+      "groupName": "com.miglayout",
+      "allowedVersions": "< 11.0"
     },
     {
       "matchPackagePrefixes": ["org.ajoberstar.grgit"],

From d077087997dbf36c5f6a055a01286d173d4cb1b1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 11:48:58 +0300
Subject: [PATCH 0619/1037] chore: set Java LTS release for build script
 compilation

Previously the build failed if the default Java was newer than 20.

Now we explicitly specify jvmTarget for the build script compilation.

Note: it does not impact the target JVM for the resulting JMeter binaries.
---
 .../gradle-plugin/build.gradle.kts            | 23 +++++++++++++++++++
 ...-logic.kotlin-dsl-gradle-plugin.gradle.kts | 21 +++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index 59d18a29ea1..90f37494f4c 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -16,6 +16,8 @@
  */
 
 import org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
@@ -29,4 +31,25 @@ dependencies {
     // to make it work.
     // See https://github.com/gradle/gradle/issues/17016 regarding expectedKotlinDslPluginsVersion
     implementation("org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:$expectedKotlinDslPluginsVersion")
+    // It seems to be the best way to make KotlinCompile available for use in build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$embeddedKotlinVersion")
+}
+
+// We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin
+val currentJava = JavaVersion.current()
+if (currentJava > JavaVersion.VERSION_1_8) {
+    // We want an LTS Java release for build script compilation
+    val latestSupportedLts = listOf("25", "21", "17", "11")
+        .intersect(JvmTarget.values().mapTo(mutableSetOf()) { it.target })
+        .first { JavaVersion.toVersion(it) <= currentJava }
+
+    tasks.withType<JavaCompile>().configureEach {
+        options.release.set(JavaVersion.toVersion(latestSupportedLts).majorVersion.toInt())
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = latestSupportedLts
+        }
+    }
 }
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
index 449e3c9b7c3..ee27e739c3c 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("java-library")
     id("org.gradle.kotlin.kotlin-dsl") // this is 'kotlin-dsl' without version
@@ -24,3 +27,21 @@ tasks.validatePlugins {
     failOnWarning.set(true)
     enableStricterValidation.set(true)
 }
+
+val currentJava = JavaVersion.current()
+if (currentJava > JavaVersion.VERSION_1_8) {
+    // We want an LTS Java release for build script compilation
+    val latestSupportedLts = listOf("25", "21", "17", "11")
+        .intersect(JvmTarget.values().mapTo(mutableSetOf()) { it.target })
+        .first { JavaVersion.toVersion(it) <= currentJava }
+
+    tasks.withType<JavaCompile>().configureEach {
+        options.release.set(JavaVersion.toVersion(latestSupportedLts).majorVersion.toInt())
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = latestSupportedLts
+        }
+    }
+}

From b2c483c59628a7c8fe39bdb02aba1db47d2105b0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 12:45:30 +0300
Subject: [PATCH 0620/1037] chore: add explicit dependency from
 kaptGenerateStubsKotlin on versionClass

---
 src/core/build.gradle.kts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 5a5e5c7e48e..800cefd3c91 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -165,6 +165,15 @@ plugins.withId("org.jetbrains.kotlin.jvm") {
         dependsOn(versionClass)
     }
 }
+plugins.withId("org.jetbrains.kotlin.kapt") {
+    // kapt adds kaptGenerateStubsKotlin in afterEvaluate, so we can't use just tasks.named here
+    // This workaround is needed for Kotlin Gradle Plugin 1.9
+    afterEvaluate {
+        tasks.named("kaptGenerateStubsKotlin") {
+            dependsOn(versionClass)
+        }
+    }
+}
 
 tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
     .configureEach {

From b080ca648fe8d99aa3d13f881bff3290c7b03ec2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 12:49:05 +0300
Subject: [PATCH 0621/1037] chore: bump oracle-actions/setup-java to v1.3.2

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7577181def8..a32cb4b0d62 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
       if: ${{ matrix.oracle_java_website != '' }}
-      uses: oracle-actions/setup-java@1611a647972adb8b04779be3529a044d650fd510 # v1
+      uses: oracle-actions/setup-java@7a0114d66dbd02646abd345c3395b34c148e6126 # v1.3.2
       with:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}

From 9b4221a23ef1aec2b6415115049ce768385aa69b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 13:17:19 +0300
Subject: [PATCH 0622/1037] chore: use Java 17 for building the build scripts

---
 .../gradle-plugin/build.gradle.kts            |  2 +-
 ...-logic.kotlin-dsl-gradle-plugin.gradle.kts | 21 +++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index 90f37494f4c..550c4334ae9 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
 val currentJava = JavaVersion.current()
 if (currentJava > JavaVersion.VERSION_1_8) {
     // We want an LTS Java release for build script compilation
-    val latestSupportedLts = listOf("25", "21", "17", "11")
+    val latestSupportedLts = listOf("17", "11")
         .intersect(JvmTarget.values().mapTo(mutableSetOf()) { it.target })
         .first { JavaVersion.toVersion(it) <= currentJava }
 
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
index ee27e739c3c..278d4174028 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("java-library")
     id("org.gradle.kotlin.kotlin-dsl") // this is 'kotlin-dsl' without version
@@ -28,20 +25,8 @@ tasks.validatePlugins {
     enableStricterValidation.set(true)
 }
 
-val currentJava = JavaVersion.current()
-if (currentJava > JavaVersion.VERSION_1_8) {
-    // We want an LTS Java release for build script compilation
-    val latestSupportedLts = listOf("25", "21", "17", "11")
-        .intersect(JvmTarget.values().mapTo(mutableSetOf()) { it.target })
-        .first { JavaVersion.toVersion(it) <= currentJava }
-
-    tasks.withType<JavaCompile>().configureEach {
-        options.release.set(JavaVersion.toVersion(latestSupportedLts).majorVersion.toInt())
-    }
-
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = latestSupportedLts
-        }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }

From 05a71a08919ec03b05232950faa35832d685372b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 13:18:55 +0300
Subject: [PATCH 0623/1037] chore: remove dependency on
 jetbrains.kotlin.jvm.gradle.plugin in build-logic-commons

---
 build-logic-commons/gradle-plugin/build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index 550c4334ae9..e0c21fbb0a9 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -31,8 +31,6 @@ dependencies {
     // to make it work.
     // See https://github.com/gradle/gradle/issues/17016 regarding expectedKotlinDslPluginsVersion
     implementation("org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:$expectedKotlinDslPluginsVersion")
-    // It seems to be the best way to make KotlinCompile available for use in build-logic.kotlin-dsl-gradle-plugin.gradle.kts
-    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$embeddedKotlinVersion")
 }
 
 // We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin

From 39888d9867d829867bc6f530c5bff17463cc82aa Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 09:46:13 +0000
Subject: [PATCH 0624/1037] fix(deps): update kotlin monorepo to v1.9.21

---
 build-logic/jvm/build.gradle.kts        | 4 ++--
 build-logic/root-build/build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 4f53411004f..871ed9c56f5 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.22")
-    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.8.22")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.21")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.20")
 }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index b14b02b1b20..7493960f136 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.22")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
 }

From 3c38098347f5d69e452a0538e916a262e080e9c0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 13:34:45 +0300
Subject: [PATCH 0625/1037] chore: use toolchains for kotlin-dsl for Gradle 9
 compatibility

---
 .../gradle-plugin/build.gradle.kts            | 25 ++++++-------------
 ...-logic.kotlin-dsl-gradle-plugin.gradle.kts | 14 ++++++++---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index e0c21fbb0a9..97cd2f00d9b 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -16,8 +16,6 @@
  */
 
 import org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
@@ -34,20 +32,13 @@ dependencies {
 }
 
 // We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin
-val currentJava = JavaVersion.current()
-if (currentJava > JavaVersion.VERSION_1_8) {
-    // We want an LTS Java release for build script compilation
-    val latestSupportedLts = listOf("17", "11")
-        .intersect(JvmTarget.values().mapTo(mutableSetOf()) { it.target })
-        .first { JavaVersion.toVersion(it) <= currentJava }
-
-    tasks.withType<JavaCompile>().configureEach {
-        options.release.set(JavaVersion.toVersion(latestSupportedLts).majorVersion.toInt())
-    }
-
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = latestSupportedLts
+// So we settle on 17 or 11 if the current JVM supports it
+listOf(17, 11)
+    .firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
+    ?.let { buildScriptJvmTarget ->
+        java {
+            toolchain {
+                languageVersion.set(JavaLanguageVersion.of(buildScriptJvmTarget))
+            }
         }
     }
-}
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
index 278d4174028..f5e69752512 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -25,8 +25,14 @@ tasks.validatePlugins {
     enableStricterValidation.set(true)
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+// We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin
+// So we settle on 17 or 11 if the current JVM supports it
+listOf(17, 11)
+    .firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
+    ?.let { buildScriptJvmTarget ->
+        java {
+            toolchain {
+                languageVersion.set(JavaLanguageVersion.of(buildScriptJvmTarget))
+            }
+        }
     }
-}

From 5bf0e2dd8cc0cacae69d29fc0ed0ec7adc8c2b9f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 14:09:28 +0300
Subject: [PATCH 0626/1037] chore: increase test coverage for Java 21 by
 testing more distributions

---
 .github/workflows/matrix.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 1a75468db36..1301e48b164 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -83,7 +83,9 @@ matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '8'});
 matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
 // Oracle JDK is only supported for JDK 17 and later
 matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']});
-matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// TODO: Semeru does not ship Java 21 builds yet
+matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'})
 // Ensure at least one job with "same" hashcode exists
 matrix.generateRow({hash: {value: 'same'}});
 // Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)

From b788603409a77d71cb5fe0549744cda7490280d4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 22 May 2023 14:49:26 +0000
Subject: [PATCH 0627/1037] fix(deps): update dependency
 org.mongodb:mongo-java-driver to v2.14.3

Fixes https://github.com/apache/jmeter/pull/5865
---
 src/bom-thirdparty/build.gradle.kts                             | 2 +-
 .../jmeter/protocol/mongodb/config/MongoSourceElement.java      | 1 +
 .../java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java  | 1 +
 .../jmeter/protocol/mongodb/sampler/MongoScriptRunner.java      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1e01c95d6c1..1ab2ac6da07 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -132,7 +132,7 @@ dependencies {
         api("org.jodd:jodd-log:5.0.13")
         api("org.jodd:jodd-props:5.0.13")
         api("org.jsoup:jsoup:1.16.1")
-        api("org.mongodb:mongo-java-driver:2.11.3")
+        api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.12")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
index aaafddc28bc..c1bc55d1c9b 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
@@ -107,6 +107,7 @@ public boolean expectsModification() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void testStarted() {
         if(log.isDebugEnabled()) {
             log.debug(getTitle() + " testStarted");
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
index 0447802a792..ceb918fce8b 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
@@ -43,6 +43,7 @@ public MongoDB(
         mongo = new MongoClient(serverAddresses, mongoOptions);
     }
 
+    @SuppressWarnings("deprecation")
     public DB getDB(String database, String username, String password) {
 
         if(log.isDebugEnabled()) {
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
index 854c15321f9..73a730fca33 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
@@ -44,6 +44,7 @@ public MongoScriptRunner() {
      * @throws Exception
      *             when evaluation on the database fails
      */
+    @SuppressWarnings("deprecation")
     public Object evaluate(DB db, String script)
         throws Exception {
 

From e47e59cd2a5db942a5dc1cf3c27208c0bde33251 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:15 +0000
Subject: [PATCH 0628/1037] chore(deps): update release-drafter/release-drafter
 digest to 09c613e

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index f938e609b3a..087a6b7d71b 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
-        uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5
+        uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
         id: prepare_release
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:

From 71bb952320f2bee3034686206c1bbaf80d78ea8b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 14:27:41 +0300
Subject: [PATCH 0629/1037] chore: add Java 22 (ignored) version to the build
 matrix

---
 .github/workflows/matrix.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 1301e48b164..c03fdade12b 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -18,7 +18,7 @@ matrix.addAxis({
   ]
 });
 
-const eaJava = '21';
+const eaJava = '22';
 
 matrix.addAxis({
   name: 'java_version',
@@ -27,6 +27,7 @@ matrix.addAxis({
     '8',
     '11',
     '17',
+    '21',
     eaJava,
   ]
 });
@@ -83,7 +84,9 @@ matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '8'});
 matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
 // Oracle JDK is only supported for JDK 17 and later
 matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']});
-// matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// Ignore builds with JAVA EA for now, see https://github.com/apache/jmeter/issues/6114
+matrix.exclude({java_version: eaJava})
+matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'})
 // Ensure at least one job with "same" hashcode exists
@@ -98,8 +101,10 @@ matrix.generateRow({java_version: "8"});
 matrix.generateRow({java_version: "11"});
 // Ensure there will be at least one job with Java 17
 matrix.generateRow({java_version: "17"});
+// Ensure there will be at least one job with Java 21
+matrix.generateRow({java_version: "21"});
 // Ensure there will be at least one job with Java EA
-matrix.generateRow({java_version: eaJava});
+// matrix.generateRow({java_version: eaJava});
 const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
 if (include.length === 0) {
   throw new Error('Matrix list is empty');

From ff0c320a26969d504fbc73aab639a285387f766a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:26 +0000
Subject: [PATCH 0630/1037] fix(deps): update dependency jacoco to v0.8.11

---
 .../verification/src/main/kotlin/build-logic.jacoco.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
index 19ba3646d4a..70982d4cc9d 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.10"
+    toolVersion = "0.8.11"
     providers.gradleProperty("jacoco.version")
         .takeIf { it.isPresent }
         ?.let { toolVersion = it.get() }

From 047fa0168499da6b0a089cc144e708e85a9b8266 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:22 +0000
Subject: [PATCH 0631/1037] fix(deps): update dependency
 com.github.tomakehurst:wiremock-jre8 to v2.35.1

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 25bf1357a54..c43f97611ea 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("com.github.tomakehurst:wiremock-jre8:2.35.0")
+        api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.5")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.3")

From 367c065b9785a10cd33092873ed2f9131eb97254 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:34 +0000
Subject: [PATCH 0632/1037] fix(deps): update dependency
 net.bytebuddy:byte-buddy to v1.14.10

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index c43f97611ea..511cf2f8419 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
-        api("net.bytebuddy:byte-buddy:1.14.5")
+        api("net.bytebuddy:byte-buddy:1.14.10")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.3")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.6")

From ee9b70a483f4cee8d051f21ef7ad3756ded79bd4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:30 +0000
Subject: [PATCH 0633/1037] fix(deps): update dependency
 me.champeau.jmh:me.champeau.jmh.gradle.plugin to v0.7.2

Fixes https://github.com/apache/jmeter/pull/6119
---
 build-logic/checksum.xml         | 5 +++--
 build-logic/jvm/build.gradle.kts | 2 +-
 checksum.xml                     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 9c2f78f61d2..8421fe8b9bc 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -40,6 +40,7 @@
     <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
+    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
     <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
@@ -82,8 +83,8 @@
     <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
       <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
     </dependency>
-    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.1'>
-      <sha512>D0B6A85CA7261FCEF0B2796F8FAD16C1044822AFE5ECD896B1103D7015FF690E806EC969B01150E9CA3FF96607AB53B6468ED2D5F3260C019CAE953B2291E7A4</sha512>
+    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.2'>
+      <sha512>E433E221C9167BB937EC0DF7626B5BBBE99E08C566A6D54BA7D2E04252DD452B4CA957B57E687F85F958DF0CE12678E17D0BCB527E1077770C8B7390CE58F56C</sha512>
     </dependency>
     <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
       <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 871ed9c56f5..d90ee65ffbf 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.1")
+    api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.2")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
diff --git a/checksum.xml b/checksum.xml
index b0e6bc50d78..24a25908629 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -265,8 +265,8 @@
     <dependency group='javax.inject' module='javax.inject' version='1'>
       <sha512>E126B7CCF3E42FD1984A0BEEF1004A7269A337C202E59E04E8E2AF714280D2F2D8D2BA5E6F59481B8DCD34AAF35C966A688D0B48EC7E96F102C274DC0D3B381E</sha512>
     </dependency>
-    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.1'>
-      <sha512>D0B6A85CA7261FCEF0B2796F8FAD16C1044822AFE5ECD896B1103D7015FF690E806EC969B01150E9CA3FF96607AB53B6468ED2D5F3260C019CAE953B2291E7A4</sha512>
+    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.2'>
+      <sha512>E433E221C9167BB937EC0DF7626B5BBBE99E08C566A6D54BA7D2E04252DD452B4CA957B57E687F85F958DF0CE12678E17D0BCB527E1077770C8B7390CE58F56C</sha512>
     </dependency>
     <dependency group='net.jcip' module='jcip-annotations' version='1.0'>
       <sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>

From fa227e48baf1965434d61d908d1e9125d2d3e41f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 11:33:18 +0000
Subject: [PATCH 0634/1037] fix(deps): update dependency checkstyle to v10.12.5

Fixes https://github.com/apache/jmeter/pull/6116
---
 ...a1a08c62fca78b79d3081164a16faaec16a4be.asc | 16 ++++++++++++
 .../be/64a16faaec16a4be.fingerprints          |  1 +
 .../cb/1e8f1d57a4450bcb.fingerprints          |  1 +
 .../kotlin/build-logic.checkstyle.gradle.kts  |  2 +-
 checksum.xml                                  |  8 ++++++
 ...3d3a74b068eca354dc385ce126833f9cf64915.asc | 26 +++++++++++++++++++
 .../15/e126833f9cf64915.fingerprints          |  1 +
 .../6a/012579464d01c06a.fingerprints          |  1 +
 ...77dcfef2ee6eb2debedd2c012579464d01c06a.asc | 16 ++++++++++++
 .../aa/cb6d56b72fddf8aa.fingerprints          |  1 +
 .../ab/c64121f5021754ab.fingerprints          |  1 +
 ...4be739ddae10f4473fecf0aef385ed6ca815ae.asc | 21 +++++++++++++++
 .../ae/aef385ed6ca815ae.fingerprints          |  1 +
 .../d9/39f8a1784230e2d9.fingerprints          |  1 +
 .../e3/875c3ef9dc4638e3.fingerprints          |  1 +
 ...c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc | 16 ++++++++++++
 .../f1/603dbe5f5c9fa9f1.fingerprints          |  1 +
 17 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints

diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
new file mode 100644
index 00000000000..794a6124934
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
++6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
+kJJDgH2BcbNSmWJlrCqYk+E3GAyQial+szkEZED+02wXHsbs0z3vozjQGHy0RVOj
+Gc5Shwk7Hr/F3vw9EQKa1nNffWmcGEx9B+WcC9ALPVd/fpQVXvlqfbi+kaIbqv2x
+NHQr7BL8j3SpN6vhfZM/3zeghlxQ5HYWER983XwkmvbNdMxt5HWsMKWZ0utt4ocK
+TnQP8NFGlPWEQhPvRRFNb9BI0wvGD0NUb1gjABEBAAG5AQ0EVuqxPQEIAOPl0cr0
+rbuuaQWxwNjrHnfDgv9foBgqZW7tCiXtWFH7Va1leDFloszEPGPlEriw04iqHpHe
+8QyUBVL6JhvNqEj8DR9xJyIKgsKCMkoJHdJOdO7aTQP8w7SVr7AX9sY9rRQAMYgk
+tEKNqWSXm6/hzvNlvIudGXxr1dJzzVynZYlPFp9kmUmQU5ThzJ7DAW4fSnAy9z1a
+bCGSHkh4EXrDwCyPvszlvMkg1djG0owZgDnTrrT0eu83T6uht+DHgCrLiEYqypcy
+xJmK48O9t20feAhFXw091hGr51CD+C/bbZjcbXGmsNVuXUDUIIeVpSpPaUgU+i+O
+gHY7ZIF5f3EpEnMAEQEAAQ==
+=PkT4
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
new file mode 100644
index 00000000000..4fc458aea3b
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
@@ -0,0 +1 @@
+41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
new file mode 100644
index 00000000000..4fc458aea3b
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
@@ -0,0 +1 @@
+41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index f5bdcd09f94..66b033db16d 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -27,7 +27,7 @@ checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "10.12.1"
+    toolVersion = "10.12.5"
     configProperties = mapOf(
         "cache_file" to buildDir.resolve("checkstyle/cacheFile").relativeTo(configDir)
     )
diff --git a/checksum.xml b/checksum.xml
index 24a25908629..cebb72b5937 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -125,6 +125,7 @@
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.commons' />
     <trusted-key id='3692c12c7e3d336a452beb254e066e0459cd109b' group='org.apache.commons' />
     <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
+    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='org.apache.commons' />
     <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.apache.commons' />
     <trusted-key id='d6f1bc78607808ec8e9f69437a8860944fad5f62' group='org.apache.commons' />
     <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.ftpserver' />
@@ -133,10 +134,12 @@
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
     <trusted-key id='53c935821aa6a755bd337db53595395eb3d8e1ba' group='org.apache.logging.log4j' />
+    <trusted-key id='fa77dcfef2ee6eb2debedd2c012579464d01c06a' group='org.apache.maven.doxia' />
     <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.mina' />
     <trusted-key id='6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1' group='org.apache.rat' />
     <trusted-key id='184454fad8697760f3e00d2e4a51a45b944ffd51' group='org.apache.tika' />
     <trusted-key id='7b9751fc3f01f134f476464cd0eb627d4885ced1' group='org.apache.velocity' />
+    <trusted-key id='223d3a74b068eca354dc385ce126833f9cf64915' group='org.apache.xbean' />
     <trusted-key id='82d8419ba697f0e7fb85916ee91287822fdb81b1' group='org.apache.xbean' />
     <trusted-key id='c758f9cc982ac877e7b295dd6e97418b04b11dcb' group='org.apache.xbean' />
     <trusted-key id='5c9a30ff22b2c02f30261c305b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
@@ -148,6 +151,8 @@
     <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
     <trusted-key id='82f833963889d7ed06f1e4dc6525fd70cc303655' group='org.codehaus.mojo' />
     <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.codehaus.mojo' />
+    <trusted-key id='b02137d875d833d9b23392ecae5a7fb608a0221c' group='org.codehaus.plexus' />
+    <trusted-key id='fa77dcfef2ee6eb2debedd2c012579464d01c06a' group='org.codehaus.plexus' />
     <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
     <trusted-key id='8f9a3c6d105b9f57844a721d79e193516be7998f' group='org.dom4j' />
     <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
@@ -238,6 +243,9 @@
     <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.85'>
       <sha512>2F70DA03A8F8ECF0F92C7B8B219321DFE9C8926DC55BF343662B043F277C7F63090B1B7E06F963606D9D9228E3FA4245393E2D3773DFD3D059136EB65D2E7998</sha512>
     </dependency>
+    <dependency group='com.google.collections' module='google-collections' version='1.0'>
+      <sha512>5741BCDF5C2D54DAA53A60972D61D0FB3ACB68A31AB4A913832DE71C47B4ABD59B85E760A335D7EFDE55D4E309824839B09F9224A43C124BD54C634A87A9B7F7</sha512>
+    </dependency>
     <dependency group='commons-logging' module='commons-logging' version='1.0.4'>
       <sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512>
     </dependency>
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
new file mode 100644
index 00000000000..ce1811d89fd
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEu57KUBEAC6GSPbvdc5EtEu9GYQvWGxo44mJrCed9LbFc3rV6bawbvARQjG
+oolnQ04PRpGI6+RmjhsHU5MlbUMWhpjdkhTXWZEheTnvCFnKGTV37DXpwJeHl3aV
+kAX1C2a4gePaUBpDi93R18eaQbOzPfa+cmXq8gCltb9efFONtrR/K9QkAQzlxsbR
+d9nIsuALV1Wbpqzan+mJ2taBDrbIN7PpBObnB7sGpsfpGC8pvNaIElAGb+JRM3df
+DIkdymWZZouKHKM6akYoA1j54uf3iHSGPxIMKTuDTMZk950cfsR9FFwnDXMK8v+3
+yQV1qWHW7MEOoC3bfPNB6BH2rkzXDJmlt4fXA6yyH4vDLJS0287XZLYrCDFC4Gbm
+l5fG4dhw+DW7mhHezK3ssZJja5miRQtVJ/sBXJC/4y2tStoeyD54nY7BTtBnP4iN
+tgW1E1glxqiDjWbsbXQeyfvpNWPd1VY2JQAyPyg0G48YSHiO2LLhwqlTwXVWdP9l
+b/VHW0PkT38DnCk5DzhcpYt6hi84fKvomIqx1nASvVHKnxgNNZYZv9h63TXuU8sw
+Ct0+HwnIehw20uNE4nmjUFZmzKRi+Qm+nkE7GnBFafIVadZeKDskkBQVWVE0D7ij
+HgVn8q2NDbQ2yq8dYUcnW7HufJbuQX7e0mb3nJiI+B4RCQx9vlj9oGy0TwARAQAB
+uQINBEu57KUBEACX5n3ANsTRUmQhgsyDtYIMQ3TNBvdgJ7oD8+xLfUI0rg/p1sll
+HtKXSS1zhiKfG649dm3hx2KVOGKuIpNGptcL/MZxReXoAMN/f0MiAgf96Le43GT9
+c1MLYziAuVCl9FH8QjH02MvNnTolqtgail51vpKBgirysvuwKwaYDpeRT4bJLj8k
+waAHD77FwcUMu5AW2BJgwg8YG08tltxEQSb/5d8YJW8jktnLt8rgYlQKYWnBWzyJ
+5UiXWeuEHzn6sFdXkTzelbfqXZWbIEfFECglQztGB1Bb7/4RQ4x0K/bmja2ppWHC
+Xh0dwNqszcvFKU6rPcJkyq9P4XL4Sis/9R/xZqpgu37FiDwPfTCo2eXqFiy0lxnx
+HJkLgokOvMW7AxXlrNWO0ADQwhvCOAMVbdwjm9S6K5V1Yki0kZQN7wSXX3da0yUA
+ltwC2CejNinGiMox/2aPAkDhBH5PwbF5h2TPUV3Pa2MCNwMvL3R4G954NoGVRa1b
+sGxbO8XYgya+Dpiat/rmfwtE0hAosWoMasSUMxN7euk/0nfvfXo4bRGBBvXvKbJV
+uWUE50WO164LwIYB3JtaXl0Ay9muDKj7vi4oWiwK4j0trcIwClXzLb3UVoGHfgQb
+7Srq9k0TkBdVFv1BK6EcoAF11N0WekMb5y7fOebc8cOeBKcTLfnsEiS7cQARAQAB
+=nW0b
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
new file mode 100644
index 00000000000..f30d19535b0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
@@ -0,0 +1 @@
+223d3a74b068eca354dc385ce126833f9cf64915
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
new file mode 100644
index 00000000000..0fbeca4c8d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
@@ -0,0 +1 @@
+fa77dcfef2ee6eb2debedd2c012579464d01c06a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
new file mode 100644
index 00000000000..48b0e33430f
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
+agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
+dID/i1onAX1dE914J4lf3XvIAxGiAjmr3UvWO9RiFxRUkecMAMlCBp2FuHuvxkcn
+Mk8q9dP9Ef360wu8X5rj0kgP6vPhgl9/RhuPsUxlazb2Kn9Zxi/RmDKDiH/vDuwy
+WdRGFOR1OPV7l3Ws01nrs4vKd2v5rsUmsjvQ8ldxdrA1xzX4IszHRDgSC9PI8ItZ
+1VlbaKjE0L03acPfFTg/wRFSF5zsrGNbTmq1ABEBAAG5AQ0EWCeUDwEIAMGWqQT5
+ccT/Q1OypoOQGEZn+oRkgEdnzt8mjo7aOXd6pkNTkt3+LCkmb8Pp3/a3iYEfvSvB
+Zbb2JbY9xnmM8jBucWnow1iwEPxGhUuu3jlIpRsCwLk+utLkMALRkooXqanDoVRW
+xuVeFYN0as8nndgWiJT30innN4vfaR3x3E6/nS57zp5IggxZYsXTRHb25kaof9lg
+lHyXeypW7quKOP4SeES70PVVUnYZBlLpnX8a2msRtJiouWxCv/kHnYsjW62vc7nq
+vWAsSsfBT61TVx7yI9CckVFBnkpG1I8C9WpfcR+j9yauptgUMfrfDTFg3Aip7czM
+SoL4Jpu7jBcXy9UAEQEAAQ==
+=tjFi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
new file mode 100644
index 00000000000..0fbeca4c8d2
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
@@ -0,0 +1 @@
+fa77dcfef2ee6eb2debedd2c012579464d01c06a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
new file mode 100644
index 00000000000..f30d19535b0
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
@@ -0,0 +1 @@
+223d3a74b068eca354dc385ce126833f9cf64915
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
new file mode 100644
index 00000000000..2b518fae3e6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF722yABDADQFCoMvjoHc58wS1blOVmfsH7G4Cnm81PJKpjfzY15ZkJSOyCz
++Vpfsv8CJdB00gc9rZyOE8AAjZoBjVOVgJnRsxy+VRfKfU6qfWNmngsMveQwdsIO
+1Vk8IdGN7xuxWzVUnSdPmZ8xIzhnPsaecNWuW5n6NjVRJ+pw2oIAA5LLU9m3jcfH
+gDFIe/byDwmLylGNLOJ9D/Qvl+kvxCTHJIX68BR1fhLM2v5NStDzEHRk7xQeu42F
+6of7n7+R0xVR3VV2XmaZuR/gDCvq9f8b+qx80y8DMOfgl79UeXyeekWkr5zxiLZp
+riNAaVOGatFnjD+WfW5gggIN973FO3Gr3+VubN3rq/LSsLvLPjVTOD8PZUrrdyQA
+wwYXKDyYtg2gKDt2NE2RNx606BRRTsN6AC9dZCTz+WrMKh1RPPtvCyGyxWDd/hhd
+DRSJ8OoBkrfxKd8yrSjobRiso48IvjPHyVd8JPxkNAWQoBE0Sv9GGkXeJ2DYiUNr
+XQeK6+SWLLm/PK0AEQEAAbkBjQRe9tsgAQwAvowEd8ZErQ6o6iocwEy0UJAqxEVm
+DEOLbQ4lQrzBtF+pvC2ra5AU4jUlqfZGXjAaSaE83C4TFE+cuOhUhRz3rhyjwZec
+YbMxeWW4vjk0YRlGdKIS9qns0f7m8pPyoiEPd8VpBM7Diipm2yEoEb2Le+f31Rfg
++sqFiGu/+7eo6uoseuJFVmZ0pCN5T7y8SOptR52/UvvRAHbr/3DbVXWt1J8HDqK2
+lrg+eebm5zb6i531IXdsu/926bCT0Ch62qc0ARNyzywORkS0WTAYJAVFkE5rQthz
+Q5RnuwjVV07wgW7GqeyFZMCidWxBduHjgo8K6DC+Eim43YeMcdbVMpsSiIqKRwgs
+kTeF3FD2+smBKVDEFyZPQ5b3nzkOemDn0b9FTq2LWrJr5YMxDJRJKrio7JgXV8Ef
+PebTMSCGt232l46YH+vTq2US7p26sk4pzyApFxW7+oVngw7xYzbzSJJQHeXC+2LL
+Wg6Z/DPLMNxuEHShQMoQw6PnAjJ2j4APV3kdABEBAAE=
+=k7LG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
new file mode 100644
index 00000000000..c100ad26752
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
@@ -0,0 +1 @@
+764be739ddae10f4473fecf0aef385ed6ca815ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
new file mode 100644
index 00000000000..c100ad26752
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
@@ -0,0 +1 @@
+764be739ddae10f4473fecf0aef385ed6ca815ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
new file mode 100644
index 00000000000..8e66bc24ead
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
@@ -0,0 +1 @@
+c8c4b9dc1e031f788b12882b875c3ef9dc4638e3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
new file mode 100644
index 00000000000..1ba0f83565e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF2sVzEBCACqCLAn02agm66fsdgfEEDhPGlJv/BhX/GDsw/FwCzpwZLyiFiJ
+vwcMWgV0OOP3gI2CkzPxFE9/LL3Zjc/vS9J0tGeDBsCPB7TGiToQm63+zyzNCU3R
+G7205zo+Ty8P3JX/InHRPrqxwitLh/sF68A0cF6EjGDoL4w0uuYYBMevfuGfra+b
+dGKQPAWzU0afcQSpOkXIIdwBNb5vam6fy1att+50gqgPBKfYpBMFnkBteEBFIRd4
+8qQ2NIIwMC6P2ZIRBWUAKLT5fZaQ/u5KJRZXlT2BclPmS0r0mbAJmXNo5FWEk4l2
+16rccPwFg1AcX3rdAbtJ84DyBa7+Yz4aa3J7ABEBAAG5AQ0EXaxXMQEIANBULfZK
+Rddy6Eq2d9TAPRSwYo5Volr4sTdiztr+60+Z7ink96VkoVowDrZ8OgvWQSm+tu7M
+ocTpJ96ubO2ilBRgH9g9tX8/qT3bz3QSqR+A0K7b8KADew8pN+bB8GsOzQSu7Zgp
+uqT73uAKv7YUaZ58Y5geWvVpBuxGQUxcD/ArOLyT1fBu2kvaOS6n/sRO/3kEnH27
+IlrvhCt1WEJeG7/BFHhg0z8cLVaR0RxpPvbY/l6sudtziBrrwMG6c2L11Gniz7iL
+gSHSQPhUKFiKXcfXjk+lS+bSnx2XooY4WpZt9eYEMVZLY5RpdPYyLe/xxfBXvoSm
+LtlBhI+uyGcwWbEAEQEAAQ==
+=iYeQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints
new file mode 100644
index 00000000000..8e66bc24ead
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints
@@ -0,0 +1 @@
+c8c4b9dc1e031f788b12882b875c3ef9dc4638e3

From e8fa76aabd5cbb45bd98307ac4cad073a1f353a7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 12:13:38 +0000
Subject: [PATCH 0635/1037] chore(deps): update Gradle to v8.4

Fixes https://github.com/apache/jmeter/pull/6121
---
 build-logic/checksum.xml                      |   4 +--
 .../main/kotlin/build-logic.jmh.gradle.kts    |   4 +--
 .../kotlin/build-logic.checkstyle.gradle.kts  |   2 +-
 checksum.xml                                  |   4 +--
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +--
 gradlew                                       |  29 ++++++++++--------
 src/core/build.gradle.kts                     |   4 +--
 src/dist/build.gradle.kts                     |  23 +++++++-------
 src/licenses/build.gradle.kts                 |   8 ++---
 10 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 8421fe8b9bc..08f4a65f57a 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -101,8 +101,8 @@
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
-      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.1.2'>
+      <sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
     </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
       <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
index bd176572c4b..f0efe81f3f2 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
@@ -72,7 +72,7 @@ tasks.withType<JavaExec>().configureEach {
         // At best jmh plugin should add the generated directories to the Gradle model, however,
         // currently it builds the jar only :-/
         // IntelliJ IDEA "execute main method" adds a JavaExec task, so we configure it
-        classpath(File(buildDir, "jmh-generated-classes"))
-        classpath(File(buildDir, "jmh-generated-resources"))
+        classpath(layout.buildDirectory.dir("jmh-generated-classes"))
+        classpath(layout.buildDirectory.dir("jmh-generated-resources"))
     }
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 66b033db16d..44ef221da6c 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -29,7 +29,7 @@ checkstyle {
 
     toolVersion = "10.12.5"
     configProperties = mapOf(
-        "cache_file" to buildDir.resolve("checkstyle/cacheFile").relativeTo(configDir)
+        "cache_file" to layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )
 
     providers.gradleProperty("checkstyle.version")
diff --git a/checksum.xml b/checksum.xml
index cebb72b5937..1546c6c5655 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -309,8 +309,8 @@
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
-      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.1.2'>
+      <sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
     </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
       <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
delta 41154
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%0DEqyP8OADCy^l*0
zg(H9~!6Kv4ocRbS0v2HGh)kw7_Re?18&VxU{R<Kv!B)H}aK~TB?}V|CT1vZ%O(jjA
zSAZ*xi38dbWPomVjn)iD3LAvn+G6I+NC;pENiSw%nBCa*M;gahoai6;;}$$uryKrp
zxv{}C1YlpnnCZl$520HDm_JNTM={8xRAy+q#Dtikt*np+Nax53d63;GN$;>mGqTNK
z4~C@Rz3KKbeI63?rRC;kNrb$k_Sg+5x9r{a5P$~cNe1<E2WQ(PTiQvG{h#9bVj%er
z99(bMsO++VmsyI3`G+Z{fy_juS<bj}iAnA|ln~IVf5i5@KFGXf-cZ7f^%I+SKmMav
zIO<J7z$AVXEvnfU28<@s1CEFaElh6=ok=Ru;^$?U6BwIUv`UeagA2(UYK|-XKgdh#
zZ&)o*CtI(EBoo3Z3s-v!A^-l1fKQG&$4xf$82_KkS+)HW<JWMu_Qg1eeEkiHlSwYV
zOu6bis{dKT95}NPC#ilWDADxlS^)|me-|aRv>=KB0F^(3t(LWuHX5#)qO%b}j;A4t
z{%6sGJpOm3Y-DPdAbHDINuE4k*dT>(<)%N{pN{i<XP*2|a=PDM^LIYMZUuXm6Z=LP
zPy3p2EQS)6t=q6h+zGjErRkH}XgwT&XKk^1^cJk;r1g8Mgs6U49qrIB^U8f)IM-HM
zb6-wRGQgNewfZ$H2t&U<tJ23}_&Aerc5{8-po}I~JIpC`qs!(sXKzCKyX6+)sK@k#
zz-+Bgmj=BKM?T-e<7V1uD`TsHZQh<iCZ8Y#J<2D?WaB$Nf~SfliWl|RJZ2csXr>lr
zwWa9jw)1h?{hBfRg7a!9+Tl;Lrra#rKm2SF;9wOi!qk1Z#nxZN=qV!%f-Kh-?P_P2
zwg9a9y?+rBmC_n`ElG~Ak2(&6ZdF|abBT0<KU$|_20x}gN<}>a46GKWWW*tjB6_SX
zB2x6jgI~q3)jkj>F8M<OaP-80F({%hcfsw;N;w#Mxq~Vh>IN<kRIqBQ-?eg&I!+Rg
zuCicHAiO50F|bbZQeM&=+mRYii>A^pINir}9eyySb}oDRFAA36@)dctm8Ng<z8o_4
z|8T*v6a~XO9TtGd<+dz<--4bg9__=FL#c*E%*WRf9q)r-!Ub*m6&U{k_W9RXX<?=@
z)6`PWS#UFZ+ROM`R9-)?P&wj3?PrBCBl?AYhwd4HK-^(5`zN_94MN@Ce<e34yNu}u
z__EQ^Di>a>=41I(AXQDW{IQ~ll(;%defD&}PVx2tW$dN#GvblIL3bzJXe*@RIc_vx
z_}!7J3#xNpdpQN>pix5s$>S<FE4lSYD;XWVuH)EYtmnxGgK4uw|FGvr5Yb_XA=74K
zrPiLr<QOM73_?aQV+@Ip&OKsd%L816L5R~LO;1JfBLT0i3U6@Jksu;1A3N+I&@)p?
zb5r!L>=}o!DYaT46sj4Wjuwn^Sz$;hEHWth6K9~I%K;rNeLNK?j5L?!^DF2HT@(am
z0j-<&5%?Fxtn?X{M|6pBEmC^-$5qUV4F&lF&R#v^pQxOishMA>6HIU_nf4=qTmw~1
z3j=l~jtFZMM%E<9-6YFh+QWK5)=J)ktt}?Sj4MRB3Hs1RE)T!_HykDEMS;Cf4_=BP
z7tM*OkB^ZRG9xQ+Ydb?F`P@~H%%Z>KmHZX*q@)8m*J@P4ppYYQ*-fRCp+|Tl=9Q1k
zcI%v|2-uUdtC|rupWyt>IB8y1`U=2&F-n2ohtVm87M5U+%`zHRno=#sBy-57CV{E#
zQ!l?Spp0{veSfclkxWl2lUOvMROVpIq9cvHg@ULrTOuRnMQws<etOoY$`#Zyx^q+P
zPkfi3U5XrOb$L%)+OsY!y9<cKA~7F$AlFNAH0bbCq6mHM{r~4NtT^@HyyP)o5#XC6
zx+KcyUptq-=JGN4QmS}T(eN$FYe=QYXa@bXDJ$Lyn$qYr*$)#uKHaXfCt>e^k4%l-
zX7Q@$NSO~!I?`9+S~Xbrzx!e>=sfH$9+n=xnYk|(9yhD$LLUgb3^LGh#_TeK+7SL;
znw2L-UdT7}XAls?`&~h-F&Aw{B)}>#Wxbf)q%3C712`%-z1RYj{*t(O1ki3)5M&*_
zBk@IB;Q@LW6L71F>Hz^le3kxWB9G?JkJi0N8F8O>Y0tq%ePulAU8t{*ge*cxW!xAD
z4bZlmMgdTqcR6&ss^&OjjNr)DKoeiZ_?vXgP|AfhNC&x|{kZv-jm`no2lDoq!|goc
zJR^=K8uVi=S5e6IEY6R2Bhg%cHi0b1{RSUp<bBgFSaM`aqo0Pj$WEk$T7@F`hv+75
zW?E#(8X7}YXQtosj#6MTNE2?d>ZVZ;Z==<v??#XPjRSZn=|t*y1<l(wGkfE3<Dfw{
zPY*UY=G@+3S^XKFwt2MmK<%irwHXZ!^S(RiIM=SY07^`rGL~Y~v;(SR?&HP+(?nC)
z{Ij;<#+X^$*LAjDonMzpAa0EYnQ(JY)swbbgc~QnpiYE44?x)9A5H_27Xl?jq#zE=
z+Hq$%>9EUx7vIB7JE@!P5!}p@NK;gnMk}+A4_7&~DT_m=qsV^C0~I;A)F(;Du_!R9
zU+B2Q0KZ(>TGMb9daHKIXd=&t+sPO?B*p1}?oaaqT03Yu<u^M+9PJ+t2(^k{;TKbu
zZCuzD5wiq#bJsi!9~k*0p8(w~aC-^aiA&qXPZEn(0`5<Kp5>J$j0%-DDHy1$mrfQ}
zdF&rp;jxtaeV*_az=7;r{zhqJRl07Kg0dazoK#UC*borX)4cBVzO#F@6r6}^dKB-A
z{K8CP*}R=u7?H@N9Vv*=8V}m)k__P%Utw+x;!mG+m%OW%yT{<5VM(ZUo%uNoFdnco
zKvr3e)SclCbM;+}h`gf<%CsWx8nV1FZY`d>W)Ie<EG*vyXh*Eog~=&!58r_%Sw>9W
z$j`4bYO8zdFWgV$k3vxrEFf=)v5On}oFhomyU2BloHLrQRSI^q4<+{=3-^hbG_KTF
zeLBo%hDin@%pr|ToaR=cpcS==Ra*oBA=hOyczs%c{{lxv2#`2%GAKe4_UYN0p<0B1
zAsZ24s+5R)svKG*u_X9vq}W==cUUP;DC!O|m+WxqpZlnA^~j5wumAqnio5_pGSB<v
zQ($LE?guggmxZV^r+hQJ>>$LTzez$NXs6Q22BV?{!%}=>gJmyRki1Wdk+WFP*0Nh(
zkMj6sQW~w(+LFe!U_y_MLccDq+xf@8HCi{le&xD)`bp@i`%e<<!p&PiZ-DUi=Fz5a
z%RiozZCJ(ki~jIPE8KtG8FcMSgXVhIBK4wKGS*#qz}fqRY)ju$kv!D_bw3?g!jtxe
zXZAczQRw{ZLde<l?O-(C5qJ(kfQ7|mW`Olf$}vOi>|Z5J=A?cT>ok}USGT$}eOdRq
z`L-1ReEZDc<0eUTEYbSNiO(s$U*5>1TR>_!*4;~!OVG^Zk!$EwO^QV-yZi#XZI{jg
zyui{J@Rz$o;%sz@cJYJGi`{a&yx@s%MbN7CX5E8NE_0f4czE8if;H#Z89vALLfZzw
zwtW;}>y;dyhv_g2*J|ngi#=Ux@uKjAdv{OpI^80AMpvLYY85l_y^@4(PxB!#Ja5mQ
z*YWAL)Gzb0P0xa9)hm3ae*RAiBO%@mM(y`fAa2q~l7&_ls<lKZtc_pjOsCjL!i*`=
z`lxX(IdA;MyG~|o)OQmiypy&WSmcio&x<a}gYF-{6;J5h19ByHmY*MqdZOxAUhsGh
z5b+GF@9^CNl4n-Wx(rV)+<Qdq9xe7>v2u5+9yZ(pI%l}f-;r`17hVGGy0i~GZT#Sq
zf%CXXy7MgwxY63IWo#?jgBD~MhS-15k;JD8r{~9{mZF9`f*aeQM5&m|{$A^5N5t#w
zc{$C+NU~^e@BC`CTwKW`)Lr+5$j$Z<UU3g?->^f-+)Er0=Ep;bXJ<=o5g%x5!;N!f
z1;EOlgvdp&{H{0L*ja8ZF7I}{DBF(Z1HSThZg4$5U7cQEo}VK$x7wd;V;k+yh!(lh
zWyt8ft=2o<Y@wcRuEbT^n9yx(cAo8T{}ncp)ct-)gYm@L4oFNyMSTX<Nx79cQ`jJd
z){F=!yZUWLae7pWN0b<En#O6%5rJB?=CxSREUIww%e?%1Tn%OvxZBBEkUv;!fPpMT
z7#C?964FB<g(D8G1Y*NMyHaa0)I}(}!JEs=i;Ud<Wl)wWp|#I>Qf``tPE%17`%3=q
zECeyFEWb5o3*IUTdfniYs~LZoMPBwdEGOe^Sc|_+<&w(k5#X`|bf>J8MrKOr1@V5C
z!CU;mGIMy_ky)WF%H_m?y$N%M04_54E4ZhzvcXTwmU|b#u*6*tT6TW$P^X(DW<lp#
z@?Shxy_XMyz`hMg(zwL@a^yEJIQBcSeDhhHp|9!pdH~_xxm%MsAYBg#x@V2tEIe=F
z^@dlzEnx_nE9naqhkWKrabw1*c9Hdb>;jbnRhyF{yr+Q+3Un~nAO9R_fRrbGkQYu)
zkd+QLP|CQi4LT7MrW#%qgFnK3YFDXhaKI}UzHuh$nF1ZlbCaAfTBc@e+=dPgKDzZQ
zn2mqJAwmB9BO~d`var@(>3>u3<qg85DiSf9*(_E@G&ycqCPtLkJ|9T>rW#x9r=5hv
z5y1RI^i|jl(toUx&gK*&61YfKgB->{*=vD>7<r^T6INixa=BK(kdDDY;cjEe?I1o_
z29p+{J^!0LO;s$>#e*s=yi^#|&T)8tZ%C`2(j;Yw+?j33JXCVOSesfKP)WND=39QQ
zr%OS~ka2uWlV>`|#wHsyw#!6+t(HSDSOuq+s$r%|CYToi0h`7X20RKj;vS{ln<^S<
zweiayX|;V9jJ=WKg9y;!#)MG)Xd$sAYhWheda{sJhYD%UYTVsbTVkBPs6LyBUgZxt
zV|{0II7L8~42;ROn9>Od@byx{oS<CxKDX-GP#TWFY~>Q~tbMkE6wFQ+$Nn7#*j=%z
zhXrR8&na5IG-iLQ10F5G?TQ^Utzp=66&DsLO^+8%w8WC>C5oSFu!x*A*ASkEt(9W!
zR`Q{y(>R7iCg8TdE~atQ_vX7SYox(f)29o@0i4}~IJa{SFnTgAG*1Nj$z635Xb#V{
zO^|bZb<Hhk1y16IF7XYVDbfVmIeEG1R(twIc7gNWCwY@gzyz-JvKz)lM`S49#!2)D
zilUITAqG0Ps16Y;#E$Ii`Ddn(n`2)DUO8f}Qv)BVtZ+i>s{`JtHJZ4TP)Wo9A)xR9
zGM*nZaBLUwZX6;sKy03sdU9@bJNjG<y)$ZeYkcOPBNQZigJ6T>hQH-7_jVd6;yL$C
zPuhaS00f5&1c#ZDMCeGq{&5=OHdi2ds%&I~@zQ3jci+{vxcl~!EXDZ)e^PF6o6R}z
za}LEKf8qICNW9BJf#Do8V&1MPH1WxIRDNbdM5Q0R>#KEa&ya(Ed&~X>FNy{GK(Rx#
zqpZBK3)$UD2Mp~>4u8+zn=PAByS)$(7VD7>N7^@~19Ix3_a{W<!0jE!uX9Wh$3G)}
z5&#XdMiY!b2B`{uEFCJQV)Q~b_3Eq;hcn2E&xWg9&(!KmLC9XbJM-PWRwp`*nnZoV
zLjx1@S)OHu;r*lY#JuI~9o3-*@Fr%4QOG-2%$Ucm4bzV4p@HgCcN_r=yY&y2h@a3v
z)dNRd;Jf{2T>s7yGTV#F_5BU2>1V;xmpzK#0g=P%T_B`)R*2;}{GFU?;dvBV2<q)Y
z5t7WZOO#Q>tt2kY{9|x_EQ8pZ%)XNW9p{hq=x%-#8<1*xR{XfU^eKjYwkSwvmXzOu
z2D{<SXBhC#=^(L3#FO?Z&AgXdKw@|M@D5)F{Lo$f``7KS-sMevWCWqVfA&Y!#Ix&U
zj8L#-)DFTRKdUVYHVLpS2_{+1`mbs7KNC#EPtqYx_BJ+BcErzV(n&QI*wJ9H4535|
z94p}oRF6cfTbc5Tc6(BUSH^CuTjm!{=zm$?Uf||CL>43g)pXj>|H2G~Y0ThIgWY6i
zfLzb5?_bZ{Wq0%f-^8Wp5_V%q-(IqQ9Q$W(fA5J<U%-d|#f2u`yX2=TlD^GF4L?WJ
z_!oDN|2Hla&jWf8fOs+0hC7;EH68F7iIRH2P2v!}5(S^if5bEitwhv0^6ndaH;?;{
z74z~RPBaaNI6iPXf!Ose;o<|o#cdFHZNTTs!JRp&V6EPsoSh3t-S}Y{@^9cWr6z1k
z;Tu~{qH4y()t;7xMD!5erO%lNv*o%P<t1piab%bk__(k2>$R1=+V<A)#c>SE8_oWt
z1C;9CFX#QtUqYeQzL2vIam99^(AM`!X64Z%Y31<Kqclw6T-rX%Mf)e^!_F|U>A{3M
znjfCmzj%I(=&fCV`UaB<+xL6}f+m7x49myC-J^Tf`}pEqHYBigoBEGhhRqCXYSDa%
zHH7+6LOBApV!Sfjis@Bsb^079Mok0Wp+V3>D<7BHmescdAAUj)-s2oDk-fIf0Zk3X
z9bSK`n-~0lvqY&bu1o}|^bF%bas`89>}fyvY-{Iv?<iwvUe%ro&`?dAYq7|tnZBm$
z=@PE^T?DwTxciJNU_016P?Q@#@u6()kUyKQZ_#_E?E2dEz8ke~F`Lx=wuSjYe}x{X
zt{HiSbOA~as<U}~UCBubfn+1&|KX?&)utdU!+;y+^jHoGbiU@DRy_qiJiF6<_(`!3
zx=c@<mznBX*O;ut47hsGN%PS^gn7hY;lW9mW;&uZ8SeK?>CMQhuS}${O%*oNPWCZS
zALXPCGrrN<_FnD6{uJha-1HD%{?%3C<6E84NhV48TP><Hs3HmPWTZ!c{tqS2#nk4n
z44Z$kPLLp#)>tqbE3y?JXVkBw6m8XQ2Yk*7k~MVkYj8gj_j2&08}kS7K#V97WK6^`
zGFESge(0cnWm&rPumDN1p4r503pLep%P4CKSN)`h5{vYLPC=Wvn9A?F&$J>!v#o>w
ze%Tl0<L_C9nW&nuLtWUnG*qQTOg9mhP-WX^94_JQxcxYxL?n*{(&rpt^@{G6;zSs$
zW}3<832c;KjSHHuKf$>gIv|d~gn3GO^aHE!aZKN)jPn&vOd3}Fogcfs1rd*It6!Gw
z*^VGZ#E)&EpPVRoEk??vQYBx~<t3)wsMJ-0Gqz=j?&sy*z&^4gD+0G8?-<=!1Ol+9
zi#;u4cS7!be~q*PlQfBzPJNH$YXxtd1n(F$@;w&?3V^*u|G-APXp0Tw+I`OeR>;Q9
zxtoVcf3kGys)Zz=Mk}0x^`5Hbi6t)jspntRB(Ucs=c*gW&x%2;kGhjCl+e|AFe(K;
zWHN;&Zux^&KiQLZTs16MvktNfiYjX~RG?~AYGzuwO0?C1W!mar7jI1o^=rG+gz+o)
zN?!_mBiX)#pvZL)>_Uf4QVDUnN!fMB!J%=6GY>DNTzta3sxB}`CNoJbOo3<dz)OIL
zY>>$4FSk0z!U`ZcewC;{lZnzbHOZOd%#D<>3~OBqTN$}l`TninpOvvtaqdHAU>YR-
ziXrHJUI6@_;uu$j4o6T$QE~Yj*~lK;*8b2ZvI~!J@${L3kuqHZd7V5Kflg`5KY1;s
zQ^|^XcW0-;0%G^){Rp7N_*BPh(7v;~Zu{gOQ$0_0@41L&68mEJuScnDw0z#`Rd8!C
zI~d#|SVIsQ4TDM+9@59wT>Tj8#iC42IALR6Ul)+--*SOPa2LmKNox)H59KWV16RUQ
z9*&-(;vo*|3Y&r!hhPOh8CTomw)iCEp@$zy%!MY+*de~(eRAiFAg03%kCm}=0b6Rw
z|8gX=Q#1%UTbnf|7jzh9ZGSV=E;oJM5Y(1XSGZc9wK7QdCO>=sBytb#8*nJp)_DMH
zd;)?F*n7cfs@002Y(O}v`30d69Q-1d1mr-8+8>mn%+uw9Rb`Aae%X5}lJBrk6TvT(
z86OD#E3iS6EY!h7bpjHWRA)8U!D$^7xgRi$HZCuE+r!d2DykO%lDrUQ4!L%A=>{&b
zdrDY%>8j+i9&-^&|2?KEJ`qF+>I&3(H(=dU7X{;>as7Q>{7f)~{;qzULXw8u+(dG?
zm3y+S#W|ImodmX5_Ej#~_<8aZ017!)6(O@vqZg`;6b~$?)%ZvyOFX^5IGw!sx`5XQ
zF)3MEz8O7{3uXt|_=d&<nS3LT1PW>qC(S><cy^EmR_B|oP~E#XcWmGw2<nxr4R|4Z
zgbt#_nTK!;z!hXtgAT(tC~}VN8K}jp)sZ$-m$2+W6EZBOCM0-LE&MWLKMhd)wyQ-Q
zGDwkjZ{Y$Mv4sV2=Q6nfE-z#-&iq4qB6D#qpzh7Hr)!*;my-VZHH7)LRgO8kCci<}
z2A!=U1v+0q{(gMkbn;D}bZ+7907|2$zco|T%JOsxENe3>^tM%2G-VMjWV_+IGdy9`
z)6g0ypVQx;NuLvF8R$7->wCm-Qdl3<s`&(KAbNFDRlJ$0kLT=v97iQpsXS`ysPks~
zj6@-Ci$JIGzaei+JS^q>F2cAxUNNbwI^?$ZQ0-P^&QZ-Nkwuc<jw{vP25wV8`H9CT
zUen8{7=D;GcMD2?gjdu{qleKt*+cn>4QhHD=6+XOheXV=qnia5P<?-$P?Skx3Q;!{
zcH2vy4g77m%eGvOIIxkR7g5yUOTd~6woIf0<H%693h`5u6jWbk(E)A!fGEYjN~W?C
z0q#p^)J|Lo6d>`2xGLic0q!$Czj>tG<0}U_fS)3f1brp@5<&jcJ$u^)VW7<~N^#GU
zqjm>Y_eFz<q+IA%=j=D7S|48AzSo!Vd2?({W0T^-25-ZcNbSFJ&Mfxvi0l;JfSW2q
zPCPkzuu{MtfI`52i+7%W2Lb4U)QUmmAeq8ZY|_E_phoOU)c(5^V2PwbvM7ZQ650GO
zRP8=S5c(@ErYN+>Uo2;~kC*@?_|&@}m|_l?yoxI06k4e^YL)Yxv3V<}xUqT5r#wHC
z=`@{9um_yc3R%!G>8pNKQ;~M1r6aZGOP^-^lA1xYZHD^x{!URPDlQ0qf-E&BCpw;f
zkcb)I@vhS+eXrR+161KYSDb74rpMjFmL+@ViW|T*I*at)Wf43@uAfBI9r8QrUajCQ
zan|FQ;yvE@SdbSU<t4&ZlN(+~NTOE-^hl@sr*cQ$&Sp)Yq}ST%e$JR%<X%@6(F@^m
ziF{-0=C=*0YEqaZIRI)12E1s7FDt5~U`X);Qr~zKDG5*p17uWtyieYJq|JExCY4mO
z*texP>io}}<sx`3Nx_uyjD1D4_nR<WgD)kCf8Tfo%ZgAXWL|D=%LyII2NsUn-@^n~
z&306ajnon)&s<LiX=BHd+eP-glGVRU-o-!S+F6KbKqC+tb}q|oE9lbeTWS>81PoNr
zaJJpPNzK@hoj~G3f60ai_oj!(c0PZm8A*Fhwi|Vi$lwTG2e<UTmu{Fh+gt063g|S_
zXYuc#6YzJ$3ZiPTblCy}=3pa?zirTau8iPPm+rI-EZ7*m#XAQ-p?R}E1M}e7T+iY`
z)Lu>)oGmAH;^Y6=KA^e{D6)EssBzj^?Jw|C^-F!O%7MM}JEX;0ZE0{+{XI(kINw0X
zkwNs-K}4E9GRbgdl@s@hKI0<y{y33r8%t0}Htr%plpV{rSxXJ&*Q~q{-XOQ{A{E|~
zbV}<xN{-~GFt;98iR@vQ_zzEsRRLi9A1JhslENdZ+H2Ob7mLSg2QFPupQR4(@QEc<
zi);PrCqPP@#`=yi@u5qjvW0f3?IJOMQ<)_u4nNg8vei;d<-w0i<7C;`dd2wYrROlv
z+Lga+XkB1%=%1i(h56_>V4L6&4u;A`!Vm2b5I*)s1q1rw64l5A#jOO=hTxZ0uRP7Z
zcpsL#@s_CKvxRQ_@wyYtO%4^U+*q{b7j44cUdE)9w;ia_ON%U>DdJ2ejCv&w6<f`D
zTc?<NIY&+x-&{0LYg`)-)+9_Y6J?5HgdI5ADJ~qehlqyT0%g@~3v5tT5~8=MJ}c+;
zW@P$iAcE-52)RcKOx=d`-*^6tF#Wi|O+H9k`JzYlE^&V?CSQHEOZ@838vH7vNDj?C
z`yX=UUa_Y&;EVF8fd>O4`@itcXXSSw1?zv)qZ()b;XeK$LPC#}lQ;~g!qt+3e@oXm
zUm%l;g%TqpSzlL3vc$=pDq%yPZ}Hf98fMD*>)H#7)`!XQQFt3x{7Cj$&)eop77k7%
zcXHY3eA@ch_S|`Y+_?dQaR;{hTn<}9vqD?q@DCbE0qDcjW2}^%HHLu|VLk|KE^(fw
z?hy|@d9()zR5)@!+6s(ORPlVA6Z=bj_@hs}JhcZOyn?jdETpZZ$Vx@_;fk#VGc=5?
z)<UZBURa6;)Do4AX|1}-vhB-qm!_j7Jmy$RgAoCmkG4Kb4aG6U>J4$;Dq$ChIB~)9
z;!~_>JhKh8&ZBy0O(j5VLgMJeISC8d^%YF=TvxYa)j2^kzB8-!dDXI*8D1Yw`rK2q
zhQH}eNq)6l_HFiCa2^_HQQCFo*;EgNYz%{Zg?+H~BU(hNlr^WX5N~UOg(ORk<uvAq
zfG|o)m&~7TGZ(N5CW|O1ZlazDBk)5gqb0&a4ACi>9Tzg9p7p?ePhI3t95VTo{Sl|P
zi3u2Tql^4B>8h%$3xl#v>I3nu(wY*v$<vt_w_qwQ;wRAIR6`zPTU~BPUW#_yhI*oU
zL;Gn=rS943pCR>3kd&nVrj%|+x~o*ljX_wTsJ^L0B}Wp^Xkr@n6*cwRMC1LfLW80+
z-wB2Jt}1H_lLfH2B)=)C><UlAN6Tl?LuNP{97!(-$qkM_SQ6?lD@?IIN$>}_{;iaJ
zC1wx-k!FMapJi^2mQ=w^wy6|1$U0+<U0w&8it8pzNCT5DcxL#n;B4^vA6~K6^#_PS
zTz6@G8(xybo!~cn{z1sMg;DX4f+N)6`9Ge%fZ$<la6{leJ!UIpkHwkeZEc@tTcy!k
z6TK<VB-;-c+DE&LX8sYP8@*cV3T=&JgZ?`8<a(nWh!(imK=UKnp2UNv^m0)u!b)G4
zz~ivs?I_LP_msMS?w5^wJTDd(@RxZ43pmsUBtbEHe=<Z^z2zDl=t~RO{BG{L(L(Q&
zjdCr&Q$PW0_hej)<xtyOW}K`QR7UJi!fvj`n;hDL@(~X$4F`Tt=TJ+!J7%F3QztK!
zO0UZQV(LD|)gT(dWAg2{L(aa^nzn1FkW@_(=xa)~)z<bfXOzui4;Xwj3%jQz^f7H=
zaE?<kBO0cDl#5*b{^$OVLzl@hQXbPziP{{Otui0js&<Y+=VULFwU9iyO<>}<^7+mn
zz<p$C>mA^sW<=Cr$+);uxvZ|)OEyXvl9%DsKK?hg{x{9=nUA-JVV4jVy+;7+!XSb5
z2_D(wjg8Zz<RL@yoTwp5t<qdr)`&#j0$A-E9R0Knu+;ggo_*phq$(>wKO#wu>uRPL
z?sqe=MeOe^AkuBBm~Me5{#?q{il|V^b(-IX48Gzc)2nI@(2zzE^zD@eq6ID1%o!#8
z8*r2p<F&k9#?nlrJqB;*c#BV|oUFHyF1~}WB3~yE%jn`BMg9Wzu+cau4_KseGS3}O
z{`RoO9Zp0>BZq*Lh1F=?W{R49q9i$)w$TeTqOaY!_lkJVriR~C2f<^O*kCnwi%DCd
z^4+hs*OZ4MYp;@dB*twe2boSM_k8lLu?<6G&E1#h3(X9`vZD}`5D3W|#+I}G#M$Q#
zfya>mCzm=P=(cp;EJ6UrJHJQ3zW<bdmm!F5JG5jDMj5~ALnU~8@M=vMWeMnGttzw=
zUDyg;JP_N7IR`q6gjN+jIodscFK#AP6!yX3|Fb5k4Wt|EFf^=Fm8XagchqFagTaB5
zNMAy^e0WhT+A;j@G$DjvqJ%tO7ir~-`u>Ra2y6AfHK9hc@<pF7kQY0dsGJk{g##(!
zjO71vr>7^}eIH>?p*1BTBsPgKiJ_24F2rV&y}hm>kSJ{ab+z<w44;WT(Te?U0sbG&
zfv*BQzA1E?`3;YwZ{E&Zmq7W)!_z1;7`zr|g1B~ACPAn+?)9Xbf~0ud1GJ0QT;rG#
zJ4DY}6!vGH5l-dx?bD`<-$gs{AWG8BIGWFa59NXk!8=(4V;__0DNBP9j-Xz;8f1nU
z^0EL=e%)caF|e&(Ngd3Q9$pB8t07Chyr?c@rPBy|0qE0ZMAd>VU6U{7UC-*37MG}w
zqc-^cgh%Ezh+pS&w6R(H(3j}#qP)Y$UK?(|QTEfg)U9h!q{@<*FAp6kV4QIo1hTGD
zuqd_<r$bWdcN*w`$zhbV`%xmh=!kp&J7S~rqAQi%+-X_bxktq~gE1GENxL#W70E~h
zTmu>mL=+2{D}t;=Lf{PuMlzmEWr{{tS9#b7Vl<ndxywq1K~H!3GXyh}$&$!rY_vAy
zzB%_5_317lL{+z2g@6pi8R4BV;PUuM$QtvHxVWVv4%R2%1+-qOlz?QVk>Fu9rL1r*
ze3INmX~hl^lRxIraL;v`pL)(eT+=m})h6u9W)K=3WjsdphB{G$Z2W{n>XDp;Nc9tO
zVu3wQ<)!d`>Ra>u<+laHI2I_nZ^t60f-W_osDBkmsZDT4oDr3PY_OI#RN3<L@p*nK
z$GEZg20ibX>yD@E)K+Ky9SPU>c<$cQ)VtZBSrU%-lvu<)EcIA#je*I8tEm9R*;pn8
z=vK<`Ax{=>Q8^1AVlALEs^?q8q9ytc-}+tLGoMO%<bw>qd-I<y6OSzJ?USUaMI6;m
zMPi2FIf;+|Xq7mS|1U+2@!4SQ9TyBtffEdj<i95ZB%scBFWqHK!4qqK?Eu`C1BwYX
zQ8|LyOB5ao?iK)n9rc>F0u9N=Y>RMO3<WjoFLR6mx=<B7D{Vq+_|OtYkBZDvD4DM}
zsML49n``4^)?aZ_Lv*3u@6PvW%lSI<AJ0?N$@a^FsaUfb-=yrY9(BBrH@jD5F4w7F
zN67OLHL&Y&Ki2!yA!U@xJBKu$idkTG+Q4CN+Q28Jb?iVcSGSuzbHi+2Be!)t=Zg2{
zRt5D2WBuxW?Wol8&cV7ecc=I({a8@)#MK?i$C}CU)+xM;?`ZzWSao~LAZt*dsbzJL
z)H|QrZ8lv}i^!i>(k;%XGU}~cZ5(@yoGQL;1_+Cc?B$Jo^LQ)BjC>zT)H5bK`E2s%
z6)l(f@zz}Qu$w3#Ki#J0bMoN~+fQ8ZBdI=RRGlcG*Uj*1&(`cZ0NF5mcJ=P@-Z_Nd
z0d)Jl3q;%_eS+*$DgNvg>zJ0OTY{Os65i!U4_uQ)?U5gPjkt8~8*IJs3wH}xk|jQh
z2TGsh67|S#d-}c*^{fsOrza}HK;)-H=HK6nFaxuM$nk+1CvRO#gZPIB0oso|na_dY
z#7i#;GvNa7-pD`^iQdyv!2l^DfI;5OATM#^)1U#~F7p}xeyP7npyc641%HQoz|>^?
z1Nyz!f^7QjFwtjIc>evp=5w|8JG&4$@SXo+uYUZE=g;8<FK|%yP5j&2OZJQ2^iI;~
z18?tcDZVjtK%!yN%Eynl4c^|G2hT1LskRe5P*cNS5z=dTGFsgJ?N0dOjrU*RxK+#$
zdcRX!-RdR3p})kGmOeL5e6}-{q5ojmy1l&aY^9^!#`=0&z{bkRG~<a~<yJ=`u(IK-
zYd6oxog3$@(m{4eG%*ja4Axz_5L?;~IqbU}^1lRW#|<stnFUPxc^iAM#4t`O2R9Nu
z0=a9a=JL@P)@i$_5uYkwlm5B}?QSlt%Ns7!WqBJEGXeei?nEc{wPAMZ)u9m|Up=i;
zWGWxqexRYG7R~JJZzI`b0){MO;PnLp@({px3bC+3d*hGw$iZ~Kl+v9>ZnWs2GIn5&
zuRIN!OpQ5jCkV%dP&dib(s$m2%2L01(kyEUBPxRt!k^H>&K4!aB+tr{rAq(@e!O+-
zOb!%gw4%-9*+TGb)0fZGg2i|xd>^)KnTK-CxZC*ZT4`38Ap=I7oFke67!M;}ElzC`
zH8bU0CO#?;hvshlrd44o+|xQdAcxL)kIJUpUHcnV6>fmc#D9c87x?qKtZ_?jaz{NI
zex!B)se?tCII5IWanhn<+B5X^2%k4ZDC48)OE5U)M9=O1Ltw`|U6#N&mC<;x!p(0a
zI>g?&|5ypOr~k}0JQhU-Y(dsE#5u2ruBIjG2RfGpZ1{vk%(VmwwmEpBFa*XCv9U7I
zuoN<)Uh?<ytkri(oe*EVqyL=ZCS|M0aeg;QW_&HutJs$ZJ(jayg}Hi2Ybhw!>Iuzl
z*^f-sX>gDYm@AEAte;M}q~!;Lgdr!CTP(A(7bR#{TFPOHtDRkeRD0I?7He`DQ8O!6
zz~uJPpUlHU*fOK4&Tf&ixREuH$!wR)kenj!HXaDbf2j}Fge<PJE(KOrPT$#bfk<~9
z#f=KCAzJ5F`;_`hIN2pRKDI0?rc?~}iV7M2AJQjH9dN9rt|SOQ$5@`<8%>Uz$jOm5
z2`9AV)~_Gu#Om9D$RDJ_s;y*okNuApy3q#~C&COVI5iH?ZQ$A$0D-cF=we+ZhC!^v
z&mc$-){w9CC|>Aq2K{0Qw8)3GTZxk+&dmWN7+Aph7i`{tD&<0=2fkBU6}~Ks)w;#=
zKV41<IwmogsoVY(bda!3(s_=r6>P_Nj);C>$#Hk4uz4{8dGU+=EwX4g;G(4TQhJKq
z`0;NhsHSqT<B|FpF{+NU-(II@e*P()%D}#qLx3Ets(sS736~heLI`FBI`CQg)XFkM
zRwjE`DlY#CL0lIVNHj7bfo_W430>i?mzWxz78?|N78eCKj>f%!A3nf3wb@6%_9~+1
zO_1UVFZxXi#Jhl}LW9H2F{Y4_yS@PnHn*~rWuT+wKSR464=5|TL$^`sFZaPGC&9-*
z4gdVHXB2GS(_v+3$O0bD$wG_wYfI}yvoKuAPm(6M30jU%2K(Eut$8n5rKwy?<4764
zgE<KF$LBygE~E4rg9d!Iy)O-SG+W0~sHPAM$&oDy7=c)(#756J7E#rNVxSR&uVg}3
z1{sm0XE$@24oRz~o|KU$(n|Vc&a&)BJK*XDV_(b37;UsX)^bRpR@OCHM>T+b1?uK2
zN1}euHFy5AAA#Gbif$Sfy&WoPcTQBP9Ke%E&QSFTo!WuTV9=FONo{E&yQ1(<F=p;B
zW7;Sh(3?TtwNbAvB9{gGU$`h>qg9S*a<Quh#ehyR5S#SCUUk>>EmNRgrVQ6^E*{|(
z&VRXp>r_63=x`_S6Bcu)>9iHvKaPmyl*E6%V0O+Du_OMP>)G?&H}@aOjS${D_2;jC
z;GR&i0&kdf8ccgH-aFSPpVu_T@GkIH=o_gd(9rI-*DFk<exV-WmGp2Q_#lLc2Sw-;
z+7n+Y$vlhT6J#Jaqx8ARiz5B=b!rLW=d5xQZj<E?<qZALDgFa&y}$VH!~ya|_2e}l
zg>6D;k2kPk0Q~@`!ZJ17_ppZ7uY;^xU9wUGOwG*g-PRYv5XnNm*d>fu5lT<oFi}!f
zps@yZT0|uA5<9>(F!&e)9s8(aC86P>2x5=vHvP6*WpM{T=IK>=?%93X+{!`zyNu>p
z*67^*vwR<RON1o(x86c;k*t&Gv}l(l+X|b75=?#*=^mJK5OvX9Li83iPL7cky0NHz
z5-0A@bEwop%TxBSpSZDKJOe`>qE+oV5P1YGOrwv@XshI}c~u?e0K{)HKsMRWDD#$_
zaC-5~bv1jPg}9caA1D)ZWwwHV?82|Q676+6{cKY!R}L0l#cbpUYiite@IN=3i>XiM
zx<1CzeucgCHY2GK+@X}gg%LtHxN@w>Q+4-TYn6s2*Akrf*>4H|217n6tx2m3fVIuu
zoSr%14gmUj1<vMBoytPSg=4nvlM1;t-_b_#rJbi<XCo_fo%T9)9Gy~V56<q+A+(78
z3>5kC>)A%Ql<MEZ&>v|5mR7ROrBmG-rAu(`bW0DCovyX_y3{4!l!-}Fd<_gIIX$~1
z@9yzuH!RZ;La3J)>0`Gyh?G8Gp*m!6dZzxLVva09;b(>!59}>-JH*i@#wK&fsL<xj
z@V0dJHI+@Hg|hS=sIy-YXEaDF*GZJ0MhG?L&n0%2%uk-9MgCv8Hk>Hf<XYy&sW8X0
z3_%|i7!aRHUeXk2n*ltTV+qT-KTON@v!PQ&ghvdk;U=6RI$EaY(roDwfcB*=bhu@3
z2)3q;y9Fu0Fpnt6X&d{>enDq<M@br!5XSS2;$;Wz&n$*d{oHPUWek%zb@~SLzJWSC
zfNpWFjg{?is6S5?B>t~v_jT(Zy`0grYU;3SD1=f<yJBo7Yr}<g%eXq-D@IoMkS`Mp
z!apalw(}Y6KR(XZHCUJffhr2|Bh_RysP0#8fQ<@{^K~i!AHeoUvqde`pl@yP!W^gV
zR~Ud?EvC8C4Bq6fO6~MqOO#J5Y@7VFzSh~g2VkR+18-en{$EX_a4%1_R8C%`Stg*U
z(_?<0DJ1<?1+Y;&ZKmUuQ;PD{1=9ctD>Ge69gv<pwe5kM;`^irOjXoySzpJGzW%MS
zi~cK~ZrrS#7Y|*fQQ}DB0q10GYBNQ<0V~G!l7Y<vV@OWbMZNJ{I7oC-eSNJ0>5+TN
z^1{UBtf<k``qOifc9DnL1^rn_zZElXPmM50Wvc9EyDKBT1DW?u=b0w;E^=w$y1*Z@
zdfJ=0fFX1VqVvEFm{w5-LBG%SwfAZ;r2?*S8rka9%TkWJq@2U|({9nx=GR*~Mn))R
z+CvR_oHdTy@Ng9A{5Pkw99=zXUh>4)+bx~zY758-O(Lh4)lK;EwoS|GBV8I&{|>|2
z6w=I~slaGU9wcvnU_s+!ms<Ye3SPKK^c|#ffAw?^D|YSzS{}1_zmloPfA5^OZ$x3~
zcAHZFqZQ{b*?pJ}Fl!!l`Ez{eA0=jH|6T1z0t+Lew<zsYhEA3@a?%hQk8Sa%J?qmq
z?i|#|36HoGzV_O;km4M>h5Knnft7hB@AmdtQN2?IwAmFJRY5P!e$2BWEZI1R+2ZYO
zo?#Sl#m-e`AUIm*_t(zgfx0*(_{L3rPElT2>~Th8XbKqxb(?8LF|IP^rzlx`*Y9u&
zw*o~*!eoE5)O9==%2xn)VLhKi1)IUumvsT3IFcSucRyw1Uo*N?;>OF5mzM4fzjGfH
z!WU9}UlLN-OgVEk|NS^`1-^!M=_o<Cnbs#QzQiS61-vTT6^0Dewo_$E^SEbib;hl*
zjs7Jwq%Gj^_bz&$lUZ0Ahd6{lTK;-M#?yV?3FoW9!!VC_rSZYuI<9(@zrAA9NM8u6
z&vPUyfjDZFIv#V*ya7Id8yBw@UZMz9?ZcQJuRQIzO<t9jgXtB0gl##$2XE;K8W4$y
zHjJ*G0W>>2w8ph&c<b@;xyGma<2ViLz0)>16C;XK8XeUE>mef(U}+k$Odo|nX}fyq
z;)8PXQxG1qWla*jEIFQjwdA=Gf$GeV$)xpnX@JZOPKENfZH%qxLwt-1h3iBf>Jy^8
z!$|boym3u^N0t@nQMMr6iSZocBgtV}uJN*iN#K3`CH}Ou@cyyYlpRdA{~Tq@1h!a<
z(69QMC704^DV7?Wf?C!bc+<NAOk}i}Ff%;drly?E8@~%pFvE4W5q(t+OFD`RPLNf=
z@j5&=r!^6#Dj(|EVR7fFgGtACL%gl%n|MpV^!+z<(D>3*d4-b0(i~HYEXQL{{I%xI
zEN~ve3)}cQ#0_S4@Y#pCeJt`RxXIWhEjFRLdrn_?7Ag4?#d~6cxTvcsDtt^=;|1l2
zScA`xXcqTy#1&Jcu7K7J&Pz+)l}4Ca8PWe6xjB~nE17^;iOv9eb(&LYW!mkL@C^!L
zv1G*#z&q+b>YnsR)?|;=i<O*JB|%Z-Hz0LhGB}f)k6#^X)~3O+>q`#i(V!ZOSg4}X
zd?ALfDk;Xi4!>e?q#8WdYRHk#@Vbs|2!<{FDU1LDm0oj3j~ICYOCr_+Ifz>;8=Q?_
zL{T&Ymp!>BCM`N|0FU~Zd2p(JPLpxuh3#~5aBN!e1VtXUjevgZI+Zsg-zSiN7<dg)
z!iSu+*tnp2$pe;}rirlF+%#dFWk3ZVLwcY3rZ>o5Ttkq{*7!=Y{GETe<Bf>!wmpv&
z;(_GsGH|ke!M{{crv@0KfLF+KMb6&ppYb005N0LV!dL0^4G*C9LylU=;IhXb)HJy3
z4sKt<W`#w8cGWD(R79dz9n!TF37mJhS4B=$VoqIrnFA2l7SnJj39aZyq+%<v4O>wU
zH`)YtSRq^7l(JkEU!0M>lIYj4Zy?$Pa33y$5WE{q2nA#f0q{D~)^8T2;u?&y8w+TJ
zd}^|Gdytl^^R7-V*fa(J!|wuIZCz14-y~PhvNPJV_;2PQbIGP&;ufD7fj_)bj*}$I
zO>(2$UekO8>#0yK*e@7yGajM&*%kwt=b|+TZpqi=5V*<mR#mL4F_~IXUKtpEr|^nJ
zgU_JS+0^3{{qTj$I>J>As{|LM%Y%iFSE58vTV^V&B`O>K);cR7CJWxtmG%k(e2ZVc
z=O=O+XnaUo(L*vxm9z@Q0e(5?Z`3o{6h!LVX1;1hh=a8(lVLAVKa0+<iXMzA&8=?K
z9Va2cZ=LBu%;DjNL1S%ES*JEN+wqU9#?t{cZE<J~HwGO+&}R}IA%b8Vn<WfeaMd%#
zR};YsH3kyQm22Gi!ngK5xGQ*KLjtlp$}B8NO`j2jwhL%Na}5>|z@BL4@TPOR1&PMS
zx|(Odg@iOl`r()z{LsXl%)tfvG{4XuN7Jzf5~_`BHDxSrDa#f!I)_+Hn)0aWm3?L7
z*7!OL?*5J?qoafHR4@k?71L^0q@1MF!P8EN?$&;5A#gc<;f+&|brE8D(jsh;JBAP8
z_Scyd6^}AelX5snpnN4+e6vKZ&Gt}I$>567X*h@+zpeM%k6@SVi9q;r4o!Z!-*Swp
z$mn!;5Y1?@ywKf6cB56TTgOYy&HI&zd`NMEu3A^gVNad6UHBe7-xK|q?S<E^#j2#?
z*pR*MOhaRLNhznOD8ZA+yY{I;s!s20AiT=F{EdBiiYxm_;Ev%bXp$?%>}vqFgXpm<
zFF}fIzIQ80-AHU9#k5YsQP@eO-H~Xlz~rVi^`S3_kqBqlhGb{@DiHF@Yy4`-kmEMo
zTN3FKLInL|@am4|Bp0xkT-c0t!xbBlqi%^y=^_N#Zg>%L=1oh^yu=Q$B`yN`%C?-A
z5!UX;<XduqT-Rz=l5POwMN}IHyuvgOiv8*7xZhC8XQ+yOJi49HewZdrjJB3LJg@OC
z`HQT+5i|VUuex3i7a~8vnXI4n;sGTsSh}d+4)HV_tM40qD?0)u=%e)~nFK_28Nt?%
zyRz^7XU3z$t=^FGRXdJv+7^btOByD`${+=`OB=BR3kpnPeROTs<EnlZz;I!(z!vHT
zP6-f-2;ducgTc{+!ljYA*9GH4-U=e#@IF6DL;$H4jvOea3@9St!OlXYkZu4w%TDIX
zSK7BP;1xGdVBX&=W=e$Shzs)!0w?l!BOKP@)`24xZ6AmrY#QzTTboz<55%ZkvGj$V
zGvZyKKe@`PP~%FF!0KG@=}rOJh?eLp4NND7%e!RxY9L`f`sef-n3afVW{hL*@qih8
z0*`^@%(xtu<6O4KWo$5%agpwD9^@7hYzJ*9Uv9jLZ)b7Q70eZ{XeYAqA;VIGr}3$P
zX*dD$;-4(cLctSM-V<CoUe75CTo@vm;iGXNop?7`q2bRqX3~uwg!p%){S!=HLa;X6
zT^A-4(WUmyeU_ujEe|u93&sjnh*Z}z`=JU5+mi)8y0pc4I#Z$6ZZ9;RZ8D)E_pk*y
zRIK<PfA(I{IMLcFs{O)p!cqMQX_klLd6CCj#dM9+>kjE0Z9U<(TYh)aZLDtzmXF~A
zoumoLY3~n5RpT_E8z`I(Ad#7j0D^PIa3-}liEI!|O(<aoaZffly!y+_r6sk1^<G_R
zUCXcDg2lNLuv*o%pfvRA?n^cIFvRw{Rx31yd~1)F%y}dYIVF~PIw=>vGs!XjpBA33
z!)z;~Fpnh9KDu;6CGoW>bPa3zmmTTA<CmP_>(a5eSCmks1m&|u;<5+!b>~ui<)`F{
z=E&+kqIp}2yiDZqYy?yJAlfnjme5ZfL{gjnPpanDz+WYmn&ci7WNxW>$u?HMV+C=w
zMJ$n@pB7a%PNh|K1*BEe6X=PTQ)ax2xmiy=1ctrAmvh49t!HcxO&a4yUY@@)lyIeg
zC6Udm3O76q|Ap&?9|SwMfM$98-AP<3)mh8}$3=4)j^2mOWQAXrQDGag|1Eu%Lo5=a
zxt}fvdi}_EmgP$Q_ae+yh{yNZb8Bhez6W;shqF*@9oB<~X2f~%G1K~}BxVO5sb36D
z7jq0SBneD}MUy25-HfS<$wF+lz%FL}?^@aiEG4uO%5I3FvfHg+BZ%qsz+Ny(57M3h
ze^8Vc8RmnT&IlC7uIOnyj1f!d%u%JApkndlnxtl9e%)TC8{=$I_FPY><zg*=`1NkP
z8}e+i;=SMN4`!v7%kX7SB}|&$n&5_?)b|uxztb&D(>wQolNG7(4aw**KwoHVV`gmq
z=ynxt?lX-wkT#Qs^?79qF@NbmHfno#-)gc<$M?Rit(Il{u>;)Up2}C;e`LImXZ(bz
z>2adO4&2}UgZ*Zvq{S|j%j_1;l3)Y8LgFpgaJ->86D#QHy53>*@4Wv{U0)p+)%L|p
zcXvyJbPe4|3(_DUNK1D~3?U&y58W}M^cCqGx{+481%v?xP*6eM==FCm-1px6vCls1
zthHn9edcq{K6`z?tzNM;PF(!KH$+c(U+W$eeM-OIPBa%(o*D|QXz2U26qeyoAuzwq
z5uAHMnrv89U1r`tt=C@TSQC&#Au&HuBj1^8Ty|As{Z&t#K_fSP!g?3B?X?Vih5GiZ
zzWU9@YY!DBF5{=A8Unh?;1-(V#w-dr36<4--hm4Zi+r4S%2^Va!=o?PO^Q-eP+c<M
z=2?a&wd&>VDu$}Ss#&RUI(PlziL-#O2aF}dH|I}nM!=twm3*$TVD74-Ek;f`2Yuf6
z$`07dv!+`WG+JoU?|XhtF1mygx2h-7xP7~1BvQ8Cv=6xPX7RyQ+*N|fUI?rp_P7)5
z*`*8Zix$d0yqEG(+#{KNeVvJyPMRQbHJaW%Q<3=*O{cU0uvz;uu!)Kic>Os)CUSKr
zz*5_|qDeR;ZCn3-(uXP58n%12F@y740@Lyb0jPkJ{rVKKDL%InH#da`E(0&CqA*TY
z2hH}F-IQO{Pa&)$FMQhpzEI9$QCV!=4Ml+ND4R|ht@-!{c!OV3PcKU|Fy-{@KwqP)
zVDymHUnUdCE%&~ZyBTFbYb(E@Zlng=NgZe=0PLEWbDy~{xq{WjfQXnbW{jMVC0I-L
z9&%2*z;LW^8LE1}6QeK18;TdQS;mI0P3FbBGYQN1nm!@*%v$+XDV2cFVE2?<H?<kE
zH0E^F8?KH(%$7h(@)Nh5eh1Wx_r>VJZYrky>gwh|#J3)t#|;@u!m0DS6(hsp%t17@
zVIb2~8c2t-+cr5}l*IVCEn)4pp`Q!jX?mWvkFTE>#NA-o3B=VOv6j>G`XkR?ETQJU
zBqpQ|X_&^s=3s-T&FD13_EjFBzE`5$G$K&npyPgpg-(MTPP+%-pbR?dJg23=rEBxv
zH#kRxR|Pu2&@}6i7bJ)4v|N6@{56zj*~Dw<d8>YQZ#b&CVAZ}dNyE<|GJ-3roomX!
zx1m@aQG;iKNWr;Bc<&gyynpRJsX3y4SKU2wo3_Wee6W=i5iKuI@C)Mq7k&)18~+c)
zf4b4WCG7`tnaB)cYZGQ0si%M09nvsileKv+Q4Qjg^bIMj*S-3vexgRx_i;L22$azF
z+PBF^YZ0QAE4q?<1W91ysE1$t)N&2&@V8G6i)H_I`l(aQU*e+u$5GHt=mpFlDX;rl
zK-;F8-ZL%0gixvfi-5XV0OuJ{hqxGCHvz7Qb?DuL(jdT-vzbh;8hWud*!kBst(5v;
z0?*;u0<xg@QSiXva99^rPi9X5fhEBfO(%j`me_LV_(Km>--p1<=veo-0NEGrQGzer
zV@~Lee)18n*{H5L?4uL&N1vcl0I7O3ncC@kl1y#}nJtJ<pz#*TqhMf#Bem0NqrnqW
zMmvC(ppe~y2)RCV19V0T7S^xS#MM8mobhfcpNs1Mc6g|aoRWQTswH8V(V*uPPWSAU
zCvraZ6Jg%R?=p7ks<HN3rRDq`x!!&J>oXU%*V`(d>^Q+{W0PLr($D3Cb9IV*&nu!s
zpWHVAS16RaEmIIl*E&@IeHEZ@Kf1wI-lf<f|BSa_tz8kWC>vW$Z@1<d`BvBCA@RX(
zK_~Et_j|Q(dMaJcRD#}!az?A&&|HNzgl}~IJ6ehklUAgMZzh?um|^8xBfm$jmdw^#
zybIA|ty?U|v>V$&UnBN;4$qm3Ugc&WqrW(<D<2yf^L(S`_T+8vB+$2PKL6!aq<w*p
zay3pCsKehz?m+=>oML^#X}wDg_yJw(bUB5tDUH7o*-V<|2*gzHp(eDb(v}N-NvC?L
ze0gFGa&Ks@vDss(rVJe`ZL6E!;<YG_#@rUiGf5^+1pFGM+xB*aG1*GA-jq9+K5a%x
zHUTVj+)9(t?*)(N9?&pibR#+QWtmC&t8a(0WC9(UDlNLlON-m>8g`7E94I~8Vp_SM
zT!topq5<B=6<%cFQTi-#a<;2Qbyijld{pca59Qh*4S3KaA<evLi0ydwu*XoEZ9{!b
zBWr-v=c|8f=81PZyMjtVE7XG1(TtapT&aiOWH<AYTo9ak;tVWE*b*ZN9i2Wt$q5s_
z*Lk`y7)acec_R6faWjeJXWx-m7Ww+9RslKO0UOwD$##XGOR@@GLqC@!;@%cdH`07O
zuBQ=ye6LC%QH*-&2{NYXY(&`4PoLYXA3G^8z`Yqumv*cTW~%oj)7=c_DjLasK@RaD
zA2|I<J~wl0@U{batw7zK{Tn66nNkgH9r#8)a&Z0%s#<ToVlS;cklqRc|HjE#OyoL4
zX-dj=<$-MGZcU4`V|S&8WxUze38r-4HnV75lLq18eyHQ?ljk<Pl_9l4uO9|_a8`3Z
zJx9$CsqJe9KmP8=&S7eS)JDhKhWYY&HfSohnJTe<{b?$2kLN%LnN%xK>#>jlvZ~p=
z&+PZ6CnUZQX%?Cc*}hv6Pr52(-w{o&@_s~twZ4D7|FLN_s@bqPVd5U`h7o0brSbx^
zfB45a5ik+Y^QnlpRc&4Z8Lll);70UaEp^Rqdri#%$z{LE(J&}wdO{1pZvjOLKIOLf
z4fgXnXND_1Fw-5iRwT{AwZ-KKzH4-TIg}o<$+IOclc7CBI-Vpe9siE#L@=j;N#QK%
zI4g;{XC-MHOHBTI+<8(CUP98eOO#LWIV|x5Qy;1S6vd;}sAK%W%LtoKui=~tgOiDz
zt(@l^j%=TEHUu9cCH7gNscy=<vc67%_q2nM&@qnsfTV!S1FY@MVabSh@Tmv%n-Vt^
ziriO~9f>Ctl187CpUpp3GKS<v%gW&c&S&A!7HFfJZRSz<lh(vE7aH`Y$+l_AJ=}Ru
zk9R3%auFf~`WAwUG7-HGoT53G<)?=|7yFlo-~{Y~%G3=rxnDe)TN0{V%vpz38_B2T
zG^Op-fKr-xXb9kMO;&Vua1C`5F4%r--y;v{`|*Yje#}9DM`Jb!7dRWW_JX#I|AYu#
z1_lMSxzU_N({o0!2<k*%Fxt}vxCX}rAX#uoHPV63SCoK>C=A(JdiCMFcr};Uvs03Z
zU-GJ$TC<mWCN;LvU~|Ji5_h-GU&w0z%sH0<s%)XjoXqSM&&F_`V#keNGO*)BP(kVV
z^sfj?_VlwjmPlFopH2<iSA~b-X%c+5ON}HtW$t&};$Bn=$>(X=eomT_H0$wsD%_Y@
z&4oP}6@VwK+DX6j{H5p-cAQY8cAa~Mvpb6^zbxzlsk#liF=r~}h1?#5gRG0Nz4?6#
zknP7IM}c(<tNVC4ZX}s>OE%rPWu+B_`kKfNZ$wc3n|hiR;SO0bT~6EFn*3zaYdBs%
z);gn6zIE!Jhag2^<SY6fAThCL!p5XoU*wr|i`C`?2QwPyHylN{*i>V7Y`my_r`9T<
zHjmlHKt)^YRbx`G(!~W*r$%={$@-%i9ts&HTEB7R;Gu*Wq+o`q0Sw~k8tw0vK5_cp
zs`;l7=agyb$gh83Xx>3b2+_&@-NGSnshnkpKx2E14L<guPCcOkCZxIQ&&U%EUI-*N
zVmu4az!`}w;zfU1vW|*{vQw-FEe;dj!y|ph6P_xd&LtemZn+mv?-0C!d7>n7#I7*n
z=^6YksAc8mh`%ZG>ihK;2hu~R3f`swcdt2`g>o_dCp(i^C^PSwZN?DK=wFJV=?}xl
zoQ0f)$m~oUiqh~0fei_fInE~Rk&T;gzv}91tr+?@;>_S}Ccx3hr>K1{B@D-_-mt}I
zlgl0_d}0t(6Lm{ZtbaLNt_MpCzZw=l<DMFM@7kNVn-Nmyn)lgg+zyI^*DB{^SX$Nc
zyt8;R@k#$4Lu3YZugLOa46!<vHav)OWjxywD7xHzR-4c#2xunt=6UmcvC+z$OJqT$
z*078a9R`c?Xw4gPGj3zwFU#{26Fz1k2S1cYubvt>HL5&;<1cZy=5~3Rzz?y2<}iZ7
zv>}Uerg`m}G$73r%AJ}5m)9&B+V-`(aT-4cM?akS&zQUQ#!qWM<BYE80AUa04PeS`
zQW7%%R6=2)T?W4JbP?Zr;Vr{#hkMQ?!?}pxhWutgYI5s}MS0{%H``>mVj<>xoq~54
z8_kh;J_N<TD5*PaU2#%sOe!%n&UkR(ZLQ1rE=co-)T>w3*K^}v*w7`5ajnp%Bleq3
z$*oNJ{q{;d$kY@wQC4iHAu#f1XY(zO8|v#&nu=7zEt-MV@+gvIYAMWTg<_O}{QM)I
zy5ENG^)UWK-n=AyDNkzHXGq!+u?r4=gx)E2vJYhe?Gj^#pit%0E`|n6c85fVvR=@e
z)NHBHL(Ek*>22NV;qz1G%%ruw<9P;{JC(*xNUryWp0&yM3<$c=4659B@uj83FQ)H%
zvq>4#){F{lW{3__upyV}&+%R>`ZBs!!n<k@jBNf^dns#+0_U+8)Ae(!C#cR;6Lj~-
z0`yu$r4^DJ6p`oC116YfeTiOT4r3{J32>pL1SIRu#z%!sp1gr)5k2^%V8AqlDi}K!
zDXlUNCQ7zN65>O1+)^mOQ7{lxqa_qd$jK&3Hb4TN>R^#<D13UsnAFEe%wS6l_(qg`
zgk-CTMY5w{gpl?#>N42k1Nw=QeUMJk*wGoq<h&Vk6_fANQ4>ysEQJa66vzFru&x!}
zz=Z?&kaPo*n-r5N#Y2!|dm`JF#(xkIeUH-JqJDIC`XAc9Og8~k7&hYR_9cP_i}Tmh
zZR!ao*mi~ph#gGkKz{S6ZrCMSosl**mFjZ_hMFjo!U+B=EyZNsmNB;oY^S_K?bPt`
z2|vFKq<K@b@&>LiHM7s>P?IW(*l0myl?_ijYM)ac|L9Cw{JuK&SM~~CY}b|0+C|4j
z=Z#e7#p(sj=8?=LQ5Zn6Jk~h2c_ztNgR`gdLA$9UHZW0*$b(Yff@QNIv|YRJfQ@c|
zmNji7frMf`HdajCB$maFHBbz=I#yWP4rln;9_7Ery-^)NJKC|5<bQIh{b^<Jo&Ptu
z8^c;};l+2)_`wUoAJ@`9!tUMMhKK$P9!erSyCnWecd><*bkA-f34Vwyr+q5ko5u6r
zUO9L<2@|-mtREU25h6K07IW!s+DDC@d!o)R$74lOxG7VZae^hwvZ0%2XZc?Jl80ey
zVV5<S!SZAagyPf`!!i}_G5Azu`Gb_C_@vCD+~kKf01-U}(cWt1q46S#hF1x%HI1p4
zH7M*<TP9mH9U=i?6{-kpl@3e%s+Nh%RJgFlumaq-<{P$A@oP+~dE68#BJ`1EJub!L
z<{9gv*rZ|X-X>Yk7e8hH3;aWxgy^8w?--?gMlhWq|A3&NdguB{Gi1GyN&N~dCnr<+
z1eoW*EQ#y2gk<0oL5>C`&EzHWMo3u`Jcm`o=DC-7F45#{H7%(tX*9{BH?A|$sU;z<
zZ7?8$KxUXKu6$p8(Ew0G3vsBW5pHtE2=U!23TsICww|eYC|NWhRG$D1&VQcAWA?F{
zZEkgJHp}Tjx?m$<vU)JBFWLH8yI<^KQ)#BPs-Jk+HF{!(>O;21T2*z49~w<g>f_7o
zPwm3fSBsr#NEjy@os9W>>0`_9bD+q2>y-kbV&(;)o#=|bCTGW)Nz8;7Vf_hO780f@
zlj#9n2j<tNsaX|5>B29n2sreqXV~3|;cUc~WpB1!G(nd*=-!F|-jGET#9}(d6P;{>
z@y70OfpW74ih&&5MJ@0fbyVF3bBF-Uaankci60_BX~n!Td@$(?erTj8gY%=Bsto94
zg1Mm|j~%Cy9z!6c_>KvE)>4BBJ!A~^hB@%q5hrSaVyXO5%6nYS;0Y_;)7ocw?s>aR
zquS~WhlW&krGuTL%5jxj8tk6MrE>v{QMo;7gI4aJ)Ml^*_klBZ3j&*tFA(7&V>*Pf
zxSR{`qhl|*>?(`Pe0mS3rX5LgL8(BpDPfg|4Vpfl3dQw8?O}E|ZIB^<e|+3$JjqR&
zm3ejt=9Fph;NS#<Aaa?r&WS?Gp-T*g*UnET*1{i7&z8-aXJbF}bitVj#~d8aS|8cj
zPw#Hl9)-AJ%%K`YR~xu^n}pabLv4de*Q{OF$_jk40URt5Z{lUoM*|2jY~KJ~obf!V
z*Sh_cgC7kbzDdTPT_QWix6#PQq#D^>C9@H3vQx`hHw2Pg$4T7Z8sveK+8ecHr>IBq
zwW!%^3_Nm;H?zBn@84E3<x*5FS)>V_Shn02bXm6)+A<z{Q$!$AP5YyS?2(L;=OrMt
zH&$%)k~dV<nC(>xh4I6=73dqF>&T@HgG0BO?G-W*61qN>vu`f><sq|Mf5DQY$KqBN
zUdV`KnNi|R;hQG|xQ6t7Ow>(VMA=&tBF4u%)xZom<(1*Unz%bj775&+`UWbee5E<i
z1&74ntluYoG-}|0!ux_*moo#sP=~pw!<f(%oiuNLY<OMvOHsbWei{vMW&i+Sm`yDh
zupD|jk4rq%MS8kPk}q=Z_yZ*m4D(iY*0oZ{ZC*T!7&}mz1%qh6nK`}kUo_QYx&P`%
zfQDd)R9suo65IO9d_{-k{e7<8&`K(&>3U~b|I%?8d(qa<LtJjW>IqWitb7Lg3L3he
zFk_f=5xf0+TvoKI&S&1hyr5k&^D5k#s3vzin@+qR`i35=-pIrNm^yFrPEHQLvwkMo
z&?l!%lYLMf>ms1!m5Z<5V#i++qRqW;DbxG*$GPpfiT7H|AHLtcr0G5Mqj#k_t?{rf
z<L^EPBnrsyO*a|x?Nl=wQ*^3-ljsf!kC@u~2C;sbYNF`y;ehWaVntu4Pi<9nM&oic
zL~MN2wD#!u3ldY?v~;P%>s@c>g3^*X%kKj%WjzHAMiQ#H`sEM*A^~a$PS5U-fzqtA
z_E(dTDd{AVb<$b8{Hgew&R@`V8=iZ6AYT(%gqiwSVOAGtRWetVe$oEWn(?!z=8K-`
z+PW#GW5;NNTaj;*Gq59dUZ%!3cD|#=mm4LxV_F(2Rt1>O*R(;uenH<yq<&Op$f4ng
zF<THJ5R9YTTP*KM(W%c#Jy9Zp3vWihF#o<7p+!|z>*C%Mi~b~9Mgoc*OHs=vf_fuk
z;)P?^i#+U4gBuM}N_jl=IIYmit~i*!KO+%`CfxAFRNV6_Kj6NT=W;*+8~5ytJRzM~
zxd)}|3Gq%aCkO|{LJbPiE)kmbA_><yQ#SyB0jh8h?@=C#7zRddin#}s+5P0gCf2$r
z4bo#pd?1IhqSZ3q21jGldWXgOBCWPKlm-_J<E1`~+~#ExbE_Gn#d;OcyzPvlXte|=
zgSx8Dv0Ahm$P1bi4wx65{bH)yHjrp4tm<k=;ru?2(LXW(&Ef69%MbWIRZzh86%J3I
zDNiGbtBks9pO;GyhD({qVuY?s)Jtbi%*G81^O&vX0uM>-a{ArLa1PGL67x)ok}))?
zz+zvL-QuTsf7#OkyK_9P$scp*MwYzBhGb2cKS+rs0Wy3bO26l=t%5flcQKce84hiw
zu9CyOPiB(YAH6dF*V~gT|LN=)UFD4T`M`Xem)<`OlP{;#CaX5xnBm{}Wumlted=?A
za_+a9?Ew!2)jFhW>Pn1NXezuHYasQ=f%+<)hB|?0Z{#Z+t4iM%9NNPaMoV64e}%_)
zI6(TTUIShH`-^k7pbA8S!=95GZ!-gAQ&&}Q&TG7w>!MY@4!alrXovzd4(>Fq!Oi4J
zTHkezFIe{cz!ghs5zX8deeF?7T8SoM&~shXKi}#4&fU<v+8yIV{t(l`pn$eufjpZ;
zZ>%%yNy`f?sQltINzv@cq;>&pPz07fbcjkOU<u?ya*loEt~(fB{eZg;Ws>LeO&m_h
zM+e8Mw{~7M*8wSW8&v!3n2wlC<V$M27HX{rM7u2T!+sI&Istb-0sj<{(ae~f0|!qT
z!(*PsV}2y<wy;re=#Ip?7fR?$)L;;YM-2M%V=U<qYAC;Nn7eP-aVdErfmkt8L&KNc
zkOp9<s;=pQ)aogxhG`<dOk5q&mpuHzs1|E8mDNZOwzyA<iulRh0NX>7p6Wr@KDk55
zZ_#<Y_!4F`d3*3f(Ym-todo>vw4+8972#m4SaEYb6}_h2iLOGNB>y?H5VxS0GrQ3t
zw!pb4%@RgF|5mROSqIGy8&FuL*{S~(r4EKBG71^$-$W0ND@@2_DSXsm$O<Q7jr14y
z!{!RzpB&jL%b%RqDmNk*xN3|@r&e`-OR2$9YchYXC$4cIa*b;ih?IQ&86pi`|CL`^
zH$tS96x3j?4M{`}PDc$c-jF8v_l2?VC6f*KV8iT|Xh9TL5^S)ke@jHunsNnh*fhT-
z`UH{J0N>lPC;hi9hjZ3qJj4TU061&Qgz#Uv%h`V0Yw*n$Im(g{c!QG#EV0eR{_o{(
zKjNfc<n4V3QVSUbu>Jpjknm*yxLf=_xO|)LmikxMT+&>`E3P^g5|Y^ebP-2L_=Y$_
zT>=c;!nmb=hfDsB`jj+yN=g#kwT*GBt-qP%!G$~IC=;^3D@PE>)BYV2sq^=^{ljVd
zo0mKF6FJJT!XM4s&HPP*jObM}0uff|PQ9%Uemh}FiTGFDx0-r~B=?R9f$DD)0TqV-
znA{=By<?)LfiPjlzteOC{|E~T^%L-CGfvDuy#cS=P=gP4aZuRp5MpL9^&Sagp789k
zplCb;>+UHcPSOx33{K$VXHsB-bwoJn?^#N;Pk;h<1~cwc{Sllvq2c}A03sxq0+S2a
zV*mCa-(fDf(@@i2s&vZ#UmlbHy8XXA2>&Y#5^nE-D2bNh|4oMgzF8x`<?BD#^?yUx
z|E~zd5fYB-4W0@jM<CfV-%|ev5*-H#iT92=j_)6JGBEHn9>N*%pIJ~Wo`c_h=DuZr
z?>08@9eaf!ggpZSD)_egZ^Tc;91lg@O(J*H$AMta1L<2O|BEn)gv4}5wIdQyGCla@
z;8&}z4_Ht{v%njv!vBoC`5_Amdp0=yPzrIqJBRwu@cr@uZ_)2gX(MBRuMdAw(NMuy
zP~auMg?g~te!LS!e5d-Q(%<Tcpki=2jNn#_|A~J?-0ydNX;J=<iQH>ap8t;go%p0X
zb+J_aF~t9;cUDI%C{G4{i*t{D&FLD10DJhi0NTy=e-(b`ThyJxVIzNx@WE!szkCTD
zx$Ub5)4wktj?ja<j&I-2|E|UTx1R<dewn16Fy8XY-^&GmRtxUbkGAx;HYV8mgn~dE
QNgOGU6!F)$^GoUf0Ea$J+W-In

delta 39065
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e277e34d474..d5a7c2d41e0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,9 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65c..1aa94a42690 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 800cefd3c91..43da5c77e8b 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -129,7 +129,7 @@ dependencies {
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
 
-val generatedVersionDir = File(buildDir, "generated/sources/version")
+val generatedVersionDir = layout.buildDirectory.dir( "generated/sources/version")
 
 val versionClass by tasks.registering(Sync::class) {
     val lastEditYear: String by rootProject.extra
@@ -152,7 +152,7 @@ val versionClass by tasks.registering(Sync::class) {
 // Caused by: java.lang.IllegalStateException: couldn't find inline method
 // Lorg/gradle/kotlin/dsl/Accessorslkzxmv806rumtqvft7195qyhKt;.getIde(Lorg/gradle/api/Project;)Lcom/github/vlsi/gradle/ide/IdeExtension;
 configure<IdeExtension> {
-    generatedJavaSources(versionClass.get(), generatedVersionDir)
+    generatedJavaSources(versionClass.get(), generatedVersionDir.get().asFile)
 }
 
 // <editor-fold defaultstate="collapsed" desc="Gradle can't infer task dependencies, however it sees they use the same directories. So we add the dependencies">
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index a41d732dd7a..ed40ea3deed 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -166,7 +166,7 @@ val verifyReleaseDependencies by tasks.registering {
     val expectedLibs = file("src/dist/expected_release_jars.csv")
     inputs.file(expectedLibs)
     inputs.property("updateExpectedJars", updateExpectedJars)
-    val actualLibs = File(buildDir, "dist/expected_release_jars.csv")
+    val actualLibs = layout.buildDirectory.file("dist/expected_release_jars.csv")
     outputs.file(actualLibs)
     val ignoreJarsMismatch = version.toString().endsWith("-SNAPSHOT")
     if (ignoreJarsMismatch || updateExpectedJars) {
@@ -233,12 +233,13 @@ val verifyReleaseDependencies by tasks.registering {
             sb.append(" ").append(dep)
         }
         val newline = System.getProperty("line.separator")
-        actualLibs.writeText(
+        val actualLibsFile = actualLibs.get().asFile
+        actualLibsFile.writeText(
             libs.map { "${it.value},${it.key}" }.joinToString(newline, postfix = newline)
         )
         if (updateExpectedJars) {
             println("Updating ${expectedLibs.relativeTo(rootDir)}")
-            actualLibs.copyTo(expectedLibs, overwrite = true)
+            actualLibsFile.copyTo(expectedLibs, overwrite = true)
         } else if (ignoreJarsMismatch) {
             // Renovate requires self-hosted runner for executing postUpgradeTasks,
             // so we can't make Renovate to update expected_release_jars.csv at the moment
@@ -315,13 +316,13 @@ fun createAnakiaTask(
     excludes: Array<String>,
     includes: Array<String>
 ): TaskProvider<Task> {
-    val outputDir = "$buildDir/docs/$taskName"
+    val outputDir = layout.buildDirectory.dir("docs/$taskName").get().asFile
 
     val prepareProps = tasks.register("prepareProperties$taskName") {
         // AnakiaTask can't use relative paths, and it forbids ../, so we create a dedicated
         // velocity.properties file that contains absolute path
         inputs.file(velocityProperties)
-        val outputProps = "$buildDir/docProps/$taskName/velocity.properties"
+        val outputProps = layout.buildDirectory.file("docProps/$taskName/velocity.properties").get().asFile
         outputs.file(outputProps)
         doLast {
             // Unfortunately, Velocity does not use Java properties format.
@@ -428,7 +429,7 @@ val buildPrintableDoc = createAnakiaTask(
 val previewPrintableDocs by tasks.registering(Copy::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Creates preview of a printable documentation to build/docs/printable_preview"
-    into("$buildDir/docs/printable_preview")
+    into(layout.buildDirectory.dir("docs/printable_preview"))
     CrLfSpec().run {
         gitattributes(gitProps)
         printableDocumentation()
@@ -461,7 +462,7 @@ fun xslt(
 }
 
 val processSiteXslt by tasks.registering {
-    val outputDir = "$buildDir/siteXslt"
+    val outputDir = layout.buildDirectory.dir("siteXslt").get().asFile
     inputs.files(xdocs).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
     inputs.property("year", lastEditYear)
     outputs.dir(outputDir)
@@ -472,7 +473,7 @@ val processSiteXslt by tasks.registering {
             f.delete()
         }
         for (i in arrayOf("", "usermanual", "localising")) {
-            xslt(i, outputDir)
+            xslt(i, outputDir.absolutePath)
         }
     }
 }
@@ -489,7 +490,7 @@ fun CopySpec.siteLayout() {
 }
 
 // See https://github.com/gradle/gradle/issues/10960
-val previewSiteDir = buildDir.resolve("site")
+val previewSiteDir = layout.buildDirectory.dir("site")
 val previewSite by tasks.registering(Sync::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Creates preview of a site to build/docs/site"
@@ -499,7 +500,7 @@ val previewSite by tasks.registering(Sync::class) {
         siteLayout()
     }
     doLast {
-        println("Site preview synchronized to $previewSiteDir/index.html")
+        println("Site preview synchronized to ${previewSiteDir.get().file("index.html")}")
     }
 }
 
@@ -576,7 +577,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
     // Aggregate javadoc needs to include generated JMeterVersion class
     // So we use delay computation of source files
     setSource(sourceSets.map { set -> set.map { it.allJava } })
-    setDestinationDir(file("$buildDir/docs/javadocAggregate"))
+    setDestinationDir(layout.buildDirectory.dir("docs/javadocAggregate").get().asFile)
 }
 
 // Generates distZip, distTar, distZipSource, and distTarSource tasks
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index f1b45341e1c..e2292467861 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -211,20 +211,20 @@ val binLicenseSpec = licensesCopySpec(renderLicenseForBinary)
 val srcLicenseSpec = licensesCopySpec(renderLicenseForSource)
 
 val binLicenseDir by tasks.registering(Sync::class) {
-    into("$buildDir/$name")
+    into(layout.buildDirectory.dir(name))
     dependencyLicenses(binLicenseSpec)
 }
 
 val srcLicenseDir by tasks.registering(Sync::class) {
-    into("$buildDir/$name")
+    into(layout.buildDirectory.dir(name))
     dependencyLicenses(srcLicenseSpec)
 }
 
 artifacts {
-    add(binLicense.name, buildDir.resolve(binLicenseDir.name)) {
+    add(binLicense.name, layout.buildDirectory.dir(binLicenseDir.name)) {
         builtBy(binLicenseDir)
     }
-    add(srcLicense.name, buildDir.resolve(srcLicenseDir.name)) {
+    add(srcLicense.name, layout.buildDirectory.dir(srcLicenseDir.name)) {
         builtBy(srcLicenseDir)
     }
 }

From a8ef142b8f6e1b6c8bae94aba87b99372c4fa9d3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 15:50:41 +0300
Subject: [PATCH 0636/1037] chore: use proper Gradle release checksum

The previous one was a checksum for the wrapper.jar

See https://gradle.org/release-checksums/
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d5a7c2d41e0..64fe1d50c5a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true

From d4a2cde3e1e5c55fef364da490e56a793fd57b2b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 16:00:39 +0300
Subject: [PATCH 0637/1037] style: fix extra whitespace in
 src/core/build.gradle.kts

---
 src/core/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 43da5c77e8b..1d3e73d93f0 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -129,7 +129,7 @@ dependencies {
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
 
-val generatedVersionDir = layout.buildDirectory.dir( "generated/sources/version")
+val generatedVersionDir = layout.buildDirectory.dir("generated/sources/version")
 
 val versionClass by tasks.registering(Sync::class) {
     val lastEditYear: String by rootProject.extra

From a793855b14c4953ce90d486afdfd873f6d147edb Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:01:57 +0000
Subject: [PATCH 0638/1037] chore(deps): update plugin
 org.gradle.toolchains.foojay-resolver-convention to v0.7.0

Fixes https://github.com/apache/jmeter/pull/6123
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 40dd2098b1a..a5c065c4f0f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,7 +27,7 @@ pluginManagement {
 plugins {
     id("com.gradle.enterprise") version "3.13.4"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11"
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
 dependencyResolutionManagement {
@@ -167,8 +167,8 @@ val expectedSha512 = mapOf(
         to "okhttp-4.1.0.jar",
     "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
         to "okio-2.2.2.jar",
-    "B9F87DECE28EABCCEDA58C77C3B602AEAE7A8AEF3D30DA838F4924A620B18C05D9DF86C5876BDE8AB5597C8C0CE808AD083CAF89C3A5AAC60C1E980C6C144A17"
-        to "foojay-resolver-0.5.0.jar",
+    "A7E32B1E638C47049683ED945BBCD2678F9FC2AEE1E329C61C05DF8FF426DF5FAE21C81446F4361ABBDB18E5B3B7B7DD01AA1074EDCB3A6D5D148C2B3DEB3FC9"
+        to "foojay-resolver-0.7.0.jar",
     "10BF91C79AB151B684834E3CA8BA7D7E19742A3EEB580BDE690FBA433F9FFFE3ABBD79ED3FE3F97986C3A2BADC4D14E28835A8EF89167B4B9CC6014242338769"
         to "gson-2.9.1.jar",
     settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()

From 3c6cacb507cddfe4c337213f364f2b5730d6b5d1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:01:54 +0000
Subject: [PATCH 0639/1037] fix(deps): update org.apache.activemq to v5.16.7

---
 src/bom-testing/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 511cf2f8419..ea08f4829f8 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,9 +42,9 @@ dependencies {
         api("net.bytebuddy:byte-buddy:1.14.10")
         api("nl.jqno.equalsverifier:equalsverifier:3.14.3")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.6")
-        api("org.apache.activemq:activemq-client:5.16.6")
-        api("org.apache.activemq:activemq-spring:5.16.6")
+        api("org.apache.activemq:activemq-broker:5.16.7")
+        api("org.apache.activemq:activemq-client:5.16.7")
+        api("org.apache.activemq:activemq-spring:5.16.7")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.2")

From 295c57b42f43cabf88ad7f58673b35e30021531d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:30:56 +0000
Subject: [PATCH 0640/1037] fix(deps): update dependency org.ow2.asm:asm to
 v9.6

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1ab2ac6da07..cb83a41e67a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("org.ow2.asm:asm:9.5")
+        api("org.ow2.asm:asm:9.6")
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")

From d07a87905dbf8e9b4698a4a7d019ed9cab150cbc Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:29:22 +0000
Subject: [PATCH 0641/1037] fix(deps): update dependency org.jsoup:jsoup to
 v1.16.2

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index cb83a41e67a..64e9005723d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -131,7 +131,7 @@ dependencies {
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")
         api("org.jodd:jodd-props:5.0.13")
-        api("org.jsoup:jsoup:1.16.1")
+        api("org.jsoup:jsoup:1.16.2")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.12")

From 35968fc4c4d4686d3144111990298fc65f3d92dc Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:29:19 +0000
Subject: [PATCH 0642/1037] fix(deps): update dependency
 org.apache.mina:mina-core to v2.2.3

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index ea08f4829f8..af263910e9b 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
         api("org.apache.activemq:activemq-spring:5.16.7")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
-        api("org.apache.mina:mina-core:2.2.2")
+        api("org.apache.mina:mina-core:2.2.3")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")

From 5ba571b2171706eb1c9e639c62a51f7846d64a6a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:29:15 +0000
Subject: [PATCH 0643/1037] fix(deps): update dependency
 org.apache.httpcomponents.client5:httpclient5 to v5.2.2

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 64e9005723d..9834b32331c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -101,7 +101,7 @@ dependencies {
         api("org.apache.commons:commons-pool2:2.11.1")
         api("org.apache.commons:commons-text:1.10.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
-        api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
+        api("org.apache.httpcomponents.client5:httpclient5:5.2.2")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.14")
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")

From 5b2753eb18461a434488cc4e2eedbf4c80f58a05 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:31:29 +0000
Subject: [PATCH 0644/1037] fix(deps): update dependency
 commons-codec:commons-codec to v1.16.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 9834b32331c..f1d9a4fb009 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.20")
-        api("commons-codec:commons-codec:1.15")
+        api("commons-codec:commons-codec:1.16.0")
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.12.0")
         api("commons-lang:commons-lang:2.6")

From e734757fd802b78c171e0461e354b926a1ea0a62 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:30:48 +0000
Subject: [PATCH 0645/1037] fix(deps): update dependency
 org.jetbrains:annotations to v24.1.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f1d9a4fb009..cc716db23da 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -126,7 +126,7 @@ dependencies {
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
-        api("org.jetbrains:annotations:24.0.1")
+        api("org.jetbrains:annotations:24.1.0")
         api("org.jodd:jodd-core:5.0.13")
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")

From 5e6b7d486bff15c3bf438503f7e34e250c7b3fc1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:31:33 +0000
Subject: [PATCH 0646/1037] fix(deps): update dependency commons-io:commons-io
 to v2.15.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index cc716db23da..282b095437e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -64,7 +64,7 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.20")
         api("commons-codec:commons-codec:1.16.0")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.12.0")
+        api("commons-io:commons-io:2.15.0")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.2")
         api("commons-net:commons-net:3.9.0")

From 045d0525c4d480f16fbdd1719aa3ca340bbac930 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:18:12 +0000
Subject: [PATCH 0647/1037] chore(deps): update actions/checkout action to v4

---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/main.yml                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 8bfd0dcf51f..b63fdf355cd 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a32cb4b0d62..2375ad9da06 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
       # Number of jobs to generate in matrix.js
       MATRIX_JOBS: 4
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: set-matrix
         run: |
           node .github/workflows/matrix.js
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       # max-parallel: 4
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
@@ -90,7 +90,7 @@ jobs:
     name: 'Error Prone (JDK 11)'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: 'Set up JDK 11'
       uses: actions/setup-java@v3
       with:

From 6b8155107be62be8814703c54ec34174642daae6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:18:15 +0000
Subject: [PATCH 0648/1037] chore(deps): update actions/github-script action to
 v7

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2375ad9da06..56934e3584c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,7 +62,7 @@ jobs:
         distribution: ${{ matrix.java_distribution }}
         architecture: x64
     - name: Steps to reproduce
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: |
           console.log('The following command might help reproducing CI results, use Java ${{ matrix.java_version }}')

From 46c5e6923c64a1f9f5c24c803d9b924aea3c9a75 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:18:09 +0000
Subject: [PATCH 0649/1037] fix(deps): update org.openjdk.jmh to v1.37

---
 src/bom-testing/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index af263910e9b..f6dfe01c455 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2")
         api("org.hsqldb:hsqldb:2.7.2")
         api("org.objenesis:objenesis:3.3")
-        api("org.openjdk.jmh:jmh-core:1.36")
-        api("org.openjdk.jmh:jmh-generator-annprocess:1.36")
+        api("org.openjdk.jmh:jmh-core:1.37")
+        api("org.openjdk.jmh:jmh-generator-annprocess:1.37")
         api("org.spockframework:spock-core:2.3-groovy-3.0")
         api("org.springframework:spring-beans:4.3.30.RELEASE")
         api("org.springframework:spring-context:4.3.30.RELEASE")

From 56902b80e185c82c56f6c4d746e04ffc675d51c4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:17:51 +0000
Subject: [PATCH 0650/1037] fix(deps): update dependency
 org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin to v1.9.10

---
 build-logic/jvm/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index d90ee65ffbf..994bbf934b4 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.21")
-    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.20")
+    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
 }

From 44e9e5fc6b032fc8a0d9f93d267034851352f0b7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:17:06 +0000
Subject: [PATCH 0651/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v3.15.3

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index f6dfe01c455..257c788f1a3 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.10")
-        api("nl.jqno.equalsverifier:equalsverifier:3.14.3")
+        api("nl.jqno.equalsverifier:equalsverifier:3.15.3")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.7")
         api("org.apache.activemq:activemq-client:5.16.7")

From f0e70f8c1921fe7ad75b0501aa3f48ed36b10539 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:17:55 +0000
Subject: [PATCH 0652/1037] fix(deps): update dependency
 org.jetbrains.lets-plot:lets-plot-kotlin-jvm to v4.5.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 282b095437e..bf18e057ae3 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -125,7 +125,7 @@ dependencies {
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
-        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")
         api("org.jodd:jodd-core:5.0.13")
         api("org.jodd:jodd-lagarto:5.0.13")

From ccadefe53e07b3ef6993cbe310763ca6a1ec6768 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:18:00 +0000
Subject: [PATCH 0653/1037] fix(deps): update dependency spotbugs to v4.8.1

---
 .../src/main/kotlin/build-logic.spotbugs.gradle.kts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
index 81b8cd3f17c..684857d487b 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 
 spotbugs {
     // Below statement is for Renovate Bot since it does not support toolVersion.set("..") pattern yet
-    val toolVersion = "4.7.3"
+    val toolVersion = "4.8.1"
     this.toolVersion.set(toolVersion)
 
     providers.gradleProperty("spotbugs.version")

From d61dadd7ef3f782bfd6459392983f006dfd30896 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 18:26:08 +0300
Subject: [PATCH 0654/1037] chore: add PGP keys for the updated Spotbugs

---
 checksum.xml                                  |  2 ++
 ...d04176586361fda94ee0315f7786df73e61f56.asc | 26 ++++++++++++++
 .../56/5f7786df73e61f56.fingerprints          |  1 +
 .../85/7679164aa2590985.fingerprints          |  1 +
 ...2b29e928995b9db963c636c7ca19b7b620d787.asc | 35 +++++++++++++++++++
 .../87/c7ca19b7b620d787.fingerprints          |  1 +
 ...7e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc | 15 ++++++++
 .../d0/56e73ba9a0b592d0.fingerprints          |  1 +
 .../f4/73f7734b17ec71f4.fingerprints          |  1 +
 9 files changed, 83 insertions(+)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 1546c6c5655..5ebfc5575ec 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -26,6 +26,7 @@
     <trusted-key id='a4fd709cc4b0515f2e6af04e218fa0f6a941a037' group='com.github.kevinstern' />
     <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
     <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs' />
+    <trusted-key id='042b29e928995b9db963c636c7ca19b7b620d787' group='com.github.stephenc.jcip' />
     <trusted-key id='e05f005af50ae94e69701222b9729775c0352d3a' group='com.github.tomakehurst' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
     <trusted-key id='b0255b26003ef6f82491acd7254e9c64c264c176' group='com.github.weisj' />
@@ -133,6 +134,7 @@
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
+    <trusted-key id='077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0' group='org.apache.logging.log4j' />
     <trusted-key id='53c935821aa6a755bd337db53595395eb3d8e1ba' group='org.apache.logging.log4j' />
     <trusted-key id='fa77dcfef2ee6eb2debedd2c012579464d01c06a' group='org.apache.maven.doxia' />
     <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.mina' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
new file mode 100644
index 00000000000..bea2cf284c4
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGEVsM0BEADiZwFLiyjeOLeGS0jAso0pOwUigT9PpwQq7JFAuJP2i9C4Eunc
+J2HWRdMhnAY12C2MVetSwhI/4QID+rIreB7ooC4xv8sz1PIC30t2oSYtXF4w5DYh
+RlHdJajbVy9Oz+qdpZtshTQgXhg301TXu5PN6KloTvWxvCZWQ9moByhhwNJrCbI6
+EScorVQexvUdv9/N3bC0P31/GvU/5u0l8mHeK21RLqGJSZINqfUKf7YAMrAXKn+R
+IlGePr0sg0BCACOCmf3NtGq6/GLtm5ShZD5PuAstaMjp7u4P9cNEW0mny+FYkde3
+H+kN4U7bWCZcMFWhGwgsLCm3VgD710C7Qb40WLY5w8pTnsY9gOgaYti7xfOIi/nH
+UF0oPecnBw3pMfHNesYPS/s5/ektju26cH4Lq35PgAX3/5QUqkHp/tgW9zXX4RIo
+r06kV+U7fKFfzDfThvINTd09D4dYorkYEoB46NJbjoIFG6tJJXM/1MTMDHLi4MEL
+rC8Zy4jIoxDjkU75oQNrgALOXsSfxkMLEdRjXcjqvJEPr1ndcJ6FxCJnWtAqbdNu
+uqgX3PiE64vQzK75m3NKKDp9uoA0BrZ9cnAMf6BwIqNA77CLo8yAzDS4WPu0N8Kj
+gmOx804d12/Ixy3soT4KcS7zqXKeWy5xzoBImScerRsm3ij/cC+fz74vAQARAQAB
+uQINBGEVsM0BEAC0Kq9yuZkMgTJX7PqLYOE1A/5VyXik3iPpHLccuIVLLiZhqhed
+dKuyDkub9zROQHqu1qyw4EO6T/5uAT8erVvlKJ/7PvNgkvL4M9yO0KUw05EbbrvG
+tWE+eskOL9umS4wD/ZYpPNOmqpLjASlz6W0ltfeDhHzp3CMfJ5qsUTMfzYCwXkOf
+5UYa4w9CDOUf3kXNEQ+I0l+r60QB0LLeNRDLKyL14nk12+dhKHSybbYYdHk4o6qe
+nUKGhr2295AmcA/Jx2G8D240/4oxlANvXVbyuKsUTsJxzwEZBSpuU9xd7/DypIvM
++oU9XU9849x3PsC36mgHYSUCMSaCdF6qhimUn9x+rhg4LrU0lVEKP03B0JoPbgFm
+W/Kq/eysVB6b/m54LQl5/iqoPxQAs51RT9xk5/PdEAhjjzn1OgLyOqDyh13wnRH9
+pEH5fPYAMNUVsEW0ijNT+mKLGJggwJBkW+x9Av+Ff9P4MLFXkbwK7lF9K3bGX1kg
+b2A23duXxBeooEQa5cavVvrrCs5d73T4DsIe0f2bMbec5BChEVY3cbfUdwcRVrhI
+lNOwL/+ButprWMnBdlxuHiR3QU9XdUEvvP9WNyckBEqWJkKqGZG5OQd9DlHTabg1
+MspVjvmHqejOtA94gK5wAG3tOr07K1V8GI6/k5Ivhj9zFr67bxTZ9J2aAwARAQAB
+=UmaF
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
new file mode 100644
index 00000000000..c96bb8e4dd6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
@@ -0,0 +1 @@
+24d04176586361fda94ee0315f7786df73e61f56
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
new file mode 100644
index 00000000000..1fcfded497b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
@@ -0,0 +1 @@
+042b29e928995b9db963c636c7ca19b7b620d787
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
new file mode 100644
index 00000000000..64a1f282c02
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
@@ -0,0 +1,35 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBErg1IARBACVbmwMwp4p0ldolUYSkGl7XFJHwtEWmuikGcM4lp72h/YhAXpf
+RVsKE3aCy6HSTt7KJrcUuOL8BB67riZXLOIZtA9kDyC+0EUbnW2EbVfJXskPLP5X
+VA7RqcuvaW7lil+Fi+eWsy4dvRS0/guG7SBlMpyoOOcuSK1fGlMJkRKMEwCgopOy
+9220jSQTIvq/2nzLR0PN1o8EAIImG36FVZw8j1WMaCMfJMX8gZuYxdnBXo3AgU2H
+x+AnWvyMFlxR7fIIOsYaMmGLcIY0Re9qQCpPaZum9d9IRvqH6YGcI7s00ysk+C5K
+09FjQEtcgAe9WBVOSuHorcv4UMnX6fyDWHucu63KXrwqfq6YCHHV3OPTs6CkzgNY
+iomxA/93OVuaEXHkyPBS75br0rl2/m7Ow/qp9rvNOzS9U2ttJRctM7ts7TwtYLi1
+YHxHeTgbnq5lVCdUnY8h4hElGx/hi/lpyCJEEK076o/M0qTvq9JnA1p2dKj07lJ6
+ffANb0BKwV9zhvI9e0+hheROQiHpLM8BhXHgptSeAB2L5rjWkbkEDQRK4NSAEBAA
+wlyOxGtSEu+rS/F64OFIvrUfPUu1TjtDSem5jfHIoKME9zntQDyxSxczM90wGB5f
+nxFWWuFQQdyLb2aS3pmkoRbtDIr3WTFMBfohzjEUsxLjy651XokVh7v1zJFpqb92
++VOeHV66GwRKQWHCTyi85G/6m4SpDEFOOopYiO3aYYs0yKNnUygoZQUX0D0YGNOe
+8kS8Lzui3VXwAFCNWN7Jh//bfQCnaR3CUGTWMnUE6NXMY6kb8fl5aBMaz3guKMdr
++BkRd5cuS7i2o2kT8jsx/P1agavkFByYO7jMRObskMr+KX/7lwvNgnBS5r4fRVzA
+sJMP9OMQ+a1o6dQwPbsqmf0wzGJTHY8bSoWa6j6i3HiXrfhzSG4bgRAWqQQgRVDK
+uLw6zg0lFEiR7CM3GMyNXRz/jmSLl0e/NVhXb1SrYw4jPSiHxFfq/rTdITNYnuwF
+UXQnWmOAkRqNGiEVNIfhiR6q6dIFvYbhUDNmLTVgsmGT3spBn01FYI7jO6uTjTpM
+ao4GYop/QDrPapUaBGzYxfI6L5ikZQ3FRQwUdTuQHB5FLmXqTkPimiwTpGiFhez8
+ImjAvE32vZiCIsRukGE8nJFrRqaJML9fWwnkMzA0CAiExyyQkDKzzxkYo4YyJxFD
+yAd2Ak553lsmTApjQD+v3yPMJUqPbKXj+yxx0aa6VocAAwUP/RE3neYN2ny0EhBZ
+TXY9FaXA/HR8gyodzQxAWdwpDEZRQL6PW6rqAKio05dcqVcD1zeQvWJRMX7af3CQ
+VqWdSliFSEv6vlIgO50VjDCdoLF+Gt6Ex2EZzTBjFSocsTfPHiqcnAwnvcuja7r/
+7DzF8jIp6G6tIhDGeGJJTyBk656seqSy/A0WPFRFsbDk7J1eX+8F5yJgAVRQ6ZXT
+79tZlvoP7zCrMRIO7GmO44J8/kxsYEETUgGMSU+jVVmpwqB1Fb1Vgwgeq22JUKFT
+iEfyCY2k3gt4B4ee4CByEYP3kea2TCGZGevqxs+DpBD7Mzc0irgErmEaxNdaPMc+
+fD7t7Uxshiw6jVKQV7oso1+Ax9LgKhlFUc5X4U3YBYWH2n0ZuTRvpmn1L4nPfRkF
+6sAkCWATvH4CrPBWfrnV/JTo6mqNcmcMtuTZICw521ypYbdPNNOxLo//0qg7sRIZ
+yOF0JSPivF0N0dHkJGs4XxZ+XKPBzlJer3xDniMqfQdthtMuJ0kSmhwVLRKHwNS+
+KJkxD3gxbyggeoZFLDx6u38/TJAC++B1EXX4Rxnz+uzvMy8kdN7pJHKg0Pf1X8LP
+C4BTYGBhskdfSFc8HFYXVz1By8T0f4x2dTygh9xWj8PfaBHgV2t7gi5UqIFbtCFA
+uj1GTISSHu7AOSBua8sXCHl6XWjd
+=Jbye
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
new file mode 100644
index 00000000000..1fcfded497b
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
@@ -0,0 +1 @@
+042b29e928995b9db963c636c7ca19b7b620d787
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
new file mode 100644
index 00000000000..33d5176e465
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGO9IPgBEADHCB2evKGSjQutTtIjODtaYUoU634Tl4Iv4DYsOR+MyOQBJ3Eo
+9okST4azX6r9Fspgmc4LxpFnGm9OSEGn4NZ9ZxiTrmKaGsoXzj2w4JKtgAip4F5h
+o9Ai/ridqeA7V9VH31OLSyZ/YJvrcoBcxWdwcpydxchlKQOOYX6wKqGk0BO38870
+sI1d0y1W9pC9AiL+z7qaX3WUslOFDCGxRSxZs57x28P4pkRy0HwUWn38TrS4fnA5
+XfWuxXWr2K8/xtf+Uf2EGVUP+qiv7kDdKYbZj+SeF4ba8nLPcuFmnz6Q1iZUhA9s
+sTfruyibtm7htngt1IHFy7DT35GrIbE6D7W7S3ANqg/K+Gc/j9JXKjOwx8AM/WI0
+WQ5w4fSn3C6WhFTMpyq445c97+5ki/SKbFP45oWd7A9JqIMttMqZLzOSzFM4230J
+Cd6FQTGJdtcgfruwltQOUWl4IaCOsCAzI0XnxTIdsaCDDQ6+KspvdFw7zav03eVN
+TguQ39IkZgke2Am2He5vtxXAayv/qiTKsyTUxIIDe1ZTS5j3MJ+SNWR0faXvvDaV
+QgqVjsB9U/CHjcCYbmFhKxk2phGwa0Wc+NHKwyVwjhJkFo+U+XDGJaT2RbhDYD1H
+LeoZAT6kdngSzr2WvXWs6xJbWIXJc5FivUorfkhaiaBWam1R4o+8kSuxSwARAQAB
+=wRa/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
new file mode 100644
index 00000000000..fdb197d87d8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
@@ -0,0 +1 @@
+077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints
new file mode 100644
index 00000000000..c96bb8e4dd6
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints
@@ -0,0 +1 @@
+24d04176586361fda94ee0315f7786df73e61f56

From d9c32eb8501bb200fb818a69d590a70327e0f1e7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 15:51:01 +0000
Subject: [PATCH 0655/1037] fix(deps): update com.google.errorprone to v2.23.0

Fixes https://github.com/apache/jmeter/pull/6148
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts          | 2 +-
 src/bom-thirdparty/build.gradle.kts                            | 2 +-
 .../src/main/java/org/apache/jmeter/util/ShutdownClient.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index be71ef36e8d..211db7f58c6 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"("com.google.errorprone:error_prone_core:2.20.0")
+        "errorprone"("com.google.errorprone:error_prone_core:2.23.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index bf18e057ae3..79ccb11ea74 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
-        api("com.google.errorprone:error_prone_annotations:2.20.0")
+        api("com.google.errorprone:error_prone_annotations:2.23.0")
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
diff --git a/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java b/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java
index 8e6b1fca845..cdc535f3b9e 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java
@@ -21,6 +21,7 @@
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Simple utility to send a shutdown message to a non-GUI instance of JMeter
@@ -38,7 +39,7 @@ public static void main(String[] args) throws IOException {
         String command = args[0];
         System.out.println("Sending "+command+" request to port "+port);
         try (DatagramSocket socket = new DatagramSocket()) {
-            byte[] buf = command.getBytes("ASCII");
+            byte[] buf = command.getBytes(StandardCharsets.US_ASCII);
             InetAddress address = InetAddress.getByName("localhost");
             DatagramPacket packet = new DatagramPacket(buf, buf.length, address,
                     port);

From d5b50e354fa30780122a248b4fd3ece1acc8c097 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 19:03:38 +0300
Subject: [PATCH 0656/1037] style: fix letsPlot deprecations

---
 .../apache/jmeter/threads/openmodel/gui/TargetRateChart.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
index 63ca5b42021..0f4b1790c7b 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.threads.openmodel.gui
 
-import jetbrains.datalore.base.registration.Disposable
-import jetbrains.datalore.plot.MonolithicCommon
+import org.jetbrains.letsPlot.commons.registration.Disposable
+import org.jetbrains.letsPlot.core.util.MonolithicCommon
 import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep

From 5d8f11650f631b571a838233758b7c4033046010 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:31:40 +0000
Subject: [PATCH 0657/1037] fix(deps): update dependency
 de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin to v3.6

Fixes https://github.com/apache/jmeter/pull/6136
---
 build-logic/checksum.xml                  | 5 ++++-
 build-logic/verification/build.gradle.kts | 2 +-
 checksum.xml                              | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 08f4a65f57a..d3852ab751d 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -40,8 +40,8 @@
     <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
-    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
     <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
+    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
     <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
     <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
@@ -77,6 +77,9 @@
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
     </dependency>
+    <dependency group='de.thetaphi' module='forbiddenapis' version='3.6'>
+      <sha512>B9D779B085611E8122FB1F30952E1DD1EE1456AF11EAED24F7182B73EFF1E648862912849F1CE53CD8CDA8313F7CDB2E88BA959C3868418359BB98E59CD2E5D7</sha512>
+    </dependency>
     <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='1.1.7'>
       <sha512>B7B121AC6385206A03717E03A61C9514478934CF7E8BBDCD87BD2E8ECFC2DEB37B9B834DA34EAA14C16CA6F61DB6A4DCD1C89FEDEE22EEBDEF6EAE5423847CE1</sha512>
     </dependency>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index b40fcecfce0..606dd85caeb 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.14")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.5.1")
+    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.28")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
diff --git a/checksum.xml b/checksum.xml
index 5ebfc5575ec..87ff4a2edf9 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -254,6 +254,9 @@
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
     </dependency>
+    <dependency group='de.thetaphi' module='forbiddenapis' version='3.6'>
+      <sha512>B9D779B085611E8122FB1F30952E1DD1EE1456AF11EAED24F7182B73EFF1E648862912849F1CE53CD8CDA8313F7CDB2E88BA959C3868418359BB98E59CD2E5D7</sha512>
+    </dependency>
     <dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.5.0'>
       <sha512>36557C04B8FC7DC446B5FBDD6383A1B7281708B424C3039E7EC11807F3BB9A5E2764BE4BEC1D717C38595B12D8B291CB2A002D85B5E79DC9A9A4CBD27C58C7BB</sha512>
     </dependency>

From a1db7e9a986a1292ac2e14667d91e41f109ad7b5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Nov 2023 19:19:24 +0300
Subject: [PATCH 0658/1037] style: correct import order in TargetRateChart

---
 .../apache/jmeter/threads/openmodel/gui/TargetRateChart.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
index 0f4b1790c7b..a8c074a1143 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -17,14 +17,14 @@
 
 package org.apache.jmeter.threads.openmodel.gui
 
-import org.jetbrains.letsPlot.commons.registration.Disposable
-import org.jetbrains.letsPlot.core.util.MonolithicCommon
 import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
 import org.apache.jmeter.threads.openmodel.asSeconds
 import org.apache.jmeter.threads.openmodel.rateUnitFor
 import org.apiguardian.api.API
+import org.jetbrains.letsPlot.commons.registration.Disposable
+import org.jetbrains.letsPlot.core.util.MonolithicCommon
 import org.jetbrains.letsPlot.geom.geomLine
 import org.jetbrains.letsPlot.intern.toSpec
 import org.jetbrains.letsPlot.label.ggtitle

From 59afeed54e963ee93b6570d1af40ece013a05d73 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:18:04 +0000
Subject: [PATCH 0659/1037] fix(deps): update org.checkerframework

Fixes https://github.com/apache/jmeter/pull/6144
---
 build-logic/checksum.xml                                       | 3 +++
 build-logic/verification/build.gradle.kts                      | 2 +-
 .../src/main/kotlin/build-logic.checkerframework.gradle.kts    | 2 +-
 checksum.xml                                                   | 3 +++
 src/bom-thirdparty/build.gradle.kts                            | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index d3852ab751d..5637b9d0316 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -101,6 +101,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
       <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
+      <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 606dd85caeb..2016c099765 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.28")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.35")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index 11fc8723c05..9b7858b1678 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.35.0"
+        val checkerframeworkVersion = "3.40.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/checksum.xml b/checksum.xml
index 87ff4a2edf9..7bcc7f7352a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -311,6 +311,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
       <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
+      <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 79ccb11ea74..1c29355216e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.35.0")
+        api("org.checkerframework:checker-qual:3.40.0")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }

From dc1c7671656f47236aadc0376176ece2ee980d6b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 14:17:01 +0000
Subject: [PATCH 0660/1037] fix(deps): update dependency
 com.github.spotbugs:com.github.spotbugs.gradle.plugin to v5.2.3

Fixes https://github.com/apache/jmeter/pull/6137
---
 build-logic/checksum.xml                      |  1 +
 ...57c388d7d1d9d031274cd0a5def5a76f94a471.asc | 26 +++++++++++++++++++
 .../71/a5def5a76f94a471.fingerprints          |  1 +
 .../cb/b15ad8efbd28d3cb.fingerprints          |  1 +
 build-logic/verification/build.gradle.kts     |  2 +-
 checksum.xml                                  |  1 +
 6 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 5637b9d0316..8e47996a3cb 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -11,6 +11,7 @@
     <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
+    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs.snom' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
new file mode 100644
index 00000000000..73f4cef2ba0
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF09IUABEAC2p2RNMRu3DgovIw/OuG4BL101EzTepeoPzRbKll+/xtNiN270
+ekSio9Of9nn7ZV0n4AH1nFM4iQqAC4KFZ74NrgJ+EeHoh3eZr7hyQ/TW7p0z4097
+Dm+C9PbN6+7wf1sBdlaRwsQ+eNKkdkal7WGNXUX1YiUtof8WZZRkiqRFD+0Ldsnm
+frJFKc3MPPWR0UC56JmqzMaN0XeiQvcDaoJJ6W8XLT4QbzwQMJVpA1wKyfMNodPO
+kvJ7jOFNLuLA3a8hE/ZFrvMJgp6yziQoIxC+Rlim1AN0leLsfgjVU7TnqTS8Z8+B
+i2LRwpJhLS/HbaiRsJbpXOr53GPiTuZTz78OIq30nqAg40O+NWghOX93DzB7j1xF
+Aunzm/Z1VO76Feos3ORQJSB0PAQbLqCzAyyAu/xuF7DZuiobHB+b8ggZZRJEiEyL
+O64YP5UBWn3sEM+VdNy+NZujqvNKXrehISk2GBdmAQFszJP9Ti5SZiw/L3z148fz
+dERBs9s4k6iUsrbHzEtHvqxy29okKvQvW/PgsA1pImByndYBXCQQrl20giUQRxWa
+mMEy5Zt8DEeG5/D5mRDeJk/sjTxRlFoFheFZX5NGPD3I4/P7um2L59Hu93oxlEqo
+/OcAXDCr6s2lQjkEdeamUPzsGh6/4TKqdP/0wVgxZlDs0U9/iMoQPxwFUQARAQAB
+uQINBF09IUABEADeGZ7xqPNpZ7v9VLQOmZvzuj498/TZ7qaL79o9pN4svEiSP1FI
+O7ol3a7zHnwfHHvJyd76fo5lVlvRRtgqEfJeqzJASUbTQwPU5U/7cMEQhLhvNe0K
+uhLcNInIpPdSmX0z0CS0vuCUCc59wXPangyXER1plkqtaQDq+R+giY5aXRqcmutT
+DL4LW+lJYUIf0lybseVHNmgqRRKzIvD4aYowegHIKVEiBBxh826rrLmB78608/6+
+alABLErpfflPTwyJnI56D77672fu6rXE5m21NiXsEcS5a4snP8QrxcpFkJbBvxmO
+wgGuD8/6juOM263uCWmzt9Qrnj/ujA7RvwPlFXZSTTqmRchEPFTCeC/nRMNIImwR
+DmbrHZkgqsGJhNvWba7f86DitCn5+5ne+PWi7gAK6w+mjWDtUHOOIpo6U0sEegUS
+u6frHaE4U0dB2y+FxJCr2jhtuqNYjlsoFkBMNGCGKUj5zizbX5As2QR7PPtBeA2I
+ZEha74CzdNx1tmBHAqIAmARDfy6iamAoh/yMuLCcOxV0ZN4qtweu4DmNuPFJBUZg
+neDSfEYv2e9oIdVkjaMUZggfxeO5xUUoGaWZKTAemTAASx/wNef/T11D0jwxypTa
+pGMgmPtiGormuHpN8+yJMSCSnns8DvVTHaU0d7kVv+EDcMe+RQzv8NnCPQARAQAB
+=yQnj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
new file mode 100644
index 00000000000..6d4dfa116b9
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
@@ -0,0 +1 @@
+9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
new file mode 100644
index 00000000000..6d4dfa116b9
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
@@ -0,0 +1 @@
+9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 2016c099765..e8a73d04515 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.14")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.2.3")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
diff --git a/checksum.xml b/checksum.xml
index 7bcc7f7352a..2f2ec0a3864 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -26,6 +26,7 @@
     <trusted-key id='a4fd709cc4b0515f2e6af04e218fa0f6a941a037' group='com.github.kevinstern' />
     <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
     <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs' />
+    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs.snom' />
     <trusted-key id='042b29e928995b9db963c636c7ca19b7b620d787' group='com.github.stephenc.jcip' />
     <trusted-key id='e05f005af50ae94e69701222b9729775c0352d3a' group='com.github.tomakehurst' />
     <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />

From 5fb39e2d6017d1d4b4477ed16cf95aa6ad3c4623 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 13:29:26 +0000
Subject: [PATCH 0661/1037] fix(deps): update dependency
 org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin to v0.8.1

Fixes https://github.com/apache/jmeter/pull/6129
---
 build-logic/checksum.xml                | 4 ++--
 build-logic/root-build/build.gradle.kts | 2 +-
 checksum.xml                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 8e47996a3cb..7fa8a3948c8 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -117,8 +117,8 @@
     <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
       <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
     </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
-      <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
+    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.1'>
+      <sha512>397C3257C5448C26304B312212F6DA1649AD15E52CE0419C5BA647F8A68864707A0C8071FA9860C28AA9D626D66C8FAF2D5F576E693F9D01B0F71EEEB84B57FB</sha512>
     </dependency>
     <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
       <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 7493960f136..613d514991f 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.0")
+    api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
 }
diff --git a/checksum.xml b/checksum.xml
index 2f2ec0a3864..7189d77c62a 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -342,8 +342,8 @@
     <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.7.1'>
       <sha512>89CA3D64D42938DCB50AC58CD53D1DAEAF6EA0BF69CC01DEFE7467D2D1F23BE7932D005861A6E08C2C81980EE1F8EFB9A944B939FE02AF99518753704383C086</sha512>
     </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.0'>
-      <sha512>F9C0C770036768965D955BF849933DFA1B5805959D0C93C2C70DA31D67C200140CAC7B9B93CF28B3F86AA3A5993DD25D566E37B0C451264CB0F6F2B5CD88F760</sha512>
+    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.1'>
+      <sha512>397C3257C5448C26304B312212F6DA1649AD15E52CE0419C5BA647F8A68864707A0C8071FA9860C28AA9D626D66C8FAF2D5F576E693F9D01B0F71EEEB84B57FB</sha512>
     </dependency>
     <dependency group='org.ow2.asm' module='asm-analysis' version='6.2.1'>
       <sha512>BE273F8E886BBCFDA81180917145996AB8FD26A17264EBEB5E1FC2337950A309D64DC8CBD373220009728622A8CBF56B8578E960B5561C22EA66848D296AE44E</sha512>

From a186172503582bd7b4f22a908a322e53704289ff Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:30:28 +0000
Subject: [PATCH 0662/1037] chore(deps): update plugin
 com.gradle.common-custom-user-data-gradle-plugin to v1.12

Fixes https://github.com/apache/jmeter/pull/6149
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a5c065c4f0f..c2f402d8b2c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.enterprise") version "3.13.4"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
@@ -147,8 +147,8 @@ val expectedSha512 = mapOf(
         to "JavaEWAH-1.1.12.jar",
     "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
         to "JavaEWAH-1.1.13.jar",
-    "761746DE12A20A9D04D395D1454220636770FE33399A49AE2D2F8E22177B261A9884FC36CB47F13CCBE5A9E9644A4EC9B1E0F657BA12ACA95E603D3A5C29E60B"
-        to "common-custom-user-data-gradle-plugin-1.11.jar",
+    "3A5A5A8D5525CC6974287C32AD5D8432F3020FC613EF54555FC0B954646D1BE06794AE2EC712E71807A5C8CF5F6E7A1074F5963E32B78302AE6B1ECE9725DF0F"
+        to "common-custom-user-data-gradle-plugin-1.12.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"

From 7a5ef78db8ec5fd714b7598e533942f24e1c0181 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:30:37 +0000
Subject: [PATCH 0663/1037] fix(deps): update dependency
 org.sonarqube:org.sonarqube.gradle.plugin to v4.4.1.3373

Fixes https://github.com/apache/jmeter/pull/6151
---
 build-logic/checksum.xml                                       | 3 +++
 build-logic/verification/build.gradle.kts                      | 2 +-
 .../src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts | 2 ++
 checksum.xml                                                   | 3 +++
 gradle.properties                                              | 3 +++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 7fa8a3948c8..ea3d8f47c40 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -123,6 +123,9 @@
     <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
       <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
     </dependency>
+    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.4.1.3373'>
+      <sha512>3FDE80F4F005B5BABF6F278C6B4C7BEA4A00603BF9C44C3026334BFBE0B64E1F767C92295614D6A5AEF61692844F0FE7DBB0F8119F58EABF522FCEC6904272E8</sha512>
+    </dependency>
     <dependency group='xerces' module='xercesImpl' version='2.9.1'>
       <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
     </dependency>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index e8a73d04515..d08e5bb7f66 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.35")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.sonarqube:org.sonarqube.gradle.plugin:4.0.0.2929")
+    api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
index 01aee062959..9b610ebe678 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
@@ -40,6 +40,8 @@ sonar {
         property("sonar.links.ci", "https://builds.apache.org/job/JMeter-trunk/")
         property("sonar.links.scm", "https://jmeter.apache.org/svnindex.html")
         property("sonar.links.issue", "https://jmeter.apache.org/issues.html")
+        // Skip dependency of Sonar task on compilation tasks
+        property("sonar.gradle.skipCompile", "true")
     }
 }
 
diff --git a/checksum.xml b/checksum.xml
index 7189d77c62a..2b9e3fe1269 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -390,6 +390,9 @@
     <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
       <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
     </dependency>
+    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.4.1.3373'>
+      <sha512>3FDE80F4F005B5BABF6F278C6B4C7BEA4A00603BF9C44C3026334BFBE0B64E1F767C92295614D6A5AEF61692844F0FE7DBB0F8119F58EABF522FCEC6904272E8</sha512>
+    </dependency>
     <dependency group='oro' module='oro' version='2.0.8'>
       <sha512>9A98E493C4D771322B1331EC05AB0E363A83D8AC2AF8018D96A44DF2BF5BFC97D33EBE6F6F93E46AB10BF1536F0C29E9D9569318ED49BC18B4E96B1A8B476D37</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index 123dfc216c6..eda4cfba059 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,6 +28,9 @@ kapt.include.compile.classpath=false
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 kotlin.code.style=official
 
+# See https://community.sonarsource.com/t/sonarscanner-for-gradle-you-can-now-decide-when-to-compile/102069/4
+systemProp.sonar.gradle.skipCompile=true
+
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments

From f9201d7ea33e63d129429f5b109f5467843b0ecf Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:35:54 +0000
Subject: [PATCH 0664/1037] chore(deps): update plugin com.gradle.enterprise to
 v3.15.1

Fixes https://github.com/apache/jmeter/pull/6151
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c2f402d8b2c..8c02bc164ad 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.13.4"
+    id("com.gradle.enterprise") version "3.15.1"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
@@ -157,8 +157,8 @@ val expectedSha512 = mapOf(
         to "org.eclipse.jgit-5.13.2.202306221912-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
-    "F669488ABCCD8F6A0C631809C951BC2DADD606217C1AD99DABCBDAB11EDD85B08FF71283A18FF954290681EEDE80FD358C5D18F4C482C35F252DF8051306EF05"
-        to "gradle-enterprise-gradle-plugin-3.13.4.jar",
+    "4B13DF3104932BCA325445276915BF710234888B76E315FE44BAEB2DF3D56AA21EDF77B5C7357887CF9D592010794192250B3E061437A102F63E68C075D67D3"
+        to "gradle-enterprise-gradle-plugin-3.15.1.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"

From 8ba840a73fbe30567a1ab6b5c8171de91c575d3f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:31:27 +0000
Subject: [PATCH 0665/1037] fix(deps): update org.apache.logging.log4j to
 v2.22.0

---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1c29355216e..f2bf539cc11 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -107,10 +107,10 @@ dependencies {
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
         api("org.apache.httpcomponents:httpcore:4.4.16")
         api("org.apache.httpcomponents:httpmime:4.5.14")
-        api("org.apache.logging.log4j:log4j-1.2-api:2.20.0")
-        api("org.apache.logging.log4j:log4j-api:2.20.0")
-        api("org.apache.logging.log4j:log4j-core:2.20.0")
-        api("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.22.0")
+        api("org.apache.logging.log4j:log4j-api:2.22.0")
+        api("org.apache.logging.log4j:log4j-core:2.22.0")
+        api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.0")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")

From 3e6c3f7a6aeb8ad12b34cf9ef46f492c3243b95d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:31:23 +0000
Subject: [PATCH 0666/1037] fix(deps): update net.minidev json-smart to v2.5.0

---
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f2bf539cc11..09b94b2dfba 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -87,8 +87,8 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("net.minidev:accessors-smart:2.4.11")
-        api("net.minidev:json-smart:2.4.11")
+        api("net.minidev:accessors-smart:2.5.0")
+        api("net.minidev:json-smart:2.5.0")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.5")
         api("org.apache-extras.beanshell:bsh:2.0b6")

From 63f839d664ddc7499cfd620769ccf62f16ae08ef Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:30:32 +0000
Subject: [PATCH 0667/1037] fix(deps): update dependency
 org.apache.xmlgraphics:xmlgraphics-commons to v2.9

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 09b94b2dfba..787544705fd 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -115,7 +115,7 @@ dependencies {
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")
         api("org.apache.velocity:velocity:1.7")
-        api("org.apache.xmlgraphics:xmlgraphics-commons:2.8")
+        api("org.apache.xmlgraphics:xmlgraphics-commons:2.9")
         api("org.apiguardian:apiguardian-api:1.1.2")
         api("org.bouncycastle:bcmail-jdk15on:1.70")
         api("org.bouncycastle:bcpkix-jdk15on:1.70")

From 047a6fbe69a366c0ed814fb6ca1f8c69619caa2b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:27:45 +0000
Subject: [PATCH 0668/1037] fix(deps): update dependency
 commons-net:commons-net to v3.10.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 787544705fd..d533721a632 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
         api("commons-io:commons-io:2.15.0")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.2")
-        api("commons-net:commons-net:3.9.0")
+        api("commons-net:commons-net:3.10.0")
         api("dnsjava:dnsjava:2.1.9")
         api("io.burt:jmespath-core:0.5.1")
         api("io.burt:jmespath-jackson:0.5.1")

From 45c4b0466da452f963e3efffae3bbe8c88b877e0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:27:47 +0000
Subject: [PATCH 0669/1037] fix(deps): update dependency org.junit:junit-bom to
 v5.10.1

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 257c788f1a3..390fd33d432 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.junit:junit-bom:5.9.3"))
+    api(platform("org.junit:junit-bom:5.10.1"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From f201bd63767b09af37afd2bf81120059969aa9ae Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 16:31:19 +0000
Subject: [PATCH 0670/1037] fix(deps): update dependency
 org.apache.commons:commons-text to v1.11.0

Fixes https://github.com/apache/jmeter/pull/6155
---
 src/bom-thirdparty/build.gradle.kts                   |  2 +-
 .../extractor/json/jsonpath/JSONPostProcessor.java    |  9 +++------
 .../org/apache/jmeter/gui/util/JSyntaxTextArea.java   |  4 ++--
 .../jmeter/report/core/AbstractSampleWriter.java      |  6 +++---
 .../org/apache/jmeter/report/core/SampleMetadata.java |  4 ++--
 .../jmeter/report/dashboard/HtmlTemplateExporter.java | 11 ++++-------
 .../report/processor/AbstractSampleConsumer.java      |  4 ++--
 .../jmeter/report/processor/AggregateConsumer.java    |  9 ++++-----
 .../jmeter/report/processor/CsvFileSampleSource.java  |  3 ++-
 .../jmeter/report/processor/ExternalSampleSorter.java |  7 +++----
 .../jmeter/report/processor/SampleWriterConsumer.java |  4 ++--
 .../main/java/org/apache/jmeter/util/SSLManager.java  |  4 ++--
 .../apache/jmeter/util/SecurityProviderLoader.java    |  4 ++--
 .../http/parser/CSSParseExceptionCallback.java        |  4 ++--
 .../apache/jmeter/protocol/http/parser/CssParser.java |  4 ++--
 .../jmeter/protocol/http/parser/URLCollection.java    |  4 ++--
 .../protocol/http/proxy/DefaultSamplerCreator.java    |  3 ++-
 .../jmeter/protocol/http/proxy/ProxyControl.java      |  4 ++--
 .../apache/jmeter/protocol/http/util/HTTPFileArg.java |  3 ++-
 19 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d533721a632..065b34e857c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -99,7 +99,7 @@ dependencies {
         api("org.apache.commons:commons-lang3:3.12.0")
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.11.1")
-        api("org.apache.commons:commons-text:1.10.0")
+        api("org.apache.commons:commons-text:1.11.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.2.2")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index d0244919514..390fd22af59 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -23,6 +23,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -161,7 +162,7 @@ private void handleListResult(JMeterVariables vars, String defaultValue, final i
                             ? extractedValues.size() * 20
                             : 1);
             for (Object extractedObject : extractedValues) {
-                String extractedString = StringUtils.defaultString(stringify(extractedObject), defaultValue);
+                String extractedString = Objects.toString(extractedObject, defaultValue);
                 vars.put(currentRefName + "_" + index,
                         extractedString); //$NON-NLS-1$
                 if (getComputeConcatenation()) {
@@ -246,11 +247,7 @@ private static void clearOldRefVars(JMeterVariables vars, String refName) {
     private static void placeObjectIntoVars(JMeterVariables vars, String currentRefName,
             List<Object> extractedValues, int matchNr, String defaultValue) {
         vars.put(currentRefName,
-                StringUtils.defaultString(stringify(extractedValues.get(matchNr)), defaultValue));
-    }
-
-    private static String stringify(Object obj) {
-        return obj == null ? null : obj.toString();
+                Objects.toString(extractedValues.get(matchNr), defaultValue));
     }
 
     public String getJsonPathExpressions() {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
index b0bd5c02442..6625fa75777 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
@@ -23,12 +23,12 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Properties;
 
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.action.LookAndFeelCommand;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JFactory;
@@ -302,7 +302,7 @@ protected RUndoManager createUndoManager() {
      */
     public void setInitialText(String string) {
         try {
-            setText(StringUtils.defaultString(string, ""));
+            setText(Objects.toString(string, ""));
         } catch (Exception e) {
             log.error("Dubious problem while setting text to {}", string, e);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
index 62f6ad2daa2..722e02addd6 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java
@@ -26,8 +26,8 @@
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
@@ -66,7 +66,7 @@ public abstract class AbstractSampleWriter extends SampleWriter {
      *            sample writer
      */
     public void setWriter(Writer newWriter) {
-        Validate.notNull(newWriter, "writer must not be null."); // NOSONAR
+        Objects.requireNonNull(newWriter, "writer must not be null."); // NOSONAR
 
         if (this.writer != null) {
             // flush and close previous writer
@@ -84,7 +84,7 @@ public void setWriter(Writer newWriter) {
      *            The output stream on which sample should be written
      */
     public void setOutputStream(OutputStream out) {
-        Validate.notNull(out, "out must not be null."); // NOSONAR
+        Objects.requireNonNull(out, "out must not be null."); // NOSONAR
 
         try {
             setWriter(new OutputStreamWriter(out, CHARSET));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 03fe8f76a4e..c066097810d 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -20,10 +20,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.TreeMap;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.save.CSVSaveService;
 
@@ -56,7 +56,7 @@ public class SampleMetadata {
      *            The list of columns names (must not be {@code null})
      */
     public SampleMetadata(char separator, String... columns) {
-        Validate.notNull(columns, "columns must not be null");
+        Objects.requireNonNull(columns, "columns must not be null");
         initialize(separator, Arrays.asList(columns));
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 3f6de35a0ff..cdb25dc3a46 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -22,13 +22,13 @@
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.report.config.ExporterConfiguration;
@@ -61,9 +61,6 @@
 public class HtmlTemplateExporter extends AbstractDataExporter {
     private static final String CUSTOM_GRAPH_PREFIX = "custom_";
 
-    /** Format used for non null check of parameters. */
-    private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
     private static final Logger log = LoggerFactory.getLogger(HtmlTemplateExporter.class);
 
     public static final String DATA_CTX_REPORT_TITLE = "reportTitle";
@@ -289,9 +286,9 @@ private static boolean htmlReportFileFilter(File file) {
     @Override
     public void export(SampleContext context, File file,
             ReportGeneratorConfiguration configuration) throws ExportException {
-        Validate.notNull(context, MUST_NOT_BE_NULL, "context");
-        Validate.notNull(file, MUST_NOT_BE_NULL, "file");
-        Validate.notNull(configuration, MUST_NOT_BE_NULL, "configuration");
+        Objects.requireNonNull(context, "context must not be null");
+        Objects.requireNonNull(file, "file must not be null");
+        Objects.requireNonNull(configuration, "configuration must not be null");
 
         log.debug("Start template processing");
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
index d62d8f966e4..72eb137e9dc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
@@ -21,9 +21,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.core.SampleException;
 import org.apache.jmeter.report.core.SampleMetadata;
@@ -132,7 +132,7 @@ public void setSampleContext(SampleContext sampleContext) {
      *            for the samples (must not be {@code null})
      */
     public void setSampleConsumers(List<SampleConsumer> consumers) {
-        Validate.notNull(consumers, "consumers must not be null");
+        Objects.requireNonNull(consumers, "consumers must not be null");
 
         this.sampleConsumers = consumers;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
index 67c34037ce1..8462583383a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
@@ -17,7 +17,8 @@
 
 package org.apache.jmeter.report.processor;
 
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
+
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.core.SampleSelector;
 
@@ -29,8 +30,6 @@
  */
 public class AggregateConsumer extends AbstractSampleConsumer {
 
-    private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
     /** The aggregator. */
     private final Aggregator aggregator;
 
@@ -65,8 +64,8 @@ public final SampleSelector<Double> getSelector() {
      */
     public AggregateConsumer(Aggregator aggregator,
             SampleSelector<Double> selector) {
-        Validate.notNull(aggregator, MUST_NOT_BE_NULL, "aggregator");
-        Validate.notNull(selector, MUST_NOT_BE_NULL, "selector");
+        Objects.requireNonNull(aggregator, "aggregator must not be null");
+        Objects.requireNonNull(selector, "selector must not be null");
 
         this.aggregator = aggregator;
         this.selector = selector;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 31296e83745..904b6dc8126 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -247,7 +248,7 @@ private static class PrivateProducer extends AbstractSampleProcessor implements
          *                  {@code null})
          */
         public void setSampleConsumers(List<SampleConsumer> consumers) {
-            Validate.notNull(consumers, "consumers must not be null");
+            Objects.requireNonNull(consumers, "consumers must not be null");
 
             this.sampleConsumers = consumers;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
index db25bb4f921..d049e3671a8 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -79,8 +80,6 @@
  */
 public class ExternalSampleSorter extends AbstractSampleConsumer {
 
-    private static final String MUST_NOT_BE_NULL = "%s must not be null";
-
     private static final Logger LOG = LoggerFactory.getLogger(ExternalSampleSorter.class);
 
     private static final int DEFAULT_CHUNK_SIZE = 50000;
@@ -219,7 +218,7 @@ public void sort(CsvFile inputFile, File outputFile, boolean writeHeader) {
      */
     public void sort(SampleMetadata sampleMetadata, File inputFile,
             File outputFile, boolean writeHeader) {
-        Validate.notNull(sampleMetadata, MUST_NOT_BE_NULL, "sampleMetadata");
+        Objects.requireNonNull(sampleMetadata, "sampleMetadata must not be null");
 
         if (!inputFile.isFile()) {
             throw new SampleException(
@@ -250,7 +249,7 @@ public void sort(SampleMetadata sampleMetadata, File inputFile,
      */
     private void sort(CsvSampleReader csvReader, File output,
             boolean writeHeader) {
-        Validate.notNull(output, MUST_NOT_BE_NULL, "output");
+        Objects.requireNonNull(output, "output must not be null");
 
         SampleMetadata readSampleMetadata = csvReader.getMetadata();
         SampleWriterConsumer writerConsumer = new SampleWriterConsumer();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
index c45aa03c1cf..56af4607365 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java
@@ -18,8 +18,8 @@
 package org.apache.jmeter.report.processor;
 
 import java.io.File;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.report.core.CsvSampleWriter;
 import org.apache.jmeter.report.core.Sample;
 import org.slf4j.Logger;
@@ -48,7 +48,7 @@ public void setOutputFile(String outputFile) {
     }
 
     public void setOutputFile(File outputFile) {
-        Validate.notNull(outputFile, "outputFile must not be null");
+        Objects.requireNonNull(outputFile, "outputFile must not be null");
         this.outputFile = outputFile;
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index f03a7362884..c48d9696c4f 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -31,13 +31,13 @@
 import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.util.keystore.JmeterKeyStore;
 import org.slf4j.Logger;
@@ -179,7 +179,7 @@ private void retryLoadKeys(File initStore, boolean allowEmptyPassword) throws No
         for (int i = 0; i < 3; i++) {
             String password = getPassword();
             if (!allowEmptyPassword) {
-                Validate.notNull(password, "Password for keystore must not be null");
+                Objects.requireNonNull(password, "Password for keystore must not be null");
             }
             try {
                 if (initStore == null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
index db817ff5d3e..e96beee1ebe 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
@@ -22,11 +22,11 @@
 import java.security.Provider;
 import java.security.Security;
 import java.util.Comparator;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +49,7 @@ public static void addSecurityProvider(String securityProviderConfig) {
 
         if (matcher.matches()) {
             final String classname = matcher.group("classname");
-            final int position = Integer.parseInt(StringUtils.defaultString(matcher.group("position"), "0"));
+            final int position = Integer.parseInt(Objects.toString(matcher.group("position"), "0"));
             final String config = matcher.group("config");
 
             try {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
index f1234548963..bae2e7aa5e0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
@@ -18,8 +18,8 @@
 package org.apache.jmeter.protocol.http.parser;
 
 import java.net.URL;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@ public class CSSParseExceptionCallback implements ICSSParseExceptionCallback {
     private final URL baseUrl;
 
     public CSSParseExceptionCallback(URL baseUrl) {
-        this.baseUrl = Validate.notNull(baseUrl);
+        this.baseUrl = Objects.requireNonNull(baseUrl, "baseUrl must not be null");
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
index ac014683881..952f61fb3ac 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
@@ -21,9 +21,9 @@
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.jmeter.util.JMeterUtils;
@@ -78,7 +78,7 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] data,
     private static URLCollection orDefault(URLCollection urlCollection,
             URLCollection defaultValue) {
         if (urlCollection == null) {
-            return Validate.notNull(defaultValue);
+            return Objects.requireNonNull(defaultValue);
         }
         return urlCollection;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index 6a68dd20704..99728479e6a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -21,8 +21,8 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.slf4j.Logger;
@@ -47,7 +47,7 @@ public class URLCollection implements Iterable<URL> {
      * @param c collection to start with (Must not be {@code null})
      */
     public URLCollection(Collection<URLString> c) {
-        coll = Validate.notNull(c);
+        coll = Objects.requireNonNull(c, "collection must not be null");
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 75206a91080..fc075cc310b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -26,6 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
@@ -345,7 +346,7 @@ public boolean isErrorDetected() {
      */
     protected static void computeSamplerName(HTTPSamplerBase sampler,
             HttpRequestHdr request) {
-        String prefix = StringUtils.defaultString(request.getPrefix(), "");
+        String prefix = Objects.toString(request.getPrefix(), "");
         int httpSampleNameMode = request.getHttpSampleNameMode();
         String format = getFormat(httpSampleNameMode, request.getHttpSampleNameFormat());
         String url;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 01155e769ac..5fbbc1a34eb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -42,6 +42,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.prefs.Preferences;
 import java.util.regex.PatternSyntaxException;
@@ -49,7 +50,6 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.jmeter.assertions.Assertion;
 import org.apache.jmeter.assertions.ResponseAssertion;
@@ -1265,7 +1265,7 @@ private boolean prepareTree(final JMeterTreeModel treeModel,
             prefixChanged = true;
         }
         if (deltaT > sampleGap || prefixChanged) {
-            String controllerName = StringUtils.defaultString(getPrefixHTTPSampleName(), sampler.getName());
+            String controllerName = Objects.toString(getPrefixHTTPSampleName(), sampler.getName());
             if (!myTarget.isLeaf() && cachedGroupingMode == GROUPING_ADD_SEPARATORS) {
                 addDivider(treeModel, myTarget);
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index 18ba242ae17..d94a613be2c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
@@ -99,7 +100,7 @@ private static String detectMimeType(String path, String mimetype) {
         if (StringUtils.isNotBlank(mimetype)) {
             return mimetype;
         }
-        mimetype = StringUtils.defaultString(mimetype, "");
+        mimetype = Objects.toString(mimetype, "");
         if (StringUtils.isBlank(path)) {
             return mimetype;
         }

From a875fa48bdd892d5d2682212b08c5d7a600fae73 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 17:15:26 +0000
Subject: [PATCH 0671/1037] fix(deps): update dependency
 org.apache.commons:commons-pool2 to v2.12.0

Fixes https://github.com/apache/jmeter/pull/6154
---
 checksum.xml                                  |  1 +
 ...2ddd47e19863bb87211544cd3038fef07d567e.asc | 19 +++++++++++++++++++
 .../7e/cd3038fef07d567e.fingerprints          |  1 +
 .../d4/a0fc00d356eef1d4.fingerprints          |  1 +
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 .../AbstractGraphiteMetricsSender.java        |  2 +-
 6 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 2b9e3fe1269..d1aae8545e1 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -127,6 +127,7 @@
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.commons' />
     <trusted-key id='3692c12c7e3d336a452beb254e066e0459cd109b' group='org.apache.commons' />
     <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
+    <trusted-key id='4e2ddd47e19863bb87211544cd3038fef07d567e' group='org.apache.commons' />
     <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='org.apache.commons' />
     <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.apache.commons' />
     <trusted-key id='d6f1bc78607808ec8e9f69437a8860944fad5f62' group='org.apache.commons' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
new file mode 100644
index 00000000000..8bd8129ac7e
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEEn15ERBADm0iBZ/KwIiEYdLWxMIIZVzwF6My1eLRX+TLvPtOO4wf8zE9zV
+fAsnMI8uCK3as3OwgqTTsKy7KQSqRyG0zd/rvCmJUEET3zHX1e5e2nYq8p1TzJzk
+mR9lXe/amtRy6687fVn5hxERSlXNioh3CZdOVv1Mum5EHuzWFQGjA3CFywCgoXKg
+dLJ9QuE4Btzf9ozvZRDcWYcEAN41LTmy3NYv0SfwvPnR5rEc+xw4T5p28qhPc1OP
+h0jGnYgHYaM3xf0QGchvWLlwLsquxvD2K41ldIJpZm+Z4RqkV9wPrjmu1k2EUqWq
+UKD2gdyyQx9pN6RH9qIN4Mh8b9x1BUrm+/KoxlmCfMxg2efLJTaPwlFgqitswZaV
+aLi1A/4+Z7l1W/sMN09ZfOvTxEmznKOscCBNQPWwu/NBFYVzCAAv2pNVFvmjU1OV
+u85pXfY8/x0lkpUlexd4bL0x1IPmrJn+H4dTI2sVFXLuKVceug1HjXW+zN/LWhT2
+08bq6V/+a9+9oVjcdYMqJldoxEe5Tac7fwExQvqRFUvteL2LTbkBDQRBJ9eUEAQA
+vAxg5za8Trgpvk3rx//r1H1u8F21mtMVC4DnDWEUw9Ts+Ew/oy4xTENPTaA3wVti
+DBxorHoQlxZquqWUNcUFnrqSSyJ7S5NDiAWKYL6ez0MgXd6lqwL8tA4rKQhDK3kP
+qnuF6RFUfC5aBrQxCbNOk5OZMS+W5/w2CiCqhjKtkHMAAwUD/04nzr26XFB0XHbb
+CF4bSbyiR3vQTWOBOmv1qkGnausQzbFpg34T1l5KYaje0C7n7+UZSlD2uWksYTbt
+R3JpAWmf486MuAbZ5ViTshy8K5ia56k2yI/ZaSErG7HZjMxa4G8ecWyK1guHT4LM
+EobWUA79cs/cwdwqvUV83S1la3Al
+=/OVc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
new file mode 100644
index 00000000000..b62f4833769
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
@@ -0,0 +1 @@
+4e2ddd47e19863bb87211544cd3038fef07d567e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints
new file mode 100644
index 00000000000..b62f4833769
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints
@@ -0,0 +1 @@
+4e2ddd47e19863bb87211544cd3038fef07d567e
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 065b34e857c..0ae0112667c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -98,7 +98,7 @@ dependencies {
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.12.0")
         api("org.apache.commons:commons-math3:3.6.1")
-        api("org.apache.commons:commons-pool2:2.11.1")
+        api("org.apache.commons:commons-pool2:2.12.0")
         api("org.apache.commons:commons-text:1.11.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.2.2")
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
index 3ac0a7cf295..d9b68ecef21 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
@@ -44,7 +44,7 @@ protected GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> crea
         config.setMaxTotalPerKey(-1);
         config.setMaxTotal(-1);
         config.setMaxIdlePerKey(-1);
-        config.setMinEvictableIdleTime(Duration.ofMinutes(3));
+        config.setMinEvictableIdleDuration(Duration.ofMinutes(3));
         config.setTimeBetweenEvictionRuns(Duration.ofMinutes(3));
 
         return new GenericKeyedObjectPool<>(

From 2fc90f976b28e4dfe70d76c8d5362c75ddd454ce Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 17:15:58 +0000
Subject: [PATCH 0672/1037] fix(deps): update dependency
 org.apache.commons:commons-lang3 to v3.14.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 0ae0112667c..2156f313e26 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -96,7 +96,7 @@ dependencies {
         api("org.apache.commons:commons-dbcp2:2.9.0")
         api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")
-        api("org.apache.commons:commons-lang3:3.12.0")
+        api("org.apache.commons:commons-lang3:3.14.0")
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.12.0")
         api("org.apache.commons:commons-text:1.11.0")

From b0c06a60e277b10f8e0e7b0af5828dd0f744068f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 17:20:44 +0000
Subject: [PATCH 0673/1037] fix(deps): update io.burt to v0.6.0

---
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 2156f313e26..f4a177f604e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -69,8 +69,8 @@ dependencies {
         api("commons-logging:commons-logging:1.2")
         api("commons-net:commons-net:3.10.0")
         api("dnsjava:dnsjava:2.1.9")
-        api("io.burt:jmespath-core:0.5.1")
-        api("io.burt:jmespath-jackson:0.5.1")
+        api("io.burt:jmespath-core:0.6.0")
+        api("io.burt:jmespath-jackson:0.6.0")
         api("javax.activation:javax.activation-api:1.2.0")
         api("javax.mail:mail:1.5.0-b01")
         api("jcharts:jcharts:0.7.5")

From c92b9cf244ea1e43130891d0ee70d403b669c945 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 1 Dec 2023 23:54:46 +0300
Subject: [PATCH 0674/1037] chore: bump Gradle to 8.5

---
 build-logic/checksum.xml                      |   1 +
 ...d97a6a154e7810ee0bc832e2f38302c8075e3d.asc |  26 ++++++++++++++++++
 .../3d/e2f38302c8075e3d.fingerprints          |   1 +
 .../90/1b80c80e07bc7190.fingerprints          |   1 +
 checksum.xml                                  |   1 +
 ...d97a6a154e7810ee0bc832e2f38302c8075e3d.asc |  26 ++++++++++++++++++
 .../3d/e2f38302c8075e3d.fingerprints          |   1 +
 .../90/1b80c80e07bc7190.fingerprints          |   1 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 63721 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 +--
 10 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
 create mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index ea3d8f47c40..898ae7f143b 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -52,6 +52,7 @@
     <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
     <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
     <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
+    <trusted-key id='1bd97a6a154e7810ee0bc832e2f38302c8075e3d' group='org.gradle.kotlin' />
     <trusted-key id='66d7cbff956830fe9f5a723afe6c7d77a1ce15a6' group='org.gradlex' />
     <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
     <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
new file mode 100644
index 00000000000..1df30880d6a
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
+Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
+F/EkDYC6gtNUqzJ8IcxFMIQT+J6LCd3a/eTJWwDLUwSnGXVUPTXzYf4laSVdBDVp
+jp6K+tDHQrLZ140DY4GSvT1SzcgR5+5C1Mda3XobIJNHe47AeZPzKuFzZSlKqvrX
+QNexgGGjrEDWt9I3CXeNoOVVZvI2k6jAvUSZb+jN/YWpW+onDeV1S/7AUBaKE2TE
+EJtidYIOuFsufSwLURwX0um17M47sgzxov9vZYDucGntZn4zKYcZsdkTTkrrgU7N
+RSu90mqdL7rCxkUPsSeEUWFyhleGB108QBa5HiE/Z5T5C94kxD9JV1HAocFraTaZ
+SrNr0dBvZH7SoLCUQZ6q3gXebLbLQgDSuApjn523927O1wdnig+xDgAqTP14sw9i
+9OfvpNhCSolFL7mjGYKGfzTFo4pj5CzoKvvAXcsWY4HvwslWJvmrEqvo8Ss+YTII
+fiRSL4DWurT+42yOoExPwcYNofNwEuyYy5Zr9edsXeodScvy/hlri3JuB3Ji142w
+xFCuKUfrAh7hOw6QOXgIFyFXWrW0HH/8IoeJjxvG+6euxkGx8QZutyaY6wARAQAB
+uQINBGOtCzoBEADSUdEj7dz3jsz4EObAdNXnZnJ5zAkqE4zbGtU94sXdBtxD1F++
+5dTNE0ZCVwJLtZnYvxYXYwHBEDB5ZWS7noTL9rXkgXpDP5WGVLTYIMiGjPkVu2fW
+ZZ78Tu4KIfRnkWdUoMQ2g7YNZ8cVU40cZlk63tRdt7Th71g+K/RKWdqh7NK0laua
+lahK+Glped0QEo1TfrEhNgT0JUCwWzuM4qWHDys7itF++xLJsPSwS/wAUqvsWqGz
+W/1KrYbbxgKX4vbrqL3jnk4IHvcKAub0uchLv9KR5QpsVT86TmOB3WsAAlPdosW/
+ahAc2/XyiCxv5JEo8YpErBZ5TSgUy7lJNABS0JUVCeUCq/AAZ2TScOwRX8aXCeYA
+SfRHOZCiWrWy5nMGGnXVs42MMIML9d+Hr37BCCFT3Gbw8WOTeGleE92sed5dBAjO
+PyQWP+IvYxF7zOyNs46RAVlJfg3G33VwEBQgJwLSl/sUYqSHe9QubbxI0fiMsTJd
+Z6/5fbsXVnMbGe4kQDZbDTgylotiHfMCMNefgb0+yA6Fw+EHQeN/v/AtpcpT0w12
+AOpmlNy4+zPQE8Ai73gtJeTRpiuob3k1/JwvLHemB14CtxBGiHAyYHCjPqTPyQUI
+ikj+R8mecG/60RfSmGe3HW7Hpt907BNEcc4s4V9uvJPHIJdZS/gmtSp5VQARAQAB
+=on0Y
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
new file mode 100644
index 00000000000..9fb46924e33
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
new file mode 100644
index 00000000000..9fb46924e33
--- /dev/null
+++ b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/checksum.xml b/checksum.xml
index d1aae8545e1..800b0bc91f6 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -168,6 +168,7 @@
     <trusted-key id='1def9646901a1652e5b3e5ea694db6f419c8d1fd' group='org.exparity' />
     <trusted-key id='13ac2213964abe1d1c147c0e1939a2520bab1d90' group='org.freemarker' />
     <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='org.fusesource.hawtbuf' />
+    <trusted-key id='1bd97a6a154e7810ee0bc832e2f38302c8075e3d' group='org.gradle.kotlin' />
     <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
     <trusted-key id='e3a9f95079e84ce201f7cf60bede11eaf1164480' group='org.hamcrest' />
     <trusted-key id='d76260c72df74e66268f7770ab049df4ab24c1ef' group='org.hsqldb' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
new file mode 100644
index 00000000000..1df30880d6a
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
+Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
+F/EkDYC6gtNUqzJ8IcxFMIQT+J6LCd3a/eTJWwDLUwSnGXVUPTXzYf4laSVdBDVp
+jp6K+tDHQrLZ140DY4GSvT1SzcgR5+5C1Mda3XobIJNHe47AeZPzKuFzZSlKqvrX
+QNexgGGjrEDWt9I3CXeNoOVVZvI2k6jAvUSZb+jN/YWpW+onDeV1S/7AUBaKE2TE
+EJtidYIOuFsufSwLURwX0um17M47sgzxov9vZYDucGntZn4zKYcZsdkTTkrrgU7N
+RSu90mqdL7rCxkUPsSeEUWFyhleGB108QBa5HiE/Z5T5C94kxD9JV1HAocFraTaZ
+SrNr0dBvZH7SoLCUQZ6q3gXebLbLQgDSuApjn523927O1wdnig+xDgAqTP14sw9i
+9OfvpNhCSolFL7mjGYKGfzTFo4pj5CzoKvvAXcsWY4HvwslWJvmrEqvo8Ss+YTII
+fiRSL4DWurT+42yOoExPwcYNofNwEuyYy5Zr9edsXeodScvy/hlri3JuB3Ji142w
+xFCuKUfrAh7hOw6QOXgIFyFXWrW0HH/8IoeJjxvG+6euxkGx8QZutyaY6wARAQAB
+uQINBGOtCzoBEADSUdEj7dz3jsz4EObAdNXnZnJ5zAkqE4zbGtU94sXdBtxD1F++
+5dTNE0ZCVwJLtZnYvxYXYwHBEDB5ZWS7noTL9rXkgXpDP5WGVLTYIMiGjPkVu2fW
+ZZ78Tu4KIfRnkWdUoMQ2g7YNZ8cVU40cZlk63tRdt7Th71g+K/RKWdqh7NK0laua
+lahK+Glped0QEo1TfrEhNgT0JUCwWzuM4qWHDys7itF++xLJsPSwS/wAUqvsWqGz
+W/1KrYbbxgKX4vbrqL3jnk4IHvcKAub0uchLv9KR5QpsVT86TmOB3WsAAlPdosW/
+ahAc2/XyiCxv5JEo8YpErBZ5TSgUy7lJNABS0JUVCeUCq/AAZ2TScOwRX8aXCeYA
+SfRHOZCiWrWy5nMGGnXVs42MMIML9d+Hr37BCCFT3Gbw8WOTeGleE92sed5dBAjO
+PyQWP+IvYxF7zOyNs46RAVlJfg3G33VwEBQgJwLSl/sUYqSHe9QubbxI0fiMsTJd
+Z6/5fbsXVnMbGe4kQDZbDTgylotiHfMCMNefgb0+yA6Fw+EHQeN/v/AtpcpT0w12
+AOpmlNy4+zPQE8Ai73gtJeTRpiuob3k1/JwvLHemB14CtxBGiHAyYHCjPqTPyQUI
+ikj+R8mecG/60RfSmGe3HW7Hpt907BNEcc4s4V9uvJPHIJdZS/gmtSp5VQARAQAB
+=on0Y
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
new file mode 100644
index 00000000000..9fb46924e33
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
new file mode 100644
index 00000000000..9fb46924e33
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 64fe1d50c5a..e37c1db618c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 54a906918c3787864dc444141e194a5a9b8ba63f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 2 Dec 2023 21:58:39 +0300
Subject: [PATCH 0675/1037] chore: exclude Semeru + tr_TR combination from
 tests

See https://github.com/gradle/gradle/issues/27261
---
 .github/workflows/matrix.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index c03fdade12b..71bf872336e 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -88,7 +88,10 @@ matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']}
 matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
 // TODO: Semeru does not ship Java 21 builds yet
-matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'})
+matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'});
+// Semeru 11 and 17 has issues with tr_TR locale: https://github.com/gradle/gradle/issues/27261
+// It is not clear what is the source of the issues, however, we can exclude the combination
+matrix.exclude({java_distribution: {value: 'semeru'}, locale: {language: 'tr', country: 'TR'}});
 // Ensure at least one job with "same" hashcode exists
 matrix.generateRow({hash: {value: 'same'}});
 // Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)

From 646a4060d319f2cf9067dd22471050c03c4ce17c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 4 Dec 2023 06:03:03 +0100
Subject: [PATCH 0676/1037] fix(deps): update dependency
 com.github.spotbugs:com.github.spotbugs.gradle.plugin to v5.2.5 (#6167)

---
 build-logic/verification/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index d08e5bb7f66..90fc1cb9f3b 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.2.3")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.2.5")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")

From 2948281a3c885286db4122ca7d12925ab25d5164 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 4 Dec 2023 14:51:50 +0300
Subject: [PATCH 0677/1037] test: exclude Semeru JDK from the builds as there
 are issues running with Gradle 8.5

See https://github.com/gradle/gradle/issues/27273
---
 .github/workflows/matrix.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 71bf872336e..bf22ef42a55 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -12,7 +12,9 @@ matrix.addAxis({
     {value: 'liberica', vendor: 'bellsoft', weight: 1},
     {value: 'microsoft', vendor: 'microsoft', weight: 1},
     {value: 'oracle', vendor: 'oracle', weight: 1},
-    {value: 'semeru', vendor: 'ibm', weight: 4},
+    // There are issues running Semeru JDK with Gradle 8.5
+    // See https://github.com/gradle/gradle/issues/27273
+    // {value: 'semeru', vendor: 'ibm', weight: 4},
     {value: 'temurin', vendor: 'eclipse', weight: 1},
     {value: 'zulu', vendor: 'azul', weight: 1},
   ]
@@ -89,9 +91,6 @@ matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'});
-// Semeru 11 and 17 has issues with tr_TR locale: https://github.com/gradle/gradle/issues/27261
-// It is not clear what is the source of the issues, however, we can exclude the combination
-matrix.exclude({java_distribution: {value: 'semeru'}, locale: {language: 'tr', country: 'TR'}});
 // Ensure at least one job with "same" hashcode exists
 matrix.generateRow({hash: {value: 'same'}});
 // Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)

From 9d0961f093d6e10255466224ba74042990aca085 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 7 Dec 2023 13:54:22 +0300
Subject: [PATCH 0678/1037] fix: restore backward compatibility with JMeter <
 5.6.2

We should not have changed public methods to static, and we should
probably restore the API.

Unfortuantely, it would break those who already recompiled with 5.6.2,
however, I hope it it would be less harm to restore the API to the original state.

This reverts some of the changes made in 12aefb0c70526a61f955ba1dad7fe3e99200b0b2
---
 .../org/apache/jmeter/extractor/BoundaryExtractor.java   | 9 +++++++--
 .../apache/jmeter/protocol/http/control/AuthManager.java | 2 +-
 .../jmeter/protocol/http/proxy/HttpRequestHdr.java       | 2 +-
 .../jmeter/protocol/java/sampler/JavaSamplerContext.java | 4 ++--
 xdocs/changes.xml                                        | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index f43ba726c0e..14382936361 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -240,7 +240,7 @@ private static List<String> extract(
             String leftBoundary, String rightBoundary, int matchNumber, Stream<String> previousResults) {
         boolean allItems = matchNumber <= 0;
         return previousResults
-                .flatMap(input -> extractAll(leftBoundary, rightBoundary, input).stream())
+                .flatMap(input -> extract(leftBoundary, rightBoundary, input).stream())
                 .skip(allItems ? 0L : matchNumber - 1)
                 .limit(allItems ? Long.MAX_VALUE : 1L)
                 .collect(Collectors.toList());
@@ -302,7 +302,12 @@ private static List<String> extract(String leftBoundary, String rightBoundary, i
         return Collections.unmodifiableList(matches);
     }
 
-    public static List<String> extractAll(
+    public List<String> extractAll(
+            String leftBoundary, String rightBoundary, String textToParse) {
+        return extract(leftBoundary, rightBoundary, textToParse);
+    }
+
+    private static List<String> extract(
             String leftBoundary, String rightBoundary, String textToParse) {
         return extract(leftBoundary, rightBoundary, -1, textToParse);
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index ea783cfb8e5..20b41daccb4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -472,7 +472,7 @@ static boolean isSupportedProtocol(URL url) {
      * @param credentialsProvider provider which should be set up
      * @param localhost name of the workstation to be used for {@link NTCredentials}
      */
-    public static void setupCredentials(Authorization auth, URL url,
+    public void setupCredentials(Authorization auth, URL url,
             HttpClientContext localContext,
             CredentialsProvider credentialsProvider,
             String localhost) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index b118ea659fe..b10e5d27dda 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -302,7 +302,7 @@ private static boolean isMultipart(String contentType) {
         return contentType != null && contentType.startsWith(HTTPConstants.MULTIPART_FORM_DATA);
     }
 
-    public static MultipartUrlConfig getMultipartConfig(String contentType) {
+    public MultipartUrlConfig getMultipartConfig(String contentType) {
         if(isMultipart(contentType)) {
             // Get the boundary string for the multiparts from the content type
             String boundaryString = contentType.substring(contentType.toLowerCase(java.util.Locale.ENGLISH).indexOf("boundary=") + "boundary=".length());
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
index 44e2241f742..1fabe5e1707 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
@@ -239,7 +239,7 @@ public JMeterContext getJMeterContext() {
      * Returns {@link JMeterVariables} for the current thread.
      * @return {@link JMeterVariables} for the current thread.
      */
-    public static JMeterVariables getJMeterVariables() {
+    public final JMeterVariables getJMeterVariables() {
         return JMeterContextService.getContext().getVariables();
     }
 
@@ -247,7 +247,7 @@ public static JMeterVariables getJMeterVariables() {
      * Returns JMeter properties.
      * @return {@link Properties} JMeter properties
      */
-    public static Properties getJMeterProperties() {
+    public final Properties getJMeterProperties() {
         return JMeterUtils.getJMeterProperties();
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 81842e2e84e..583f6eb0a46 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -68,7 +68,9 @@ Summary
 
 <h3>General</h3>
 <ul>
-  <li><pr></pr><issue>6043</issue>Fix computation of <code>min</code> in <code>Summary report</code> (regression since 5.6.0)</li>
+  <li>Restored binary API compatibility with pre-5.6.2: restore public methods to non-static as they were before 5.6.2 <code>JavaSamplerContext.getJMeterVariables</code>,
+    <code>JavaSamplerContext.getJMeterProperties</code>, <code>BoundaryExtractor.extractAll</code>,
+    <code>AuthManager.setupCredentials</code>, <code>HttpRequestHdr.getMultipartConfig</code>, (regression since 5.6.2)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->

From 43dac8805d9fa9aa18dfda5c8cb07c721c0952df Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 4 Dec 2023 05:03:46 +0000
Subject: [PATCH 0679/1037] fix(deps): update dependency commons-io:commons-io
 to v2.15.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f4a177f604e..079c95fcd6f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -64,7 +64,7 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.20")
         api("commons-codec:commons-codec:1.16.0")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.15.0")
+        api("commons-io:commons-io:2.15.1")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.2")
         api("commons-net:commons-net:3.10.0")

From 91fa7041f498c26a5dbc8edbf2352600995fefd5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 24 Nov 2023 17:20:39 +0000
Subject: [PATCH 0680/1037] fix(deps): update dependency
 com.fifesoft:rsyntaxtextarea to v3.3.4

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 079c95fcd6f..fcbd93af639 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -45,7 +45,7 @@ dependencies {
         api("com.fasterxml.jackson.core:jackson-annotations:2.15.2")
         api("com.fasterxml.jackson.core:jackson-core:2.15.2")
         api("com.fasterxml.jackson.core:jackson-databind:2.15.2")
-        api("com.fifesoft:rsyntaxtextarea:3.3.3")
+        api("com.fifesoft:rsyntaxtextarea:3.3.4")
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:2.7.3")

From 76bf21fb9ea9c92718b5af6c3e5f14f57bcd09c3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 13 Dec 2023 20:02:51 +0300
Subject: [PATCH 0681/1037] chore: make sure the build fails with a reasonable
 message if the build Java version is less than 17

---
 settings.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c02bc164ad..1b9af891520 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,6 +38,10 @@ dependencyResolutionManagement {
     }
 }
 
+if (JavaVersion.current() < JavaVersion.VERSION_17) {
+    throw UnsupportedOperationException("Please use Java 17 or 21 for launching Gradle when building JMeter, the current Java is ${JavaVersion.current().majorVersion}")
+}
+
 // This is the name of a current project
 // Note: it cannot be inferred from the directory name as developer might clone JMeter to jmeter_tmp folder
 rootProject.name = "jmeter"

From 8ce5097d27c29c170b0711656e8b6f824ae49620 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 14 Dec 2023 18:51:30 +0300
Subject: [PATCH 0682/1037] chore: use Java 17 for Errorprone analysis

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 56934e3584c..e3edfebd79d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,14 +87,14 @@ jobs:
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
   errorprone:
-    name: 'Error Prone (JDK 11)'
+    name: 'Error Prone (JDK 17)'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 17'
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'zulu'
     - uses: burrunan/gradle-cache-action@v1
       name: Test

From 2c8495368ef153fda918b6b1c9f880cd7302227f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 15:53:26 +0000
Subject: [PATCH 0683/1037] chore(deps): update plugin
 com.gradle.common-custom-user-data-gradle-plugin to v1.12.1

Fixes https://github.com/apache/jmeter/pull/6176
---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1b9af891520..e9416be646b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.enterprise") version "3.15.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
@@ -151,8 +151,8 @@ val expectedSha512 = mapOf(
         to "JavaEWAH-1.1.12.jar",
     "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
         to "JavaEWAH-1.1.13.jar",
-    "3A5A5A8D5525CC6974287C32AD5D8432F3020FC613EF54555FC0B954646D1BE06794AE2EC712E71807A5C8CF5F6E7A1074F5963E32B78302AE6B1ECE9725DF0F"
-        to "common-custom-user-data-gradle-plugin-1.12.jar",
+    "D56423AD67E3EB133939BB69DA202445EBB476F8C2D570CD741C3043EADD132D4C1BB3D08757B266C08A4D2150BE2248A65580A517E3230322D13D983CACCDD6"
+        to "common-custom-user-data-gradle-plugin-1.12.1.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"

From a6bc6574f247c8d212ecb3e2bde1172e415c870e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 15:53:29 +0000
Subject: [PATCH 0684/1037] fix(deps): update dependency checkstyle to v10.12.6

Fixes https://github.com/apache/jmeter/pull/6177
---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 44ef221da6c..2012ca9dece 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -23,11 +23,19 @@ plugins {
     id("checkstyle")
 }
 
+configurations.checkstyle {
+    // See https://github.com/gradle/gradle/issues/27035#issuecomment-1814997295
+    // TODO: remove the workaround as https://github.com/checkstyle/checkstyle/issues/14123 is resolved
+    resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+        select("com.google.guava:guava:0")
+    }
+}
+
 checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "10.12.5"
+    toolVersion = "10.12.6"
     configProperties = mapOf(
         "cache_file" to layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )

From 31c29af392c907f8ead8ce8cd359c80160f2d0e6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 15:53:33 +0000
Subject: [PATCH 0685/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v3.15.4

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 390fd33d432..60128b0eb27 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.10")
-        api("nl.jqno.equalsverifier:equalsverifier:3.15.3")
+        api("nl.jqno.equalsverifier:equalsverifier:3.15.4")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.7")
         api("org.apache.activemq:activemq-client:5.16.7")

From 311342a7bc24f537d65bd0c82dd509c0340b4a7e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 8 Dec 2023 04:49:02 +0000
Subject: [PATCH 0686/1037] fix(deps): update com.fasterxml.jackson.core to
 v2.16.0

Fixes https://github.com/apache/jmeter/pull/6124
---
 src/bom-thirdparty/build.gradle.kts               |  6 +++---
 .../assertions/jmespath/JMESPathAssertion.java    |  7 ++++++-
 .../json/jmespath/JMESPathExtractor.java          |  7 ++++++-
 .../json/render/RenderAsJmesPathRenderer.java     |  7 ++++++-
 .../jmeter/report/dashboard/JsonExporter.java     |  9 +++++++--
 .../jmeter/protocol/bolt/sampler/BoltSampler.java | 10 ++++++++--
 .../http/proxy/DefaultSamplerCreator.java         |  7 ++++++-
 .../http/util/GraphQLRequestParamUtils.java       | 12 +++++++++---
 .../http/util/TestGraphQLRequestParamUtils.java   | 15 ++++++++++-----
 9 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index fcbd93af639..d80302d4c5a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -42,9 +42,9 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.15.2")
-        api("com.fasterxml.jackson.core:jackson-core:2.15.2")
-        api("com.fasterxml.jackson.core:jackson-databind:2.15.2")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.16.0")
+        api("com.fasterxml.jackson.core:jackson-core:2.16.0")
+        api("com.fasterxml.jackson.core:jackson-databind:2.16.0")
         api("com.fifesoft:rsyntaxtextarea:3.3.4")
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index 780ea8ce792..c6b615dd652 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -32,8 +32,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.NullNode;
 
 import io.burt.jmespath.Expression;
@@ -56,7 +58,10 @@ public class JMESPathAssertion extends AbstractTestElement implements Serializab
     private static final String EXPECT_NULL = "EXPECT_NULL";
     private static final String INVERT = "INVERT";
     private static final String ISREGEX = "ISREGEX";
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();
 
     private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
             "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
index 0001124d81c..85650c9c9a6 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
@@ -37,8 +37,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 import io.burt.jmespath.Expression;
@@ -59,7 +61,10 @@ public class JMESPathExtractor extends AbstractScopedTestElement
     private static final String DEFAULT_VALUE = "JMESExtractor.defaultValue"; // $NON-NLS-1$
     private static final String MATCH_NUMBER = "JMESExtractor.matchNumber"; // $NON-NLS-1$
     private static final String REF_MATCH_NR = "_matchNr"; // $NON-NLS-1$
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();
 
     @Override
     public void process() {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
index 45e1241d3cc..5545cdb5d16 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
@@ -24,8 +24,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.auto.service.AutoService;
 
@@ -36,7 +38,10 @@
 @AutoService(ResultRenderer.class)
 public class RenderAsJmesPathRenderer extends AbstractRenderAsJsonRenderer {
     private static final Logger log = LoggerFactory.getLogger(RenderAsJmesPathRenderer.class);
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();
 
     @Override
     protected String getTabLabel() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index 9ad3a0a4356..c942ee45eac 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -39,8 +39,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 /**
  * Implementation of {@link DataExporter} that exports statistics to JSON
@@ -52,7 +53,11 @@ public class JsonExporter extends AbstractDataExporter {
     public static final String OUTPUT_FILENAME = "statistics.json";
     private static final FileFilter JSON_FILE_FILTER =
             file -> file.isFile() && file.getName().equals(OUTPUT_FILENAME);
-    private final static ObjectWriter OBJECT_WRITER = new ObjectMapper().writerWithDefaultPrettyPrinter();
+    private final static ObjectWriter OBJECT_WRITER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build()
+            .writerWithDefaultPrettyPrinter();
 
 
     public JsonExporter() {
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
index d01cedbbefb..78f2a413381 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
@@ -45,9 +45,10 @@
 import org.neo4j.driver.exceptions.Neo4jException;
 import org.neo4j.driver.summary.ResultSummary;
 
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 @TestElementMetadata(labelResource = "displayName")
 public class BoltSampler extends AbstractBoltTestElement implements Sampler, TestBean, ConfigMergabilityIndicator {
@@ -57,7 +58,12 @@ public class BoltSampler extends AbstractBoltTestElement implements Sampler, Tes
 
     // Enables to initialize object mapper on demand
     private static class Holder {
-        private static final ObjectReader OBJECT_READER = new ObjectMapper().readerFor(new TypeReference<HashMap<String, Object>>() {});
+        private static final ObjectReader OBJECT_READER = JsonMapper.builder()
+                // See https://github.com/FasterXML/jackson-core/issues/991
+                .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+                .build()
+                .readerFor(new TypeReference<HashMap<String, Object>>() {
+                });
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index fc075cc310b..aa2fd9516da 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -58,7 +58,9 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.auto.service.AutoService;
 
 /**
@@ -76,7 +78,10 @@ public class DefaultSamplerCreator extends AbstractSamplerCreator {
     private static final int SAMPLER_NAME_NAMING_MODE_SUFFIX = 2; // $NON-NLS-1$
     private static final int SAMPLER_NAME_NAMING_MODE_FORMATTER = 3; // $NON_NLS-1$
 
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();
     /**
      *
      */
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
index 00673bf4ab5..f64ba780992 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
@@ -36,8 +36,10 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -56,6 +58,11 @@ public final class GraphQLRequestParamUtils {
 
     private static final JsonFactory jsonFactory = new JsonFactory();
 
+    private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();
+
     private GraphQLRequestParamUtils() {
     }
 
@@ -133,11 +140,10 @@ public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final
         final String encoding = StringUtils.isNotEmpty(contentEncoding) ? contentEncoding
                 : EncoderCache.URL_ARGUMENT_ENCODING;
 
-        final ObjectMapper mapper = new ObjectMapper();
         ObjectNode data;
 
         try (InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(postData), encoding)) {
-            data = mapper.readValue(reader, ObjectNode.class);
+            data = OBJECT_MAPPER.readValue(reader, ObjectNode.class);
         } catch (IOException e) {
             throw new IllegalArgumentException("Invalid json data: " + e.getLocalizedMessage(), e);
         }
@@ -166,7 +172,7 @@ public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final
             final JsonNodeType nodeType = variablesNode.getNodeType();
             if (nodeType != JsonNodeType.NULL) {
                 if (nodeType == JsonNodeType.OBJECT) {
-                    variables = mapper.writeValueAsString(variablesNode);
+                    variables = OBJECT_MAPPER.writeValueAsString(variablesNode);
                 } else {
                     throw new IllegalArgumentException("Not a valid object node for GraphQL variables.");
                 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
index be7b075eed1..5ad929b5c13 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
@@ -36,8 +36,10 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 class TestGraphQLRequestParamUtils {
 
@@ -73,7 +75,10 @@ class TestGraphQLRequestParamUtils {
             + "\"query\":\"" + StringUtils.replace(QUERY.trim(), "\n", "\\n") + "\""
             + "}";
 
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            // See https://github.com/FasterXML/jackson-core/issues/991
+            .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+            .build();;
 
     private GraphQLRequestParams params;
 
@@ -101,8 +106,8 @@ void testInvalidGraphQLContentType(String contentType) {
     }
 
     static Stream<org.junit.jupiter.params.provider.Arguments> postBodyFieldNameAndJsonNodes() throws Exception {
-        final JsonNode expectedPostBodyJson = objectMapper.readTree(EXPECTED_POST_BODY);
-        final JsonNode actualPostBodyJson = objectMapper.readTree(
+        final JsonNode expectedPostBodyJson = OBJECT_MAPPER.readTree(EXPECTED_POST_BODY);
+        final JsonNode actualPostBodyJson = OBJECT_MAPPER.readTree(
                 GraphQLRequestParamUtils.toPostBodyString(new GraphQLRequestParams(OPERATION_NAME, QUERY, VARIABLES)));
         return Stream.of(
                 arguments(GraphQLRequestParamUtils.OPERATION_NAME_FIELD, expectedPostBodyJson, actualPostBodyJson),
@@ -124,8 +129,8 @@ void testQueryToGetParamValue() {
 
     @Test
     void testVariablesToGetParamValue() throws Exception {
-        assertEquals(objectMapper.readTree(EXPECTED_VARIABLES_GET_PARAM_VALUE),
-                objectMapper.readTree(GraphQLRequestParamUtils.variablesToGetParamValue(params.getVariables())));
+        assertEquals(OBJECT_MAPPER.readTree(EXPECTED_VARIABLES_GET_PARAM_VALUE),
+                OBJECT_MAPPER.readTree(GraphQLRequestParamUtils.variablesToGetParamValue(params.getVariables())));
     }
 
     @Test

From eeb45b805268b567a2c6b50f08ec7c6c55b5ac39 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:17 +0000
Subject: [PATCH 0687/1037] fix(deps): update org.checkerframework

Fixes https://github.com/apache/jmeter/pull/6183
---
 build-logic/checksum.xml                                       | 3 +++
 build-logic/verification/build.gradle.kts                      | 2 +-
 .../src/main/kotlin/build-logic.checkerframework.gradle.kts    | 2 +-
 checksum.xml                                                   | 3 +++
 src/bom-thirdparty/build.gradle.kts                            | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 898ae7f143b..c1b793ab091 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -106,6 +106,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
       <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.36'>
+      <sha512>90E5E8376CC3F3461D5F39BB471D8E467B6662C44300FE6B209334C63835A5405C244A80747B74368561CB432D2A36D8B4606661C25627FCBDF11F58544DF389</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 90fc1cb9f3b..c86e724ab78 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.35")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.36")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index 9b7858b1678..b09b77010b1 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.40.0"
+        val checkerframeworkVersion = "3.41.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/checksum.xml b/checksum.xml
index 800b0bc91f6..dedb8b3309c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -317,6 +317,9 @@
     <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
       <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
     </dependency>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.36'>
+      <sha512>90E5E8376CC3F3461D5F39BB471D8E467B6662C44300FE6B209334C63835A5405C244A80747B74368561CB432D2A36D8B4606661C25627FCBDF11F58544DF389</sha512>
+    </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
     </dependency>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d80302d4c5a..1be83485207 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.40.0")
+        api("org.checkerframework:checker-qual:3.41.0")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }

From 928c4fa043b112faeb69be550c37fbb5c73723d0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:22 +0000
Subject: [PATCH 0688/1037] chore(deps): update actions/setup-java action to v4

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e3edfebd79d..08047d39f22 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,7 +53,7 @@ jobs:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}
     - name: Set up Java 17 and ${{ matrix.non_ea_java_version }}, ${{ matrix.java_distribution }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         # The latest one will be the default, so we use Java 17 for launching Gradle
         java-version: |
@@ -92,7 +92,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'zulu'

From 9e4485ac8f46ef5edea97c68f70ed8380c2c06f5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 14 Dec 2023 19:45:43 +0300
Subject: [PATCH 0689/1037] chore: prevent Renovate from upgrading Guava "0"

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index 4b78197a54d..39d8644ad1b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -31,6 +31,12 @@
       "matchPackagePrefixes": ["com.google.errorprone", "net.ltgt.errorprone"],
       "groupName": "com.google.errorprone"
     },
+    {
+      "matchPackageNames": ["com.google.guava:guava"],
+      "groupName": "guava",
+      "matchCurrentVersion": "0",
+      "enabled": false
+    },
     {
       "matchPackagePrefixes": ["com.helger"],
       "groupName": "com.helger"

From 58a9b2b33372a998e69258e45656cfd5c6a95d71 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:01 +0000
Subject: [PATCH 0690/1037] fix(deps): update dependency
 commons-logging:commons-logging to v1.3.0

Fixes https://github.com/apache/jmeter/pull/6179
---
 checksum.xml                        | 1 +
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/checksum.xml b/checksum.xml
index dedb8b3309c..aa1de035ed9 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -80,6 +80,7 @@
     <trusted-key id='636de9055c4c75c7bd9830771241bc872c5e4ec0' group='commons-lang' />
     <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-lang' />
     <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-logging' />
+    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-logging' />
     <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-net' />
     <trusted-key id='0186f8b24c5bc02c94a0e0e486f75e83e1ee085f' group='de.thetaphi' />
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1be83485207..d9a76d2fb38 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.15.1")
         api("commons-lang:commons-lang:2.6")
-        api("commons-logging:commons-logging:1.2")
+        api("commons-logging:commons-logging:1.3.0")
         api("commons-net:commons-net:3.10.0")
         api("dnsjava:dnsjava:2.1.9")
         api("io.burt:jmespath-core:0.6.0")

From 7942db818733d4d5a6beaded074cc04ac3ebd21e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:25 +0000
Subject: [PATCH 0691/1037] fix(deps): update dependency
 com.github.spotbugs:com.github.spotbugs.gradle.plugin to v6

---
 build-logic/verification/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index c86e724ab78..2cf06c36801 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.2.5")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.2")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")

From 95da3fd5de4c6f10f22a53f15d98dcb09ae4c2f7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:09 +0000
Subject: [PATCH 0692/1037] fix(deps): update dependency
 org.apache.httpcomponents.client5:httpclient5 to v5.3

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d9a76d2fb38..b4b6e40773d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -101,7 +101,7 @@ dependencies {
         api("org.apache.commons:commons-pool2:2.12.0")
         api("org.apache.commons:commons-text:1.11.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
-        api("org.apache.httpcomponents.client5:httpclient5:5.2.2")
+        api("org.apache.httpcomponents.client5:httpclient5:5.3")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.14")
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")

From 3e20b6fdcada53e15f4034ed1788a816eed39408 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:12 +0000
Subject: [PATCH 0693/1037] fix(deps): update dependency org.jsoup:jsoup to
 v1.17.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b4b6e40773d..5ba834ed37e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -131,7 +131,7 @@ dependencies {
         api("org.jodd:jodd-lagarto:5.0.13")
         api("org.jodd:jodd-log:5.0.13")
         api("org.jodd:jodd-props:5.0.13")
-        api("org.jsoup:jsoup:1.16.2")
+        api("org.jsoup:jsoup:1.17.1")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.12")

From b3209293e3888a56d0ce3e3db85d835f3ce6f5df Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:37:18 +0000
Subject: [PATCH 0694/1037] fix(deps): update dependency spotbugs to v4.8.3

---
 .../src/main/kotlin/build-logic.spotbugs.gradle.kts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
index 684857d487b..413fdb7df63 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 
 spotbugs {
     // Below statement is for Renovate Bot since it does not support toolVersion.set("..") pattern yet
-    val toolVersion = "4.8.1"
+    val toolVersion = "4.8.3"
     this.toolVersion.set(toolVersion)
 
     providers.gradleProperty("spotbugs.version")

From a45bcc9172e5d3fd5cb12c3792dce5b0559187c6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 16:36:05 +0000
Subject: [PATCH 0695/1037] fix(deps): update dependency net.sf.saxon:saxon-he
 to v11.6

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5ba834ed37e..224702176ec 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
         api("net.minidev:accessors-smart:2.5.0")
         api("net.minidev:json-smart:2.5.0")
         api("net.sf.jtidy:jtidy:r938")
-        api("net.sf.saxon:Saxon-HE:11.5")
+        api("net.sf.saxon:Saxon-HE:11.6")
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")

From 9b250b64c00513cbcce81fe3f12746dcde8d9ddc Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 18 Dec 2023 16:26:05 +0300
Subject: [PATCH 0696/1037] fix: allow usage of variables in
 ConstantThroughputTimer.throughput and PreciseThroughputTimer

Previously, the timers might fail initialization in case variable was not present
when test started.

The current workaround is to avoid implementing TestStateListener in the timers
so JMeter does not attempt evaluating all the properties before test starts.

fixes https://github.com/apache/jmeter/issues/6165
---
 .../timers/ConstantThroughputTimer.java       | 48 +++----------
 .../PreciseThroughputTimer.java               | 39 ++++-------
 .../timers/ConstantThroughputTimerKtTest.kt   | 69 +++++++++++++++++++
 3 files changed, 92 insertions(+), 64 deletions(-)
 create mode 100644 src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 4a764cf7be4..448e0cc2683 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -23,13 +23,13 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.property.DoubleProperty;
 import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -52,7 +52,7 @@
  */
 @GUIMenuSortOrder(4)
 @TestElementMetadata(labelResource = "displayName")
-public class ConstantThroughputTimer extends AbstractTestElement implements Timer, TestStateListener, TestBean {
+public class ConstantThroughputTimer extends AbstractTestElement implements Timer, TestBean {
     private static final long serialVersionUID = 4;
 
     private static class ThroughputInfo{
@@ -60,6 +60,7 @@ private static class ThroughputInfo{
         long lastScheduledTime = 0;
     }
     private static final Logger log = LoggerFactory.getLogger(ConstantThroughputTimer.class);
+    private static final AtomicLong PREV_TEST_STARTED = new AtomicLong(0L);
 
     private static final double MILLISEC_PER_MIN = 60000.0;
 
@@ -180,6 +181,13 @@ protected long calculateCurrentTarget(long currentTime) {
 
     // Calculate the delay based on the mode
     private long calculateDelay() {
+        long testStarted = JMeterContextService.getTestStartTime();
+        long prevStarted = PREV_TEST_STARTED.get();
+        if (prevStarted != testStarted && PREV_TEST_STARTED.compareAndSet(prevStarted, testStarted)) {
+            // Reset counters if we are calculating throughput for a new test, see https://github.com/apache/jmeter/issues/6165
+            reset();
+        }
+
         long delay;
         // N.B. we fetch the throughput each time, as it may vary during a test
         double msPerRequest = MILLISEC_PER_MIN / getThroughput();
@@ -252,18 +260,6 @@ public String toString() {
         return JMeterUtils.getResString("constant_throughput_timer_memo"); //$NON-NLS-1$
     }
 
-    /**
-     * Get the timer ready to compute delays for a new test.
-     * <p>
-     * {@inheritDoc}
-     */
-    @Override
-    public void testStarted()
-    {
-        log.debug("Test started - reset throughput calculation.");
-        reset();
-    }
-
     /**
      * Override the setProperty method in order to convert
      * the original String calcMode property.
@@ -300,30 +296,6 @@ public void setProperty(JMeterProperty property) {
         super.setProperty(property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testEnded() {
-        //NOOP
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testStarted(String host) {
-        testStarted();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testEnded(String host) {
-        //NOOP
-    }
-
     // For access from test code
     Mode getMode() {
         int mode = getCalcMode();
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
index fc3c4a9f187..4864e22117c 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
@@ -20,13 +20,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.AbstractThreadGroup;
+import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.timers.Timer;
 import org.apache.jorphan.collections.IdentityKey;
 import org.apache.jorphan.util.JMeterStopThreadException;
@@ -41,7 +42,7 @@
  */
 @GUIMenuSortOrder(3)
 @TestElementMetadata(labelResource = "displayName")
-public class PreciseThroughputTimer extends AbstractTestElement implements Cloneable, Timer, TestStateListener, TestBean, ThroughputProvider, DurationProvider {
+public class PreciseThroughputTimer extends AbstractTestElement implements Cloneable, Timer, TestBean, ThroughputProvider, DurationProvider {
     private static final Logger log = LoggerFactory.getLogger(PreciseThroughputTimer.class);
 
     private static final long serialVersionUID = 4;
@@ -50,6 +51,8 @@ public class PreciseThroughputTimer extends AbstractTestElement implements Clone
     private static final ConcurrentMap<IdentityKey<AbstractThreadGroup>, EventProducer> groupEvents =
             new ConcurrentHashMap<>();
 
+    private static final AtomicLong PREV_TEST_STARTED = new AtomicLong(0L);
+
     /**
      * Desired throughput configured as {@code throughput/throughputPeriod} per second.
      */
@@ -63,8 +66,6 @@ public class PreciseThroughputTimer extends AbstractTestElement implements Clone
      */
     private long duration;
 
-    private long testStarted;
-
     /**
      * When number of required samples exceeds {@code exactLimit}, random generator would resort to approximate match of
      * number of generated samples.
@@ -87,31 +88,9 @@ public class PreciseThroughputTimer extends AbstractTestElement implements Clone
     @Override
     public Object clone() {
         final PreciseThroughputTimer newTimer = (PreciseThroughputTimer) super.clone();
-        newTimer.testStarted = testStarted; // JMeter cloning does not clone fields
         return newTimer;
     }
 
-    @Override
-    public void testStarted() {
-        testStarted(null);
-    }
-
-    @Override
-    public void testStarted(String host) {
-        groupEvents.clear();
-        testStarted = System.currentTimeMillis();
-    }
-
-    @Override
-    public void testEnded() {
-        // NOOP
-    }
-
-    @Override
-    public void testEnded(String s) {
-        // NOOP
-    }
-
     @Override
     public long delay() {
         double nextEvent;
@@ -120,6 +99,7 @@ public long delay() {
             nextEvent = events.next();
         }
         long now = System.currentTimeMillis();
+        long testStarted = JMeterContextService.getTestStartTime();
         long delay = (long) (nextEvent * TimeUnit.SECONDS.toMillis(1) + testStarted - now);
         if (log.isDebugEnabled()) {
             log.debug("Calculated delay is {}", delay);
@@ -137,6 +117,13 @@ public long delay() {
     }
 
     private EventProducer getEventProducer() {
+        long testStarted = JMeterContextService.getTestStartTime();
+        long prevStarted = PREV_TEST_STARTED.get();
+        if (prevStarted != testStarted && PREV_TEST_STARTED.compareAndSet(prevStarted, testStarted)) {
+            // Reset counters if we are calculating throughput for a new test, see https://github.com/apache/jmeter/issues/6165
+            groupEvents.clear();
+        }
+
         AbstractThreadGroup tg = getThreadContext().getThreadGroup();
         IdentityKey<AbstractThreadGroup> key = new IdentityKey<>(tg);
         EventProducer eventProducer = groupEvents.get(key);
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt
new file mode 100644
index 00000000000..1a1dc805aeb
--- /dev/null
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.timers
+
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.threads.ThreadGroup
+import org.apache.jmeter.treebuilder.TreeBuilder
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import kotlin.time.Duration.Companion.seconds
+
+class ConstantThroughputTimerKtTest : JMeterTestCase() {
+    fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
+        ThreadGroup::class {
+            numThreads = 1
+            rampUp = 0
+            setSamplerController(
+                LoopController().apply {
+                    loops = 1
+                }
+            )
+            body()
+        }
+    }
+
+    @Test
+    fun `throughput as variable`() {
+        val events = executePlanAndCollectEvents(5.seconds) {
+            oneRequest {
+                DebugSampler::class {
+                    // This initializes the variable during the test execution
+                    name = "\${__groovy( vars.put(\"throughput\"\\, \"10000\") )}"
+                }
+                DebugSampler::class {
+                    ConstantThroughputTimer::class {
+                        setProperty(
+                            "throughput",
+                            "\${__groovy( vars.get(\"throughput\").toDouble() )}"
+                        )
+                        setProperty("calcMode", 0)
+                    }
+                }
+            }
+        }
+        assertEquals(
+            2,
+            events.size,
+            "Test should complete within reasonable time, and the test has 2 debug samplers, so we expect 2 events"
+        )
+    }
+}

From 1329c481fc9def6ad81f3534e86a44f584e221a9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 18 Dec 2023 18:05:38 +0300
Subject: [PATCH 0697/1037] fix: avoid NPE when ConstantTimer.delay accesses a
 variable

The variable might not yet be initialized at the first iteration

Fixes https://github.com/apache/jmeter/issues/6162
---
 .../org/apache/jmeter/timers/ConstantTimer.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
index c62d226bf27..8d9790db19e 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
@@ -29,14 +29,12 @@
  * value update and user interaction.
  *
  */
-public class ConstantTimer extends AbstractTestElement implements Timer, Serializable, LoopIterationListener {
+public class ConstantTimer extends AbstractTestElement implements Timer, Serializable {
 
     private static final long serialVersionUID = 240L;
 
     public static final String DELAY = "ConstantTimer.delay"; //$NON-NLS-1$
 
-    private long delay = 0;
-
     /**
      * No-arg constructor.
      */
@@ -85,7 +83,7 @@ public double getRange() {
      */
     @Override
     public long delay() {
-        return delay;
+        return getPropertyAsLong(DELAY);
     }
 
     /**
@@ -97,15 +95,4 @@ public long delay() {
     public String toString() {
         return JMeterUtils.getResString("constant_timer_memo"); //$NON-NLS-1$
     }
-
-    /**
-     * Gain access to any variables that have been defined.
-     *
-     * @see LoopIterationListener#iterationStart(LoopIterationEvent)
-     */
-    @Override
-    public void iterationStart(LoopIterationEvent event) {
-        delay = getPropertyAsLong(DELAY);
-
-    }
 }

From e9c2ef9cc0056aeaaff171991536a6158e200f82 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 19 Dec 2023 11:50:55 +0300
Subject: [PATCH 0698/1037] fix: log errors happening while JMeter starts the
 test

Previously, the exceptions from TestStateListener.testStarted might
be unnoticed since the UI did not display them.

This change is a workaround to surface errors in common cases.

See https://github.com/apache/jmeter/issues/6174
---
 .../apache/jmeter/timers/ConstantTimer.java   |  2 --
 .../jmeter/engine/StandardJMeterEngine.java   | 22 +++++++++++++------
 .../jmeter/testbeans/TestBeanHelper.java      | 20 +++++++++++++++--
 .../apache/jmeter/functions/TimeFunction.java | 11 +++++++---
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
index 8d9790db19e..1b8b771363a 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java
@@ -19,8 +19,6 @@
 
 import java.io.Serializable;
 
-import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 2aea22251e2..a72602fb2e4 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -239,13 +239,21 @@ private static void removeThreadGroups(List<?> elements) {
 
     private void notifyTestListenersOfStart(SearchByClass<? extends TestStateListener> testListeners) {
         for (TestStateListener tl : testListeners.getSearchResults()) {
-            if (tl instanceof TestBean) {
-                TestBeanHelper.prepare((TestElement) tl);
-            }
-            if (host == null) {
-                tl.testStarted();
-            } else {
-                tl.testStarted(host);
+            try {
+                if (tl instanceof TestBean) {
+                    TestBeanHelper.prepare((TestElement) tl);
+                }
+                if (host == null) {
+                    tl.testStarted();
+                } else {
+                    tl.testStarted(host);
+                }
+            } catch (Throwable e) {
+                // TODO: we should not be logging the exceptions multiple times, however, currently GUI does not
+                //   monitor if the running test fails, so we log the exception for the users to see in the logs
+                log.error("Unable to execute testStarted({}) for test element {}", host, tl, e);
+                throw new IllegalStateException(
+                        "Unable to execute testStarted(" + host + ") for test element " + tl, e);
             }
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
index 3c81ccc5a47..1be2833df05 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
@@ -134,9 +134,25 @@ public static void prepare(TestElement el) {
         try {
             for (CachedPropertyDescriptor desc : GOOD_PROPS.get(el.getClass())) {
                 // Obtain a value of the appropriate type for this property.
-                JMeterProperty jprop = el.getProperty(desc.descriptor.getName());
                 Class<?> type = desc.propertyType;
-                Object value = unwrapProperty(desc.descriptor, jprop, type);
+
+                JMeterProperty jprop;
+                Object value;
+                try {
+                    jprop = el.getProperty(desc.descriptor.getName());
+                    value = unwrapProperty(desc.descriptor, jprop, type);
+                } catch (OutOfMemoryError | StackOverflowError e) {
+                    throw e;
+                } catch (Throwable e) {
+                    String elementName;
+                    try {
+                        elementName = el.getName();
+                    } catch(Throwable ignore) {
+                        elementName = el.getClass().getName();
+                    }
+                    throw new IllegalStateException(
+                            "Can't retrieve property '" + desc.descriptor.getName() + "' of element " + elementName, e);
+                }
 
                 if (log.isDebugEnabled()) {
                     log.debug("Setting {}={}", jprop.getName(), value);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index f7049852865..95abd79655b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -71,9 +71,14 @@ public class TimeFunction extends AbstractFunction implements TestStateListener
                             long div = Long.parseLong(fmt.substring(1)); // should never case NFE
                             return () -> Long.toString(System.currentTimeMillis() / div);
                         }
-                        DateTimeFormatter df = DateTimeFormatter
-                                .ofPattern(fmt)
-                                .withZone(ZoneId.systemDefault());
+                        DateTimeFormatter df;
+                        try {
+                            df = DateTimeFormatter
+                                    .ofPattern(fmt)
+                                    .withZone(ZoneId.systemDefault());
+                        } catch (IllegalArgumentException e) {
+                            throw new IllegalArgumentException("Unable to parse date format " + fmt, e);
+                        }
                         if (isPossibleUsageOfUInFormat(df, fmt)) {
                             log.warn(
                                     MessageFormat.format(

From 9c3c4bd5a0871ca1120275cf425b1be2bc214f2c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 19 Dec 2023 11:52:40 +0300
Subject: [PATCH 0699/1037] fix: remove empty implementation of
 TestStateListener from AbstractJDBCTestElement

TestStateListener + TestBean cause issues like in https://github.com/apache/jmeter/issues/6174,
so we should remove empty implementations
---
 .../jdbc/AbstractJDBCTestElement.java         | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index b464a20e569..c69b9f00362 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -47,7 +47,6 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
@@ -57,7 +56,7 @@
  * A base class for all JDBC test elements handling the basics of a SQL request.
  *
  */
-public abstract class AbstractJDBCTestElement extends AbstractTestElement implements TestStateListener{
+public abstract class AbstractJDBCTestElement extends AbstractTestElement {
     private static final long serialVersionUID = 235L;
 
     private static final Logger log = LoggerFactory.getLogger(AbstractJDBCTestElement.class);
@@ -819,40 +818,4 @@ public String getResultVariable() {
     public void setResultVariable(String resultVariable) {
         this.resultVariable = resultVariable;
     }
-
-
-    /**
-     * {@inheritDoc}
-     * @see org.apache.jmeter.testelement.TestStateListener#testStarted()
-     */
-    @Override
-    public void testStarted() {
-        testStarted("");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see org.apache.jmeter.testelement.TestStateListener#testStarted(java.lang.String)
-     */
-    @Override
-    public void testStarted(String host) {
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see org.apache.jmeter.testelement.TestStateListener#testEnded()
-     */
-    @Override
-    public void testEnded() {
-        testEnded("");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see org.apache.jmeter.testelement.TestStateListener#testEnded(java.lang.String)
-     */
-    @Override
-    public void testEnded(String host) {
-    }
-
 }

From 2395d49d986e0029ab0240a96fee2626de4cebe4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 19 Dec 2023 12:40:21 +0300
Subject: [PATCH 0700/1037] test: remove timer.iterationStart calls from
 ConstantThroughputTimerTest

---
 .../org/apache/jmeter/timers/UniformRandomTimerSpec.groovy  | 6 ------
 .../apache/jmeter/timers/ConstantThroughputTimerTest.java   | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy
index 756d69a5a71..dae6286b79f 100644
--- a/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy
+++ b/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy
@@ -25,8 +25,6 @@ class UniformRandomTimerSpec extends Specification {
     def sut = new UniformRandomTimer()
 
     def "default delay is 0"() {
-        given:
-            sut.iterationStart(null)
         when:
             def computedDelay = sut.delay()
         then:
@@ -34,8 +32,6 @@ class UniformRandomTimerSpec extends Specification {
     }
 
     def "default range is 0"() {
-        given:
-            sut.iterationStart(null)
         when:
             def actualRange = sut.range
         then:
@@ -45,7 +41,6 @@ class UniformRandomTimerSpec extends Specification {
     def "delay can be set via a String"() {
         given:
             sut.setDelay("1")
-            sut.iterationStart(null)
         when:
             def computedDelay = sut.delay()
         then:
@@ -57,7 +52,6 @@ class UniformRandomTimerSpec extends Specification {
         given:
             sut.setDelay(delay)
             sut.setRange(range)
-            sut.iterationStart(null)
         when:
             def computedDelay = sut.delay()
         then:
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
index a55b4bae4a3..1dfa7452490 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
@@ -127,7 +127,6 @@ void testUniformRandomTimer() throws Exception {
         UniformRandomTimer timer = new UniformRandomTimer();
         timer.setDelay("1000");
         timer.setRange(100d);
-        timer.iterationStart(null);
         long delay = timer.delay();
         assertBetween(1000, 1100, delay);
     }
@@ -142,7 +141,6 @@ private static void assertBetween(long expectedLow, long expectedHigh, long actu
     void testConstantTimer() throws Exception {
         ConstantTimer timer = new ConstantTimer();
         timer.setDelay("1000");
-        timer.iterationStart(null);
         Assertions.assertEquals(1000, timer.delay());
     }
 
@@ -151,7 +149,6 @@ void testPoissonRandomTimerRangeHigherThan30() throws Exception {
         PoissonRandomTimer timer = new PoissonRandomTimer();
         timer.setDelay("300");
         timer.setRange(100d);
-        timer.iterationStart(null);
         long delay = timer.delay();
         assertBetween(356, 457, delay);
     }
@@ -161,7 +158,6 @@ void testPoissonRandomTimerRangeLowerThan30() throws Exception {
         PoissonRandomTimer timer = new PoissonRandomTimer();
         timer.setDelay("300");
         timer.setRange(30d);
-        timer.iterationStart(null);
         long delay = timer.delay();
         assertBetween(305, 362, delay);
     }

From 167038054f2a5fd525565f4c117195cb09158864 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 14 Dec 2023 18:38:54 +0000
Subject: [PATCH 0701/1037] fix(deps): update dependency
 org.jetbrains.lets-plot:lets-plot-batik to v4

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 224702176ec..685952996e3 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -124,7 +124,7 @@ dependencies {
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
-        api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0")
+        api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")
         api("org.jodd:jodd-core:5.0.13")

From f781395514da8bd376eabde52e5ce35faf2473d8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 01:49:22 +0000
Subject: [PATCH 0702/1037] fix(deps): update com.fasterxml.jackson.core to
 v2.16.1

---
 src/bom-thirdparty/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 685952996e3..e0db168dc66 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -42,9 +42,9 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.16.0")
-        api("com.fasterxml.jackson.core:jackson-core:2.16.0")
-        api("com.fasterxml.jackson.core:jackson-databind:2.16.0")
+        api("com.fasterxml.jackson.core:jackson-annotations:2.16.1")
+        api("com.fasterxml.jackson.core:jackson-core:2.16.1")
+        api("com.fasterxml.jackson.core:jackson-databind:2.16.1")
         api("com.fifesoft:rsyntaxtextarea:3.3.4")
         api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")

From 2ae93c8dfc5add923d5482c75693e25db377c930 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 01:49:26 +0000
Subject: [PATCH 0703/1037] fix(deps): update dependency
 com.github.spotbugs:com.github.spotbugs.gradle.plugin to v6.0.4

---
 build-logic/verification/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 2cf06c36801..f8682543285 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.2")
+    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.4")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")

From 851879f2cf9c674204253c398f2f27956f014d5f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:42:32 +0000
Subject: [PATCH 0704/1037] fix(deps): update dependency
 org.neo4j.driver:neo4j-java-driver to v4.4.13

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index e0db168dc66..28f381c64bb 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -134,7 +134,7 @@ dependencies {
         api("org.jsoup:jsoup:1.17.1")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
-        api("org.neo4j.driver:neo4j-java-driver:4.4.12")
+        api("org.neo4j.driver:neo4j-java-driver:4.4.13")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")

From bd411da1a880646c217a024987c8ab8b1733be46 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:36:40 +0000
Subject: [PATCH 0705/1037] fix(deps): update dependency
 net.bytebuddy:byte-buddy to v1.14.11

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 60128b0eb27..f7a1e4ce0e7 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
-        api("net.bytebuddy:byte-buddy:1.14.10")
+        api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.4")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.7")

From 56a02b3b1753c797bea9d42785993f311d4df905 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:42:38 +0000
Subject: [PATCH 0706/1037] fix(deps): update kotlin monorepo to v1.9.22

---
 build-logic/jvm/build.gradle.kts        | 4 ++--
 build-logic/root-build/build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 994bbf934b4..899c13c1560 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.2")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
-    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.21")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
     api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
 }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 613d514991f..734136ffa22 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
 }

From 9532a8aa18d89e68d3b35c5495c944e838f3780f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 03:09:00 +0000
Subject: [PATCH 0707/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v3.15.5

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index f7a1e4ce0e7..0f28bf8d0a4 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.11")
-        api("nl.jqno.equalsverifier:equalsverifier:3.15.4")
+        api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.7")
         api("org.apache.activemq:activemq-client:5.16.7")

From 99460c992f8d8f09b8e34f63b2292a6818f2cb2f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:42:42 +0000
Subject: [PATCH 0708/1037] fix(deps): update com.google.errorprone to v2.24.0

Fixes https://github.com/apache/jmeter/pull/6208
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts        | 2 +-
 src/bom-thirdparty/build.gradle.kts                          | 2 +-
 .../java/org/apache/jmeter/gui/util/TristateCheckBox.java    | 2 +-
 .../junit-sample/src/main/java/woolfel/DummyTestCase.java    | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 211db7f58c6..740919157a4 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"("com.google.errorprone:error_prone_core:2.23.0")
+        "errorprone"("com.google.errorprone:error_prone_core:2.24.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 28f381c64bb..19b1a789e8c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:2.7.3")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
-        api("com.google.errorprone:error_prone_annotations:2.23.0")
+        api("com.google.errorprone:error_prone_annotations:2.24.0")
         api("com.helger.commons:ph-commons:10.2.5")
         api("com.helger:ph-css:6.5.0")
         api("com.jayway.jsonpath:json-path:2.8.0")
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
index f875c93d60b..1698c9a0623 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
@@ -206,7 +206,7 @@ private static class TristateButtonModel extends ToggleButtonModel {
 
         public TristateButtonModel(TristateState initial,
                 TristateCheckBox tristateCheckBox, boolean original) {
-            setState(TristateState.DESELECTED);
+            setState(initial);
             this.tristateCheckBox = tristateCheckBox;
             icon = new TristateCheckBoxIcon();
             this.original = original;
diff --git a/src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java b/src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java
index 648f839c886..0318177205f 100644
--- a/src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java
+++ b/src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java
@@ -49,16 +49,17 @@ public void tearDown(){
     public void testMethodPass() {
         try {
             TimeUnit.MILLISECONDS.sleep(100);
-            assertEquals(10,10);
+            assertEquals(10,5 + 5);
         } catch (InterruptedException e) {
             LOGGER.warn("Exception on sleep", e);
         }
     }
 
+    @SuppressWarnings("TruthSelfEquals")
     public void testMethodPass2() {
         try {
             TimeUnit.MILLISECONDS.sleep(100);
-            assertEquals("one","one");
+            assertEquals("one", "one");
         } catch (InterruptedException e) {
             LOGGER.warn("Exception on sleep", e);
         }

From 55f15377a918eedf0d71f0f9f6a8fdb1b05b2d48 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:43:45 +0000
Subject: [PATCH 0709/1037] fix(deps): update org.checkerframework

Fixes https://github.com/apache/jmeter/pull/6209
---
 build-logic/checksum.xml                               | 10 ++--------
 build-logic/verification/build.gradle.kts              |  2 +-
 .../kotlin/build-logic.checkerframework.gradle.kts     |  2 +-
 checksum.xml                                           | 10 ++--------
 src/bom-thirdparty/build.gradle.kts                    |  2 +-
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index c1b793ab091..0864348dd6f 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -100,14 +100,8 @@
     <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
       <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
     </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
-      <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
-      <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.36'>
-      <sha512>90E5E8376CC3F3461D5F39BB471D8E467B6662C44300FE6B209334C63835A5405C244A80747B74368561CB432D2A36D8B4606661C25627FCBDF11F58544DF389</sha512>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.37'>
+      <sha512>52E8003B3CD07FFD3DFB8830F628904C24762003F65D10E002C4D2E84B7046C6B2ED66D69CE8A74AD6923E96868B3E08B3B404AA004ED36750B316B12BAEAF6D</sha512>
     </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index f8682543285..f9e901c1679 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.36")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.37")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index b09b77010b1..40c028c8e99 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.41.0"
+        val checkerframeworkVersion = "3.42.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/checksum.xml b/checksum.xml
index aa1de035ed9..87663e6911c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -312,14 +312,8 @@
     <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
       <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
     </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.28'>
-      <sha512>976E7FECDEC7793A0E44562972DC86D16416913DD58C9A9A24A69DC7A32E2FC7B651505E6916F6CC50D91EC82629284C58AFCBB233277E7635B8777DA07F228C</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.35'>
-      <sha512>D1C1FFD932AA64A2961FD07DD7124E7561CB33ED4CB586AA0036BD4C39A192C718420E8DD3719B90994754E2ADE2F77876CC221B73B4333EBADCBD4C37C7A458</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.36'>
-      <sha512>90E5E8376CC3F3461D5F39BB471D8E467B6662C44300FE6B209334C63835A5405C244A80747B74368561CB432D2A36D8B4606661C25627FCBDF11F58544DF389</sha512>
+    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.37'>
+      <sha512>52E8003B3CD07FFD3DFB8830F628904C24762003F65D10E002C4D2E84B7046C6B2ED66D69CE8A74AD6923E96868B3E08B3B404AA004ED36750B316B12BAEAF6D</sha512>
     </dependency>
     <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
       <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 19b1a789e8c..082a711fd6c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.41.0")
+        api("org.checkerframework:checker-qual:3.42.0")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }

From d863aa7ef84d9c2cbc4e39af86ee5c53192e5511 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Dec 2023 02:42:29 +0000
Subject: [PATCH 0710/1037] fix(deps): update dependency
 org.codehaus.groovy:groovy-bom to v3.0.20

Fixes https://github.com/apache/jmeter/pull/6205
---
 checksum.xml                                  |  1 +
 ...123c1ed3f13a6a0140e166c71fb765cd9de313.asc | 26 +++++++++++++++++++
 .../13/c71fb765cd9de313.fingerprints          |  1 +
 .../9e/dff2d25e2cd6139e.fingerprints          |  1 +
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints

diff --git a/checksum.xml b/checksum.xml
index 87663e6911c..a29e0badc42 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -122,6 +122,7 @@
     <trusted-key id='b01128c8fd304fe48e6eed2c347cd0eaed975c5f' group='org.antlr' />
     <trusted-key id='dddee87612e9fb95f5c8d91e411063a3a0ffd119' group='org.apache-extras.beanshell' />
     <trusted-key id='1aa8cf92d409a73393d0b736bff2ee42c8282e76' group='org.apache.activemq' />
+    <trusted-key id='0a123c1ed3f13a6a0140e166c71fb765cd9de313' group='org.apache.ant' />
     <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
     <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.bcel' />
     <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
new file mode 100644
index 00000000000..77dd35642a3
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGOV0eQBEADTe/ljLAoBp+z84NkWHDBqbBmEsBxcGa0VDQxGsaMMi2f6wkO2
+VDkRFNzNQbmw5xFqLisZ9ywzuVc9xmZ6qoMWLJaYs9RdsJSgD9+4hL5IkmjClxc9
+Sws/NatagNaJNEA0uYSBJ6yRTksM5+46vUNK+BaBI8e/qdDX25Sqr4833nsBIGRo
+6InBoTJJzu9jtLCWezFUt6iMcA3WgMlgYtWF8mhs8BjGAgEiHUGz6+b2YSwC/bKr
+C1JfEPmzXRH2LbR+g4t41SKBYZmJ5qCf4DzkG836SIDc13AeLEYidGYHpsirRdVK
+3ORZjgUcCNS8MTDohzSuj1HJaoQ4jpbRlvhnWYHxA4H2re+1cqieQorDdr3KCKDI
+xQR68RSoAX5tl98TOMqAfGN1n5yWYDnHKAoqa5k6WSY+nE0ESHSszEdIuMkk03Bu
+CzXKZYEJyTwKv+FZLQ4i+9cjC5AECy1dLA6lCePypNVzeZmsAQcWEii/jrEOheAt
+M/p0IsxjDGrxMOjKqqOsL6sKOgDwh04Q0STy1uL6DQp2DMfTZI1VmoVd1+jMQUDj
+hr/tWplGxGUyoXqZj+i98Zl8xWhfAcmx+p70Zm+ypJWqU9+axHlNnD16oHDZuOct
+PPdrONeR3jBVtd60fZIXrNGNrRYwm3Tq2P7dhssjRRzBg/D3VW003z4StwARAQAB
+uQINBGOV0eQBEADODM1fmfMCXF5WdDRi+BwiOTDRrUkBCl7pc3/l/PieEf/AeiX7
+B0JJJLRjid3wJpFj6RqM8jOruLJJFgkF5R54tHgg8CWveZuR/Oh+Ek/GpFPQXxPB
+FH4T9j3SnIzqJkpLZgX11rpfBg/7jBp1YTOJjJ2VXG7mmG9R+Kkej9CpPnd7owxZ
+xNmk1PAcmkjusvrxek0bSL2XdwxN+j40wEjXyNG2+u/Xgg3vMGy1AFkSGfrlzLLQ
+BV1Ohak8CZvVh4dURT3fSSwE8+zN/LRep3IVdloWVR30+eDhzPECje8pIwaMV0uL
+8VbiWIOE2x1UyS3qIh3mN9FbywYYsvSNWn3SNk4zqqhTnirvN5jd8GPCD5hZ4pmW
+To/fD16Entt+sBFNy8pgFZRLjyy0jMeOSfpBjCb0nQB7e0bmNeXxH9IAM6DtNqwz
+d40k0PRDjlkvgqADyRN7bh2+V335l4KUdBB0KXj7xNQaDCOjVhXz4L7FP/o7S0if
+hYfVKEtXYJAMibFYKmCNkOMvrNV0u3PMUgd5UMlpGkcPDAqTGAUoEdESuBs4d03b
+1B+PXEwSqMFEZB+errUmDAWyA9c60GppFSTfsgTPapOVkOlrTMl2FTIdY7SoMA/s
+S+qhtHYWZpOBXF4sXFCl26nJ2fzXL6CTMfa8JwtC2L3eXoYCkdjtK6hQ3wARAQAB
+=cyTc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
new file mode 100644
index 00000000000..7b22e4face8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
@@ -0,0 +1 @@
+0a123c1ed3f13a6a0140e166c71fb765cd9de313
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints
new file mode 100644
index 00000000000..7b22e4face8
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints
@@ -0,0 +1 @@
+0a123c1ed3f13a6a0140e166c71fb765cd9de313
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 082a711fd6c..aa704dc7f2c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:3.0.19"))
+    api(platform("org.codehaus.groovy:groovy-bom:3.0.20"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 
     constraints {

From 5c95bcc43d95caff744acf3434a9d0fffc4be671 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 25 Dec 2023 19:42:17 +0300
Subject: [PATCH 0711/1037] refactor: replace use of deprecated
 DefaultPlotPanelBatik

---
 .../org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
index a8c074a1143..f24150e1c6e 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.threads.openmodel.gui
 
-import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
 import org.apache.jmeter.threads.openmodel.asSeconds
 import org.apache.jmeter.threads.openmodel.rateUnitFor
 import org.apiguardian.api.API
+import org.jetbrains.letsPlot.batik.plot.component.DefaultPlotPanelBatik
 import org.jetbrains.letsPlot.commons.registration.Disposable
 import org.jetbrains.letsPlot.core.util.MonolithicCommon
 import org.jetbrains.letsPlot.geom.geomLine

From 221c14d6fc20450ddc2e9c6cecdf366d02f45880 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 14:17:12 +0300
Subject: [PATCH 0712/1037] test: remove stale AllTests.java test launcher

---
 .../org/apache/jorphan/test/AllTests.java     | 389 ------------------
 1 file changed, 389 deletions(-)
 delete mode 100644 src/core/src/test/java/org/apache/jorphan/test/AllTests.java

diff --git a/src/core/src/test/java/org/apache/jorphan/test/AllTests.java b/src/core/src/test/java/org/apache/jorphan/test/AllTests.java
deleted file mode 100644
index e64fb568de8..00000000000
--- a/src/core/src/test/java/org/apache/jorphan/test/AllTests.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jorphan.test;
-
-import java.awt.GraphicsEnvironment;
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-import javax.crypto.Cipher;
-
-import org.apache.commons.lang3.time.StopWatch;
-import org.apache.jmeter.junit.categories.ExcludeCategoryFilter;
-import org.apache.jmeter.junit.categories.NeedGuiTests;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.reflect.ClassFilter;
-import org.apache.jorphan.reflect.ClassFinder;
-import org.apache.jorphan.util.JOrphanUtils;
-import org.junit.experimental.ParallelComputer;
-import org.junit.internal.TextListener;
-import org.junit.runner.Computer;
-import org.junit.runner.Description;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Request;
-import org.junit.runner.Result;
-import org.junit.runner.notification.RunListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import junit.framework.TestCase;
-import spock.lang.Specification;
-
-/**
- * Provides a quick and easy way to run all <a href="http://http://junit.org">junit</a>
- * unit tests (including Spock tests) in your Java project.
- * It will find all unit test classes and run all their test methods.
- * There is no need to configure it in any way to find these classes except to
- * give it a path to search.
- * <p>
- * Here is an example Ant target (See Ant at <a
- * href="http://ant.apache.org">Apache Ant</a>) that runs all your unit
- * tests:
- *
- * <pre>
- *
- *       &lt;target name=&quot;test&quot; depends=&quot;compile&quot;&gt;
- *           &lt;java classname=&quot;org.apache.jorphan.test.AllTests&quot; fork=&quot;yes&quot;&gt;
- *               &lt;classpath&gt;
- *                   &lt;path refid=&quot;YOUR_CLASSPATH&quot;/&gt;
- *                   &lt;pathelement location=&quot;ROOT_DIR_OF_YOUR_COMPILED_CLASSES&quot;/&gt;
- *               &lt;/classpath&gt;
- *               &lt;arg value=&quot;SEARCH_PATH/&quot;/&gt;
- *               &lt;arg value=&quot;PROPERTY_FILE&quot;/&gt;
- *               &lt;arg value=&quot;NAME_OF_UNITTESTMANAGER_CLASS&quot;/&gt;
- *           &lt;/java&gt;
- *       &lt;/target&gt;
- *
- * </pre>
- *
- * <dl>
- * <dt>YOUR_CLASSPATH</dt>
- * <dd>Refers to the classpath that includes all jars and libraries need to run
- * your unit tests</dd>
- *
- * <dt>ROOT_DIR_OF_YOUR_COMPILED_CLASSES</dt>
- * <dd>The classpath should include the directory where all your project's
- * classes are compiled to, if it doesn't already.</dd>
- *
- * <dt>SEARCH_PATH</dt>
- * <dd>The first argument tells AllTests where to look for unit test classes to
- * execute. In most cases, it is identical to ROOT_DIR_OF_YOUR_COMPILED_CLASSES.
- * You can specify multiple directories or jars to search by providing a
- * comma-delimited list.</dd>
- *
- * <dt>PROPERTY_FILE</dt>
- * <dd>A simple property file that sets logging parameters. It is optional and
- * is only relevant if you use the same logging packages that JOrphan uses.</dd>
- *
- * <dt>NAME_OF_UNITTESTMANAGER_CLASS</dt>
- * <dd>If your system requires some configuration to run correctly, you can
- * implement the {@link UnitTestManager} interface and be given an opportunity
- * to initialize your system from a configuration file.</dd>
- * </dl>
- *
- * @see UnitTestManager
- */
-public final class AllTests {
-    private static final Logger log = LoggerFactory.getLogger(AllTests.class);
-
-    /**
-     * Private constructor to prevent instantiation.
-     */
-    private AllTests() {
-    }
-
-    private static void logprop(String prop, boolean show) {
-        String value = System.getProperty(prop);
-        log.info("{}={}", prop, value);
-        if (show) {
-            System.out.println(prop + "=" + value);
-        }
-    }
-
-    private static void logprop(String prop) {
-        logprop(prop, false);
-    }
-
-    /**
-     * Starts a run through all unit tests found in the specified classpaths.
-     * The first argument should be a list of paths to search. The second
-     * argument is optional and specifies a properties file used to initialize
-     * logging. The third argument is also optional, and specifies a class that
-     * implements the UnitTestManager interface. This provides a means of
-     * initializing your application with a configuration file prior to the
-     * start of any unit tests.
-     *
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        if (args.length < 1) {
-            System.out.println("You must specify a comma-delimited list of paths to search " + "for unit tests");
-            return;
-        }
-
-        String home = new File(System.getProperty("user.dir")).getParent();
-        System.out.println("Setting JMeterHome: "+home);
-        JMeterUtils.setJMeterHome(home);
-        initializeManager(args);
-
-        log.info("JMeterVersion={}", JMeterUtils.getJMeterVersion());
-        System.out.println("JMeterVersion=" + JMeterUtils.getJMeterVersion());
-        logprop("java.version", true);
-        logprop("java.vm.name");
-        logprop("java.vendor");
-        logprop("java.home", true);
-        logprop("file.encoding", true);
-        // Display actual encoding used (will differ if file.encoding is not recognised)
-        System.out.println("default encoding="+Charset.defaultCharset());
-        log.info("default encoding={}", Charset.defaultCharset());
-        logprop("user.home");
-        logprop("user.dir", true);
-        logprop("user.language");
-        logprop("user.region");
-        logprop("user.country");
-        logprop("user.variant");
-        log.info("Locale={}", Locale.getDefault());
-        System.out.println("Locale=" + Locale.getDefault());
-        logprop("os.name", true);
-        logprop("os.version", true);
-        logprop("os.arch");
-        logprop("java.class.version");
-
-        if (Boolean.getBoolean("jmeter.test.log.classpath")) {
-            String cp = System.getProperty("java.class.path");
-            String[] cpe = JOrphanUtils.split(cp, java.io.File.pathSeparator);
-            StringBuilder sb = new StringBuilder(3000);
-            sb.append("java.class.path=");
-            for (String path : cpe) {
-                sb.append("\n");
-                sb.append(path);
-                if (new File(path).exists()) {
-                    sb.append(" - OK");
-                } else {
-                    sb.append(" - ??");
-                }
-            }
-            log.info(sb.toString());
-        }
-
-        try {
-            int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");
-            System.out.println("JCE max key length = " + maxKeyLen);
-        } catch (NoSuchAlgorithmException e) {
-            log.warn(e.getLocalizedMessage());
-        }
-        System.out.println("+++++++++++");
-        logprop("java.awt.headless", true);
-        logprop("java.awt.graphicsenv", true);
-
-        System.out.println("------------");
-        JUnitCore jUnitCore = new JUnitCore();
-        // this listener is in the internal junit package
-        // if it breaks, replace it with a custom text listener
-        jUnitCore.addListener(new TextListener(System.out));
-        // this will time each unit test and then print to file
-        // TODO: put behind a flag
-        jUnitCore.addListener(new TimePrinter());
-
-        System.out.println("Searching junit tests in : "+args[0]);
-
-        try {
-            List<String> tests = findJMeterJUnitTests(args[0]);
-            List<Class<?>> classes = asClasses(tests);
-
-            Result parallelResults = jUnitCore.run(getParallelTests(classes));
-            Result serialResults = jUnitCore.run(getSerialTests(classes));
-
-            boolean allTestsSuccessful =
-                    parallelResults.wasSuccessful() && serialResults.wasSuccessful();
-            System.exit(allTestsSuccessful ? 0 : 1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static Request getParallelTests(List<Class<?>> classes) {
-        Request parallelRequest = Request.classes(
-                ParallelComputer.methods(), // ParallelComputer.classes() causes failures
-                classes.stream()
-                        .filter(c -> !JMeterSerialTest.class.isAssignableFrom(c))
-                        .toArray(Class<?>[]::new));
-        return filterGUITests(parallelRequest);
-    }
-
-    private static Request getSerialTests(List<Class<?>> classes) {
-        Request serialRequest = Request.classes(Computer.serial(),
-                classes.stream()
-                        .filter(JMeterSerialTest.class::isAssignableFrom)
-                        .toArray(Class<?>[]::new));
-        return filterGUITests(serialRequest);
-    }
-
-    private static Request filterGUITests(Request request) {
-        if (GraphicsEnvironment.isHeadless()) {
-            return request.filterWith(new ExcludeCategoryFilter(NeedGuiTests.class));
-        } else {
-            return request;
-        }
-    }
-
-    private static List<Class<?>> asClasses(List<String> tests) {
-        return tests.stream()
-                .map(AllTests::asClass)
-                .collect(Collectors.toList());
-    }
-
-    private static Class<?> asClass(String test) {
-        try {
-            return Class.forName(test, true, Thread.currentThread().getContextClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Used to time each unit test and then write the results to file
-     */
-    private static class TimePrinter extends RunListener {
-        private ConcurrentHashMap<Description, StopWatch> testTimers = new ConcurrentHashMap<>();
-        private List<String> logLines = new ArrayList<>();
-
-        @Override
-        public void testStarted(Description description) {
-            StopWatch sw = new StopWatch();
-            sw.start();
-            testTimers.put(description, sw);
-        }
-
-        @Override
-        public void testFinished(Description desc) {
-            StopWatch sw = testTimers.get(desc);
-            sw.stop();
-            logLines.add(desc.getClassName() + "." + desc.getMethodName() + "\t" + sw.getNanoTime());
-        }
-
-        @Override
-        public void testRunFinished(Result result) throws Exception {
-            Files.write(Paths.get("unit-test-perf.log"), logLines);
-        }
-    }
-
-    /**
-     * An overridable method that instantiates a UnitTestManager (if one
-     * was specified in the command-line arguments), and hands it the name of
-     * the properties file to use to configure the system.
-     *
-     * @param args arguments with the initialization parameter
-     * arg[0] - not used
-     * arg[1] - relative name of properties file
-     * arg[2] - used as label
-     */
-    private static void initializeManager(String[] args) {
-        if (args.length >= 3) {
-            try {
-                System.out.println("Using initializeProperties() from " + args[2]);
-                UnitTestManager um = Class.forName(args[2]).asSubclass(UnitTestManager.class).getDeclaredConstructor()
-                        .newInstance();
-                System.out.println("Setting up initial properties using: " + args[1]);
-                um.initializeProperties(args[1]);
-            } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
-                System.out.println("Couldn't create: " + args[2]);
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private static List<String> findJMeterJUnitTests(String searchPathString) throws IOException {
-        final String[] searchPaths = JOrphanUtils.split(searchPathString, ",");
-        // TODO: do we really need class searching here?
-        return ClassFinder.findClasses(searchPaths, new JunitTestFilter());
-    }
-
-    /**
-     * Match JUnit (including Spock) tests
-     */
-    private static class JunitTestFilter implements ClassFilter {
-
-        private final transient ClassLoader contextClassLoader =
-                Thread.currentThread().getContextClassLoader();
-
-        @Override
-        public boolean accept(String className) {
-            boolean isJunitTest = false;
-            try {
-                Class<?> clazz = Class.forName(className, false, contextClassLoader);
-
-                if (!clazz.isAnnotation()
-                        && !clazz.isEnum()
-                        && !clazz.isInterface()
-                        && !Modifier.isAbstract(clazz.getModifiers())) {
-                    isJunitTest = TestCase.class.isAssignableFrom(clazz)
-                            || Specification.class.isAssignableFrom(clazz) // Spock
-                            || checkForJUnitAnnotations(clazz);
-                }
-            } catch (UnsupportedClassVersionError
-                    | ClassNotFoundException
-                    | NoClassDefFoundError e) {
-                log.debug("Exception while filtering class {}. {}", className, e.toString());
-            }
-
-            return isJunitTest;
-        }
-
-        private boolean checkForJUnitAnnotations(Class<?> clazz) {
-            Class<?> classToCheck = clazz;
-            while (classToCheck != null) {
-                if (checkForTestAnnotationOnMethods(classToCheck)) {
-                    return true;
-                }
-                classToCheck = classToCheck.getSuperclass();
-            }
-
-            return false;
-        }
-
-        private boolean checkForTestAnnotationOnMethods(Class<?> clazz) {
-            return Arrays.stream(clazz.getDeclaredMethods())
-                    .flatMap(method -> Arrays.stream(method.getAnnotations()))
-                    .map(Annotation::annotationType)
-                    .anyMatch(org.junit.Test.class::isAssignableFrom);
-        }
-
-        /**
-         * @see java.lang.Object#toString()
-         */
-        @Override
-        public String toString() {
-            return "JunitTestFilter []";
-        }
-    }
-}

From 7ec460defe2eb362ce1f1e23702fcdcef8cd6557 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 08:27:28 +0300
Subject: [PATCH 0713/1037] test: add DisabledIfHeadless annotation to
 selectively disabling tests in headless mode

---
 .../jmeter/test/gui/DisabledIfHeadless.kt     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/jorphan/src/testFixtures/kotlin/org/apache/jmeter/test/gui/DisabledIfHeadless.kt

diff --git a/src/jorphan/src/testFixtures/kotlin/org/apache/jmeter/test/gui/DisabledIfHeadless.kt b/src/jorphan/src/testFixtures/kotlin/org/apache/jmeter/test/gui/DisabledIfHeadless.kt
new file mode 100644
index 00000000000..d63af7cced1
--- /dev/null
+++ b/src/jorphan/src/testFixtures/kotlin/org/apache/jmeter/test/gui/DisabledIfHeadless.kt
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.test.gui
+
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty
+
+/**
+ * Disables test class or method if running in headless mode.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+@DisabledIfSystemProperty(named = "java.awt.headless", matches = "true")
+annotation class DisabledIfHeadless

From 13b824a5a99bf14789a434ddf1e13b11bfd04573 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 08:28:06 +0300
Subject: [PATCH 0714/1037] test: ensure all Gui elements initialize non-empty
 TestElement names

---
 .../src/test/java/org/apache/jmeter/junit/JMeterTest.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 3ed11e88c1a..f442cb64dc0 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -47,6 +47,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.gui.ObsoleteGui;
+import org.apache.jmeter.control.gui.TestFragmentControllerGui;
 import org.apache.jmeter.dsl.DslPrinterTraverser;
 import org.apache.jmeter.gui.JMeterGUIComponent;
 import org.apache.jmeter.gui.UnsharedComponent;
@@ -374,8 +375,14 @@ public void GUIComponents2() throws Exception {
         assertEquals("GUI-CLASS: Failed on " + name, name, el.getPropertyAsString(TestElement.GUI_CLASS));
 
         assertEquals("NAME: Failed on " + name, guiItem.getName(), el.getName());
+        if (StringUtils.isEmpty(el.getName())) {
+            fail("Name of the element must not be blank. Gui class " + name + ", element class " + el.getClass().getName());
+        }
         assertEquals("TEST-CLASS: Failed on " + name, el.getClass().getName(), el
                 .getPropertyAsString(TestElement.TEST_CLASS));
+        if (guiItem.getClass() != TestFragmentControllerGui.class) {
+            assertTrue("Should be enabled by default: " + name, el.isEnabled());
+        }
         TestElement el2 = guiItem.createTestElement();
         el.setName("hey, new name!:");
         el.setProperty("NOT", "Shouldn't be here");

From 73b255962e44725688438ef056822f973b10678b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 08:51:11 +0300
Subject: [PATCH 0715/1037] test: remove AssertionGuiSpec as it duplicates
 existing org.apache.jmeter.junit.JMeterTest

junit.JMeterTest instantiates all detected Gui classes, create components,
and verify basic properties, so AssertionGuiSpec was not adding much
---
 .../assertions/gui/AssertionGuiSpec.groovy    | 81 -------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy

diff --git a/src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy
deleted file mode 100644
index d6618a73856..00000000000
--- a/src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.assertions.gui
-
-import org.apache.jmeter.assertions.ResponseAssertion
-import org.apache.jmeter.junit.spock.JMeterSpec
-
-/**
- * Extending JMeterSpec is required to initialize resource bundle org.apache.jmeter.resource.messages
- */
-class AssertionGuiSpec extends JMeterSpec {
-
-    def sut = new AssertionGui()
-
-    private def langIsEnglish() {
-        return Locale.default.language.startsWith(Locale.ENGLISH.language)
-    }
-
-    def "init of new component does not throw an exception"() {
-        when:
-            sut.init()
-        then:
-            noExceptionThrown()
-    }
-
-    def "clearing GUI component fields does not throw an exception"() {
-        when:
-            sut.clearGui()
-        then:
-            noExceptionThrown()
-    }
-
-    def "Creation of ResponseAssertion sets name of element and enables it"() {
-        when:
-            def result = sut.createTestElement()
-        then:
-            (langIsEnglish() && result.name == "Response Assertion") ||
-                    (!langIsEnglish() && result.getName() != null && !result.getName().empty)
-            result.isEnabled()
-    }
-
-    def "Modification of ResponseAssertion by GUI has no unexpected behaviour"() {
-        given:
-            def element = new ResponseAssertion()
-            sut.clearGui()
-        when:
-            sut.modifyTestElement(element)
-        then:
-            (langIsEnglish() && element.name == "Response Assertion") ||
-                    (!langIsEnglish() && element.getName() != null && !element.getName().empty)
-            element.isTestFieldResponseData()
-            element.getTestStrings().isEmpty()
-            !element.getAssumeSuccess()
-            !element.isNotType()
-            element.isSubstringType()
-    }
-
-    def "Modification of GUI by ResponseAssertion does not throw an exception"() {
-        given:
-            def element = new ResponseAssertion()
-        when:
-            sut.configure(element)
-        then:
-            noExceptionThrown()
-    }
-}

From ef82a00cad726e654aa00418e13a29c97b537d6d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 19 Dec 2023 20:33:13 +0300
Subject: [PATCH 0716/1037] fix: allow setting empty strings with
 TestElement.set(...) API, and remove properties only in case the value is
 null

---
 .../apache/jmeter/testelement/TestElement.kt  |   4 +-
 .../testelement/schema/PropertiesAccessor.kt  |   6 +-
 .../property/JMeterElementSchemaTest.kt       | 141 ++++++++++++++++--
 3 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
index d6cb9ec99f7..0ec79242f61 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/TestElement.kt
@@ -285,13 +285,13 @@ public interface TestElement : Cloneable {
         getPropertyOrNull(property)?.stringValue ?: property.defaultValueAsString ?: ""
 
     /**
-     * Set property as string, or remove it if the given value is `null` or empty.
+     * Set property as string, or remove it if the given value is `null`.
      * @since 5.6
      */
     @JMeterPropertySchemaUnchecked
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public operator fun set(property: PropertyDescriptor<*, *>, value: String?) {
-        removeOrSet(value.isNullOrEmpty(), property.name) {
+        removeOrSet(value == null, property.name) {
             StringProperty(it, value)
         }
     }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
index 05c6f0b5ce9..2f2f4a78929 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertiesAccessor.kt
@@ -84,7 +84,7 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
     }
 
     // All properties can be set as strings
-    public operator fun set(property: PropertyDescriptor<Schema, *>, value: String) {
+    public operator fun set(property: PropertyDescriptor<Schema, *>, value: String?) {
         target[property] = value
     }
 
@@ -116,13 +116,13 @@ public class PropertiesAccessor<out TestElementClass : TestElement, out Schema :
     public inline operator fun get(propertySelector: Schema.() -> BooleanPropertyDescriptor<Schema>): Boolean =
         target[propertySelector(schema)]
 
-    public operator fun set(property: BooleanPropertyDescriptor<Schema>, value: Boolean) {
+    public operator fun set(property: BooleanPropertyDescriptor<Schema>, value: Boolean?) {
         target[property] = value
     }
 
     public inline operator fun set(
         propertySelector: Schema.() -> BooleanPropertyDescriptor<Schema>,
-        value: Boolean
+        value: Boolean?
     ) {
         target[propertySelector(schema)] = value
     }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
index 58f6869f09c..143a03d6075 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/property/JMeterElementSchemaTest.kt
@@ -29,10 +29,14 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 
 class JMeterElementSchemaTest {
+    val warpDrive = WarpDriveElement()
+
     abstract class WarpDriveElementSchema : TestElementSchema() {
         companion object INSTANCE : WarpDriveElementSchema()
 
         val warpFactor by int("WarpDriveElement.warpFactor", default = 7)
+        val turbo by boolean("WarpDriveElement.turbo")
+        val description by string("WarpDriveElement.description")
     }
 
     open class WarpDriveElement : AbstractTestElement() {
@@ -44,7 +48,16 @@ class JMeterElementSchemaTest {
 
     @Test
     fun `getPropertyOrNull returns null for unset props`() {
-        val warpDrive = WarpDriveElement()
+        assertGetWarpDescription(
+            null,
+            warpDrive,
+            "${WarpDriveElementSchema.warpFactor} should be null for newly created element"
+        )
+        assertGetWarpTurbo(
+            null,
+            warpDrive,
+            "${WarpDriveElementSchema.warpFactor} should be null for newly created element"
+        )
         assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.warpFactor)) {
             "${WarpDriveElementSchema.warpFactor} should be null for newly created element, getPropertyOrNull(PropertyDescriptor)"
         }
@@ -54,22 +67,19 @@ class JMeterElementSchemaTest {
     }
 
     @Test
-    fun `get returns default value`() {
-        val warpDrive = WarpDriveElement()
+    fun `get int returns default value`() {
         assertGetWarpFactor(7, warpDrive, "element is empty, so default value expected")
     }
 
     @Test
-    fun `set modifies value`() {
-        val warpDrive = WarpDriveElement()
+    fun `set int modifies value`() {
         warpDrive[warpDrive.schema.warpFactor] = 8
 
         assertGetWarpFactor(8, warpDrive, "value was modified with [warpFactor] = 8")
     }
 
     @Test
-    fun `props set modifies value`() {
-        val warpDrive = WarpDriveElement()
+    fun `props set int modifies value`() {
         warpDrive.props {
             it[warpFactor] = 8
         }
@@ -77,6 +87,74 @@ class JMeterElementSchemaTest {
         assertGetWarpFactor(8, warpDrive, "value was modified with props { it[warpFactor] = 8 }")
     }
 
+    @Test
+    fun `set string modifies value`() {
+        var value = "new description"
+        warpDrive[warpDrive.schema.description] = value
+        assertGetWarpDescription(value, warpDrive, "value was modified with [description] = \"$value\"")
+
+        value = ""
+        warpDrive[warpDrive.schema.description] = value
+        assertGetWarpDescription(value, warpDrive, "value was modified with [description] = \"$value\"")
+
+        warpDrive[warpDrive.schema.description] = null
+        assertGetWarpDescription(null, warpDrive, "value should be removed after [description] = null")
+    }
+
+    @Test
+    fun `props set string modifies value`() {
+        var value = "new description"
+        warpDrive.props {
+            it[description] = value
+        }
+        assertGetWarpDescription(value, warpDrive, "value was modified with props { it[description] = \"$value\" }")
+
+        value = ""
+        warpDrive.props {
+            it[description] = value
+        }
+        assertGetWarpDescription(value, warpDrive, "value was modified with props { it[description] = \"$value\" }")
+
+        warpDrive.props {
+            it[description] = null
+        }
+        assertGetWarpDescription(null, warpDrive, "value should be removed after props { it[description] = null }")
+    }
+
+    @Test
+    fun `set boolean modifies value`() {
+        var value = true
+        warpDrive[warpDrive.schema.turbo] = value
+        assertGetWarpTurbo(value, warpDrive, "value was modified with [turbo] = \"$value\"")
+
+        value = false
+        warpDrive[warpDrive.schema.turbo] = value
+        assertGetWarpTurbo(value, warpDrive, "value was modified with [turbo] = \"$value\"")
+
+        warpDrive[warpDrive.schema.turbo] = null as Boolean?
+        assertGetWarpTurbo(null, warpDrive, "value should be removed after [turbo] = null")
+    }
+
+    @Test
+    fun `props set boolean modifies value`() {
+        var value = true
+        warpDrive.props {
+            it[turbo] = value
+        }
+        assertGetWarpTurbo(value, warpDrive, "value was modified with props { it[turbo] = \"$value\" }")
+
+        value = false
+        warpDrive.props {
+            it[turbo] = value
+        }
+        assertGetWarpTurbo(value, warpDrive, "value was modified with props { it[turbo] = \"$value\" }")
+
+        warpDrive.props {
+            it[turbo] = null as Boolean?
+        }
+        assertGetWarpTurbo(null, warpDrive, "value should be removed after props { it[turbo] = null }")
+    }
+
     @Test
     fun `property descriptor equals`() {
         assertEquals(TestElementSchema.name, ThreadGroupSchema.name) {
@@ -90,7 +168,6 @@ class JMeterElementSchemaTest {
 
     @Test
     fun `test string setter`() {
-        val warpDrive = WarpDriveElement()
         warpDrive.props {
             it[warpFactor] = "\${hello}"
         }
@@ -103,7 +180,7 @@ class JMeterElementSchemaTest {
         assertEquals(expected, warpDrive[warpDrive.schema.warpFactor]) {
             "get(warpFactor): ${WarpDriveElementSchema.warpFactor}, $message"
         }
-        assertEquals(expected, warpDrive.props[ { warpDrive.schema.warpFactor }]) {
+        assertEquals(expected, warpDrive.props[ { warpFactor }]) {
             "props.get[{warpFactor}]: ${WarpDriveElementSchema.warpFactor}, $message"
         }
         assertEquals(expected.toString(), warpDrive.getString(warpDrive.schema.warpFactor)) {
@@ -111,6 +188,52 @@ class JMeterElementSchemaTest {
         }
     }
 
+    private fun assertGetWarpDescription(expected: String?, warpDrive: WarpDriveElement, message: String) {
+        assertEquals(expected ?: "", warpDrive[warpDrive.schema.description]) {
+            "get(description): ${WarpDriveElementSchema.description}, $message"
+        }
+        assertEquals(expected ?: "", warpDrive.props[ { description }]) {
+            "props.get[{description}]: ${WarpDriveElementSchema.description}, $message"
+        }
+        assertEquals(expected ?: "", warpDrive.getString(warpDrive.schema.description)) {
+            "getString(description): ${WarpDriveElementSchema.description}, $message"
+        }
+        assertEquals(expected ?: "", warpDrive.getPropertyAsString(warpDrive.schema.description.name)) {
+            "getPropertyAsString(description): ${WarpDriveElementSchema.description}, $message"
+        }
+        if (expected == null) {
+            assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.description)) {
+                "getPropertyOrNull(description) should return null for absent property, ${WarpDriveElementSchema.description}, $message"
+            }
+            assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.description.name)) {
+                "getPropertyOrNull(description.name) should return null for absent property, ${WarpDriveElementSchema.description}, $message"
+            }
+        }
+    }
+
+    private fun assertGetWarpTurbo(expected: Boolean?, warpDrive: WarpDriveElement, message: String) {
+        assertEquals(expected ?: false, warpDrive[warpDrive.schema.turbo]) {
+            "get(turbo): ${WarpDriveElementSchema.turbo}, $message"
+        }
+        assertEquals(expected ?: false, warpDrive.props[ { turbo }]) {
+            "props.get[{turbo}]: ${WarpDriveElementSchema.turbo}, $message"
+        }
+        assertEquals((expected ?: false).toString(), warpDrive.getString(warpDrive.schema.turbo)) {
+            "getString(turbo): ${WarpDriveElementSchema.turbo}, $message"
+        }
+        assertEquals(expected?.toString() ?: "", warpDrive.getPropertyAsString(warpDrive.schema.turbo.name)) {
+            "getPropertyAsString(turbo): ${WarpDriveElementSchema.turbo}, $message"
+        }
+        if (expected == null) {
+            assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.turbo)) {
+                "getPropertyOrNull(turbo) should return null for absent property, ${WarpDriveElementSchema.turbo}, $message"
+            }
+            assertNull(warpDrive.getPropertyOrNull(warpDrive.schema.turbo.name)) {
+                "getPropertyOrNull(turbo.name) should return null for absent property, ${WarpDriveElementSchema.turbo}, $message"
+            }
+        }
+    }
+
     @Suppress("UNUSED_VARIABLE", "ReplaceGetOrSet")
     fun `compilation succeeds`() {
         // Below code does not make much sense, and it tests different styles of using the properties

From 9b258623b07962195230fa9cd416120967ea7d4f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 24 Dec 2023 14:49:01 +0300
Subject: [PATCH 0717/1037] fix: add property bindings to reduce code
 duplication in UI classes and make "configure and modifyTestElement" simple
 in most cases

---
 .../gui/AbstractJMeterGuiComponent.java       |  49 +++++-
 .../apache/jmeter/gui/JMeterGUIComponent.java |  80 +++++++--
 .../apache/jmeter/dsl/DslPrinterTraverser.kt  |   8 +-
 .../kotlin/org/apache/jmeter/gui/Binding.kt   |  42 +++++
 .../org/apache/jmeter/gui/BindingGroup.kt     |  51 ++++++
 .../jmeter/gui/FilePanelEntryBinding.kt       |  47 ++++++
 .../jmeter/gui/JBooleanPropertyEditor.kt      |  24 +--
 .../org/apache/jmeter/gui/JCheckBoxBinding.kt |  43 +++++
 .../apache/jmeter/gui/JLabeledFieldBinding.kt |  47 ++++++
 .../jmeter/gui/JSyntaxTextAreaBinding.kt      |  49 ++++++
 .../jmeter/gui/JTextComponentBinding.kt       |  52 ++++++
 .../apache/jorphan/gui/JEditableCheckBox.kt   |  43 ++++-
 .../http/config/gui/GraphQLUrlConfigGui.java  |   6 -
 .../http/config/gui/HttpDefaultsGui.java      | 145 +++++++----------
 .../http/config/gui/UrlConfigDefaults.java    |  12 ++
 .../http/config/gui/UrlConfigGui.java         | 101 +++++-------
 .../control/gui/GraphQLHTTPSamplerGui.java    |  12 ++
 .../http/control/gui/HttpTestSampleGui.java   | 153 +++++++++---------
 .../protocol/http/gui/HTTPArgumentsPanel.java |   6 +-
 .../gui/action/ParseCurlCommandAction.java    |   3 +-
 .../http/sampler/HTTPSamplerBaseSchema.kt     |   2 +-
 .../http/sampler/HttpSamplerPrintDslTest.kt   |  19 +--
 xdocs/usermanual/jmeter_tutorial.xml          |  38 +++--
 23 files changed, 719 insertions(+), 313 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/Binding.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/BindingGroup.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/FilePanelEntryBinding.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/JCheckBoxBinding.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/JLabeledFieldBinding.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/JSyntaxTextAreaBinding.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
index f9920f194f9..4c6a79144e0 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
@@ -35,9 +35,10 @@
 import javax.swing.JTextField;
 import javax.swing.border.Border;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.TestElementSchema;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.Printable;
 import org.apache.jorphan.gui.JFactory;
@@ -83,6 +84,13 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete
 
     private final JTextArea commentField = JFactory.tabMovesFocus(new JTextArea());
 
+    /**
+     * Stores a collection of property editors, so GuiCompoenent can have default implementations that
+     * update the UI fields based on {@link TestElement} properties and vice versa.
+     */
+    @API(status = EXPERIMENTAL, since = "5.6.3")
+    protected final BindingGroup bindingGroup = new BindingGroup();
+
     /**
      * When constructing a new component, this takes care of basic tasks like
      * setting up the Name Panel and assigning the class's static label as the
@@ -205,6 +213,7 @@ public void configure(TestElement element) {
         setName(element.getName());
         enabled = element.isEnabled();
         commentField.setText(element.getComment());
+        bindingGroup.updateUi(element);
     }
 
     /**
@@ -228,6 +237,14 @@ private void init() {
         initGui();
     }
 
+    @Override
+    @API(status = EXPERIMENTAL, since = "5.6.3")
+    public void modifyTestElement(TestElement element) {
+        JMeterGUIComponent.super.modifyTestElement(element);
+        modifyTestElementEnabledAndComment(element);
+        bindingGroup.updateElement(element);
+    }
+
     /**
      * This provides a convenience for extenders when they implement the
      * {@link JMeterGUIComponent#modifyTestElement(TestElement)} method. This
@@ -235,21 +252,37 @@ private void init() {
      * Element. It should be called by every extending class when
      * creating/modifying Test Elements, as that will best assure consistent
      * behavior.
+     * <p>Deprecation notice: most likely you do not need the method, and you should
+     * override {@link #modifyTestElement(TestElement)} instead</p>
      *
      * @param mc
      *            the TestElement being created.
      */
+    @API(status = DEPRECATED, since = "5.6.3")
     protected void configureTestElement(TestElement mc) {
-        mc.setName(getName());
-
-        mc.setProperty(new StringProperty(TestElement.GUI_CLASS, this.getClass().getName()));
-
-        mc.setProperty(new StringProperty(TestElement.TEST_CLASS, mc.getClass().getName()));
+        mc.setName(StringUtils.defaultIfEmpty(getName(), null));
+        TestElementSchema schema = TestElementSchema.INSTANCE;
+        mc.set(schema.getGuiClass(), getClass());
+        mc.set(schema.getTestClass(), mc.getClass());
+        modifyTestElementEnabledAndComment(mc);
+    }
 
+    /**
+     * Assigns basic fields from UI to the test element: name, comments, gui class, and the registered editors.
+     *
+     * @param mc test element
+     */
+    private void modifyTestElementEnabledAndComment(TestElement mc) {
         // This stores the state of the TestElement
         log.debug("setting element to enabled: {}", enabled);
-        mc.setEnabled(enabled);
-        mc.setComment(getComment());
+        // We can skip storing "enabled" state if it's true, as it's default value.
+        // JMeter removes disabled elements early from the tree, so configuration elements
+        // with enabled=false (~HTTP Request Defaults) can't unexpectedly override the regular ones
+        // like HTTP Request.
+        mc.set(TestElementSchema.INSTANCE.getEnabled(), enabled ? null : Boolean.FALSE);
+        // Note: we can't use editors for "comments" as getComments() is not a final method, so plugins might
+        // override it and provide a different implementation.
+        mc.setComment(StringUtils.defaultIfEmpty(getComment(), null));
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
index 17b5676231a..c7df480a759 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
@@ -21,7 +21,10 @@
 
 import javax.swing.JPopupMenu;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestElementSchema;
+import org.apiguardian.api.API;
 
 /**
  * Implementing this interface indicates that the class is a JMeter GUI
@@ -82,9 +85,9 @@ public interface JMeterGUIComponent extends ClearGui {
      * the component's label in the local language. The resource name is fixed,
      * and does not vary with the selected language.
      *
-     * Normally this method should be overridden in preference to overriding
+     * <p>Normally this method should be overridden in preference to overriding
      * getStaticLabel(). However where the resource name is not available or required,
-     * getStaticLabel() may be overridden instead.
+     * getStaticLabel() may be overridden instead.</p>
      *
      * @return the resource name
      */
@@ -105,8 +108,19 @@ public interface JMeterGUIComponent extends ClearGui {
      * the model class that it knows how to display, and this method is called
      * when new test elements are created.
      *
+     * <p>Since 5.6.3, the default implementation is as follows, and subclasses should override
+     * {@link #makeTestElement()}
+     * <pre>
+     * public TestElement createTestElement() {
+     *     TestElement element = makeTestElement();
+     *     assignDefaultValues(element);
+     *     return el;
+     * }
+     * </pre>
+     *
      * <p>
-     * The canonical implementation looks like this:
+     * Before 5.6.3 the canonical implementation was as follows, however, it is recommended to
+     * avoid overriding {@link #createTestElement()} and override {@link #makeTestElement()} instead.
      * <pre>
      * public TestElement createTestElement() {
      *     TestElementXYZ el = new TestElementXYZ();
@@ -117,7 +131,35 @@ public interface JMeterGUIComponent extends ClearGui {
      *
      * @return the Test Element object that the GUI component represents.
      */
-    TestElement createTestElement();
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+    default TestElement createTestElement() {
+        TestElement element = makeTestElement();
+        assignDefaultValues(element);
+        return element;
+    }
+
+    /**
+     * Creates the test element represented by the GUI component.
+     * @since 5.6.3
+     * @return a new {@link TestElement}
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+    default TestElement makeTestElement() {
+        throw new UnsupportedOperationException("Please override makeTestElement with creating the element you need: return new ....");
+    }
+
+    /**
+     * Configures default values for element after its creation.
+     * Plugin authors should call this once in their {@link #createTestElement()} implementation.
+     * @since 5.6.3
+     * @param element test element to configure
+     */
+    default void assignDefaultValues(TestElement element) {
+        element.setName(StringUtils.defaultIfEmpty(getStaticLabel(), null));
+        TestElementSchema schema = TestElementSchema.INSTANCE;
+        element.set(schema.getGuiClass(), getClass());
+        element.set(schema.getTestClass(), element.getClass());
+    }
 
     /**
      * GUI components are responsible for populating TestElements they create
@@ -127,19 +169,26 @@ public interface JMeterGUIComponent extends ClearGui {
      * information.
      *
      * <p>
+     * If you override {@link AbstractJMeterGuiComponent}, you might want using {@link AbstractJMeterGuiComponent#bindingGroup}
+     * instead of overriding {@code modifyTestElement}.
+     *
+     * <p>
      * The canonical implementation looks like this:
      * <pre>
+     * &#064;Override
      * public void modifyTestElement(TestElement element) {
-     *     element.clear(); // many implementations use this
-     *     configureTestElement(element);
+     *     super.modifyTestElement(element); // clear the element and assign basic fields like name, gui class, test class
      *     // Using the element setters (preferred):
+     *     // If the field is empty, you probably want to remove the property instead of storing an empty string
+     *     // See <a href="https://github.com/apache/jmeter/pull/6199">Streamline binding of UI elements to TestElement properties</a>
+     *     // for more details
      *     TestElementXYZ xyz = (TestElementXYZ) element;
-     *     xyz.setState(guiState.getText());
-     *     xyz.setCode(guiCode.getText());
+     *     xyz.setState(StringUtils.defaultIfEmpty(guiState.getText(), null));
+     *     xyz.setCode(StringUtils.defaultIfEmpty(guiCode.getText(), null));
      *     ... other GUI fields ...
      *     // or directly (do not use unless there is no setter for the field):
-     *     element.setProperty(TestElementXYZ.STATE, guiState.getText())
-     *     element.setProperty(TestElementXYZ.CODE, guiCode.getText())
+     *     element.setProperty(TestElementXYZ.STATE, StringUtils.defaultIfEmpty(guiState.getText(), null))
+     *     element.setProperty(TestElementXYZ.CODE, StringUtils.defaultIfEmpty(guiCode.getText(), null))
      *     ... other GUI fields ...
      * }
      * </pre>
@@ -147,7 +196,16 @@ public interface JMeterGUIComponent extends ClearGui {
      * @param element
      *            the TestElement to modify
      */
-    void modifyTestElement(TestElement element);
+    @API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+    default void modifyTestElement(TestElement element) {
+        // TODO: should we keep .clear() here? It probably makes it easier to remove all properties before populating
+        //   the values from UI, however, it might be inefficient.
+        element.clear();
+        element.setName(StringUtils.defaultIfEmpty(getName(), null));
+        TestElementSchema schema = TestElementSchema.INSTANCE;
+        element.set(schema.getGuiClass(), getClass());
+        element.set(schema.getTestClass(), element.getClass());
+    }
 
     /**
      * Test GUI elements can be disabled, in which case they do not become part
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
index a17022298c8..d52faa33897 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/dsl/DslPrinterTraverser.kt
@@ -115,11 +115,9 @@ public class DslPrinterTraverser(
                 if (prop == TestElementSchema.testClass && stringValue == te::class.java.name && canSkipTestClass) {
                     continue
                 }
-                if ((property is StringProperty && stringValue.isNullOrEmpty()) ||
-                    stringValue == prop?.defaultValueAsString
-                ) {
-                    continue
-                }
+                // It might be tempting to skip printing the property if its value matches the default value,
+                // However, it would be wrong because "unset" values might be overriden by "... Request Defaults",
+                // so we do not want accidental overrides if the user explicitly set some of the properties
             }
 
             if (prop == null) {
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/Binding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/Binding.kt
new file mode 100644
index 00000000000..d3aca2e7682
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/Binding.kt
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Binds a UI control to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public interface Binding {
+    /**
+     * Update [TestElement] based on the state of the UI.
+     * @param testElement element to update
+     */
+    public fun updateElement(testElement: TestElement)
+
+    /**
+     * Update UI based on the state of the given [TestElement].
+     * @param testElement element to get the state from
+     */
+    public fun updateUi(testElement: TestElement)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/BindingGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/BindingGroup.kt
new file mode 100644
index 00000000000..9af3ce52f4f
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/BindingGroup.kt
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apiguardian.api.API
+
+/**
+ * Manages a collection of [Binding]s.
+ * It enables to update a [TestElement] from the UI and vice versa with a common implementation.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class BindingGroup() : Binding {
+    private val bindings = mutableListOf<Binding>()
+
+    public constructor(bindings: Collection<Binding>) : this() {
+        addAll(bindings)
+    }
+
+    public fun add(binding: Binding) {
+        bindings += binding
+    }
+
+    public fun addAll(bindings: Collection<Binding>) {
+        this.bindings.addAll(bindings)
+    }
+
+    override fun updateElement(testElement: TestElement) {
+        bindings.forEach { it.updateElement(testElement) }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        bindings.forEach { it.updateUi(testElement) }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/FilePanelEntryBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/FilePanelEntryBinding.kt
new file mode 100644
index 00000000000..07414588640
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/FilePanelEntryBinding.kt
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.gui.util.FilePanelEntry
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Binds a [FilePanelEntry] to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class FilePanelEntryBinding(
+    private val filePanelEntry: FilePanelEntry,
+    private val propertyDescriptor: PropertyDescriptor<*, *>,
+) : Binding {
+    override fun updateElement(testElement: TestElement) {
+        testElement[propertyDescriptor] = filePanelEntry.filename.takeIf { it.isNotEmpty() }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        filePanelEntry.filename =
+            if (testElement.getPropertyOrNull(propertyDescriptor) == null) {
+                ""
+            } else {
+                testElement.getString(propertyDescriptor)
+            }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
index 3ff38b33b26..1b4e70af789 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JBooleanPropertyEditor.kt
@@ -32,7 +32,7 @@ import org.apiguardian.api.API
 public class JBooleanPropertyEditor(
     private val propertyDescriptor: BooleanPropertyDescriptor<*>,
     label: String,
-) : JEditableCheckBox(label, DEFAULT_CONFIGURATION) {
+) : JEditableCheckBox(label, DEFAULT_CONFIGURATION), Binding {
     private companion object {
         @JvmField
         val DEFAULT_CONFIGURATION: Configuration = Configuration(
@@ -50,26 +50,18 @@ public class JBooleanPropertyEditor(
         value = Value.of(propertyDescriptor.defaultValue ?: false)
     }
 
-    /**
-     * Update [TestElement] based on the state of the UI.
-     * TODO: we might better use PropertiesAccessor<TestElement, ElementSchema>
-     *     However, it would require callers to pass element.getProps() which might allocate.
-     * @param testElement element to update
-     */
-    public fun updateElement(testElement: TestElement) {
+    public override fun updateElement(testElement: TestElement) {
         when (val value = value) {
-            is Value.Boolean -> testElement[propertyDescriptor] = value.value
+            // For now, UI does not distinguish between "false" and "absent" values,
+            // so we treat "false" as "absent".
+            is Value.Boolean ->
+                testElement[propertyDescriptor] =
+                    value.value.takeIf { it || propertyDescriptor.defaultValue == true }
             is Value.Text -> testElement[propertyDescriptor] = value.value
         }
     }
 
-    /**
-     * Update UI based on the state of the given [TestElement].
-     * TODO: we might better use PropertiesAccessor<TestElement, ElementSchema>
-     *     However, it would require callers to pass element.getProps() which might allocate.
-     * @param testElement element to get the state from
-     */
-    public fun updateUi(testElement: TestElement) {
+    public override fun updateUi(testElement: TestElement) {
         value = when (val value = testElement.getPropertyOrNull(propertyDescriptor)) {
             is BooleanProperty, null -> Value.of(value?.booleanValue ?: propertyDescriptor.defaultValue ?: false)
             // TODO: should we rather fail in case we detect an unknown property?
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JCheckBoxBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JCheckBoxBinding.kt
new file mode 100644
index 00000000000..a5744f62339
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JCheckBoxBinding.kt
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apiguardian.api.API
+import javax.swing.JCheckBox
+
+/**
+ * Binds a [JCheckBox] to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class JCheckBoxBinding(
+    private val checkbox: JCheckBox,
+    private val propertyDescriptor: BooleanPropertyDescriptor<*>,
+) : Binding {
+    override fun updateElement(testElement: TestElement) {
+        testElement[propertyDescriptor] = checkbox.isSelected.takeIf { it }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        checkbox.isSelected = testElement[propertyDescriptor]
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JLabeledFieldBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JLabeledFieldBinding.kt
new file mode 100644
index 00000000000..cdf5e83be6f
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JLabeledFieldBinding.kt
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apache.jorphan.gui.JLabeledField
+import org.apiguardian.api.API
+
+/**
+ * Binds a [JLabeledField] to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class JLabeledFieldBinding(
+    private val labeledField: JLabeledField,
+    private val propertyDescriptor: PropertyDescriptor<*, *>,
+) : Binding {
+    override fun updateElement(testElement: TestElement) {
+        testElement[propertyDescriptor] = labeledField.text.takeIf { it.isNotEmpty() }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        labeledField.text =
+            if (testElement.getPropertyOrNull(propertyDescriptor) == null) {
+                ""
+            } else {
+                testElement.getString(propertyDescriptor)
+            }
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JSyntaxTextAreaBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JSyntaxTextAreaBinding.kt
new file mode 100644
index 00000000000..5f6b97090a3
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JSyntaxTextAreaBinding.kt
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.gui.util.JSyntaxTextArea
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Binds a [JSyntaxTextArea] to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class JSyntaxTextAreaBinding(
+    private val syntaxTextArea: JSyntaxTextArea,
+    private val propertyDescriptor: PropertyDescriptor<*, *>,
+) : Binding {
+    override fun updateElement(testElement: TestElement) {
+        testElement[propertyDescriptor] = syntaxTextArea.text.takeIf { it.isNotEmpty() }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        syntaxTextArea.setInitialText(
+            if (testElement.getPropertyOrNull(propertyDescriptor) == null) {
+                ""
+            } else {
+                testElement.getString(propertyDescriptor)
+            }
+        )
+        syntaxTextArea.caretPosition = 0
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt
new file mode 100644
index 00000000000..69bd883d9f2
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.PropertyDescriptor
+import org.apiguardian.api.API
+import javax.swing.JPasswordField
+import javax.swing.text.JTextComponent
+
+/**
+ * Binds a [JTextComponent] to a [PropertyDescriptor], so JMeter can automatically update the test element
+ * from the UI state and vice versa.
+ * @since 5.6.3
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6.3")
+public class JTextComponentBinding(
+    private val textComponent: JTextComponent,
+    private val propertyDescriptor: PropertyDescriptor<*, *>,
+) : Binding {
+    override fun updateElement(testElement: TestElement) {
+        val text = when (val component = textComponent) {
+            is JPasswordField -> String(component.password)
+            else -> component.text
+        }
+        testElement[propertyDescriptor] = text.takeIf { it.isNotEmpty() }
+    }
+
+    override fun updateUi(testElement: TestElement) {
+        textComponent.text =
+            if (testElement.getPropertyOrNull(propertyDescriptor) == null) {
+                ""
+            } else {
+                testElement.getString(propertyDescriptor)
+            }
+    }
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt
index 4ca3c5f8cd1..ea825cf9206 100644
--- a/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/gui/JEditableCheckBox.kt
@@ -20,6 +20,8 @@ package org.apache.jorphan.gui
 import org.apiguardian.api.API
 import java.awt.Container
 import java.awt.FlowLayout
+import java.awt.event.ActionEvent
+import javax.swing.AbstractAction
 import javax.swing.Box
 import javax.swing.JCheckBox
 import javax.swing.JComboBox
@@ -41,6 +43,7 @@ public open class JEditableCheckBox(
     public companion object {
         public const val CHECKBOX_CARD: String = "checkbox"
         public const val EDITABLE_CARD: String = "editable"
+        public const val VALUE_PROPERTY: String = "value"
     }
 
     /**
@@ -92,14 +95,21 @@ public open class JEditableCheckBox(
 
     private val cards = CardLayoutWithSizeOfCurrentVisibleElement()
 
+    private val useExpressionAction = object : AbstractAction(configuration.startEditing) {
+        override fun actionPerformed(e: ActionEvent?) {
+            cards.next(this@JEditableCheckBox)
+            comboBox.requestFocusInWindow()
+            fireValueChanged()
+        }
+    }
+
     private val checkbox: JCheckBox = JCheckBox(label).apply {
+        val cb = this
         componentPopupMenu = JPopupMenu().apply {
-            add(configuration.startEditing).apply {
-                addActionListener {
-                    cards.next(this@JEditableCheckBox)
-                    comboBox.requestFocusInWindow()
-                }
-            }
+            add(useExpressionAction)
+        }
+        addItemListener {
+            fireValueChanged()
         }
     }
 
@@ -114,6 +124,7 @@ public open class JEditableCheckBox(
             val jComboBox = it.source as JComboBox<*>
             SwingUtilities.invokeLater {
                 if (jComboBox.isPopupVisible) {
+                    fireValueChanged()
                     return@invokeLater
                 }
                 when (val value = jComboBox.selectedItem as String) {
@@ -121,10 +132,12 @@ public open class JEditableCheckBox(
                         checkbox.isSelected = value == configuration.trueValue
                         cards.show(this@JEditableCheckBox, CHECKBOX_CARD)
                         checkbox.requestFocusInWindow()
+                        fireValueChanged()
                     }
                 }
             }
         }
+        // TODO: trigger value changed when the text is changed
     }
 
     private val textFieldLabel = JLabel(label).apply {
@@ -157,6 +170,23 @@ public open class JEditableCheckBox(
         )
     }
 
+    private var oldValue = value
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        checkbox.isEnabled = enabled
+        comboBox.isEnabled = enabled
+        useExpressionAction.isEnabled = enabled
+    }
+
+    private fun fireValueChanged() {
+        val newValue = value
+        if (value != oldValue) {
+            firePropertyChange(VALUE_PROPERTY, oldValue, newValue)
+            oldValue = newValue
+        }
+    }
+
     public var value: Value
         get() = when (components.indexOfFirst { it.isVisible }) {
             0 -> if (checkbox.isSelected) Value.Boolean.TRUE else Value.Boolean.FALSE
@@ -176,6 +206,7 @@ public open class JEditableCheckBox(
                     cards.show(this, EDITABLE_CARD)
                 }
             }
+            fireValueChanged()
         }
 
     @get:JvmSynthetic
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index 9f461e61001..d729b0e7727 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -58,12 +58,6 @@ public class GraphQLUrlConfigGui extends UrlConfigGui {
     private static final UrlConfigDefaults URL_CONFIG_DEFAULTS = new UrlConfigDefaults();
     static {
         URL_CONFIG_DEFAULTS.setValidMethods(new String[] { HTTPConstants.POST, HTTPConstants.GET });
-        URL_CONFIG_DEFAULTS.setDefaultMethod(HTTPConstants.POST);
-        URL_CONFIG_DEFAULTS.setAutoRedirects(false);
-        URL_CONFIG_DEFAULTS.setFollowRedirects(false);
-        URL_CONFIG_DEFAULTS.setUseBrowserCompatibleMultipartMode(false);
-        URL_CONFIG_DEFAULTS.setUseKeepAlive(true);
-        URL_CONFIG_DEFAULTS.setUseMultipart(false);
         URL_CONFIG_DEFAULTS.setUseMultipartVisible(false);
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index 8d8dd64b32d..61f5b56653f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -19,10 +19,9 @@
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.event.ItemEvent;
+import java.util.Arrays;
 
 import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -34,6 +33,8 @@
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.config.gui.AbstractConfigGui;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
+import org.apache.jmeter.gui.JTextComponentBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.VerticalPanel;
@@ -43,6 +44,7 @@
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.JEditableCheckBox;
 import org.apache.jorphan.gui.JFactory;
 
 import net.miginfocom.swing.MigLayout;
@@ -57,10 +59,16 @@ public class HttpDefaultsGui extends AbstractConfigGui {
     private static final long serialVersionUID = 242L;
 
     private UrlConfigGui urlConfigGui;
-    private JCheckBox retrieveEmbeddedResources;
-    private JCheckBox concurrentDwn;
+    private final JBooleanPropertyEditor retrieveEmbeddedResources = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getRetrieveEmbeddedResources(),
+            JMeterUtils.getResString("web_testing_retrieve_images"));
+    private final JBooleanPropertyEditor concurrentDwn = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getConcurrentDownload(),
+            JMeterUtils.getResString("web_testing_concurrent_download"));
     private JTextField concurrentPool;
-    private JCheckBox useMD5;
+    private final JBooleanPropertyEditor useMD5 = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getStoreAsMD5(),
+            JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
     private JTextField embeddedAllowRE; // regular expression used to match against embedded resource URLs to allow
     private JTextField embeddedExcludeRE; // regular expression used to match against embedded resource URLs to discard
     private JTextField sourceIpAddr; // does not apply to Java implementation
@@ -77,6 +85,27 @@ public class HttpDefaultsGui extends AbstractConfigGui {
     public HttpDefaultsGui() {
         super();
         init();
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        bindingGroup.addAll(
+                Arrays.asList(
+                        retrieveEmbeddedResources,
+                        concurrentDwn,
+                        new JTextComponentBinding(concurrentPool, schema.getConcurrentDownloadPoolSize()),
+                        useMD5,
+                        new JTextComponentBinding(embeddedAllowRE, schema.getEmbeddedUrlAllowRegex()),
+                        new JTextComponentBinding(embeddedExcludeRE, schema.getEmbeddedUrlExcludeRegex()),
+                        new JTextComponentBinding(sourceIpAddr, schema.getIpSource()),
+                        // TODO: sourceIpType
+                        new JTextComponentBinding(proxyScheme, schema.getProxy().getScheme()),
+                        new JTextComponentBinding(proxyHost, schema.getProxy().getHost()),
+                        new JTextComponentBinding(proxyPort, schema.getProxy().getPort()),
+                        new JTextComponentBinding(proxyUser, schema.getProxy().getUsername()),
+                        new JTextComponentBinding(proxyPass, schema.getProxy().getPassword()),
+                        // TODO: httpImplementation
+                        new JTextComponentBinding(connectTimeOut, schema.getConnectTimeout()),
+                        new JTextComponentBinding(responseTimeOut, schema.getResponseTimeout())
+                )
+        );
     }
 
     @Override
@@ -94,13 +123,6 @@ public TestElement createTestElement() {
         return config;
     }
 
-    /**
-     * Treat unset checkbox as empty, so "unset" checkboxes do not override values in HTTP Request Samplers.
-     */
-    private static Boolean nullIfUnset(JCheckBox checkBox) {
-        return checkBox.isSelected() ? true : null;
-    }
-
     /**
      * Modifies a given TestElement to mirror the data in the gui components.
      *
@@ -108,67 +130,33 @@ private static Boolean nullIfUnset(JCheckBox checkBox) {
      */
     @Override
     public void modifyTestElement(TestElement config) {
-        ConfigTestElement cfg = (ConfigTestElement) config;
-        ConfigTestElement el = (ConfigTestElement) urlConfigGui.createTestElement();
-        cfg.clear();
-        cfg.addConfigElement(el);
-        super.configureTestElement(config);
-        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
-        config.set(httpSchema.getRetrieveEmbeddedResources(), nullIfUnset(retrieveEmbeddedResources));
-        enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
-        if (concurrentDwn.isSelected()) {
-            config.set(httpSchema.getConcurrentDownload(), true);
-            config.set(httpSchema.getConcurrentDownloadPoolSize(), concurrentPool.getText());
-        } else {
-            config.removeProperty(httpSchema.getConcurrentDownload());
+        super.modifyTestElement(config);
+        urlConfigGui.modifyTestElement(config);
+        enableConcurrentDwn();
+
+        HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        if (concurrentDwn.getValue().equals(JEditableCheckBox.Value.of(false))) {
+            // Even though we remove "concurrent download pool size" if the checkbox was unchecked,
+            // we do it on purpose otherwise "merging defaults to regular http sampler" would unexpectedly
+            // override "concurrent download pool size" value
+            // TODO: keep "concurrent download pool size" in defaults, however somehow remove it before merging config
+            //   to the http sampler
             config.removeProperty(httpSchema.getConcurrentDownloadPoolSize());
         }
-        config.set(httpSchema.getStoreAsMD5(), nullIfUnset(useMD5));
-        config.set(httpSchema.getEmbeddedUrlAllowRegex(), embeddedAllowRE.getText());
-        config.set(httpSchema.getEmbeddedUrlExcludeRegex(), embeddedExcludeRE.getText());
 
         if(!StringUtils.isEmpty(sourceIpAddr.getText())) {
-            config.set(httpSchema.getIpSource(), sourceIpAddr.getText());
             config.set(httpSchema.getIpSourceType(), sourceIpType.getSelectedIndex());
         } else {
-            config.removeProperty(httpSchema.getIpSource());
             config.removeProperty(httpSchema.getIpSourceType());
         }
 
-        config.set(httpSchema.getProxy().getScheme(), proxyScheme.getText());
-        config.set(httpSchema.getProxy().getHost(), proxyHost.getText());
-        config.set(httpSchema.getProxy().getPort(), proxyPort.getText());
-        config.set(httpSchema.getProxy().getUsername(), proxyUser.getText());
-        config.set(httpSchema.getProxy().getPassword(), String.valueOf(proxyPass.getPassword()));
         config.set(httpSchema.getImplementation(), String.valueOf(httpImplementation.getSelectedItem()));
-        config.set(httpSchema.getConnectTimeout(), connectTimeOut.getText());
-        config.set(httpSchema.getResponseTimeout(), responseTimeOut.getText());
     }
 
-    /**
-     * Implements JMeterGUIComponent.clearGui
-     */
     @Override
     public void clearGui() {
         super.clearGui();
-        retrieveEmbeddedResources.setSelected(false);
-        concurrentDwn.setSelected(false);
-        concurrentPool.setText(String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE));
-        enableConcurrentDwn(false);
-        useMD5.setSelected(false);
         urlConfigGui.clear();
-        embeddedAllowRE.setText(""); // $NON-NLS-1$
-        embeddedExcludeRE.setText(""); // $NON-NLS-1$
-        sourceIpAddr.setText(""); // $NON-NLS-1$
-        sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname
-        proxyScheme.setText(""); // $NON-NLS-1$
-        proxyHost.setText(""); // $NON-NLS-1$
-        proxyPort.setText(""); // $NON-NLS-1$
-        proxyUser.setText(""); // $NON-NLS-1$
-        proxyPass.setText(""); // $NON-NLS-1$
-        httpImplementation.setSelectedItem(""); // $NON-NLS-1$
-        connectTimeOut.setText(""); // $NON-NLS-1$
-        responseTimeOut.setText(""); // $NON-NLS-1$
     }
 
     @Override
@@ -176,24 +164,10 @@ public void configure(TestElement el) {
         super.configure(el);
         AbstractTestElement samplerBase = (AbstractTestElement) el;
         urlConfigGui.configure(el);
+
         HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
-        retrieveEmbeddedResources.setSelected(samplerBase.get(httpSchema.getRetrieveEmbeddedResources()));
-        concurrentDwn.setSelected(samplerBase.get(httpSchema.getConcurrentDownload()));
-        concurrentPool.setText(samplerBase.getPropertyAsString(httpSchema.getConcurrentDownloadPoolSize().getName(), ""));
-        useMD5.setSelected(samplerBase.get(httpSchema.getStoreAsMD5()));
-        embeddedAllowRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlAllowRegex()));
-        embeddedExcludeRE.setText(samplerBase.get(httpSchema.getEmbeddedUrlExcludeRegex()));
-        sourceIpAddr.setText(samplerBase.get(httpSchema.getIpSource()));
         sourceIpType.setSelectedIndex(samplerBase.get(httpSchema.getIpSourceType()));
-
-        proxyScheme.setText(samplerBase.getString(httpSchema.getProxy().getScheme()));
-        proxyHost.setText(samplerBase.getString(httpSchema.getProxy().getHost()));
-        proxyPort.setText(samplerBase.getString(httpSchema.getProxy().getPort()));
-        proxyUser.setText(samplerBase.getString(httpSchema.getProxy().getUsername()));
-        proxyPass.setText(samplerBase.getString(httpSchema.getProxy().getPassword()));
         httpImplementation.setSelectedItem(samplerBase.getString(httpSchema.getImplementation()));
-        connectTimeOut.setText(samplerBase.getString(httpSchema.getConnectTimeout()));
-        responseTimeOut.setText(samplerBase.getString(httpSchema.getResponseTimeout()));
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
@@ -268,18 +242,14 @@ private JPanel getResponseTimeOutPanel() {
 
     protected JPanel createEmbeddedRsrcPanel() {
         // retrieve Embedded resources
-        retrieveEmbeddedResources = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$
         // add a listener to activate or not concurrent dwn.
-        retrieveEmbeddedResources.addItemListener(e -> {
-            if (e.getStateChange() == ItemEvent.SELECTED) { enableConcurrentDwn(true); }
-            else { enableConcurrentDwn(false); }
-        });
+        retrieveEmbeddedResources.addPropertyChangeListener(
+                JEditableCheckBox.VALUE_PROPERTY,
+                ev -> enableConcurrentDwn());
         // Download concurrent resources
-        concurrentDwn = new JCheckBox(JMeterUtils.getResString("web_testing_concurrent_download")); // $NON-NLS-1$
-        concurrentDwn.addItemListener(e -> {
-            if (retrieveEmbeddedResources.isSelected() && e.getStateChange() == ItemEvent.SELECTED) { concurrentPool.setEnabled(true); }
-            else { concurrentPool.setEnabled(false); }
-        });
+        concurrentDwn.addPropertyChangeListener(
+                JEditableCheckBox.VALUE_PROPERTY,
+                ev -> enableConcurrentDwn());
         concurrentPool = new JTextField(2); // 2 columns size
         concurrentPool.setMinimumSize(new Dimension(10, (int) concurrentPool.getPreferredSize().getHeight()));
         concurrentPool.setMaximumSize(new Dimension(60, (int) concurrentPool.getPreferredSize().getHeight()));
@@ -327,12 +297,7 @@ protected JPanel createOptionalTasksPanel() {
         final JPanel checkBoxPanel = new VerticalPanel();
         checkBoxPanel.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("optional_tasks"))); // $NON-NLS-1$
-
-        // Use MD5
-        useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
-
         checkBoxPanel.add(useMD5);
-
         return checkBoxPanel;
     }
 
@@ -341,11 +306,13 @@ public Dimension getPreferredSize() {
         return getMinimumSize();
     }
 
-    private void enableConcurrentDwn(final boolean enable) {
+    private void enableConcurrentDwn() {
+        boolean enable = !JEditableCheckBox.Value.of(false).equals(retrieveEmbeddedResources.getValue());
         concurrentDwn.setEnabled(enable);
         embeddedAllowRE.setEnabled(enable);
         embeddedExcludeRE.setEnabled(enable);
-        concurrentPool.setEnabled(concurrentDwn.isSelected() && enable);
+        // Allow editing the pool size if "download concurrently" checkbox is set or has expression
+        concurrentPool.setEnabled(enable && !concurrentDwn.getValue().equals(JEditableCheckBox.Value.of(false)));
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigDefaults.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigDefaults.java
index a864fa45a0c..bf704e9f2ba 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigDefaults.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigDefaults.java
@@ -118,6 +118,7 @@ public void setValidMethods(String[] validMethods) {
      * Return the default HTTP method to be selected in the {@link UrlConfigGui}.
      * @return the default HTTP method to be selected in the {@link UrlConfigGui}
      */
+    @Deprecated
     public String getDefaultMethod() {
         return defaultMethod;
     }
@@ -126,6 +127,7 @@ public String getDefaultMethod() {
      * Set the default HTTP method to be selected in the {@link UrlConfigGui}.
      * @param defaultMethod the default HTTP method to be selected in the {@link UrlConfigGui}
      */
+    @Deprecated
     public void setDefaultMethod(String defaultMethod) {
         this.defaultMethod = defaultMethod;
     }
@@ -133,6 +135,7 @@ public void setDefaultMethod(String defaultMethod) {
     /**
      * @return the default value to be set for the followRedirect checkbox in the {@link UrlConfigGui}.
      */
+    @Deprecated
     public boolean isFollowRedirects() {
         return followRedirects;
     }
@@ -141,6 +144,7 @@ public boolean isFollowRedirects() {
      * Set the default value to be set for the followRedirect checkbox in the {@link UrlConfigGui}.
      * @param followRedirects flag whether redirects should be followed
      */
+    @Deprecated
     public void setFollowRedirects(boolean followRedirects) {
         this.followRedirects = followRedirects;
     }
@@ -148,6 +152,7 @@ public void setFollowRedirects(boolean followRedirects) {
     /**
      * @return the default value to be set for the autoRedirects checkbox in the {@link UrlConfigGui}.
      */
+    @Deprecated
     public boolean isAutoRedirects() {
         return autoRedirects;
     }
@@ -156,6 +161,7 @@ public boolean isAutoRedirects() {
      * Set the default value to be set for the autoRedirects checkbox in the {@link UrlConfigGui}.
      * @param autoRedirects flag whether redirects should be followed automatically
      */
+    @Deprecated
     public void setAutoRedirects(boolean autoRedirects) {
         this.autoRedirects = autoRedirects;
     }
@@ -163,6 +169,7 @@ public void setAutoRedirects(boolean autoRedirects) {
     /**
      * @return the default value to be set for the useKeepAlive checkbox in the {@link UrlConfigGui}.
      */
+    @Deprecated
     public boolean isUseKeepAlive() {
         return useKeepAlive;
     }
@@ -171,6 +178,7 @@ public boolean isUseKeepAlive() {
      * Set the default value to be set for the useKeepAlive checkbox in the {@link UrlConfigGui}.
      * @param useKeepAlive flag whether to use keep-alive on HTTP requests
      */
+    @Deprecated
     public void setUseKeepAlive(boolean useKeepAlive) {
         this.useKeepAlive = useKeepAlive;
     }
@@ -178,6 +186,7 @@ public void setUseKeepAlive(boolean useKeepAlive) {
     /**
      * @return the default value to be set for the useMultipart checkbox in the {@link UrlConfigGui}.
      */
+    @Deprecated
     public boolean isUseMultipart() {
         return useMultipart;
     }
@@ -186,6 +195,7 @@ public boolean isUseMultipart() {
      * Set the default value to be set for the useMultipart checkbox in the {@link UrlConfigGui}.
      * @param useMultipart flag whether request data should use multi-part feature
      */
+    @Deprecated
     public void setUseMultipart(boolean useMultipart) {
         this.useMultipart = useMultipart;
     }
@@ -193,6 +203,7 @@ public void setUseMultipart(boolean useMultipart) {
     /**
      * @return the default value to be set for the useBrowserCompatibleMultipartMode checkbox in the {@link UrlConfigGui}.
      */
+    @Deprecated
     public boolean isUseBrowserCompatibleMultipartMode() {
         return useBrowserCompatibleMultipartMode;
     }
@@ -201,6 +212,7 @@ public boolean isUseBrowserCompatibleMultipartMode() {
      * Set the default value to be set for the useBrowserCompatibleMultipartMode checkbox in the {@link UrlConfigGui}.
      * @param useBrowserCompatibleMultipartMode flag whether to use browser compatible multi-part mode
      */
+    @Deprecated
     public void setUseBrowserCompatibleMultipartMode(boolean useBrowserCompatibleMultipartMode) {
         this.useBrowserCompatibleMultipartMode = useBrowserCompatibleMultipartMode;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index 39062621fa3..e1c09a6f2c1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -20,6 +20,7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
+import java.util.Arrays;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -32,7 +33,10 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.gui.BindingGroup;
 import org.apache.jmeter.gui.JBooleanPropertyEditor;
+import org.apache.jmeter.gui.JCheckBoxBinding;
+import org.apache.jmeter.gui.JLabeledFieldBinding;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
@@ -110,6 +114,8 @@ public class UrlConfigGui extends JPanel implements ChangeListener {
     private final boolean showRawBodyPane;
     private final boolean showFileUploadPane;
 
+    private final BindingGroup bindingGroup;
+
     /**
      * Constructor which is setup to show HTTP implementation, raw body pane and
      * sampler fields.
@@ -150,21 +156,31 @@ public UrlConfigGui(boolean showSamplerFields, boolean showRawBodyPane, boolean
         this.showRawBodyPane = showRawBodyPane;
         this.showFileUploadPane = showFileUploadPane;
         init();
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        bindingGroup = new BindingGroup(
+                Arrays.asList(
+                        new JLabeledFieldBinding(domain, schema.getDomain()),
+                        new JLabeledFieldBinding(port, schema.getPort()),
+                        new JLabeledFieldBinding(protocol, schema.getProtocol()),
+                        new JLabeledFieldBinding(contentEncoding, schema.getContentEncoding()),
+                        new JLabeledFieldBinding(path, schema.getPath())
+                )
+        );
+        if (notConfigOnly) {
+            bindingGroup.addAll(
+                    Arrays.asList(
+                            new JCheckBoxBinding(followRedirects, schema.getFollowRedirects()),
+                            new JCheckBoxBinding(autoRedirects, schema.getAutoRedirects()),
+                            new JLabeledFieldBinding(method, schema.getMethod()),
+                            useKeepAlive,
+                            useMultipart,
+                            useBrowserCompatibleMultipartMode
+                    )
+            );
+        }
     }
 
     public void clear() {
-        domain.setText(""); // $NON-NLS-1$
-        if (notConfigOnly){
-            followRedirects.setSelected(getUrlConfigDefaults().isFollowRedirects());
-            autoRedirects.setSelected(getUrlConfigDefaults().isAutoRedirects());
-            method.setText(getUrlConfigDefaults().getDefaultMethod());
-            useKeepAlive.setBooleanValue(getUrlConfigDefaults().isUseKeepAlive());
-            useBrowserCompatibleMultipartMode.setBooleanValue(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
-        }
-        path.setText(""); // $NON-NLS-1$
-        port.setText(""); // $NON-NLS-1$
-        protocol.setText(""); // $NON-NLS-1$
-        contentEncoding.setText(""); // $NON-NLS-1$
         argsPanel.clear();
         if(showFileUploadPane) {
             filesPanel.clear();
@@ -191,6 +207,7 @@ public TestElement createTestElement() {
      * @param element {@link TestElement} to modify
      */
     public void modifyTestElement(TestElement element) {
+        bindingGroup.updateElement(element);
         boolean useRaw = showRawBodyPane && !postBodyContent.getText().isEmpty();
         Arguments args;
         if(useRaw) {
@@ -207,30 +224,21 @@ public void modifyTestElement(TestElement element) {
             arg.setAlwaysEncoded(false);
             args.addArgument(arg);
         } else {
-            args = (Arguments) argsPanel.createTestElement();
+            args = argsPanel.createTestElement();
             HTTPArgument.convertArgumentsToHTTP(args);
         }
         if(showFileUploadPane) {
             filesPanel.modifyTestElement(element);
         }
-        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
         // Treat "unset" checkbox as "property removal" for HTTP Request Defaults component
         // Regular sampler should save both true and false values
         element.set(httpSchema.getPostBodyRaw(), useRaw ? Boolean.TRUE : (notConfigOnly ? false : null));
         element.set(httpSchema.getArguments(), args);
-        element.set(httpSchema.getDomain(), domain.getText());
-        element.set(httpSchema.getPort(), port.getText());
-        element.set(httpSchema.getProtocol(), protocol.getText());
-        element.set(httpSchema.getContentEncoding(), contentEncoding.getText());
-        element.set(httpSchema.getPath(), path.getText());
-        if (notConfigOnly){
-            element.set(httpSchema.getMethod(), method.getText());
-            element.set(httpSchema.getFollowRedirects(), followRedirects.isSelected());
-            element.set(httpSchema.getAutoRedirects(), autoRedirects.isSelected());
-            useKeepAlive.updateElement(element);
-            useMultipart.updateElement(element);
-            useBrowserCompatibleMultipartMode.updateElement(element);
-        }
+    }
+
+    public void assignDefaultValues(TestElement element) {
+        ((HTTPSamplerBase) element).setArguments(argsPanel.createTestElement());
     }
 
     // Just append all the parameter values, and use that as the post body
@@ -270,7 +278,8 @@ private static String computePostBody(Arguments arguments, boolean crlfToLF) {
      */
     public void configure(TestElement el) {
         setName(el.getName());
-        HTTPSamplerBaseSchema.INSTANCE httpSchema = HTTPSamplerBaseSchema.INSTANCE;
+        bindingGroup.updateUi(el);
+        HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
         Arguments arguments = el.get(httpSchema.getArguments());
 
         if (showRawBodyPane) {
@@ -291,31 +300,6 @@ public void configure(TestElement el) {
         if(showFileUploadPane) {
             filesPanel.configure(el);
         }
-
-        domain.setText(el.getString(httpSchema.getDomain()));
-
-        String portString = el.getString(httpSchema.getPort());
-
-        // Only display the port number if it is meaningfully specified
-        if (portString.equals(HTTPSamplerBase.UNSPECIFIED_PORT_AS_STRING)) {
-            port.setText(""); // $NON-NLS-1$
-        } else {
-            port.setText(portString);
-        }
-        // We explicitly
-        String protocol = el.getPropertyAsString(httpSchema.getProtocol().getName(), "");
-        this.protocol.setText(protocol);
-        String encoding = el.getPropertyAsString(httpSchema.getContentEncoding().getName(), "");
-        contentEncoding.setText(encoding);
-        path.setText(el.getString(httpSchema.getPath()));
-        if (notConfigOnly){
-            method.setText(el.getString(httpSchema.getMethod()));
-            followRedirects.setSelected(el.get(httpSchema.getFollowRedirects()));
-            autoRedirects.setSelected(el.get(httpSchema.getAutoRedirects()));
-            useKeepAlive.updateUi(el);
-            useMultipart.updateUi(el);
-            useBrowserCompatibleMultipartMode.updateUi(el);
-        }
     }
 
     private void init() {// called from ctor, so must not be overridable
@@ -384,35 +368,30 @@ protected Component getPathPanel() {
         if (notConfigOnly){
             followRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects")); // $NON-NLS-1$
             JFactory.small(followRedirects);
-            followRedirects.setSelected(getUrlConfigDefaults().isFollowRedirects());
             followRedirects.addChangeListener(this);
             followRedirects.setVisible(getUrlConfigDefaults().isFollowRedirectsVisible());
 
             autoRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto")); //$NON-NLS-1$
             JFactory.small(autoRedirects);
             autoRedirects.addChangeListener(this);
-            autoRedirects.setSelected(getUrlConfigDefaults().isAutoRedirects());// Default changed in 2.3 and again in 2.4
             autoRedirects.setVisible(getUrlConfigDefaults().isAutoRedirectsVisible());
 
             useKeepAlive = new JBooleanPropertyEditor(
                     HTTPSamplerBaseSchema.INSTANCE.getUseKeepalive(),
                     JMeterUtils.getResString("use_keepalive"));
             JFactory.small(useKeepAlive);
-            useKeepAlive.setBooleanValue(getUrlConfigDefaults().isUseKeepAlive());
             useKeepAlive.setVisible(getUrlConfigDefaults().isUseKeepAliveVisible());
 
             useMultipart = new JBooleanPropertyEditor(
                     HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost(),
                     JMeterUtils.getResString("use_multipart_for_http_post")); // $NON-NLS-1$
             JFactory.small(useMultipart);
-            useMultipart.setBooleanValue(getUrlConfigDefaults().isUseMultipart());
             useMultipart.setVisible(getUrlConfigDefaults().isUseMultipartVisible());
 
             useBrowserCompatibleMultipartMode = new JBooleanPropertyEditor(
                     HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart(),
                     JMeterUtils.getResString("use_multipart_mode_browser")); // $NON-NLS-1$
             JFactory.small(useBrowserCompatibleMultipartMode);
-            useBrowserCompatibleMultipartMode.setBooleanValue(getUrlConfigDefaults().isUseBrowserCompatibleMultipartMode());
             useBrowserCompatibleMultipartMode.setVisible(getUrlConfigDefaults().isUseBrowserCompatibleMultipartModeVisible());
         }
 
@@ -464,7 +443,7 @@ protected JTabbedPane getParameterPanel() {
      * @return a new {@link Arguments} instance associated with the specific GUI used in this component
      */
     protected Arguments createHTTPArgumentsTestElement() {
-        return (Arguments) argsPanel.createTestElement();
+        return argsPanel.createTestElement();
     }
 
     class ValidationTabbedPane extends AbstractValidationTabbedPane {
@@ -507,7 +486,7 @@ protected int getValidatedTabIndex(int currentTabIndex, int newTabIndex) {
          * @return false if one argument has a name
          */
         private boolean canSwitchToRawBodyPane() {
-            Arguments arguments = (Arguments) argsPanel.createTestElement();
+            Arguments arguments = argsPanel.createTestElement();
             for (int i = 0; i < arguments.getArgumentCount(); i++) {
                 if(!StringUtils.isEmpty(arguments.getArgument(i).getName())) {
                     return false;
@@ -542,7 +521,7 @@ else if (source == followRedirects && followRedirects.isSelected()) {
      */
     void convertParametersToRaw() {
         if (showRawBodyPane && postBodyContent.getText().isEmpty()) {
-            postBodyContent.setInitialText(computePostBody((Arguments)argsPanel.createTestElement()));
+            postBodyContent.setInitialText(computePostBody(argsPanel.createTestElement()));
             postBodyContent.setCaretPosition(0);
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
index c393e779403..d8e2f83d1eb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
@@ -22,6 +22,9 @@
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.protocol.http.config.gui.GraphQLUrlConfigGui;
 import org.apache.jmeter.protocol.http.config.gui.UrlConfigGui;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
+import org.apache.jmeter.protocol.http.util.HTTPConstants;
+import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
 /**
@@ -33,6 +36,15 @@ public class GraphQLHTTPSamplerGui extends HttpTestSampleGui {
 
     private static final long serialVersionUID = 1L;
 
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        element.set(schema.getMethod(), HTTPConstants.POST);
+        element.set(schema.getUseBrowserCompatibleMultipart(), false);
+        element.set(schema.getUseMultipartPost(), false);
+    }
+
     public GraphQLHTTPSamplerGui() {
         super();
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index 3459a73168d..ca7234f8717 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -19,10 +19,9 @@
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.event.ItemEvent;
+import java.util.Arrays;
 
 import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -31,7 +30,10 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
+import org.apache.jmeter.gui.JTextComponentBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.VerticalPanel;
@@ -40,9 +42,11 @@
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
+import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.JEditableCheckBox;
 import org.apache.jorphan.gui.JFactory;
 
 import net.miginfocom.swing.MigLayout;
@@ -57,10 +61,16 @@ public class HttpTestSampleGui extends AbstractSamplerGui {
     private static final long serialVersionUID = 242L;
 
     private UrlConfigGui urlConfigGui;
-    private JCheckBox retrieveEmbeddedResources;
-    private JCheckBox concurrentDwn;
+    private final JBooleanPropertyEditor retrieveEmbeddedResources = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getRetrieveEmbeddedResources(),
+            JMeterUtils.getResString("web_testing_retrieve_images"));
+    private final JBooleanPropertyEditor concurrentDwn = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getConcurrentDownload(),
+            JMeterUtils.getResString("web_testing_concurrent_download"));
     private JTextField concurrentPool;
-    private JCheckBox useMD5;
+    private final JBooleanPropertyEditor useMD5 = new JBooleanPropertyEditor(
+            HTTPSamplerBaseSchema.INSTANCE.getStoreAsMD5(),
+            JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
     private JTextField embeddedAllowRE; // regular expression used to match against embedded resource URLs to allow
     private JTextField embeddedExcludeRE; // regular expression used to match against embedded resource URLs to exclude
     private JTextField sourceIpAddr; // does not apply to Java implementation
@@ -77,14 +87,40 @@ public class HttpTestSampleGui extends AbstractSamplerGui {
     private final boolean isAJP;
 
     public HttpTestSampleGui() {
-        isAJP = false;
-        init();
+        this(false);
     }
 
     // For use by AJP
     protected HttpTestSampleGui(boolean ajp) {
         isAJP = ajp;
         init();
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        bindingGroup.addAll(
+                Arrays.asList(
+                        retrieveEmbeddedResources,
+                        concurrentDwn,
+                        new JTextComponentBinding(concurrentPool, schema.getConcurrentDownloadPoolSize()),
+                        useMD5,
+                        new JTextComponentBinding(embeddedAllowRE, schema.getEmbeddedUrlAllowRegex()),
+                        new JTextComponentBinding(embeddedExcludeRE, schema.getEmbeddedUrlExcludeRegex())
+                )
+        );
+        if (!isAJP) {
+            bindingGroup.addAll(
+                    Arrays.asList(
+                            new JTextComponentBinding(sourceIpAddr, schema.getIpSource()),
+                            // TODO: sourceIpType
+                            new JTextComponentBinding(proxyScheme, schema.getProxy().getScheme()),
+                            new JTextComponentBinding(proxyHost, schema.getProxy().getHost()),
+                            new JTextComponentBinding(proxyPort, schema.getProxy().getPort()),
+                            new JTextComponentBinding(proxyUser, schema.getProxy().getUsername()),
+                            new JTextComponentBinding(proxyPass, schema.getProxy().getPassword()),
+                            // TODO: httpImplementation
+                            new JTextComponentBinding(connectTimeOut, schema.getConnectTimeout()),
+                            new JTextComponentBinding(responseTimeOut, schema.getResponseTimeout())
+                    )
+            );
+        }
     }
 
     /**
@@ -96,24 +132,9 @@ public void configure(TestElement element) {
         final HTTPSamplerBase samplerBase = (HTTPSamplerBase) element;
         HTTPSamplerBaseSchema httpSchema = HTTPSamplerBaseSchema.INSTANCE;
         urlConfigGui.configure(element);
-        retrieveEmbeddedResources.setSelected(samplerBase.isImageParser());
-        concurrentDwn.setSelected(samplerBase.isConcurrentDwn());
-        concurrentPool.setText(samplerBase.getConcurrentPool());
-        useMD5.setSelected(samplerBase.useMD5());
-        embeddedAllowRE.setText(samplerBase.getEmbeddedUrlRE());
-        embeddedExcludeRE.setText(samplerBase.getEmbededUrlExcludeRE());
         if (!isAJP) {
-            sourceIpAddr.setText(samplerBase.getIpSource());
             sourceIpType.setSelectedIndex(samplerBase.getIpSourceType());
-
-            proxyScheme.setText(samplerBase.getString(httpSchema.getProxy().getScheme()));
-            proxyHost.setText(samplerBase.getString(httpSchema.getProxy().getHost()));
-            proxyPort.setText(samplerBase.getString(httpSchema.getProxy().getPort()));
-            proxyUser.setText(samplerBase.getString(httpSchema.getProxy().getUsername()));
-            proxyPass.setText(samplerBase.getString(httpSchema.getProxy().getPassword()));
             httpImplementation.setSelectedItem(samplerBase.getString(httpSchema.getImplementation()));
-            connectTimeOut.setText(samplerBase.getString(httpSchema.getConnectTimeout()));
-            responseTimeOut.setText(samplerBase.getString(httpSchema.getResponseTimeout()));
         }
     }
 
@@ -121,10 +142,19 @@ public void configure(TestElement element) {
      * {@inheritDoc}
      */
     @Override
-    public TestElement createTestElement() {
-        HTTPSamplerBase sampler = new HTTPSamplerProxy();
-        modifyTestElement(sampler);
-        return sampler;
+    public TestElement makeTestElement() {
+        return new HTTPSamplerProxy();
+    }
+
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        // It probably does not make much sense overriding HTTP method with HTTP Request Defaults, so we set it here
+        element.set(schema.getMethod(), HTTPConstants.GET);
+        element.set(schema.getFollowRedirects(), true);
+        element.set(schema.getUseKeepalive(), true);
+        urlConfigGui.assignDefaultValues(element);
     }
 
     /**
@@ -134,31 +164,19 @@ public TestElement createTestElement() {
      */
     @Override
     public void modifyTestElement(TestElement sampler) {
-        sampler.clear();
+        super.modifyTestElement(sampler);
         urlConfigGui.modifyTestElement(sampler);
         final HTTPSamplerBase samplerBase = (HTTPSamplerBase) sampler;
         HTTPSamplerBaseSchema httpSchema = samplerBase.getSchema();
-        samplerBase.setImageParser(retrieveEmbeddedResources.isSelected());
-        enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
-        samplerBase.setConcurrentDwn(concurrentDwn.isSelected());
-        samplerBase.setConcurrentPool(concurrentPool.getText());
-        samplerBase.setMD5(useMD5.isSelected());
-        samplerBase.setEmbeddedUrlRE(embeddedAllowRE.getText());
-        samplerBase.setEmbeddedUrlExcludeRE(embeddedExcludeRE.getText());
+        enableConcurrentDwn();
         if (!isAJP) {
-            samplerBase.setIpSource(sourceIpAddr.getText());
-            samplerBase.setIpSourceType(sourceIpType.getSelectedIndex());
-
-            samplerBase.set(httpSchema.getProxy().getScheme(), proxyScheme.getText());
-            samplerBase.set(httpSchema.getProxy().getHost(), proxyHost.getText());
-            samplerBase.set(httpSchema.getProxy().getPort(), proxyPort.getText());
-            samplerBase.set(httpSchema.getProxy().getUsername(), proxyUser.getText());
-            samplerBase.set(httpSchema.getProxy().getPassword(), String.valueOf(proxyPass.getPassword()));
+            if (!StringUtils.isEmpty(sourceIpAddr.getText())) {
+                samplerBase.set(httpSchema.getIpSourceType(), sourceIpType.getSelectedIndex());
+            } else {
+                samplerBase.removeProperty(httpSchema.getIpSourceType());
+            }
             samplerBase.set(httpSchema.getImplementation(), String.valueOf(httpImplementation.getSelectedItem()));
-            samplerBase.set(httpSchema.getConnectTimeout(), connectTimeOut.getText());
-            samplerBase.set(httpSchema.getResponseTimeout(), responseTimeOut.getText());
         }
-        super.configureTestElement(sampler);
     }
 
     /**
@@ -279,18 +297,14 @@ private JPanel getResponseTimeOutPanel() {
 
     protected JPanel createEmbeddedRsrcPanel() {
         // retrieve Embedded resources
-        retrieveEmbeddedResources = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); // $NON-NLS-1$
         // add a listener to activate or not concurrent dwn.
-        retrieveEmbeddedResources.addItemListener(e -> {
-            if (e.getStateChange() == ItemEvent.SELECTED) { enableConcurrentDwn(true); }
-            else { enableConcurrentDwn(false); }
-        });
+        retrieveEmbeddedResources.addPropertyChangeListener(
+                JEditableCheckBox.VALUE_PROPERTY,
+                ev -> enableConcurrentDwn());
         // Download concurrent resources
-        concurrentDwn = new JCheckBox(JMeterUtils.getResString("web_testing_concurrent_download")); // $NON-NLS-1$
-        concurrentDwn.addItemListener(e -> {
-            if (retrieveEmbeddedResources.isSelected() && e.getStateChange() == ItemEvent.SELECTED) { concurrentPool.setEnabled(true); }
-            else { concurrentPool.setEnabled(false); }
-        });
+        concurrentDwn.addPropertyChangeListener(
+                JEditableCheckBox.VALUE_PROPERTY,
+                ev -> enableConcurrentDwn());
         concurrentPool = new JTextField(2); // 2 column size
         concurrentPool.setMinimumSize(new Dimension(10, (int) concurrentPool.getPreferredSize().getHeight()));
         concurrentPool.setMaximumSize(new Dimension(60, (int) concurrentPool.getPreferredSize().getHeight()));
@@ -341,8 +355,6 @@ protected JPanel createOptionalTasksPanel() {
         checkBoxPanel.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("optional_tasks"))); // $NON-NLS-1$
 
-        // Use MD5
-        useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
         checkBoxPanel.add(useMD5);
 
         return checkBoxPanel;
@@ -370,38 +382,19 @@ public Dimension getPreferredSize() {
         return getMinimumSize();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void clearGui() {
         super.clearGui();
-        retrieveEmbeddedResources.setSelected(false);
-        concurrentDwn.setSelected(false);
-        concurrentPool.setText(String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE));
-        enableConcurrentDwn(false);
-        useMD5.setSelected(false);
         urlConfigGui.clear();
-        embeddedAllowRE.setText(""); // $NON-NLS-1$
-        if (!isAJP) {
-            sourceIpAddr.setText(""); // $NON-NLS-1$
-            sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal()); //default: IP/Hostname
-            proxyScheme.setText(""); // $NON-NLS-1$
-            proxyHost.setText(""); // $NON-NLS-1$
-            proxyPort.setText(""); // $NON-NLS-1$
-            proxyUser.setText(""); // $NON-NLS-1$
-            proxyPass.setText(""); // $NON-NLS-1$
-            httpImplementation.setSelectedItem(""); // $NON-NLS-1$
-            connectTimeOut.setText(""); // $NON-NLS-1$
-            responseTimeOut.setText(""); // $NON-NLS-1$
-        }
     }
 
-    private void enableConcurrentDwn(boolean enable) {
+    private void enableConcurrentDwn() {
+        boolean enable = !JEditableCheckBox.Value.of(false).equals(retrieveEmbeddedResources.getValue());
         concurrentDwn.setEnabled(enable);
         embeddedAllowRE.setEnabled(enable);
         embeddedExcludeRE.setEnabled(enable);
-        concurrentPool.setEnabled(concurrentDwn.isSelected() && enable);
+        // Allow editing the pool size if "download concurrently" checkbox is set or has expression
+        concurrentPool.setEnabled(enable && !concurrentDwn.getValue().equals(JEditableCheckBox.Value.of(false)));
     }
 
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index f087afef702..1f4af2befa2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -104,10 +104,10 @@ public HTTPArgumentsPanel() {
     }
 
     @Override
-    public TestElement createTestElement() {
+    public Arguments createTestElement() {
         Arguments args = getUnclonedParameters();
-        super.configureTestElement(args);
-        return (TestElement) args.clone();
+        assignDefaultValues(args);
+        return (Arguments) args.clone();
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 12db65f1895..2818fc8fab3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -315,11 +315,12 @@ private HTTPSamplerProxy createSampler(Request request, String commentText) thro
         if (StringUtils.isNotEmpty(url.getQuery())) {
             path += "?" + url.getQuery();
         }
+        // setMethod must be before setPath as setPath uses method to determine if parameters should be parsed or not
+        httpSampler.setMethod(request.getMethod());
         httpSampler.setPath(path);
         httpSampler.setDomain(url.getHost());
         httpSampler.setUseKeepAlive(request.isKeepAlive());
         httpSampler.setFollowRedirects(true);
-        httpSampler.setMethod(request.getMethod());
         HeaderManager headerManager = createHeaderManager(request);
         httpSampler.addTestElement(headerManager);
         configureTimeout(request, httpSampler);
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index 587d9ed19f4..5f2a31790a5 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -65,7 +65,7 @@ public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
         by testElement("HTTPSampler.dns_cache_manager")
 
     public val method: StringPropertyDescriptor<HTTPSamplerBaseSchema>
-        by string("HTTPSampler.method")
+        by string("HTTPSampler.method", default = HTTPSamplerBase.DEFAULT_METHOD)
 
     public val protocol: StringPropertyDescriptor<HTTPSamplerBaseSchema>
         by string("HTTPSampler.protocol", default = HTTPConstants.PROTOCOL_HTTP)
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
index d9348448f9b..08882188224 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
@@ -92,6 +92,8 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
             +element
         }
 
+        // "arguments" property is assigned in HTTPSamplerBase constructor, so it comes before
+        // name and guiClass common properties
         assertEquals(
             """
             org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
@@ -103,17 +105,19 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
                             it[testClass] = "org.apache.jmeter.config.Arguments"
                         }
                     }
+                    it[name] = "HTTP Request"
+                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
                     it[method] = "GET"
                     it[followRedirects] = true
                     it[useKeepalive] = true
-                    it[implementation] = "HttpClient4"
-                    it[name] = "HTTP Request"
-                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
                 }
             }
 
             """.trimIndent().replace("\r\n", "\n"),
-            DslPrinterTraverser().also { tree.traverse(it) }.toString().replace("\r\n", "\n")
+            DslPrinterTraverser().also { tree.traverse(it) }.toString().replace("\r\n", "\n"),
+            "HTTP request created with HttpTestSampleGui.createTestElement() should have expected output shape. " +
+                "DslPrinterTraverser does not print the values which are automatically assigned in constructor, " +
+                "so the expected output does not have it[testClass] = HTTPSamplerProxy, and empty list in arguments"
         )
     }
 
@@ -130,18 +134,15 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
                             it[testClass] = "org.apache.jmeter.config.Arguments"
                         }
                     }
+                    it[name] = "HTTP Request"
+                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
                     it[method] = "GET"
                     it[followRedirects] = true
                     it[useKeepalive] = true
-                    it[implementation] = "HttpClient4"
-                    it[name] = "HTTP Request"
-                    it[guiClass] = "org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui"
                 }
             }
         }.keys.first() as TestElement
 
-        createdWithUi.traverse(RemoveDefaultValues)
-
         // We compare elements manually, and call assertEquals(toString, toString) so
         // the test output looks better (diff in IDE) in case of the failure
         // If we use just assertEquals(createdWithUi, createdWithDsl), then there will be no "diff in IDE"
diff --git a/xdocs/usermanual/jmeter_tutorial.xml b/xdocs/usermanual/jmeter_tutorial.xml
index 1f7ff285fb7..814cf3004a0 100644
--- a/xdocs/usermanual/jmeter_tutorial.xml
+++ b/xdocs/usermanual/jmeter_tutorial.xml
@@ -259,6 +259,10 @@ component. The resource will have to be entered into JMeters <code>messages.prop
 (and possibly translations as well).</li>
     </ol>
   </li>
+  <li>Override <code>org.apache.jmeter.gui.JMeterGUIComponent.makeTestElement</code> method so it returns
+  the appropriate <code>TestElement</code>. JMeter will use <code>makeTestElement</code> when user creates the element
+  from the UI. In most cases it should be just creating the test element like
+  <code>return new SetupThreadGroup()</code>.</li>
   <li>Create your GUI. Whatever style you like, layout your GUI. Your class ultimately extends
     <code>JPanel</code>, so your layout must be in your class's own <code>ContentPane</code>.
     Do not hook up GUI elements to your <code>TestElement</code> class via actions and events.
@@ -287,10 +291,15 @@ private void init() {
       </li>
     </ol>
   </li>
-  <li>Implement <code>public void configure(TestElement el)</code>
+  <li>Then you need to wire UI elements with the properties of the new <code>TestElement</code>. If you create
+  <code>TestElementSchema</code> for your test element (see <code>ThreadGroupSchema</code>), then you could use
+  automatic wiring with <code>PropertyEditorCollection</code></li>
+  <li>If you do not use schema for wiring properties to UI control, or if you have non-trivial controls,
+    you might customize <code>TestElement</code> properties to UI control mapping by overriding <code>public void configure(TestElement el)</code>
     <ol>
       <li>Be sure to call <code>super.configure(e)</code>. This will populate some of the data for you, like
-         the name of the element.</li>
+      the name of the element. Note: JMeter reuses UI elements when user changes the active element in test tree,
+      so you need to set all the text fields in <code>configure</code> method to avoid displaying stale contents.</li>
       <li>Use this method to set data into your GUI elements. Example:
 <source>
 public void configure(TestElement el) {
@@ -312,16 +321,18 @@ public void configure(TestElement el) {
 }
 </source>
       </li>
-      <li>Implement <code>public void modifyTestElement(TestElement e)</code>. This is where you
-         move the data from your GUI elements to the <code>TestElement</code>. It is the logical reverse of the
-         previous method.
+      <li>If you do not use schema for wiring UI controls to <code>TestElement</code> properties,
+         or if you want customized behavior, you might override <code>public void modifyTestElement(TestElement e)</code>.
+         It is the logical reverse of <code>configure</code> method.
          <ol>
-           <li>Call <code>super.configureTestElement(e)</code>. This will take care of some default data for
+           <li>Call <code>super.modifyTestElement(e)</code>. This will take care of some default data for
              you.</li>
+           <li>Note: in most cases, you want to treat "empty field" as "absent property", so make sure to
+           remove the property if the input field is empty.</li>
            <li>Example:
 <source>
 public void modifyTestElement(TestElement e) {
-    super.configureTestElement(e);
+    super.modifyTestElement(e);
     e.setProperty(new BooleanProperty(
             RegexExtractor.USEHEADERS,
             useHeaders.isSelected()));
@@ -339,16 +350,9 @@ public void modifyTestElement(TestElement e) {
            </li>
          </ol>
        </li>
-       <li>Implement <code>public TestElement createTestElement()</code>. This method should create a
-         new instance of your <code>TestElement</code> class, and then pass it to the <code>modifyTestElement(TestElement)</code>
-         method you made above
-<source>
-public TestElement createTestElement() {
-    RegexExtractor extractor = new RegexExtractor();
-    modifyTestElement(extractor);
-    return extractor;
-}
-</source>
+       <li>If your UI includes controls that do not map to <code>TestElement</code> properties (sliders, tabs),
+         then you might want to reset them when user switches the controls. You can do that by overriding
+         <code>clearGui()</code> method and resetting the controls there.
        </li>
     </ol>
   </li>

From 1651026f19454e531316c550e0779f0a96e757cd Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 24 Dec 2023 15:16:20 +0300
Subject: [PATCH 0718/1037] refactor: use property bindings in
 BeanShellSamplerGui

---
 .../java/control/gui/BeanShellSamplerGui.java | 56 +++++--------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
index 08f300d0da1..019347e7952 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.protocol.java.control.gui;
 
 import java.awt.BorderLayout;
+import java.util.Arrays;
 
 import javax.swing.Box;
 import javax.swing.JLabel;
@@ -25,7 +26,10 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
+import org.apache.jmeter.gui.FilePanelEntryBinding;
 import org.apache.jmeter.gui.JBooleanPropertyEditor;
+import org.apache.jmeter.gui.JSyntaxTextAreaBinding;
+import org.apache.jmeter.gui.JTextComponentBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.FilePanelEntry;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
@@ -55,51 +59,19 @@ public class BeanShellSamplerGui extends AbstractSamplerGui {
 
     public BeanShellSamplerGui() {
         init();
+        bindingGroup.addAll(
+                Arrays.asList(
+                        new JSyntaxTextAreaBinding(scriptField, BeanShellSamplerSchema.INSTANCE.getScript()),
+                        new FilePanelEntryBinding(filename, BeanShellSamplerSchema.INSTANCE.getFilename()),
+                        new JTextComponentBinding(parameters, BeanShellSamplerSchema.INSTANCE.getParameters()),
+                        resetInterpreter
+                )
+        );
     }
 
     @Override
-    public void configure(TestElement element) {
-        scriptField.setInitialText(element.get(BeanShellSamplerSchema.INSTANCE.getScript()));
-        scriptField.setCaretPosition(0);
-        filename.setFilename(element.get(BeanShellSamplerSchema.INSTANCE.getFilename()));
-        parameters.setText(element.get(BeanShellSamplerSchema.INSTANCE.getParameters()));
-        resetInterpreter.updateUi(element);
-        super.configure(element);
-    }
-
-    @Override
-    public TestElement createTestElement() {
-        BeanShellSampler sampler = new BeanShellSampler();
-        modifyTestElement(sampler);
-        return sampler;
-    }
-
-    /**
-     * Modifies a given TestElement to mirror the data in the gui components.
-     *
-     * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
-     */
-    @Override
-    public void modifyTestElement(TestElement te) {
-        te.clear();
-        super.configureTestElement(te);
-        te.set(BeanShellSamplerSchema.INSTANCE.getScript(), scriptField.getText());
-        te.set(BeanShellSamplerSchema.INSTANCE.getFilename(), filename.getFilename());
-        te.set(BeanShellSamplerSchema.INSTANCE.getParameters(), parameters.getText());
-        resetInterpreter.updateElement(te);
-    }
-
-    /**
-     * Implements JMeterGUIComponent.clearGui
-     */
-    @Override
-    public void clearGui() {
-        super.clearGui();
-
-        filename.setFilename(""); //$NON-NLS-1$
-        parameters.setText(""); //$NON-NLS-1$
-        scriptField.setInitialText(""); //$NON-NLS-1$
-        resetInterpreter.reset();
+    public TestElement makeTestElement() {
+        return new BeanShellSampler();
     }
 
     @Override

From 278247608b66adf92e06e1444e0229a663e54618 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 24 Dec 2023 17:18:09 +0300
Subject: [PATCH 0719/1037] refactor: use property bindings in ThreadGroupGui,
 OpenModelThreadGroupGui

---
 .../threads/gui/PostThreadGroupGui.java       |  6 +-
 .../threads/gui/SetupThreadGroupGui.java      |  6 +-
 .../jmeter/threads/gui/ThreadGroupGui.java    | 83 +++++++++----------
 .../openmodel/gui/OpenModelThreadGroupGui.kt  | 43 +++-------
 4 files changed, 55 insertions(+), 83 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java
index 8ef7bb4a109..3fffeb03d8b 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java
@@ -38,9 +38,7 @@ public String getLabelResource() {
     }
 
     @Override
-    public TestElement createTestElement() {
-        PostThreadGroup tg = new PostThreadGroup();
-        modifyTestElement(tg);
-        return tg;
+    public TestElement makeTestElement() {
+        return new PostThreadGroup();
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java
index 7fde1c1f72d..10a10d351cf 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java
@@ -38,9 +38,7 @@ public String getLabelResource() {
     }
 
     @Override
-    public TestElement createTestElement() {
-        SetupThreadGroup tg = new SetupThreadGroup();
-        modifyTestElement(tg);
-        return tg;
+    public TestElement makeTestElement() {
+        return new SetupThreadGroup();
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
index 80fa3a85a15..4dd33c2f58d 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -22,9 +22,9 @@
 import java.awt.BorderLayout;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.Arrays;
 
 import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
@@ -32,14 +32,15 @@
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.control.gui.LoopControlPanel;
 import org.apache.jmeter.gui.JBooleanPropertyEditor;
+import org.apache.jmeter.gui.JTextComponentBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.AbstractThreadGroupSchema;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jmeter.threads.ThreadGroupSchema;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.JEditableCheckBox;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -61,7 +62,10 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
 
     private JBooleanPropertyEditor delayedStart;
 
-    private final JCheckBox scheduler = new JCheckBox(JMeterUtils.getResString("scheduler"));
+    private final JBooleanPropertyEditor scheduler =
+            new JBooleanPropertyEditor(
+                    ThreadGroupSchema.INSTANCE.getUseScheduler(),
+                    JMeterUtils.getResString("scheduler"));
 
     private final JTextField duration = new JTextField();
     private final JLabel durationLabel = labelFor(duration, "duration");
@@ -83,15 +87,42 @@ public ThreadGroupGui(boolean showDelayedStart) {
         this.showDelayedStart = showDelayedStart;
         init();
         initGui();
+        if (showDelayedStart) {
+            bindingGroup.add(delayedStart);
+        }
+        bindingGroup.addAll(
+                Arrays.asList(
+                        new JTextComponentBinding(threadInput, AbstractThreadGroupSchema.INSTANCE.getNumThreads()),
+                        new JTextComponentBinding(rampInput, ThreadGroupSchema.INSTANCE.getRampTime()),
+                        new JTextComponentBinding(duration, ThreadGroupSchema.INSTANCE.getDuration()),
+                        new JTextComponentBinding(delay, ThreadGroupSchema.INSTANCE.getDelay()),
+                        sameUserBox,
+                        scheduler
+                )
+        );
+    }
+
+    @Override
+    public TestElement makeTestElement() {
+        return new ThreadGroup();
     }
 
     @Override
     public TestElement createTestElement() {
-        ThreadGroup tg = new ThreadGroup();
+        TestElement tg = makeTestElement();
+        // modifyTestElement is here for backward compatibility
         modifyTestElement(tg);
+        assignDefaultValues(tg);
         return tg;
     }
 
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        element.set(ThreadGroupSchema.INSTANCE.getNumThreads(), 1);
+        element.set(ThreadGroupSchema.INSTANCE.getRampTime(), 1);
+    }
+
     /**
      * Modifies a given TestElement to mirror the data in the gui components.
      *
@@ -103,46 +134,22 @@ public void modifyTestElement(TestElement tg) {
         if (tg instanceof AbstractThreadGroup) {
             ((AbstractThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
         }
-        tg.set(AbstractThreadGroupSchema.INSTANCE.getNumThreads(), threadInput.getText());
-        tg.setProperty(ThreadGroup.RAMP_TIME, rampInput.getText());
-        if (showDelayedStart) {
-            delayedStart.updateElement(tg);
-        }
-        tg.setProperty(new BooleanProperty(ThreadGroup.SCHEDULER, scheduler.isSelected()));
-        tg.setProperty(ThreadGroup.DURATION, duration.getText());
-        tg.setProperty(ThreadGroup.DELAY, delay.getText());
-        sameUserBox.updateElement(tg);
+        toggleSchedulerFields();
     }
 
     @Override
     public void configure(TestElement tg) {
         super.configure(tg);
-        threadInput.setText(tg.getString(AbstractThreadGroupSchema.INSTANCE.getNumThreads()));
-        rampInput.setText(tg.getPropertyAsString(ThreadGroup.RAMP_TIME));
         loopPanel.configure((TestElement) tg.getProperty(AbstractThreadGroup.MAIN_CONTROLLER).getObjectValue());
-        if (showDelayedStart) {
-            delayedStart.updateUi(tg);
-        }
-        scheduler.setSelected(tg.getPropertyAsBoolean(ThreadGroup.SCHEDULER));
-
-        toggleSchedulerFields(scheduler.isSelected());
-
-        duration.setText(tg.getPropertyAsString(ThreadGroup.DURATION));
-        delay.setText(tg.getPropertyAsString(ThreadGroup.DELAY));
-        sameUserBox.updateUi(tg);
     }
 
     @Override
     public void itemStateChanged(ItemEvent ie) {
-        if (ie.getItem().equals(scheduler)) {
-            toggleSchedulerFields(scheduler.isSelected());
-        }
+        // Method kept for backward compatibility
     }
 
-    /**
-     * @param enable boolean used to enable/disable fields related to scheduler
-     */
-    private void toggleSchedulerFields(boolean enable) {
+    private void toggleSchedulerFields() {
+        boolean enable = !scheduler.getValue().equals(JEditableCheckBox.Value.of(false));
         duration.setEnabled(enable);
         durationLabel.setEnabled(enable);
         delay.setEnabled(enable);
@@ -171,16 +178,7 @@ public void clearGui(){
 
     // Initialise the gui field values
     private void initGui(){
-        threadInput.setText("1"); // $NON-NLS-1$
-        rampInput.setText("1"); // $NON-NLS-1$
         loopPanel.clearGui();
-        if (showDelayedStart) {
-            delayedStart.reset();
-        }
-        scheduler.setSelected(false);
-        delay.setText(""); // $NON-NLS-1$
-        duration.setText(""); // $NON-NLS-1$
-        sameUserBox.reset();
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
@@ -211,7 +209,8 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
                     JMeterUtils.getResString("delayed_start")); // $NON-NLS-1$
             threadPropsPanel.add(delayedStart, "span 2");
         }
-        scheduler.addItemListener(this);
+        scheduler.addPropertyChangeListener(
+                JBooleanPropertyEditor.VALUE_PROPERTY, (ev) -> toggleSchedulerFields());
 
         threadPropsPanel.add(scheduler, "span 2");
 
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
index 055ed329fb5..a83f4ff6667 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
@@ -19,11 +19,12 @@ package org.apache.jmeter.threads.openmodel.gui
 
 import net.miginfocom.swing.MigLayout
 import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.gui.JTextComponentBinding
 import org.apache.jmeter.gui.TestElementMetadata
 import org.apache.jmeter.testelement.TestElement
 import org.apache.jmeter.threads.gui.AbstractThreadGroupGui
-import org.apache.jmeter.threads.openmodel.DefaultThreadSchedule
 import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroupSchema
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
 import org.apache.jmeter.threads.openmodel.asSeconds
@@ -69,6 +70,12 @@ public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
                 updateExplanation()
             }
         })
+        bindingGroup.addAll(
+            listOf(
+                JTextComponentBinding(scheduleStringEditor, OpenModelThreadGroupSchema.schedule),
+                JTextComponentBinding(randomSeedEditor, OpenModelThreadGroupSchema.randomSeed)
+            )
+        )
     }
 
     private fun createPanel() =
@@ -87,6 +94,7 @@ public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
 
             add(explanation)
             add(targetRateChart, "height 200")
+            updateExplanation()
         }
 
     private fun templateButton(title: String) = JButton(title).apply {
@@ -131,36 +139,5 @@ public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
 
     private fun evaluate(input: String): String = CompoundVariable(input).execute()
 
-    override fun createTestElement(): TestElement =
-        OpenModelThreadGroup().also {
-            modifyTestElement(it)
-        }
-
-    override fun modifyTestElement(tg: TestElement) {
-        configureTestElement(tg)
-        tg as OpenModelThreadGroup
-        tg.scheduleString = scheduleStringEditor.text
-        tg.randomSeedString = randomSeedEditor.text
-    }
-
-    override fun configure(tg: TestElement) {
-        super.configure(tg)
-        tg as OpenModelThreadGroup
-        scheduleStringEditor.text = tg.scheduleString
-        randomSeedEditor.text = tg.randomSeedString
-    }
-
-    override fun clearGui() {
-        super.clearGui()
-        scheduleStringEditor.text = ""
-        randomSeedEditor.text = ""
-        targetRateChart.updateSchedule(
-            DefaultThreadSchedule(
-                listOf(
-                    ThreadScheduleStep.RateStep(0.0),
-                    ThreadScheduleStep.ArrivalsStep(ThreadScheduleStep.ArrivalType.RANDOM, 1.0)
-                )
-            )
-        )
-    }
+    override fun makeTestElement(): TestElement = OpenModelThreadGroup()
 }

From 0d9c3517ef2b8ed78296b89f1fd2da30491c5a10 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 24 Dec 2023 17:22:23 +0300
Subject: [PATCH 0720/1037] refactor: use property bindings in TestPlanGui

---
 .../jmeter/control/gui/TestPlanGui.java       | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
index 49bded9be04..d962b5a0821 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.control.gui;
 
 import java.awt.BorderLayout;
+import java.util.Arrays;
 import java.util.Collection;
 
 import javax.swing.JComponent;
@@ -50,7 +51,7 @@ public class TestPlanGui extends AbstractJMeterGuiComponent {
     private static final long serialVersionUID = 240L;
 
     /**
-     * A checkbox allowing the user to specify whether or not JMeter should do
+     * A checkbox allowing the user to specify whether JMeter should do
      * functional testing.
      */
     private final JBooleanPropertyEditor functionalMode =
@@ -80,6 +81,13 @@ public TestPlanGui() {
         browseJar = new FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar"); // $NON-NLS-1$ $NON-NLS-2$
         argsPanel = new ArgumentsPanel(JMeterUtils.getResString("user_defined_variables")); // $NON-NLS-1$
         init();
+        bindingGroup.addAll(
+                Arrays.asList(
+                        functionalMode,
+                        serializedMode,
+                        tearDownOnShutdown
+                )
+        );
     }
 
     /**
@@ -117,26 +125,33 @@ public JPopupMenu createPopupMenu() {
         return pop;
     }
 
-    /* Implements JMeterGUIComponent.createTestElement() */
     @Override
-    public TestElement createTestElement() {
-        TestPlan tp = new TestPlan();
-        modifyTestElement(tp);
-        return tp;
+    public TestElement makeTestElement() {
+        return new TestPlan();
+    }
+
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        TestPlan tp = (TestPlan) element;
+        tp.setUserDefinedVariables((Arguments) argsPanel.createTestElement());
     }
 
     /* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
     @Override
     public void modifyTestElement(TestElement plan) {
-        super.configureTestElement(plan);
+        super.modifyTestElement(plan);
         if (plan instanceof TestPlan) {
             TestPlan tp = (TestPlan) plan;
-            functionalMode.updateElement(tp);
-            tearDownOnShutdown.updateElement(tp);
-            serializedMode.updateElement(tp);
             // TODO: set expression to TestPlan somehow
             tp.setUserDefinedVariables((Arguments) argsPanel.createTestElement());
-            tp.setTestPlanClasspathArray(browseJar.getFiles());
+            String[] files = browseJar.getFiles();
+            if (files.length == 0) {
+                // Remove property if it is empty
+                tp.setTestPlanClasspath(null);
+            } else {
+                tp.setTestPlanClasspathArray(files);
+            }
         }
     }
 
@@ -172,9 +187,6 @@ public void configure(TestElement el) {
         super.configure(el);
         if (el instanceof TestPlan) {
             TestPlan tp = (TestPlan) el;
-            functionalMode.updateUi(tp);
-            serializedMode.updateUi(tp);
-            tearDownOnShutdown.updateUi(tp);
             final JMeterProperty udv = tp.getUserDefinedVariablesAsProperty();
             if (udv != null) {
                 argsPanel.configure((Arguments) udv.getObjectValue());
@@ -208,9 +220,6 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
     @Override
     public void clearGui() {
         super.clearGui();
-        functionalMode.reset();
-        serializedMode.reset();
-        tearDownOnShutdown.reset();
         argsPanel.clear();
         browseJar.clearFiles();
     }

From c3457ffc3c87a4d2c959670c3b4345944577cb86 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 25 Dec 2023 11:51:05 +0300
Subject: [PATCH 0721/1037] test: verify that
 GuiComponent.configure+modifyTestElement does not modify element after
 creation

It helps to verify both createTestElement, configure, and modifyTestElement implementations,
so JMeter does not accidentally show treat test plan as dirty when the user
merely switches across elements

At the same time, it ensures test elements do not accidentally lose properties
when processing modifyTestElement
---
 .../control/gui/TransactionControllerGui.java | 47 ++++++++-----------
 .../openmodel/gui/OpenModelThreadGroupGui.kt  |  6 +++
 .../org/apache/jmeter/junit/JMeterTest.java   | 39 ++++++++++++++-
 .../http/config/gui/GraphQLUrlConfigGui.java  |  8 ++--
 .../http/config/gui/UrlConfigGui.java         |  4 +-
 .../control/gui/GraphQLHTTPSamplerGui.java    | 16 ++++++-
 .../http/control/gui/HttpTestSampleGui.java   |  3 +-
 .../jmeter/protocol/http/gui/AuthPanel.java   |  3 +-
 .../protocol/http/gui/DNSCachePanel.java      | 21 +++++++--
 .../http/proxy/DefaultSamplerCreator.java     |  8 ++--
 .../http/sampler/HttpSamplerPrintDslTest.kt   |  2 +
 11 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java
index 1b4ea1aeb2d..ee513facade 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java
@@ -17,12 +17,11 @@
 
 package org.apache.jmeter.control.gui;
 
-import javax.swing.JCheckBox;
-
 import org.apache.jmeter.control.TransactionController;
+import org.apache.jmeter.control.TransactionControllerSchema;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
+import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.TestElementMetadata;
-import org.apache.jmeter.gui.util.CheckBoxPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.layout.VerticalLayout;
@@ -37,40 +36,36 @@ public class TransactionControllerGui extends AbstractControllerGui {
     private static final long serialVersionUID = 240L;
 
     /** If selected, then generate parent sample, otherwise as per original controller */
-    private JCheckBox generateParentSample;
+    private final JBooleanPropertyEditor generateParentSample =
+            new JBooleanPropertyEditor(
+                    TransactionControllerSchema.INSTANCE.getGenearteParentSample(),
+                    JMeterUtils.getResString("transaction_controller_parent"));
 
     /** if selected, add duration of timers to total runtime */
-    private JCheckBox includeTimers;
+    private final JBooleanPropertyEditor includeTimers =
+            new JBooleanPropertyEditor(
+                    TransactionControllerSchema.INSTANCE.getIncludeTimers(),
+                    JMeterUtils.getResString("transaction_controller_include_timers"));
 
     /**
      * Create a new TransactionControllerGui instance.
      */
     public TransactionControllerGui() {
         init();
+        bindingGroup.add(generateParentSample);
+        bindingGroup.add(includeTimers);
     }
 
     @Override
-    public TestElement createTestElement() {
-        TransactionController lc = new TransactionController();
-        lc.setIncludeTimers(false); // change default for new test elements
-        configureTestElement(lc);
-        return lc;
-    }
-
-    @Override
-    public void configure(TestElement el) {
-        super.configure(el);
-        generateParentSample.setSelected(((TransactionController) el).isGenerateParentSample());
-        includeTimers.setSelected(((TransactionController) el).isIncludeTimers());
+    public TestElement makeTestElement() {
+        return new TransactionController();
     }
 
     @Override
-    public void modifyTestElement(TestElement el) {
-        configureTestElement(el);
-        ((TransactionController) el).setGenerateParentSample(generateParentSample.isSelected());
-        TransactionController tc = (TransactionController) el;
-        tc.setGenerateParentSample(generateParentSample.isSelected());
-        tc.setIncludeTimers(includeTimers.isSelected());
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        // See https://github.com/apache/jmeter/issues/3282
+        ((TransactionController) element).setIncludeTimers(false);
     }
 
     @Override
@@ -85,9 +80,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         setLayout(new VerticalLayout(5, VerticalLayout.BOTH, VerticalLayout.TOP));
         setBorder(makeBorder());
         add(makeTitlePanel());
-        generateParentSample = new JCheckBox(JMeterUtils.getResString("transaction_controller_parent")); // $NON-NLS-1$
-        add(CheckBoxPanel.wrap(generateParentSample));
-        includeTimers = new JCheckBox(JMeterUtils.getResString("transaction_controller_include_timers"), true); // $NON-NLS-1$
-        add(CheckBoxPanel.wrap(includeTimers));
+        add(generateParentSample);
+        add(includeTimers);
     }
 }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
index a83f4ff6667..5188b1da8f3 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/OpenModelThreadGroupGui.kt
@@ -24,6 +24,7 @@ import org.apache.jmeter.gui.TestElementMetadata
 import org.apache.jmeter.testelement.TestElement
 import org.apache.jmeter.threads.gui.AbstractThreadGroupGui
 import org.apache.jmeter.threads.openmodel.OpenModelThreadGroup
+import org.apache.jmeter.threads.openmodel.OpenModelThreadGroupController
 import org.apache.jmeter.threads.openmodel.OpenModelThreadGroupSchema
 import org.apache.jmeter.threads.openmodel.ThreadSchedule
 import org.apache.jmeter.threads.openmodel.ThreadScheduleStep
@@ -140,4 +141,9 @@ public class OpenModelThreadGroupGui : AbstractThreadGroupGui() {
     private fun evaluate(input: String): String = CompoundVariable(input).execute()
 
     override fun makeTestElement(): TestElement = OpenModelThreadGroup()
+
+    override fun modifyTestElement(element: TestElement) {
+        super.modifyTestElement(element)
+        element[OpenModelThreadGroupSchema.mainController] = OpenModelThreadGroupController()
+    }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index f442cb64dc0..ed5ae0e55ad 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -53,6 +53,8 @@
 import org.apache.jmeter.gui.UnsharedComponent;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.loadsave.IsEnabledNormalizer;
+import org.apache.jmeter.protocol.http.control.gui.GraphQLHTTPSamplerGui;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@@ -279,6 +281,7 @@ private static Test suiteGUIComponents() throws Throwable {
                 ts.addTest(new JMeterTest("GUIComponents2", item));
                 ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
                 ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
+                ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
                 ts.addTest(new JMeterTest("runGUITitle", item));
             }
             suite.addTest(ts);
@@ -300,6 +303,7 @@ private static Test suiteBeanComponents() throws Throwable {
                 ts.addTest(new JMeterTest("GUIComponents2", item));
                 ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
                 ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
+                ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
                 ts.addTest(new JMeterTest("runGUITitle", item));
                 suite.addTest(ts);
             } catch (IllegalArgumentException e) {
@@ -427,6 +431,39 @@ public void propertiesShouldNotBeInitializedToNullValues() {
         }
     }
 
+    public void elementShouldNotBeModifiedWithConfigureModify() {
+        TestElement expected = guiItem.createTestElement();
+        TestElement actual = guiItem.createTestElement();
+        guiItem.configure(actual);
+        if (!Objects.equals(expected, actual)) {
+            boolean breakpointForDebugging = Objects.equals(expected, actual);
+            String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
+            String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
+            assertEquals(
+                    "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element)",
+                    expectedStr,
+                    actualStr
+            );
+        }
+        guiItem.modifyTestElement(actual);
+        if (guiItem.getClass() == GraphQLHTTPSamplerGui.class) {
+            // GraphQL sampler computes its arguments, so we don't compare them
+            // See org.apache.jmeter.protocol.http.config.gui.GraphQLUrlConfigGui.modifyTestElement
+            expected.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
+            actual.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
+        }
+        if (!Objects.equals(expected, actual)) {
+            boolean breakpointForDebugging = Objects.equals(expected, actual);
+            String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
+            String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
+            assertEquals(
+                    "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element); gui.modifyTestElement(element)",
+                    expectedStr,
+                    actualStr
+            );
+        }
+    }
+
     public void saveLoadShouldKeepElementIntact() throws IOException {
         TestElement expected = guiItem.createTestElement();
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -442,7 +479,7 @@ private static void compareAllProperties(TestElement expected, TestElement actua
 
         String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
         if (!Objects.equals(expected, actual)) {
-            boolean abc = Objects.equals(expected, actual);
+            boolean breakpointForDebugging = Objects.equals(expected, actual);
             assertEquals(
                     "TestElement after 'save+load' should match the one created in GUI\n" +
                             "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index d729b0e7727..fa2ced67245 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.protocol.http.config.gui;
 
+import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
+
 import java.awt.Component;
 
 import javax.swing.BorderFactory;
@@ -93,9 +95,9 @@ public void modifyTestElement(TestElement element) {
         final GraphQLRequestParams params = new GraphQLRequestParams(operationNameText.getText(),
                 queryContent.getText(), variablesContent.getText());
 
-        element.setProperty(OPERATION_NAME, params.getOperationName());
-        element.setProperty(QUERY, params.getQuery());
-        element.setProperty(VARIABLES, params.getVariables());
+        element.setProperty(OPERATION_NAME, defaultIfEmpty(params.getOperationName(), null));
+        element.setProperty(QUERY, defaultIfEmpty(params.getQuery(), null));
+        element.setProperty(VARIABLES, defaultIfEmpty(params.getVariables(), null));
         element.setProperty(HTTPSamplerBase.POST_BODY_RAW, !HTTPConstants.GET.equals(method));
 
         final Arguments args;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index e1c09a6f2c1..bb0ce92879e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -238,7 +238,9 @@ public void modifyTestElement(TestElement element) {
     }
 
     public void assignDefaultValues(TestElement element) {
-        ((HTTPSamplerBase) element).setArguments(argsPanel.createTestElement());
+        HTTPSamplerBase httpSampler = (HTTPSamplerBase) element;
+        httpSampler.setPostBodyRaw(false);
+        httpSampler.setArguments(argsPanel.createTestElement());
     }
 
     // Just append all the parameter values, and use that as the post body
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
index d8e2f83d1eb..f68eecf06e8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/GraphQLHTTPSamplerGui.java
@@ -41,8 +41,20 @@ public void assignDefaultValues(TestElement element) {
         super.assignDefaultValues(element);
         HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
         element.set(schema.getMethod(), HTTPConstants.POST);
-        element.set(schema.getUseBrowserCompatibleMultipart(), false);
-        element.set(schema.getUseMultipartPost(), false);
+        element.set(schema.getPostBodyRaw(), true);
+        disableMultipart(element);
+    }
+
+    @Override
+    public void modifyTestElement(TestElement sampler) {
+        super.modifyTestElement(sampler);
+        disableMultipart(sampler);
+    }
+
+    private static void disableMultipart(TestElement sampler) {
+        HTTPSamplerBaseSchema schema = HTTPSamplerBaseSchema.INSTANCE;
+        sampler.set(schema.getUseBrowserCompatibleMultipart(), false);
+        sampler.set(schema.getUseMultipartPost(), false);
     }
 
     public GraphQLHTTPSamplerGui() {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index ca7234f8717..f5151b91d86 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -175,7 +175,8 @@ public void modifyTestElement(TestElement sampler) {
             } else {
                 samplerBase.removeProperty(httpSchema.getIpSourceType());
             }
-            samplerBase.set(httpSchema.getImplementation(), String.valueOf(httpImplementation.getSelectedItem()));
+            String selectedImplementation = String.valueOf(httpImplementation.getSelectedItem());
+            samplerBase.set(httpSchema.getImplementation(), StringUtils.defaultIfBlank(selectedImplementation, null));
         }
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
index 28b44156d23..7a8daa666ea 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
@@ -107,7 +107,8 @@ public AuthPanel() {
     public TestElement createTestElement() {
         AuthManager authMan = tableModel.manager;
         configureTestElement(authMan);
-        authMan.setClearEachIteration(clearEachIteration.isSelected());
+        authMan.setClearEachIteration(false);
+        authMan.setControlledByThread(false);
         return (TestElement) authMan.clone();
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index 3d97369041f..afa4bcae387 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -140,10 +140,14 @@ public void modifyTestElement(TestElement dnsRes) {
         configureTestElement(dnsRes);
         if (dnsRes instanceof DNSCacheManager) {
             DNSCacheManager dnsCacheManager = (DNSCacheManager) dnsRes;
+            // Init servers list
+            dnsCacheManager.getServers();
             for (int i = 0; i < dnsServersTableModel.getRowCount(); i++) {
                 String server = (String) dnsServersTableModel.getRowData(i)[0];
                 dnsCacheManager.addServer(server);
             }
+            // Init hosts list
+            dnsCacheManager.getHosts();
             for (int i = 0; i < dnsHostsTableModel.getRowCount(); i++) {
                 String host = (String) dnsHostsTableModel.getRowData(i)[0];
                 String addresses = (String) dnsHostsTableModel.getRowData(i)[1];
@@ -188,10 +192,19 @@ private void populateHostsTable(DNSCacheManager resolver) {
     }
 
     @Override
-    public TestElement createTestElement() {
-        DNSCacheManager dnsCacheManager = new DNSCacheManager();
-        modifyTestElement(dnsCacheManager);
-        return dnsCacheManager;
+    public TestElement makeTestElement() {
+        return new DNSCacheManager();
+    }
+
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        DNSCacheManager manager = (DNSCacheManager) element;
+        // It sets empty list of servers and hosts
+        manager.getServers();
+        manager.getHosts();
+        manager.setClearEachIteration(true);
+        manager.setCustomResolver(false);
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index aa2fd9516da..e06ebda7ebc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
+import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -174,9 +176,9 @@ private static void detectAndModifySamplerOnGraphQLRequest(final HTTPSamplerBase
 
         if (params != null) {
             sampler.setProperty(TestElement.GUI_CLASS, GraphQLHTTPSamplerGui.class.getName());
-            sampler.setProperty(GraphQLUrlConfigGui.OPERATION_NAME, params.getOperationName());
-            sampler.setProperty(GraphQLUrlConfigGui.QUERY, params.getQuery());
-            sampler.setProperty(GraphQLUrlConfigGui.VARIABLES, params.getVariables());
+            sampler.setProperty(GraphQLUrlConfigGui.OPERATION_NAME, defaultIfEmpty(params.getOperationName(), null));
+            sampler.setProperty(GraphQLUrlConfigGui.QUERY, defaultIfEmpty(params.getQuery(), null));
+            sampler.setProperty(GraphQLUrlConfigGui.VARIABLES, defaultIfEmpty(params.getVariables(), null));
         }
     }
 
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
index 08882188224..589cb0308e3 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
@@ -110,6 +110,7 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
                     it[method] = "GET"
                     it[followRedirects] = true
                     it[useKeepalive] = true
+                    it[postBodyRaw] = false
                 }
             }
 
@@ -139,6 +140,7 @@ class HttpSamplerPrintDslTest : JMeterTestCase() {
                     it[method] = "GET"
                     it[followRedirects] = true
                     it[useKeepalive] = true
+                    it[postBodyRaw] = false
                 }
             }
         }.keys.first() as TestElement

From 73719bdf80e292b1796ce52ab1724dc53f7718c3 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Wed, 27 Dec 2023 15:22:34 +0100
Subject: [PATCH 0722/1037] Next major release will be for Java 17+

---
 xdocs/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 583f6eb0a46..e8a7254b474 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -49,7 +49,7 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 <note>
 JMeter 5.6.x requires Java 8 or later for execution (Java 17 or later recommended).
 <br></br>
-<b>The next major release would require Java 11 or later.</b>
+<b>The next major release would require Java 17 or later.</b>
 </note>
 
 <!--  =================== 5.6.3 =================== -->

From c7a41e09b1dbe54100587aa812843780eaabda4c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 27 Dec 2023 14:11:17 +0000
Subject: [PATCH 0723/1037] fix(deps): update org.apache.logging.log4j to
 v2.22.1

---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index aa704dc7f2c..5a91e9dd43d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -107,10 +107,10 @@ dependencies {
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
         api("org.apache.httpcomponents:httpcore:4.4.16")
         api("org.apache.httpcomponents:httpmime:4.5.14")
-        api("org.apache.logging.log4j:log4j-1.2-api:2.22.0")
-        api("org.apache.logging.log4j:log4j-api:2.22.0")
-        api("org.apache.logging.log4j:log4j-core:2.22.0")
-        api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.0")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.22.1")
+        api("org.apache.logging.log4j:log4j-api:2.22.1")
+        api("org.apache.logging.log4j:log4j-core:2.22.1")
+        api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")

From a671815c9542a704661547288fe9c46cfa832766 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 10:20:38 +0300
Subject: [PATCH 0724/1037] refactor: rename .groovy -> .kt in :src:jorphan so
 Git tracks history better

---
 .../org/apache/jorphan/io/TextFileTest.kt}                        | 0
 .../org/apache/jorphan/util/ConverterTest.kt}                     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/jorphan/src/test/{groovy/org/apache/jorphan/io/TextFileSpec.groovy => kotlin/org/apache/jorphan/io/TextFileTest.kt} (100%)
 rename src/jorphan/src/test/{groovy/org/apache/jorphan/util/ConverterSpec.groovy => kotlin/org/apache/jorphan/util/ConverterTest.kt} (100%)

diff --git a/src/jorphan/src/test/groovy/org/apache/jorphan/io/TextFileSpec.groovy b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt
similarity index 100%
rename from src/jorphan/src/test/groovy/org/apache/jorphan/io/TextFileSpec.groovy
rename to src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt
diff --git a/src/jorphan/src/test/groovy/org/apache/jorphan/util/ConverterSpec.groovy b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt
similarity index 100%
rename from src/jorphan/src/test/groovy/org/apache/jorphan/util/ConverterSpec.groovy
rename to src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt

From 23f922817fefd24e10328fc9cdd23ddb41827c93 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 15:08:23 +0300
Subject: [PATCH 0725/1037] refactor: replace Groovy tests in :src:jorphan with
 Kotlin

---
 .../org/apache/jorphan/io/TextFileTest.kt     | 126 ++++-----
 .../org/apache/jorphan/util/ConverterTest.kt  | 260 +++++++++---------
 2 files changed, 174 insertions(+), 212 deletions(-)

diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt
index d3c3ebd8f3e..2d2e8640669 100644
--- a/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TextFileTest.kt
@@ -17,89 +17,65 @@
 
 package org.apache.jorphan.io
 
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.ValueSource
+import java.io.File
 import java.nio.charset.Charset
-import java.nio.charset.StandardCharsets
 
-import org.apache.commons.io.FileUtils
-
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class TextFileSpec extends Specification {
-
-    def tmpFile = File.createTempFile("TextFile", ".unittest")
-    def tmpPath = tmpFile.getAbsolutePath()
-
-    def setup() {
-        tmpFile.deleteOnExit()
+class TextFileTest {
+    data class GetTextCase(val input: String, val charset: Charset?)
+    companion object {
+        @JvmStatic
+        fun getTextCases() = listOf(
+            GetTextCase("", Charsets.UTF_8),
+            GetTextCase("a\nb\nc", null),
+            GetTextCase("\"a\nb\nc\n", null),
+            GetTextCase("a\nb\nc", Charsets.UTF_8),
+            GetTextCase("\"a\nb\nc\n", Charsets.UTF_8),
+            GetTextCase("a\nb\nc", Charsets.UTF_16),
+            GetTextCase("\"a\nb\nc\n", Charsets.UTF_16),
+            GetTextCase("a\nb\nc", Charsets.ISO_8859_1),
+            GetTextCase("\"a\nb\nc\n", Charsets.ISO_8859_1),
+            GetTextCase("丈, 😃, and नि", Charsets.UTF_8),
+            GetTextCase("丈, 😃, and नि", Charsets.UTF_16),
+        )
     }
 
-    def "getText of empty file is empty string"() {
-        given:
-            def sut = new TextFile(tmpPath)
-        expect:
-            sut.getText() == ""
-    }
-
-    def "getText returns exact content of file"() {
-        given:
-            def sut = new TextFile(tmpPath)
-            FileUtils.write(tmpFile, content, Charset.defaultCharset())
-        expect:
-            sut.getText() == content
-        where:
-            content << ["a\nb\nc", "\"a\nb\nc\n"]
-    }
-
-    def "getText returns exact content of file with specific charset"() {
-        given:
-            def sut = new TextFile(tmpPath, encoding)
-            FileUtils.write(tmpFile, content, charset)
-        expect:
-            sut.getText() == content
-        where:
-            content     | charset                     | encoding
-            "a\nb\nc"   | StandardCharsets.UTF_16     | "UTF_16"
-            "a\nb\nc\n" | StandardCharsets.UTF_16     | "UTF_16"
-            "a\nb\nc"   | StandardCharsets.ISO_8859_1 | "ISO_8859_1"
-            "a\nb\nc\n" | StandardCharsets.ISO_8859_1 | "ISO_8859_1"
-    }
+    @TempDir
+    lateinit var tempDir: File
 
-    def "setText sets exact content of file"() {
-        given:
-            def sut = new TextFile(tmpPath)
-        when:
-            sut.setText(content)
-        then:
-            sut.getText() == content
-        where:
-            content << ["a\nb\nc", "\"a\nb\nc\n"]
+    @ParameterizedTest
+    @MethodSource("getTextCases")
+    fun getText(case: GetTextCase) {
+        val tmpPath = tempDir.resolve("file.txt")
+        tmpPath.writeText(case.input, case.charset ?: Charsets.UTF_8)
+        assertEquals(case.input, TextFile(tmpPath, case.charset?.name()).text) {
+            "TextFile(tmpPath, encoding=${case.charset?.name()}).getText()"
+        }
     }
 
-    def "setText sets exact content of file other charset"() {
-        given:
-            def sut = new TextFile(tmpPath, encoding)
-        when:
-            sut.setText(content, encoding)
-        then:
-            sut.getText(encoding) == content
-        where:
-            content     | encoding
-            "a\nb\nc"   | "UTF_16"
-            "a\nb\nc\n" | "UTF_16"
-            "a\nb\nc"   | "ISO_8859_1"
-            "a\nb\nc\n" | "ISO_8859_1"
+    @ParameterizedTest
+    @MethodSource("getTextCases")
+    fun setText(case: GetTextCase) {
+        val tmpPath = tempDir.resolve("file.txt")
+        TextFile(tmpPath, case.charset?.name()).text = case.input
+        assertEquals(case.input, tmpPath.readText(case.charset ?: Charsets.UTF_8)) {
+            "contents of TextFile(tmpPath, encoding=${case.charset?.name()}).setText(${case.input})"
+        }
     }
 
-    def "getText throws exception with invalid encoding"() {
-        given:
-            def sut = new TextFile(tmpPath, invalidEncoding)
-        when:
-            sut.getText()
-        then:
-            thrown(IllegalArgumentException)
-        where:
-            invalidEncoding << ["", "invalid", "invalid encoding"]
+    @ParameterizedTest
+    @ValueSource(strings = ["", "invalid", "invalid encoding"])
+    fun `getText throws exception with invalid encoding`(charset: String) {
+        val tmpFile = tempDir.resolve("file.txt")
+        tmpFile.writeBytes(byteArrayOf())
+        val file = TextFile(tmpFile, charset)
+        assertThrows<IllegalArgumentException> {
+            file.text
+        }
     }
 }
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt
index 54ac0b3b3e9..8a1c712dd26 100644
--- a/src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/ConverterTest.kt
@@ -17,149 +17,135 @@
 
 package org.apache.jorphan.util
 
-
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.io.File
 import java.text.DateFormat
-
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class ConverterSpec extends Specification {
-
-    def 'convert #value to #type should give "" when value or type is null'() {
-        expect:
-            Converter.convert(value, type) == ""
-        where:
-            value      | type
-            null       | null
-            "anything" | null
-            23         | null
-            null       | String.class
-            null       | Number.class
-    }
-
-    def "convert #value to #type should downcast gracefully and give [#expected]"() {
-        expect:
-            Converter.convert(value, type) == expected
-        where:
-            value      | type         | expected
-            "anything" | Object.class | "anything"
-            23         | Number.class | 23
-    }
-
-    def "convert #value to string should give [#expected]"() {
-        expect:
-            Converter.convert(value, String.class) == expected
-        where:
-            value      | expected
-            "anything" | "anything"
-            23         | "23"
-            42L        | "42"
-            64f        | "64.0"
-    }
-
-    def "convert #value to number #type should give number [#expected]"() {
-        expect:
-            Converter.convert(value, type) == expected
-        where:
-            value     | type          | expected
-            23f       | float.class   | 23f
-            42f       | Float.class   | 42f
-            "42"      | Float.class   | 42f
-            23f       | double.class  | 23d
-            42f       | Double.class  | 42d
-            "42"      | Double.class  | 42d
-            23L       | int.class     | 23
-            42        | Integer.class | 42
-            "42"      | Integer.class | 42
-            23L       | long.class    | 23L
-            42        | Long.class    | 42L
-            "42"      | Long.class    | 42L
-            "invalid" | Float.class   | 0f
-            "invalid" | float.class   | 0f
-            "invalid" | double.class  | 0d
-            "invalid" | Double.class  | 0d
-            "invalid" | int.class     | 0
-            "invalid" | Integer.class | 0
-    }
-
-    def "Convert #value to Class gives #expected"() {
-        expect:
-            Converter.convert(value, Class.class) == expected
-        where:
-            value               | expected
-            "java.lang.String"  | String.class
-            "not.a.valid.class" | "not.a.valid.class"
-    }
-
-    def "Convert '#value' to #type"() {
-        expect:
-            if (value == "OBJECT_WITH_BROKEN_TO_STRING") {
-                value = new Object() { String toString() { 1/0 } }
+import java.util.Date
+import java.util.Locale
+
+class ConverterTest {
+    data class ConvertCase(val input: Any?, val type: Class<*>?, val expected: Any?, val message: String? = null) {
+        override fun toString(): String =
+            "Case(input=${
+            try {
+                input?.toString()
+            } catch (t: Throwable) {
+                "exception from input.toString: ${t.message}"
             }
-            Converter.convert(value, type) == expected
-        where:
-            value                | type            | expected
-            ""                   | Boolean.class   | false
-            "true"               | Boolean.class   | true
-            true                 | Boolean.class   | true
-            false                | Boolean.class   | false
-            ""                   | boolean.class   | false
-            "true"               | boolean.class   | true
-            true                 | boolean.class   | true
-            false                | boolean.class   | false
-            "filename"           | File.class      | new File("filename")
-            new File("filename") | File.class      | new File("filename")
-            "c"                  | Character.class | 'c'
-            "c"                  | char.class      | 'c'
-            "char"               | char.class      | 'c'
-            65                   | char.class      | 'A'
-            ''                   | char.class      | ' '
-            Character.valueOf((char) 65)       | char.class | 'A'
-            Byte.valueOf((byte)65)             | char.class | 'A'
-            "OBJECT_WITH_BROKEN_TO_STRING" | char.class | ' '
-    }
-
-    def "Convert to date from '#value'"() {
-        expect:
-            Math.abs(Converter.convert(value, Date.class).getTime() - expected.getTime()) < 1000
-        where:
-            value                  | expected
-            ""                     | new Date()
-            new Date(30000)   | new Date(30000)
-            toLocalDateFormat("08/20/2019", DateFormat.SHORT) | toLocalDate("08/20/2019", DateFormat.SHORT)
-    }
-
-    def "Convert to Calendar from '#value'"() {
-        expect:
-            Math.abs(
-                Converter.convert(value, Calendar.class).getTime().getTime() - expected.getTime()) < 1000
-        where:
-            value                  | expected
-            ""                     | new Date()
-            new Date(30000)   | new Date(30000)
-            toLocalDateFormat("08/20/2019", DateFormat.SHORT) | toLocalDate("08/20/2019", DateFormat.SHORT)
+            }, type=${type?.name}, expected=$expected)"
     }
-
-    def toLocalDateFormat(String dateString, int format) {
-        def date = toLocalDate(dateString, format)
-        return DateFormat.getDateInstance(format).format(date)
-    }
-
-    def toLocalDate(String dateString, int format) {
-        def date = DateFormat
+    data class InsertLineBreaksCase(val source: String?, val expected: String?, val message: String? = null)
+
+    companion object {
+        @JvmStatic
+        fun insertLineBreaks() = listOf(
+            InsertLineBreaksCase(null, ""),
+            InsertLineBreaksCase("bar", "bar"),
+            InsertLineBreaksCase("\nbar", "foobar"),
+        )
+
+        @JvmStatic
+        fun conversionCases() = listOf(
+            // Null input or type
+            ConvertCase(null, null, "", "null input and null type"),
+            ConvertCase("anything", null, "", "null type"),
+            ConvertCase(23, null, "", "null type"),
+            ConvertCase(null, String::class.java, "", "null input"),
+            ConvertCase(null, Number::class.java, "", "null input"),
+            // No change
+            ConvertCase("anything", Any::class.java, "anything"),
+            ConvertCase(23, Number::class.java, 23),
+            // To string
+            ConvertCase("anything", String::class.java, "anything"),
+            ConvertCase(23, String::class.java, "23"),
+            ConvertCase(42L, String::class.java, "42"),
+            ConvertCase(64f, String::class.java, "64.0"),
+            // To number
+            ConvertCase(23f, Float::class.javaPrimitiveType, 23f),
+            ConvertCase(42f, Float::class.javaObjectType, 42f),
+            ConvertCase("42", Float::class.javaObjectType, 42f),
+            ConvertCase(23f, Double::class.javaPrimitiveType, 23.0),
+            ConvertCase(42f, Double::class.javaObjectType, 42.0),
+            ConvertCase("42", Double::class.javaObjectType, 42.0),
+            ConvertCase(23L, Int::class.javaPrimitiveType, 23),
+            ConvertCase(42, Int::class.javaObjectType, 42),
+            ConvertCase("42", Int::class.javaObjectType, 42),
+            ConvertCase(23L, Long::class.javaPrimitiveType, 23L),
+            ConvertCase(42, Long::class.javaObjectType, 42L),
+            ConvertCase("42", Long::class.javaObjectType, 42L),
+            ConvertCase("invalid", Float::class.javaObjectType, 0f),
+            ConvertCase("invalid", Float::class.javaPrimitiveType, 0f),
+            ConvertCase("invalid", Double::class.javaPrimitiveType, 0.0),
+            ConvertCase("invalid", Double::class.javaObjectType, 0.0),
+            ConvertCase("invalid", Int::class.javaPrimitiveType, 0),
+            ConvertCase("invalid", Int::class.javaObjectType, 0),
+            // To Class
+            ConvertCase("java.lang.String", Class::class.java, String::class.java),
+            ConvertCase("not.a.valid.class", Class::class.java, "not.a.valid.class"),
+            // Other cases
+            ConvertCase("", Boolean::class.javaObjectType, false),
+            ConvertCase("true", Boolean::class.javaObjectType, true),
+            ConvertCase(true, Boolean::class.javaObjectType, true),
+            ConvertCase(false, Boolean::class.javaObjectType, false),
+            ConvertCase("", Boolean::class.javaPrimitiveType, false),
+            ConvertCase("true", Boolean::class.javaPrimitiveType, true),
+            ConvertCase(true, Boolean::class.javaPrimitiveType, true),
+            ConvertCase(false, Boolean::class.javaPrimitiveType, false),
+            ConvertCase("filename", File::class.java, File("filename")),
+            ConvertCase(File("filename"), File::class.java, File("filename")),
+            ConvertCase("c", Character::class.javaObjectType, 'c'),
+            ConvertCase("c", Character::class.javaPrimitiveType, 'c'),
+            ConvertCase("char", Character::class.javaPrimitiveType, 'c'),
+            ConvertCase(65, Character::class.javaPrimitiveType, 'A'),
+            ConvertCase("", Character::class.javaPrimitiveType, ' '),
+            ConvertCase(65.toChar(), Character::class.javaPrimitiveType, 'A'),
+            ConvertCase(65.toByte(), Character::class.javaPrimitiveType, 'A'),
+            ConvertCase(
+                object {
+                    override fun toString(): String =
+                        throw Exception("deliberate exception to test Converter.convert()")
+                },
+                Character::class.javaPrimitiveType,
+                ' ',
+                "toString() throws exception"
+            ),
+            // Date
+            ConvertCase(Date(30000), Date::class.java, Date(30000)),
+            ConvertCase(
+                toLocalDateFormat("08/20/2019", DateFormat.SHORT),
+                Date::class.java,
+                toLocalDate("08/20/2019", DateFormat.SHORT)
+            )
+        )
+
+        private fun toLocalDateFormat(dateString: String, format: Int): String {
+            val date = toLocalDate(dateString, format)
+            return DateFormat.getDateInstance(format).format(date)
+        }
+
+        fun toLocalDate(dateString: String, format: Int): Date {
+            val date = DateFormat
                 .getDateInstance(format, Locale.forLanguageTag("en-US"))
                 .parse(dateString)
-        return date
+            return date
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("conversionCases")
+    fun convert(case: ConvertCase) {
+        assertEquals(case.expected, Converter.convert(case.input, case.type)) {
+            "Converter.convert(${case.input}, ${case.type}): ${case.message}"
+        }
     }
 
-    def "line breaks should be replaced in '#source' to '#expected'"() {
-        expect:
-           Converter.insertLineBreaks(source, "foo") == expected
-        where:
-           source | expected
-           null   | ""
-           "bar"  | "bar"
-           "\nbar"| "foobar"
+    @ParameterizedTest
+    @MethodSource("insertLineBreaks")
+    fun insertLineBreaks(case: InsertLineBreaksCase) {
+        assertEquals(case.expected, Converter.insertLineBreaks(case.source, "foo")) {
+            "Converter.insertLineBreaks(${case.source}, \"foo\")"
+        }
     }
 }

From 6239f00bd47299a6f4ec9c34a801fe3e45692f0b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 17:33:32 +0300
Subject: [PATCH 0726/1037] refactor: rename .groovy to .kt in :src:core to
 allow Git track history better

---
 .../org/apache/jmeter/engine/util/FunctionParserTest.kt}          | 0
 .../org/apache/jmeter/report/core/ConvertersTest.kt}              | 0
 .../org/apache/jmeter/report/core/SampleMetadataParserTest.kt}    | 0
 .../apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt}   | 0
 .../apache/jmeter/report/processor/FieldSampleComparatorTest.kt}  | 0
 .../org/apache/jmeter/report/processor/ListResultDataTest.kt}     | 0
 .../jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt}   | 0
 .../apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt}  | 0
 .../impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt}     | 0
 .../org/apache/jmeter/services/FileServerTest.kt}                 | 0
 .../org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt}        | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename src/core/src/test/{groovy/org/apache/jmeter/engine/util/FunctionParserSpec.groovy => kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/core/ConvertersSpec.groovy => kotlin/org/apache/jmeter/report/core/ConvertersTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy => kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy => kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy => kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/ListResultDataSpec.groovy => kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy => kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy => kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy => kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/services/FileServerSpec.groovy => kotlin/org/apache/jmeter/services/FileServerTest.kt} (100%)
 rename src/core/src/test/{groovy/org/apache/jmeter/util/keystore/JmeterKeyStoreSpec.groovy => kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt} (100%)

diff --git a/src/core/src/test/groovy/org/apache/jmeter/engine/util/FunctionParserSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/engine/util/FunctionParserSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/core/ConvertersSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/core/ConvertersSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/ListResultDataSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/ListResultDataSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/services/FileServerSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/services/FileServerSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt
diff --git a/src/core/src/test/groovy/org/apache/jmeter/util/keystore/JmeterKeyStoreSpec.groovy b/src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt
similarity index 100%
rename from src/core/src/test/groovy/org/apache/jmeter/util/keystore/JmeterKeyStoreSpec.groovy
rename to src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt

From e46aa4ce17504463905266d9653089bf85fe6467 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 14:02:32 +0300
Subject: [PATCH 0727/1037] refactor: replace Groovy tests in :src:core with
 Kotlin

---
 checksum.xml                                  |   1 +
 ...b06224fd8912e36603be79fefe78456eddc34a.asc |  21 +
 .../4a/fefe78456eddc34a.fingerprints          |   1 +
 .../7c/c3720ddc2e713b7c.fingerprints          |   1 +
 src/bom-testing/build.gradle.kts              |   1 +
 src/core/build.gradle.kts                     |   1 +
 .../apache/jmeter/services/FileServer.java    |   2 +-
 .../jmeter/gui/HtmlReportGUISpec.groovy       |  47 ---
 .../AbstractTestElementSpec.groovy            |  99 -----
 .../jmeter/engine/util/FunctionParserTest.kt  |  69 ++--
 .../jmeter/report/core/ConvertersTest.kt      |  85 ++--
 .../report/core/SampleMetadataParserTest.kt   |  63 ++-
 .../processor/ApdexSummaryConsumerTest.kt     |  45 ++-
 .../processor/FieldSampleComparatorTest.kt    |  75 ++--
 .../report/processor/ListResultDataTest.kt    |  43 +-
 .../Top5ErrorsBySamplerConsumerTest.kt        | 104 ++---
 .../processor/Top5ErrorsSummaryDataTest.kt    |  71 ++--
 ...imePercentilesOverTimeGraphConsumerTest.kt |  62 ++-
 .../apache/jmeter/services/FileServerTest.kt  | 372 ++++++++++--------
 .../testelement/AbstractTestElementTest.kt    |  42 ++
 .../util/keystore/JmeterKeyStoreTest.kt       |  37 +-
 21 files changed, 627 insertions(+), 615 deletions(-)
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
 create mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
 delete mode 100644 src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy
 delete mode 100644 src/core/src/test/groovy/org/apache/jmeter/testelement/AbstractTestElementSpec.groovy

diff --git a/checksum.xml b/checksum.xml
index a29e0badc42..ce13b9d1424 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -94,6 +94,7 @@
     <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
     <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
+    <trusted-key id='59b06224fd8912e36603be79fefe78456eddc34a' group='io.mockk' />
     <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
     <trusted-key id='a1483f88ba771993ab609c43590c2310cee1c9be' group='jakarta.jms' />
     <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
new file mode 100644
index 00000000000..9768ac8d196
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y
+gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4
+g9Z+T6LbXKNAfZgPvTv4rr7UjD05N4XS4vckrS4taYLtBRJAmqT3pt43KxlyoTbh
+f4xcO2rWeXsPqgzTYIHH7M5mYPeqA2gc9NBAhkHjesFuYfWXqUfOVcOLvzULxrra
+pZDOyrINr83WikC8DkuDrAav4mIWjIhYmfBWzuNeYJsusVnFENeOxpEHV8RT+8uE
+v1gPjbjAKUPfZoa7egvz3EmDkshpNIIym0XxNGTj5ntJWR2SLT7mDrSYPeHrZKW6
+/aKuAcOxpGLpdVOMM+y4N5mTQfdlL81G9kbGQarMmwGaJb2a82PaF20wRwVgiVfO
+p/GWgwXr0XdJNLqx13LdM8BMM5vmLomOQOjnpQBOlJWRgrYUJQOReKAEAQqNMsxS
+IW9laXkrewJtblEAEQEAAbkBjQRfsuZbAQwAr/owOCxebZMTjp9coUsDjFabJowZ
+H0F++vuh73UY/v2z+vqwug89ABjrPUIccE9/t5dRyEjBt0ED2KFM3mi692QhyYE8
+uRaUKWz0kYaMPuw0W7RTblhhXErBror1m00ibNDGSf3fIr9FZ7u5ep/RTFDCDaZg
+qtWQGVD+uLnqA5EHdwUyieWDSgeThRddM3hKXB1eld4JKJPzQ0XwXLgv8MmbOc9W
+5pxb1ULD44s17SKDjlBtRvrSRdgExgfpKU63HH0D6mn+kJP066knYddunNw7HsKg
+v2mPudTVIQXYGb8xDLhP6UYJowdvJEbM8vp1t/d/CgCMXyVVJOlTZwdJaECE0n4g
+MJ2ihDZ8qbDl81OQhTiWvgoKOFHLTwZgmyhKpt36RvkXkoywqlKNGaZVNi9Ct1Xx
+fprj4sozA5Mcf8BAaxXV9sQfZLKH7NhGrFzc/r1v2R37RYWfmYL79dJj1xsrcEN8
+26cSoyLi69+XOxvbdo4KfyopRxECTdd6Oqk/ABEBAAE=
+=+/j7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
new file mode 100644
index 00000000000..cc05455ba32
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
@@ -0,0 +1 @@
+59b06224fd8912e36603be79fefe78456eddc34a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
new file mode 100644
index 00000000000..cc05455ba32
--- /dev/null
+++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
@@ -0,0 +1 @@
+59b06224fd8912e36603be79fefe78456eddc34a
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 0f28bf8d0a4..65ddd385938 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
+        api("io.mockk:mockk:1.13.7")
         api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 1d3e73d93f0..b5e0d3d75bb 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -120,6 +120,7 @@ dependencies {
     runtimeOnly("xml-apis:xml-apis")
 
     testImplementation("commons-net:commons-net")
+    testImplementation("io.mockk:mockk")
     testRuntimeOnly("org.spockframework:spock-core")
 
     testFixturesApi(testFixtures(projects.src.jorphan))
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index 1f9b836a282..efd4ad781c6 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -81,7 +81,7 @@ public class FileServer {
     private volatile String scriptName;
 
     // Cannot be instantiated
-    private FileServer() {
+    FileServer() {
         base = new File(DEFAULT_BASE);
         log.info("Default base='{}'", DEFAULT_BASE);
     }
diff --git a/src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy
deleted file mode 100644
index a0caec038b8..00000000000
--- a/src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.gui;
-
-import org.apache.jmeter.gui.tree.JMeterTreeListener
-import org.apache.jmeter.gui.tree.JMeterTreeModel
-import org.apache.jmeter.junit.spock.JMeterSpec
-
-import spock.lang.IgnoreIf
-
-@IgnoreIf({ JMeterSpec.isHeadless() })
-class HtmlReportGUISpec extends JMeterSpec {
-
-    def "test HtmlReportUI initialization"() {
-        given:
-            def sut = new HtmlReportUI();
-            def treeModel = new JMeterTreeModel();
-            def treeListener = new JMeterTreeListener(treeModel);
-            GuiPackage.initInstance(treeListener, treeModel);
-            GuiPackage.getInstance().setMainFrame(new MainFrame(treeModel, treeListener));
-        when:
-            sut.showInputDialog(GuiPackage.getInstance().getMainFrame())
-            Thread.sleep(50) // https://bugs.openjdk.java.net/browse/JDK-5109571
-            sut.messageDialog.setVisible(false)
-        then:
-            sut.csvFilePathTextField.getText() == ""
-            sut.userPropertiesFilePathTextField.getText() == ""
-            sut.outputDirectoryPathTextField.getText() == ""
-            sut.reportArea.getText() == ""
-            sut.messageDialog.getComponents().length == 1;
-    }
-}
diff --git a/src/core/src/test/groovy/org/apache/jmeter/testelement/AbstractTestElementSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/testelement/AbstractTestElementSpec.groovy
deleted file mode 100644
index 91ddecfffd1..00000000000
--- a/src/core/src/test/groovy/org/apache/jmeter/testelement/AbstractTestElementSpec.groovy
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.testelement
-
-import org.apache.commons.lang3.NotImplementedException
-import org.apache.jmeter.junit.spock.JMeterSpec
-import org.apache.jmeter.testelement.property.JMeterProperty
-import org.apache.jmeter.testelement.property.MultiProperty
-import org.apache.jmeter.testelement.property.PropertyIterator
-import org.apache.jmeter.testelement.property.TestElementProperty
-
-import spock.lang.Unroll
-
-@Unroll
-class AbstractTestElementSpec extends JMeterSpec {
-
-    def "set outer properties as temporary when using a TestElementProperty"() {
-        given:
-            AbstractTestElement sut = Spy(AbstractTestElement.class)
-            def outerElement = Mock(TestElement.class)
-            def innerElement = Mock(TestElement.class)
-            def outerProp = new TestElementProperty("outerProp", outerElement)
-            def innerProp = new TestElementProperty("innerProp", innerElement)
-            outerProp.addProperty(innerProp)
-        when:
-            sut.setTemporary(outerProp)
-        then:
-            sut.isTemporary(outerProp)
-            !sut.isTemporary(innerProp)
-    }
-
-    def "set all properties as temporary when using a MultiProperty"() {
-        given:
-            AbstractTestElement sut = Spy(AbstractTestElement.class)
-            def outerProp = new MinimalMultiProperty()
-            def innerProp = new MinimalMultiProperty()
-            outerProp.addProperty(innerProp)
-        when:
-            sut.setTemporary(outerProp)
-        then:
-            sut.isTemporary(outerProp)
-            sut.isTemporary(innerProp)
-    }
-
-    private class MinimalMultiProperty extends MultiProperty {
-
-        Set<JMeterProperty> props = new HashSet<>()
-
-        @Override
-        void recoverRunningVersion(TestElement owner) {
-            throw new NotImplementedException()
-        }
-
-        @Override
-        String getStringValue() {
-            throw new NotImplementedException()
-        }
-
-        @Override
-        Object getObjectValue() {
-            return null
-        }
-
-        @Override
-        void setObjectValue(Object value) {
-            throw new NotImplementedException()
-        }
-
-        @Override
-        PropertyIterator iterator() {
-            return props.iterator() as PropertyIterator
-        }
-
-        @Override
-        void addProperty(JMeterProperty prop) {
-            props.add(prop)
-        }
-
-        @Override
-        void clear() {
-            props.clear()
-        }
-    }
-}
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt
index 039f1232855..0b4d0f7b6a8 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/engine/util/FunctionParserTest.kt
@@ -17,46 +17,53 @@
 
 package org.apache.jmeter.engine.util
 
+import com.google.auto.service.AutoService
 import org.apache.jmeter.functions.Function
 import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.samplers.Sampler
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class FunctionParserSpec extends Specification {
-    def "function '#value' gets compiled"() {
-        given:
-            CompoundVariable.functions.put('__func', Func.class)
-            def parser = new FunctionParser()
-        when:
-            def result = parser.compileString(value)
-        then:
-            "$result" == "$expected"
-        where:
-            value           | expected
-            '${__func()}'   | [new Func()]
-            '${ __func()}'  | [new Func()]
-            '${__func() }'  | [new Func()]
-            '${ __func() }' | [new Func()]
-    }
+class FunctionParserTest {
+    @ParameterizedTest
+    @ValueSource(
+        strings = [
+            "\${__func()}",
+            "\${ __func()}",
+            "\${__func() }",
+            "\${ __func() }",
+        ]
+    )
+    fun `simple function call`(input: String) {
+        val parser = FunctionParser()
+        val result = parser.compileString(input)
 
-    public static class Func implements Function {
-        void setParameters(Collection params) {
-            // do nothing
+        Assertions.assertEquals(arrayListOf(Func()), result) {
+            "FunctionParser.compileString($input)"
         }
-        String getReferenceKey() {
-            return "__func"
+    }
+
+    @AutoService(Function::class)
+    class Func : Function {
+        override fun execute(previousResult: SampleResult?, currentSampler: Sampler?): String {
+            TODO()
         }
-        List<String> getArgumentDesc() {
-            return Collections.emptyList()
+
+        override fun setParameters(parameters: MutableCollection<CompoundVariable>) {
         }
-        String execute(SampleResult result, Sampler sampler) {
-            return "done"
+
+        override fun getReferenceKey(): String = "__func"
+
+        override fun getArgumentDesc(): List<String> = listOf()
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+            return true
         }
-        String toString() {
-            return "__func()"
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
         }
     }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt
index 7ed9bcd23ca..118a913ef17 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/core/ConvertersTest.kt
@@ -17,46 +17,57 @@
 
 package org.apache.jmeter.report.core
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-@Unroll
-class ConvertersSpec extends Specification {
+class ConvertersTest {
+    data class NumberCase(val input: String, val type: Class<*>?, val expected: Number, val precision: Number)
+    data class SimpleCase(val input: String, val type: Class<*>?, val expected: Any)
+    companion object {
+        @JvmStatic
+        fun numberCases() = listOf(
+            NumberCase(" 42", Int::class.javaObjectType, Integer.valueOf(42), 0),
+            NumberCase("-5", Int::class.javaPrimitiveType, Integer.valueOf(-5), 0),
+            NumberCase("5000000", Long::class.javaObjectType, java.lang.Long.valueOf(5_000_000), 0),
+            NumberCase("500 ", Long::class.javaPrimitiveType, java.lang.Long.valueOf(500), 0),
+            NumberCase("3.14", Double::class.javaObjectType, java.lang.Double.valueOf(3.14), 0.0001),
+            NumberCase(" 100 ", Double::class.javaPrimitiveType, java.lang.Double.valueOf(100.0), 0.0001),
+            NumberCase("+5", Float::class.javaObjectType, java.lang.Float.valueOf(5.0f), 0.0001),
+            NumberCase(" 1.2E16 ", Float::class.javaPrimitiveType, java.lang.Float.valueOf(1.2E16f), 0.0001),
+        )
 
-    def "Convert number-like (#input) to instance of (#conversionDestClass)"() {
-        given:
-            def converter = Converters.getConverter(conversionDestClass)
-        when:
-            def result = converter.convert(input)
-        then:
-            result.class == expectedResult.class
-            result == expectedResult || Math.abs(expectedResult - result) < precision
-        where:
-            input      | conversionDestClass | expectedResult          | precision
-            " 42"      | Integer.class       | Integer.valueOf(42)     | 0
-            "-5"       | int.class           | Integer.valueOf(-5)     | 0
-            "5000000"  | Long.class          | Long.valueOf(5_000_000) | 0
-            "500 "     | long.class          | Long.valueOf(500)       | 0
-            "3.14"     | Double.class        | Double.valueOf(3.14)    | 0.0001
-            " 100 "    | double.class        | Double.valueOf(100)     | 0.0001
-            "+5"       | Float.class         | Float.valueOf(5)        | 0.0001
-            " 1.2E16 " | float.class         | Float.valueOf(1.2E16)   | 0.0001
+        @JvmStatic
+        fun simpleCases() = listOf(
+            SimpleCase("FALSE", Boolean::class.javaObjectType, false),
+            SimpleCase("true", Boolean::class.javaPrimitiveType, true),
+            SimpleCase(" true", Boolean::class.javaPrimitiveType, false),
+            SimpleCase("fAlSe ", Boolean::class.javaPrimitiveType, false),
+            SimpleCase("a", Char::class.javaObjectType, 'a'),
+            SimpleCase("ä", Char::class.javaPrimitiveType, 'ä'),
+        )
     }
 
-    def "Convert (#input) to instance of (#conversionDestClass)"() {
-        given:
-            def converter = Converters.getConverter(conversionDestClass)
-        when:
-            def result = converter.convert(input)
-        then:
-            result == expectedResult
-        where:
-            input    | conversionDestClass | expectedResult
-            "FALSE"  | Boolean.class       | Boolean.FALSE
-            "true"   | boolean.class       | Boolean.TRUE
-            " true"  | boolean.class       | Boolean.FALSE
-            "fAlSe " | boolean.class       | Boolean.FALSE
-            "a"      | Character.class     | 'a'
-            "ä"      | char.class          | 'ä'
+    @ParameterizedTest
+    @MethodSource("numberCases")
+    fun convertNumbers(case: NumberCase) {
+        val result = Converters.getConverter(case.type).convert(case.input)
+        if (result != case.expected) {
+            assertEquals(case.expected.toDouble(), (result as Number).toDouble(), case.precision.toDouble()) {
+                "Converters.getConverter(${case.type}).convert(${case.input}) should be within ${case.precision} of ${case.expected}"
+            }
+        }
+        assertEquals(case.expected::class.java, result::class.java) {
+            "type of Converters.getConverter(${case.type}).convert(${case.input})"
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("simpleCases")
+    fun convertSimple(case: SimpleCase) {
+        val result = Converters.getConverter(case.type).convert(case.input)
+        assertEquals(case.expected, result) {
+            "Converters.getConverter(${case.type}).convert(${case.input})"
+        }
     }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt
index fe1ed724131..6806ac6e08d 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/core/SampleMetadataParserTest.kt
@@ -17,42 +17,37 @@
 
 package org.apache.jmeter.report.core
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-@Unroll
-class SampleMetadataParserSpec extends Specification {
-
-    def "Parse headers (#headers) with separator (#separator) and get (#expectedColumns)"() {
-        given:
-            def sut = new SampleMetaDataParser(separator as char)
-        when:
-            def columns = sut.parse(headers).columns
-        then:
-            columns == expectedColumns
-        where:
-            separator | headers           | expectedColumns
-            ';'       | "a;b;c;d;e"       | ["a", "b", "c", "d", "e"]
-            '|'       | "a|b|c|d|e"       | ["a", "b", "c", "d", "e"]
-            '|'       | "aa|bb|cc|dd|eef" | ["aa", "bb", "cc", "dd", "eef"]
-            '&'       | "a&b&c&d&e"       | ["a", "b", "c", "d", "e"]
-            '\t'      | "a\tb c\td\te"    | ["a", "b c", "d", "e"]
-            ','       | "abcdef"          | ["abcdef"]
+class SampleMetadataParserTest {
+    data class ParseCase(val separator: Char, val headers: String, val expected: List<String>)
+    companion object {
+        @JvmStatic
+        fun headerCases() = listOf(
+            ParseCase(';', "a;b;c;d;e", listOf("a", "b", "c", "d", "e")),
+            ParseCase(',', "a|b|c|d|e", listOf("a", "b", "c", "d", "e")),
+            ParseCase(',', "aa|bb|cc|dd|eef", listOf("aa", "bb", "cc", "dd", "eef")),
+            ParseCase('&', "a&b&c&d&e", listOf("a", "b", "c", "d", "e")),
+            ParseCase('\t', "a\tb c\td\te", listOf("a", "b c", "d", "e")),
+            ParseCase(',', "abcdef", listOf("abcdef")),
+            // Wrong separator
+            ParseCase(',', "a;b;c;d;e", listOf("a", "b", "c", "d", "e")),
+            ParseCase(',', "a|b|c|d|e", listOf("a", "b", "c", "d", "e")),
+            ParseCase(',', "aa|bb|cc|dd|eef", listOf("aa", "bb", "cc", "dd", "eef")),
+            ParseCase(',', "a&b&c&d&e", listOf("a", "b", "c", "d", "e")),
+            ParseCase(',', "a\tb c\td\te", listOf("a", "b c", "d", "e")),
+            ParseCase(',', "abcdef", listOf("abcdef")),
+        )
     }
 
-    def "Parse headers (#headers) with wrong separator (#separator) and get (#expectedColumns)"() {
-        given:
-        def sut = new SampleMetaDataParser(separator as char)
-        when:
-        def columns = sut.parse(headers).columns
-        then:
-        columns == expectedColumns
-        where:
-        separator | headers           | expectedColumns
-        ','       | "a;b;c;d;e"       | ["a", "b", "c", "d", "e"]
-        ','       | "a|b|c|d|e"       | ["a", "b", "c", "d", "e"]
-        ','       | "aa|bb|cc|dd|eef" | ["aa", "bb", "cc", "dd", "eef"]
-        ','       | "a&b&c&d&e"       | ["a", "b", "c", "d", "e"]
-        ','       | "a\tb c\td\te"    | ["a", "b c", "d", "e"]
+    @ParameterizedTest
+    @MethodSource("headerCases")
+    fun parseHeaders(case: ParseCase) {
+        val result = SampleMetaDataParser(case.separator).parse(case.headers).columns
+        Assertions.assertEquals(case.expected, result) {
+            "SampleMetaDataParser(${case.separator}).parse(${case.headers})"
+        }
     }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt
index 595085efddd..179003b51cb 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ApdexSummaryConsumerTest.kt
@@ -17,29 +17,32 @@
 
 package org.apache.jmeter.report.processor
 
-import spock.lang.Specification
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
-class ApdexSummaryConsumerSpec extends Specification {
+class ApdexSummaryConsumerTest {
+    val sut = ApdexSummaryConsumer()
 
-    def sut = new ApdexSummaryConsumer()
+    @Test
+    fun `createDataResult contains apdex, satisfied, tolerated, key`() {
+        val info = ApdexThresholdsInfo()
+        info.satisfiedThreshold = 3L
+        info.toleratedThreshold = 12L
+        val data = ApdexSummaryData(info).apply {
+            satisfiedCount = 60L
+            toleratedCount = 30L
+            totalCount = 100L
+        }
+        val expectedApdex = 0.75
 
-    def "createDataResult contains apdex, satisfied, tolerated, key"() {
-        given:
-            def info = new ApdexThresholdsInfo()
-            info.setSatisfiedThreshold(3L)
-            info.setToleratedThreshold(12L)
-            def data = new ApdexSummaryData(info)
-            data.satisfiedCount = 60L
-            data.toleratedCount = 30L
-            data.totalCount = 100L
-            def expectedApdex = 0.75
-        when:
-            def result = sut.createDataResult("key", data)
-        then:
-            def resultValues = result.asList().collect {
-                ((ValueResultData) it).value
-            }
-            // [apdex, satisfied, tolerated, key]
-            resultValues == [expectedApdex, 3L, 12L, "key"]
+        val result = sut.createDataResult("key", data)
+
+        val resultValues = result.map { (it as ValueResultData).value }
+        assertEquals(
+            listOf(expectedApdex, 3L, 12L, "key"),
+            resultValues
+        ) {
+            "ApdexSummaryConsumer().createDataResult(\"key\", $data) should yield [apdex, satisfied, tolerated, key]"
+        }
     }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt
index d645cf04a08..9346f8e9dc4 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/FieldSampleComparatorTest.kt
@@ -19,45 +19,52 @@ package org.apache.jmeter.report.processor
 
 import org.apache.jmeter.report.core.Sample
 import org.apache.jmeter.report.core.SampleMetadata
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import kotlin.math.sign
 
-import spock.lang.Specification
-
-class FieldSampleComparatorSpec extends Specification {
-
-    static char separator = ',' as char
-    def multiColSampleMeta = new SampleMetadata(separator, "col1", "col2")
-
-    def testCompare() {
-        given:
-            def sampleMetadata = new SampleMetadata(separator, "col1")
-            def firstRow = new Sample(0, sampleMetadata, "1")
-            def secondRow = new Sample(1, sampleMetadata, "2")
-            def sut = new FieldSampleComparator("col1")
-            sut.initialize(sampleMetadata)
-        expect:
-            sut.compare(firstRow, secondRow) < 0
-            sut.compare(secondRow, firstRow) > 0
-            sut.compare(firstRow, firstRow) == 0
-            sut.compare(secondRow, secondRow) == 0
+class FieldSampleComparatorTest {
+    companion object {
+        const val separator = ','
     }
+    private val multiColSampleMeta = SampleMetadata(separator, "col1", "col2")
 
-    def "initialize ensures correct column is compared"() {
-        given:
-            def sut = new FieldSampleComparator("col2")
-            def firstRow = new Sample(0, multiColSampleMeta, "1", "3")
-            def secondRow = new Sample(1, multiColSampleMeta, "2", "3")
-            sut.initialize(multiColSampleMeta)
-        expect:
-            sut.compare(firstRow, secondRow) == 0
+    fun assertCompare(comparator: FieldSampleComparator, a: Sample, b: Sample, expectedSign: Int) {
+        Assertions.assertEquals(expectedSign.sign, comparator.compare(a, b).sign) {
+            "$comparator.compare($a, $b)"
+        }
     }
 
-    def "Incorrectly uses first column if initialize isn't called"() {
-        given:
-            def sut = new FieldSampleComparator("col2")
-            def firstRow = new Sample(0, multiColSampleMeta, "1", "3")
-            def secondRow = new Sample(1, multiColSampleMeta, "2", "3")
-        expect:
-            sut.compare(firstRow, secondRow) != 0
+    @Test
+    fun testCompare() {
+        val sampleMetadata = SampleMetadata(separator, "col1")
+        val firstRow = Sample(0, sampleMetadata, "1")
+        val secondRow = Sample(1, sampleMetadata, "2")
+        val sut = FieldSampleComparator("col1")
+        sut.initialize(sampleMetadata)
+
+        assertCompare(sut, firstRow, secondRow, -1)
+        assertCompare(sut, secondRow, firstRow, 1)
+        assertCompare(sut, firstRow, firstRow, 0)
+        assertCompare(sut, secondRow, secondRow, 0)
+    }
+
+    @Test
+    fun `initialize ensures correct column is compared`() {
+        val sut = FieldSampleComparator("col2")
+        val firstRow = Sample(0, multiColSampleMeta, "1", "3")
+        val secondRow = Sample(1, multiColSampleMeta, "2", "3")
+        sut.initialize(multiColSampleMeta)
+
+        assertCompare(sut, firstRow, secondRow, 0)
     }
 
+    @Test
+    fun `Incorrectly uses first column if initialize isn't called`() {
+        val sut = FieldSampleComparator("col2")
+        val firstRow = Sample(0, multiColSampleMeta, "1", "3")
+        val secondRow = Sample(1, multiColSampleMeta, "2", "3")
+
+        assertCompare(sut, firstRow, secondRow, -1)
+    }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt
index 9f4e5740296..7dc6452c92b 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/ListResultDataTest.kt
@@ -17,27 +17,36 @@
 
 package org.apache.jmeter.report.processor
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-@Unroll
-class ListResultDataSpec extends Specification {
+class ListResultDataTest {
+    companion object {
+        @JvmStatic
+        fun addResultInputs() = listOf(
+            null,
+            ValueResultData(),
+            ListResultData(),
+        )
+    }
 
-    def sut = new ListResultData()
+    val sut = ListResultData()
 
-    def "a new ListResultData is empty"() {
-        expect:
-            new ListResultData().size() == 0
+    @Test
+    fun `a new ListResultData is empty`() {
+        assertEquals(0, sut.size)
+        assertEquals(listOf<Any>(), sut.toList())
     }
 
-    def "addResult adds #object to list and returns true"() {
-        when:
-            def result = sut.addResult(object)
-        then:
-            result
-            sut.getSize() == 1
-            sut.get(0) == object
-        where:
-            object << [null, Mock(ResultData), new ListResultData()]
+    @ParameterizedTest
+    @MethodSource("addResultInputs")
+    fun addResult(input: ResultData?) {
+        assertTrue(sut.addResult(input), "addResult should return true")
+        assertEquals(listOf(input), sut.toList()) {
+            "ListResultData().add($input).toList()"
+        }
     }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt
index f43c41d134b..f4284f97101 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerTest.kt
@@ -17,62 +17,74 @@
 
 package org.apache.jmeter.report.processor
 
-
+import io.mockk.every
+import io.mockk.mockk
 import org.apache.jmeter.report.core.Sample
 import org.apache.jmeter.report.utils.MetricUtils
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
-import spock.lang.Specification
-
-class Top5ErrorsBySamplerConsumerSpec extends Specification {
+class Top5ErrorsBySamplerConsumerTest {
+    val sut = Top5ErrorsBySamplerConsumer()
 
-    def sut = new Top5ErrorsBySamplerConsumer()
+    @Test
+    fun `summary info data updated with non-controller passing sample`() {
+        val mockSummaryInfo = mockk<AbstractSummaryConsumer<Top5ErrorsSummaryData>.SummaryInfo> {
+            every { getData() } answers { callOriginal() }
+            every { setData(any()) } answers { callOriginal() }
+        }
+        val mockSample = mockk<Sample>(relaxed = true) {
+            every { success } returns true
+        }
+        sut.updateData(mockSummaryInfo, mockSample)
 
-    def "summary info data updated with non-controller passing sample"() {
-        given:
-            def mockSummaryInfo = Mock(AbstractSummaryConsumer.SummaryInfo)
-            def mockSample = Mock(Sample) {
-                getSuccess() >> true
-            }
-        when:
-            sut.updateData(mockSummaryInfo, mockSample)
-        then:
-            def data = (Top5ErrorsSummaryData) mockSummaryInfo.getData()
-            data.getTotal() == 1
+        val data = mockSummaryInfo.getData()
+        assertEquals(1, data.total, "data.total")
     }
 
-    def "summary info data updated with non-controller failing sample"() {
-        given:
-            def mockSummaryInfo = Mock(AbstractSummaryConsumer.SummaryInfo)
-            def mockSample = Mock(Sample) {
-                getResponseCode() >> "200"
-            }
-        when:
-            sut.updateData(mockSummaryInfo, mockSample)
-        then:
-            def data = (Top5ErrorsSummaryData) mockSummaryInfo.getData()
-            data.getTotal() == 1
-            data.getErrors() == 1
-            data.top5ErrorsMetrics[0][0] == MetricUtils.ASSERTION_FAILED
-            def overallData = (Top5ErrorsSummaryData) sut.getOverallInfo().getData()
-            overallData.getTotal() == 1
-            overallData.getErrors() == 1
-            overallData.top5ErrorsMetrics[0][0] == MetricUtils.ASSERTION_FAILED
-    }
+    @Test
+    fun `summary info data updated with non-controller failing sample`() {
+        val mockSummaryInfo = mockk<AbstractSummaryConsumer<Top5ErrorsSummaryData>.SummaryInfo> {
+            every { getData() } answers { callOriginal() }
+            every { setData(any()) } answers { callOriginal() }
+        }
+        val mockSample = mockk<Sample>(relaxed = true) {
+            every { responseCode } returns "200"
+        }
+        sut.updateData(mockSummaryInfo, mockSample)
 
-    def "key from sample is name"() {
-        given:
-            def mockSample = Mock(Sample)
-        when:
-            def key = sut.getKeyFromSample(mockSample)
-        then:
-            1 * mockSample.getName() >> "name"
-            key == "name"
+        val data = mockSummaryInfo.getData()
+        assertEquals(1, data.total, "data.total")
+        assertEquals(1, data.errors, "data.errors")
+        assertEquals(MetricUtils.ASSERTION_FAILED, data.top5ErrorsMetrics[0][0], "data.top5ErrorsMetrics[0][0]")
+
+        val overallData = sut.overallInfo.getData()
+        assertEquals(1, overallData.total, "data.total")
+        assertEquals(1, overallData.errors, "data.errors")
+        assertEquals(
+            MetricUtils.ASSERTION_FAILED,
+            overallData.top5ErrorsMetrics[0][0],
+            "overallData.top5ErrorsMetrics[0][0]"
+        )
     }
 
-    def "there are 3 + 2n expected results title columns"() {
-        expect:
-            sut.createResultTitles().size ==
-                    3 + 2 * sut.MAX_NUMBER_OF_ERRORS_IN_TOP
+    @Test
+    fun `key from sample is name`() {
+        val sample = mockk<Sample> {
+            every { name } returns "name"
+        }
+        assertEquals("name", sut.getKeyFromSample(sample)) {
+            "getKeyFromSample(sample) should return the name of the sample"
+        }
     }
 
+    @Test
+    fun `there are 3 + 2n expected results title columns`() {
+        assertEquals(
+            3 + 2 * Top5ErrorsBySamplerConsumer.MAX_NUMBER_OF_ERRORS_IN_TOP,
+            sut.createResultTitles().size
+        ) {
+            ".createResultTitles().size should be 3 + 2 * ${Top5ErrorsBySamplerConsumer.MAX_NUMBER_OF_ERRORS_IN_TOP}"
+        }
+    }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
index 3ffd87cd03c..f47fb67abe4 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
@@ -17,44 +17,59 @@
 
 package org.apache.jmeter.report.processor
 
-import spock.lang.Specification
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
-class Top5ErrorsSummaryDataSpec extends Specification {
+class Top5ErrorsSummaryDataTest {
+    val sut = Top5ErrorsSummaryData()
 
-    def sut = new Top5ErrorsSummaryData()
-
-    def "error and total count start at 0"() {
-        expect:
-            sut.getErrors() == 0
-            sut.getTotal() == 0
+    @Test
+    fun `error and total count start at 0`() {
+        assertEquals(0, sut.errors, "errors")
+        assertEquals(0, sut.total, "total")
     }
 
-    def "error and total count increment by one each time"() {
-        when:
-            sut.incErrors()
-            sut.incTotal()
-        then:
-            sut.getErrors() == 1
-            sut.getTotal() == 1
+    @Test
+    fun `incErrors increments errors`() {
+        sut.incErrors()
+        assertEquals(1, sut.errors, "errors")
     }
 
-    def "when no errors are registered an array with null values is returned"() {
-        expect:
-            sut.getTop5ErrorsMetrics() == new Object[0][0]
+    @Test
+    fun `incTotal increments total`() {
+        sut.incTotal()
+        assertEquals(1, sut.total, "total")
     }
 
-    def "error messages with the same frequency are preserved up until the size limit"() {
-        given:
-            ["A", "B", "C", "D", "E", "F"].each { sut.registerError(it) }
-        expect:
-            sut.getTop5ErrorsMetrics() == [["A", 1], ["B", 1], ["C", 1], ["D", 1], ["E", 1]]
+    @Test
+    fun `when no errors are registered an array with null values is returned`() {
+        assertArrayEquals(arrayOf<Array<Any>>(), sut.getTop5ErrorsMetrics(), "getTop5ErrorsMetrics")
     }
 
-    def "error messages are sorted by size, descending"() {
-        given:
-            ["A", "A", "A", "B", "B", "C"].each { sut.registerError(it) }
-        expect:
-            sut.getTop5ErrorsMetrics() == [["A", 3], ["B", 2], ["C", 1]]
+    @Test
+    fun `error messages with the same frequency are preserved up until the size limit`() {
+        val input = listOf("A", "B", "C", "D", "E", "F")
+        input.forEach { sut.registerError(it) }
+        assertArrayEquals(
+            input.take(5).map { arrayOf(it, 1L) }.toTypedArray(),
+            sut.getTop5ErrorsMetrics(),
+            "registerErrors $input, then call getTop5ErrorsMetrics"
+        )
     }
 
+    @Test
+    fun `error messages are sorted by size, descending`() {
+        val input = listOf("A", "A", "A", "B", "B", "C")
+        input.forEach { sut.registerError(it) }
+        assertArrayEquals(
+            arrayOf(
+                arrayOf("A", 3L),
+                arrayOf("B", 2L),
+                arrayOf("C", 1L)
+            ),
+            sut.top5ErrorsMetrics,
+            "registerErrors $input, then call getTop5ErrorsMetrics"
+        )
+    }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt
index 2036bf0f7a9..918764e5f55 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerTest.kt
@@ -17,39 +17,37 @@
 
 package org.apache.jmeter.report.processor.graph.impl
 
-import java.util.stream.Collectors
-
-import org.apache.jmeter.junit.spock.JMeterSpec
-
-class ResponseTimePercentilesOverTimeGraphConsumerSpec extends JMeterSpec {
-
-    static def EXPECTED_KEYS =
-            ['aggregate_report_min',
-             'aggregate_report_max',
-             'aggregate_rpt_pct1',
-             'aggregate_rpt_pct2',
-             'aggregate_rpt_pct3',
-            'aggregate_report_median'] as Set
-
-    def sut = new ResponseTimePercentilesOverTimeGraphConsumer()
-
-    def "GroupInfos have only the required keys"() {
-        when:
-            def groupInfosMap = sut.createGroupInfos()
-        then:
-            groupInfosMap.keySet() == EXPECTED_KEYS
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Test
+
+class ResponseTimePercentilesOverTimeGraphConsumerTest {
+    val sut = ResponseTimePercentilesOverTimeGraphConsumer()
+
+    @Test
+    fun `GroupInfos have only the required keys`() {
+        val groupInfosMap = sut.createGroupInfos()
+
+        assertEquals(
+            setOf(
+                "aggregate_report_min",
+                "aggregate_report_max",
+                "aggregate_rpt_pct1",
+                "aggregate_rpt_pct2",
+                "aggregate_rpt_pct3",
+                "aggregate_report_median",
+            ),
+            groupInfosMap.keys,
+            "createGroupInfos().keys"
+        )
     }
 
-    def "GroupInfos have the expected settings"() {
-        when:
-            def groupInfos = sut.createGroupInfos()
-            def groupInfoValues = groupInfos
-                    .entrySet().stream()
-                    .map { it.value }
-                    .collect(Collectors.toList())
-        then:
-            groupInfoValues.every { !it.enablesAggregatedKeysSeries() }
-            groupInfoValues.every { !it.enablesOverallSeries() }
+    @Test
+    fun `GroupInfos have the expected settings`() {
+        val groupInfos = sut.createGroupInfos()
+        groupInfos.values.forEach {
+            assertFalse(it.enablesAggregatedKeysSeries(), "enablesAggregatedKeysSeries()")
+            assertFalse(it.enablesOverallSeries(), "enablesOverallSeries()")
+        }
     }
-
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt
index d02c2dcda1d..c48e619d87b 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/services/FileServerTest.kt
@@ -17,221 +17,249 @@
 
 package org.apache.jmeter.services
 
-import org.apache.jmeter.junit.spock.JMeterSpec
+import org.apache.jmeter.junit.JMeterTestCase
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.io.EOFException
+import java.io.File
+import java.io.IOException
 
-import spock.lang.Unroll
+class FileServerTest : JMeterTestCase() {
+    val sut = FileServer()
 
-@Unroll
-class FileServerSpec extends JMeterSpec {
+    val testFile = getResourceFilePath("testfiles/unit/FileServerSpec.csv")
+    val emptyFile = getResourceFilePath("testfiles/empty.csv")
+    val bomFile = getResourceFilePath("testfiles/bomData.csv")
 
-    def sut = new FileServer()
+    data class SetBaseForScriptCase(val file: File, val expectedBaseDirRelative: String)
 
-    def testFile = getResourceFilePath("testfiles/unit/FileServerSpec.csv")
-    def emptyFile = getResourceFilePath("testfiles/empty.csv")
-    def bomFile = getResourceFilePath("testfiles/bomData.csv")
+    companion object {
+        @JvmStatic
+        fun setBaseForScript(): List<SetBaseForScriptCase> {
+            val baseFile = File(FileServer.getDefaultBase())
+            return listOf(
+                SetBaseForScriptCase(baseFile, "."),
+                SetBaseForScriptCase(baseFile.getParentFile(), "."),
+                SetBaseForScriptCase(File(baseFile.getParentFile(), "abcd/defg.jmx"), "."),
+                SetBaseForScriptCase(File(baseFile, "abcd/defg.jmx"), "abcd"),
+            )
+        }
+    }
 
-    def setup() {
+    @BeforeEach
+    fun setup() {
         sut.resetBase()
     }
 
-    def tearDown() {
+    @AfterEach
+    fun tearDown() {
         sut.closeFiles()
     }
 
-    def "reading a non-existent file throws an exception"() {
-        when:
+    @Test
+    fun `reading a non-existent file throws an exception`() {
+        assertThrows<IOException> {
             sut.readLine("test")
-        then:
-            thrown(IOException)
+        }
     }
 
-    def "writing to a non-exisent file throws an exception"() {
-        when:
+    @Test
+    fun `writing to a non-exisent file throws an exception`() {
+        assertThrows<IOException> {
             sut.write("test", "")
-        then:
-            thrown(IOException)
+        }
     }
 
-    def "no files should be open following resetBase"() {
-        expect:
-            !sut.filesOpen()
+    @Test
+    fun `no files should be open following resetBase`() {
+        assertNoFilesOpen()
     }
 
-    def "closing unrecognised files are ignored"() {
-        when:
-            sut.closeFile("xxx")
-        then:
-            !sut.filesOpen()
-            noExceptionThrown()
+    @Test
+    fun `closing unrecognised files are ignored`() {
+        sut.closeFile("xxx")
+        assertNoFilesOpen()
     }
 
-    def "file is not opened until read from"() {
-        given:
-            sut.reserveFile(testFile) // Does not open file
-            assert !sut.filesOpen()
-        when:
-            def line = sut.readLine(testFile)
-        then:
-            line == "a1,b1,c1,d1"
-            sut.filesOpen()
+    @Test
+    fun `file is not opened until read from`() {
+        sut.reserveFile(testFile) // Does not open file
+        assertNoFilesOpen()
+        assertEquals("a1,b1,c1,d1", sut.readLine(testFile)) {
+            "readLine($testFile)"
+        }
+        assertFilesOpen()
     }
 
-    def "reading lines loops to start once last line is read"() {
-        given:
-            sut.reserveFile(testFile)
-        when:
-            def firstPass = [sut.readLine(testFile), sut.readLine(testFile), sut.readLine(testFile), sut.readLine(testFile)]
-            def secondPass = [sut.readLine(testFile), sut.readLine(testFile), sut.readLine(testFile), sut.readLine(testFile)]
-        then:
-            firstPass == secondPass
+    private fun assertNoFilesOpen() {
+        assertFalse(sut.filesOpen(), "filesOpen")
     }
 
-    def "cannot write to reserved file after reading"() {
-        given:
-            sut.reserveFile(testFile)
-            sut.readLine(testFile)
-        when:
+    private fun assertFilesOpen() {
+        assertTrue(sut.filesOpen(), "filesOpen")
+    }
+
+    @Test
+    fun `reading lines loops to start once last line is read`() {
+        sut.reserveFile(testFile)
+        val firstPass = Array(4) { sut.readLine(testFile) }
+        val secondPass = Array(4) { sut.readLine(testFile) }
+        assertArrayEquals(firstPass, secondPass)
+    }
+
+    @Test
+    fun `cannot write to reserved file after reading`() {
+        sut.reserveFile(testFile)
+        sut.readLine(testFile)
+        assertThrows<IOException> {
             sut.write(testFile, "")
-        then:
-            thrown(IOException)
+        }
     }
 
-    def "closing reserved file after reading resets"() {
-        given:
-            sut.reserveFile(testFile)
-            sut.readLine(testFile)
-        when:
-            sut.closeFile(testFile) // does not remove the entry
-        then:
-            !sut.filesOpen()
-            sut.readLine(testFile) == "a1,b1,c1,d1" // Re-read first line
-            sut.filesOpen()
+    @Test
+    fun `closing reserved file after reading resets`() {
+        sut.reserveFile(testFile)
+        sut.readLine(testFile)
+        sut.closeFile(testFile) // does not remove the entry
+        assertNoFilesOpen()
+        assertEquals("a1,b1,c1,d1", sut.readLine(testFile), "re-read first line")
+        assertFilesOpen()
     }
 
-    def "closeFiles() prevents reading of reserved file"() {
-        given:
-            sut.reserveFile(testFile)
-            sut.readLine(testFile)
-        when:
-            sut.closeFiles() // removes all entries
+    @Test
+    fun `closeFiles() prevents reading of reserved file`() {
+        sut.reserveFile(testFile)
+        sut.readLine(testFile)
+        sut.closeFiles() // removes all entries
+        assertThrows<IOException> {
             sut.readLine(testFile)
-        then:
-            !sut.filesOpen()
-            thrown(IOException)
+        }
+        assertNoFilesOpen()
     }
 
-    def "baseDir is the defaultBasedir"() {
-        expect:
-            sut.getBaseDir() == FileServer.getDefaultBase()
+    @Test
+    fun `baseDir is the defaultBasedir`() {
+        assertEquals(FileServer.getDefaultBase(), sut.getBaseDir()) {
+            "getBaseDir should be FileServer.getDefaultBase()"
+        }
     }
 
-    def "setBaseDir doesn't error when no files are open"() {
-        when:
-            sut.setBasedir("testfiles/unit/FileServerSpec.csv")
-        then:
-            sut.getBaseDir().replaceAll("\\\\", "/").endsWith("testfiles/unit")
+    @Test
+    fun `setBaseDir doesn't error when no files are open`() {
+        sut.setBasedir("testfiles/unit/FileServerSpec.csv")
+
+        val result = sut.baseDir.replace("\\", "/")
+        if (!result.endsWith("testfiles/unit")) {
+            fail("baseDir should start with testfiles/unit, but was $result")
+        }
     }
 
     // TODO: what about throwing an exception in setBaseDir?
-    def "setBaseDir doesn't set base when passed a directory"() {
-        def dir = "does-not-exist"
-        given:
-            sut.setBasedir(dir)
-        when:
-            sut.getBaseDir().endsWith(dir)
-        then:
-            thrown(NullPointerException)
-    }
-
-    def "cannot set baseDir when files are open"() {
-        given:
-            sut.reserveFile(testFile)
-            sut.readLine(testFile) == "a1,b1,c1,d1"
-        when:
+    @Test
+    fun `setBaseDir doesn't set base when passed a directory`() {
+        val dir = "does-not-exist"
+        sut.setBasedir(dir)
+        assertThrows<NullPointerException> {
+            sut.baseDir.endsWith(dir)
+        }
+    }
+
+    @Test
+    fun `cannot set baseDir when files are open`() {
+        sut.reserveFile(testFile)
+        assertEquals("a1,b1,c1,d1", sut.readLine(testFile), "sut.readLine($testFile)")
+        assertThrows<IllegalStateException> {
             sut.setBasedir("testfiles")
-        then:
-            thrown(IllegalStateException)
-    }
-
-    static def baseFile = new File(FileServer.getDefaultBase())
-
-    def "setting base to #file gives getBaseDirRelative == #expectedBaseDirRelative"() {
-        when:
-            sut.setBaseForScript(file)
-        then:
-            sut.getBaseDirRelative().toString() == expectedBaseDirRelative
-        where:
-            file                                                | expectedBaseDirRelative
-            baseFile                                            | "."
-            baseFile.getParentFile()                            | "."
-            new File(baseFile.getParentFile(), "abcd/defg.jmx") | "."
-            new File(baseFile, "abcd/defg.jmx")                 | "abcd"
-    }
-
-    def "non-existent filename to reserveFile will throw exception"() {
-        given:
-            def missing = "no-such-file"
-            def alias = "missing"
-            def charsetName = "UTF-8"
-            def hasHeader = true
-        when:
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("setBaseForScript")
+    fun `setting base to #file gives getBaseDirRelative == #expectedBaseDirRelative`(case: SetBaseForScriptCase) {
+        sut.setBaseForScript(case.file)
+        assertEquals(case.expectedBaseDirRelative, sut.getBaseDirRelative().toString())
+    }
+
+    @Test
+    fun `non-existent filename to reserveFile will throw exception`() {
+        val missing = "no-such-file"
+        val alias = "missing"
+        val charsetName = "UTF-8"
+        val hasHeader = true
+        val ex = assertThrows<IllegalArgumentException> {
             sut.reserveFile(missing, charsetName, alias, hasHeader)
-        then:
-            def ex = thrown(IllegalArgumentException)
-            ex.getMessage() == "Could not read file header line for file $missing"
-            ex.getCause().getMessage() == "File $missing must exist and be readable"
+        }
+        assertEquals("Could not read file header line for file $missing", ex.message) {
+            "ex.message"
+        }
+        assertEquals("File $missing must exist and be readable", ex.cause?.message) {
+            "ex.cause?.message"
+        }
     }
 
-    def "reserving a file with no header will throw an exception if the header is expected"() {
-        given:
-            def alias = "empty"
-            def charsetName = "UTF-8"
-        when:
+    @Test
+    fun `reserving a file with no header will throw an exception if the header is expected`() {
+        val alias = "empty"
+        val charsetName = "UTF-8"
+        val e = assertThrows<IllegalArgumentException> {
             sut.reserveFile(emptyFile, charsetName, alias, true)
-        then:
-            def e = thrown(IllegalArgumentException)
-            e.getCause() instanceof EOFException
-    }
-
-    def "resolvedFile returns absolute and relative files"() {
-        given:
-            def testFile = new File(emptyFile)
-        expect:
-            // absolute
-            sut.getResolvedFile(testFile.getAbsolutePath())
-                    .getCanonicalFile() == testFile.getCanonicalFile()
-            // relative
-            sut.getResolvedFile(testFile.getParentFile().getPath() + "/../testfiles/empty.csv")
-                    .getCanonicalFile() == testFile.getCanonicalFile()
-    }
-
-    def "resolvedFile returns relative files with BaseForScript set"() {
-        given:
-            def testFile = new File(emptyFile)
-        when:
-            sut.setBaseForScript(testFile)
-        then:
-            sut.getResolvedFile(testFile.getName())
-                    .getCanonicalFile() == testFile.getCanonicalFile()
-    }
-
-    def "skip bom at start of file and set correct encoding"() {
-        given:
-            sut.reserveFile(bomFile)
-        when:
-            def header = sut.readLine(bomFile)
-        then:
-            header == '"äöü"'
-    }
-
-    def "fail to read a line from a directory"() {
-        given:
-            def directory = new File(bomFile).parent
-            sut.reserveFile(directory)
-        when:
-            sut.readLine(directory)
-        then:
-            thrown(IllegalArgumentException)
+        }
+        if (e.cause !is EOFException) {
+            fail("reserveFile(emptyFile) should throw IllegalArgumentException(cause=EOFException), got cause=${e.cause}")
+        }
+    }
+
+    @Test
+    fun `resolvedFile returns absolute and relative files`() {
+        val testFile = File(emptyFile)
+        assertEquals(
+            testFile.getCanonicalFile(),
+            sut.getResolvedFile(testFile.absolutePath).getCanonicalFile(),
+            "sut.getResolvedFile(testFile.absolutePath)"
+        )
+        // relative
+        assertEquals(
+            testFile.getCanonicalFile(),
+            sut.getResolvedFile(testFile.getParentFile().path + "/../testfiles/empty.csv")
+                .getCanonicalFile(),
+            "sut.getResolvedFile(testFile.getParentFile().path + \"/../testfiles/empty.csv\")"
+        )
     }
 
+    @Test
+    fun `resolvedFile returns relative files with BaseForScript set`() {
+        val testFile = File(emptyFile)
+        sut.setBaseForScript(testFile)
+        assertEquals(
+            testFile.getCanonicalFile(),
+            sut.getResolvedFile(testFile.getName()).getCanonicalFile()
+        ) {
+            ".getResolvedFile(${testFile.name}).getCanonicalFile()"
+        }
+    }
+
+    @Test
+    fun `skip bom at start of file and set correct encoding`() {
+        sut.reserveFile(bomFile)
+        val header = sut.readLine(bomFile)
+        assertEquals("\"äöü\"", header)
+    }
+
+    @Test
+    fun `fail to read a line from a directory`() {
+        val directory = File(bomFile).parent
+        sut.reserveFile(directory)
+        assertThrows<IllegalArgumentException> {
+            sut.readLine(directory)
+        }
+    }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt
index 10347c23a2a..61e0e26e262 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/testelement/AbstractTestElementTest.kt
@@ -17,7 +17,13 @@
 
 package org.apache.jmeter.testelement
 
+import io.mockk.mockk
+import io.mockk.spyk
+import org.apache.jmeter.testelement.property.CollectionProperty
+import org.apache.jmeter.testelement.property.TestElementProperty
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
 class AbstractTestElementTest {
@@ -50,4 +56,40 @@ class AbstractTestElementTest {
                 "Note that comments is added in constructor, however, we remove <<comments>> property before cloning"
         }
     }
+
+    @Test
+    fun `set outer properties as temporary when using a TestElementProperty`() {
+        val sut = spyk<AbstractTestElement>()
+        val outerElement = mockk<TestElement>(relaxed = true)
+        val innerElement = mockk<TestElement>(relaxed = true)
+        val outerProp = TestElementProperty("outerProp", outerElement)
+        val innerProp = TestElementProperty("innerProp", innerElement)
+        outerProp.addProperty(innerProp)
+
+        sut.setTemporary(outerProp)
+
+        assertTrue(sut.isTemporary(outerProp)) {
+            "isTemporary($outerProp)"
+        }
+        assertFalse(sut.isTemporary(innerProp)) {
+            "isTemporary($innerProp)"
+        }
+    }
+
+    @Test
+    fun `set all properties as temporary when using a MultiProperty`() {
+        val sut = spyk<AbstractTestElement>()
+        val outerProp = CollectionProperty()
+        val innerProp = CollectionProperty()
+
+        outerProp.addProperty(innerProp)
+        sut.setTemporary(outerProp)
+
+        assertTrue(sut.isTemporary(outerProp)) {
+            "isTemporary($outerProp)"
+        }
+        assertTrue(sut.isTemporary(innerProp)) {
+            "isTemporary($innerProp)"
+        }
+    }
 }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt
index 0ca8fe8e5db..5f906cf88b6 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/util/keystore/JmeterKeyStoreTest.kt
@@ -17,24 +17,29 @@
 
 package org.apache.jmeter.util.keystore
 
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 import java.security.KeyStore
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class JmeterKeyStoreSpec extends Specification {
-
-    def "IllegalArgumentException expected when (#startIndex, #endIndex) startIndex < 0, endIndex < -1, or endIndex < startIndex"() {
-        when:
-            JmeterKeyStore.getInstance(KeyStore.defaultType, startIndex, endIndex, "defaultName")
-        then:
-            thrown IllegalArgumentException
-        where:
-            startIndex | endIndex
-            -1         | 0
-            0          | -2 // -1 indicates to return the first alias only
-            1          | 0
+class JmeterKeyStoreTest {
+    data class Case(val startIndex: Int, val endIndex: Int, val message: String? = null)
+    companion object {
+        @JvmStatic
+        fun inputs() = listOf(
+            Case(-1, 0),
+            Case(0, -2, "-1 indicates to return the first alias only"),
+            Case(1, 0),
+        )
     }
 
+    @ParameterizedTest
+    @MethodSource("inputs")
+    fun `throws IllegalArgumentException`(case: Case) {
+        assertThrows<IllegalArgumentException> {
+            JmeterKeyStore.getInstance(
+                KeyStore.getDefaultType(), case.startIndex, case.endIndex, "defaultName"
+            )
+        }
+    }
 }

From 993ed37076664b7bd9905d6de59aa0637541389c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 14:17:48 +0300
Subject: [PATCH 0728/1037] refactor: move JMeterSpec to :src:components as
 :src:core no longer has Groovy

---
 src/components/build.gradle.kts                               | 4 ++++
 .../groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy    | 0
 src/core/build.gradle.kts                                     | 2 --
 src/dist-check/build.gradle.kts                               | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename src/{core => components}/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy (100%)

diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 05a51f2efe5..7595fb93c04 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 plugins {
+    id("java-test-fixtures")
     id("build-logic.build-params")
     id("build-logic.jvm-published-library")
 }
@@ -87,6 +88,9 @@ dependencies {
     testRuntimeOnly("org.bouncycastle:bcprov-jdk15on")
     testImplementation("nl.jqno.equalsverifier:equalsverifier")
     testImplementation(testFixtures(projects.src.testkitWiremock))
+    testFixturesImplementation(testFixtures(projects.src.core))
+    testFixturesImplementation("junit:junit")
+    testFixturesImplementation("org.spockframework:spock-core")
 }
 
 if (!buildParameters.enableJavaFx) {
diff --git a/src/core/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy b/src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
similarity index 100%
rename from src/core/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
rename to src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index b5e0d3d75bb..c7a0172102b 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -121,11 +121,9 @@ dependencies {
 
     testImplementation("commons-net:commons-net")
     testImplementation("io.mockk:mockk")
-    testRuntimeOnly("org.spockframework:spock-core")
 
     testFixturesApi(testFixtures(projects.src.jorphan))
     testFixturesImplementation("junit:junit")
-    testFixturesImplementation("org.spockframework:spock-core")
     testFixturesImplementation(projects.src.testkit)
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 5486acd4cf9..3ea9dd20f52 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     api(projects.src.dist)
 
     testImplementation(testFixtures(projects.src.core))
+    testImplementation(testFixtures(projects.src.components))
     testImplementation("org.apache.commons:commons-lang3") {
         because("StringUtils")
     }

From 5c0d59256279c629259a03882c4a517397abe4ce Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 18:10:13 +0300
Subject: [PATCH 0729/1037] refactor: rename .groovy to .kt in :src:components
 to allow Git track history better

---
 .../org/apache/jmeter/assertions/CompareAssertionTest.kt}         | 0
 .../org/apache/jmeter/assertions/MD5HexAssertionTest.kt}          | 0
 .../org/apache/jmeter/control/RandomOrderControllerTest.kt}       | 0
 .../org/apache/jmeter/control/RunTimeTest.kt}                     | 0
 .../org/apache/jmeter/control/ThroughputControllerTest.kt}        | 0
 .../org/apache/jmeter/extractor/BoundaryExtractorTest.kt}         | 0
 .../org/apache/jmeter/extractor/JoddExtractorTest.kt}             | 0
 .../jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt} | 0
 .../jmeter/extractor/json/render/RenderAsJsonRendererTest.kt}     | 0
 .../org/apache/jmeter/timers/UniformRandomTimerTest.kt}           | 0
 .../backend/graphite/PickleGraphiteMetricsSenderTest.kt}          | 0
 .../backend/graphite/TextGraphiteMetricsSenderTest.kt}            | 0
 .../backend/influxdb/InfluxDBRawBackendListenerClientTest.kt}     | 0
 .../backend/influxdb/InfluxdbBackendListenerClientTest.kt}        | 0
 14 files changed, 0 insertions(+), 0 deletions(-)
 rename src/components/src/test/{groovy/org/apache/jmeter/assertions/CompareAssertionSpec.groovy => kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy => kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/control/RandomOrderControllerSpec.groovy => kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/control/RunTimeSpec.groovy => kotlin/org/apache/jmeter/control/RunTimeTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/control/ThroughputControllerSpec.groovy => kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy => kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/extractor/JoddExtractorSpec.groovy => kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererSpec.groovy => kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy => kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy => kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderSpec.groovy => kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderSpec.groovy => kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy => kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt} (100%)
 rename src/components/src/test/{groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientSpec.groovy => kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt} (100%)

diff --git a/src/components/src/test/groovy/org/apache/jmeter/assertions/CompareAssertionSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/assertions/CompareAssertionSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/control/RandomOrderControllerSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/control/RandomOrderControllerSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/control/RunTimeSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/control/RunTimeSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/control/ThroughputControllerSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/control/ThroughputControllerSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/extractor/JoddExtractorSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/extractor/JoddExtractorSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt
diff --git a/src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientSpec.groovy b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt
similarity index 100%
rename from src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientSpec.groovy
rename to src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt

From 572698fac7afad315b81936fe21e3a328d45dc65 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 26 Dec 2023 18:17:32 +0300
Subject: [PATCH 0730/1037] refactor: migrate :src:components Groovy tests to
 Kotlin

---
 src/components/build.gradle.kts               |   1 +
 .../jmeter/assertions/MD5HexAssertion.java    |   4 +-
 .../jmeter/extractor/BoundaryExtractor.java   |   7 +-
 .../graphite/PickleGraphiteMetricsSender.java |   9 +-
 .../graphite/TextGraphiteMetricsSender.java   |   6 +
 .../InfluxDBRawBackendListenerClient.java     |  17 +-
 .../jmeter/assertions/CompareAssertionTest.kt |  97 +--
 .../jmeter/assertions/MD5HexAssertionTest.kt  |  99 ++-
 .../control/RandomOrderControllerTest.kt      | 110 ++--
 .../org/apache/jmeter/control/RunTimeTest.kt  | 175 ++---
 .../control/ThroughputControllerTest.kt       | 348 +++++-----
 .../jmeter/extractor/BoundaryExtractorTest.kt | 600 +++++++++---------
 .../jmeter/extractor/JoddExtractorTest.kt     |  77 ++-
 .../json/render/JsonRendererExtensions.kt     |  24 +
 .../render/RenderAsJmesPathRendererTest.kt    | 205 +++---
 .../json/render/RenderAsJsonRendererTest.kt   | 201 +++---
 .../jmeter/timers/UniformRandomTimerTest.kt   |  74 +--
 .../PickleGraphiteMetricsSenderTest.kt        | 169 ++---
 .../graphite/TextGraphiteMetricsSenderTest.kt | 101 ++-
 .../InfluxDBRawBackendListenerClientTest.kt   | 141 ++--
 .../InfluxdbBackendListenerClientTest.kt      |  48 +-
 21 files changed, 1324 insertions(+), 1189 deletions(-)
 create mode 100644 src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/JsonRendererExtensions.kt

diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 7595fb93c04..1e5052a2faf 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -90,6 +90,7 @@ dependencies {
     testImplementation(testFixtures(projects.src.testkitWiremock))
     testFixturesImplementation(testFixtures(projects.src.core))
     testFixturesImplementation("junit:junit")
+    testImplementation("io.mockk:mockk")
     testFixturesImplementation("org.spockframework:spock-core")
 }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java
index ae350c89e3d..c8cc943f0fa 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java
@@ -27,6 +27,7 @@
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,7 +91,8 @@ public String getAllowedMD5Hex() {
         return getPropertyAsString(MD5HexAssertion.MD5HEX_KEY);
     }
 
-    private static String md5Hex(byte[] bytes) {
+    @VisibleForTesting
+    static String md5Hex(byte[] bytes) {
         byte[] md5Result = {};
 
         try {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index 14382936361..ac64abe41fd 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -34,6 +34,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.Document;
 import org.apache.jmeter.util.JMeterUtils;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -236,7 +237,8 @@ private String chosenInput(SampleResult result) {
         return result.getResponseDataAsString(); // Bug 36898
     }
 
-    private static List<String> extract(
+    @VisibleForTesting
+    static List<String> extract(
             String leftBoundary, String rightBoundary, int matchNumber, Stream<String> previousResults) {
         boolean allItems = matchNumber <= 0;
         return previousResults
@@ -257,7 +259,8 @@ private static List<String> extract(
      * @param inputString   text in which to look for the fragments
      * @return list where the found text fragments will be placed
      */
-    private static List<String> extract(String leftBoundary, String rightBoundary, int matchNumber, String inputString) {
+    @VisibleForTesting
+    static List<String> extract(String leftBoundary, String rightBoundary, int matchNumber, String inputString) {
         if (StringUtils.isBlank(inputString)) {
             return Collections.emptyList();
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
index 0f6ae38d5e8..99267ae9379 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,6 +87,11 @@ public void setup(SocketConnectionInfos socketConnectionInfos,
         this.prefix = prefix;
     }
 
+    @VisibleForTesting
+    List<MetricTuple> getMetrics() {
+        return metrics;
+    }
+
     /*
      * (non-Javadoc)
      *
@@ -160,7 +166,8 @@ public void destroy() {
     }
 
     /** See: https://graphite.readthedocs.io/en/1.0.0/feeding-carbon.html */
-    private static String convertMetricsToPickleFormat(List<MetricTuple> metrics) {
+    @VisibleForTesting
+    static String convertMetricsToPickleFormat(List<MetricTuple> metrics) {
         StringBuilder pickled = new StringBuilder(metrics.size() * 75);
         pickled.append(MARK).append(LIST);
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
index e24bb686930..a653fe51d1e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,6 +71,11 @@ public void setup(SocketConnectionInfos socketConnectionInfos,
         this.prefix = prefix;
     }
 
+    @VisibleForTesting
+    List<MetricTuple> getMetrics() {
+        return metrics;
+    }
+
     /* (non-Javadoc)
      * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#addMetric(long, java.lang.String, java.lang.String, java.lang.String)
      */
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
index 57be7a8a39f..2d18049c2e5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
@@ -26,6 +26,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.visualizers.backend.BackendListenerClient;
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +77,16 @@ public InfluxDBRawBackendListenerClient(InfluxdbMetricsSender sender) {
         influxDBMetricsManager = sender;
     }
 
+    @VisibleForTesting
+    String getMeasurement() {
+        return measurement;
+    }
+
+    @VisibleForTesting
+    InfluxdbMetricsSender getInfluxDBMetricsManager() {
+        return influxDBMetricsManager;
+    }
+
     @Override
     public void setupTest(BackendListenerContext context) throws Exception {
         initInfluxDBMetricsManager(context);
@@ -119,7 +130,8 @@ private void addMetricFromSampleResult(SampleResult sampleResult) {
         influxDBMetricsManager.addMetric(measurement, tags, fields, timestamp);
     }
 
-    private static String createTags(SampleResult sampleResult) {
+    @VisibleForTesting
+    static String createTags(SampleResult sampleResult) {
         boolean isError = sampleResult.getErrorCount() != 0;
         String status = isError ? TAG_KO : TAG_OK;
         // remove surrounding quotes and spaces from sample label
@@ -131,7 +143,8 @@ private static String createTags(SampleResult sampleResult) {
                 + ",threadName=" + threadName;
     }
 
-    private static String createFields(SampleResult sampleResult) {
+    @VisibleForTesting
+    static String createFields(SampleResult sampleResult) {
         long duration = sampleResult.getTime();
         long latency = sampleResult.getLatency();
         long connectTime = sampleResult.getConnectTime();
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
index 333970cc110..c33bac5faeb 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
@@ -17,60 +17,65 @@
 
 package org.apache.jmeter.assertions
 
-import java.nio.charset.StandardCharsets
-
-import org.apache.commons.lang3.StringUtils
 import org.apache.jmeter.samplers.SampleResult
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-import spock.lang.Specification
-import spock.lang.Unroll
+class CompareAssertionTest {
+    val sut = CompareAssertion()
 
-@Unroll
-class CompareAssertionSpec extends Specification {
+    data class AssertCase(
+        val compareContent: Boolean,
+        val compareTime: Long,
+        val content: String,
+        val elapsed: Long,
+        val skip: String?,
+        val isFailure: Boolean
+    )
 
-    def sut = new CompareAssertion()
+    companion object {
+        fun simpleResult(data: String, elapsed: Long) =
+            SampleResult(0, elapsed).apply {
+                setResponseData(data, Charsets.UTF_8.name())
+                sampleEnd()
+            }
 
-    def "Result is simple assertionResult when only one response is given"() {
-        given:
-            sut.setName("myName")
-            sut.iterationStart(null)
-        when:
-            def assertionResult = sut.getResult(null)
-        then:
-            assertionResult.getName() == "myName"
+        @JvmStatic
+        fun assertCases() = listOf(
+            AssertCase(true, -1, "OK", 100, null, false),
+            AssertCase(true, -1, "different", 100, null, true),
+            AssertCase(false, -1, "different", 100, null, false),
+            AssertCase(false, -1, "different OK", 100, "d\\w+\\s", false),
+            AssertCase(true, 10, "OK", 120, null, true),
+            AssertCase(true, 10, "OK", 110, null, false),
+        )
     }
 
-    def "content '#content' with compareContent==#compareContent, skip=#skip, elapsed=#elapsed and compareTime==#compareTime"() {
-        given:
-            sut.setName("myName")
-            def firstResponse = simpleResult("OK", 100)
-            sut.iterationStart(null)
-            sut.getResult(firstResponse)
-            sut.setCompareContent(compareContent)
-            sut.setCompareTime(compareTime)
-            if (skip != null) {
-                def subst = new SubstitutionElement()
-                subst.setRegex(skip)
-                sut.setStringsToSkip(Arrays.asList(subst))
-            }
-        when:
-            def assertionResult = sut.getResult(simpleResult(content, elapsed))
-        then:
-            assertionResult.isFailure() == isFailure
-        where:
-            compareContent | compareTime | content        | elapsed | skip        | isFailure
-            true           | -1          | "OK"           | 100     | null        | false
-            true           | -1          | "different"    | 100     | null        | true
-            false          | -1          | "different"    | 100     | null        | false
-            false          | -1          | "different OK" | 100     | "d\\w+\\s"  | false
-            true           | 10          | "OK"           | 120     | null        | true
-            true           | 10          | "OK"           | 110     | null        | false
+    @Test
+    fun `Result is simple assertionResult when only one response is given`() {
+        sut.name = "myName"
+        sut.iterationStart(null)
+        val assertionResult = sut.getResult(null)
+        assertEquals("myName", assertionResult.name)
     }
 
-    private SampleResult simpleResult(String data, long elapsed) {
-        def result = new SampleResult(0L, elapsed)
-        result.setResponseData(data, StandardCharsets.UTF_8.name())
-        result.sampleEnd()
-        return result
+    @ParameterizedTest
+    @MethodSource("assertCases")
+    fun isFailure(case: AssertCase) {
+        sut.name = "myName"
+        val firstResponse = simpleResult("OK", 100)
+        sut.iterationStart(null)
+        sut.getResult(firstResponse)
+        sut.isCompareContent = case.compareContent
+        sut.compareTime = case.compareTime
+        case.skip?.let {
+            val subst = SubstitutionElement()
+            subst.regex = it
+            sut.stringsToSkip = listOf(subst)
+        }
+        val assertionResult = sut.getResult(simpleResult(case.content, case.elapsed))
+        assertEquals(case.isFailure, assertionResult.isFailure)
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt
index 4923af67c90..56740cef879 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/assertions/MD5HexAssertionTest.kt
@@ -17,65 +17,64 @@
 
 package org.apache.jmeter.assertions
 
-import java.nio.charset.StandardCharsets
-
-import org.apache.commons.lang3.StringUtils
 import org.apache.jmeter.samplers.SampleResult
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class MD5HexAssertionSpec extends Specification {
+class MD5HexAssertionTest {
+    val sut = MD5HexAssertion()
 
-    def sut = new MD5HexAssertion()
+    data class MD5HexAssertionCase(
+        val sampleData: String,
+        val allowedHex: String? = null,
+        val success: Boolean,
+    )
 
-    def "unset allowable hash with empty response fails"() {
-        when:
-            def result = sut.getResult(sampleResult(""))
-        then:
-            result.isFailure()
-            StringUtils.isNotBlank(result.getFailureMessage())
+    companion object {
+        @JvmStatic
+        fun md5Cases() = listOf(
+            // success
+            MD5HexAssertionCase("anything", "f0e166dc34d14d6c228ffac576c9a43c", true),
+            MD5HexAssertionCase("anything", "F0e166Dc34D14d6c228ffac576c9a43c", true),
+            // failure
+            MD5HexAssertionCase("", "", false),
+            MD5HexAssertionCase("anything", "anything", false),
+            MD5HexAssertionCase("anything", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", false),
+        )
     }
 
-    def "incorrect hash #allowedHex causes result failure"() {
-        given:
-            sut.setAllowedMD5Hex(allowedHex)
-        when:
-            def result = sut.getResult(sampleResult("anything"))
-        then:
-            result.isFailure()
-            StringUtils.isNotBlank(result.getFailureMessage())
-        where:
-            allowedHex << ["", "anything", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
-    }
+    @ParameterizedTest
+    @MethodSource("md5Cases")
+    fun md5HexAssertion(case: MD5HexAssertionCase) {
+        sut.allowedMD5Hex = case.allowedHex
+        val result = sut.getResult(sampleResult(case.sampleData))
 
-    def "example MD5s - '#sampleData' == '#hash'"() {
-        given:
-            sut.setAllowedMD5Hex(hash)
-        when:
-            def result = sut.getResult(sampleResult(sampleData))
-        then:
-            !result.isFailure()
-            !result.isError()
-            result.getFailureMessage() == null
-        where:
-            sampleData | hash
-            "anything" | "f0e166dc34d14d6c228ffac576c9a43c"
-            "anything" | "F0e166Dc34D14d6c228ffac576c9a43c"
+        if (case.success) {
+            assertFalse(result.isFailure, ".isFailure()")
+            assertFalse(result.isError, ".isError()")
+            assertNull(result.failureMessage, "result.failureMessage")
+        } else {
+            assertTrue(result.isFailure, ".isFailure()")
+            assertTrue(result.failureMessage.isNotBlank(), "result.failureMessage should not be blank for failure case")
+        }
     }
 
-    def "empty array has MD5 hash of D41D8CD98F00B204E9800998ECF8427E"() {
-        given:
-            def emptyByteArray = [] as byte[]
-        expect:
-            MD5HexAssertion.md5Hex(emptyByteArray)
-                    .toUpperCase(Locale.ENGLISH) == "D41D8CD98F00B204E9800998ECF8427E"
+    @Test
+    fun `empty array has MD5 hash of D41D8CD98F00B204E9800998ECF8427E`() {
+        val emptyByteArray = byteArrayOf()
+        assertEquals(
+            "D41D8CD98F00B204E9800998ECF8427E",
+            MD5HexAssertion.md5Hex(emptyByteArray).uppercase()
+        )
     }
+}
 
-    def sampleResult(String data) {
-        SampleResult response = new SampleResult()
-        response.setResponseData(data.getBytes(StandardCharsets.UTF_8))
-        return response
+private fun sampleResult(data: String) =
+    SampleResult().apply {
+        responseData = data.toByteArray()
     }
-}
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt
index a8db72ce7e3..c31efcd0c97 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/control/RandomOrderControllerTest.kt
@@ -17,80 +17,80 @@
 
 package org.apache.jmeter.control
 
+import io.mockk.mockk
 import org.apache.jmeter.junit.stubs.TestSampler
 import org.apache.jmeter.testelement.TestElement
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 
-import spock.lang.Specification
+class RandomOrderControllerTest {
+    val sut = RandomOrderController()
 
-class RandomOrderControllerSpec extends Specification {
+    @Test
+    fun `next() on an empty controller returns null`() {
+        sut.initialize()
+        val nextSampler = sut.next()
+        assertNull(nextSampler)
+    }
 
-    def sut = new RandomOrderController()
+    @Test
+    fun `next() returns only provided sampler`() {
+        val sampler = TestSampler("the one and only")
+        sut.addTestElement(sampler)
+        sut.initialize()
 
-    def "next() on an empty controller returns null"() {
-        given:
-            sut.initialize()
-        when:
-            def nextSampler = sut.next()
-        then:
-            nextSampler == null
-    }
+        val nextSampler = sut.next()
+        val nextSamplerAfterEnd = sut.next()
 
-    def "next() returns only provided sampler"() {
-        given:
-            def sampler = new TestSampler("the one and only")
-            sut.addTestElement(sampler)
-            sut.initialize()
-        when:
-            def nextSampler = sut.next()
-            def nextSamplerAfterEnd = sut.next()
-        then:
-            nextSampler == sampler
-            nextSamplerAfterEnd == null
+        assertEquals(sampler, nextSampler, "there's only one sampler, so it should be returned from .next()")
+        assertNull(nextSamplerAfterEnd, "nextSamplerAfterEnd")
     }
 
-    def "next() returns exactly all added elements in random order"() {
-        given:
-            def samplerNames = (1..50).collect { it.toString() }
-            samplerNames.each {
-                sut.addTestElement(new TestSampler(it))
-            }
-            sut.initialize()
-        when:
-            def elements = getAllTestElements(sut)
-        then: "the same elements are returned but in a different order"
-            def elementNames = elements.collect { it.getName() }
-            elementNames.toSet() == samplerNames.toSet() // same elements
-            elementNames != samplerNames                 // not the same order
+    @Test
+    fun `next() returns exactly all added elements in random order`() {
+        val samplerNames = (1..50).map { it.toString() }
+        samplerNames.forEach {
+            sut.addTestElement(TestSampler(it))
+        }
+        sut.initialize()
 
+        val elements = sut.getAllTestElements()
+
+        // then: "the same elements are returned but in a different order"
+        // val
+        val elementNames = elements.map { it.name }
+        assertEquals(samplerNames.toSet(), elementNames.toSet(), "controller should return the same elements")
+        assertNotEquals(samplerNames, elementNames, "The order of elements should be randomized")
     }
 
-    def "next() is null if isDone() is true"() {
-        given:
-            sut.addTestElement(Mock(TestElement))
-            sut.initialize()
-            sut.setDone(true)
-        when:
-            def nextSampler = sut.next()
-        then:
-            sut.isDone()
-            nextSampler == null
+    @Test
+    fun `next() is null if isDone() is true`() {
+        sut.addTestElement(mockk<TestElement>())
+        sut.initialize()
+        sut.isDone = true
+
+        val nextSampler = sut.next()
+        assertTrue(sut.isDone, ".isDone()")
+        assertNull(nextSampler, "nextSampler")
     }
 
     /**
      * Builds and returns a list by 'iterating' through the
-     * {@link GenericController}, using {@link GenericController#next()},
-     * placing each item in a list until <code>null</code> is encountered.
+     * [GenericController], using [GenericController.next()],
+     * placing each item in a list until `null` is encountered.
      *
-     * @param controller the {@link GenericController} to 'iterate' though
+     * @param controller the [GenericController] to 'iterate' though
      * @return a list of all items (in order) returned from next()
      * method, excluding null
      */
-    def getAllTestElements(GenericController controller) {
-        def sample
-        def samplers = []
-        while ((sample = controller.next()) != null) {
-            samplers.add(sample)
+    fun GenericController.getAllTestElements() =
+        buildList {
+            while (true) {
+                val sampler = next() ?: break
+                add(sampler)
+            }
         }
-        return samplers
-    }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt
index 52b6ee2ee5f..679fa8564be 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/control/RunTimeTest.kt
@@ -17,104 +17,117 @@
 
 package org.apache.jmeter.control
 
+import io.mockk.every
+import io.mockk.mockk
 import org.apache.jmeter.junit.stubs.TestSampler
 import org.apache.jmeter.samplers.Sampler
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import kotlin.math.ceil
+import kotlin.system.measureTimeMillis
 
-import spock.lang.Ignore
-import spock.lang.Specification
+class RunTimeTest {
+    val sut = RunTime()
 
-class RunTimeSpec extends Specification {
+    @Test
+    @Disabled("It fails too often due to timing issues")
+    fun `RunTime stops within a tolerance after specified runtime`() {
+        sut.runtime = 1
+        val runTimeMillis = 1000L
+        val expectedLoops = 5
+        val tolerance = ceil(0.1 * expectedLoops)
+        val samplerWaitTime: Long = runTimeMillis / expectedLoops
+        val samp1 = TestSampler("Sample 1", samplerWaitTime)
+        val samp2 = TestSampler("Sample 2", samplerWaitTime)
 
-    def sut = new RunTime()
+        val sampler1Loops = 2
+        val loop1 = LoopController().apply {
+            loops = sampler1Loops
+            setContinueForever(false)
+            addTestElement(samp1)
+        }
 
-    @Ignore("It fails too often due to timing issues")
-    def "RunTime stops within a tolerance after specified runtime"() {
-        given:
-            sut.setRuntime(1)
+        val loop2 = LoopController().apply {
+            loops = expectedLoops * 2
+            setContinueForever(false)
+            addTestElement(samp2)
+        }
 
-            def runTimeMillis = 1000
-            def expectedLoops = 5
-            def tolerance = Math.ceil(0.1f * expectedLoops)
-            int samplerWaitTime = runTimeMillis / expectedLoops
-            TestSampler samp1 = new TestSampler("Sample 1", samplerWaitTime)
-            TestSampler samp2 = new TestSampler("Sample 2", samplerWaitTime)
+        sut.addTestElement(loop1)
+        sut.addTestElement(loop2)
+        sut.isRunningVersion = true
+        loop1.isRunningVersion = true
+        loop2.isRunningVersion = true
+        sut.initialize()
 
-            def sampler1Loops = 2
-            LoopController loop1 = new LoopController()
-            loop1.setLoops(sampler1Loops)
-            loop1.setContinueForever(false)
-            loop1.addTestElement(samp1)
-
-            LoopController loop2 = new LoopController()
-            loop2.setLoops(expectedLoops * 2)
-            loop2.setContinueForever(false)
-            loop2.addTestElement(samp2)
-
-            sut.addTestElement(loop1)
-            sut.addTestElement(loop2)
-            sut.setRunningVersion(true)
-            loop1.setRunningVersion(true)
-            loop2.setRunningVersion(true)
-            sut.initialize()
-        when:
-            def sampler
-            int loopCount = 0
-            long now = System.currentTimeMillis()
-            while ((sampler = sut.next()) != null) {
+        // when:
+        var loopCount = 0
+        val elapsed = measureTimeMillis {
+            while (true) {
+                val sampler = sut.next() ?: break
                 loopCount++
                 sampler.sample(null)
             }
-            long elapsed = System.currentTimeMillis() - now
-        then:
-            sut.getIterCount() == 1
-            loopCount >= expectedLoops - tolerance
-            loopCount <= expectedLoops + tolerance
-            elapsed >= runTimeMillis - (tolerance * samplerWaitTime)
-            elapsed <= runTimeMillis + (tolerance * samplerWaitTime)
-            samp1.getSamples() == sampler1Loops
-            samp2.getSamples() >= expectedLoops - sampler1Loops - tolerance
-            samp2.getSamples() <= expectedLoops - sampler1Loops + tolerance
+        }
+        // then:
+        assertEquals(1, sut.iterCount, ".iterCount")
+        assertEquals(expectedLoops.toDouble(), loopCount.toDouble(), tolerance, "loopCount")
+        assertEquals(elapsed.toDouble(), runTimeMillis.toDouble(), tolerance * samplerWaitTime, "elapsedMillis")
+        assertEquals(sampler1Loops, samp1.samples, "samp1.samples")
+        assertEquals(
+            (expectedLoops - sampler1Loops).toDouble(),
+            samp2.samples.toDouble(),
+            tolerance,
+            "samp2.samples should be expectedLoops - sampler1Loops"
+        )
     }
 
-    def "Immediately returns null when runtime is set to 0"() {
-        given:
-            sut.setRuntime(0)
-            sut.addTestElement(Mock(Sampler))
-        when:
-            def sampler = sut.next()
-        then:
-            sampler == null
-    }
+    @Test
+    fun `Immediately returns null when runtime is set to 0`() {
+        sut.runtime = 0
+        sut.addTestElement(mockk<Sampler>())
 
-    def "Immediately returns null if only Controllers are present"() {
-        given:
-            sut.setRuntime(10)
-            sut.addTestElement(Mock(Controller))
-            sut.addTestElement(Mock(Controller))
-        when:
-            def sampler = sut.next()
-        then:
-            sampler == null
+        assertNull(sut.next(), ".next()")
     }
-    def "within time limit samplers are returned until empty"() {
-        given:
-            def mockSampler = Mock(Sampler)
-            sut.setRuntime(10)
-            sut.addTestElement(mockSampler)
-            sut.addTestElement(mockSampler)
-        when:
-            def samplers = [sut.next(), sut.next(), sut.next()]
-        then:
-            samplers == [mockSampler, mockSampler, null]
+
+    @Test
+    fun `Immediately returns null if only Controllers are present`() {
+        sut.runtime = 10
+        sut.addTestElement(
+            mockk<Controller> {
+                every { next() } returns null
+                every { isDone } returns true
+            }
+        )
+        sut.addTestElement(
+            mockk<Controller> {
+                every { next() } returns null
+                every { isDone } returns true
+            }
+        )
+
+        assertNull(sut.next(), ".next()")
     }
 
-    def "RunTime immediately returns null when there are no test elements"() {
-        given:
-            sut.setRuntime(10)
-        when:
-            def sampler = sut.next()
-        then:
-            sampler == null
+    @Test
+    fun `within time limit samplers are returned until empty`() {
+        val mockSampler = mockk<Sampler>()
+        sut.runtime = 10
+        sut.addTestElement(mockSampler)
+        sut.addTestElement(mockSampler)
+
+        assertEquals(
+            listOf(mockSampler, mockSampler, null),
+            listOf(sut.next(), sut.next(), sut.next()),
+            "there are two elements, so first two .next() should return them, then null"
+        )
     }
 
+    @Test
+    fun `RunTime immediately returns null when there are no test elements`() {
+        sut.runtime = 10
+        assertNull(sut.next(), ".next()")
+    }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt
index 2f9c918676b..84112a4153f 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/control/ThroughputControllerTest.kt
@@ -18,66 +18,70 @@
 package org.apache.jmeter.control
 
 import org.apache.jmeter.junit.stubs.TestSampler
-
-import spock.lang.Specification
-
-class ThroughputControllerSpec extends Specification {
-
-    def sut = new ThroughputController()
-
-    def setup() {
-        sut.addTestElement(new TestSampler("one"))
-        sut.addTestElement(new TestSampler("two"))
+import org.apache.jmeter.threads.TestCompiler
+import org.apache.jmeter.treebuilder.dsl.testTree
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ThroughputControllerTest {
+    val sut = ThroughputController()
+
+    @BeforeEach
+    fun setup() {
+        sut.addTestElement(TestSampler("one"))
+        sut.addTestElement(TestSampler("two"))
     }
 
-    def "new TC isDone is true"() {
-        given:
-            def newTC = new ThroughputController()
-        expect:
-            newTC.isDone()
+    @Test
+    fun `TC isDone is true`() {
+        val newTC = ThroughputController()
+        assertTrue(newTC.isDone, ".isDone")
     }
 
-    def "2 maxThroughput runs samplers inside the TC only twice"() {
-        given:
-            sut.setStyle(ThroughputController.BYNUMBER)
-            sut.setMaxThroughput(2)
-
-            def expectedNames =
-                    ["zero", "one", "two", "three",
-                     "zero", "one", "two", "three",
-                     "zero", "three",
-                     "zero", "three",
-                     "zero", "three",]
-
-            def loop = createLoopController(5)
-        when:
-            def actualNames = expectedNames.collect({
-                loop.next().getName()
-            })
-        then:
-            loop.next() == null
-            actualNames == expectedNames
-            sut.isDone()
-            sut.testEnded()
+    @Test
+    fun `2 maxThroughput runs samplers inside the TC only twice`() {
+        sut.style = ThroughputController.BYNUMBER
+        sut.setMaxThroughput(2)
+
+        val expectedNames =
+            listOf(
+                "zero", "one", "two", "three",
+                "zero", "one", "two", "three",
+                "zero", "three",
+                "zero", "three",
+                "zero", "three",
+            )
+
+        val loop = createLoopController(5)
+
+        val actualNames = expectedNames.map {
+            loop.next()?.name
+        }
+
+        assertEquals(expectedNames, actualNames, "actualNames")
+        assertNull(loop.next(), "loop.next()")
+        assertTrue(sut.isDone, ".isDone")
+        sut.testEnded()
     }
 
-    def "0 maxThroughput does not run any samplers inside the TC"() {
-        given:
-            sut.setStyle(ThroughputController.BYNUMBER)
-            sut.setMaxThroughput(0)
-
-            def loops = 3
-            def loop = createLoopController(loops)
-
-            def expectedNames = ["zero", "three"] * loops
-        when:
-            def actualNames = expectedNames.collect({
-                loop.next().getName()
-            })
-        then:
-            loop.next() == null
-            actualNames == expectedNames
-            sut.testEnded()
+    @Test
+    fun `0 maxThroughput does not run any samplers inside the TC`() {
+        sut.style = ThroughputController.BYNUMBER
+        sut.setMaxThroughput(0)
+        val loops = 3
+        val loop = createLoopController(loops)
+        val expectedNames = (1..loops).flatMap { listOf("zero", "three") }
+
+        val actualNames = expectedNames.map {
+            loop.next().name
+        }
+
+        assertEquals(expectedNames, actualNames, "actualNames")
+        assertNull(loop.next(), "loop.next()")
+        sut.testEnded()
     }
 
     /**
@@ -88,25 +92,24 @@ class ThroughputControllerSpec extends Specification {
      *        - sampler two
      * </pre>
      */
-    def "0 maxThroughput does not run any sampler inside the TC and does not cause StackOverFlowError"() {
-        given:
-            sut.setStyle(ThroughputController.BYNUMBER)
-            sut.setMaxThroughput(0)
-
-            LoopController innerLoop = new LoopController()
-            innerLoop.setLoops(10000)
-            innerLoop.addTestElement(sut)
-            innerLoop.addIterationListener(sut)
-            innerLoop.initialize()
-            innerLoop.setRunningVersion(true)
-            sut.testStarted()
-            sut.setRunningVersion(true)
-
-        when:
-            innerLoop.next() == null
-            innerLoop.next() == null
-        then:
-            sut.testEnded()
+    @Test
+    fun `0 maxThroughput does not run any sampler inside the TC and does not cause StackOverFlowError`() {
+        sut.style = ThroughputController.BYNUMBER
+        sut.setMaxThroughput(0)
+
+        val innerLoop = LoopController().apply {
+            setLoops(10000)
+            addTestElement(sut)
+            addIterationListener(sut)
+            initialize()
+            isRunningVersion = true
+        }
+        sut.testStarted()
+        sut.isRunningVersion = true
+
+        assertNull(innerLoop.next(), "innerLoop.next()")
+        assertNull(innerLoop.next(), "innerLoop.next(), second call")
+        sut.testEnded()
     }
 
     /**
@@ -117,98 +120,93 @@ class ThroughputControllerSpec extends Specification {
      *        - sampler two
      * </pre>
      */
-    def "0.0 percentThroughput does not run any sampler inside the TC and does not cause StackOverFlowError"() {
-        given:
-            sut.setStyle(ThroughputController.BYPERCENT)
-            sut.setPercentThroughput("0.0")
-
-            LoopController innerLoop = new LoopController()
-            innerLoop.setLoops(10000)
-            innerLoop.addTestElement(sut)
-            innerLoop.addIterationListener(sut)
-            innerLoop.initialize()
-            innerLoop.setRunningVersion(true)
-            sut.testStarted()
-            sut.setRunningVersion(true)
-
-        when:
-            innerLoop.next() == null
-            innerLoop.next() == null
-        then:
-            sut.testEnded()
+    @Test
+    fun `0 percentThroughput does not run any sampler inside the TC and does not cause StackOverFlowError`() {
+        sut.style = ThroughputController.BYPERCENT
+        sut.percentThroughput = "0.0"
+
+        val innerLoop = LoopController().apply {
+            loops = 10000
+            addTestElement(sut)
+            addIterationListener(sut)
+            initialize()
+            isRunningVersion = true
+        }
+        sut.testStarted()
+        sut.isRunningVersion = true
+
+        assertNull(innerLoop.next(), "innerLoop.next()")
+        assertNull(innerLoop.next(), "innerLoop.next(), second call")
+
+        sut.testEnded()
     }
 
-    def "33.33% will run all the samplers inside the TC every 3 iterations"() {
-        given:
-            sut.setStyle(ThroughputController.BYPERCENT)
-            sut.setPercentThroughput(33.33f)
-
-            def loop = createLoopController(9)
-            // Expected results established using the DDA algorithm - see:
-            // http://www.siggraph.org/education/materials/HyperGraph/scanline/outprims/drawline.htm
-            def expectedNames =
-                    ["zero", "three", // 0/1 vs. 1/1 -> 0 is closer to 33.33
-                     "zero", "one", "two", "three", // 0/2 vs. 1/2 -> 50.0 is closer to 33.33
-                     "zero", "three", // 1/3 vs. 2/3 -> 33.33 is closer to 33.33
-                     "zero", "three", // 1/4 vs. 2/4 -> 25.0 is closer to 33.33
-                     "zero", "one", "two", "three", // 1/5 vs. 2/5 -> 40.0 is closer to 33.33
-                     "zero", "three", // 2/6 vs. 3/6 -> 33.33 is closer to 33.33
-                     "zero", "three", // 2/7 vs. 3/7 -> 0.2857 is closer to 33.33
-                     "zero", "one", "two", "three", // 2/8 vs. 3/8 -> 0.375 is closer to 33.33
-                     "zero", "three", // ...
-                    ]
-        when:
-            def actualNames = expectedNames.collect({
-                loop.next().getName()
-            })
-        then:
-            loop.next() == null
-            actualNames == expectedNames
-            sut.testEnded()
+    @Test
+    fun `33 percentThroughput will run all the samplers inside the TC every 3 iterations`() {
+        sut.style = ThroughputController.BYPERCENT
+        sut.setPercentThroughput(33.33f)
+
+        val loop = createLoopController(9)
+        // Expected results established using the DDA algorithm - see:
+        // http://www.siggraph.org/education/materials/HyperGraph/scanline/outprims/drawline.htm
+        val expectedNames = listOf(
+            "zero", "three", // 0/1 vs. 1/1 -> 0 is closer to 33.33
+            "zero", "one", "two", "three", // 0/2 vs. 1/2 -> 50.0 is closer to 33.33
+            "zero", "three", // 1/3 vs. 2/3 -> 33.33 is closer to 33.33
+            "zero", "three", // 1/4 vs. 2/4 -> 25.0 is closer to 33.33
+            "zero", "one", "two", "three", // 1/5 vs. 2/5 -> 40.0 is closer to 33.33
+            "zero", "three", // 2/6 vs. 3/6 -> 33.33 is closer to 33.33
+            "zero", "three", // 2/7 vs. 3/7 -> 0.2857 is closer to 33.33
+            "zero", "one", "two", "three", // 2/8 vs. 3/8 -> 0.375 is closer to 33.33
+            "zero", "three", // ...
+        )
+        val actualNames = expectedNames.map {
+            loop.next()?.name
+        }
+        assertEquals(expectedNames, actualNames, "actualNames")
+        assertNull(loop.next(), "loop.next()")
+        sut.testEnded()
     }
 
-    def "0% does not run any samplers inside the TC"() {
-        given:
-            sut.setStyle(ThroughputController.BYPERCENT)
-            sut.setPercentThroughput(0.0f)
-
-            def loops = 3
-            def loop = createLoopController(loops)
-
-            def expectedNames = ["zero", "three",] * loops
-        when:
-            def actualNames = expectedNames.collect({
-                loop.next().getName()
-            })
-        then:
-            loop.next() == null
-            actualNames == expectedNames
-            sut.testEnded()
+    @Test
+    fun `0 percentThroughput does not run any samplers inside the TC`() {
+        sut.style = ThroughputController.BYPERCENT
+        sut.setPercentThroughput(0.0f)
+
+        val loops = 3
+        val loop = createLoopController(loops)
+
+        val expectedNames = (1..loops).flatMap { listOf("zero", "three") }
+        val actualNames = expectedNames.map {
+            loop.next().name
+        }
+
+        assertEquals(expectedNames, actualNames, "actualNames")
+        assertNull(loop.next(), "loop.next()")
+        sut.testEnded()
     }
 
-    def "100% always runs all samplers inside the TC"() {
-        given:
-            sut.setStyle(ThroughputController.BYPERCENT)
-            sut.setPercentThroughput(100.0f)
-
-            def loops = 3
-            def loop = createLoopController(loops)
-
-            def expectedNames = ["zero", "one", "two", "three",] * loops
-        when:
-            def actualNames = expectedNames.collect({
-                loop.next().getName()
-            })
-        then:
-            loop.next() == null
-            actualNames == expectedNames
-            sut.testEnded()
+    @Test
+    fun `100 percentThroughput always runs all samplers inside the TC`() {
+        sut.style = ThroughputController.BYPERCENT
+        sut.setPercentThroughput(100.0f)
+
+        val loops = 3
+        val loop = createLoopController(loops)
+
+        val expectedNames = (1..loops).flatMap { listOf("zero", "one", "two", "three") }
+        val actualNames = expectedNames.map {
+            loop.next()?.name
+        }
+        assertEquals(expectedNames, actualNames, "actualNames")
+        assertNull(loop.next(), "loop.next()")
+        sut.testEnded()
     }
 
     /**
      * Create a LoopController, executed once, which contains an inner loop that
-     * runs {@code innerLoops} times, this inner loop contains a TestSampler ("zero")
-     * the {@link ThroughputController} which contains two test samplers
+     * runs [innerLoops] times, this inner loop contains a TestSampler ("zero")
+     * the [ThroughputController] which contains two test samplers
      * ("one" and "two") followed by a final TestSampler ("three"):
      *
      * <pre>
@@ -221,25 +219,31 @@ class ThroughputControllerSpec extends Specification {
      *     - sampler three
      * </pre>
      *
-     * @param innerLoops number of times to loop the {@link ThroughputController}
-     * @return the{@link LoopController}
+     * @param innerLoops number of times to loop the [ThroughputController]
+     * @return the [LoopController]
      */
-    def createLoopController(int innerLoops) {
-        LoopController innerLoop = new LoopController()
-        innerLoop.setLoops(innerLoops)
-        innerLoop.addTestElement(new TestSampler("zero"))
-        innerLoop.addTestElement(sut)
-        innerLoop.addIterationListener(sut)
-        innerLoop.addTestElement(new TestSampler("three"))
-
-        def outerLoop = new LoopController()
-        outerLoop.setLoops(1)
-        outerLoop.addTestElement(innerLoop)
+    private fun createLoopController(innerLoops: Int): LoopController {
         sut.testStarted()
-        outerLoop.setRunningVersion(true)
-        sut.setRunningVersion(true)
-        innerLoop.setRunningVersion(true)
+        val tree = testTree {
+            LoopController::class {
+                loops = 1
+                LoopController::class {
+                    loops = innerLoops
+                    +TestSampler("zero")
+                    +sut
+                    +TestSampler("three")
+                }
+            }
+        }
+        val compiler = TestCompiler(tree)
+        tree.traverse(compiler)
+
+        val outerLoop = tree.list().first() as LoopController
         outerLoop.initialize()
-        outerLoop
+
+        sut.isRunningVersion = true
+        sut.testStarted()
+
+        return outerLoop
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt
index c38944dd58d..4bbe7a84425 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/extractor/BoundaryExtractorTest.kt
@@ -17,384 +17,362 @@
 
 package org.apache.jmeter.extractor
 
-import java.util.stream.Stream
-
 import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.threads.JMeterContext
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.ValueSource
+import java.util.stream.Stream
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class BoundaryExtractorSpec extends Specification {
+class BoundaryExtractorTest {
+    data class ExtractCase(val occurrences: IntRange, val matchNumber: Int, val expected: List<String>)
+    companion object {
+        const val LEFT = "LB"
+        const val RIGHT = "RB"
+        const val DEFAULT_VAL = "defaultVal"
+        const val VAR_NAME = "varName"
+
+        /**
+         * Creates a string with a "match" for each number in the list.
+         *
+         * @param occurrences list of numbers to be the "body" of a match
+         * @return a string with a start, end and then a left boundary + number + right boundary
+         * e.g. "... LB1RB LB2RB ..."
+         */
+        fun createInputString(occurrences: IntRange) =
+            occurrences.joinToString(" ", prefix = "start \t\r\n", postfix = "\n\t end") {
+                LEFT + it + RIGHT
+            }
+
+        fun createSampleResult(responseData: String) = SampleResult().apply {
+            sampleStart()
+            setResponseData(responseData, "ISO-8859-1")
+            sampleEnd()
+        }
 
-    static LEFT = "LB"
-    static RIGHT = "RB"
-    static DEFAULT_VAL = "defaultVal"
-    static VAR_NAME = "varName"
+        @JvmStatic
+        fun extractCases() = listOf(
+            ExtractCase(1..1, -1, listOf("1")),
+            ExtractCase(1..1, 0, listOf("1")),
+            ExtractCase(1..1, 1, listOf("1")),
+            ExtractCase(1..1, 2, listOf()),
+            ExtractCase(1..2, -1, listOf("1", "2")),
+            ExtractCase(1..2, 1, listOf("1")),
+            ExtractCase(1..2, 2, listOf("2")),
+            ExtractCase(1..3, 3, listOf("3")),
+        )
+
+        @JvmStatic
+        fun extractCasesStream() = listOf(
+            ExtractCase(1..1, -1, List(10) { "1" }),
+            ExtractCase(1..1, 0, List(10) { "1" }),
+            ExtractCase(1..1, 1, listOf("1")),
+            ExtractCase(1..1, 10, listOf("1")),
+            ExtractCase(1..1, 11, listOf()),
+            ExtractCase(1..2, -1, (1..10).flatMap { listOf("1", "2") }),
+            ExtractCase(1..2, 1, listOf("1")),
+            ExtractCase(1..2, 2, listOf("2")),
+            ExtractCase(1..3, 3, listOf("3")),
+        )
+    }
 
-    def sut = new BoundaryExtractor()
+    val sut = BoundaryExtractor()
 
-    SampleResult prevResult
-    JMeterVariables vars
-    JMeterContext context
+    private lateinit var prevResult: SampleResult
+    lateinit var vars: JMeterVariables
+    private lateinit var context: JMeterContext
 
-    def setup() {
-        vars = new JMeterVariables()
+    @BeforeEach
+    fun setup() {
+        vars = JMeterVariables()
         context = JMeterContextService.getContext()
-        context.setVariables(vars)
-
-        sut.setThreadContext(context)
-        sut.setRefName(VAR_NAME)
-        sut.setLeftBoundary(LEFT)
-        sut.setRightBoundary(RIGHT)
-        sut.setDefaultValue(DEFAULT_VAL)
-        sut.setMatchNumber(1)
-
-        prevResult = new SampleResult()
-        prevResult.sampleStart()
-        prevResult.setResponseData(createInputString(1..2), null)
-        prevResult.sampleEnd()
-        context.setPreviousResult(prevResult)
+        context.variables = vars
+
+        sut.threadContext = context
+        sut.refName = VAR_NAME
+        sut.leftBoundary = LEFT
+        sut.rightBoundary = RIGHT
+        sut.defaultValue = DEFAULT_VAL
+        sut.matchNumber = 1
+
+        prevResult = SampleResult().apply {
+            sampleStart()
+            setResponseData(createInputString(1..2), null)
+            sampleEnd()
+        }
+        context.previousResult = prevResult
     }
 
-    def "Extract, where pattern exists, with matchNumber=#matchNumber from #occurrences returns #expected"() {
-        given:
-            def input = createInputString(occurrences)
-        when:
-            def matches = sut.extract(LEFT, RIGHT, matchNumber, input)
-        then:
-            matches == expected
-        where:
-            occurrences | matchNumber || expected
-            1..1        | -1          || ['1']
-            1..1        | 0           || ['1']
-            1..1        | 1           || ['1']
-            1..1        | 2           || []
-            1..2        | -1          || ['1', '2']
-            1..2        | 1           || ['1']
-            1..2        | 2           || ['2']
-            1..3        | 3           || ['3']
+    private fun assertVarValueEquals(expected: String?) {
+        assertEquals(expected, vars.get(VAR_NAME), "vars.get($VAR_NAME)")
     }
-
-    def "Extract, where pattern does not exist, with matchNumber=#matchNumber returns an empty list"() {
-        expect:
-            sut.extract(LEFT, RIGHT, matchNumber, 'start end') == []
-        where:
-            matchNumber << [-1, 0, 1, 2, 100]
+    private fun assertVarNameMatchNrEquals(expected: String?) {
+        assertEquals(expected, vars.get("${VAR_NAME}_matchNr"), "vars.get(${VAR_NAME}_matchNr)")
     }
 
-    def "Extract, where pattern exists in the stream, with matchNumber=#matchNumber from #occurrences returns #expected"() {
-        given:
-            def input = createInputString(occurrences)
-            Stream<String> stream = ([input, "", null] * 10).stream()
-        when:
-            def matches = sut.extract(LEFT, RIGHT, matchNumber, stream)
-        then:
-            matches == expected
-        where:
-            occurrences | matchNumber || expected
-            1..1        | -1          || ['1'] * 10
-            1..1        | 0           || ['1'] * 10
-            1..1        | 1           || ['1']
-            1..1        | 10          || ['1']
-            1..1        | 11          || []
-            1..2        | -1          || ['1', '2'] * 10
-            1..2        | 1           || ['1']
-            1..2        | 2           || ['2']
-            1..3        | 3           || ['3']
+    private fun assertAllVars(expected: List<String>) {
+        assertEquals(expected, getAllVars(), "getAllVars()")
     }
 
-    def "Extract, where pattern does not exist in the stream, with matchNumber=#matchNumber returns an empty list"() {
-        given:
-            Stream<String> stream = (['start end'] * 10).stream()
-        expect:
-            sut.extract(LEFT, RIGHT, matchNumber, stream) == []
-        where:
-            matchNumber << [-1, 0, 1, 2, 100]
+    @ParameterizedTest
+    @MethodSource("extractCases")
+    fun `Extract, where pattern exists, with matchNumber=#matchNumber from #occurrences returns #expected`(case: ExtractCase) {
+        val input = createInputString(case.occurrences)
+        val matches = BoundaryExtractor.extract(LEFT, RIGHT, case.matchNumber, input)
+
+        assertEquals(case.expected, matches)
     }
 
-    def "IllegalArgumentException when name (#name) is null"() {
-        given:
-            sut.setLeftBoundary(lb)
-            sut.setRightBoundary(rb)
-            sut.setRefName(name)
-        when:
-            sut.process()
-        then:
-            thrown(IllegalArgumentException)
-        where:
-            lb   | rb   | name
-            "l"  | "r"  | null
+    @ParameterizedTest
+    @ValueSource(ints = [-1, 0, 1, 2, 100])
+    fun `Extract, where pattern does not exist, with matchNumber=#matchNumber returns an empty list`(matchNumber: Int) {
+        assertEquals(listOf<Any>(), BoundaryExtractor.extract(LEFT, RIGHT, matchNumber, "start end"))
     }
 
-    def "matching only on left boundary returns default"() {
-        given:
-            sut.setRightBoundary("does-not-exist")
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == DEFAULT_VAL
+    @ParameterizedTest
+    @MethodSource("extractCasesStream")
+    fun `Extract, where pattern exists in the stream, with matchNumber=#matchNumber from #occurrences returns #expected`(case: ExtractCase) {
+        val input = createInputString(case.occurrences)
+        val stream = (1..10).flatMap { listOf(input, "", null) }.stream()
+        val matches = BoundaryExtractor.extract(LEFT, RIGHT, case.matchNumber, stream)
+
+        assertEquals(case.expected, matches)
     }
 
-    def "matching only on right boundary returns default"() {
-        given:
-            sut.setLeftBoundary("does-not-exist")
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == DEFAULT_VAL
+    @ParameterizedTest
+    @ValueSource(ints = [-1, 0, 1, 2, 100])
+    fun `Extract, where pattern does not exist in the stream, with matchNumber=#matchNumber returns an empty list`(matchNumber: Int) {
+        val stream: Stream<String> = (1..10).flatMap { listOf("start end") }.stream()
+
+        assertEquals(listOf<Any>(), BoundaryExtractor.extract(LEFT, RIGHT, matchNumber, stream))
     }
 
-    def "variables from a previous extraction are removed"() {
-        given:
-            sut.setMatchNumber(-1)
-            sut.process()
-            assert vars.get("${VAR_NAME}_1") == "1"
-            assert vars.get("${VAR_NAME}_matchNr") == "2"
-        when:
-            // Now rerun with match fail
-            sut.setMatchNumber(10)
+    @Test
+    fun `IllegalArgumentException when name (#name) is null`() {
+        sut.leftBoundary = "l"
+        sut.rightBoundary = "r"
+        sut.refName = null
+
+        assertThrows<IllegalArgumentException> {
             sut.process()
-        then:
-            vars.get(VAR_NAME) == DEFAULT_VAL
-            vars.get("${VAR_NAME}_1") == null
-            vars.get("${VAR_NAME}_matchNr") == null
+        }
     }
 
-    def "with no sub-samples parent and all scope return data but children scope does not"() {
-        given:
-            sut.setScopeParent()
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == "1"
+    @Test
+    fun `matching only on left boundary returns default`() {
+        sut.rightBoundary = "does-not-exist"
+        sut.process()
+        assertVarValueEquals(DEFAULT_VAL)
+    }
 
-        and:
-            sut.setScopeAll()
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == "1"
+    @Test
+    fun `matching only on right boundary returns default`() {
+        sut.leftBoundary = "does-not-exist"
+        sut.process()
+        assertVarValueEquals(DEFAULT_VAL)
+    }
 
-        and:
-            sut.setScopeChildren()
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == DEFAULT_VAL
+    @Test
+    fun `variables from a previous extraction are removed`() {
+        sut.matchNumber = -1
+        sut.process()
+        assertEquals("1", vars.get("${VAR_NAME}_1"))
+        assertEquals("2", vars.get("${VAR_NAME}_matchNr"))
+
+        // Now rerun with match fail
+        sut.matchNumber = 10
+        sut.process()
+        assertVarValueEquals(DEFAULT_VAL)
+        assertNull(vars.get("${VAR_NAME}_1"), "vars.get(${VAR_NAME}_1)")
+        assertVarNameMatchNrEquals(null)
     }
 
-    def "with sub-samples parent, all and children scope return expected item"() {
-        given:
-            prevResult.addSubResult(createSampleResult("${LEFT}sub1${RIGHT}"))
-            prevResult.addSubResult(createSampleResult("${LEFT}sub2${RIGHT}"))
-            prevResult.addSubResult(createSampleResult("${LEFT}sub3${RIGHT}"))
-            sut.setScopeParent()
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == "1"
+    @Test
+    fun `with no sub-samples parent and all scope return data but children scope does not`() {
+        sut.setScopeParent()
+        sut.process()
+        assertVarValueEquals("1")
 
-        and:
-            sut.setScopeAll()
-            sut.setMatchNumber(3) // skip 2 in parent sample
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == "sub1"
+        sut.setScopeAll()
+        sut.process()
+        assertVarValueEquals("1")
 
-        and:
-            sut.setScopeChildren()
-            sut.setMatchNumber(3)
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == "sub3"
+        sut.setScopeChildren()
+        sut.process()
+        assertVarValueEquals(DEFAULT_VAL)
     }
 
-    def "with sub-samples parent, all and children scope return expected data"() {
-        given:
-            prevResult.addSubResult(createSampleResult("${LEFT}sub1${RIGHT}"))
-            prevResult.addSubResult(createSampleResult("${LEFT}sub2${RIGHT}"))
-            prevResult.addSubResult(createSampleResult("${LEFT}sub3${RIGHT}"))
-            sut.setMatchNumber(-1)
+    @Test
+    fun `with sub-samples parent, all and children scope return expected item`() {
+        prevResult.addSubResult(createSampleResult("${LEFT}sub1$RIGHT"))
+        prevResult.addSubResult(createSampleResult("${LEFT}sub2$RIGHT"))
+        prevResult.addSubResult(createSampleResult("${LEFT}sub3$RIGHT"))
+        sut.setScopeParent()
 
-            sut.setScopeParent()
-        when:
-            sut.process()
-        then:
-            vars.get("${VAR_NAME}_matchNr") == "2"
-            getAllVars() == ["1", "2"]
+        sut.process()
 
-        and:
-            sut.setScopeAll()
-        when:
-            sut.process()
-        then:
-            vars.get("${VAR_NAME}_matchNr") == "5"
-            getAllVars() == ["1", "2", "sub1", "sub2", "sub3"]
+        assertVarValueEquals("1")
 
-        and:
-            sut.setScopeChildren()
-        when:
-            sut.process()
-        then:
-            vars.get("${VAR_NAME}_matchNr") == "3"
-            getAllVars() == ["sub1", "sub2", "sub3"]
-    }
+        sut.setScopeAll()
+        sut.matchNumber = 3 // skip 2 in parent sample
+        sut.process()
+        assertVarValueEquals("sub1")
 
-    def "when 'default empty value' is true the default value is allowed to be empty"() {
-        given:
-            sut.setMatchNumber(10) // no matches
-            sut.setDefaultValue("")
-            sut.setDefaultEmptyValue(true)
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == ""
+        sut.setScopeChildren()
+        sut.matchNumber = 3
+        sut.process()
+        assertVarValueEquals("sub3")
     }
 
-    def "when default value is empty but not allowed null is returned"() {
-        given:
-            sut.setMatchNumber(10) // no matches
-            sut.setDefaultValue("")
-            sut.setDefaultEmptyValue(false)
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == null
+    @Test
+    fun `with sub-samples parent, all and children scope return expected data`() {
+        prevResult.addSubResult(createSampleResult("${LEFT}sub1$RIGHT"))
+        prevResult.addSubResult(createSampleResult("${LEFT}sub2$RIGHT"))
+        prevResult.addSubResult(createSampleResult("${LEFT}sub3$RIGHT"))
+        sut.matchNumber = -1
+
+        sut.setScopeParent()
+        sut.process()
+
+        assertVarNameMatchNrEquals("2")
+        assertAllVars(listOf("1", "2"))
+
+        sut.setScopeAll()
+        sut.process()
+        assertVarNameMatchNrEquals("5")
+        assertAllVars(listOf("1", "2", "sub1", "sub2", "sub3"))
+
+        sut.setScopeChildren()
+        sut.process()
+        assertVarNameMatchNrEquals("3")
+        assertAllVars(listOf("sub1", "sub2", "sub3"))
     }
 
-    def "with no previous results result is null"() {
-        given:
-            context.setPreviousResult(null)
-            sut.setDefaultEmptyValue(true)
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == null
+    @Test
+    fun `when 'default empty value' is true the default value is allowed to be empty`() {
+        sut.matchNumber = 10 // no matches
+        sut.defaultValue = ""
+        sut.setDefaultEmptyValue(true)
+        sut.process()
+        assertVarValueEquals("")
     }
 
-    def "with non-existent variable result is null"() {
-        given:
-            sut.setDefaultValue(null)
-            sut.setScopeVariable("empty-var-name")
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == null
+    @Test
+    fun `when default value is empty but not allowed null is returned`() {
+        sut.matchNumber = 10 // no matches
+        sut.defaultValue = ""
+        sut.setDefaultEmptyValue(false)
+        sut.process()
+        assertVarValueEquals(null)
     }
 
-    def "not allowing blank default value returns null upon no matches"() {
-        given:
-            sut.setMatchNumber(10) // no matches
-            sut.setDefaultValue("")
-            sut.setDefaultEmptyValue(false)
-        when:
-            sut.process()
-        then:
-            vars.get(VAR_NAME) == null
+    @Test
+    fun `with no previous results result is null`() {
+        context.previousResult = null
+        sut.setDefaultEmptyValue(true)
+        sut.process()
+        assertVarValueEquals(null)
     }
 
-    def "extract all matches from variable input"() {
-        given:
-            sut.setMatchNumber(-1)
-            sut.setScopeVariable("contentvar")
-            vars.put("contentvar", createInputString(1..2))
-        when:
-            sut.process()
-        then:
-            getAllVars() == ["1", "2"]
-            vars.get("${VAR_NAME}_matchNr") == "2"
+    @Test
+    fun `with non-existent variable result is null`() {
+        sut.defaultValue = null
+        sut.setScopeVariable("empty-var-name")
+        sut.process()
+        assertVarValueEquals(null)
     }
 
-    def "extract random from variable returns one of the matches"() {
-        given:
-            sut.setMatchNumber(0)
-            sut.setScopeVariable("contentvar")
-            vars.put("contentvar", createInputString(1..42))
-        when:
-            sut.process()
-        then:
-            (1..42).collect({ it.toString() }).contains(vars.get(VAR_NAME))
-            vars.get("${VAR_NAME}_matchNr") == null
+    @Test
+    fun `not allowing blank default value returns null upon no matches`() {
+        sut.matchNumber = 10 // no matches
+        sut.defaultValue = ""
+        sut.setDefaultEmptyValue(false)
+        sut.process()
+        assertVarValueEquals(null)
     }
 
-    def "extract all from an empty variable returns no results"() {
-        given:
-            sut.setMatchNumber(-1)
-            sut.setScopeVariable("contentvar")
-            vars.put("contentvar", "")
-        when:
-            sut.process()
-        then:
-            vars.get("${VAR_NAME}_matchNr") == "0"
-            vars.get("${VAR_NAME}_1") == null
+    @Test
+    fun `extract all matches from variable input`() {
+        sut.matchNumber = -1
+        sut.setScopeVariable("contentvar")
+        vars.put("contentvar", createInputString(1..2))
+        sut.process()
+        assertAllVars(listOf("1", "2"))
+        assertVarNameMatchNrEquals("2")
     }
 
-    def "previous extractions are cleared"() {
-        given:
-            sut.setMatchNumber(-1)
-            sut.setScopeVariable("contentvar")
-            vars.put("contentvar", createInputString(1..10))
-            sut.process()
-            assert getAllVars() == (1..10).collect({ it.toString() })
-            assert vars.get("${VAR_NAME}_matchNr") == "10"
-            vars.put("contentvar", createInputString(11..15))
-            sut.setMatchNumber("-1")
-            def expectedMatches = (11..15).collect({ it.toString() })
-        when:
-            sut.process()
-        then:
-            getAllVars() == expectedMatches
-            vars.get("${VAR_NAME}_matchNr") == "5"
-            (6..10).collect { vars.get("${VAR_NAME}_${it}") } == [null] * 5
-
-        and:
-            sut.setMatchNumber(0)
-        when:
-            sut.process()
-        then:
-            expectedMatches.contains(vars.get(VAR_NAME))
+    @Test
+    fun `extract random from variable returns one of the matches`() {
+        sut.matchNumber = 0
+        sut.setScopeVariable("contentvar")
+        vars.put("contentvar", createInputString(1..42))
+
+        sut.process()
+
+        (1..42).map { it.toString() }.contains(vars.get(VAR_NAME))
+        assertVarNameMatchNrEquals(null)
     }
 
-    /**
-     * Creates a string with a "match" for each number in the list.
-     *
-     * @param occurrences list of numbers to be the "body" of a match
-     * @return a string with a start, end and then a left boundary + number + right boundary
-     * e.g. "... LB1RB LB2RB ..."
-     */
-    static createInputString(List<Integer> occurrences) {
-        def middle = occurrences.collect({ LEFT + it + RIGHT }).join(" ")
-        return 'start \t\r\n' + middle + '\n\t end'
+    @Test
+    fun `extract all from an empty variable returns no results`() {
+        sut.matchNumber = -1
+        sut.setScopeVariable("contentvar")
+        vars.put("contentvar", "")
+
+        sut.process()
+        assertVarNameMatchNrEquals("0")
+        assertNull(vars.get("${VAR_NAME}_1"), "vars.get(${VAR_NAME}_1)")
     }
 
-    static createSampleResult(String responseData) {
-        SampleResult child = new SampleResult()
-        child.sampleStart()
-        child.setResponseData(responseData, "ISO-8859-1")
-        child.sampleEnd()
-        return child
+    @Test
+    fun `previous extractions are cleared`() {
+        sut.matchNumber = -1
+        sut.setScopeVariable("contentvar")
+        vars.put("contentvar", createInputString(1..10))
+        sut.process()
+        assertAllVars((1..10).map { it.toString() })
+        assertVarNameMatchNrEquals("10")
+        vars.put("contentvar", createInputString(11..15))
+        sut.setMatchNumber("-1")
+        val expectedMatches = (11..15).map { it.toString() }
+
+        sut.process()
+
+        assertAllVars(expectedMatches)
+        assertVarNameMatchNrEquals("5")
+        assertEquals(
+            List(5) { null },
+            (6..10).map { vars.get("${VAR_NAME}_$it") },
+            "vars.get(${VAR_NAME}_6..10)"
+        )
+
+        sut.matchNumber = 0
+        sut.process()
+
+        val varValue = vars.get(VAR_NAME)
+        if (varValue !in expectedMatches) {
+            fail("expectedMatches ($expectedMatches) should contain value of $VAR_NAME variable $varValue")
+        }
     }
 
     /**
      * @return a list of all the variables in the format ${VAR_NAME}_${i}
      * starting at i = 1 until null is returned
      */
-    def getAllVars() {
-        def allVars = []
-        def i = 1
-        def var = vars.get("${VAR_NAME}_${i}")
-        while (var != null) {
-            allVars.add(var)
+    private fun getAllVars(): List<String> = buildList {
+        var i = 1
+        while (true) {
+            val value = vars.get("${VAR_NAME}_$i") ?: break
+            add(value)
             i++
-            var = vars.get("${VAR_NAME}_${i}")
         }
-        return allVars
     }
-
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt
index 52da3dd4853..fa143b3c99b 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/extractor/JoddExtractorTest.kt
@@ -17,35 +17,56 @@
 
 package org.apache.jmeter.extractor
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-@Unroll
-class JoddExtractorSpec extends Specification {
+class JoddExtractorTest {
+    data class ExtractCase(
+        val expression: String,
+        val attribute: String,
+        val matchNumber: Int,
+        val expectedList: List<String>,
+        val found: Int,
+        val expected: Int,
+        val cacheKey: String
+    )
 
-    def "extract #expression and #attribute"() {
-        given:
-            def resultList = []
-            def input = """
-<html>
-  <head><title>Test</title></head>
-  <body>
-    <h1 class="title">TestTitle</h1>
-    <p>Some text</p>
-    <h1>AnotherTitle</h1>
-  </body>
-</html>
-"""
-        when:
-            def foundCount = new JoddExtractor().extract(expression, attribute, matchNumber, input, resultList, found, cacheKey)
-        then:
-            foundCount == expected
-            resultList == expectedList
-        where:
-            expression        | attribute | matchNumber | expectedList                  | found | expected | cacheKey
-            "p"               | ""        | 1           | ["Some text"]                 | -1    | 0        | "key"
-            "h1[class=title]" | "class"   | 1           | ["title"]                     | -1    | 0        | "key"
-            "h1"              | ""        | 0           | ["TestTitle", "AnotherTitle"] | -1    | 1        | "key"
-            "notthere"        | ""        | 0           | []                            | -1    | -1       | "key"
+    companion object {
+        @JvmStatic
+        fun extractCases() = listOf(
+            ExtractCase("p", "", 1, listOf("Some text"), -1, 0, "key"),
+            ExtractCase("h1[class=title]", "class", 1, listOf("title"), -1, 0, "key"),
+            ExtractCase("h1", "", 0, listOf("TestTitle", "AnotherTitle"), -1, 1, "key"),
+            ExtractCase("notthere", "", 0, listOf(), -1, -1, "key"),
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("extractCases")
+    fun extract(case: ExtractCase) {
+        val resultList = mutableListOf<String>()
+        val input = /* language=xml */
+            """
+            <html>
+              <head><title>Test</title></head>
+              <body>
+                <h1 class="title">TestTitle</h1>
+                <p>Some text</p>
+                <h1>AnotherTitle</h1>
+              </body>
+            </html>
+            """.trimIndent()
+        val foundCount = JoddExtractor().extract(
+            case.expression,
+            case.attribute,
+            case.matchNumber,
+            input,
+            resultList,
+            case.found,
+            case.cacheKey
+        )
+        assertEquals(case.expectedList, resultList, "resultList")
+        assertEquals(case.expected, foundCount, "foundCount")
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/JsonRendererExtensions.kt b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/JsonRendererExtensions.kt
new file mode 100644
index 00000000000..d989fa94574
--- /dev/null
+++ b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/JsonRendererExtensions.kt
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.extractor.json.render
+
+import org.junit.jupiter.api.Assertions
+
+internal fun AbstractRenderAsJsonRenderer.assertJsonDataFieldEquals(expected: String?) {
+    Assertions.assertEquals(expected, jsonDataField.getText(), ".jsonDataField.text")
+}
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt
index 25eb575cd4c..b21775812d3 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRendererTest.kt
@@ -17,119 +17,134 @@
 
 package org.apache.jmeter.extractor.json.render
 
-import javax.swing.JTabbedPane
-
-import org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer
-import org.apache.jmeter.junit.categories.NeedGuiTests
-import org.apache.jmeter.junit.spock.JMeterSpec
+import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.samplers.SampleResult
+import org.apache.jmeter.test.gui.DisabledIfHeadless
 import org.apache.jmeter.util.JMeterUtils
-import org.junit.experimental.categories.Category
+import org.intellij.lang.annotations.Language
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.nio.charset.StandardCharsets
+import javax.swing.JTabbedPane
+
+class RenderAsJmesPathRendererTest : JMeterTestCase() {
+    val sut = RenderAsJmesPathRenderer()
 
-import spock.lang.IgnoreIf
+    data class RenderCase(
+        @param:Language("json") val input: String,
+        @param:Language("json") val output: String
+    )
 
-class RenderAsJmesPathRendererSpec extends JMeterSpec {
-    def sut = new RenderAsJmesPathRenderer()
+    data class ExecuteCase(
+        @param:Language("json") val input: String,
+        val expression: String,
+        val output: String
+    )
 
-    def "init of component doesn't fail"() {
-        when:
-            sut.init()
-        then:
-            noExceptionThrown()
-            sut.jsonWithExtractorPanel != null;
+    companion object {
+        @JvmStatic
+        fun renderCases() = listOf(
+            RenderCase("This is not json", "This is not json"),
+            RenderCase(
+                """{name:"Ludwig",age: 23,city: "Bonn"}""",
+                """
+                {
+                    "city": "Bonn",
+                    "name": "Ludwig",
+                    "age": 23
+                }
+                """.trimIndent()
+            ),
+        )
+
+        @JvmStatic
+        fun executeCases() = listOf(
+            ExecuteCase("{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}", "name", "Result[0]=Ludwig\n"),
+            ExecuteCase("{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}", "age", "Result[0]=23\n"),
+            ExecuteCase("{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}", "name1", "NO MATCH"),
+        )
     }
 
-    @IgnoreIf({ JMeterSpec.isHeadless() })
-    def "render image"() {
-        given:
-            sut.init()
-            def sampleResult = new SampleResult();
-        when:
-            sut.renderImage(sampleResult)
-        then:
-            sut.jsonDataField.getText() == JMeterUtils.getResString("render_no_text")
+    @Test
+    fun `init of component doesn't fail`() {
+        sut.init()
+        assertNotNull(sut.jsonWithExtractorPanel, ".jsonWithExtractorPanel")
     }
 
-    def "render null Response"() {
-        given:
-            sut.init()
-            def sampleResult = new SampleResult();
-        when:
-            sut.renderResult(sampleResult)
-        then:
-            sut.jsonDataField.getText() == ""
+    @Test
+    @DisabledIfHeadless
+    fun `render image`() {
+        sut.init()
+        val sampleResult = SampleResult()
+        sut.renderImage(sampleResult)
+        sut.assertJsonDataFieldEquals(JMeterUtils.getResString("render_no_text"))
     }
 
-    @IgnoreIf({ JMeterSpec.isHeadless() })
-    def "render '#input' as JSON Response to '#output'"() {
-        given:
-            sut.init();
-            def sampleResult = new SampleResult();
-        when:
-            sampleResult.setResponseData(input);
-            sut.renderResult(sampleResult)
-        then:
-            output == sut.jsonDataField.getText()
-        where:
-            input               |   output
-            "This is not json"  |   "This is not json"
-            "{name:\"Ludwig\",age: 23,city: \"Bonn\"}" | '''{
-    "city": "Bonn",
-    "name": "Ludwig",
-    "age": 23
-}'''
+    @Test
+    fun `render null Response`() {
+        sut.init()
+        val sampleResult = SampleResult()
+        sut.renderResult(sampleResult)
+        sut.assertJsonDataFieldEquals("")
     }
 
-    def "execute '#expression' on '#input' results into '#output'"() {
-        given:
-            sut.init();
-            sut.expressionField.setText(expression);
-            def sampleResult = new SampleResult();
-        when:
-            sut.executeTester(input);
-        then:
-            output == sut.resultField.getText()
-        where:
-            input               | expression          | output
-            "{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}"   | "name"           | "Result[0]=Ludwig\n"
-            "{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}"   | "age"           | "Result[0]=23\n"
-            "{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}" | "name1" | "NO MATCH"
+    @DisabledIfHeadless
+    @ParameterizedTest
+    @MethodSource("renderCases")
+    fun `render JSON Response`(case: RenderCase) {
+        sut.init()
+        val sampleResult = SampleResult()
+        sampleResult.setResponseData(case.input, StandardCharsets.UTF_8.name())
+        sut.renderResult(sampleResult)
+
+        sut.assertJsonDataFieldEquals(case.output)
     }
 
-    def "clearData clears expected fields"() {
-        given:
-            sut.init()
-            sut.jsonDataField.setText("blabla")
-            sut.resultField.setText("blabla")
-        when:
-            sut.clearData()
-        then:
-            sut.jsonDataField.getText() == ""
-            sut.resultField.getText() == ""
+    @ParameterizedTest
+    @MethodSource("executeCases")
+    fun `execute expression`(case: ExecuteCase) {
+        sut.init()
+        sut.expressionField.text = case.expression
+        sut.executeTester(case.input)
+
+        assertEquals(case.output, sut.resultField.getText(), ".resultField.text")
     }
 
-    def "setupTabPane adds the tab to rightSide"() {
-        given:
-            sut.init()
-            def rightSideTabbedPane = new JTabbedPane();
-            sut.setRightSide(rightSideTabbedPane)
-        when:
-            sut.setupTabPane()
-        then:
-            sut.rightSide.getTabCount() == 1
-            // Investigate why it's failing
-            // sut.rightSide.getTabComponentAt(0) == sut.jsonWithExtractorPanel
+    @Test
+    fun `clearData clears expected fields`() {
+        sut.init()
+        sut.jsonDataField.setText("blabla")
+        sut.resultField.setText("blabla")
+
+        sut.clearData()
+
+        assertEquals("", sut.resultField.getText(), ".resultField.text")
+        sut.assertJsonDataFieldEquals("")
+    }
+
+    @Test
+    fun `setupTabPane adds the tab to rightSide`() {
+        sut.init()
+        val rightSideTabbedPane = JTabbedPane()
+        sut.rightSide = rightSideTabbedPane
+
+        sut.setupTabPane()
+        assertEquals(1, sut.rightSide.getTabCount(), ".rightSide.getTabCount()")
+
+        // Investigate why it's failing
+        // sut.rightSide.getTabComponentAt(0) == sut.jsonWithExtractorPanel
     }
 
-    def "setupTabPane called twice does not add twice the tab"() {
-        given:
-            sut.init()
-            def rightSideTabbedPane = new JTabbedPane();
-            sut.setRightSide(rightSideTabbedPane)
-            sut.setupTabPane()
-        when:
-            sut.setupTabPane()
-        then:
-            sut.rightSide.getTabCount() == 1
+    @Test
+    fun `setupTabPane called twice does not add twice the tab`() {
+        sut.init()
+        val rightSideTabbedPane = JTabbedPane()
+        sut.rightSide = rightSideTabbedPane
+        sut.setupTabPane()
+        sut.setupTabPane()
+        assertEquals(1, sut.rightSide.getTabCount(), ".rightSide.getTabCount()")
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt
index c6404aae9bc..c046707b11a 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererTest.kt
@@ -17,115 +17,134 @@
 
 package org.apache.jmeter.extractor.json.render
 
-import javax.swing.JTabbedPane
-
-import org.apache.jmeter.junit.spock.JMeterSpec
+import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.samplers.SampleResult
+import org.apache.jmeter.test.gui.DisabledIfHeadless
 import org.apache.jmeter.util.JMeterUtils
+import org.intellij.lang.annotations.Language
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.nio.charset.StandardCharsets
+import javax.swing.JTabbedPane
+
+class RenderAsJsonRendererTest : JMeterTestCase() {
+    val sut = RenderAsJsonRenderer()
+
+    data class RenderCase(
+        @param:Language("json") val input: String,
+        @param:Language("json") val output: String
+    )
 
-import spock.lang.IgnoreIf
+    data class ExecuteCase(
+        @param:Language("json") val input: String,
+        @param:Language("jsonpath") val expression: String,
+        val output: String
+    )
 
-class RenderAsJsonRendererSpec extends JMeterSpec {
-    def sut = new RenderAsJsonRenderer()
+    companion object {
+        @JvmStatic
+        fun renderCases() = listOf(
+            RenderCase("This is not json", "This is not json"),
+            RenderCase(
+                """{name:"Ludwig",age: 23,city: "Bonn"}""",
+                """
+                {
+                    "city": "Bonn",
+                    "name": "Ludwig",
+                    "age": 23
+                }
+                """.trimIndent()
+            ),
+        )
 
-    def "init of component doesn't fail"() {
-        when:
-            sut.init()
-        then:
-            noExceptionThrown()
-            sut.jsonWithExtractorPanel != null
+        @JvmStatic
+        fun executeCases() = listOf(
+            ExecuteCase("{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}", "$..name", "Result[0]=Ludwig\n"),
+            ExecuteCase("This is not json", "$..name", "NO MATCH"),
+            ExecuteCase(
+                "{\"name\":\"Ludwig\",\"age\": 23,\"city\": \"Bonn\"}",
+                "$..",
+                "Exception: Path must not end with a '.' or '..'"
+            ),
+        )
     }
 
-    @IgnoreIf({ JMeterSpec.isHeadless() })
-    def "render image"() {
-        given:
-            sut.init()
-            def sampleResult = new SampleResult()
-        when:
-            sut.renderImage(sampleResult)
-        then:
-            sut.jsonDataField.getText() == JMeterUtils.getResString("render_no_text")
+    @Test
+    fun `init of component doesn't fail`() {
+        sut.init()
+        assertNotNull(sut.jsonWithExtractorPanel, "jsonWithExtractorPanel")
     }
 
-    def "render null Response"() {
-        given:
-            sut.init()
-            def sampleResult = new SampleResult()
-        when:
-            sut.renderResult(sampleResult)
-        then:
-            sut.jsonDataField.getText() == ""
+    @Test
+    @DisabledIfHeadless
+    fun `render image`() {
+        sut.init()
+        val sampleResult = SampleResult()
+        sut.renderImage(sampleResult)
+        sut.assertJsonDataFieldEquals(JMeterUtils.getResString("render_no_text"))
     }
 
-    @IgnoreIf({ JMeterSpec.isHeadless() })
-    def "render '#input' as JSON Response to '#output'"() {
-        given:
-            sut.init()
-            def sampleResult = new SampleResult()
-            sampleResult.setResponseData(input)
-        when:
-            sut.renderResult(sampleResult)
-        then:
-            output == sut.jsonDataField.getText()
-        where:
-            input                                      | output
-            "This is not json"                         | "This is not json"
-            "{name:\"Ludwig\",age: 23,city: \"Bonn\"}" | '''{
-    "city": "Bonn",
-    "name": "Ludwig",
-    "age": 23
-}'''
+    @Test
+    fun `render null Response`() {
+        sut.init()
+        val sampleResult = SampleResult()
+        sut.renderResult(sampleResult)
+        sut.assertJsonDataFieldEquals("")
     }
 
-    def "execute '#expression' on '#input' results into '#output'"() {
-        given:
-            sut.init()
-            sut.expressionField.setText(expression)
-        when:
-            sut.executeTester(input)
-        then:
-            output == sut.resultField.getText()
-        where:
-            input                                      | expression | output
-            "{name:\"Ludwig\",age: 23,city: \"Bonn\"}" | "\$..name" | "Result[0]=Ludwig\n"
-            "This is not json"                         | "\$..name" | "NO MATCH"
-            "{name:\"Ludwig\",age: 23,city: \"Bonn\"}" | "\$.."     | "Exception: Path must not end with a '.' or '..'"
+    @DisabledIfHeadless
+    @ParameterizedTest
+    @MethodSource("renderCases")
+    fun `render JSON Response`(case: RenderCase) {
+        sut.init()
+        val sampleResult = SampleResult()
+        sampleResult.setResponseData(case.input, StandardCharsets.UTF_8.name())
+        sut.renderResult(sampleResult)
+
+        sut.assertJsonDataFieldEquals(case.output)
+    }
+
+    @ParameterizedTest
+    @MethodSource("executeCases")
+    fun `execute expression`(case: ExecuteCase) {
+        sut.init()
+        sut.expressionField.text = case.expression
+        sut.executeTester(case.input)
+
+        assertEquals(case.output, sut.resultField.getText(), ".resultField.text")
     }
 
-    def "clearData clears expected fields"() {
-        given:
-            sut.init()
-            sut.jsonDataField.setText("blabla")
-            sut.resultField.setText("blabla")
-        when:
-            sut.clearData()
-        then:
-            sut.jsonDataField.getText() == ""
-            sut.resultField.getText() == ""
+    @Test
+    fun `clearData clears expected fields`() {
+        sut.init()
+        sut.jsonDataField.text = "blabla"
+        sut.resultField.text = "blabla"
+        sut.clearData()
+        assertEquals("", sut.resultField.getText(), ".resultField.text")
+        sut.assertJsonDataFieldEquals("")
     }
 
-    def "setupTabPane adds the tab to rightSide"() {
-        given:
-            sut.init()
-            def rightSideTabbedPane = new JTabbedPane()
-            sut.setRightSide(rightSideTabbedPane)
-        when:
-            sut.setupTabPane()
-        then:
-            sut.rightSide.getTabCount() == 1
-            // Investigate why it's failing
-            // sut.rightSide.getTabComponentAt(0) == sut.jsonWithExtractorPanel
+    @Test
+    fun `setupTabPane adds the tab to rightSide`() {
+        sut.init()
+        val rightSideTabbedPane = JTabbedPane()
+        sut.rightSide = rightSideTabbedPane
+        sut.setupTabPane()
+        assertEquals(1, sut.rightSide.tabCount, ".rightSide.getTabCount()")
+        // Investigate why it's failing
+        // sut.rightSide.getTabComponentAt(0) == sut.jsonWithExtractorPanel
     }
 
-    def "setupTabPane called twice does not add twice the tab"() {
-        given:
-            sut.init()
-            def rightSideTabbedPane = new JTabbedPane()
-            sut.setRightSide(rightSideTabbedPane)
-            sut.setupTabPane()
-        when:
-            sut.setupTabPane()
-        then:
-            sut.rightSide.getTabCount() == 1
+    @Test
+    fun `setupTabPane called twice does not add twice the tab`() {
+        sut.init()
+        val rightSideTabbedPane = JTabbedPane()
+        sut.rightSide = rightSideTabbedPane
+        sut.setupTabPane()
+        sut.setupTabPane()
+        assertEquals(1, sut.rightSide.tabCount, ".rightSide.getTabCount()")
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt
index dae6286b79f..f78afd6389a 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/timers/UniformRandomTimerTest.kt
@@ -17,50 +17,52 @@
 
 package org.apache.jmeter.timers
 
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-class UniformRandomTimerSpec extends Specification {
+class UniformRandomTimerTest {
+    data class RangeCase(val delay: String, val range: Double, val min: Long, val max: Long)
 
-    def sut = new UniformRandomTimer()
+    val sut = UniformRandomTimer()
 
-    def "default delay is 0"() {
-        when:
-            def computedDelay = sut.delay()
-        then:
-            computedDelay == 0L
+    companion object {
+        @JvmStatic
+        fun rangeCases() = listOf(
+            RangeCase("1", 10.5, 1, 11),
+            RangeCase("1", 0.1, 1, 1),
+            RangeCase("0", -50.0, 0, 50),
+        )
     }
 
-    def "default range is 0"() {
-        when:
-            def actualRange = sut.range
-        then:
-            actualRange == 0L
+    @Test
+    fun `default delay is 0`() {
+        assertEquals(0L, sut.delay(), ".delay()")
     }
 
-    def "delay can be set via a String"() {
-        given:
-            sut.setDelay("1")
-        when:
-            def computedDelay = sut.delay()
-        then:
-            computedDelay == 1L
+    @Test
+    fun `default range is 0`() {
+        assertEquals(0.0, sut.range, ".range")
     }
 
-    @Unroll
-    def "#delay <= computedDelay <= trunc(#delay + abs(#range))"() {
-        given:
-            sut.setDelay(delay)
-            sut.setRange(range)
-        when:
-            def computedDelay = sut.delay()
-        then:
-            min <= computedDelay
-            computedDelay <= max
-        where:
-            delay | range | min | max
-            "1"   | 10.5  | 1   | 11
-            "1"   | 0.1   | 1   | 1
-            "0"   | -50.0 | 0   | 50
+    @Test
+    fun `delay can be set via a String`() {
+        sut.delay = "1"
+        assertEquals(1L, sut.delay(), ".delay()")
+    }
+
+    @ParameterizedTest
+    @MethodSource("rangeCases")
+    fun `computed delay should be within range`(case: RangeCase) {
+        sut.delay = case.delay
+        sut.range = case.range
+
+        val computedDelay = sut.delay()
+
+        if (computedDelay < case.min || computedDelay > case.max) {
+            fail("computed delay $computedDelay should be within [${case.min}..${case.max}]")
+        }
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt
index 1e6a628065a..af9a46f3e6b 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderTest.kt
@@ -17,106 +17,109 @@
 
 package org.apache.jmeter.visualizers.backend.graphite
 
-import java.time.Instant
-
+import io.mockk.mockk
+import io.mockk.verify
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import java.time.Instant
 
-import spock.lang.Specification
-
-class PickleGraphiteMetricsSenderSpec extends Specification {
+class PickleGraphiteMetricsSenderTest {
 
-    def sut = new PickleGraphiteMetricsSender()
+    private val sut = PickleGraphiteMetricsSender()
 
-    def "new sender has no metrics"() {
-        expect:
-            sut.metrics.isEmpty()
+    private fun assertMetricsIsEmpty() {
+        assertTrue(sut.metrics.isEmpty(), ".metrics.isEmpty()")
     }
 
-    def "adding metric to sender creates correct MetricTuple"() {
-        given:
-            def expectedName = "prefix-contextName.metricName"
-            def expectedTS = 1000000
-            def expectedVal = "value"
-
-            sut.setup("host", 1024, "prefix-")
-        when:
-            sut.addMetric(expectedTS, "contextName", "metricName", expectedVal)
-        then:
-            def actualMetrics = sut.metrics
-            actualMetrics.size() == 1
-            def actualMetric = actualMetrics.get(0)
-            actualMetric.name == expectedName
-            actualMetric.timestamp == expectedTS
-            actualMetric.value == expectedVal
+    @Test
+    fun `new sender has no metrics`() {
+        assertMetricsIsEmpty()
     }
 
-    def "writeAndSendMetrics does not attempt connection if there's nothing to send"() {
-        given:
-            sut.setup("non-existant-host", 1024, "prefix-")
-        when:
-            sut.writeAndSendMetrics()
-        then:
-            sut.metrics.isEmpty()
-            noExceptionThrown()
+    @Test
+    fun `adding metric to sender creates correct MetricTuple`() {
+        val expectedTS = 1000000L
+        val expectedVal = "value"
+
+        sut.setup("host", 1024, "prefix-")
+
+        sut.addMetric(expectedTS, "contextName", "metricName", expectedVal)
+
+        assertEquals(
+            "MetricTuple(name=prefix-contextName.metricName, timestamp=1000000, value=value)",
+            sut.metrics.joinToString { "MetricTuple(name=${it.name}, timestamp=${it.timestamp}, value=${it.value})" },
+            ".metrics"
+        )
     }
 
-    def "writeAndSendMetrics connects and sends if there's something to send, dropping metrics on connection failure, without throwing exceptions"() {
-        given:
-            SocketConnectionInfos socketConnInfoMock = Mock()
-            GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> objectPoolStub = Mock()
-            sut.setup(socketConnInfoMock, objectPoolStub, "prefix-")
-            sut.addMetric(1, "contextName", "metricName", "val")
-        when:
-            sut.writeAndSendMetrics()
-        then:
-            1 * objectPoolStub.borrowObject(socketConnInfoMock)
-            sut.metrics.isEmpty()
-            noExceptionThrown()
+    @Test
+    fun `writeAndSendMetrics does not attempt connection if there's nothing to send`() {
+        sut.setup("non-existant-host", 1024, "prefix-")
+        sut.writeAndSendMetrics()
+        assertMetricsIsEmpty()
     }
 
-    def "destroy closes outputStreamPool"() {
-        given:
-            GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> objectPoolStub = Mock()
-            sut.setup(Mock(SocketConnectionInfos), objectPoolStub, "prefix-")
-            sut.addMetric(1, "contextName", "metricName", "val")
-        when:
-            sut.destroy()
-        then:
-            1 * objectPoolStub.close()
-            // TODO: should destroy also set metrics to null or are we relying on the original reference to be removed after destroy is called?
-            sut.metrics.size() == 1
-            noExceptionThrown()
+    @Test
+    fun `writeAndSendMetrics connects and sends if there's something to send, dropping metrics on connection failure, without throwing exceptions`() {
+        val socketConnInfoMock = mockk<SocketConnectionInfos>()
+        val objectPoolStub = mockk<GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream>>()
+        sut.setup(socketConnInfoMock, objectPoolStub, "prefix-")
+        sut.addMetric(1, "contextName", "metricName", "val")
+
+        sut.writeAndSendMetrics()
+        verify(exactly = 1) { objectPoolStub.borrowObject(socketConnInfoMock) }
+        assertMetricsIsEmpty()
     }
 
-    def static newMetric(String name, long timestamp, String value) {
-        return new GraphiteMetricsSender.MetricTuple(name, timestamp, value)
+    @Test
+    fun `destroy closes outputStreamPool`() {
+        val objectPoolStub = mockk<GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream>>(relaxed = true)
+        sut.setup(mockk<SocketConnectionInfos>(), objectPoolStub, "prefix-")
+        sut.addMetric(1, "contextName", "metricName", "val")
+
+        sut.destroy()
+
+        verify(exactly = 1) { objectPoolStub.close() }
+        // TODO: should destroy also set metrics to null or are we relying on the original reference to be removed after destroy is called?
+        assertEquals(1, sut.metrics.size, ".metrics.size")
     }
 
-    def "convertMetricsToPickleFormat produces expected result for one metric"() {
-        given:
-            def name = "name"
-            def timeStamp = Instant.now().getEpochSecond()
-            def value = "value-1.23"
-            def metric = newMetric(name, timeStamp, value)
-            def metrics = Collections.singletonList(metric)
-        when:
-            def result = sut.convertMetricsToPickleFormat(metrics)
-        then:
-            result == "(l(S'${name}'\n(L${timeStamp}L\nS'${value}'\ntta."
+    private fun newMetric(name: String, timestamp: Long, value: String) =
+        GraphiteMetricsSender.MetricTuple(name, timestamp, value)
+
+    @Test
+    fun `convertMetricsToPickleFormat produces expected result for one metric`() {
+        val name = "name"
+        val timeStamp = Instant.now().getEpochSecond()
+        val value = "value-1.23"
+        val metric = newMetric(name, timeStamp, value)
+        val metrics = listOf(metric)
+
+        val result = PickleGraphiteMetricsSender.convertMetricsToPickleFormat(metrics)
+
+        assertEquals(
+            "(l(S'$name'\n(L${timeStamp}L\nS'$value'\ntta.",
+            result,
+        )
     }
 
-    def "convertMetricsToPickleFormat produces expected result for multiple metrics"() {
-        given:
-            def name = "name"
-            def timeStamp = Instant.now().getEpochSecond()
-            def value = "value-1.23"
-            def metric = newMetric(name, timeStamp, value)
-            def metrics = Arrays.asList(metric, metric)
-        when:
-            def result = sut.convertMetricsToPickleFormat(metrics)
-        then:
-            result == "(l" +
-                    "(S'${name}'\n(L${timeStamp}L\nS'${value}'\ntta" +
-                    "(S'${name}'\n(L${timeStamp}L\nS'${value}'\ntta."
+    @Test
+    fun `convertMetricsToPickleFormat produces expected result for multiple metrics`() {
+        val name = "name"
+        val timeStamp = Instant.now().getEpochSecond()
+        val value = "value-1.23"
+        val metric = newMetric(name, timeStamp, value)
+        val metrics = listOf(metric, metric)
+
+        val result = PickleGraphiteMetricsSender.convertMetricsToPickleFormat(metrics)
+
+        assertEquals(
+            "(l" +
+                "(S'$name'\n(L${timeStamp}L\nS'$value'\ntta" +
+                "(S'$name'\n(L${timeStamp}L\nS'$value'\ntta.",
+            result,
+        )
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt
index 067e3d1972b..2112f08eced 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderTest.kt
@@ -17,73 +17,66 @@
 
 package org.apache.jmeter.visualizers.backend.graphite
 
+import io.mockk.mockk
+import io.mockk.verify
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 
-import spock.lang.Specification
+class TextGraphiteMetricsSenderTest {
 
-class TextGraphiteMetricsSenderSpec extends Specification {
+    private val sut = TextGraphiteMetricsSender()
 
-    def sut = new TextGraphiteMetricsSender()
+    private fun assertMetricsIsEmpty() {
+        Assertions.assertTrue(sut.metrics.isEmpty(), ".metrics.isEmpty()")
+    }
 
-    def "new sender has no metrics"() {
-        expect:
-            sut.metrics.isEmpty()
+    @Test
+    fun `new sender has no metrics`() {
+        assertMetricsIsEmpty()
     }
 
-    def "adding metric to sender creates correct MetricTuple"() {
-        given:
-            def expectedName = "prefix-contextName.metricName"
-            def expectedTS = 1000000
-            def expectedVal = "value"
+    @Test
+    fun `adding metric to sender creates correct MetricTuple`() {
+        val expectedTS = 1000000L
+        val expectedVal = "value"
 
-            sut.setup("host", 1024, "prefix-")
-        when:
-            sut.addMetric(expectedTS, "contextName", "metricName", expectedVal)
-        then:
-            def actualMetrics = sut.metrics
-            actualMetrics.size() == 1
-            def actualMetric = actualMetrics.get(0)
-            actualMetric.name == expectedName
-            actualMetric.timestamp == expectedTS
-            actualMetric.value == expectedVal
-    }
+        sut.setup("host", 1024, "prefix-")
+        sut.addMetric(expectedTS, "contextName", "metricName", expectedVal)
 
-    def "writeAndSendMetrics does not attempt connection if there's nothing to send"() {
-        given:
-            sut.setup("non-existant-host", 1024, "prefix-")
-        when:
-            sut.writeAndSendMetrics()
-        then:
-            sut.metrics.isEmpty()
-            noExceptionThrown()
+        Assertions.assertEquals(
+            "MetricTuple(name=prefix-contextName.metricName, timestamp=1000000, value=value)",
+            sut.metrics.joinToString { "MetricTuple(name=${it.name}, timestamp=${it.timestamp}, value=${it.value})" },
+            ".metrics"
+        )
     }
 
-    def "writeAndSendMetrics connects and sends if there's something to send, dropping metrics on connection failure, without throwing exceptions"() {
-        given:
-            SocketConnectionInfos socketConnInfoMock = Mock()
-            GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> objectPoolStub = Mock()
-            sut.setup(socketConnInfoMock, objectPoolStub, "prefix-")
-            sut.addMetric(1, "contextName", "metricName", "val")
-        when:
-            sut.writeAndSendMetrics()
-        then:
-            1 *  objectPoolStub.borrowObject(socketConnInfoMock)
-            sut.metrics.isEmpty()
-            noExceptionThrown()
+    @Test
+    fun `writeAndSendMetrics does not attempt connection if there's nothing to send`() {
+        sut.setup("non-existant-host", 1024, "prefix-")
+        sut.writeAndSendMetrics()
+        assertMetricsIsEmpty()
     }
 
-    def "destroy closes outputStreamPool"() {
-        given:
-            GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> objectPoolStub = Mock()
-            sut.setup(Mock(SocketConnectionInfos), objectPoolStub, "prefix-")
-            sut.addMetric(1, "contextName", "metricName", "val")
-        when:
-            sut.destroy()
-        then:
-            1 *  objectPoolStub.close()
-            // TODO: should destroy also set metrics to null or are we relying on the original reference to be removed after destroy is called?
-            sut.metrics.size() == 1
-            noExceptionThrown()
+    @Test
+    fun `writeAndSendMetrics connects and sends if there's something to send, dropping metrics on connection failure, without throwing exceptions`() {
+        val socketConnInfoMock = mockk<SocketConnectionInfos>()
+        val objectPoolStub = mockk<GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream>>()
+        sut.setup(socketConnInfoMock, objectPoolStub, "prefix-")
+        sut.addMetric(1, "contextName", "metricName", "val")
+        sut.writeAndSendMetrics()
+        verify(exactly = 1) { objectPoolStub.borrowObject(socketConnInfoMock) }
+        assertMetricsIsEmpty()
     }
 
+    @Test
+    fun `destroy closes outputStreamPool`() {
+        val objectPoolStub = mockk<GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream>>(relaxed = true)
+        sut.setup(mockk<SocketConnectionInfos>(), objectPoolStub, "prefix-")
+        sut.addMetric(1, "contextName", "metricName", "val")
+
+        sut.destroy()
+
+        verify(exactly = 1) { objectPoolStub.close() }
+    }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt
index 5390a2507bc..283b21ae19b 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientTest.kt
@@ -17,83 +17,102 @@
 
 package org.apache.jmeter.visualizers.backend.influxdb
 
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyOrder
 import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.visualizers.backend.BackendListenerContext
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.fail
 
-import spock.lang.Specification
+class InfluxDBRawBackendListenerClientTest {
 
-class InfluxDBRawBackendListenerClientSpec extends Specification {
+    val sut = InfluxDBRawBackendListenerClient()
+    private val defaultContext = BackendListenerContext(sut.getDefaultParameters())
 
-    def sut = new InfluxDBRawBackendListenerClient()
-    def defaultContext = new BackendListenerContext(sut.getDefaultParameters())
-
-    def createOkSample() {
-        def t = 1600123456789
-        def okSample = SampleResult.createTestSample(t - 100, t)
-        okSample.setLatency(42)
-        okSample.setConnectTime(7)
-        okSample.setSampleLabel("myLabel")
-        okSample.setThreadName("myThread")
-        okSample.setResponseOK()
-        return okSample
+    private fun createOkSample(): SampleResult {
+        val t = 1600123456789
+        return SampleResult.createTestSample(t - 100, t).apply {
+            latency = 42
+            connectTime = 7
+            sampleLabel = "myLabel"
+            threadName = "myThread"
+            setResponseOK()
+        }
     }
 
-    def "Default parameters contain minimum required options"() {
-        expect:
-            sut.getDefaultParameters()
-                    .getArgumentsAsMap()
-                    .keySet()
-                    .containsAll([
-                            "influxdbMetricsSender", "influxdbUrl",
-                            "influxdbToken", "measurement"])
+    @Test
+    fun `Default parameters contain minimum required options`() {
+        val actualKeys = sut.getDefaultParameters()
+            .getArgumentsAsMap()
+            .keys
+        val expectedKeys = setOf(
+            "influxdbMetricsSender", "influxdbUrl",
+            "influxdbToken", "measurement"
+        )
+        if (!actualKeys.containsAll(expectedKeys)) {
+            fail("Default arguments $actualKeys should include all keys of $expectedKeys")
+        }
     }
 
-    def "Provided args are used during setup"() {
-        when:
-            sut.setupTest(defaultContext)
-        then:
-            sut.measurement == sut.DEFAULT_MEASUREMENT
-            sut.influxDBMetricsManager.class.isAssignableFrom(HttpMetricsSender.class)
+    @Test
+    fun `Provided args are used during setup`() {
+        sut.setupTest(defaultContext)
+        assertEquals("jmeter", sut.measurement, ".measurement")
+        assertEquals(
+            HttpMetricsSender::class.java,
+            sut.influxDBMetricsManager::class.java,
+            ".influxDBMetricsManager.class"
+        )
     }
 
-    def "OK sample data is mapped correctly to InfluxDB tags and fields"() {
-        given:
-            def okSample = createOkSample()
-        when:
-            def tags = sut.createTags(okSample)
-            def fields = sut.createFields(okSample)
-        then:
-            tags == "status=ok,transaction=myLabel,threadName=myThread"
-            fields == "duration=100,ttfb=42,connectTime=7"
+    @Test
+    fun `OK sample data is mapped correctly to InfluxDB tags and fields`() {
+        val okSample = createOkSample()
+        assertEquals(
+            "status=ok,transaction=myLabel,threadName=myThread",
+            InfluxDBRawBackendListenerClient.createTags(okSample),
+            "createTags($okSample)"
+        )
+        assertEquals(
+            "duration=100,ttfb=42,connectTime=7",
+            InfluxDBRawBackendListenerClient.createFields(okSample),
+            "createFields($okSample)"
+        )
     }
 
-    def "Failed sample data is mapped correctly to InfluxDB tags and fields"() {
-        given:
-            def koSample = new SampleResult()
-            koSample.setSampleLabel("myLabel")
-            koSample.setThreadName("myThread")
-        expect:
-            sut.createTags(koSample) == "status=ko,transaction=myLabel,threadName=myThread"
+    @Test
+    fun `Failed sample data is mapped correctly to InfluxDB tags and fields`() {
+        val koSample = SampleResult().apply {
+            sampleLabel = "myLabel"
+            threadName = "myThread"
+        }
+        assertEquals(
+            "status=ko,transaction=myLabel,threadName=myThread",
+            InfluxDBRawBackendListenerClient.createTags(koSample),
+            "createTags($koSample)"
+        )
     }
 
-    def "Upon handling sample result data is added to influxDBMetricsManager and written"() {
-        given:
-            def mockSender = Mock(InfluxdbMetricsSender)
-            def sut = new InfluxDBRawBackendListenerClient(mockSender)
-        when:
-            sut.handleSampleResults([createOkSample()], defaultContext)
-        then:
-            1 * mockSender.addMetric(_, _, _, _)
-            1 * mockSender.writeAndSendMetrics()
+    @Test
+    fun `Upon handling sample result data is added to influxDBMetricsManager and written`() {
+        val mockSender = mockk<InfluxdbMetricsSender>(relaxed = true)
+        val sut = InfluxDBRawBackendListenerClient(mockSender)
+        sut.handleSampleResults(listOf(createOkSample()), defaultContext)
+        verifyOrder {
+            mockSender.addMetric(any(), any(), any(), any())
+            mockSender.writeAndSendMetrics()
+        }
     }
 
-    def "teardownTest calls destroy on influxDBMetricsManager"() {
-        given:
-            def mockSender = Mock(InfluxdbMetricsSender)
-            def sut = new InfluxDBRawBackendListenerClient(mockSender)
-        when:
-            sut.teardownTest()
-        then:
-            1 * mockSender.destroy()
+    @Test
+    fun `teardownTest calls destroy on influxDBMetricsManager`() {
+        val mockSender = mockk<InfluxdbMetricsSender>(relaxed = true)
+        val sut = InfluxDBRawBackendListenerClient(mockSender)
+        sut.teardownTest(defaultContext)
+        verify(exactly = 1) {
+            mockSender.destroy()
+        }
     }
 }
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt
index bb787848052..03b5b53490a 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClientTest.kt
@@ -18,32 +18,40 @@
 package org.apache.jmeter.visualizers.backend.influxdb
 
 import org.apache.jmeter.visualizers.backend.BackendListenerContext
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
-import spock.lang.Specification
+class InfluxdbBackendListenerClientTest {
 
-class InfluxdbBackendListenerClientSpec extends Specification {
+    val sut = InfluxdbBackendListenerClient()
+    private val defaultContext = BackendListenerContext(sut.getDefaultParameters())
 
-    def sut = new InfluxdbBackendListenerClient()
-    def defaultContext = new BackendListenerContext(sut.getDefaultParameters())
-
-    def "setupTest with default config does not raise an exception"() {
-        when:
-            sut.setupTest(defaultContext)
-        then:
-            noExceptionThrown()
+    @Test
+    fun `setupTest with default config does not raise an exception`() {
+        sut.setupTest(defaultContext)
     }
 
-    def "Sending metrics when empty does not raise an exception"() {
-        given:
-            sut.setupTest(defaultContext)
-        when:
-            sut.run()
-        then:
-            noExceptionThrown()
+    @Test
+    fun `Sending metrics when empty does not raise an exception`() {
+        sut.setupTest(defaultContext)
+        sut.run()
     }
 
-    def "Default parameters are equal to default args"() {
-        expect:
-            sut.getDefaultParameters().getArgumentsAsMap() == InfluxdbBackendListenerClient.DEFAULT_ARGS
+    @Test
+    fun `Default parameters are equal to default args`() {
+        assertEquals(
+            mapOf(
+                "influxdbMetricsSender" to "org.apache.jmeter.visualizers.backend.influxdb.HttpMetricsSender",
+                "influxdbUrl" to "http://host_to_change:8086/write?db=jmeter",
+                "application" to "application name",
+                "measurement" to "jmeter",
+                "summaryOnly" to "false",
+                "samplersRegex" to ".*",
+                "percentiles" to "99;95;90",
+                "testTitle" to "Test name",
+                "eventTags" to ""
+            ),
+            sut.getDefaultParameters().getArgumentsAsMap()
+        )
     }
 }

From a7706f03dd4e88b696e6cf199d6893a8e7ff3341 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 08:54:40 +0300
Subject: [PATCH 0731/1037] refactor: rename .groovy to .kt in :src:dist-check
 to allow Git track history better

---
 .../org/apache/jmeter/engine/util/PackageTest.kt}                 | 0
 .../org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt}      | 0
 .../org/apache/jmeter/gui/util/MenuFactoryTest.kt}                | 0
 .../org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt}    | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename src/dist-check/src/test/{groovy/org/apache/jmeter/engine/util/PackageSpec.groovy => kotlin/org/apache/jmeter/engine/util/PackageTest.kt} (100%)
 rename src/dist-check/src/test/{groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy => kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt} (100%)
 rename src/dist-check/src/test/{groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy => kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt} (100%)
 rename src/dist-check/src/test/{groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy => kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt} (100%)

diff --git a/src/dist-check/src/test/groovy/org/apache/jmeter/engine/util/PackageSpec.groovy b/src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt
similarity index 100%
rename from src/dist-check/src/test/groovy/org/apache/jmeter/engine/util/PackageSpec.groovy
rename to src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt
diff --git a/src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
similarity index 100%
rename from src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy
rename to src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
diff --git a/src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt
similarity index 100%
rename from src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy
rename to src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt
diff --git a/src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
similarity index 100%
rename from src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy
rename to src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt

From 5c7d63e889de28838d59af7b5389704f1f984021 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 11:48:23 +0300
Subject: [PATCH 0732/1037] refactor: migrate :src:dist-check Groovy tests to
 Kotlin

---
 .../gui/action/HtmlReportGenerator.java       |   4 +-
 .../apache/jmeter/gui/util/MenuFactory.java   |   9 +-
 .../apache/jmeter/engine/util/PackageTest.kt  | 211 ++++++++--------
 .../gui/action/HtmlReportGeneratorTest.kt     | 228 ++++++++++--------
 .../apache/jmeter/gui/util/MenuFactoryTest.kt |  23 +-
 .../report/dashboard/ReportGeneratorTest.kt   | 110 +++------
 6 files changed, 301 insertions(+), 284 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 781aadf45d2..7b21789a1fb 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -28,6 +28,7 @@
 
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.exec.SystemCommand;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -136,7 +137,8 @@ private List<String> createGenerationCommand() {
      *
      * @return whether or not the files are correct
      */
-    private List<String> checkArguments() {
+    @VisibleForTesting
+    List<String> checkArguments() {
         List<String> errors = new ArrayList<>();
 
         String csvError = checkFile(new File(csvFilePath));
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
index 5c908326f9a..92d825fb89a 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java
@@ -61,6 +61,7 @@
 import org.apache.jmeter.visualizers.Printable;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.reflect.ClassFinder;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -115,6 +116,11 @@ public final class MenuFactory {
         }
     }
 
+    @VisibleForTesting
+    static Map<String, List<MenuInfo>> getMenuMap() {
+        return menuMap;
+    }
+
     private static Set<String> classesToSkip() {
         return Arrays.stream(JMeterUtils.getPropDefault("not_in_menu", "").split(","))
                 .map(String::trim)
@@ -378,7 +384,8 @@ public static JPopupMenu getDefaultControllerMenu() {
         return pop;
     }
 
-    private static JMenu createDefaultAddMenu() {
+    @VisibleForTesting
+    static JMenu createDefaultAddMenu() {
         String addAction = ActionNames.ADD;
         JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
         addDefaultAddMenuToMenu(addMenu, addAction);
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt
index 130ba4367f0..043719dff87 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/engine/util/PackageTest.kt
@@ -18,121 +18,138 @@
 package org.apache.jmeter.engine.util
 
 import org.apache.jmeter.samplers.SampleResult
-import org.apache.jmeter.testelement.property.JMeterProperty
+import org.apache.jmeter.testelement.property.FunctionProperty
 import org.apache.jmeter.testelement.property.StringProperty
+import org.apache.jmeter.threads.JMeterContext
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
-
-import spock.lang.Specification
-import spock.lang.Unroll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
 /**
  * To run this test stand-alone, ensure that ApacheJMeter_functions.jar is on the classpath,
  * as it is needed to resolve the functions.
  */
-class PackageSpec extends Specification {
+class PackageTest {
 
-    def transformer
-    def jmctx
+    lateinit var transformer: ReplaceStringWithFunctions
+    lateinit var jmctx: JMeterContext
 
-    def setup() {
-        def variables = ["my_regex": ".*",
-                         "server"  : "jakarta.apache.org"]
-        transformer = new ReplaceStringWithFunctions(new CompoundVariable(), variables)
-        jmctx = JMeterContextService.getContext()
-        jmctx.setVariables(new JMeterVariables())
-        jmctx.setSamplingStarted(true)
-        def result = new SampleResult()
-        result.setResponseData('<a>hello world</a> costs: $3.47,$5.67', null)
-        jmctx.setPreviousResult(result)
-        jmctx.getVariables().put("server", "jakarta.apache.org")
-        jmctx.getVariables().put("my_regex", ".*")
-    }
+    data class TransformCase(
+        val propertyValue: String,
+        val stringValue: String,
+        val type: Class<*> = StringProperty::class.java,
+    )
 
-    def testFunctionParse1() {
-        given:
-            StringProperty prop = new StringProperty("date",
-                    '${__javaScript((new Date().getDate() / 100).toString()' +
-                            '.substr(${__javaScript(1+1,d\\,ay)}\\,2),heute)}')
-        when:
-            JMeterProperty newProp = transformer.transformValue(prop)
-            newProp.setRunningVersion(true)
-        then:
-            newProp.getClass().getName() == "org.apache.jmeter.testelement.property.FunctionProperty"
-            newProp.recoverRunningVersion(null)
-            Integer.parseInt(newProp.getStringValue()) >= 0
-            jmctx.getVariables().getObject("d,ay") == "2"
+    companion object {
+        @JvmStatic
+        fun transformCases() = listOf(
+            TransformCase("", ""),
+            TransformCase("just some text", "just some text"),
+            TransformCase("\${__regexFunction(<a>(.*)</a>,$1$)}", "hello world", type = FunctionProperty::class.java),
+            TransformCase(
+                "It should say:\\\${\${__regexFunction(<a>(.+o)(.*)</a>,$1$$2$)}}",
+                "It should say:\${hello world}",
+                type = FunctionProperty::class.java,
+            ),
+            TransformCase("\${non - existing; function}", "\${non - existing; function}", type = FunctionProperty::class.java),
+            TransformCase("\${server}", "jakarta.apache.org", type = FunctionProperty::class.java),
+            TransformCase("\${__regexFunction(<([a-z]*)>,$1$)}", "a", type = FunctionProperty::class.java),
+            TransformCase("\${__regexFunction((\\\\$\\d+\\.\\d+),$1$)}", "$3.47", type = FunctionProperty::class.java),
+            TransformCase("\${__regexFunction(([$]\\d+\\.\\d+),$1$)}", "$3.47", type = FunctionProperty::class.java),
+            TransformCase("\${__regexFunction((\\\\\\$\\d+\\.\\d+\\,\\\\$\\d+\\.\\d+),$1$)}", "$3.47,$5.67", type = FunctionProperty::class.java),
+            // Nested examples
+            TransformCase("\${__regexFunction(<a>(\${my_regex})</a>,$1$)}", "hello world", type = FunctionProperty::class.java),
+            TransformCase(
+                "\${__regexFunction(<a>(\${my_regex})</a>,$1$)}\${__regexFunction(<a>(.),$1$)}",
+                "hello worldh",
+                type = FunctionProperty::class.java,
+            ),
+            // N.B. See Bug 46831 which wanted to changed the behaviour of \$
+            // It's too late now, as this would invalidate some existing test plans,
+            // so document the current behaviour with some more tests.
+            // With no variable reference
+            TransformCase("\\\$a", "\\\$a"),
+            TransformCase("\\,", "\\,"),
+            TransformCase("\\\\", "\\\\"),
+            TransformCase("\\", "\\"),
+            TransformCase("\\x", "\\x"),
+            TransformCase(
+                "\\\$a \\, \\\\ \\ \\x \${server} \\\$b\\,z",
+                "\$a , \\ \\ \\x jakarta.apache.org \$b,z",
+                type = FunctionProperty::class.java
+            ),
+            TransformCase(
+                "\\\$a \\, \\\\ \\ \\x \${__missing(a)} \\\$b\\,z",
+                "\$a , \\ \\ \\x \${__missing(a)} \$b,z",
+                type = FunctionProperty::class.java
+            ),
+            TransformCase(
+                "\\\$a \\, \\\\ \\ \\x \${missing}      \\\$b\\,z",
+                "\$a , \\ \\ \\x \${missing}      \$b,z",
+                type = FunctionProperty::class.java
+            ),
+            TransformCase("\\\$a \\, \\\\ \${ z", "\$a , \\  z", type = FunctionProperty::class.java),
+        )
     }
 
-    @Unroll
-    def "test parsing StringProperty '#propertyValue' == '#stringValue'"() {
-        given:
-            StringProperty prop = new StringProperty("a", propertyValue)
-        when:
-            JMeterProperty newProp = transformer.transformValue(prop)
-            newProp.setRunningVersion(true)
-        then:
-            newProp.getClass().getName() == 'org.apache.jmeter.testelement.property.StringProperty'
-            newProp.getStringValue() == stringValue
-        where:
-            propertyValue    | stringValue
-            ""               | ""
-            "just some text" | "just some text"
+    @BeforeEach
+    fun setup() {
+        val variables = mapOf(
+            "my_regex" to ".*",
+            "server" to "jakarta.apache.org"
+        )
+        transformer = ReplaceStringWithFunctions(CompoundVariable(), variables)
+        jmctx = JMeterContextService.getContext()
+        jmctx.variables = JMeterVariables()
+        jmctx.isSamplingStarted = true
+        val result = SampleResult()
+        result.setResponseData("<a>hello world</a> costs: $3.47,$5.67", null)
+        jmctx.previousResult = result
+        jmctx.variables.put("server", "jakarta.apache.org")
+        jmctx.variables.put("my_regex", ".*")
     }
 
-    @Unroll
-    def "test parsing FunctionProperty '#propertyValue' == '#stringValue'"() {
-        given:
-            StringProperty prop = new StringProperty("a", propertyValue)
-        when:
-            JMeterProperty newProp = transformer.transformValue(prop)
-            newProp.setRunningVersion(true)
-        then:
-            newProp.getClass().getName() == 'org.apache.jmeter.testelement.property.FunctionProperty'
-            newProp.getStringValue() == stringValue
-        where:
-            propertyValue                                                                | stringValue
-            '${__regexFunction(<a>(.*)</a>,$1$)}'                                        | "hello world"
-            'It should say:\\${${__regexFunction(<a>(.+o)(.*)</a>,$1$$2$)}}'             | 'It should say:${hello world}'
-            '${non - existing; function}'                                                | '${non - existing; function}'
-            '${server}'                                                                  | "jakarta.apache.org"
-            '${__regexFunction(<([a-z]*)>,$1$)}'                                         | "a"
-            '${__regexFunction((\\\\$\\d+\\.\\d+),$1$)}'                                 | '$3.47'
-            '${__regexFunction(([$]\\d+\\.\\d+),$1$)}'                                   | '$3.47'
-            '${__regexFunction((\\\\\\$\\d+\\.\\d+\\,\\\\$\\d+\\.\\d+),$1$)}'            | '$3.47,$5.67'
+    @Test
+    fun testFunctionParse1() {
+        val prop = StringProperty(
+            "date",
+            "\${__javaScript((new Date().getDate() / 100).toString()" +
+                ".substr(\${__javaScript(1+1,d\\,ay)}\\,2),heute)}"
+        )
+        val newProp = transformer.transformValue(prop)
+        newProp.setRunningVersion(true)
 
-            // Nested examples
-            '${__regexFunction(<a>(${my_regex})</a>,$1$)}'                               | "hello world"
-            '${__regexFunction(<a>(${my_regex})</a>,$1$)}${__regexFunction(<a>(.),$1$)}' | "hello worldh"
+        assertEquals(FunctionProperty::class.java, newProp::class.java, "class of property $prop after transformation")
+        newProp.recoverRunningVersion(null)
+        newProp.getStringValue().let {
+            if (it?.toIntOrNull().let { it == null || it < 0 }) {
+                fail("Property value should be positive integer, but was: $it")
+            }
+        }
+        assertEquals("2", jmctx.variables.getObject("d,ay"), "Variable 'd,ay' value")
     }
 
-    @Unroll
-    def "Backslashes are removed before escaped dollar, comma and backslash with FunctionProperty"() {
-        // N.B. See Bug 46831 which wanted to changed the behaviour of \$
-        // It's too late now, as this would invalidate some existing test plans,
-        // so document the current behaviour with some more tests.
-        given:
-            StringProperty prop = new StringProperty("a", propertyValue)
-        when:
-            JMeterProperty newProp = transformer.transformValue(prop)
-            newProp.setRunningVersion(true)
-        then:
-            newProp.getClass().getName() == 'org.apache.jmeter.testelement.property.' + className
-            newProp.getStringValue() == stringValue
+    @ParameterizedTest
+    @MethodSource("transformCases")
+    fun transformValue(case: TransformCase) {
+        val prop = StringProperty("a", case.propertyValue)
+        val newProp = transformer.transformValue(prop)
+        newProp.setRunningVersion(true)
 
-        where:
-            propertyValue | className        | stringValue
-            // With no variable reference
-            '\\$a'        | "StringProperty" | '\\$a'
-            '\\,'         | "StringProperty" | '\\,'
-            '\\\\'        | "StringProperty" | '\\\\'
-            '\\'          | "StringProperty" | '\\'
-            '\\x'         | "StringProperty" | '\\x'
-        and: // With variable reference
-            '\\$a \\, \\\\ \\ \\x ${server} \\$b\\,z'       | "FunctionProperty" | '$a , \\ \\ \\x jakarta.apache.org $b,z'
-            '\\$a \\, \\\\ \\ \\x ${__missing(a)} \\$b\\,z' | "FunctionProperty" | '$a , \\ \\ \\x ${__missing(a)} $b,z'
-            '\\$a \\, \\\\ \\ \\x ${missing}      \\$b\\,z' | "FunctionProperty" | '$a , \\ \\ \\x ${missing}      $b,z'
-            '\\$a \\, \\\\ ${ z'                            | "FunctionProperty" | '$a , \\  z'
+        assertEquals(
+            case.stringValue,
+            newProp.getStringValue(),
+            "stringValue of property with input ${case.propertyValue} (should parse as ${case.type})"
+        )
+        assertEquals(
+            case.type,
+            newProp::class.java,
+            "class of property with input ${case.propertyValue} after transformation"
+        )
     }
-
 }
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
index 7f1f4db0770..3b8104bcdbe 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
@@ -17,121 +17,141 @@
 
 package org.apache.jmeter.gui.action
 
-import java.net.URL
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.util.JMeterUtils
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.io.File
 import java.nio.file.Paths
 import java.text.MessageFormat
 
-import org.apache.commons.io.FileUtils
-import org.apache.jmeter.junit.spock.JMeterSpec
-import org.apache.jmeter.util.JMeterUtils
+class HtmlReportGeneratorTest : JMeterTestCase() {
+    @TempDir
+    lateinit var testDirectory: File
 
-import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.databind.ObjectMapper
+    data class CheckArgumentsCase(val csvPath: String, val userPropertiesPath: String, val outputDirectoryPath: String, val expected: List<String>)
 
-class HtmlReportGeneratorSpec extends JMeterSpec {
+    companion object {
+        /**
+         * Combine the given path parts to one path with the correct path separator of the current platform.
+         * The current JMeter bin directory will be prepended to the path.
+         *
+         * @param paths to be combined (should contain no path separators)
+         * @return combined path as string
+         */
+        fun combine(vararg paths: String) =
+            Paths.get(JMeterUtils.getJMeterBinDir(), *paths).toString()
 
-    /**
-     * Combine the given path parts to one path with the correct path separator of the current platform.
-     * The current JMeter bin directory will be prepended to the path.
-     *
-     * @param paths to be combined (should contain no path separators)
-     * @return combined path as string
-     */
-    def combine(String... paths) {
-        Paths.get(JMeterUtils.getJMeterBinDir(), paths).toString()
+        @JvmStatic
+        fun checkArgumentsCases() = listOf(
+            CheckArgumentsCase(
+                combine("testfiles", "HTMLReportTestFile.csv"),
+                combine("user.properties"),
+                combine("testfiles", "testReport"),
+                listOf()
+            ),
+            combine("testfiles").let { outputDirectoryPath ->
+                CheckArgumentsCase(
+                    combine("testfiles", "HTMLReportTestFile.csv"),
+                    combine("user.properties"),
+                    outputDirectoryPath,
+                    listOf(
+                        JMeterUtils.getResString("generate_report_ui.output_directory") +
+                            MessageFormat.format(
+                                JMeterUtils.getResString(HtmlReportGenerator.NOT_EMPTY_DIRECTORY),
+                                outputDirectoryPath
+                            )
+                    )
+                )
+            },
+            combine("testfiles", "HTMLReportTestFileMissing.csv").let { csvPath ->
+                CheckArgumentsCase(
+                    csvPath,
+                    combine("user.properties"),
+                    combine("testfiles", "testReport"),
+                    listOf(
+                        JMeterUtils.getResString("generate_report_ui.csv_file") +
+                            MessageFormat.format(
+                                JMeterUtils.getResString(HtmlReportGenerator.NO_FILE),
+                                csvPath
+                            )
+                    )
+                )
+            },
+            CheckArgumentsCase(
+                "",
+                "",
+                "",
+                listOf(
+                    JMeterUtils.getResString("generate_report_ui.csv_file") +
+                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
+                    JMeterUtils.getResString("generate_report_ui.user_properties_file") +
+                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
+                    JMeterUtils.getResString("generate_report_ui.output_directory") +
+                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY), "")
+                )
+            ),
+            combine("testfiles", "testReport", "oneLevel", "twolevel").let { outputDirectoryPath ->
+                CheckArgumentsCase(
+                    combine("testfiles", "HTMLReportTestFile.csv"),
+                    combine("user.properties"),
+                    outputDirectoryPath,
+                    listOf(
+                        JMeterUtils.getResString("generate_report_ui.output_directory") +
+                            MessageFormat.format(
+                                JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY),
+                                outputDirectoryPath
+                            )
+                    )
+                )
+            },
+        )
     }
 
-    def "check if generation from csv: '#csvPath' with properties: '#userPropertiesPath' in folder: '#outputDirectoryPath' contains the expected error"() {
-        when:
-            HtmlReportGenerator htmlReportGenerator = new HtmlReportGenerator(csvPath, userPropertiesPath, outputDirectoryPath)
-            List<String> resultList = htmlReportGenerator.checkArguments()
-        then:
-            resultList.equals(expected)
-        where:
-            csvPath                                               | userPropertiesPath                  | outputDirectoryPath                     | expected
-            combine("testfiles", "HTMLReportTestFile.csv")        | combine("user.properties")          | combine("testfiles", "testReport")      | []
-            combine("testfiles", "HTMLReportTestFile.csv")        | combine("user.properties")          | combine("testfiles")                    | [
-                JMeterUtils.getResString("generate_report_ui.output_directory") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NOT_EMPTY_DIRECTORY), outputDirectoryPath)
-            ]
-            combine("testfiles", "HTMLReportTestFileMissing.csv") | combine("user.properties")          | combine("testfiles", "testReport")      | [
-                JMeterUtils.getResString("generate_report_ui.csv_file") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), csvPath)
-            ]
-            ""                                                    | ""                                  | ""                                      | [
-                JMeterUtils.getResString("generate_report_ui.csv_file") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), csvPath),
-                JMeterUtils.getResString("generate_report_ui.user_properties_file") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), userPropertiesPath),
-                JMeterUtils.getResString("generate_report_ui.output_directory") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY), outputDirectoryPath)
-            ]
-            combine("testfiles", "HTMLReportTestFile.csv")        | combine("user.properties")          | combine("testfiles", "testReport", "oneLevel", "twolevel") | [
-                JMeterUtils.getResString("generate_report_ui.output_directory") + MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY), outputDirectoryPath)
-            ]
+    @ParameterizedTest
+    @MethodSource("checkArgumentsCases")
+    fun checkArguments(case: CheckArgumentsCase) {
+        val htmlReportGenerator = HtmlReportGenerator(case.csvPath, case.userPropertiesPath, case.outputDirectoryPath)
+        val resultList = htmlReportGenerator.checkArguments()
+
+        assertEquals(case.expected, resultList, "resultList")
     }
 
-    def "check that report generation succeeds and statistic are generated"(){
-        setup:
-            File testDirectory = new File(combine("testfiles", "testReport"))
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            } else {
-                testDirectory.mkdir()
-            }
-            ObjectMapper mapper = new ObjectMapper()
-            URL expected = HtmlReportGenerator.class.getResource("/org/apache/jmeter/gui/report/HTMLReportExpect.json");
-            JsonNode expectedRoot = null;
-            expected.withReader { jsonFileReader ->
-                expectedRoot = mapper.readTree(jsonFileReader)
-            }
-        when:
-            HtmlReportGenerator htmlReportGenerator = new HtmlReportGenerator(
-                    combine("testfiles", "HTMLReportTestFile.csv"),
-                    combine("user.properties"),
-                    testDirectory.toString())
-            List<String> resultList = htmlReportGenerator.run()
-            File statistics = new File(combine("testfiles", "testReport", "statistics.json"))
-            JsonNode actualRoot = null;
-            if (statistics.exists()) {
-                statistics.withReader { jsonFileReader ->
-                    actualRoot = mapper.readTree(jsonFileReader)
-                }
-            }
-        then:
-            resultList.isEmpty()
-            statistics.exists()
-            expectedRoot != null
-            expectedRoot == actualRoot
-        cleanup:
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            }
+    @Test
+    fun `check that report generation succeeds and statistic are generated`() {
+        val mapper = ObjectMapper()
+        val expected = HtmlReportGenerator::class.java.getResource("/org/apache/jmeter/gui/report/HTMLReportExpect.json")
+        val expectedRoot = mapper.readTree(expected)
+        val htmlReportGenerator = HtmlReportGenerator(
+            combine("testfiles", "HTMLReportTestFile.csv"),
+            combine("user.properties"),
+            testDirectory.toString()
+        )
+        val resultList = htmlReportGenerator.run()
+        val statistics = File(testDirectory, "statistics.json")
+        val actualRoot = mapper.readTree(statistics)
+
+        assertEquals(expectedRoot, actualRoot, "test report json file")
     }
 
-    def "report generation fails when format does not match and error is reported"() {
-        setup:
-            File testDirectory = new File(combine("testfiles", "testReportThatShouldBeEmpty"))
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            } else {
-                testDirectory.mkdir()
-            }
-        when:
-            HtmlReportGenerator htmlReportGenerator = new HtmlReportGenerator(
-                    combine("testfiles", "HTMLReportFalseTestFile.csv"),
-                    combine("user.properties"),
-                    testDirectory.toString())
-            List<String> resultList = htmlReportGenerator.run()
-        then:
-            testDirectory.list().length == 0
-            resultList.get(0).contains("An error occurred: Error while processing samples: Consumer failed with message")
-        cleanup:
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            }
+    @Test
+    fun `report generation fails when format does not match and error is reported`() {
+        val htmlReportGenerator = HtmlReportGenerator(
+            combine("testfiles", "HTMLReportFalseTestFile.csv"),
+            combine("user.properties"),
+            testDirectory.toString()
+        )
+        val resultList = htmlReportGenerator.run()
+        assertEquals("[]", testDirectory.list()?.contentDeepToString(), "testDirectory contents")
+        val firstMessage = resultList.firstOrNull()
+        val expectedError = "An error occurred: Error while processing samples: Consumer failed with message"
+        if (firstMessage?.contains(expectedError) != true) {
+            fail("First result message should contain '$expectedError', but was '$firstMessage'")
+        }
     }
 }
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt
index ad2d0ed2fcc..f1d8d24fb9f 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/util/MenuFactoryTest.kt
@@ -17,18 +17,23 @@
 
 package org.apache.jmeter.gui.util
 
-import org.apache.jmeter.junit.spock.JMeterSpec
+import org.apache.jmeter.junit.JMeterTestCase
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Test
 
-class MenuFactorySpec extends JMeterSpec {
+class MenuFactoryTest : JMeterTestCase() {
 
-    def "ensure each menu has something in it"() {
-        expect:
-            MenuFactory.menuMap.size() == 12
-            MenuFactory.menuMap.every { !it.value.isEmpty() }
+    @Test
+    fun `ensure each menu has something in it`() {
+        assertEquals(12, MenuFactory.getMenuMap().size, "MenuFactory.getMenuMap().size")
+        MenuFactory.getMenuMap().forEach { (group, items) ->
+            assertNotEquals(0, items.size, "MenuFactory.getMenuMap()[$group].size")
+        }
     }
 
-    def "default add menu has expected item count"() {
-        expect:
-            MenuFactory.createDefaultAddMenu().itemCount == 6 + 3 // items + separators
+    @Test
+    fun `default add menu has expected item count`() {
+        assertEquals(6 + 3, MenuFactory.createDefaultAddMenu().itemCount, "items + separators")
     }
 }
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
index 5a6e046822b..6191f7afee7 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
@@ -17,17 +17,21 @@
 
 package org.apache.jmeter.report.dashboard
 
-import java.net.URL
-import java.nio.file.Paths
-
-import org.apache.commons.io.FileUtils
-import org.apache.jmeter.junit.spock.JMeterSpec
-import org.apache.jmeter.util.JMeterUtils
-
-import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.util.JMeterUtils
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.api.parallel.Isolated
+import java.io.File
+import java.nio.file.Paths
 
-class ReportGeneratorSpec extends JMeterSpec{
+@Isolated("modifies shared properties")
+class ReportGeneratorTest : JMeterTestCase() {
+    @TempDir
+    lateinit var testDirectory: File
 
     /**
      * Combine the given path parts to one path with the correct path separator of the current platform.
@@ -36,72 +40,34 @@ class ReportGeneratorSpec extends JMeterSpec{
      * @param paths to be combined (should contain no path separators)
      * @return combined path as string
      */
-    def combine(String... paths) {
-       Paths.get(JMeterUtils.getJMeterBinDir(), paths).toString()
-    }
+    fun combine(vararg paths: String) =
+        Paths.get(JMeterUtils.getJMeterBinDir(), *paths).toString()
 
-    def "check that report generation succeeds and statistics.json are generated"(){
-        setup:
-            File testDirectory = new File(combine("testfiles", "testReport"))
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            } else {
-                testDirectory.mkdir()
-            }
-            ObjectMapper mapper = new ObjectMapper()
-            URL expected = ReportGenerator.class.getResource("/org/apache/jmeter/gui/report/HTMLReportExpect.json");
-            JsonNode expectedRoot = null;
-            expected.withReader { jsonFileReader ->
-                expectedRoot = mapper.readTree(jsonFileReader)
-            }
-        when:
-            JMeterUtils.setProperty("jmeter.reportgenerator.outputdir", testDirectory.getAbsolutePath())
-            ReportGenerator reportGenerator = new ReportGenerator(
-                    combine("testfiles", "HTMLReportTestFile.csv"),null)
-            reportGenerator.generate()
-            File statistics = new File(combine("testfiles", "testReport", "statistics.json"))
-            JsonNode actualRoot = null;
-            if (statistics.exists()) {
-                statistics.withReader { jsonFileReader ->
-                    actualRoot = mapper.readTree(jsonFileReader)
-                }
-            }
-        then:
-            statistics.exists()
-            expectedRoot != null
-            expectedRoot == actualRoot
-        cleanup:
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            }
+    @Test
+    fun `check that report generation succeeds and statistics json are generated`() {
+        val mapper = ObjectMapper()
+        val expected = ReportGenerator::class.java.getResource("/org/apache/jmeter/gui/report/HTMLReportExpect.json")
+        val expectedRoot = mapper.readTree(expected)
+
+        JMeterUtils.setProperty("jmeter.reportgenerator.outputdir", testDirectory.absolutePath)
+        val reportGenerator = ReportGenerator(
+            combine("testfiles", "HTMLReportTestFile.csv"), null
+        )
+        reportGenerator.generate()
+        val statistics = File(testDirectory, "statistics.json")
+        val actualRoot = mapper.readTree(statistics)
+
+        assertEquals(expectedRoot, actualRoot, "test report json file")
     }
 
-    def "check that report generation fails when format does not match and error is reported"(){
-        setup:
-            File testDirectory = new File(combine("testfiles", "testReportThatShouldBeEmpty"))
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            } else {
-                testDirectory.mkdir()
-            }
-        when:
-            ReportGenerator reportGenerator = new ReportGenerator(
-                combine("testfiles", "HTMLReportFalseTestFile.csv"), null)
+    @Test
+    fun `check that report generation fails when format does not match and error is reported`() {
+        assertThrows<GenerationException> {
+            val reportGenerator = ReportGenerator(
+                combine("testfiles", "HTMLReportFalseTestFile.csv"), null
+            )
             reportGenerator.generate()
-        then:
-            thrown(GenerationException)
-            testDirectory.list().length == 0
-        cleanup:
-            if(testDirectory.exists()) {
-                if (testDirectory.list().length>0) {
-                    FileUtils.cleanDirectory(testDirectory)
-                }
-            }
+        }
+        assertEquals("[]", testDirectory.list()?.contentDeepToString(), "testDirectory contents")
     }
 }

From 53f9066f9130ca03fc2fb8de8140b1115d9fed2c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 11:50:34 +0300
Subject: [PATCH 0733/1037] refactor: remove unused JMeterSpec.groovy

---
 .../jmeter/junit/spock/JMeterSpec.groovy      | 55 -------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy

diff --git a/src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy b/src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
deleted file mode 100644
index f0219ba1237..00000000000
--- a/src/components/src/testFixtures/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.junit.spock
-
-import org.apache.jmeter.junit.JMeterTestCaseJUnit
-import org.apache.jmeter.junit.JMeterTestUtils
-
-import spock.lang.Specification
-
-/**
- * Common setup for Spock test cases.
- * <p>
- * Please only use this class if you <em>need</em> the things set up here.
- * <p>
- * Otherwise, extend {@link Specification}
- */
-abstract class JMeterSpec extends Specification {
-
-    /*
-    * If not running under AllTests.java, make sure that the properties (and
-    * log file) are set up correctly.
-    *
-    * N.B. This assumes the JUnit test are executed in the
-    * project root, bin directory or one level down, and all the JMeter jars
-    * (plus any others needed at run-time) need to be on the classpath.
-    */
-    static {
-        // Initialize JMeterTestCaseJUnit which will setup JMeter properties, home, etc
-        JMeterTestCaseJUnit.class.getSuperclass();
-    }
-
-    protected String getResourceFilePath(String resource) {
-        return JMeterTestUtils.getResourceFilePath(getClass(), resource);
-    }
-
-    protected static boolean isHeadless() {
-        System.properties['java.awt.headless'] == 'true'
-    }
-
-}

From d5bc84c44a052f5d5a02d66571085faa76c27076 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 11:53:12 +0300
Subject: [PATCH 0734/1037] refactor: rename .groovy to .kt in :src:functions
 to allow Git track history better

---
 .../org/apache/jmeter/functions/ChangeCaseTest.kt}                | 0
 .../org/apache/jmeter/functions/IterationCounterTest.kt}          | 0
 .../org/apache/jmeter/functions/gui/FunctionHelperTest.kt}        | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/functions/src/test/{groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy => kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt} (100%)
 rename src/functions/src/test/{groovy/org/apache/jmeter/functions/IterationCounterSpec.groovy => kotlin/org/apache/jmeter/functions/IterationCounterTest.kt} (100%)
 rename src/functions/src/test/{groovy/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy => kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt} (100%)

diff --git a/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy b/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
similarity index 100%
rename from src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy
rename to src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
diff --git a/src/functions/src/test/groovy/org/apache/jmeter/functions/IterationCounterSpec.groovy b/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
similarity index 100%
rename from src/functions/src/test/groovy/org/apache/jmeter/functions/IterationCounterSpec.groovy
rename to src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
diff --git a/src/functions/src/test/groovy/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy b/src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt
similarity index 100%
rename from src/functions/src/test/groovy/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy
rename to src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt

From b9dc01feb48ad071c0c7affe94caa77bf5ff2218 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 12:18:59 +0300
Subject: [PATCH 0735/1037] refactor: migrate Groovy tests in :src:functions to
 Kotlin

---
 .../jmeter/functions/gui/FunctionHelper.java  |  3 +-
 .../apache/jmeter/functions/ChangeCaseTest.kt | 95 ++++++++++---------
 .../jmeter/functions/IterationCounterTest.kt  | 78 ++++++++-------
 .../functions/gui/FunctionHelperTest.kt       | 58 ++++++-----
 4 files changed, 128 insertions(+), 106 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
index 3284a182295..ef659afab1d 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
@@ -272,7 +272,8 @@ private static String variablesToString(JMeterVariables jMeterVariables) {
         return sb.toString();
     }
 
-    private static String buildFunctionCallString(String functionName, Arguments args) {
+    @VisibleForTesting
+    static String buildFunctionCallString(String functionName, Arguments args) {
         StringBuilder functionCall = new StringBuilder("${");
         functionCall.append(functionName);
         if (args.getArguments().size() > 0) {
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
index e86e5c9fb03..fd01972510f 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
@@ -21,52 +21,59 @@ import org.apache.jmeter.engine.util.CompoundVariable
 import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assumptions.assumeTrue
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import java.util.Locale
 
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-import spock.lang.Unroll
+class ChangeCaseTest {
+    data class ExecuteCase(val input: String, val mode: String, val output: String)
 
-@Unroll
-class ChangeCaseSpec extends Specification {
-
-    // See https://github.com/apache/jmeter/issues/5723
-    @IgnoreIf({ 'i'.toUpperCase() != 'I' || 'I'.toLowerCase() != 'i' })
-    def "convert '#input' using mode #mode to '#output'"() {
-        given:
-            def changeCase = new ChangeCase()
-            def jMCtx = JMeterContextService.getContext()
-            def result = new SampleResult()
-            result.setResponseData("dummy data", null)
-            jMCtx.setVariables(new JMeterVariables())
-            jMCtx.setPreviousResult(result)
-        when:
-            changeCase.setParameters([new CompoundVariable(input), new CompoundVariable(mode)])
-        then:
-            output == changeCase.execute(result, null)
-        where:
-            input               | mode               | output
-            "simple"            | "lower"            | "simple"
-            "simple"            | "upper"            | "SIMPLE"
-            "simple"            | "capitalize"       | "Simple"
-            "simple"            | ""                 | "SIMPLE"
-            " with space "      | "lower"            | " with space "
-            " with space "      | "upper"            | " WITH SPACE "
-            " with space "      | "capitalize"       | " with space "
-            "#_with-signs."     | "lower"            | "#_with-signs."
-            "#_with-signs."     | "upper"            | "#_WITH-SIGNS."
-            "#_with-signs."     | "capitalize"       | "#_with-signs."
-            "m4u file"          | "lower"            | "m4u file"
-            "m4u file"          | "upper"            | "M4U FILE"
-            "m4u file"          | "capitalize"       | "M4u file"
-            "WITH Ümläuts"      | "lower"            | "with ümläuts"
-            "WITH Ümläuts"      | "upper"            | "WITH ÜMLÄUTS"
-            "WITH Ümläuts"      | "capitalize"       | "WITH Ümläuts"
-            "+ - special space" | "lower"            | "+ - special space"
-            "+ - special space" | "upper"            | "+ - SPECIAL SPACE"
-            "+ - special space" | "capitalize"       | "+ - special space"
-            " "                 | "lower"            | " "
-            " "                 | "upper"            | " "
-            " "                 | "capitalize"       | " "
+    companion object {
+        @JvmStatic
+        fun executeCases() = listOf(
+            ExecuteCase("simple", "lower", "simple"),
+            ExecuteCase("simple", "upper", "SIMPLE"),
+            ExecuteCase("simple", "capitalize", "Simple"),
+            ExecuteCase("simple", "", "SIMPLE"),
+            ExecuteCase(" with space ", "lower", " with space "),
+            ExecuteCase(" with space ", "upper", " WITH SPACE "),
+            ExecuteCase(" with space ", "capitalize", " with space "),
+            ExecuteCase("#_with-signs.", "lower", "#_with-signs."),
+            ExecuteCase("#_with-signs.", "upper", "#_WITH-SIGNS."),
+            ExecuteCase("#_with-signs.", "capitalize", "#_with-signs."),
+            ExecuteCase("m4u file", "lower", "m4u file"),
+            ExecuteCase("m4u file", "upper", "M4U FILE"),
+            ExecuteCase("m4u file", "capitalize", "M4u file"),
+            ExecuteCase("WITH Ümläuts", "lower", "with ümläuts"),
+            ExecuteCase("WITH Ümläuts", "upper", "WITH ÜMLÄUTS"),
+            ExecuteCase("WITH Ümläuts", "capitalize", "WITH Ümläuts"),
+            ExecuteCase("+ - special space", "lower", "+ - special space"),
+            ExecuteCase("+ - special space", "upper", "+ - SPECIAL SPACE"),
+            ExecuteCase("+ - special space", "capitalize", "+ - special space"),
+            ExecuteCase(" ", "lower", " "),
+            ExecuteCase(" ", "upper", " "),
+            ExecuteCase(" ", "capitalize", " "),
+        ).also {
+            assumeTrue(
+                "i".uppercase(Locale.getDefault()) == "I" && "I".lowercase(Locale.getDefault()) == "i",
+                "ChangeCase does not behave well in tr_TR locale, see https://github.com/apache/jmeter/issues/5723"
+            )
+        }
     }
 
+    @ParameterizedTest
+    @MethodSource("executeCases")
+    fun changeCase(case: ExecuteCase) {
+        val changeCase = ChangeCase()
+        val jMCtx = JMeterContextService.getContext()
+        val result = SampleResult()
+        result.setResponseData("dummy data", null)
+        jMCtx.variables = JMeterVariables()
+        jMCtx.previousResult = result
+        changeCase.setParameters(listOf(CompoundVariable(case.input), CompoundVariable(case.mode)))
+
+        assertEquals(case.output, changeCase.execute(result, null))
+    }
 }
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
index 5f4924df1ef..7b1445d410d 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
@@ -15,51 +15,57 @@
  * limitations under the License.
  */
 
-package org.apache.jmeter.functions;
-
-import java.util.concurrent.CountDownLatch
+package org.apache.jmeter.functions
 
 import org.apache.jmeter.engine.util.CompoundVariable
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import java.util.concurrent.CountDownLatch
+import kotlin.concurrent.thread
+
+class IterationCounterTest {
 
-import spock.lang.Specification
-import spock.lang.Unroll
+    @Test
+    fun `Counter per thread counts for each thread`() {
+        val context = JMeterContextService.getContext()
+        context.variables = JMeterVariables()
+        val counter = IterationCounter()
+        counter.setParameters(listOf(CompoundVariable("true"), CompoundVariable("var")))
 
-@Unroll
-class IterationCounterSpec extends Specification {
+        thread(start = true) {
+            repeat(7) { counter.execute(null, null) }
+        }.join()
 
-    def "Counter per thread counts for each thread"() {
-        given:
-            def context = JMeterContextService.getContext()
-            context.setVariables(new JMeterVariables())
-            def counter = new IterationCounter()
-            counter.setParameters(Arrays.asList(new CompoundVariable("true"), new CompoundVariable("var")))
-        when:
-            Thread.start({ (1..10).each { counter.execute(null, null) } }).join()
-            (1..10).each { counter.execute(null, null) }
-        then:
-            context.getVariables().get("var") == "10"
+        repeat(10) { counter.execute(null, null) }
+
+        Assertions.assertEquals("10", context.variables.get("var")) {
+            "Only 10 executions happended in the current thread, so expecting 10. " +
+                "Note there were 7 iterations in a different thread, however the counter should be per-thread"
+        }
     }
 
-    def "global Counter counts for all threads"() {
-        given:
-            def context = JMeterContextService.getContext()
-            context.setVariables(new JMeterVariables())
-            def counter = new IterationCounter()
-            counter.setParameters(Arrays.asList(new CompoundVariable("false"), new CompoundVariable("var")))
-            def nrOfThreads = 100
-            def latch = new CountDownLatch(nrOfThreads)
-        when:
-            (1..nrOfThreads).each {
-                Thread.start({
-                    (1..1000).each { counter.execute(null, null) }
-                    latch.countDown()
-                })
+    @Test
+    fun `global Counter counts for all threads`() {
+        val context = JMeterContextService.getContext()
+        context.variables = JMeterVariables()
+        val counter = IterationCounter()
+        counter.setParameters(listOf(CompoundVariable("false"), CompoundVariable("var")))
+        val nrOfThreads = 100
+        val latch = CountDownLatch(nrOfThreads)
+
+        repeat(nrOfThreads) {
+            thread(start = true) {
+                repeat(1000) { counter.execute(null, null) }
+                latch.countDown()
             }
-            latch.await()
-            counter.execute(null, null)
-        then:
-            context.getVariables().get("var") == "100001"
+        }
+        latch.await()
+        counter.execute(null, null)
+
+        Assertions.assertEquals("100001", context.variables.get("var")) {
+            "$nrOfThreads should have increased the var by 1000, plus one in main thread"
+        }
     }
 }
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt
index b5e297df0f7..3ce551e1c35 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/gui/FunctionHelperTest.kt
@@ -19,33 +19,41 @@ package org.apache.jmeter.functions.gui
 
 import org.apache.jmeter.config.Argument
 import org.apache.jmeter.config.Arguments
+import org.apache.jmeter.test.gui.DisabledIfHeadless
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-import spock.lang.Unroll
+class FunctionHelperTest {
+    data class BuildCallCase(val functionName: String, val parameters: List<String>, val combined: String)
 
-@Unroll
-class FunctionHelperSpec extends Specification {
+    companion object {
+        @JvmStatic
+        fun buildCallCases() = listOf(
+            BuildCallCase("fname", listOf(), "\${fname}"),
+            BuildCallCase("fname", listOf("a"), "\${fname(a)}"),
+            BuildCallCase("fname", listOf("a,b"), "\${fname(a\\,b)}"),
+            BuildCallCase("fname", listOf("a,b,c"), "\${fname(a\\,b\\,c)}"),
+            BuildCallCase("fname", listOf("a", "b"), "\${fname(a,b)}"),
+            BuildCallCase("fname", listOf("a,b", "c"), "\${fname(a\\,b,c)}"),
+            BuildCallCase("fname", listOf("\\\${f(a,b)}"), "\${fname(\\\${f(a\\,b)})}"),
+            BuildCallCase("fname", listOf("\${f(a,b)},c,\${g(d,e)}", "h"), "\${fname(\${f(a,b)}\\,c\\,\${g(d,e)},h)}"),
+            BuildCallCase("fname", listOf("a,\${f(b,\${g(c,d)},e)},f", "h"), "\${fname(a\\,\${f(b,\${g(c,d)},e)}\\,f,h)}"),
+        )
+    }
+
+    @DisabledIfHeadless
+    @ParameterizedTest
+    @MethodSource("buildCallCases")
+    fun `construct correct call string for parameters #parameters`(case: BuildCallCase) {
+        val args = Arguments()
+        args.setArguments(case.parameters.map { Argument("dummy$it", it) })
 
-    @IgnoreIf({ System.properties['java.awt.headless'] as boolean })
-    def "construct correct call string for parameters #parameters"() {
-        setup:
-            def functionHelper = new FunctionHelper()
-        when:
-            def args = new Arguments()
-            args.setArguments(parameters.collect { new Argument("dummy${it}", it) })
-        then:
-            functionHelper.buildFunctionCallString(functionName, args).toString() == combined
-        where:
-            functionName | parameters                         | combined
-            "fname"      | []                                 | "\${fname}"
-            "fname"      | ["a"]                              | "\${fname(a)}"
-            "fname"      | ["a,b"]                            | "\${fname(a\\,b)}"
-            "fname"      | ["a,b,c"]                          | "\${fname(a\\,b\\,c)}"
-            "fname"      | ["a", "b"]                         | "\${fname(a,b)}"
-            "fname"      | ["a,b", "c"]                       | "\${fname(a\\,b,c)}"
-            "fname"      | ["\\\${f(a,b)}"]                   | "\${fname(\\\${f(a\\,b)})}"
-            "fname"      | ["\${f(a,b)},c,\${g(d,e)}", "h"]   | "\${fname(\${f(a,b)}\\,c\\,\${g(d,e)},h)}"
-            "fname"      | ["a,\${f(b,\${g(c,d)},e)},f", "h"] | "\${fname(a\\,\${f(b,\${g(c,d)},e)}\\,f,h)}"
+        assertEquals(
+            case.combined,
+            FunctionHelper.buildFunctionCallString(case.functionName, args).toString()
+        ) {
+            "buildFunctionCallString(${case.functionName}, ${case.parameters})"
+        }
     }
 }

From 7df1f93e898a600246ae2b30e5f200b38ed0a94d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 12:24:13 +0300
Subject: [PATCH 0736/1037] refactor: rename .groovy to .kt in
 :src:protocol:http to allow Git track history better

---
 .../apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt}   | 0
 .../org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt}        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/protocol/http/src/test/{groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy => kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt} (100%)
 rename src/protocol/http/src/test/{groovy/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy => kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt} (100%)

diff --git a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
similarity index 100%
rename from src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy
rename to src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
diff --git a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt
similarity index 100%
rename from src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy
rename to src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt

From a0ab4eee4ebc88640aab60f03caeac3668b0fada Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 13:05:16 +0300
Subject: [PATCH 0737/1037] refactor: migrate :src:protocol:http Groovy tests
 to Kotlin

---
 .../http/control/DNSCacheManager.java         |   6 +
 .../http/control/DNSCacheManagerTest.kt       | 268 +++++++++---------
 .../protocol/http/util/HTTPUtilsTest.kt       | 248 +++++++++-------
 3 files changed, 285 insertions(+), 237 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index 22ed001a72a..8b67fa1f760 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -37,6 +37,7 @@
 import org.apache.jmeter.testelement.property.NullProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.threads.JMeterContextService;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xbill.DNS.ARecord;
@@ -112,6 +113,11 @@ public Object clone() {
         return clone;
     }
 
+    @VisibleForTesting
+    Resolver getResolver() {
+        return resolver;
+    }
+
     private Resolver createResolver() {
         CollectionProperty dnsServers = getServers();
         try {
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
index c4de5754983..1c23d84a4a5 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
@@ -17,173 +17,177 @@
 
 package org.apache.jmeter.protocol.http.control
 
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Assumptions.assumeTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty
+import org.junit.jupiter.api.fail
 import org.xbill.DNS.ExtendedResolver
 import org.xbill.DNS.ResolverConfig
+import java.net.InetAddress
+import java.net.UnknownHostException
 
-import spock.lang.IgnoreIf
-import spock.lang.Requires
-import spock.lang.Specification
+class DNSCacheManagerTest {
 
-class DNSCacheManagerSpec extends Specification {
-
-    private static final String[] VALID_DNS_SERVERS = ResolverConfig.getCurrentConfig().servers()
-    private static final String INVALID_DNS_SERVER = "512.1.1.1"
-    private static final String VALID_HOSTNAME = "jmeter.apache.org"
+    companion object {
+        val VALID_DNS_SERVERS = ResolverConfig.getCurrentConfig().servers()
+        val INVALID_DNS_SERVER = "512.1.1.1"
+        val VALID_HOSTNAME = "jmeter.apache.org"
+    }
 
-    private static final boolean localDNSResolverOK = {
+    private val localDNSResolverOK =
         try {
             if (VALID_DNS_SERVERS == null) {
-                return false
+                false
+            } else {
+                DNSCacheManager().resolve("apache.org")
+                true
             }
-            new DNSCacheManager().resolve("apache.org")
-            return true
-        } catch (UnknownHostException uhe) {
-            return false
+        } catch (uhe: UnknownHostException) {
+            false
         }
-    }.call() // <-- this avoids automatic casting of Closure to boolean which yields true in Groovy
 
-    def sut = new DNSCacheManager()
+    val sut = DNSCacheManager()
 
-    def "A custom resolver with one host will resolve that host"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addHost("jmeter.example.org", "127.0.0.1")
-        expect:
-            sut.resolve("jmeter.example.org") == [InetAddress.getByName("127.0.0.1")].toArray()
+    private fun assumeLocalDnsResolverOK() {
+        assumeTrue(localDNSResolverOK, "Local DNS resolver is needed for the test")
     }
 
-    def "A custom resolver with one host and an invalid DNS server will still resolve that host"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addServer(INVALID_DNS_SERVER)
-            sut.addHost("localhost", "127.0.0.1")
-        expect:
-            sut.resolve("localhost") == [InetAddress.getByName("127.0.0.1")].toArray()
+    @Test
+    fun `A custom resolver with one host will resolve that host`() {
+        sut.isCustomResolver = true
+        sut.addHost("jmeter.example.org", "127.0.0.1")
+
+        assertEquals(listOf(InetAddress.getByName("127.0.0.1")), sut.resolve("jmeter.example.org").toList())
     }
 
-    def "A custom resolver with one host with many addresses will resolve all addresses for that host"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addHost("jmeter.example.org", "127.0.0.1, 1.2.3.4")
-        expect:
-            sut.resolve("jmeter.example.org") ==
-                    [InetAddress.getByName("127.0.0.1"),
-                     InetAddress.getByName("1.2.3.4")].toArray()
+    @Test
+    fun `A custom resolver with one host and an invalid DNS server will still resolve that host`() {
+        sut.isCustomResolver = true
+        sut.addServer(INVALID_DNS_SERVER)
+        sut.addHost("localhost", "127.0.0.1")
+
+        assertEquals(listOf(InetAddress.getByName("127.0.0.1")), sut.resolve("localhost").toList())
     }
 
-    @Requires({ localDNSResolverOK })
-    def "Clear removes custom resolver status and any added hosts"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addHost(VALID_HOSTNAME, "127.0.0.1")
-            sut.clear()
-        expect:
-            // uses real DNS server
-            sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName(VALID_HOSTNAME))
-            !sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName("127.0.0.1"))
+    @Test
+    fun `A custom resolver with one host with many addresses will resolve all addresses for that host`() {
+        sut.isCustomResolver = true
+        sut.addHost("jmeter.example.org", "127.0.0.1, 1.2.3.4")
+        assertEquals(
+            listOf(InetAddress.getByName("127.0.0.1"), InetAddress.getByName("1.2.3.4")),
+            sut.resolve("jmeter.example.org").toList()
+        )
     }
 
-    @Requires({ localDNSResolverOK })
-    def "A custom resolver with a host entry will still fall back to system lookup"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addHost("jmeter.example.org", "127.0.0.1")
-        expect:
-            // uses real DNS server
-            sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName(VALID_HOSTNAME))
+    @Test
+    fun `Clear removes custom resolver status and any added hosts`() {
+        assumeLocalDnsResolverOK()
+        sut.isCustomResolver = true
+        sut.addHost(VALID_HOSTNAME, "127.0.0.1")
+        sut.clear()
+        // uses real DNS server
+        sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName(VALID_HOSTNAME))
+        !sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName("127.0.0.1"))
     }
 
-    def "If using an invalid server resolve throws UnknownHostException"() {
-        given:
-            sut.addServer(INVALID_DNS_SERVER)
-            sut.setCustomResolver(true)
-        when:
-            sut.resolve(VALID_HOSTNAME)
-        then:
-            thrown(UnknownHostException)
-            sut.resolver == null
-            sut.initFailed
+    @Test
+    fun `A custom resolver with a host entry will still fall back to system lookup`() {
+        assumeLocalDnsResolverOK()
+        sut.isCustomResolver = true
+        sut.addHost("jmeter.example.org", "127.0.0.1")
+        // uses real DNS server
+        sut.resolve(VALID_HOSTNAME).contains(InetAddress.getByName(VALID_HOSTNAME))
     }
 
-    @IgnoreIf({ Boolean.getBoolean("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server") })
-    @Requires({ localDNSResolverOK })
-    def "Valid DNS resolves and caches with custom resolve true"() {
-        given:
-            for (dns in VALID_DNS_SERVERS) {
-                sut.addServer(dns)
-            }
-            sut.setCustomResolver(true)
-            sut.setTimeoutMs(5000)
-        when:
+    @Test
+    fun `If using an invalid server resolve throws UnknownHostException`() {
+        sut.addServer(INVALID_DNS_SERVER)
+        sut.isCustomResolver = true
+        assertThrows<UnknownHostException> {
             sut.resolve(VALID_HOSTNAME)
-        then:
-            sut.resolver != null
-            ((ExtendedResolver) sut.resolver).getResolvers().length == VALID_DNS_SERVERS.length
-            sut.cache.size() == 1
+        }
+        assertNull(sut.resolver, ".resolver")
+        assertTrue(sut.initFailed, ".initFailed")
     }
 
-    def "Cache should be used where entries exist"() {
-        given:
-            for (dns in VALID_DNS_SERVERS) {
-                sut.addServer(dns)
-            }
-            sut.setCustomResolver(true)
-            sut.setTimeoutMs(5000)
-        when:
-            sut.cache.put(VALID_HOSTNAME, new InetAddress[0])
-        then:
-            sut.resolve(VALID_HOSTNAME) == new InetAddress[0]
-
-        when:
-            sut.cache.put(VALID_HOSTNAME, null)
-        then:
-            sut.resolve(VALID_HOSTNAME) == null
+    @Test
+    @DisabledIfSystemProperty(named = "skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server", matches = "true")
+    fun `Valid DNS resolves and caches with custom resolve true`() {
+        assumeLocalDnsResolverOK()
+        for (dns in VALID_DNS_SERVERS) {
+            sut.addServer(dns)
+        }
+        sut.isCustomResolver = true
+        sut.timeoutMs = 5000
+        sut.resolve(VALID_HOSTNAME)
+        assertNotNull(sut.resolver, ".resolver")
+        assertEquals(VALID_DNS_SERVERS.size, (sut.resolver as ExtendedResolver).resolvers.size, ".resolver.resolvers.size")
+        assertEquals(1, sut.cache.size, ".cache.size")
     }
 
-    @Requires({ localDNSResolverOK })
-    def "set custom resolver but without an address should use system resolver"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.setTimeoutMs(5000)
-        when:
-            sut.resolve(VALID_HOSTNAME)
-        then:
-            sut.resolver != null
-            ((ExtendedResolver) sut.resolver).getResolvers().length == 0
+    @Test
+    fun `Cache should be used where entries exist`() {
+        assumeLocalDnsResolverOK()
+        for (dns in VALID_DNS_SERVERS) {
+            sut.addServer(dns)
+        }
+        sut.isCustomResolver = true
+        sut.timeoutMs = 5000
+        val cached = arrayOf(InetAddress.getByAddress(byteArrayOf(10, 20, 30, 40)))
+        sut.cache[VALID_HOSTNAME] = cached
+        assertEquals(cached, sut.resolve(VALID_HOSTNAME), ".resolve($VALID_HOSTNAME) should return cached results")
+
+        sut.cache[VALID_HOSTNAME] = null
+        assertNull(sut.resolve(VALID_HOSTNAME)) {
+            ".resolve($VALID_HOSTNAME) after removing entry from the cache"
+        }
+    }
+
+    @Test
+    fun `set custom resolver but without an address should use system resolver`() {
+        assumeLocalDnsResolverOK()
+        sut.isCustomResolver = true
+        sut.timeoutMs = 5000
+        sut.resolve(VALID_HOSTNAME)
+        assertNotNull(sut.resolver, ".resolver")
+        assertEquals(0, (sut.resolver as ExtendedResolver).resolvers.size, ".resolver.resolvers.size")
     }
 
-    def "Clones retain custom resolve and server info"() {
-        given:
-            sut.setCustomResolver(true)
-            sut.addServer(INVALID_DNS_SERVER)
-            DNSCacheManager clone = (DNSCacheManager) sut.clone()
-            clone.setTimeoutMs(5000)
-        when:
+    @Test
+    fun `Clones retain custom resolve and server info`() {
+        sut.isCustomResolver = true
+        sut.addServer(INVALID_DNS_SERVER)
+        val clone = sut.clone() as DNSCacheManager
+        clone.timeoutMs = 5000
+        assertThrows<UnknownHostException> {
             clone.resolve(VALID_HOSTNAME)
-        then:
-            thrown(UnknownHostException)
-            clone.resolver == sut.resolver
+        }
+        assertEquals(sut.resolver, clone.resolver, "Cloned DNSCacheManager should share the resolver")
     }
 
-    @Requires({ localDNSResolverOK })
-    def "Resolve Existing Host With System Default DNS Server"() {
-        given:
-            sut.setCustomResolver(false)
-        when:
-            InetAddress[] result = sut.resolve("www.example.org")
-        then:
-            sut.resolver == null
-            result != null
-            result.length > 0 // IPv4 and/or IPv6
+    @Test
+    fun `Resolve Existing Host With System Default DNS Server`() {
+        assumeLocalDnsResolverOK()
+        sut.isCustomResolver = false
+
+        val result = sut.resolve("www.example.org")
+        assertNull(sut.resolver, ".resolver")
+        if (result == null || result.isEmpty()) {
+            fail("Resolution result should be non-empty, got ${result.contentDeepToString()}")
+        }
     }
 
-    def "Resolve Non-existing Host With System Default DNS Server"() {
-        given:
-            sut.setCustomResolver(false)
-        when:
+    @Test
+    fun `Resolve Non-existing Host With System Default DNS Server`() {
+        sut.isCustomResolver = false
+        assertThrows<UnknownHostException> {
             sut.resolve("jmeterxxx.apache.org")
-        then:
-            thrown(UnknownHostException)
-            sut.resolver == null
+        }
+        assertNull(sut.resolver, ".resolver")
     }
 }
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt
index d87e6bb0cbc..4089c8c3bc6 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/HTTPUtilsTest.kt
@@ -17,121 +17,159 @@
 
 package org.apache.jmeter.protocol.http.util
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class HTTPUtilsSpec extends Specification {
-
-    def "getEncoding returns #expectedEncoding from #contentType"() {
-        expect:
-            ConversionUtils.getEncodingFromContentType(contentType) == expectedEncoding
-        where:
-            contentType                           | expectedEncoding
-            "charset=utf8"                        | "utf8"
-            "charset=\"utf8\""                    | "utf8"
-            "text/plain ;charset=utf8"            | "utf8"
-            "text/html ;charset=utf8;charset=def" | "utf8"
-            "xyx"                                 | null
-            "charset="                            | null
-            ";charset=;"                          | null
-            ";charset=no-such-charset;"           | null
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.ValueSource
+import java.net.URI
+import java.net.URL
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class HTTPUtilsTest {
+    data class GetEncodingFromContentTypeCase(val contentType: String, val expectedEncoding: String?)
+
+    @ParameterizedTest
+    @MethodSource("getEncodingFromContentTypeCases")
+    fun getEncodingFromContentType(case: GetEncodingFromContentTypeCase) {
+        assertEquals(case.expectedEncoding, ConversionUtils.getEncodingFromContentType(case.contentType))
+    }
+
+    private fun getEncodingFromContentTypeCases() = listOf(
+        GetEncodingFromContentTypeCase("charset=utf8", "utf8"),
+        GetEncodingFromContentTypeCase("charset=\"utf8\"", "utf8"),
+        GetEncodingFromContentTypeCase("text/plain ;charset=utf8", "utf8"),
+        GetEncodingFromContentTypeCase("text/html ;charset=utf8;charset=def", "utf8"),
+        GetEncodingFromContentTypeCase("xyx", null),
+        GetEncodingFromContentTypeCase("charset=", null),
+        GetEncodingFromContentTypeCase(";charset=;", null),
+        GetEncodingFromContentTypeCase(";charset=no-such-charset;", null),
+    )
+
+    data class MakeRelativeUrlCase(val baseURL: String, val path: String, val expectedURL: String)
+
+    @ParameterizedTest
+    @MethodSource("makeRelativeUrlFileCases")
+    fun `makeRelativeURL works with a trailing file`(case: MakeRelativeUrlCase) {
+        assertMakeRelativeUrl(case.expectedURL, case.baseURL, case.path)
     }
 
-    def "makeRelativeURL works with a trailing file"() {
-        given:
-            URL baseURL = new URL("http://192.168.0.1/a/b/c")
-        when:
-            def relativeURL = ConversionUtils.makeRelativeURL(baseURL, path)
-        then:
-            relativeURL == new URL(expectedURL)
-        where:
-            path            | expectedURL
-            "d"             | "http://192.168.0.1/a/b/d"
-            "../d"          | "http://192.168.0.1/a/d"
-            "../../d"       | "http://192.168.0.1/d"
-            "../../../d"    | "http://192.168.0.1/d"
-            "../../../../d" | "http://192.168.0.1/d"
-            "/../d"         | "http://192.168.0.1/../d"
-            "./d"           | "http://192.168.0.1/a/b/d"
+    private fun makeRelativeUrlFileCases() = listOf(
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "d", "http://192.168.0.1/a/b/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "../d", "http://192.168.0.1/a/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "../../d", "http://192.168.0.1/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "../../../d", "http://192.168.0.1/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "../../../../d", "http://192.168.0.1/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "/../d", "http://192.168.0.1/../d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c", "./d", "http://192.168.0.1/a/b/d"),
+    )
+
+    @ParameterizedTest
+    @MethodSource("makeRelativeUrlDirectoryCases")
+    fun `makeRelativeURL works with a trailing directory`(case: MakeRelativeUrlCase) {
+        assertMakeRelativeUrl(case.expectedURL, case.baseURL, case.path)
     }
 
-    def "makeRelativeURL works with a trailing directory"() {
-        given:
-            URL baseURL = new URL("http://192.168.0.1/a/b/c/")
-        when:
-            def relativeURL = ConversionUtils.makeRelativeURL(baseURL, path)
-        then:
-            relativeURL == new URL(expectedURL)
-        where:
-            path            | expectedURL
-            "d"             | "http://192.168.0.1/a/b/c/d"
-            "../d"          | "http://192.168.0.1/a/b/d"
-            "../../d"       | "http://192.168.0.1/a/d"
-            "../../../d"    | "http://192.168.0.1/d"
-            "../../../../d" | "http://192.168.0.1/d"
-            "/../d"         | "http://192.168.0.1/../d"
-            "./d"           | "http://192.168.0.1/a/b/c/d"
+    private fun makeRelativeUrlDirectoryCases() = listOf(
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "d", "http://192.168.0.1/a/b/c/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "../d", "http://192.168.0.1/a/b/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "../../d", "http://192.168.0.1/a/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "../../../d", "http://192.168.0.1/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "../../../../d", "http://192.168.0.1/d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "/../d", "http://192.168.0.1/../d"),
+        MakeRelativeUrlCase("http://192.168.0.1/a/b/c/", "./d", "http://192.168.0.1/a/b/c/d"),
+    )
+
+    private fun assertMakeRelativeUrl(expectedUrl: String, baseUrl: String, path: String) {
+        val baseURL = URL(baseUrl)
+        val relativeURL = ConversionUtils.makeRelativeURL(baseURL, path)
+        assertEquals(URL(expectedUrl), relativeURL)
     }
 
     // Test that location urls with a protocol are passed unchanged
-    def "makeRelativeURL given invalid path '#path' returns '#path'"() {
-        given:
-            URL baseURL = new URL("http://ahost.invalid/a/b/c")
-        when:
-            def relativeURL = ConversionUtils.makeRelativeURL(baseURL, path)
-        then:
-            relativeURL == new URL(path)
-        where:
-            path << ["http://host.invalid/e",
-                     "https://host.invalid/e",
-                     "http://host.invalid:8081/e",
-                     "https://host.invalid:8081/e"]
+    @ParameterizedTest
+    @ValueSource(
+        strings = [
+            "http://host.invalid/e",
+            "https://host.invalid/e",
+            "http://host.invalid:8081/e",
+            "https://host.invalid:8081/e",
+        ]
+    )
+    fun `makeRelativeURL given invalid path '#path' returns '#path'`(path: String) {
+        assertMakeRelativeUrl(path, "http://ahost.invalid/a/b/c", path)
     }
 
-    def "removeSlashDotDot given a url or path #urlOrPath returns #expectedUrl"() {
-        expect:
-            ConversionUtils.removeSlashDotDot(urlOrPath) == expectedUrl
-        where:
-            urlOrPath                                   | expectedUrl
-            "/path/"                                    | "/path/"
-            "http://host/"                              | "http://host/"
-            "http://host/one"                           | "http://host/one"
-            "/one/../two"                               | "/two"
-            "http://host:8080/one/../two"               | "http://host:8080/two"
-            "http://host:8080/one/../two/"              | "http://host:8080/two/"
-            "http://usr@host:8080/one/../two/"          | "http://usr@host:8080/two/"
-            "http://host:8080/one/../two/?query#anchor" | "http://host:8080/two/?query#anchor"
-            "one/two/.."                                | "one"
-            "../../path"                                | "../../path"
-            "/one/.."                                   | "/"
-            "/one/../"                                  | "/"
-            "/one/..?a"                                 | "/?a"
-            "http://host/one/../one"                    | "http://host/one"
-            "http://host/one/two/../../one/two"         | "http://host/one/two"
-            "http://host/.."                            | "http://host/.."
-            "http://host/../abc"                        | "http://host/../abc"
+    data class RemoveSlashDotCase(val urlOrPath: String, val expectedUrl: String)
+
+    @ParameterizedTest
+    @MethodSource("removeSlashDotDot")
+    fun removeSlashDotDot(case: RemoveSlashDotCase) {
+        assertEquals(case.expectedUrl, ConversionUtils.removeSlashDotDot(case.urlOrPath))
     }
 
-    def testSanitizeUrl() {
-        expect:
-            ConversionUtils.sanitizeUrl(new URL(input)) == new URI(expected)
-        where:
-            input                                                        | expected
-            'http://localhost/'                                          | 'http://localhost/'                                               // normal, no encoding needed
-            'http://192.168.0.1/'                                        | 'http://192.168.0.1/'                                             // normal, no encoding needed
-            'http://host/a/b/c|d'                                        | 'http://host/a/b/c%7Cd'                                           // pipe needs encoding
-            'http://host:8080/%5B%5D'                                    | 'http://host:8080/%5B%5D'                                         // already encoded
-            'http://host:8080/?%5B%5D'                                   | 'http://host:8080/?%5B%5D'                                        //already encoded
-            'http://host:8080/?!£$*():@~;\'\"%^{}[]<>|\\#'               | 'http://host:8080/?!£$*():@~;\'%22%25%5E%7B%7D[]%3C%3E%7C%5C#'    // unencoded query
-            'http://host/?!£$*():@~;\'%22%25%5E%7B%7D[]%3C%3E%7C%5C#'    | 'http://host/?!£$*():@~;\'%22%25%5E%7B%7D[]%3C%3E%7C%5C#'         // encoded
-            'http://host:8080/!£$*():@~;\'"%^{}[]<>|\\#'                 | 'http://host:8080/!£$*():@~;\'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#' // unencoded path
-            'http://host/!£$*():@~;\'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#' | 'http://host/!£$*():@~;\'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#'      // encoded
-            'http://host/?%25%5B%5D!@$%^*()#'                            | 'http://host/?%2525%255B%255D!@$%25%5E*()#'
-            'http://host/?%2525%255B%255D!@$%25%5E*()#'                  | 'http://host/?%2525%255B%255D!@$%25%5E*()#'
-            'http://host/%5B%5D?[]!@$%^*()#'                             | 'http://host/%255B%255D?[]!@$%25%5E*()#'
-            'http://host/%255B%255D?[]!@$%25%5E*()#'                     | 'http://host/%255B%255D?[]!@$%25%5E*()#'
-            'http://host/IqGo6EM1JEVZ+MSRJqUSo@qhjVMSFBTs/37/0/1'        | 'http://host/IqGo6EM1JEVZ+MSRJqUSo@qhjVMSFBTs/37/0/1'
-            'http://host/test?getItem={someID}'                          | 'http://host/test?getItem=%7BsomeID%7D'
+    private fun removeSlashDotDot() = listOf(
+        RemoveSlashDotCase("/path/", "/path/"),
+        RemoveSlashDotCase("http://host/", "http://host/"),
+        RemoveSlashDotCase("http://host/one", "http://host/one"),
+        RemoveSlashDotCase("/one/../two", "/two"),
+        RemoveSlashDotCase("http://host:8080/one/../two", "http://host:8080/two"),
+        RemoveSlashDotCase("http://host:8080/one/../two/", "http://host:8080/two/"),
+        RemoveSlashDotCase("http://usr@host:8080/one/../two/", "http://usr@host:8080/two/"),
+        RemoveSlashDotCase("http://host:8080/one/../two/?query#anchor", "http://host:8080/two/?query#anchor"),
+        RemoveSlashDotCase("one/two/..", "one"),
+        RemoveSlashDotCase("../../path", "../../path"),
+        RemoveSlashDotCase("/one/..", "/"),
+        RemoveSlashDotCase("/one/../", "/"),
+        RemoveSlashDotCase("/one/..?a", "/?a"),
+        RemoveSlashDotCase("http://host/one/../one", "http://host/one"),
+        RemoveSlashDotCase("http://host/one/two/../../one/two", "http://host/one/two"),
+        RemoveSlashDotCase("http://host/..", "http://host/.."),
+        RemoveSlashDotCase("http://host/../abc", "http://host/../abc"),
+    )
+
+    @ParameterizedTest
+    @MethodSource("sanitizeUrlCases")
+    fun testSanitizeUrl(case: SanitizeUrlCase) {
+        assertEquals(URI(case.expectedUrl), ConversionUtils.sanitizeUrl(URL(case.input)), case.message)
     }
+
+    data class SanitizeUrlCase(val input: String, val expectedUrl: String, val message: String? = null)
+
+    private fun sanitizeUrlCases() = listOf(
+        SanitizeUrlCase("http://localhost/", "http://localhost/", "normal, no encoding needed"),
+        SanitizeUrlCase("http://192.168.0.1/", "http://192.168.0.1/", "normal, no encoding needed"),
+        SanitizeUrlCase("http://host/a/b/c|d", "http://host/a/b/c%7Cd", "pipe needs encoding"),
+        SanitizeUrlCase("http://host:8080/%5B%5D", "http://host:8080/%5B%5D", "already encoded"),
+        SanitizeUrlCase("http://host:8080/?%5B%5D", "http://host:8080/?%5B%5D", "already encoded"),
+        SanitizeUrlCase(
+            "http://host:8080/?!£$*():@~;'\"%^{}[]<>|\\#",
+            "http://host:8080/?!£$*():@~;'%22%25%5E%7B%7D[]%3C%3E%7C%5C#",
+            "unencoded query"
+        ),
+        SanitizeUrlCase(
+            "http://host/?!£$*():@~;'%22%25%5E%7B%7D[]%3C%3E%7C%5C#",
+            "http://host/?!£$*():@~;'%22%25%5E%7B%7D[]%3C%3E%7C%5C#",
+            "encoded"
+        ),
+        SanitizeUrlCase(
+            "http://host:8080/!£$*():@~;'\"%^{}[]<>|\\#",
+            "http://host:8080/!£$*():@~;'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#",
+            "unencoded path"
+        ),
+        SanitizeUrlCase(
+            "http://host/!£$*():@~;'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#",
+            "http://host/!£$*():@~;'%22%25%5E%7B%7D%5B%5D%3C%3E%7C%5C#",
+            "encoded"
+        ),
+        SanitizeUrlCase("http://host/?%25%5B%5D!@$%^*()#", "http://host/?%2525%255B%255D!@$%25%5E*()#"),
+        SanitizeUrlCase("http://host/?%2525%255B%255D!@$%25%5E*()#", "http://host/?%2525%255B%255D!@$%25%5E*()#"),
+        SanitizeUrlCase("http://host/%5B%5D?[]!@$%^*()#", "http://host/%255B%255D?[]!@$%25%5E*()#"),
+        SanitizeUrlCase("http://host/%255B%255D?[]!@$%25%5E*()#", "http://host/%255B%255D?[]!@$%25%5E*()#"),
+        SanitizeUrlCase(
+            "http://host/IqGo6EM1JEVZ+MSRJqUSo@qhjVMSFBTs/37/0/1",
+            "http://host/IqGo6EM1JEVZ+MSRJqUSo@qhjVMSFBTs/37/0/1"
+        ),
+        SanitizeUrlCase("http://host/test?getItem={someID}", "http://host/test?getItem=%7BsomeID%7D"),
+    )
 }

From 2f2cbbd955091d3d9dea6257067c70b0ba0a236d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 13:08:02 +0300
Subject: [PATCH 0738/1037] refactor: rename .groovy to .kt in
 :src:protocol:jdbc to allow Git track history better

---
 .../org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/protocol/jdbc/src/test/{groovy/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy => kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt} (100%)

diff --git a/src/protocol/jdbc/src/test/groovy/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
similarity index 100%
rename from src/protocol/jdbc/src/test/groovy/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy
rename to src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt

From d80c0226f8179dae9b6018b11db8b6002eb82fba Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 13:41:45 +0300
Subject: [PATCH 0739/1037] refactor: migrate :src:protocol:jdbc Groovy tests
 to Kotlin

---
 src/protocol/jdbc/build.gradle.kts            |   1 +
 .../jdbc/AbstractJDBCTestElementExecute.kt    |  24 ++
 .../protocol/jdbc/sampler/JDBCSamplerTest.kt  | 207 ++++++++++--------
 3 files changed, 140 insertions(+), 92 deletions(-)
 create mode 100644 src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElementExecute.kt

diff --git a/src/protocol/jdbc/build.gradle.kts b/src/protocol/jdbc/build.gradle.kts
index 3503b81c607..702d139c624 100644
--- a/src/protocol/jdbc/build.gradle.kts
+++ b/src/protocol/jdbc/build.gradle.kts
@@ -31,4 +31,5 @@ dependencies {
     }
 
     testImplementation(testFixtures(projects.src.core))
+    testImplementation("io.mockk:mockk")
 }
diff --git a/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElementExecute.kt b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElementExecute.kt
new file mode 100644
index 00000000000..192415ae394
--- /dev/null
+++ b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElementExecute.kt
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.jdbc
+
+import org.apache.jmeter.samplers.SampleResult
+import java.sql.Connection
+
+fun AbstractJDBCTestElement.executeForTest(conn: Connection, sampleResult: SampleResult) =
+    execute(conn, sampleResult)
diff --git a/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
index 0f72eea7580..1ab034de974 100644
--- a/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
+++ b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
@@ -17,116 +17,139 @@
 
 package org.apache.jmeter.protocol.jdbc.sampler
 
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.verifyOrder
+import org.apache.jmeter.config.ConfigTestElement
+import org.apache.jmeter.config.gui.SimpleConfigGui
+import org.apache.jmeter.protocol.jdbc.executeForTest
+import org.apache.jmeter.samplers.SampleResult
+import org.apache.jmeter.testelement.TestElementSchema
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
 import java.sql.Connection
 import java.sql.ResultSet
 import java.sql.ResultSetMetaData
 import java.sql.SQLException
 import java.sql.Statement
 
-import org.apache.jmeter.config.ConfigTestElement
-import org.apache.jmeter.samplers.SampleResult
-import org.apache.jmeter.testelement.property.JMeterProperty
-
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class JDBCSamplerSpec extends Specification {
-
-    def sut = new JDBCSampler()
-
-    def "applies matches SimpleConfigGui"() {
-        given:
-            def mockConfig = Mock(ConfigTestElement)
-            def mockProperty = Mock(JMeterProperty)
-        when:
-            def applies = sut.applies(mockConfig)
-        then:
-            1 * mockConfig.getProperty(_ as String) >> mockProperty
-            1 * mockProperty.getStringValue() >> propertyValue
-            applies == expectedApplies
-            // this check will catch any future additions
-            sut.APPLIABLE_CONFIG_CLASSES.size() == 1
-        where:
-            propertyValue                                  | expectedApplies
-            "org.apache.jmeter.config.gui.SimpleConfigGui" | true
-            "org.apache.jmeter.config.gui.SomethingElse"   | false
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class JDBCSamplerTest {
+
+    lateinit var sut: JDBCSampler
+
+    @BeforeEach
+    fun setup() {
+        sut = JDBCSampler()
+    }
+
+    @Test
+    fun `applies matches SimpleConfigGui`() {
+        val configElement = SimpleConfigGui().createTestElement() as ConfigTestElement
+        assertTrue(
+            sut.applies(configElement),
+            "JDBCSampler should apply to SimpleConfigGui"
+        )
+        configElement[TestElementSchema.guiClass] = "org.apache.jmeter.config.gui.SomethingElse"
+        assertFalse(
+            sut.applies(configElement),
+            "JDBCSampler should not apply to gui.SomethingElse"
+        )
     }
 
     /* AbstractJDBCTestElement tests */
 
-    def "execute with SELECT query"() {
-        given:
-            def conn = Mock(Connection)
-            def sample = Mock(SampleResult)
-            def stmt = Mock(Statement)
-            def rs = Mock(ResultSet)
-            def meta = Mock(ResultSetMetaData)
-            sut.setQuery("SELECT")
-        when:
-            def response = sut.execute(conn, sample)
-        then:
-            1 * conn.createStatement() >> stmt
-            1 * stmt.setQueryTimeout(0)
-            1 * stmt.executeQuery(_ as String) >> rs
-            1 * sample.latencyEnd()
+    @Test
+    fun `execute with SELECT query`() {
+        val meta = mockk<ResultSetMetaData> {
+            every { columnCount } returns 0
+        }
+        val rs = mockk<ResultSet> {
+            every { metaData } returns meta
+            every { close() } throws SQLException()
+            every { next() } returns false
+        }
+        val stmt = mockk<Statement> {
+            every { executeQuery(any()) } returns rs
+            justRun { queryTimeout = any() }
+            justRun { close() }
+        }
+        val conn = mockk<Connection> {
+            every { createStatement() } returns stmt
+        }
+        val sample = mockk<SampleResult> {
+            justRun { latencyEnd() }
+        }
+
+        sut.query = "SELECT"
+        val response = sut.executeForTest(conn, sample)
+
+        verifyOrder {
+            conn.createStatement()
+            stmt.queryTimeout = 0
+            stmt.executeQuery(any())
+            sample.latencyEnd()
             // getStringFromResultSet
-            1 * rs.getMetaData() >> meta
-            1 * rs.next()
-            1 * rs.close() >> { throw new SQLException() }
-            1 * stmt.close()
-            // 1 * conn.close() // closed by JDBCSampler
-            1 * meta.getColumnCount() >> 0
-            response == [] as byte[]
+            rs.metaData
+            meta.columnCount
+            rs.next()
+            rs.close()
+            stmt.close()
+            // conn.close() // closed by JDBCSampler
+        }
+        assertArrayEquals(byteArrayOf(), response, "response")
     }
 
-    def "Catches SQLException during Connection closing"() {
-        given:
-            def mockConnection = Mock(Connection)
-        when:
-            sut.close(mockConnection)
-        then:
-            1 * mockConnection.close() >> { throw new SQLException() }
-            noExceptionThrown()
+    @Test
+    fun `Catches SQLException during Connection closing`() {
+        val mockConnection = mockk<Connection> {
+            every { close() } throws SQLException()
+        }
+        JDBCSampler.close(mockConnection)
     }
 
-    def "Catches SQLException during Statement closing"() {
-        given:
-            def mockStatement = Mock(Statement)
-        when:
-            sut.close(mockStatement)
-        then:
-            1 * mockStatement.close() >> { throw new SQLException() }
-            noExceptionThrown()
+    @Test
+    fun `Catches SQLException during Statement closing`() {
+        val mockStatement = mockk<Statement> {
+            every { close() } throws SQLException()
+        }
+        JDBCSampler.close(mockStatement)
     }
 
-    def "Catches SQLException during ResultSet closing"() {
-        given:
-            def mockResultSet = Mock(ResultSet)
-        when:
-            sut.close(mockResultSet)
-        then:
-            1 * mockResultSet.close() >> { throw new SQLException() }
-            noExceptionThrown()
+    @Test
+    fun `Catches SQLException during ResultSet closing`() {
+        val mockStatement = mockk<ResultSet> {
+            every { close() } throws SQLException()
+        }
+        JDBCSampler.close(mockStatement)
     }
 
-    def "getIntegerQueryTimeout returns #expectedTimeout from #initialTimeout"() {
-        given:
-            sut.setQueryTimeout(initialTimeout)
-        when:
-            def timeout = sut.getIntegerQueryTimeout()
-        then:
-            timeout == expectedTimeout
-        where:
-            initialTimeout | expectedTimeout
-            "0"            | 0
-            "1"            | 1
-            "2147483647"   | Integer.MAX_VALUE
-            "-1"           | -1
-            "-2147483648"  | Integer.MIN_VALUE
-            "2147483648"   | 0 // max int + 1
-            "-2147483649"  | 0 // min int - 1
-            "nan"          | 0
-            ""             | 0
+    data class GetIntegerQueryTimeoutCase(val initialTimeout: String, val expectedTimeout: Int, val message: String? = null)
+
+    @ParameterizedTest
+    @MethodSource("getIntegerQueryTimeoutCases")
+    fun `getIntegerQueryTimeout returns #expectedTimeout from #initialTimeout`(case: GetIntegerQueryTimeoutCase) {
+        sut.queryTimeout = case.initialTimeout
+        assertEquals(case.expectedTimeout, sut.getIntegerQueryTimeout(), case.message)
     }
+
+    fun getIntegerQueryTimeoutCases() = listOf(
+        GetIntegerQueryTimeoutCase("0", 0),
+        GetIntegerQueryTimeoutCase("1", 1),
+        GetIntegerQueryTimeoutCase("2147483647", Integer.MAX_VALUE),
+        GetIntegerQueryTimeoutCase("-1", -1),
+        GetIntegerQueryTimeoutCase("-2147483648", Integer.MIN_VALUE),
+        GetIntegerQueryTimeoutCase("2147483648", 0, "max int + 1"),
+        GetIntegerQueryTimeoutCase("-2147483649", 0, "min int - 1"),
+        GetIntegerQueryTimeoutCase("nan", 0),
+        GetIntegerQueryTimeoutCase("", 0),
+    )
 }

From bf18733adb82062bacd6be6c789b314588372dc3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 13:50:15 +0300
Subject: [PATCH 0740/1037] refactor: rename .groovy to .kt in
 :src:protocol:bolt to allow Git track history better

---
 .../org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/protocol/bolt/src/test/{groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy => kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt} (100%)

diff --git a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy b/src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt
similarity index 100%
rename from src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
rename to src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt

From dfe4649a301cbc603d5f2cd0a635e5ed48d2d99f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 14:17:58 +0300
Subject: [PATCH 0741/1037] refactor: migrate :src:protocol:bolt Groovy tests
 to Kotlin

---
 src/protocol/bolt/build.gradle.kts            |   1 +
 .../protocol/bolt/sampler/BoltSamplerTest.kt  | 277 +++++++++---------
 2 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/src/protocol/bolt/build.gradle.kts b/src/protocol/bolt/build.gradle.kts
index 431d0d658f1..86be43ac195 100644
--- a/src/protocol/bolt/build.gradle.kts
+++ b/src/protocol/bolt/build.gradle.kts
@@ -28,4 +28,5 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind")
 
     testImplementation(testFixtures(projects.src.core))
+    testImplementation("io.mockk:mockk")
 }
diff --git a/src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt b/src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt
index 65e6b09efe0..96859fd65f5 100644
--- a/src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt
+++ b/src/protocol/bolt/src/test/kotlin/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerTest.kt
@@ -17,10 +17,19 @@
 
 package org.apache.jmeter.protocol.bolt.sampler
 
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
 import org.apache.jmeter.protocol.bolt.config.BoltConnectionElement
 import org.apache.jmeter.samplers.Entry
+import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 import org.neo4j.driver.Driver
 import org.neo4j.driver.Record
 import org.neo4j.driver.Result
@@ -29,166 +38,156 @@ import org.neo4j.driver.exceptions.ClientException
 import org.neo4j.driver.summary.ResultSummary
 import org.neo4j.driver.summary.SummaryCounters
 
-import spock.lang.Specification
+class BoltSamplerTest {
+    lateinit var sampler: BoltSampler
+    lateinit var entry: Entry
+    lateinit var session: Session
 
-class BoltSamplerSpec extends Specification {
-
-    BoltSampler sampler
-    Entry entry
-    Session session
-
-    def setup() {
-        sampler = new BoltSampler()
-        entry = new Entry()
-        def driver = Mock(Driver)
-        def boltConfig = new BoltConnectionElement()
-        def variables = new JMeterVariables()
+    @BeforeEach
+    fun setup() {
+        sampler = BoltSampler()
+        entry = Entry()
+        session = mockk<Session> {
+            justRun { close() }
+        }
+        val driver = mockk<Driver> {
+            every { session(any()) } returns session
+        }
+        val boltConfig = BoltConnectionElement()
+        val variables = JMeterVariables()
         // ugly but could not find a better way to pass the driver to the sampler...
         variables.putObject(BoltConnectionElement.BOLT_CONNECTION, driver)
-        JMeterContextService.getContext().setVariables(variables)
+        JMeterContextService.getContext().variables = variables
         entry.addConfigElement(boltConfig)
-        session = Mock(Session)
-        driver.session(_) >> session
     }
 
-    def "should execute return success on successful query"() {
-        given:
-            sampler.setCypher("MATCH x")
-            session.run("MATCH x", [:], _) >> getEmptyQueryResult()
-        when:
-            def response = sampler.sample(entry)
-        then:
-            response.isSuccessful()
-            response.isResponseCodeOK()
-            def str = response.getResponseDataAsString()
-            str.contains("Summary:")
-            str.endsWith("Records: Skipped")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 0
-            //  The sampler was executed, so start and end times should be set
-            response.getStartTime() > 0
-            response.getEndTime() > 0
+    @Test
+    fun `should execute return success on successful query`() {
+        sampler.cypher = "MATCH x"
+        every {
+            session.run("MATCH x", mapOf(), any())
+        } returns getEmptyQueryResult()
+        val response = sampler.sample(entry)
+
+        assertSuccessResult(response, "Records: Skipped")
+    }
+
+    private fun assertSuccessResult(response: SampleResult, responseDataTail: String) {
+        val str = response.responseDataAsString
+        assertTrue(str.contains("Summary:"), "response contains 'Summary:', got '$str'")
+        assertTrue(str.endsWith(responseDataTail), "response ends with '$responseDataTail', got '$str'")
+        assertTrue(response.isSuccessful, ".isSuccessful()")
+        assertTrue(response.isResponseCodeOK, ".isResponseCodeOK()")
+        assertEquals(1, response.sampleCount, ".sampleCount")
+        assertEquals(0, response.errorCount, ".errorCount")
+        assertSamplerStarted(response)
+    }
+
+    private fun assertSamplerStarted(response: SampleResult) {
+        assertTrue(response.startTime > 0, "The sampler was executed, so start and end times should be set")
+        assertTrue(response.endTime > 0, "The sampler was executed, so start and end times should be set")
     }
 
-    def "should not display results by default"() {
-        given:
-            sampler.setCypher("MATCH x")
-            session.run("MATCH x", [:], _) >> getPopulatedQueryResult()
-        when:
-            def response = sampler.sample(entry)
-        then:
-            response.isSuccessful()
-            response.isResponseCodeOK()
-            def str = response.getResponseDataAsString()
-            str.contains("Summary:")
-            str.endsWith("Records: Skipped")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 0
+    private fun assertFailureResult(
+        response: SampleResult,
+        responseCode: String,
+        message: String,
+        samplerStarted: Boolean
+    ) {
+        val str = response.responseDataAsString
+        assertFalse(str.contains("Summary:"), "response contains 'Summary:', got $str")
+        assertTrue(str.contains(message), "response contains '$message', got $str")
+        assertFalse(response.isSuccessful, ".isSuccessful()")
+        assertFalse(response.isResponseCodeOK, ".isResponseCodeOK()")
+        assertEquals(responseCode, response.responseCode, ".responseCode")
+        assertEquals(1, response.sampleCount, ".sampleCount")
+        assertEquals(1, response.errorCount, ".errorCount")
+        if (samplerStarted) {
+            assertSamplerStarted(response)
+        } else {
+            assertSamplerNotStarted(response)
+        }
     }
 
-    def "should display results if asked"() {
-        given:
-            sampler.setCypher("MATCH x")
-            sampler.setRecordQueryResults(true)
-            session.run("MATCH x", [:], _) >> getPopulatedQueryResult()
-        when:
-            def response = sampler.sample(entry)
-        then:
-            response.isSuccessful()
-            response.isResponseCodeOK()
-            def str = response.getResponseDataAsString()
-            str.contains("Summary:")
-            str.endsWith("Mock for type 'Record'")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 0
-            //  The sampler was executed, so start and end times should be set
-            response.getStartTime() > 0
-            response.getEndTime() > 0
+    private fun assertSamplerNotStarted(response: SampleResult) {
+        assertEquals(0, response.startTime, "The sampler fails at parameter preparation, so no time is recorded")
+        assertEquals(0, response.endTime, "The sampler fails at parameter preparation, so no time is recorded")
     }
 
-    def "should return error on failed query"() {
-        given:
-            sampler.setCypher("MATCH x")
-            session.run("MATCH x", [:], _) >> { throw new RuntimeException("a message") }
-        when:
-            def response = sampler.sample(entry)
-        then:
-            !response.isSuccessful()
-            !response.isResponseCodeOK()
-            response.getResponseCode() == "500"
-            def str = response.getResponseDataAsString()
-            str.contains("a message")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 1
-            //  The sampler was executed, so start and end times should be set
-            response.getStartTime() > 0
-            response.getEndTime() > 0
+    @Test
+    fun `should not display results by default`() {
+        sampler.cypher = "MATCH x"
+        every {
+            session.run("MATCH x", mapOf(), any())
+        } returns getPopulatedQueryResult()
+        val response = sampler.sample(entry)
+
+        assertSuccessResult(response, "Records: Skipped")
     }
 
-    def "should return error on invalid parameters"() {
-        given:
-            sampler.setCypher("MATCH x")
-            sampler.setParams("{invalid}")
-        when:
-            def response = sampler.sample(entry)
-        then:
-            !response.isSuccessful()
-            !response.isResponseCodeOK()
-            response.getResponseCode() == "500"
-            def str = response.getResponseDataAsString()
-            str.contains("Unexpected character")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 1
-            // The sampler fails at parameter preparation, so no time is recorded
-            response.getStartTime() == 0
-            response.getEndTime() == 0
-            response.getTime() == 0
+    @Test
+    fun `should display results if asked`() {
+        sampler.cypher = "MATCH x"
+        sampler.isRecordQueryResults = true
+        every {
+            session.run("MATCH x", mapOf(), any())
+        } returns getPopulatedQueryResult()
+        val response = sampler.sample(entry)
+        assertSuccessResult(response, "Mock for type 'Record'")
     }
 
-    def "should return db error code"() {
-        given:
-            sampler.setCypher("MATCH x")
-            session.run("MATCH x", [:], _) >> { throw new ClientException("a code", "a message") }
-        when:
-            def response = sampler.sample(entry)
-        then:
-            response.getResponseCode() == "a code"
+    @Test
+    fun `should return error on failed query`() {
+        sampler.cypher = "MATCH x"
+        every { session.run("MATCH x", mapOf(), any()) } throws RuntimeException("a message")
+        val response = sampler.sample(entry)
+
+        assertFailureResult(response, "500", "a message", samplerStarted = true)
     }
 
-    def "should ignore invalid timeout values"() {
-        given:
-            sampler.setCypher("MATCH x")
-            sampler.setTxTimeout(-1)
-            session.run("MATCH x", [:], _) >> getEmptyQueryResult()
-        when:
-            def response = sampler.sample(entry)
-        then:
-            response.isSuccessful()
-            response.isResponseCodeOK()
-            def str = response.getResponseDataAsString()
-            str.contains("Summary:")
-            str.endsWith("Records: Skipped")
-            response.getSampleCount() == 1
-            response.getErrorCount() == 0
+    @Test
+    fun `should return error on invalid parameters`() {
+        sampler.cypher = "MATCH x"
+        sampler.params = "{invalid}"
+        val response = sampler.sample(entry)
+
+        assertFailureResult(response, "500", "Unexpected character", samplerStarted = false)
     }
 
-    def getEmptyQueryResult() {
-        def queryResult = Mock(Result)
-        def summary = Mock(ResultSummary)
-        queryResult.consume() >> summary
-        SummaryCounters counters = Mock(SummaryCounters)
-        summary.counters() >> counters
-        return queryResult
+    @Test
+    fun `should return db error code`() {
+        sampler.cypher = "MATCH x"
+        every { session.run("MATCH x", mapOf(), any()) } throws ClientException("a code", "a message")
+        val response = sampler.sample(entry)
+        assertEquals("a code", response.responseCode)
     }
 
-    def getPopulatedQueryResult() {
-        def queryResult = Mock(Result)
-        def summary = Mock(ResultSummary)
-        def list = [Mock(Record), Mock(Record), Mock(Record)]
-        queryResult.consume() >> summary
-        queryResult.list() >> list
-        SummaryCounters counters = Mock(SummaryCounters)
-        summary.counters() >> counters
-        return queryResult
+    @Test
+    fun `should ignore invalid timeout values`() {
+        sampler.cypher = "MATCH x"
+        sampler.txTimeout = -1
+        every { session.run("MATCH x", mapOf(), any()) } returns getEmptyQueryResult()
+        val response = sampler.sample(entry)
+        assertSuccessResult(response, "Records: Skipped")
     }
+
+    private fun getEmptyQueryResult() =
+        mockk<Result> {
+            every { consume() } returns mockk<ResultSummary> {
+                every { counters() } returns mockk<SummaryCounters>(relaxed = true)
+            }
+        }
+
+    @Suppress("LABEL_NAME_CLASH")
+    private fun getPopulatedQueryResult() =
+        mockk<Result> {
+            every { consume() } returns mockk<ResultSummary> {
+                every { counters() } returns mockk<SummaryCounters>(relaxed = true)
+            }
+            every { list() } returns listOf(
+                mockk<Record> { every { this@mockk.toString() } returns "Mock for type 'Record'" },
+                mockk<Record> { every { this@mockk.toString() } returns "Mock for type 'Record'" },
+                mockk<Record> { every { this@mockk.toString() } returns "Mock for type 'Record'" },
+            )
+        }
 }

From e5355de31932ac94ce67034af07b97fddc0ff719 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 14:27:15 +0300
Subject: [PATCH 0742/1037] chore: remove Groovy compilation from the build
 pipeline

---
 CONTRIBUTING.md                               |  3 +-
 .../main/kotlin/build-logic.groovy.gradle.kts | 34 --------------
 .../kotlin/build-logic.jvm-library.gradle.kts |  4 --
 .../kotlin/build-logic.test-base.gradle.kts   | 16 -------
 .../kotlin/build-logic.test-spock.gradle.kts  | 46 -------------------
 checksum.xml                                  |  1 -
 renovate.json                                 |  6 ---
 src/bom-testing/build.gradle.kts              |  1 -
 src/components/build.gradle.kts               |  1 -
 9 files changed, 1 insertion(+), 111 deletions(-)
 delete mode 100644 build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
 delete mode 100644 build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c22f9b37d93..2c8ca1f6e46 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,8 +53,7 @@ Optionally you can generate an Eclipse project by running
 The steps to import the sources (based on Eclipse 2019-06) into Eclipse are as follows:
 
 1. Install `Eclipse IDE for Java Developers`
-1. Install the Groovy Eclipse plugin and select Groovy Compiler 2.4 (some tests are written in Groovy)
-1. Install `Kotlin for Eclipse` plugin (builds scripts are written in Kotlin)
+1. Install `Kotlin for Eclipse` plugin (JMeter code uses Java and Kotlin)
 1. Make sure you have a Java 8 compatible JDK configured in your workspace
 1. Open `File->Import...`
 1. Select `Existing Gradle Project` and click `Next`
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
deleted file mode 100644
index 1acd72cc948..00000000000
--- a/build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import com.github.vlsi.gradle.dsl.configureEach
-
-plugins {
-    id("java")
-    id("groovy")
-    id("build-logic.test-spock")
-    id("com.github.vlsi.gradle-extensions")
-    id("build-logic.build-params")
-}
-
-tasks.configureEach<GroovyCompile> {
-    buildParameters.testJdk?.let {
-        javaLauncher.convention(javaToolchains.launcherFor(it))
-    }
-    // Support jdk-release to configure the target Java release when compiling the bytecode
-    // See https://issues.apache.org/jira/browse/GROOVY-11105
-}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
index 1b38aec8296..3c9f687dd5a 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts
@@ -19,10 +19,6 @@ plugins {
     id("build-logic.java-library")
 }
 
-if (file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory) {
-    apply(plugin = "build-logic.groovy")
-}
-
 if (file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory) {
     apply(plugin = "build-logic.kotlin")
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
index 830174dca29..fa614d93aee 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
@@ -61,20 +61,4 @@ tasks.configureEach<Test> {
     passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
     // Enable testing ByteBuddy with EA Java versions
     passProperty("net.bytebuddy.experimental", "true")
-    // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively,
-    // So we pass --add-opens
-    // See https://github.com/apache/jmeter/pull/5763
-    jvmArgumentProviders += AddOpensArgumentsProvider(javaLauncher.map { it.metadata.languageVersion })
-}
-
-class AddOpensArgumentsProvider(
-    @Input val javaLanguageVersion: Provider<JavaLanguageVersion>
-): CommandLineArgumentProvider {
-    override fun asArguments(): Iterable<String> =
-        if (javaLanguageVersion.get().asInt() <= 8) {
-            // Jave 1.8 does not need add-opens, so we omit it
-            listOf()
-        } else {
-            listOf("--add-opens=java.base/java.lang=ALL-UNNAMED")
-        }
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts
deleted file mode 100644
index 431485b6e2b..00000000000
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    `java-library`
-    id("build-logic.test-base")
-}
-
-dependencies {
-    testImplementation("org.spockframework:spock-core")
-    testRuntimeOnly("cglib:cglib-nodep") {
-        because(
-            """
-                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
-                 class org.apache.jmeter.report.processor.AbstractSummaryConsumer${'$'}SummaryInfo.
-                 Mocking of non-interface types requires a code generation library.
-                 Please put an up-to-date version of byte-buddy or cglib-nodep on the class path.
-            """.trimIndent()
-        )
-    }
-    testRuntimeOnly("org.objenesis:objenesis") {
-        because(
-            """
-                org.spockframework.mock.CannotCreateMockException: Cannot create mock for
-                 class org.apache.jmeter.report.core.Sample. To solve this problem,
-                 put Objenesis 1.2 or higher on the class path (recommended),
-                 or supply constructor arguments (e.g. 'constructorArgs: [42]') that allow to construct
-                 an object of the mocked type.
-            """.trimIndent()
-        )
-    }
-}
diff --git a/checksum.xml b/checksum.xml
index ce13b9d1424..cbbfe400079 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -211,7 +211,6 @@
     <trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='org.slf4j' />
     <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
     <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
-    <trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.springframework' />
     <trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
     <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
diff --git a/renovate.json b/renovate.json
index 39d8644ad1b..dd41f3bdbf4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -113,12 +113,6 @@
       "groupName": "org.slf4j",
       "allowedVersions": "< 2.0.0"
     },
-    {
-      "matchPackagePrefixes": ["org.spockframework"],
-      "groupName": "org.spockframework",
-      "description": "TODO: change when we upgrade to Groovy 4.0",
-      "allowedVersions": "/.*-groovy-3.0/"
-    },
     {
       "matchPackagePatterns": ["^src:protocol"],
       "enabled": false
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 65ddd385938..158cb59b391 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -56,7 +56,6 @@ dependencies {
         api("org.objenesis:objenesis:3.3")
         api("org.openjdk.jmh:jmh-core:1.37")
         api("org.openjdk.jmh:jmh-generator-annprocess:1.37")
-        api("org.spockframework:spock-core:2.3-groovy-3.0")
         api("org.springframework:spring-beans:4.3.30.RELEASE")
         api("org.springframework:spring-context:4.3.30.RELEASE")
     }
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 1e5052a2faf..7ea996edbe5 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -91,7 +91,6 @@ dependencies {
     testFixturesImplementation(testFixtures(projects.src.core))
     testFixturesImplementation("junit:junit")
     testImplementation("io.mockk:mockk")
-    testFixturesImplementation("org.spockframework:spock-core")
 }
 
 if (!buildParameters.enableJavaFx) {

From ae75354d3c498e8c03d9d46daaf8504ea17a6b1c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 27 Dec 2023 23:09:31 +0300
Subject: [PATCH 0743/1037] refactor: replace org.junit.Assert with
 org.junit.jupiter.api.Assertions

It is a step towards removing junit:junit:4.x dependency
---
 .../assertions/ResponseAssertionTest.java     |  34 ++---
 .../jmeter/assertions/SMIMEAssertionTest.java |  32 ++---
 .../jmeter/assertions/SizeAssertionTest.java  |  15 +-
 .../assertions/XMLSchemaAssertionTest.java    |  10 +-
 .../assertions/XPath2AssertionTest.java       |  65 ++++-----
 .../jmeter/assertions/XPathAssertionTest.java | 103 +++++++-------
 .../jmespath/TestJMESPathAssertion.java       |   4 +-
 .../apache/jmeter/config/TestCVSDataSet.java  | 134 +++++++++---------
 .../jmeter/config/gui/TestArgumentsPanel.java |   2 +-
 .../jmeter/control/TestGenericController.java |   3 +-
 .../jmeter/control/TestIfController.java      |  28 ++--
 .../jmeter/control/TestInterleaveControl.java |  10 +-
 .../jmeter/control/TestLoopController.java    |   6 +-
 .../control/TestOnceOnlyController.java       |   2 +-
 .../jmeter/control/TestRandomController.java  |  11 +-
 .../control/TestTransactionController.java    |   7 +-
 .../jmeter/control/TestWhileController.java   |  74 +++++-----
 .../extractor/TestHtmlExtractorJSoup.java     |   4 +-
 .../jmeter/extractor/TestRegexExtractor.java  |  82 +++++------
 .../jmeter/extractor/TestXPath2Extractor.java |   4 +-
 .../apache/jmeter/gui/action/TestSave.java    |   2 +-
 .../action/template/TestTemplateManager.java  |  18 +--
 .../timers/ConstantThroughputTimerTest.java   |  44 +++---
 .../PreciseThroughputTimerTest.java           |  31 ++--
 .../jmeter/visualizers/TestRenderAsJson.java  |  16 +--
 .../TestSamplingStatCalculator.java           |  10 +-
 .../backend/SamplerMetricFixedModeTest.java   |  92 ++++++------
 .../backend/SamplerMetricTimedModeTest.java   |  88 ++++++------
 .../apache/jmeter/engine/LocalHostTest.java   |   7 +-
 .../apache/jmeter/engine/TestTreeCloner.java  |  19 +--
 .../jmeter/engine/util/TestValueReplacer.java |   4 +-
 .../gui/logging/TestGuiLogEventAppender.java  |   4 +-
 .../jmeter/listeners/TestResultAction.java    |  38 ++---
 .../report/core/CsvSampleReaderTest.java      |  16 ++-
 .../report/core/SampleMetadataTest.java       |   2 +-
 .../report/core/TestCsvSampleWriter.java      |   8 +-
 .../samplers/TestSampleSaveConfiguration.java |  61 ++++----
 .../jmeter/save/TestCSVSaveService.java       |  20 +--
 .../gui/TestBooleanPropertyEditor.java        |  32 ++---
 .../testbeans/gui/TestComboStringEditor.java  |   4 +-
 .../testbeans/gui/TestFieldStringEditor.java  |   2 +-
 .../jmeter/testelement/PackageTest.java       |   8 +-
 .../testelement/TestNumberProperty.java       |   4 +-
 .../jmeter/threads/TestJMeterThread.java      |  11 +-
 .../jmeter/threads/TestTestCompiler.java      |   2 +-
 .../TestUnmodifiableJMeterVariables.java      |   4 +-
 .../org/apache/jmeter/util/PackageTest.java   |   2 +-
 .../util/SecurityProviderLoaderTest.java      |  63 ++++----
 .../jmeter/util/StringUtilitiesTest.java      |   4 +-
 .../apache/jmeter/util/TestJMeterUtils.java   |  22 +--
 .../org/apache/jmeter/util/XPathUtilTest.java |  34 ++---
 .../apache/jorphan/reflect/TestFunctor.java   |  33 ++---
 .../apache/jmeter/junit/JMeterTestCase.java   |   3 +-
 .../resources/ResourceKeyUsageTest.java       |  11 +-
 .../threads/TestJMeterContextService.java     |   2 +-
 .../jmeter/control/TestSwitchController.java  |  42 +++---
 .../jmeter/resources/TestPropertiesFiles.java |  10 +-
 .../apache/jmeter/save/TestSaveService.java   |  13 +-
 .../org/apache/jorphan/TestFunctorUsers.java  |  16 +--
 .../jorphan/reflect/TestClassFinder.java      |  26 ++--
 .../jmeter/functions/EvalFunctionTest.java    |   6 +-
 .../jmeter/functions/RandomFunctionTest.java  |  12 +-
 .../functions/TestFileRowColContainer.java    |  25 ++--
 .../jmeter/functions/TestFileToString.java    |  12 +-
 .../jmeter/functions/TestGroovyFunction.java  |   2 +-
 .../jmeter/functions/TestIsPropDefined.java   |   2 +-
 .../jmeter/functions/TestRegexFunction.java   |   8 +-
 .../jmeter/functions/TestSetProperty.java     |   6 +-
 .../apache/jmeter/functions/VariableTest.java |  20 +--
 .../commons/cli/avalon/ClutilTestCase.java    |  56 ++++----
 .../jorphan/collections/PackageTest.java      |  10 +-
 .../apache/jorphan/exec/TestKeyToolUtils.java |   2 +-
 .../jorphan/gui/TableModelEventBacker.java    |  12 +-
 .../http/config/MultipartUrlConfigTest.java   |   2 +-
 .../protocol/http/config/UrlConfigTest.java   |   6 +-
 .../http/control/TestAuthManager.java         |  10 +-
 .../TestAuthManagerThreadIteration.java       |  20 +--
 .../TestCacheManagerThreadIteration.java      |  64 ++++-----
 .../TestCookieManagerThreadIteration.java     | 103 +++++++++-----
 .../http/control/TestHC4CookieManager.java    |  53 ++++---
 .../control/gui/TestHttpTestSampleGui.java    |   7 +-
 .../http/modifier/TestAnchorModifier.java     |   9 +-
 .../modifier/TestURLRewritingModifier.java    |  11 +-
 .../protocol/http/parser/TestBaseParser.java  |  12 +-
 .../http/parser/TestHtmlParsingUtils.java     |   4 +-
 .../http/proxy/TestHttpRequestHdr.java        |  32 ++---
 .../protocol/http/proxy/TestProxyControl.java |  56 ++++----
 .../protocol/http/sampler/PackageTest.java    |   2 +-
 .../protocol/http/sampler/PostWriterTest.java |   6 +-
 .../protocol/http/sampler/PutWriterTest.java  |   8 +-
 .../http/sampler/SamplingNamingTest.java      |  15 +-
 .../http/sampler/TestHTTPHC4Impl.java         |  13 +-
 .../http/sampler/TestHTTPSamplers.java        |   4 +-
 .../protocol/http/sampler/TestHttpWebdav.java |  13 +-
 .../protocol/http/util/TestHTTPArgument.java  |   2 +-
 .../protocol/http/util/TestHTTPFileArg.java   |  26 ++--
 .../protocol/http/util/TestHTTPFileArgs.java  |   5 +-
 .../http/util/accesslog/TestLogFilter.java    |  24 ++--
 .../util/accesslog/TestSessionFilter.java     |   4 +-
 .../http/util/accesslog/TestTCLogParser.java  |  16 +--
 .../jmeter/testelement/TestHeaderManager.java |   2 +-
 .../jms/sampler/PublisherSamplerTest.java     |   4 +-
 .../protocol/ldap/config/gui/PackageTest.java |   2 +-
 .../tcp/sampler/BinaryTCPClientImplTest.java  |  16 +--
 ...LengthPrefixedBinaryTCPClientImplTest.java |   4 +-
 .../tcp/sampler/TCPClientDecoratorTest.java   |   4 +-
 106 files changed, 1095 insertions(+), 1095 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
index a556c407b3a..7906381cef2 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
@@ -17,11 +17,12 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -115,14 +116,13 @@ public void testMalformedCachePatternException() throws Exception{
         assertion.addTestString("[]");
         result = assertion.getResult(sample);
         assertNotNull(result.getFailureMessage());
-        assertFalse("Should not be: Response was null","Response was null".equals(result.getFailureMessage()));
-        assertTrue("Not expecting error: "+result.getFailureMessage(),result.isError());
+        assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
+        assertTrue(result.isError(), "Not expecting error: "+result.getFailureMessage());
 
         assertion.setCustomFailureMessage("Custom failure message");
         result = assertion.getResult(sample);
-        assertTrue("Did not get expected error: "+result.getFailureMessage(),result.isError());
-        assertFalse("Failure message must not be custom failure message for error",
-                "Custom failure message".equals(result.getFailureMessage()));
+        assertTrue(result.isError(), "Did not get expected error: "+result.getFailureMessage());
+        assertNotEquals("Custom failure message", result.getFailureMessage(), "Failure message must not be custom failure message for error");
 
     }
 
@@ -311,17 +311,17 @@ public void testResponseAssertionSubstring() throws Exception{
 //TODO - need a lot more tests
 
     private void assertPassed() throws Exception{
-        assertNull(result.getFailureMessage(),result.getFailureMessage());
-        assertFalse("Not expecting error: "+result.getFailureMessage(),result.isError());
-        assertFalse("Not expecting error",result.isError());
-        assertFalse("Not expecting failure",result.isFailure());
+        assertNull(result.getFailureMessage(), result.getFailureMessage());
+        assertFalse(result.isError(), "Not expecting error: "+result.getFailureMessage());
+        assertFalse(result.isError(), "Not expecting error");
+        assertFalse(result.isFailure(), "Not expecting failure");
     }
 
     private void assertFailed() throws Exception{
         assertNotNull(result.getFailureMessage());
-        assertFalse("Should not be: Response was null","Response was null".equals(result.getFailureMessage()));
-        assertFalse("Not expecting error: "+result.getFailureMessage(),result.isError());
-        assertTrue("Expecting failure",result.isFailure());
+        assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
+        assertFalse(result.isError(), "Not expecting error: "+result.getFailureMessage());
+        assertTrue(result.isFailure(), "Expecting failure");
 
     }
     private AtomicInteger failed;
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java
index d27c5016eea..4b50c0aa0f0 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -111,9 +111,8 @@ public void testSignature() {
         testElement.setVerifySignature(true);
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     @Test
@@ -123,9 +122,8 @@ public void testSignerEmail() {
         testElement.setSignerEmail("bob@b.example.com");
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     @Test
@@ -135,9 +133,8 @@ public void testSignerSerial() {
         testElement.setSignerSerial("0xc8c46f8fbf9ebea4");
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     @Test
@@ -149,9 +146,8 @@ public void testSignerSignerDN() {
                 .setSignerDn(signerDn);
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     @Test
@@ -163,9 +159,8 @@ public void testSignerIssuerDN() {
                 .setIssuerDn(issuerDn);
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     @Test
@@ -176,9 +171,8 @@ public void testSignerCert() throws Exception {
         testElement.setSignerCertFile(new File(getClass().getResource("email.pem").toURI()).getAbsolutePath());
         AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
                 "Test");
-        assertFalse("Result should not be an error", result.isError());
-        assertFalse("Result should not fail: " + result.getFailureMessage(),
-                result.isFailure());
+        assertFalse(result.isError(), "Result should not be an error");
+        assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
     }
 
     private SampleResult createChildSample() throws MessagingException,
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
index b5b0a8e4831..00a3ea71dbb 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.samplers.SampleResult;
@@ -162,14 +163,14 @@ public void testSizeAssertionLessThanEqual() throws Exception {
     // TODO - need a lot more tests
 
     private void assertPassed() throws Exception {
-        assertNull("Failure message should be null", result.getFailureMessage());
+        assertNull(result.getFailureMessage(), "Failure message should be null");
         assertFalse(result.isError());
         assertFalse(result.isFailure());
     }
 
     private void assertFailed() throws Exception {
-        assertNotNull("Failure message should not be null", result.getFailureMessage());
-        assertFalse("Should not be: Response was null", "Response was null".equals(result.getFailureMessage()));
+        assertNotNull(result.getFailureMessage(), "Failure message should not be null");
+        assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
         assertFalse(result.isError());
         assertTrue(result.isFailure());
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
index 236625a1b54..62e60b56306 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -77,8 +77,8 @@ public void testAssertionOK() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
index e98fa2d4cae..c4d826f916f 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
@@ -64,8 +64,8 @@ public void testXPath2AssertionPath1() throws FactoryConfigurationError {
         assertion.setXPathString(xPathQuery);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertFalse("When xpath2 conforms to xml, the result of assertion should be true ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertFalse(res.isFailure(), "When xpath2 conforms to xml, the result of assertion should be true ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
     @Test
     public void testXPath2AssertionPath1Negated() throws FactoryConfigurationError {
@@ -76,8 +76,8 @@ public void testXPath2AssertionPath1Negated() throws FactoryConfigurationError {
         assertion.setNegated(true);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertTrue("When xpath2 conforms to xml, the result of assertion should be false ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertTrue(res.isFailure(), "When xpath2 conforms to xml, the result of assertion should be false ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
 
     }
     @Test
@@ -88,8 +88,8 @@ public void testXPath2AssertionPath2() throws FactoryConfigurationError {
         assertion.setXPathString(xPathQuery);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertTrue("When xpath2 doesn't conform to xml, the result of assertion should be false ", res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertTrue(res.isFailure(), "When xpath2 doesn't conform to xml, the result of assertion should be false ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
     @Test
     public void testXPath2AssertionPath2Negated() throws FactoryConfigurationError {
@@ -100,8 +100,8 @@ public void testXPath2AssertionPath2Negated() throws FactoryConfigurationError {
         assertion.setNegated(true);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertFalse("When xpath2 doesn't conform to xml, the result of assertion should be true ", res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertFalse(res.isFailure(), "When xpath2 doesn't conform to xml, the result of assertion should be true ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
 
     @Test
@@ -112,8 +112,8 @@ public void testXPath2AssertionBool1() throws FactoryConfigurationError {
         assertion.setXPathString(xPathQuery);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertFalse("When xpath2 conforms to xml, the result of assertion should be true ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertFalse(res.isFailure(), "When xpath2 conforms to xml, the result of assertion should be true ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
     @Test
     public void testXPath2AssertionBool1Negated() throws FactoryConfigurationError {
@@ -124,8 +124,8 @@ public void testXPath2AssertionBool1Negated() throws FactoryConfigurationError {
         assertion.setNegated(true);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertTrue("When xpath2 conforms to xml, the result of assertion should be false ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertTrue(res.isFailure(), "When xpath2 conforms to xml, the result of assertion should be false ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
     @Test
     public void testXPath2AssertionBool2() throws FactoryConfigurationError {
@@ -135,8 +135,8 @@ public void testXPath2AssertionBool2() throws FactoryConfigurationError {
         assertion.setXPathString(xPathQuery);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertTrue("When xpath2 doesn't conforms to xml, the result of assertion should be false ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertTrue(res.isFailure(), "When xpath2 doesn't conforms to xml, the result of assertion should be false ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
     @Test
     public void testXPath2AssertionBool2Negated() throws FactoryConfigurationError {
@@ -147,8 +147,8 @@ public void testXPath2AssertionBool2Negated() throws FactoryConfigurationError {
         assertion.setNegated(true);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertFalse("When xpath2 doesn't conforms to xml, the result of assertion should be true ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertFalse(res.isFailure(), "When xpath2 doesn't conforms to xml, the result of assertion should be true ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
 
     @Test
@@ -162,8 +162,8 @@ public void testScope(){
         jmctx.setPreviousResult(result);
         assertion.setXPathString("/html/head/title");
         AssertionResult res = assertion.getResult(result);
-        assertFalse("When xpath conforms to xml, the result of assertion "
-                + "should be true ",res.isFailure());
+        assertFalse(res.isFailure(), "When xpath conforms to xml, the result of assertion "
+                + "should be true ");
         assertFalse(res.isError());
     }
     @Test
@@ -177,8 +177,8 @@ public void testScopeFailure(){
         jmctx.setPreviousResult(result);
         assertion.setXPathString("/html/head/tit");
         AssertionResult res = assertion.getResult(result);
-        assertTrue("When xpath doesn't conforms to xml, the result "
-                + "of assertion should be false ",res.isFailure());
+        assertTrue(res.isFailure(), "When xpath doesn't conforms to xml, the result "
+                + "of assertion should be false ");
         assertFalse(res.isError());
     }
     @Test
@@ -191,11 +191,10 @@ public void testResponseDataIsEmpty(){
         jmctx.setPreviousResult(result);
         assertion.setXPathString("/html/head/tit");
         AssertionResult res = assertion.getResult(result);
-        assertTrue("When xpath doesn't conforms to xml, the result "
-                + "of assertion should be false ",res.isFailure());
+        assertTrue(res.isFailure(), "When xpath doesn't conforms to xml, the result "
+                + "of assertion should be false ");
         assertFalse(res.isError());
-        assertEquals("When the response data is empty, the result of assertion should be false",
-                "Response was null", res.getFailureMessage());
+        assertEquals("Response was null", res.getFailureMessage(), "When the response data is empty, the result of assertion should be false");
     }
     @Test
     public void testBadXpathFormat() throws FactoryConfigurationError {
@@ -205,7 +204,7 @@ public void testBadXpathFormat() throws FactoryConfigurationError {
         assertion.setXPathString(xPathQuery);
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertTrue("When format of xpath is wrong, the test should failed",res.isError());
+        assertTrue(res.isError(), "When format of xpath is wrong, the test should failed");
         assertTrue(res.getFailureMessage().contains("Exception occurred computing assertion with XPath"));
     }
 
@@ -219,8 +218,8 @@ public void testXPath2AssertionPathWithoutNamespace() throws FactoryConfiguratio
         assertion.setXPathString(xPathQuery);
         response.setResponseData(data, "UTF-8");
         AssertionResult res = assertion.getResult(response);
-        assertFalse("When xpath2 conforms to xml, the result of assertion should be true ",res.isFailure());
-        assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError());
+        assertFalse(res.isFailure(), "When xpath2 conforms to xml, the result of assertion should be true ");
+        assertFalse(res.isError(), "When the format of xpath2 is right, assertion will run correctly ");
     }
 
     @Test
@@ -230,10 +229,8 @@ public void testValidateXPath2() throws ParserConfigurationException {
         testDoc.appendChild(el);
         String namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos# b=http://www.w3.org/2003/01/geo/wgs85_pos#";
         String xPathQuery = "//Employees/b:Employee[1]/a:ag";
-        assertTrue("When the user give namspaces, the result of validation should be true",
-                XPath2Panel.validXPath(xPathQuery, false, namespaces));
+        assertTrue(XPath2Panel.validXPath(xPathQuery, false, namespaces), "When the user give namspaces, the result of validation should be true");
         namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos#";
-        assertFalse("When the user doesn't give namspaces, the result of validation should be false",
-                XPath2Panel.validXPath(xPathQuery, false, namespaces));
+        assertFalse(XPath2Panel.validXPath(xPathQuery, false, namespaces), "When the user doesn't give namspaces, the result of validation should be false");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
index b98f32a4b3a..14538a1281b 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.assertions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -89,8 +89,8 @@ public void testAssertionOK() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -99,8 +99,8 @@ public void testAssertionFail() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -109,8 +109,8 @@ public void testAssertionPath1() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
     @Test
     public void testAssertionPath1Negated() {
@@ -119,8 +119,8 @@ public void testAssertionPath1Negated() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -130,8 +130,8 @@ public void testAssertionPath2() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -141,8 +141,8 @@ public void testAssertionPath2Negated() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should not be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -151,8 +151,8 @@ public void testAssertionBool1() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -162,10 +162,9 @@ public void testAssertionBool1Negated() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should not be a failure",res.isFailure());
-        assertEquals("when isNegated is true, when xpath matches, result should fail",
-                "Nodes Matched for count(//error)=2" , res.getFailureMessage());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should not be a failure");
+        assertEquals("Nodes Matched for count(//error)=2", res.getFailureMessage(), "when isNegated is true, when xpath matches, result should fail");
     }
 
     @Test
@@ -174,8 +173,8 @@ public void testAssertionBool2() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -185,9 +184,9 @@ public void testAssertionBool2Negated() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
-        assertEquals("Nodes Matched for count(//*[code=1])=1" , res.getFailureMessage());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
+        assertEquals("Nodes Matched for count(//*[code=1])=1", res.getFailureMessage());
 
     }
 
@@ -197,9 +196,9 @@ public void testAssertionBool3() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure", res.isFailure());
-        assertEquals("No Nodes Matched for count(//error)=1" , res.getFailureMessage());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
+        assertEquals("No Nodes Matched for count(//error)=1", res.getFailureMessage());
     }
     @Test
     public void testAssertionBool3Negated() {
@@ -208,8 +207,8 @@ public void testAssertionBool3Negated() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -218,8 +217,8 @@ public void testAssertionBool4() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -229,9 +228,9 @@ public void testAssertionBool4Negated() throws Exception {
         assertion.setNegated(true);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
-        assertEquals("No Nodes Matched for count(//*[code=2])=1" , res.getFailureMessage());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
+        assertEquals("No Nodes Matched for count(//*[code=2])=1", res.getFailureMessage());
     }
     @Test
     public void testAssertionNumber() throws Exception {
@@ -239,8 +238,8 @@ public void testAssertionNumber() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -251,8 +250,8 @@ public void testAssertionNoResult() throws Exception {
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
         assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -262,8 +261,8 @@ public void testAssertionEmptyResult() throws Exception {
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
         assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-        assertFalse("Should not be an error", res.isError());
-        assertTrue("Should be a failure",res.isFailure());
+        assertFalse(res.isError(), "Should not be an error");
+        assertTrue(res.isFailure(), "Should be a failure");
     }
 
     @Test
@@ -273,8 +272,8 @@ public void testAssertionBlankResult() throws Exception {
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
         assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
-        assertTrue("Should be an error",res.isError());
-        assertFalse("Should not be a failure", res.isFailure());
+        assertTrue(res.isError(), "Should be an error");
+        assertFalse(res.isFailure(), "Should not be a failure");
     }
 
     @Test
@@ -418,8 +417,8 @@ public void testScope(){
         assertion.setTolerant(true);
         AssertionResult res = assertion.getResult(result);
         log.debug("failureMessage: {}", res.getFailureMessage());
-        assertFalse("When xpath conforms to xml, the result of assertion "
-                + "should be true ",res.isFailure());
+        assertFalse(res.isFailure(), "When xpath conforms to xml, the result of assertion "
+                + "should be true ");
         assertFalse(res.isError());
     }
     @Test
@@ -436,8 +435,8 @@ public void testScopeFailure(){
         assertion.setTolerant(true);
         AssertionResult res = assertion.getResult(result);
         log.debug("failureMessage: {}", res.getFailureMessage());
-        assertTrue("When xpath doesn't conforms to xml, the result "
-                + "of assertion should be false ",res.isFailure());
+        assertTrue(res.isFailure(), "When xpath doesn't conforms to xml, the result "
+                + "of assertion should be false ");
         assertFalse(res.isError());
     }
 
@@ -448,9 +447,8 @@ public void testWrongXpathMethod() {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertTrue("Should not be an error", res.isError());
-        assertTrue("A TransformerException should be thrown",
-                res.getFailureMessage().contains("TransformerException"));
+        assertTrue(res.isError(), "Should not be an error");
+        assertTrue(res.getFailureMessage().contains("TransformerException"), "A TransformerException should be thrown");
     }
     @Test
     public void testWithoutSuitableNamespaces() {
@@ -460,7 +458,6 @@ public void testWithoutSuitableNamespaces() {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         log.debug(" res {}", res.isError());
         log.debug(" failure {}", res.getFailureMessage());
-        assertTrue("When the user activates namespaces, a TransformerException should be thrown",
-                res.getFailureMessage().contains("TransformerException"));
+        assertTrue(res.getFailureMessage().contains("TransformerException"), "When the user activates namespaces, a TransformerException should be thrown");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
index 41a5ee17698..2e38339eaa8 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.assertions.jmespath;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.stream.Stream;
 
diff --git a/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java b/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
index 58bfce31d28..2edad0ab847 100644
--- a/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
+++ b/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 
@@ -62,9 +62,7 @@ public void testopen() throws Exception {
             csv.iterationStart(null);
             fail("Bad filename in CSVDataSet -> IllegalArgumentException: File No.such.filename must exist and be readable");
         } catch (IllegalArgumentException ignored) {
-            assertEquals("Bad filename in CSVDataSet -> exception",
-                    "File No.such.filename must exist and be readable",
-                    ignored.getMessage());
+            assertEquals("File No.such.filename must exist and be readable", ignored.getMessage(), "Bad filename in CSVDataSet -> exception");
         }
 
         csv = new CSVDataSet();
@@ -73,30 +71,30 @@ public void testopen() throws Exception {
         csv.setDelimiter(",");
 
         csv.iterationStart(null);
-        assertEquals("",threadVars.get("a"));
-        assertEquals("b1",threadVars.get("b"));
-        assertEquals("c1",threadVars.get("c"));
+        assertEquals("", threadVars.get("a"));
+        assertEquals("b1", threadVars.get("b"));
+        assertEquals("c1", threadVars.get("c"));
 
         csv.iterationStart(null);
-        assertEquals("a2",threadVars.get("a"));
-        assertEquals("",threadVars.get("b"));
-        assertEquals("c2",threadVars.get("c"));
+        assertEquals("a2", threadVars.get("a"));
+        assertEquals("", threadVars.get("b"));
+        assertEquals("c2", threadVars.get("c"));
 
         csv.iterationStart(null);
-        assertEquals("a3",threadVars.get("a"));
-        assertEquals("b3",threadVars.get("b"));
-        assertEquals("",threadVars.get("c"));
+        assertEquals("a3", threadVars.get("a"));
+        assertEquals("b3", threadVars.get("b"));
+        assertEquals("", threadVars.get("c"));
 
 
         csv.iterationStart(null);
-        assertEquals("a4",threadVars.get("a"));
-        assertEquals("b4",threadVars.get("b"));
-        assertEquals("c4",threadVars.get("c"));
+        assertEquals("a4", threadVars.get("a"));
+        assertEquals("b4", threadVars.get("b"));
+        assertEquals("c4", threadVars.get("c"));
 
         csv.iterationStart(null); // Restart file
-        assertEquals("",threadVars.get("a"));
-        assertEquals("b1",threadVars.get("b"));
-        assertEquals("c1",threadVars.get("c"));
+        assertEquals("", threadVars.get("a"));
+        assertEquals("b1", threadVars.get("b"));
+        assertEquals("c1", threadVars.get("c"));
     }
 
     @Test
@@ -110,28 +108,28 @@ public void testutf8() throws Exception {
         csv.setFileEncoding( "UTF-8" );
 
         csv.iterationStart(null);
-        assertEquals("a1",threadVars.get("a"));
-        assertEquals("b1",threadVars.get("b"));
-        assertEquals("\u00e71",threadVars.get("c"));
-        assertEquals("d1",threadVars.get("d"));
+        assertEquals("a1", threadVars.get("a"));
+        assertEquals("b1", threadVars.get("b"));
+        assertEquals("\u00e71", threadVars.get("c"));
+        assertEquals("d1", threadVars.get("d"));
 
         csv.iterationStart(null);
-        assertEquals("a2",threadVars.get("a"));
-        assertEquals("b2",threadVars.get("b"));
-        assertEquals("\u00e72",threadVars.get("c"));
-        assertEquals("d2",threadVars.get("d"));
+        assertEquals("a2", threadVars.get("a"));
+        assertEquals("b2", threadVars.get("b"));
+        assertEquals("\u00e72", threadVars.get("c"));
+        assertEquals("d2", threadVars.get("d"));
 
         csv.iterationStart(null);
-        assertEquals("a3",threadVars.get("a"));
-        assertEquals("b3",threadVars.get("b"));
-        assertEquals("\u00e73",threadVars.get("c"));
-        assertEquals("d3",threadVars.get("d"));
+        assertEquals("a3", threadVars.get("a"));
+        assertEquals("b3", threadVars.get("b"));
+        assertEquals("\u00e73", threadVars.get("c"));
+        assertEquals("d3", threadVars.get("d"));
 
         csv.iterationStart(null);
-        assertEquals("a4",threadVars.get("a"));
-        assertEquals("b4",threadVars.get("b"));
-        assertEquals("\u00e74",threadVars.get("c"));
-        assertEquals("d4",threadVars.get("d"));
+        assertEquals("a4", threadVars.get("a"));
+        assertEquals("b4", threadVars.get("b"));
+        assertEquals("\u00e74", threadVars.get("c"));
+        assertEquals("d4", threadVars.get("d"));
     }
 
     // Test CSV file with a header line
@@ -143,16 +141,16 @@ public void testHeaderOpen(){
         assertNull(csv.getVariableNames());
         csv.iterationStart(null);
         assertNull(threadVars.get("a"));
-        assertEquals("a1",threadVars.get("A"));
-        assertEquals("b1",threadVars.get("B"));
-        assertEquals("c1",threadVars.get("C"));
-        assertEquals("d1",threadVars.get("D|1"));
+        assertEquals("a1", threadVars.get("A"));
+        assertEquals("b1", threadVars.get("B"));
+        assertEquals("c1", threadVars.get("C"));
+        assertEquals("d1", threadVars.get("D|1"));
         csv.iterationStart(null);
         assertNull(threadVars.get("a"));
-        assertEquals("a2",threadVars.get("A"));
-        assertEquals("b2",threadVars.get("B"));
-        assertEquals("c2",threadVars.get("C"));
-        assertEquals("d2",threadVars.get("D|1"));
+        assertEquals("a2", threadVars.get("A"));
+        assertEquals("b2", threadVars.get("B"));
+        assertEquals("c2", threadVars.get("C"));
+        assertEquals("d2", threadVars.get("D|1"));
     }
 
     // Test CSV file with a header line and recycle is true
@@ -169,10 +167,10 @@ public void testHeaderOpenAndRecycle(){
         csv.iterationStart(null); // line 4
         csv.iterationStart(null); // line 5
         csv.iterationStart(null); // return to 2nd line (first line is names)
-        assertEquals("a1",threadVars.get("A"));
-        assertEquals("b1",threadVars.get("B"));
-        assertEquals("c1",threadVars.get("C"));
-        assertEquals("d1",threadVars.get("D|1"));
+        assertEquals("a1", threadVars.get("A"));
+        assertEquals("b1", threadVars.get("B"));
+        assertEquals("c1", threadVars.get("C"));
+        assertEquals("d1", threadVars.get("D|1"));
     }
 
     // Test CSV file with a header line
@@ -187,22 +185,22 @@ public void testHeaderQuotes(){
         assertNull(csv.getVariableNames());
         csv.iterationStart(null);
         assertNull(threadVars.get("a"));
-        assertEquals("a1",threadVars.get("A"));
-        assertEquals("b1",threadVars.get("B"));
-        assertEquals("c1",threadVars.get("C"));
-        assertEquals("d1",threadVars.get("D|1"));
+        assertEquals("a1", threadVars.get("A"));
+        assertEquals("b1", threadVars.get("B"));
+        assertEquals("c1", threadVars.get("C"));
+        assertEquals("d1", threadVars.get("D|1"));
         csv.iterationStart(null);
         assertNull(threadVars.get("a"));
-        assertEquals("a2",threadVars.get("A"));
-        assertEquals("b2",threadVars.get("B"));
-        assertEquals("c2",threadVars.get("C"));
-        assertEquals("d2",threadVars.get("D|1"));
+        assertEquals("a2", threadVars.get("A"));
+        assertEquals("b2", threadVars.get("B"));
+        assertEquals("c2", threadVars.get("C"));
+        assertEquals("d2", threadVars.get("D|1"));
         csv.iterationStart(null);
         assertNull(threadVars.get("a"));
-        assertEquals("a3",threadVars.get("A"));
-        assertEquals("b3",threadVars.get("B"));
-        assertEquals("c3",threadVars.get("C"));
-        assertEquals("d3",threadVars.get("D|1"));
+        assertEquals("a3", threadVars.get("A"));
+        assertEquals("b3", threadVars.get("B"));
+        assertEquals("c3", threadVars.get("C"));
+        assertEquals("d3", threadVars.get("D|1"));
         try {
             csv.iterationStart(null);
             fail("Expected JMeterStopThreadException");
@@ -226,19 +224,19 @@ public void testShareMode(){
         CSVDataSet csv1 = initCSV();
         assertNull(csv1.getShareMode());
         csv1.setShareMode("abc");
-        assertEquals("abc",csv1.getShareMode());
+        assertEquals("abc", csv1.getShareMode());
         csv1.iterationStart(null);
-        assertEquals("a1",threadVars.get("a"));
+        assertEquals("a1", threadVars.get("a"));
         csv1.iterationStart(null);
-        assertEquals("a2",threadVars.get("a"));
+        assertEquals("a2", threadVars.get("a"));
         CSVDataSet csv2 = initCSV();
         csv2.setShareMode("abc");
-        assertEquals("abc",csv2.getShareMode());
+        assertEquals("abc", csv2.getShareMode());
         csv2.iterationStart(null);
-        assertEquals("a3",threadVars.get("a"));
+        assertEquals("a3", threadVars.get("a"));
         csv0.iterationStart(null);
-        assertEquals("a1",threadVars.get("a"));
+        assertEquals("a1", threadVars.get("a"));
         csv1.iterationStart(null);
-        assertEquals("a4",threadVars.get("a"));
+        assertEquals("a4", threadVars.get("a"));
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
index 19bf9173630..7fca36c9424 100644
--- a/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
+++ b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.config.gui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java b/src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java
index cbb9a9776ee..0a16f2cfc3e 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java
@@ -17,7 +17,8 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.junit.stubs.TestSampler;
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java b/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
index 03805d42b0d..d61c6eabfbb 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java
@@ -17,6 +17,9 @@
 
 package org.apache.jmeter.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.junit.stubs.TestSampler;
@@ -27,7 +30,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -62,7 +64,7 @@ void testStackOverflow() throws Exception {
                 sampler.sample(null);
                 counter++;
             }
-            Assertions.assertEquals(0, counter);
+            assertEquals(0, counter);
         } catch (StackOverflowError e) {
             throw new AssertionError("Stackoverflow occurred in testStackOverflow", e);
         }
@@ -122,10 +124,10 @@ void testBug53768() throws Exception {
 
             Sampler sampler = controller.next();
             sampler.sample(null);
-            Assertions.assertEquals("0", vars.get("VAR1"));
+            assertEquals("0", vars.get("VAR1"));
             sampler = controller.next();
             sampler.sample(null);
-            Assertions.assertEquals("0", vars.get("VAR1"));
+            assertEquals("0", vars.get("VAR1"));
 
         } catch (StackOverflowError e) {
             throw new AssertionError("Stackoverflow occurred in testStackOverflow", e);
@@ -167,10 +169,10 @@ void testProcessingTrue() throws Exception {
         Sampler sampler = null;
         while ((sampler = controller.next()) != null) {
             sampler.sample(null);
-            Assertions.assertEquals(order[counter], sampler.getName());
+            assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        Assertions.assertEquals(counter, 6);
+        assertEquals(counter, 6);
     }
 
     @Test
@@ -195,10 +197,10 @@ void testProcessingTrueWithExpression() throws Exception {
         Sampler sampler = null;
         while ((sampler = controller.next()) != null) {
             sampler.sample(null);
-            Assertions.assertEquals(order[counter], sampler.getName());
+            assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        Assertions.assertEquals(counter, 6);
+        assertEquals(counter, 6);
     }
 
 
@@ -232,10 +234,10 @@ void testEvaluateAllChildrenWithoutSubController() throws Exception {
             if (sampler.getName().equals("Sample3")) {
                 ifCont.setCondition("true==false");
             }
-            Assertions.assertEquals(order[counter], sampler.getName());
+            assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        Assertions.assertEquals(counter, 6);
+        assertEquals(counter, 6);
     }
 
     /**
@@ -271,10 +273,10 @@ void testEvaluateAllChildrenWithSubController() throws Exception {
             if (sampler.getName().equals("Sample3")) {
                 ifCont.setCondition("true==false");
             }
-            Assertions.assertEquals(order[counter], sampler.getName());
+            assertEquals(order[counter], sampler.getName());
             counter++;
         }
-        Assertions.assertEquals(counter, 6);
+        assertEquals(counter, 6);
     }
 
     @Test
@@ -293,6 +295,6 @@ void shouldIgnoreEmptyLastLine() {
         ifCont.setRunningVersion(true);
 
         Sampler sampler = controller.next();
-        Assertions.assertNotNull(sampler);
+        assertNotNull(sampler);
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java b/src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java
index 21d2f0db2cf..6320c2c6ab3 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.junit.stubs.TestSampler;
@@ -126,7 +126,7 @@ public void testProcessing2() throws Exception {
         while (counter < order.length) {
             TestElement sampler = null;
             while ((sampler = controller.next()) != null) {
-                assertEquals("failed on " + counter, order[counter], sampler.getName());
+                assertEquals(order[counter], sampler.getName(), "failed on " + counter);
                 counter++;
             }
         }
@@ -162,7 +162,7 @@ public void testProcessing3() throws Exception {
         while (counter < order.length) {
             TestElement sampler = null;
             while ((sampler = controller.next()) != null) {
-                assertEquals("failed on" + counter, order[counter], sampler.getName());
+                assertEquals(order[counter], sampler.getName(), "failed on" + counter);
                 counter++;
             }
         }
@@ -193,7 +193,7 @@ public void testProcessing4() throws Exception {
         while (counter < order.length) {
             TestElement sampler = null;
             while ((sampler = controller.next()) != null) {
-                assertEquals("failed on" + counter, order[counter], sampler.getName());
+                assertEquals(order[counter], sampler.getName(), "failed on" + counter);
                 counter++;
             }
         }
@@ -224,7 +224,7 @@ public void testProcessing5() throws Exception {
         while (counter < order.length) {
             TestElement sampler = null;
             while ((sampler = controller.next()) != null) {
-                assertEquals("failed on" + counter, order[counter], sampler.getName());
+                assertEquals(order[counter], sampler.getName(), "failed on" + counter);
                 counter++;
             }
         }
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java b/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
index dcaeb3a64f6..162d966aae6 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java b/src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java
index e19fb45fe71..ea3f0303529 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.junit.stubs.TestSampler;
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java b/src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java
index 2c26d43e29c..32081444aa6 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java
@@ -17,9 +17,10 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,7 +47,7 @@ public void testRandomOrder() {
         while ((sampler = roc.next()) != null) {
             String samplerName = sampler.getName();
             if (usedSamplers.contains(samplerName)) {
-                assertTrue("Duplicate sampler returned from next()", false);
+                fail("Duplicate sampler returned from next()");
             }
             usedSamplers.add(samplerName);
         }
@@ -71,7 +72,7 @@ public void testRandomOneElement() {
         while ((sampler = roc.next()) != null) {
             String samplerName = sampler.getName();
             if (usedSamplers.contains(samplerName)) {
-                assertTrue("Duplicate sampler returned from next()", false);
+                fail("Duplicate sampler returned from next()");
             }
             usedSamplers.add(samplerName);
         }
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
index eb8c52f7635..3da05383418 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.jmeter.assertions.ResponseAssertion;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.sampler.DebugSampler;
@@ -28,7 +30,6 @@
 import org.apache.jmeter.threads.TestCompiler;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jorphan.collections.ListedHashTree;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
@@ -75,9 +76,9 @@ public void testIssue57958() throws Exception {
         thread.setOnErrorStopThread(true);
         thread.run();
 
-        Assertions.assertEquals(1, listener.getEvents().size(),
+        assertEquals(1, listener.getEvents().size(),
                 "Must one transaction samples with parent debug sample");
-        Assertions.assertEquals("Number of samples in transaction : 1, number of failing samples : 1",
+        assertEquals("Number of samples in transaction : 1, number of failing samples : 1",
                 listener.getEvents().get(0).getResult().getResponseMessage());
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java b/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
index 5cb30909d69..2e1a877dca5 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.jmeter.engine.util.ValueReplacer;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -186,32 +186,32 @@ public void testVariable1() throws Exception {
         controller.addTestElement(new TestSampler("after"));
         controller.initialize();
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
-            assertEquals("Loop: " + i, "one", nextName(controller));
-            assertEquals("Loop: " + i, "two", nextName(controller));
-            assertEquals("Loop: " + i, "three", nextName(controller));
-            assertEquals("Loop: " + i, "four", nextName(controller));
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
+            assertEquals("one", nextName(controller), "Loop: " + i);
+            assertEquals("two", nextName(controller), "Loop: " + i);
+            assertEquals("three", nextName(controller), "Loop: " + i);
+            assertEquals("four", nextName(controller), "Loop: " + i);
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
         jmvars.put("VAR", "LAST"); // Should not enter the loop
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
         jmvars.put("VAR", "");
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
             if (i == 1) {
-                assertEquals("Loop: " + i, "one", nextName(controller));
-                assertEquals("Loop: " + i, "two", nextName(controller));
-                assertEquals("Loop: " + i, "three", nextName(controller));
+                assertEquals("one", nextName(controller), "Loop: " + i);
+                assertEquals("two", nextName(controller), "Loop: " + i);
+                assertEquals("three", nextName(controller), "Loop: " + i);
                 jmvars.put("VAR", "LAST"); // Should not enter the loop next time
-                assertEquals("Loop: " + i, "four", nextName(controller));
+                assertEquals("four", nextName(controller), "Loop: " + i);
             }
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
     }
 
@@ -237,33 +237,33 @@ public void testVariable2() throws Exception {
         controller.addTestElement(new TestSampler("after"));
         controller.initialize();
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
-            assertEquals("Loop: " + i, "one", nextName(controller));
-            assertEquals("Loop: " + i, "two", nextName(controller));
-            assertEquals("Loop: " + i, "three", nextName(controller));
-            assertEquals("Loop: " + i, "four", nextName(controller));
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
+            assertEquals("one", nextName(controller), "Loop: " + i);
+            assertEquals("two", nextName(controller), "Loop: " + i);
+            assertEquals("three", nextName(controller), "Loop: " + i);
+            assertEquals("four", nextName(controller), "Loop: " + i);
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
         jmvars.put("VAR", "LAST"); // Should not enter the loop
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
         jmvars.put("VAR", "");
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop: " + i, "before", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop: " + i);
             if (i == 1) {
-                assertEquals("Loop: " + i, "one", nextName(controller));
-                assertEquals("Loop: " + i, "two", nextName(controller));
+                assertEquals("one", nextName(controller), "Loop: " + i);
+                assertEquals("two", nextName(controller), "Loop: " + i);
                 jmvars.put("VAR", "LAST"); // Should not enter the loop next time
                 // But should continue to the end of the loop
-                assertEquals("Loop: " + i, "three", nextName(controller));
-                assertEquals("Loop: " + i, "four", nextName(controller));
+                assertEquals("three", nextName(controller), "Loop: " + i);
+                assertEquals("four", nextName(controller), "Loop: " + i);
             }
-            assertEquals("Loop: " + i, "after", nextName(controller));
-            assertNull("Loop: " + i, nextName(controller));
+            assertEquals("after", nextName(controller), "Loop: " + i);
+            assertNull(nextName(controller), "Loop: " + i);
         }
     }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
index 67035e497c1..0d456956627 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
@@ -18,8 +18,8 @@
 package org.apache.jmeter.extractor;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.threads.JMeterContext;
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
index 8e62a1d56dd..c4d42b97b15 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
@@ -19,11 +19,11 @@
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URL;
 
@@ -258,26 +258,26 @@ public void testVariableExtraction5() {
         assertEquals("position", vars.get("regVal_1"));
         assertEquals("1", vars.get("regVal_1_g"));
         assertEquals("position", vars.get("regVal_1_g1"));
-        assertNull("Unused variables should be null", vars.get("regVal_1_g2"));
+        assertNull(vars.get("regVal_1_g2"), "Unused variables should be null");
         assertEquals("invalidpin", vars.get("regVal_2"));
         assertEquals("1", vars.get("regVal_2_g"));
         assertEquals("invalidpin", vars.get("regVal_2_g1"));
-        assertNull("Unused variables should be null", vars.get("regVal_2_g2"));
+        assertNull(vars.get("regVal_2_g2"), "Unused variables should be null");
         assertEquals("1", vars.get("regVal_1_g"));
-        assertNull("Unused variables should be null", vars.get("regVal_3"));
-        assertNull("Unused variables should be null", vars.get("regVal_3_g"));
-        assertNull("Unused variables should be null", vars.get("regVal_3_g0"));
-        assertNull("Unused variables should be null", vars.get("regVal_3_g1"));
-        assertNull("Unused variables should be null", vars.get("regVal_3_g2"));
+        assertNull(vars.get("regVal_3"), "Unused variables should be null");
+        assertNull(vars.get("regVal_3_g"), "Unused variables should be null");
+        assertNull(vars.get("regVal_3_g0"), "Unused variables should be null");
+        assertNull(vars.get("regVal_3_g1"), "Unused variables should be null");
+        assertNull(vars.get("regVal_3_g2"), "Unused variables should be null");
 
         // Check when match fails
         extractor.setRegex("xxxx(.)(.)");
         extractor.process();
         assertEquals("0", vars.get("regVal_matchNr"));
-        assertNull("Unused variables should be null", vars.get("regVal_1"));
-        assertNull("Unused variables should be null", vars.get("regVal_1_g0"));
-        assertNull("Unused variables should be null", vars.get("regVal_1_g1"));
-        assertNull("Unused variables should be null", vars.get("regVal_1_g2"));
+        assertNull(vars.get("regVal_1"), "Unused variables should be null");
+        assertNull(vars.get("regVal_1_g0"), "Unused variables should be null");
+        assertNull(vars.get("regVal_1_g1"), "Unused variables should be null");
+        assertNull(vars.get("regVal_1_g2"), "Unused variables should be null");
     }
 
     @Test
@@ -285,23 +285,23 @@ public void testVariableExtraction7() {
         extractor.setRegex("Header1: (\\S+)");
         extractor.setTemplate("$1$");
         extractor.setMatchNumber(1);
-        assertTrue("useBody should be true", extractor.useBody());
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useURL should be false", extractor.useUrl());
+        assertTrue(extractor.useBody(), "useBody should be true");
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useUrl(), "useURL should be false");
         extractor.setUseField(RegexExtractor.USE_BODY);
-        assertTrue("useBody should be true", extractor.useBody());
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useURL should be false", extractor.useUrl());
+        assertTrue(extractor.useBody(), "useBody should be true");
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useUrl(), "useURL should be false");
         extractor.setUseField(RegexExtractor.USE_HDRS);
-        assertTrue("useHdrs should be true", extractor.useHeaders());
-        assertFalse("useBody should be false", extractor.useBody());
-        assertFalse("useURL should be false", extractor.useUrl());
+        assertTrue(extractor.useHeaders(), "useHdrs should be true");
+        assertFalse(extractor.useBody(), "useBody should be false");
+        assertFalse(extractor.useUrl(), "useURL should be false");
         extractor.process();
         assertEquals("Value1", vars.get("regVal"));
         extractor.setUseField(RegexExtractor.USE_URL);
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useBody should be false", extractor.useBody());
-        assertTrue("useURL should be true", extractor.useUrl());
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useBody(), "useBody should be false");
+        assertTrue(extractor.useUrl(), "useURL should be true");
     }
 
     @Test
@@ -310,9 +310,9 @@ public void testVariableExtraction8() throws Exception {
         extractor.setTemplate("$1$");
         extractor.setMatchNumber(1);
         extractor.setUseField(RegexExtractor.USE_URL);
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useBody should be false", extractor.useBody());
-        assertTrue("useURL should be true", extractor.useUrl());
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useBody(), "useBody should be false");
+        assertTrue(extractor.useUrl(), "useURL should be true");
         extractor.process();
         assertNull(vars.get("regVal"));
         result.setURL(new URL("http://jakarta.apache.org/index.html?abcd"));
@@ -326,19 +326,19 @@ public void testVariableExtraction9() {
         extractor.setTemplate("$1$");
         extractor.setMatchNumber(1);
         extractor.setUseField(RegexExtractor.USE_CODE);
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useBody should be false", extractor.useBody());
-        assertFalse("useURL should be false", extractor.useUrl());
-        assertFalse("useMessage should be false", extractor.useMessage());
-        assertTrue("useCode should be true", extractor.useCode());
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useBody(), "useBody should be false");
+        assertFalse(extractor.useUrl(), "useURL should be false");
+        assertFalse(extractor.useMessage(), "useMessage should be false");
+        assertTrue(extractor.useCode(), "useCode should be true");
         extractor.process();
         assertEquals("abcd", vars.get("regVal"));
         extractor.setUseField(RegexExtractor.USE_MESSAGE);
-        assertFalse("useHdrs should be false", extractor.useHeaders());
-        assertFalse("useBody should be false", extractor.useBody());
-        assertFalse("useURL should be false", extractor.useUrl());
-        assertTrue("useMessage should be true", extractor.useMessage());
-        assertFalse("useCode should be false", extractor.useCode());
+        assertFalse(extractor.useHeaders(), "useHdrs should be false");
+        assertFalse(extractor.useBody(), "useBody should be false");
+        assertFalse(extractor.useUrl(), "useURL should be false");
+        assertTrue(extractor.useMessage(), "useMessage should be true");
+        assertFalse(extractor.useCode(), "useCode should be false");
         extractor.setMatchNumber(3);
         extractor.process();
         assertEquals("brown", vars.get("regVal"));
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
index 49c6b45388d..906f93a7a33 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.extractor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java b/src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java
index 3cac569c295..ad20a90a20f 100644
--- a/src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java
+++ b/src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.gui.action;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
index 7990339cfcb..92de5766f9a 100644
--- a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
+++ b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
@@ -17,11 +17,12 @@
 
 package org.apache.jmeter.gui.action.template;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -34,7 +35,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.jmeter.junit.JMeterTestCase;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
@@ -100,7 +100,7 @@ public void testValidTemplateFile() {
     @Test
     public void testNonExistantXmlFileThrowsFileNotFoundException() throws Exception {
         File xmlTemplateFile = new File("missing.xml");
-        Assertions.assertThrows(
+        assertThrows(
                 FileNotFoundException.class,
                 () -> TemplateManager.getInstance().parseTemplateFile(xmlTemplateFile));
     }
@@ -111,8 +111,8 @@ public void testInvalidTemplateXml() throws IOException, SAXException, ParserCon
             File templateFile = getFileFromResource("invalidTemplates.xml");
             TemplateManager.getInstance().parseTemplateFile(templateFile);
         } catch (SAXParseException ex) {
-            assertTrue("Exception did not contains expected message, got:" + ex.getMessage(),
-                    ex.getMessage().contains("Element type \"key\" must be declared."));
+            String message = ex.getMessage();
+            assertTrue(message.contains("Element type \"key\" must be declared."), "Exception did not contains expected message, got:" + message);
         }
     }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
index 1dfa7452490..38e6e511fc8 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
@@ -17,13 +17,15 @@
 
 package org.apache.jmeter.timers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.util.UUID;
 
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.TestJMeterContextService;
 import org.apache.jmeter.util.BeanShellInterpreter;
 import org.apache.jmeter.util.ScriptingTestElement;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
@@ -32,11 +34,11 @@ class ConstantThroughputTimerTest {
     @Test
     void testTimer1() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        Assertions.assertEquals(0, timer.getCalcMode());// Assume this thread only
+        assertEquals(0, timer.getCalcMode());// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
         long start = System.currentTimeMillis();
         long delay = timer.delay(); // Initialise
-        Assertions.assertEquals(0, delay);
+        assertEquals(0, delay);
         // The test tries to check if the calculated delay is correct.
         // If the build machine is busy, then the sleep(500) may take longer in
         // which case the calculated delay should be shorter.
@@ -55,39 +57,39 @@ void testTimer1() throws Exception {
     private static void assertAlmostEquals(long expected, long actual, long delta) {
         long actualDelta = Math.abs(actual - expected);
         if (actualDelta > delta) {
-            Assertions.fail(() -> "Expected " + expected + " within delta of " + delta
+            fail("Expected " + expected + " within delta of " + delta
                     + ", but got " + actual + " which is a delta of " + actualDelta);
         }
     }
     @Test
     void testTimer2() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        Assertions.assertEquals(0, timer.getCalcMode());// Assume this thread only
+        assertEquals(0, timer.getCalcMode());// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
-        Assertions.assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
+        assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
         timer.setThroughput(60000.0);// 1 per milli-second
-        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
     }
 
     @Test
     void testTimer3() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
         timer.setMode(ConstantThroughputTimer.Mode.AllActiveThreads); //$NON-NLS-1$ - all threads
-        Assertions.assertEquals(1, timer.getCalcMode());// All threads
+        assertEquals(1, timer.getCalcMode());// All threads
         for(int i=1; i<=10; i++){
             TestJMeterContextService.incrNumberOfThreads();
         }
-        Assertions.assertEquals(10, JMeterContextService.getNumberOfThreads());
+        assertEquals(10, JMeterContextService.getNumberOfThreads());
         timer.setThroughput(600.0);// 10 per second
-        Assertions.assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
+        assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
         timer.setThroughput(600000.0);// 10 per milli-second
-        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
         for(int i=1; i<=990; i++){
             TestJMeterContextService.incrNumberOfThreads();
         }
-        Assertions.assertEquals(1000, JMeterContextService.getNumberOfThreads());
+        assertEquals(1000, JMeterContextService.getNumberOfThreads());
         timer.setThroughput(60000000.0);// 1000 per milli-second
-        Assertions.assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
+        assertEquals(1, timer.calculateCurrentTarget(0)); // Should delay for 1 milli-second
     }
 
     @Test
@@ -97,13 +99,13 @@ void testTimerBSH() throws Exception {
         BeanShellTimer timer = new BeanShellTimer();
 
         timer.setScript("\"60\"");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
 
         timer.setScript("60");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
 
         timer.setScript("5*3*4");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
     }
 
     @Test
@@ -113,13 +115,13 @@ void testTimerJSR223Timer() throws Exception {
         timer.setCacheKey(UUID.randomUUID().toString());
 
         timer.setScript("\"60\"");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
 
         timer.setScript("60");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
 
         timer.setScript("5*3*4");
-        Assertions.assertEquals(60, timer.delay());
+        assertEquals(60, timer.delay());
     }
 
     @Test
@@ -133,7 +135,7 @@ void testUniformRandomTimer() throws Exception {
 
     private static void assertBetween(long expectedLow, long expectedHigh, long actual) {
         if (actual < expectedLow || actual > expectedHigh) {
-            Assertions.fail(() -> "delay not in expected range: expected " + actual
+            fail(() -> "delay not in expected range: expected " + actual
                     + " to be within " + expectedLow + " and " + expectedHigh);
         }
     }
@@ -141,7 +143,7 @@ private static void assertBetween(long expectedLow, long expectedHigh, long actu
     void testConstantTimer() throws Exception {
         ConstantTimer timer = new ConstantTimer();
         timer.setDelay("1000");
-        Assertions.assertEquals(1000, timer.delay());
+        assertEquals(1000, timer.delay());
     }
 
     @Test
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
index d6358fc40b8..2f7d8a11cb5 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.timers.poissonarrivals;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,12 +69,9 @@ public void testTimer1() throws Exception {
         }
 
         if (!ok) {
-            assertEquals(
-                    "Schedule does not match expectation, " +
-                            "throughput=" + throughput + ", duration=" + duration +
-                            "seed=" + seed + ", batchSize=" + batchSize,
-                    Arrays.toString(expected), Arrays.toString(actual)
-            );
+            assertEquals(Arrays.toString(expected), Arrays.toString(actual), "Schedule does not match expectation, " +
+                    "throughput=" + throughput + ", duration=" + duration +
+                    "seed=" + seed + ", batchSize=" + batchSize);
         }
     }
 
@@ -138,11 +135,9 @@ private void verifyExactThroughput(
                 for (int i = 0; i < samplesPerTest; i++) {
                     double next = gen.next();
                     if (prev > next) {
-                        fail(
-                                "Schedule should be monotonic, so each new event comes later. " +
-                                        "prev: " + prev + ", next: " + next +
-                                        ". Full schedule so far: " + delays
-                        );
+                        fail("Schedule should be monotonic, so each new event comes later. " +
+                                "prev: " + prev + ", next: " + next +
+                                ". Full schedule so far: " + delays);
                     }
                     prev = next;
                     delays.add(next);
@@ -151,12 +146,10 @@ private void verifyExactThroughput(
                         // OK
                         continue;
                     }
-                    fail(
-                            "Throughput violation at second #" + time + ". Event #" + delays.size() +
-                                    " is scheduled at " + next + ", however it should be " +
-                                    " between " + time * testDuration + " and " + (time + 1) * testDuration +
-                                    ". Full schedule so far: " + delays
-                    );
+                    fail("Throughput violation at second #" + time + ". Event #" + delays.size() +
+                            " is scheduled at " + next + ", however it should be " +
+                            " between " + time * testDuration + " and " + (time + 1) * testDuration +
+                            ". Full schedule so far: " + delays);
 
                 }
             }
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java
index b9bb9124eea..960103693a2 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.visualizers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.reflect.Method;
 
@@ -49,8 +49,7 @@ public void testRenderResultWithLongStringBug54826() throws Exception {
         }
         json.append("\"");
 
-        assertEquals("{\n" + TAB + json.toString() + "\n}",
-                prettyJSON("{" + json.toString() + "}"));
+        assertEquals("{\n" + TAB + json.toString() + "\n}", prettyJSON("{" + json.toString() + "}"));
     }
 
     @Test
@@ -69,8 +68,7 @@ public void testRenderResultSimpleArray() throws Exception {
 
     @Test
     public void testRenderArrayInObject() throws Exception {
-        assertEquals("{\n" + TAB + "\"foo\": [\n" + TAB + "]\n}",
-                prettyJSON("{\"foo\":[]}"));
+        assertEquals("{\n" + TAB + "\"foo\": [\n" + TAB + "]\n}", prettyJSON("{\"foo\":[]}"));
     }
 
     @Test
@@ -85,11 +83,9 @@ public void testRenderResultSimpleString() throws Exception {
 
     @Test
     public void testRenderResultSimpleStructure() throws Exception {
-        assertEquals(
-                "{\n" + TAB + "\"Hello\": \"World\",\n" + TAB + "\"more\": [\n"
-                        + TAB + TAB + "\"Something\",\n" + TAB
-                        + TAB + "\"else\"\n" + TAB + "]\n}",
-                prettyJSON("{\"Hello\": \"World\", \"more\": [\"Something\", \"else\", ]}"));
+        assertEquals("{\n" + TAB + "\"Hello\": \"World\",\n" + TAB + "\"more\": [\n"
+                + TAB + TAB + "\"Something\",\n" + TAB
+                + TAB + "\"else\"\n" + TAB + "]\n}", prettyJSON("{\"Hello\": \"World\", \"more\": [\"Something\", \"else\", ]}"));
     }
 
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java
index 6e1aa760651..2615e66355d 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java
@@ -17,8 +17,10 @@
 
 package org.apache.jmeter.visualizers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.jmeter.samplers.SampleResult;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -32,19 +34,19 @@ public void setUp(){
 
     @Test
     public void testGetCurrentSample() {
-        Assert.assertNotNull(ssc.getCurrentSample()); // probably needed to avoid NPEs with GUIs
+        assertNotNull(ssc.getCurrentSample()); // probably needed to avoid NPEs with GUIs
     }
 
     @Test
     public void testGetAvgPageBytes() {
         SampleResult res = new SampleResult();
-        Assert.assertEquals(0,ssc.getAvgPageBytes(),0);
+        assertEquals(0, ssc.getAvgPageBytes(), 0);
         res.setResponseData("abcdef", "UTF-8");
         ssc.addSample(res);
         res.setResponseData("abcde", "UTF-8");
         ssc.addSample(res);
         res.setResponseData("abcd", "UTF-8");
         ssc.addSample(res);
-        Assert.assertEquals(5,ssc.getAvgPageBytes(),0);
+        assertEquals(5, ssc.getAvgPageBytes(), 0);
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
index 4286f5840d3..8fdac49e5e0 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.visualizers.backend;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 
@@ -41,40 +41,40 @@ public void initMode() throws Exception {
     public void checkResetOkAndAllStats() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         metric.add(createSampleResult(true));
-        assertEquals("Before reset  ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001);
-        assertEquals("Before reset failure", 1, metric.getHits(), 0.0);
-        assertEquals("Before reset sent bytes", 1000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 2000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001, "Before reset  ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001, "Before reset all.max");
+        assertEquals(1, metric.getHits(), 0.0, "Before reset failure");
+        assertEquals(1000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(2000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         // In fixed mode DescriptiveStatistics are not reset, just sliding on a window
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in FIXED mode ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001);
-        assertEquals("After reset in FIXED mode all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset failure", 0, metric.getHits(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001, "After reset in FIXED mode ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.0, "After reset in FIXED mode all.max");
+        assertEquals(0, metric.getHits(), 0.0, "After reset failure");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     @Test
     public void checkResetKoAndAllStats() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         metric.add(createSampleResult(false));
-        assertEquals("Before reset  ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.001);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001);
-        assertEquals("Before reset failure", 1, metric.getFailures(), 0.0);
-        assertEquals("Before reset sent bytes", 1000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 2000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.001, "Before reset  ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001, "Before reset all.max");
+        assertEquals(1, metric.getFailures(), 0.0, "Before reset failure");
+        assertEquals(1000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(2000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         // In fixed mode DescriptiveStatistics are not reset, just sliding on a window
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in FIXED mode  ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.0);
-        assertEquals("After reset in FIXED mode all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset failure", 0, metric.getFailures(), 0.001);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.0, "After reset in FIXED mode  ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.0, "After reset in FIXED mode all.max");
+        assertEquals(0, metric.getFailures(), 0.001, "After reset failure");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     @Test
@@ -84,9 +84,9 @@ public void checkErrorsDetailStat() {
         metric.add(createSampleResult("400", "Bad Request "));
         metric.add(createSampleResult("500", "Internal Server Error"));
         ErrorMetric error = new ErrorMetric(createSampleResult("400", "Bad request"));
-        assertEquals("Count for '400 - bad request' error ", 2, metric.getErrors().get(error), 0.0);
+        assertEquals(2, metric.getErrors().get(error), 0.0, "Count for '400 - bad request' error ");
         error = new ErrorMetric(createSampleResult("500", "Internal Server Error"));
-        assertEquals("Count for '500 - Internal Server Error' error ", 1, metric.getErrors().get(error), 0.0);
+        assertEquals(1, metric.getErrors().get(error), 0.0, "Count for '500 - Internal Server Error' error ");
     }
 
     private SampleResult createSampleResult(boolean success) {
@@ -127,43 +127,41 @@ private SampleResult createSampleResultWithSubresults(boolean success) {
     public void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
-        assertEquals("We are recognized as a TransactionController made sample", Boolean.TRUE,
-                Boolean.valueOf(TransactionController.isFromTransactionController(sample)));
+        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
-        assertEquals("Before reset  ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset hits", 2, metric.getHits(), 0.0);
-        assertEquals("Before reset sent bytes", 2000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 4000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA, "Before reset  ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
+        assertEquals(2, metric.getHits(), 0.0, "Before reset hits");
+        assertEquals(2000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(4000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA);
-        assertEquals("After reset in TIMED mode all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("After reset hits", 0, metric.getHits(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA, "After reset in TIMED mode ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getHits(), 0.0, "After reset hits");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     @Test
     public void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
-        assertEquals("We are recognized as a TransactionController made sample", Boolean.TRUE,
-                Boolean.valueOf(TransactionController.isFromTransactionController(sample)));
+        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
-        assertEquals("Before reset  ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset failures", 1, metric.getFailures(), 0.0);
-        assertEquals("Before reset sent bytes", 2000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 4000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA, "Before reset  ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
+        assertEquals(1, metric.getFailures(), 0.0, "Before reset failures");
+        assertEquals(2000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(4000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA);
-        assertEquals("After reset in TIMED mode all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("After reset failures", 0, metric.getFailures(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA, "After reset in TIMED mode ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getFailures(), 0.0, "After reset failures");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
index ba9fa7f77fe..42c3835f7a5 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.visualizers.backend;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 
@@ -43,19 +43,19 @@ public void checkResetOkAndAllStats() throws Exception {
         SamplerMetric metric = new SamplerMetric();
 
         metric.add(createSampleResult(true));
-        assertEquals("Before reset  ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001);
-        assertEquals("Before reset hits", 1, metric.getHits(), 0.0);
-        assertEquals("Before reset sent bytes", 1000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 2000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), 0.001, "Before reset  ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001, "Before reset all.max");
+        assertEquals(1, metric.getHits(), 0.0, "Before reset hits");
+        assertEquals(1000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(2000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode ok.max", Double.NaN, metric.getOkMaxTime(), 0.0);
-        assertEquals("After reset in TIMED mode all.max", Double.NaN, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset hits", 0, metric.getHits(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(Double.NaN, metric.getOkMaxTime(), 0.0, "After reset in TIMED mode ok.max");
+        assertEquals(Double.NaN, metric.getAllMaxTime(), 0.0, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getHits(), 0.0, "After reset hits");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     @Test
@@ -63,19 +63,19 @@ public void checkResetKoAndAllStats() throws Exception {
 
         SamplerMetric metric = new SamplerMetric();
         metric.add(createSampleResult(false));
-        assertEquals("Before reset  ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.001);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001);
-        assertEquals("Before reset failure", 1, metric.getFailures(), 0.0);
-        assertEquals("Before reset sent bytes", 1000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 2000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), 0.001, "Before reset  ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), 0.001, "Before reset all.max");
+        assertEquals(1, metric.getFailures(), 0.0, "Before reset failure");
+        assertEquals(1000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(2000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode  ko.max", Double.NaN, metric.getKoMaxTime(), 0.0);
-        assertEquals("After reset in TIMED mode all.max", Double.NaN, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset failure", 0, metric.getFailures(), 0.001);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(Double.NaN, metric.getKoMaxTime(), 0.0, "After reset in TIMED mode  ko.max");
+        assertEquals(Double.NaN, metric.getAllMaxTime(), 0.0, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getFailures(), 0.001, "After reset failure");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     private SampleResult createSampleResult(boolean success) {
@@ -109,44 +109,42 @@ private SampleResult createSampleResultWithSubresults(boolean success) {
     public void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
-        assertEquals("We are recognized as a TransactionController made sample", Boolean.TRUE,
-                Boolean.valueOf(TransactionController.isFromTransactionController(sample)));
+        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
-        assertEquals("Before reset  ok.max", DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset hits", 2, metric.getHits(), 0.0);
-        assertEquals("Before reset sent bytes", 2000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 4000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA, "Before reset  ok.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
+        assertEquals(2, metric.getHits(), 0.0, "Before reset hits");
+        assertEquals(2000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(4000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode ok.max", Double.NaN, metric.getOkMaxTime(), 0.0);
-        assertEquals("After reset in TIMED mode all.max", Double.NaN, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset hits", 0, metric.getHits(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(Double.NaN, metric.getOkMaxTime(), 0.0, "After reset in TIMED mode ok.max");
+        assertEquals(Double.NaN, metric.getAllMaxTime(), 0.0, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getHits(), 0.0, "After reset hits");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
     @Test
     public void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
-        assertEquals("We are recognized as a TransactionController made sample", Boolean.TRUE,
-                Boolean.valueOf(TransactionController.isFromTransactionController(sample)));
+        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
-        assertEquals("Before reset  ko.max", DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset all.max", DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA);
-        assertEquals("Before reset failures", 1, metric.getFailures(), 0.0);
-        assertEquals("Before reset sent bytes", 2000, metric.getSentBytes(), 0.0);
-        assertEquals("Before reset received bytes", 4000, metric.getReceivedBytes(), 0.0);
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA, "Before reset  ko.max");
+        assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
+        assertEquals(1, metric.getFailures(), 0.0, "Before reset failures");
+        assertEquals(2000, metric.getSentBytes(), 0.0, "Before reset sent bytes");
+        assertEquals(4000, metric.getReceivedBytes(), 0.0, "Before reset received bytes");
 
         metric.resetForTimeInterval();
 
-        assertEquals("After reset in TIMED mode ko.max", Double.NaN, metric.getKoMaxTime(), 0.0);
-        assertEquals("After reset in TIMED mode all.max", Double.NaN, metric.getAllMaxTime(), 0.0);
-        assertEquals("After reset failures", 0, metric.getFailures(), 0.0);
-        assertEquals("After reset sent bytes", 0, metric.getSentBytes(), 0.0);
-        assertEquals("After reset received bytes", 0, metric.getReceivedBytes(), 0.0);
+        assertEquals(Double.NaN, metric.getKoMaxTime(), 0.0, "After reset in TIMED mode ko.max");
+        assertEquals(Double.NaN, metric.getAllMaxTime(), 0.0, "After reset in TIMED mode all.max");
+        assertEquals(0, metric.getFailures(), 0.0, "After reset failures");
+        assertEquals(0, metric.getSentBytes(), 0.0, "After reset sent bytes");
+        assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
index 8c024cf0435..9d27c75d25b 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.engine;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
@@ -28,7 +30,6 @@
 
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -52,9 +53,7 @@ public void testInterfaces() throws Exception {
                 .filter(iface -> iface.getAddress().getAddress().length == 4) // hack to prevent checking IPv6
                 .map(this::toSubnetInfo)
                 .anyMatch(subnetInfo -> subnetInfo.isInRange(localHost));
-        Assert.assertTrue(
-                "localHost: " + localHost + " is bound to an interface",
-                localHostIsBound);
+        assertTrue(localHostIsBound, () -> "localHost: " + localHost + " is bound to an interface");
     }
 
     private String guessExternalIPv4Interface() throws SocketException {
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java b/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
index 143f5691c1f..ed5664c13ac 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java
@@ -17,9 +17,12 @@
 
 package org.apache.jmeter.engine;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
@@ -53,10 +56,10 @@ public void testCloning() throws Exception {
         TreeCloner cloner = new TreeCloner();
         original.traverse(cloner);
         ListedHashTree newTree = cloner.getClonedTree();
-        assertTrue(original != newTree);
+        assertNotSame(original, newTree);
         assertEquals(original.size(), newTree.size());
         assertEquals(original.getTree(original.getArray()[0]).size(), newTree.getTree(newTree.getArray()[0]).size());
-        assertTrue(original.getArray()[0] != newTree.getArray()[0]);
+        assertNotSame(original.getArray()[0], newTree.getArray()[0]);
         assertEquals(((GenericController) original.getArray()[0]).getName(), ((GenericController) newTree
                 .getArray()[0]).getName());
         assertSame(original.getTree(original.getArray()[0]).getArray()[1], newTree.getTree(newTree.getArray()[0])
@@ -64,14 +67,14 @@ public void testCloning() throws Exception {
         TestPlan clonedTestPlan = (TestPlan) newTree.getArray()[1];
         clonedTestPlan.setRunningVersion(true);
         clonedTestPlan.recoverRunningVersion();
-        assertTrue(!plan.getUserDefinedVariablesAsProperty().isRunningVersion());
+        assertFalse(plan.getUserDefinedVariablesAsProperty().isRunningVersion());
         assertTrue(clonedTestPlan.getUserDefinedVariablesAsProperty().isRunningVersion());
         Arguments vars = (Arguments) plan.getUserDefinedVariablesAsProperty().getObjectValue();
         PropertyIterator iter = ((CollectionProperty) vars.getProperty(Arguments.ARGUMENTS)).iterator();
         while (iter.hasNext()) {
             JMeterProperty argProp = iter.next();
-            assertTrue(!argProp.isRunningVersion());
-            assertTrue(argProp.getObjectValue() instanceof Argument);
+            assertFalse(argProp.isRunningVersion());
+            assertInstanceOf(Argument.class, argProp.getObjectValue());
             Argument arg = (Argument) argProp.getObjectValue();
             arg.setValue("yahoo");
             assertEquals("yahoo", arg.getValue());
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
index 026f95ff17c..4a54e69a4ab 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.engine.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
index e59184d17c6..246c44af34d 100644
--- a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
+++ b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.gui.logging;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -107,6 +107,6 @@ public void setUp() {
     public void testSimpleLogging() throws Exception {
         final Logger log = LoggerFactory.getLogger(TestGuiLogEventAppender.class);
         log.info("logger created.");
-        assertTrue("Logging appender error: " + log4j2LevelErrorMessages, log4j2LevelErrorMessages.isEmpty());
+        assertTrue(log4j2LevelErrorMessages.isEmpty(), "Logging appender error: " + log4j2LevelErrorMessages);
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java b/src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java
index 72b6cbc35b4..a96eed1479a 100644
--- a/src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java
+++ b/src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java
@@ -17,6 +17,9 @@
 
 package org.apache.jmeter.listeners;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.reporters.ResultAction;
 import org.apache.jmeter.samplers.SampleEvent;
@@ -24,7 +27,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -49,7 +51,7 @@ public void testSuccess() {
         sampleResult.setSuccessful(true);
         resultAction.setErrorAction(ResultAction.ON_ERROR_STOPTEST);
         resultAction.sampleOccurred(new SampleEvent(sampleResult, "JUnit-TG"));
-        Assert.assertFalse(sampleResult.isStopTest());
+        assertFalse(sampleResult.isStopTest());
     }
 
     @Test
@@ -58,10 +60,10 @@ public void testOnFailureStopTest() {
         sampleResult.setSuccessful(false);
         resultAction.setErrorAction(ResultAction.ON_ERROR_STOPTEST);
         resultAction.sampleOccurred(new SampleEvent(sampleResult, "JUnit-TG"));
-        Assert.assertTrue(sampleResult.isStopTest());
-        Assert.assertFalse(sampleResult.isStopTestNow());
-        Assert.assertFalse(sampleResult.isStopThread());
-        Assert.assertFalse(sampleResult.isStartNextThreadLoop());
+        assertTrue(sampleResult.isStopTest());
+        assertFalse(sampleResult.isStopTestNow());
+        assertFalse(sampleResult.isStopThread());
+        assertFalse(sampleResult.isStartNextThreadLoop());
     }
 
     @Test
@@ -70,10 +72,10 @@ public void testOnFailureStopTestNow() {
         sampleResult.setSuccessful(false);
         resultAction.setErrorAction(ResultAction.ON_ERROR_STOPTEST_NOW);
         resultAction.sampleOccurred(new SampleEvent(sampleResult, "JUnit-TG"));
-        Assert.assertFalse(sampleResult.isStopTest());
-        Assert.assertTrue(sampleResult.isStopTestNow());
-        Assert.assertFalse(sampleResult.isStopThread());
-        Assert.assertFalse(sampleResult.isStartNextThreadLoop());
+        assertFalse(sampleResult.isStopTest());
+        assertTrue(sampleResult.isStopTestNow());
+        assertFalse(sampleResult.isStopThread());
+        assertFalse(sampleResult.isStartNextThreadLoop());
     }
 
     @Test
@@ -82,10 +84,10 @@ public void testOnFailureStopThread() {
         sampleResult.setSuccessful(false);
         resultAction.setErrorAction(ResultAction.ON_ERROR_STOPTHREAD);
         resultAction.sampleOccurred(new SampleEvent(sampleResult, "JUnit-TG"));
-        Assert.assertFalse(sampleResult.isStopTest());
-        Assert.assertFalse(sampleResult.isStopTestNow());
-        Assert.assertTrue(sampleResult.isStopThread());
-        Assert.assertFalse(sampleResult.isStartNextThreadLoop());
+        assertFalse(sampleResult.isStopTest());
+        assertFalse(sampleResult.isStopTestNow());
+        assertTrue(sampleResult.isStopThread());
+        assertFalse(sampleResult.isStartNextThreadLoop());
     }
 
     @Test
@@ -94,9 +96,9 @@ public void testOnFailureStartNextThreadLoop() {
         sampleResult.setSuccessful(false);
         resultAction.setErrorAction(ResultAction.ON_ERROR_START_NEXT_THREAD_LOOP);
         resultAction.sampleOccurred(new SampleEvent(sampleResult, "JUnit-TG"));
-        Assert.assertFalse(sampleResult.isStopTest());
-        Assert.assertFalse(sampleResult.isStopTestNow());
-        Assert.assertFalse(sampleResult.isStopThread());
-        Assert.assertTrue(sampleResult.isStartNextThreadLoop());
+        assertFalse(sampleResult.isStopTest());
+        assertFalse(sampleResult.isStopTestNow());
+        assertFalse(sampleResult.isStopThread());
+        assertTrue(sampleResult.isStartNextThreadLoop());
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java b/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
index f1bf97b8586..1df86af511e 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
@@ -18,15 +18,17 @@
 package org.apache.jmeter.report.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -54,7 +56,7 @@ public void setUp() throws IOException {
 
     @Test
     public void testConstructorWithInvalidFile() {
-        Assertions.assertThrows(
+        assertThrows(
                 IllegalArgumentException.class,
                 () -> new CsvSampleReader(new File("/not/available.csv"), metadata)
         );
@@ -97,11 +99,11 @@ public void testPeek() {
     public void testHasNextAndReadSample() {
         try (CsvSampleReader reader = new CsvSampleReader(tempCsv, metadata)) {
             for (long i = 0; i < NR_ROWS; i++) {
-                Assert.assertTrue(reader.hasNext());
+                assertTrue(reader.hasNext());
                 final Sample sample = reader.readSample();
-                Assert.assertEquals(i, sample.getSampleRow());
+                assertEquals(i, sample.getSampleRow());
             }
-            Assert.assertFalse(reader.hasNext());
+            assertFalse(reader.hasNext());
         }
     }
 
diff --git a/src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java b/src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java
index dc34d579723..fc6fb1cdd27 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.report.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java b/src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java
index 5691f80221b..d0bd7db027e 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java
@@ -17,15 +17,15 @@
 
 package org.apache.jmeter.report.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.StringWriter;
 import java.io.Writer;
 
 import org.apache.jmeter.junit.JMeterTestUtils;
 import org.apache.jmeter.util.JMeterUtils;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -44,7 +44,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testCsvSampleWriterConstructorWithNull() throws Exception {
-        Assertions.assertThrows(
+        assertThrows(
                 NullPointerException.class,
                 () -> new CsvSampleWriter(null)
         );
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
index 2818ed5f9f4..b208ce05bd4 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
@@ -17,11 +17,11 @@
 
 package org.apache.jmeter.samplers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -105,55 +105,55 @@ public void testEqualsAndHashCode() throws Exception {
     public void testFalse() throws Exception {
         SampleSaveConfiguration a = new SampleSaveConfiguration(false);
         SampleSaveConfiguration b = new SampleSaveConfiguration(false);
-        assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode());
-        assertTrue("Objects should be equal",a.equals(b));
-        assertTrue("Objects should be equal",b.equals(a));
+        assertEquals(a.hashCode(), b.hashCode(), "Hash codes should be equal");
+        assertTrue(a.equals(b), "Objects should be equal");
+        assertTrue(b.equals(a), "Objects should be equal");
     }
 
     @Test
     public void testTrue() throws Exception {
         SampleSaveConfiguration a = new SampleSaveConfiguration(true);
         SampleSaveConfiguration b = new SampleSaveConfiguration(true);
-        assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode());
-        assertTrue("Objects should be equal",a.equals(b));
-        assertTrue("Objects should be equal",b.equals(a));
+        assertEquals(a.hashCode(), b.hashCode(), "Hash codes should be equal");
+        assertTrue(a.equals(b), "Objects should be equal");
+        assertTrue(b.equals(a), "Objects should be equal");
     }
     @Test
     public void testFalseTrue() throws Exception {
         SampleSaveConfiguration a = new SampleSaveConfiguration(false);
         SampleSaveConfiguration b = new SampleSaveConfiguration(true);
-        assertFalse("Hash codes should not be equal",a.hashCode() == b.hashCode());
-        assertFalse("Objects should not be equal",a.equals(b));
-        assertFalse("Objects should not be equal",b.equals(a));
+        assertFalse(a.hashCode() == b.hashCode(), "Hash codes should not be equal");
+        assertFalse(a.equals(b), "Objects should not be equal");
+        assertFalse(b.equals(a), "Objects should not be equal");
     }
 
     @Test
     public void testFormatter() throws Exception {
         SampleSaveConfiguration a = new SampleSaveConfiguration(false);
         SampleSaveConfiguration b = new SampleSaveConfiguration(false);
-        assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode());
-        assertTrue("Objects should be equal",a.equals(b));
-        assertTrue("Objects should be equal",b.equals(a));
+        assertEquals(a.hashCode(), b.hashCode(), "Hash codes should be equal");
+        assertTrue(a.equals(b), "Objects should be equal");
+        assertTrue(b.equals(a), "Objects should be equal");
         assertTrue(a.strictDateFormatter() == null);
         assertTrue(b.strictDateFormatter() == null);
         assertTrue(a.threadSafeLenientFormatter() == null);
         assertTrue(b.threadSafeLenientFormatter() == null);
         a.setDateFormat(null);
         b.setDateFormat(null);
-        assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode());
-        assertTrue("Objects should be equal",a.equals(b));
-        assertTrue("Objects should be equal",b.equals(a));
+        assertEquals(a.hashCode(), b.hashCode(), "Hash codes should be equal");
+        assertTrue(a.equals(b), "Objects should be equal");
+        assertTrue(b.equals(a), "Objects should be equal");
         assertTrue(a.strictDateFormatter() == null);
         assertTrue(b.strictDateFormatter() == null);
         assertTrue(a.threadSafeLenientFormatter() == null);
         assertTrue(b.threadSafeLenientFormatter() == null);
         a.setDateFormat("dd/MM/yyyy");
         b.setDateFormat("dd/MM/yyyy");
-        assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode());
-        assertTrue("Objects should be equal",a.equals(b));
-        assertTrue("Objects should be equal",b.equals(a));
-        assertTrue("Objects should be equal",a.strictDateFormatter().equals(b.strictDateFormatter()));
-        assertTrue("Objects should be equal",a.threadSafeLenientFormatter().equals(b.threadSafeLenientFormatter()));
+        assertEquals(a.hashCode(), b.hashCode(), "Hash codes should be equal");
+        assertTrue(a.equals(b), "Objects should be equal");
+        assertTrue(b.equals(a), "Objects should be equal");
+        assertTrue(a.strictDateFormatter().equals(b.strictDateFormatter()), "Objects should be equal");
+        assertTrue(a.threadSafeLenientFormatter().equals(b.threadSafeLenientFormatter()), "Objects should be equal");
     }
 
     @Test
@@ -167,7 +167,7 @@ public void testSaveConfigNames() throws Exception {
             if (name.startsWith(SampleSaveConfiguration.CONFIG_GETTER_PREFIX) && method.getParameterTypes().length == 0) {
                 name = name.substring(SampleSaveConfiguration.CONFIG_GETTER_PREFIX.length());
                 getMethodNames.add(name);
-                assertTrue("SAVE_CONFIG_NAMES should contain save" + name, SampleSaveConfiguration.SAVE_CONFIG_NAMES.contains(name));
+                assertTrue(SampleSaveConfiguration.SAVE_CONFIG_NAMES.contains(name), "SAVE_CONFIG_NAMES should contain save" + name);
             }
             if (name.startsWith(SampleSaveConfiguration.CONFIG_SETTER_PREFIX)
                     && method.getParameterTypes().length == 1
@@ -175,14 +175,13 @@ public void testSaveConfigNames() throws Exception {
                 name = name.substring(
                         SampleSaveConfiguration.CONFIG_SETTER_PREFIX.length());
                 setMethodNames.add(name);
-                assertTrue("SAVE_CONFIG_NAMES should contain set" + name,
-                        SampleSaveConfiguration.SAVE_CONFIG_NAMES
-                                .contains(name));
+                assertTrue(SampleSaveConfiguration.SAVE_CONFIG_NAMES
+                        .contains(name), "SAVE_CONFIG_NAMES should contain set" + name);
             }
         }
         for (String name : SampleSaveConfiguration.SAVE_CONFIG_NAMES) {
-            assertTrue("SAVE_CONFIG_NAMES should NOT contain save" + name, getMethodNames.contains(name));
-            assertTrue("SAVE_CONFIG_NAMES should NOT contain set" + name, setMethodNames.contains(name));
+            assertTrue(getMethodNames.contains(name), "SAVE_CONFIG_NAMES should NOT contain save" + name);
+            assertTrue(setMethodNames.contains(name), "SAVE_CONFIG_NAMES should NOT contain set" + name);
         }
     }
 
diff --git a/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java b/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
index cc7a6c80867..cb9d959f172 100644
--- a/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
+++ b/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.save;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.BufferedReader;
@@ -40,9 +40,9 @@ private void checkSplitString(String input, char delim, String[] expected) throw
     }
 
     private void checkStrings(String[] expected, String[] out) {
-        assertEquals("Incorrect number of strings returned",expected.length, out.length);
+        assertEquals(expected.length, out.length, "Incorrect number of strings returned");
         for(int i = 0; i < out.length; i++){
-           assertEquals("Incorrect entry returned",expected[i], out[i]);
+           assertEquals(expected[i], out[i], "Incorrect entry returned");
         }
     }
 
@@ -108,7 +108,7 @@ public void testSplitMultiLine() throws Exception  {
         checkStrings(new String[]{"","","f","g",""}, out);
         out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{""}, out); // Blank line
-        assertEquals("Expected to be at EOF",-1,br.read());
+        assertEquals(-1, br.read(), "Expected to be at EOF");
         // Empty strings at EOF
         out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{}, out);
@@ -121,7 +121,7 @@ public void testBlankLine() throws Exception  {
         BufferedReader br = new BufferedReader(new StringReader("\n"));
         String[] out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{""}, out);
-        assertEquals("Expected to be at EOF",-1,br.read());
+        assertEquals(-1, br.read(), "Expected to be at EOF");
     }
 
     @Test
@@ -129,7 +129,7 @@ public void testBlankLineQuoted() throws Exception  {
         BufferedReader br = new BufferedReader(new StringReader("\"\"\n"));
         String[] out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{""}, out);
-        assertEquals("Expected to be at EOF",-1,br.read());
+        assertEquals(-1, br.read(), "Expected to be at EOF");
     }
 
     @Test
@@ -137,7 +137,7 @@ public void testEmptyFile() throws Exception  {
         BufferedReader br = new BufferedReader(new StringReader(""));
         String[] out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{}, out);
-        assertEquals("Expected to be at EOF",-1,br.read());
+        assertEquals(-1, br.read(), "Expected to be at EOF");
     }
 
     @Test
@@ -145,7 +145,7 @@ public void testShortFile() throws Exception  {
         BufferedReader br = new BufferedReader(new StringReader("a"));
         String[] out = CSVSaveService.csvReadFile(br, ',');
         checkStrings(new String[]{"a"}, out);
-        assertEquals("Expected to be at EOF",-1,br.read());
+        assertEquals(-1, br.read(), "Expected to be at EOF");
     }
 
     @Test
@@ -154,7 +154,7 @@ public void testShortFile() throws Exception  {
     public void testHeader() {
         final String HDR = "timeStamp,elapsed,label,responseCode,responseMessage,threadName,dataType,success,"
                 + "failureMessage,bytes,sentBytes,grpThreads,allThreads,URL,Latency,IdleTime,Connect";
-        assertEquals("Header text has changed", HDR, CSVSaveService.printableFieldNamesToString());
+        assertEquals(HDR, CSVSaveService.printableFieldNamesToString(), "Header text has changed");
     }
 
     @Test
@@ -180,6 +180,6 @@ public void testSample() throws MalformedURLException {
         result.setIdleTime(13);
         result.setConnectTime(14);
 
-        assertEquals("Result text has changed", RESULT, CSVSaveService.resultToDelimitedString(new SampleEvent(result,"")));
+        assertEquals(RESULT, CSVSaveService.resultToDelimitedString(new SampleEvent(result,"")), "Result text has changed");
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
index 1a8f1915ff7..ed4a10ffbe8 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.testbeans.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
@@ -52,32 +52,32 @@ public void testBooleanPropertyEditor() {
     }
 
     private void testBooleanEditor(PropertyEditor propertyEditor) {
-        assertNotNull("Expected to find property editor", propertyEditor);
+        assertNotNull(propertyEditor, "Expected to find property editor");
         String[] tags = propertyEditor.getTags();
-        assertEquals(2,tags.length);
-        assertEquals(TRUE,tags[0]);
-        assertEquals(FALSE,tags[1]);
+        assertEquals(2, tags.length);
+        assertEquals(TRUE, tags[0]);
+        assertEquals(FALSE, tags[1]);
 
         propertyEditor.setValue(Boolean.FALSE);
-        assertEquals(FALSE,propertyEditor.getAsText());
+        assertEquals(FALSE, propertyEditor.getAsText());
         propertyEditor.setAsText(FALSE);
-        assertEquals(FALSE,propertyEditor.getAsText());
+        assertEquals(FALSE, propertyEditor.getAsText());
         propertyEditor.setAsText("false");
-        assertEquals(FALSE,propertyEditor.getAsText());
+        assertEquals(FALSE, propertyEditor.getAsText());
         propertyEditor.setAsText("False");
-        assertEquals(FALSE,propertyEditor.getAsText());
+        assertEquals(FALSE, propertyEditor.getAsText());
         propertyEditor.setAsText("FALSE");
-        assertEquals(FALSE,propertyEditor.getAsText());
+        assertEquals(FALSE, propertyEditor.getAsText());
 
         propertyEditor.setValue(Boolean.TRUE);
-        assertEquals(TRUE,propertyEditor.getAsText());
+        assertEquals(TRUE, propertyEditor.getAsText());
         propertyEditor.setAsText(TRUE);
-        assertEquals(TRUE,propertyEditor.getAsText());
+        assertEquals(TRUE, propertyEditor.getAsText());
         propertyEditor.setAsText("true");
-        assertEquals(TRUE,propertyEditor.getAsText());
+        assertEquals(TRUE, propertyEditor.getAsText());
         propertyEditor.setAsText("True");
-        assertEquals(TRUE,propertyEditor.getAsText());
+        assertEquals(TRUE, propertyEditor.getAsText());
         propertyEditor.setAsText("TRUE");
-        assertEquals(TRUE,propertyEditor.getAsText());
+        assertEquals(TRUE, propertyEditor.getAsText());
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
index 69433eaa244..c0aae9b63b7 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.testbeans.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
index b3732ce0048..573de5b5ca4 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.testbeans.gui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java
index 1c5d6c8c32c..5be8b416065 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.testelement;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -38,13 +38,13 @@ public void testRecovery() throws Exception {
         LoginConfig loginConfig = new LoginConfig();
         loginConfig.setUsername("user1");
         loginConfig.setPassword("pass1");
-        assertTrue(config.getProperty("login") instanceof NullProperty);
+        assertInstanceOf(NullProperty.class, config.getProperty("login"));
         // This test should work whether or not all Nulls are equal
         assertEquals(new NullProperty("login"), config.getProperty("login"));
         config.addProperty(new TestElementProperty("login", loginConfig));
         assertEquals(loginConfig.toString(), config.getPropertyAsString("login"));
         config.recoverRunningVersion();
-        assertTrue(config.getProperty("login") instanceof NullProperty);
+        assertInstanceOf(NullProperty.class, config.getProperty("login"));
         assertEquals(new NullProperty("login"), config.getProperty("login"));
     }
 
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java b/src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java
index b30f0e223b5..5e74a08d7fb 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.testelement;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.testelement.property.DoubleProperty;
 import org.apache.jmeter.testelement.property.IntegerProperty;
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
index a114203099d..fcd3a5f6d26 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.threads;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.time.Instant;
 
 import org.apache.jmeter.control.LoopController;
@@ -27,7 +31,6 @@
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.timers.Timer;
 import org.apache.jorphan.collections.HashTree;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class TestJMeterThread {
@@ -117,7 +120,7 @@ void testBug61661OnError() {
         hashTree.add("Test", new ThrowingThreadListener(true));
         JMeterThread.ThreadListenerTraverser traverser =
                 new JMeterThread.ThreadListenerTraverser(true);
-        Assertions.assertThrows(
+        assertThrows(
                 NoClassDefFoundError.class,
                 () -> hashTree.traverse(traverser));
     }
@@ -158,11 +161,11 @@ void testBug63490EndTestWhenDelayIsTooLongForScheduler() {
         jMeterThread.run();
         long duration = Instant.now().toEpochMilli() - startTime.toEpochMilli();
 
-        Assertions.assertFalse(dummySampler.isCalled(), "Sampler should not be called");
+        assertFalse(dummySampler.isCalled(), "Sampler should not be called");
 
         // the duration of this test plan should currently be around zero seconds,
         // but it is allowed to take up to maxDuration amount of time
-        Assertions.assertTrue(duration <= maxDuration, "Test plan should not run for longer than duration");
+        assertTrue(duration <= maxDuration, "Test plan should not run for longer than duration");
     }
 
     private LoopController createLoopController() {
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java b/src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java
index 17ffcd419ce..cbc368b6c7b 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.threads;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.control.GenericController;
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
index fef4df0dec1..3a6b68bbb7d 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
@@ -18,6 +18,7 @@
 package org.apache.jmeter.threads;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,7 +26,6 @@
 import java.util.Map;
 
 import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -109,7 +109,7 @@ public void testGetIteratorIsUnmodifable() {
     }
 
     private void assertThrowsUnsupportedOperation(Executable executable) {
-        Assertions.assertThrows(
+        assertThrows(
                 UnsupportedOperationException.class,
                 executable
         );
diff --git a/src/core/src/test/java/org/apache/jmeter/util/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/util/PackageTest.java
index ada7aaac15c..9bfc4576471 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/PackageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/PackageTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.util;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
index a87999e37ce..aef5a00de09 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.security.Provider;
@@ -24,7 +28,6 @@
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -37,8 +40,8 @@ public class SecurityProviderLoaderTest {
     void removeAllDummyProviders() {
         Security.removeProvider(DummyProvider.PROVIDER_NAME);
         Security.removeProvider(DummyProviderWithConfig.PROVIDER_NAME);
-        Assert.assertNull(Security.getProvider(DummyProvider.PROVIDER_NAME));
-        Assert.assertNull(Security.getProvider(DummyProviderWithConfig.PROVIDER_NAME));
+        assertNull(Security.getProvider(DummyProvider.PROVIDER_NAME));
+        assertNull(Security.getProvider(DummyProviderWithConfig.PROVIDER_NAME));
     }
 
     @Test
@@ -48,7 +51,7 @@ void utilityClassTest() throws Exception {
         try {
             privateConstructor.newInstance();
         } catch (InvocationTargetException e) {
-            Assert.assertEquals(IllegalStateException.class, e.getCause().getClass());
+            assertEquals(IllegalStateException.class, e.getCause().getClass());
         }
     }
 
@@ -63,10 +66,10 @@ void addSecurityProviderTest() {
         Provider[] providersAfter = Security.getProviders();
         Provider provider = Security.getProvider(DummyProvider.PROVIDER_NAME);
         try {
-            Assert.assertEquals(providersCountBefore + 1, providersAfter.length);
-            Assert.assertNotNull("Provider not installed.", provider);
-            Assert.assertEquals(DummyProvider.class, provider.getClass());
-            Assert.assertEquals(provider, providersAfter[providersAfter.length - 1]);
+            assertEquals(providersCountBefore + 1, providersAfter.length);
+            assertNotNull(provider, "Provider not installed.");
+            assertEquals(DummyProvider.class, provider.getClass());
+            assertEquals(provider, providersAfter[providersAfter.length - 1]);
         } catch (AssertionError e){
             Arrays.stream(providers).forEach(pro -> System.err.println(pro.getName()));
             throw e;
@@ -83,10 +86,10 @@ void addSecurityProviderTestWithConfigForUnconfigurableProvider() {
         Provider[] providersAfter = Security.getProviders();
         Provider provider = Security.getProvider(DummyProvider.PROVIDER_NAME);
 
-        Assert.assertEquals(providersCountBefore + 1, providersAfter.length);
-        Assert.assertNotNull("Provider not installed.", provider);
-        Assert.assertEquals(DummyProvider.class, provider.getClass());
-        Assert.assertEquals(provider, providersAfter[providersAfter.length - 1]);
+        assertEquals(providersCountBefore + 1, providersAfter.length);
+        assertNotNull(provider, "Provider not installed.");
+        assertEquals(DummyProvider.class, provider.getClass());
+        assertEquals(provider, providersAfter[providersAfter.length - 1]);
     }
 
     @ParameterizedTest
@@ -99,7 +102,7 @@ void addInvalidProviderClassTest(String invalidClassname) {
 
         int providersCountAfter = Security.getProviders().length;
 
-        Assert.assertEquals(providersCountBefore, providersCountAfter);
+        assertEquals(providersCountBefore, providersCountAfter);
     }
 
     @ParameterizedTest
@@ -113,10 +116,10 @@ void addSecurityProviderWithPositionTest(int position) {
         Provider[] providersAfter = Security.getProviders();
         Provider provider = Security.getProvider(DummyProvider.PROVIDER_NAME);
 
-        Assert.assertEquals(providersCountBefore + 1, providersAfter.length);
-        Assert.assertNotNull(provider);
-        Assert.assertEquals(DummyProvider.class, provider.getClass());
-        Assert.assertEquals(provider, providersAfter[expectedInsertPosition(position, providersAfter)]);
+        assertEquals(providersCountBefore + 1, providersAfter.length);
+        assertNotNull(provider);
+        assertEquals(DummyProvider.class, provider.getClass());
+        assertEquals(provider, providersAfter[expectedInsertPosition(position, providersAfter)]);
     }
 
     private int expectedInsertPosition(int position, Provider[] providersAfter) {
@@ -137,11 +140,11 @@ void addSecurityProviderWithPositionAndConfigTest(String config, int position) {
         Provider[] providersAfter = Security.getProviders();
         Provider provider = Security.getProvider(DummyProviderWithConfig.PROVIDER_NAME);
 
-        Assert.assertNotNull("Provider not installed.", provider);
-        Assert.assertEquals(providersCountBefore + 1, providersAfter.length);
-        Assert.assertEquals(DummyProviderWithConfig.class, provider.getClass());
-        Assert.assertEquals(provider, providersAfter[expectedInsertPosition(position, providersAfter)]);
-        Assert.assertEquals(config.substring(config.lastIndexOf(":") + 1), ((DummyProviderWithConfig) provider).getConfig());
+        assertNotNull(provider, "Provider not installed.");
+        assertEquals(providersCountBefore + 1, providersAfter.length);
+        assertEquals(DummyProviderWithConfig.class, provider.getClass());
+        assertEquals(provider, providersAfter[expectedInsertPosition(position, providersAfter)]);
+        assertEquals(config.substring(config.lastIndexOf(":") + 1), ((DummyProviderWithConfig) provider).getConfig());
     }
 
     @Test
@@ -156,19 +159,19 @@ void addSecurityProvidersViaProperties() {
         SecurityProviderLoader.addSecurityProvider(properties);
 
         Provider[] providersAfter = Security.getProviders();
-        Assert.assertEquals(providersCountBefore + 2, providersAfter.length);
+        assertEquals(providersCountBefore + 2, providersAfter.length);
 
         Provider provider = Security.getProvider(DummyProvider.PROVIDER_NAME);
         Provider providerWithConfig = Security.getProvider(DummyProviderWithConfig.PROVIDER_NAME);
 
-        Assert.assertNotNull("Provider not installed.", provider);
-        Assert.assertEquals(DummyProvider.class, provider.getClass());
-        Assert.assertEquals(provider, providersAfter[0]);
+        assertNotNull(provider, "Provider not installed.");
+        assertEquals(DummyProvider.class, provider.getClass());
+        assertEquals(provider, providersAfter[0]);
 
-        Assert.assertNotNull("Provider not installed.", providerWithConfig);
-        Assert.assertEquals(DummyProviderWithConfig.class, providerWithConfig.getClass());
-        Assert.assertEquals(providerWithConfig, providersAfter[1]);
-        Assert.assertEquals("CONFIG", ((DummyProviderWithConfig) providerWithConfig).getConfig());
+        assertNotNull(providerWithConfig, "Provider not installed.");
+        assertEquals(DummyProviderWithConfig.class, providerWithConfig.getClass());
+        assertEquals(providerWithConfig, providersAfter[1]);
+        assertEquals("CONFIG", ((DummyProviderWithConfig) providerWithConfig).getConfig());
     }
 
     static class DummyProvider extends Provider {
diff --git a/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java b/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
index 3fcfaaf089b..eeb1558d163 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 4abbe451a67..03c72effd89 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -17,14 +17,16 @@
 
 package org.apache.jmeter.util;
 
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestJMeterUtils {
@@ -32,18 +34,18 @@ public class TestJMeterUtils {
     @Test
     public void testGetResourceFileAsText() throws Exception{
         String sep = System.getProperty("line.separator");
-        Assertions.assertEquals("line one" + sep + "line two" + sep,
+        assertEquals("line one" + sep + "line two" + sep,
                 JMeterUtils.getResourceFileAsText("resourcefile.txt"));
     }
 
     @Test
     public void testGetResourceFileAsTextWithMisingResource() throws Exception{
-        Assertions.assertEquals("", JMeterUtils.getResourceFileAsText("not_existant_resourcefile.txt"));
+        assertEquals("", JMeterUtils.getResourceFileAsText("not_existant_resourcefile.txt"));
     }
 
     @Test
     public void testGesResStringDefaultWithNonExistantKey() throws Exception {
-        Assertions.assertEquals("[res_key=noValidKey]", JMeterUtils.getResString("noValidKey"));
+        assertEquals("[res_key=noValidKey]", JMeterUtils.getResString("noValidKey"));
     }
 
     @Test
@@ -53,25 +55,25 @@ public void testGetArrayPropDefault() throws Exception {
         JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefaultEmpty", "    ");
         JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefault",
                 " Tolstoi  Dostoievski    Pouchkine       Gorki ");
-        Assertions.assertArrayEquals(new String[]{"Tolstoi", "Dostoievski", "Pouchkine", "Gorki"},
+        assertArrayEquals(new String[]{"Tolstoi", "Dostoievski", "Pouchkine", "Gorki"},
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefault", null));
-        Assertions.assertArrayEquals(new String[]{"Gilels", "Richter"},
+        assertArrayEquals(new String[]{"Gilels", "Richter"},
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultMissing",
                         new String[]{"Gilels", "Richter"}));
-        Assertions.assertArrayEquals(null,
+        assertArrayEquals(null,
                 JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultEmpty", null));
     }
 
     @Test
     void testCompilePatternOK() {
         Pattern pattern = JMeterUtils.compilePattern("some.*");
-        Assertions.assertTrue(pattern.matcher("something").matches());
+        assertTrue(pattern.matcher("something").matches());
     }
 
     @Test
     void testCompilePatternMultilineCaseIgnoreOK() {
         Pattern pattern = JMeterUtils.compilePattern("^some.*g$", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
-        Assertions.assertTrue(pattern.matcher("abc\nsome good thing").find());
+        assertTrue(pattern.matcher("abc\nsome good thing").find());
     }
 
     @Test
diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index 5a719c81b29..3ebf8c2cd37 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -18,8 +18,8 @@
 package org.apache.jmeter.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayInputStream;
@@ -74,7 +74,7 @@ public void testBug63033() throws SaxonApiException {
         selector.setContextItem(p.newDocumentBuilder().build(new StreamSource(new StringReader(xmlDoc))));
         XdmValue nodes = selector.evaluate();
         XdmItem item = nodes.itemAt(0);
-        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>",item.toString());
+        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>", item.toString());
     }
 
     @Test
@@ -86,41 +86,41 @@ public void testputValuesForXPathInListUsingSaxon() throws SaxonApiException, Fa
         int matchNumber = 3;
 
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals("Manager",matchStrings.get(0));
+        assertEquals("Manager", matchStrings.get(0));
 
         matchNumber = 0;
         xPathQuery="//Employees/Employee[1]/age:ag";
         fragment = true;
         matchStrings.clear();
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>",matchStrings.get(0));
-        assertEquals(1,matchStrings.size());
+        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>", matchStrings.get(0));
+        assertEquals(1, matchStrings.size());
 
         matchNumber = -1;
         xPathQuery="//Employees/Employee/age:ag";
         matchStrings.clear();
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>",matchStrings.get(0));
-        assertEquals(4,matchStrings.size());
+        assertEquals("<age:ag xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\">29</age:ag>", matchStrings.get(0));
+        assertEquals(4, matchStrings.size());
 
         fragment = false;
         matchStrings.clear();
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals("29",matchStrings.get(0));
-        assertEquals(4,matchStrings.size());
+        assertEquals("29", matchStrings.get(0));
+        assertEquals(4, matchStrings.size());
 
         matchStrings.clear();
         xPathQuery="regtsgwsdfstgsdf";
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals(new ArrayList<String>(),matchStrings);
-        assertEquals(0,matchStrings.size());
+        assertEquals(new ArrayList<String>(), matchStrings);
+        assertEquals(0, matchStrings.size());
 
         matchStrings.clear();
         xPathQuery="//Employees/Employee[1]/age:ag";
         matchNumber = 555;
         XPathUtil.putValuesForXPathInListUsingSaxon(xmlDoc, xPathQuery, matchStrings, fragment, matchNumber, namespaces);
-        assertEquals(new ArrayList<String>(),matchStrings);
-        assertEquals(0,matchStrings.size());
+        assertEquals(new ArrayList<String>(), matchStrings);
+        assertEquals(0, matchStrings.size());
     }
 
     static Stream<Arguments> namespaceData() {
@@ -140,7 +140,7 @@ static Stream<Arguments> namespaceData() {
     @MethodSource("namespaceData")
     public void testnamespacesParse(String namespaces, String key, String value, int position) {
         List<String[]> test = XPathUtil.namespacesParse(namespaces);
-        assertEquals(key,test.get(position)[0]);
+        assertEquals(key, test.get(position)[0]);
         assertEquals(value, test.get(position)[1]);
     }
 
@@ -203,8 +203,8 @@ public void testMakeDocument(String xpathquery, boolean isNegated, boolean isErr
                 false, false, false, false, false);
         AssertionResult res = new AssertionResult("test");
         XPathUtil.computeAssertionResult(res, testDoc, xpathquery, isNegated);
-        assertEquals("test isError", isError, res.isError());
-        assertEquals("test isFailure", isFailure, res.isFailure());
+        assertEquals(isError, res.isError(), "test isError");
+        assertEquals(isFailure, res.isFailure(), "test isFailure");
     }
 
     @Test
diff --git a/src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java b/src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java
index aa47eed841d..799568a3065 100644
--- a/src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java
+++ b/src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java
@@ -17,7 +17,8 @@
 
 package org.apache.jorphan.reflect;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Map;
@@ -100,13 +101,13 @@ void testName() throws Exception{
         Test1 t1 = new Test1("t1");
         Test2 t2 = new Test2("t2");
         Test1a t1a = new Test1a("aa");
-        assertEquals("t1",f1.invoke(t1));
+        assertEquals("t1", f1.invoke(t1));
         assertThrows(JMeterError.class, () -> f1.invoke(t2));
-        assertEquals("t2",f2.invoke(t2));
-        assertEquals("1a:aa.",f1a.invoke(t1a));
+        assertEquals("t2", f2.invoke(t2));
+        assertEquals("1a:aa.", f1a.invoke(t1a));
         assertThrows(JMeterError.class, () -> f1a.invoke(t1));
         // OK (currently) to invoke using sub-class
-        assertEquals("1a:aa.",f1.invoke(t1a));
+        assertEquals("1a:aa.", f1.invoke(t1a));
     }
 
     @Test
@@ -114,9 +115,9 @@ void testNameTypes() throws Exception{
         Functor f = new Functor("getString",new Class[]{String.class});
         Functor f2 = new Functor("getString");// Args will be provided later
         Test1 t1 = new Test1("t1");
-        assertEquals("x1",f.invoke(t1,new String[]{"x1"}));
+        assertEquals("x1", f.invoke(t1,new String[]{"x1"}));
         assertThrows(JMeterError.class, () -> f.invoke(t1));
-        assertEquals("x2",f2.invoke(t1,new String[]{"x2"}));
+        assertEquals("x2", f2.invoke(t1,new String[]{"x2"}));
         assertThrows(JMeterError.class, () -> f2.invoke(t1));
     }
 
@@ -125,8 +126,8 @@ void testObjectName() throws Exception{
         Test1 t1 = new Test1("t1");
         Test2 t2 = new Test2("t2");
         Functor f1 = new Functor(t1,"getName");
-        assertEquals("t1",f1.invoke(t1));
-        assertEquals("t1",f1.invoke(t2)); // should use original object
+        assertEquals("t1", f1.invoke(t1));
+        assertEquals("t1", f1.invoke(t2)); // should use original object
     }
 
     // Check how Class definition behaves
@@ -136,23 +137,23 @@ void testClass() throws Exception{
         Test1 t1a = new Test1a("t1a");
         Test2 t2 = new Test2("t2");
         Functor f1 = new Functor(HasName.class,"getName");
-        assertEquals("t1",f1.invoke(t1));
-        assertEquals("1a:t1a.",f1.invoke(t1a));
-        assertEquals("t2",f1.invoke(t2));
+        assertEquals("t1", f1.invoke(t1));
+        assertEquals("1a:t1a.", f1.invoke(t1a));
+        assertEquals("t2", f1.invoke(t2));
         assertThrows(IllegalStateException.class, () -> f1.invoke());
         Functor f2 = new Functor(HasString.class,"getString");
-        assertEquals("xyz",f2.invoke(t2,new String[]{"xyz"}));
+        assertEquals("xyz", f2.invoke(t2,new String[]{"xyz"}));
         assertThrows(JMeterError.class, () -> f2.invoke(t1,new String[]{"xyz"}));
         Functor f3 = new Functor(t2,"getString");
-        assertEquals("xyz",f3.invoke(t2,new Object[]{"xyz"}));
+        assertEquals("xyz", f3.invoke(t2,new Object[]{"xyz"}));
 
         Properties p = new Properties();
         p.put("Name","Value");
         Functor fk = new Functor(Map.Entry.class,"getKey");
         Functor fv = new Functor(Map.Entry.class,"getValue");
         Object o = p.entrySet().iterator().next();
-        assertEquals("Name",fk.invoke(o));
-        assertEquals("Value",fv.invoke(o));
+        assertEquals("Name", fk.invoke(o));
+        assertEquals("Value", fv.invoke(o));
     }
 
     @Test
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
index ebf7adeb10f..475b012a454 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.junit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
@@ -144,7 +145,7 @@ protected void checkInvalidParameterCounts(AbstractFunction func, int min,
     }
 
     public static void assertPrimitiveEquals(boolean expected, boolean actual) {
-        org.junit.Assert.assertEquals(expected, actual);
+        assertEquals(expected, actual);
     }
 
     /**
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
index 92308c10016..c8b4b6306bd 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.resources;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,7 +35,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class ResourceKeyUsageTest {
@@ -52,7 +55,7 @@ private PropertyResourceBundle getRAS(String res) throws Exception {
     void checkResourceReferences() throws Exception {
         String resourceName = "/org/apache/jmeter/resources/messages.properties";
         PropertyResourceBundle messagePRB = getRAS(resourceName);
-        Assertions.assertNotNull(resourceName, () -> "Resource bundle " + resourceName + " was not found");
+        assertNotNull(resourceName, () -> "Resource bundle " + resourceName + " was not found");
         List<String> failures = new ArrayList<>();
         final List<Exception> exceptions = new ArrayList<>();
 
@@ -91,10 +94,10 @@ void checkResourceReferences() throws Exception {
             }
             return file.isDirectory();
         });
-        Assertions.assertTrue(exceptions.isEmpty());
+        assertTrue(exceptions.isEmpty());
         if (failures.isEmpty()) {
             return;
         }
-        Assertions.fail(() -> String.join("\n", failures));
+        fail(String.join("\n", failures));
     }
 }
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java b/src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java
index 173bfc9ab7d..019eafecefc 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/threads/TestJMeterContextService.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.threads;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java b/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
index dfc9b63d373..246c803f21c 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -124,11 +124,11 @@ private void runSimpleTest(String cond, String exp) throws Exception {
         controller.initialize();
 
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop " + i, "before", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop " + i);
             if (exp != null) {
-                assertEquals("Loop " + i, exp, nextName(controller));
+                assertEquals(exp, nextName(controller), "Loop " + i);
             }
-            assertEquals("Loop " + i, "after", nextName(controller));
+            assertEquals("after", nextName(controller), "Loop " + i);
             assertNull(nextName(controller));
         }
     }
@@ -171,12 +171,12 @@ private void runSimpleTest2(String cond, String exp, String sub1Name) throws Exc
         controller.addTestElement(new TestSampler("after"));
         controller.initialize();
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop=" + i, "before", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop=" + i);
             if (exp != null) {
-                assertEquals("Loop=" + i, exp, nextName(controller));
+                assertEquals(exp, nextName(controller), "Loop=" + i);
             }
-            assertEquals("Loop=" + i, "after", nextName(controller));
-            assertNull("Loop=" + i, nextName(controller));
+            assertEquals("after", nextName(controller), "Loop=" + i);
+            assertNull(nextName(controller), "Loop=" + i);
         }
     }
 
@@ -243,13 +243,13 @@ private void runTest2(String cond, String[] exp) throws Exception {
         switch_cont.setRunningVersion(true);
         controller.initialize();
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop:" + i, "before", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop:" + i);
             for (String anExp : exp) {
-                assertEquals("Loop:" + i, anExp, nextName(controller));
+                assertEquals(anExp, nextName(controller), "Loop:" + i);
             }
-            assertEquals("Loop:" + i, "after", nextName(controller));
+            assertEquals("after", nextName(controller), "Loop:" + i);
         }
-        assertNull("Loops:" + loops, nextName(controller));
+        assertNull(nextName(controller), "Loops:" + loops);
     }
 
     /*
@@ -288,17 +288,17 @@ public void testFunction() throws Exception {
         assertEquals("100", jmvars.get("VAR"));
 
         for (int i = 1; i <= 3; i++) {
-            assertEquals("Loop " + i, "before", nextName(controller));
-            assertEquals("Loop " + i, "" + i, nextName(controller));
-            assertEquals("Loop " + i, "" + i, jmvars.get("VAR"));
-            assertEquals("Loop " + i, "after", nextName(controller));
+            assertEquals("before", nextName(controller), "Loop " + i);
+            assertEquals("" + i, nextName(controller), "Loop " + i);
+            assertEquals("" + i, jmvars.get("VAR"), "Loop " + i);
+            assertEquals("after", nextName(controller), "Loop " + i);
             assertNull(nextName(controller));
         }
         int i = 4;
-        assertEquals("Loop " + i, "before", nextName(controller));
-        assertEquals("Loop " + i, "0", nextName(controller));
-        assertEquals("Loop " + i, "" + i, jmvars.get("VAR"));
-        assertEquals("Loop " + i, "after", nextName(controller));
+        assertEquals("before", nextName(controller), "Loop " + i);
+        assertEquals("0", nextName(controller), "Loop " + i);
+        assertEquals("" + i, jmvars.get("VAR"), "Loop " + i);
+        assertEquals("after", nextName(controller), "Loop " + i);
         assertNull(nextName(controller));
         assertEquals("4", jmvars.get("VAR"));
     }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java b/src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java
index bcae474d908..db4487bb2d2 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.resources;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,7 +34,7 @@ public class TestPropertiesFiles extends JMeterTestCase {
     @Test
     public void testUserProperties() throws Exception {
         Properties props = loadProps(new File(JMeterUtils.getJMeterBinDir(), "user.properties"));
-        assertTrue("user.properties should not contain any enabled properties", props.isEmpty());
+        assertTrue(props.isEmpty(), "user.properties should not contain any enabled properties");
     }
 
     // The keys in jmeter.properties and reportgenerator.properties should be distinct
@@ -45,12 +45,12 @@ public void testDefaultProperties() throws Exception {
         Enumeration<?> jmeterNames = jmeter.propertyNames();
         while (jmeterNames.hasMoreElements()) {
             final Object key = jmeterNames.nextElement();
-            assertFalse("reportgenerator should not contain the jmeter key " + key, report.containsKey(key));
+            assertFalse(report.containsKey(key), "reportgenerator should not contain the jmeter key " + key);
         }
         Enumeration<?> reportNames = report.propertyNames();
         while (reportNames.hasMoreElements()) {
             final Object key = reportNames.nextElement();
-            assertFalse("jmeter should not contain the reportgenerator key " + key, jmeter.containsKey(key));
+            assertFalse(jmeter.containsKey(key), "jmeter should not contain the reportgenerator key " + key);
         }
     }
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 6a64173910a..0f08f23de2f 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -17,9 +17,10 @@
 
 package org.apache.jmeter.save;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -86,8 +87,10 @@ public class TestSaveService extends JMeterTestCase {
     @Test
     public void testPROPVERSION() {
         assertEquals(
-                "Property Version mismatch, ensure you update SaveService#PROPVERSION field with _version property value from saveservice.properties",
-                SaveService.PROPVERSION, SaveService.getPropertyVersion());
+                SaveService.PROPVERSION,
+                SaveService.getPropertyVersion(),
+                "Property Version mismatch, ensure you update SaveService#PROPVERSION field with _version property value from saveservice.properties"
+        );
     }
 
     @Test
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java b/src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java
index 458f77da89f..4d0394d11c2 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java
@@ -17,7 +17,7 @@
 
 package org.apache.jorphan;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.config.gui.ArgumentsPanel;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -35,37 +35,37 @@ public class TestFunctorUsers extends JMeterTestCase {
     @Test
     @SuppressWarnings("deprecation")
     public void testSummaryReport() throws Exception {
-        assertTrue("SummaryReport Functor", SummaryReport.testFunctors());
+        assertTrue(SummaryReport.testFunctors(), "SummaryReport Functor");
     }
 
     @Test
     public void testTableVisualizer() throws Exception {
-        assertTrue("TableVisualizer Functor", TableVisualizer.testFunctors());
+        assertTrue(TableVisualizer.testFunctors(), "TableVisualizer Functor");
     }
 
     @Test
     public void testStatGraphVisualizer() throws Exception {
-        assertTrue("StatGraphVisualizer Functor", StatGraphVisualizer.testFunctors());
+        assertTrue(StatGraphVisualizer.testFunctors(), "StatGraphVisualizer Functor");
     }
 
     @Test
     @SuppressWarnings("deprecation")
     public void testStatVisualizer() throws Exception {
-        assertTrue("StatVisualizer Functor", StatVisualizer.testFunctors());
+        assertTrue(StatVisualizer.testFunctors(), "StatVisualizer Functor");
     }
 
     @Test
     public void testArgumentsPanel() throws Exception {
-        assertTrue("ArgumentsPanel Functor", ArgumentsPanel.testFunctors());
+        assertTrue(ArgumentsPanel.testFunctors(), "ArgumentsPanel Functor");
     }
 
     @Test
     public void testHTTPArgumentsPanel() throws Exception {
-        assertTrue("HTTPArgumentsPanel Functor", HTTPArgumentsPanel.testFunctors());
+        assertTrue(HTTPArgumentsPanel.testFunctors(), "HTTPArgumentsPanel Functor");
     }
 
     @Test
     public void testLDAPArgumentsPanel() throws Exception {
-        assertTrue("LDAPArgumentsPanel Functor", LDAPArgumentsPanel.testFunctors());
+        assertTrue(LDAPArgumentsPanel.testFunctors(), "LDAPArgumentsPanel Functor");
     }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
index a035d321422..182bfd1643a 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
@@ -17,17 +17,18 @@
 
 package org.apache.jorphan.reflect;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.jmeter.junit.JMeterTestUtils;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.logging.log4j.LoggingException;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -62,8 +63,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayTrue() throws Excep
                 libDirs,
                 new Class<?>[] { Object.class },
                 true);
-        Assert.assertFalse(
-                findClassesThatExtend.stream().filter(s -> s.contains("$")).collect(Collectors.toList()).isEmpty());
+        assertFalse(findClassesThatExtend.stream().noneMatch(s -> s.contains("$")));
     }
 
     @Test
@@ -73,8 +73,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayFalse() throws Exce
                 libDirs,
                 new Class<?>[] { Exception.class },
                 false);
-        Assert.assertTrue(
-                findClassesThatExtend.stream().filter(s -> s.contains("$")).collect(Collectors.toList()).isEmpty());
+        assertTrue(findClassesThatExtend.stream().noneMatch(s -> s.contains("$")));
         MatcherAssert.assertThat(findClassesThatExtend, CoreMatchers.hasItem(LoggingException.class.getName()));
     }
 
@@ -87,9 +86,8 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringString
                 false,
                 "org.apache.log",
                 "core");
-        Assert.assertTrue(
-                findClassesThatExtend.stream().filter(s -> s.contains("core")).collect(Collectors.toList()).isEmpty());
-        Assert.assertFalse(findClassesThatExtend.isEmpty());
+        assertTrue(findClassesThatExtend.stream().noneMatch(s -> s.contains("core")));
+        assertFalse(findClassesThatExtend.isEmpty());
     }
 
     @Test
@@ -102,7 +100,7 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayBooleanStringString
                 null,
                 null,
                 true);
-        Assert.assertFalse(annotatedClasses.isEmpty());
+        assertFalse(annotatedClasses.isEmpty());
     }
 
     @Test
@@ -111,7 +109,7 @@ public void testFindAnnotatedClasses() throws Exception {
         List<String> annotatedClasses = ClassFinder.findAnnotatedClasses(
                 libDirs,
                 new Class[] { java.beans.Transient.class});
-        Assert.assertFalse(annotatedClasses.isEmpty());
+        assertFalse(annotatedClasses.isEmpty());
     }
 
     @Test
@@ -119,21 +117,21 @@ public void testFindAnnotatedInnerClasses() throws Exception {
         @SuppressWarnings({"deprecation", "unchecked"})
         List<String> annotatedClasses = ClassFinder.findAnnotatedClasses(libDirs,
                 new Class[] { java.lang.Deprecated.class}, true);
-        Assert.assertTrue(annotatedClasses.stream().anyMatch(s->s.contains("$")));
+        assertTrue(annotatedClasses.stream().anyMatch(s->s.contains("$")));
     }
 
     @Test
     public void testFindClasses() throws IOException {
         @SuppressWarnings("deprecation")
         List<String> classes = ClassFinder.findClasses(libDirs, className -> true);
-        Assert.assertFalse(classes.isEmpty());
+        assertFalse(classes.isEmpty());
     }
 
     @Test
     public void testFindClassesNone() throws IOException {
         @SuppressWarnings("deprecation")
         List<String> classes = ClassFinder.findClasses(libDirs, className -> false);
-        Assert.assertTrue(classes.isEmpty());
+        assertTrue(classes.isEmpty());
     }
 
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java
index 3b4eba652b0..85c1bf458f4 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java
@@ -18,7 +18,7 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Collection;
 
@@ -54,7 +54,7 @@ public void evalTest1() throws Exception {
         parms = makeParams("${query}",null,null);
         eval.setParameters(parms);
         s = eval.execute(null,null);
-        assertEquals("select name from customers",s);
+        assertEquals("select name from customers", s);
     }
 
     @Test
@@ -69,6 +69,6 @@ public void evalTest2() throws Exception {
         parms = makeParams("query",null,null);
         evalVar.setParameters(parms);
         s = evalVar.execute(null,null);
-        assertEquals("select name from customers",s);
+        assertEquals("select name from customers", s);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
index ba9dd239b50..31178e14965 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
@@ -18,8 +18,9 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -30,7 +31,6 @@
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -70,9 +70,9 @@ public void randomStringTest1() throws Exception {
         Collection<CompoundVariable> parms = makeParams("10","abcdefghijklmnopqrstuvwxyz","VAR");
         r.setParameters(parms);
         String s = r.execute(null,null);
-        Assert.assertNotNull(s);
+        assertNotNull(s);
         assertEquals(10, s.length());
-        assertTrue("Random String contains unexpected character", stringOnlyContainsChars(s, "abcdefghijklmnopqrstuvwxyz"));
+        assertTrue(stringOnlyContainsChars(s, "abcdefghijklmnopqrstuvwxyz"), "Random String contains unexpected character");
 
         String varValue = JMeterContextService.getContext().getVariables().get("VAR");
         assertEquals(s, varValue);
@@ -80,7 +80,7 @@ public void randomStringTest1() throws Exception {
         parms = makeParams("5","", "VAR2");
         r.setParameters(parms);
         s = r.execute(null,null);
-        Assert.assertNotNull(s);
+        assertNotNull(s);
         assertEquals(5, s.length());
 
         varValue = JMeterContextService.getContext().getVariables().get("VAR2");
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java
index 07fbfe8a675..fb4663e0da4 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
@@ -31,6 +29,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.test.JMeterSerialTest;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -60,7 +59,7 @@ public void testNull() {
     public void testrowNum() throws Exception {
         FileRowColContainer f = new FileRowColContainer(findTestPath("testfiles/unit/TestFileRowColContainer.csv"));
         assertNotNull(f);
-        assertEquals("Expected 4 lines", 4, f.getSize());
+        assertEquals(4, f.getSize(), "Expected 4 lines");
 
         assertEquals(0, f.nextRow());
         assertEquals(1, f.nextRow());
@@ -73,7 +72,7 @@ public void testrowNum() throws Exception {
     public void testRowNumRelative() throws Exception {
         FileRowColContainer f = new FileRowColContainer("testfiles/unit/TestFileRowColContainer.csv");
         assertNotNull(f);
-        assertEquals("Expected 4 lines", 4, f.getSize());
+        assertEquals(4, f.getSize(), "Expected 4 lines");
 
         assertEquals(0, f.nextRow());
         assertEquals(1, f.nextRow());
@@ -86,7 +85,7 @@ public void testRowNumRelative() throws Exception {
     public void testColumns() throws Exception {
         FileRowColContainer f = new FileRowColContainer(findTestPath("testfiles/unit/TestFileRowColContainer.csv"));
         assertNotNull(f);
-        assertTrue("Not empty", f.getSize() > 0);
+        Assertions.assertTrue(f.getSize() > 0, "Not empty");
 
         int myRow = f.nextRow();
         assertEquals(0, myRow);
@@ -95,7 +94,7 @@ public void testColumns() throws Exception {
 
         try {
             f.getColumn(myRow, 4);
-            fail("Expected out of bounds");
+            Assertions.fail("Expected out of bounds");
         } catch (IndexOutOfBoundsException e) {
         }
         myRow = f.nextRow();
@@ -108,7 +107,7 @@ public void testColumns() throws Exception {
     public void testColumnsComma() throws Exception {
         FileRowColContainer f = new FileRowColContainer(findTestPath("testfiles/unit/TestFileRowColContainer.csv"), ",");
         assertNotNull(f);
-        assertTrue("Not empty", f.getSize() > 0);
+        Assertions.assertTrue(f.getSize() > 0, "Not empty");
 
         int myRow = f.nextRow();
         assertEquals(0, myRow);
@@ -117,7 +116,7 @@ public void testColumnsComma() throws Exception {
 
         try {
             f.getColumn(myRow, 4);
-            fail("Expected out of bounds");
+            Assertions.fail("Expected out of bounds");
         } catch (IndexOutOfBoundsException e) {
         }
         myRow = f.nextRow();
@@ -130,7 +129,7 @@ public void testColumnsComma() throws Exception {
     public void testColumnsTab() throws Exception {
         FileRowColContainer f = new FileRowColContainer(findTestPath("testfiles/test.tsv"), "\t");
         assertNotNull(f);
-        assertTrue("Not empty", f.getSize() > 0);
+        Assertions.assertTrue(f.getSize() > 0, "Not empty");
 
         int myRow = f.nextRow();
         assertEquals(0, myRow);
@@ -139,7 +138,7 @@ public void testColumnsTab() throws Exception {
 
         try {
             f.getColumn(myRow, 4);
-            fail("Expected out of bounds");
+            Assertions.fail("Expected out of bounds");
         } catch (IndexOutOfBoundsException e) {
         }
         myRow = f.nextRow();
@@ -152,7 +151,7 @@ public void testColumnsTab() throws Exception {
     public void testEmptyCols() throws Exception {
         FileRowColContainer f = new FileRowColContainer(findTestPath("testfiles/testempty.csv"));
         assertNotNull(f);
-        assertEquals("Expected 4 lines", 4, f.getSize());
+        assertEquals(4, f.getSize(), "Expected 4 lines");
 
         int myRow = f.nextRow();
         assertEquals(0, myRow);
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
index 634482ce1ae..cd287381b84 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java
@@ -17,7 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -30,7 +31,6 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -74,7 +74,7 @@ public void testRead() throws Exception {
         params.add(new CompoundVariable(file.getAbsolutePath()));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        Assert.assertTrue(returnValue.indexOf("language=")>0);
+        assertTrue(returnValue.indexOf("language=")>0);
     }
 
     @Test
@@ -84,7 +84,7 @@ public void testReadWithEncoding() throws Exception {
         params.add(new CompoundVariable("UTF-8"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        Assert.assertTrue(returnValue.indexOf("language=")>0);
+        assertTrue(returnValue.indexOf("language=")>0);
     }
 
     @Test
@@ -95,7 +95,7 @@ public void testReadWithEncodingAndVar() throws Exception {
         params.add(new CompoundVariable("MY_FILE_AS_TEXT"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        Assert.assertTrue(returnValue.indexOf("language=")>0);
-        Assert.assertTrue(vars.get("MY_FILE_AS_TEXT").indexOf("language=")>0);
+        assertTrue(returnValue.indexOf("language=")>0);
+        assertTrue(vars.get("MY_FILE_AS_TEXT").indexOf("language=")>0);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
index a8e5a28ec79..cca2e07061a 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
index 297fc902957..ffc8a2af07f 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
index 4fd7f19beea..0713711eb6d 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java
@@ -17,8 +17,9 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -30,7 +31,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -389,7 +389,7 @@ public void testExtractionIndexNotNumeric() throws Exception {
                 "",
                 "No Value Found");
         variable.setParameters(params);
-        Assertions.assertThrows(
+        assertThrows(
                 Exception.class,
                 () -> variable.execute(result, null));
     }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
index 7a1e714d81b..40f4200f733 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java
@@ -17,7 +17,8 @@
 
 package org.apache.jmeter.functions;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +31,6 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.test.JMeterSerialTest;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -78,7 +78,7 @@ public void testSetPropertyWithReturn() throws Exception {
         function.setParameters(params);
         String returnValue = function.execute(result, null);
         assertEquals("value1", JMeterUtils.getProperty("prop1"));
-        Assert.assertNull(returnValue);
+        assertNull(returnValue);
 
         params.clear();
         params.add(new CompoundVariable("prop1"));
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java
index 1fc45416608..9dfd907b046 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java
@@ -18,7 +18,7 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Collection;
 
@@ -56,46 +56,46 @@ public void variableTest1() throws Exception {
         parms = makeParams("V",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("A",s);
+        assertEquals("A", s);
 
         parms = makeParams("V","DEFAULT",null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("A",s);
+        assertEquals("A", s);
 
         parms = makeParams("EMPTY","DEFAULT",null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("DEFAULT",s);
+        assertEquals("DEFAULT", s);
 
         parms = makeParams("X",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("X",s);
+        assertEquals("X", s);
 
         parms = makeParams("A${X}",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("A${X}",s);
+        assertEquals("A${X}", s);
 
         parms = makeParams("A_1",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("a1",s);
+        assertEquals("a1", s);
 
         parms = makeParams("A_2",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("a2",s);
+        assertEquals("a2", s);
 
         parms = makeParams("A_${two}",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("a2",s);
+        assertEquals("a2", s);
 
         parms = makeParams("${V}_${one}",null,null);
         r.setParameters(parms);
         s = r.execute(null,null);
-        assertEquals("a1",s);
+        assertEquals("a1", s);
     }
 }
diff --git a/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java b/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
index a2a7548fb6e..3720bf1be91 100644
--- a/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
+++ b/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
@@ -17,9 +17,9 @@
 
 package org.apache.commons.cli.avalon;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.List;
 
@@ -120,11 +120,11 @@ public void testOptionalArgWithSpace() {
         final List<CLOption> clOptions = parser.getArguments();
         final int size = clOptions.size();
 
-        assertEquals("Option count", 3, size);
+        assertEquals(3, size, "Option count");
 
         final CLOption option0 = clOptions.get(0);
-        assertEquals("Option Code: " + option0.getDescriptor().getId(), TAINT_OPT, option0.getDescriptor().getId());
-        assertEquals("Option Arg: " + option0.getArgument(0), null, option0.getArgument(0));
+        assertEquals(TAINT_OPT, option0.getDescriptor().getId(), "Option Code: " + option0.getDescriptor().getId());
+        assertNull(option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(option1.getDescriptor().getId(), CLOption.TEXT_ARGUMENT);
@@ -132,7 +132,7 @@ public void testOptionalArgWithSpace() {
 
         final CLOption option2 = clOptions.get(2);
         assertEquals(option2.getDescriptor().getId(), ALL_OPT);
-        assertEquals(option2.getArgument(0), null);
+        assertNull(option2.getArgument(0));
     }
 
     @Test
@@ -149,11 +149,11 @@ public void testOptionalArgLong() {
         final List<CLOption> clOptions = parser.getArguments();
         final int size = clOptions.size();
 
-        assertEquals("Option count", 3, size);
+        assertEquals(3, size, "Option count");
 
         final CLOption option0 = clOptions.get(0);
-        assertEquals("Option Code: " + option0.getDescriptor().getId(), TAINT_OPT, option0.getDescriptor().getId());
-        assertEquals("Option Arg: " + option0.getArgument(0), null, option0.getArgument(0));
+        assertEquals(TAINT_OPT, option0.getDescriptor().getId(), "Option Code: " + option0.getDescriptor().getId());
+        assertNull(option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(CLOption.TEXT_ARGUMENT, option1.getDescriptor().getId());
@@ -161,7 +161,7 @@ public void testOptionalArgLong() {
 
         final CLOption option2 = clOptions.get(2);
         assertEquals(option2.getDescriptor().getId(), ALL_OPT);
-        assertEquals(option2.getArgument(0), null);
+        assertNull(option2.getArgument(0));
     }
 
     @Test
@@ -178,15 +178,15 @@ public void testOptionalArgLongEquals() {
         final List<CLOption> clOptions = parser.getArguments();
         final int size = clOptions.size();
 
-        assertEquals("Option count", 2, size);
+        assertEquals(2, size, "Option count");
 
         final CLOption option0 = clOptions.get(0);
-        assertEquals("Option Code: " + option0.getDescriptor().getId(), TAINT_OPT, option0.getDescriptor().getId());
-        assertEquals("Option Arg: " + option0.getArgument(0), "param", option0.getArgument(0));
+        assertEquals(TAINT_OPT, option0.getDescriptor().getId(), "Option Code: " + option0.getDescriptor().getId());
+        assertEquals("param", option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
 
         final CLOption option2 = clOptions.get(1);
         assertEquals(option2.getDescriptor().getId(), ALL_OPT);
-        assertEquals(option2.getArgument(0), null);
+        assertNull(option2.getArgument(0));
     }
 
     @Test
@@ -202,15 +202,15 @@ public void testShortOptArgUnenteredBeforeOtherOpt() {
         final List<CLOption> clOptions = parser.getArguments();
         final int size = clOptions.size();
 
-        assertEquals("Option count", 2, size);
+        assertEquals(2, size, "Option count");
 
         final CLOption option0 = clOptions.get(0);
-        assertEquals("Option Code: " + option0.getDescriptor().getId(), TAINT_OPT, option0.getDescriptor().getId());
-        assertEquals("Option Arg: " + option0.getArgument(0), null, option0.getArgument(0));
+        assertEquals(TAINT_OPT, option0.getDescriptor().getId(), "Option Code: " + option0.getDescriptor().getId());
+        assertNull(option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(option1.getDescriptor().getId(), ALL_OPT);
-        assertEquals(option1.getArgument(0), null);
+        assertNull(option1.getArgument(0));
     }
 
     @Test
@@ -234,7 +234,7 @@ public void testOptionalArgsWithArgShortBeforeOtherOpt() {
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(ALL_OPT, option1.getDescriptor().getId());
-        assertEquals(null, option1.getArgument(0));
+        assertNull(option1.getArgument(0));
     }
 
     @Test
@@ -258,7 +258,7 @@ public void testOptionalArgsWithArgShortEqualsBeforeOtherOpt() {
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(ALL_OPT, option1.getDescriptor().getId());
-        assertEquals(null, option1.getArgument(0));
+        assertNull(option1.getArgument(0));
     }
 
     @Test
@@ -278,11 +278,11 @@ public void testOptionalArgsNoArgShortBeforeOtherOpt() {
         assertEquals(size, 2);
         final CLOption option0 = clOptions.get(0);
         assertEquals(TAINT_OPT, option0.getDescriptor().getId());
-        assertEquals(null, option0.getArgument(0));
+        assertNull(option0.getArgument(0));
 
         final CLOption option1 = clOptions.get(1);
         assertEquals(ALL_OPT, option1.getDescriptor().getId());
-        assertEquals(null, option1.getArgument(0));
+        assertNull(option1.getArgument(0));
     }
 
     @Test
@@ -734,7 +734,7 @@ public boolean isFinished(final int lastOptionCode) {
         assertEquals(clOptions1.get(2).getDescriptor().getId(), ALL_OPT);
         assertEquals(clOptions1.get(3).getDescriptor().getId(), CLEAR1_OPT);
 
-        assertEquals("ler",parser1.getUnparsedArgs()[0]);
+        assertEquals("ler", parser1.getUnparsedArgs()[0]);
 
         final CLArgsParser parser2 = new CLArgsParser(parser1.getUnparsedArgs(), options2);
 
@@ -861,7 +861,7 @@ public void testNullLongForm() {
         assertEquals('n', optionByID.getDescriptor().getId());
 
         final CLOption optionByName = parser.getArgumentByName(FILE.getName());
-        assertNull("Looking for non-existent option by name", optionByName);
+        assertNull(optionByName, "Looking for non-existent option by name");
     }
 
     /**
@@ -884,7 +884,7 @@ public void testNullDescription() {
 
         final StringBuilder sb = CLUtil.describeOptions(options);
         final String lineSeparator = System.getProperty("line.separator");
-        assertEquals("Testing display of null description", "\t-n, --nulltest" + lineSeparator, sb.toString());
+        assertEquals("\t-n, --nulltest" + lineSeparator, sb.toString(), "Testing display of null description");
     }
 
     @Test
@@ -927,7 +927,7 @@ public void testCombinations() throws Exception {
     private void check(String[] args, String canon){
         final CLArgsParser parser = new CLArgsParser(args, OPTIONS);
 
-        assertNull(parser.getErrorString(),parser.getErrorString());
+        assertNull(parser.getErrorString(), parser.getErrorString());
 
         final List<CLOption> clOptions = parser.getArguments();
         final int size = clOptions.size();
@@ -938,7 +938,7 @@ private void check(String[] args, String canon){
             }
             sb.append(clOptions.get(i).toShortString());
         }
-        assertEquals("Canonical form ("+size+")",canon,sb.toString());
+        assertEquals(canon, sb.toString(), "Canonical form ("+size+")");
     }
     /*
      * TODO add tests to check for: - name clash - long option abbreviations
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java b/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
index 61e6daf18f2..fec95bc2c05 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
@@ -17,11 +17,11 @@
 
 package org.apache.jorphan.collections;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
index 5edb7294d62..22fb3d1cdbe 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
@@ -17,7 +17,7 @@
 
 package org.apache.jorphan.exec;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java
index 051f414bb11..cd9082f5115 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java
@@ -18,8 +18,8 @@
 package org.apache.jorphan.gui;
 
 import static java.lang.String.format;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -60,7 +60,7 @@ public EventAssertion add(ObjIntConsumer<TableModelEvent> assertion) {
          * @return <code>this</code>
          */
         public EventAssertion addInt(String name, int expected, ToIntFunction<TableModelEvent> f) {
-            return add((e,i) -> assertEquals(format("%s[%d]", name, i), expected, f.applyAsInt(e)));
+            return add((e,i) -> assertEquals(expected, f.applyAsInt(e), () -> format("%s[%d]", name, i)));
         }
 
         /**
@@ -69,7 +69,7 @@ public EventAssertion addInt(String name, int expected, ToIntFunction<TableModel
          * @return <code>this</code>
          */
         public EventAssertion source(Object expected) {
-            return add((e,i) -> assertSame(format("source[%d]",i), expected, e.getSource()));
+            return add((e,i) -> assertSame(expected, e.getSource(), () -> format("source[%d]",i)));
         }
 
         /**
@@ -149,12 +149,12 @@ public EventAssertion assertEvent() {
      */
     public void assertEvents(EventAssertion... assertions) {
         try {
-            assertEquals("event count", assertions.length, events.size());
-
             int i = 0;
             for (TableModelEvent event : events) {
                 assertions[i].assertEvent(event, i++);
             }
+
+            assertEquals(assertions.length, events.size(), "event count");
         } finally {
             events.clear();
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
index e31cebe27f0..16f8e25822f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.config;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
index 39f8eb1c0b5..2ac1c81d4a2 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -66,7 +66,7 @@ public void testSimpleConfig() {
     @Test
     public void testOverRide() {
         JMeterProperty jmp = partialConfig.getProperty(HTTPSamplerBase.DOMAIN);
-        assertTrue(jmp instanceof NullProperty);
+        assertInstanceOf(NullProperty.class, jmp);
         assertEquals(jmp, new NullProperty(HTTPSamplerBase.DOMAIN));
         partialConfig.addTestElement(defaultConfig);
         assertEquals(partialConfig.getPropertyAsString(HTTPSamplerBase.DOMAIN), "www.xerox.com");
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
index eee4a212572..6df391e3e70 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java
@@ -17,9 +17,8 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,18 +28,19 @@
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestAuthManager extends JMeterTestCase {
 
     @Test
     public void testHttp() throws Exception {
-        assertTrue(AuthManager.isSupportedProtocol(new URL("http:")));
+        Assertions.assertTrue(AuthManager.isSupportedProtocol(new URL("http:")));
     }
 
     @Test
     public void testHttps() throws Exception {
-        assertTrue(AuthManager.isSupportedProtocol(new URL("https:")));
+        Assertions.assertTrue(AuthManager.isSupportedProtocol(new URL("https:")));
     }
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
index 419fc83df2d..10e091850a6 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.lang.reflect.Field;
 import java.util.concurrent.ConcurrentHashMap;
@@ -65,22 +65,22 @@ public void testJmeterVariableAuthorizationWhenThreadIterationIsADifferentUser()
         Field authPrivateField = authManager.getClass().getDeclaredField("kerberosManager");
         authPrivateField.setAccessible(true);
         authPrivateField.set(authManager, kerberosManager);
-        assertNotNull("Before the iteration, the AuthManager shouldn't be cleared",subjects.get("test"));
+        assertNotNull(subjects.get("test"), "Before the iteration, the AuthManager shouldn't be cleared");
         authManager.setControlledByThread(false);
         authManager.setClearEachIteration(true);
         authManager.testIterationStart(null);
-        assertNull("After the iteration, the AuthManager should be cleared",subjects.get("test"));
+        assertNull(subjects.get("test"), "After the iteration, the AuthManager should be cleared");
         //Test button controlled by Thread
         kerberosManager=initKerberosManager();
         jmvars.putObject(SAME_USER, false);
         jmctx.setVariables(jmvars);
         authManager.setThreadContext(jmctx);
         authPrivateField.set(authManager, kerberosManager);
-        assertNotNull("Before the iteration, the AuthManager shouldn't be cleared",subjects.get("test"));
+        assertNotNull(subjects.get("test"), "Before the iteration, the AuthManager shouldn't be cleared");
         authManager.setControlledByThread(true);
         authManager.setClearEachIteration(false);
         authManager.testIterationStart(null);
-        assertNull("After the iteration, the AuthManager should be cleared",subjects.get("test"));
+        assertNull(subjects.get("test"), "After the iteration, the AuthManager should be cleared");
     }
 
     @Test
@@ -92,21 +92,21 @@ public void testJmeterVariableAuthorizationWhenThreadIterationIsASameUser()
         Field authPrivateField = authManager.getClass().getDeclaredField("kerberosManager");
         authPrivateField.setAccessible(true);
         authPrivateField.set(authManager, kerberosManager);
-        assertNotNull("Before the iteration, the AuthManager shouldn't be cleared", subjects.get("test"));
+        assertNotNull(subjects.get("test"), "Before the iteration, the AuthManager shouldn't be cleared");
         authManager.setControlledByThread(false);
         authManager.setClearEachIteration(false);
         authManager.testIterationStart(null);
-        assertNotNull("After the iteration, the AuthManager shouldn't be cleared", subjects.get("test"));
+        assertNotNull(subjects.get("test"), "After the iteration, the AuthManager shouldn't be cleared");
         // Test button controlled by Thread
         kerberosManager = initKerberosManager();
         jmvars.putObject(SAME_USER, true);
         jmctx.setVariables(jmvars);
         authManager.setThreadContext(jmctx);
         authPrivateField.set(authManager, kerberosManager);
-        assertNotNull("Before the iteration, the AuthManager shouldn't be cleared", subjects.get("test"));
+        assertNotNull(subjects.get("test"), "Before the iteration, the AuthManager shouldn't be cleared");
         authManager.setControlledByThread(true);
         authManager.setClearEachIteration(false);
         authManager.testIterationStart(null);
-        assertNotNull("After the iteration, the AuthManager shouldn't be cleared", subjects.get("test"));
+        assertNotNull(subjects.get("test"), "After the iteration, the AuthManager shouldn't be cleared");
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
index f8ca9a1b702..d2909b8c286 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
@@ -17,10 +17,10 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Field;
 import java.net.URISyntaxException;
@@ -309,19 +309,19 @@ protected CacheManager.CacheEntry getThreadCacheEntry(String url) throws Excepti
     public void testCacheControlCleared() throws Exception {
         this.cacheManager.setUseExpires(true);
         this.cacheManager.testIterationStart(null);
-        assertNull("Should not find entry", getThreadCacheEntry(LOCAL_HOST));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "Should not find entry");
         Header[] headers = new Header[1];
-        assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertFalse(this.cacheManager.inCache(url, headers), "Should not find valid entry");
         long start = System.currentTimeMillis();
         setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
-        assertNotNull("Before iternation, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("Before iternation, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Before iternation, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "Before iternation, should find valid entry");
         this.cacheManager.setClearEachIteration(true);
         this.cacheManager.testIterationStart(null);
-        assertNull("After iterantion, should not find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertFalse("After iterantion, should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "After iterantion, should not find entry");
+        assertFalse(this.cacheManager.inCache(url, headers), "After iterantion, should not find valid entry");
     }
 
     @Test
@@ -333,7 +333,7 @@ public void testJmeterVariableCacheWhenThreadIterationIsANewUser() {
         sampler.setCacheManager(cacheManager);
         sampler.setThreadContext(jmctx);
         boolean res = (boolean) cacheManager.getThreadContext().getVariables().getObject(SAME_USER);
-        assertTrue("When test different user on the different iternation, the cache should be cleared", res);
+        assertTrue(res, "When test different user on the different iternation, the cache should be cleared");
     }
 
     @Test
@@ -345,7 +345,7 @@ public void testJmeterVariableWhenThreadIterationIsSameUser() {
         sampler.setCacheManager(cacheManager);
         sampler.setThreadContext(jmctx);
         boolean res = (boolean) cacheManager.getThreadContext().getVariables().getObject(SAME_USER);
-        assertFalse("When test different user on the different iternation, the cache shouldn't be cleared", res);
+        assertFalse(res, "When test different user on the different iternation, the cache shouldn't be cleared");
     }
 
     @Test
@@ -355,20 +355,20 @@ public void testCacheManagerWhenThreadIterationIsANewUser() throws Exception {
         jmctx.setVariables(jmvars);
         this.cacheManager.setUseExpires(true);
         this.cacheManager.testIterationStart(null);
-        assertNull("Should not find entry", getThreadCacheEntry(LOCAL_HOST));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "Should not find entry");
         Header[] headers = new Header[1];
-        assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertFalse(this.cacheManager.inCache(url, headers), "Should not find valid entry");
         long start = System.currentTimeMillis();
         setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         this.cacheManager.setThreadContext(jmctx);
         this.cacheManager.setControlledByThread(true);
-        assertNotNull("Before iternation, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("Before iternation, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Before iternation, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "Before iternation, should find valid entry");
         this.cacheManager.testIterationStart(null);
-        assertNull("After iterantion, should not find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertFalse("After iterantion, should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "After iterantion, should not find entry");
+        assertFalse(this.cacheManager.inCache(url, headers), "After iterantion, should not find valid entry");
 
         //Controlled by cacheManager
         jmvars.putObject(SAME_USER, true);
@@ -378,13 +378,13 @@ public void testCacheManagerWhenThreadIterationIsANewUser() throws Exception {
         setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
-        assertNotNull("Before iternation, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("Before iternation, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Before iternation, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "Before iternation, should find valid entry");
         this.cacheManager.setControlledByThread(false);
         this.cacheManager.setClearEachIteration(true);
         this.cacheManager.testIterationStart(null);
-        assertNull("After iterantion, should not find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertFalse("After iterantion, should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "After iterantion, should not find entry");
+        assertFalse(this.cacheManager.inCache(url, headers), "After iterantion, should not find valid entry");
     }
 
     @Test
@@ -394,20 +394,20 @@ public void testCacheManagerWhenThreadIterationIsSameUser() throws Exception {
         jmctx.setVariables(jmvars);
         this.cacheManager.setUseExpires(true);
         this.cacheManager.testIterationStart(null);
-        assertNull("Should not find entry", getThreadCacheEntry(LOCAL_HOST));
+        assertNull(getThreadCacheEntry(LOCAL_HOST), "Should not find entry");
         Header[] headers = new Header[1];
-        assertFalse("Should not find valid entry", this.cacheManager.inCache(url, headers));
+        assertFalse(this.cacheManager.inCache(url, headers), "Should not find valid entry");
         long start = System.currentTimeMillis();
         setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
         this.cacheManager.setThreadContext(jmctx);
         this.cacheManager.setControlledByThread(true);
-        assertNotNull("Before iteration, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("Before iteration, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Before iteration, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "Before iteration, should find valid entry");
         this.cacheManager.testIterationStart(null);
-        assertNotNull("After iteration, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("After iteration, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "After iteration, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "After iteration, should find valid entry");
         // Controlled by cacheManager
         jmvars.putObject(SAME_USER, false);
         jmctx.setVariables(jmvars);
@@ -416,13 +416,13 @@ public void testCacheManagerWhenThreadIterationIsSameUser() throws Exception {
         setExpires(makeDate(Instant.ofEpochMilli(start)));
         setCacheControl("public, max-age=1");
         cacheResult(sampleResultOK);
-        assertNotNull("Before iteration, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("Before iteration, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "Before iteration, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "Before iteration, should find valid entry");
         this.cacheManager.setControlledByThread(false);
         this.cacheManager.setClearEachIteration(false);
         this.cacheManager.testIterationStart(null);
-        assertNotNull("After iteration, should find entry", getThreadCacheEntry(LOCAL_HOST));
-        assertTrue("After iteration, should find valid entry", this.cacheManager.inCache(url, headers));
+        assertNotNull(getThreadCacheEntry(LOCAL_HOST), "After iteration, should find entry");
+        assertTrue(this.cacheManager.inCache(url, headers), "After iteration, should find valid entry");
     }
 
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
index 3fd04d3c212..e92b7072825 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Field;
 
@@ -55,7 +55,7 @@ public void testJmeterVariableCookieWhenThreadIterationIsANewUser() {
         sampler.setCookieManager(cookieManager);
         sampler.setThreadContext(jmctx);
         boolean res = (boolean) cookieManager.getThreadContext().getVariables().getObject(SAME_USER);
-        assertTrue("When test different users on the different iternations, the cookie should be cleared", res);
+        assertTrue(res, "When test different users on the different iternations, the cookie should be cleared");
     }
 
     @Test
@@ -68,7 +68,7 @@ public void testJmeterVariableCookieWhenThreadIterationIsSameUser() {
         sampler.setCookieManager(cookieManager);
         sampler.setThreadContext(jmctx);
         boolean res = (boolean) cookieManager.getThreadContext().getVariables().getObject(SAME_USER);
-        assertFalse("When test same user on the different iternations, the cookie shouldn't be cleared", res);
+        assertFalse(res, "When test same user on the different iternations, the cookie shouldn't be cleared");
     }
 
     @Test
@@ -92,15 +92,23 @@ public void testCookieManagerWhenThreadIterationIsNewUser() throws NoSuchFieldEx
         cookieManagerStatic.getCookies().addItem(cookieStatic);
         CollectionProperty initialCookies = cookieManagerStatic.getCookies();
         privateStringField.set(cookieManagerDynamic, initialCookies);
-        assertTrue("Before the iteration,the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
-        assertEquals("Before the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "Before the iteration,the quantity of cookies should be 1");
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "Before the iteration, the value of cookie should be what user have set");
         cookieManagerDynamic.testIterationStart(null);
-        assertEquals("After the iteration, the value of cookie should be the initial cookies", STATIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("After the iteration, the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                STATIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "After the iteration, the value of cookie should be the initial cookies");
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "After the iteration, the quantity of cookies should be 1");
         // Controlled by CookieManager
         jmvars.putObject(SAME_USER, true);
         jmctx.setVariables(jmvars);
@@ -115,15 +123,23 @@ public void testCookieManagerWhenThreadIterationIsNewUser() throws NoSuchFieldEx
         cookieManagerStatic.getCookies().addItem(cookieStatic);
         initialCookies = cookieManagerStatic.getCookies();
         privateStringField.set(cookieManagerDynamic, initialCookies);
-        assertEquals("Before the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("Before the iteration,the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "Before the iteration, the value of cookie should be what user have set");
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "Before the iteration,the quantity of cookies should be 1");
         cookieManagerDynamic.testIterationStart(null);
-        assertEquals("After the iteration, the value of cookie should be the initial cookies", STATIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("After the iteration, the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                STATIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "After the iteration, the value of cookie should be the initial cookies");
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "After the iteration, the quantity of cookies should be 1");
     }
 
     @Test
@@ -147,15 +163,23 @@ public void testCookieManagerWhenThreadIterationIsSameUser() throws NoSuchFieldE
         cookieManagerStatic.getCookies().addItem(cookieStatic);
         CollectionProperty initialCookies = cookieManagerStatic.getCookies();
         privateStringField.set(cookieManagerDynamic, initialCookies);
-        assertTrue("Before the iteration,the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
-        assertEquals("Before the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "Before the iteration,the quantity of cookies should be 1");
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "Before the iteration, the value of cookie should be what user have set");
         cookieManagerDynamic.testIterationStart(null);
-        assertEquals("After the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("After the iteration, the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "After the iteration, the value of cookie should be what user have set");
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "After the iteration, the quantity of cookies should be 1");
 
         // Controlled by CookieManager
         jmvars.putObject(SAME_USER, false);
@@ -169,14 +193,19 @@ public void testCookieManagerWhenThreadIterationIsSameUser() throws NoSuchFieldE
         cookieManagerStatic.getCookies().clear();
         cookieStatic.setName(STATIC_COOKIE);
         privateStringField.set(cookieManagerDynamic, initialCookies);
-        assertEquals("Before the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("Before the iteration,the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "Before the iteration, the value of cookie should be what user have set");
+        assertEquals(
+                1,
+                cookieManagerDynamic.getCookies().size(),
+                "Before the iteration,the quantity of cookies should be 1");
         cookieManagerDynamic.testIterationStart(null);
-        assertEquals("After the iteration, the value of cookie should be what user have set", DYNAMIC_COOKIE,
-                cookieManagerDynamic.getCookies().get(0).getName());
-        assertTrue("After the iteration, the quantity of cookies should be 1",
-                cookieManagerDynamic.getCookies().size() == 1);
+        assertEquals(
+                DYNAMIC_COOKIE,
+                cookieManagerDynamic.getCookies().get(0).getName(),
+                "After the iteration, the value of cookie should be what user have set");
+        assertEquals(1, cookieManagerDynamic.getCookies().size(), "After the iteration, the quantity of cookies should be 1");
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
index 0d445cf9b74..8b242540a47 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URL;
 import java.util.List;
@@ -113,7 +112,7 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
         URL url = new URL("https://subdomain.bt.com/page");
         String headerLine = "SMTRYNO=1; path=/; domain=.bt.com";
         man.addCookieFromHeader(headerLine, url);
-        Assertions.assertEquals(1, man.getCookieCount());
+        assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
@@ -121,8 +120,8 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
 
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assertions.assertEquals("bt.com", cookie.getDomain());
-            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            assertEquals("bt.com", cookie.getDomain());
+            assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
 
         // we check that CookieManager returns the cookies for the main domain
@@ -130,11 +129,11 @@ public void testAddCookieFromHeaderWithWildcard() throws Exception {
         cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlMainDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assertions.assertEquals(1, cookies.size());
+        assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assertions.assertEquals("bt.com", cookie.getDomain());
-            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            assertEquals("bt.com", cookie.getDomain());
+            assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
     }
 
@@ -143,15 +142,15 @@ public void testAddCookieFromHeaderWithNoWildcard() throws Exception {
         URL url = new URL("https://subdomain.bt.com/page");
         String headerLine = "SMTRYNO=1; path=/";
         man.addCookieFromHeader(headerLine, url);
-        Assertions.assertEquals(1, man.getCookieCount());
+        assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assertions.assertEquals(1, cookies.size());
+        assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assertions.assertEquals("subdomain.bt.com", cookie.getDomain());
+            assertEquals("subdomain.bt.com", cookie.getDomain());
             Assertions.assertFalse(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
 
@@ -160,7 +159,7 @@ public void testAddCookieFromHeaderWithNoWildcard() throws Exception {
         cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlMainDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assertions.assertEquals(0, cookies.size());
+        assertEquals(0, cookies.size());
     }
 
     @Test
@@ -169,18 +168,18 @@ public void testAddCookieFromHeaderWithWildcard2() throws Exception {
         String headerLine = "SMTRYNO=1; path=/; domain=.bt.com";
         man.addCookieFromHeader(headerLine, url);
 
-        Assertions.assertEquals(1, man.getCookieCount());
+        assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         URL urlSubDomain = new URL("https://subdomain.bt.com/page");
 
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlSubDomain,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assertions.assertEquals(1, cookies.size());
+        assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assertions.assertEquals("bt.com", cookie.getDomain());
-            Assertions.assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
+            assertEquals("bt.com", cookie.getDomain());
+            assertTrue(((BasicClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR));
         }
     }
 
@@ -191,18 +190,18 @@ public void testBug56358() throws Exception {
         man.setCookiePolicy(CookieSpecs.STANDARD);
         man.addCookieFromHeader(headerLine, url);
 
-        Assertions.assertEquals(1, man.getCookieCount());
+        assertEquals(1, man.getCookieCount());
         HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
         URL urlSameDomainDifferentPort = new URL("http://remote.com:10001/test/me");
 
         List<org.apache.http.cookie.Cookie> cookies =
                 cookieHandler.getCookiesForUrl(man.getCookies(), urlSameDomainDifferentPort,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
-        Assertions.assertEquals(1, cookies.size());
+        assertEquals(1, cookies.size());
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             // See http://tools.ietf.org/html/rfc6265#section-5.2.3
-            Assertions.assertEquals("remote.com", cookie.getDomain());
-            Assertions.assertEquals("test", cookie.getName());
+            assertEquals("remote.com", cookie.getDomain());
+            assertEquals("test", cookie.getName());
         }
     }
 
@@ -493,7 +492,7 @@ public void testCookieOrdering2() throws Exception {
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
         assertEquals("/sub1", c.get(0).getPath());
-        assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
+        Assertions.assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/sub1", c.get(1).getPath());
         assertTrue(((BasicClientCookie) c.get(1)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/", c.get(2).getPath());
@@ -520,7 +519,7 @@ public void testCookiePolicy2109() throws Exception {
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
         assertEquals("/sub1", c.get(0).getPath());
-        assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
+        Assertions.assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/sub1", c.get(1).getPath());
         assertTrue(((BasicClientCookie) c.get(1)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/", c.get(2).getPath());
@@ -548,7 +547,7 @@ public void testCookiePolicyNetscape() throws Exception {
                 cookieHandler.getCookiesForUrl(man.getCookies(), url,
                         CookieManager.ALLOW_VARIABLE_COOKIES);
         assertEquals("/sub1", c.get(0).getPath());
-        assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
+        Assertions.assertFalse(((BasicClientCookie) c.get(0)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/sub1", c.get(1).getPath());
         assertTrue(((BasicClientCookie) c.get(1)).containsAttribute(ClientCookie.PATH_ATTR));
         assertEquals("/", c.get(2).getPath());
@@ -610,7 +609,7 @@ public void testLoad() throws Exception {
         assertEquals("value2", man.get(num).getValue());
         assertEquals("/", man.get(num).getPath());
         assertEquals("", man.get(num).getDomain());
-        assertFalse(man.get(num).getSecure());
+        Assertions.assertFalse(man.get(num).getSecure());
         assertEquals(0, man.get(num).getExpires());
 
         num++;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
index c5489bf597d..513bf0d3b0d 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.protocol.http.control.gui;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.jmeter.junit.categories.NeedGuiTests;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
 import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -42,8 +41,6 @@ public void testCloneSampler() throws Exception {
         HTTPSamplerBase clonedSampler = (HTTPSamplerBase) sampler.clone();
         clonedSampler.setRunningVersion(true);
         sampler.getArguments().getArgument(0).setValue("new value");
-        assertEquals("Sampler didn't clone correctly",
-                "new value",
-                sampler.getArguments().getArgument(0).getValue());
+        Assertions.assertEquals("new value", sampler.getArguments().getArgument(0).getValue(), "Sampler didn't clone correctly");
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
index 5221b78f329..d16801ba5ed 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
@@ -17,9 +17,7 @@
 
 package org.apache.jmeter.protocol.http.modifier;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -37,6 +35,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.io.TextFile;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -179,7 +178,7 @@ public void testSimpleParse2() throws Exception {
         jmctx.setPreviousResult(result);
         parser.process();
         String newUrl = config.getUrl().toString();
-        assertTrue("http://www.apache.org/index.html".equals(newUrl)
+        Assertions.assertTrue("http://www.apache.org/index.html".equals(newUrl)
                 || "http://www.apache.org/subdir/lowerdir/index.html".equals(newUrl));
     }
 
@@ -288,7 +287,7 @@ public void testFailSimpleParse2() throws Exception {
         jmctx.setPreviousResult(result);
         parser.process();
         String newUrl = config.getUrl().toString();
-        assertNotEquals("http://www.apache.org/home/index.html?param1=value1", newUrl);
+        Assertions.assertNotEquals("http://www.apache.org/home/index.html?param1=value1", newUrl);
         assertEquals(config.getUrl().toString(), newUrl);
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
index 0ae4171c231..3b29a07d800 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.modifier;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
@@ -274,8 +274,7 @@ public void testGrabSessionIdFromForm() throws Exception {
             context.setPreviousResult(response);
             newMod.process();
             Arguments args = sampler.getArguments();
-            assertEquals("For case i=" + i, "myId",
-                    ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
+            assertEquals("myId", ((Argument) args.getArguments().get(0).getObjectValue()).getValue(), "For case i=" + i);
         }
     }
 
@@ -315,8 +314,7 @@ public void testCache() throws Exception {
             context.setPreviousResult(response);
             newMod.process();
             Arguments args = sampler.getArguments();
-            assertEquals("For case i=" + i, "myId",
-                    ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
+            assertEquals("myId", ((Argument) args.getArguments().get(0).getObjectValue()).getValue(), "For case i=" + i);
         }
     }
 
@@ -339,8 +337,7 @@ public void testNoCache() throws Exception {
             context.setPreviousResult(response);
             newMod.process();
             Arguments args = sampler.getArguments();
-            assertEquals("For case i=" + i, html[i * 2 + 1],
-                    ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
+            assertEquals(html[i * 2 + 1], ((Argument) args.getArguments().get(0).getObjectValue()).getValue(), "For case i=" + i);
         }
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java
index e6ec9cd0a73..e0df52786b7 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.parser;
 
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import org.junit.jupiter.api.Test;
 
@@ -26,16 +26,12 @@ public class TestBaseParser {
 
     @Test
     public void testReusableCache() throws Exception {
-        assertSame(
-                BaseParser.getParser(ReusableParser.class.getCanonicalName()),
-                BaseParser.getParser(ReusableParser.class.getCanonicalName()));
+        assertSame(BaseParser.getParser(ReusableParser.class.getCanonicalName()), BaseParser.getParser(ReusableParser.class.getCanonicalName()));
     }
 
     @Test
     public void testNotReusableCache() throws Exception {
-        assertNotSame(
-                BaseParser.getParser(NotReusableParser.class.getCanonicalName()),
-                BaseParser.getParser(NotReusableParser.class.getCanonicalName()));
+        assertNotSame(BaseParser.getParser(NotReusableParser.class.getCanonicalName()), BaseParser.getParser(NotReusableParser.class.getCanonicalName()));
     }
 
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java
index 2a5e85e5503..386704698fa 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.parser;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.junit.JMeterTestCase;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index c0b1326b76e..3c5a6852b70 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -219,11 +219,8 @@ private void testEncodedArguments(String url) throws Exception {
         String actualQueryString = s.getQueryString();
         String alternativeExpectedQueryString = queryString.replaceAll("%20", "+");
         if (!queryString.equals(actualQueryString) && !alternativeExpectedQueryString.equals(actualQueryString)) {
-            assertEquals(
-                    "%20 is the same as +, so expecting either " +
-                            queryString + " or " + alternativeExpectedQueryString,
-                    queryString,
-                    actualQueryString);
+            assertEquals(queryString, actualQueryString, "%20 is the same as +, so expecting either " +
+                    queryString + " or " + alternativeExpectedQueryString);
         }
         assertEquals("UTF-8", s.getContentEncoding());
 
@@ -269,11 +266,8 @@ private void testEncodedArguments(String url) throws Exception {
         assertEquals(HTTPConstants.POST, s.getMethod());
         alternativeExpectedQueryString = expectedQueryString.replaceAll("%20", "+");
         if (!queryString.equals(actualQueryString) && !alternativeExpectedQueryString.equals(actualQueryString)) {
-            assertEquals(
-                    "%20 is the same as +, so expecting either " +
-                            queryString + " or " + alternativeExpectedQueryString,
-                    queryString,
-                    actualQueryString);
+            assertEquals(queryString, actualQueryString, "%20 is the same as +, so expecting either " +
+                    queryString + " or " + alternativeExpectedQueryString);
         }
         assertEquals("UTF-8", s.getContentEncoding());
         assertFalse(s.getDoMultipart());
@@ -334,7 +328,7 @@ private void testGetRequestEncodings(String url) throws Exception {
         // know the encoding for the page
         HTTPSamplerBase s = getSamplerForRequest(null, testGetRequest, null);
         assertEquals(HTTPConstants.GET, s.getMethod());
-        assertEquals("Default content encoding is UTF-8", "UTF-8", s.getContentEncoding());
+        assertEquals("UTF-8", s.getContentEncoding(), "Default content encoding is UTF-8");
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(2, arguments.getArgumentCount());
@@ -400,7 +394,7 @@ public void testPostRequestEncodings() throws Exception {
         // know the encoding for the page
         HTTPSamplerBase s = getSamplerForRequest(null, testPostRequest, null);
         assertEquals(HTTPConstants.POST, s.getMethod());
-        assertEquals("Default content encoding is UTF-8", "UTF-8", s.getContentEncoding());
+        assertEquals("UTF-8", s.getContentEncoding(), "Default content encoding is UTF-8");
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(2, arguments.getArgumentCount());
@@ -549,8 +543,8 @@ public void testParse1() throws Exception {// no space after :
         Header header;
         mgr.getHeaders();
         header = mgr.getHeader(0);
-        assertEquals("name",header.getName());
-        assertEquals("value",header.getValue());
+        assertEquals("name", header.getName());
+        assertEquals("value", header.getValue());
     }
 
 
@@ -564,8 +558,8 @@ public void testParse2() throws Exception {// spaces after :
         Header header;
         mgr.getHeaders();
         header = mgr.getHeader(0);
-        assertEquals("name",header.getName());
-        assertEquals("value",header.getValue());
+        assertEquals("name", header.getName());
+        assertEquals("value", header.getValue());
     }
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
index 586455b1173..f94689228e7 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.protocol.http.sampler.HTTPNullSampler;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
@@ -43,21 +43,21 @@ public void setUp() {
     public void testFilter1() throws Exception {
         sampler.setDomain("jakarta.org");
         sampler.setPath("index.jsp");
-        assertTrue("Should find jakarta.org/index.jsp", control.filterUrl(sampler));
+        assertTrue(control.filterUrl(sampler), "Should find jakarta.org/index.jsp");
     }
 
     @Test
     public void testFilter2() throws Exception {
         sampler.setPath("index.jsp");
         sampler.setDomain("www.apache.org");
-        assertFalse("Should not match www.apache.org", control.filterUrl(sampler));
+        assertFalse(control.filterUrl(sampler), "Should not match www.apache.org");
     }
 
     @Test
     public void testFilter3() throws Exception {
         sampler.setPath("header.gif");
         sampler.setDomain("jakarta.org");
-        assertFalse("Should not match header.gif", control.filterUrl(sampler));
+        assertFalse(control.filterUrl(sampler), "Should not match header.gif");
     }
 
     @Test
@@ -68,33 +68,33 @@ public void testContentTypeNoFilters() throws Exception {
         control.setContentTypeExclude(null);
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("image/png");
-        assertTrue("Should allow image/png", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow image/png");
 
         // Empty filters
         control.setContentTypeInclude("");
         control.setContentTypeExclude("");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("image/png");
-        assertTrue("Should allow image/png", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow image/png");
 
         // Non empty filters
         control.setContentTypeInclude(" ");
         control.setContentTypeExclude(" ");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertFalse("Should not allow text/html", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow text/html");
         result.setContentType("image/png");
-        assertFalse("Should not allow image/png", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow image/png");
     }
 
     @Test
@@ -103,11 +103,11 @@ public void testContentTypeInclude() throws Exception {
         control.setContentTypeInclude("text/html|text/ascii");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("text/css");
-        assertFalse("Should not allow text/css", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow text/css");
     }
 
     @Test
@@ -116,11 +116,11 @@ public void testContentTypeExclude() throws Exception {
         control.setContentTypeExclude("text/css");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("text/css");
-        assertFalse("Should not allow text/css", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow text/css");
     }
 
     @Test
@@ -131,25 +131,25 @@ public void testContentTypeIncludeAndExclude() throws Exception {
         control.setContentTypeExclude("text/css");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("text/css");
-        assertFalse("Should not allow text/css", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow text/css");
         result.setContentType("image/png");
-        assertFalse("Should not allow image/png", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow image/png");
 
         // Allow all but images
         control.setContentTypeInclude(null);
         control.setContentTypeExclude("image/.*");
 
         result.setContentType(null);
-        assertTrue("Should allow if no content-type present", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow if no content-type present");
         result.setContentType("text/html; charset=utf-8");
-        assertTrue("Should allow text/html", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/html");
         result.setContentType("text/css");
-        assertTrue("Should allow text/css", control.filterContentType(result));
+        assertTrue(control.filterContentType(result), "Should allow text/css");
         result.setContentType("image/png");
-        assertFalse("Should not allow image/png", control.filterContentType(result));
+        assertFalse(control.filterContentType(result), "Should not allow image/png");
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
index c13a5900662..45f7cecefa9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.junit.categories.NeedGuiTests;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
index cae9635384e..bd5b36bceb3 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java
index 1c948c19747..207c1a3a730 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URLConnection;
 
@@ -37,8 +37,7 @@ public void testSetHeadersWithNoParams() throws Exception {
                 "mime1") });
         PutWriter pw = new PutWriter();
         pw.setHeaders(uc, sampler);
-        assertEquals("mime1",
-                uc.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
+        assertEquals("mime1", uc.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
     }
 
     @Test
@@ -52,7 +51,6 @@ public void testSetHeadersWithParams() throws Exception {
         sampler.setArguments(arguments);
         PutWriter pw = new PutWriter();
         pw.setHeaders(uc, sampler);
-        assertEquals("mime2",
-                uc.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
+        assertEquals("mime2", uc.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
index 26d5916da52..5d0fb9f244a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
@@ -17,7 +17,8 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.stream.Stream;
 
@@ -26,7 +27,6 @@
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jorphan.test.JMeterSerialTest;
 import org.junit.Ignore;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -47,18 +47,17 @@ private static Stream<Arguments> getImplementations() {
     void testBug63364(String implementation) {
         TestPlan plan = new TestPlan();
         SampleResult[] subResults = doSample(implementation);
-        Assertions.assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
+        assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
         for (int i = 0; i < subResults.length; i++) {
-            assertEquals("Expected sample label to be " + LABEL + "-" + i, LABEL + "-" + i,
-                    subResults[i].getSampleLabel());
+            assertEquals(LABEL + "-" + i, subResults[i].getSampleLabel(), "Expected sample label to be " + LABEL + "-" + i);
         }
         final boolean prevValue = TestPlan.getFunctionalMode();
         plan.setFunctionalMode(true);
         try {
             subResults = doSample(implementation);
-            Assertions.assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
+            assertTrue(subResults.length > 0, "We should have at least one sample result, we had none");
             for (SampleResult subResult : subResults) {
-                Assertions.assertTrue(subResult.getSampleLabel().startsWith(JMETER_HOME_PAGE), "Expected sample label to start with " + JMETER_HOME_PAGE);
+                assertTrue(subResult.getSampleLabel().startsWith(JMETER_HOME_PAGE), "Expected sample label to start with " + JMETER_HOME_PAGE);
             }
         } finally {
             plan.setFunctionalMode(prevValue);
@@ -80,7 +79,7 @@ private SampleResult[] doSample(String implementation) {
         // We intentionally keep only resources which start with JMETER_HOME_PAGE
         httpSamplerProxy.setEmbeddedUrlRE(JMETER_HOME_PAGE + ".*");
         SampleResult result = httpSamplerProxy.sample();
-        assertEquals("Expected sample label to be " + LABEL, LABEL, result.getSampleLabel());
+        assertEquals(LABEL, result.getSampleLabel(), "Expected sample label to be " + LABEL);
         return result.getSubResults();
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
index 5194852e238..315806d1b87 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
@@ -17,8 +17,6 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
@@ -33,6 +31,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -61,7 +60,7 @@ void testParameterWithMimeTypeWithCharset() throws Exception {
         sampler.getArguments().addArgument(argument);
         HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
         String requestData = hc.setupHttpEntityEnclosingRequestData(post);
-        assertTrue(requestData.contains("charset=utf-8"));
+        Assertions.assertTrue(requestData.contains("charset=utf-8"));
     }
 
     @Test
@@ -76,7 +75,7 @@ void testParameterWithMultipartAndExplicitHeader() throws Exception {
         HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
         String requestData = hc.setupHttpEntityEnclosingRequestData(post);
         assertEquals(0, post.getHeaders(HTTPConstants.HEADER_CONTENT_TYPE).length);
-        assertTrue(requestData.contains("charset=utf-8"));
+        Assertions.assertTrue(requestData.contains("charset=utf-8"));
     }
 
     @Test
@@ -95,7 +94,7 @@ void testFileargWithMimeTypeWithCharset() throws Exception {
         sampler.setHTTPFiles(Collections.singletonList(fileArg).toArray(new HTTPFileArg[1]));
         HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
         String requestData = hc.setupHttpEntityEnclosingRequestData(post);
-        assertTrue(requestData.contains("charset=utf-8"));
+        Assertions.assertTrue(requestData.contains("charset=utf-8"));
     }
 
     @Test
@@ -106,7 +105,7 @@ public void testNotifyFirstSampleAfterLoopRestartWhenThreadIterationIsSameUser()
         sampler.setThreadContext(jmctx);
         HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
         hc.notifyFirstSampleAfterLoopRestart();
-        assertFalse("User is the same, the state shouldn't be reset", HTTPHC4Impl.resetStateOnThreadGroupIteration.get());
+        Assertions.assertFalse(HTTPHC4Impl.resetStateOnThreadGroupIteration.get(), "User is the same, the state shouldn't be reset");
     }
 
     @Test
@@ -117,6 +116,6 @@ public void testNotifyFirstSampleAfterLoopRestartWhenThreadIterationIsANewUser()
         sampler.setThreadContext(jmctx);
         HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
         hc.notifyFirstSampleAfterLoopRestart();
-        assertTrue("Users are different, the state should be reset", HTTPHC4Impl.resetStateOnThreadGroupIteration.get());
+        Assertions.assertTrue(HTTPHC4Impl.resetStateOnThreadGroupIteration.get(), "Users are different, the state should be reset");
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
index 1caacb790c5..482b24557af 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java
index 7dfde4cee29..113132fa72c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java
@@ -17,10 +17,6 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -28,6 +24,7 @@
 
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestHttpWebdav {
@@ -41,12 +38,10 @@ public class TestHttpWebdav {
     @Test
     public void testIsWebdavMethod() {
         for (String method : VALID_METHODS) {
-            assertTrue(method + " is a HttpWebdav method",
-                    HttpWebdav.isWebdavMethod(method));
+            Assertions.assertTrue(HttpWebdav.isWebdavMethod(method), method + " is a HttpWebdav method");
         }
         for (String method : INVALID_METHODS) {
-            assertFalse(method + " is not a HttpWebdav method",
-                    HttpWebdav.isWebdavMethod(method));
+            Assertions.assertFalse(HttpWebdav.isWebdavMethod(method), method + " is not a HttpWebdav method");
         }
     }
 
@@ -55,7 +50,7 @@ public void testGetMethod() throws URISyntaxException {
         for (String method : VALID_METHODS) {
             HttpRequestBase request = new HttpWebdav(method, new URI(
                     "http://example.com"));
-            assertEquals(method, request.getMethod());
+            Assertions.assertEquals(method, request.getMethod());
         }
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
index 1e503690c6d..1c944e8f8d0 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.testelement.property.CollectionProperty;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java
index 849926676e4..9b535b36eba 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
@@ -26,21 +26,21 @@ public class TestHTTPFileArg {
     @Test
     public void testConstructors() throws Exception {
         HTTPFileArg file = new HTTPFileArg();
-        assertEquals("no parameter failure", "", file.getPath());
-        assertEquals("no parameter failure", "", file.getParamName());
-        assertEquals("no parameter failure", "", file.getMimeType());
+        assertEquals("", file.getPath(), "no parameter failure");
+        assertEquals("", file.getParamName(), "no parameter failure");
+        assertEquals("", file.getMimeType(), "no parameter failure");
         file = new HTTPFileArg("path");
-        assertEquals("single parameter failure", "path", file.getPath());
-        assertEquals("single parameter failure", "", file.getParamName());
-        assertEquals("single parameter failure", "application/octet-stream", file.getMimeType());
+        assertEquals("path", file.getPath(), "single parameter failure");
+        assertEquals("", file.getParamName(), "single parameter failure");
+        assertEquals("application/octet-stream", file.getMimeType(), "single parameter failure");
         file = new HTTPFileArg("path", "param", "mimetype");
-        assertEquals("three parameter failure", "path", file.getPath());
-        assertEquals("three parameter failure", "param", file.getParamName());
-        assertEquals("three parameter failure", "mimetype", file.getMimeType());
+        assertEquals("path", file.getPath(), "three parameter failure");
+        assertEquals("param", file.getParamName(), "three parameter failure");
+        assertEquals("mimetype", file.getMimeType(), "three parameter failure");
         HTTPFileArg file2 = new HTTPFileArg(file);
-        assertEquals("copy constructor failure", "path", file2.getPath());
-        assertEquals("copy constructor failure", "param", file2.getParamName());
-        assertEquals("copy constructor failure", "mimetype", file2.getMimeType());
+        assertEquals("path", file2.getPath(), "copy constructor failure");
+        assertEquals("param", file2.getParamName(), "copy constructor failure");
+        assertEquals("mimetype", file2.getMimeType(), "copy constructor failure");
     }
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
index fb8c4ec254f..c2b91869059 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -118,7 +118,6 @@ public void testToString() throws Exception {
         files.addHTTPFileArg("file3.jar");
         assertEquals("path:'file1'|param:''|mimetype:'application/octet-stream'\n"
                     +"path:'file2.jpg'|param:''|mimetype:'image/jpeg'\n"
-                    +"path:'file3.jar'|param:''|mimetype:'application/java-archive'",
-                    files.toString());
+                    +"path:'file3.jar'|param:''|mimetype:'application/java-archive'", files.toString());
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
index bd7c52a3e10..30f63346df4 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
@@ -17,11 +17,11 @@
 
 package org.apache.jmeter.protocol.http.util.accesslog;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.junit.JMeterTestCase;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -86,7 +86,7 @@ public void setUp() {
     public void testReplaceExtension() {
         testf.setReplaceExtension("html", "jsp");
         testf.isFiltered(TESTSTR, null);// set the required variables
-        assertEquals(TESTSTROUT, testf.filter(TESTSTR));
+        Assertions.assertEquals(TESTSTROUT, testf.filter(TESTSTR));
     }
 
     @Test
@@ -99,9 +99,9 @@ public void testExcludeFiles() {
             testf.isFiltered(theFile, null);
             String line = testf.filter(theFile);
             if (line != null) {
-                assertTrue("Expect to accept " + theFile, expect);
+                assertTrue(expect, "Expect to accept " + theFile);
             } else {
-                assertFalse("Expect to reject " + theFile, expect);
+                assertFalse(expect, "Expect to reject " + theFile);
             }
         }
     }
@@ -116,9 +116,9 @@ public void testIncludeFiles() {
             testf.isFiltered(theFile, null);
             String line = testf.filter(theFile);
             if (line != null) {
-                assertTrue("Expect to accept " + theFile, expect);
+                assertTrue(expect, "Expect to accept " + theFile);
             } else {
-                assertFalse("Expect to reject " + theFile, expect);
+                assertFalse(expect, "Expect to reject " + theFile);
             }
         }
     }
@@ -133,9 +133,9 @@ public void testExcludePattern() {
             assertPrimitiveEquals(!expect, testf.isFiltered(theFile, null));
             String line = testf.filter(theFile);
             if (line != null) {
-                assertTrue("Expect to accept " + theFile, expect);
+                assertTrue(expect, "Expect to accept " + theFile);
             } else {
-                assertFalse("Expect to reject " + theFile, expect);
+                assertFalse(expect, "Expect to reject " + theFile);
             }
         }
     }
@@ -150,9 +150,9 @@ public void testIncludePattern() {
             assertPrimitiveEquals(!expect, testf.isFiltered(theFile, null));
             String line = testf.filter(theFile);
             if (line != null) {
-                assertTrue("Expect to accept " + theFile, expect);
+                assertTrue(expect, "Expect to accept " + theFile);
             } else {
-                assertFalse("Expect to reject " + theFile, expect);
+                assertFalse(expect, "Expect to reject " + theFile);
             }
         }
     }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
index 48b3849bd5a..15a9da3a544 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.http.util.accesslog;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
 import java.util.IdentityHashMap;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java
index a68247679da..a7bf587c6e3 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java
@@ -17,10 +17,10 @@
 
 package org.apache.jmeter.protocol.http.util.accesslog;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.protocol.http.sampler.HTTPNullSampler;
@@ -37,11 +37,11 @@ public class TestTCLogParser extends JMeterTestCase {
     public void testConstruct() throws Exception {
         TCLogParser tcp;
         tcp = new TCLogParser();
-        assertNull("Should not have set the filename", tcp.FILENAME);
+        assertNull(tcp.FILENAME, "Should not have set the filename");
 
         String file = "testfiles/access.log";
         tcp = new TCLogParser(file);
-        assertEquals("Filename should have been saved", file, tcp.FILENAME);
+        assertEquals(file, tcp.FILENAME, "Filename should have been saved");
     }
 
     @Test
@@ -53,8 +53,8 @@ public void testcleanURL() throws Exception {
 
     @Test
     public void testcheckURL() throws Exception {
-        assertFalse("URL does not have a query", tclp.checkURL(URL1));
-        assertTrue("URL is a query", tclp.checkURL(URL2));
+        assertFalse(tclp.checkURL(URL1), "URL does not have a query");
+        assertTrue(tclp.checkURL(URL2), "URL is a query");
     }
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java
index eaaccb5c7a6..a508a73b2c3 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.testelement;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.protocol.http.control.Header;
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
index 100d4ab3c97..c60afc0ecb1 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.Locale;
 
diff --git a/src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java b/src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java
index 8e301456a36..6c9f3cb5437 100644
--- a/src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java
+++ b/src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.ldap.config.gui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java
index ae0f161db4f..ac0297ac27b 100644
--- a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java
+++ b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.tcp.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,12 +42,12 @@ public void testHexStringToByteArray() throws Exception {
 
         ba = BinaryTCPClientImpl.hexStringToByteArray("0f107F8081ff");
         assertEquals(6, ba.length);
-        assertEquals(15,   ba[0]);
-        assertEquals(16,   ba[1]);
-        assertEquals(127,  ba[2]);
+        assertEquals(15, ba[0]);
+        assertEquals(16, ba[1]);
+        assertEquals(127, ba[2]);
         assertEquals(-128, ba[3]);
         assertEquals(-127, ba[4]);
-        assertEquals(-1,   ba[5]);
+        assertEquals(-1, ba[5]);
         try {
             ba = BinaryTCPClientImpl.hexStringToByteArray("0f107f8081ff1");// odd chars
             fail("Expected IllegalArgumentException");
@@ -80,8 +80,8 @@ public void testRoundTrip() throws Exception {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         bi.write(os, "3132333435"); // '12345'
         os.close();
-        assertEquals("12345",os.toString("ISO-8859-1"));
+        assertEquals("12345", os.toString("ISO-8859-1"));
         ByteArrayInputStream bis = new ByteArrayInputStream(os.toByteArray());
-        assertEquals("3132333435",bi.read(bis, new SampleResult()));
+        assertEquals("3132333435", bi.read(bis, new SampleResult()));
     }
 }
diff --git a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java
index cccaddac680..256f20e7a3b 100644
--- a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java
+++ b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.tcp.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java
index c18ad04a2d0..e0609e9d063 100644
--- a/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java
+++ b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.tcp.sampler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Test;
 

From c962ec690a395d1db20712306eca98b51e259fc5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 28 Dec 2023 11:37:32 +0300
Subject: [PATCH 0744/1037] refactor: migrate JUnit 3 tests to JUnit 5, remove
 JUnit 4 test dependency

Now we have only JUnit 5 on the test compilation classpath, and IDE
no longer suggests multiple different @Test and assertEquals implementations.
---
 .../kotlin/build-logic.test-junit5.gradle.kts |   8 +-
 src/bom-testing/build.gradle.kts              |   1 -
 src/components/build.gradle.kts               |   1 -
 .../jmeter/config/KeystoreConfigBeanInfo.java |   2 +-
 .../json/jmespath/TestJMESPathExtractor.java  |   2 -
 src/core/build.gradle.kts                     |   1 -
 .../jmeter/testbeans/gui/TestBeanGUI.java     |   3 +-
 .../threads/JMeterContextServiceHelper.java   |  41 ---
 .../jmeter/junit/JMeterTestCaseJUnit.java     | 131 -------
 .../categories/ExcludeCategoryFilter.java     |  58 ---
 .../apache/jmeter/resources/PackageTest.java  |  86 ++---
 .../ComponentReferenceFunctionTest.java       |  99 +++---
 .../apache/jmeter/gui/action/TestLoad.java    |  68 ++--
 .../org/apache/jmeter/junit/JMeterTest.java   | 331 ++++++++----------
 .../jmeter/testbeans/gui/PackageTest.java     |  99 ++----
 .../jmeter/testelement/TestElementTest.java   |  59 ++--
 .../apache/jmeter/gui/GuiComponentHolder.kt}  |  18 +-
 .../apache/jmeter/functions/PackageTest.java  | 102 +++---
 src/protocol/http/build.gradle.kts            |   1 +
 .../http/control/TestHTTPMirrorThread.java    |  94 ++---
 .../control/gui/TestHttpTestSampleGui.java    |   4 -
 .../protocol/http/parser/TestHTMLParser.java  | 108 +++---
 .../protocol/http/sampler/PackageTest.java    |   3 -
 .../http/sampler/SamplingNamingTest.java      |   4 +-
 ...stHTTPSamplersAgainstHttpMirrorServer.java | 131 +++----
 .../http/control/HttpMirrorServerExtension.kt |  89 +++++
 .../render/BinaryMessageRendererTest.java     |  64 +++-
 27 files changed, 632 insertions(+), 976 deletions(-)
 delete mode 100644 src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java
 delete mode 100644 src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
 delete mode 100644 src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
 rename src/{core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java => dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt} (63%)
 create mode 100644 src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index de1a35b40c4..fc83cd6e117 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -23,10 +23,14 @@ plugins {
 }
 
 dependencies {
-    testImplementation("junit:junit")
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.hamcrest:hamcrest")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+}
+
+plugins.withId("java-test-fixtures") {
+    dependencies {
+        "testFixturesImplementation"("org.junit.jupiter:junit-jupiter")
+    }
 }
 
 tasks.configureEach<Test> {
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 158cb59b391..b48b40fb161 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.1")
         api("io.mockk:mockk:1.13.7")
-        api("junit:junit:4.13.2")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
         // activemq-all should not be used as it provides secondary slf4j binding
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 7ea996edbe5..10d6b508dda 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -89,7 +89,6 @@ dependencies {
     testImplementation("nl.jqno.equalsverifier:equalsverifier")
     testImplementation(testFixtures(projects.src.testkitWiremock))
     testFixturesImplementation(testFixtures(projects.src.core))
-    testFixturesImplementation("junit:junit")
     testImplementation("io.mockk:mockk")
 }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
index 4fc5de04eb3..32a5a6fd25b 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
@@ -44,7 +44,7 @@ public KeystoreConfigBeanInfo() {
 
         PropertyDescriptor p = property(PRELOAD);
         p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, "true"); // $NON-NLS-1$
+        p.setValue(DEFAULT, "True"); // $NON-NLS-1$
         p.setValue(NOT_EXPRESSION, Boolean.TRUE);
         p.setValue(NOT_OTHER, Boolean.TRUE);
         p.setValue(TAGS, new String[]{"True", "False"}); // $NON-NLS-1$ $NON-NLS-2$
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
index b10f6e1a5a5..d2e7f77dfec 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
@@ -32,7 +32,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.runners.Parameterized.Parameters;
 
 class TestJMESPathExtractor {
     private static final String DEFAULT_VALUE = "NONE"; // $NON-NLS-1$
@@ -151,7 +150,6 @@ private void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String da
             + "    {\"missing\": \"different\"}\r\n" + "  ],\r\n" + "  \"foo\": {\"bar\": \"baz\"}\r\n"
             + "}";
 
-    @Parameters
     private static Stream<Arguments> dataMatchNumberMoreThanZero() {
         return Stream.of(
             Arguments.of(TEST_DATA, "people[:3].first", "1", "James", "3"),
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index c7a0172102b..38fa682e8e6 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -123,7 +123,6 @@ dependencies {
     testImplementation("io.mockk:mockk")
 
     testFixturesApi(testFixtures(projects.src.jorphan))
-    testFixturesImplementation("junit:junit")
     testFixturesImplementation(projects.src.testkit)
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
index 59c0fb4e9d9..a9ba4405e4c 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.ResourceBundle;
 
 import javax.swing.JPopupMenu;
@@ -152,7 +153,7 @@ public TestBeanGUI() {
     }
 
     public TestBeanGUI(Class<?> testBeanClass) {
-        super();
+        Objects.requireNonNull(testBeanClass, "testBeanClass");
         log.debug("testing class: {}", testBeanClass);
         // A quick verification, just in case:
         if (!TestBean.class.isAssignableFrom(testBeanClass)) {
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java b/src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java
deleted file mode 100644
index 9bb323fdb54..00000000000
--- a/src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.threads;
-
-import org.junit.rules.ExternalResource;
-
-public class JMeterContextServiceHelper extends ExternalResource {
-
-    @Override
-    protected void after() {
-        JMeterContextService.removeContext();
-    }
-
-    private JMeterContext instance;
-    public JMeterContext get() {
-        if (instance == null) {
-            JMeterContext jMeterContext = new JMeterContext();
-            JMeterContextService.replaceContext(jMeterContext);
-            initContext(jMeterContext);
-            instance = jMeterContext;
-        }
-        return instance;
-    }
-
-    protected void initContext(JMeterContext jMeterContext) {}
-}
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
deleted file mode 100644
index a653f95cabf..00000000000
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.junit;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Locale;
-import java.util.MissingResourceException;
-
-import org.apache.jmeter.engine.util.CompoundVariable;
-import org.apache.jmeter.functions.AbstractFunction;
-import org.apache.jmeter.functions.InvalidVariableException;
-import org.apache.jmeter.util.JMeterUtils;
-
-import junit.framework.TestCase;
-
-/*
- * Extend JUnit TestCase to provide common setup
- */
-public abstract class JMeterTestCaseJUnit extends TestCase {
-    // Used by findTestFile
-    private static final String filePrefix;
-
-    protected JMeterTestCaseJUnit() {
-        super();
-    }
-
-    protected JMeterTestCaseJUnit(String name) {
-        super(name);
-    }
-
-    /*
-     * If not running under AllTests.java, make sure that the properties (and
-     * log file) are set up correctly.
-     *
-     * N.B. This assumes the JUnit test are executed in the
-     * project root, bin directory or one level down, and all the JMeter jars
-     * (plus any others needed at run-time) need to be on the classpath.
-     */
-    static {
-        if (JMeterUtils.getJMeterProperties() == null) {
-            filePrefix = JMeterTestUtils.setupJMeterHome();
-            String home = JMeterUtils.getJMeterHome();
-            System.setProperty("jmeter.home", home); // needed for scripts
-            JMeterUtils jmu = new JMeterUtils();
-            try {
-                jmu.initializeProperties(filePrefix+"jmeter.properties");
-            } catch (MissingResourceException e) {
-                System.out.println("** Can't find resources - continuing anyway **");
-            }
-            System.out.println("JMeterVersion="+JMeterUtils.getJMeterVersion());
-            logprop("java.version");
-            logprop("java.vm.name");
-            logprop("java.vendor");
-            logprop("java.home");
-            logprop("file.encoding");
-            // Display actual encoding used (will differ if file.encoding is not recognised)
-            System.out.println("default encoding="+Charset.defaultCharset());
-            logprop("user.home");
-            logprop("user.dir");
-            logprop("user.language");
-            logprop("user.region");
-            logprop("user.country");
-            logprop("user.variant");
-            System.out.println("Locale="+Locale.getDefault().toString());
-            logprop("java.class.version");
-            logprop("java.awt.headless");
-            logprop("os.name");
-            logprop("os.version");
-            logprop("os.arch");
-            if (Boolean.getBoolean("jmeter.test.log.classpath")) {
-                logprop("java.class.path");
-            }
-        } else {
-            filePrefix = JMeterTestUtils.setupJMeterHome();
-        }
-    }
-
-    private static void logprop(String prop) {
-        System.out.println(prop + "=" + System.getProperty(prop));
-    }
-
-    // Helper method to find a file
-    protected static File findTestFile(String file) {
-        File f = new File(file);
-        if (filePrefix.length() > 0 && !f.isAbsolute()) {
-            f = new File(filePrefix, file);// Add the offset
-        }
-        return f;
-    }
-
-    protected void checkInvalidParameterCounts(AbstractFunction func, int minimum)
-            throws Exception {
-        Collection<CompoundVariable> parms = new ArrayList<>();
-        for (int c = 0; c < minimum; c++) {
-            assertThrows(InvalidVariableException.class, () -> func.setParameters(parms));
-            parms.add(new CompoundVariable());
-        }
-        func.setParameters(parms);
-    }
-
-    /**
-     * Returns absolute path of a resource file.
-     * It allows to have test resources in {@code test/resources/org/apache...} folder
-     * and reference it as {@code getResourceFilePath("test1.txt")}.
-     * @param resource argument for klass.getResource. Relative (to current class) or absolute resource path
-     * @return absolute file path of a resource
-     */
-    protected String getResourceFilePath(String resource) {
-        return JMeterTestUtils.getResourceFilePath(getClass(), resource);
-    }
-}
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
deleted file mode 100644
index b7d4acb877b..00000000000
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.junit.categories;
-
-import org.junit.experimental.categories.Category;
-import org.junit.runner.Description;
-import org.junit.runner.manipulation.Filter;
-
-/**
- * Junit Filter that excludes test annotated with a given marker interface
- * @since 3.0
- */
-public class ExcludeCategoryFilter extends Filter {
-
-    private Class<?> excludedClass;
-
-    public ExcludeCategoryFilter(Class<?> excludedClass) {
-        super();
-        this.excludedClass = excludedClass;
-    }
-
-    @Override
-    public String describe() {
-        return "JMeter ExcludeCategoryFilter";
-    }
-
-    @Override
-    public boolean shouldRun(Description description) {
-        //TODO : check the class hierarchy and not only the current class
-        Category cat = description.getAnnotation(Category.class);
-        if(cat != null) {
-            Class<?>[] categories = cat.value();
-            for (Class<?> class1 : categories) {
-                if(excludedClass.isAssignableFrom(class1)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-}
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
index 744cb69c8fe..f90cff518e9 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
@@ -17,6 +17,11 @@
 
 package org.apache.jmeter.resources;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -25,6 +30,7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -37,12 +43,10 @@
 import java.util.TreeSet;
 
 import org.apache.jmeter.gui.util.JMeterMenuBar;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /*
  * Created on Nov 29, 2003
@@ -64,7 +68,7 @@
  * why the tests failed.
  */
 
-public class PackageTest extends TestCase implements Describable {
+public class PackageTest {
     // We assume the test starts in "src/core" directory (which is true for Gradle and IDEs)
     private static final File resourceFiledir = new File("src/main/resources");
 
@@ -85,7 +89,7 @@ private PropertyResourceBundle getRAS(String res) throws Exception {
             new Object[] { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
     // Read resource file saving the keys
-    private void readRF(String res, List<String> l) throws Exception {
+    private void readRF(String res, String resourcePrefix, String lang, List<String> l) throws Exception {
         InputStream ras = this.getClass().getResourceAsStream(res);
         if (ras == null){
             if (MESSAGES.equals(resourcePrefix)|| lang.isEmpty()) {
@@ -137,7 +141,7 @@ private void readRF(String res, List<String> l) throws Exception {
     }
 
     // Helper method to construct resource name
-    private String getResName(String lang) {
+    private String getResName(String lang, String resourcePrefix) {
         if (lang.isEmpty()) {
             return resourcePrefix+".properties";
         } else {
@@ -145,18 +149,18 @@ private String getResName(String lang) {
         }
     }
 
-    private void check(String resname) throws Exception {
-        check(resname, true);// check that there aren't any extra entries
+    private void check(String resname, String resourcePrefix) throws Exception {
+        check(resname, resourcePrefix, true);// check that there aren't any extra entries
     }
 
     /*
      * perform the checks on the resources
      *
      */
-    private void check(String resname, boolean checkUnexpected) throws Exception {
+    private void check(String resname, String resourcePrefix, boolean checkUnexpected) throws Exception {
         ArrayList<String> alf = new ArrayList<>(500);// holds keys from file
-        String res = getResName(resname);
-        readRF(res, alf);
+        String res = getResName(resname, resourcePrefix);
+        readRF(res, resourcePrefix, resname, alf);
         Collections.sort(alf);
 
         // Look for duplicate keys in the file
@@ -241,7 +245,7 @@ public boolean accept(File dir, String name) {
     static void findFile(File file, Set<String> set,
             FilenameFilter filenameFilter) {
         File[] foundFiles = file.listFiles(filenameFilter);
-        assertNotNull("Not a directory: "+file, foundFiles);
+        assertNotNull(foundFiles, "Not a directory: "+file);
         for (File file2 : foundFiles) {
             if (file2.isDirectory()) {
                 findFile(file2, set, filenameFilter);
@@ -257,61 +261,35 @@ static void findFile(File file, Set<String> set,
     /*
      * Use a suite to ensure that the default is done first
     */
-    public static Test suite() {
-        TestSuite ts = new TestSuite("Resources PackageTest");
+    public static Collection<Arguments> languagesAndPrefixes() {
+        Collection<Arguments> res = new ArrayList<>();
         String[] languages = JMeterMenuBar.getLanguages();
         for(String prefix : prefixList){
-            TestSuite pfx = new TestSuite(prefix) ;
-            pfx.addTest(new PackageTest("testLang","", prefix)); // load the default resource
+            res.add(arguments("", prefix)); // load the default resource
             for(String language : languages){
                 if (!"en".equals(language)){ // Don't try to check the default language
-                    pfx.addTest(new PackageTest("testLang", language, prefix));
+                    res.add(arguments(language, prefix));
                 }
             }
-            ts.addTest(pfx);
         }
-        ts.addTest(new PackageTest("checkI18n", "fr"));
-        // TODO Add these some day
-//        ts.addTest(new PackageTest("checkI18n", "es"));
-//        ts.addTest(new PackageTest("checkI18n", "pl"));
-//        ts.addTest(new PackageTest("checkI18n", "pt_BR"));
-//        ts.addTest(new PackageTest("checkI18n", "tr"));
-//        ts.addTest(new PackageTest("checkI18n", Locale.JAPANESE.toString()));
-//        ts.addTest(new PackageTest("checkI18n", Locale.SIMPLIFIED_CHINESE.toString()));
-//        ts.addTest(new PackageTest("checkI18n", Locale.TRADITIONAL_CHINESE.toString()));
-        return ts;
+        return res;
     }
 
     private List<String> failures = new ArrayList<>();
 
-    private final String lang;
-
-    private final String resourcePrefix; // e.g. "/org/apache/jmeter/resources/messages"
-
-    public PackageTest(String testName, String _lang) {
-        this(testName, _lang, MESSAGES);
-    }
-
-    public PackageTest(String testName, String _lang, String propName) {
-        super(testName);
-        lang=_lang;
-        resourcePrefix = propName;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + lang + ": " + resourcePrefix);
-    }
-
-    public void testLang() throws Exception{
-        check(lang);
+    @ParameterizedTest
+    @MethodSource("languagesAndPrefixes")
+    public void testLang(String lang, String resourcePrefix) throws Exception{
+        check(lang, resourcePrefix);
     }
 
     /**
      * Check all messages are available in one language
      * @throws Exception if something fails
      */
-    public void checkI18n() throws Exception {
+    @ParameterizedTest
+    @ValueSource(strings = {"fr"})
+    public void checkI18n(String lang) throws Exception {
         Map<String, Map<String,String>> missingLabelsPerBundle = new HashMap<>();
         for (String prefix : prefixList) {
             Properties messages = new Properties();
@@ -319,7 +297,7 @@ public void checkI18n() throws Exception {
             checkMessagesForLanguage( missingLabelsPerBundle , messages,prefix.substring(1), lang);
         }
 
-        assertEquals(missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle), 0, missingLabelsPerBundle.size());
+        assertEquals(0, missingLabelsPerBundle.size(), missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle));
     }
 
     private void checkMessagesForLanguage(Map<String, Map<String, String>> missingLabelsPerBundle,
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
index 141f7a774e1..861e4da6bbb 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
@@ -17,11 +17,16 @@
 
 package org.apache.jmeter.functions;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,9 +35,13 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTest;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -41,47 +50,34 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implements Describable {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS) // shares funcTitles between tests
+public class ComponentReferenceFunctionTest extends JMeterTestCase {
 
     private static final Logger log = LoggerFactory.getLogger(ComponentReferenceFunctionTest.class);
 
-    private static Map<String, Boolean> funcTitles;
+    private Map<String, Boolean> funcTitles;
 
-    // Constructor for Function tests
-    private Function funcItem;
-
-    public ComponentReferenceFunctionTest(String name) {
-        super(name);
-    }
+    static class Holder {
+        static final Collection<Function> FUNCTIONS;
 
-    public ComponentReferenceFunctionTest(String testName, Function fi) {
-        super(testName);// Save the method name
-        funcItem = fi;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + (funcItem != null ? " " + funcItem.getClass() : null));
+        static {
+            try {
+                FUNCTIONS = JMeterTest.getObjects(Function.class)
+                        .stream()
+                        .filter(f -> f.getClass() != CompoundVariable.class)
+                        .map(Function.class::cast)
+                        .collect(Collectors.toList());
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 
     /*
      * Test Functions - create the suite of tests
      */
-    private static Test suiteFunctions() throws Throwable {
-        TestSuite suite = new TestSuite("Functions");
-        for (Object item : JMeterTest.getObjects(Function.class)) {
-            if (item.getClass().equals(CompoundVariable.class)) {
-                continue;
-            }
-            TestSuite ts = new TestSuite(item.getClass().getName());
-            ts.addTest(new ComponentReferenceFunctionTest("runFunction", (Function) item));
-            ts.addTest(new ComponentReferenceFunctionTest("runFunction2", (Function) item));
-            suite.addTest(ts);
-        }
-        return suite;
+    static Collection<Function> functions() throws Throwable {
+        return Holder.FUNCTIONS;
     }
 
     private Element getBodyFromXMLDocument(InputStream stream)
@@ -99,6 +95,7 @@ private Element getBodyFromXMLDocument(InputStream stream)
     /*
      * Extract titles from functions.xml
      */
+    @BeforeAll
     public void createFunctionSet() throws Exception {
         funcTitles = new HashMap<>(20);
         String compref = "../xdocs/usermanual/functions.xml";
@@ -121,18 +118,17 @@ public void createFunctionSet() throws Exception {
         }
     }
 
+    @AfterAll
     public void checkFunctionSet() throws Exception {
-        assertEquals(
-                "Should not have any names left over in funcTitles",
-                "[]",
-                JMeterTest.keysWithFalseValues(funcTitles).toString()
-        );
+        Assertions.assertEquals("[]", JMeterTest.keysWithFalseValues(funcTitles).toString(), "Should not have any names left over in funcTitles");
     }
 
     /*
      * run the function test
      */
-    public void runFunction() throws Exception {
+    @ParameterizedTest
+    @MethodSource("functions")
+    public void runFunction(Function funcItem) throws Exception {
         if (funcTitles.size() > 0) {
             String title = funcItem.getReferenceKey();
             boolean ct = funcTitles.containsKey(title);
@@ -146,7 +142,7 @@ public void runFunction() throws Exception {
                 if (!ct) {
                     log.warn(s); // Record in log as well
                 }
-                assertTrue(s, ct);
+                Assertions.assertTrue(ct, s);
             }
         }
     }
@@ -154,21 +150,12 @@ public void runFunction() throws Exception {
     /*
      * Check that function descriptions are OK
      */
-    public void runFunction2() throws Exception {
-        for (Object o : funcItem.getArgumentDesc()) {
-            assertTrue("Description must be a String", o instanceof String);
-            assertFalse("Description must not start with [refkey", ((String) o).startsWith("[refkey"));
+    @ParameterizedTest
+    @MethodSource("functions")
+    public void runFunction2(Function funcItem) throws Exception {
+        for (String o : funcItem.getArgumentDesc()) {
+            assertInstanceOf(String.class, o, "Description must be a String");
+            assertFalse(o.startsWith("[refkey"), "Description must not start with [refkey");
         }
     }
-
-    /*
-     * Use a suite to allow the tests to be generated at run-time
-     */
-    public static Test suite() throws Throwable {
-        TestSuite suite = new TestSuite("ComponentReferenceFunctionTest");
-        suite.addTest(new ComponentReferenceFunctionTest("createFunctionSet"));
-        suite.addTest(suiteFunctions());
-        suite.addTest(new ComponentReferenceFunctionTest("checkFunctionSet"));
-        return suite;
-    }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
index 5464a8fd0c2..40387d5e4d0 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
@@ -17,24 +17,27 @@
 
 package org.apache.jmeter.gui.action;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Stream;
 
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jorphan.collections.HashTree;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
-
-import junit.framework.TestSuite;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  *
  * Test JMX files to check that they can be loaded OK.
  */
-public class TestLoad extends JMeterTestCaseJUnit implements Describable {
+public class TestLoad  {
 
     private static final String basedir = new File(System.getProperty("user.dir")).getParentFile().getParent();
     private static final File testfiledir = new File(basedir,"bin/testfiles");
@@ -55,56 +58,31 @@ public boolean accept(File dir, String name) {
         }
     };
 
-    private final File testFile;
-    private final String parent;
-
-    public TestLoad(String name) {
-        super(name);
-        testFile=null;
-        parent=null;
+    public static Stream<Arguments> inputFiles() {
+        return Stream.concat(
+                scanFiles(testfiledir),
+                scanFiles(demofiledir));
     }
 
-    public TestLoad(String name, File file, String dir) {
-        super(name);
-        testFile=file;
-        parent=dir;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + testFile + " " + parent);
-    }
-
-    public static TestSuite suite(){
-        TestSuite suite = new TestSuite("Load Test");
-        scanFiles(suite, testfiledir);
-        scanFiles(suite, demofiledir);
-        return suite;
-    }
-
-    private static void scanFiles(TestSuite suite, File parent) {
+    private static Stream<Arguments> scanFiles(File parent) {
         String dir = parent.getName();
         File[] testFiles = parent.listFiles(jmxFilter);
         if (testFiles == null) {
             fail("*.jmx files for test should be present in folder " + parent);
         }
-        for (File file : testFiles) {
-            suite.addTest(new TestLoad("checkTestFile", file, dir));
-        }
+        return Stream.of(testFiles)
+                .map(file -> arguments(dir, file));
     }
 
-    public void checkTestFile() throws Exception{
-        HashTree tree = null;
-        try {
-            tree =getTree(testFile);
-        } catch (Exception e) {
-            fail(parent+": "+ testFile.getName()+" caused "+e);
-        }
-        assertTree(tree);
+    @ParameterizedTest
+    @MethodSource("inputFiles")
+    public void checkTestFile(String parent, File testFile) throws Exception{
+        HashTree tree = getTree(testFile);
+        assertTree(tree, parent, testFile);
     }
 
-    private void assertTree(HashTree tree) throws Exception {
-        assertNotNull(parent+": "+ testFile.getName()+" caused null tree: ",tree);
+    private void assertTree(HashTree tree, String parent, File testFile) throws Exception {
+        assertNotNull(tree, parent+": "+ testFile.getName()+" caused null tree: ");
         final Object object = tree.getArray()[0];
         final String name = testFile.getName();
 
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index ed5ae0e55ad..8fae00c2d37 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -17,6 +17,12 @@
 
 package org.apache.jmeter.junit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.awt.Component;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,6 +45,7 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.SwingUtilities;
 import javax.xml.parsers.DocumentBuilder;
@@ -49,12 +56,16 @@
 import org.apache.jmeter.config.gui.ObsoleteGui;
 import org.apache.jmeter.control.gui.TestFragmentControllerGui;
 import org.apache.jmeter.dsl.DslPrinterTraverser;
+import org.apache.jmeter.gui.GuiComponentHolder;
 import org.apache.jmeter.gui.JMeterGUIComponent;
 import org.apache.jmeter.gui.UnsharedComponent;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.loadsave.IsEnabledNormalizer;
 import org.apache.jmeter.protocol.http.control.gui.GraphQLHTTPSamplerGui;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
+import org.apache.jmeter.protocol.java.config.gui.JavaConfigGui;
+import org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui;
+import org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@@ -62,10 +73,15 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.visualizers.backend.BackendListenerGui;
 import org.apache.jorphan.reflect.ClassFinder;
 import org.apache.jorphan.util.JOrphanUtils;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -73,10 +89,9 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
+@Isolated("changes default locale")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS) // maps must persist across test method executions
+public class JMeterTest extends JMeterTestCase {
     private static final Logger log = LoggerFactory.getLogger(JMeterTest.class);
 
     private static Map<String, Boolean> guiTitles;
@@ -89,80 +104,17 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
 
     private static final Locale DEFAULT_LOCALE = Locale.getDefault();
 
-    public JMeterTest(String name) {
-        super(name);
-    }
-
-    /*
-     * The suite() method creates separate test suites for each of the types of
-     * test. The suitexxx() methods create a list of items to be tested, and
-     * create a new test instance for each.
-     *
-     * Each test type has its own constructor, which saves the item to be tested
-     *
-     * Note that the suite() method must be static, and the methods to run the
-     * tests must be instance methods so that they can pick up the item value
-     * which was saved by the constructor.
-     *
-     */
-
-    // Constructor for Serializable tests
-    private Serializable serObj;
-
-    public JMeterTest(String testName, Serializable ser) {
-        super(testName);// Save the method name
-        serObj = ser;
-    }
-
-    // Constructor for GUI tests
-    private JMeterGUIComponent guiItem;
-
-    public JMeterTest(String testName, JMeterGUIComponent gc) {
-        super(testName);// Save the method name
-        guiItem = gc;
-    }
-
-    @Override
-    public Description getDescription() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getName());
-        if (guiItem instanceof TestBeanGUI) {
-            sb.append(" ").append(guiItem);
-        } else if (guiItem != null) {
-            sb.append(" ").append(guiItem.getClass().getName());
-        } else if (serObj != null) {
-            sb.append(" ").append(serObj.getClass().getName());
-        }
-        return Description.createTestDescription(getClass(), sb.toString());
-    }
-
     private static volatile boolean classPathShown = false;// Only show classpath once
 
-    /*
-     * Use a suite to allow the tests to be generated at run-time
-     */
-    public static Test suite() throws Throwable {
-        TestSuite suite = new TestSuite("JMeterTest");
-
-        // The Locale used to instantiate the GUI objects
+    @BeforeAll
+    public static void setLocale() {
         JMeterUtils.setLocale(TEST_LOCALE);
         Locale.setDefault(TEST_LOCALE);
-        // Needs to be done before any GUI classes are instantiated
-
-        suite.addTest(new JMeterTest("readAliases"));
-        suite.addTest(new JMeterTest("createTitleSet"));
-        suite.addTest(new JMeterTest("createTagSet"));
-        suite.addTest(suiteGUIComponents());
-        suite.addTest(suiteSerializableElements());
-        suite.addTest(suiteBeanComponents());
-        suite.addTest(new JMeterTest("checkGuiSet"));
-
-        suite.addTest(new JMeterTest("resetLocale")); // revert
-        return suite;
     }
 
     // Restore the original Locale
-    public void resetLocale(){
+    @AfterAll
+    public static void resetLocale() {
         JMeterUtils.setLocale(DEFAULT_LOCALE);
         Locale.setDefault(DEFAULT_LOCALE);
     }
@@ -170,7 +122,8 @@ public void resetLocale(){
     /*
      * Extract titles from component_reference.xml
      */
-    public void createTitleSet() throws Exception {
+    @BeforeAll
+    public static void createTitleSet() throws Exception {
         guiTitles = new HashMap<>(90);
 
         String compref = "../xdocs/usermanual/component_reference.xml";
@@ -200,7 +153,7 @@ public void createTitleSet() throws Exception {
      * @throws IOException when stream can not be read
      * @throws SAXException in case of XML parsing error
      */
-    private org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
+    private static org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
             throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setIgnoringElementContentWhitespace(true);
@@ -215,7 +168,8 @@ private org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
     /*
      * Extract titles from component_reference.xml
      */
-    public void createTagSet() throws Exception {
+    @BeforeAll
+    public static void createTagSet() throws Exception {
         guiTags = new HashMap<>(90);
 
         String compref = "../xdocs/usermanual/component_reference.xml";
@@ -246,26 +200,30 @@ public static<T> List<T> keysWithFalseValues(Map<? extends T, Boolean> map) {
                 .collect(Collectors.toList());
     }
 
-    public void checkGuiSet() {
+    @AfterAll
+    public static void checkGuiSet() {
         guiTitles.remove("Example Sampler");// We don't mind if this is left over
         guiTitles.remove("Sample_Result_Save_Configuration");// Ditto, not a sampler
         assertEquals(
-                "Should not have any names left over in guiTitles map, check name of components in EN (default) Locale, "
+                "[]",
+                keysWithFalseValues(guiTitles).toString(),
+                () -> "Should not have any names left over in guiTitles map, check name of components in EN (default) Locale, "
                         + "which must match name attribute of component, check java.awt.HeadlessException errors before,"
                         + " we are running with '-Djava.awt.headless="
-                        + System.getProperty("java.awt.headless") + "'",
-                "[]",
-                keysWithFalseValues(guiTitles).toString()
-        );
+                        + System.getProperty("java.awt.headless") + "'");
     }
 
     /*
      * Test GUI elements - create the suite of tests
      */
-    private static Test suiteGUIComponents() throws Throwable {
-        TestSuite suite = new TestSuite("GuiComponents");
+    static Collection<GuiComponentHolder> guiComponents() throws Throwable {
+        List<GuiComponentHolder> components = new ArrayList<>();
+
         for (Object o : getObjects(JMeterGUIComponent.class)) {
             JMeterGUIComponent item = (JMeterGUIComponent) o;
+            if (item.getClass() == TestBeanGUI.class) {
+                continue;
+            }
             if (item instanceof JMeterTreeNode) {
                 System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping all tests  " + item.getClass().getName());
                 continue;
@@ -273,51 +231,23 @@ private static Test suiteGUIComponents() throws Throwable {
             if (item instanceof ObsoleteGui) {
                 continue;
             }
-            TestSuite ts = new TestSuite(item.getClass().getName());
-            ts.addTest(new JMeterTest("GUIComponents1", item));
-            if (item instanceof TestBeanGUI) {
-                System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping some tests " + item.getClass().getName());
-            } else {
-                ts.addTest(new JMeterTest("GUIComponents2", item));
-                ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
-                ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
-                ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
-                ts.addTest(new JMeterTest("runGUITitle", item));
-            }
-            suite.addTest(ts);
+            components.add(new GuiComponentHolder(item));
         }
-        return suite;
-    }
-
-
-    /*
-     * Test GUI elements - create the suite of tests
-     */
-    private static Test suiteBeanComponents() throws Throwable {
-        TestSuite suite = new TestSuite("BeanComponents");
         for (Object o : getObjects(TestBean.class)) {
             Class<?> c = o.getClass();
-            try {
-                JMeterGUIComponent item = new TestBeanGUI(c);
-                TestSuite ts = new TestSuite(item.getClass().getName());
-                ts.addTest(new JMeterTest("GUIComponents2", item));
-                ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
-                ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
-                ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
-                ts.addTest(new JMeterTest("runGUITitle", item));
-                suite.addTest(ts);
-            } catch (IllegalArgumentException e) {
-                System.out.println("o.a.j.junit.JMeterTest Cannot create test for " + c.getName() + " " + e);
-                e.printStackTrace(System.out);
-            }
+            JMeterGUIComponent item = new TestBeanGUI(c);
+            components.add(new GuiComponentHolder(item));
         }
-        return suite;
+        return components;
     }
 
     /*
      * Test GUI elements - run the test
      */
-    public void runGUITitle() throws Exception {
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void runGUITitle(GuiComponentHolder componentHolder) throws Exception {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
         if (!guiTitles.isEmpty()) {
             String title = guiItem.getDocAnchor();
             boolean ct = guiTitles.containsKey(title);
@@ -337,7 +267,7 @@ public void runGUITitle() throws Exception {
                 if (!ct) {
                     log.warn(s); // Record in log as well
                 }
-                assertTrue(s, ct);
+                assertTrue(ct, s);
             }
         }
     }
@@ -345,20 +275,22 @@ public void runGUITitle() throws Exception {
     /*
      * Test GUI elements - run for all components
      */
-    public void GUIComponents1() throws Exception {
-        String name = guiItem.getClass().getName();
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void GUIComponents1(GuiComponentHolder componentHolder) throws Exception {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
+        String name = componentHolder.toString();
 
-        assertEquals("Name should be same as static label for " + name, guiItem.getStaticLabel(), guiItem.getName());
-        if (name.startsWith("org.apache.jmeter.examples.")){
+        if (guiItem.getClass().getName().startsWith("org.apache.jmeter.examples.")){
             return;
         }
-        if (!name.endsWith("TestBeanGUI")) {
+        if (guiItem.getClass() != TestBeanGUI.class) {
             try {
                 String label = guiItem.getLabelResource();
-                assertNotNull("Label should not be null for "+name, label);
-                assertTrue("Label should not be empty for "+name, !label.isEmpty());
-                assertFalse("'" + label + "' should be in resource file for " + name, JMeterUtils.getResString(
-                        label).startsWith(JMeterUtils.RES_KEY_PFX));
+                assertNotNull(label, () -> "Label should not be null for " + name);
+                assertFalse(label.isEmpty(), () -> "Label should not be empty for " + name);
+                assertFalse(JMeterUtils.getResString(
+                        label).startsWith(JMeterUtils.RES_KEY_PFX), () -> "'" + label + "' should be in resource file for " + name);
             } catch (UnsupportedOperationException uoe) {
                 log.warn("Class has not yet implemented getLabelResource {}", name);
             }
@@ -369,29 +301,32 @@ public void GUIComponents1() throws Exception {
     /*
      * Test GUI elements - not run for TestBeanGui items
      */
-    public void GUIComponents2() throws Exception {
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void GUIComponents2(GuiComponentHolder componentHolder) throws Exception {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
         String name = guiItem.getClass().getName();
 
         // TODO these assertions should be separate tests
 
         TestElement el = guiItem.createTestElement();
-        assertNotNull(name + ".createTestElement should be non-null ", el);
-        assertEquals("GUI-CLASS: Failed on " + name, name, el.getPropertyAsString(TestElement.GUI_CLASS));
+        assertNotNull(el, name + ".createTestElement should be non-null ");
+        assertEquals(name, el.getPropertyAsString(TestElement.GUI_CLASS), "GUI-CLASS: Failed on " + name);
 
-        assertEquals("NAME: Failed on " + name, guiItem.getName(), el.getName());
+        assertEquals(guiItem.getName(), el.getName(), () -> "NAME: Failed on " + name);
         if (StringUtils.isEmpty(el.getName())) {
             fail("Name of the element must not be blank. Gui class " + name + ", element class " + el.getClass().getName());
         }
-        assertEquals("TEST-CLASS: Failed on " + name, el.getClass().getName(), el
-                .getPropertyAsString(TestElement.TEST_CLASS));
+        assertEquals(el.getClass().getName(), el
+                .getPropertyAsString(TestElement.TEST_CLASS), "TEST-CLASS: Failed on " + name);
         if (guiItem.getClass() != TestFragmentControllerGui.class) {
-            assertTrue("Should be enabled by default: " + name, el.isEnabled());
+            assertTrue(el.isEnabled(), "Should be enabled by default: " + name);
         }
         TestElement el2 = guiItem.createTestElement();
         el.setName("hey, new name!:");
         el.setProperty("NOT", "Shouldn't be here");
         if (!(guiItem instanceof UnsharedComponent)) {
-            assertEquals("SHARED: Failed on " + name, "", el2.getPropertyAsString("NOT"));
+            assertEquals("", el2.getPropertyAsString("NOT"), () -> "SHARED: Failed on " + name);
         }
         log.debug("Saving element: {}", el.getClass());
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -400,38 +335,44 @@ public void GUIComponents2() throws Exception {
         bos.close();
         el = (TestElement) SaveService.loadElement(bis);
         bis.close();
-        assertNotNull("Load element failed on: "+name,el);
+        assertNotNull(el, "Load element failed on: "+name);
         guiItem.configure(el);
-        assertEquals("CONFIGURE-TEST: Failed on " + name, el.getName(), guiItem.getName());
+        assertEquals(el.getName(), guiItem.getName(), () -> "CONFIGURE-TEST: Failed on " + name);
         guiItem.modifyTestElement(el2);
-        assertEquals("Modify Test: Failed on " + name, "hey, new name!:", el2.getName());
+        assertEquals("hey, new name!:", el2.getName(), () -> "Modify Test: Failed on " + name);
     }
 
-    public void propertiesShouldNotBeInitializedToNullValues() {
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void propertiesShouldNotBeInitializedToNullValues(GuiComponentHolder componentHolder) {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
         TestElement el = guiItem.createTestElement();
+
+        assertFalse(
+                StringUtils.isEmpty(el.getName()),
+                () -> "Name should be non-blank for element " + componentHolder);
         PropertyIterator it = el.propertyIterator();
         while (it.hasNext()) {
             JMeterProperty property = it.next();
             if (property.getObjectValue() == null) {
-                fail(
-                        "Property " + property.getName() + " is initialized with NULL OBJECT value in " +
-                                " test element " + el + " created with " + guiItem + ".createTestElement() " +
-                                "Please refrain from that since null properties consume memory, and they will be " +
-                                "removed when saving and loading the plan anyway"
-                );
+                fail("Property " + property.getName() + " is initialized with NULL OBJECT value in " +
+                        " test element " + el + " created with " + guiItem + ".createTestElement() " +
+                        "Please refrain from that since null properties consume memory, and they will be " +
+                        "removed when saving and loading the plan anyway");
             }
             if (property.getStringValue() == null) {
-                fail(
-                        "Property " + property.getName() + " is initialized with NULL STRING value in " +
-                                " test element " + el + " created with " + guiItem + ".createTestElement() " +
-                                "Please refrain from that since null properties consume memory, and they will be " +
-                                "removed when saving and loading the plan anyway"
-                );
+                fail("Property " + property.getName() + " is initialized with NULL STRING value in " +
+                        " test element " + el + " created with " + guiItem + ".createTestElement() " +
+                        "Please refrain from that since null properties consume memory, and they will be " +
+                        "removed when saving and loading the plan anyway");
             }
         }
     }
 
-    public void elementShouldNotBeModifiedWithConfigureModify() {
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void elementShouldNotBeModifiedWithConfigureModify(GuiComponentHolder componentHolder) {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
         TestElement expected = guiItem.createTestElement();
         TestElement actual = guiItem.createTestElement();
         guiItem.configure(actual);
@@ -440,9 +381,9 @@ public void elementShouldNotBeModifiedWithConfigureModify() {
             String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
             String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
             assertEquals(
-                    "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element)",
                     expectedStr,
-                    actualStr
+                    actualStr,
+                    () -> "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element)"
             );
         }
         guiItem.modifyTestElement(actual);
@@ -453,18 +394,34 @@ public void elementShouldNotBeModifiedWithConfigureModify() {
             actual.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
         }
         if (!Objects.equals(expected, actual)) {
+            if (guiItem.getClass() == JavaConfigGui.class || guiItem.getClass() == JavaTestSamplerGui.class) {
+                // TODO: JavaConfigGui modifies UI when classname combobox changes, and it causes inconsistency between the
+                //   element state and the UI state. We ignore the discrepancy for now
+                return;
+            }
+            if (guiItem.getClass() == JUnitTestSamplerGui.class) {
+                // TODO: fix org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui.configure to use placeholders
+                return;
+            }
+            if (guiItem.getClass() == BackendListenerGui.class) {
+                // TODO: fix handling of default arguments in org.apache.jmeter.visualizers.backend.BackendListenerGui.actionPerformed
+                return;
+            }
             boolean breakpointForDebugging = Objects.equals(expected, actual);
             String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
             String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
             assertEquals(
-                    "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element); gui.modifyTestElement(element)",
                     expectedStr,
-                    actualStr
+                    actualStr,
+                    () -> "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element); gui.modifyTestElement(element)"
             );
         }
     }
 
-    public void saveLoadShouldKeepElementIntact() throws IOException {
+    @ParameterizedTest
+    @MethodSource("guiComponents")
+    public void saveLoadShouldKeepElementIntact(GuiComponentHolder componentHolder) throws IOException {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
         TestElement expected = guiItem.createTestElement();
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         SaveService.saveElement(expected, bos);
@@ -481,47 +438,34 @@ private static void compareAllProperties(TestElement expected, TestElement actua
         if (!Objects.equals(expected, actual)) {
             boolean breakpointForDebugging = Objects.equals(expected, actual);
             assertEquals(
-                    "TestElement after 'save+load' should match the one created in GUI\n" +
-                            "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
                     expectedStr,
-                    new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString()
-            );
+                    new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString(),
+                    "TestElement after 'save+load' should match the one created in GUI\n" +
+                    "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
             fail("TestElement after 'save+load' should match the one created in GUI. " +
                     "DSL representation is the same, however TestElement#equals says the elements are different. " +
                     "DSL is " + expectedStr + "\n" +
                     "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
         }
-        assertEquals(
-                "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
-                "DSL representation is the same, however TestElement#hashCode says the elements are different. " +
-                "DSL is " + expectedStr + "\n" +
-                "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
-                expected.hashCode(),
-                actual.hashCode()
-        );
+        assertEquals(expected.hashCode(), actual.hashCode(), "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
+        "DSL representation is the same, however TestElement#hashCode says the elements are different. " +
+        "DSL is " + expectedStr + "\n" +
+        "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
     }
 
-    /*
-     * Test serializable elements - create the suite of tests
-     */
-    private static Test suiteSerializableElements() throws Throwable {
-        TestSuite suite = new TestSuite("SerializableElements");
-        for (Object o : getObjects(Serializable.class)) {
-            Serializable serObj = (Serializable) o;
-            if (serObj.getClass().getName().endsWith("_Stub")) {
-                continue;
-            }
-            TestSuite ts = new TestSuite(serObj.getClass().getName());
-            ts.addTest(new JMeterTest("runSerialTest", serObj));
-            suite.addTest(ts);
-        }
-        return suite;
+    static Stream<Serializable> serializableObjects() throws Throwable {
+        return getObjects(Serializable.class)
+                .stream()
+                .map(Serializable.class::cast)
+                .filter(o -> !o.getClass().getName().endsWith("_Stub"));
     }
 
     /*
      * Test serializable elements - test the object
      */
-    public void runSerialTest() throws Exception {
+    @ParameterizedTest
+    @MethodSource("serializableObjects")
+    public void runSerialTest(Serializable serObj) throws Exception {
         if (!(serObj instanceof Component)) {//
             try {
                 ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -531,8 +475,10 @@ public void runSerialTest() throws Exception {
                 ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()));
                 Object readObject = in.readObject();
                 in.close();
-                assertEquals("deserializing class: " + serObj.getClass().getName(), serObj.getClass(), readObject
-                        .getClass());
+                assertEquals(
+                        serObj.getClass(),
+                        readObject.getClass(),
+                        () -> "deserializing class: " + serObj.getClass().getName());
             } catch (Exception e) {
                 fail("serialization of " + serObj.getClass().getName() + " failed: " + e);
             }
@@ -540,9 +486,10 @@ public void runSerialTest() throws Exception {
     }
 
 
-    public void readAliases() throws Exception {
+    @BeforeAll
+    public static void readAliases() throws Exception {
         nameMap = SaveService.loadProperties();
-        assertNotNull("SaveService nameMap (saveservice.properties) should not be null",nameMap);
+        assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
     }
 
     private void checkElementAlias(Object item) {
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
index f076fb32837..f9ee49cc18a 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
@@ -17,29 +17,34 @@
 
 package org.apache.jmeter.testbeans.gui;
 
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
 import org.apache.jmeter.gui.util.JMeterMenuBar;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.reflect.ClassFinder;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /*
  * Find all beans out there and check their resource property files: - Check
  * that non-default property files don't have any extra keys. - Check all
@@ -49,45 +54,17 @@
  * TODO: - Check property files don't have duplicate keys (is this important)
  *
  */
-public final class PackageTest extends JMeterTestCaseJUnit implements Describable {
+@Isolated("modifies jmeter locale")
+public final class PackageTest extends JMeterTestCase {
     private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
 
     private static final Locale defaultLocale = new Locale("en","");
 
-    private final ResourceBundle defaultBundle;
-
-    private final Class<?> testBeanClass;
-
-    private final Locale testLocale;
-
-    private PackageTest(Class<?> testBeanClass, Locale locale, ResourceBundle defaultBundle) {
-        super(testBeanClass.getName() + " - " + locale.getLanguage() + " - " + locale.getCountry());
-        this.testBeanClass = testBeanClass;
-        this.testLocale = locale;
-        this.defaultBundle = defaultBundle;
-    }
-
-    private PackageTest(String name){
-        super(name);
-        this.testBeanClass = null;
-        this.testLocale = null;
-        this.defaultBundle = null;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + testLocale + " " + testBeanClass);
-    }
-
     private BeanInfo beanInfo;
 
     private ResourceBundle bundle;
 
-    @Override
-    public void setUp() {
-        if (testLocale == null) {
-            return;
-        }
+    public void setUp(Class<?> testBeanClass, Locale testLocale) {
         JMeterUtils.setLocale(testLocale);
         Introspector.flushFromCaches(testBeanClass);
         try {
@@ -102,25 +79,23 @@ public void setUp() {
         }
     }
 
-    @Override
+    @AfterEach
     public void tearDown() {
         JMeterUtils.setLocale(Locale.getDefault());
     }
 
-    @Override
-    public void runTest() throws Throwable {
-        if (testLocale == null) {
-            super.runTest();
-            return;
-        }
+    @ParameterizedTest
+    @MethodSource("testBeans")
+    public void runTest(Class<?> testBeanClass, Locale testLocale, ResourceBundle defaultBundle) {
+        setUp(testBeanClass, testLocale);
         if (bundle == defaultBundle) {
-            checkAllNecessaryKeysPresent();
+            checkAllNecessaryKeysPresent(bundle, defaultBundle);
         } else {
-            checkNoInventedKeys();
+            checkNoInventedKeys(bundle, defaultBundle);
         }
     }
 
-    public void checkNoInventedKeys() {
+    public void checkNoInventedKeys(ResourceBundle bundle, ResourceBundle defaultBundle) {
         // Check that all keys in the bundle are also in the default bundle:
         for (Enumeration<String> keys = bundle.getKeys(); keys.hasMoreElements();) {
             String key = keys.nextElement();
@@ -129,7 +104,7 @@ public void checkNoInventedKeys() {
         }
     }
 
-    public void checkAllNecessaryKeysPresent() {
+    public void checkAllNecessaryKeysPresent(ResourceBundle bundle, ResourceBundle defaultBundle) {
         // Check that all necessary keys are there:
 
         // displayName is always mandatory:
@@ -168,15 +143,15 @@ public void checkAllNecessaryKeysPresent() {
         }
     }
 
-    public static Test suite() throws Exception {
-        TestSuite suite = new TestSuite("Bean Resource Test Suite");
+    public static Collection<Arguments> testBeans() throws Exception {
+        Collection<Arguments> suite = new ArrayList<>();
 
         @SuppressWarnings("deprecation")
         List<String> testBeanClassNames = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { TestBean.class });
 
-        boolean errorDetected = false;
         JMeterUtils.setLocale(defaultLocale);
         String defaultLocaleId = defaultLocale.toString();
+        List<Class<?>> beansWithMissingBundle = new ArrayList<>();
         for (String className : testBeanClassNames) {
             Class<?> testBeanClass = Class.forName(className);
             ResourceBundle defaultBundle;
@@ -184,8 +159,7 @@ public static Test suite() throws Exception {
                 defaultBundle = (ResourceBundle) Introspector.getBeanInfo(testBeanClass).getBeanDescriptor().getValue(
                         GenericTestBeanCustomizer.RESOURCE_BUNDLE);
             } catch (IntrospectionException e) {
-                log.error("Can't get beanInfo for {}", testBeanClass, e);
-                throw new Error(e.toString(), e); // Programming error. Don't continue.
+                throw new Error("Can't get beanInfo for " + testBeanClass, e);
             }
 
             if (defaultBundle == null) {
@@ -193,12 +167,11 @@ public static Test suite() throws Exception {
                     log.info("No default bundle found for {}", className);
                     continue;
                 }
-                errorDetected=true;
-                log.error("No default bundle found for {} using {}", className, defaultLocale);
+                beansWithMissingBundle.add(testBeanClass);
                 continue;
             }
 
-            suite.addTest(new PackageTest(testBeanClass, defaultLocale, defaultBundle));
+            suite.add(arguments(testBeanClass, defaultLocale, defaultBundle));
 
             String[] languages = JMeterMenuBar.getLanguages();
             for (String lang : languages) {
@@ -208,25 +181,19 @@ public static Test suite() throws Exception {
                     if (locale.toString().equals(defaultLocaleId)) {
                         continue;
                     }
-                    suite.addTest(new PackageTest(testBeanClass, locale, defaultBundle));
+                    suite.add(arguments(testBeanClass, locale, defaultBundle));
                 } else if (language.length == 2) {
                     Locale locale = new Locale(language[0], language[1]);
                     if (locale.toString().equals(defaultLocaleId)) {
                         continue;
                     }
-                    suite.addTest(new PackageTest(testBeanClass, locale, defaultBundle));
+                    suite.add(arguments(testBeanClass, locale, defaultBundle));
                 }
             }
         }
-
-        if (errorDetected)
-        {
-            suite.addTest(new PackageTest("errorDetected"));
+        if (!beansWithMissingBundle.isEmpty()) {
+            fail("Default resource bundle not found for: " + beansWithMissingBundle);
         }
         return suite;
     }
-
-    public void errorDetected(){
-        fail("One or more errors detected - see log file");
-    }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
index a175459396e..41e40e5ef30 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
@@ -17,54 +17,40 @@
 
 package org.apache.jmeter.testelement;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.jmeter.junit.JMeterTest;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class TestElementTest extends JMeterTestCaseJUnit implements Describable {
-
-    private TestElement testItem;
-
-    public TestElementTest(String testName, TestElement te) {
-        super(testName);// Save the method name
-        testItem = te;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + testItem.getClass());
-    }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+public class TestElementTest extends JMeterTestCase {
     /*
      * Test TestElements - create the suite
      */
-    public static Test suite() throws Throwable {
-        TestSuite suite = new TestSuite("TestElements");
-        for (Object o : JMeterTest.getObjects(TestElement.class)) {
-            TestElement item = (TestElement) o;
-            suite.addTest(new TestElementTest("runTestElement", item));
-        }
-        return suite;
+    public static Collection<Object> testElements() throws Throwable {
+        return JMeterTest.getObjects(TestElement.class);
     }
 
-    /*
-     * Test TestElements - implement the test case
-     */
-    public void runTestElement() throws Exception {
+    @ParameterizedTest
+    @MethodSource("testElements")
+    public void runTestElement(TestElement testItem) throws Exception {
         checkElementCloning(testItem);
         String name = testItem.getClass().getName();
-        assertTrue(name + " must implement Serializable", testItem instanceof Serializable);
+        assertInstanceOf(Serializable.class, testItem, () -> name + " must implement Serializable");
         if (name.startsWith("org.apache.jmeter.examples.")){
             return;
         }
@@ -82,20 +68,19 @@ private static void checkElementCloning(TestElement item) {
         while (iter2.hasNext()) {
             JMeterProperty item2 = iter2.next();
             assertEquals(item2.getStringValue(), clonedItem.getProperty(item2.getName()).getStringValue());
-            assertTrue(item2 != clonedItem.getProperty(item2.getName()));
+            assertNotSame(item2, clonedItem.getProperty(item2.getName()));
         }
     }
 
     private static void cloneTesting(TestElement item, TestElement clonedItem) {
-        assertTrue(item != clonedItem);
-        assertEquals("CLONE-SAME-CLASS: testing " + item.getClass().getName(), item.getClass().getName(), clonedItem
-                .getClass().getName());
+        assertNotSame(item, clonedItem, "Cloned element must be a different instance");
+        assertSame(item.getClass(), clonedItem.getClass(), "Cloned element should have the same class");
     }
 
     private void checkElementAlias(Object item) throws IOException {
         //FIXME do it only once
         Properties nameMap = SaveService.loadProperties();
-        assertNotNull("SaveService nameMap (saveservice.properties) should not be null",nameMap);
+        assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
 
         String name = item.getClass().getName();
         boolean contains = nameMap.values().contains(name);
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt
similarity index 63%
rename from src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
rename to src/dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt
index c1d4f5b4279..f6e8358e91d 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt
@@ -15,11 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.jmeter.junit.categories;
+package org.apache.jmeter.gui
+
+import org.apache.jmeter.testbeans.gui.TestBeanGUI
 
 /**
- * JUnit category marker for tests that could not run in headless mode
+ * Wraps a [JMeterGUIComponent] to provide a better [toString] method.
+ * See https://github.com/junit-team/junit5/issues/1154
  */
-public interface NeedGuiTests {
-    // yeah !
+class GuiComponentHolder(
+    val component: JMeterGUIComponent
+) {
+    override fun toString(): String =
+        if (component is TestBeanGUI) {
+            component.toString()
+        } else {
+            "${component::class.java} $component"
+        }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
index 3b6b25d975b..6b3faeb19c2 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
@@ -18,33 +18,32 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.FileNotFoundException;
 
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.BeanShellInterpreter;
 import org.apache.jmeter.util.JMeterUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test cases for Functions
  */
-public class PackageTest extends JMeterTestCaseJUnit {
+public class PackageTest extends JMeterTestCase {
 
     private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
 
-    public PackageTest(String arg0) {
-        super(arg0);
-    }
-
     // Create the BeanShell function and set its parameters.
     private static BeanShell BSHFParams(String p1, String p2, String p3) throws Exception {
         BeanShell bsh = new BeanShell();
@@ -52,49 +51,20 @@ private static BeanShell BSHFParams(String p1, String p2, String p3) throws Exce
         return bsh;
     }
 
-    public static Test suite() throws Exception {
-        TestSuite allsuites = new TestSuite("Function PackageTest");
-
-        if (!BeanShellInterpreter.isInterpreterPresent()) {
-            final String msg = "BeanShell jar not present, tests ignored";
-            log.warn(msg);
-        } else {
-            TestSuite bsh = new TestSuite("BeanShell");
-            bsh.addTest(new PackageTest("BSH1"));
-            allsuites.addTest(bsh);
-        }
-
-
-        // Reset files
-
-        TestSuite xpath = new TestSuite("XPath");
-        xpath.addTest(new PackageTest("XPathtestColumns"));
-        xpath.addTest(new PackageTest("XPathtestDefault"));
-        xpath.addTest(new PackageTest("XPathtestNull"));
-        xpath.addTest(new PackageTest("XPathtestrowNum"));
-        xpath.addTest(new PackageTest("XPathEmpty"));
-        xpath.addTest(new PackageTest("XPathFile"));
-        xpath.addTest(new PackageTest("XPathFile1"));
-        xpath.addTest(new PackageTest("XPathFile2"));
-        xpath.addTest(new PackageTest("XPathNoFile"));
-
-        allsuites.addTest(xpath);
-
-        return allsuites;
-    }
-
     private JMeterContext jmctx = null;
 
     private JMeterVariables vars = null;
 
-    @Override
+    @BeforeEach
     public void setUp() {
         jmctx = JMeterContextService.getContext();
         jmctx.setVariables(new JMeterVariables());
         vars = jmctx.getVariables();
     }
 
+    @Test
     public void BSH1() throws Exception {
+        assumeTrue(BeanShellInterpreter.isInterpreterPresent(), "BeanShell interpreter is needed for the test");
         String fn = "src/test/resources/org/apache/jmeter/functions/testfiles/BeanShellTest.bsh";
 
         assertThrows(InvalidVariableException.class, () -> BSHFParams(null, null, null));
@@ -160,10 +130,12 @@ public void BSH1() throws Exception {
 
     // XPathFileContainer tests
 
+    @Test
     public void XPathtestNull() throws Exception {
         assertThrows(FileNotFoundException.class, () -> new XPathFileContainer("nosuch.xml", "/"));
     }
 
+    @Test
     public void XPathtestrowNum() throws Exception {
         XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name");
         assertNotNull(f);
@@ -181,10 +153,11 @@ public void XPathtestrowNum() throws Exception {
         assertEquals(3, f.getNextRow());
     }
 
+    @Test
     public void XPathtestColumns() throws Exception {
         XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name");
         assertNotNull(f);
-        assertTrue("Not empty", f.size() > 0);
+        assertTrue(f.size() > 0, "Not empty");
         int last = 0;
         for (int i = 0; i < f.size(); i++) {
             last = f.nextRow();
@@ -194,33 +167,37 @@ public void XPathtestColumns() throws Exception {
 
     }
 
+    @Test
     public void XPathtestDefault() throws Exception {
         XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/@default");
         assertNotNull(f);
-        assertTrue("Not empty", f.size() > 0);
+        assertTrue(f.size() > 0, "Not empty");
         assertEquals("install", f.getXPathString(0));
 
     }
 
+    @Test
     public void XPathEmpty() throws Exception{
         XPath xp = setupXPath("","");
         String val=xp.execute();
-        assertEquals("",val);
+        assertEquals("", val);
         val=xp.execute();
-        assertEquals("",val);
+        assertEquals("", val);
         val=xp.execute();
-        assertEquals("",val);
+        assertEquals("", val);
     }
 
+    @Test
     public void XPathNoFile() throws Exception{
         XPath xp = setupXPath("no-such-file","");
         String val=xp.execute();
-        assertEquals("",val); // TODO - should check that error has been logged...
+        assertEquals("", val); // TODO - should check that error has been logged...
     }
 
+    @Test
     public void XPathFile() throws Exception{
         XPath xp = setupXPath("testfiles/XPathTest2.xml","note/body");
-        assertEquals("Don't forget me this weekend!",xp.execute());
+        assertEquals("Don't forget me this weekend!", xp.execute());
 
         xp = setupXPath("testfiles/XPathTest2.xml","//note2");
         assertEquals("", xp.execute());
@@ -229,29 +206,30 @@ public void XPathFile() throws Exception{
         assertEquals("Tove", xp.execute());
     }
 
+    @Test
     public void XPathFile1() throws Exception{
         XPath xp = setupXPath("testfiles/XPathTest.xml","//user/@username");
-        assertEquals("u1",xp.execute());
-        assertEquals("u2",xp.execute());
-        assertEquals("u3",xp.execute());
-        assertEquals("u4",xp.execute());
-        assertEquals("u5",xp.execute());
-        assertEquals("u1",xp.execute());
+        assertEquals("u1", xp.execute());
+        assertEquals("u2", xp.execute());
+        assertEquals("u3", xp.execute());
+        assertEquals("u4", xp.execute());
+        assertEquals("u5", xp.execute());
+        assertEquals("u1", xp.execute());
     }
 
+    @Test
     public void XPathFile2() throws Exception{
         XPath xp1  = setupXPath("testfiles/XPathTest.xml","//user/@username");
         XPath xp1a = setupXPath("testfiles/XPathTest.xml","//user/@username");
         XPath xp2  = setupXPath("testfiles/XPathTest.xml","//user/@password");
         XPath xp2a = setupXPath("testfiles/XPathTest.xml","//user/@password");
-        assertEquals("u1",xp1.execute());
-        assertEquals("p1",xp2.execute());
-        assertEquals("p2",xp2.execute());
-        assertEquals("u2",xp1a.execute());
-        assertEquals("u3",xp1.execute());
-        assertEquals("u4",xp1.execute());
-        assertEquals("p3",xp2a.execute());
-
+        assertEquals("u1", xp1.execute());
+        assertEquals("p1", xp2.execute());
+        assertEquals("p2", xp2.execute());
+        assertEquals("u2", xp1a.execute());
+        assertEquals("u3", xp1.execute());
+        assertEquals("u4", xp1.execute());
+        assertEquals("p3", xp2a.execute());
     }
 
     private XPath setupXPath(String file, String expr) throws Exception{
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 6e82081a8b1..2b1dd7f1aca 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 plugins {
+    id("java-test-fixtures")
     id("build-logic.jvm-published-library")
 }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
index 0f725bacb81..920e7f68752 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.protocol.http.control;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -27,83 +31,25 @@
 import java.net.URL;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * Class for testing the HTTPMirrorThread, which is handling the
  * incoming requests for the HTTPMirrorServer
  */
-public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
+public class TestHTTPMirrorThread extends JMeterTestCase {
     /** The encodings used for http headers and control information */
     private static final String ISO_8859_1 = "ISO-8859-1"; // $NON-NLS-1$
     private static final String UTF_8 = "UTF-8"; // $NON-NLS-1$
 
     private static final byte[] CRLF = { 0x0d, 0x0a };
     private static final int HTTP_SERVER_PORT = 8181;
+    @RegisterExtension
+    private static final HttpMirrorServerExtension HTTP_MIRROR_SERVER = new HttpMirrorServerExtension(HTTP_SERVER_PORT);
 
-    public TestHTTPMirrorThread(String arg0) {
-        super(arg0);
-    }
-
-    // We need to use a suite in order to preserve the server across test cases
-    // With JUnit4 we could use before/after class annotations
-    public static Test suite(){
-        return new TestSetup(new TestSuite(TestHTTPMirrorThread.class)){
-            private HttpMirrorServer httpServer;
-
-            @Override
-            protected void setUp() throws Exception {
-                httpServer = startHttpMirror(HTTP_SERVER_PORT);
-            }
-
-            @Override
-            protected void tearDown() throws Exception {
-                // Shutdown the http server
-                httpServer.stopServer();
-                httpServer = null;
-            }
-        };
-    }
-
-    /**
-     * Utility method to handle starting the HttpMirrorServer for testing. Also
-     * used by TestHTTPSamplersAgainstHttpMirrorServer
-     *
-     * @param port
-     *            port on which the mirror should be started
-     * @return newly created http mirror server
-     * @throws Exception
-     *             if something fails
-     */
-    public static HttpMirrorServer startHttpMirror(int port) throws Exception {
-        HttpMirrorServer server;
-        server = new HttpMirrorServer(port);
-        server.start();
-        Exception e;
-        for (int i=0; i < 10; i++) {// Wait up to 1 second
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ignored) {
-            }
-            e = server.getException();
-            if (e != null) {// Already failed
-                throw new Exception("Could not start mirror server on port: "+port+". "+e);
-            }
-            if (server.isAlive()) {
-                break; // succeeded
-            }
-        }
-
-        if (!server.isAlive()){
-            throw new Exception("Could not start mirror server on port: "+port);
-        }
-        return server;
-    }
-
+    @Test
     public void testGetRequest() throws Exception {
         // Connect to the http server, and do a simple http get
         Socket clientSocket = new Socket("localhost", HTTP_SERVER_PORT);
@@ -183,6 +129,7 @@ public void testGetRequest() throws Exception {
         clientSocket.close();
     }
 
+    @Test
     public void testPostRequest() throws Exception {
         // Connect to the http server, and do a simple http post
         Socket clientSocket = new Socket("localhost", HTTP_SERVER_PORT);
@@ -337,6 +284,7 @@ public void testPostRequestChunked() throws Exception {
     }
 */
 
+    @Test
     public void testStatus() throws Exception {
         URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -346,6 +294,7 @@ public void testStatus() throws Exception {
         assertEquals("Temporary Redirect", conn.getResponseMessage());
     }
 
+    @Test
     public void testQueryStatus() throws Exception {
         URL url = new URI("http",null,"localhost",HTTP_SERVER_PORT,"/path","status=303 See Other",null).toURL();
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -354,6 +303,7 @@ public void testQueryStatus() throws Exception {
         assertEquals("See Other", conn.getResponseMessage());
     }
 
+    @Test
     public void testQueryRedirect() throws Exception {
         URL url = new URI("http",null,"localhost",HTTP_SERVER_PORT,"/path","redirect=/a/b/c/d?q",null).toURL();
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -361,9 +311,10 @@ public void testQueryRedirect() throws Exception {
         conn.connect();
         assertEquals(302, conn.getResponseCode());
         assertEquals("Temporary Redirect", conn.getResponseMessage());
-        assertEquals("/a/b/c/d?q",conn.getHeaderField("Location"));
+        assertEquals("/a/b/c/d?q", conn.getHeaderField("Location"));
     }
 
+    @Test
     public void testHeaders() throws Exception {
         URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -371,10 +322,11 @@ public void testHeaders() throws Exception {
         conn.connect();
         assertEquals(200, conn.getResponseCode());
         assertEquals("OK", conn.getResponseMessage());
-        assertEquals("/abcd",conn.getHeaderField("Location"));
-        assertEquals("none",conn.getHeaderField("X-Dummy"));
+        assertEquals("/abcd", conn.getHeaderField("Location"));
+        assertEquals("none", conn.getHeaderField("X-Dummy"));
     }
 
+    @Test
     public void testResponseLength() throws Exception {
         URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -385,14 +337,16 @@ public void testResponseLength() throws Exception {
         inputStream.close();
     }
 
+    @Test
     public void testCookie() throws Exception {
         URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.addRequestProperty("X-SetCookie", "four=2*2");
         conn.connect();
-        assertEquals("four=2*2",conn.getHeaderField("Set-Cookie"));
+        assertEquals("four=2*2", conn.getHeaderField("Set-Cookie"));
     }
 
+    @Test
     public void testSleep() throws Exception {
         URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -405,7 +359,7 @@ public void testSleep() throws Exception {
         while(inputStream.read() != -1) {} // CHECKSTYLE IGNORE EmptyBlock
         inputStream.close();
         final long elapsed = (System.nanoTime() - now)/200000L;
-        assertTrue("Expected > 180 " + elapsed, elapsed >= 180);
+        assertTrue(elapsed >= 180, "Expected > 180 " + elapsed);
     }
 
     /**
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
index 513bf0d3b0d..8f45efa147e 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
@@ -17,16 +17,12 @@
 
 package org.apache.jmeter.protocol.http.control.gui;
 
-import org.apache.jmeter.junit.categories.NeedGuiTests;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-@Category(NeedGuiTests.class)
 public class TestHttpTestSampleGui {
-
     private HttpTestSampleGui gui;
 
     @BeforeEach
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index b76ebc3f7c9..2a14fcc5cc1 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.protocol.http.parser;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,21 +37,25 @@
 import java.util.Properties;
 import java.util.Vector;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 
-import junit.framework.TestSuite;
-
-public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
+@Isolated
+public class TestHTMLParser extends JMeterTestCase {
     private static final Logger log = LoggerFactory.getLogger(TestHTMLParser.class);
 
     private static final String DEFAULT_UA  = "Apache-HttpClient/4.2.6";
@@ -60,31 +68,6 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
     private static final String UA_IE9      = "Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))";
     private static final String UA_IE10     = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)";
 
-    public TestHTMLParser(String arg0) {
-        super(arg0);
-    }
-
-    private String parserName;
-
-    private int testNumber = 0;
-
-
-    public TestHTMLParser(String name, int test) {
-        super(name);
-        testNumber = test;
-    }
-
-    public TestHTMLParser(String name, String parser, int test) {
-        super(name);
-        testNumber = test;
-        parserName = parser;
-    }
-
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + testNumber + " " + parserName);
-    }
-
     private static class StaticTestClass // Can't instantiate
     {
         private StaticTestClass() {
@@ -148,6 +131,10 @@ private TestData(String htmlFileName, String baseUrl, String expectedSet, String
         "org.apache.jmeter.protocol.http.parser.JsoupBasedHtmlParser"
         };
 
+    static String[] getParsers() {
+        return PARSERS;
+    }
+
     private static final TestData[] TESTS = new TestData[] {
             new TestData("testfiles/HTMLParserTestCase.html",
                     "http://localhost/mydir/myfile.html",
@@ -260,38 +247,21 @@ private TestData(String htmlFileName, String baseUrl, String expectedSet, String
                 UA_IE6)
     };
 
-    public static junit.framework.Test suite() {
-        TestSuite suite = new TestSuite("TestHTMLParser");
-        suite.addTest(new TestHTMLParser("testDefaultParser"));
-        suite.addTest(new TestHTMLParser("testParserDefault"));
-        suite.addTest(new TestHTMLParser("testParserMissing"));
-        suite.addTest(new TestHTMLParser("testNotParser"));
-        suite.addTest(new TestHTMLParser("testNotCreatable"));
-        suite.addTest(new TestHTMLParser("testNotCreatableStatic"));
-        for (String parser : PARSERS) {
-            TestSuite ps = new TestSuite(parser);// Identify subtests
-            ps.addTest(new TestHTMLParser("testParserProperty", parser, 0));
-            for (int j = 0; j < TESTS.length; j++) {
-                TestSuite ts = new TestSuite(TESTS[j].fileName);
-                ts.addTest(new TestHTMLParser("testParserSet", parser, j));
-                ts.addTest(new TestHTMLParser("testParserList", parser, j));
-                ps.addTest(ts);
-            }
-            suite.addTest(ps);
-        }
+    static Stream<Arguments> parsersAndTestNumbers() {
+        return Stream.of(PARSERS)
+                .flatMap(parser -> IntStream.range(0, TESTS.length)
+                        .mapToObj(testNumber -> arguments(parser, testNumber)));
+    }
 
-        TestSuite ps = new TestSuite(DEFAULT_JMETER_PARSER+"_conditional_comments");// Identify subtests
-        for (int j = 0; j < SPECIFIC_PARSER_TESTS.length; j++) {
-            TestSuite ts = new TestSuite(SPECIFIC_PARSER_TESTS[j].fileName);
-            ts.addTest(new TestHTMLParser("testSpecificParserList", DEFAULT_JMETER_PARSER, j));
-            ps.addTest(ts);
-        }
-        suite.addTest(ps);
-        return suite;
+    static Stream<Arguments> specificParserTests() {
+        return IntStream.range(0, SPECIFIC_PARSER_TESTS.length)
+                        .mapToObj(testNumber -> arguments(DEFAULT_JMETER_PARSER, testNumber));
     }
 
     // Test if can instantiate parser using property name
-    public void testParserProperty() throws Exception {
+    @ParameterizedTest
+    @MethodSource("getParsers")
+    public void testParserProperty(String parserName) throws Exception {
         Properties p = JMeterUtils.getJMeterProperties();
         if (p == null) {
             p = JMeterUtils.getProperties("jmeter.properties");
@@ -300,14 +270,17 @@ public void testParserProperty() throws Exception {
         BaseParser.getParser(p.getProperty(HTMLParser.PARSER_CLASSNAME));
     }
 
+    @Test
     public void testDefaultParser() throws Exception {
         BaseParser.getParser(JMeterUtils.getPropDefault(HTMLParser.PARSER_CLASSNAME, HTMLParser.DEFAULT_PARSER));
     }
 
+    @Test
     public void testParserDefault() throws Exception {
         BaseParser.getParser(HTMLParser.DEFAULT_PARSER);
     }
 
+    @Test
     public void testParserMissing() throws Exception {
         try {
             BaseParser.getParser("no.such.parser");
@@ -319,6 +292,7 @@ public void testParserMissing() throws Exception {
         }
     }
 
+    @Test
     public void testNotParser() throws Exception {
         try {
             HTMLParser.getParser("java.lang.String");
@@ -331,6 +305,7 @@ public void testNotParser() throws Exception {
         }
     }
 
+    @Test
     public void testNotCreatable() throws Exception {
         try {
             HTMLParser.getParser(TestClass.class.getName());
@@ -343,6 +318,7 @@ public void testNotCreatable() throws Exception {
         }
     }
 
+    @Test
     public void testNotCreatableStatic() throws Exception {
         try {
             HTMLParser.getParser(StaticTestClass.class.getName());
@@ -358,20 +334,26 @@ public void testNotCreatableStatic() throws Exception {
         }
     }
 
-    public void testParserSet() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parsersAndTestNumbers")
+    public void testParserSet(String parserName, int testNumber) throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedSet, null,
                 false, TESTS[testNumber].userAgent);
     }
 
     @SuppressWarnings("JdkObsolete")
-    public void testParserList() throws Exception {
+    @ParameterizedTest
+    @MethodSource("parsersAndTestNumbers")
+    public void testParserList(String parserName, int testNumber) throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedList,
                 new Vector<>(), true, TESTS[testNumber].userAgent);
     }
 
-    public void testSpecificParserList() throws Exception {
+    @ParameterizedTest
+    @MethodSource("specificParserTests")
+    public void testSpecificParserList(String parserName, int testNumber) throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
                 SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
@@ -407,7 +389,7 @@ private static void filetest(HTMLParser p, String file, String url, String resul
             Collections.sort(actual);
         }
 
-        assertEquals("userAgent=" + userAgent + ", fname=" + fname + ", parserName=" + parserName, expected, actual);
+        assertEquals(expected, actual, "userAgent=" + userAgent + ", fname=" + fname + ", parserName=" + parserName);
     }
 
     // Get expected results as a List
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
index 45f7cecefa9..0353213826f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
@@ -20,14 +20,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.junit.categories.NeedGuiTests;
 import org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui;
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Test;
 
-@Category(NeedGuiTests.class)
 public class PackageTest {
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
index 5d0fb9f244a..fb1c2fe798f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
@@ -26,7 +26,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jorphan.test.JMeterSerialTest;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -42,7 +42,7 @@ private static Stream<Arguments> getImplementations() {
     }
 
     @ParameterizedTest(name="Run {index}: implementation:{0}")
-    @Ignore(value = "Test produces: We should have at least one sample result, we had none too often")
+    @Disabled(value = "Test produces: We should have at least one sample result, we had none too often")
     @MethodSource("getImplementations")
     void testBug63364(String implementation) {
         TestPlan plan = new TestPlan();
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 1467ce5affe..76cc184a29a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -17,23 +17,27 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Locale;
 import java.util.regex.Matcher;
 
 import org.apache.jmeter.engine.util.ValueReplacer;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit;
-import org.apache.jmeter.protocol.http.control.HttpMirrorServer;
-import org.apache.jmeter.protocol.http.control.TestHTTPMirrorThread;
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jmeter.protocol.http.control.HttpMirrorServerExtension;
 import org.apache.jmeter.protocol.http.util.EncoderCache;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -47,20 +51,19 @@
 import org.apache.oro.text.regex.PatternMatcherInput;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
-import org.junit.Assert;
-import org.junit.runner.Describable;
-import org.junit.runner.Description;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /**
  * Class for performing actual samples for HTTPSampler and HTTPSampler2.
  * The samples are executed against the HttpMirrorServer, which is
  * started when the unit tests are executed.
  */
-public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit implements Describable {
+public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCase {
     private static final java.util.regex.Pattern EMPTY_LINE_PATTERN = java.util.regex.Pattern.compile("^$",
             java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
     private static final int HTTP_SAMPLER = 0;
@@ -76,124 +79,98 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
 
     private static final byte[] CRLF = {0x0d, 0x0A};
     private static final int MIRROR_PORT = 8182; // Different from TestHTTPMirrorThread port and standard mirror server
+    @RegisterExtension
+    private static final HttpMirrorServerExtension HTTP_MIRROR_SERVER = new HttpMirrorServerExtension(MIRROR_PORT);
     private static byte[] TEST_FILE_CONTENT;
 
-    private static File temporaryFile;
+    @TempDir
+    private static File tempDirectory;
 
-    private final int item;
+    private static File temporaryFile;
 
     private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
             "jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
 
-    public TestHTTPSamplersAgainstHttpMirrorServer(String arg0) {
-        super(arg0);
-        this.item = -1;
-    }
-
-    // additional ctor for processing tests which use int parameters
-    public TestHTTPSamplersAgainstHttpMirrorServer(String arg0, int item) {
-        super(arg0);
-        this.item = item;
-    }
 
-    @Override
-    public Description getDescription() {
-        return Description.createTestDescription(getClass(), getName() + " " + item);
-    }
+    @BeforeAll
+    static void setup() throws IOException {
+        // Create the test file content
+        TEST_FILE_CONTENT = "some foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
+                .getBytes(StandardCharsets.UTF_8);
 
-    // This is used to emulate @before class and @after class
-    public static Test suite() {
-        final TestSuite testSuite = new TestSuite(TestHTTPSamplersAgainstHttpMirrorServer.class);
-        // Add parameterised tests. For simplicity we assume each has cases 0-10
-        for (int i = 0; i < 11; i++) {
-            testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testGetRequest_Parameters", i));
-            testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testGetRequest_Parameters3", i));
-
-            testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testPostRequest_UrlEncoded", i));
-            testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testPostRequest_UrlEncoded3", i));
-        }
-
-        return new TestSetup(testSuite) {
-            private HttpMirrorServer httpServer;
-
-            @Override
-            protected void setUp() throws Exception {
-                httpServer = TestHTTPMirrorThread.startHttpMirror(MIRROR_PORT);
-                // Create the test file content
-                TEST_FILE_CONTENT = "some foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
-                        .getBytes(StandardCharsets.UTF_8);
-
-                // create a temporary file to make sure we always have a file to give to the PostWriter
-                // Wherever we are or whatever the current path is.
-                temporaryFile = File.createTempFile("TestHTTPSamplersAgainstHttpMirrorServer", "tmp");
-                OutputStream output = new FileOutputStream(temporaryFile);
-                output.write(TEST_FILE_CONTENT);
-                output.flush();
-                output.close();
-            }
-
-            @Override
-            protected void tearDown() {
-                // Shutdown mirror server
-                httpServer.stopServer();
-                httpServer = null;
-                if (!temporaryFile.delete()) {
-                    Assert.fail("Could not delete file:" + temporaryFile.getAbsolutePath());
-                }
-            }
-        };
+        // create a temporary file to make sure we always have a file to give to the PostWriter
+        // Wherever we are or whatever the current path is.
+        temporaryFile = new File(tempDirectory, "TestHTTPSamplersAgainstHttpMirrorServer.tmp");
+        Files.write(temporaryFile.toPath(), TEST_FILE_CONTENT);
     }
 
-    public void itemised_testPostRequest_UrlEncoded() throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+    public void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER, ISO_8859_1, item);
     }
 
-    public void itemised_testPostRequest_UrlEncoded3() throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+    public void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER3, US_ASCII, item);
     }
 
+    @Test
     public void testPostRequest_FormMultipart_0() throws Exception {
         testPostRequest_FormMultipart(HTTP_SAMPLER);
     }
 
+    @Test
     public void testPostRequest_FormMultipart3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FormMultipart(HTTP_SAMPLER3);
     }
 
+    @Test
     public void testPostRequest_FileUpload() throws Exception {
         testPostRequest_FileUpload(HTTP_SAMPLER);
     }
 
+    @Test
     public void testPostRequest_FileUpload3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FileUpload(HTTP_SAMPLER3);
     }
 
+    @Test
     public void testPostRequest_BodyFromParameterValues() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER, ISO_8859_1);
     }
 
+    @Test
     public void testPostRequest_BodyFromParameterValues3() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
 
+    @Test
     public void testGetRequest() throws Exception {
         testGetRequest(HTTP_SAMPLER);
     }
 
+    @Test
     public void testGetRequest3() throws Exception {
         testGetRequest(HTTP_SAMPLER3);
     }
 
-    public void itemised_testGetRequest_Parameters() throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+    public void itemised_testGetRequest_Parameters(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER, item);
     }
 
-    public void itemised_testGetRequest_Parameters3() throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+    public void itemised_testGetRequest_Parameters3(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER3, item);
     }
 
+    @Test
     public void testPutRequest_BodyFromParameterValues3() throws Exception {
         testPutRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
@@ -948,7 +925,7 @@ private void checkPostRequestFileUpload(
         // Check response headers
         checkHeaderContentType(headersSent, "multipart/form-data" + "; boundary=" + boundaryString);
         byte[] bodySent = getBodySent(res.getResponseData());
-        assertNotNull("Sent body should not be null", bodySent);
+        assertNotNull(bodySent, "Sent body should not be null");
         // Check post body which was sent to the mirror server, and
         // sent back by the mirror server
         checkArraysHaveSameContent(expectedPostBody, bodySent, contentEncoding, res);
@@ -1177,10 +1154,10 @@ private boolean isInRequestHeaders(String requestHeaders, String headerName, Str
     private void checkHeaderContentType(String requestHeaders, String contentType) {
         if (contentType == null) {
             boolean isPresent = checkRegularExpression(requestHeaders, HTTPConstants.HEADER_CONTENT_TYPE + ": .*");
-            assertFalse("Expected no Content-Type in request headers:\n" + requestHeaders, isPresent);
+            assertFalse(isPresent, "Expected no Content-Type in request headers:\n" + requestHeaders);
         } else {
             boolean typeOK = isInRequestHeaders(requestHeaders, HTTPConstants.HEADER_CONTENT_TYPE, contentType);
-            assertTrue("Expected type:" + contentType + " in request headers:\n" + requestHeaders, typeOK);
+            assertTrue(typeOK, "Expected type:" + contentType + " in request headers:\n" + requestHeaders);
         }
     }
 
diff --git a/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt b/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt
new file mode 100644
index 00000000000..6375a595229
--- /dev/null
+++ b/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.control
+
+import org.junit.jupiter.api.extension.AfterAllCallback
+import org.junit.jupiter.api.extension.BeforeAllCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+
+/**
+ * JUnit 5 extension to start and stop [HttpMirrorServer] for testing.
+ * Typical usage:
+ *
+ * ```java
+ * @RegisterExtension
+ * HttpMirrorServerExtension httpMirrorServer = new HttpMirrorServerExtension(8181);
+ * ```
+ *
+ * See https://junit.org/junit5/docs/current/user-guide/#extensions-registration-programmatic
+ */
+public class HttpMirrorServerExtension(
+    val serverPort: Int
+) : BeforeAllCallback, AfterAllCallback {
+    private val NAMESPACE =
+        ExtensionContext.Namespace.create(HttpMirrorServerExtension::class.java)
+
+    /**
+     * Utility method to handle starting the [HttpMirrorServer] for testing.
+     *
+     * @param port
+     * port on which the mirror should be started
+     * @return newly created http mirror server
+     * @throws Exception
+     * if something fails
+     */
+    @Throws(InterruptedException::class)
+    fun startHttpMirror(): HttpMirrorServer {
+        val server = HttpMirrorServer(serverPort)
+        server.start()
+        for (i in 0..9) { // Wait up to 1 second
+            Thread.sleep(100)
+            server.exception?.let { e ->
+                throw Exception("Could not start mirror server on port: $serverPort", e)
+            }
+            if (server.isAlive) {
+                break // succeeded
+            }
+        }
+
+        if (!server.isAlive) {
+            throw Exception("Could not start mirror server on port: $serverPort")
+        }
+        return server
+    }
+
+    private fun getStore(context: ExtensionContext): ExtensionContext.Store {
+        return context.getStore(NAMESPACE)
+    }
+
+    private fun getServer(context: ExtensionContext): HttpMirrorServer? {
+        return getStore(context).get("server", HttpMirrorServer::class.java)
+    }
+
+    override fun beforeAll(context: ExtensionContext) {
+        val server = startHttpMirror()
+        getStore(context).put("server", server)
+    }
+
+    override fun afterAll(context: ExtensionContext) {
+        getServer(context)?.let {
+            it.stopServer()
+            it.interrupt()
+        }
+    }
+}
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
index d91c0bd2e43..9feba1ac6ad 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
@@ -20,8 +20,6 @@
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
-import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -30,13 +28,75 @@
 import java.nio.charset.StandardCharsets;
 
 import org.apache.jmeter.threads.JMeterVariables;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
+import org.hamcrest.TypeSafeMatcher;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class BinaryMessageRendererTest extends MessageRendererTest<byte[]> {
+    public static class ThrowableMessageMatcher<T extends Throwable> extends
+            TypeSafeMatcher<T> {
+
+        private final Matcher<String> matcher;
+
+        public ThrowableMessageMatcher(Matcher<String> matcher) {
+            this.matcher = matcher;
+        }
+
+        public void describeTo(Description description) {
+            description.appendText("exception with message ");
+            description.appendDescriptionOf(matcher);
+        }
+
+        @Override
+        protected boolean matchesSafely(T item) {
+            return matcher.matches(item.getMessage());
+        }
+
+        @Override
+        protected void describeMismatchSafely(T item, Description description) {
+            description.appendText("message ");
+            matcher.describeMismatch(item.getMessage(), description);
+        }
+    }
+
+    public static class ThrowableCauseMatcher<T extends Throwable> extends
+            TypeSafeMatcher<T> {
+
+        private final Matcher<?> causeMatcher;
+
+        public ThrowableCauseMatcher(Matcher<?> causeMatcher) {
+            this.causeMatcher = causeMatcher;
+        }
+
+        public void describeTo(Description description) {
+            description.appendText("exception with cause ");
+            description.appendDescriptionOf(causeMatcher);
+        }
+
+        @Override
+        protected boolean matchesSafely(T item) {
+            return causeMatcher.matches(item.getCause());
+        }
+
+        @Override
+        protected void describeMismatchSafely(T item, Description description) {
+            description.appendText("cause ");
+            causeMatcher.describeMismatch(item.getCause(), description);
+        }
+    }
+
+    public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
+        return new ThrowableMessageMatcher<T>(matcher);
+    }
+
+    public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
+        return new ThrowableCauseMatcher<T>(matcher);
+    }
 
     private BinaryMessageRenderer render = RendererFactory.getInstance().getBinary();
 

From be645a23c53a77002f0d009a9bf7789402051c6f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 13 Dec 2023 20:07:44 +0300
Subject: [PATCH 0745/1037] docs: update changelog for 5.6.3

---
 src/dist/src/dist/expected_release_jars.csv | 116 ++++++++++----------
 xdocs/changes.xml                           |  91 ++++++++++++++-
 2 files changed, 143 insertions(+), 64 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c1ec956f3a8..a6b456bff17 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,8 +1,7 @@
-29904,accessors-smart-2.4.11.jar
-30651,annotations-24.0.1.jar
+29901,accessors-smart-2.5.0.jar
+30570,annotations-24.1.0.jar
 6806,apiguardian-api-1.1.2.jar
-121863,asm-9.5.jar
-582588,base-portable-jvm-3.2.0.jar
+123598,asm-9.6.jar
 485898,batik-anim-1.16.jar
 424607,batik-awt-util-1.16.jar
 704905,batik-bridge-1.16.jar
@@ -24,20 +23,21 @@
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
-224450,checker-qual-3.35.0.jar
-353793,commons-codec-1.15.jar
+230830,checker-qual-3.42.0.jar
+360738,commons-codec-1.16.0.jar
 588337,commons-collections-3.2.2.jar
 751914,commons-collections4-4.4.jar
 211301,commons-dbcp2-2.9.0.jar
-474305,commons-io-2.12.0.jar
+501218,commons-io-2.15.1.jar
 267634,commons-jexl-2.1.1.jar
 462124,commons-jexl3-3.2.1.jar
-587402,commons-lang3-3.12.0.jar
-61829,commons-logging-1.2.jar
+760623,commons-jvm-4.1.0.jar
+657952,commons-lang3-3.14.0.jar
+70816,commons-logging-1.3.0.jar
 2213560,commons-math3-3.6.1.jar
-316431,commons-net-3.9.0.jar
-145516,commons-pool2-2.11.1.jar
-238400,commons-text-1.10.0.jar
+322780,commons-net-3.10.0.jar
+150048,commons-pool2-2.12.0.jar
+246659,commons-text-1.11.0.jar
 1547509,darklaf-core-2.7.3.jar
 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
 93477,darklaf-macos-2.7.3.jar
@@ -47,80 +47,81 @@
 89456,darklaf-theme-2.7.3.jar
 69133,darklaf-utils-2.7.3.jar
 217795,darklaf-windows-2.7.3.jar
+353322,datamodel-jvm-4.1.0.jar
 98115,dec-0.1.2.jar
+95287,deprecated-in-v4-jvm-4.1.0.jar
 320748,dnsjava-2.1.9.jar
-16826,error_prone_annotations-2.20.0.jar
+16829,error_prone_annotations-2.24.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8038657,groovy-3.0.17.jar
-15178,groovy-datetime-3.0.17.jar
-7405,groovy-dateutil-3.0.17.jar
-132953,groovy-jmx-3.0.17.jar
-128879,groovy-json-3.0.17.jar
-16838,groovy-jsr223-3.0.17.jar
-78915,groovy-sql-3.0.17.jar
-94160,groovy-templates-3.0.17.jar
-291717,groovy-xml-3.0.17.jar
+8046016,groovy-3.0.20.jar
+15172,groovy-datetime-3.0.20.jar
+7400,groovy-dateutil-3.0.20.jar
+132982,groovy-jmx-3.0.20.jar
+128872,groovy-json-3.0.20.jar
+16832,groovy-jsr223-3.0.20.jar
+78909,groovy-sql-3.0.20.jar
+94157,groovy-templates-3.0.20.jar
+291709,groovy-xml-3.0.20.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
-839626,httpclient5-5.2.1.jar
+861640,httpclient5-5.3.jar
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
-852871,httpcore5-5.2.jar
-236827,httpcore5-h2-5.2.jar
+855013,httpcore5-5.2.4.jar
+237145,httpcore5-h2-5.2.4.jar
 41727,httpmime-4.5.14.jar
-75567,jackson-annotations-2.15.2.jar
-549207,jackson-core-2.15.2.jar
-1620088,jackson-databind-2.15.2.jar
+78480,jackson-annotations-2.16.1.jar
+578125,jackson-core-2.16.1.jar
+1637611,jackson-databind-2.16.1.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
-490571,jmespath-core-0.5.1.jar
-7066,jmespath-jackson-0.5.1.jar
+489286,jmespath-core-0.6.0.jar
+7090,jmespath-jackson-0.6.0.jar
 403497,jodd-core-5.0.13.jar
 220475,jodd-lagarto-5.0.13.jar
 19858,jodd-log-5.0.13.jar
 26047,jodd-props-5.0.13.jar
 277582,json-path-2.8.0.jar
-120205,json-smart-2.4.11.jar
-443295,jsoup-1.16.1.jar
+120233,json-smart-2.5.0.jar
+473788,jsoup-1.17.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
-1670469,kotlin-stdlib-1.8.22.jar
-221491,kotlin-stdlib-common-1.8.22.jar
-963,kotlin-stdlib-jdk7-1.8.22.jar
-969,kotlin-stdlib-jdk8-1.8.22.jar
-1548432,kotlinx-coroutines-core-jvm-1.7.1.jar
-9964,kotlinx-coroutines-swing-1.7.1.jar
-792176,kotlinx-html-jvm-0.7.3.jar
-199113,lets-plot-batik-3.2.0.jar
-4918373,lets-plot-common-3.2.0.jar
-344375,log4j-1.2-api-2.20.0.jar
-313296,log4j-api-2.20.0.jar
-1847550,log4j-core-2.20.0.jar
-23862,log4j-slf4j-impl-2.20.0.jar
+1718956,kotlin-stdlib-1.9.22.jar
+959,kotlin-stdlib-jdk7-1.9.10.jar
+965,kotlin-stdlib-jdk8-1.9.10.jar
+1551152,kotlinx-coroutines-core-jvm-1.7.3.jar
+9964,kotlinx-coroutines-swing-1.7.3.jar
+996,lets-plot-batik-4.1.0.jar
+996,lets-plot-common-4.1.0.jar
+356564,log4j-1.2-api-2.22.1.jar
+335001,log4j-api-2.22.1.jar
+1900022,log4j-core-2.22.1.jar
+24583,log4j-slf4j-impl-2.22.1.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
-419054,mongo-java-driver-2.11.3.jar
+613352,mongo-java-driver-2.14.3.jar
 29680,mxparser-1.2.2.jar
-5052937,neo4j-java-driver-4.4.11.jar
+5223562,neo4j-java-driver-4.4.13.jar
 65261,oro-2.0.8.jar
 1314621,ph-commons-10.2.5.jar
 530791,ph-css-6.5.0.jar
-1256127,plot-api-jvm-4.4.1.jar
-1169629,plot-base-portable-jvm-3.2.0.jar
-1096918,plot-builder-portable-jvm-3.2.0.jar
-206691,plot-common-portable-jvm-3.2.0.jar
-923713,plot-config-portable-jvm-3.2.0.jar
+133403,platf-awt-jvm-4.1.0.jar
+81351,platf-batik-jvm-4.1.0.jar
+1353287,plot-api-jvm-4.5.0.jar
+1614468,plot-base-jvm-4.1.0.jar
+1283358,plot-builder-jvm-4.1.0.jar
+969648,plot-stem-jvm-4.1.0.jar
 11640,reactive-streams-1.0.4.jar
 1383644,rhino-1.7.14.jar
-1297243,rsyntaxtextarea-3.3.3.jar
-5098540,Saxon-HE-11.5.jar
+1297525,rsyntaxtextarea-3.3.4.jar
+5104657,Saxon-HE-11.6.jar
 283536,serializer-2.7.3.jar
 41125,slf4j-api-1.7.36.jar
 320794,svgSalamander-1.1.4.jar
@@ -128,13 +129,12 @@
 2539,swing-extensions-visual-padding-0.1.3.jar
 736051,tika-core-1.28.5.jar
 1588025,tika-parsers-1.28.5.jar
-183438,vis-svg-portable-jvm-3.2.0.jar
 3455761,xalan-2.7.3.jar
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
-676840,xmlgraphics-commons-2.8.jar
+678189,xmlgraphics-commons-2.9.jar
 7188,xmlpull-1.1.3.1.jar
-1027769,xmlresolver-4.6.4-data.jar
-157695,xmlresolver-4.6.4.jar
+1027769,xmlresolver-5.2.1-data.jar
+165689,xmlresolver-5.2.1.jar
 644649,xstream-1.4.20.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e8a7254b474..ef7546a9c2f 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -62,17 +62,96 @@ Summary
 <li><a href="#Bug fixes">Bug fixes</a></li>
 </ul>
 
+  <ch_section>Improvements</ch_section>
+  <h3>General</h3>
+  <ul>
+    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>TransactionController</code> "generate parent sample", and "include timers" checkboxes</li>
+    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>ThreadGroupGui</code> "scheduler" checkbox</li>
+    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>HTTP Request</code> "retrieve embedded resources", "download resources concurrently", and "store as MD5" checkboxes</li>
+  </ul>
+
  <!-- =================== Bug fixes =================== -->
 
 <ch_section>Bug fixes</ch_section>
 
 <h3>General</h3>
 <ul>
+  <li><issue>6043</issue><pr>6044</pr>JMeter 5.6 shows 0 as a min response time in summary report</li>
   <li>Restored binary API compatibility with pre-5.6.2: restore public methods to non-static as they were before 5.6.2 <code>JavaSamplerContext.getJMeterVariables</code>,
     <code>JavaSamplerContext.getJMeterProperties</code>, <code>BoundaryExtractor.extractAll</code>,
     <code>AuthManager.setupCredentials</code>, <code>HttpRequestHdr.getMultipartConfig</code>, (regression since 5.6.2)</li>
+  <li><issue>6165</issue><pr>6192</pr>The Constant Throughput Timer is throwing a NullPointerException when using variables (vars.get) in "Target Throughput"-field</li>
+  <li><issue>6162</issue>The Constant Timer is throwing a NullPointerException when using variables (vars.get) in "delay"-field</li>
+  <li><pr>6193</pr>Log errors happening while JMeter starts the test (previously, errors from TestStateListener.testStarted were not logged)</li>
 </ul>
 
+<ch_section>Non-functional changes</ch_section>
+<ul>
+  <li><pr>6166</pr>Use Gradle to 8.5 for building JMeter</li>
+  <li>Require Java 17 for building JMeter </li>
+  <li><pr>6199</pr>Improved API for programmatic test plan creation, see default implementations of <code>createTestElement</code>, <code>modifyTestElement</code>,
+    and new <code>makeTestElement</code> and <code>assignDefaultValues</code> methods in <code>JMeterGUIComponent</code>.
+    <code>AbstractJMeterGuiComponent.configureTestElement</code> is now discouraged</li>
+  <li><pr>6212</pr>Refactor: migrate existing Groovy tests to Kotlin, remove Groovy compiler from the build pipeline</li>
+  <li><pr>6214</pr>Refactor JUnit 3 and JUnit 4 tests to JUnit 5, remove JUnit 4 test dependency</li>
+</ul>
+
+  <ch_section>Dependency upgrades</ch_section>
+  <ul>
+    <li>Update com.fasterxml.jackson.core:jackson-annotations to 2.16.1 (was 2.15.2)</li>
+    <li>Update com.fasterxml.jackson.core:jackson-core to 2.16.1 (was 2.15.2)</li>
+    <li>Update com.fasterxml.jackson.core:jackson-databind to 2.16.1 (was 2.15.2)</li>
+    <li>Update com.fifesoft:rsyntaxtextarea to 3.3.4 (was 3.3.3)</li>
+    <li>Update com.google.errorprone:error_prone_annotations to 2.24.0 (was 2.20.0)</li>
+    <li>Update commons-codec:commons-codec to 1.16.0 (was 1.15)</li>
+    <li>Update commons-io:commons-io to 2.15.1 (was 2.12.0)</li>
+    <li>Update commons-logging:commons-logging to 1.3.0 (was 1.2)</li>
+    <li>Update commons-net:commons-net to 3.9.0 (was 3.10.0)</li>
+    <li>Update io.burt:jmespath-core to 0.6.0 (was 0.5.1)</li>
+    <li>Update io.burt:jmespath-jackson to 0.6.0 (was 0.5.1)</li>
+    <li>Update net.minidev:accessors-smart to 2.5.0 (was 2.4.11)</li>
+    <li>Update net.minidev:json-smart to 2.5.0 (was 2.4.11)</li>
+    <li>Update net.sf.saxon:Saxon-HE to 11.6 (was 11.5)</li>
+    <li>Update org.apache.commons:commons-lang3 to 3.14.0 (was 3.12.0)</li>
+    <li>Update org.apache.commons:commons-pool2 to 2.12.0 (was 2.11.1)</li>
+    <li>Update org.apache.commons:commons-text to 1.11.0 (was 1.10.0)</li>
+    <li>Update org.apache.httpcomponents.client5:httpclient5 to 5.3 (was 5.2.1)</li>
+    <li>Update org.apache.httpcomponents.core5:httpcore5-h2 to 5.2.4 (was 5.2)</li>
+    <li>Update org.apache.httpcomponents.core5:httpcore5 to 5.2.4 (was 5.2)</li>
+    <li>Update org.apache.logging.log4j:log4j-1.2-api to 2.22.1 (was 2.20.0)</li>
+    <li>Update org.apache.logging.log4j:log4j-api to 2.22.1 (was 2.20.0)</li>
+    <li>Update org.apache.logging.log4j:log4j-core to 2.22.1 (was 2.20.0)</li>
+    <li>Update org.apache.logging.log4j:log4j-slf4j-impl to 2.22.1 (was 2.20.0)</li>
+    <li>Update org.apache.xmlgraphics:xmlgraphics-commons to 2.9 (was 2.8)</li>
+    <li>Update org.checkerframework:checker-qual to 3.42.0 (was 3.35.0)</li>
+    <li>Update org.codehaus.groovy:groovy-datetime to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-dateutil to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-jmx to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-json to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-jsr223 to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-sql to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-templates to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy-xml to 3.0.20 (was 3.0.17)</li>
+    <li>Update org.codehaus.groovy:groovy to 3.0.20 (was 3.0.17)</li>
+    <li>Remove org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22</li>
+    <li>Update org.jetbrains.kotlin:kotlin-stdlib-jdk7 to 1.9.10 (was 1.8.22)</li>
+    <li>Update org.jetbrains.kotlin:kotlin-stdlib-jdk8 to 1.9.10 (was 1.8.22)</li>
+    <li>Update org.jetbrains.kotlin:kotlin-stdlib to 1.9.22 (was 1.8.22)</li>
+    <li>Update org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm to 1.7.3 (was 1.7.1)</li>
+    <li>Update org.jetbrains.kotlinx:kotlinx-coroutines-swing to 1.7.3 (was 1.7.1)</li>
+    <li>Update org.jetbrains.lets-plot:base-portable-jvm to 4.1.0 (was 3.2.0)</li>
+    <li>Update org.jetbrains.lets-plot:lets-plot-common to 4.1.0 (was 3.2.0)</li>
+    <li>Update org.jetbrains.lets-plot:lets-plot-kotlin-jvm to 4.5.0 (was 4.4.1)</li>
+    <li>Update org.jetbrains.lets-plot:plot-common-portable-jvm to 4.1.0 (was 3.2.0)</li>
+    <li>Update org.jetbrains:annotations to 24.1.0 (was 24.0.1)</li>
+    <li>Update org.jsoup:jsoup to 1.17.1 (was 1.16.1)</li>
+    <li>Update org.mongodb:mongo-java-driver to 2.14.3 (was 2.11.3)</li>
+    <li>Update org.neo4j.driver:neo4j-java-driver to 4.4.13 (was 4.4.11)</li>
+    <li>Update org.ow2.asm:asm to 9.6 (was 9.5)</li>
+    <li>Update org.xmlresolver:xmlresolver to 5.2.1 (was 4.6.4)</li>
+    <li>Update org.xmlresolver:xmlresolver:data to 5.2.1 (was 4.6.4)</li>
+  </ul>
+
  <!--  =================== Thanks =================== -->
 
 <ch_section>Thanks</ch_section>
@@ -166,12 +245,12 @@ With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jep
       <source>
 mkdir lib/modules
 pushd lib/modules
-wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.4/nashorn-core-15.4.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6/asm-util-9.6.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar
 popd
 export JVM_ARGS="--module-path $PWD/lib/modules"
 ./bin/jmeter

From 8d629f196dde05992b1ab96516711fc5ee8f44dc Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 10:11:23 +0300
Subject: [PATCH 0746/1037] test: use bin/temp/ftp_test instead of bin/ftp_test
 so the generated files are not accidentally committed

---
 bin/testfiles/FTP_TESTS.jmx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/testfiles/FTP_TESTS.jmx b/bin/testfiles/FTP_TESTS.jmx
index d2ea49aed12..371a7d09c33 100644
--- a/bin/testfiles/FTP_TESTS.jmx
+++ b/bin/testfiles/FTP_TESTS.jmx
@@ -82,12 +82,12 @@ import org.apache.commons.io.FileUtils;
 import org.apache.ftpserver.DataConnectionConfiguration;
 import org.apache.ftpserver.DataConnectionConfigurationFactory;
 
-FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/ftp_test&quot;));
-new File(JMeterUtils.getJMeterHome(), &quot;bin/ftp_test&quot;).mkdir();
+FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;));
+new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;).mkdirs();
 
-DataConnectionConfigurationFactory dataConnectionConfigurationFactory = 
+DataConnectionConfigurationFactory dataConnectionConfigurationFactory =
 	new DataConnectionConfigurationFactory();
-dataConnectionConfigurationFactory.setPassivePorts(vars.get(&quot;passivePort&quot;));	
+dataConnectionConfigurationFactory.setPassivePorts(vars.get(&quot;passivePort&quot;));
 DataConnectionConfiguration dataConnectionConfiguration = dataConnectionConfigurationFactory.createDataConnectionConfiguration();
 
 PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
@@ -107,7 +107,7 @@ listenerFactory.setPort(Integer.parseInt(vars.get(&quot;port&quot;)));
 FtpServerFactory factory = new FtpServerFactory();
 factory.setUserManager(userManager);
 factory.addListener(&quot;default&quot;, listenerFactory.createListener());
- 
+
 FtpServer server = factory.createServer();
 server.start();
 
@@ -145,7 +145,7 @@ props.put(&quot;FTP_SERVER&quot;, server);
           <stringProp name="FTPSampler.server"></stringProp>
           <stringProp name="FTPSampler.port"></stringProp>
           <stringProp name="FTPSampler.filename">jmeter.properties</stringProp>
-          <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-binary.properties</stringProp>
+          <stringProp name="FTPSampler.localfilename">temp/ftp_test/jmeter-from-ftp-binary.properties</stringProp>
           <stringProp name="FTPSampler.inputdata"></stringProp>
           <boolProp name="FTPSampler.binarymode">true</boolProp>
           <boolProp name="FTPSampler.saveresponse">true</boolProp>
@@ -168,7 +168,7 @@ props.put(&quot;FTP_SERVER&quot;, server);
           <stringProp name="FTPSampler.server"></stringProp>
           <stringProp name="FTPSampler.port"></stringProp>
           <stringProp name="FTPSampler.filename">jmeter.properties</stringProp>
-          <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
+          <stringProp name="FTPSampler.localfilename">temp/ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
           <stringProp name="FTPSampler.inputdata"></stringProp>
           <boolProp name="FTPSampler.binarymode">false</boolProp>
           <boolProp name="FTPSampler.saveresponse">true</boolProp>
@@ -190,8 +190,8 @@ props.put(&quot;FTP_SERVER&quot;, server);
         <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-put-text" enabled="true">
           <stringProp name="FTPSampler.server"></stringProp>
           <stringProp name="FTPSampler.port"></stringProp>
-          <stringProp name="FTPSampler.filename">ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
-          <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
+          <stringProp name="FTPSampler.filename">temp/ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
+          <stringProp name="FTPSampler.localfilename">temp/ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
           <stringProp name="FTPSampler.inputdata"></stringProp>
           <boolProp name="FTPSampler.binarymode">false</boolProp>
           <boolProp name="FTPSampler.saveresponse">true</boolProp>
@@ -203,8 +203,8 @@ props.put(&quot;FTP_SERVER&quot;, server);
         <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-check-upload" enabled="true">
           <stringProp name="FTPSampler.server"></stringProp>
           <stringProp name="FTPSampler.port"></stringProp>
-          <stringProp name="FTPSampler.filename">ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
-          <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii-write-tocheck.properties</stringProp>
+          <stringProp name="FTPSampler.filename">temp/ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
+          <stringProp name="FTPSampler.localfilename">temp/ftp_test/jmeter-from-ftp-ascii-write-tocheck.properties</stringProp>
           <stringProp name="FTPSampler.inputdata"></stringProp>
           <boolProp name="FTPSampler.binarymode">false</boolProp>
           <boolProp name="FTPSampler.saveresponse">true</boolProp>
@@ -248,7 +248,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
 
 
-FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/ftp_test&quot;));
+FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;));
 
 FtpServer server = (FtpServer) props.get(&quot;FTP_SERVER&quot;);
 try {

From 4199228f127b6e050679a08a4b5e37c8758a71d1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 10:17:33 +0300
Subject: [PATCH 0747/1037] refactor: @JMeterSerialTest.java ->
 JMeterSerialTest.kt

---
 .../org/apache/jorphan/test/JMeterSerialTest.kt}                  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/jorphan/src/testFixtures/{java/org/apache/jorphan/test/JMeterSerialTest.java => kotlin/org/apache/jorphan/test/JMeterSerialTest.kt} (100%)

diff --git a/src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
similarity index 100%
rename from src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java
rename to src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt

From 1c64012830204fea112215b49aa737a1543c27c9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 10:19:05 +0300
Subject: [PATCH 0748/1037] refactor: JMeterSerialTest to Kotlin so we have one
 less compileJava task

---
 .../org/apache/jorphan/test/JMeterSerialTest.kt       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
index 7f6ccd06b64..a6d732bcbca 100644
--- a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
+++ b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.jorphan.test;
+package org.apache.jorphan.test
 
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode
+import org.junit.jupiter.api.parallel.Isolated
 
 /**
  * Used to tag tests which need to be run on their own (in serial) because
@@ -27,5 +27,4 @@ import org.junit.jupiter.api.parallel.Isolated;
  */
 @Isolated
 @Execution(ExecutionMode.SAME_THREAD)
-public interface JMeterSerialTest {
-}
+interface JMeterSerialTest

From 8a5f5d8e98ecb99f3ee182dc4a2827146d1fdc67 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 11:58:48 +0300
Subject: [PATCH 0749/1037] Revert "refactor: JMeterSerialTest to Kotlin so we
 have one less compileJava task"

This reverts commit 1c64012830204fea112215b49aa737a1543c27c9.
---
 .../org/apache/jorphan/test/JMeterSerialTest.kt       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
index a6d732bcbca..7f6ccd06b64 100644
--- a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
+++ b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.jorphan.test
+package org.apache.jorphan.test;
 
-import org.junit.jupiter.api.parallel.Execution
-import org.junit.jupiter.api.parallel.ExecutionMode
-import org.junit.jupiter.api.parallel.Isolated
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.api.parallel.Isolated;
 
 /**
  * Used to tag tests which need to be run on their own (in serial) because
@@ -27,4 +27,5 @@ import org.junit.jupiter.api.parallel.Isolated
  */
 @Isolated
 @Execution(ExecutionMode.SAME_THREAD)
-interface JMeterSerialTest
+public interface JMeterSerialTest {
+}

From 241078e51874a7cf8347437fc029a649cd223705 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 11:58:55 +0300
Subject: [PATCH 0750/1037] Revert "refactor: @JMeterSerialTest.java ->
 JMeterSerialTest.kt"

This reverts commit 4199228f127b6e050679a08a4b5e37c8758a71d1.
---
 .../org/apache/jorphan/test/JMeterSerialTest.java}                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/jorphan/src/testFixtures/{kotlin/org/apache/jorphan/test/JMeterSerialTest.kt => java/org/apache/jorphan/test/JMeterSerialTest.java} (100%)

diff --git a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt b/src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java
similarity index 100%
rename from src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
rename to src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java

From c204d5c72d4995bf00c24b0d87aad06c9f7c7d3b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 12:19:50 +0300
Subject: [PATCH 0751/1037] Reapply "refactor: @JMeterSerialTest.java ->
 JMeterSerialTest.kt"

This reverts commit 241078e51874a7cf8347437fc029a649cd223705.
---
 .../org/apache/jorphan/test/JMeterSerialTest.kt}                  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/jorphan/src/testFixtures/{java/org/apache/jorphan/test/JMeterSerialTest.java => kotlin/org/apache/jorphan/test/JMeterSerialTest.kt} (100%)

diff --git a/src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
similarity index 100%
rename from src/jorphan/src/testFixtures/java/org/apache/jorphan/test/JMeterSerialTest.java
rename to src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt

From b36a9c41dcdecdb93ae6622114f70ccb78d7ab83 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 12:19:55 +0300
Subject: [PATCH 0752/1037] Reapply "refactor: JMeterSerialTest to Kotlin so we
 have one less compileJava task"

This reverts commit 8a5f5d8e98ecb99f3ee182dc4a2827146d1fdc67.
---
 .../org/apache/jorphan/test/JMeterSerialTest.kt       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
index 7f6ccd06b64..a6d732bcbca 100644
--- a/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
+++ b/src/jorphan/src/testFixtures/kotlin/org/apache/jorphan/test/JMeterSerialTest.kt
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.jorphan.test;
+package org.apache.jorphan.test
 
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode
+import org.junit.jupiter.api.parallel.Isolated
 
 /**
  * Used to tag tests which need to be run on their own (in serial) because
@@ -27,5 +27,4 @@ import org.junit.jupiter.api.parallel.Isolated;
  */
 @Isolated
 @Execution(ExecutionMode.SAME_THREAD)
-public interface JMeterSerialTest {
-}
+interface JMeterSerialTest

From 05c8659f3bb41455783435f1e0120acd540e802f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 12:26:31 +0300
Subject: [PATCH 0753/1037] chore: add workaround for kapt failure "Number of
 loaded files in snapshots differs"

See https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
---
 src/core/build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 38fa682e8e6..c0ebe1fc3de 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -188,3 +188,10 @@ tasks.jar {
         from("$rootDir/xdocs/images/logo.svg")
     }
 }
+
+afterEvaluate {
+    tasks.named("kaptTestFixturesKotlin") {
+        // Workaround for https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
+        inputs.property("wa.to.trigger.full.recompilation", "1")
+    }
+}

From aa22e935265dd14038d6c870c0166961854865ed Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 13:02:01 +0300
Subject: [PATCH 0754/1037] chore: apply kapt incremental execution failure
 workaround for all kapt tasks

---
 .../jvm/src/main/kotlin/build-logic.autoservice.gradle.kts | 6 ++++++
 src/core/build.gradle.kts                                  | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
index ef80b5909df..0d72904a2ce 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 import com.github.vlsi.gradle.dsl.configureEach
+import org.jetbrains.kotlin.gradle.tasks.Kapt
 
 plugins {
     id("java-library")
@@ -36,6 +37,11 @@ plugins.withId("org.jetbrains.kotlin.jvm") {
             "kapt"(platform(it))
         }
     }
+
+    tasks.configureEach<Kapt> {
+        // Workaround for https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
+        inputs.property("wa.to.trigger.full.recompilation", "1")
+    }
 }
 
 tasks.configureEach<Jar> {
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index c0ebe1fc3de..38fa682e8e6 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -188,10 +188,3 @@ tasks.jar {
         from("$rootDir/xdocs/images/logo.svg")
     }
 }
-
-afterEvaluate {
-    tasks.named("kaptTestFixturesKotlin") {
-        // Workaround for https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
-        inputs.property("wa.to.trigger.full.recompilation", "1")
-    }
-}

From 945281cfaa6cca782f0e11f151eb22497d545713 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 30 Dec 2023 11:47:00 +0300
Subject: [PATCH 0755/1037] feat: pass JDBCSampler.maxRows to
 Statement.setMaxRows so the driver does not fetch extra rows from the
 database

---
 .../jmeter/protocol/jdbc/AbstractJDBCTestElement.java  | 10 ++++++++++
 .../jmeter/protocol/jdbc/sampler/JDBCSampler.java      |  7 ++++---
 .../jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt    |  3 +++
 xdocs/changes.xml                                      |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index c69b9f00362..0680cf52e7d 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -167,6 +167,7 @@ protected byte[] execute(Connection conn, SampleResult sample) throws SQLExcepti
         if (SELECT.equals(currentQueryType)) {
             try (Statement stmt = conn.createStatement()) {
                 setQueryTimeout(stmt, getIntegerQueryTimeout());
+                configureMaxRows(stmt);
                 ResultSet rs = null;
                 try {
                     rs = stmt.executeQuery(getQuery());
@@ -198,6 +199,7 @@ protected byte[] execute(Connection conn, SampleResult sample) throws SQLExcepti
         } else if (PREPARED_SELECT.equals(currentQueryType)) {
             try (PreparedStatement pstmt = getPreparedStatement(conn)) {
                 setArguments(pstmt);
+                configureMaxRows(pstmt);
                 ResultSet rs = null;
                 try {
                     rs = pstmt.executeQuery();
@@ -236,7 +238,15 @@ protected byte[] execute(Connection conn, SampleResult sample) throws SQLExcepti
         }
     }
 
+    private void configureMaxRows(Statement stmt) throws SQLException {
+        int maxRows = getIntegerResultSetMaxRows();
+        if (maxRows >= 0) {
+           stmt.setMaxRows(maxRows);
+        }
+    }
+
     private String resultSetsToString(PreparedStatement pstmt, boolean result, int[] out) throws SQLException, UnsupportedEncodingException {
+        configureMaxRows(pstmt);
         StringBuilder sb = new StringBuilder();
         int updateCount = 0;
         boolean currentResult = result;
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
index db95cd76617..7c23db03a82 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
@@ -72,16 +72,17 @@ public SampleResult sample(Entry e) {
         Connection conn = null;
 
         try {
-            if (JOrphanUtils.isBlank(getDataSource())) {
+            String dataSource = getDataSource();
+            if (JOrphanUtils.isBlank(dataSource)) {
                 throw new IllegalArgumentException("Name for DataSoure must not be empty in " + getName());
             }
 
             try {
-                conn = DataSourceElement.getConnection(getDataSource());
+                conn = DataSourceElement.getConnection(dataSource);
             } finally {
                 res.connectEnd();
             }
-            res.setResponseHeaders(DataSourceElement.getConnectionInfo(getDataSource()));
+            res.setResponseHeaders(DataSourceElement.getConnectionInfo(dataSource));
             res.setResponseData(execute(conn, res));
         } catch (SQLException ex) {
             final String errCode = Integer.toString(ex.getErrorCode());
diff --git a/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
index 1ab034de974..7777d2ae5c4 100644
--- a/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
+++ b/src/protocol/jdbc/src/test/kotlin/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerTest.kt
@@ -80,6 +80,7 @@ class JDBCSamplerTest {
         val stmt = mockk<Statement> {
             every { executeQuery(any()) } returns rs
             justRun { queryTimeout = any() }
+            justRun { maxRows = any() }
             justRun { close() }
         }
         val conn = mockk<Connection> {
@@ -90,11 +91,13 @@ class JDBCSamplerTest {
         }
 
         sut.query = "SELECT"
+        sut.resultSetMaxRows = "10"
         val response = sut.executeForTest(conn, sample)
 
         verifyOrder {
             conn.createStatement()
             stmt.queryTimeout = 0
+            stmt.maxRows = 10
             stmt.executeQuery(any())
             sample.latencyEnd()
             // getStringFromResultSet
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ef7546a9c2f..d07120f1553 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -83,6 +83,7 @@ Summary
   <li><issue>6165</issue><pr>6192</pr>The Constant Throughput Timer is throwing a NullPointerException when using variables (vars.get) in "Target Throughput"-field</li>
   <li><issue>6162</issue>The Constant Timer is throwing a NullPointerException when using variables (vars.get) in "delay"-field</li>
   <li><pr>6193</pr>Log errors happening while JMeter starts the test (previously, errors from TestStateListener.testStarted were not logged)</li>
+  <li><pr>6216</pr>Pass JDBCSampler.maxRows to Statement.setMaxRows so the driver does not fetch extra rows from the database</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>

From 6c2a009159ad2a1858d885b35971a64f79a5d700 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sun, 31 Dec 2023 10:34:31 +0100
Subject: [PATCH 0756/1037] prepare new version 5.6.3

---
 NOTICE                              | 2 +-
 xdocs/download_jmeter.xml           | 2 +-
 xdocs/stylesheets/website-style.xsl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NOTICE b/NOTICE
index 7d41bdf0e27..75b927c8e74 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache JMeter
-Copyright 1998-2023 The Apache Software Foundation
+Copyright 1998-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 225efcf975f..ff0a7d07088 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.6.2'>
+<!ENTITY release '5.6.3'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
 
diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index ac1fa44a49e..9b8dbddae96 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -38,7 +38,7 @@
   <xsl:param name="cssdir" select="concat($relative-path, '/css')" />
   <xsl:param name="apidir" select="concat($relative-path, '/api')" />
   <xsl:param name="jakarta-site" select="'https://jakarta.apache.org'" />
-  <xsl:param name="year" select="'2023'" />
+  <xsl:param name="year" select="'2024'" />
   <xsl:param name="max-img-width" select="'600'" />
 
   <!-- Output method -->

From ff63439527ece9b1d8347e19bc289e97ae1923d5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 Jan 2024 17:18:17 +0300
Subject: [PATCH 0757/1037] fix: store ThreadGroup.scheduler fields

This fixes a regression in 278247608b66adf92e06e1444e0229a663e54618
---
 .../jmeter/control/IncludeController.java     |  17 +-
 .../control/gui/IncludeControllerGui.java     |  32 +---
 .../jmeter/control/IncludeControllerSchema.kt |  33 ++++
 .../threads/gui/AbstractThreadGroupGui.java   |  23 ++-
 .../jmeter/threads/gui/ThreadGroupGui.java    |  15 +-
 .../jmeter/gui/JTextComponentBinding.kt       |  42 +++-
 .../org/apache/jmeter/junit/JMeterTest.java   | 180 +++++++++++++++---
 .../java/sampler/BeanShellSampler.java        |   2 +-
 .../java/sampler/BeanShellSamplerSchema.kt    |   3 -
 9 files changed, 270 insertions(+), 77 deletions(-)
 create mode 100644 src/components/src/main/kotlin/org/apache/jmeter/control/IncludeControllerSchema.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
index 388dcf269eb..4913bd7eb14 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
@@ -27,6 +27,7 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.slf4j.Logger;
@@ -37,8 +38,6 @@ public class IncludeController extends GenericController implements ReplaceableC
 
     private static final long serialVersionUID = 241L;
 
-    private static final String INCLUDE_PATH = "IncludeController.includepath"; //$NON-NLS-1$
-
     private static  final String PREFIX =
         JMeterUtils.getPropDefault(
                 "includecontroller.prefix", //$NON-NLS-1$
@@ -56,6 +55,16 @@ public IncludeController() {
         super();
     }
 
+    @Override
+    public IncludeControllerSchema getSchema() {
+        return IncludeControllerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends IncludeController, ? extends IncludeControllerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     @Override
     public Object clone() {
         // TODO - fix so that this is only called once per test, instead of at every clone
@@ -81,7 +90,7 @@ public Object clone() {
      * @param jmxfile The path to the JMX test plan to include
      */
     public void setIncludePath(String jmxfile) {
-        this.setProperty(INCLUDE_PATH,jmxfile);
+        set(getSchema().getIncludePath(), jmxfile);
     }
 
     /**
@@ -89,7 +98,7 @@ public void setIncludePath(String jmxfile) {
      * @return the JMX file path
      */
     public String getIncludePath() {
-        return this.getPropertyAsString(INCLUDE_PATH);
+        return get(getSchema().getIncludePath());
     }
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java
index 72fb0a75491..4dc41e625b7 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java
@@ -20,6 +20,8 @@
 import javax.swing.JPopupMenu;
 
 import org.apache.jmeter.control.IncludeController;
+import org.apache.jmeter.control.IncludeControllerSchema;
+import org.apache.jmeter.gui.FilePanelEntryBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.FilePanel;
 import org.apache.jmeter.gui.util.MenuFactory;
@@ -41,6 +43,7 @@ public class IncludeControllerGui extends AbstractControllerGui
      */
     public IncludeControllerGui() {
         init();
+        bindingGroup.add(new FilePanelEntryBinding(includePanel, IncludeControllerSchema.INSTANCE.getIncludePath()));
     }
 
     @Override
@@ -48,34 +51,9 @@ public String getLabelResource() {
         return "include_controller";//$NON-NLS-1$
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void configure(TestElement el) {
-        super.configure(el);
-        IncludeController controller = (IncludeController) el;
-        this.includePanel.setFilename(controller.getIncludePath());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TestElement createTestElement() {
-        IncludeController mc = new IncludeController();
-        configureTestElement(mc);
-        return mc;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
-    public void modifyTestElement(TestElement element) {
-        configureTestElement(element);
-        IncludeController controller = (IncludeController)element;
-        controller.setIncludePath(this.includePanel.getFilename());
+    public TestElement makeTestElement() {
+        return new IncludeController();
     }
 
     /**
diff --git a/src/components/src/main/kotlin/org/apache/jmeter/control/IncludeControllerSchema.kt b/src/components/src/main/kotlin/org/apache/jmeter/control/IncludeControllerSchema.kt
new file mode 100644
index 00000000000..9881ef0ad04
--- /dev/null
+++ b/src/components/src/main/kotlin/org/apache/jmeter/control/IncludeControllerSchema.kt
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.control
+
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [IncludeController].
+ * @since 5.6
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "5.6")
+public abstract class IncludeControllerSchema : GenericControllerSchema() {
+    public companion object INSTANCE : IncludeControllerSchema()
+
+    public val includePath: StringPropertyDescriptor<IncludeControllerSchema>
+        by string("IncludeController.includepath")
+}
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
index 7abf48fa68b..05ced0f6f54 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
@@ -39,6 +39,7 @@
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.AbstractThreadGroupSchema;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apiguardian.api.API;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -203,16 +204,34 @@ private String onSampleError() {
         return AbstractThreadGroup.ON_SAMPLE_ERROR_CONTINUE;
     }
 
-   @Override
+    @Override
+    public void assignDefaultValues(TestElement element) {
+        super.assignDefaultValues(element);
+        element.set(AbstractThreadGroupSchema.INSTANCE.getOnSampleError(), AbstractThreadGroup.ON_SAMPLE_ERROR_CONTINUE);
+    }
+
+    @Override
     public void configure(TestElement tg) {
         super.configure(tg);
         setSampleErrorBoxes((AbstractThreadGroup) tg);
     }
 
+    @Override
+    public void modifyTestElement(TestElement element) {
+        super.modifyTestElement(element);
+        element.set(AbstractThreadGroupSchema.INSTANCE.getOnSampleError(), onSampleError());
+    }
+
+    /**
+     * {@inheritDoc}
+     * @deprecated Override {@link #modifyTestElement(TestElement)} instead
+     * @param tg the TestElement being configured.
+     */
    @Override
+   @Deprecated
+   @API(status = API.Status.DEPRECATED, since = "5.6.3")
     protected void configureTestElement(TestElement tg) {
         super.configureTestElement(tg);
         tg.set(AbstractThreadGroupSchema.INSTANCE.getOnSampleError(), onSampleError());
     }
-
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
index 4dd33c2f58d..468381563f4 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -107,20 +107,13 @@ public TestElement makeTestElement() {
         return new ThreadGroup();
     }
 
-    @Override
-    public TestElement createTestElement() {
-        TestElement tg = makeTestElement();
-        // modifyTestElement is here for backward compatibility
-        modifyTestElement(tg);
-        assignDefaultValues(tg);
-        return tg;
-    }
-
     @Override
     public void assignDefaultValues(TestElement element) {
         super.assignDefaultValues(element);
         element.set(ThreadGroupSchema.INSTANCE.getNumThreads(), 1);
         element.set(ThreadGroupSchema.INSTANCE.getRampTime(), 1);
+        element.set(AbstractThreadGroupSchema.INSTANCE.getSameUserOnNextIteration(), true);
+        ((AbstractThreadGroup) element).setSamplerController((LoopController) loopPanel.createTestElement());
     }
 
     /**
@@ -130,17 +123,17 @@ public void assignDefaultValues(TestElement element) {
      */
     @Override
     public void modifyTestElement(TestElement tg) {
-        super.configureTestElement(tg);
+        super.modifyTestElement(tg);
         if (tg instanceof AbstractThreadGroup) {
             ((AbstractThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
         }
-        toggleSchedulerFields();
     }
 
     @Override
     public void configure(TestElement tg) {
         super.configure(tg);
         loopPanel.configure((TestElement) tg.getProperty(AbstractThreadGroup.MAIN_CONTROLLER).getObjectValue());
+        toggleSchedulerFields();
     }
 
     @Override
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt b/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt
index 69bd883d9f2..9e8a6310fdb 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/gui/JTextComponentBinding.kt
@@ -18,6 +18,11 @@
 package org.apache.jmeter.gui
 
 import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.schema.BooleanPropertyDescriptor
+import org.apache.jmeter.testelement.schema.DoublePropertyDescriptor
+import org.apache.jmeter.testelement.schema.FloatPropertyDescriptor
+import org.apache.jmeter.testelement.schema.IntegerPropertyDescriptor
+import org.apache.jmeter.testelement.schema.LongPropertyDescriptor
 import org.apache.jmeter.testelement.schema.PropertyDescriptor
 import org.apiguardian.api.API
 import javax.swing.JPasswordField
@@ -38,7 +43,42 @@ public class JTextComponentBinding(
             is JPasswordField -> String(component.password)
             else -> component.text
         }
-        testElement[propertyDescriptor] = text.takeIf { it.isNotEmpty() }
+        if (text.isEmpty()) {
+            testElement.removeProperty(propertyDescriptor)
+            return
+        }
+        when (propertyDescriptor) {
+            is IntegerPropertyDescriptor<*> ->
+                text.toIntOrNull()?.let {
+                    testElement[propertyDescriptor] = it
+                    return
+                }
+
+            is LongPropertyDescriptor<*> ->
+                text.toLongOrNull()?.let {
+                    testElement[propertyDescriptor] = it
+                    return
+                }
+
+            is FloatPropertyDescriptor<*> ->
+                text.toFloatOrNull()?.let {
+                    testElement[propertyDescriptor] = it
+                    return
+                }
+
+            is DoublePropertyDescriptor<*> ->
+                text.toDoubleOrNull()?.let {
+                    testElement[propertyDescriptor] = it
+                    return
+                }
+
+            is BooleanPropertyDescriptor<*> ->
+                text.toBooleanStrictOrNull()?.let {
+                    testElement[propertyDescriptor] = it
+                    return
+                }
+        }
+        testElement[propertyDescriptor] = text
     }
 
     override fun updateUi(testElement: TestElement) {
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 8fae00c2d37..d9cbe40b421 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.awt.Component;
 import java.io.ByteArrayInputStream;
@@ -38,12 +39,15 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -54,24 +58,39 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.gui.ObsoleteGui;
+import org.apache.jmeter.control.IfControllerSchema;
+import org.apache.jmeter.control.LoopControllerSchema;
 import org.apache.jmeter.control.gui.TestFragmentControllerGui;
 import org.apache.jmeter.dsl.DslPrinterTraverser;
+import org.apache.jmeter.extractor.RegexExtractorSchema;
 import org.apache.jmeter.gui.GuiComponentHolder;
 import org.apache.jmeter.gui.JMeterGUIComponent;
+import org.apache.jmeter.gui.NamePanel;
 import org.apache.jmeter.gui.UnsharedComponent;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.loadsave.IsEnabledNormalizer;
+import org.apache.jmeter.protocol.http.control.gui.AjpSamplerGui;
 import org.apache.jmeter.protocol.http.control.gui.GraphQLHTTPSamplerGui;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
 import org.apache.jmeter.protocol.java.config.gui.JavaConfigGui;
 import org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui;
 import org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui;
+import org.apache.jmeter.protocol.jms.control.gui.JMSSamplerGui;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.TestBeanGUI;
+import org.apache.jmeter.testelement.AbstractScopedTestElementSchema;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestElementSchema;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.schema.CollectionPropertyDescriptor;
+import org.apache.jmeter.testelement.schema.PropertyDescriptor;
+import org.apache.jmeter.testelement.schema.TestElementPropertyDescriptor;
+import org.apache.jmeter.threads.ThreadGroupSchema;
+import org.apache.jmeter.threads.gui.PostThreadGroupGui;
+import org.apache.jmeter.threads.gui.SetupThreadGroupGui;
+import org.apache.jmeter.threads.openmodel.gui.OpenModelThreadGroupGui;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.backend.BackendListenerGui;
 import org.apache.jorphan.reflect.ClassFinder;
@@ -213,12 +232,8 @@ public static void checkGuiSet() {
                         + System.getProperty("java.awt.headless") + "'");
     }
 
-    /*
-     * Test GUI elements - create the suite of tests
-     */
-    static Collection<GuiComponentHolder> guiComponents() throws Throwable {
+    static Collection<GuiComponentHolder> customGuiComponents() throws Throwable {
         List<GuiComponentHolder> components = new ArrayList<>();
-
         for (Object o : getObjects(JMeterGUIComponent.class)) {
             JMeterGUIComponent item = (JMeterGUIComponent) o;
             if (item.getClass() == TestBeanGUI.class) {
@@ -233,6 +248,14 @@ static Collection<GuiComponentHolder> guiComponents() throws Throwable {
             }
             components.add(new GuiComponentHolder(item));
         }
+        return components;
+    }
+
+    /*
+     * Test GUI elements - create the suite of tests
+     */
+    static Collection<GuiComponentHolder> guiComponents() throws Throwable {
+        List<GuiComponentHolder> components = new ArrayList<>(customGuiComponents());
         for (Object o : getObjects(TestBean.class)) {
             Class<?> c = o.getClass();
             JMeterGUIComponent item = new TestBeanGUI(c);
@@ -342,6 +365,101 @@ public void GUIComponents2(GuiComponentHolder componentHolder) throws Exception
         assertEquals("hey, new name!:", el2.getName(), () -> "Modify Test: Failed on " + name);
     }
 
+    private static final Set<PropertyDescriptor<?, ?>> IGNORED_PROPERTIES = new HashSet<>();
+
+    static {
+        IGNORED_PROPERTIES.add(TestElementSchema.INSTANCE.getGuiClass());
+        IGNORED_PROPERTIES.add(TestElementSchema.INSTANCE.getTestClass());
+        // TODO: support variables in TestElement.enabled property
+        IGNORED_PROPERTIES.add(TestElementSchema.INSTANCE.getEnabled());
+        IGNORED_PROPERTIES.add(AbstractScopedTestElementSchema.INSTANCE.getScope());
+        IGNORED_PROPERTIES.add(ThreadGroupSchema.INSTANCE.getOnSampleError());
+        // TODO: migrate to editable checkboxes
+        IGNORED_PROPERTIES.add(IfControllerSchema.INSTANCE.getEvaluateAll());
+        IGNORED_PROPERTIES.add(IfControllerSchema.INSTANCE.getUseExpression());
+        IGNORED_PROPERTIES.add(HTTPSamplerBaseSchema.INSTANCE.getPostBodyRaw());
+        // TODO: LoopControlPanel does not set continueForever properly
+        IGNORED_PROPERTIES.add(LoopControllerSchema.INSTANCE.getContinueForever());
+        IGNORED_PROPERTIES.add(RegexExtractorSchema.INSTANCE.getMatchTarget());
+        IGNORED_PROPERTIES.add(RegexExtractorSchema.INSTANCE.getDefaultIsEmpty());
+        // TODO: support expressions?
+        IGNORED_PROPERTIES.add(HTTPSamplerBaseSchema.INSTANCE.getIpSourceType());
+        IGNORED_PROPERTIES.add(HTTPSamplerBaseSchema.INSTANCE.getImplementation());
+        // TODO: support expressions in UrlConfigGui
+        IGNORED_PROPERTIES.add(HTTPSamplerBaseSchema.INSTANCE.getFollowRedirects());
+        IGNORED_PROPERTIES.add(HTTPSamplerBaseSchema.INSTANCE.getAutoRedirects());
+
+    }
+
+    /**
+     * Assign simple expression value to every property of the element, and verify if the property is get back correctly
+     * from the UI.
+     */
+    @ParameterizedTest
+    @MethodSource("customGuiComponents")
+    public void allPropertiesAreStoredInUI(GuiComponentHolder componentHolder) {
+        JMeterGUIComponent guiItem = componentHolder.getComponent();
+        assumeFalse(
+                improperlyUsesUiPlaceholders(guiItem.getClass()),
+                () -> "UI " + componentHolder + " does not use placeholders properly, so the test is skipped");
+        assumeFalse(guiItem.getClass() == JMSSamplerGui.class,
+                "JMSSamplerGui does not seem to use default values vs placeholders properly");
+        assumeFalse(guiItem.getClass() == AjpSamplerGui.class,
+                "AjpSamplerGui hides some fields from HTTP (e.g. proxy), so we skip testing AJP");
+        TestElement el = guiItem.createTestElement();
+        TestElementSchema schema = el.getSchema();
+        // UI might set properties in a different order which makes it harder to compare
+        Collection<PropertyDescriptor<?, ?>> properties = schema.getProperties().values();
+        for (PropertyDescriptor<?, ?> property : properties) {
+            if (IGNORED_PROPERTIES.contains(property)) {
+                continue;
+            }
+            if (property instanceof CollectionPropertyDescriptor || property instanceof TestElementPropertyDescriptor) {
+                continue;
+            }
+            if (guiItem.getClass() == NamePanel.class && property.equals(TestElementSchema.INSTANCE.getComments())) {
+                // NamePanel does not configure description
+                continue;
+            }
+            if ((guiItem.getClass() == SetupThreadGroupGui.class || guiItem.getClass() == PostThreadGroupGui.class) &&
+                    property.equals(ThreadGroupSchema.INSTANCE.getDelayedStart())) {
+                // Setup and Post thread groups do not show "delay thread creation" checkbox
+                continue;
+            }
+            if (guiItem.getClass() == OpenModelThreadGroupGui.class && (
+                    property.equals(ThreadGroupSchema.INSTANCE.getNumThreads()) ||
+                            property.equals(ThreadGroupSchema.INSTANCE.getSameUserOnNextIteration()))) {
+                continue;
+            }
+            el.set(property, "${test_" + property.getName() + "}");
+        }
+        // Configure UI with the modified properties
+        guiItem.configure(el);
+        // Assign the values from the UI to another element
+        TestElement el2 = guiItem.createTestElement();
+        guiItem.modifyTestElement(el2);
+
+        // Remove all ignored properties
+        for (PropertyDescriptor<?, ?> property : IGNORED_PROPERTIES) {
+            if (property.equals(TestElementSchema.INSTANCE.getGuiClass())) {
+                continue;
+            }
+            el.removeProperty(property);
+            el2.removeProperty(property);
+        }
+        if (guiItem.getClass() == GraphQLHTTPSamplerGui.class) {
+            el.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
+            el2.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
+            el.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart());
+            el2.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getUseBrowserCompatibleMultipart());
+            el.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost());
+            el2.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getUseMultipartPost());
+        }
+
+        compareAllProperties(el, el2,
+                () -> "GUI element " + componentHolder + " be able to pass all the properties to a different TestElement");
+    }
+
     @ParameterizedTest
     @MethodSource("guiComponents")
     public void propertiesShouldNotBeInitializedToNullValues(GuiComponentHolder componentHolder) {
@@ -394,17 +512,7 @@ public void elementShouldNotBeModifiedWithConfigureModify(GuiComponentHolder com
             actual.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
         }
         if (!Objects.equals(expected, actual)) {
-            if (guiItem.getClass() == JavaConfigGui.class || guiItem.getClass() == JavaTestSamplerGui.class) {
-                // TODO: JavaConfigGui modifies UI when classname combobox changes, and it causes inconsistency between the
-                //   element state and the UI state. We ignore the discrepancy for now
-                return;
-            }
-            if (guiItem.getClass() == JUnitTestSamplerGui.class) {
-                // TODO: fix org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui.configure to use placeholders
-                return;
-            }
-            if (guiItem.getClass() == BackendListenerGui.class) {
-                // TODO: fix handling of default arguments in org.apache.jmeter.visualizers.backend.BackendListenerGui.actionPerformed
+            if (improperlyUsesUiPlaceholders(guiItem.getClass())) {
                 return;
             }
             boolean breakpointForDebugging = Objects.equals(expected, actual);
@@ -418,6 +526,23 @@ public void elementShouldNotBeModifiedWithConfigureModify(GuiComponentHolder com
         }
     }
 
+    private static boolean improperlyUsesUiPlaceholders(Class<? extends JMeterGUIComponent> klass) {
+        if (klass == JavaConfigGui.class || klass == JavaTestSamplerGui.class) {
+            // TODO: JavaConfigGui modifies UI when classname combobox changes, and it causes inconsistency between the
+            //   element state and the UI state. We ignore the discrepancy for now
+            return true;
+        }
+        if (klass == JUnitTestSamplerGui.class) {
+            // TODO: fix org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui.configure to use placeholders
+            return true;
+        }
+        if (klass == BackendListenerGui.class) {
+            // TODO: fix handling of default arguments in org.apache.jmeter.visualizers.backend.BackendListenerGui.actionPerformed
+            return true;
+        }
+        return false;
+    }
+
     @ParameterizedTest
     @MethodSource("guiComponents")
     public void saveLoadShouldKeepElementIntact(GuiComponentHolder componentHolder) throws IOException {
@@ -427,10 +552,13 @@ public void saveLoadShouldKeepElementIntact(GuiComponentHolder componentHolder)
         SaveService.saveElement(expected, bos);
         byte[] serializedBytes = bos.toByteArray();
         TestElement actual = (TestElement) SaveService.loadElement(new ByteArrayInputStream(serializedBytes));
-        compareAllProperties(expected, actual, serializedBytes);
+        compareAllProperties(expected, actual,
+                () -> "TestElement after 'save+load' should match the one created in GUI\n" +
+                        "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
     }
 
-    private static void compareAllProperties(TestElement expected, TestElement actual, byte[] serializedBytes) {
+    private static void compareAllProperties(TestElement expected, TestElement actual,
+            Supplier<String> message) {
         expected.traverse(IsEnabledNormalizer.INSTANCE);
         actual.traverse(IsEnabledNormalizer.INSTANCE);
 
@@ -440,17 +568,13 @@ private static void compareAllProperties(TestElement expected, TestElement actua
             assertEquals(
                     expectedStr,
                     new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString(),
-                    "TestElement after 'save+load' should match the one created in GUI\n" +
-                    "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
-            fail("TestElement after 'save+load' should match the one created in GUI. " +
-                    "DSL representation is the same, however TestElement#equals says the elements are different. " +
-                    "DSL is " + expectedStr + "\n" +
-                    "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
+                    message.get());
+            fail("DSL representation is the same, however TestElement#equals says the elements are different. " + message.get());
         }
-        assertEquals(expected.hashCode(), actual.hashCode(), "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
-        "DSL representation is the same, however TestElement#hashCode says the elements are different. " +
-        "DSL is " + expectedStr + "\n" +
-        "JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
+        assertEquals(expected.hashCode(), actual.hashCode(),
+                "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
+                        "DSL representation is the same, however TestElement#hashCode says the elements are different. " +
+                        message.get());
     }
 
     static Stream<Serializable> serializableObjects() throws Throwable {
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
index 0039237c7ff..3607a55692e 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
@@ -74,7 +74,7 @@ public BeanShellSamplerSchema getSchema() {
 
     @Override
     protected String getInitFileProperty() {
-        return BeanShellSamplerSchema.INSTANCE.getInitFile().getName();
+        return INIT_FILE;
     }
 
     @Override
diff --git a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
index 33b506d469b..e4552fc433d 100644
--- a/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
+++ b/src/protocol/java/src/main/kotlin/org/apache/jmeter/protocol/java/sampler/BeanShellSamplerSchema.kt
@@ -40,9 +40,6 @@ public abstract class BeanShellSamplerSchema : TestElementSchema() {
     public val parameters: StringPropertyDescriptor<BeanShellSamplerSchema>
         by string("BeanShellSampler.parameters")
 
-    public val initFile: StringPropertyDescriptor<BeanShellSamplerSchema>
-        by string("beanshell.sampler.init")
-
     public val filename: StringPropertyDescriptor<BeanShellSamplerSchema>
         by string("BeanShellSampler.filename")
 }

From 34a2785748e9e0b14702595e8682c387869deda3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 1 Jan 2024 17:40:58 +0300
Subject: [PATCH 0758/1037] test: reduce JMeterTest > runSerialTest test noise

PropertyDescriptor requires arguments for instantiation, so it can't easily
be tested for serializability.
---
 .../src/test/java/org/apache/jmeter/junit/JMeterTest.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index d9cbe40b421..5fd25546bb7 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -643,6 +643,11 @@ public static Collection<Object> getObjects(Class<?> extendsClass) throws Throwa
                 // TODO: Cannot start. travis-job-e984b3d5-f93f-4b0f-b6c0-50988a5ece9d is a loopback address.
                 continue;
             }
+            if (className.startsWith("org.apache.jmeter.testelement.schema.") &&
+                    className.endsWith("PropertyDescriptor")) {
+                // PropertyDescriptors do not have no-arg constructor
+                continue;
+            }
             try {
                 // Construct classes in the AWT thread, as we may have found classes, that
                 // assume to be constructed in the AWT thread.

From 79bc2c831f8a1a1b6a28157b3e272bc041be954a Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Sun, 7 Jan 2024 18:12:57 +0100
Subject: [PATCH 0759/1037] Add the 5.6.3 release

---
 doap_JMeter.rdf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doap_JMeter.rdf b/doap_JMeter.rdf
index 5f662ebe957..09d6ddee5f2 100644
--- a/doap_JMeter.rdf
+++ b/doap_JMeter.rdf
@@ -342,6 +342,13 @@
         <revision>5.6.2 final</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache JMeter</name>
+        <created>2024-01-07</created>
+        <revision>5.6.3 final</revision>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/jmeter.git"/>

From d3cba664160eeb8c856e6f2281bcbd12f09546f6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 9 Jan 2024 11:00:48 +0300
Subject: [PATCH 0760/1037] chore: set next version to 6.0.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index eda4cfba059..83166e07ac1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,7 +34,7 @@ systemProp.sonar.gradle.skipCompile=true
 # This is version for Apache JMeter itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.6.3
+jmeter.version=6.0.0
 
 # Plugins
 com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988

From 09c3f810dda7efaf1510ac062454d978d90a0741 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 4 Jan 2024 21:58:22 +0300
Subject: [PATCH 0761/1037] change: use Java 17 as the build target, require
 Java 17+ for execution

---
 .github/workflows/matrix.js                   |  21 ----
 CONTRIBUTING.md                               |   2 +-
 README.md                                     |   2 +-
 build-logic/build-parameters/build.gradle.kts |   2 +-
 .../main/kotlin/build-logic.java.gradle.kts   |  11 +-
 .../main/kotlin/build-logic.kotlin.gradle.kts |  14 +--
 src/release/build.gradle.kts                  |   2 +-
 xdocs/building.xml                            |   2 +-
 xdocs/changes.xml                             | 116 +-----------------
 xdocs/download_jmeter.xml                     |   2 +-
 xdocs/usermanual/get-started.xml              |   2 +-
 11 files changed, 17 insertions(+), 159 deletions(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index bf22ef42a55..ba4364eb1f0 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -26,8 +26,6 @@ matrix.addAxis({
   name: 'java_version',
   // Strings allow versions like 18-ea
   values: [
-    '8',
-    '11',
     '17',
     '21',
     eaJava,
@@ -80,12 +78,6 @@ matrix.setNamePattern(['java_version', 'java_distribution', 'hash', 'os', 'tz',
 
 // Semeru uses OpenJ9 jit which has no option for making hash codes the same
 matrix.exclude({java_distribution: {value: 'semeru'}, hash: {value: 'same'}});
-// Semeru 8 fails when Semeru 17 is on the PATH (we use 17 for build)
-matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '8'});
-// Microsoft Java has no distribution for 8
-matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
-// Oracle JDK is only supported for JDK 17 and later
-matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', '11']});
 // Ignore builds with JAVA EA for now, see https://github.com/apache/jmeter/issues/6114
 matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
@@ -97,10 +89,6 @@ matrix.generateRow({hash: {value: 'same'}});
 matrix.generateRow({os: 'windows-latest'});
 // TODO: un-comment when xvfb will be possible
 // matrix.generateRow({os: 'ubuntu-latest'});
-// Ensure there will be at least one job with Java 8
-matrix.generateRow({java_version: "8"});
-// Ensure there will be at least one job with Java 11
-matrix.generateRow({java_version: "11"});
 // Ensure there will be at least one job with Java 17
 matrix.generateRow({java_version: "17"});
 // Ensure there will be at least one job with Java 21
@@ -119,15 +107,6 @@ include.forEach(v => {
     `-Duser.country=${v.locale.country}`,
     `-Duser.language=${v.locale.language}`,
   ];
-  if (v.hash.value === 'same' && v.java_version <= 8) {
-    // processSiteXslt fails with VerifyError when running with Java 8 and the same hashcode
-    // Skip the task in that case
-    //java.lang.VerifyError: (class: website_style, method: issue_separator signature: (Lcom/sun/org/apache/xala...)
-    // Illegal target of jump or branch
-    gradleArgs.push('-x :src:dist:processSiteXslt');
-    // javadoc tool seems take too much CPU when there are many hash collisions
-    gradleArgs.push('-x :src:dist:javadocAggregate');
-  }
   v.extraGradleArgs = gradleArgs.join(' ');
 });
 include.forEach(v => {
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2c8ca1f6e46..94ac90745a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,7 +54,7 @@ The steps to import the sources (based on Eclipse 2019-06) into Eclipse are as f
 
 1. Install `Eclipse IDE for Java Developers`
 1. Install `Kotlin for Eclipse` plugin (JMeter code uses Java and Kotlin)
-1. Make sure you have a Java 8 compatible JDK configured in your workspace
+1. Make sure you have a Java 17 compatible JDK configured in your workspace
 1. Open `File->Import...`
 1. Select `Existing Gradle Project` and click `Next`
 1. Read `How to experience the best Gradle integration` and click `Next`
diff --git a/README.md b/README.md
index 711bc5f9b95..f8d4fb5ead0 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ The following requirements exist for running Apache JMeter:
 
 - Java Interpreter:
 
-  A fully compliant Java 8 Runtime Environment is required
+  A fully compliant Java 17 Runtime Environment is required
   for Apache JMeter to execute. A JDK with `keytool` utility is better suited
   for Recording HTTPS websites.
 
diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 32db188ef63..5c83b3d0cf3 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -38,7 +38,7 @@ buildParameters {
         description.set("Collect test coverage")
     }
     integer("targetJavaVersion") {
-        defaultValue.set(8)
+        defaultValue.set(17)
         mandatory.set(true)
         description.set("Java version for source and target compatibility")
     }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 08f5c67f60e..53786ede3b9 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -42,14 +42,9 @@ java {
 }
 
 tasks.configureEach<JavaCompile> {
-    // Use --release=8 for Java 10+ so the generated bytecode does not include methods introduced in Java 9+
-    options.release.set(
-        provider {
-            buildParameters.targetJavaVersion.takeIf {
-                javaCompiler.get().metadata.languageVersion.asInt() > 9
-            }
-        }
-    )
+    // Use --release=<targetJavaVersion> for javac so the generated bytecode does not include methods introduced in
+    // next Java releases
+    options.release.set(buildParameters.targetJavaVersion)
 }
 
 tasks.configureEach<JavaExec> {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index ca509a7c337..bc2591ad1ff 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -48,18 +48,8 @@ tasks.configureEach<KotlinCompile> {
             apiVersion = "kotlin.api".v
         }
         freeCompilerArgs += "-Xjvm-default=all"
-        val jdkRelease = buildParameters.targetJavaVersion.let {
-            when {
-                it < 9 -> "1.8"
-                else -> it.toString()
-            }
-        }
-        // jdk-release requires Java 9+
-        buildParameters.buildJdkVersion
-            .takeIf { it > 8 }
-            ?.let {
-                freeCompilerArgs += "-Xjdk-release=$jdkRelease"
-            }
+        val jdkRelease = buildParameters.targetJavaVersion.toString()
+        freeCompilerArgs += "-Xjdk-release=$jdkRelease"
         kotlinOptions.jvmTarget = jdkRelease
     }
 }
diff --git a/src/release/build.gradle.kts b/src/release/build.gradle.kts
index 55291997d36..f7cfe4861c3 100644
--- a/src/release/build.gradle.kts
+++ b/src/release/build.gradle.kts
@@ -68,7 +68,7 @@ https://www.apache.org/dist/$tlpUrl/KEYS
 N.B.
 To create the distribution and test $tlp: "./gradlew build -Prelease -PskipSign".
 
-$tlp $version requires Java 8 or later to run.
+$tlp $version requires Java 17 or later to run.
 
 The artifacts were built with
   ${"java.runtime.name".prop} ${"java.vendor".prop} (build ${"java.runtime.version".prop})
diff --git a/xdocs/building.xml b/xdocs/building.xml
index a42ee2af9d6..c01dcd9ff1a 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -29,7 +29,7 @@
 
 Before you can compile JMeter, you will need a few things:
 <ul>
-<li>a Java 8 compatible JDK (Java Development Kit)</li>
+<li>a Java 17 compatible JDK (Java Development Kit)</li>
 <li>Optional: <a href="https://gradle.org/">Gradle</a> installation</li>
 <li>the JMeter sources as shown in the next section</li>
 </ul>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d07120f1553..bf3d4336718 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -47,14 +47,12 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
 
 <br></br>
 <note>
-JMeter 5.6.x requires Java 8 or later for execution (Java 17 or later recommended).
-<br></br>
-<b>The next major release would require Java 17 or later.</b>
+JMeter 6.x requires Java 17 or later for execution (Java 21 is recommended).
 </note>
 
-<!--  =================== 5.6.3 =================== -->
+<!--  =================== 6.0.0 =================== -->
 
-<h1>Version 5.6.3 </h1>
+<h1>Version 6.0.0 </h1>
 <p>
 Summary
 </p>
@@ -62,95 +60,10 @@ Summary
 <li><a href="#Bug fixes">Bug fixes</a></li>
 </ul>
 
-  <ch_section>Improvements</ch_section>
+  <ch_section>Changes</ch_section>
   <h3>General</h3>
   <ul>
-    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>TransactionController</code> "generate parent sample", and "include timers" checkboxes</li>
-    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>ThreadGroupGui</code> "scheduler" checkbox</li>
-    <li><pr>6199</pr>Enable use of <code>${...}</code> expressions for <code>HTTP Request</code> "retrieve embedded resources", "download resources concurrently", and "store as MD5" checkboxes</li>
-  </ul>
-
- <!-- =================== Bug fixes =================== -->
-
-<ch_section>Bug fixes</ch_section>
-
-<h3>General</h3>
-<ul>
-  <li><issue>6043</issue><pr>6044</pr>JMeter 5.6 shows 0 as a min response time in summary report</li>
-  <li>Restored binary API compatibility with pre-5.6.2: restore public methods to non-static as they were before 5.6.2 <code>JavaSamplerContext.getJMeterVariables</code>,
-    <code>JavaSamplerContext.getJMeterProperties</code>, <code>BoundaryExtractor.extractAll</code>,
-    <code>AuthManager.setupCredentials</code>, <code>HttpRequestHdr.getMultipartConfig</code>, (regression since 5.6.2)</li>
-  <li><issue>6165</issue><pr>6192</pr>The Constant Throughput Timer is throwing a NullPointerException when using variables (vars.get) in "Target Throughput"-field</li>
-  <li><issue>6162</issue>The Constant Timer is throwing a NullPointerException when using variables (vars.get) in "delay"-field</li>
-  <li><pr>6193</pr>Log errors happening while JMeter starts the test (previously, errors from TestStateListener.testStarted were not logged)</li>
-  <li><pr>6216</pr>Pass JDBCSampler.maxRows to Statement.setMaxRows so the driver does not fetch extra rows from the database</li>
-</ul>
-
-<ch_section>Non-functional changes</ch_section>
-<ul>
-  <li><pr>6166</pr>Use Gradle to 8.5 for building JMeter</li>
-  <li>Require Java 17 for building JMeter </li>
-  <li><pr>6199</pr>Improved API for programmatic test plan creation, see default implementations of <code>createTestElement</code>, <code>modifyTestElement</code>,
-    and new <code>makeTestElement</code> and <code>assignDefaultValues</code> methods in <code>JMeterGUIComponent</code>.
-    <code>AbstractJMeterGuiComponent.configureTestElement</code> is now discouraged</li>
-  <li><pr>6212</pr>Refactor: migrate existing Groovy tests to Kotlin, remove Groovy compiler from the build pipeline</li>
-  <li><pr>6214</pr>Refactor JUnit 3 and JUnit 4 tests to JUnit 5, remove JUnit 4 test dependency</li>
-</ul>
-
-  <ch_section>Dependency upgrades</ch_section>
-  <ul>
-    <li>Update com.fasterxml.jackson.core:jackson-annotations to 2.16.1 (was 2.15.2)</li>
-    <li>Update com.fasterxml.jackson.core:jackson-core to 2.16.1 (was 2.15.2)</li>
-    <li>Update com.fasterxml.jackson.core:jackson-databind to 2.16.1 (was 2.15.2)</li>
-    <li>Update com.fifesoft:rsyntaxtextarea to 3.3.4 (was 3.3.3)</li>
-    <li>Update com.google.errorprone:error_prone_annotations to 2.24.0 (was 2.20.0)</li>
-    <li>Update commons-codec:commons-codec to 1.16.0 (was 1.15)</li>
-    <li>Update commons-io:commons-io to 2.15.1 (was 2.12.0)</li>
-    <li>Update commons-logging:commons-logging to 1.3.0 (was 1.2)</li>
-    <li>Update commons-net:commons-net to 3.9.0 (was 3.10.0)</li>
-    <li>Update io.burt:jmespath-core to 0.6.0 (was 0.5.1)</li>
-    <li>Update io.burt:jmespath-jackson to 0.6.0 (was 0.5.1)</li>
-    <li>Update net.minidev:accessors-smart to 2.5.0 (was 2.4.11)</li>
-    <li>Update net.minidev:json-smart to 2.5.0 (was 2.4.11)</li>
-    <li>Update net.sf.saxon:Saxon-HE to 11.6 (was 11.5)</li>
-    <li>Update org.apache.commons:commons-lang3 to 3.14.0 (was 3.12.0)</li>
-    <li>Update org.apache.commons:commons-pool2 to 2.12.0 (was 2.11.1)</li>
-    <li>Update org.apache.commons:commons-text to 1.11.0 (was 1.10.0)</li>
-    <li>Update org.apache.httpcomponents.client5:httpclient5 to 5.3 (was 5.2.1)</li>
-    <li>Update org.apache.httpcomponents.core5:httpcore5-h2 to 5.2.4 (was 5.2)</li>
-    <li>Update org.apache.httpcomponents.core5:httpcore5 to 5.2.4 (was 5.2)</li>
-    <li>Update org.apache.logging.log4j:log4j-1.2-api to 2.22.1 (was 2.20.0)</li>
-    <li>Update org.apache.logging.log4j:log4j-api to 2.22.1 (was 2.20.0)</li>
-    <li>Update org.apache.logging.log4j:log4j-core to 2.22.1 (was 2.20.0)</li>
-    <li>Update org.apache.logging.log4j:log4j-slf4j-impl to 2.22.1 (was 2.20.0)</li>
-    <li>Update org.apache.xmlgraphics:xmlgraphics-commons to 2.9 (was 2.8)</li>
-    <li>Update org.checkerframework:checker-qual to 3.42.0 (was 3.35.0)</li>
-    <li>Update org.codehaus.groovy:groovy-datetime to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-dateutil to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-jmx to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-json to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-jsr223 to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-sql to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-templates to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy-xml to 3.0.20 (was 3.0.17)</li>
-    <li>Update org.codehaus.groovy:groovy to 3.0.20 (was 3.0.17)</li>
-    <li>Remove org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22</li>
-    <li>Update org.jetbrains.kotlin:kotlin-stdlib-jdk7 to 1.9.10 (was 1.8.22)</li>
-    <li>Update org.jetbrains.kotlin:kotlin-stdlib-jdk8 to 1.9.10 (was 1.8.22)</li>
-    <li>Update org.jetbrains.kotlin:kotlin-stdlib to 1.9.22 (was 1.8.22)</li>
-    <li>Update org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm to 1.7.3 (was 1.7.1)</li>
-    <li>Update org.jetbrains.kotlinx:kotlinx-coroutines-swing to 1.7.3 (was 1.7.1)</li>
-    <li>Update org.jetbrains.lets-plot:base-portable-jvm to 4.1.0 (was 3.2.0)</li>
-    <li>Update org.jetbrains.lets-plot:lets-plot-common to 4.1.0 (was 3.2.0)</li>
-    <li>Update org.jetbrains.lets-plot:lets-plot-kotlin-jvm to 4.5.0 (was 4.4.1)</li>
-    <li>Update org.jetbrains.lets-plot:plot-common-portable-jvm to 4.1.0 (was 3.2.0)</li>
-    <li>Update org.jetbrains:annotations to 24.1.0 (was 24.0.1)</li>
-    <li>Update org.jsoup:jsoup to 1.17.1 (was 1.16.1)</li>
-    <li>Update org.mongodb:mongo-java-driver to 2.14.3 (was 2.11.3)</li>
-    <li>Update org.neo4j.driver:neo4j-java-driver to 4.4.13 (was 4.4.11)</li>
-    <li>Update org.ow2.asm:asm to 9.6 (was 9.5)</li>
-    <li>Update org.xmlresolver:xmlresolver to 5.2.1 (was 4.6.4)</li>
-    <li>Update org.xmlresolver:xmlresolver:data to 5.2.1 (was 4.6.4)</li>
+    <li><pr>6220</pr> Require Java 17 or later for running JMeter</li>
   </ul>
 
  <!--  =================== Thanks =================== -->
@@ -203,25 +116,6 @@ This property is in this file:
 See  <bugzilla>56357</bugzilla> for details.
 </li>
 
-<li>
-Under Mac OSX Aggregate Graph will show wrong values due to mirroring effect on numbers.
-This is due to a known Java bug, see Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8065373" >JDK-8065373</a>
-The fix is to use JDK8_u45 or later.
-</li>
-
-<li>
-View Results Tree may fail to display some HTML code under HTML renderer, see <bugzilla>54586</bugzilla>.
-This is due to a known Java bug which fails to parse "<code>px</code>" units in row/col attributes.
-See Bug <a href="https://bugs.openjdk.java.net/browse/JDK-8031109" >JDK-8031109</a>
-The fix is to use JDK9 b65 or later.
-</li>
-
-<li>
-JTable selection with keyboard (<keycombo><keysym>SHIFT</keysym><keysym>up/down</keysym></keycombo>) is totally unusable with Java 7 on Mac OSX.
-This is due to a known Java bug <a href="https://bugs.openjdk.java.net/browse/JDK-8025126" >JDK-8025126</a>
-The fix is to use JDK 8 b132 or later.
-</li>
-
 <li>
 Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
 Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index ff0a7d07088..cb214fd35d4 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -78,7 +78,7 @@
       <a href="https://www.apache.org/dist/jmeter/KEYS">KEYS</a>
       </p>
     </section>
-    <section name="Apache JMeter &release; (Requires Java 8+)">
+    <section name="Apache JMeter &release; (Requires Java 17+)">
       <subsection name="Binaries" anchor="binaries">
         <table>
           <tr>
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 9446ef63ac6..015d8e6d32a 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -115,7 +115,7 @@ over your Test Plans.</p>
 <p>JMeter requires that your computing environment meets some minimum requirements.</p>
 
 <subsection name="&sect-num;.1.1 Java Version" anchor="java_versions">
-<note>JMeter is compatible with Java 8 or higher.
+<note>JMeter is compatible with Java 17 or higher.
 We highly advise you to install latest minor version of your major version for security and performance reasons.
 </note>
 <p>Because JMeter uses only standard Java APIs, please do not file bug reports if your JRE fails to run

From bacaa8baff2365a6b49d996766c77475c37eecc3 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Fri, 12 Apr 2024 12:01:50 +0000
Subject: [PATCH 0762/1037] Add a space between key and value after : in View
 Results Tree > Sampler result tab #6267 (#6268)

---
 .../jmeter/visualizers/SamplerResultTab.java  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 7356f172295..90819ac6c45 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -92,6 +92,8 @@ public abstract class SamplerResultTab implements ResultRenderer {
 
     private static final String NL = "\n"; // $NON-NLS-1$
 
+    private static final String SPACE = " "; // $NON-NLS-1$
+
     public static final Color SERVER_ERROR_COLOR = Color.red;
 
     public static final Color CLIENT_ERROR_COLOR = Color.blue;
@@ -261,53 +263,53 @@ public void setupTabPane() {
                 StringBuilder statsBuff = new StringBuilder(200);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_thread_name")) //$NON-NLS-1$
+                                .getResString("view_results_thread_name")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getThreadName()).append(NL);
                 String startTime = dateFormat
                         .format(Instant.ofEpochMilli(sampleResult.getStartTime()));
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_sample_start")) //$NON-NLS-1$
+                                .getResString("view_results_sample_start")).append(SPACE) //$NON-NLS-1$
                         .append(startTime).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_load_time")) //$NON-NLS-1$
+                                .getResString("view_results_load_time")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getTime()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_connect_time")) //$NON-NLS-1$
+                                .getResString("view_results_connect_time")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getConnectTime()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_latency")) //$NON-NLS-1$
+                                .getResString("view_results_latency")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getLatency()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_size_in_bytes")) //$NON-NLS-1$
+                                .getResString("view_results_size_in_bytes")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getBytesAsLong()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_sent_bytes")) //$NON-NLS-1$
+                                .getResString("view_results_sent_bytes")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getSentBytes()).append(NL);
                 statsBuff
                         .append(JMeterUtils.getResString(
-                                "view_results_size_headers_in_bytes")) //$NON-NLS-1$
+                                "view_results_size_headers_in_bytes")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getHeadersSize()).append(NL);
                 statsBuff
                         .append(JMeterUtils.getResString(
-                                "view_results_size_body_in_bytes")) //$NON-NLS-1$
+                                "view_results_size_body_in_bytes")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getBodySizeAsLong()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_sample_count")) //$NON-NLS-1$
+                                .getResString("view_results_sample_count")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getSampleCount()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_error_count")) //$NON-NLS-1$
+                                .getResString("view_results_error_count")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getErrorCount()).append(NL);
                 statsBuff
                         .append(JMeterUtils
-                                .getResString("view_results_datatype")) //$NON-NLS-1$
+                                .getResString("view_results_datatype")).append(SPACE) //$NON-NLS-1$
                         .append(sampleResult.getDataType()).append(NL);
                 statsDoc.insertString(statsDoc.getLength(),
                         statsBuff.toString(), null);

From 289b3d189c5289894dc44e3d29e24a800a7e4c36 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 May 2024 15:03:26 +0300
Subject: [PATCH 0763/1037] fix: trim whitespace when parsing numeric
 properties

Motivation: if the value parses after trimming, then it would likely be the one
the user wants.

Currently, a trailing whitespace in UI is hard to notice, and it breaks test
execution. For instance ThreadGroup.threadNum becomes 0 without any warning,
and it invalidates test results.
---
 .../property/AbstractProperty.java            | 20 +++----
 .../apache/jmeter/threads/ThreadGroupTest.kt  | 57 +++++++++++++++++++
 2 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 src/core/src/test/kotlin/org/apache/jmeter/threads/ThreadGroupTest.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
index 5c6fcb8dc1f..185c92a3861 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
@@ -108,11 +108,11 @@ public AbstractProperty clone() {
     @Override
     public int getIntValue() {
         String val = getStringValue();
-        if (val == null || val.length()==0) {
+        if (val == null || val.isEmpty()) {
             return 0;
         }
         try {
-            return Integer.parseInt(val);
+            return Integer.parseInt(val.trim());
         } catch (NumberFormatException e) {
             return 0;
         }
@@ -126,11 +126,11 @@ public int getIntValue() {
     @Override
     public long getLongValue() {
         String val = getStringValue();
-        if (val == null || val.length()==0) {
+        if (val == null || val.isEmpty()) {
             return 0;
         }
         try {
-            return Long.parseLong(val);
+            return Long.parseLong(val.trim());
         } catch (NumberFormatException e) {
             return 0;
         }
@@ -144,11 +144,11 @@ public long getLongValue() {
     @Override
     public double getDoubleValue() {
         String val = getStringValue();
-        if (val == null || val.length()==0) {
+        if (val == null || val.isEmpty()) {
             return 0;
         }
         try {
-            return Double.parseDouble(val);
+            return Double.parseDouble(val.trim());
         } catch (NumberFormatException e) {
             log.error("Tried to parse a non-number string to an integer", e);
             return 0;
@@ -163,11 +163,11 @@ public double getDoubleValue() {
     @Override
     public float getFloatValue() {
         String val = getStringValue();
-        if (val == null || val.length()==0) {
+        if (val == null || val.isEmpty()) {
             return 0;
         }
         try {
-            return Float.parseFloat(val);
+            return Float.parseFloat(val.trim());
         } catch (NumberFormatException e) {
             log.error("Tried to parse a non-number string to an integer", e);
             return 0;
@@ -182,10 +182,10 @@ public float getFloatValue() {
     @Override
     public boolean getBooleanValue() {
         String val = getStringValue();
-        if (val == null || val.length()==0) {
+        if (val == null || val.isEmpty()) {
             return false;
         }
-        return Boolean.parseBoolean(val);
+        return Boolean.parseBoolean(val.trim());
     }
 
     /**
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/ThreadGroupTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/ThreadGroupTest.kt
new file mode 100644
index 00000000000..a26be526f78
--- /dev/null
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/ThreadGroupTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.threads
+
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.test.samplers.ThreadSleep
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import kotlin.time.Duration.Companion.seconds
+
+class ThreadGroupTest : JMeterTestCase() {
+    @Test
+    fun `threadNum with trailing whitespace`() {
+        val events = executePlanAndCollectEvents(10.seconds) {
+            ThreadGroup::class {
+                props {
+                    it[numThreads] = "1 "
+                }
+                rampUp = 0
+                scheduler = true
+                delay = 0
+                duration = 1
+                setSamplerController(
+                    LoopController().apply {
+                        loops = 1
+                        setContinueForever(false)
+                    }
+                )
+
+                ThreadSleep::class {
+                    duration = 0.seconds
+                }
+            }
+        }
+        assertEquals(1, events.size) {
+            "ThreadGroup.threadNum has trailing whitespace, it should be trimmed, so one event should be generated. " +
+                "Actual events are $events"
+        }
+    }
+}

From 339c793250a73f937436ccb49a58cb40fc3db50a Mon Sep 17 00:00:00 2001
From: David Coomber <10194965-dcoomber@users.noreply.gitlab.com>
Date: Fri, 21 Jun 2024 16:30:43 +0200
Subject: [PATCH 0764/1037] Fixed typo

---
 .../src/main/java/org/apache/jorphan/exec/KeyToolUtils.java | 4 ++--
 xdocs/usermanual/component_reference.xml                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index f4f489743e2..e09387dfebe 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -53,7 +53,7 @@ public class KeyToolUtils {
     /** Name of property that can be used to override the default keytool location */
     private static final String KEYTOOL_DIRECTORY = "keytool.directory"; // $NON-NLS-1$
 
-    private static final String DNAME_INTERMEDIATE_CA_KEY  = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF IT S YOURS)"; // $NON-NLS-1$
+    private static final String DNAME_INTERMEDIATE_CA_KEY  = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF ITS YOURS)"; // $NON-NLS-1$
 
     public static final String ROOT_CACERT_CRT_PFX = "ApacheJMeterTemporaryRootCA"; // $NON-NLS-1$ (do not change)
     private static final String ROOT_CACERT_CRT = ROOT_CACERT_CRT_PFX + ".crt"; // $NON-NLS-1$ (Firefox and Windows)
@@ -73,7 +73,7 @@ public class KeyToolUtils {
     static {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF IT S YOURS)"); // $NON-NLS-1$
+        sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)"); // $NON-NLS-1$
         String userName = System.getProperty("user.name"); // $NON-NLS-1$
         userName = userName.replace('\\','/'); // Backslash is special (Bugzilla 56178)
         addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 8a5f438c232..bafe02dbd21 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6832,9 +6832,9 @@ As a consequence:
 <li>The browser should display a dialogue asking if you want to accept the certificate or not. For example:
 <source>
 1) The server's name "<code>www.example.com</code>" does not match the certificate's name
-   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT S YOURS)</code>". Somebody may be trying to eavesdrop on you.
-2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT S YOURS)</code>" is signed by the unknown Certificate Authority
-   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT S YOURS)</code>". It is not possible to verify that this is a valid certificate.
+   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". Somebody may be trying to eavesdrop on you.
+2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>" is signed by the unknown Certificate Authority
+   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". It is not possible to verify that this is a valid certificate.
 </source>
 You will need to accept the certificate in order to allow the JMeter Proxy to intercept the SSL traffic in order to
 record it.

From 174ba3178f287d2984b1e53004e2c2cee1ffff16 Mon Sep 17 00:00:00 2001
From: David Coomber <47242934+dcoomber@users.noreply.github.com>
Date: Sun, 23 Jun 2024 12:53:21 +0200
Subject: [PATCH 0765/1037] Fixed grammar

---
 .../src/main/java/org/apache/jorphan/exec/KeyToolUtils.java | 4 ++--
 xdocs/usermanual/component_reference.xml                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index e09387dfebe..cf184c04a1b 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -53,7 +53,7 @@ public class KeyToolUtils {
     /** Name of property that can be used to override the default keytool location */
     private static final String KEYTOOL_DIRECTORY = "keytool.directory"; // $NON-NLS-1$
 
-    private static final String DNAME_INTERMEDIATE_CA_KEY  = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF ITS YOURS)"; // $NON-NLS-1$
+    private static final String DNAME_INTERMEDIATE_CA_KEY  = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF IT IS YOURS)"; // $NON-NLS-1$
 
     public static final String ROOT_CACERT_CRT_PFX = "ApacheJMeterTemporaryRootCA"; // $NON-NLS-1$ (do not change)
     private static final String ROOT_CACERT_CRT = ROOT_CACERT_CRT_PFX + ".crt"; // $NON-NLS-1$ (Firefox and Windows)
@@ -73,7 +73,7 @@ public class KeyToolUtils {
     static {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)"); // $NON-NLS-1$
+        sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)"); // $NON-NLS-1$
         String userName = System.getProperty("user.name"); // $NON-NLS-1$
         userName = userName.replace('\\','/'); // Backslash is special (Bugzilla 56178)
         addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index bafe02dbd21..5733903554f 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6832,9 +6832,9 @@ As a consequence:
 <li>The browser should display a dialogue asking if you want to accept the certificate or not. For example:
 <source>
 1) The server's name "<code>www.example.com</code>" does not match the certificate's name
-   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". Somebody may be trying to eavesdrop on you.
-2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>" is signed by the unknown Certificate Authority
-   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". It is not possible to verify that this is a valid certificate.
+   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>". Somebody may be trying to eavesdrop on you.
+2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>" is signed by the unknown Certificate Authority
+   "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>". It is not possible to verify that this is a valid certificate.
 </source>
 You will need to accept the certificate in order to allow the JMeter Proxy to intercept the SSL traffic in order to
 record it.

From cbdfd1ba435ad92b32c6538a5a433ac7dff9e024 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Sun, 4 Aug 2024 23:13:56 +0200
Subject: [PATCH 0766/1037] Fix log4j package warning on JMeter startup: WARN
 StatusConsoleListener The use of package scanning to locate plugins is
 deprecated ...

The Log4j Core `packages` configuration attribute is deprecated because:

* It triggers the scanning of the mentioned packages and slows down the
  startup process.
* It was replaced in version 2.0 by a faster mechanism that relies on a
  `Log4jPlugins.dat` metadata file. See [Log4j Plugins](https://logging.apache.org/log4j/2.x/manual/plugins.html) for more details.

This PR removes the `packages` attribute from the standard configuration
file and configures the build script of `jmeter-core` to use the
`PluginProcessor` contained in `log4j-core`.

See #5937.
---
 bin/log4j2.xml            |  2 +-
 src/core/build.gradle.kts | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bin/log4j2.xml b/bin/log4j2.xml
index 47b012f2cf4..feb8954d56a 100644
--- a/bin/log4j2.xml
+++ b/bin/log4j2.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="WARN" packages="org.apache.jmeter.gui.logging">
+<Configuration status="WARN">
 
   <Appenders>
     <!-- Uncomment to set rotating logs up to 5 files of 100 MB-->
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 38fa682e8e6..98141cdcab4 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -17,6 +17,7 @@
 
 import com.github.autostyle.gradle.AutostyleTask
 import com.github.vlsi.gradle.ide.IdeExtension
+import java.util.jar.JarFile
 
 plugins {
     id("java-test-fixtures")
@@ -45,6 +46,9 @@ dependencies {
     api("org.apache.logging.log4j:log4j-core") {
         because("GuiLogEventAppender is using log4j-core to implement GUI-based log appender")
     }
+    kapt("org.apache.logging.log4j:log4j-core") {
+        because("Generates a plugin cache file for GuiLogEventAppender")
+    }
     api("org.apache.logging.log4j:log4j-slf4j-impl") {
         because("Both log4j and slf4j are included, so it makes sense to just add log4j->slf4j bridge as well")
     }
@@ -188,3 +192,16 @@ tasks.jar {
         from("$rootDir/xdocs/images/logo.svg")
     }
 }
+
+// Checks the generated JAR for a Log4j plugin cache file.
+tasks.jar {
+    doLast {
+        val jarFile = archiveFile.get().asFile
+        JarFile(jarFile).use { jar ->
+            val entryName = "META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat"
+            if (jar.getJarEntry(entryName) == null) {
+                throw IllegalStateException("$entryName was not found in $jarFile. The entry should be generated by log4j-core annotation processor")
+            }
+        }
+    }
+}

From 6b650080c40ef1d0ac4c52a597fd20f9c746485c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 6 Aug 2024 10:37:53 +0300
Subject: [PATCH 0767/1037] chore: use xercesImpl:2.12.1 for the buildscript
 classpath to avoid old xerces during the build

This is a build-time only change, and it does not change test/runtime classpath.
---
 build-logic/root-build/build.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 734136ffa22..d0a7975f544 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -20,6 +20,11 @@ plugins {
 }
 
 dependencies {
+    constraints {
+        api("xerces:xercesImpl:2.12.1") {
+            because("Some of the plugins might depend on an older version, and we want using a more recent one")
+        }
+    }
     api(projects.buildParameters)
     api(projects.verification)
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")

From ca708c8ece7490d980c88ebe12fc4a553b20b561 Mon Sep 17 00:00:00 2001
From: Dmitry Kryukov <dk2k@ya.ru>
Date: Sun, 30 Jun 2024 22:37:38 +0300
Subject: [PATCH 0768/1037] Removed several collections which are updated, but
 seem to be never accessed.

---
 .../src/main/java/org/apache/jmeter/gui/HtmlReportUI.java   | 6 ------
 .../main/java/org/apache/jmeter/testelement/TestPlan.java   | 4 ----
 .../org/apache/jmeter/protocol/jms/sampler/JMSSampler.java  | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
index 4ff62a8f1e2..97b5a79bc62 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
@@ -52,7 +52,6 @@
 import org.slf4j.LoggerFactory;
 
 public class HtmlReportUI implements ActionListener {
-    private static final Set<String> commands = new HashSet<>();
     private static final Logger LOGGER = LoggerFactory.getLogger(HtmlReportUI.class);
 
     private static final String CREATE_REQUEST = "CREATE_REQUEST";
@@ -82,11 +81,6 @@ public class HtmlReportUI implements ActionListener {
     private final ImageIcon inErrorIcon = JMeterUtils.getImage(IMAGES_PREFIX + iconSize +"/dialog-error-5.png");// $NON-NLS-1$
     private final ImageIcon completedIcon = JMeterUtils.getImage(IMAGES_PREFIX + iconSize +"/task-complete.png");// $NON-NLS-1$
 
-
-    static {
-        commands.add(ActionNames.HTML_REPORT);
-    }
-
     public HtmlReportUI() {
         super();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
index 0f19947ee28..82498960c93 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
@@ -43,8 +43,6 @@ public class TestPlan extends AbstractTestElement implements Serializable, TestS
 
     private static final String BASEDIR = "basedir";
 
-    private transient List<AbstractThreadGroup> threadGroups = new ArrayList<>();
-
     // There's only 1 test plan, so can cache the mode here
     private static volatile boolean functionalMode = false;
 
@@ -68,7 +66,6 @@ public TestPlanSchema getSchema() {
 
     // create transient item
     protected Object readResolve(){
-        threadGroups = new ArrayList<>();
         return this;
     }
 
@@ -213,7 +210,6 @@ public void addTestElement(TestElement tg) {
      *            the feature to be added to the AbstractThreadGroup attribute
      */
     public void addThreadGroup(AbstractThreadGroup group) {
-        threadGroups.add(group);
     }
 
     /**
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index afa833b5cdb..1ea1d922869 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -254,7 +254,6 @@ private void handleOneWay(SampleResult res) throws JMSException {
 
     private void handleRead(JMeterContext context, SampleResult res) {
         LOGGER.debug("isRead");
-        StringBuilder sb = new StringBuilder(75);
         res.setSuccessful(true);
         Sampler sampler = context.getPreviousSampler();
         SampleResult sr = context.getPreviousResult();
@@ -273,8 +272,6 @@ private void handleRead(JMeterContext context, SampleResult res) {
         do {
             result = browseQueueForConsumption(sendQueue, jmsSelector, res, buffer, propBuffer);
             if (result != null) {
-                sb.append(result);
-                sb.append('\n');
                 sampleCounter++;
             }
             sampleTries++;

From 871aa6052280f0919af03b34a6880337306b4ba6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 6 Aug 2024 12:29:38 +0300
Subject: [PATCH 0769/1037] style: remove unused imports

---
 src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java | 3 ---
 .../src/main/java/org/apache/jmeter/testelement/TestPlan.java  | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
index 97b5a79bc62..0c55e5efee3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
@@ -25,9 +25,7 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.ImageIcon;
@@ -40,7 +38,6 @@
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 
-import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.HtmlReportGenerator;
 import org.apache.jmeter.gui.util.EscapeDialog;
 import org.apache.jmeter.gui.util.JMeterToolBar;
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
index 82498960c93..b73f8359c60 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
@@ -20,8 +20,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.jmeter.NewDriver;

From 3e9af5de35718ae31eabcd2e46cd5462760091ed Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 6 Aug 2024 13:00:43 +0300
Subject: [PATCH 0770/1037] chore: bump Gradle to 8.9

---
 ...build-logic.reproducible-builds.gradle.kts |   8 +++++--
 ...ld-logic.java-published-library.gradle.kts |  10 +++++---
 ...d-logic.java-published-platform.gradle.kts |   9 ++++---
 gradle/wrapper/gradle-wrapper.jar             | Bin 43462 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   7 ++++--
 gradlew.bat                                   |  22 ++++++++++--------
 src/dist-check/build.gradle.kts               |   8 +++++--
 src/dist/build.gradle.kts                     |  10 +++++---
 9 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts b/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
index ee54f0ac9e5..d832a31e1ff 100644
--- a/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
+++ b/build-logic/basics/src/main/kotlin/build-logic.reproducible-builds.gradle.kts
@@ -19,6 +19,10 @@ tasks.withType<AbstractArchiveTask>().configureEach {
     // Ensure builds are reproducible
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true
-    dirMode = "775".toInt(8)
-    fileMode = "664".toInt(8)
+    filePermissions {
+        unix("rw-r--r--")
+    }
+    dirPermissions {
+        unix("rwxr-xr-x")
+    }
 }
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
index 68b140e45bc..527e0ec6d53 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.java-published-library.gradle.kts
@@ -26,17 +26,21 @@ java {
     withSourcesJar()
 }
 
-val archivesBaseName = when (name) {
+// We maintain the file names for backward compatibility
+val archiveName = when (name) {
     "jorphan", "bshclient" -> name
     "launcher" -> "ApacheJMeter"
     else -> "ApacheJMeter_$name"
 }
-setProperty("archivesBaseName", archivesBaseName)
+
+base {
+    archivesName = archiveName
+}
 
 publishing {
     publications {
         create<MavenPublication>("mavenJava") {
-            artifactId = archivesBaseName
+            artifactId = archiveName
             from(components["java"])
         }
     }
diff --git a/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts b/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
index baacdd1f779..11a331a1b71 100644
--- a/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
+++ b/build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
@@ -21,13 +21,16 @@ plugins {
     id("build-logic.publish-to-central")
 }
 
-val archivesBaseName = "ApacheJMeter_$name"
-setProperty("archivesBaseName", archivesBaseName)
+val archiveName = "ApacheJMeter_$name"
+
+base {
+    archivesName = archiveName
+}
 
 publishing {
     publications {
         create<MavenPublication>("mavenJavaPlatform") {
-            artifactId = archivesBaseName
+            artifactId = archiveName
             from(components["javaPlatform"])
         }
     }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 34463
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
SXRcJ{65?fGI57uQ5&!`B?F@7P

delta 34554
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e37c1db618c..340af228290 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f135..9d21a21834d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 3ea9dd20f52..38094102510 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -82,8 +82,12 @@ val populateLibs by tasks.registering {
     doLast {
         val deps = extraTestDependencies.resolvedConfiguration.resolvedArtifacts
         with(libOpt) {
-            fileMode = "644".toInt(8)
-            dirMode = "755".toInt(8)
+            filePermissions {
+                unix("rw-r--r--")
+            }
+            dirPermissions {
+                unix("rwxr-xr-x")
+            }
             from(deps.map { it.file })
         }
     }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index ed40ea3deed..8ac383a052d 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -132,12 +132,16 @@ val populateLibs by tasks.registering {
         val bshclientProject = projects.src.bshclient.dependencyProject.path
         val jorphanProject = projects.src.jorphan.dependencyProject.path
         listOf(libs, libsExt, binLibs).forEach {
-            it.fileMode = "644".toInt(8)
-            it.dirMode = "755".toInt(8)
+            it.filePermissions {
+                unix("rw-r--r--")
+            }
+            it.dirPermissions {
+                unix("rwxr-xr-x")
+            }
         }
         for (dep in deps) {
             val compId = dep.id.componentIdentifier
-            if (compId !is ProjectComponentIdentifier || !compId.build.isCurrentBuild) {
+            if (compId !is ProjectComponentIdentifier) {
                 // Move all non-JMeter jars to lib folder
                 libs.from(dep.file)
                 continue

From 8b25820e672b7719a7f2c92e00dfd196ec5e340c Mon Sep 17 00:00:00 2001
From: Jitesh Kumar Raghav <jkr18042001@gmail.com>
Date: Thu, 12 Sep 2024 14:03:41 +0530
Subject: [PATCH 0771/1037] Fixed Typo in error message #6335 Issue

---
 bin/testfiles/JDBC_TESTS.csv                           |  2 +-
 bin/testfiles/JDBC_TESTS.jmx                           | 10 +++++-----
 bin/testfiles/JDBC_TESTS.xml                           |  2 +-
 .../jmeter/protocol/jdbc/config/DataSourceElement.java |  2 +-
 .../protocol/jdbc/processor/AbstractJDBCProcessor.java |  2 +-
 .../jmeter/protocol/jdbc/sampler/JDBCSampler.java      |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/testfiles/JDBC_TESTS.csv b/bin/testfiles/JDBC_TESTS.csv
index a2a54858979..ba56666ef62 100644
--- a/bin/testfiles/JDBC_TESTS.csv
+++ b/bin/testfiles/JDBC_TESTS.csv
@@ -23,7 +23,7 @@ JDBC_SELECT_LIMIT_RESULTSET_1,200,OK,TG-OK 1-1,text,true,1,1,1,0
 JDBC_SELECT_LIMIT_RESULTSET_2,200,OK,TG-OK 1-1,text,true,1,1,1,0
 JDBC_SELECT_LIMIT_RESULTSET_3,200,OK,TG-OK 1-1,text,true,1,1,1,0
 JDBC_SELECT_LIMIT_RESULTSET_4,200,OK,TG-OK 1-1,text,true,1,1,1,0
-JDBC_NoConfig,000,java.lang.IllegalArgumentException: Name for DataSoure must not be empty in JDBC_NoConfig,TG-Errors 2-1,text,true,1,1,1,0
+JDBC_NoConfig,000,java.lang.IllegalArgumentException: Name for DataSource must not be empty in JDBC_NoConfig,TG-Errors 2-1,text,true,1,1,1,0
 JDBC_Wrong_Sql,42581 -5581,java.sql.SQLSyntaxErrorException: unexpected token: WHERE,TG-Errors 2-1,text,true,1,1,1,0
 JDBC_With_Failing_PreProcessor,200,OK,TG-Errors 2-1,text,true,1,1,1,0
 JDBC_With_Failing_PostProcessor,200,OK,TG-Errors 2-1,text,true,1,1,1,0
diff --git a/bin/testfiles/JDBC_TESTS.jmx b/bin/testfiles/JDBC_TESTS.jmx
index c59e13ef39f..ff1705a823d 100644
--- a/bin/testfiles/JDBC_TESTS.jmx
+++ b/bin/testfiles/JDBC_TESTS.jmx
@@ -67,7 +67,7 @@ def user = &apos;SA&apos;
 def password = &apos;&apos;
 def driver = &apos;org.hsqldb.jdbcDriver&apos;
 def sql = Sql.newInstance(url, user, password, driver)
-def row = sql.firstRow(&apos;select count(*) from INFORMATION_SCHEMA.system_sessions&apos;) 
+def row = sql.firstRow(&apos;select count(*) from INFORMATION_SCHEMA.system_sessions&apos;)
 def sessionNum = row[0]
 
 try {
@@ -164,7 +164,7 @@ sql.close()
    title VARCHAR(50) NOT NULL,
    author VARCHAR(20) NOT NULL,
    submission_date DATE,
-   PRIMARY KEY (id) 
+   PRIMARY KEY (id)
 );
 
 </stringProp>
@@ -196,7 +196,7 @@ sql.close()
    BEGIN ATOMIC
      DECLARE result CURSOR FOR SELECT * FROM USERS WHERE ID = IDENTITY();
      INSERT INTO USERS VALUES (DEFAULT, title, author, CURRENT_DATE);
-     OPEN result;    
+     OPEN result;
    END ;</stringProp>
           <stringProp name="queryArguments"></stringProp>
           <stringProp name="queryArgumentsTypes"></stringProp>
@@ -225,7 +225,7 @@ sql.close()
 	MODIFIES SQL DATA DYNAMIC RESULT SETS 1
    BEGIN ATOMIC
      DECLARE result CURSOR FOR SELECT * FROM USERS order by id FOR READ ONLY;
-     OPEN result;   
+     OPEN result;
    END ;</stringProp>
           <stringProp name="queryArguments"></stringProp>
           <stringProp name="queryArgumentsTypes"></stringProp>
@@ -1284,7 +1284,7 @@ if (list.size()==3) {
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="-1643270117">Name for DataSoure must not be empty in JDBC_NoConfig</stringProp>
+              <stringProp name="-1643270117">Name for DataSource must not be empty in JDBC_NoConfig</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_message</stringProp>
             <boolProp name="Assertion.assume_success">true</boolProp>
diff --git a/bin/testfiles/JDBC_TESTS.xml b/bin/testfiles/JDBC_TESTS.xml
index bf938f4909d..4b9b3021508 100644
--- a/bin/testfiles/JDBC_TESTS.xml
+++ b/bin/testfiles/JDBC_TESTS.xml
@@ -340,7 +340,7 @@
     <error>false</error>
   </assertionResult>
 </sample>
-<sample s="true" lb="JDBC_NoConfig" rc="000" rm="java.lang.IllegalArgumentException: Name for DataSoure must not be empty in JDBC_NoConfig" tn="TG-Errors 2-1" dt="text" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="JDBC_NoConfig" rc="000" rm="java.lang.IllegalArgumentException: Name for DataSource must not be empty in JDBC_NoConfig" tn="TG-Errors 2-1" dt="text" sc="1" ec="0" ng="1" na="1">
   <assertionResult>
     <name>Response Assertion</name>
     <failure>false</failure>
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 703c5143cbb..ed6a7cfc73c 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -116,7 +116,7 @@ public void testStarted() {
         JMeterVariables variables = getThreadContext().getVariables();
         String poolName = getDataSource();
         if (JOrphanUtils.isBlank(poolName)) {
-            throw new IllegalArgumentException("Name for DataSoure must not be empty in " + getName());
+            throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
         } else if (variables.getObject(poolName) != null) {
             log.error("JDBC data source already defined for: {}", poolName);
         } else {
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
index c8de7603432..53dfb4072a3 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
@@ -41,7 +41,7 @@ public abstract class AbstractJDBCProcessor extends AbstractJDBCTestElement {
      */
     protected void process() {
         if (JOrphanUtils.isBlank(getDataSource())) {
-            throw new IllegalArgumentException("Name for DataSoure must not be empty in " + getName());
+            throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
         }
         try (Connection conn = DataSourceElement.getConnection(getDataSource())){
             execute(conn);
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
index 7c23db03a82..81bdae0649d 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
@@ -74,7 +74,7 @@ public SampleResult sample(Entry e) {
         try {
             String dataSource = getDataSource();
             if (JOrphanUtils.isBlank(dataSource)) {
-                throw new IllegalArgumentException("Name for DataSoure must not be empty in " + getName());
+                throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
             }
 
             try {

From 755011176b2e2d035c99a6ef607c21e827d508f8 Mon Sep 17 00:00:00 2001
From: wick <linvaux@outlook.com>
Date: Sun, 11 Aug 2024 13:26:22 +0800
Subject: [PATCH 0772/1037] fix(Jmeter): fix a wrong method name

update org.apache.jmeter.JMeter#startUdpDdaemon to org.apache.jmeter.JMeter#startUdpDaemon

Closes 6325
---
 src/core/src/main/java/org/apache/jmeter/JMeter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 8592d4fd865..d9292549621 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -1040,7 +1040,7 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
                 testListener.setStartedRemoteEngines(engines);
                 distributedRunner.start();
             }
-            startUdpDdaemon(engines);
+            startUdpDaemon(engines);
         } catch (ConfigurationException e) {
             throw e;
         } catch (Exception e) {
@@ -1379,7 +1379,7 @@ public static boolean isNonGUI(){
         return "true".equals(System.getProperty(JMeter.JMETER_NON_GUI)); //$NON-NLS-1$
     }
 
-    private static void startUdpDdaemon(final List<? extends JMeterEngine> engines) {
+    private static void startUdpDaemon(final List<? extends JMeterEngine> engines) {
         int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port", UDP_PORT_DEFAULT); // $NON-NLS-1$
         int maxPort = JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
         if (port > 1000){

From 90f6998fa730f2d5c908bdcde4155cf17c1b399b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 11:18:45 +0200
Subject: [PATCH 0773/1037] Fix flaky brotli decompression batch test

Sometimes in CI the brotli request will be redirected first, so try to not show
those redirects in the sampler output. Maybe we can get that test to working again.
---
 bin/testfiles/ResponseDecompression.jmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/testfiles/ResponseDecompression.jmx b/bin/testfiles/ResponseDecompression.jmx
index 9350526d165..aa96379e50d 100644
--- a/bin/testfiles/ResponseDecompression.jmx
+++ b/bin/testfiles/ResponseDecompression.jmx
@@ -160,8 +160,8 @@
             <stringProp name="HTTPSampler.contentEncoding"></stringProp>
             <stringProp name="HTTPSampler.path">/</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
             <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
             <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
             <stringProp name="HTTPSampler.embedded_url_re"></stringProp>

From d1de0b8e1a41e52872b89aaea2dd3eff7923cc30 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 14:29:13 +0200
Subject: [PATCH 0774/1037] Exclude Oracle Java on MacOS. It is not working
 currently

It seems, that the env variable JAVA_HOME__x64 is not set
---
 .github/workflows/matrix.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index ba4364eb1f0..acf5472f941 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -78,6 +78,8 @@ matrix.setNamePattern(['java_version', 'java_distribution', 'hash', 'os', 'tz',
 
 // Semeru uses OpenJ9 jit which has no option for making hash codes the same
 matrix.exclude({java_distribution: {value: 'semeru'}, hash: {value: 'same'}});
+// MacOS and Oracle Java does not work currently. No JAVA_HOME_${VERSION}_x64 set and thus no java found
+matrix.exclude({os: 'macos-latest', java_distribution: {value: 'oracle'}})
 // Ignore builds with JAVA EA for now, see https://github.com/apache/jmeter/issues/6114
 matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})

From 3a38f0462a28222bb0d675a2f3692422db189510 Mon Sep 17 00:00:00 2001
From: David Getzlaff <David.Getzlaff@telekom.de>
Date: Fri, 26 Apr 2024 09:33:04 +0200
Subject: [PATCH 0775/1037] Add new jdbc.driver.class
 "com.mysql.cj.jdbc.Driver" to jmeter.properties

By providing this new class, this message can be prevented:
Loading class `com.mysql.jdbc.Driver'. This is deprecated. The new driver class is `com.mysql.cj.jdbc.Driver'. The driver is automatically registered via the SPI and manual loading of the driver class is generally unnecessary.
---
 bin/jmeter.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 24a6798e4c0..bac04e85bc9 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -807,7 +807,7 @@ wmlParser.types=text/vnd.wap.wml
 # Database validation query
 # based in https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases list
 jdbc.config.check.query=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from rdb$database
-jdbc.config.jdbc.driver.class=com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver
+jdbc.config.jdbc.driver.class=com.mysql.cj.jdbc.Driver|com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver
 
 #---------------------------------------------------------------------------
 # OS Process Sampler configuration

From 9643596b15c3dadc695c3f317f87c4e729a35b7b Mon Sep 17 00:00:00 2001
From: David Getzlaff <David.Getzlaff@telekom.de>
Date: Fri, 27 Sep 2024 14:36:27 +0200
Subject: [PATCH 0776/1037] Update component_reference.xml for
 com.mysql.cj.jdbc.Driver

---
 xdocs/usermanual/component_reference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 5733903554f..c91719f909d 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4104,7 +4104,7 @@ instead. (see figures 12 and 13).</p>
               <dt>hsqldb</dt><dd>org.hsqldb.jdbc.JDBCDriver</dd>
               <dt>Oracle</dt><dd>oracle.jdbc.OracleDriver</dd>
               <dt>DB2</dt><dd>com.ibm.db2.jcc.DB2Driver</dd>
-              <dt>MySQL</dt><dd>com.mysql.jdbc.Driver</dd>
+              <dt>MySQL</dt><dd>com.mysql.cj.jdbc.Driver</dd><dd>com.mysql.jdbc.Driver (deprecated)</dd>
               <dt>Microsoft SQL Server (MS JDBC driver)</dt><dd>com.microsoft.sqlserver.jdbc.SQLServerDriver or com.microsoft.jdbc.sqlserver.SQLServerDriver</dd>
               <dt>PostgreSQL</dt><dd>org.postgresql.Driver</dd>
               <dt>Ingres</dt><dd>com.ingres.jdbc.IngresDriver</dd>

From 356775da35b86ef363003ebd295218e23f57b817 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 18:27:36 +0200
Subject: [PATCH 0777/1037] More occurrences of com.mysql.jdbc.Driver / replace
 them all

---
 xdocs/usermanual/build-db-test-plan.xml   |  2 +-
 xdocs/usermanual/component_reference.xml  | 40 ++++++++++++++---------
 xdocs/usermanual/properties_reference.xml |  2 +-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/xdocs/usermanual/build-db-test-plan.xml b/xdocs/usermanual/build-db-test-plan.xml
index 8e6d1729801..64b4d3f91c5 100644
--- a/xdocs/usermanual/build-db-test-plan.xml
+++ b/xdocs/usermanual/build-db-test-plan.xml
@@ -122,7 +122,7 @@ Then, select this new element to view its Control Panel (see Figure &sect-num;.3
 <ul>
 <li>Variable name (here: <code>myDatabase</code>) bound to pool. This needs to uniquely identify the configuration. It is used by the JDBC Sampler to identify the configuration to be used.</li>
 <li>Database URL: <code>jdbc:mysql://ipOfTheServer:3306/cloud</code></li>
-<li>JDBC Driver class: <code>com.mysql.jdbc.Driver</code></li>
+<li>JDBC Driver class: <code>com.mysql.cj.jdbc.Driver</code></li>
 <li>Username: <em>the username of database</em></li>
 <li>Password: <em>password for the username</em></li>
 </ul>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index c91719f909d..04925267b6e 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4101,21 +4101,29 @@ instead. (see figures 12 and 13).</p>
         JMeter's classpath - easiest to copy <code>.jar</code> file into JMeter's <code>/lib</code> directory).
         <p>The list of the preconfigured jdbc driver classes can be configured with <code>jdbc.config.jdbc.driver.class</code> property and are by default:</p>
             <dl>
-              <dt>hsqldb</dt><dd>org.hsqldb.jdbc.JDBCDriver</dd>
-              <dt>Oracle</dt><dd>oracle.jdbc.OracleDriver</dd>
-              <dt>DB2</dt><dd>com.ibm.db2.jcc.DB2Driver</dd>
-              <dt>MySQL</dt><dd>com.mysql.cj.jdbc.Driver</dd><dd>com.mysql.jdbc.Driver (deprecated)</dd>
-              <dt>Microsoft SQL Server (MS JDBC driver)</dt><dd>com.microsoft.sqlserver.jdbc.SQLServerDriver or com.microsoft.jdbc.sqlserver.SQLServerDriver</dd>
-              <dt>PostgreSQL</dt><dd>org.postgresql.Driver</dd>
-              <dt>Ingres</dt><dd>com.ingres.jdbc.IngresDriver</dd>
-              <dt>Derby</dt><dd>org.apache.derby.jdbc.ClientDriver</dd>
-              <dt>H2</dt><dd>org.h2.Driver</dd>
-              <dt>Firebird</dt><dd>org.firebirdsql.jdbc.FBDriver</dd>
-              <dt>Apache Derby</dt><dd>org.apache.derby.jdbc.ClientDriver</dd>
-              <dt>MariaDB</dt><dd>org.mariadb.jdbc.Driver</dd>
-              <dt>SQLite</dt><dd>org.sqlite.JDBC</dd>
-              <dt>Sybase AES</dt><dd>net.sourceforge.jtds.jdbc.Driver</dd>
-              <dt>Exasol</dt><dd>com.exasol.jdbc.EXADriver</dd>
+              <dt>hsqldb</dt><dd><code>org.hsqldb.jdbc.JDBCDriver</code/><dd>
+              <dt>Oracle</dt><dd><code>oracle.jdbc.OracleDriver</code></dd>
+              <dt>DB2</dt><dd><code>com.ibm.db2.jcc.DB2Driver</code></dd>
+              <dt>MySQL</dt>
+              <dd>
+                <code>com.mysql.cj.jdbc.Driver</code><br/>
+                <code>com.mysql.jdbc.Driver</code> (deprecated)
+              </dd>
+              <dt>Microsoft SQL Server (MS JDBC driver)</dt>
+              <dd>
+                <code>com.microsoft.sqlserver.jdbc.SQLServerDriver</code> or
+                <code>com.microsoft.jdbc.sqlserver.SQLServerDriver</code>
+              </dd>
+              <dt>PostgreSQL</dt><dd><code>org.postgresql.Driver</code></dd>
+              <dt>Ingres</dt><dd><code>com.ingres.jdbc.IngresDriver</code></dd>
+              <dt>Derby</dt><dd><code>org.apache.derby.jdbc.ClientDriver</code></dd>
+              <dt>H2</dt><dd><code>org.h2.Driver</code></dd>
+              <dt>Firebird</dt><dd><code>org.firebirdsql.jdbc.FBDriver</code></dd>
+              <dt>Apache Derby</dt><dd><code>org.apache.derby.jdbc.ClientDriver</code></dd>
+              <dt>MariaDB</dt><dd><code>org.mariadb.jdbc.Driver</code></dd>
+              <dt>SQLite</dt><dd><code>org.sqlite.JDBC</code></dd>
+              <dt>Sybase AES</dt><dd><code>net.sourceforge.jtds.jdbc.Driver</code></dd>
+              <dt>Exasol</dt><dd><code>com.exasol.jdbc.EXADriver</code></dd>
             </dl>
         </property>
         <property name="Username" required="No">Name of user to connect as.</property>
@@ -4142,7 +4150,7 @@ If the database server is not running or is not accessible, then JMeter will rep
   <dd>
     <dl>
       <dt>Driver class</dt>
-      <dd><code>com.mysql.jdbc.Driver</code></dd>
+      <dd><code>com.mysql.cj.jdbc.Driver</code></dd>
       <dt>Database URL</dt>
       <dd><code>jdbc:mysql://host[:port]/dbname</code></dd>
     </dl>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index cb9cd3ba2cd..d74ece0613d 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1048,7 +1048,7 @@ JMETER-SERVER</source>
 </property>
 <property name="jdbc.config.jdbc.driver.class">
     List of JDBC driver class name<br/>
-    Defaults to: <source>com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver</source>
+    Defaults to: <source>com.mysql.cj.jdbc.Driver|com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver</source>
 </property>
 </properties>
 </section>

From 954d229fdd36b6d78af936a1ea497f350bde3fe1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 18:29:14 +0200
Subject: [PATCH 0778/1037] Add changes to changes.xml

---
 xdocs/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index bf3d4336718..60836279fde 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -64,6 +64,7 @@ Summary
   <h3>General</h3>
   <ul>
     <li><pr>6220</pr> Require Java 17 or later for running JMeter</li>
+    <li><pr>6274</pr> Change references to old MySQL driver to new class <code>com.mysql.cj.jdbc.Driver</code></li>
   </ul>
 
  <!--  =================== Thanks =================== -->

From 6abfb4d5cd37ea328a9b1f29cc5a2f395f822e73 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 19:26:28 +0200
Subject: [PATCH 0779/1037] Fix markup

---
 xdocs/usermanual/component_reference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 04925267b6e..213a62758ed 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4101,7 +4101,7 @@ instead. (see figures 12 and 13).</p>
         JMeter's classpath - easiest to copy <code>.jar</code> file into JMeter's <code>/lib</code> directory).
         <p>The list of the preconfigured jdbc driver classes can be configured with <code>jdbc.config.jdbc.driver.class</code> property and are by default:</p>
             <dl>
-              <dt>hsqldb</dt><dd><code>org.hsqldb.jdbc.JDBCDriver</code/><dd>
+              <dt>hsqldb</dt><dd><code>org.hsqldb.jdbc.JDBCDriver</code></dd>
               <dt>Oracle</dt><dd><code>oracle.jdbc.OracleDriver</code></dd>
               <dt>DB2</dt><dd><code>com.ibm.db2.jcc.DB2Driver</code></dd>
               <dt>MySQL</dt>

From 45996dbd69cf9ad1ee95e0cc522a10196e4e6e0f Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 24 Sep 2024 17:05:28 +0200
Subject: [PATCH 0780/1037] Use current time as start time for OMTG

When we use the test start time via JMeterContextService#getTestStartTime,
we might create a storm of test samples at the beginning, when a setup thread group
made us wait.
---
 .../org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
index 167e17f628f..5948dc6d40b 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -204,7 +204,7 @@ public class OpenModelThreadGroup :
             val seed = randomSeed
             val rnd = if (seed == 0L) Random() else Random(seed)
             val gen = ThreadScheduleProcessGenerator(rnd, parsedSchedule)
-            val testStartTime = JMeterContextService.getTestStartTime()
+            val testStartTime = System.currentTimeMillis()
             val executorService = Executors.newCachedThreadPool()
             this.executorService = executorService
             val starter = ThreadsStarter(testStartTime, executorService, activeThreads, gen) { threadNumber ->

From 9e2e2bcbd13d128c0d887a23e67e2e7a9dcf9355 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 25 Sep 2024 12:28:54 +0200
Subject: [PATCH 0781/1037] Add startTime to AbstractThreadGroup and use it in
 OMTG and PreciseThroughputTimer

A thread group might start later than the test. When we calculate delays on the start time of
the test, we might get a stampede of samples run at the start of the thread group.
---
 .../PreciseThroughputTimer.java               |  4 ++--
 .../jmeter/engine/StandardJMeterEngine.java   |  1 +
 .../jmeter/threads/AbstractThreadGroup.java   | 20 +++++++++++++++++++
 .../threads/openmodel/OpenModelThreadGroup.kt |  2 +-
 xdocs/changes.xml                             |  4 +++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
index 4864e22117c..ee4998a62c7 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
@@ -99,7 +99,7 @@ public long delay() {
             nextEvent = events.next();
         }
         long now = System.currentTimeMillis();
-        long testStarted = JMeterContextService.getTestStartTime();
+        long testStarted = JMeterContextService.getContext().getThreadGroup().getStartTime();
         long delay = (long) (nextEvent * TimeUnit.SECONDS.toMillis(1) + testStarted - now);
         if (log.isDebugEnabled()) {
             log.debug("Calculated delay is {}", delay);
@@ -117,7 +117,7 @@ public long delay() {
     }
 
     private EventProducer getEventProducer() {
-        long testStarted = JMeterContextService.getTestStartTime();
+        long testStarted = JMeterContextService.getContext().getThreadGroup().getStartTime();
         long prevStarted = PREV_TEST_STARTED.get();
         if (prevStarted != testStarted && PREV_TEST_STARTED.compareAndSet(prevStarted, testStarted)) {
             // Reset counters if we are calculating throughput for a new test, see https://github.com/apache/jmeter/issues/6165
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index a72602fb2e4..618f5b92124 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -574,6 +574,7 @@ private void startThreadGroup(AbstractThreadGroup group, int groupCount, SearchB
             threadGroupTree.add(group, testLevelElements);
 
             groups.add(group);
+            group.setStartTime(System.currentTimeMillis());
             group.start(groupCount, notifier, threadGroupTree, this);
         } catch (JMeterStopTestException ex) { // NOSONAR Reported by log
             JMeterUtils.reportErrorToUser("Error occurred starting thread group :" + group.getName()+ ", error message:"+ex.getMessage()
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index 37b3f104b25..63a4462a4d1 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -21,6 +21,7 @@
 import java.time.Duration;
 import java.util.IdentityHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.control.IteratingController;
@@ -86,6 +87,8 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
 
     private final AtomicInteger numberOfThreads = new AtomicInteger(0); // Number of active threads in this group
 
+    private final AtomicLong startTime = new AtomicLong(0);
+
     @Override
     public AbstractThreadGroupSchema getSchema() {
         return AbstractThreadGroupSchema.INSTANCE;
@@ -97,6 +100,23 @@ public AbstractThreadGroupSchema getSchema() {
         return new PropertiesAccessor<>(this, getSchema());
     }
 
+    /**
+     * Get the time when this thread group has been started
+     * @return time in milliseconds since epoch
+     */
+    public long getStartTime() {
+        return startTime.get();
+    }
+
+    /**
+     * Set the time when this thread group has been started.<br>
+     * Will probably be set by StandardJMeterEngine.
+     * @param startTime time in milliseconds since epoch
+     */
+    public void setStartTime(long startTime) {
+        this.startTime.set(startTime);
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean isDone() {
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
index 5948dc6d40b..45c0f6cef6b 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroup.kt
@@ -204,7 +204,7 @@ public class OpenModelThreadGroup :
             val seed = randomSeed
             val rnd = if (seed == 0L) Random() else Random(seed)
             val gen = ThreadScheduleProcessGenerator(rnd, parsedSchedule)
-            val testStartTime = System.currentTimeMillis()
+            val testStartTime = this.startTime
             val executorService = Executors.newCachedThreadPool()
             this.executorService = executorService
             val starter = ThreadsStarter(testStartTime, executorService, activeThreads, gen) { threadNumber ->
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 60836279fde..025af48bca1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -57,7 +57,7 @@ JMeter 6.x requires Java 17 or later for execution (Java 21 is recommended).
 Summary
 </p>
 <ul>
-<li><a href="#Bug fixes">Bug fixes</a></li>
+<li><a href="#Changes">Changes</a></li>
 </ul>
 
   <ch_section>Changes</ch_section>
@@ -65,6 +65,8 @@ Summary
   <ul>
     <li><pr>6220</pr> Require Java 17 or later for running JMeter</li>
     <li><pr>6274</pr> Change references to old MySQL driver to new class <code>com.mysql.cj.jdbc.Driver</code></li>
+    <li><issue>6352</issue> Calculate delays in Open Model Thread Group and Precise Throughput
+        Timer relative to start of Thread Group instead of the start of the test.</li>
   </ul>
 
  <!--  =================== Thanks =================== -->

From 66c2df72ad3d8cb39aae8cef6d2b68cc17624a1e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 25 Sep 2024 18:25:09 +0200
Subject: [PATCH 0782/1037] Use simple long, as we are initialized before the
 reading threads are started

---
 .../org/apache/jmeter/threads/AbstractThreadGroup.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index 63a4462a4d1..5b7c6c68575 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -21,7 +21,6 @@
 import java.time.Duration;
 import java.util.IdentityHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.control.IteratingController;
@@ -87,7 +86,7 @@ public abstract class AbstractThreadGroup extends AbstractTestElement
 
     private final AtomicInteger numberOfThreads = new AtomicInteger(0); // Number of active threads in this group
 
-    private final AtomicLong startTime = new AtomicLong(0);
+    private long startTime;
 
     @Override
     public AbstractThreadGroupSchema getSchema() {
@@ -105,7 +104,7 @@ public AbstractThreadGroupSchema getSchema() {
      * @return time in milliseconds since epoch
      */
     public long getStartTime() {
-        return startTime.get();
+        return startTime;
     }
 
     /**
@@ -114,7 +113,7 @@ public long getStartTime() {
      * @param startTime time in milliseconds since epoch
      */
     public void setStartTime(long startTime) {
-        this.startTime.set(startTime);
+        this.startTime = startTime;
     }
 
     /** {@inheritDoc} */

From 8268c1c4990564d7fb5f335fee0ca1ab0217370b Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 10:07:56 +0200
Subject: [PATCH 0783/1037] Add since annotation to javadoc for new feature

Closes #6352 and #6353
---
 .../java/org/apache/jmeter/threads/AbstractThreadGroup.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
index 5b7c6c68575..f64cf41e7d1 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java
@@ -101,6 +101,7 @@ public AbstractThreadGroupSchema getSchema() {
 
     /**
      * Get the time when this thread group has been started
+     * @since 6.0.0
      * @return time in milliseconds since epoch
      */
     public long getStartTime() {
@@ -110,6 +111,7 @@ public long getStartTime() {
     /**
      * Set the time when this thread group has been started.<br>
      * Will probably be set by StandardJMeterEngine.
+     * @since 6.0.0
      * @param startTime time in milliseconds since epoch
      */
     public void setStartTime(long startTime) {

From 939ae3c0461fd45c642c9d7bc3ffb5b4a7b41bb9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 4 Oct 2024 16:26:09 +0200
Subject: [PATCH 0784/1037] Ensure directories are writable when generating
 reports from read-only sources

---
 .../org/apache/jmeter/report/dashboard/TemplateVisitor.java    | 3 +++
 xdocs/changes.xml                                              | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index c4bdc15f8f9..1e8fa7a9664 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -93,6 +93,9 @@ public FileVisitResult preVisitDirectory(Path file, BasicFileAttributes attrs)
                             "{}, found non empty folder with following content {}, will be ignored",
                     file, newDir, ex.getMessage(), newDir.toFile().listFiles());
         }
+        if (!newDir.toFile().canWrite()) {
+            newDir.toFile().setWritable(true);
+        }
         return FileVisitResult.CONTINUE;
     }
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 025af48bca1..b3c79ec82e6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -67,6 +67,7 @@ Summary
     <li><pr>6274</pr> Change references to old MySQL driver to new class <code>com.mysql.cj.jdbc.Driver</code></li>
     <li><issue>6352</issue> Calculate delays in Open Model Thread Group and Precise Throughput
         Timer relative to start of Thread Group instead of the start of the test.</li>
+    <li><issue>6357</issue> Ensure writable directories when copying template files while report generation.</li>
   </ul>
 
  <!--  =================== Thanks =================== -->

From 872112bf5d08d2f698f765b3c950b2898ec23e98 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 4 Oct 2024 18:34:10 +0200
Subject: [PATCH 0785/1037] Add test to check report generation from read-only
 directory

Closes #6357 and #6358
---
 .../report/dashboard/ReportGeneratorTest.kt   | 27 +++++++++++++++++++
 xdocs/changes.xml                             |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
index 6191f7afee7..0c72affaac8 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
@@ -18,6 +18,7 @@
 package org.apache.jmeter.report.dashboard
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.apache.commons.io.FileUtils
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.util.JMeterUtils
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -26,7 +27,10 @@ import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.api.parallel.Isolated
 import java.io.File
+import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.io.path.absolutePathString
 
 @Isolated("modifies shared properties")
 class ReportGeneratorTest : JMeterTestCase() {
@@ -43,6 +47,29 @@ class ReportGeneratorTest : JMeterTestCase() {
     fun combine(vararg paths: String) =
         Paths.get(JMeterUtils.getJMeterBinDir(), *paths).toString()
 
+    @Test
+    fun `check that report generation succeeds from read-only templates`() {
+        val roTemplate = Files.createTempDirectory("report-template-ro")
+        FileUtils.copyDirectoryToDirectory(Path.of(combine("report-template")).toFile(), roTemplate.toFile())
+        Files.walk(roTemplate).forEach { p -> p.toFile().setReadOnly() }
+        JMeterUtils.setProperty("jmeter.reportgenerator.exporter.html.property.template_dir", roTemplate.absolutePathString())
+        val roReport = Files.createTempDirectory("report-from-ro-template")
+
+        val mapper = ObjectMapper()
+        val expected = ReportGenerator::class.java.getResource("/org/apache/jmeter/gui/report/HTMLReportExpect.json")
+        val expectedRoot = mapper.readTree(expected)
+
+        JMeterUtils.setProperty("jmeter.reportgenerator.outputdir", roReport.absolutePathString())
+        val reportGenerator = ReportGenerator(
+            combine("testfiles", "HTMLReportTestFile.csv"), null
+        )
+        reportGenerator.generate()
+        val statistics = File(roReport.toFile(), "statistics.json")
+        val actualRoot = mapper.readTree(statistics)
+
+        assertEquals(expectedRoot, actualRoot, "test report json file")
+    }
+
     @Test
     fun `check that report generation succeeds and statistics json are generated`() {
         val mapper = ObjectMapper()
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b3c79ec82e6..f50ac08b508 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -67,7 +67,7 @@ Summary
     <li><pr>6274</pr> Change references to old MySQL driver to new class <code>com.mysql.cj.jdbc.Driver</code></li>
     <li><issue>6352</issue> Calculate delays in Open Model Thread Group and Precise Throughput
         Timer relative to start of Thread Group instead of the start of the test.</li>
-    <li><issue>6357</issue> Ensure writable directories when copying template files while report generation.</li>
+    <li><issue>6357</issue><pr>6358</pr> Ensure writable directories when copying template files while report generation.</li>
   </ul>
 
  <!--  =================== Thanks =================== -->

From f9fe8e4feb390c7774bcf8268b8757ed87ff3de6 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Mon, 28 Oct 2024 21:18:06 +0100
Subject: [PATCH 0786/1037] Fix KeyManage log when using CLI mode

Without this patch, whenever a KeyStore is used (for example for client
certificates) in CLI mode, there is a message that no password was
provided.
This was caused by the else of the condition being on the wrong if
statement, and can cause people to spend a lot of time trying to debug
why the key store won't work.
---
 src/core/src/main/java/org/apache/jmeter/util/SSLManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index c48d9696c4f..81b233e0a3c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -223,9 +223,9 @@ private String getPassword() {
                 }
                 System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
                 password = this.defaultpw;
+            } else {
+                log.warn("No password provided, and no GUI present so cannot prompt");
             }
-        } else {
-            log.warn("No password provided, and no GUI present so cannot prompt");
         }
         return password;
     }

From c846e66e92d0ed4428e5a0d7dd9c0bc0570c5def Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Mon, 28 Oct 2024 21:33:20 +0100
Subject: [PATCH 0787/1037] Add explanation to UnrecoverableKeyException

Unrecoverable keys after opening the keystore could be a consequence of
the key having a different password than the keystore itself.
This could cause some people to spend a lot of time figuring out what's
going on, so let's just give them a quick heads up of a potential
(common?) reason for this error.

This could be fixed by running "keytool -keypasswd".
---
 .../src/main/java/org/apache/jmeter/util/SSLManager.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index 81b233e0a3c..0c4823ebf68 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -157,7 +157,10 @@ protected synchronized JmeterKeyStore getKeyStore() {
            } catch (IOException e) {
                log.error("Can't load keystore '{}'. Wrong password?", fileName, e);
            } catch (UnrecoverableKeyException e) {
-               log.error("Can't recover keys from keystore '{}'", fileName, e);
+               log.error(
+                   "Can't recover keys from keystore '{}'. Is key password different from keystore password?",
+                   fileName,
+                   e);
            } catch (NoSuchAlgorithmException e) {
                log.error("Problem finding the correct algorithm while loading keys from keystore '{}'", fileName, e);
            } catch (CertificateException e) {

From 423c00b22efc509a2ff341174d34de7e0476e348 Mon Sep 17 00:00:00 2001
From: linvaux <linvaux@outlook.com>
Date: Sat, 30 Nov 2024 10:32:32 +0800
Subject: [PATCH 0788/1037] style(StandardJmeterEngine): remove unnecessary
 code

delete "return" in a private void method
---
 .../main/java/org/apache/jmeter/engine/StandardJMeterEngine.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 618f5b92124..65894a4dff3 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -579,7 +579,6 @@ private void startThreadGroup(AbstractThreadGroup group, int groupCount, SearchB
         } catch (JMeterStopTestException ex) { // NOSONAR Reported by log
             JMeterUtils.reportErrorToUser("Error occurred starting thread group :" + group.getName()+ ", error message:"+ex.getMessage()
                 +", \r\nsee log file for more details", ex);
-            return; // no point continuing
         }
     }
 

From be0cf3a661ea9b84c7726b41e5c2dfaf5e42f5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20B=C3=ADlek?= <bilekf@email.cz>
Date: Sat, 30 Nov 2024 03:22:02 +0100
Subject: [PATCH 0789/1037] Updated the `createMenuItem` method to use a more
 descriptive variable name `menuItem` for clarity and consistency.

---
 .../jmeter/threads/gui/AbstractThreadGroupGui.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
index 05ced0f6f54..de21598783d 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
@@ -84,11 +84,11 @@ public JPopupMenu createPopupMenu() {
     }
 
     private static JMenuItem createMenuItem(String name, String actionCommand) {
-        JMenuItem addThinkTimesToChildren = new JMenuItem(JMeterUtils.getResString(name));
-        addThinkTimesToChildren.setName(name);
-        addThinkTimesToChildren.addActionListener(ActionRouter.getInstance());
-        addThinkTimesToChildren.setActionCommand(actionCommand);
-        return addThinkTimesToChildren;
+        JMenuItem menuItem = new JMenuItem(JMeterUtils.getResString(name));
+        menuItem.setName(name);
+        menuItem.addActionListener(ActionRouter.getInstance());
+        menuItem.setActionCommand(actionCommand);
+        return menuItem;
     }
 
     private static JMenu createAddMenu() {

From 083d6fe15cfec3cc15ee190a914a468463f6615e Mon Sep 17 00:00:00 2001
From: Gabriele Coletta <gdmg92@gmail.com>
Date: Fri, 9 Aug 2024 16:29:52 +0200
Subject: [PATCH 0790/1037] Apply HiDPI mode on GUI setup

---
 src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index df4a2adde5a..8fb1174fff7 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -83,6 +83,7 @@ public object JMeterGuiLauncher {
     }
 
     private suspend fun startGuiInternal(testFile: String?) {
+        JMeterUtils.applyHiDPIOnFonts()
         setupLaF()
         val splash = SplashScreen()
         splash.showScreen()

From 5d9778129a68bb68f25596b95b33ab3c8738469b Mon Sep 17 00:00:00 2001
From: Gabriele Coletta <gdmg92@gmail.com>
Date: Tue, 26 Nov 2024 16:13:13 +0100
Subject: [PATCH 0791/1037] Removed duplicated call to applyHiDPIOnFonts

---
 src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index 8fb1174fff7..0420124960a 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -93,8 +93,6 @@ public object JMeterGuiLauncher {
             // Allow UI updates
             yield()
         }
-        setProgress(1)
-        JMeterUtils.applyHiDPIOnFonts()
         log.debug("Setup tree")
         setProgress(5)
         val treeModel = JMeterTreeModel()

From ecac72df6cbf251c9cc4365bed412c154b4939ce Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:16:12 -0600
Subject: [PATCH 0792/1037] Publish build scans to develocity.apache.org

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index e9416be646b..2674a6a6eff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -114,7 +114,7 @@ if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, defau
 val isCiServer = System.getenv().containsKey("CI")
 
 gradleEnterprise {
-    server = "https://ge.apache.org"
+    server = "https://develocity.apache.org"
     allowUntrustedServer = false
 
     buildScan {

From 9747669c2d091ddee4256cbc7dc458f9377afed9 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:18:32 -0600
Subject: [PATCH 0793/1037] Use `DEVELOCITY_ACCESS_KEY` to authenticate to
 `develocity.apache.org`

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 08047d39f22..acd36d7e8b3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,7 +84,7 @@ jobs:
           org.gradle.java.installations.auto-download=false
       env:
         _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
   errorprone:
     name: 'Error Prone (JDK 17)'
@@ -103,4 +103,4 @@ jobs:
         multi-cache-enabled: false
         arguments: --scan --no-parallel --no-daemon -PenableErrorprone classes
       env:
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

From ab65ec18103fad25cbd85aa05078bb7f89c5caca Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:35:59 -0600
Subject: [PATCH 0794/1037] Update Develocity plugin versions

---
 .github/workflows/main.yml |  4 ++--
 settings.gradle.kts        | 26 +++++++++++---------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index acd36d7e8b3..b60b0be35f5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,7 +84,7 @@ jobs:
           org.gradle.java.installations.auto-download=false
       env:
         _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
   errorprone:
     name: 'Error Prone (JDK 17)'
@@ -103,4 +103,4 @@ jobs:
         multi-cache-enabled: false
         arguments: --scan --no-parallel --no-daemon -PenableErrorprone classes
       env:
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2674a6a6eff..96fe431f4b7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
-
 import java.util.*
 
 pluginManagement {
@@ -25,8 +23,8 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.15.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
+    id("com.gradle.develocity") version "3.18.2"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
@@ -113,16 +111,14 @@ if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, defau
 
 val isCiServer = System.getenv().containsKey("CI")
 
-gradleEnterprise {
+develocity {
     server = "https://develocity.apache.org"
     allowUntrustedServer = false
+    projectId = "jmeter"
 
     buildScan {
-        capture { isTaskInputFiles = true }
-        isUploadInBackground = !isCiServer
-        publishAlways()
-        this as BuildScanExtensionWithHiddenFeatures
-        publishIfAuthenticated()
+        uploadInBackground = !isCiServer
+        publishing.onlyIf { it.isAuthenticated }
         obfuscation {
             ipAddresses { addresses -> addresses.map { "0.0.0.0" } }
         }
@@ -151,8 +147,8 @@ val expectedSha512 = mapOf(
         to "JavaEWAH-1.1.12.jar",
     "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
         to "JavaEWAH-1.1.13.jar",
-    "D56423AD67E3EB133939BB69DA202445EBB476F8C2D570CD741C3043EADD132D4C1BB3D08757B266C08A4D2150BE2248A65580A517E3230322D13D983CACCDD6"
-        to "common-custom-user-data-gradle-plugin-1.12.1.jar",
+    "3EA1DC755BFC93EA97ACA9C3E40CA922C369907E31338DC06DE5226B51FF79D7E2584D5AE8CC011FF11C94DB750414E9E46F6DD712F945973A4992D6A2969B1"
+        to "common-custom-user-data-gradle-plugin-2.0.2.jar",
     "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
         to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
     "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"
@@ -161,8 +157,8 @@ val expectedSha512 = mapOf(
         to "org.eclipse.jgit-5.13.2.202306221912-r.jar",
     "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
         to "slf4j-api-1.7.30.jar",
-    "4B13DF3104932BCA325445276915BF710234888B76E315FE44BAEB2DF3D56AA21EDF77B5C7357887CF9D592010794192250B3E061437A102F63E68C075D67D3"
-        to "gradle-enterprise-gradle-plugin-3.15.1.jar",
+    "24638FE67382EBDA9529F00A54FA6133EA5434D870E6C1D20622F007E8CC1C00408060D7D578CFE62195650A1785FE7E65DC87B1D92FB27B31AB4134AEADAC0E"
+        to "develocity-gradle-plugin-3.18.2.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
@@ -217,7 +213,7 @@ buildCache {
     local {
         isEnabled = !isCiServer
     }
-    remote(gradleEnterprise.buildCache) {
+    remote(develocity.buildCache) {
         isEnabled = false
     }
 }

From d7f7bcc164bebd2db1b5ae725f51cafe97a3062e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 20 Jan 2025 01:12:45 +0000
Subject: [PATCH 0795/1037] chore(deps): update plugin
 org.gradlex.build-parameters to v1.4.4

---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 5c83b3d0cf3..9af59d0bc24 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id("org.gradlex.build-parameters") version "1.4.3"
+    id("org.gradlex.build-parameters") version "1.4.4"
     id("com.github.vlsi.gradle-extensions") version "1.90"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }

From 10491a655053497520fe02657283e317fff79f32 Mon Sep 17 00:00:00 2001
From: junyejiang <jiangjunye1@hotmail.com>
Date: Mon, 13 Jan 2025 20:18:46 +0800
Subject: [PATCH 0796/1037] Correct mirror server class path

---
 bin/mirror-server.cmd | 4 +---
 bin/mirror-server.sh  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/mirror-server.cmd b/bin/mirror-server.cmd
index 6f76adf5951..dc38a0ce422 100644
--- a/bin/mirror-server.cmd
+++ b/bin/mirror-server.cmd
@@ -26,9 +26,7 @@ set JMETER_CMD_LINE_ARGS=%*
 
 cd /D %~dp0
 
-set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
-set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.11.1.jar
-set CP=%CP%;..\lib\log4j-api-2.11.1.jar;..\lib\log4j-core-2.11.1.jar;..\lib\log4j-1.2-api-2.11.1.jar
+set CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/*
 
 java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS%
 
diff --git a/bin/mirror-server.sh b/bin/mirror-server.sh
index 7e969626258..1444d5170c7 100755
--- a/bin/mirror-server.sh
+++ b/bin/mirror-server.sh
@@ -21,8 +21,6 @@
 
 cd "$(dirname "$0")" || exit 1
 
-CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar
-CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.11.0.jar
-CP=${CP}:../lib/log4j-api-2.11.1.jar:../lib/log4j-core-2.11.1.jar:../lib/log4j-1.2-api-2.11.1.jar
+CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/*
 
 java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer "$@"

From 30b3b7ef36c0d5c62a205f3da97b6c0502fbc8ee Mon Sep 17 00:00:00 2001
From: junyejiang <jiangjunye1@hotmail.com>
Date: Mon, 10 Feb 2025 16:00:26 +0800
Subject: [PATCH 0797/1037] update according to CR

---
 bin/mirror-server.cmd | 4 +++-
 bin/mirror-server.sh  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/mirror-server.cmd b/bin/mirror-server.cmd
index dc38a0ce422..1f86cff1ef1 100644
--- a/bin/mirror-server.cmd
+++ b/bin/mirror-server.cmd
@@ -26,7 +26,9 @@ set JMETER_CMD_LINE_ARGS=%*
 
 cd /D %~dp0
 
-set CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/*
+set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
+set CP=%CP%;..\lib\slf4j-api-1.7.36.jar;..\lib\jcl-over-slf4j-1.7.36.jar;..\lib\log4j-slf4j-impl-2.22.1.jar
+set CP=%CP%;..\lib\log4j-api-2.22.1.jar;..\lib\log4j-core-2.22.1.jar;..\lib\log4j-1.2-api-2.22.1.jar
 
 java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS%
 
diff --git a/bin/mirror-server.sh b/bin/mirror-server.sh
index 1444d5170c7..1da2f9d0349 100755
--- a/bin/mirror-server.sh
+++ b/bin/mirror-server.sh
@@ -21,6 +21,8 @@
 
 cd "$(dirname "$0")" || exit 1
 
-CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/*
+CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar
+CP=${CP}:../lib/slf4j-api-1.7.36.jar:../lib/jcl-over-slf4j-1.7.36.jar:../lib/log4j-slf4j-impl-2.22.1.jar
+CP=${CP}:../lib/log4j-api-2.22.1.jar:../lib/log4j-core-2.22.1.jar:../lib/log4j-1.2-api-2.22.1.jar
 
 java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer "$@"

From 6d39ac6e698f71f90e2cb92a5cc66f29f13bd4ef Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 10 Feb 2025 10:39:46 +0000
Subject: [PATCH 0798/1037] fix(deps): update dependency
 com.github.tomakehurst:wiremock-jre8 to v2.35.2

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index b48b40fb161..ec415bb4d22 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("com.github.tomakehurst:wiremock-jre8:2.35.1")
+        api("com.github.tomakehurst:wiremock-jre8:2.35.2")
         api("io.mockk:mockk:1.13.7")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")

From 19c75638cf4947d078b0d6dfd85f2acab05e456e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 3 Mar 2025 02:00:04 +0000
Subject: [PATCH 0799/1037] fix(deps): update dependency
 com.thoughtworks.xstream:xstream to v1.4.21

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5a91e9dd43d..bb5571de7a2 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
         api("com.miglayout:miglayout-core:5.3")
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
-        api("com.thoughtworks.xstream:xstream:1.4.20")
+        api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.16.0")
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.15.1")

From d3dcc82c755b6732c15b3191ff9826248111ebb8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 3 Mar 2025 06:23:17 +0000
Subject: [PATCH 0800/1037] fix(deps): update dependency
 commons-logging:commons-logging to v1.3.5

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index bb5571de7a2..6d54246c2b1 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.15.1")
         api("commons-lang:commons-lang:2.6")
-        api("commons-logging:commons-logging:1.3.0")
+        api("commons-logging:commons-logging:1.3.5")
         api("commons-net:commons-net:3.10.0")
         api("dnsjava:dnsjava:2.1.9")
         api("io.burt:jmespath-core:0.6.0")

From a7bd8fabdc6525391934754b93292d3b2dc9e2e5 Mon Sep 17 00:00:00 2001
From: Anjanan <49702955+Anjaa84@users.noreply.github.com>
Date: Sun, 23 Feb 2025 18:49:50 +0530
Subject: [PATCH 0801/1037] Update index.xml

Removed unnecessary space in  a link
---
 xdocs/index.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/index.xml b/xdocs/index.xml
index 90844a0b430..d01afc4db41 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,7 +60,7 @@
     <li>Full featured Test IDE that allows fast Test Plan <b>recording (from Browsers or native applications), building and debugging</b>.</li>
     <li><b><a href="usermanual/get-started.html#non_gui">CLI mode (Command-line mode (previously called Non GUI) / headless mode)</a></b> to load test from any Java compatible OS (Linux, Windows, Mac OSX, &hellip;)</li>
     <li>A complete and <b><a href="usermanual/generating-dashboard.html" >ready to present dynamic HTML report</a></b></li>
-    <li>Easy correlation through ability to extract data from most popular response formats, <b><a href="usermanual/component_reference.html#CSS/JQuery_Extractor" >HTML</a>, <a href="usermanual/component_reference.html#JSON_Extractor" >JSON </a>,
+    <li>Easy correlation through ability to extract data from most popular response formats, <b><a href="usermanual/component_reference.html#CSS/JQuery_Extractor" >HTML</a>, <a href="usermanual/component_reference.html#JSON_Extractor" >JSON</a>,
         <a href="usermanual/component_reference.html#XPath_Extractor" >XML</a> or <a href="usermanual/component_reference.html#Regular_Expression_Extractor" >any textual format</a></b></li>
     <li>Complete portability and <b>100% Java purity</b>.</li>
     <li>Full <b>multi-threading</b> framework allows concurrent sampling by many threads and

From 131c4cff5a415a2a78b05228b226cafdfd548ee8 Mon Sep 17 00:00:00 2001
From: Raul Almeida <raul.almeida@acolita.com.br>
Date: Thu, 20 Mar 2025 09:48:38 -0300
Subject: [PATCH 0802/1037] fix typo on flotSyntheticResponseTimeDistribution
 caused export to png to fail

---
 bin/report-template/content/pages/ResponseTimes.html.fmkr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/report-template/content/pages/ResponseTimes.html.fmkr b/bin/report-template/content/pages/ResponseTimes.html.fmkr
index 9b59d484b74..e3fc05542bb 100644
--- a/bin/report-template/content/pages/ResponseTimes.html.fmkr
+++ b/bin/report-template/content/pages/ResponseTimes.html.fmkr
@@ -217,7 +217,7 @@
                                         </li>
                                         <li><a href="#syntheticResponseTimeDistribution" onClick="uncheckAll('choicesSyntheticResponseTimeDistribution');">Hide all samples</a>
                                         </li>
-                                        <li><a href="#syntheticResponseTimeDistribution" onclick="exportToPNG('flotSyntheticResponseTimesDistribution', this);">Save as PNG</a></li>
+                                        <li><a href="#syntheticResponseTimeDistribution" onclick="exportToPNG('flotSyntheticResponseTimeDistribution', this);">Save as PNG</a></li>
                                     </ul>
                                     <button type="button" class="btn btn-link btn-xs dropdown-toggle" data-toggle="collapse" href="#bodySyntheticResponseTimeDistribution" aria-expanded="true" aria-controls="bodySyntheticResponseTimeDistribution">
                                         <i class="fa fa-chevron-down"></i>

From 6e58d4b50981db140f344a56f852be82455a011a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 24 Mar 2025 01:50:00 +0000
Subject: [PATCH 0803/1037] fix(deps): update dependency io.mockk:mockk to
 v1.13.17

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index ec415bb4d22..21330035d81 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("com.github.tomakehurst:wiremock-jre8:2.35.2")
-        api("io.mockk:mockk:1.13.7")
+        api("io.mockk:mockk:1.13.17")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
         // activemq-all should not be used as it provides secondary slf4j binding

From 96ea3c0b02c46156de4172fad786acb45687d41a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 24 Mar 2025 06:33:10 +0000
Subject: [PATCH 0804/1037] fix(deps): update dependency jacoco to v0.8.12

---
 .../verification/src/main/kotlin/build-logic.jacoco.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
index 70982d4cc9d..8fb628da79b 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.11"
+    toolVersion = "0.8.12"
     providers.gradleProperty("jacoco.version")
         .takeIf { it.isPresent }
         ?.let { toolVersion = it.get() }

From d154f27827635481c807eeb5ccebf87b6df5b3e1 Mon Sep 17 00:00:00 2001
From: Alioth Null <alioth4j@proton.me>
Date: Sun, 23 Mar 2025 22:05:42 +0800
Subject: [PATCH 0805/1037] remove reflection

---
 src/core/build.gradle.kts                     |   3 +
 .../main/java/org/apache/jmeter/JMeter.java   |   2 +-
 .../jmeter/util/BeanShellInterpreter.java     | 182 +++++++++---------
 .../jmeter/util/BeanShellTestElement.java     |  16 +-
 src/dist/src/dist/expected_release_jars.csv   |   4 +-
 .../apache/jmeter/functions/BeanShell.java    |   6 +-
 6 files changed, 101 insertions(+), 112 deletions(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 98141cdcab4..98160b953a5 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -95,6 +95,9 @@ dependencies {
     implementation("commons-codec:commons-codec") {
         because("DigestUtils")
     }
+    implementation("org.apache-extras.beanshell:bsh:2.0b6") {
+        because("Direct dependency required from BeanShellInterpreter")
+    }
     runtimeOnly("commons-collections:commons-collections") {
         because("Compatibility for old plugins")
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index d9292549621..5fa41bec70a 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -632,7 +632,7 @@ static void runInitScripts() {
             try {
                 BeanShellInterpreter bsi = new BeanShellInterpreter();
                 bsi.source(bshinit);
-            } catch (ClassNotFoundException|JMeterException e) {
+            } catch (JMeterException e) {
                 if (log.isWarnEnabled()) {
                     log.warn("Could not process Beanshell file: {}", e.getMessage());
                 }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
index c07926ff128..f1d3da5b970 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
@@ -18,77 +18,38 @@
 package org.apache.jmeter.util;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.io.IOException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jorphan.util.JMeterError;
 import org.apache.jorphan.util.JMeterException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import bsh.EvalError;
+import bsh.Interpreter;
+
 /**
  * BeanShell setup function - encapsulates all the access to the BeanShell
  * Interpreter in a single class.
  *
- * The class uses dynamic class loading to access BeanShell, which means that
- * all the source files can be built without needing access to the bsh jar.
- *
- * If the beanshell jar is not present at run-time, an error will be logged
+ * This class wraps a BeanShell instance.
  *
+ * Note that reflection-based dynamic class loading has been removed, so the
+ * bsh jar must be available at compile-time and runtime.
  */
-
 public class BeanShellInterpreter {
     private static final Logger log = LoggerFactory.getLogger(BeanShellInterpreter.class);
 
-    private static final Method bshGet;
-
-    private static final Method bshSet;
-
-    private static final Method bshEval;
-
-    private static final Method bshSource;
-
-    private static final Class<?> bshClass;
-
-    private static final String BSH_INTERPRETER = "bsh.Interpreter"; //$NON-NLS-1$
-
-    static {
-        // Temporary copies, so can set the final ones
-        Method get = null;
-        Method eval = null;
-        Method set = null;
-        Method source = null;
-        Class<?> clazz = null;
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        try {
-            clazz = loader.loadClass(BSH_INTERPRETER);
-            Class<String> string = String.class;
-            Class<Object> object = Object.class;
-
-            get = clazz.getMethod("get", string); //$NON-NLS-1$
-            eval = clazz.getMethod("eval", string); //$NON-NLS-1$
-            set = clazz.getMethod("set", string, object); //$NON-NLS-1$
-            source = clazz.getMethod("source", string); //$NON-NLS-1$
-        } catch (ClassNotFoundException|SecurityException | NoSuchMethodException e) {
-            log.error("Beanshell Interpreter not found", e);
-        } finally {
-            bshEval = eval;
-            bshGet = get;
-            bshSet = set;
-            bshSource = source;
-            bshClass = clazz;
-        }
-    }
-
     // This class is not serialised
-    private Object bshInstance = null; // The interpreter instance for this class
+    private Interpreter bshInstance = null; // The interpreter instance for this class
 
     private final String initFile; // Script file to initialize the Interpreter with
 
     private final Logger logger; // Logger to use during initialization and script run
 
-    public BeanShellInterpreter() throws ClassNotFoundException {
+    private static final String BSH_ERROR_TEMPLATE = "Error invoking bsh method: %s";
+
+    public BeanShellInterpreter() {
         this(null, null);
     }
 
@@ -96,25 +57,16 @@ public BeanShellInterpreter() throws ClassNotFoundException {
      *
      * @param init initialisation file
      * @param log logger to pass to interpreter
-     * @throws ClassNotFoundException when beanshell can not be instantiated
      */
-    public BeanShellInterpreter(String init, Logger log)  throws ClassNotFoundException {
+    public BeanShellInterpreter(String init, Logger log) {
         initFile = init;
         logger = log;
         init();
     }
 
     // Called from ctor, so must be private (or final, but it does not seem useful elsewhere)
-    private void init() throws ClassNotFoundException {
-        if (bshClass == null) {
-            throw new ClassNotFoundException(BSH_INTERPRETER);
-        }
-        try {
-            bshInstance = bshClass.getDeclaredConstructor().newInstance();
-        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
-            log.error("Can't instantiate BeanShell", e);
-            throw new ClassNotFoundException("Can't instantiate BeanShell", e);
-        }
+    private void init() {
+        bshInstance = new Interpreter();
          if (logger != null) {// Do this before starting the script
             try {
                 set("log", logger);//$NON-NLS-1$
@@ -148,65 +100,111 @@ private void init() throws ClassNotFoundException {
 
     /**
      * Resets the BeanShell interpreter.
-     *
-     * @throws ClassNotFoundException if interpreter cannot be instantiated
      */
-    public void reset() throws ClassNotFoundException {
+    public void reset() {
        init();
     }
 
-    private Object bshInvoke(Method m, Object[] o, boolean shouldLog) throws JMeterException {
+    public Object eval(String s) throws JMeterException {
         Object r = null;
-        final String errorString = "Error invoking bsh method: ";
         try {
-            r = m.invoke(bshInstance, o);
-        } catch (IllegalArgumentException | IllegalAccessException e) { // Programming error
-            final String message = errorString + m.getName();
-            log.error(message);
-            throw new JMeterError(message, e);
-        } catch (InvocationTargetException e) { // Can occur at run-time
-            // could be caused by the bsh Exceptions:
-            // EvalError, ParseException or TargetError
-            String message = errorString + m.getName();
+            r = bshInstance.eval(s);
+        } catch (EvalError e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "eval");
             Throwable cause = e.getCause();
             if (cause != null) {
                 message += "\t" + cause.getLocalizedMessage();
             }
-
-            if (shouldLog) {
-                log.error(message);
-            }
+            log.error(message);
             throw new JMeterException(message, e);
         }
         return r;
     }
 
-    public Object eval(String s) throws JMeterException {
-        return bshInvoke(bshEval, new Object[] { s }, true);
-    }
-
     public Object evalNoLog(String s) throws JMeterException {
-        return bshInvoke(bshEval, new Object[] { s }, false);
+        Object r = null;
+        try {
+            r = bshInstance.eval(s);
+        } catch (EvalError e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "eval");
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                message += "\t" + cause.getLocalizedMessage();
+            }
+            throw new JMeterException(message, e);
+        }
+        return r;
     }
 
-    public Object set(String s, Object o) throws JMeterException {
-        return bshInvoke(bshSet, new Object[] { s, o }, true);
+    public void set(String s, Object o) throws JMeterException {
+        try {
+            bshInstance.set(s, o);
+        } catch (EvalError e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "set");
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                message += "\t" + cause.getLocalizedMessage();
+            }
+            log.error(message);
+            throw new JMeterException(message, e);
+        }
     }
 
-    public Object set(String s, boolean b) throws JMeterException {
-        return bshInvoke(bshSet, new Object[] { s, b}, true);
+    public void set(String s, boolean b) throws JMeterException {
+        try {
+            bshInstance.set(s, b);
+        } catch (EvalError e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "set");
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                message += "\t" + cause.getLocalizedMessage();
+            }
+            log.error(message);
+            throw new JMeterException(message, e);
+        }
     }
 
     public Object source(String s) throws JMeterException {
-        return bshInvoke(bshSource, new Object[] { s }, true);
+        Object r = null;
+        try {
+            r = bshInstance.source(s);
+        } catch (EvalError | IOException e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "source");
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                message += "\t" + cause.getLocalizedMessage();
+            }
+            log.error(message);
+            throw new JMeterException(message, e);
+        }
+        return r;
     }
 
     public Object get(String s) throws JMeterException {
-        return bshInvoke(bshGet, new Object[] { s }, true);
+        Object r = null;
+        try {
+            r = bshInstance.get(s);
+        } catch (EvalError e) {
+            String message = String.format(BSH_ERROR_TEMPLATE, "get");
+            Throwable cause = e.getCause();
+            if (cause != null) {
+                message += "\t" + cause.getLocalizedMessage();
+            }
+            log.error(message);
+            throw new JMeterException(message, e);
+        }
+        return r;
     }
 
     // For use by Unit Tests
-    public static boolean isInterpreterPresent(){
+    public static boolean isInterpreterPresent() {
+        Class<?> bshClass = null;
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        try {
+            bshClass = loader.loadClass("bsh.Interpreter");
+        } catch (ClassNotFoundException e) {
+            log.error("Beanshell Interpreter not found", e);
+        }
         return bshClass != null;
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
index 816b3299e1d..88b9bdd1bc2 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
@@ -75,11 +75,7 @@ protected BeanShellTestElement() {
      */
     protected BeanShellInterpreter getBeanShellInterpreter() {
         if (isResetInterpreter()) {
-            try {
-                bshInterpreter.reset();
-            } catch (ClassNotFoundException e) {
-                log.error("Cannot reset BeanShell: {}", e.toString()); // NOSONAR last arg would be exception
-            }
+            bshInterpreter.reset();
         }
 
         JMeterContext jmctx = JMeterContextService.getContext();
@@ -101,13 +97,9 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         parameters=""; // ensure variables are not null
         filename="";
         script="";
-        try {
-            String initFileName = JMeterUtils.getProperty(getInitFileProperty());
-            hasInitFile = initFileName != null;
-            bshInterpreter = new BeanShellInterpreter(initFileName, log);
-        } catch (ClassNotFoundException e) {
-            log.error("Cannot find BeanShell: {}", e.toString()); // NOSONAR last arg would be exception
-        }
+        String initFileName = JMeterUtils.getProperty(getInitFileProperty());
+        hasInitFile = initFileName != null;
+        bshInterpreter = new BeanShellInterpreter(initFileName, log);
     }
 
     protected Object readResolve() {
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index a6b456bff17..3acb3234866 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -33,7 +33,7 @@
 462124,commons-jexl3-3.2.1.jar
 760623,commons-jvm-4.1.0.jar
 657952,commons-lang3-3.14.0.jar
-70816,commons-logging-1.3.0.jar
+73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
 322780,commons-net-3.10.0.jar
 150048,commons-pool2-2.12.0.jar
@@ -137,4 +137,4 @@
 7188,xmlpull-1.1.3.1.jar
 1027769,xmlresolver-5.2.1-data.jar
 165689,xmlresolver-5.2.1.jar
-644649,xstream-1.4.20.jar
+646504,xstream-1.4.21.jar
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
index f72284c877b..8a924904ec3 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
@@ -131,11 +131,7 @@ public synchronized void setParameters(Collection<CompoundVariable> parameters)
 
         values = parameters.toArray();
 
-        try {
-            bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
-        } catch (ClassNotFoundException e) {
-            throw new InvalidVariableException("BeanShell not found", e);
-        }
+        bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
     }
 
     /** {@inheritDoc} */

From 9c64fd2d2701d6bea5402f60dd03db8d2868018a Mon Sep 17 00:00:00 2001
From: Alioth Null <alioth4j@proton.me>
Date: Mon, 24 Mar 2025 16:09:21 +0800
Subject: [PATCH 0806/1037] factor out error handling logic

---
 .../jmeter/util/BeanShellInterpreter.java     | 61 ++++++-------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
index f1d3da5b970..1e0869b9297 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
@@ -47,8 +47,6 @@ public class BeanShellInterpreter {
 
     private final Logger logger; // Logger to use during initialization and script run
 
-    private static final String BSH_ERROR_TEMPLATE = "Error invoking bsh method: %s";
-
     public BeanShellInterpreter() {
         this(null, null);
     }
@@ -110,13 +108,7 @@ public Object eval(String s) throws JMeterException {
         try {
             r = bshInstance.eval(s);
         } catch (EvalError e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "eval");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            log.error(message);
-            throw new JMeterException(message, e);
+            handleException("eval", e, true);
         }
         return r;
     }
@@ -126,12 +118,7 @@ public Object evalNoLog(String s) throws JMeterException {
         try {
             r = bshInstance.eval(s);
         } catch (EvalError e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "eval");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            throw new JMeterException(message, e);
+            handleException("eval", e, false);
         }
         return r;
     }
@@ -140,13 +127,7 @@ public void set(String s, Object o) throws JMeterException {
         try {
             bshInstance.set(s, o);
         } catch (EvalError e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "set");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            log.error(message);
-            throw new JMeterException(message, e);
+            handleException("set", e, true);
         }
     }
 
@@ -154,13 +135,7 @@ public void set(String s, boolean b) throws JMeterException {
         try {
             bshInstance.set(s, b);
         } catch (EvalError e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "set");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            log.error(message);
-            throw new JMeterException(message, e);
+            handleException("set", e, true);
         }
     }
 
@@ -169,13 +144,7 @@ public Object source(String s) throws JMeterException {
         try {
             r = bshInstance.source(s);
         } catch (EvalError | IOException e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "source");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            log.error(message);
-            throw new JMeterException(message, e);
+            handleException("source", e, true);
         }
         return r;
     }
@@ -185,17 +154,23 @@ public Object get(String s) throws JMeterException {
         try {
             r = bshInstance.get(s);
         } catch (EvalError e) {
-            String message = String.format(BSH_ERROR_TEMPLATE, "get");
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                message += "\t" + cause.getLocalizedMessage();
-            }
-            log.error(message);
-            throw new JMeterException(message, e);
+            handleException("get", e, true);
         }
         return r;
     }
 
+    private static void handleException(String methodName, Exception e, boolean shouldLog) throws JMeterException {
+        String message = String.format("Error invoking bsh method: %s", methodName);
+        Throwable cause = e.getCause();
+        if (cause != null) {
+            message += "\t" + cause.getLocalizedMessage();
+        }
+        if (shouldLog) {
+            log.error(message);
+        }
+        throw new JMeterException(message, e);
+    }
+
     // For use by Unit Tests
     public static boolean isInterpreterPresent() {
         Class<?> bshClass = null;

From 77675e0b8e6fa8a81a101777c450acc97927b781 Mon Sep 17 00:00:00 2001
From: Raul Almeida <49497430+ratacolita@users.noreply.github.com>
Date: Wed, 23 Apr 2025 10:00:46 -0300
Subject: [PATCH 0807/1037] fix: support trailing empty default values in JSON
 Extractor(#6448)

See https://errorprone.info/bugpattern/StringSplitter
---
 .../json/jsonpath/JSONPostProcessor.java      |  2 +-
 .../extractor/TestJSONPostProcessor.java      | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index 390fd22af59..0626d1c1643 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -70,7 +70,7 @@ public void process() {
         List<String> jsonResponses = extractJsonResponse(context, vars);
         String[] refNames = getRefNames().split(SEPARATOR);
         String[] jsonPathExpressions = getJsonPathExpressions().split(SEPARATOR);
-        String[] defaultValues = getDefaultValues().split(SEPARATOR);
+        String[] defaultValues = getDefaultValues().split(SEPARATOR, -1);
         int[] matchNumbers = getMatchNumbersAsInt(defaultValues.length);
 
         validateSameLengthOfArguments(refNames, jsonPathExpressions, defaultValues);
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
index 7705bee083a..d88bbfac062 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
@@ -317,6 +317,35 @@ void testExtractComplexElements() {
         assertEquals("3", vars.get(VAR_NAME + "_matchNr"));
     }
 
+    @Test
+    void testProcessDefaultsWithAllEmptyStrings() {
+        JMeterContext context = JMeterContextService.getContext();
+        // Use match number 1 for simplicity
+        JSONPostProcessor processor = setupProcessor(context, "1", false);
+        JMeterVariables vars = new JMeterVariables();
+        context.setVariables(vars);
+
+        // Set up sample result that won't match JSON Paths
+        SampleResult sampleResult = createSampleResult("{}"); // Empty JSON
+        context.setPreviousResult(sampleResult);
+
+        // Configure the processor
+        // Three paths and names, corresponding to the three empty defaults
+        processor.setJsonPathExpressions("$.key1;$.key2;$.key3");
+        processor.setRefNames("var1;var2;var3");
+        // *** Default values string containing only separators ***
+        // This should split into ["", "", ""] with the fix
+        processor.setDefaultValues(";;"); // Represents 3 empty default values
+        processor.setScopeAll(); // Ensure it processes the main sample
+
+        // Process the sample
+        processor.process();
+
+        // Assertions: Verify all variables received an empty string default
+        assertEquals("", vars.get("var1"), "Variable var1 should get the first (empty) default value");
+        assertEquals("", vars.get("var2"), "Variable var2 should get the second (empty) default value");
+        assertEquals("", vars.get("var3"), "Variable var3 should get the third (empty) default value");
+    }
 
     private static JSONPostProcessor setupProcessor(JMeterContext context, String matchNumbers) {
         return setupProcessor(context, matchNumbers, true);

From 83e211fed7531855ca8685f3f8ab97aafab9b488 Mon Sep 17 00:00:00 2001
From: Milamber <milamber@apache.org>
Date: Mon, 7 Jul 2025 09:43:25 +0100
Subject: [PATCH 0808/1037] Move to Java 17 (migrate source code from Java 8)
 (#6462)

* Prepare to use Java 17 as minimal version

* See #6219 Pattern Matching for instanceof uses (Java 14/16)

* See #6219 - Implicit Typing with var (Java 10)

* See #6219 - Using Switch Expressions / yield Keyword (Java 14)

* See #6219 - Using Text Blocks (Java 15)

* See #6219 - some tunning / formating style

* See #6219 - tunning code

* See #6219 - Update Java argline params / remove java 8 / 9 args/comments

* See #6219 - formating code

* Remove not standard options for Java 17

* See #6219 - refactor CompOper to an enum

* See #6219 - fix unnecessary yield usage in the switch expression

* See #6219 - Optimize the code, fix formatting issue
---
 bin/jmeter                                    |  35 ++---
 bin/jmeter.bat                                |  61 ++++-----
 bin/jmeter.sh                                 |   7 +-
 .../main/kotlin/build-logic.java.gradle.kts   |  10 +-
 .../jmeter/assertions/SizeAssertion.java      | 113 +++++++++++-----
 .../assertions/gui/SizeAssertionGui.java      |  50 +++----
 .../org/apache/jmeter/config/CSVDataSet.java  |  20 +--
 .../json/jsonpath/JSONPostProcessor.java      |   4 +-
 .../jmeter/sampler/gui/TestActionGui.java     |  27 +---
 .../ViewResultsFullVisualizer.java            |  14 +-
 .../visualizers/backend/SamplerMetric.java    |  16 +--
 .../jmeter/assertions/SizeAssertionTest.java  |  12 +-
 .../extractor/TestJSONPostProcessor.java      |  15 ++-
 .../jmeter/engine/StandardJMeterEngine.java   |  42 +++---
 .../org/apache/jmeter/gui/GuiPackage.java     |   5 +-
 .../apache/jmeter/save/CSVSaveService.java    |   6 +-
 .../SampleSaveConfigurationConverter.java     |  25 ++--
 .../jmeter/testbeans/TestBeanHelper.java      |  12 +-
 .../testelement/AbstractTestElement.java      |   4 +-
 .../property/AbstractProperty.java            |  48 ++++---
 .../property/CollectionProperty.java          |  16 +--
 .../apache/jmeter/threads/JMeterThread.java   |  40 +++---
 .../apache/jmeter/threads/TestCompiler.java   |  61 +++++----
 .../apache/jmeter/functions/ChangeCase.java   |  25 ++--
 .../apache/jmeter/functions/CharFunction.java |   4 +-
 .../apache/jmeter/functions/LogFunction.java  |  20 +--
 .../jmeter/functions/RegexFunction.java       |   8 +-
 .../jmeter/functions/StringFromFile.java      |   2 +-
 .../apache/jorphan/collections/HashTree.java  |  12 +-
 .../org/apache/jorphan/util/Converter.java    |  48 +++----
 .../protocol/http/control/CacheManager.java   |   4 +-
 .../protocol/http/curl/BasicCurlParser.java   |  29 ++---
 .../protocol/http/util/ConversionUtils.java   |  20 +--
 .../http/visualizers/RequestViewHTTP.java     |   6 +-
 .../http/proxy/TestHttpRequestHdr.java        | 122 ++++++++++--------
 .../util/TestGraphQLRequestParamUtils.java    |  36 +++---
 .../jdbc/config/DataSourceElement.java        |   6 +-
 .../protocol/jms/sampler/JMSSampler.java      |  21 ++-
 38 files changed, 496 insertions(+), 510 deletions(-)

diff --git a/bin/jmeter b/bin/jmeter
index 055b2bafcbe..56550598ec8 100755
--- a/bin/jmeter
+++ b/bin/jmeter
@@ -115,18 +115,19 @@ if [ -z "$JAVA_HOME" ]; then
   JAVA_HOME="$JRE_HOME"
 fi
 
-#--add-opens if JAVA 9
-JAVA9_OPTS=
+# Module access for modern Java versions (required for JMeter components)
+JAVA_OPTS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED"
 
 # Minimal version to run JMeter
-MINIMAL_VERSION=8
+MINIMAL_VERSION=17
 
-# Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
+# Check if version meets the minimal requirement
 CURRENT_VERSION=`"${JAVA_HOME}/bin/java" -version 2>&1 | awk -F'"' '/version/ {gsub("^1[.]", "", $2); gsub("[^0-9].*$", "", $2); print $2}'`
 
-# Check if Java is present and the minimal version requirement
-if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then
-    JAVA9_OPTS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED"
+# Check if Java is present and meets the minimal version requirement
+if [ "$CURRENT_VERSION" -lt "$MINIMAL_VERSION" ]; then
+    echo "ERROR: Java version $CURRENT_VERSION is too low. JMeter requires Java $MINIMAL_VERSION or higher."
+    exit 1
 fi
 
 : "${JMETER_OPTS:=""}"
@@ -169,15 +170,19 @@ esac
 # Default to en_EN
 : "${JMETER_LANGUAGE:="-Duser.language=en -Duser.region=EN"}"
 
-# Uncomment this to generate GC verbose file with Java prior to 9
-# VERBOSE_GC="-verbose:gc -Xloggc:gc_jmeter_%p.log -XX:+PrintGCDetails -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintGCApplicationConcurrentTime -XX:+PrintAdaptiveSizePolicy -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps"
+# Legacy GC verbose options removed (Java 8/9 support discontinued)
+
+# Optimized GC logging for Java 17 with structured output and performance analysis
+# Uncomment to enable comprehensive GC logging with rotation and detailed metrics
+# VERBOSE_GC="-Xlog:gc,gc+heap,gc+regions,gc+refine,gc+phases:gc_jmeter_%p_%t.log:time,level,tags:filecount=5,filesize=50M"
+
+# Alternative: Minimal GC logging for production (uncomment if needed)
+# VERBOSE_GC="-Xlog:gc:gc_jmeter_%p.log:time"
 
-# Uncomment this to generate GC verbose file with Java 9 and above
-# VERBOSE_GC="-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%p.log"
+# Docker support for Java 17+
+# Modern container memory detection is automatic in Java 17+
+# RUN_IN_DOCKER="-XX:+UseContainerSupport"
 
-# Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
-# see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
-# RUN_IN_DOCKER="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
 
 # Finally, some tracing to help in case things go astray:
 # You may want to add those settings:
@@ -191,7 +196,7 @@ SYSTEM_PROPS="-Djava.security.egd=file:/dev/urandom"
 SERVER="-server"
 
 if [ -z "${JMETER_COMPLETE_ARGS}" ]; then
-    ARGS="$JAVA9_OPTS $SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
+    ARGS="$JAVA_OPTS $SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
 else
     ARGS=""
 fi
diff --git a/bin/jmeter.bat b/bin/jmeter.bat
index e39153dab5b..7a6dae72b3c 100644
--- a/bin/jmeter.bat
+++ b/bin/jmeter.bat
@@ -78,12 +78,19 @@ if not defined JMETER_LANGUAGE (
 )
 
 rem Minimal version to run JMeter
-set MINIMAL_VERSION=1.8.0
+set MINIMAL_VERSION=17.0.0
 
 
-rem --add-opens if JAVA 9
-set JAVA9_OPTS=
+rem Optimized GC logging for Java 17 with structured output and performance analysis
+rem Uncomment to enable comprehensive GC logging with rotation and detailed metrics
+rem set VERBOSE_GC=-Xlog:gc,gc+heap,gc+regions,gc+refine,gc+phases:gc_jmeter_%%p_%%t.log:time,level,tags:filecount=5,filesize=50M
 
+rem Alternative: Minimal GC logging for production (uncomment if needed)
+rem set VERBOSE_GC=-Xlog:gc:gc_jmeter_%%p.log:time
+
+
+rem Module access for modern Java versions (required for JMeter components)
+set JAVA_OPTS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED
 
 for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
     rem @echo Debug Output: %%g
@@ -95,36 +102,24 @@ if not defined JAVAVER (
     goto pause
 )
 
-
-
-rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
-rem JAVAVER will be equal to "9.0.4" (quotes are part of the value) for Oracle Java 9
-rem JAVAVER will be equal to "1.8.0_161" (quotes are part of the value) for Oracle Java 8
-rem so we extract 2 chars starting from index 1
-IF "%JAVAVER:~1,2%"=="1." (
-    set JAVAVER=%JAVAVER:"=%
-    for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
-        set current_minor=%%w
+rem Extract major version number from Java version string
+for /f "delims=. tokens=1" %%v in ("%JAVAVER:~1,-1%") do (
+    set current_major=%%v
 )
-) else (
-    rem Java 9 at least
-    set current_minor=9
-    set JAVA9_OPTS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED
-)
-
 
-for /f "delims=. tokens=1-3" %%v in ("%MINIMAL_VERSION%") do (
-    set minimal_minor=%%w
+rem Extract minimal major version
+for /f "delims=. tokens=1" %%v in ("%MINIMAL_VERSION%") do (
+    set minimal_major=%%v
 )
 
-if not defined current_minor (
+if not defined current_major (
     @echo Not able to find Java executable or version. Please check your Java installation.
     set ERRORLEVEL=2
     goto pause
 )
-rem @echo Debug: CURRENT=%current_minor% - MINIMAL=%minimal_minor%
-if %current_minor% LSS %minimal_minor% (
-    @echo Error: Java version -- %JAVAVER% -- is too low to run JMeter. Needs a Java version greater than or equal to %MINIMAL_VERSION%
+
+if %current_major% LSS %minimal_major% (
+    @echo Error: Java version -- %JAVAVER% -- is too low to run JMeter. Needs Java %MINIMAL_VERSION% or higher.
     set ERRORLEVEL=3
     goto pause
 )
@@ -151,13 +146,7 @@ if not defined HEAP (
     set HEAP=-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m
 )
 
-rem Uncomment this to generate GC verbose file with Java prior to 9
-rem set VERBOSE_GC=-verbose:gc -Xloggc:gc_jmeter_%%p.log -XX:+PrintGCDetails -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy
-
-rem Uncomment this to generate GC verbose file with Java 9 and above
-rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log
-rem You may want to add those settings
-rem -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem
+rem Legacy GC verbose options removed (Java 8/9 support discontinued)
 if not defined GC_ALGO (
     set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20
 )
@@ -167,9 +156,9 @@ set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
 rem Always dump on OOM (does not cost anything unless triggered)
 set DUMP=-XX:+HeapDumpOnOutOfMemoryError
 
-rem Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
-rem see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
-rem set RUN_IN_DOCKER=-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+rem Docker support for Java 17+
+rem Modern container memory detection is automatic in Java 17+
+rem set RUN_IN_DOCKER=-XX:+UseContainerSupport
 
 rem Additional settings that might help improve GUI performance on some platforms
 rem See: http://www.oracle.com/technetwork/java/perf-graphics-135933.html
@@ -188,7 +177,7 @@ if not defined DDRAW (
 
 rem Collect the settings defined above
 if not defined JMETER_COMPLETE_ARGS (
-    set ARGS=%JAVA9_OPTS% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %JMETER_LANGUAGE% %RUN_IN_DOCKER%
+    set ARGS=%JAVA_OPTS% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %JMETER_LANGUAGE% %RUN_IN_DOCKER%
 ) else (
     set ARGS=
 )
diff --git a/bin/jmeter.sh b/bin/jmeter.sh
index e5cf8a7e0c9..94843d2915c 100755
--- a/bin/jmeter.sh
+++ b/bin/jmeter.sh
@@ -90,14 +90,17 @@ fi
 JAVA9_OPTS=
 
 # Minimal version to run JMeter
-MINIMAL_VERSION=8
+MINIMAL_VERSION=17
 
 # Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
 CURRENT_VERSION=`"${JAVA_HOME}/bin/java" -version 2>&1 | awk -F'"' '/version/ {gsub("^1[.]", "", $2); gsub("[^0-9].*$", "", $2); print $2}'`
 
 # Check if Java is present and the minimal version requirement
-if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then
+if [ "$CURRENT_VERSION" -ge "$MINIMAL_VERSION" ]; then
     JAVA9_OPTS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED"
+else
+    echo "JMeter requires Java $MINIMAL_VERSION or later. Current Java version is $CURRENT_VERSION"
+    exit 1
 fi
 
 # Don't add additional arguments to the JVM start, except those needed for Java 9
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 53786ede3b9..bb7366a3a1e 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -121,18 +121,14 @@ tasks.configureEach<Javadoc> {
         docTitle = "Apache JMeter ${project.name} API"
         windowTitle = "Apache JMeter ${project.name} API"
         header = "<b>Apache JMeter</b>"
-        addStringOption("source", "8")
+        addStringOption("source", "17")
         addStringOption("Xmaxwarns", "10")
         addBooleanOption("Xdoclint:all,-missing", true)
         val lastEditYear: String by rootProject.extra
         bottom =
             "Copyright &copy; 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
-        if (buildParameters.buildJdkVersion > 8) {
-            addBooleanOption("html5", true)
-            links("https://docs.oracle.com/en/java/javase/11/docs/api/")
-        } else {
-            links("https://docs.oracle.com/javase/8/docs/api/")
-        }
+        addBooleanOption("html5", true)
+        links("https://docs.oracle.com/en/java/javase/17/docs/api/")
     }
 }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
index 54cadef4f38..5e83d920c46 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
@@ -35,17 +35,86 @@ public class SizeAssertion extends AbstractScopedAssertion implements Serializab
 
     private static final long serialVersionUID = 241L;
 
-    // Static int to signify the type of logical comparator to assert
+    /**
+     * Comparison operators for size assertions
+     */
+    public enum ComparisonOperator {
+        EQUAL(1, "size_assertion_comparator_error_equal"),
+        NOTEQUAL(2, "size_assertion_comparator_error_notequal"),
+        GREATERTHAN(3, "size_assertion_comparator_error_greater"),
+        LESSTHAN(4, "size_assertion_comparator_error_less"),
+        GREATERTHANEQUAL(5, "size_assertion_comparator_error_greaterequal"),
+        LESSTHANEQUAL(6, "size_assertion_comparator_error_lessequal");
+
+        private static final ComparisonOperator[] VALUES = values();
+
+        private final int value;
+        private final String errorMessageKey;
+
+        ComparisonOperator(int value, String errorMessageKey) {
+            this.value = value;
+            this.errorMessageKey = errorMessageKey;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getErrorMessageKey() {
+            return errorMessageKey;
+        }
+
+        public static ComparisonOperator fromValue(int value) {
+            for (ComparisonOperator op : VALUES) {
+                if (op.value == value) {
+                    return op;
+                }
+            }
+            return null;
+        }
+
+        public boolean evaluate(long actual, long expected) {
+            switch (this) {
+                case EQUAL:
+                    return actual == expected;
+                case NOTEQUAL:
+                    return actual != expected;
+                case GREATERTHAN:
+                    return actual > expected;
+                case LESSTHAN:
+                    return actual < expected;
+                case GREATERTHANEQUAL:
+                    return actual >= expected;
+                case LESSTHANEQUAL:
+                    return actual <= expected;
+            }
+            throw new IllegalStateException("Unexpected value: " + this);
+        }
+    }
+
+    // Backward compatibility constants - deprecated
+    /** @deprecated Use {@link ComparisonOperator#EQUAL} instead */
+    @Deprecated
     public static final int EQUAL = 1;
 
+    /** @deprecated Use {@link ComparisonOperator#NOTEQUAL} instead */
+    @Deprecated
     public static final int NOTEQUAL = 2;
 
+    /** @deprecated Use {@link ComparisonOperator#GREATERTHAN} instead */
+    @Deprecated
     public static final int GREATERTHAN = 3;
 
+    /** @deprecated Use {@link ComparisonOperator#LESSTHAN} instead */
+    @Deprecated
     public static final int LESSTHAN = 4;
 
+    /** @deprecated Use {@link ComparisonOperator#GREATERTHANEQUAL} instead */
+    @Deprecated
     public static final int GREATERTHANEQUAL = 5;
 
+    /** @deprecated Use {@link ComparisonOperator#LESSTHANEQUAL} instead */
+    @Deprecated
     public static final int LESSTHANEQUAL = 6;
 
     /** Key for storing assertion-information in the jmx-file. */
@@ -175,41 +244,17 @@ public void setAllowedSize(long size) {
      *
      */
     private String compareSize(long resultSize) {
-        String comparatorErrorMessage;
         long allowedSize = Long.parseLong(getAllowedSize());
-        boolean result;
-        int comp = getCompOper();
-        switch (comp) {
-        case EQUAL:
-            result = resultSize == allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_equal"); //$NON-NLS-1$
-            break;
-        case NOTEQUAL:
-            result = resultSize != allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_notequal"); //$NON-NLS-1$
-            break;
-        case GREATERTHAN:
-            result = resultSize > allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greater"); //$NON-NLS-1$
-            break;
-        case LESSTHAN:
-            result = resultSize < allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_less"); //$NON-NLS-1$
-            break;
-        case GREATERTHANEQUAL:
-            result = resultSize >= allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greaterequal"); //$NON-NLS-1$
-            break;
-        case LESSTHANEQUAL:
-            result = resultSize <= allowedSize;
-            comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_lessequal"); //$NON-NLS-1$
-            break;
-        default:
-            result = false;
-            comparatorErrorMessage = "ERROR - invalid condition";
-            break;
+        ComparisonOperator operator = ComparisonOperator.fromValue(getCompOper());
+        if (operator == null) {
+            return "ERROR - invalid condition";
+        }
+        
+        if (operator.evaluate(resultSize, allowedSize)) {
+            return "";
+        } else {
+            return JMeterUtils.getResString(operator.getErrorMessageKey());
         }
-        return result ? "" : comparatorErrorMessage;
     }
 
     private void setTestField(String testField) {
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
index 6e17c167c9a..8fb265d568b 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
@@ -135,7 +135,7 @@ public void clearGui() {
         lessthanButton.setSelected(false);
         greaterthanequalButton.setSelected(false);
         lessthanequalButton.setSelected(false);
-        execState = SizeAssertion.EQUAL;
+        execState = SizeAssertion.ComparisonOperator.EQUAL.getValue();
     }
 
     @Override
@@ -164,32 +164,32 @@ public void configure(TestElement el) {
      * <p>
      * Allowed states are
      * <ul>
-     * <li>{@link SizeAssertion#EQUAL}</li>
-     * <li>{@link SizeAssertion#NOTEQUAL}</li>
-     * <li>{@link SizeAssertion#GREATERTHAN}</li>
-     * <li>{@link SizeAssertion#LESSTHAN}</li>
-     * <li>{@link SizeAssertion#GREATERTHANEQUAL}</li>
-     * <li>{@link SizeAssertion#LESSTHANEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#EQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#NOTEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#GREATERTHAN}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#LESSTHAN}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#GREATERTHANEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#LESSTHANEQUAL}</li>
      * </ul>
      * @param state One of the allowed states
      */
     public void setState(int state) {
-        if (state == SizeAssertion.EQUAL) {
+        if (state == SizeAssertion.ComparisonOperator.EQUAL.getValue()) {
             equalButton.setSelected(true);
             execState = state;
-        } else if (state == SizeAssertion.NOTEQUAL) {
+        } else if (state == SizeAssertion.ComparisonOperator.NOTEQUAL.getValue()) {
             notequalButton.setSelected(true);
             execState = state;
-        } else if (state == SizeAssertion.GREATERTHAN) {
+        } else if (state == SizeAssertion.ComparisonOperator.GREATERTHAN.getValue()) {
             greaterthanButton.setSelected(true);
             execState = state;
-        } else if (state == SizeAssertion.LESSTHAN) {
+        } else if (state == SizeAssertion.ComparisonOperator.LESSTHAN.getValue()) {
             lessthanButton.setSelected(true);
             execState = state;
-        } else if (state == SizeAssertion.GREATERTHANEQUAL) {
+        } else if (state == SizeAssertion.ComparisonOperator.GREATERTHANEQUAL.getValue()) {
             greaterthanequalButton.setSelected(true);
             execState = state;
-        } else if (state == SizeAssertion.LESSTHANEQUAL) {
+        } else if (state == SizeAssertion.ComparisonOperator.LESSTHANEQUAL.getValue()) {
             lessthanequalButton.setSelected(true);
             execState = state;
         }
@@ -200,12 +200,12 @@ public void setState(int state) {
      * <p>
      * Possible states are
      * <ul>
-     * <li>{@link SizeAssertion#EQUAL}</li>
-     * <li>{@link SizeAssertion#NOTEQUAL}</li>
-     * <li>{@link SizeAssertion#GREATERTHAN}</li>
-     * <li>{@link SizeAssertion#LESSTHAN}</li>
-     * <li>{@link SizeAssertion#GREATERTHANEQUAL}</li>
-     * <li>{@link SizeAssertion#LESSTHANEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#EQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#NOTEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#GREATERTHAN}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#LESSTHAN}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#GREATERTHANEQUAL}</li>
+     * <li>{@link SizeAssertion.ComparisonOperator#LESSTHANEQUAL}</li>
      * </ul>
      * @return The current state of the radio Button
      */
@@ -273,12 +273,12 @@ private JPanel createFieldPanel() {
     private Box createComparatorButtonPanel() {
         ButtonGroup group = new ButtonGroup();
 
-        equalButton = createComparatorButton("=", SizeAssertion.EQUAL, group); //$NON-NLS-1$
-        notequalButton = createComparatorButton("!=", SizeAssertion.NOTEQUAL, group); //$NON-NLS-1$
-        greaterthanButton = createComparatorButton(">", SizeAssertion.GREATERTHAN, group); //$NON-NLS-1$
-        lessthanButton = createComparatorButton("<", SizeAssertion.LESSTHAN, group); //$NON-NLS-1$
-        greaterthanequalButton = createComparatorButton(">=", SizeAssertion.GREATERTHANEQUAL, group); //$NON-NLS-1$
-        lessthanequalButton = createComparatorButton("<=", SizeAssertion.LESSTHANEQUAL, group); //$NON-NLS-1$
+        equalButton = createComparatorButton("=", SizeAssertion.ComparisonOperator.EQUAL.getValue(), group); //$NON-NLS-1$
+        notequalButton = createComparatorButton("!=", SizeAssertion.ComparisonOperator.NOTEQUAL.getValue(), group); //$NON-NLS-1$
+        greaterthanButton = createComparatorButton(">", SizeAssertion.ComparisonOperator.GREATERTHAN.getValue(), group); //$NON-NLS-1$
+        lessthanButton = createComparatorButton("<", SizeAssertion.ComparisonOperator.LESSTHAN.getValue(), group); //$NON-NLS-1$
+        greaterthanequalButton = createComparatorButton(">=", SizeAssertion.ComparisonOperator.GREATERTHANEQUAL.getValue(), group); //$NON-NLS-1$
+        lessthanequalButton = createComparatorButton("<=", SizeAssertion.ComparisonOperator.LESSTHANEQUAL.getValue(), group); //$NON-NLS-1$
 
         equalButton.setSelected(true);
         execState = Integer.parseInt(equalButton.getActionCommand());
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index d7364c50361..3731fd43753 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -222,20 +222,12 @@ private void initVars(FileServer server, final JMeterContext context, String del
     private void setAlias(final JMeterContext context, String alias) {
         String mode = getShareMode();
         int modeInt = CSVDataSetBeanInfo.getShareModeAsInt(mode);
-        switch(modeInt){
-            case CSVDataSetBeanInfo.SHARE_ALL:
-                this.alias = alias;
-                break;
-            case CSVDataSetBeanInfo.SHARE_GROUP:
-                this.alias = alias + "@" + System.identityHashCode(context.getThreadGroup());
-                break;
-            case CSVDataSetBeanInfo.SHARE_THREAD:
-                this.alias = alias + "@" + System.identityHashCode(context.getThread());
-                break;
-            default:
-                this.alias = alias + "@" + mode; // user-specified key
-                break;
-        }
+        this.alias = switch(modeInt){
+            case CSVDataSetBeanInfo.SHARE_ALL -> alias;
+            case CSVDataSetBeanInfo.SHARE_GROUP -> alias + "@" + System.identityHashCode(context.getThreadGroup());
+            case CSVDataSetBeanInfo.SHARE_THREAD -> alias + "@" + System.identityHashCode(context.getThread());
+            default -> alias + "@" + mode; // user-specified key
+        };
     }
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index 0626d1c1643..7d40b92b5f8 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -157,12 +157,12 @@ private void handleListResult(JMeterVariables vars, String defaultValue, final i
         if (matchNumber < 0) {
             // Extract all
             int index = 1;
-            StringBuilder concat =
+            var concat =
                     new StringBuilder(getComputeConcatenation()
                             ? extractedValues.size() * 20
                             : 1);
             for (Object extractedObject : extractedValues) {
-                String extractedString = Objects.toString(extractedObject, defaultValue);
+                var extractedString = Objects.toString(extractedObject, defaultValue);
                 vars.put(currentRefName + "_" + index,
                         extractedString); //$NON-NLS-1$
                 if (getComputeConcatenation()) {
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java b/src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java
index fa3951cae78..c35f3c840b7 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java
@@ -114,26 +114,13 @@ public void configure(TestElement element) {
         }
         action = ta.getAction();
         switch (action) {
-            case TestAction.PAUSE:
-                pauseButton.setSelected(true);
-                break;
-            case TestAction.STOP_NOW:
-                stopNowButton.setSelected(true);
-                break;
-            case TestAction.STOP:
-                stopButton.setSelected(true);
-                break;
-            case TestAction.RESTART_NEXT_LOOP:
-                restartNextThreadLoopButton.setSelected(true);
-                break;
-            case TestAction.START_NEXT_ITERATION_CURRENT_LOOP:
-                startNextIterationOfCurrentLoopButton.setSelected(true);
-                break;
-            case TestAction.BREAK_CURRENT_LOOP:
-                breakLoopButton.setSelected(true);
-                break;
-            default:
-                break;
+            case TestAction.PAUSE -> pauseButton.setSelected(true);
+            case TestAction.STOP_NOW -> stopNowButton.setSelected(true);
+            case TestAction.STOP -> stopButton.setSelected(true);
+            case TestAction.RESTART_NEXT_LOOP -> restartNextThreadLoopButton.setSelected(true);
+            case TestAction.START_NEXT_ITERATION_CURRENT_LOOP -> startNextIterationOfCurrentLoopButton.setSelected(true);
+            case TestAction.BREAK_CURRENT_LOOP -> breakLoopButton.setSelected(true);
+            default -> { /* no action needed */ }
         }
 
         durationField.setText(ta.getDurationAsString());
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 44216aa7115..1c9470b45c4 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -546,12 +546,14 @@ public static String getResponseAsString(SampleResult res) {
             // they are ready to wait.
             int len = res.getResponseDataAsString().length();
             if (MAX_DISPLAY_SIZE > 0 && len > MAX_DISPLAY_SIZE) {
-                StringBuilder builder = new StringBuilder(MAX_DISPLAY_SIZE + 100);
-                builder.append(JMeterUtils.getResString("view_results_response_too_large_message")) //$NON-NLS-1$
-                    .append(len).append(" > Max: ").append(MAX_DISPLAY_SIZE)
-                    .append(", ").append(JMeterUtils.getResString("view_results_response_partial_message")) // $NON-NLS-1$
-                    .append("\n").append(res.getResponseDataAsString(), 0, MAX_DISPLAY_SIZE).append("\n...");
-                response = builder.toString();
+                response = """
+                        %s%d > Max: %d, %s
+                        %s
+                        ...""".formatted(
+                            JMeterUtils.getResString("view_results_response_too_large_message"), //$NON-NLS-1$
+                            len, MAX_DISPLAY_SIZE,
+                            JMeterUtils.getResString("view_results_response_partial_message"), // $NON-NLS-1$
+                            res.getResponseDataAsString().substring(0, MAX_DISPLAY_SIZE));
             } else {
                 response = res.getResponseDataAsString();
             }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index 6222c9d8086..7e3149cb749 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -178,15 +178,15 @@ private void addHits(SampleResult result, boolean isCumulated) {
      */
     public synchronized void resetForTimeInterval() {
         switch (globalWindowMode) {
-        case FIXED:
-            // We don't clear responsesStats nor usersStats as it will slide as per my understanding of
-            // http://commons.apache.org/proper/commons-math/userguide/stat.html
-            break;
-        case TIMED:
-            for (DescriptiveStatistics stat : windowedStats) {
-                stat.clear();
+            case FIXED -> {
+                // We don't clear responsesStats nor usersStats as it will slide as per my understanding of
+                // http://commons.apache.org/proper/commons-math/userguide/stat.html
+            }
+            case TIMED -> {
+                for (DescriptiveStatistics stat : windowedStats) {
+                    stat.clear();
+                }
             }
-            break;
         }
         errors.clear();
         successes = 0;
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
index 00a3ea71dbb..28215b65d4a 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
@@ -55,7 +55,7 @@ public void setUp() {
 
     @Test
     public void testSizeAssertionEquals() throws Exception {
-        assertion.setCompOper(SizeAssertion.EQUAL);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.EQUAL.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertFailed();
@@ -73,7 +73,7 @@ public void testSizeAssertionEquals() throws Exception {
 
     @Test
     public void testSizeAssertionNotEquals() throws Exception {
-        assertion.setCompOper(SizeAssertion.NOTEQUAL);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.NOTEQUAL.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertPassed();
@@ -91,7 +91,7 @@ public void testSizeAssertionNotEquals() throws Exception {
 
     @Test
     public void testSizeAssertionGreaterThan() throws Exception {
-        assertion.setCompOper(SizeAssertion.GREATERTHAN);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.GREATERTHAN.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertPassed();
@@ -109,7 +109,7 @@ public void testSizeAssertionGreaterThan() throws Exception {
 
     @Test
     public void testSizeAssertionGreaterThanEqual() throws Exception {
-        assertion.setCompOper(SizeAssertion.GREATERTHANEQUAL);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.GREATERTHANEQUAL.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertPassed();
@@ -127,7 +127,7 @@ public void testSizeAssertionGreaterThanEqual() throws Exception {
 
     @Test
     public void testSizeAssertionLessThan() throws Exception {
-        assertion.setCompOper(SizeAssertion.LESSTHAN);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.LESSTHAN.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertFailed();
@@ -145,7 +145,7 @@ public void testSizeAssertionLessThan() throws Exception {
 
     @Test
     public void testSizeAssertionLessThanEqual() throws Exception {
-        assertion.setCompOper(SizeAssertion.LESSTHANEQUAL);
+        assertion.setCompOper(SizeAssertion.ComparisonOperator.LESSTHANEQUAL.getValue());
         assertion.setAllowedSize(0);
         result = assertion.getResult(sample1);
         assertFailed();
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
index d88bbfac062..57d131bb1fe 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
@@ -86,8 +86,10 @@ void testAssertionWithScope(AccessMode accessMode, String path, String matchNumb
         processor.setJsonPathExpressions(path);
         processor.setRefNames("result");
         accessMode.configure(processor);
-        SampleResult sampleResult = createSampleResult("{\"a\": 23, \"b\": \"parent_only\"}");
-        sampleResult.addSubResult(createSampleResult("{\"a\": 42, \"c\": \"child_only\"}"));
+        SampleResult sampleResult = createSampleResult("""
+                {"a": 23, "b": "parent_only"}""");
+        sampleResult.addSubResult(createSampleResult("""
+                {"a": 42, "c": "child_only"}"""));
         context.setPreviousResult(sampleResult);
         context.setVariables(vars);
         processor.process();
@@ -297,7 +299,8 @@ void testExtractSimpleArrayElements() {
     void testExtractComplexElements() {
         JMeterContext context = JMeterContextService.getContext();
         JSONPostProcessor processor = setupProcessor(context, "-1");
-        String data = "[{\"a\":[1,{\"d\":2},3]},[\"b\",{\"h\":23}],3]";
+        String data = """
+                [{"a":[1,{"d":2},3]},["b",{"h":23}],3]""";
         SampleResult result = new SampleResult();
         result.setResponseData(data.getBytes(StandardCharsets.UTF_8));
         JMeterVariables vars = new JMeterVariables();
@@ -310,8 +313,10 @@ void testExtractComplexElements() {
         String jsonWithoutOuterParens = data.substring(1, data.length() - 1);
         assertEquals(jsonWithoutOuterParens, vars.get(VAR_NAME + "_ALL"));
 
-        assertEquals("{\"a\":[1,{\"d\":2},3]}", vars.get(VAR_NAME + "_1"));
-        assertEquals("[\"b\",{\"h\":23}]", vars.get(VAR_NAME + "_2"));
+        assertEquals("""
+                {"a":[1,{"d":2},3]}""", vars.get(VAR_NAME + "_1"));
+        assertEquals("""
+                ["b",{"h":23}]""", vars.get(VAR_NAME + "_2"));
         assertEquals("3", vars.get(VAR_NAME + "_3"));
 
         assertEquals("3", vars.get(VAR_NAME + "_matchNr"));
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 65894a4dff3..59846b4d3b5 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -185,13 +185,13 @@ private static boolean stopThread(String threadName, boolean now) {
     @Override
     public void configure(HashTree testTree) {
         // Is testplan serialised?
-        SearchByClass<TestPlan> testPlan = new SearchByClass<>(TestPlan.class);
+        var testPlan = new SearchByClass<>(TestPlan.class);
         testTree.traverse(testPlan);
-        Object[] plan = testPlan.getSearchResults().toArray();
+        var plan = testPlan.getSearchResults().toArray();
         if (plan.length == 0) {
             throw new IllegalStateException("Could not find the TestPlan class!");
         }
-        TestPlan tp = (TestPlan) plan[0];
+        var tp = (TestPlan) plan[0];
         serialized = tp.isSerialized();
         tearDownOnShutdown = tp.isTearDownOnShutdown();
         active = true;
@@ -409,7 +409,7 @@ public void run() {
 
         JMeterContextService.startTest();
         try {
-            PreCompiler compiler = new PreCompiler();
+            var compiler = new PreCompiler();
             test.traverse(compiler);
         } catch (RuntimeException e) {
             log.error("Error occurred compiling the tree:",e);
@@ -420,7 +420,7 @@ public void run() {
          * Notification of test listeners needs to happen after function
          * replacement, but before setting RunningVersion to true.
          */
-        SearchByClass<TestStateListener> testListeners = new SearchByClass<>(TestStateListener.class); // TL - S&E
+        var testListeners = new SearchByClass<>(TestStateListener.class); // TL - S&E
         test.traverse(testListeners);
 
         // Merge in any additional test listeners
@@ -431,12 +431,12 @@ public void run() {
         test.traverse(new TurnElementsOn());
         notifyTestListenersOfStart(testListeners);
 
-        List<?> testLevelElements = new ArrayList<>(test.list(test.getArray()[0]));
+        var testLevelElements = new ArrayList<>(test.list(test.getArray()[0]));
         removeThreadGroups(testLevelElements);
 
-        SearchByClass<SetupThreadGroup> setupSearcher = new SearchByClass<>(SetupThreadGroup.class);
-        SearchByClass<AbstractThreadGroup> searcher = new SearchByClass<>(AbstractThreadGroup.class);
-        SearchByClass<PostThreadGroup> postSearcher = new SearchByClass<>(PostThreadGroup.class);
+        var setupSearcher = new SearchByClass<>(SetupThreadGroup.class);
+        var searcher = new SearchByClass<>(AbstractThreadGroup.class);
+        var postSearcher = new SearchByClass<>(PostThreadGroup.class);
 
         test.traverse(setupSearcher);
         test.traverse(searcher);
@@ -446,11 +446,11 @@ public void run() {
         // for each thread group, generate threads
         // hand each thread the sampler controller
         // and the listeners, and the timer
-        Iterator<SetupThreadGroup> setupIter = setupSearcher.getSearchResults().iterator();
-        Iterator<AbstractThreadGroup> iter = searcher.getSearchResults().iterator();
-        Iterator<PostThreadGroup> postIter = postSearcher.getSearchResults().iterator();
+        var setupIter = setupSearcher.getSearchResults().iterator();
+        var iter = searcher.getSearchResults().iterator();
+        var postIter = postSearcher.getSearchResults().iterator();
 
-        ListenerNotifier notifier = new ListenerNotifier();
+        var notifier = new ListenerNotifier();
 
         int groupCount = 0;
         JMeterContextService.clearTotalThreads();
@@ -458,9 +458,9 @@ public void run() {
         if (setupIter.hasNext()) {
             log.info("Starting setUp thread groups");
             while (running && setupIter.hasNext()) {//for each setup thread group
-                AbstractThreadGroup group = setupIter.next();
+                var group = setupIter.next();
                 groupCount++;
-                String groupName = group.getName();
+                var groupName = group.getName();
                 log.info("Starting setUp ThreadGroup: {} : {} ", groupCount, groupName);
                 startThreadGroup(group, groupCount, setupSearcher, testLevelElements, notifier);
                 if (serialized && setupIter.hasNext()) {
@@ -489,7 +489,7 @@ public void run() {
         JMeterContextService.getContext().setSamplingStarted(true);
         boolean mainGroups = running; // still running at this point, i.e. setUp was not cancelled
         while (running && iter.hasNext()) {// for each thread group
-            AbstractThreadGroup group = iter.next();
+            var group = iter.next();
             //ignore Setup and Post here.  We could have filtered the searcher. but then
             //future Thread Group objects wouldn't execute.
             if (group instanceof SetupThreadGroup ||
@@ -497,7 +497,7 @@ public void run() {
                 continue;
             }
             groupCount++;
-            String groupName = group.getName();
+            var groupName = group.getName();
             log.info("Starting ThreadGroup: {} : {}", groupCount, groupName);
             startThreadGroup(group, groupCount, searcher, testLevelElements, notifier);
             if (serialized && iter.hasNext()) {
@@ -527,9 +527,9 @@ public void run() {
                 running = tearDownOnShutdown; // re-enable for tearDown if necessary
             }
             while (running && postIter.hasNext()) {//for each setup thread group
-                AbstractThreadGroup group = postIter.next();
+                var group = postIter.next();
                 groupCount++;
-                String groupName = group.getName();
+                var groupName = group.getName();
                 log.info("Starting tearDown ThreadGroup: {} : {}", groupCount, groupName);
                 startThreadGroup(group, groupCount, postSearcher, testLevelElements, notifier);
                 if (serialized && postIter.hasNext()) {
@@ -557,7 +557,7 @@ private void startThreadGroup(AbstractThreadGroup group, int groupCount, SearchB
             boolean onErrorStopTestNow = group.getOnErrorStopTestNow();
             boolean onErrorStopThread = group.getOnErrorStopThread();
             boolean onErrorStartNextLoop = group.getOnErrorStartNextLoop();
-            String groupName = group.getName();
+            var groupName = group.getName();
             log.info("Starting {} threads for group {}.", numThreads, groupName);
             if (onErrorStopTest) {
                 log.info("Test will stop on error");
@@ -570,7 +570,7 @@ private void startThreadGroup(AbstractThreadGroup group, int groupCount, SearchB
             } else {
                 log.info("Thread will continue on error");
             }
-            ListedHashTree threadGroupTree = (ListedHashTree) searcher.getSubTree(group);
+            var threadGroupTree = (ListedHashTree) searcher.getSubTree(group);
             threadGroupTree.add(group, testLevelElements);
 
             groups.add(group);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 7b695660824..231270e6f0e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -432,13 +432,12 @@ private JMeterGUIComponent getGuiFromCache(Class<?> guiClass, Class<?> testClass
     }
 
     private void updateUi(JMeterGUIComponent comp) {
-        if (!(comp instanceof JComponent)) {
+        if (!(comp instanceof JComponent jc)) {
             return;
         }
-        JComponent jc = (JComponent) comp;
         Object epoch = jc.getClientProperty(LAF_EPOCH);
         int currentLafEpoch = lafEpoch.get();
-        if (epoch instanceof Integer && ((Integer) epoch) < currentLafEpoch) {
+        if (epoch instanceof Integer epochInt && epochInt < currentLafEpoch) {
             JFactory.updateUi(jc);
         }
         jc.putClientProperty(LAF_EPOCH, currentLafEpoch);
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index b9da12d7ea6..adece7104fe 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -228,10 +228,10 @@ private static SampleEvent makeResultFromDelimitedString(
                                 Arrays.asList(DATE_FORMAT_STRINGS));
                         boolean foundMatch = false;
                         for(String fmt : DATE_FORMAT_STRINGS) {
-                            SimpleDateFormat dateFormat = new SimpleDateFormat(fmt);
+                            var dateFormat = new SimpleDateFormat(fmt);
                             dateFormat.setLenient(false);
                             try {
-                                Date stamp = dateFormat.parse(text);
+                                var stamp = dateFormat.parse(text);
                                 timeStamp = stamp.getTime();
                                 log.warn("Setting date format to: {}", fmt);
                                 saveConfig.setDateFormat(fmt);
@@ -246,7 +246,7 @@ private static SampleEvent makeResultFromDelimitedString(
                         }
                     }
                 } else if (saveConfig.strictDateFormatter() != null) {
-                    Date stamp = saveConfig.strictDateFormatter().parse(text);
+                    var stamp = saveConfig.strictDateFormatter().parse(text);
                     timeStamp = stamp.getTime();
                 } else { // can this happen?
                     final String msg = "Unknown timestamp format";
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
index 7bc635313ff..8488176cb75 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
@@ -84,23 +84,14 @@ public boolean shouldSerializeMember(
             }
             // These are new fields; not saved unless true
             // This list MUST agree with the list in the marshall() method below
-            switch (fieldName) {
-                case NODE_BYTES:
-                case NODE_SENT_BYTES:
-                case NODE_URL:
-                case NODE_FILENAME:
-                case NODE_HOSTNAME:
-                case NODE_THREAD_COUNT:
-                case NODE_SAMPLE_COUNT:
-                case NODE_IDLE_TIME:
-                case NODE_CONNECT_TIME:
-                // The two fields below are not currently saved or restored
-                case NODE_DELIMITER:
-                case NODE_PRINTMS:
-                    return false;
-                default:
-                    return true;
-            }
+            return switch (fieldName) {
+                case NODE_BYTES, NODE_SENT_BYTES, NODE_URL, NODE_FILENAME,
+                     NODE_HOSTNAME, NODE_THREAD_COUNT, NODE_SAMPLE_COUNT,
+                     NODE_IDLE_TIME, NODE_CONNECT_TIME,
+                     // The two fields below are not currently saved or restored
+                     NODE_DELIMITER, NODE_PRINTMS -> false;
+                default -> true;
+            };
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
index 1be2833df05..0148e2a7327 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
@@ -174,18 +174,18 @@ public static void prepare(TestElement el) {
 
     private static Object unwrapProperty(PropertyDescriptor desc, JMeterProperty jprop, Class<?> type) {
         Object value;
-        if(jprop instanceof TestElementProperty)
+        if(jprop instanceof TestElementProperty testElementProperty)
         {
-            TestElement te = ((TestElementProperty)jprop).getElement();
+            TestElement te = testElementProperty.getElement();
             if(te instanceof TestBean)
             {
                 prepare(te);
             }
             value = te;
         }
-        else if(jprop instanceof MultiProperty)
+        else if(jprop instanceof MultiProperty multiProperty)
         {
-            value = unwrapCollection((MultiProperty)jprop,(String)desc.getValue(TableEditor.CLASSNAME));
+            value = unwrapCollection(multiProperty,(String)desc.getValue(TableEditor.CLASSNAME));
         }
         // value was not provided, and this is allowed
         else if (jprop instanceof NullProperty &&
@@ -200,10 +200,10 @@ else if (jprop instanceof NullProperty &&
 
     private static Object unwrapCollection(MultiProperty prop, String type)
     {
-        if(prop instanceof CollectionProperty)
+        if(prop instanceof CollectionProperty collectionProperty)
         {
             Collection<Object> values = new ArrayList<>();
-            for (JMeterProperty jMeterProperty : prop) {
+            for (JMeterProperty jMeterProperty : collectionProperty) {
                 try {
                     values.add(unwrapProperty(null, jMeterProperty, Class.forName(type)));
                 }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 95c65cc2abd..920cdfbb112 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -236,9 +236,9 @@ public void removeProperty(String key) {
      */
     @Override
     public boolean equals(Object o) {
-        if (o instanceof AbstractTestElement) {
+        if (o instanceof AbstractTestElement other) {
             try (ResourceLock ignored = readLock()) {
-                return ((AbstractTestElement) o).propMap.equals(propMap);
+                return other.propMap.equals(propMap);
             }
         } else {
             return false;
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
index 185c92a3861..8166c4b8271 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
@@ -195,13 +195,12 @@ public boolean getBooleanValue() {
      */
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof JMeterProperty)) {
+        if (!(o instanceof JMeterProperty jpo)) {
             return false;
         }
         if (this == o) {
             return true;
         }
-        JMeterProperty jpo = (JMeterProperty) o;
         if (!name.equals(jpo.getName())) {
             return false;
         }
@@ -275,18 +274,18 @@ protected static JMeterProperty getBlankProperty(Object item) {
         if (item == null) {
             return new NullProperty();
         }
-        if (item instanceof String) {
-            return new StringProperty("", item.toString());
-        } else if (item instanceof Boolean) {
-            return new BooleanProperty("", (Boolean) item);
-        } else if (item instanceof Float) {
-            return new FloatProperty("", (Float) item);
-        } else if (item instanceof Double) {
-            return new DoubleProperty("", (Double) item);
-        } else if (item instanceof Integer) {
-            return new IntegerProperty("", (Integer) item);
-        } else if (item instanceof Long) {
-            return new LongProperty("", (Long) item);
+        if (item instanceof String str) {
+            return new StringProperty("", str);
+        } else if (item instanceof Boolean bool) {
+            return new BooleanProperty("", bool);
+        } else if (item instanceof Float floatVal) {
+            return new FloatProperty("", floatVal);
+        } else if (item instanceof Double doubleVal) {
+            return new DoubleProperty("", doubleVal);
+        } else if (item instanceof Integer intVal) {
+            return new IntegerProperty("", intVal);
+        } else if (item instanceof Long longVal) {
+            return new LongProperty("", longVal);
         } else {
             return new StringProperty("", item.toString());
         }
@@ -341,8 +340,8 @@ protected Map<String, JMeterProperty> normalizeMap(Map<?,?> coll) {
                 Object key = entry.getKey();
                 Object prop = entry.getValue();
                 String item=null;
-                if (key instanceof String) {
-                    item = (String) key;
+                if (key instanceof String keyStr) {
+                    item = keyStr;
                 } else {
                     if (key != null) {
                         log.error("Expected key type String, found: {}", key.getClass());
@@ -378,18 +377,17 @@ public static JMeterProperty createProperty(Object item) {
      * @return the JMeterProperty
      */
     protected static JMeterProperty makeProperty(Object item) {
-        if (item instanceof JMeterProperty) {
-            return (JMeterProperty) item;
+        if (item instanceof JMeterProperty prop) {
+            return prop;
         }
-        if (item instanceof TestElement) {
-            return new TestElementProperty(((TestElement) item).getName(),
-                    (TestElement) item);
+        if (item instanceof TestElement testElement) {
+            return new TestElementProperty(testElement.getName(), testElement);
         }
-        if (item instanceof Collection<?>) {
-            return new CollectionProperty(Integer.toString(item.hashCode()), (Collection<?>) item);
+        if (item instanceof Collection<?> collection) {
+            return new CollectionProperty(Integer.toString(item.hashCode()), collection);
         }
-        if (item instanceof Map<?, ?>) {
-            return new MapProperty(Integer.toString(item.hashCode()), (Map<?, ?>) item);
+        if (item instanceof Map<?, ?> map) {
+            return new MapProperty(Integer.toString(item.hashCode()), map);
         }
         return null;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
index 174e430fa14..09d89c93648 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
@@ -66,27 +66,27 @@ public void remove(String prop) {
     }
 
     public void set(int index, String prop) {
-        if (value instanceof List<?>) {
-            ((List<JMeterProperty>) value).set(index, new StringProperty(prop, prop));
+        if (value instanceof List<JMeterProperty> list) {
+            list.set(index, new StringProperty(prop, prop));
         }
     }
 
     public void set(int index, JMeterProperty prop) {
-        if (value instanceof List<?>) {
-            ((List<JMeterProperty>) value).set(index, prop);
+        if (value instanceof List<JMeterProperty> list) {
+            list.set(index, prop);
         }
     }
 
     public JMeterProperty get(int row) {
-        if (value instanceof List<?>) {
-            return ((List<JMeterProperty>) value).get(row);
+        if (value instanceof List<JMeterProperty> list) {
+            return list.get(row);
         }
         return null;
     }
 
     public void remove(int index) {
-        if (value instanceof List<?>) {
-            ((List<?>) value).remove(index);
+        if (value instanceof List<?> list) {
+            list.remove(index);
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 8b7f13f7900..01a74581881 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -355,8 +355,8 @@ public void run() {
     private void triggerLoopLogicalActionOnParentControllers(Sampler sampler, JMeterContext threadContext,
             Consumer<? super FindTestElementsUpToRootTraverser> consumer) {
         TransactionSampler transactionSampler = null;
-        if (sampler instanceof TransactionSampler) {
-            transactionSampler = (TransactionSampler) sampler;
+        if (sampler instanceof TransactionSampler transSampler) {
+            transactionSampler = transSampler;
         }
 
         Sampler realSampler = findRealSampler(sampler);
@@ -389,11 +389,10 @@ private void triggerLoopLogicalActionOnParentControllers(Sampler sampler, JMeter
     private static void continueOnCurrentLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
         List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
         for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
+            if (parentController instanceof AbstractThreadGroup tg) {
                 tg.startNextLoop();
-            } else if (parentController instanceof IteratingController) {
-                ((IteratingController) parentController).startNextLoop();
+            } else if (parentController instanceof IteratingController iterController) {
+                iterController.startNextLoop();
                 break;
             } else {
                 parentController.triggerEndOfLoop();
@@ -409,11 +408,10 @@ private static void continueOnCurrentLoop(FindTestElementsUpToRootTraverser path
     private static void breakOnCurrentLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
         List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
         for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
+            if (parentController instanceof AbstractThreadGroup tg) {
                 tg.breakThreadLoop();
-            } else if (parentController instanceof IteratingController) {
-                ((IteratingController) parentController).breakLoop();
+            } else if (parentController instanceof IteratingController iterController) {
+                iterController.breakLoop();
                 break;
             } else {
                 parentController.triggerEndOfLoop();
@@ -448,8 +446,8 @@ private static void continueOnThreadLoop(FindTestElementsUpToRootTraverser pathT
      */
     private static Sampler findRealSampler(Sampler sampler) {
         Sampler realSampler = sampler;
-        while (realSampler instanceof TransactionSampler) {
-            realSampler = ((TransactionSampler) realSampler).getSubSampler();
+        while (realSampler instanceof TransactionSampler transSampler) {
+            realSampler = transSampler.getSubSampler();
         }
         return realSampler;
     }
@@ -469,8 +467,8 @@ private SampleResult processSampler(Sampler current, Sampler parent, JMeterConte
         // Find the package for the transaction
         SamplePackage transactionPack = null;
         try {
-            if (current instanceof TransactionSampler) {
-                transactionSampler = (TransactionSampler) current;
+            if (current instanceof TransactionSampler transSampler) {
+                transactionSampler = transSampler;
                 transactionPack = compiler.configureTransactionSampler(transactionSampler);
 
                 // Check if the transaction is done
@@ -641,8 +639,8 @@ private SampleResult doSampling(JMeterContext threadContext, Sampler sampler) {
         currentSamplerForInterruption = sampler;
         if (!sampleMonitors.isEmpty()) {
             for (SampleMonitor sampleMonitor : sampleMonitors) {
-                if(sampleMonitor instanceof TestElement) {
-                    TestBeanHelper.prepare((TestElement) sampleMonitor);
+                if(sampleMonitor instanceof TestElement testElement) {
+                    TestBeanHelper.prepare(testElement);
                 }
                 sampleMonitor.sampleStarting(sampler);
             }
@@ -795,8 +793,7 @@ static class ThreadListenerTraverser implements HashTreeTraverser {
 
         @Override
         public void addNode(Object node, HashTree subTree) {
-            if (node instanceof ThreadListener) {
-                ThreadListener tl = (ThreadListener) node;
+            if (node instanceof ThreadListener tl) {
                 if (isStart) {
                     try {
                         tl.threadStarted();
@@ -902,8 +899,7 @@ private void stopThread() {
     private static void checkAssertions(List<? extends Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
         for (Assertion assertion : assertions) {
             TestBeanHelper.prepare((TestElement) assertion);
-            if (assertion instanceof AbstractScopedAssertion) {
-                AbstractScopedAssertion scopedAssertion = (AbstractScopedAssertion) assertion;
+            if (assertion instanceof AbstractScopedAssertion scopedAssertion) {
                 String scope = scopedAssertion.fetchScope();
                 if (scopedAssertion.isScopeParent(scope)
                         || scopedAssertion.isScopeAll(scope)
@@ -1031,8 +1027,8 @@ void notifyTestListeners() {
         threadVars.incIteration();
         for (TestIterationListener listener : testIterationStartListeners) {
             listener.testIterationStart(new LoopIterationEvent(threadGroupLoopController, threadVars.getIteration()));
-            if (listener instanceof TestElement) {
-                ((TestElement) listener).recoverRunningVersion();
+            if (listener instanceof TestElement testElement) {
+                testElement.recoverRunningVersion();
             }
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index f212dda90a9..626d3ce8581 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -136,11 +136,11 @@ public void subtractNode() {
         }
         TestElement child = stack.getLast();
         trackIterationListeners(stack);
-        if (child instanceof Sampler) {
-            saveSamplerConfigs((Sampler) child);
+        if (child instanceof Sampler sampler) {
+            saveSamplerConfigs(sampler);
         }
-        else if(child instanceof TransactionController) {
-            saveTransactionControllerConfigs((TransactionController) child);
+        else if(child instanceof TransactionController transactionController) {
+            saveTransactionControllerConfigs(transactionController);
         }
         stack.removeLast();
         if (!stack.isEmpty()) {
@@ -148,8 +148,7 @@ else if(child instanceof TransactionController) {
             boolean duplicate = false;
             // Bug 53750: this condition used to be in ObjectPair#addTestElements()
             if (parent instanceof Controller && (child instanceof Sampler || child instanceof Controller)) {
-                if (parent instanceof TestCompilerHelper) {
-                    TestCompilerHelper te = (TestCompilerHelper) parent;
+                if (parent instanceof TestCompilerHelper te) {
                     duplicate = !te.addTestElementOnce(child);
                 } else { // this is only possible for 3rd party controllers by default
                     ObjectPair pair = new ObjectPair(child, parent);
@@ -174,16 +173,16 @@ else if(child instanceof TransactionController) {
     @SuppressWarnings("NonApiType")
     private static void trackIterationListeners(LinkedList<TestElement> pStack) {
         TestElement child = pStack.getLast();
-        if (child instanceof LoopIterationListener) {
+        if (child instanceof LoopIterationListener loopListener) {
             ListIterator<TestElement> iter = pStack.listIterator(pStack.size());
             while (iter.hasPrevious()) {
                 TestElement item = iter.previous();
                 if (item == child) {
                     continue;
                 }
-                if (item instanceof Controller) {
+                if (item instanceof Controller controller) {
                     TestBeanHelper.prepare(child);
-                    ((Controller) item).addIterationListener((LoopIterationListener) child);
+                    controller.addIterationListener(loopListener);
                     break;
                 }
             }
@@ -209,23 +208,23 @@ private void saveSamplerConfigs(Sampler sam) {
             List<PostProcessor> tempPost = new ArrayList<>();
             List<Assertion> tempAssertions = new ArrayList<>();
             for (Object item : testTree.list(stack.subList(0, i))) {
-                if (item instanceof ConfigTestElement) {
-                    configs.add((ConfigTestElement) item);
+                if (item instanceof ConfigTestElement configElement) {
+                    configs.add(configElement);
                 }
-                if (item instanceof SampleListener) {
-                    listeners.add((SampleListener) item);
+                if (item instanceof SampleListener listener) {
+                    listeners.add(listener);
                 }
-                if (item instanceof Timer) {
-                    timers.add((Timer) item);
+                if (item instanceof Timer timer) {
+                    timers.add(timer);
                 }
-                if (item instanceof Assertion) {
-                    tempAssertions.add((Assertion) item);
+                if (item instanceof Assertion assertion) {
+                    tempAssertions.add(assertion);
                 }
-                if (item instanceof PostProcessor) {
-                    tempPost.add((PostProcessor) item);
+                if (item instanceof PostProcessor postProcessor) {
+                    tempPost.add(postProcessor);
                 }
-                if (item instanceof PreProcessor) {
-                    tempPre.add((PreProcessor) item);
+                if (item instanceof PreProcessor preProcessor) {
+                    tempPre.add(preProcessor);
                 }
             }
             assertions.addAll(0, tempAssertions);
@@ -251,11 +250,11 @@ private void saveTransactionControllerConfigs(TransactionController tc) {
         for (int i = stack.size(); i > 0; i--) {
             addDirectParentControllers(controllers, stack.get(i - 1));
             for (Object item : testTree.list(stack.subList(0, i))) {
-                if (item instanceof SampleListener) {
-                    listeners.add((SampleListener) item);
+                if (item instanceof SampleListener listener) {
+                    listeners.add(listener);
                 }
-                if (item instanceof Assertion) {
-                    assertions.add((Assertion) item);
+                if (item instanceof Assertion assertion) {
+                    assertions.add(assertion);
                 }
             }
         }
@@ -272,9 +271,9 @@ private void saveTransactionControllerConfigs(TransactionController tc) {
      * @param maybeController
      */
     private static void addDirectParentControllers(List<? super Controller> controllers, TestElement maybeController) {
-        if (maybeController instanceof Controller) {
+        if (maybeController instanceof Controller controller) {
             log.debug("adding controller: {} to sampler config", maybeController);
-            controllers.add((Controller) maybeController);
+            controllers.add(controller);
         }
     }
 
@@ -297,8 +296,8 @@ public int hashCode() {
         /** {@inheritDoc} */
         @Override
         public boolean equals(Object o) {
-            if (o instanceof ObjectPair) {
-                return child == ((ObjectPair) o).child && parent == ((ObjectPair) o).parent;
+            if (o instanceof ObjectPair other) {
+                return child == other.child && parent == other.parent;
             }
             return false;
         }
@@ -309,8 +308,8 @@ private static void configureWithConfigElements(Sampler sam, List<? extends Conf
         for (ConfigTestElement config  : configs) {
             if (!(config instanceof NoConfigMerge))
             {
-                if(sam instanceof ConfigMergabilityIndicator) {
-                    if(((ConfigMergabilityIndicator)sam).applies(config)) {
+                if(sam instanceof ConfigMergabilityIndicator indicator) {
+                    if(indicator.applies(config)) {
                         sam.addTestElement(config);
                     }
                 } else {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index 38e15271a2d..faf5c841b07 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -80,25 +80,18 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
     }
 
     protected String changeCase(String originalString, String mode) {
-        String targetString = originalString;
         // mode is case insensitive, allow upper for example
         ChangeCaseMode changeCaseMode = ChangeCaseMode.typeOf(mode.toUpperCase(Locale.ROOT));
-        if (changeCaseMode != null) {
-            switch (changeCaseMode) {
-            case UPPER:
-                targetString = StringUtils.upperCase(originalString);
-                break;
-            case LOWER:
-                targetString = StringUtils.lowerCase(originalString);
-                break;
-            case CAPITALIZE:
-                targetString = StringUtils.capitalize(originalString);
-                break;
-            }
-        } else {
-            LOGGER.error("Unknown mode {}, returning {} unchanged", mode, targetString);
+        if (changeCaseMode == null) {
+            LOGGER.error("Unknown mode {}, returning {} unchanged", mode, originalString);
+            return originalString;
         }
-        return targetString;
+        
+        return switch (changeCaseMode) {
+            case UPPER -> StringUtils.upperCase(originalString);
+            case LOWER -> StringUtils.lowerCase(originalString);
+            case CAPITALIZE -> StringUtils.capitalize(originalString);
+        };
     }
 
     @Override
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
index 482c7ed6e6d..30c4164b08b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java
@@ -57,9 +57,9 @@ public CharFunction() {
     public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
-        StringBuilder sb = new StringBuilder(values.length);
+        var sb = new StringBuilder(values.length);
         for (Object val : values) {
-            String numberString = ((CompoundVariable) val).execute().trim();
+            var numberString = ((CompoundVariable) val).execute().trim();
             try {
                 long value = Long.decode(numberString);
                 char ch = (char) value;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
index a40d6d668dd..754ed78fd9c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
@@ -164,21 +164,11 @@ static synchronized void logDetails(Logger logger, String stringToLog, String pr
             final String separator = comment.isEmpty() ? DEFAULT_SEPARATOR : comment;
 
             switch (prioLevel) {
-                case ERROR:
-                    logger.error("{} {} {}", threadName, separator, stringToLog, throwable);
-                    break;
-                case WARN:
-                    logger.warn("{} {} {}", threadName, separator, stringToLog, throwable);
-                    break;
-                case INFO:
-                    logger.info("{} {} {}", threadName, separator, stringToLog, throwable);
-                    break;
-                case DEBUG:
-                    logger.debug("{} {} {}", threadName, separator, stringToLog, throwable);
-                    break;
-                case TRACE:
-                    logger.trace("{} {} {}", threadName, separator, stringToLog, throwable);
-                    break;
+                case ERROR -> logger.error("{} {} {}", threadName, separator, stringToLog, throwable);
+                case WARN -> logger.warn("{} {} {}", threadName, separator, stringToLog, throwable);
+                case INFO -> logger.info("{} {} {}", threadName, separator, stringToLog, throwable);
+                case DEBUG -> logger.debug("{} {} {}", threadName, separator, stringToLog, throwable);
+                case TRACE -> logger.trace("{} {} {}", threadName, separator, stringToLog, throwable);
             }
         }
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index 8ea9e820194..ffcfcc30de0 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -182,8 +182,8 @@ private String getResultWithJavaRegex(String valueIndex, String defaultValue, St
         }
 
         if (valueIndex.equals(ALL)) {
-            StringBuilder value = new StringBuilder();
-            Iterator<java.util.regex.MatchResult> it = collectAllMatches.iterator();
+            var value = new StringBuilder();
+            var it = collectAllMatches.iterator();
             boolean first = true;
             while (it.hasNext()) {
                 if (!first) {
@@ -195,7 +195,7 @@ private String getResultWithJavaRegex(String valueIndex, String defaultValue, St
             }
             return value.toString();
         } else if (valueIndex.equals(RAND)) {
-            java.util.regex.MatchResult result = collectAllMatches.get(
+            var result = collectAllMatches.get(
                     ThreadLocalRandom.current().nextInt(collectAllMatches.size()));
             return generateResult(result, name, tmplt, vars);
         } else {
@@ -313,7 +313,7 @@ public List<String> getArgumentDesc() {
 
     private static String generateResult(MatchResult match, String namep, Object[] template, JMeterVariables vars) {
         saveGroups(match, namep, vars);
-        StringBuilder result = new StringBuilder();
+        var result = new StringBuilder();
         for (Object t : template) {
             if (t instanceof String) {
                 result.append(t);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
index 5e7081e1b01..8e4c5500414 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
@@ -296,7 +296,7 @@ public synchronized void setParameters(Collection<CompoundVariable> parameters)
         checkParameterCount(parameters, MIN_PARAM_COUNT, MAX_PARAM_COUNT);
         values = parameters.toArray();
 
-        StringBuilder sb = new StringBuilder(40);
+        var sb = new StringBuilder(40);
         sb.append("setParameters(");//$NON-NLS-1$
         for (int i = 0; i < values.length; i++) {
             if (i > 0) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
index 1dd9bda9cea..37091f0d5b8 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -95,8 +95,10 @@ public HashTree(Object key) {
      */
     private HashTree(Map<Object, ? extends HashTree> _map, Object key) {
         if(_map != null) {
-            if (_map instanceof IdentityHashMap) {
-                data = (IdentityHashMap<Object, HashTree>) _map;
+            if (_map instanceof IdentityHashMap<?, ?> identityMapRaw) {
+                @SuppressWarnings("unchecked")
+                IdentityHashMap<Object, HashTree> identityMap = (IdentityHashMap<Object, HashTree>) identityMapRaw;
+                data = identityMap;
             } else {
                 // Technically speaking, TestElements can't be placed in HashMapk keys,
                 // so we have to convert the map to an IdentityHashMap.
@@ -122,8 +124,8 @@ private HashTree(Map<Object, ? extends HashTree> _map, Object key) {
      */
     @Override
     public void putAll(Map<?, ? extends HashTree> map) {
-        if (map instanceof HashTree) {
-            this.add((HashTree) map);
+        if (map instanceof HashTree hashTree) {
+            this.add(hashTree);
         } else {
             throw new UnsupportedOperationException("can only putAll other HashTree objects");
         }
@@ -916,7 +918,7 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         }
-        if (!(o instanceof HashTree)) {
+        if (!(o instanceof HashTree hashTree)) {
             return false;
         }
         HashTree oo = (HashTree) o;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
index cf24b5d141e..60bc7f647fb 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
@@ -90,8 +90,8 @@ public static Object convert(Object value, Class<?> toType) {
      */
     public static Calendar getCalendar(Object date, Calendar defaultValue) {
         Calendar cal = new GregorianCalendar();
-        if (date instanceof java.util.Date) {
-            cal.setTime((java.util.Date) date);
+        if (date instanceof java.util.Date dateValue) {
+            cal.setTime(dateValue);
             return cal;
         } else if (date != null) {
             Optional<Date> d = tryToParseDate(date);
@@ -145,8 +145,8 @@ public static Date getDate(Object date) {
      *         <code>defaultValue</code> if conversion failed
      */
     public static Date getDate(Object date, Date defaultValue) {
-        if (date instanceof java.util.Date) {
-            return (Date) date;
+        if (date instanceof java.util.Date dateValue) {
+            return dateValue;
         } else if (date != null) {
             return tryToParseDate(date).orElse(defaultValue);
         } else {
@@ -182,8 +182,8 @@ public static float getFloat(Object o, float defaultValue) {
         if (o == null) {
             return defaultValue;
         }
-        if (o instanceof Number) {
-            return ((Number) o).floatValue();
+        if (o instanceof Number number) {
+            return number.floatValue();
         }
         try {
             return Float.parseFloat(o.toString());
@@ -221,8 +221,8 @@ public static double getDouble(Object o, double defaultValue) {
             if (o == null) {
                 return defaultValue;
             }
-            if (o instanceof Number) {
-                return ((Number) o).doubleValue();
+            if (o instanceof Number number) {
+                return number.doubleValue();
             }
             return Double.parseDouble(o.toString());
         } catch (NumberFormatException e) {
@@ -270,8 +270,8 @@ public static boolean getBoolean(Object o) {
     public static boolean getBoolean(Object o, boolean defaultValue) {
         if (o == null) {
             return defaultValue;
-        } else if (o instanceof Boolean) {
-            return (Boolean) o;
+        } else if (o instanceof Boolean boolValue) {
+            return boolValue;
         }
         return Boolean.parseBoolean(o.toString());
     }
@@ -291,8 +291,8 @@ public static int getInt(Object o, int defaultValue) {
             if (o == null) {
                 return defaultValue;
             }
-            if (o instanceof Number) {
-                return ((Number) o).intValue();
+            if (o instanceof Number number) {
+                return number.intValue();
             }
             return Integer.parseInt(o.toString());
         } catch (NumberFormatException e) {
@@ -327,12 +327,12 @@ public static char getChar(Object o, char defaultValue) {
             if (o == null) {
                 return defaultValue;
             }
-            if (o instanceof Character) {
-                return (Character) o;
-            } else if (o instanceof Byte) {
-                return (char) ((Byte) o).byteValue();
-            } else if (o instanceof Integer) {
-                return (char) ((Integer) o).intValue();
+            if (o instanceof Character charValue) {
+                return charValue;
+            } else if (o instanceof Byte byteValue) {
+                return (char) byteValue.byteValue();
+            } else if (o instanceof Integer intValue) {
+                return (char) intValue.intValue();
             } else {
                 String s = o.toString();
                 if (s.length() > 0) {
@@ -373,8 +373,8 @@ public static long getLong(Object o, long defaultValue) {
             if (o == null) {
                 return defaultValue;
             }
-            if (o instanceof Number) {
-                return ((Number) o).longValue();
+            if (o instanceof Number number) {
+                return number.longValue();
             }
             return Long.parseLong(o.toString());
         } catch (NumberFormatException e) {
@@ -546,11 +546,11 @@ public static String getString(Object o) {
      *             when object can not be converted
      */
     public static File getFile(Object o){
-        if (o instanceof File) {
-            return (File) o;
+        if (o instanceof File file) {
+            return file;
         }
-        if (o instanceof String) {
-            return new File((String) o);
+        if (o instanceof String str) {
+            return new File(str);
         }
         throw new IllegalArgumentException("Expected String or file, actual "+o.getClass().getName());
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index 0a6a42bd12a..aed697b28b7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -211,8 +211,8 @@ private static Pair<String, String> getVaryHeader(String headerName, Header[] re
         if (headerName == null) {
             return null;
         }
-        final Set<String> names = new HashSet<>(Arrays.asList(headerName.split(",\\s*")));
-        final Map<String, List<String>> values = new HashMap<>();
+        final var names = new HashSet<>(Arrays.asList(headerName.split(",\\s*")));
+        final var values = new HashMap<String, List<String>>();
         for (final String name: names) {
             values.put(name, new ArrayList<>());
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 224ea30794a..1b5c6f3eebd 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -287,19 +287,12 @@ public int getLimitRate() {
         public void setLimitRate(String limitRate) {
             String unit = limitRate.substring(limitRate.length() - 1, limitRate.length()).toLowerCase(Locale.ROOT);
             int value = Integer.parseInt(limitRate.substring(0, limitRate.length() - 1).toLowerCase(Locale.ROOT));
-            switch (unit) {
-            case "k":
-                this.limitRate = value * ONE_KILOBYTE_IN_CPS;
-                break;
-            case "m":
-                this.limitRate = value * ONE_KILOBYTE_IN_CPS * 1000;
-                break;
-            case "g":
-                this.limitRate = value * ONE_KILOBYTE_IN_CPS * 1000000;
-                break;
-            default:
-                break;
-            }
+            this.limitRate = switch (unit) {
+                case "k" -> value * ONE_KILOBYTE_IN_CPS;
+                case "m" -> value * ONE_KILOBYTE_IN_CPS * 1000;
+                case "g" -> value * ONE_KILOBYTE_IN_CPS * 1000000;
+                default -> this.limitRate; // Keep current value if unit is not recognized
+            };
         }
 
         /**
@@ -640,8 +633,9 @@ public String toString() {
             "Tells curl to use HTTP negotiate authentication when communicating with the given proxy. ");
     private static final CLOptionDescriptor D_KEEPALIVETILE_OPT = new CLOptionDescriptor("keepalive-time",
             CLOptionDescriptor.ARGUMENT_REQUIRED, KEEPALIVETILE_OPT,
-            " This option sets the  time  a  connection  needs  to  remain  idle  before  sending"
-                    + " keepalive  probes and the time between individual keepalive probes..");
+            """
+                    This option sets the time a connection needs to remain idle before sending \
+                    keepalive probes and the time between individual keepalive probes..""");
     private static final CLOptionDescriptor D_MAX_TIME_OPT = new CLOptionDescriptor("max-time",
             CLOptionDescriptor.ARGUMENT_REQUIRED, MAX_TIME_OPT,
             "Maximum time in seconds that you allow the whole operation to take. ");
@@ -652,8 +646,9 @@ public String toString() {
             "Create the necessary local directory hierarchy as needed for output file");
     private static final CLOptionDescriptor D_RAW_OPT = new CLOptionDescriptor("raw",
             CLOptionDescriptor.ARGUMENT_DISALLOWED, RAW_OPT,
-            "When used, it disables all internal HTTP decoding of content or transfer encodings "
-                    + "and instead makes them passed on unaltered raw. ");
+            """
+                    When used, it disables all internal HTTP decoding of content or transfer \
+                    encodings and instead makes them passed on unaltered raw.""");
     private static final CLOptionDescriptor D_INTERFACE_OPT = new CLOptionDescriptor("interface",
             CLOptionDescriptor.ARGUMENT_REQUIRED, INTERFACE_OPT, "Perform an operation using a specified interface");
     private static final CLOptionDescriptor D_DNS_RESOLVER_OPT = new CLOptionDescriptor("resolve",
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index add440fe693..6d885a5abf7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -119,20 +119,12 @@ public static String percentEncode(String value) {
         StringBuilder sb = new StringBuilder(value.length() + 2);
         for (int i = 0; i < value.length(); i++) {
             char c = value.charAt(i);
-            switch (c) {
-                case '"':
-                    sb.append("%22");
-                    break;
-                case 0x0A:
-                    sb.append("%0A");
-                    break;
-                case 0x0D:
-                    sb.append("%0D");
-                    break;
-                default:
-                    sb.append(c);
-                    break;
-            }
+            sb.append(switch (c) {
+                case '"' -> "%22";
+                case 0x0A -> "%0A";
+                case 0x0D -> "%0D";
+                default -> String.valueOf(c);
+            });
         }
         return sb.toString();
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index b71257e39fe..06c95cf8bf8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -286,10 +286,10 @@ private static boolean isMultipart(Map<String, String> headers) {
     //TODO: move to utils class (JMeterUtils?)
     public static Map<String, String[]> getQueryMap(String query) {
 
-        Map<String, String[]> map = new HashMap<>();
-        String[] params = query.split(PARAM_CONCATENATE);
+        var map = new HashMap<String, String[]>();
+        var params = query.split(PARAM_CONCATENATE);
         for (String param : params) {
-            String[] paramSplit = param.split("=");
+            var paramSplit = param.split("=");
             if (paramSplit.length == 0) {
                 continue; // We found no key-/value-pair, so continue on the next param
             }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index 3c5a6852b70..d538a73e99c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -76,12 +76,13 @@ public void testRepeatedArguments() throws Exception {
         // A HTTP POST request
         contentEncoding = "UTF-8";
         String postBody = "update=yes&d=1&d=2&d=&d=&d=&d=&d=&d=1&d=2&d=1&d=&d=";
-        String testPostRequest = "POST " + url + " HTTP/1.0\n"
-                + "Content-type: "
-                + HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED + "\r\n"
-                + "Content-length: " + getBodyLength(postBody, contentEncoding) + "\r\n"
-                + "\r\n"
-                + postBody;
+        String testPostRequest = """
+                POST %s HTTP/1.0
+                Content-type: %s\r
+                Content-length: %d\r
+                \r
+                %s""".formatted(url, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED, 
+                              getBodyLength(postBody, contentEncoding), postBody);
         s = getSamplerForRequest(url, testPostRequest, contentEncoding);
         assertEquals(HTTPConstants.POST, s.getMethod());
         assertFalse(s.getDoMultipart());
@@ -147,35 +148,37 @@ public void testRepeatedArguments() throws Exception {
         // The encoding should be picked up from the header we send with the request
         contentEncoding = "UTF-8";
         url =  "http://vmdal-hqqa9/retalixhq/GG_Implementation/ScreenEntity/ScreenEntityHTTP.aspx?Action=Save&ET=Vendor&TT=Single&Sid=1347280336092";
-        postBody = "<Action UIStatus=\"2\"><Vendor Id=\"9292\" HOST_ID=\"0\" VENDOR=\"9292\" TERMS_TYPE=\"No Terms\" TERMS=\"0 %\""
-                + " AUTO_PRICE=\"Use System Default\" VM_VENDOR_TYPE=\"DSD Vendor\" ITEM_FORMAT=\"PLU\" COST_ENTRY_SORT=\"UPC/EAN\""
-                + " VM_REPORT_SORT=\"UPC/EAN\" VM_ORDER_SORT=\"UPC/EAN\" VM_RECEIVING_SORT=\"UPC/EAN\" VM_MAX_BACK_ORDERS=\"99\""
-                + " MAX_OPEN_DAYS=\"99\" PAY_BASED_ON=\"System Cost\" ORDER_COST_DATE=\"Use System Rule\" VM_CONSIDER_FREE=\"False\""
-                + " VM_SHOW_DETAIL=\"False\" VM_UPDATE_COST=\"No\" RD_USE_VENDOR_CC=\"False\" BLIND_RECEIVING=\"Default\""
-                + " EXCLUDE_RECEIVED_COST=\"False\" PRINT_ITEM_ADJ=\"False\" PRINT_OVERALL_ADJ=\"False\" PRINT_TAX_DETAIL=\"False\""
-                + " BLOCK_PRICE_VIEW=\"False\" DELIVERY_STATUS=\"No Delivery\" AUTO_RECEIVE=\"False\" TARGET_GM_FLAG=\"%\""
-                + " MINIMUM_GM_FLAG=\"%\" MARGIN_TYPE=\"Gross Margin\" HOLD_REGULAR=\"Default\" HOLD_SPECIALS=\"Default\""
-                + " TRUSTING_VENDOR=\"False\" AUTO_ACCEPT=\"All\" EARLY_RCPT_AFFECTS=\"All Costs\" SBT_ELIGIBLE=\"Not eligible\""
-                + " SBT_REPORTING_DAY=\"Monday\" AUTO_BALANCE_FLAG=\"$\" DAX_MANAGED=\"False\" CHANGE_ID=\"QA\" CHANGE_SOURCE=\"Manual Change\""
-                + " ORIGINAL_SOURCE=\"Manual Change\" RECORD_STATUS=\"Add\" RECORD_STATUS_DATE=\"9/7/2012 8:34:58 AM\" VENDOR_NAME=\"test\""
-                + " UIStatus=\"2\"/></Action>";
-        testPostRequest = "POST " + url + " HTTP/1.1\r\n"
-                + "x-requested-with: XMLHttpRequest" + "\r\n"
-                + "Accept-Language: en-us" + "\r\n"
-                + "Referer: http://vmdal-hqqa9/retalixhq/GG_Implementation/ScreenEntity/ScreenEntityPage.aspx?ET=Vendor&TT=Single&"
-                + "WM=2&UID=9292&Sid=1347280331908&UITH=Blue&MUID=window_0" + "\r\n"
-                + "Accept: */*" + "\r\n"
-                + "Content-Type: application/x-www-form-urlencoded" + "\r\n"
-                + "Accept-Encoding: gzip, deflate" + "\r\n"
-                + "User-Agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729;"
-                + " .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; Tablet PC 2.0)" + "\r\n"
-                + "Host: vmdal-hqqa9" + "\r\n"
-                + "Content-Length: "+ getBodyLength(postBody, contentEncoding) + "\r\n"
-                + "Proxy-Connection: Keep-Alive" + "\r\n"
-                + "Pragma: no-cache" + "\r\n"
-                + "Cookie: RHQ=sid=5aaeb66c-e174-4f4c-9928-83cffcc62150" + "\r\n"
-                + "\r\n"
-                + postBody;
+        postBody = """
+                <Action UIStatus="2">
+                    <Vendor Id="9292" HOST_ID="0" VENDOR="9292" TERMS_TYPE="No Terms" TERMS="0 %"\
+                     AUTO_PRICE="Use System Default" VM_VENDOR_TYPE="DSD Vendor" ITEM_FORMAT="PLU" COST_ENTRY_SORT="UPC/EAN"\
+                     VM_REPORT_SORT="UPC/EAN" VM_ORDER_SORT="UPC/EAN" VM_RECEIVING_SORT="UPC/EAN" VM_MAX_BACK_ORDERS="99"\
+                     MAX_OPEN_DAYS="99" PAY_BASED_ON="System Cost" ORDER_COST_DATE="Use System Rule" VM_CONSIDER_FREE="False"\
+                     VM_SHOW_DETAIL="False" VM_UPDATE_COST="No" RD_USE_VENDOR_CC="False" BLIND_RECEIVING="Default"\
+                     EXCLUDE_RECEIVED_COST="False" PRINT_ITEM_ADJ="False" PRINT_OVERALL_ADJ="False" PRINT_TAX_DETAIL="False"\
+                     BLOCK_PRICE_VIEW="False" DELIVERY_STATUS="No Delivery" AUTO_RECEIVE="False" TARGET_GM_FLAG="%"\
+                     MINIMUM_GM_FLAG="%" MARGIN_TYPE="Gross Margin" HOLD_REGULAR="Default" HOLD_SPECIALS="Default"\
+                     TRUSTING_VENDOR="False" AUTO_ACCEPT="All" EARLY_RCPT_AFFECTS="All Costs" SBT_ELIGIBLE="Not eligible"\
+                     SBT_REPORTING_DAY="Monday" AUTO_BALANCE_FLAG="$" DAX_MANAGED="False" CHANGE_ID="QA" CHANGE_SOURCE="Manual Change"\
+                     ORIGINAL_SOURCE="Manual Change" RECORD_STATUS="Add" RECORD_STATUS_DATE="9/7/2012 8:34:58 AM" VENDOR_NAME="test"\
+                     UIStatus="2"/>
+                </Action>""";
+        testPostRequest = """
+                POST %s HTTP/1.1\r
+                x-requested-with: XMLHttpRequest\r
+                Accept-Language: en-us\r
+                Referer: http://vmdal-hqqa9/retalixhq/GG_Implementation/ScreenEntity/ScreenEntityPage.aspx?ET=Vendor&TT=Single&WM=2&UID=9292&Sid=1347280331908&UITH=Blue&MUID=window_0\r
+                Accept: */*\r
+                Content-Type: application/x-www-form-urlencoded\r
+                Accept-Encoding: gzip, deflate\r
+                User-Agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; Tablet PC 2.0)\r
+                Host: vmdal-hqqa9\r
+                Content-Length: %d\r
+                Proxy-Connection: Keep-Alive\r
+                Pragma: no-cache\r
+                Cookie: RHQ=sid=5aaeb66c-e174-4f4c-9928-83cffcc62150\r
+                \r
+                %s""".formatted(url, getBodyLength(postBody, contentEncoding), postBody);
         // Use null for url to simulate that HttpRequestHdr do not
         // know the encoding for the page. Specify contentEncoding, so the
         // request is "sent" using that encoding
@@ -594,27 +597,34 @@ public void testPostMultipartFileUpload() throws Exception {
     private String createMultipartFormBody(String titleValue, String descriptionValue,
             String contentEncoding, boolean includeExtraHeaders,
             String boundary, String endOfLine) {
-        // Title multipart
-        String postBody = "--" + boundary + endOfLine
-            + "Content-Disposition: form-data; name=\"title\"" + endOfLine;
-        if(includeExtraHeaders) {
-            postBody += "Content-Type: text/plain; charset=" + contentEncoding + endOfLine
-            + "Content-Transfer-Encoding: 8bit" + endOfLine;
-        }
-        postBody += endOfLine
-            + titleValue + endOfLine
-            + "--" + boundary + endOfLine;
-        // Description multipart
-        postBody += "Content-Disposition: form-data; name=\"description\"" + endOfLine;
-        if(includeExtraHeaders) {
-            postBody += "Content-Type: text/plain; charset=" + contentEncoding + endOfLine
-                + "Content-Transfer-Encoding: 8bit" + endOfLine;
-        }
-        postBody += endOfLine
-            + descriptionValue + endOfLine
-            + "--" + boundary + "--" + endOfLine;
-
-        return postBody;
+        
+        String titleHeaders = includeExtraHeaders ? """
+                Content-Type: text/plain; charset=%s%s\
+                Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
+        
+        String descriptionHeaders = includeExtraHeaders ? """
+                Content-Type: text/plain; charset=%s%s\
+                Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
+        
+        return """
+                --%s%s\
+                Content-Disposition: form-data; name="title"%s\
+                %s%s\
+                %s%s\
+                --%s%s\
+                Content-Disposition: form-data; name="description"%s\
+                %s%s\
+                %s%s\
+                --%s--%s""".formatted(
+                    boundary, endOfLine,
+                    endOfLine,
+                    titleHeaders, endOfLine,
+                    titleValue, endOfLine,
+                    boundary, endOfLine,
+                    endOfLine,
+                    descriptionHeaders, endOfLine,
+                    descriptionValue, endOfLine,
+                    boundary, endOfLine);
     }
 
     private String createMultipartFileUploadBody(String fileField, String fileName,
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
index 5ad929b5c13..f15972b7616 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
@@ -45,23 +45,25 @@ class TestGraphQLRequestParamUtils {
 
     private static final String OPERATION_NAME = "";
 
-    private static final String QUERY =
-            "query($id: ID!) {\n"
-            + "  droid(id: $id) {\n"
-            + "    id\n"
-            + "    name\n"
-            + "    friends {\n"
-            + "      id\n"
-            + "      name\n"
-            + "      appearsIn\n"
-            + "    }\n"
-            + "  }\n"
-            + "}\n";
-
-    private static final String VARIABLES =
-            "{\n"
-            + "  \"id\": \"2001\"\n"
-            + "}\n";
+    private static final String QUERY = """
+            query($id: ID!) {
+              droid(id: $id) {
+                id
+                name
+                friends {
+                  id
+                  name
+                  appearsIn
+                }
+              }
+            }
+            """;
+
+    private static final String VARIABLES = """
+            {
+              "id": "2001"
+            }
+            """;
 
     private static final String EXPECTED_QUERY_GET_PARAM_VALUE =
             "query($id: ID!) { droid(id: $id) { id name friends { id name appearsIn } } }";
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index ed6a7cfc73c..2d5ae2e9adc 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -164,8 +164,7 @@ public Object clone() {
     public static String getConnectionInfo(String poolName) throws SQLException{
         Object poolObject =
                 JMeterContextService.getContext().getVariables().getObject(poolName);
-        if (poolObject instanceof DataSourceComponentImpl) {
-            DataSourceComponentImpl pool = (DataSourceComponentImpl) poolObject;
+        if (poolObject instanceof DataSourceComponentImpl pool) {
             return pool.getConnectionInfo();
         } else {
             return "Object:" + poolName + " is not of expected type '" + DataSourceComponentImpl.class.getName() + "'";
@@ -194,8 +193,7 @@ public static Connection getConnection(String poolName) throws SQLException{
         if (poolObject == null) {
             throw new SQLException("No pool found named: '" + poolName + "', ensure Variable Name matches Variable Name of JDBC Connection Configuration");
         } else {
-            if(poolObject instanceof DataSourceComponentImpl) {
-                DataSourceComponentImpl pool = (DataSourceComponentImpl) poolObject;
+            if(poolObject instanceof DataSourceComponentImpl pool) {
                 return pool.getConnection();
             } else {
                 String errorMsg = "Found object stored under variable:'" + poolName + "' with class:"
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index 1ea1d922869..aac95f997b3 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -307,8 +307,8 @@ private void handleRequestResponse(SampleResult res) throws JMSException {
         if (replyMsg == null) {
             res.setResponseMessage("No reply message received");
         } else {
-            if (replyMsg instanceof TextMessage) {
-                res.setResponseData(((TextMessage) replyMsg).getText(), null);
+            if (replyMsg instanceof TextMessage textMessage) {
+                res.setResponseData(textMessage.getText(), null);
             } else {
                 res.setResponseData(replyMsg.toString(), null);
             }
@@ -355,20 +355,17 @@ private String browseQueueForConsumption(Queue queue,
     private static void extractContent(StringBuilder buffer, StringBuilder propBuffer, Message msg) {
         if (msg != null) {
             try {
-                if (msg instanceof TextMessage) {
-                    buffer.append(((TextMessage) msg).getText());
-                } else if (msg instanceof ObjectMessage) {
-                    ObjectMessage objectMessage = (ObjectMessage) msg;
+                if (msg instanceof TextMessage textMessage) {
+                    buffer.append(textMessage.getText());
+                } else if (msg instanceof ObjectMessage objectMessage) {
                     if (objectMessage.getObject() != null) {
                         buffer.append(objectMessage.getObject().getClass());
                     } else {
                         buffer.append("object is null");
                     }
-                } else if (msg instanceof BytesMessage) {
-                    BytesMessage bytesMessage = (BytesMessage) msg;
+                } else if (msg instanceof BytesMessage bytesMessage) {
                     buffer.append(bytesMessage.getBodyLength() + " bytes received in BytesMessage");
-                } else if (msg instanceof MapMessage) {
-                    MapMessage mapm = (MapMessage) msg;
+                } else if (msg instanceof MapMessage mapm) {
                     @SuppressWarnings("unchecked") // MapNames are Strings
                     Enumeration<String> enumb = mapm.getMapNames();
                     while (enumb.hasMoreElements()) {
@@ -484,8 +481,8 @@ public JMSProperties getJMSProperties() {
         Object o = getProperty(JMS_PROPERTIES).getObjectValue();
         JMSProperties jmsProperties = null;
         // Backward compatibility with versions <= 2.10
-        if (o instanceof Arguments) {
-            jmsProperties = Utils.convertArgumentsToJmsProperties((Arguments) o);
+        if (o instanceof Arguments arguments) {
+            jmsProperties = Utils.convertArgumentsToJmsProperties(arguments);
         } else {
             jmsProperties = (JMSProperties) o;
         }

From e456dee08f43beee54dedabcd5515ef0c2e80b1a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 18 Jul 2025 10:24:52 +0000
Subject: [PATCH 0809/1037] chore(deps): update
 gradle/wrapper-validation-action action to v3

---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b63fdf355cd..b1889d479d8 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v3

From 2b09e2e74b34face75e6594538ebdd6b15323a77 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 18 Jul 2025 10:24:49 +0000
Subject: [PATCH 0810/1037] chore(deps): update burrunan/gradle-cache-action
 action to v3

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b60b0be35f5..92a22d3157d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,7 +67,7 @@ jobs:
         script: |
           console.log('The following command might help reproducing CI results, use Java ${{ matrix.java_version }}')
           console.log('TZ="${{ matrix.tz }}" _JAVA_OPTIONS="${{ matrix.extraJvmArgs }}" ./gradlew build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512 ${{ matrix.extraGradleArgs }} -PtestExtraJvmArgs="${{ matrix.testExtraJvmArgs }}" -PtestDisableCaching="${{ matrix.testDisableCaching }}"')
-    - uses: burrunan/gradle-cache-action@v1
+    - uses: burrunan/gradle-cache-action@v3
       name: Test
       with:
         job-id: jdk${{ matrix.java_version }}
@@ -96,7 +96,7 @@ jobs:
       with:
         java-version: 17
         distribution: 'zulu'
-    - uses: burrunan/gradle-cache-action@v1
+    - uses: burrunan/gradle-cache-action@v3
       name: Test
       with:
         job-id: errprone

From 4bed942058fbf7fa472a40703ccd8d850db3d43f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 17 Jul 2025 18:20:42 +0300
Subject: [PATCH 0811/1037] fix: replace checksum-dependency-plugin with Gradle
 dependency verification

---
 .ratignore                                    |    6 +-
 build-logic/checksum.xml                      |  134 -
 build-logic/gradle.properties                 |    3 -
 .../00/8118b3bcdb1a5000.fingerprints          |    1 -
 .../04/ea8543c570faf804.fingerprints          |    1 -
 .../06/3a1959eef8726006.fingerprints          |    1 -
 ...e38bc93d90b852d88465dd3a1959eef8726006.asc |   26 -
 .../07/402123d2f5f4af07.fingerprints          |    1 -
 ...441e504a937f43eb0daef96a65176a0fb1cd0b.asc |   27 -
 .../0b/6a65176a0fb1cd0b.fingerprints          |    1 -
 .../0c/0ae7bbd7fee66e0c.fingerprints          |    1 -
 .../0e/105cb91cac2aee0e.fingerprints          |    1 -
 .../0f/7a01b0f236e5430f.fingerprints          |    1 -
 ...cc4c7594d09e2182c60e0f7a01b0f236e5430f.asc |   16 -
 .../0f/aff3e378166b1f0f.fingerprints          |    1 -
 ...ed3b4843daacc79de555557457ca33c3ce9e15.asc |   16 -
 .../15/7457ca33c3ce9e15.fingerprints          |    1 -
 ...d52b5a8295137c88fb5748dddafa7674e54418.asc |   16 -
 .../18/dddafa7674e54418.fingerprints          |    1 -
 .../1a/1db198f93525ec1a.fingerprints          |    1 -
 ...9f1ee92b19609de816fde81db198f93525ec1a.asc |   26 -
 .../1c/83552a552a0d431c.fingerprints          |    1 -
 .../1e/6005789e24e5ad1e.fingerprints          |    1 -
 .../1f/9d29ae4a6b50e01f.fingerprints          |    1 -
 .../21/60eb70ddaac2ec21.fingerprints          |    1 -
 .../25/2c7b12f2a511e325.fingerprints          |    1 -
 ...5f3b8e59e6e63aa78067482c7b12f2a511e325.asc |   16 -
 .../25/9351716690874f25.fingerprints          |    1 -
 .../25/a182f48d9c2c0825.fingerprints          |    1 -
 .../2b/d89d05374952262b.fingerprints          |    1 -
 .../2f/315693699f8d102f.fingerprints          |    1 -
 .../30/37de9e37c5b67c30.fingerprints          |    1 -
 .../34/e98008460eb9bb34.fingerprints          |    1 -
 .../36/01f3a913fb698736.fingerprints          |    1 -
 .../36/3bd211f725778c36.fingerprints          |    1 -
 .../36/6c70a3b7599c5736.fingerprints          |    1 -
 ...beab2d799c020f17c69126b16698a4adf4d638.asc |   16 -
 .../38/b16698a4adf4d638.fingerprints          |    1 -
 .../38/b5681e477ad61c38.fingerprints          |    1 -
 .../3b/29579f18fa8fd93b.fingerprints          |    1 -
 .../3b/b5cb27f94f97173b.fingerprints          |    1 -
 ...01e2f8ef035068ec1139cc29579f18fa8fd93b.asc |   16 -
 ...d97a6a154e7810ee0bc832e2f38302c8075e3d.asc |   26 -
 .../3d/e2f38302c8075e3d.fingerprints          |    1 -
 ...b1a49729b053caf015cee9a6adfc93ef34893e.asc |   16 -
 .../3e/a6adfc93ef34893e.fingerprints          |    1 -
 .../41/9a347756830c4541.fingerprints          |    1 -
 .../45/1669c4bb543e0445.fingerprints          |    1 -
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc |   21 -
 .../4b/71499a87dc1ff84b.fingerprints          |    1 -
 .../51/85911f425ec61b51.fingerprints          |    1 -
 ...6e2c001948c5f2f38b0cc385911f425ec61b51.asc |   26 -
 .../52/33cd6733af5ec452.fingerprints          |    1 -
 ...20d295bf0e61cb4cf0896c33cd6733af5ec452.asc |   24 -
 .../55/6525fd70cc303655.fingerprints          |    1 -
 ...f833963889d7ed06f1e4dc6525fd70cc303655.asc |   24 -
 .../57/098a31f381819057.fingerprints          |    1 -
 ...b9bdf40ed49debb5caaded5b30d3b10694f057.asc |   16 -
 .../57/5b30d3b10694f057.fingerprints          |    1 -
 ...885c07a3204611fb184ef7098a31f381819057.asc |   16 -
 .../58/2161d72e7dcd4258.fingerprints          |    1 -
 .../59/10da72cd7fbfa159.fingerprints          |    1 -
 .../5a/083891ad4774845a.fingerprints          |    1 -
 ...46dec275b1f230acce4eeb083891ad4774845a.asc |   26 -
 ...d16069219c90212a974d119ae296fd02e9f65b.asc |   26 -
 .../5b/32784d4f004b405b.fingerprints          |    1 -
 .../5b/9ae296fd02e9f65b.fingerprints          |    1 -
 .../5b/9df7f2349731d55b.fingerprints          |    1 -
 ...4dac8350968ec2a8260584ee8ecbbbc188fd5d.asc |   15 -
 .../5d/ee8ecbbbc188fd5d.fingerprints          |    1 -
 ...86f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc |   26 -
 .../5f/86f75e83e1ee085f.fingerprints          |    1 -
 .../60/7eb97d110dfadd60.fingerprints          |    1 -
 ...789342f598ad5b1175ef357eb97d110dfadd60.asc |   16 -
 .../61/379ce192d401ab61.fingerprints          |    1 -
 ...56c4f765c9ac3cb6b85d62379ce192d401ab61.asc |   26 -
 .../62/5a5c54a339b38462.fingerprints          |    1 -
 .../6f/41321490758aad6f.fingerprints          |    1 -
 ...aa0f2206de228f0db01ad741321490758aad6f.asc |   16 -
 ...57c388d7d1d9d031274cd0a5def5a76f94a471.asc |   26 -
 .../71/a5def5a76f94a471.fingerprints          |    1 -
 .../71/c45d01093dcfc371.fingerprints          |    1 -
 .../73/59a252fb1199d873.fingerprints          |    1 -
 ...16eb882daf57a11477aaf559a252fb1199d873.asc |   16 -
 .../76/575d6c921d84ac76.fingerprints          |    1 -
 .../76/5b05ccde140c2876.fingerprints          |    1 -
 ...669810892cbd3148fa92995b05ccde140c2876.asc |   33 -
 .../7e/3ff44d37464bbb7e.fingerprints          |    1 -
 .../80/ca890a5fa09cfd80.fingerprints          |    1 -
 ...118c070cb22a0175a2e8d43d12ca2ac19f3181.asc |   26 -
 .../81/3d12ca2ac19f3181.fingerprints          |    1 -
 ...a70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc |   26 -
 .../81/ddbcc1270a29d081.fingerprints          |    1 -
 .../83/6a0975f8b1127b83.fingerprints          |    1 -
 .../87/0729a0aff8999a87.fingerprints          |    1 -
 ...ba29d08d2e25ee84c132c30729a0aff8999a87.asc |   38 -
 .../89/926dfb2edb329089.fingerprints          |    1 -
 .../8b/5d9ffe7b8e3dea8b.fingerprints          |    1 -
 .../8c/0ac07d0bbd11498c.fingerprints          |    1 -
 .../8f/dc0b7e986bd7398f.fingerprints          |    1 -
 .../90/1b80c80e07bc7190.fingerprints          |    1 -
 ...3a1affe42b5f53af19f780bcf4173966770193.asc |   16 -
 .../93/bcf4173966770193.fingerprints          |    1 -
 .../94/59ba7bfead3d7f94.fingerprints          |    1 -
 ...14760097dc5cfad0175ac2c9fbaa83a8753994.asc |   16 -
 .../94/c9fbaa83a8753994.fingerprints          |    1 -
 ...23db1360d9029481e7f2efecdfea3cb4493b94.asc |   36 -
 .../94/ecdfea3cb4493b94.fingerprints          |    1 -
 .../96/6601e5c08dccbb96.fingerprints          |    1 -
 ...417737bd805456db3cbdde6601e5c08dccbb96.asc |   21 -
 ...900cd2fc9a9d906ecba48be3822b59020a349d.asc |   38 -
 .../9d/c1b12a5d99c0729d.fingerprints          |    1 -
 .../9d/e3822b59020a349d.fingerprints          |    1 -
 ...2231331bca7e1f292c9b88c1b12a5d99c0729d.asc |   21 -
 .../9e/d4ff1f46313c1a9e.fingerprints          |    1 -
 .../9e/e0130a3ed5a2079e.fingerprints          |    1 -
 ...1703b1d287caea3a60f931e0130a3ed5a2079e.asc |   16 -
 .../a0/7ec19439e4d4c2a0.fingerprints          |    1 -
 .../a2/0cfe993cdbe1d0a2.fingerprints          |    1 -
 .../a2/249dee8e2c07a0a2.fingerprints          |    1 -
 ...3e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc |   21 -
 .../a2/606cc6c4533e81a2.fingerprints          |    1 -
 .../a2/92bd2d0b5b21aba2.fingerprints          |    1 -
 .../a2/c3e640f38d845fa2.fingerprints          |    1 -
 .../a3/501b5adef57ce6a3.fingerprints          |    1 -
 ...d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc |   15 -
 .../a6/ac5ec74981f9cda6.fingerprints          |    1 -
 ...ba03381ef6c89096acd985ac5ec74981f9cda6.asc |   21 -
 .../a6/fe6c7d77a1ce15a6.fingerprints          |    1 -
 ...9082bc00e0324e2aef4cf00d3b328562a119a7.asc |   26 -
 .../a7/0d3b328562a119a7.fingerprints          |    1 -
 .../a7/bc7df305d87bdfa7.fingerprints          |    1 -
 ...f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc |   24 -
 .../ab/b341ddb020fcb6ab.fingerprints          |    1 -
 .../ac/d908a43fb7ec07ac.fingerprints          |    1 -
 .../ad/0da8a5ec02d11ead.fingerprints          |    1 -
 ...7b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc |   24 -
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc |   16 -
 .../ae/f6d4a1d411e9d1ae.fingerprints          |    1 -
 .../b1/0e91c2de43b72bb1.fingerprints          |    1 -
 ...6090d3223dca95bfd25c0e38f47d3e410c47b1.asc |   16 -
 ...92113263fc31c74ccbaab20e91c2de43b72bb1.asc |   16 -
 .../b1/38f47d3e410c47b1.fingerprints          |    1 -
 .../b1/50c6cc55c6f24fb1.fingerprints          |    1 -
 .../b2/1861c322c56014b2.fingerprints          |    1 -
 ...96a5e3e70732eeb2e5007f1861c322c56014b2.asc |   24 -
 .../b3/8b2a34a7d4a9b8b3.fingerprints          |    1 -
 ...5479e1055341431b4545ab72475fd306b9cab7.asc |   16 -
 .../b7/72475fd306b9cab7.fingerprints          |    1 -
 .../b8/1b2718089ce964b8.fingerprints          |    1 -
 ...fae244a81d64507b47182e1b2718089ce964b8.asc |   33 -
 .../b9/5f6ba89d4b0869b9.fingerprints          |    1 -
 .../bd/9c4c23e6ffe405bd.fingerprints          |    1 -
 ...a1a08c62fca78b79d3081164a16faaec16a4be.asc |   16 -
 .../be/64a16faaec16a4be.fingerprints          |    1 -
 .../c0/1241bc872c5e4ec0.fingerprints          |    1 -
 ...6de9055c4c75c7bd9830771241bc872c5e4ec0.asc |   24 -
 .../c1/abe9f3126bb741c1.fingerprints          |    1 -
 .../c2/3624ee1473a843c2.fingerprints          |    1 -
 ...184bcd55f4d016e30d4c9bf42e87f9665015c9.asc |   24 -
 .../c9/f42e87f9665015c9.fingerprints          |    1 -
 .../cb/1e8f1d57a4450bcb.fingerprints          |    1 -
 ...b4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc |   16 -
 .../cb/86fdc7e2a11262cb.fingerprints          |    1 -
 .../cb/b15ad8efbd28d3cb.fingerprints          |    1 -
 .../d2/dcf4b49b4d5845d2.fingerprints          |    1 -
 .../da/5a3d35a6757384da.fingerprints          |    1 -
 .../dd/15c71c0a4e0b8edd.fingerprints          |    1 -
 ...7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc |   26 -
 .../e0/6064b04a9dc688e0.fingerprints          |    1 -
 .../e2/56028df552ba32e2.fingerprints          |    1 -
 ...36a28bc89fb250272c9f7f56028df552ba32e2.asc |   38 -
 .../e3/2f3c9eeb05d1d1e3.fingerprints          |    1 -
 ...85b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc |   24 -
 .../e5/4713a6a15a6ea9e5.fingerprints          |    1 -
 .../e5/7c25280eae63ebe5.fingerprints          |    1 -
 ...10792983023d5d14c93b488d7f1bec1e2ecae7.asc |   16 -
 .../e7/8d7f1bec1e2ecae7.fingerprints          |    1 -
 .../ec/1723844cf9a045ec.fingerprints          |    1 -
 .../ec/2290c86d79f1dfec.fingerprints          |    1 -
 ...d6ff19930adf43ac127792a50569c7ca7fa1f0.asc |   24 -
 .../f0/a50569c7ca7fa1f0.fingerprints          |    1 -
 .../f8/bf935c771a8474f8.fingerprints          |    1 -
 .../f8/c9f04e6e2dc4f7f8.fingerprints          |    1 -
 ...5e5f90e43e837f9dd8c781bf935c771a8474f8.asc |   26 -
 .../fb/3d5839a2262cbbfb.fingerprints          |    1 -
 .../fb/cfa67e8582f7e9fb.fingerprints          |    1 -
 .../fe/891e4c2d471515fe.fingerprints          |    1 -
 build-logic/settings.gradle.kts               |   44 -
 checksum.xml                                  |  419 -
 gradle.properties                             |    3 +-
 .../00/4be257b370130000.fingerprints          |    1 -
 .../00/8118b3bcdb1a5000.fingerprints          |    1 -
 .../00/cfa2c539de0e0d00.fingerprints          |    1 -
 .../01/1f7a8f87b9d8f501.fingerprints          |    1 -
 ...6dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc |   38 -
 .../01/c59d5d06cf8d0e01.fingerprints          |    1 -
 .../02/72ff58594f983302.fingerprints          |    1 -
 .../04/ea8543c570faf804.fingerprints          |    1 -
 .../06/3a1959eef8726006.fingerprints          |    1 -
 ...e38bc93d90b852d88465dd3a1959eef8726006.asc |   26 -
 .../07/402123d2f5f4af07.fingerprints          |    1 -
 ...88b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc |   16 -
 ...441e504a937f43eb0daef96a65176a0fb1cd0b.asc |   27 -
 ...ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc |   21 -
 .../0b/6a65176a0fb1cd0b.fingerprints          |    1 -
 .../0b/74c249541619ff0b.fingerprints          |    1 -
 .../0b/96b88eacd463b90b.fingerprints          |    1 -
 .../0b/c51e6cbc7ff46f0b.fingerprints          |    1 -
 .../0c/0ae7bbd7fee66e0c.fingerprints          |    1 -
 .../0c/6b3225e6f495dc0c.fingerprints          |    1 -
 .../0e/105cb91cac2aee0e.fingerprints          |    1 -
 ...2c7ef8ada0f794b58c7c63436902af59edf60e.asc |    6 -
 .../0e/3684155e9365c30e.fingerprints          |    1 -
 ...d266db4427983a1a4afb0c3684155e9365c30e.asc |   16 -
 .../0e/436902af59edf60e.fingerprints          |    1 -
 .../0f/7a01b0f236e5430f.fingerprints          |    1 -
 ...cc4c7594d09e2182c60e0f7a01b0f236e5430f.asc |   16 -
 .../0f/aff3e378166b1f0f.fingerprints          |    1 -
 .../10/a7a66be60a24ce10.fingerprints          |    1 -
 .../10/bb2fb7b24b12ae10.fingerprints          |    1 -
 .../11/9f3ffb85a8582c11.fingerprints          |    1 -
 ...123c1ed3f13a6a0140e166c71fb765cd9de313.asc |   26 -
 .../13/c71fb765cd9de313.fingerprints          |    1 -
 .../14/3faad2cd5ecbb314.fingerprints          |    1 -
 .../14/5cf48cd2f24c5214.fingerprints          |    1 -
 ...e73d84ea4fcc47166087253faad2cd5ecbb314.asc |   26 -
 .../14/d7913335bfa51814.fingerprints          |    1 -
 ...3d3a74b068eca354dc385ce126833f9cf64915.asc |   26 -
 ...ed3b4843daacc79de555557457ca33c3ce9e15.asc |   16 -
 .../15/7457ca33c3ce9e15.fingerprints          |    1 -
 .../15/e126833f9cf64915.fingerprints          |    1 -
 .../16/0588bc69a286ff16.fingerprints          |    1 -
 .../16/92aeca6ac21db816.fingerprints          |    1 -
 ...999bb69041cf17e73bb1cec038787776a19d18.asc |    7 -
 ...d52b5a8295137c88fb5748dddafa7674e54418.asc |   16 -
 .../18/c038787776a19d18.fingerprints          |    1 -
 .../18/dddafa7674e54418.fingerprints          |    1 -
 .../19/411063a3a0ffd119.fingerprints          |    1 -
 .../19/9ff24f51b06dcc19.fingerprints          |    1 -
 ...dee87612e9fb95f5c8d91e411063a3a0ffd119.asc |  117 -
 .../1a/1db198f93525ec1a.fingerprints          |    1 -
 ...9f1ee92b19609de816fde81db198f93525ec1a.asc |   26 -
 ...0a37a2e0577f4baa095b52602ec18d20c4661c.asc |   26 -
 .../1c/602ec18d20c4661c.fingerprints          |    1 -
 .../1c/8067ecaa8d58321c.fingerprints          |    1 -
 .../1c/83552a552a0d431c.fingerprints          |    1 -
 .../1c/ae5a7fb608a0221c.fingerprints          |    1 -
 ...2137d875d833d9b23392ecae5a7fb608a0221c.asc |   33 -
 .../1d/9207518d06855c1d.fingerprints          |    1 -
 .../1e/6005789e24e5ad1e.fingerprints          |    1 -
 .../1e/9842fe565aa0601e.fingerprints          |    1 -
 .../1e/d547b4a01f74ac1e.fingerprints          |    1 -
 .../1f/9d29ae4a6b50e01f.fingerprints          |    1 -
 .../20/011b32c57a810220.fingerprints          |    1 -
 ...90c240ce51b4670d30ad1c38ee757d69184620.asc |   26 -
 .../20/38ee757d69184620.fingerprints          |    1 -
 .../20/d364abaa39a47320.fingerprints          |    1 -
 ...0ca873074092f806f59b65d364abaa39a47320.asc |   26 -
 .../21/60eb70ddaac2ec21.fingerprints          |    1 -
 .../22/51f5b36c761aa122.fingerprints          |    1 -
 .../22/fe694b892910dd22.fingerprints          |    1 -
 .../23/528dc75aa68f0923.fingerprints          |    1 -
 ...569a15406ae682380f3ef8528dc75aa68f0923.asc |   16 -
 .../24/b8c800fb51837224.fingerprints          |    1 -
 .../25/2c7b12f2a511e325.fingerprints          |    1 -
 ...5f3b8e59e6e63aa78067482c7b12f2a511e325.asc |   16 -
 .../25/9351716690874f25.fingerprints          |    1 -
 .../25/a182f48d9c2c0825.fingerprints          |    1 -
 .../29/16fbb6b6e3120829.fingerprints          |    1 -
 ...9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc |   21 -
 .../2b/d89d05374952262b.fingerprints          |    1 -
 .../2c/5f69ad087600b22c.fingerprints          |    1 -
 ...bd02b93e7a40482eb1d66a5f69ad087600b22c.asc |   16 -
 .../2d/127ce18327e55b2d.fingerprints          |    1 -
 .../2d/923c08f9417b222d.fingerprints          |    1 -
 .../2e/a1766be5f812ac2e.fingerprints          |    1 -
 .../2f/315693699f8d102f.fingerprints          |    1 -
 .../30/37de9e37c5b67c30.fingerprints          |    1 -
 .../31/f8052e4e1bd0db31.fingerprints          |    1 -
 .../34/31474e5e7c6b7034.fingerprints          |    1 -
 ...2db2916149baa9d0c92f3731474e5e7c6b7034.asc |   26 -
 .../34/dee12b9896f97e34.fingerprints          |    1 -
 ...d98c5fd55a8af232290e58dee12b9896f97e34.asc |   16 -
 .../34/e98008460eb9bb34.fingerprints          |    1 -
 .../36/01f3a913fb698736.fingerprints          |    1 -
 .../36/2be5d98f751f4136.fingerprints          |    1 -
 .../36/3bd211f725778c36.fingerprints          |    1 -
 .../36/6c70a3b7599c5736.fingerprints          |    1 -
 ...8366594e746bf3c449f5622be5d98f751f4136.asc |   16 -
 .../37/218fa0f6a941a037.fingerprints          |    1 -
 ...fd709cc4b0515f2e6af04e218fa0f6a941a037.asc |   16 -
 ...beab2d799c020f17c69126b16698a4adf4d638.asc |   16 -
 .../38/b16698a4adf4d638.fingerprints          |    1 -
 .../38/b5681e477ad61c38.fingerprints          |    1 -
 .../3a/03281aa0289ff53a.fingerprints          |    1 -
 ...e2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc |   16 -
 .../3a/b9729775c0352d3a.fingerprints          |    1 -
 ...5f005af50ae94e69701222b9729775c0352d3a.asc |   10 -
 .../3b/06ec66d653dc633b.fingerprints          |    1 -
 .../3b/29579f18fa8fd93b.fingerprints          |    1 -
 .../3b/b5cb27f94f97173b.fingerprints          |    1 -
 ...01e2f8ef035068ec1139cc29579f18fa8fd93b.asc |   16 -
 .../3d/0a52516cf3e88b3d.fingerprints          |    1 -
 ...d97a6a154e7810ee0bc832e2f38302c8075e3d.asc |   26 -
 .../3d/9a2c7a98e457c53d.fingerprints          |    1 -
 ...acb037933cdeaab7bf77d49a2c7a98e457c53d.asc |   16 -
 .../3d/e2f38302c8075e3d.fingerprints          |    1 -
 ...b1a49729b053caf015cee9a6adfc93ef34893e.asc |   16 -
 .../3e/a6adfc93ef34893e.fingerprints          |    1 -
 .../3f/efd4147f269a813f.fingerprints          |    1 -
 .../40/66b50994442d2d40.fingerprints          |    1 -
 .../40/750f9a735eecf640.fingerprints          |    1 -
 .../40/d8b9c51729d09d40.fingerprints          |    1 -
 ...d744ace7ade6aa50dd591f66b50994442d2d40.asc |   15 -
 .../41/9a347756830c4541.fingerprints          |    1 -
 .../42/a0f7d9615b3a5e42.fingerprints          |    1 -
 .../43/a6ea2e2bf22e0543.fingerprints          |    1 -
 ...77d51812e692011db11e66a6ea2e2bf22e0543.asc |   13 -
 ...4d86c56ca99373b6d8953dbe84d764623a3644.asc |   16 -
 .../44/5923a9d358adf744.fingerprints          |    1 -
 .../44/be84d764623a3644.fingerprints          |    1 -
 .../44/c1d2a95a576a4144.fingerprints          |    1 -
 .../44/c7fddd147fa73f44.fingerprints          |    1 -
 .../45/1669c4bb543e0445.fingerprints          |    1 -
 .../45/353a436e043e3145.fingerprints          |    1 -
 ...bc5d7dc2fb8dd68aa429bd353a436e043e3145.asc |   16 -
 ...15ad56144df2376f49d98b1669c4bb543e0445.asc |   21 -
 .../45/a98bd25be464ea45.fingerprints          |    1 -
 .../46/6f67467bc1adb846.fingerprints          |    1 -
 .../46/873a8e86b4372146.fingerprints          |    1 -
 .../46/9a716f957bc42546.fingerprints          |    1 -
 ...1b3de71713c9ec2e87cc26ee92349ad86de446.asc |   16 -
 .../46/ee92349ad86de446.fingerprints          |    1 -
 ...54b35617dc255d9344bcfa873a8e86b4372146.asc |   24 -
 .../47/dd6aefcee9eb4747.fingerprints          |    1 -
 .../48/1d185615d0a84648.fingerprints          |    1 -
 ...aa7402ba75f78720d975211d185615d0a84648.asc |   16 -
 ...b06224fd8912e36603be79fefe78456eddc34a.asc |   21 -
 .../4a/fefe78456eddc34a.fingerprints          |    1 -
 .../4b/0440006d577eae4b.fingerprints          |    1 -
 .../4b/700e4f39bc05364b.fingerprints          |    1 -
 .../4b/71499a87dc1ff84b.fingerprints          |    1 -
 .../4e/ccfb05b8ccbc1f4e.fingerprints          |    1 -
 .../4e/f5492b20d173a94e.fingerprints          |    1 -
 .../4f/9ff25980f5ba7e4f.fingerprints          |    1 -
 ...b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc |   19 -
 .../50/726f4e5c34cfd750.fingerprints          |    1 -
 ...4454fad8697760f3e00d2e4a51a45b944ffd51.asc |   26 -
 .../51/4a51a45b944ffd51.fingerprints          |    1 -
 ...c55a85d30c3499a3219500b7e2662a7640a051.asc |   10 -
 .../51/85911f425ec61b51.fingerprints          |    1 -
 .../51/b7e2662a7640a051.fingerprints          |    1 -
 ...6e2c001948c5f2f38b0cc385911f425ec61b51.asc |   26 -
 .../52/33cd6733af5ec452.fingerprints          |    1 -
 .../52/74237ad167ffee52.fingerprints          |    1 -
 .../52/8671a8df71296252.fingerprints          |    1 -
 ...d6c97108b8585f91b158748671a8df71296252.asc |   26 -
 ...20d295bf0e61cb4cf0896c33cd6733af5ec452.asc |   24 -
 .../53/3046c9379f41ea53.fingerprints          |    1 -
 ...2a008a91d11a7fac4a0786f13d3e721d56bd54.asc |   21 -
 .../54/cf9f423a7d348254.fingerprints          |    1 -
 .../54/f13d3e721d56bd54.fingerprints          |    1 -
 .../55/6525fd70cc303655.fingerprints          |    1 -
 ...f833963889d7ed06f1e4dc6525fd70cc303655.asc |   24 -
 ...d04176586361fda94ee0315f7786df73e61f56.asc |   26 -
 .../56/5f7786df73e61f56.fingerprints          |    1 -
 .../57/098a31f381819057.fingerprints          |    1 -
 ...b9bdf40ed49debb5caaded5b30d3b10694f057.asc |   16 -
 .../57/5b30d3b10694f057.fingerprints          |    1 -
 .../57/6366592024774157.fingerprints          |    1 -
 ...885c07a3204611fb184ef7098a31f381819057.asc |   16 -
 ...d34ed6ff73de368a772a781063fe98bcecb758.asc |   16 -
 .../58/1063fe98bcecb758.fingerprints          |    1 -
 .../58/2161d72e7dcd4258.fingerprints          |    1 -
 .../59/10da72cd7fbfa159.fingerprints          |    1 -
 .../5a/083891ad4774845a.fingerprints          |    1 -
 ...46dec275b1f230acce4eeb083891ad4774845a.asc |   26 -
 .../5b/11cd01355c5bcf5b.fingerprints          |    1 -
 ...d16069219c90212a974d119ae296fd02e9f65b.asc |   26 -
 .../5b/3260cb2def74135b.fingerprints          |    1 -
 .../5b/32784d4f004b405b.fingerprints          |    1 -
 .../5b/9ae296fd02e9f65b.fingerprints          |    1 -
 .../5b/9df7f2349731d55b.fingerprints          |    1 -
 .../5c/b89991d171a02f5c.fingerprints          |    1 -
 ...4dac8350968ec2a8260584ee8ecbbbc188fd5d.asc |   15 -
 ...de772c338ba540e1057d0c8ea48d105232855d.asc |   16 -
 .../5d/8ea48d105232855d.fingerprints          |    1 -
 .../5d/ee8ecbbbc188fd5d.fingerprints          |    1 -
 ...86f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc |   26 -
 .../5f/347cd0eaed975c5f.fingerprints          |    1 -
 .../5f/86f75e83e1ee085f.fingerprints          |    1 -
 .../5f/ae1c126549627b5f.fingerprints          |    1 -
 ...1128c8fd304fe48e6eed2c347cd0eaed975c5f.asc |   16 -
 .../60/7eb97d110dfadd60.fingerprints          |    1 -
 ...789342f598ad5b1175ef357eb97d110dfadd60.asc |   16 -
 .../61/379ce192d401ab61.fingerprints          |    1 -
 ...56c4f765c9ac3cb6b85d62379ce192d401ab61.asc |   26 -
 .../62/064ac25270668162.fingerprints          |    1 -
 ...97b4f5dcc46cea61059071a1ae06236ca2ba62.asc |   21 -
 .../62/5a5c54a339b38462.fingerprints          |    1 -
 ...86bbf993566d8c2f4f7ed7d945e643368fef62.asc |   21 -
 .../62/7a8860944fad5f62.fingerprints          |    1 -
 .../62/a1ae06236ca2ba62.fingerprints          |    1 -
 ...f1bc78607808ec8e9f69437a8860944fad5f62.asc |   26 -
 .../62/d945e643368fef62.fingerprints          |    1 -
 ...7366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc |   21 -
 .../64/9987b20c8f6a3064.fingerprints          |    1 -
 .../67/21939ff0ca2a6567.fingerprints          |    1 -
 .../67/91a4ba316974a467.fingerprints          |    1 -
 ...87a3fd0a54480f0badbebd21939ff0ca2a6567.asc |   26 -
 .../68/2f45f85cdf082e68.fingerprints          |    1 -
 ...af5293c334c7c0b583227d2f45f85cdf082e68.asc |   21 -
 .../69/e68665c8f91bde69.fingerprints          |    1 -
 .../6a/012579464d01c06a.fingerprints          |    1 -
 .../6a/2591ba36fd00e56a.fingerprints          |    1 -
 ...407e95050fb588296690862591ba36fd00e56a.asc |   26 -
 ...77dcfef2ee6eb2debedd2c012579464d01c06a.asc |   16 -
 .../6c/1afec329b615d06c.fingerprints          |    1 -
 .../6e/b2ca0dfe9ed21c6e.fingerprints          |    1 -
 ...2c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc |   16 -
 .../6f/41321490758aad6f.fingerprints          |    1 -
 ...aa0f2206de228f0db01ad741321490758aad6f.asc |   16 -
 ...57c388d7d1d9d031274cd0a5def5a76f94a471.asc |   26 -
 .../71/a5def5a76f94a471.fingerprints          |    1 -
 .../71/c45d01093dcfc371.fingerprints          |    1 -
 .../71/c51e10bd96d06071.fingerprints          |    1 -
 ...5a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc |   16 -
 .../72/a2115ae15f6b8b72.fingerprints          |    1 -
 ...8075a251547bee249bc151a2115ae15f6b8b72.asc |   19 -
 .../73/59a252fb1199d873.fingerprints          |    1 -
 ...16eb882daf57a11477aaf559a252fb1199d873.asc |   16 -
 .../73/8183e80d264ee073.fingerprints          |    1 -
 .../76/164779204e106a76.fingerprints          |    1 -
 ...a8cf92d409a73393d0b736bff2ee42c8282e76.asc |   26 -
 .../76/254e9c64c264c176.fingerprints          |    1 -
 .../76/575d6c921d84ac76.fingerprints          |    1 -
 .../76/5b05ccde140c2876.fingerprints          |    1 -
 ...669810892cbd3148fa92995b05ccde140c2876.asc |   33 -
 ...255b26003ef6f82491acd7254e9c64c264c176.asc |   16 -
 .../76/bff2ee42c8282e76.fingerprints          |    1 -
 ...c3b1929191df06136ccb2b164779204e106a76.asc |   26 -
 .../77/7ba5338873382b77.fingerprints          |    1 -
 ...ba61cf501c09f70911b83b82216a03caa86c78.asc |   10 -
 .../78/82216a03caa86c78.fingerprints          |    1 -
 .../7c/c3720ddc2e713b7c.fingerprints          |    1 -
 ...0be7d076a0c89f5f07625ae57428da9e879e7d.asc |   16 -
 .../7d/e57428da9e879e7d.fingerprints          |    1 -
 .../7e/3ff44d37464bbb7e.fingerprints          |    1 -
 ...2ddd47e19863bb87211544cd3038fef07d567e.asc |   19 -
 .../7e/cd3038fef07d567e.fingerprints          |    1 -
 .../7f/25a93b1970c22a7f.fingerprints          |    1 -
 .../80/10314d676733c080.fingerprints          |    1 -
 .../80/2ac7bf2f3349de80.fingerprints          |    1 -
 .../80/bede11eaf1164480.fingerprints          |    1 -
 .../80/ca890a5fa09cfd80.fingerprints          |    1 -
 .../80/d068f0d7b6a63980.fingerprints          |    1 -
 ...a9f95079e84ce201f7cf60bede11eaf1164480.asc |   21 -
 ...118c070cb22a0175a2e8d43d12ca2ac19f3181.asc |   26 -
 .../81/33aebc1f01c98081.fingerprints          |    1 -
 .../81/3d12ca2ac19f3181.fingerprints          |    1 -
 ...a70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc |   26 -
 .../81/ddbcc1270a29d081.fingerprints          |    1 -
 ...91fed3922d52296888bae9b6d3ab9bcc641282.asc |   26 -
 ...752a9878e937049ef3fba7d4012dda1f1f0f82.asc |   16 -
 .../82/b6d3ab9bcc641282.fingerprints          |    1 -
 .../82/d4012dda1f1f0f82.fingerprints          |    1 -
 .../83/31fa045762d93f83.fingerprints          |    1 -
 .../83/6a0975f8b1127b83.fingerprints          |    1 -
 .../83/b7d8b732f9ff1283.fingerprints          |    1 -
 ...200ac4ae761f1614d6c46766d68daa073be985.asc |   11 -
 .../85/66d68daa073be985.fingerprints          |    1 -
 .../85/7679164aa2590985.fingerprints          |    1 -
 ...2b29e928995b9db963c636c7ca19b7b620d787.asc |   35 -
 .../87/0729a0aff8999a87.fingerprints          |    1 -
 ...ba29d08d2e25ee84c132c30729a0aff8999a87.asc |   38 -
 ...4cb436c56916fc01eea4a77c30f7b1329dba87.asc |   38 -
 .../87/7c30f7b1329dba87.fingerprints          |    1 -
 .../87/c7ca19b7b620d787.fingerprints          |    1 -
 ...0a7a9cf46221a56b06ad64461a804f2609fd89.asc |   37 -
 .../89/461a804f2609fd89.fingerprints          |    1 -
 .../89/4b1e11d5a4b91e89.fingerprints          |    1 -
 .../89/926dfb2edb329089.fingerprints          |    1 -
 ...a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc |   21 -
 .../8a/ef3fa25a9e1b028a.fingerprints          |    1 -
 .../8b/5d9ffe7b8e3dea8b.fingerprints          |    1 -
 .../8b/7999befba1039e8b.fingerprints          |    1 -
 .../8c/0ac07d0bbd11498c.fingerprints          |    1 -
 .../8d/2a742740e08e7f8d.fingerprints          |    1 -
 ...19e50eac5a4b1dd390b72c2a742740e08e7f8d.asc |   33 -
 .../8d/fe4ce430fd91c78d.fingerprints          |    1 -
 ...5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc |   16 -
 .../8f/79e193516be7998f.fingerprints          |    1 -
 ...9a3c6d105b9f57844a721d79e193516be7998f.asc |   16 -
 .../8f/a929ea2321fdbf8f.fingerprints          |    1 -
 .../8f/dc0b7e986bd7398f.fingerprints          |    1 -
 ...ac2213964abe1d1c147c0e1939a2520bab1d90.asc |   16 -
 .../90/1939a2520bab1d90.fingerprints          |    1 -
 .../90/1b80c80e07bc7190.fingerprints          |    1 -
 .../91/3967d4eda591b991.fingerprints          |    1 -
 .../91/9f621f1ae6ef2591.fingerprints          |    1 -
 .../92/8bcab185914c4a92.fingerprints          |    1 -
 ...c641c3a62453ab390066c4a41f13c999945293.asc |   26 -
 ...3a1affe42b5f53af19f780bcf4173966770193.asc |   16 -
 .../93/a41f13c999945293.fingerprints          |    1 -
 .../93/bcf4173966770193.fingerprints          |    1 -
 .../94/326ba6bd408bfa94.fingerprints          |    1 -
 .../94/59ba7bfead3d7f94.fingerprints          |    1 -
 ...14760097dc5cfad0175ac2c9fbaa83a8753994.asc |   16 -
 .../94/be6397e958ab7594.fingerprints          |    1 -
 .../94/c9fbaa83a8753994.fingerprints          |    1 -
 ...23db1360d9029481e7f2efecdfea3cb4493b94.asc |   36 -
 .../94/ecdfea3cb4493b94.fingerprints          |    1 -
 ...abfb0dbd7a754822d35dd9be6397e958ab7594.asc |   16 -
 .../96/6601e5c08dccbb96.fingerprints          |    1 -
 ...417737bd805456db3cbdde6601e5c08dccbb96.asc |   21 -
 .../97/145d819475314d97.fingerprints          |    1 -
 .../97/4830c9fb8b680a97.fingerprints          |    1 -
 ...caa216b086a7b603b638c5145d819475314d97.asc |   16 -
 .../99/a7764f502a938c99.fingerprints          |    1 -
 ...5e25b78ebb19e47c0a99bca7764f502a938c99.asc |   16 -
 ...92c12c7e3d336a452beb254e066e0459cd109b.asc |   26 -
 .../9b/4e066e0459cd109b.fingerprints          |    1 -
 .../9c/c6fc46eb51cf569c.fingerprints          |    1 -
 ...491704d613780d2bee00f2c6fc46eb51cf569c.asc |   16 -
 .../9d/43203be58f49479d.fingerprints          |    1 -
 ...900cd2fc9a9d906ecba48be3822b59020a349d.asc |   38 -
 .../9d/c1b12a5d99c0729d.fingerprints          |    1 -
 .../9d/e3822b59020a349d.fingerprints          |    1 -
 ...2231331bca7e1f292c9b88c1b12a5d99c0729d.asc |   21 -
 ...3aabbb95ca37431e20422043203be58f49479d.asc |   26 -
 .../9e/d4ff1f46313c1a9e.fingerprints          |    1 -
 .../9e/dff2d25e2cd6139e.fingerprints          |    1 -
 .../9e/e0130a3ed5a2079e.fingerprints          |    1 -
 ...1703b1d287caea3a60f931e0130a3ed5a2079e.asc |   16 -
 .../a0/7ec19439e4d4c2a0.fingerprints          |    1 -
 .../a2/0cfe993cdbe1d0a2.fingerprints          |    1 -
 .../a2/249dee8e2c07a0a2.fingerprints          |    1 -
 ...3e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc |   21 -
 .../a2/606cc6c4533e81a2.fingerprints          |    1 -
 .../a2/92bd2d0b5b21aba2.fingerprints          |    1 -
 .../a2/c3e640f38d845fa2.fingerprints          |    1 -
 ...a37fbe4453c1073e7ef61d6449005f96bc97a3.asc |   37 -
 .../a3/501b5adef57ce6a3.fingerprints          |    1 -
 .../a3/6449005f96bc97a3.fingerprints          |    1 -
 ...dba0d142fe15d6a16f6b3789af105ceec705a4.asc |   37 -
 .../a4/89af105ceec705a4.fingerprints          |    1 -
 .../a6/6e50bb68cc1699a6.fingerprints          |    1 -
 .../a6/ac5ec74981f9cda6.fingerprints          |    1 -
 ...ba03381ef6c89096acd985ac5ec74981f9cda6.asc |   21 -
 ...9082bc00e0324e2aef4cf00d3b328562a119a7.asc |   26 -
 .../a7/0d3b328562a119a7.fingerprints          |    1 -
 .../a7/0e26a79ffe07a3a7.fingerprints          |    1 -
 .../a7/7d1be4480b61e2a7.fingerprints          |    1 -
 .../a7/bc7df305d87bdfa7.fingerprints          |    1 -
 .../aa/3449ec3ac2efe8aa.fingerprints          |    1 -
 ...1ac64f4e34e290503c90323449ec3ac2efe8aa.asc |   37 -
 .../aa/cb6d56b72fddf8aa.fingerprints          |    1 -
 ...f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc |   24 -
 .../ab/3b2a06173073fdab.fingerprints          |    1 -
 .../ab/b341ddb020fcb6ab.fingerprints          |    1 -
 .../ab/c64121f5021754ab.fingerprints          |    1 -
 .../ac/a7e989b0634097ac.fingerprints          |    1 -
 .../ac/d908a43fb7ec07ac.fingerprints          |    1 -
 .../ad/0da8a5ec02d11ead.fingerprints          |    1 -
 ...7b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc |   24 -
 ...b87b18a453990eac9453f87d713008cc07e9ad.asc |   26 -
 .../ad/7d713008cc07e9ad.fingerprints          |    1 -
 .../ad/a8d88140c35897ad.fingerprints          |    1 -
 .../ae/7494750bdf4f8fae.fingerprints          |    1 -
 ...4be739ddae10f4473fecf0aef385ed6ca815ae.asc |   21 -
 .../ae/aef385ed6ca815ae.fingerprints          |    1 -
 ...b5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc |   16 -
 .../ae/f6d4a1d411e9d1ae.fingerprints          |    1 -
 .../af/030dd9087c31c9af.fingerprints          |    1 -
 .../af/c2148900bcd3c2af.fingerprints          |    1 -
 ...4fe82e5a4c5377bca2edec5208812e1e4a6db0.asc |   16 -
 .../b0/5208812e1e4a6db0.fingerprints          |    1 -
 .../b1/07d3516820bcf6b1.fingerprints          |    1 -
 .../b1/0e91c2de43b72bb1.fingerprints          |    1 -
 ...6090d3223dca95bfd25c0e38f47d3e410c47b1.asc |   16 -
 ...92113263fc31c74ccbaab20e91c2de43b72bb1.asc |   16 -
 .../b1/38f47d3e410c47b1.fingerprints          |    1 -
 .../b1/50c6cc55c6f24fb1.fingerprints          |    1 -
 ...5ee627345f3c1dd422b2e207d3516820bcf6b1.asc |   16 -
 ...d8419ba697f0e7fb85916ee91287822fdb81b1.asc |   26 -
 .../b1/e91287822fdb81b1.fingerprints          |    1 -
 .../b2/1861c322c56014b2.fingerprints          |    1 -
 ...96a5e3e70732eeb2e5007f1861c322c56014b2.asc |   24 -
 .../b2/eaae192d27ab3eb2.fingerprints          |    1 -
 ...1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc |   16 -
 .../b3/4a1bac7f1e3b89b3.fingerprints          |    1 -
 .../b3/8b2a34a7d4a9b8b3.fingerprints          |    1 -
 .../b4/2d0e1fb8fe4b68b4.fingerprints          |    1 -
 ...89baf76217b843d66be55b2d0e1fb8fe4b68b4.asc |   26 -
 ...5479e1055341431b4545ab72475fd306b9cab7.asc |   16 -
 ...6a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc |   16 -
 .../b7/72475fd306b9cab7.fingerprints          |    1 -
 .../b7/a7f5ed0fa05d64b7.fingerprints          |    1 -
 .../b8/1b2718089ce964b8.fingerprints          |    1 -
 ...fae244a81d64507b47182e1b2718089ce964b8.asc |   33 -
 .../b9/5f6ba89d4b0869b9.fingerprints          |    1 -
 .../b9/e09f6a4522f77db9.fingerprints          |    1 -
 .../b9/fb693bc97890abb9.fingerprints          |    1 -
 .../ba/3595395eb3d8e1ba.fingerprints          |    1 -
 ...c935821aa6a755bd337db53595395eb3d8e1ba.asc |   26 -
 .../ba/7c7d8456294423ba.fingerprints          |    1 -
 ...5aed155021af8a6c6b7a4a7c7d8456294423ba.asc |   24 -
 .../ba/fcf74afdf5947aba.fingerprints          |    1 -
 .../bb/1085f41881c989bb.fingerprints          |    1 -
 .../bc/6b7edfc69f043bbc.fingerprints          |    1 -
 .../bd/38185785755267bd.fingerprints          |    1 -
 .../bd/8799af90c06efbbd.fingerprints          |    1 -
 ...4555c237785ca8a6dc1fe58799af90c06efbbd.asc |   10 -
 .../bd/9c4c23e6ffe405bd.fingerprints          |    1 -
 .../be/2bfd7825a8984fbe.fingerprints          |    1 -
 ...a1a08c62fca78b79d3081164a16faaec16a4be.asc |   16 -
 .../be/590c2310cee1c9be.fingerprints          |    1 -
 .../be/64a16faaec16a4be.fingerprints          |    1 -
 ...2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc |   21 -
 .../bf/5e975cb00c643dbf.fingerprints          |    1 -
 ...f46bc0b86af5dc56df58f05e975cb00c643dbf.asc |   21 -
 .../c0/1241bc872c5e4ec0.fingerprints          |    1 -
 ...6de9055c4c75c7bd9830771241bc872c5e4ec0.asc |   24 -
 .../c1/11f4ce313a637cc1.fingerprints          |    1 -
 .../c1/abe9f3126bb741c1.fingerprints          |    1 -
 .../c2/3624ee1473a843c2.fingerprints          |    1 -
 .../c3/67631bc0568801c3.fingerprints          |    1 -
 .../c3/80cfa7c482552dc3.fingerprints          |    1 -
 ...2567d2589415bd74eb4c2867631bc0568801c3.asc |   26 -
 ...7e32d440ef90a83011a8fc6425559c47cc79c4.asc |   16 -
 .../c4/6425559c47cc79c4.fingerprints          |    1 -
 .../c4/c189c86b813330c4.fingerprints          |    1 -
 .../c4/d66472cf54179cc4.fingerprints          |    1 -
 .../c5/1364c5e2df3e99c5.fingerprints          |    1 -
 .../c6/2f53295a4bbac7c6.fingerprints          |    1 -
 .../c7/5858009d3cc798c7.fingerprints          |    1 -
 .../c8/3f606403dca455c8.fingerprints          |    1 -
 ...184bcd55f4d016e30d4c9bf42e87f9665015c9.asc |   24 -
 .../c9/f42e87f9665015c9.fingerprints          |    1 -
 .../cb/1e8f1d57a4450bcb.fingerprints          |    1 -
 ...b4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc |   16 -
 .../cb/4c00043bec5cb7cb.fingerprints          |    1 -
 ...f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc |   33 -
 .../cb/6e97418b04b11dcb.fingerprints          |    1 -
 .../cb/86fdc7e2a11262cb.fingerprints          |    1 -
 .../cb/b15ad8efbd28d3cb.fingerprints          |    1 -
 ...58f9cc982ac877e7b295dd6e97418b04b11dcb.asc |   26 -
 .../cd/bb9cc415c9c063cd.fingerprints          |    1 -
 .../ce/ccda41f01581c6ce.fingerprints          |    1 -
 ...7e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc |   15 -
 .../d0/56e73ba9a0b592d0.fingerprints          |    1 -
 .../d0/9daadc1c9fcc82d0.fingerprints          |    1 -
 ...5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc |   26 -
 ...fab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc |   26 -
 ...9751fc3f01f134f476464cd0eb627d4885ced1.asc |   24 -
 .../d1/9c8c892f91f8e6d1.fingerprints          |    1 -
 .../d1/d0eb627d4885ced1.fingerprints          |    1 -
 .../d2/dcf4b49b4d5845d2.fingerprints          |    1 -
 .../d4/0162fe0cf6e18bd4.fingerprints          |    1 -
 ...dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc |   16 -
 .../d4/1c8d5ef0df2b70d4.fingerprints          |    1 -
 .../d4/7892707e9657ebd4.fingerprints          |    1 -
 .../d4/a0fc00d356eef1d4.fingerprints          |    1 -
 .../d4/a5c8dbb8a1599bd4.fingerprints          |    1 -
 .../d5/1da784ccb5c46dd5.fingerprints          |    1 -
 ...ac8cdc141af0ae468d16921da784ccb5c46dd5.asc |   37 -
 .../d9/39f8a1784230e2d9.fingerprints          |    1 -
 .../da/5a3d35a6757384da.fingerprints          |    1 -
 .../dd/15c71c0a4e0b8edd.fingerprints          |    1 -
 ...cffe916b6670868fa0ea0391ae1504568ec4dd.asc |   26 -
 .../dd/91ae1504568ec4dd.fingerprints          |    1 -
 ...7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc |   26 -
 .../de/106bde3d5d78bfde.fingerprints          |    1 -
 .../de/cfca4a29d26468de.fingerprints          |    1 -
 ...182e81c792928921dbcab4cfca4a29d26468de.asc |   16 -
 ...a628ffaf58480736b1079fd1031d14464180e0.asc |   26 -
 .../e0/6064b04a9dc688e0.fingerprints          |    1 -
 .../e0/d1031d14464180e0.fingerprints          |    1 -
 .../e1/72fefd1572eb75e1.fingerprints          |    1 -
 ...e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc |   16 -
 .../e1/a9b9c4370b8833e1.fingerprints          |    1 -
 .../e2/56028df552ba32e2.fingerprints          |    1 -
 ...7ea1255546d6070a23aa00db45d3a62a183ce2.asc |   16 -
 ...36a28bc89fb250272c9f7f56028df552ba32e2.asc |   38 -
 .../e2/db45d3a62a183ce2.fingerprints          |    1 -
 .../e3/2f3c9eeb05d1d1e3.fingerprints          |    1 -
 .../e3/875c3ef9dc4638e3.fingerprints          |    1 -
 ...c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc |   16 -
 .../e3/e95b8ff73f6b84e3.fingerprints          |    1 -
 ...85b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc |   24 -
 .../e5/4713a6a15a6ea9e5.fingerprints          |    1 -
 .../e5/7c25280eae63ebe5.fingerprints          |    1 -
 .../e5/b4f772a2a08563e5.fingerprints          |    1 -
 ...10792983023d5d14c93b488d7f1bec1e2ecae7.asc |   16 -
 .../e7/8d7f1bec1e2ecae7.fingerprints          |    1 -
 .../e7/b0f3710fa64900e7.fingerprints          |    1 -
 ...be5bcc9fec15518cfda882b0f3710fa64900e7.asc |   16 -
 .../e8/4f89f83c363d30e8.fingerprints          |    1 -
 .../e8/f20db7fef61ce1e8.fingerprints          |    1 -
 .../e9/cff46ee3c17e53e9.fingerprints          |    1 -
 .../ea/4044edf1bb73efea.fingerprints          |    1 -
 .../ea/5b93f1df7cdb6dea.fingerprints          |    1 -
 ...9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc |   26 -
 .../eb/995efbf4a3d20beb.fingerprints          |    1 -
 ...bc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc |   26 -
 .../ec/1723844cf9a045ec.fingerprints          |    1 -
 .../ec/2290c86d79f1dfec.fingerprints          |    1 -
 ...39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc |   16 -
 .../ec/f6bc09712c8df6ec.fingerprints          |    1 -
 .../ed/9a259c7ee636c5ed.fingerprints          |    1 -
 .../ed/d3dbc823be4819ed.fingerprints          |    1 -
 ...7417ac194160a3fabd04969a259c7ee636c5ed.asc |   26 -
 ...e770230e69cc6de143fb5b62c82e50836eb3ee.asc |   26 -
 .../ee/62c82e50836eb3ee.fingerprints          |    1 -
 .../ef/ab049df4ab24c1ef.fingerprints          |    1 -
 ...6260c72df74e66268f7770ab049df4ab24c1ef.asc |   26 -
 ...d6ff19930adf43ac127792a50569c7ca7fa1f0.asc |   24 -
 .../f0/a50569c7ca7fa1f0.fingerprints          |    1 -
 .../f1/603dbe5f5c9fa9f1.fingerprints          |    1 -
 .../f2/fc51362145a05ff2.fingerprints          |    1 -
 .../f4/73f7734b17ec71f4.fingerprints          |    1 -
 .../f4/92bf193ad552c6f4.fingerprints          |    1 -
 .../f8/bf935c771a8474f8.fingerprints          |    1 -
 .../f8/c9f04e6e2dc4f7f8.fingerprints          |    1 -
 ...5e5f90e43e837f9dd8c781bf935c771a8474f8.asc |   26 -
 .../f9/9f7335d63326e7f9.fingerprints          |    1 -
 ...13f67d71beec23add0ce0acb43338e060cf9fa.asc |   26 -
 .../fa/cb43338e060cf9fa.fingerprints          |    1 -
 .../fb/3d5839a2262cbbfb.fingerprints          |    1 -
 .../fb/cfa67e8582f7e9fb.fingerprints          |    1 -
 .../fc/4006cba6d352f1fc.fingerprints          |    1 -
 ...ef9646901a1652e5b3e5ea694db6f419c8d1fd.asc |   16 -
 .../fd/694db6f419c8d1fd.fingerprints          |    1 -
 .../fe/891e4c2d471515fe.fingerprints          |    1 -
 gradle/verification-keyring.keys              | 7459 +++++++++++++++++
 gradle/verification-metadata.xml              |  783 ++
 settings.gradle.kts                           |   63 -
 738 files changed, 8245 insertions(+), 6371 deletions(-)
 delete mode 100644 build-logic/checksum.xml
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
 delete mode 100644 build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
 delete mode 100644 checksum.xml
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
 delete mode 100644 gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
 create mode 100644 gradle/verification-keyring.keys
 create mode 100644 gradle/verification-metadata.xml

diff --git a/.ratignore b/.ratignore
index f2ade8505bd..904b2802f2c 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,8 +1,6 @@
-checksum.xml
-build-logic/checksum.xml
-build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/**
 gradle/wrapper/gradle-wrapper.jar
-gradle/checksum-dependency-plugin/cached-pgp-keys/**
+gradle/verification-keyring.keys
+gradle/verification-metadata.xml
 **/.*
 .*/**
 CODE_OF_CONDUCT.md
diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
deleted file mode 100644
index 0864348dd6f..00000000000
--- a/build-logic/checksum.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<dependency-verification version='2'>
-  <trust-requirement pgp='GROUP' checksum='NONE' />
-  <ignored-keys />
-  <trusted-keys>
-    <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
-    <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.dataformat' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.module' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
-    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
-    <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
-    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs.snom' />
-    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
-    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
-    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
-    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
-    <trusted-key id='f05e5f90e43e837f9dd8c781bf935c771a8474f8' group='com.google.errorprone' />
-    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
-    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
-    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
-    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
-    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
-    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='31fae244a81d64507b47182e1b2718089ce964b8' group='com.thoughtworks.qdox' />
-    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-beanutils' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-codec' />
-    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-collections' />
-    <trusted-key id='636de9055c4c75c7bd9830771241bc872c5e4ec0' group='commons-lang' />
-    <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
-    <trusted-key id='0186f8b24c5bc02c94a0e0e486f75e83e1ee085f' group='de.thetaphi' />
-    <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' />
-    <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' />
-    <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
-    <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
-    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
-    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
-    <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
-    <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
-    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
-    <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
-    <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
-    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
-    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
-    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
-    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
-    <trusted-key id='34441e504a937f43eb0daef96a65176a0fb1cd0b' group='org.codehaus.groovy' />
-    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
-    <trusted-key id='82f833963889d7ed06f1e4dc6525fd70cc303655' group='org.codehaus.mojo' />
-    <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
-    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
-    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
-    <trusted-key id='1bd97a6a154e7810ee0bc832e2f38302c8075e3d' group='org.gradle.kotlin' />
-    <trusted-key id='66d7cbff956830fe9f5a723afe6c7d77a1ce15a6' group='org.gradlex' />
-    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
-    <trusted-key id='e62231331bca7e1f292c9b88c1b12a5d99c0729d' group='org.jetbrains' />
-    <trusted-key id='98465301a4939c0279f2e847d89d05374952262b' group='org.jetbrains.dokka' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
-    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.kotlinx' />
-    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
-    <trusted-key id='f3184bcd55f4d016e30d4c9bf42e87f9665015c9' group='org.jsoup' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.jupiter' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.platform' />
-    <trusted-key id='019082bc00e0324e2aef4cf00d3b328562a119a7' group='org.openjdk.jmh' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
-    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
-    <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
-    <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
-    <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
-  </trusted-keys>
-  <dependencies>
-    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.14'>
-      <sha512>F8768877E3B204EA886F7BDEE6B4D900DB80B1B63CF37800F56E3BB1E2D3C13B38F7BA4784160DB80A0CAB658D4948BEE1992E9FAFE519C156BEF8A4B0B3E903</sha512>
-    </dependency>
-    <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
-      <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
-    </dependency>
-    <dependency group='de.thetaphi' module='forbiddenapis' version='3.6'>
-      <sha512>B9D779B085611E8122FB1F30952E1DD1EE1456AF11EAED24F7182B73EFF1E648862912849F1CE53CD8CDA8313F7CDB2E88BA959C3868418359BB98E59CD2E5D7</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='1.1.7'>
-      <sha512>B7B121AC6385206A03717E03A61C9514478934CF7E8BBDCD87BD2E8ECFC2DEB37B9B834DA34EAA14C16CA6F61DB6A4DCD1C89FEDEE22EEBDEF6EAE5423847CE1</sha512>
-    </dependency>
-    <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
-      <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
-    </dependency>
-    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.2'>
-      <sha512>E433E221C9167BB937EC0DF7626B5BBBE99E08C566A6D54BA7D2E04252DD452B4CA957B57E687F85F958DF0CE12678E17D0BCB527E1077770C8B7390CE58F56C</sha512>
-    </dependency>
-    <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
-      <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
-    </dependency>
-    <dependency group='net.sf.ezmorph' module='ezmorph' version='1.0.6'>
-      <sha512>16D30BE564723B74F312B4E7D06F349370FB6726B3162778C869CD723ECA2A40C4972C2757B3E107E1820CEC0D70B0BD2B96EFCD466518FC64495F7AEF97967A</sha512>
-    </dependency>
-    <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
-      <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.37'>
-      <sha512>52E8003B3CD07FFD3DFB8830F628904C24762003F65D10E002C4D2E84B7046C6B2ED66D69CE8A74AD6923E96868B3E08B3B404AA004ED36750B316B12BAEAF6D</sha512>
-    </dependency>
-    <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
-      <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.1.2'>
-      <sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
-      <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
-      <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
-    </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.1'>
-      <sha512>397C3257C5448C26304B312212F6DA1649AD15E52CE0419C5BA647F8A68864707A0C8071FA9860C28AA9D626D66C8FAF2D5F576E693F9D01B0F71EEEB84B57FB</sha512>
-    </dependency>
-    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
-      <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
-    </dependency>
-    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.4.1.3373'>
-      <sha512>3FDE80F4F005B5BABF6F278C6B4C7BEA4A00603BF9C44C3026334BFBE0B64E1F767C92295614D6A5AEF61692844F0FE7DBB0F8119F58EABF522FCEC6904272E8</sha512>
-    </dependency>
-    <dependency group='xerces' module='xercesImpl' version='2.9.1'>
-      <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
-    </dependency>
-    <dependency group='xml-resolver' module='xml-resolver' version='1.2'>
-      <sha512>ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A</sha512>
-    </dependency>
-  </dependencies>
-</dependency-verification>
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
index 1e5396a5a99..f5943dd4363 100644
--- a/build-logic/gradle.properties
+++ b/build-logic/gradle.properties
@@ -14,6 +14,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
-com.github.vlsi.checksum-dependency.version=1.89
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
deleted file mode 100644
index 3b7f58c1acb..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
deleted file mode 100644
index 1efb468cd8d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
deleted file mode 100644
index a8b12b46251..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
-j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
-lOiq5GM/Em0mtCSDI+i+zpD7MKCQEeV6V9d09r8Ncltf42BQb2x30ajTsGps++tH
-Z6xxhlPaYsF6OT7SBSt40cjc+rhUuAUo7D4Jt7S7zvi2aeulEr9YD+gkp6+EED2p
-f085M4tn9FjIEmYEOdfq2LkrKbel4r7x3YTypU+G0SDEeGKLJrlekNr7B97CxNat
-aP+ioa6GPY1+u8pkELSZDaUUKpqPKuYt37t1XqWHnvzGYzFyORQjuANCz2f8yAkN
-QqgImFuHiv4Zem7Y4ZagG0TG+T+BT7fZFbYIjpMxuy96mn8jdDMRvNOlskMWD+7x
-QLt1TGaworhDJ5suY4TVN7jQfUX11sTjriBkb+xoSvEFJt5MmQvEi587rIt0Xxcu
-/PKkob99JB/W178ZSbJBoOD43iTP//ifgPPlWHa8GgLBg+EyR1HNvZ6goXhfysGB
-BMV0JP4Fk7SOeV6sb2A2vUIA4uVGVzkzxkb/aG03vIl4pvf74y2Gi70/y1/mAbQp
-BWg3LAcn9ARB6t3Z/rTXWL2bfQPGQ6HWSBcG/qHLwQq+1eUR08GdG2PvwwARAQAB
-uQINBFu07sABEADvtfuYWvWH514Ykl9/BpRFWuGvjR3Xfnc2hn12vCH61Na851r9
-vfYkq3PKLMnzBq5Z/jodIcivDLm4zsNUPxVtsHsqr9PE/5xeFO4i7EWU0554Z9p1
-L2D6Q556WSXAFfO6r/41H96VbSctF3onJ4aUL8QQ4gVtPgX3LutC59DUDpcN+1Ut
-VFPsUMaRShVS7weN1PvBRo0QRIo5YbWMnbt48Hx/lY5X0IAT2ptdUbU+AGOiIh0W
-AMks+hyrKddi5fXupMTEYASnUvZOibBYKID4A6WmIma4QniaWy7CMPvGuKaHEZ9d
-DeK/kjGlHc5O9UmQ3bJgiTNTgmNij7VpxeTkiaYq+l7aPiuJo4TQRLZ7XtMv3YTf
-HnMZFZj/BJw5otPa9EWvMXOO8mi8MRg4KfraMNUzniJnEGL2iXAPAU/oMiHRlgrT
-vKS2s81Kaj7HDfgxS1pKKLLcXTvDIt4VAe2+9rl7UEmlR9UuRmFZx0dTmvby54MC
-qR6Xin0XMr+Y+NcONF8l1nN20AMhyWUzshKDoEsqdvyTyfKZjUoP6kAvqQknsmC2
-nSyp1V2ToPlPACAK5cMdJPa7R7C5xWrF+Do7j3FQsAoy1GzJezP78tbZyCxQTSDO
-MjvMg4l+2ngHa/aLIb5aLopobuH/9yVSILOcjTnO6wEL6YZHaJAMckVGcQARAQAB
-=ZdoI
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
deleted file mode 100644
index d9ae47869d2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
deleted file mode 100644
index d3364e97093..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
-m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
-fKpWWkpKfHsGIFkfsOX6J83J4GVpaNJBUHsmcdep8YNf1nYDGpIZCxufihQXhuuK
-x9BPm2SUdeyFwUFdxhGN4JdalxZo+x0pvQ6sKO1hQKK14YZXQxLUV043p3me9lVy
-Ubld8kcda0edx3cyhilehib3sZPVhOm8s18GmjV5/ApPnehJN7SueivB2dzzFPN7
-mUwrslti0j2DmTdOImzcz0IT7zErmiV7xtgsgP8jgKEp2LF23VFXuWsKO2yNubQP
-shNDKpYMMgJn0PfD5gwYl8FN9Yzj3OKA5wiJpgPjPl2PveZ/+rOS91bQMG1hFc3W
-v9ZWSisJAZlNQlfyv36rD12WhwQLlupLo0zPlqp7e/i5ZJBPg4unbAYECtJI5Wqj
-Ljhyd0j68QWon1Ripi8ruqXA9MUe7JMy39ZmF3/fLT4rBiHyRVpWkVKjzLlm0Ks4
-f3cNAPxn4FWeTwM+oUzEbpkNpE/swIbR05u1J2y0f+GS6X5t0CSTcHk1VIOnOiTl
-wLzSEJe9hNkBuNJjwM9Cod7dbdorq6Qwd0ffPJoTw1SVkHMPwIjikzxU7QARAQAB
-uQENBFgMcBMBCACSC8Tx2N3ZppqJ03AuDJrBOcNJU903XTp5l37lBl0JiNCDP4+y
-gkCTUyz0/K5YKQYJfyuVmM5q0ydqhQ68nmrmlxqvFxRIug5VqaE7VWhksyNAOROt
-xGi9Lo6AukKH2vK52Vh1uqRPmK44qtB1+bk8DE1YHuht00XB1Awu4ojIt3WKuRpM
-/oSYfbsol82dPt1XpDvN1et2bxeN9qRblCp7u83NRmdvAGiBMRES6yV6n8XWpQFT
-kRYf7wyVromOzz9m81dWAW5Js5QIvh3GMbFMS+2bnT+OVIrnCtJCw0TvTX3xZxyM
-EuaCvYInCZA92frmpHwJMXau7/1u12zuHLflABEBAAG5AQ0EWAxwEwEIANt0/Ryy
-VQalOTDbpaAPCir/Ui6EsdFmGeuLg6TIqy6xyCZ02iY6l4eHTPNxhnDPP4em+3/j
-Hh84Qan01O8sJB/o4ASbijAlvPwFikaJ8Gh/oKc+FO5kUwAcij4f8dtgdknGKlyo
-BFqEdfzzAEiSlX0G7biqrqD+mR6YM3eFbBTRKfZVwnwRMjNIN8n2FUUpvMKcGe3v
-34GL97e9qg+EMIBZ6SJxdKaMtvAfKYB6XG3UImlBQdYQoS8OjKJjoH5M7NRY8qb+
-v08M5z94z+dZ2mF56zpWcIlocYIT4eVi/2J8htykgxIBBWiNPfyYLrK3r2h7GtS+
-0e2MbwhhUimjOGkAEQEAAQ==
-=+Z5g
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
deleted file mode 100644
index 38f48c56106..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
deleted file mode 100644
index 276ae3fd4f7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
deleted file mode 100644
index 8acbce9e3f9..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
deleted file mode 100644
index 6f70b6c9127..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
-mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
-4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
-/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
-jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
-+krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG5AQ0EVlSyJAEIAL0+8UoJ
-uUsC3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbau
-L6Lrvw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3
-Yw/xfiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/t
-DxttYkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAg
-P6kgFxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPF
-HNkLijDp+f5mkJcAEQEAAQ==
-=32WC
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
deleted file mode 100644
index f6e3fba880b..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
deleted file mode 100644
index dcb0ae5beb3..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
-x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
-N4/BiyjQA25sdfaOolhO0sFlZuTZpYy5wG72KkA1ygNq0L+8aBKhEF6zDU61YzCC
-AxjcgTftgTeeoqkJtYa06lNz3jmJDN+zUQignfRa3ymoGtFHTzoXR9maE8RWDty4
-y+DY+8ibdGgSgKPZ0byTCDyNojgU1YTlADa/1/NY1ShYg617O1xicLNo0JEJlf2U
-Tu4Ymql36+xSkYSISU97Q6Utgq27XMuZvDUDABEBAAG5AQ0EUhfJFAEIAN9NHRd2
-bYP/3CDi+n1ilSChld0NR3DUBgS/AdqQ7IoAUfj7skyI/WyaMdV4uy6vRh5YgNg2
-g01nd0LLZR8Gf2Ck+D6F88CdZaTxlkcxHV/dXMZ8yBO+0D6yFRZEL7Imsv8Ig4QX
-OVwfuiXEPk/Ef5Dy9SdAVhcoErTGGR6BOGVVvexGtBwefsjMaOG0khkRbWIQ32Wx
-fUFuAv5XBQ0ckLrlKvYWUYhOlXg27GtFKH2EBBF0Z5ZWu7gaBFwSV0oLp9EWcD+C
-+WEwUSfBdqfRJtyXvgf4kZdwdQ5caM8P2/Sdncl2l/LU1At2Smc+plr6zhIhDlLh
-lrzKGa16oARSBdUAEQEAAQ==
-=VB22
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
deleted file mode 100644
index 62da51ed28d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
deleted file mode 100644
index f8b377469ce..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF8tnmMBCADROe7j1ZvgiMgfsQKqCSuSqgMkfMT2DEXwZKdHqkj0gfx8MPQg
-OP1pmMgpIwIXKr5kZ9KMGiGULNnS+WU2SNqjyKeq3MlnSYW5Di52MoAD7W4cHmry
-8ekaasF/x0AS5Q3M/6X/EBOD8YLWaFkk+h5x8D4IOSqiOiWH8olGjY4ZmGblaldX
-PLr7BWSrPKQ1QDsoICn583Mnjz3YLlc4p5IKnY2wss1zm7/gQk6KkdL5bRuASxLh
-to2adZ1LEE8MQfHweauHCK915RmMg7W3KW66/EsuCyEwZKBwq6rIpAciym2FngJt
-CPnY0o4IMFSasV7d1xSH5N4jeHL3Hh2Yd9tHABEBAAG5AQ0EXy2eYwEIANZAQd63
-jnuXS/btvoRXGM1kwaU0j3f2jeTg12sIGCUiiM4NcD2OnxWSKwvv6SWuk4/W+ahV
-3zQuTR8ZI51kNwgxvNZYKFExUyRjS+B4Oo6ArDSPp76Kyo3+82KmPaeHxxibir4s
-HoZUTSl8UKyszxEUV7BE756wS7DRHWpeE1gsjClFXc6/hnEOnXIzsoAdIFzzockf
-LW3guouh+MD5EE/x//rYyZJEotsPCu4vP/TanR9H6WnYOIn8g3jSUarV9LFGNcxN
-Ccj5sh2x3tOVjQBtPpE2SUEveLj3aHFTXzx29rU9kzSzEAxlFdK3pwUK/P+MO+V/
-qMHoOY3XwTZp3nkAEQEAAQ==
-=lsuN
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
deleted file mode 100644
index 28f7bcf5d21..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
deleted file mode 100644
index 86601279642..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
deleted file mode 100644
index eff24e1bee4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGCGrYsBEAC/Ws37TXMujQ4z2ioXlh5SlrWaCzdN5RSBAQEKaiuuQeuwdWku
-bsnhI2f7YgxfJh2if6hCsGeWx3Wd2paLT9IqJbnIltOzHQkYXajIJrJVDep31wQD
-FsjQS8DWdRGkrldc2ClWZs1PAGC4Snp9bNYrnlE8Z1uHVnmN2R0aQ3v7PGw2qpQ9
-XxsQl9m30hMDb4IZBOKy92PC+xNpb6dgee3HJ8uJ2t/nTUCuP1FsMPGP3crbK9po
-UOUigIWMKNnYTyHbx+p22EQIn3iKQU4DQTeZm1/rUnfuULp2Zhl+fTs6U/czCrdr
-7DN4MCzthK7DMhDHH7/uVk53+e0oe0FJZSxYE1ppjvLz4Ox7xMHrlOMFIqb9JOgn
-exUDV34KcPByHqY4ff7IL94Tx7YAwEplnJYBEfb0sYfmjai4PCFj74gjjCmhQUm8
-5Cbm23JvDGck9W75wc6qj7wcFpZrFtfpOsz10YsprM5TcmK9rEIV+o+bRqoNs5hS
-+heZmdz7LoWJgarJnlkPjDDOXW54bA5kS8ARlkxllzZ+f0BwaN/HBNbVv3gkBHUX
-YOxphjESdv/WByNQMgzoIBiUt02RqAJg9PECLJSjSfFzd2F9g7Lmc0TUdA/kLEZm
-DqgrDjPkfkwnSqCglI38Z/gcVoSDN2iYhEIfuGoZXbjG4IDVuFYyGZjimQARAQAB
-uQINBGCGrk4BEACTD/+Nk/tDzN3viBmw0GvgWWyeyfVKuhXTYgp1NA2Zugcsz9ZF
-jzQegH+jwekWc4JFSQTFHpxqog94eQ7UKzk3LaYeCMiPpuxyxsY8MSZooAOcysRa
-bkvVHNLFhCKiiTu7E8NkOlCT9v2+f/1aatFnM+D///1/RTR0MJ7lz3EuQWtC6gC0
-MQBydHoN9Ofov07j8RSVXBBf7TfZjl+uYfpYEkP5++bnWLw1WMv8AceaXyCjoJ/3
-L5GfrIHoNmpRujj8FLAZV0YOdpQCEwMn6gfJrcWXcPLcg3vmmYLhOWqj9kZoqE7N
-pejtzp9S4Yi9wM0ZTG+TTk2zec7dw7RstxTLEEJ8dx9IyXAkoNf8etlC9f9KuTnL
-K23lsi3cvjs58WzYxtl6MQS9x8U9QBlb86K8GMDYiwRrPyDusVvzwe0lZgrt7Sbo
-QP5+hD+wY92tJde9JQbYSVcIQwgRGPZGYIZ+DEo5g4SWBVp/y+pFTVd2dFmbu8D2
-RLunI+hy7zjBEXbdRCxhyI16/lGG5wecg6Y4N26w3trUHymeTdAPQ+5swE9F2MTz
-1D/FQrrb/pGa/6FcgusLvAvTJNCK/NAQNWx9ZJ1/teGCO8n2vhPi29950id4V93H
-dLcCy2PBAL4ltAp4gCBjXXRXZuou2jC+syfB/o8kln0/1sblBVlheopMbQARAQAB
-=XO0W
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
deleted file mode 100644
index 85f7ae585ef..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
deleted file mode 100644
index d0de6ff44ac..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
deleted file mode 100644
index 12ace9e88f0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
deleted file mode 100644
index 75e98dd9efa..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
-2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
-bOjh4v9ZipD+px8w3o/RNrnZH/KRsoJg9yER6pf+pUZqTJfdg5lXezc1WF+/1qVo
-ypldMGfrkfLsPrUZTT689ubbig978e7eYmJEqldtaIwaAzHQnB70wIJyg/rEwFUM
-ldsvs6t6czSuJ4zPMvmh8TMpTg9e6+DMktPl1CWRONl8RPpgYMIC96gb4OnfDDjk
-Ex6clSCwgbDwdeAyOjjR6pVq+pCNTo1Pcj5jABEBAAG5AQ0ET5k74QEIALaxogmJ
-1t7arw82krV7ILlcOu6aLuuXTuy03K1/jU73oyWfUqwvPSbH4igcLb8kt1/6ogfk
-u0T9tTx+0mDsvqK8A8NZ2nDTXok3T58UAg0FTXlqUqZmy5QPtG+it2j3/xGgip3V
-5p0Ml1TqEl2SfW6gHtLptDUWzuzPi9SgK1ZFlueprPg7xwHmWhp0gwx0KSSOYWlK
-oEllj/1aDxFNcdKogWcGN5aJEsETCEguBP7olL75u6732wc3zola4zTy5bFT4kEY
-Dk30Du3VGQJrdsqlibdQpZYm8uH4AVXDmFMdEAjIs/DGRrUgde/oUqwtgm9U+p9M
-qcbmMoeLFdi7ajEAEQEAAQ==
-=ObeE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
deleted file mode 100644
index 5fba3d86fbd..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
deleted file mode 100644
index a7c567b4543..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
deleted file mode 100644
index 2aea540087a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a1885c07a3204611fb184ef7098a31f381819057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
deleted file mode 100644
index 52dd86c65c0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
deleted file mode 100644
index 3fe473deef0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
deleted file mode 100644
index e66ffdde36d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
-NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
-/HVNFvTdF8LNnuF+a5aNgg+jjLvFwzkyMFkuiPGuUDFnqEGxC+z9J8t40tpOTOIw
-tPjSzkDN41AJDpUK/simKC5F0Im78nUbwMalE5z2IsZRWpYZyIhN1HhEdDvaDIh7
-3vENjH7enAjWh0iGRu+GTP/fayZnX0uhmausCCwMMhsr489e63ZOaJrqeC//wWrX
-dtEJjcmvRmJ2hwLmgwMP4zSNKsnLGzP0sh69ABEBAAG5AQ0EUzW/0AEIAO62SMbq
-gIzEFQEHlxNN5pZHd7msqDESILFYFkI1mxlkD0twFWMbk4nMH2VXhiuT3ulqKBOU
-UUNQrO7egtfbGsgVv4bWbUHfeZkfvoWDlmbrvi1YLlR/ZxzGpCNc8e3aOcN3XKHl
-BwfUaco6pcTBvLpKPA/TAjkTOtK4A5Azv1CSwpzSJf2bVVbrn7mi/rw78SmZAV2/
-rtiOU5a9S+3fzswLk1PO/z//d4VoCcL2s2WueVO1Q99kejkE55l3lYwEiBzVuAA9
-8Q0a5wg84vRGFZQWLIw8c20On2+dZcTLZc61ZjnsI1LSnLUUyQ/fzHQ+BynQF9l4
-3ZCPKFIl125MGikAEQEAAQ==
-=9tpm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
deleted file mode 100644
index 71760e28d01..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
deleted file mode 100644
index b6ee3744e79..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
deleted file mode 100644
index 76e9e5c4fd0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
-h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
-XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
-RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
-XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
-MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG5AQ0EVgWIwAEIAJ29KWGH
-aEt7gXV8EweJkrYd02nwjc1LyjUT2TRwEzZ9N9qUiVqfpkgnZn4mpHCToxFoqkHa
-iv/QDfj7cp8jbZJa2wjaUkDbH2pZqLBGJ0sUUBZ1KNPM2uhhWRzAnmF/bIo3+Yfl
-hGINLNqoevkYoo9cdelP3hepef4+PUuPmKmeo856uknmaWQ89LPwLlV7oj6wiqMY
-p22sHqTGAgXeR/fSLMK7d0vSPm+57LZed5ECoRMeqYFUwSMV64RjTMkKPsvFBGvR
-hppJ+uWQiMjFFuFq2DFeNBVtueHSdgCHx1TP9i+x+7JmYsmFFmRwnEdbxO3THFXa
-gFQGr4ima+oOjLcAEQEAAQ==
-=b0N8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
deleted file mode 100644
index 1df30880d6a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
-Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
-F/EkDYC6gtNUqzJ8IcxFMIQT+J6LCd3a/eTJWwDLUwSnGXVUPTXzYf4laSVdBDVp
-jp6K+tDHQrLZ140DY4GSvT1SzcgR5+5C1Mda3XobIJNHe47AeZPzKuFzZSlKqvrX
-QNexgGGjrEDWt9I3CXeNoOVVZvI2k6jAvUSZb+jN/YWpW+onDeV1S/7AUBaKE2TE
-EJtidYIOuFsufSwLURwX0um17M47sgzxov9vZYDucGntZn4zKYcZsdkTTkrrgU7N
-RSu90mqdL7rCxkUPsSeEUWFyhleGB108QBa5HiE/Z5T5C94kxD9JV1HAocFraTaZ
-SrNr0dBvZH7SoLCUQZ6q3gXebLbLQgDSuApjn523927O1wdnig+xDgAqTP14sw9i
-9OfvpNhCSolFL7mjGYKGfzTFo4pj5CzoKvvAXcsWY4HvwslWJvmrEqvo8Ss+YTII
-fiRSL4DWurT+42yOoExPwcYNofNwEuyYy5Zr9edsXeodScvy/hlri3JuB3Ji142w
-xFCuKUfrAh7hOw6QOXgIFyFXWrW0HH/8IoeJjxvG+6euxkGx8QZutyaY6wARAQAB
-uQINBGOtCzoBEADSUdEj7dz3jsz4EObAdNXnZnJ5zAkqE4zbGtU94sXdBtxD1F++
-5dTNE0ZCVwJLtZnYvxYXYwHBEDB5ZWS7noTL9rXkgXpDP5WGVLTYIMiGjPkVu2fW
-ZZ78Tu4KIfRnkWdUoMQ2g7YNZ8cVU40cZlk63tRdt7Th71g+K/RKWdqh7NK0laua
-lahK+Glped0QEo1TfrEhNgT0JUCwWzuM4qWHDys7itF++xLJsPSwS/wAUqvsWqGz
-W/1KrYbbxgKX4vbrqL3jnk4IHvcKAub0uchLv9KR5QpsVT86TmOB3WsAAlPdosW/
-ahAc2/XyiCxv5JEo8YpErBZ5TSgUy7lJNABS0JUVCeUCq/AAZ2TScOwRX8aXCeYA
-SfRHOZCiWrWy5nMGGnXVs42MMIML9d+Hr37BCCFT3Gbw8WOTeGleE92sed5dBAjO
-PyQWP+IvYxF7zOyNs46RAVlJfg3G33VwEBQgJwLSl/sUYqSHe9QubbxI0fiMsTJd
-Z6/5fbsXVnMbGe4kQDZbDTgylotiHfMCMNefgb0+yA6Fw+EHQeN/v/AtpcpT0w12
-AOpmlNy4+zPQE8Ai73gtJeTRpiuob3k1/JwvLHemB14CtxBGiHAyYHCjPqTPyQUI
-ikj+R8mecG/60RfSmGe3HW7Hpt907BNEcc4s4V9uvJPHIJdZS/gmtSp5VQARAQAB
-=on0Y
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
deleted file mode 100644
index 9fb46924e33..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
deleted file mode 100644
index 93ee42e81e2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN
-OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr
-9nFrAB4eDW0UMbSL9kPmclUm/yN+qcCZBrsVn0q6CWb/Kcd8EEXEu6sGILzOGqGe
-d433t5O+tGXWL2TjAz+Scsk2Hf4zcuDeQcxELAMnVaVgKuGuEZvibrjsdIvJDGI+
-0BzWIu8ZP8ldBl4SVtzGpEVzLvDUo3mOqBeTkj3rP7xLtFDN/3AFtowbLfL7L2Pg
-SMcTnKK+jfFHRfbHP1Ih3rQ4ilLzhCnY/QIZABEBAAG5AQ0ET7FnEgEIAM3i3e1s
-jwrx2PN8XYMPQWG+/YTtw1BYDl2+iYE+LaZvtq1hpbgeCLgEVwXrCJ4spLP1rFXo
-gWqKrkJ0LRjlpdKhKBvyH1ex4grh3cWN/bIDJcJ7JA4I/Bhqhlh8hYycS9pGFeS+
-MR3aFIsii+vadrwYYvuVYGeWvdZhB7mJKYevj5Ms0OpYTfZd95Pzo4o//lNpDnrG
-7Xd3tgTNU/fkpw6rFB/2Ib1Qlk+Kz1z6JNsp+tOPGGCBrzwfwglcikTuqS+xyRgC
-9cHh5eCol11uSoWPKcQR2Ar8Eo56nxv/UApdu15iJ7R8cA5guKeeS4jt0CGCPs2P
-huggDxI73Xvl4zsAEQEAAQ==
-=mB9L
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
deleted file mode 100644
index ad9eba9afc2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
deleted file mode 100644
index 4dbf1af5455..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
deleted file mode 100644
index f700439be79..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
-P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
-ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
-fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
-C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
-itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
-wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
-wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
-J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
-Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
-bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
-kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
-L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
-OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
-SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
-mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
-YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
-=A08o
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
deleted file mode 100644
index 8f7648dd909..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
deleted file mode 100644
index de648a3c373..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
deleted file mode 100644
index 064d520bc4a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
-YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
-nIRoUHucmr10Xftpebr/zaJk5oR8RdaL5FapapmcZmAaHR9CDWB8XtI318u314jq
-M5rKatnAZMERoPugOvvuAOz4bfZKwdfCmZKfYUM/TMSrSinXrGExSW6z4RhtqmpC
-E5M/7OoVfvDynVJKqNazqgigpmMNhOyzAhQsiKh1K0akyxTZbjeZKsdYfhCXvq0q
-k9+KM/cTllQ54MPnFWiObLkHeK0Waw8bI/vAJ4h4x/XM9iGYpkXv7F2/FVsHQdPe
-YJcwD/CkD8KHyiPaRKMeApiUtZsdAHU0L4X/lNmcooea/7ipskruUgwcm+RdLhRZ
-P949t1e7nqDZfpEHy90NiFxmlRAPSNqBLwefxY/hwBgog2jabDALJVcLCMosFWPj
-MQhFlGSIODiVcW8folGIjzkyNZbNMWkwnl2QnWp/h2TAwYQJOMqcv2MG9o5pyzpx
-97Iz1ngq1FlM/gJnGnNUydP2tAjT2L2U3MP1uX/EdRChdgPqdolqYhdFfwCr0Fpf
-W527bUZpReHCEiQ29ABSnQ711mO+d9+qM6edRyHUoBWz89IHt8sCunuvNwARAQAB
-uQINBFrKW9IBEACdAbrfrCWIQ4uRc3rrY5lLpDPb5wWW0JZuir2hf0WcDU8edNjZ
-wC3BLbXhF9ZnGSODpK1q753VZvxOwX9JQ3d4pFLKuQDGVfS/nna+PfGaZ82yyVBf
-jt7poRZnR27QzyPDv9/tDGnQieQF+lDCNKDgQKgfhwDp04Ukh3EG/x2BLgr3Qc24
-gdr5Bh9VJUyMbA6MP1K3o/CRuDWwt50hNGjn0Fu/QnXicT0t1ZsKLA2uQOvbiNN7
-B2CsNoKk3qaxTBwfUTSdjG4oB60cSLY6mAGFpjdFDpA9AHo3LC+YPTFGWUyq7iFK
-nvSkcW2bwu8l1Y6wnnB7cqKMe5nMRsFVNOX7YOE0wjQoyiH4/86bI059YPwMvg07
-elW/6Y8Nmfzb95nddjX+hJCunIloIGNEpqxVO1+ID8WBipOaXqpkyPLqLLCDzist
-7MQuBzEce+OEAp3gJ/HK4IKCcZPSJEsVkrDjhmY5So8OTK8ZF10jIdqDUrtRoz/Z
-QyfqI8zLtdZxoWIfke6HPjdKI52xYa7A2Th0PEd3GbNKOmzQfl2R8JyI4WERzngA
-VwYRcJYde7FWoir+HCpOZWXVFj49NxBQg5/HfpZbWLElB/xOlXFRuigry+vWM4UX
-qSGisNehkMk2EjZUqiZanxjfwQ8bKJQ9k1yeZKJ7PH4yhDABt6qMUwobtQARAQAB
-=RHSx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
deleted file mode 100644
index d437fadaca0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
deleted file mode 100644
index d2cefd5e889..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
-FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
-J7VtuhdhIE/+rUiE1go2vkQhdIaad8om/kQDsovbgqxfX6eU2hWL51bJZwCg59D5
-0lXm78y8dlbvGaW0EVdgBesEAJ6rcNAA6rjsi7BUXNIpZe+KF/G/slcLJETgylmw
-g0vquZP7n0fVhZZqB68zSmTcukxo36rd0jr9eSlhPj/6j9xs7gpk/UFWLWsziZDO
-7kZVLv58v6ktK1Dk8u0F9o75pDBjgxOGR7VPVTblur1dIJ+U14ffJ9fn6wzKY8hx
-hZrgA/wIpuJ/aSSns2ccKsErDMPRJP/TGygvrb1Mpfk3tLeGF7owI0sL8L8adKMK
-g9kT/8VFoLzeSeEwUDOKDVm2xB/A5pazoUcgxLdwYs6g/XJzA7y4Sbfcac2W5IZ0
-4WGGUobf5Gp/b3NeVuff+V/2UN1YIr/hlOnBOMQDlNie4loQhrkCDQRE7zskEAgA
-i+8rrcd671s/hYlH3mgNtPbmb6KY21axOKIkwqwVdFoG5nbO5SssW99d+naj6UDJ
-+x+mbF8zTb+0uFgEnHlrhjJ3cOSzuSPZ2UY+5X1GJn6tkHN4e9knyQzoAFKNoCbn
-YHzbMkEEyKpziDzcyAuFHEKp1JoHhXD465eX9b/RFcSaaXmjttiGn8bjGhgAiRXD
-5GAP/BLkD+nW0psTbLTraJ3GP+vVka1kwnDN0i7yvpvdSjntNi5xs+tljAtePbs4
-ogWQBeQV3xFD7GwadVhH/3yHRlISuEUNRO/DMK4YFsDYjU+zaBLk+lDka38QnAIj
-QYxhe8eypB8EuiOarDU3dwADBQf+KBZfOx/iCvuPcV3LFiUseNOAbF6xRbmAoJaq
-lxIy3E8fX0oiuEp4OVHz8U02BLsBtH4LIpiEj2/gyELx0P25GhS3S5UtfkNvcG2A
-fNZOtNlWW40GI6gj2KxyJqOaXAkfW+WcPJrgd+gH+9JpJzVfoTJyqkq6r61r6UNo
-gQI2nrhroPjv225TyA8xFuTyShdhRo0WoMP8tqZxDiWXsGzdFciPaLJ3GPwevVT4
-dCpbCvR2XHh/vVuytwC2p84O/Wrh9TUoT35Xe6vY2zkgGg9adhXdj47MDZG0BWqF
-s4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crA==
-=2muo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
deleted file mode 100644
index b22da3df4b4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
deleted file mode 100644
index e53a26ad84c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEmhev8RBACz56FVQ9l701+PE7Nr6+6Lsoy5tK6wmV89pEvUDgDjT0VTs4EI
-dupAk4a0dLn8Lu87AloEYuSzbCxv5cH5vyDcvLDK6g3/sRC1LPQPydD+UlCvG8LI
-jCmzJYSJj8joVqTBLL2RBdR7xUie34e1RTvAM5b0UHnnvmsvEwwFRsb6CwCg7VFi
-5CrOZlhNeWcWqSpPZCTV4ikD/2xEBh5fUlpfo6qoWeYx2pLg7X7TIriD6IVSREmT
-ewrVXK/C5N9jcJ1zCERjkPOinyZh11MX9dau6M7I+72bapVj7Za49VHiPutDCb8t
-3OPS+ksddfTccQw0iHGDjSusJM+hX6wmHDBgY++WBCYX9TkZxz/cFutqOZ+HBYUW
-QiEjA/9p5vk/gpSB2UtmUn0StfAnwsqpiiwV4weS3sbn66qRYq3jbbAjS5v+jGwf
-KZjPpUyBitKW2Jx+BgPnFy6yk+u19gv7MOiKwikqeDqyF6M0fAjJflproQFLyHZQ
-7YFfIvhB0k76t7qSeCU9MA2wbU/DvDS/TmsMiMFqBuhjB6T8wbkCDQRJoXr/EAgA
-oJmSrlu4uHo9RhCtUmSNOczGf922j95Ldou20NKmRKd6Mki9dGdCt/TJSCaWFULf
-oQ7rKDQy8IRrP18xaJ/KzhG6fjh9uuA0v9x9ORsEHB5Xih3s9gt/TqC6NWeOSd8R
-ZeG6Y6SgtFcA+5a3UP9yFSXo0xS2It48f/ClB1/I1V+iQjVXC3pbs3LwGJlaclNE
-V8ROkXDhyYPwW6LQkWEDa043dSKCOFe6FnytD/9vv92weOFe7pSltEJiHjz9qpZl
-Aq3CANsjqsqqZJU36+8rpyiJfSiHXcdjgCiDQyzdQm5HQl0cU1e1+CabMrL/8+9X
-6C1a4dSXu++NDXgbVB5hnwAEDQf/Z3kUqSvprtKZjh2orialskkQ6jQlGTSCoX/o
-UAsBvnsVSdP0CHUnI0mYfIh4WhuiJwHgmvTfjrAzU2Jfwww9glw6OlhXP4mgvM23
-rF/Rk/gpAaUfweSy6TYlynfzFHQ6HPIYEZqGmLPJ/n8a4rsIGSWcW2+TC+OEI7Rg
-YvC+LJuoXToqn2tPQ3Av3JeEbO8nenk3SJtrR70cu5F76ANJwgCuwug/ylzvM774
-DuXQd4vPFd4jFxvj/AvKs5itQAGRaInfCxn4uHcUZc2WiGy7T28CpD1Q3ptUybs/
-ogyDCKa/xVHKXu9wRF4osf8U1DdDpjfabdKWG1+RMbx08zH7dQ==
-=WcKl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
deleted file mode 100644
index 2aea540087a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a1885c07a3204611fb184ef7098a31f381819057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
deleted file mode 100644
index b669eae6ab0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
-wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
-ZXaRUHGWjU/lVwtOk1J9GokIFoqtWqBaQMgNRTyyHKWKpb6xxjlzkrDqV+a3htY4
-xNe5F24QLFqf8QiiLq0nDENPzvTNNerZhGuRCHtMgV4eih2iNzmqZL+Ug/gmNzyw
-vu6tWGNw883JQ2HoJr/wC8blJvDJYiOcahrZ5enQKttNKXHiodvL6CTP6q+CTa5t
-EQwbsUAih5tndvgwKkpqVM4aZvFTmAw/AZavABEBAAG5AQ0EV/NhAwEIALdwrp4X
-XrmQqdUmtSx3suIoWefd7iK3wUY4Jzb96MDOmHycLoDorhCcErhX5OIhQfzL+lNL
-xrasCKsNx0ymsVKMRQdMFUHbPT4u4SvPa6ZGYcipj7Y2ARU90RbVHnGneV2PNt2H
-sVJKamqUsdemACLjf9Tr3HVRNJe2PMRoVRK8GtD9Q8WDxVzbhnKh6Xvj2BrWfb6t
-Z0jpv+EFIcNyjAAtIedA/nONOhKnaOZGbfIk2PknXvCvSIs5Uq/bUcauF9mmtluK
-t9k2odvmZufup7rM+dSxI3YmxQ72cuik1LLDYbKSp2B0sHxi+uN4YMw2cufKso6T
-Qv9rSUxjx+Ee2gUAEQEAAQ==
-=f5pB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
deleted file mode 100644
index da7007bf710..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
deleted file mode 100644
index 6df408b8035..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
-95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
-Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
-VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
-5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
-1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG5AQ0ETjlN2wEIAKRxUnYM
-McvAl+AzYn3UUKKaxhvenacyhuxNZzaPbC222PTZd2wAe7jzXNYA1acb4EuJpuZN
-xdx9ijHrNl2LzKt+J+z0N6/5XvoDjON+2KVgOEAHUGGcVWaI+ZlXCCNo7w/QTvDV
-C69VcrwSblC0zjeLDiiDr6pxiy1tD3eYoLpICgcahaY2BnyamnRN8qxYjidc/g5C
-H7nYgZTaozn9Acyvry/tPDamnv2xAJz1MFnRsdkCPkBzVYyDpR0XtDO1ju52np9x
-Hc05Hx+TVDgof6PGi8n8cB0q/WieRQk7F3UJJ/zbTRPYoDsi/hOd/bUqECShuI9z
-hbIEIh/0V9SmrGMAEQEAAQ==
-=/hzd
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
deleted file mode 100644
index 86601279642..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
deleted file mode 100644
index 12ace9e88f0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
deleted file mode 100644
index 3b7f58c1acb..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
deleted file mode 100644
index 70aae820c67..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
-9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
-M6mGWsr02oVZCKdRzq0sTa8qO4UXrAjfciYoe0n6sc5e+URIH0Cmd8p60AmpKPaI
-L8/dyfDYA0EY6VVJgYlCa44IaDet7xb2VvwNxbTmvZ4lui/U+MSt8IDaW+4g58UH
-7gkRGFq4FK1a+cwBzQsPRdeEgAXsRZmCIQPt/Eti+ZF0XmLe34kT60lz/C+WcGb5
-h17NYkxERAhvDET4xLykSW9y64GEYqFVUvypqYpGk3xQ5Ly//stai0+CzwPDbhJV
-HZVWwyy4zCH+WrbAtoZSIhbGJNBryPVf+qV7e4kVdc7GTMDy74myl1d3W7v9XBWZ
-TGsVAXfemH/4CgznDw7Zj/xD5i6wnSd9zeX8cLVR66yWOYxUtFieuLzRnbbUEKAB
-Rf3uLWOLN1eTgfg3/w7lx6dn9PLvWzOIpkeLF3UHIW9iYHNhbs9lCop75o/YR/g8
-5t0p1bIm97tCKmGZSHppH4KmWQTHLaBG73H8RYCXlvoiwCApleQPaMT7q4FUJr8U
-Utu6YNQgzoE/xUOHAPHO66DaVvAjR0eS1ge9wf99CKWSnU54pwQXo9IGCwARAQAB
-uQINBFu1EwcBEAD1tTlKuxwUaoEm3Gh8lw6MR7fnBgiUZzED/W7obyUpCdflOSHA
-+tgLkjpbz7azO2a0beS21NkXdx4yOhJ1Yv8wjCIwmoA1HGC17SHiYXvKM3TovEFj
-BUhVpJxOMrR68GVC8Bx2r7zRNnru9fXzwWPkyq8qPOhqWqf465gXxZnn70qqBQfS
-sSXq+9hhVGqPn8PfTMUiRGb0O/8fUxL/bLDva+w1/hSPAMgwIIHJ8Vc62dHNP4be
-wV1r8yMjNZlM4mysm+yVhgFaH+WgTJm9HSDSxraFptq8QkAhIpDuRXORGFMm7Ain
-sKzUuMkgfPmW7sk60/1RBQ9MmKh4ma0ia8OkG58jby4yyNCh7TLP56tzyai7kk14
-l2os2Zr1ytBbSmXp3HKiHO6WU64Sa6HmAyqbv7+gP3qHz8nj+UtiWn6vo7e+Pzcp
-ejxcQUEZ3hyWGViQiRHJ6c8KDQLA6YlqJ+WZrzemy8Km7qudlpo/dUnjp9UzXeOL
-Yh8GIcAb0bfFFcTTyTYhD14DcBFCiBGLcQPiuPzzP7kei7IHj+7b+VkiGQ4+77wz
-shjTZrhA/P/e83X/QeGmfHGPnHOXFPHeSDYLf8sroEnG4SJcuoRXEavDeE6/b5yb
-3JgB/KOfScavAUk+MNHyssuSpJDpuLGb5X76qnwCGxsL4OBctwbGBJNU2wARAQAB
-=Q7gw
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
deleted file mode 100644
index 5a57652271a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
-r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
-W6/+MOieKsNTghAogNiTOp6dgrFn6Uw2iCFgRUr8Z8dPUSRwtoPtw359nyIIllEf
-lBt8ZPbmTZ3rn6y9TYviFIbO+pIVc5iGuHCyr+9NXdOpNKpUKd4h2TLtixtcNWY0
-6TRLhbd4COwZVL9ZZwAlyKhQ4TbvvKvVCS9+HPd9onQ55s9iqUTA9xeRW3D5aVOA
-0VgXrFnAq5HE2x7+j1qZQRqMNpVTDgUptpDG5lj7rIdgMaYj+vL/bgmK8thg9su4
-8TdPgza1ex5Q4Hb0tbxg/H7Ucasxys0MJ9ktG91vgR0oHP0y0Lf/3uyoCyhKilKO
-yDqkKFeKcTx9TCZfV29gDs4dumH1Eirpg5ikKjPExhaITZgtV401CDsS+DgXHqEk
-YN9R59qJ27AUV6J3dAAumzXECXBDcvyLdb7pEIBs5/QtdgE2ivCH8BwFlmcdqe0+
-uKL0jgylMDsfiADVhzagv899MqrmQh8po6Sj78G0gwdfCF9neZgX2czolSFYFSy0
-rmSwUetem6IPwaXpV5r3852P+MqEvI2s86c3ZIyGFO0ltK5KSZq62DANqwARAQAB
-uQINBEzH8KcBEAC+7OdU8Xc38u7HpPQQPAmBHw5UIACUFP3/xrsh6dDj2B0TMlsb
-mKP1MDAN3qb9lwci2NEUgLKWrByQdTMMYfOuJuGwFYZ2gU0awpvaD4mb07gQ8qxV
-pHfpHSdpLMYscViIKhTcqAY4RIB85FUN26F8lpetQ93kKxSegMdLW1kwB9UTH6ik
-86hvTCT5ggbupzWdsUh1Sd+0UJBpgLn+NBQwjv7pzPVdSx8+9XA/G77iZPNeVihe
-VTtUfoubpN3BpKoRrJVieZX8YjF2RJmzSjPBzt4mLKPec8AGPxDzc7f4/NXX445k
-BkOyDJCQxwCTHjmF1LEJbxipdPTGrWiIw467U1LrFCsuqc+ewGJBZWMkXEWWMzQF
-axbIDKy8txnTgi9nkEYW/s0QjXa7+1jWUye52aVsBpNc5t/bh4JxJ53u5qcXwQYP
-hTL0o2pXkgoXpRAbwhoZ1IpRGL+FMyAONYdEPRtv4Q4udUQx3DEeNZw3oMpXHHFd
-S7KUiLhQfESgHyR7kugpZYwbCQO+feSCWys3rMKL3s+8kQq8LqjG/xXOLiLJRDku
-7n/y9FUWZzNCgpx8pftU3bQRpDLA7yow8FXRoeQbmSM4aVydYJhaehYRoEmrlJ0R
-MwlnG0OV7kgTipJgaxaBfrxP2N8Khgf4dbhdxslkZPmpD6+scgT2U6MgqwARAQAB
-=tJcb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
deleted file mode 100644
index 71760e28d01..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
deleted file mode 100644
index 3145005c70d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
deleted file mode 100644
index b6ee3744e79..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
deleted file mode 100644
index e41c7cce940..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
-3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
-tHmG/CVFECV33C5SCvzeedzIOSSHy0ybZFrhE2DYXgZddavcxamuRyUOUZAV27yV
-Vyn4RYHSqy9YRz5WrN9R7BK+MeIh2vBJ8Nd9N36z5kBukTLeDZDsb8wujSuMyPGz
-P09gzieX6B5x7biz7Jzotqj4f5KRD0fHbCSVW60N1S7xXFsjZZf6dYdYINWW0Utc
-ABY6T1H8FOfqkd2tcfv4TqNd03vweUiPQnh0v6nWURrQKsty2z7YcVI543l4P0Bv
-/5E3YfT/B/BohsYbakT6nLSlKwgpkHz44+A25seRumMENbcYwi7XFXge1K8pfasE
-Xbf4X+Lngbt8SN7HGHvtepMLlpVIvKhGSCl76Aar/fjc5vQ4Rjd22RTbS6V6MUY2
-ROrqcjzLr8N2zpQgKEL1lG6U1huMFzjapti9CajT9le6kbR6bLU+JVUWKrQSVB4f
-4S0egNNf7gv7lFHPp5fLFwa/jaoYfihydCyYPY2BHhp7muo+k7FL2t6YvOt5rUoB
-BIYQ7LhMbG4MpLNwTlAGI0QKvPjUylZ23v0vXIIHvF8KFTq55D7C0VGW9wARAQAB
-=y/nV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
deleted file mode 100644
index 6155df6d439..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-124dac8350968ec2a8260584ee8ecbbbc188fd5d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
deleted file mode 100644
index de46195c1ea..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
-+cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
-lsq1P5bi7RQyJmmr0JDQ70uD2i3zIHMjqLKgvOMmhXnOnstCEQR0xPauEkkcHyY9
-fSZkpoD+c/i+1NvElX8/pgf3Gx9gs2jSgVJ4eREuvTm3j4ro+D6oYRbdSFHn7+RH
-1GF3Dm4pgB9b/QQVgOSOQGrn0OGyn6zGDbc06JyOQ6EdzLQv1bzl0agLO0/wVGwt
-r63HSf9C1Fy5PmcLqP3A7e9vMJ6NYCYhfj/kXdg2YyiW9MrkD30aHg97Gpqy3/jI
-emSmu0tqVqeFADS4iNXyxnpPO7pNorGmyYvAN8ONHbSyX2zL9RusEIvAbgPWZ2sd
-5UpwSg5iw1tBNjpbprPgcRzNgdOnlKYvHcfETvVM3a0g9pf5/2buMCKijrWi6nTk
-tJ9F1xXuVKCzY++AyQaZIDnk6m+bOPxUWvcIPdqxrm3IGzUcHAU26bD8nvWAKStD
-sIlf/9C/+Wa4wQW6R7Q6NGZBa09K8MRAuesNbannvczSoCKS0npTLfAJX7KjNh0+
-ycagnocbhln1I8RuRmvSMbTD4npX7rdUmDFGyTQvT7WmOUbn99NC5arpfwARAQAB
-uQINBFHtw2cBEACjrJ7CmtJDMU35tIRODGY9ze3AOiphP//XOOfri0PAxL0NJtIx
-K4rslBZI2PkSJxhl9fGEJ7gEzmsOmaVZSlN2GQvHXjw7G0SKLNM9UUTc6lZvVDEd
-UKS9asycHs8jisTrqFEWj86aC2AunLsehBXZNPORQ5k9aqQfQqT8lZyuA3H2ypcS
-Hmq252n2oa8f+YrbQ9a5DOdySZZ/7TuyXhQqCIB0u0g9b8bO11zP9y6xc23Wbi7W
-bbSR2416/vsX3Nmyle8kqZMnn4vXIJLtsSYUgVTRMuiVOnz8xkNSM9MaosA5Owhw
-a94ZyP1irC9UHynK6oVun8ChhJmCzub1sOqc54CA+XoJvYJ80EhQpnvSoeLgqgJR
-VfVdbcAtgr1vbYfoceJ5lqSs6TVeEmxQ9iBMGAxSW6yU2mnJojBY6tzmYq9ZjCNS
-vORMGO6ZpcmZJ/kGhahN/hyou9AqC66GdNf55Q+OwW80bGXghQ8NwtlNr5cLtv5H
-R/zQX06z/ofiUmAbc4PA5uDX0CRIe2y6PK9cIBgU5YVJiQGT0yImd693J3uMlX/1
-YcWnXHbSD33CZ+xywyLX/vmUxUMqC8OFZ7GSVUK4wVLc7Ompieyk/QItqFOZ14RO
-QrOcOXA+qeYKpfkUPKUahDO07nzdRp1ebEd3A1PWt8iSvotNsHE+xb7eSwARAQAB
-=weyf
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
deleted file mode 100644
index e42d6f830e6..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
deleted file mode 100644
index 9f01bb4c224..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
deleted file mode 100644
index a2c07049cbc..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
-7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
-2RRGMnMaDUc91NnoxKs/7VlQ2ySk6Cm6lH3t8KVkwaJdU59lAH1ey9UKhYyvRQuT
-htenl2R63lyyDe1ZLMAlmQXi4RcCWOO+L1emChNv0q0Fsir+7go9ZNYUi6pmIEva
-jKXM8bo/VtRIHrS73DsH7BVVCURYoBWexZWlRdb86KSE993dRXLvFPy5JzlRM+eu
-mUY3CMKxx3nLaDN5qepf1nGzMW88xjq4z4rhABEBAAG5AQ0ET39ECwEIAOvByyJj
-7wUj5zLY1B3MxPoHHLFVsyxLI1WEgXDlItY+uykB20z3BwKs2CZdfbeBQDf8lNaD
-o7rv+BilZ4tu8vDRkmr82OXpU2dtpalKoKk+g46DhtgUyx7jojUSDKgZgxsuNZhK
-utgvSNdO6aiZ52wEZnXuOuOpA4mn9r5BdQbJwcdA6fd63tniauK5AH/NN3w7wPIs
-pObgxYhoN3+9CQLu2QgCnM4JQ9FlIyIjuScZ3M9rFojtjrlYHbE7mX/vU9Gjgyrm
-utGewi5+GSuGaXYm2zhKeuly3mhrsuRzyJ007K+FJ09pL6K/wJpjyjq8qfaARZz7
-3+fsERMJUDdofz8AEQEAAQ==
-=w4JL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
deleted file mode 100644
index 91a7375d718..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
deleted file mode 100644
index 26d0506b5c4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
-Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
-CBCDJg3ZaqpZti5ti2TfiaXHeawTpxaTb3V5tT4NYhY0aJqe0MGoVl2yZyoKMWsL
-8XcUiJkUYnpu98BvnzO9ORSnKWHk60YxzZuHh5buMNiV4aI331ogiTxqISzTwEdQ
-ygtlp4IeqE6w4x4RUOqQg/mu0xhqnP375KksPtKALLEr9vgqsJXfWVa5UmNl+rZP
-gMiNEt+Abwewa6IQGgSU8GuxMp3qHxZtJQRNwIPx/yb7FngtWrUKIoQXs9xJwdJB
-z4vhfFVeQlyPkEycQNcRfHVzK62oF8L5Jj/D8BIGAD+dj3x10Cy+qVK6BTY/F1zv
-5iL12LjSlz8DtmTbqjit0WGoULjXFZALAU36q6FmE/nMcFuLaTUIinGV4fMvLgf9
-Zn44juAhZMweOt63Pn4n/K0W+uOdrLSmGxJDhoxztabUdIpIMsw44wZ8gnSmPAef
-IDTCjJO2x9s2YuaZbgstpJldooxGJ+FTe52QXFphti+tkiGOg6Tpj8Xq3+ZEM3L9
-Js38SSdys0XBCHYiCv3/4Fk4jspTsCFrDzJ9HqNjsiktxPm9szmUZ72RjwARAQAB
-uQINBFTi8JIBEACq+dSR6serUWrem1itiw0MslItsFyHuOV0+K8ZUOLRge/arBSf
-Gjk7YZPFzIMVbxXo7LYiciHCydZ9K7HdqCqygC4k2IV+85Ll07ZfraPHa2vfgXsh
-u03+VZcMcp6Jxs+UPlVHV7SE2R3o2w+KvKqzLLRLb6aBREoJCsI60HTWyPjsHiHr
-aJ+XFNl0LT22tIPJFjOTeVKU/8OMBs3O5ql3zgdMG3DFGAS2ALiCb1wh+YgJ9c8T
-A44R52Jp0z1XUYXvV298FzHD6n7ejwif2MNUkLF7oFfSknQLkAw1WuqkwYn3QYoc
-fp8aW5u3139vWWR5V2yLWeGI1+/spTJqP8eXBnF+jPWuig/GkHGrWCn+MT7Xv8TT
-2wR4rdhetkYPnPNX0ra+jURZbie6tO/C5OWTYjurTSzBDiPxNLcxxUNjrOMzIbcL
-LhSRQ0DTFLiC56D+5UvPIUY/GiX5O7x4iF1kwSPcoXz1w+xzzCwfFZg9oE5voHAy
-brGkTFCIb5Oo+WKWDCY56K7yHLIUT4UmiF2Liaz7gesTc5yFSFJhP0WpkVX6FxDu
-oCryQx0L38qD+4c445N7aUfVmqbOBBp4ORpJ/w0s8Rb946yQ8TTUB06otovyIz1i
-Zsuj0yU9kzZYovrZpKJLeDEY2ThxdU/O3ZkAowEeTjW+KyddTT9rUuggAwARAQAB
-=iPxD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
deleted file mode 100644
index e42d6f830e6..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
deleted file mode 100644
index 3fe473deef0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
deleted file mode 100644
index 234e9d4e78a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
-Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
-+oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
-QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
-Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
-kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG5AQ0EUuZY7QEIANFoey9+
-gIJ+VBKDYOZIK5t7s0J3fmgYasBt+uOycrZ/UmZfj3I502i4nYVtjwdWJZFp0LLh
-4G+Ba7uLNdTYEiSOEowjcxyBr2tvck98wDGCKkLkiesrg0IUM56ZGBqUvc+hale+
-bKoTV3+HwWfh8Iu+pRPHlNRUGpLTnAwatQf13sJukfRD8vXKdj4em9CtMjbTbsVB
-LdJXNPRzZV75zfH1DOGHTxvHYKDRsVKUmMZn4JE+gJ555dIYxygjYoB6V5oQVIy6
-hud39dhhqmPeCQDY1bUu4VJQBVJZh6WM5+1mquc6SOtJ9CWJ4zOk7hUbWstalOkn
-ipAzIIMXD411+PsAEQEAAQ==
-=dGMI
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
deleted file mode 100644
index 73f4cef2ba0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF09IUABEAC2p2RNMRu3DgovIw/OuG4BL101EzTepeoPzRbKll+/xtNiN270
-ekSio9Of9nn7ZV0n4AH1nFM4iQqAC4KFZ74NrgJ+EeHoh3eZr7hyQ/TW7p0z4097
-Dm+C9PbN6+7wf1sBdlaRwsQ+eNKkdkal7WGNXUX1YiUtof8WZZRkiqRFD+0Ldsnm
-frJFKc3MPPWR0UC56JmqzMaN0XeiQvcDaoJJ6W8XLT4QbzwQMJVpA1wKyfMNodPO
-kvJ7jOFNLuLA3a8hE/ZFrvMJgp6yziQoIxC+Rlim1AN0leLsfgjVU7TnqTS8Z8+B
-i2LRwpJhLS/HbaiRsJbpXOr53GPiTuZTz78OIq30nqAg40O+NWghOX93DzB7j1xF
-Aunzm/Z1VO76Feos3ORQJSB0PAQbLqCzAyyAu/xuF7DZuiobHB+b8ggZZRJEiEyL
-O64YP5UBWn3sEM+VdNy+NZujqvNKXrehISk2GBdmAQFszJP9Ti5SZiw/L3z148fz
-dERBs9s4k6iUsrbHzEtHvqxy29okKvQvW/PgsA1pImByndYBXCQQrl20giUQRxWa
-mMEy5Zt8DEeG5/D5mRDeJk/sjTxRlFoFheFZX5NGPD3I4/P7um2L59Hu93oxlEqo
-/OcAXDCr6s2lQjkEdeamUPzsGh6/4TKqdP/0wVgxZlDs0U9/iMoQPxwFUQARAQAB
-uQINBF09IUABEADeGZ7xqPNpZ7v9VLQOmZvzuj498/TZ7qaL79o9pN4svEiSP1FI
-O7ol3a7zHnwfHHvJyd76fo5lVlvRRtgqEfJeqzJASUbTQwPU5U/7cMEQhLhvNe0K
-uhLcNInIpPdSmX0z0CS0vuCUCc59wXPangyXER1plkqtaQDq+R+giY5aXRqcmutT
-DL4LW+lJYUIf0lybseVHNmgqRRKzIvD4aYowegHIKVEiBBxh826rrLmB78608/6+
-alABLErpfflPTwyJnI56D77672fu6rXE5m21NiXsEcS5a4snP8QrxcpFkJbBvxmO
-wgGuD8/6juOM263uCWmzt9Qrnj/ujA7RvwPlFXZSTTqmRchEPFTCeC/nRMNIImwR
-DmbrHZkgqsGJhNvWba7f86DitCn5+5ne+PWi7gAK6w+mjWDtUHOOIpo6U0sEegUS
-u6frHaE4U0dB2y+FxJCr2jhtuqNYjlsoFkBMNGCGKUj5zizbX5As2QR7PPtBeA2I
-ZEha74CzdNx1tmBHAqIAmARDfy6iamAoh/yMuLCcOxV0ZN4qtweu4DmNuPFJBUZg
-neDSfEYv2e9oIdVkjaMUZggfxeO5xUUoGaWZKTAemTAASx/wNef/T11D0jwxypTa
-pGMgmPtiGormuHpN8+yJMSCSnns8DvVTHaU0d7kVv+EDcMe+RQzv8NnCPQARAQAB
-=yQnj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
deleted file mode 100644
index 6d4dfa116b9..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
deleted file mode 100644
index 78a05175483..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
deleted file mode 100644
index 3af575c8f57..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
deleted file mode 100644
index ab214126296..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
-MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
-ymy2N3BP9cz2fJ9+3PpBccUPL+ydFKpcnEnIwiQK+p9JjEWzJBlrdUc/UEJ0R+n/
-5r/+0+BHiTEMvjAF6/SwyntpTWpu7iEzLv/pfdCuhFKa4yn+9Ciwe3wGtSiue+dh
-tqKcd4YxED3oAswObBca3CC2HWWsUEH6EmfT1jUdfy1cq4X5x7AZ26oFYfG+odqW
-W5dcB+13VkJtJRzQTO/2HKtITJYC65a1jKt3ABEBAAG5AQ0EVQEbtAEIANsILuU9
-cH/EIEL+OpwIacr/y3/6LG+ok8SKDHIlF6cSpusSsWM6L+RGcZgvCDR0S0EEid44
-yy8wFMvoYSlsXHLN4SqH/rpLIc4CD8DdCLWraKaRZrhtqzNWSsYxEgqo7n1xO6+c
-sU17VJArnpkGPHoA7ooZlaGrc0y/rlkTXH++LKqh8niO9Dap46pLFrdgvuyKbq1B
-6faAf2JMRyvqy2+fuwfVGTc7DEUUFtwGg7FniDF0zl+3rFG1ud9kH8UWz+GwCwFT
-6qhVglgOmtJgw1CSYNeDsQvDB4YTJNnMneMSdM6CkEcRhLp2+lz90+wR0K/a9QBE
-1NPubAaRB2uQR4UAEQEAAQ==
-=uaBu
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
deleted file mode 100644
index bd22f88d8ad..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
deleted file mode 100644
index d0de6ff44ac..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
deleted file mode 100644
index d1f2b8f9914..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
-YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
-en3ClYLXT5UVx0H1ZfDVKCvmaZVirZInfkqbi3OiPQoWrUfu02c3DiHQJ+Y34kdB
-egH2sIShNH8WLfEZ3YDQ4XaWHVuN1C7VwCBM8R3OeTTfyDrTsuyqJ0SeZXRR/6df
-2pEckjF9DNSXyjzFg24MrZhuhgbnj0oR1zmRh1EF+KlBfF4DF4acfxWqqcJVJx/3
-FTtOkLe3Xjj+inyJgxOW52gD4DsJpyf1tIbjAQDZvOdlRRCqZB4FnzzIb/1GmkGD
-JpDLC4MQmqgxkm0n8wgAmmHLpqDTdmuyJXvdX9RdGycpW64sljd1mpzTWJ8UKDhj
-uFQVHSSEdLoHoVj8ItnBV2kXd2uoQ/tWzbxFBST7wE/tX0e9G5XWaPKogvOKeDus
-u9XTIds2krYp80UTYWFZ88oNwGikdIrEYURSYDsYt15miROtKHWbSOHeLVbZqgVx
-dtWPqQVfH4gJGEH97/OSmozqDVog1aZDKBLGZQosng5h4j2RAQpjkaIdxKl8m7CQ
-x0Yi9tA8yD1QhRGggANQIb4n00G/vm7RMU/7NBvvjAQ/nAFjbsyO5oX1rBY1M6Xo
-NFqIBrHSBzV9MmhS3nXU+ZjAktCRhyJ7TsoHM0OYEAf8CduM5Zzp5w02iVYkFQBB
-wAoKHMpycW5LhMMMS4w7gmOfP7y04rtg6+zVe41y6bOqn/SxHCcCgnE/nhdexlzH
-ElYE1H7+HpphoI5vEwS6uElF67CoO5r74Zrb6nshGEj2AoOqjbrsdQm0noBBNYAu
-f9RsjU0sQQFzLW8+2xahqK3oZkLWOkSxzLtVwJbm7EGaGIYxEBjg87OnGQkAi9vv
-tVPwdO3VWyvgKLuPHudLDhTpeH3AMbzKgnru1Pnh/ZpiRhPzsbuFtFPEX8PMuCyE
-n4OLzUALl98kXuPjG5ww+24UsNgKMbKbu8qq/zRu7IHlpZvd730RoCWU2/i18tnY
-zLkCDQRMFWTlEAgA+MQFGIhyA4Ww9g7J8ZiEltwSzRblrjM1q9anexsBIGsWH37A
-92rlVK1RzMVfhj5yl+BzIBGO+zHbgycX7iB5/Fwsm+6R/2Uich6NDm1Qai9rc/jg
-3MS0phOAQzgxlGKOTS2GzdbDJCBQMijDObNe+Cs5DNB/E29/nzzCTQvtRzSeplZN
-r+8Q8lWz6efXmm5EeeZxN4x1YXjjzMJCHbc3yGxOjTgYQOs962yUYsg9UDRJm1OH
-9NKZe1m3dTRIMUcZvL12dq/kyiHHR9V/6CkdiNw1AFMi3tvEdvX4D1k1/Qr/2ORZ
-E4lRzgug4sKkpgaclLnkJZ9EMczmUFTGbbkx3wADBQf/Y+2nZCJSuHiDv/+SdhQh
-OBapZ2hYPDvg29mpPqin/LwH7eFTNv/oos1wzuzGtTHHGEP5mUQLOxjwdAXsWMMj
-scSbCs66ytTN7X4O8qh+1yN7vrM6ZBL12Ix7Ku40cgkWyvTVLBXKaEGm4ElhAmSL
-Fpu+/fJw0riR6rIuwHcGB4R1IJtMWcj+b1odgw9QmJ8AGpHh2WVdXspoCGnTUN4m
-DEswZjplkKXCgLypU13SrHVOqhjd4caK5GNZUfWtCKtwNcJMnvgp2truMvh9BBn6
-widfK48hEknQtXzGjui+bZz2/AD7/OT/T1CqDspB8IQlBCMBn8J4U1grSrZ1wTJf
-HA==
-=n1By
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
deleted file mode 100644
index 0a0d4c846cf..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
-R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
-kaIj27OJgbziFcnMAtvGoFRfaPI/7TOwEw3jT7B87RXeiATX4iL8fzMUmkfZm0Hk
-qjnepMQeaz3KzMY4DfBcI45kwzl3EIBFIlk428mhBU5iAAANoyPsimfqEPRCUDjx
-vT8g7PvpkBdNZgRS6R9vLxyzKi/f5KswZIMvop/pRXIhAKDhCCyr2GD+T3JoIKp9
-kvS1MQucWeX8+TFWh5qEA3e06Xu0JSdPCEej0BH06EiTMsAOU5bWqgLAO9DVpS32
-I092KAuMJlEPCnz7IGXVkeNY5KYrlsmoKrBO3GF/zsCyiZDvSULkVJcrtBCYOrgq
-HRIzvJWQaTJ5V15MD8CZIELyjCGZ8Jy8hdZpaTjYalw0bUq+yRAqMD5slp6A1tnv
-jyqVTgU+yRGq2HB90vJ0D3P1w4xRDuNF8c02futO415Yc/qkyh3/5AjGSoocrlfX
-cMreJXpQWVsvXn3NsitjsA6XOJpMOgipCDxfvn8SSLl9fWNJf55j7fCkBokF/lIi
-81RVQbyjVCOV0OEqHJLP9asPHyAFvUppNWtcvViPxVmb52djnw/x/61WVQARAQAB
-uQINBGL4BxIBEACwpcarOeEN5TztQDTvemc+DXZuWirmHv1TyJmjOhU0hGGMzEnK
-KU6VZlUIg5YQNYknUOfOf/05pgQmsEhjjI8NBD3Cys6SVQ6wOlkA+KpDKs/dXwyJ
-ttYE+EG/IMzjwZW2DbF50HkmT2VK/oFhRSf0Par+cbVQ/mNLAVC7ueZWBVXldezq
-Vvk3tDYYZef9T8Qlf999LVXFgiMzRFrzLLcd2KEHAX4se65FTxIfFYYCrshFIKDR
-i4IWNzQqtPV7mb94wXY0Vwse5mMEgjmieGPjBGYne2JU0xYNBxtly1y3aeDXcxNl
-NrcS/Ake9AqWAYU4agtocCefb1pt5Q3li0qg3PsVKDJ5qWDceb+kgcUuHgtwHFCV
-ICoQUMsv9p5F/kWL38/OWcTR2lQ4tGerE2dmlyqFWu7mpELckAfXSpJobZltUbp8
-CO679g0lk+OJWSmxddlVybdXCFaAeOKQb0woQOkR1vo2tJHyGmGr20Eea+UX+kdL
-ojVQwYCqICdvnK4YpHuhpT5crzk6lohfZpBPMHdpR7FQQZeQEW5EbcFNfoUEwsgb
-2qkG+hQIL5Q7wRajHkGaG3WuhY2xEyoHuLSb20hP5hI2uhtxswUl/+IOjjZtDCjz
-Lz59Q+ADkDZYM+PN3eR0UJDqYKly49KTuz23zLluNjNwqo8K0y05XGCQMwARAQAB
-=Gshi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
deleted file mode 100644
index bd22f88d8ad..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
deleted file mode 100644
index 929d8dc7992..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
-85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
-9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
-JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
-D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
-3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
-LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
-AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
-o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
-TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
-nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
-uQINBFsgsskBEACsFJinwgOtkIicJPjQB31Zq14JOpaUghMQowvEb1oLe0erqS3z
-nShS0SzUeGsmyxff13Fua7Jnxe3k6J7AN75yLHyx7S2syzKFFYI/Y2Y5b43MVl+R
-fKVy+wR9MeONxmb2TSHSLfUgjjyVClWX3PVQnL8OeuBPKiGxSQUgj1TE4mzzS2cO
-TdyL+Vn3akbCIO9I1EaokjjA559VaV4ndF+YlNK7qpaouYIrnfKf9YrAbVUMohpq
-Q7NlKD2lBVMZiFif7K8TceXwMjindlrFgC59JybmiJS9ANuc08y1N1qU5Bxb4plh
-/KIKJ17Yy0H4e9BieDYwYSAI7UBVabRhjS5Xg1Uw9QCDDYpnOxsRRn+BFAICvH3A
-6xelrS7St0JwN4UlxzIM6S6NTZoq1stXH78DcJ7Huygl//msZXdbJQIJzWZd1AA4
-9oqyP49W5dp7bK4hNENTfp+9vRt85ZINE8I/yIz8aNT1uuQO2+tjw4RrWo3cHzyj
-ON3R4CfGWBi/82ireHpYbFUDwWXFDpemFfX4PXOY6gCYVCG4X7skFvvxBmJ0eP9h
-t8GyComD7LgYkMOJzdSHRk6X6FvQ8pmKSHKyyWZLdv+KnksV8R2tf6hewozqDVeV
-c2te/pi0UtjTe/x8/pXMiLmH+3cyyf1PwyMiuEAXAqpu9vSErAoCth23dwARAQAB
-=eX50
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
deleted file mode 100644
index 6e5da6e7595..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
deleted file mode 100644
index a762ebe93a8..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-yEeJWNSNDrnMX28AEQEAAQ==
-=+J+8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
deleted file mode 100644
index 39f8f25641a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
deleted file mode 100644
index 0629ccfcfca..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
deleted file mode 100644
index 9f01bb4c224..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
deleted file mode 100644
index 9fb46924e33..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
deleted file mode 100644
index 33cb475b44f..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
-DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
-tFn6YtkFhA15Aahr/vz31NBjUJlBmO4PwvkyxiF/MYP6TQ/AHar4xP1RxSYEPcCi
-dIQczQ8nXzya4OqOyTfibeGz/eiHHuwTLHi3Rd2kihQnlRQdhE1rmm8uTyzFe1H+
-P7WW7kQgygW6yxQ3J+DXrG8kG+nbe57ZY1oyv3F/fOBxzn/kuoKHZ3JJEMJmTIrT
-Lr1ngCZApgteAynRHk4t/SYZiyoyqZCuBcwHABEBAAG5AQ0EUqd5cgEIAL3PEOzt
-IFUibB6FYEkObVhsDbCnHw9yO5MAvAWB60Ohf1J4T9QK63jZ5/CiqcDrw+uab9I+
-Ruz/SgGyFS0UXAkwfTICUdhT5kUzZmGyoj2ul+iFDP9uUdEgSgyXXakrxBbBPzNa
-Mx8+GyIXRVFyRTH7+1gWgPQsdN1sGYOgZ+f8TMzAv6sxu0JVzjKXAAbXdiZTyJh9
-d6h1jS5Icilu8vRwn3Qc/ZzstBRk+eLbb69wS9YGoUlzYvDBz+5tiNwvHUriKc6z
-VT4Edngcr0mKWTdvD+AsvZffU0XK+vxbgMuRWi/51qb+VgK2gFeAseV6a+D1059u
-2+5Pn3h/Fv/vRAEAEQEAAQ==
-=EnO0
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
deleted file mode 100644
index 04fea655c64..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
deleted file mode 100644
index 853cff28660..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
deleted file mode 100644
index a99b5d7cf8b..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
-NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
-/1EO3VqvvDUt39gbaSqMCQNHctnFdb2QYZ7nRFTQeCqG/wyMdB05beqEnWEXzjeP
-FDF9y6gXkELn0lxUm2TKO8tU3h96TCuutDKJ0aE00lOeh/MbEaGHEbIU8kdfui6U
-znZ1X80EWbkCY8cKxEZHKD0aONSVHXwE6nETvFW9/9+K+sj/I7ytlyxwHsaQpi1H
-6aRGnq013VsIECrwkhmXBsLLXNjmhER+LkcDABEBAAG5AQ0EV5a8TAEIAN9uOpE3
-Ua9J/1WSMMNYGpfeEguI/HcMo+JIWZKwCiItISQ/yBEMEPLqmj857P2r5uBv1KT6
-IaJ8m9tU1mvv7zwtLFAQKytUv5mBMBnYuSoAFAnxdiH91M7oEwnmtIsf9g3ps71X
-g2Nih3rtbm5ijH5oKnqR4TuJrt4EdyTbDKrGKQKq9XOYB248KSQ1JG47AuQ6C525
-d/BvsKDVGdpwwwR8N3235rrK1j/wkW7TUb75VXEUc7e+z/9Eg2ubQ7jEo+RPX45x
-3j6HcOWGFG9Fe8j4wp4zS53Q6lRUIEoJmpsUpNWChGmwoL3bllFRKpubIFwiSrJi
-PMPVp1pl2Srg8sUAEQEAAQ==
-=8Tgx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
deleted file mode 100644
index f6e3fba880b..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
deleted file mode 100644
index 2ee06441948..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=Sk0R
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
deleted file mode 100644
index 0629ccfcfca..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
deleted file mode 100644
index b898fdf506a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
-WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
-anVQ8VL1Z7uPeqw4UbtqA7Or/E0aOhF3zkkmhaiE9Yrp+I3KXWH4F0Cj3X9IUcf5
-Z93CPcEFQx7ajxSJ1xw/mSgbU4AtKZXUdK1ehnFAhH3rcMVW9paFSYaXD8f+vUbj
-hdJOp3e9UYEFShsdwo2X0FRqI318ef3gPDpbTATyCaz6NMIybDgRGo9WOGwF+Ysf
-snXwLU2UnT44kpAzHjFdjZhQGcY1w7d8yGNrYX4qw/RMPhmuVefuF2yodBtRxhWW
-09dwNiIYFVuGS4S03vlnEfYZlhmRgvWZK9PDJXm0vE5GI7LdOKlqwZxvoznjGmUU
-lscRU57DtrNlAjyXMZaGdNfPIG85B+ijJmIb0REHbszvG6csX4g1MiZ+i0WID8Jl
-20YpJTUkkvIztXkAEQEAAbkBjQRgVVFjAQwAqfVaX/iL1guWx10Xum2EWJuCzu+H
-+RiAgt3KnxzXtMc8J4QzNV/Cr3vO3Y2a1qf0NO8o4dN4nHHXWbB9Vn5ntG9VHt1H
-a4WDLr7zEDyNpPiEe/sLrQLA5TD28kXIJ4WgDuVEYZ+z1tB6tkcZkUzx6182oxCV
-KHU9lYIxAvQzg+XAwFNoHElCYAQDTryKDxEADAbGDEYGFHM476/MEzz95LqgatDI
-WaxE6RDSBjnjSA44ZHsJGwcHjrmz+RXgFnhQjC/9ywSzNZQNWzWjyS9qgLmIEkHM
-b6mD/eQHrGA5SyvElqIJMMvXrRpnoG1l2FFiNn60wyuB+Fztfx9YgKlJJwdLfmDD
-QTuVInaLU5iTKvZZ9uh8ekajtYn3NUEbvAN1SK8gnWqTRhVIm/0wcBdtNViTytTH
-7CM0L0vx4FZpru7c2KyFQx2G4/0VxIolCzHz2ROD3s2oRTvP6B5r5EdCizrsJzrj
-Mljvw1hp99AnXfJPtNMyeHKwkfxVX8Kxnk2nABEBAAE=
-=iXc5
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
deleted file mode 100644
index e347b199ce9..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-+msz/1VmbjVzeWcAEQEAAQ==
-=o6L7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
deleted file mode 100644
index 43a7a8a00b3..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
deleted file mode 100644
index 497c2b28828..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
-lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
-3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
-FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
-0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
-UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
-0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
-TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
-W0JEQdCUVgc6MQEAEQEAAbkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83V
-rlAQcR2WulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9z
-qcRArx7aSaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpv
-uq1ZvL3ndApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0
-JA3MHOk8gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2
-Ul1C2OI+tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9Rao
-gEyFmCxiEuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkG
-qgDBQGC1PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gry
-q/vyQLg/KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAE=
-=9mb+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
deleted file mode 100644
index 0bf7fa00788..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
deleted file mode 100644
index 38f48c56106..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
deleted file mode 100644
index cf5e8eaf9a0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFlMSXMBCADcgN0/57D/gU5cDobPiRuDT6qAxb/NWhQiqwAocKd274r4gPJm
-RbffUEZEgKhjH6l0CQfilC4R4x2QtU9sNC9kB/D6zumoS1uI0Hmx1pC4UseUy55r
-20WDxujUQ7OcJbpe2cDcQVKmMok2top7ZJqt4KVosQEeT9jjsgBBbEtg4cWb5ddR
-5rf+aJw0v/6dMLef1r9YAo0ZtLc+g2dyacqw73tcWEd3oCH++SgE26NntN+GibZu
-VXSE5u6xI4KwfT2vUT3jt5Fb29myX4sxsfB7n/xageuJYy5ms1ABS+WDO5ssEZC4
-eQEVL7eyIb9YhNAW/WtjeAuOfOKNonoqKFGXABEBAAG5AQ0EWUxJcwEIAMgrP3U+
-7YCibxSQKOZrp63RaSUkv7mCvQ3Lx4P4ZD/sDEsLOiKkAc+ZU7ETTIQkEpHaibvC
-ZNrA+R0pfAj0LYBLstEIkUxtAaVM4DBQGN13Zdup46fI8rPZEyZVb2XpZ/qS4RYi
-StFyJzUdazBJs/IB7CT0xp4DUFUOrsykVy0aWzWt4z0QBe1x3AmpAO/DdrDN5gvt
-mWzWbV3f783PuK3g41ju7F9XX5nuuatNSNHOHt65XL4vmhmSfXuP6UFjK6MKzq9z
-pbZD4ipUPoKEId5ONDSucX4C8OydpC8+rFWJCDDDvocox3/l6TzihQXf8MDDcB0u
-1TgDPz4M/S2vBh8AEQEAAQ==
-=Q2Ek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
deleted file mode 100644
index 91a7375d718..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
deleted file mode 100644
index 0bf7fa00788..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
deleted file mode 100644
index 5320cca32c7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGFcp8cBDADrrm+f15GNXnwAneAT164q5fCsp5CifXMPUDAkApC4o/YEC94D
-mIiKfV/RLBoH1gcXGgiHeJypRvCY94xQrFl9lHB29+8riW3vdYCy6rS07GjfUxu7
-bKOALZ9fsnOVB2B7A+i0WUlNXgBPfhu7KSqQwKG912uaTa0IWA4HKtC31nS3ZvEw
-7bheDBBhOHih7oxJLibcI6KZ8NURFpl2ZeEcxyBJYo3MrQrJ+MWoOrfCoC+r5aq2
-nL3DFb01WkA/2i9/noWyZNYAFlDQEcLkjSdrc6rrfKYNf1L1/855ix0eYCP3UNOC
-zHbtZ1FupnjHEBk+H0CPWgwj9QHb/9AF6rP5gVeSYrnmzjsBDd46SEaEdRD0l4Pi
-ubWxZj9i1wFlPKmD6MR4AXJ441IUbeWFPzaBmjsCUUwMjTyTZ4WSyeko9SGGzpdK
-kUnnw2guvsKtBvJhKKvmkAHc5p7uRy0aQ6V+rAvbdWARbXcAY+xXJ+A/7qAxUMJH
-mvijGOctRMOBy/8AEQEAAbkBjQRhXKfHAQwA4//n/Vw5eMdFUFc7+b381d70FhF4
-E8PyDMFqYpi1t407FhNt+zsr5qPPVw9Nt5/fKTCvql/eNlNcTV4+eFUl4VuKQU7f
-dvR8LmLjAxG0fjUoHL7PzIV+Iae4IBZz7l12BvCaA2mKPHTPyUOZifGkZZGNFtp9
-rylKc5UEXJx9J/H3mMDd3fIQwFaftzRAoH9qKEFDgGjPOIF96XIrlkxGyfvwcCVn
-hLUGrox03zdy2hm0QDgv9DphuGeOc9Cyld11z5OT56j/QsEqQGJ97Vxvwsyh/s34
-rLIQOxIxp6p4CvhGiO52V1aPLcKfMYjr1rT5e0b9W3U+jHk8hjHIDPELGAm3Kmxb
-KbjSWrFANpBk3+OqxCmb3eHTlIObWPLuTLv/tJGB9G7xmkNWH9UM4zuCrG2f18YK
-lKbLdd4ezVDm6odFPYhZuDWNkYfk4jugFcpHZ9C/5KUJ0+WFkQU8kCVg0mA7Bj5r
-5BoONdNm3m3C1zGrtxzAiSq7qzA/yxCGxNAxABEBAAE=
-=5u/h
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
deleted file mode 100644
index 43a7a8a00b3..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
deleted file mode 100644
index 3af575c8f57..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
deleted file mode 100644
index 8acbce9e3f9..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
deleted file mode 100644
index bfb194deee2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/66d7cbff956830fe9f5a723afe6c7d77a1ce15a6.asc
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGL3vDQBEAC06DyZDdCJFMDH2/J7zrbhN5oJmYpM/mkwmOjkHbsIMJRcocz5
-7gYQC8OeMyfs+dkorsrY31UpgMW+efjEZbDKItfbcs+y1iEhQ0fkKKam/lzNyjK0
-wb1ew3QPMz6NFPcE9+ZmHpQDV3oHJSdNB2wrVPxrDgyxQE5Qufz4KBgbggY+Mn63
-yNPxeo7axeK0GgGzoDMw3Iu/pQCVz6eNMn8+0OKowNiE9U8PyYYNdghrmsFEe9sS
-ShS8y6GmEYGz4qErI4TpkG5ZkXuIG1ZEgQlP/BuBrY4AIwkUJADGXowr70JMeeZB
-1oFWa1aTx3iIHBtr2ksVOqOuQRmnFdGcUZnqEebQov+q9ZwAge5l1jHiZqZfxQ6m
-oQnj7vK7rIA0FW+IznZ3De3M+vUnL/D5EIChySvsxjWOqaRCF8gCUA+KrR7Rqifl
-lndVJc4gLFj/NhBvh0TwNYUu2wAEWVEuN40KFs4GcVymdPvy9nJwGqrPOZ3jqdqT
-fOskvrgZJtj75wbSppED9Z+pdHLUc85lC5OzjzgE1qKiBh+cxLUwUgRSDFE797Vt
-ucYWH2coJQRh92I40koTYgPBV4chkNMc3R8/Gy7LJNMIJcjS513tPuVawCMJRDYO
-vz5BSWCgfily85jLX8eK2ceYt1m7OUA8LOElxmzysCGbARgP+lpCMfvHeQARAQAB
-=9h47
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
deleted file mode 100644
index d8d6da5b047..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF0YzcYBCADmNIEEzvSsnJnxH0u89Hb5vCCkl+45dWHyCMsCLNty8yL214LV
-B35gnU+6BvRXN3DmTpreCV8/wgI2h1eq83dTO2AsnJTxTjvYpiwAtWhONxWxCU1Y
-WlH8Fsvao51CJWUwYY2HzFr9j7h7EOnm6gj2pnUDdjHRgou9/OxIk6q3M6hrwwh2
-IXw6PXFmkg4wRwlqW5FiC90I8gd3ItFCzqx0TR7DuhOFhtvOheWMlApPoMOUY+6u
-C5Ek6kVW5w5xshKafS7p2s0WOsXkOnH76avFtkBtcsPbHkwWTal4xivSMMsCpdPM
-cF6Fr2p5hF4khQ1r5pdmHeYNoXcC+hSnPM9tABEBAAG5AQ0EXRjNxgEIAKa7sUZb
-z0gyyJG0J9aHlo/AvOZZpzMtd5SFyuVyXYYcqLL//Mz7U+EWPT3ZOX9YKJ/Tr3id
-ewquXH087Srpxr0tLIdmrABXwBssfLGSXqZCz4cfkIcQytP8Wk8sJ9NQJLI1HK5E
-laRsmMJ4yQCYH55UcdAt9pFEdVMFbgR/EIcC3At/Kz/Q87zb5oIfAKBSHu9NRqtr
-iSs80dX7sp9JuoIAKTdvR5tjndwC9r6n4Flpz68nnwKD0y6e9RGKB3XXU9k6SIqU
-DHrHByrVnYdwkVOP6O1MbBp5ckSu6w9eFbU3GJSoJ4p7ij0jD4PalgiqpqFUYqeo
-9gNhjd0ExTcYeIMAEQEAAbkBDQRdG4WvAQgAtF9mZmvdsZaWF+u4+bgEDZQ8zzUw
-UrmnZtW/K8Xle6T/4KaOjiBDeiY48IGAcV21oKEOiegaVx6AWkiZ+/8d+feLofWV
-Hwk0GE7MfrEniddVF2mqE3neXSrLn9L747WDhP9PTtkSSQLj523qC5JaIUkWmz0F
-ofK5Gvw2TyIrchUPtm5G4rvYzsSomQY8I+eyYePqnD/FsoUlvd4FhKDuLOU07T6O
-xoui2s3EWornJ5llJoghT11Q8ZknZXc7HUYdF0GzKWGebRz1sIaH7ODy9LLKvgmJ
-JEXWWVfUDQL+T3LjRdsNXDuvnsD9qC4iESlmm6zlxOEtOo57EVjJBVHh0QARAQAB
-=3i2O
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
deleted file mode 100644
index 2e0e940006c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/fe6c7d77a1ce15a6.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-66d7cbff956830fe9f5a723afe6c7d77a1ce15a6
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
deleted file mode 100644
index 24e073b181f..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
-0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
-wojLPkIr5tVo4ybeVIbQ3N4+FnqzpNfs571KZHUOa2unwdgGK7OGMTxTkP8oaRwP
-H5VenaKoknbLbp2CUchQT3pkv3Yio+NIDGgZ1VmgOTqczI2KZe1viqRY32rBVKr1
-684Bgygf0ZfzMyKd1xK5UvDGhfQU+uDZrV9f81YMqJ9dZFjbZsyIhsEtIloTp0/Y
-kDtUMlkXF1c8EExpqTEUwEBwV+ow3IKVv3YDNNpZ8g8TQa7wKcpOia7UmEdXraY6
-PdP5tzClCqV0PqOxdNh+En9tw3VNKqAjQ9EE/nSbRz5d0JgdIA6SfPeXqAK5hxuT
-fdOdleywcOa1HRVN4xoEsOljfQiS1dz2xzou0mR1NpnD4PuGRdx4wwYGmkqulbbt
-1wQJRd/psyFfnpxrqk9I4frouzxMcrPUDH+T5qAVfkX3LG5XRGFkScWbZ65SXXB6
-wg6DsFNUXl1is01Wfda0TvBXdjO19RdcVSyD/DlAlXukmQb36Av3pHatR5Y8k7xN
-c1tU4G6dSfiD/JjwnCTzfqmHBnS4c2d1JKscPGRy+Y82Ghj2lPmunn6D9QARAQAB
-uQINBE4rG7gBEADdSXw7MJF5zFEN7siT74kGxyBO40gfhW2HTIbGXyUHKGpknHOH
-V3KYS0GEtvLc8QGOHv5qLfYlCejD5cYpzoDcWIUo1KZiaqG6LulcAy8sDuX3o5z0
-LpUikutXeIxGTgxdpc3SfYPhb43ir6pPI42MhgFOOAAhHLo9yE24G5FYna5S5OZx
-eOWiwelhYUxBMTIyA+vwCUii91ZSO5ByPU9d0QJBS2Y1Xwp0SDDa5z1x+SYRx1XO
-a8aD7/tb+K1G+giuedY5J2eVKvxFB0ABqdTNT1tj9bZmXqfKEjpaziXa9WVSNNU0
-De6IYZFsDJ9yC/3mYBB4rNd3iqQnlH6bTIaSWGA1I13JZQUm0dJet9IwxP7rCgM8
-lSsPXjvdTvHZItIIYQaMihUp3360G16ESiVRXIXwRyUztm9MMNhVzTkFXkJ9G5WX
-+3Og8inNjzJViJGfqgZ4KNlXql9/BtqlsPcmTeMoZf2LCz86uTfUrhf18AVJJq2E
-B/R9M+TWQ7R9SEpQ49RoZUfVXb/HKVnWw9OjJyGFhc58MBGyT1VNGpvwDEzceJfG
-ri71lnyCAddNc10wNyfeF069wVoGTZyWklWgC7UB6dUn+9TYN2/ZpHtDzzdAoEOp
-pFdqib0+xfeY0mt9k0/jPvK2wqXMY3Vi2nvVDQNUEEJxMLSFBiqAA88EDwARAQAB
-=ZVwp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
deleted file mode 100644
index 78a05175483..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
deleted file mode 100644
index b3471a55708..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
-xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
-qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
-TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
-vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
-+fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
-0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
-Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
-YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrkCDQRKMGw7EAgA
-5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4HaR+j
-NNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw3PcE
-gCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rmwcHG
-opSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjLx0St
-a1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLjNnF4
-SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8486U
-bZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ7hsr
-Qw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxjPY7R
-H41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUGpU9v
-xZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXNYJ/p
-znXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMQ==
-=3smt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
deleted file mode 100644
index a7c567b4543..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
deleted file mode 100644
index 1efb468cd8d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
deleted file mode 100644
index 8f7648dd909..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
deleted file mode 100644
index 013825e272e..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
-2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
-gjkS5eq8L04f5CSuXO7r1eLTOch9iDl/ESaI5Nhq9A3mRQIhQalum+FjzwCgx0PK
-hoC4MVPVGXzOQPc5sG4jzAUD/0OX9c/yKQqjHUs38HTCgrjseM40iPhp8NfbWenP
-IwUMSWXE3lz0MMeKrGcEOcZOGWsjyepkLHXwj8DDOeGxhfh9bhFRJssdfzOCKBpf
-6S70A3fanzqOAvddxCqF/zOwDaieDmWvVntVpmZO9d+pgR/sZN0JgSIm7qGDdNqG
-Aq6eBACyywfwuVoY6lfNz70ZZqYjYuUkbKnKqpG0XmI+m5LYrUW7QuKJqaNdg+ZL
-vVgX/TdkWVSIoSRS5+eYm3fRD++cg3ZgoR6ZY4WEa7SRSp2zoidtQijWOzp8WeHs
-30rIaXBrb5wHR4GQ4FYsBGRuWkmIaferusllUmHCHFJI4ldvgbkCDQRNyzHzEAgA
-1rD70DvCcy91ShQKP2snZ4cLJnFwKArulDUcxoBZ0AG0qMbaE8jiiJTHIwgVrqsK
-aS1JENv6tVdUS8xHswu30zvd0obaj+4IGXlMVdc6052Y4SLAGNbGVw99Ah1OkQ7o
-v92gmYAYfqppOtRt1tylz7Jf+F6er0umdVBZm8fJ+QjzTw36AwERj2bjVbc6ogM7
-OsTyru5oZGOJ+oJU+M9/mh/Gq3AyrcfU8c6bL2pacXwylME4lxy4fBB7BsMogPXX
-iplZ2XRH7RmlZiAfLHv3StxVB1RrLXVcjdnqIO2guVYrK6mxH9WMG4LnOGvcnYTf
-GtWexEmNA5l8IOSgsK+InwADBQgA037clDFi3XWaZBVXst7IfkU6bKq9vhmphS4f
-uBx4wp7MBA62k0kGDmZWcbinZWnybypili9ihYSHlp3EYzCNTbUMWlbhc/ffYHuv
-rZsIT2DxMPb2iCnjPu5HMGegTM8iTTotW4xYmJUsEDIvgQUz0/UNsPHTX5XU09So
-cL3YOP5MxcEbgO0Fpjny3X76rc+ETAd9TmDJi7HOm24grKdOQXHQJr65j7nTc9M3
-zWnTxOP3fL9jcVnGTnLGRVoR7kedDpa5FsoFqtY8YMaFvNPVvI4+m+jozjNwTg2d
-GG6nU2dEC0qgDEeKMSJwF1wgO3Fe6mXHvxratgNrqfdY/rtEGQ==
-=PkzR
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
deleted file mode 100644
index 317a090c834..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
-9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
-DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
-KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
-xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
-BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
-tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
-nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
-TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
-IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
-Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
-DG73NR9fZCzl1K8AEQEAAQ==
-=FVRo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
deleted file mode 100644
index 85f7ae585ef..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
deleted file mode 100644
index 513827017d1..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
-405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
-6uNnrKcO32/v/lux2AQ7kc0OS+ChaD5rUdihAMIfokBPLuY9OGaCNMcWaQI/s0zv
-X0xPebYYwSYHU0uhLQm1y8fzwvlSNb0J8nVR/ZqzzPvqfM49CVaU8PmtLXqx5naQ
-VOytBT0vGUvQ6CcJPOYdxlVF8VI7vB2B7F6CuxKGdyJIOyFU5NqWBcjRq3oMHXyG
-/vryt3D076ZB8dMfi2gol1m02io3czxnUR1PABEBAAG5AQ0EVQri3wEIAN+aB4lj
-nIaCzy85DeQ4pDkH5Q0YGc6rfLk3ARnOPAexi/lYbUy7XWIZkZy78gjcxMLRgcjF
-jfvsfJqoQ+6bM3VoVL+p9PhMZ8ayFi9V05rtXLvvzJYyuntFeMkOlZ+A3YdhJHrU
-JtC/Cflbslctcz2Al12RrCWpa4tzyfG2roj2+Ymc6Y3PN1Sjnou8FSPSfCGaTwXU
-4W9rGvmvHTPHb060XHScwxXoz6fQWIDftOyQctCZSfFJgckbVKryOZT+LbIbG6wJ
-G0WXWTHpjaWtVVoXLJL1eh4YKGlFEW2Odtgu/MZaGtKZ6fAeLQKRm8u3nMDrqMDt
-3gsfoQk3lGwKzjcAEQEAAQ==
-=eVUr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
deleted file mode 100644
index 412dbb8a715..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
-sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
-6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
-hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
-OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
-EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAG5AQ0EUEib/AEIAMDUgjnP
-KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
-Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
-IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
-6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
-U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
-v5/DheBwvlwheg8AEQEAAQ==
-=JXd7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
deleted file mode 100644
index 276ae3fd4f7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
deleted file mode 100644
index 28f7bcf5d21..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
deleted file mode 100644
index 4dbf1af5455..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
deleted file mode 100644
index bffa646f616..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
-inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
-iQaq2wLM5rTQfdjLsGQb1iDNDyCXU56+/l4mFZ2JiEGCq3Re9EFHelRBKQCg/7k0
-BIfyoFVTHw39PKaDBmCYF2sD/3CMD0J/WldhBM7gLOndH9/YEQaEMy+PJNXcfTWN
-WLygGPSOQdNBulyLkvcFIZjUTxFVakh7FbjMq3dsAP1oqthwmK7L8A1zsvRgp/TI
-4YMHkZSkgcs0PBBby+h/lpgRrWmtwjTPzql/K5xX4VSRS+umHye/7R+4ZEH7mABa
-m/ZABADkPGG2ECvfjNosPQDHZVFuF9oVaske0OjzxI+rU6sR1fJKtbOPl9d+bgz+
-df7rZ3mwppkPX2r/muUbd0CM1Se10sK7ZAoPYmWqHX+vB/oj3Jq+iqb6M5mDZzEz
-6h4hdnaGERyxbktZvhRV7Psco9CGi8o7RFUQTR79Y5ElnBavqLkCDQRBlStBEAgA
-9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt
-90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcw
-Yc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZr
-M2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEs
-tSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8
-vYlLIhkmuquiXsNV6TILOwACAggAw6kL0PhPZ/EPI0mPfmIYeaKUgTB8q47nDKY4
-6wDs1l/msVJHAVwGEBHuxmbC7r/qfAgfSW+/Lj4XbSLCqaZIWSu6lfY43IOIYXD4
-pe5cCnWkQij+h3LxRR6uDmBr5cwheHEuB2sMFU5lJiiQR1+eXYkPNK4FgVQpHLWe
-boODAlTf0j8gRR+aTs5eWXqfSA+UEsXpn6453bfZKELXkRmEznb4xyGWJaLW2Mlm
-aRlauYvc61M7FK8z15SSZbq6oictpnEcfkgnBxcNza3jZQV7WOWZ3BlD1nKQ661s
-bmS81/nLnxbov9ASs25K2olXBsHkERhjMnERedvv7avlmBwi1g==
-=VzpZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
deleted file mode 100644
index de648a3c373..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
deleted file mode 100644
index daf42500d86..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
-gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
-P7Ss3EUTRGX3LnhKhKN656XQhM0PutdsHQlUKjvnl2JOaKerEhbHCRxga/U/WWOT
-KdobRO+x8v1scsrnUG83J7sTSaja0McmgUhKrhJqrgSk1Tod45SxprxOyp0cgATY
-xjHrf2rkafBn7K7aFDe8a73iCJPWS77gxTZCZ72xkcnMLR0m7QI8TzFa4lRjTovA
-QcTpr7jwjmyjA1+68peL6VHdVr0cdXm34mTVABEBAAG5AQ0ETv6G4wEIANLmAn1+
-tkX0pSiu6NJ0rkaZlMbvkxeFAstHdQ5zOoSWvJV+52DAd+h8HKZy6I89/BI1alYt
-7KWALGzj1I6s1+HavaYKWftk7UvAM6hEh8PzFQD5NNziptDOjTG3oztZ0SK6Et3F
-Qaczyzh9GyPC83vC8Dr48a+Bp5Ygpo/5LbuNloptVIapHftW6PUmRuxlXVXgFdc5
-vSDI2xPqz8dzLSjBa1mRUEiAFqdi6L0na6iyBEyEd4QlQ7TnDp6EKgCSvaS3OPRB
-EOaWOZsaOIcSw5w7tkO7YlDIjbltVQKTbVLUIR0h9njGaJXlGPYvDFvssIMR766Z
-z5bb/uPlG1HtFYUAEQEAAQ==
-=fOn1
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
deleted file mode 100644
index 4ed9f6c9144..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-015479e1055341431b4545ab72475fd306b9cab7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
deleted file mode 100644
index 5fba3d86fbd..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
deleted file mode 100644
index dbf018c11b3..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBE4CPoURCACWBMGV/j1pioJPWkD9K9NdeRvld8sBorFBZo99DF3mcJvrXo/t
-We7gmvcx2n/8P5lL27sYPuj6WSRgtVBlSMXllJm3NL3Hu/7XRILfJEKVeLLTdxc/
-Qf0f4IDqfvdcPHYGsJwEDeODbiKJ45nE4dWsbbxDEmatXUKd5fJrNlEsI09oDNcr
-7KeJn7rTVAj/Yj7UuvM7JtYKkjZegrJe24dUWg1dh57y+xEQybOpfwyfcCDuhwyj
-e1V6Ho71BWa+iyLmIIbBFBVfWTNqyTo17Ac+2Itnpy5sU/tW3691YBhSXNiepjrj
-r+jQHduI3cLQIn4O42UognuV+HnFUwq4JsHvAQDjpwYJ9IFR7DqkphXK8FEw2xeo
-03We7F51vp4Rm6FKeQf8Cn0QdELeTxX4SkFgwxV4oEAhqJJCHhrISaZY1+AAVvSM
-CcXiCFZDYdkE8rOSWNYwRmp/wGurLpdQX02V/5ogUIcHXUxsqqi20ZE/gA/JcW9S
-OaD5Vc8iX/1spaRKOMO8Oy7ezNfD8WobQoc1Lb9XQCo6ddaihh2TG6Khpy5iqbF5
-/rTh8E6+2Yn/Y2A2V4eCuGFSnQrtIHCeFt6mv8tGAw3hRX0zC0wiA5nXonl5uj2j
-QDcXo4friVHVpLxJFivK+iurquGkYCIi72rNAg3k1oKJEZsKB0HXAqU6/3hTvXU0
-GnCHwlsf0iDsEv1Z4LLRbtYddSAnFRgvowhjX6Hiugf8CeM3wfy6AJbLOhI9DLb8
-MGEOpf4eetPiFTMI6rTw2O5MKATUA7WJF+fAYjM6SENCkXSmAwbdHe1NxRnbZ1qn
-dcjDBIR/SgaXm1HLpmJSyXmjyIbNoP5aRaYaSy3g3DvWwLSmsRyA3LqvWQI0m08S
-2CwdzSx+Z8XuOZ/THJs1O/ztd7R1MGZSbdyyEHLVX0dd80B3mcuAMO48dKNO2UBB
-QEsmzpPQ06ANmx6RnBG+H2Y/99/dxyB4C3Rv7x4HrrGqoJRQOUFpUbhFmEKeFiyK
-XxqDuUeB9KX4YCx53Q1EEoKegRAYFtt+k3chahLkQcIAG6lkOZRVA45w69ApdEoG
-E7kCDQROAj6FEAgAmlAzlKUZ/qynp4S/2fBVBhKhE1ujCxpew0WUotc0O6TCyJBD
-jQ0ofQCrQEuOQKNri+2GKHKPTmIdLwfBvREbkuUI0v3S/81vLG5E3TZqIVPJgrPY
-Y472S3Q5XyCVvwYeVjZjCoPnAuCcO2G94HrE09cmG3ABaoTFE2Jq9qPCPlABegKd
-pU2TfClkWSGdS9YMbH7pD0Vdgdy2TYHLnTR1XKKkEd3rYbwnAjJ5Pa7v+du8aHMu
-wWzyEAlUhtIvipuaebhuNiiuh5N7GpE/ij1FaKAc5kvrw/FszJtXH8dQerkmceDH
-FSYeYTh9pAhlFSFyroy/6ay1nKdGU/nXrmo1IwADBgf/fxnmg8WI2gq3AVjcQim8
-9tQj2vMYImWEZnd/GlCDZkz6+LHqFoKCGiScvW3Xvq/9j2Mq1NboTVoSKTcLOLuo
-QIPeRvOP5lcizoUF7SEUGgC9y7LHqfS+BWhnT8RloMw3cCsw6GN+LcWFw1tQzCjE
-U5lXzlNL0tlc3JBQnV0rKGPqAqc/MLQdPWxilaozw75UzugKLjkG+GsM4H/mxD50
-znIM5REadBKbRKg5XNA+UCyegNaCe+SOUS5h62XeQjUvNoMhUFmS2NC35LYAQejv
-qSp0LMBlnckqI9M1QpeWAkItO/qF428nZWhYrdhrRANq1i7n1A/x1zc9bZ1LAnDb
-Ig==
-=/kab
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
deleted file mode 100644
index ad9eba9afc2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
deleted file mode 100644
index 794a6124934..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
-+6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
-kJJDgH2BcbNSmWJlrCqYk+E3GAyQial+szkEZED+02wXHsbs0z3vozjQGHy0RVOj
-Gc5Shwk7Hr/F3vw9EQKa1nNffWmcGEx9B+WcC9ALPVd/fpQVXvlqfbi+kaIbqv2x
-NHQr7BL8j3SpN6vhfZM/3zeghlxQ5HYWER983XwkmvbNdMxt5HWsMKWZ0utt4ocK
-TnQP8NFGlPWEQhPvRRFNb9BI0wvGD0NUb1gjABEBAAG5AQ0EVuqxPQEIAOPl0cr0
-rbuuaQWxwNjrHnfDgv9foBgqZW7tCiXtWFH7Va1leDFloszEPGPlEriw04iqHpHe
-8QyUBVL6JhvNqEj8DR9xJyIKgsKCMkoJHdJOdO7aTQP8w7SVr7AX9sY9rRQAMYgk
-tEKNqWSXm6/hzvNlvIudGXxr1dJzzVynZYlPFp9kmUmQU5ThzJ7DAW4fSnAy9z1a
-bCGSHkh4EXrDwCyPvszlvMkg1djG0owZgDnTrrT0eu83T6uht+DHgCrLiEYqypcy
-xJmK48O9t20feAhFXw091hGr51CD+C/bbZjcbXGmsNVuXUDUIIeVpSpPaUgU+i+O
-gHY7ZIF5f3EpEnMAEQEAAQ==
-=PkT4
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
deleted file mode 100644
index 4fc458aea3b..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
deleted file mode 100644
index d9ae47869d2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
deleted file mode 100644
index f4b4f312da5..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
-2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
-aYgApzHAo2LtaiBIyK1T/+OaCexc05lZ/wcHFfyp1yHSzIVazxhIAqx9uwCgptMa
-23r2OeX5TN9xdjwSTUIeImUD/0Mb+AcP04pMbsw9xtjvl4g1V7YbMipLE/PdSI+H
-+YLRzmyxkdfdrBNDQRxyGGxoUI2Pi45EDV3wnLBsGVRAG/UkcQ3zE3r+0sLMrRkt
-7oyzK4wqsMuslPbuAyghUes6Dnop/MY4FJYuAKK412RDBvk5s+Tp+pdkWQGHXuvM
-/KJsBACNupFtZA5CgMMWI3bO88upPZqWsO200sA9WqobbU+A2oCUotb2DgWxOgb5
-oi7eJkyFDpS/d+S0H30pq/7mUkTvCOw4Fk/ZR5T6DGqm1/vHv9/y2Z7bOg/DxwuE
-Mu1G9AT74JCjgsYFCdLcFymrghsIpjHBpnsEVjXoI4jwqOgScLkCDQREC9ogEAgA
-w0mrmS4i5o0dQ3KjyNNUUbatkUxFxZjp3zyYrVQj7c3Gpun7s1zRwZ6YQo6poUyi
-w3gpiiLq7zPCqC+ee91aCuYRXQk5y+b400iZybXydEbSeLeZ5pNIFvafYOjLuvrD
-tFiWdV5t159i7R08+Myu5D8K3kDnt/ycKTOs29mt0YCkAdW2EJfivrbSCicPNUyc
-GrMiRh0FDI8Jv43TMUmUBbl+6DdDLmqfDp/Nl09BRzvm40KgBusSRFW7G4l5jR8u
-vuloRYqOGz2X2ifXhxfr6CWIpmN7CNAwhP5OKniTAOTXTtMxvlVM/wILrIxPQ6lp
-b8vhNVIYLP1cmpVtCq3+SwADBQf+NyC/B4lec3BWXH4elVqusCU8Kmj7XDCFCSL7
-khNqO5BF8S0bZBV0NI7W9gaoNJ9ZftnlHbkGsUVNSVl5Gltwi3cD8/nJkHr8C3LK
-6jxA2/B/xQ32NWIBykofT72jw7oNfyu1j+kkF2nUnvpG3kkcuoEvQy4Rbu+1jjaR
-/3MPLcfsLU9EfCcHyiEEgW++AGrceV1AaHB0ZTmvRw8P5Q5R47ZVPR7o6ljucrYM
-MCzFu/3tUezn2cVrxNXyjlhC+kZ6tvlbOsZ8gtmuWqzVoYWZidSYA5ybSFnUtn6w
-SB/gVg57uGVPtYDp3G8lF2ocSWSsVYHzKO9Uo7C2R1V55iA68A==
-=DP2O
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
deleted file mode 100644
index 62da51ed28d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
deleted file mode 100644
index d437fadaca0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
deleted file mode 100644
index 11ac8b7abb2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
-Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
-9lFqWQOAuCIWB1XPzoy5iTRDquD2q9NrgldpcwLX3EVtloIPKF7QLq72cwCgrb5X
-R25dB8PUdZKUt2TtJbjB+SMD/1UzAPirgX0/RpL9wUR1i14yIrTfpFP/yM9PE4ij
-qcZ1yafVdw64E1k5W4k+Pyl4D8DvSJvbJHvYjg8/G9V66WzaKcv+987fetUuePvY
-/rwxBPztqq8y6+hjBc8QVhZGWmAoGGEFO6MIGsSyN5ohqPMpNXkczIo+NMvDxGzz
-ld5ZA/9awGTsigBdpBK2F6GOmbvBv+Xebu9rbaJvBvP+npNx01s/f5sHPCxmBTFk
-m1vtaMdZ29RovrWPSZRj8WWes0bcisw80250r1CBlYzGzqEVZ7b0Hh2RfkfaxbYh
-wikyfTfA2iX8TUGBgirsZbyegjUadElhwFNDASnvLTEuQKeVLLkCDQRLbBdqEAgA
-0sZ0JZvWoKIGb+o6MOwI6p3uMb+iWBwdYfoh2RPnUZdBwGhJjp32CiTt2Y3qYEcq
-C5NvF5FWdx1m5KOQe1O+QFoqPKnC1bPj9uZOjLVql7x5tSwCePIaMNB+fMxEh5hY
-wLWtBz8nrdCPgwm+nAwecoE8YfrpmrXZk/YLak54FOeEwLYaP8E4u2FHiEqN+WmK
-MjIRwLzVpYArWRCbTLhSSKyRBy7UxEovUH9mIa4YuU4Pb2R64LwopMHCBm5ow0U8
-kCw8vpW40GrBc/2eaIeXCX2XJ77E9s9ZPgW6MoJ6Ic1xV6voLJKIEV8t44deKNSw
-DfVNZHxyemaKa8/GgpjU5wADBQf/UzL5lXRmyTdJqRvHIfUV3g4A3X77d3vOroab
-8KKw4MFy2LiTioN7btKKxE97Jjp21YZFd7Kpmfu2i/kr9QVJo+DSxe2p2xcQozyS
-+layPK8h/61Lhyh8vjzV5AUWA5Zup+P7Jh/WRlh9Gxs0k0vimYMFKImw3mZr4EA8
-UCj2e85XIHNHBd0B1VIukq4OjU4QhRrutNebIy3GZ35ylcaXT5v18Rq/iRJAuJFo
-CzXUaE90/V9/2ob8A1CYEKGLocvOQgBsj7+2gP5WOP+WxI4TWPENRKMVchVBE8zV
-+7YZiahPCwOQr9TQWMaUIJxZ85yr7O8DhJOBX3B7EHIfpoADXQ==
-=5pHp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
deleted file mode 100644
index d41dd187ec7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
deleted file mode 100644
index 4fc458aea3b..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
deleted file mode 100644
index ca04dc02644..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
-WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
-cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
-WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
-KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
-9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG5AQ0ETaTO7AEIALN4amR3
-pf/FN8oMFa9eAc44ognamG31ea1lkqIiPssiJLC9J2z9mShkrECbsBj4o+HxeN/3
-rwW2hQFAm8cAbitujASpPs46slp7Ylx6cfmrNqh3tOkg9BW/5izPwjXAuULovMpG
-PVf30eeDpf6huwRqyc9uYQSS6Jn9KCLi9ULxIeQOZi3UPHyMOCbnehR5aQQk70tI
-jbNytmFKC+DXFrhDiBjlRQruATgtuYYKMWUBO65b/SyvLG7zPGmHXmCSfg2qCTQI
-8xKN6wxgQY6x0PN9BeXa1du3497qYGhaHrsxnW/nM6rcQO2hKoOlY/GmicB5oK40
-MMVfji8aN/EYTS0AEQEAAQ==
-=DpMo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
deleted file mode 100644
index 853cff28660..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
deleted file mode 100644
index 6d4dfa116b9..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
deleted file mode 100644
index b22da3df4b4..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
deleted file mode 100644
index aa12f972563..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
deleted file mode 100644
index 28e016cb361..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
deleted file mode 100644
index e75721c1d11..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
-20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
-y5M9gIc0yCynC4Cnmg2DmRWuafVvqogz0vDKUG3ADvPgRyaItzh0xO/PsWPZvIHD
-SlCX9Ny/RT1vZ741tBUm1flGUzxs0zAPt0I+ievjwOeKw8OeUb59sc98U3XpVOVQ
-KDD6RIzhnvronznoPkcKPGMrVgBbgyP1/6rwn1u/69CTlED+lyWervseGtDQCO4h
-nVZGTfLLo3cB1ertknmmMqyahfaQcohykvAmVzxxkzaWE1vSkOX1U2bFaUNiYuZN
-U8zJtdENX2isKQp4xSxJ1/+/hjyfrGwLAebtvnwNcsM3oDwHoevusMoLmMNGkGe0
-yLjz38gwLCIuVrSFeHtHJKdPPsnWVsA65o3iCQyEO5lp38cjDE1hkHzXGO34LiPX
-AlDHU2YzoWvAHPqSppppjPJmz1tgHqx146tukezuzoRXuEUTmDAjbpLEHxvKQuBr
-DcSfWqe4zfKKqH/CfhxlPGilUcVyLmhaHjs1ti1Bnj4YmQuWo9BR3rPdLi1gQFlp
-wZfzytmmK6Zy4Ek89la7cgt6AF3eXjNmpVtGZlAb7lr3xne9DTp98IW3iwARAQAB
-uQINBFcyNOoBEADH4HSIjsu94/e0zGBJbyrFFCE8ISGTI7HANfUQeL0Cpl7EbpQN
-jIGFbEtvdPheeaz5hJ5sg3dt/og3fQ9oBAXkkx65XmRnsLwYud5uI4bS240UV+HX
-DBBAVTE/luQfIp6CWImSY3dpfSRZWarXkU3vDtZgj3drSrY8DbLBPU6B9e7QqToy
-3qmZQ9/VN7QEXR+AyNDR2ajEbCzhkWyvXD+7VJg+lzhDnzepIxmDmpbiwmsT9J1i
-+BoG8FrN++ZRVXaOEslARP0+rvpIK6RZG9wdBtb09RJODBnufyprYP0//GmcZyOZ
-CbyLBfJqOI7vUYu78xyBcbwQgbulwMop3sN/IgxCTGFY4R4waHmgfMdagBNobCv5
-bjODfegAeKmI/Tmg4sppfH31+YahntYZ+MZCxgbCWRpODut6JlZ/KW015I/BAjrx
-cj/WooDMxGgq87SAYF6+Kl/Zm4eNp8emduIfLQguZymAryzWQixWwZFfkis/DVYA
-OhZWYvlXao1RPAMMHFhht+578atKpJYzMca6WzGX5TuLSip2tXRR5Y8k7vWMVEQa
-TlQyHQAl3jw62Sc4WI7u7vA3edbW++1wH8kQvoHTIjdUHpGEkGiNDuVi2dlr0LH1
-yEoVyoZYu+sSeRhBKezHtPsOd02iVBevJIXpnVA9z/FlTEOBfcz4oFKyiQARAQAB
-=RUvE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
deleted file mode 100644
index d41dd187ec7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
deleted file mode 100644
index fa16ad361ea..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF+7lwIBDACcXIXAwFDoWvCCWn+OImyyJQvSnnte93Mc1ZJtlArkrjeGU7Mu
-5giUH+FOyiXlj7CU4G9RTnAzDgM8XPncWOERgRG2dXtO03Li7iUEX4Z8PCUGsTxP
-2VKGuCF4Je1ZPGxeKG49N0L3IIBBxfCzumE37LP3diw7Ups8xJUhZE1ecF/Ow4uE
-y6lBOyaJM8VJN65GLOdlbjOTKaFKR6aY7lPcEGyClh+SnMcGTocLf9joBpDI8WZM
-NQoQlVtiT6ItvbxjxJmA2hsodm1Ix/xX2xo3hdXH+opmsxlNGSK26hOSMKTMQXXR
-m96Slky889SPpT+Rnbp+zPSsWqUJBzTT83DAfH7PJ210bRuzHJZzSox/2iiVbm09
-e8rny09ju/OTA5sVvg0ibNscO2wyGsFjoBTFB4x27Bl+4bloBot2lBO7mRkhOIaT
-KxDkKPSw6vQnhA3a7p5nGMo20MgNhP09ui9CwO5Yh3kwnA81clldlMcjQMLy35ch
-kSoqW9jnqm2CI5EAEQEAAbkBjQRfu5fdAQwAmmCsHQ/BHcphS2HGtT7O9m+HmBHd
-a6aqzvl0OtOyCLPq4NPTlgSZ+UQ7z+W+9lCZ1CS/pE/WtGOVCxkRiO3qeXPCGWCf
-dMUhdqBQxR+rf18OnQSrVbhjaEJ+T+M57xgySdisUj1MaMB/BfS39tnZVg4TUUST
-XtcE10Jz/K+uBO0XpdKYQ6gJa/7YcZ882jYzVzBf7AnjdNk7aPEc7H//UMZX+CQu
-iprdip7dk3BYpWfBqmep/CWas0kLjZjboy2whriS2w5RGkqAAHW5Dugq16y9oqHd
-fBbrm2C/SQx6LGC9tG2ulDeEOT4f2Ia0irH4L/U2/N+ghrx8qJvLgPz6tePlL6CO
-3BVmtjW3Tn3BBIMk0JaYPg8b9GijBjN0mbB8PFQym1zKAnrJh+femxNsYXcdX/SN
-TOqsoPOIuMKwrOF3YvFxrvUi1BhssOMKwj12KJbtTSz4zY8Eia8NTxRbCqemuKYs
-JWGwytECBpNviZSAUXwygrhBtEKlY4nPiOgJABEBAAG5AY0EX7uXwQEMAMX5JX6q
-/39NrSgYzCIcXj0y+0fVrf2BF4bWwu3xN5hAMiwtpZMTAW7aOkS+giK6/h2IAkFE
-r6eFQaEuCuNNq7ohLzy6fFU6HwfghiyYJ1MEkMecHK11fDi8w5DGteICBnWdgshn
-frhywt1IKe6LXZbE9k94JBm4pLSvYYCeS4ufdWopB49pg3OC0A+M+fn0GJw5W+Lv
-4fJitKdbsuJ/oxmMTNEjkkaJ7B5KYXqbBB/+rHrlAoNUNpvVV5hlW+saKZR4fxMy
-Ptm3AOh2APf2gWbEly7/W2RIjlaURAeypuLY+GWLXAFOALXmwWvfFDWJ3JWGyih2
-i0oBjzaOeISz75QXAdfzbjdj3sgojagjyu/GuhXXhVfKQGnZFvZUctGFUks9ScaW
-Hq2VzFjZWv+h1tyaxwa9Jf95/QeLN/9YAWagOAggxi09mG3OjycmblPFcTRsozbh
-EJC+uZG269gIUZ6fOGerp1HmA1tcj4tdKlGZU7hvDbYt3tvMZ5aNaOv+9QARAQAB
-uQGNBF+7l4oBDADn6/0WyY1WFixEPArc1+N1eyuX/mpM8RFItkdPZKImllKyyUsA
-SQWH6tHvt6N4+bH93hSMBHORCpjEL6Rm9EbBdyeGAojv8BLD2/xnd0ucF9VmJwrz
-+3uoENlfLpsqJteqfaJq9uoDnsEm+OPcqwYdR6WwAFI0S9TfRfMXW1vA74hGvZZM
-DcWjxGE8INCHs0ylImlH/xuaWcw9oTZSiVSbMeYuJ7V1XQgcpMkoOU8vsCZF8OsJ
-7mwTtMlpNiGf0JR+KZQrhZC7MOO1Pb9jqAr+IxmaUVC45x5qqKyJ8oBxdoXou0j5
-agkcp7OaRDRBimjx1B1JQ85Cdx00R0FJ1VDjXYMAcCb1RFxcBXJzhpO4/Zr8bGVD
-fKrxPBW5jXBZjyblemvc6ozabKZhZ7jNz9IJ/llzWQeHka8fGMZWU0XYMXx20MMD
-52uqe9w6hkEPOgxnuK+2Ev2o6sJIRKltGmNvkgo/eRNxlNAHqy+CfhDB1h+X1Fex
-yhmyioZvuRxjrHcAEQEAAQ==
-=/3ce
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
deleted file mode 100644
index 3145005c70d..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
deleted file mode 100644
index 44482f78ea7..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
-f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
-bhhFEuc2B85vNf2o9Y4V5GFwbD+tFNy4u24n7zg6/VgE2WDvYJ8JRqCEkwCggyLj
-ba0lsZ2XtSINh/W8ok+9f0sD/A8WhqBfDTEBuG9gnuCYXM0j7XBBPdPS+FXmmfea
-zyP+URKRprLCdt0ThZAMllIxZJrkbv7aeXVpM6KSZ/XvvaFQ/gha4o4iJFvpoKt1
-Er2j4Tz/STKztHGsMt6pqfrMNPWovu4tLuLZQmojtbIk+IwmcYxMy99owH8oV1WC
-U4HeA/9MlUxzmlmrQF7VLqFTGEEqQaEJqz95wNPj/t1DmI97hshPzXLD4zwKwa9m
-qZJPStRHM0a6xW2dztF12aXhrmYg1gIGNnsHtq+t8ZhfINZUurSWn0m65WT5notA
-15s6hwyDACHWWOgFQ9jmWuGDh0ZpiaBe7BxeTV+MsswY81sOn7kCDQRD6J8HEAgA
-sivVzAfz34QE+S4WTXCuknmYiSEEnyTwk9awb52vrYlhoQ2t2EhRClc/tR6QbhNM
-haMxPt1OYeutOvZN4q216IE2SwZzIDDTchYApP/brBdIDf4L/XGWFIqftCSn+vnb
-0LAzYNVuNXtNwRni2q/fZ3g1wniVMbJ2MrJNt2VhLrP9K/ipFz7JCJittMngmmDF
-7mEKhnrqBROLubFsUfNmz1qRC6PiEwyyCCdG+4m8fIiSyqna3CMkZr/UaVfxuGZH
-WM8HYGmiQjafqeLqo8aSbWerzDYtF2+v4hAAt9eDwdgYy8oNxXEvw7Q+G5lix+6S
-UMYV6NKLNUbBYffm9wjVuwADBQf8DbA7RpziZWLv7DHjR31AA5nnGEeud0dCRO8r
-wfQNnaQvuJq8siRmU3uPAL2NwDgMaa0cT1xt7p4/8/RU0N9otVqnzkLMUTuqq/wt
-QrQt0OWsEJRyxemWFwiL9ZpU4eTg49cfOQXjg2q3fbx9D1Xr6Bu/Pn7UDU8r9GbD
-StGJ7R3Z0kkhtCErWnGNXbuqlVd8uEsyeM2HYpM76BmH/8vMg43lOJyyh6Id20ZT
-n3HgWzRI5QaDJ1JYBhMuVChbTPUCcMox+qgiH4KtRIAjt+m3w0Axjsqo3EFPweWG
-pRfqMyiUcESt4X/Z9V2Nf41NH+nQ74v3RvpP7EWKf9FfEtFprw==
-=n2+K
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
deleted file mode 100644
index da7007bf710..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
deleted file mode 100644
index 39f8f25641a..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
deleted file mode 100644
index 6508c198200..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
-dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
-P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
-qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
-CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
-PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
-dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
-wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
-SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
-9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
-MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
-iDXIY2rT0D71IucAEQEAAQ==
-=/sM2
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
deleted file mode 100644
index 52dd86c65c0..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
deleted file mode 100644
index 4ed9f6c9144..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-015479e1055341431b4545ab72475fd306b9cab7
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
deleted file mode 100644
index 6e5da6e7595..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
deleted file mode 100644
index e44277c3a12..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
-4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
-fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
-+zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
-5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
-0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
-GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
-AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
-9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrkCDQRNNXsZEAgA
-u0P3pwV/lKVCGXHXgwJgrQSLFSdrKBiaeKEZuCYEAEWXE9hLxn3T6MWrioHwB83v
-RXWU2NC8tpOg/GxLI7f7V3zKtlePspmjCK5QcaonAkK8n1BUaXwniCuxayimR7Im
-Pc34p1+f77pBpZ2nV0Us6yAiRBzo2IAKNn3R0N0TQy6QGvMCn7TYFX5vyvm9eE4m
-4GUh/C79+TyzgXmnV38Wjd6rJ6swM4KGfnEEzL202Wg6Egng0y4DbnfGJJP0H5AQ
-ZQnVecLHAzQMnPtPIoi7xbNB9Oy1d2nzVCUqxuX6Y+1HylOqsjKGKd5nSydjPPQf
-iF9OQIeryS4uJ0sjqUwZXwADBwf/fIh9jvuZ5eVhn5QNtOh4n/3zFqssSxWrYHgl
-wd+hPEk3rRwj5yjbWG/GsUJL8rhU7psgMY4UvrUmoRVzNBBDRqy3R317w6wmlZy6
-5oIXEp4FtVFV1iuTES4vfIrWqr/L4E9FN2bPqd4MNeMnHcnNYX3/VH1ijYuemSOB
-b/DO4ZiL7qymrufQjOR2SKknjpXi/bxSVqr/7ceAfI9ugMFPzcAzl7u5EWgQMruR
-ODqMw6YO983AbyAlB86uR92DelR/SmBO1NgSxQscSE+FoDyDdEg9+5bumsJQ+x/s
-Fu6GMwiISFC2PdMxfrit63jH124iqi/GxjYBP1EAmNMcb/Av+Q==
-=eVH6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
deleted file mode 100644
index 61b0b4f6326..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
deleted file mode 100644
index aa12f972563..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
deleted file mode 100644
index 04fea655c64..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
deleted file mode 100644
index 4851467af2c..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFfFy6gBEADTj66jLcvIYF4tNUoAL4wyKn0UTEUO3ERr+xt3iCswUGuyCWYk
-PHRN3fRkJO8XqkDO/mjWArYt4PKZme6whYb8WJr++pAil1LJXFHo1AEoX0I0vHNZ
-j9srEKiMg63aQXczekmcLcbTeJurDrCWMR9i3qRxrjya0W6pI4ykaHDh6vQ8k/C2
-wkxIE4OcjIZy4D8+e2Cf7qDmUzdqJfZwbMB/y2RtwwWvOOzFSlrxw0zZ3nfQ+tnB
-LwGxugz2peiF5c8gRcV50EXOJQYxEMdsStkxLymIFaJO9hheW7/zJrTRbWBNHvJI
-gE7wJ0SP/9mJojDPiPH/GCfoUkcl4p42ZwZRYAzs7frHA/rmyuyqM02VqXvVsgZk
-QNI5iAuxfTNICHmj3sv3yifQ0OrAI5x2ja9PcvVXmZvTd3Ocf8Rd4mMylGlBBx9g
-kzuxl6AB8eQu+75rSTgGPKfSeDKyxyOSTkhbJj7uX4nf8thzwhVz6zI5aypyYYDL
-5FWeX7b7GPytKoeN5UiDcWgLuzwjN/wlN/IntHWDWkvUCEJ/JpN6FG5AUY+RQkvS
-FrFQLTkGTLQaP8GHo+47Weve+CApUrvTr58NXHBYh8FxXG/cpgAOYt3xy+Z4niuh
-kpcriHwO2xwd4RL0pFhCuaxvgZlgtbJsCv3yLZ5czoUgy2i4u91ZaGflhwARAQAB
-uQINBFfFy6gBEADxoYf2dNUI2DALMtmTVnwknpccOL84iFlYkG3z08DDx37c6DBi
-0ls8rZZIBw/SUxJTM2Eg2ySBqt6+v/ZihpQqoA0upOCEvqsKB1i3WK0BWPRhAE5z
-qav2hp6odIRgoaWjDes52XFFc0cX611T3oM0l2dKuUHr/9/ycne6DlUU8cHwiUzc
-/rRu+kn99rvJueh883ZgZHsNrq1jKNPsMdqNT5Fot+YQnps7ILoQduIaCMDu9PO5
-yq2JrEtuelqzEC5TrbcV1UaIAAbwS7xE47SXnjJvH/5lV4SMkQe1IqOI03HKuNR0
-k9ETAWLoHYjrHqd9A13dfq6KQgCex5psFrwav01erSq8F3ZZy2jDn09bVMLrwwlv
-eBOleFh5NrN2d/DvJq+f/DBL38gARPvvu3fsuELJHaMlLHk95HuUQINbNIMsz4EL
-esgjhc6jQQEthW7JQDReZLS7/mMuHqFCQzjXajdvd8Djw3FGZfldX2v49d+QQD0I
-u7kMk0gUxEvoUg+CLFIqDjzfMgIEBtT69xJgtnkX5KDWYZ2FXuwRQuSqOsmlRrr0
-d6DdDF71NG72ZHX2LrxgXoWJgm4raYtAOvQrK35MMHdXWSOv2fO1m5hxYrqX5Q1f
-/dARSXGjOuXb/Z+jxzt0G7h02f4OrxYQ0JWfjFbfnpShuYP3vENbgoWKWQARAQAB
-=Tdka
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
deleted file mode 100644
index 61b0b4f6326..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
deleted file mode 100644
index 28e016cb361..00000000000
--- a/build-logic/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index c3d1415f69f..e433509799b 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -29,18 +29,6 @@ rootProject.name = "build-logic"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-buildscript {
-    dependencies {
-        classpath("com.github.vlsi.gradle:checksum-dependency-plugin:${settings.extra["com.github.vlsi.checksum-dependency.version"]}") {
-            // Gradle ships kotlin-stdlib which is good enough
-            exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-        }
-    }
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
 includeBuild("../build-logic-commons")
 include("basics")
 include("batchtest")
@@ -50,35 +38,3 @@ include("publishing")
 include("root-build")
 include("verification")
 
-// Note: we need to verify the checksum for checksum-dependency-plugin itself
-val expectedSha512 = mapOf(
-    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
-        to "bcpg-jdk15on-1.70.jar",
-    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
-        to "bcprov-jdk15on-1.70.jar",
-    "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
-        to "okhttp-4.1.0.jar",
-    "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
-        to "okio-2.2.2.jar",
-    settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()
-        to "checksum-dependency-plugin.jar"
-)
-
-fun File.sha512(): String {
-    val md = java.security.MessageDigest.getInstance("SHA-512")
-    forEachBlock { buffer, bytesRead ->
-        md.update(buffer, 0, bytesRead)
-    }
-    return BigInteger(1, md.digest()).toString(16).uppercase(Locale.ROOT)
-}
-
-val violations =
-    buildscript.configurations["classpath"]
-        .resolve()
-        .sortedBy { it.name }
-        .associateWith { it.sha512() }
-        .filterNot { (_, sha512) -> expectedSha512.contains(sha512) }
-        .entries
-        .joinToString("\n  ") { (file, sha512) -> "SHA-512(${file.name}) = $sha512 ($file)" }
-
-apply(plugin = "com.github.vlsi.checksum-dependency")
diff --git a/checksum.xml b/checksum.xml
deleted file mode 100644
index cbbfe400079..00000000000
--- a/checksum.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<dependency-verification version='2'>
-  <trust-requirement pgp='GROUP' checksum='NONE' />
-  <ignored-keys>
-    <ignored-key id='1d0690e353be126d' />
-  </ignored-keys>
-  <trusted-keys>
-    <trusted-key id='07dbc3c1ab1f4468471656061c8d5ef0df2b70d4' group='cglib' />
-    <trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='ch.qos.logback' />
-    <trusted-key id='6ead752b3e2b38e8e2236d7ba9321edaa5cb3202' group='ch.randelshofer' />
-    <trusted-key id='dcba03381ef6c89096acd985ac5ec74981f9cda6' group='com.beust' />
-    <trusted-key id='28118c070cb22a0175a2e8d43d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.dataformat' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.jackson.module' />
-    <trusted-key id='8a10792983023d5d14c93b488d7f1bec1e2ecae7' group='com.fasterxml.woodstox' />
-    <trusted-key id='58f086abb0ede8f7a04b76c34c00043bec5cb7cb' group='com.fifesoft' />
-    <trusted-key id='4ac55a85d30c3499a3219500b7e2662a7640a051' group='com.formdev' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='com.formdev' />
-    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.autostyle' />
-    <trusted-key id='635ee627345f3c1dd422b2e207d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
-    <trusted-key id='55e770230e69cc6de143fb5b62c82e50836eb3ee' group='com.github.gundy' />
-    <trusted-key id='253e8e4c6fb28d11748115c1249dee8e2c07a0a2' group='com.github.javaparser' />
-    <trusted-key id='fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe' group='com.github.javaparser' />
-    <trusted-key id='4bde772c338ba540e1057d0c8ea48d105232855d' group='com.github.jknack' />
-    <trusted-key id='a4fd709cc4b0515f2e6af04e218fa0f6a941a037' group='com.github.kevinstern' />
-    <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
-    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs' />
-    <trusted-key id='9857c388d7d1d9d031274cd0a5def5a76f94a471' group='com.github.spotbugs.snom' />
-    <trusted-key id='042b29e928995b9db963c636c7ca19b7b620d787' group='com.github.stephenc.jcip' />
-    <trusted-key id='e05f005af50ae94e69701222b9729775c0352d3a' group='com.github.tomakehurst' />
-    <trusted-key id='d112630c899f508198c09018105cb91cac2aee0e' group='com.github.vlsi.gradle' />
-    <trusted-key id='b0255b26003ef6f82491acd7254e9c64c264c176' group='com.github.weisj' />
-    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto' />
-    <trusted-key id='3288b8be8512d6c0ca185268c51e6cbc7ff46f0b' group='com.google.auto.service' />
-    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto.service' />
-    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.auto.value' />
-    <trusted-key id='3dbc5d7dc2fb8dd68aa429bd353a436e043e3145' group='com.google.code.findbugs' />
-    <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
-    <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
-    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
-    <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.errorprone' />
-    <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
-    <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.errorprone' />
-    <trusted-key id='ee0ca873074092f806f59b65d364abaa39a47320' group='com.google.errorprone' />
-    <trusted-key id='f05e5f90e43e837f9dd8c781bf935c771a8474f8' group='com.google.errorprone' />
-    <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.googlejavaformat' />
-    <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
-    <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
-    <trusted-key id='d5f46bc0b86af5dc56df58f05e975cb00c643dbf' group='com.google.inject' />
-    <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
-    <trusted-key id='eb1b3de71713c9ec2e87cc26ee92349ad86de446' group='com.google.j2objc' />
-    <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.protobuf' />
-    <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' />
-    <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' />
-    <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
-    <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
-    <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger' />
-    <trusted-key id='670be7d076a0c89f5f07625ae57428da9e879e7d' group='com.helger.commons' />
-    <trusted-key id='41d266db4427983a1a4afb0c3684155e9365c30e' group='com.jayway.jsonpath' />
-    <trusted-key id='34d6ff19930adf43ac127792a50569c7ca7fa1f0' group='com.jcraft' />
-    <trusted-key id='817ea1255546d6070a23aa00db45d3a62a183ce2' group='com.miglayout' />
-    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest' />
-    <trusted-key id='adbc987d1a7b91db6b0aaa81995efbf4a3d20beb' group='com.pinterest.ktlint' />
-    <trusted-key id='06d34ed6ff73de368a772a781063fe98bcecb758' group='com.puppycrawl.tools' />
-    <trusted-key id='1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a' group='com.soywiz.korlibs.korte' />
-    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='com.sun.activation' />
-    <trusted-key id='31fae244a81d64507b47182e1b2718089ce964b8' group='com.thoughtworks.qdox' />
-    <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='com.thoughtworks.xstream' />
-    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-beanutils' />
-    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-beanutils' />
-    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-cli' />
-    <trusted-key id='cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0' group='commons-cli' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-codec' />
-    <trusted-key id='bc87a3fd0a54480f0badbebd21939ff0ca2a6567' group='commons-codec' />
-    <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-collections' />
-    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-collections' />
-    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='commons-fileupload' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-io' />
-    <trusted-key id='636de9055c4c75c7bd9830771241bc872c5e4ec0' group='commons-lang' />
-    <trusted-key id='d196a5e3e70732eeb2e5007f1861c322c56014b2' group='commons-lang' />
-    <trusted-key id='0cc641c3a62453ab390066c4a41f13c999945293' group='commons-logging' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-logging' />
-    <trusted-key id='b920d295bf0e61cb4cf0896c33cd6733af5ec452' group='commons-logging' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='commons-net' />
-    <trusted-key id='0186f8b24c5bc02c94a0e0e486f75e83e1ee085f' group='de.thetaphi' />
-    <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
-    <trusted-key id='3e1ac64f4e34e290503c90323449ec3ac2efe8aa' group='dnsjava' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
-    <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' />
-    <trusted-key id='c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e' group='io.burt' />
-    <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' />
-    <trusted-key id='7186bbf993566d8c2f4f7ed7d945e643368fef62' group='io.github.eisop' />
-    <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
-    <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' />
-    <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' />
-    <trusted-key id='59b06224fd8912e36603be79fefe78456eddc34a' group='io.mockk' />
-    <trusted-key id='6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac' group='jakarta.activation' />
-    <trusted-key id='a1483f88ba771993ab609c43590c2310cee1c9be' group='jakarta.jms' />
-    <trusted-key id='fc411cd3cb7dcb0abc9801058118b3bcdb1a5000' group='jakarta.xml.bind' />
-    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.activation' />
-    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.annotation' />
-    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.mail' />
-    <trusted-key id='4f7e32d440ef90a83011a8fc6425559c47cc79c4' group='javax.servlet' />
-    <trusted-key id='4daded739cdf2cd0e48e0ec44044edf1bb73efea' group='jaxen' />
-    <trusted-key id='ca491704d613780d2bee00f2c6fc46eb51cf569c' group='jaxen' />
-    <trusted-key id='b5569a15406ae682380f3ef8528dc75aa68f0923' group='jcharts' />
-    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='jline' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='junit' />
-    <trusted-key id='a7892505cf1a58076453e52d7999befba1039e8b' group='net.bytebuddy' />
-    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
-    <trusted-key id='3f999bb69041cf17e73bb1cec038787776a19d18' group='net.javacrumbs.json-unit' />
-    <trusted-key id='d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071' group='net.javacrumbs.json-unit' />
-    <trusted-key id='2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec' group='net.minidev' />
-    <trusted-key id='517b94f8d0a46317a28d8ab30da8a5ec02d11ead' group='net.sf.jopt-simple' />
-    <trusted-key id='4f752a9878e937049ef3fba7d4012dda1f1f0f82' group='net.sf.jtidy' />
-    <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='net.sf.saxon' />
-    <trusted-key id='d9aa7402ba75f78720d975211d185615d0a84648' group='net.sf.saxon' />
-    <trusted-key id='a1885c07a3204611fb184ef7098a31f381819057' group='net.sourceforge.nekohtml' />
-    <trusted-key id='2c1708ea05adf6966c32d6454a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
-    <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
-    <trusted-key id='5719e50eac5a4b1dd390b72c2a742740e08e7f8d' group='org.antlr' />
-    <trusted-key id='b01128c8fd304fe48e6eed2c347cd0eaed975c5f' group='org.antlr' />
-    <trusted-key id='dddee87612e9fb95f5c8d91e411063a3a0ffd119' group='org.apache-extras.beanshell' />
-    <trusted-key id='1aa8cf92d409a73393d0b736bff2ee42c8282e76' group='org.apache.activemq' />
-    <trusted-key id='0a123c1ed3f13a6a0140e166c71fb765cd9de313' group='org.apache.ant' />
-    <trusted-key id='8da70c00df7af1b0d2f9dc74ddbcc1270a29d081' group='org.apache.ant' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.bcel' />
-    <trusted-key id='12d16069219c90212a974d119ae296fd02e9f65b' group='org.apache.commons' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='org.apache.commons' />
-    <trusted-key id='3692c12c7e3d336a452beb254e066e0459cd109b' group='org.apache.commons' />
-    <trusted-key id='41a1a08c62fca78b79d3081164a16faaec16a4be' group='org.apache.commons' />
-    <trusted-key id='4e2ddd47e19863bb87211544cd3038fef07d567e' group='org.apache.commons' />
-    <trusted-key id='b6e73d84ea4fcc47166087253faad2cd5ecbb314' group='org.apache.commons' />
-    <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.apache.commons' />
-    <trusted-key id='d6f1bc78607808ec8e9f69437a8860944fad5f62' group='org.apache.commons' />
-    <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.ftpserver' />
-    <trusted-key id='ea23db1360d9029481e7f2efecdfea3cb4493b94' group='org.apache.geronimo.specs' />
-    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents' />
-    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.client5' />
-    <trusted-key id='0785b3eff60b1b1bea94e0bb7c25280eae63ebe5' group='org.apache.httpcomponents.core5' />
-    <trusted-key id='077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0' group='org.apache.logging.log4j' />
-    <trusted-key id='53c935821aa6a755bd337db53595395eb3d8e1ba' group='org.apache.logging.log4j' />
-    <trusted-key id='fa77dcfef2ee6eb2debedd2c012579464d01c06a' group='org.apache.maven.doxia' />
-    <trusted-key id='4d2db2916149baa9d0c92f3731474e5e7c6b7034' group='org.apache.mina' />
-    <trusted-key id='6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1' group='org.apache.rat' />
-    <trusted-key id='184454fad8697760f3e00d2e4a51a45b944ffd51' group='org.apache.tika' />
-    <trusted-key id='7b9751fc3f01f134f476464cd0eb627d4885ced1' group='org.apache.velocity' />
-    <trusted-key id='223d3a74b068eca354dc385ce126833f9cf64915' group='org.apache.xbean' />
-    <trusted-key id='82d8419ba697f0e7fb85916ee91287822fdb81b1' group='org.apache.xbean' />
-    <trusted-key id='c758f9cc982ac877e7b295dd6e97418b04b11dcb' group='org.apache.xbean' />
-    <trusted-key id='5c9a30ff22b2c02f30261c305b93f1df7cdb6dea' group='org.apache.xmlgraphics' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.apiguardian' />
-    <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
-    <trusted-key id='3a4d86c56ca99373b6d8953dbe84d764623a3644' group='org.brotli' />
-    <trusted-key id='19beab2d799c020f17c69126b16698a4adf4d638' group='org.checkerframework' />
-    <trusted-key id='34441e504a937f43eb0daef96a65176a0fb1cd0b' group='org.codehaus.groovy' />
-    <trusted-key id='7faa0f2206de228f0db01ad741321490758aad6f' group='org.codehaus.groovy' />
-    <trusted-key id='82f833963889d7ed06f1e4dc6525fd70cc303655' group='org.codehaus.mojo' />
-    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.codehaus.mojo' />
-    <trusted-key id='b02137d875d833d9b23392ecae5a7fb608a0221c' group='org.codehaus.plexus' />
-    <trusted-key id='fa77dcfef2ee6eb2debedd2c012579464d01c06a' group='org.codehaus.plexus' />
-    <trusted-key id='6214760097dc5cfad0175ac2c9fbaa83a8753994' group='org.codehaus.woodstox' />
-    <trusted-key id='8f9a3c6d105b9f57844a721d79e193516be7998f' group='org.dom4j' />
-    <trusted-key id='2e92113263fc31c74ccbaab20e91c2de43b72bb1' group='org.ec4j.core' />
-    <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty' />
-    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.eclipse.jetty' />
-    <trusted-key id='5989baf76217b843d66be55b2d0e1fb8fe4b68b4' group='org.eclipse.jetty.http2' />
-    <trusted-key id='f254b35617dc255d9344bcfa873a8e86b4372146' group='org.eclipse.jetty.http2' />
-    <trusted-key id='7c669810892cbd3148fa92995b05ccde140c2876' group='org.eclipse.jgit' />
-    <trusted-key id='1def9646901a1652e5b3e5ea694db6f419c8d1fd' group='org.exparity' />
-    <trusted-key id='13ac2213964abe1d1c147c0e1939a2520bab1d90' group='org.freemarker' />
-    <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='org.fusesource.hawtbuf' />
-    <trusted-key id='1bd97a6a154e7810ee0bc832e2f38302c8075e3d' group='org.gradle.kotlin' />
-    <trusted-key id='4db1a49729b053caf015cee9a6adfc93ef34893e' group='org.hamcrest' />
-    <trusted-key id='e3a9f95079e84ce201f7cf60bede11eaf1164480' group='org.hamcrest' />
-    <trusted-key id='d76260c72df74e66268f7770ab049df4ab24c1ef' group='org.hsqldb' />
-    <trusted-key id='a413f67d71beec23add0ce0acb43338e060cf9fa' group='org.jacoco' />
-    <trusted-key id='e5c3b1929191df06136ccb2b164779204e106a76' group='org.javassist' />
-    <trusted-key id='9a4555c237785ca8a6dc1fe58799af90c06efbbd' group='org.jdom' />
-    <trusted-key id='2e3a1affe42b5f53af19f780bcf4173966770193' group='org.jetbrains' />
-    <trusted-key id='33fd4bfd33554634053d73c0c2148900bcd3c2af' group='org.jetbrains' />
-    <trusted-key id='e62231331bca7e1f292c9b88c1b12a5d99c0729d' group='org.jetbrains' />
-    <trusted-key id='98465301a4939c0279f2e847d89d05374952262b' group='org.jetbrains.dokka' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.intellij.deps' />
-    <trusted-key id='6f538074ccebf35f28af9b066a0975f8b1127b83' group='org.jetbrains.kotlin' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.jetbrains.kotlinx' />
-    <trusted-key id='8e3a02905a1ae67e7b0f9acd3967d4eda591b991' group='org.jetbrains.kotlinx' />
-    <trusted-key id='e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb' group='org.jetbrains.kotlinx' />
-    <trusted-key id='8a9352189aeccfb4ae1f3bc616fbb6b6e3120829' group='org.jetbrains.lets-plot' />
-    <trusted-key id='feabfb0dbd7a754822d35dd9be6397e958ab7594' group='org.jetbrains.lets-plot' />
-    <trusted-key id='1fcffe916b6670868fa0ea0391ae1504568ec4dd' group='org.jodd' />
-    <trusted-key id='cdcaa216b086a7b603b638c5145d819475314d97' group='org.json' />
-    <trusted-key id='f3184bcd55f4d016e30d4c9bf42e87f9665015c9' group='org.jsoup' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.jupiter' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.platform' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.junit.vintage' />
-    <trusted-key id='08ba61cf501c09f70911b83b82216a03caa86c78' group='org.mongodb' />
-    <trusted-key id='e9af5293c334c7c0b583227d2f45f85cdf082e68' group='org.mozilla' />
-    <trusted-key id='07a4fa67a8222f1b39f9edaef8052e4e1bd0db31' group='org.neo4j.driver' />
-    <trusted-key id='e85aed155021af8a6c6b7a4a7c7d8456294423ba' group='org.objenesis' />
-    <trusted-key id='019082bc00e0324e2aef4cf00d3b328562a119a7' group='org.openjdk.jmh' />
-    <trusted-key id='ff6e2c001948c5f2f38b0cc385911f425ec61b51' group='org.opentest4j' />
-    <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' />
-    <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' />
-    <trusted-key id='e0d98c5fd55a8af232290e58dee12b9896f97e34' group='org.pcollections' />
-    <trusted-key id='50a628ffaf58480736b1079fd1031d14464180e0' group='org.reactivestreams' />
-    <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' />
-    <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' />
-    <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' />
-    <trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='org.slf4j' />
-    <trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
-    <trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
-    <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.springframework' />
-    <trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
-    <trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />
-    <trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
-    <trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='org.xmlresolver' />
-    <trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.xmlunit' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xalan' />
-    <trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='xalan' />
-    <trusted-key id='6cb87b18a453990eac9453f87d713008cc07e9ad' group='xerces' />
-    <trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xml-apis' />
-  </trusted-keys>
-  <dependencies>
-    <dependency group='antlr' module='antlr' version='2.7.7'>
-      <sha512>311C3115F9F6651D1711C52D1739E25A70F25456CACB9A2CDDE7627498C30B13D721133CC75B39462AD18812A82472EF1B3B9D64FAB5ABB0377C12BF82043A74</sha512>
-    </dependency>
-    <dependency group='aopalliance' module='aopalliance' version='1.0'>
-      <sha512>3F44A932D8C00CFEEE2EB057BCD7C301A2D029063E0A916E1E20B3AEC4877D19D67A2FD8AAF58FA2D5A00133D1602128A7F50912FFB6CABC7B0FDC7FBDA3F8A1</sha512>
-    </dependency>
-    <dependency group='bsf' module='bsf' version='2.4.0'>
-      <sha512>CF2FF6EA53CD13EA842CAD398F1BE24539BEC68A5CBBD088492ADAB50BC782CDE6D9F4C0B6A24DEAEEE537809C90631C43F9A680FF2826C28CCF1B39380954E3</sha512>
-    </dependency>
-    <dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
-      <sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
-    </dependency>
-    <dependency group='com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='5.0.14'>
-      <sha512>F8768877E3B204EA886F7BDEE6B4D900DB80B1B63CF37800F56E3BB1E2D3C13B38F7BA4784160DB80A0CAB658D4948BEE1992E9FAFE519C156BEF8A4B0B3E903</sha512>
-    </dependency>
-    <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.85'>
-      <sha512>59CD14C68456ADD477C6B6ACC8AC330EE5A10BA4394E3434450E958EC04968197C3EDAE8F3693D42CA32A5C0F639D6D60CF155B659D91CF89301744130087D9A</sha512>
-    </dependency>
-    <dependency group='com.github.vlsi.gradle' module='gradle-extensions-plugin' version='1.85'>
-      <sha512>42B201D43EC742D1EC4122D936291A6FF3C757E9522CA1940D2E25847F4B15D1AF814F4ED9139CD86D501849D2FD887725BF5498471D62FCBDD906AD6F167B8</sha512>
-    </dependency>
-    <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.85'>
-      <sha512>C9B64C9E8D0BE6108D479BE50D156007438CD193517CB79BEE3B9C172F38502EA77CC757D79B78C1BF7436F7747D87FE0E1B59893A5259F29711B72D7AFE1774</sha512>
-    </dependency>
-    <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.85'>
-      <sha512>2F70DA03A8F8ECF0F92C7B8B219321DFE9C8926DC55BF343662B043F277C7F63090B1B7E06F963606D9D9228E3FA4245393E2D3773DFD3D059136EB65D2E7998</sha512>
-    </dependency>
-    <dependency group='com.google.collections' module='google-collections' version='1.0'>
-      <sha512>5741BCDF5C2D54DAA53A60972D61D0FB3ACB68A31AB4A913832DE71C47B4ABD59B85E760A335D7EFDE55D4E309824839B09F9224A43C124BD54C634A87A9B7F7</sha512>
-    </dependency>
-    <dependency group='commons-logging' module='commons-logging' version='1.0.4'>
-      <sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512>
-    </dependency>
-    <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
-      <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
-    </dependency>
-    <dependency group='de.thetaphi' module='forbiddenapis' version='3.6'>
-      <sha512>B9D779B085611E8122FB1F30952E1DD1EE1456AF11EAED24F7182B73EFF1E648862912849F1CE53CD8CDA8313F7CDB2E88BA959C3868418359BB98E59CD2E5D7</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.5.0'>
-      <sha512>36557C04B8FC7DC446B5FBDD6383A1B7281708B424C3039E7EC11807F3BB9A5E2764BE4BEC1D717C38595B12D8B291CB2A002D85B5E79DC9A9A4CBD27C58C7BB</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='1.6.10'>
-      <sha512>E7486B32EF6C9C14FE879814DA5F06CA6ECABF47195063A93E6FC8CD10119244C5A7BC3C71A4760CCE3AFFA9E9736336D345D8ED84EB65153C15683FA6529D92</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
-      <sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
-    </dependency>
-    <dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='1.1.7'>
-      <sha512>B7B121AC6385206A03717E03A61C9514478934CF7E8BBDCD87BD2E8ECFC2DEB37B9B834DA34EAA14C16CA6F61DB6A4DCD1C89FEDEE22EEBDEF6EAE5423847CE1</sha512>
-    </dependency>
-    <dependency group='io.freefair.gradle' module='lombok-plugin' version='5.3.3.3'>
-      <sha512>750C97C7BE33EEF83B43A94E4342F978F5FDB0E4A523ABB408CC1E2111CE214CEC3A6177265618A8429FFB6C09A0E47070C68F2F046F3A6CCC0F5DD77D2E2ED0</sha512>
-    </dependency>
-    <dependency group='io.github.microutils' module='kotlin-logging' version='2.0.5'>
-      <sha512>7396153FF7D2188A963CAEFAC07197C40FCA4866856EC0A1011C5B17E69DA098FCB01401B62E795FBEE18C5BA06D8076380BEC91DA96ADDFC512232B7A6C9A7F</sha512>
-    </dependency>
-    <dependency group='javax.inject' module='javax.inject' version='1'>
-      <sha512>E126B7CCF3E42FD1984A0BEEF1004A7269A337C202E59E04E8E2AF714280D2F2D8D2BA5E6F59481B8DCD34AAF35C966A688D0B48EC7E96F102C274DC0D3B381E</sha512>
-    </dependency>
-    <dependency group='me.champeau.jmh' module='jmh-gradle-plugin' version='0.7.2'>
-      <sha512>E433E221C9167BB937EC0DF7626B5BBBE99E08C566A6D54BA7D2E04252DD452B4CA957B57E687F85F958DF0CE12678E17D0BCB527E1077770C8B7390CE58F56C</sha512>
-    </dependency>
-    <dependency group='net.jcip' module='jcip-annotations' version='1.0'>
-      <sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>
-    </dependency>
-    <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='1.2.1'>
-      <sha512>DC1FA477AE67F94B7CA427F1F88FD3C56E562EB3ED92A3CBC4CC116258EB3856F4B53C99506FDC279F6983EAE74BA21271E4A152F5DB8B41392FFCBB6B087C78</sha512>
-    </dependency>
-    <dependency group='net.ltgt.gradle' module='gradle-errorprone-plugin' version='3.1.0'>
-      <sha512>3D4753C1818615A894B33EB51E16A1D9F820D997EB1C3F2FFD0AC2345A0F587D53044C0BE1D9D6B776C1994D9AE3D7036064D4A801EF88D478D3D219F1964D1D</sha512>
-    </dependency>
-    <dependency group='net.minidev' module='accessors-smart' version='2.4.7'>
-      <sha512>6DAAF2FE1B278599D6D0BBD3F157096F8BCCF3D25616099C128139CE164B29461860EB2786F3D3728937A0D0505DF73F1C9673B0766F946C50878E5F60305736</sha512>
-    </dependency>
-    <dependency group='net.minidev' module='accessors-smart' version='2.4.8'>
-      <sha512>45405C083334B05EFA07572497B9D510CA771AF32CE93D960BE802216A9714FFFF8418384EA48E197D3DFB6EBEC4EC3E610155841E8A257A7FB9A4BD6A1B668F</sha512>
-    </dependency>
-    <dependency group='net.minidev' module='json-smart' version='2.4.7'>
-      <sha512>3E9E1EE9A44EA15044B588B06A956AC150A37B63C161BF9B08A60539F5C90EFC7718DEB24FD084F503B68092516AAC3349DBB74049777EA4C6619AC26090A1D</sha512>
-    </dependency>
-    <dependency group='net.minidev' module='json-smart' version='2.4.8'>
-      <sha512>13F4609FE72DF98C81F86D25616E5B0CE1426688AA5A9DD953733FA98A8DEADB87B3E69A77741DC9D31DD4485265D3B9E4EC71D99346E4A7558F2500F3677714</sha512>
-    </dependency>
-    <dependency group='net.sf.ezmorph' module='ezmorph' version='1.0.6'>
-      <sha512>16D30BE564723B74F312B4E7D06F349370FB6726B3162778C869CD723ECA2A40C4972C2757B3E107E1820CEC0D70B0BD2B96EFCD466518FC64495F7AEF97967A</sha512>
-    </dependency>
-    <dependency group='net.sf.json-lib' module='json-lib' version='2.3' classifier='jdk15'>
-      <sha512>ED6E95BF555AD3193B527258972DAFABD73745D993DA0CECE486E34A471D080850D201864026F4F41CA0982926C264C6E6CC55D91F000CDFD5D09EE3F306735C</sha512>
-    </dependency>
-    <dependency group='org.checkerframework' module='checkerframework-gradle-plugin' version='0.6.37'>
-      <sha512>52E8003B3CD07FFD3DFB8830F628904C24762003F65D10E002C4D2E84B7046C6B2ED66D69CE8A74AD6923E96868B3E08B3B404AA004ED36750B316B12BAEAF6D</sha512>
-    </dependency>
-    <dependency group='org.codehaus.groovy.modules.http-builder' module='http-builder' version='0.7.1'>
-      <sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
-    </dependency>
-    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.1.2'>
-      <sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.21'>
-      <sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.0'>
-      <sha512>1D66B1C76711E0F48800BA1EDFAABC0763A21FC0D4145DED508C8D9DCA0EDF5A61A791E58985578C25861435F5BFB4EFD5E0648A8D0E85A30CDFB01AD1559C6B</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.17.3'>
-      <sha512>A3E69E3B8416E71842921D439A45BCE30BD00043E17923B5071A298C79F4914B1CB1FAA8DAA779CBC234B576AA54A3DE4D816C2BD7E4C2712A119C357027C2B9</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='atomicfu' version='0.20.2'>
-      <sha512>8B31FEED38FCEE2CBD0705587D0E960DA508ED59F2EC51EB1C4789F3093937F5B0CF87C21B13967AB22E718E7FBFF7BD3CA4B4D0CA872EB408448583E3F45C8F</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.1'>
-      <sha512>44A5D6F34DB9A4BAE1C11CA10563F3A25F1C6A8F681ABD31C530C7D36C9B001AB6F345F0AB5E2AFD94AD5AB436C06D12D7B1AD9EB7F12DB3EF9487D692107921</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.6.4'>
-      <sha512>626213318BD0605586FC693969765FAE3BB15D2BCBBACB597C6E32AA1BDEF6430980480B6732556FCD93DE1E6BA99F9E050141AD59259AAE386D8D05A3C44C27</sha512>
-    </dependency>
-    <dependency group='org.jetbrains.kotlinx' module='kotlinx-coroutines-core' version='1.7.1'>
-      <sha512>89CA3D64D42938DCB50AC58CD53D1DAEAF6EA0BF69CC01DEFE7467D2D1F23BE7932D005861A6E08C2C81980EE1F8EFB9A944B939FE02AF99518753704383C086</sha512>
-    </dependency>
-    <dependency group='org.nosphere.apache' module='creadur-rat-gradle' version='0.8.1'>
-      <sha512>397C3257C5448C26304B312212F6DA1649AD15E52CE0419C5BA647F8A68864707A0C8071FA9860C28AA9D626D66C8FAF2D5F576E693F9D01B0F71EEEB84B57FB</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-analysis' version='6.2.1'>
-      <sha512>BE273F8E886BBCFDA81180917145996AB8FD26A17264EBEB5E1FC2337950A309D64DC8CBD373220009728622A8CBF56B8578E960B5561C22EA66848D296AE44E</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-analysis' version='7.0'>
-      <sha512>1A6CA169E9E2D29256F9C45570D89E5B039EAF7D405CCB3F7F79926552F2A0818975CE2C6ADCE3F1F59E28172E4303A1C790C52AB06263C61C9C8181FF279CEE</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-commons' version='6.2.1'>
-      <sha512>CDF7DDB8E865B1C22C7532FFF68380FE4EC49A00C6FF3188BF265C4769E49E793B51621FC80A39B5BA2D49E703F100BDB7FC9CFF8F488C5153A9339334371411</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-commons' version='7.0'>
-      <sha512>CA97B49EECE30DA774055B58A63C6E4F65A6BC4C0F40A829DCAF7164FBFFDEC10C6B2D9A22DF0A0918FDC83A47EA9906294AA99D3F170B35FD9E0632578C80B2</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-tree' version='6.2.1'>
-      <sha512>20FE687C2F494717CCEB33C97704FAB7C1867EEA1A0F79B70C68BCAA72E7818F34921B6FBA7A3C1ECBBC7256E1D8E1A538F9EC5B4BD3B2A255D412D2BC2CAA4C</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-tree' version='7.0'>
-      <sha512>81A223620DD16340D18ECBA20AB15CFE078F61AB0EC1AEF091AFCD282E3F6047B9800200412116289EC14917B5ECE9414C8009E92CC9A3333C677B5BFEC13BCF</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm-util' version='7.0'>
-      <sha512>6B9630AD4C5F6ABC2724F9D85A7C0E81E524F8B0BF25273DD5578EDC20EFC7AB400095CD48E904D2536071181A8E9F39635FF3FEE0986BD078016D2DFF8241B1</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm' version='6.2.1'>
-      <sha512>C8D0AB865B628CB5A71C2B8C5FC8AACDA3E286B14662C3287CE50A96E91990E959F1447D439BD7190D9088E69E4368EFBFF5890FA539F98776F514A262D6DA8C</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm' version='7.0'>
-      <sha512>B31699F50485DDC4E84466064CF5789A3E61BAFBEC53C4B9CB19FFEF07B36722D3EFDCA8722884FD6D6DEDACA65DB4DD6F71CD886BBA599E8A77971955167A60</sha512>
-    </dependency>
-    <dependency group='org.ow2.asm' module='asm' version='7.1'>
-      <sha512>7EBA7097109389F48FA9142BF22D225F5D3104D68013D3B8E0A6D4054A8CD0EF64614372BDCB38987D68ADB6D33A3804E98DDF112BA84DBB09D448CE702DACC4</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='jcl-over-slf4j' version='1.6.2'>
-      <sha512>3BA508C96EE0985865C9E86EBE803D1903835F7C198EB15723CDC86B028D6C82DBB7E96ECB01CEFAD7CC6EC7023155676D034B6B730A911D0FFE9F91FE532592</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='slf4j-api' version='1.6.2'>
-      <sha512>F520620AA2DF7856DEA11E8B310F5F48C7A53444867112F734FFEF6726DF6EB469BF068564AF79B7DE30845906E7B5772CA064A3CC0DA18918E6DE46BD02D6E6</sha512>
-    </dependency>
-    <dependency group='org.slf4j' module='slf4j-nop' version='1.6.2'>
-      <sha512>89F8559C281F6BCEA4EB193C49AA8C960A5FE6762DCA0198A7BB04B9D8A846AC52231F77EC16B2E9C0B48D0F6011517B641B5B93279B24EEF65EE22E2C1167F3</sha512>
-    </dependency>
-    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='3.0'>
-      <sha512>AFC41AFD611214C500CACA4D826652E38D5DDD1BCF182D935AFFD2B5B8DF26650DFEB76E4C06C2D46593E1FB86BB4D093438E8E862666E64AB32FB4B6EFEA30D</sha512>
-    </dependency>
-    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.0.0.2929'>
-      <sha512>5CD9C5E9C91145E6F5FC1DA819F6241ADCE8685C6C71F480CB7F7F1D2ACFCDFD19C631E7DC2E9FDDEDBA840C6063A020A377644C80543A9E366DF65642F16F8C</sha512>
-    </dependency>
-    <dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='4.4.1.3373'>
-      <sha512>3FDE80F4F005B5BABF6F278C6B4C7BEA4A00603BF9C44C3026334BFBE0B64E1F767C92295614D6A5AEF61692844F0FE7DBB0F8119F58EABF522FCEC6904272E8</sha512>
-    </dependency>
-    <dependency group='oro' module='oro' version='2.0.8'>
-      <sha512>9A98E493C4D771322B1331EC05AB0E363A83D8AC2AF8018D96A44DF2BF5BFC97D33EBE6F6F93E46AB10BF1536F0C29E9D9569318ED49BC18B4E96B1A8B476D37</sha512>
-    </dependency>
-    <dependency group='xerces' module='xercesImpl' version='2.12.1'>
-      <sha512>811AFD85CDD19545785FDE7FB39511F1E171E1D021A96117D105E2B2F37715536E17259E6AD0CE897B4C7C8A5BD1E88C9FA0825B0A2EF9F3956CD82944A33957</sha512>
-    </dependency>
-    <dependency group='xerces' module='xercesImpl' version='2.9.1'>
-      <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
-    </dependency>
-    <dependency group='xml-apis' module='xml-apis-ext' version='1.3.04'>
-      <sha512>AC0896B9A3FEA71644330DAEF4ECCB33005B5B7AC1E1D1D73EED2B2A1F4B2282057F3C0F3698B899E1C76B19C09C69BF4CD0EE548427B9BCC676B791DB5C36BC</sha512>
-    </dependency>
-    <dependency group='xml-resolver' module='xml-resolver' version='1.2'>
-      <sha512>ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A</sha512>
-    </dependency>
-    <dependency group='xmlpull' module='xmlpull' version='1.1.3.1'>
-      <sha512>54D1090623497E81270B2AF633268656E8855E1EDCE2217886431039516A391BA9F8D8DB3C21A0B5E51C7F7CB672D63EBE77BE75708B760B06F399486960F261</sha512>
-    </dependency>
-    <dependency group='xpp3' module='xpp3_min' version='1.1.4c'>
-      <sha512>34989289CE8ED861499F31742EE1E7B9DC3C59973CE915A7B561D33D98968E77DB5BB94C1692802CCDBD86D04CAA7DB67748EFAFB1402428B2D6AE3056497618</sha512>
-    </dependency>
-  </dependencies>
-</dependency-verification>
diff --git a/gradle.properties b/gradle.properties
index 83166e07ac1..c5f97deb259 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,7 @@ org.gradle.parallel=true
 # Build cache can be disabled with --no-build-cache option
 org.gradle.caching=true
 #org.gradle.caching.debug=true
+org.gradle.dependency.verification.console=verbose
 
 kapt.include.compile.classpath=false
 
@@ -37,8 +38,6 @@ systemProp.sonar.gradle.skipCompile=true
 jmeter.version=6.0.0
 
 # Plugins
-com.github.vlsi.checksum-dependency.sha512=FAC41BF54A7C833BEAE9AB64083F6BEB3E1935BD6866C1B2F1D48FF926ABA4AECA53600FC3E41BE6ECBC87B73CE12F59C59836FB2E1DECC9408288060D66E988
-com.github.vlsi.checksum-dependency.version=1.89
 # Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
 kotlin.api.version=1.5
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
deleted file mode 100644
index d8855e32ed2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/4be257b370130000.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e3a9f95079e84ce201f7cf60bede11eaf1164480
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
deleted file mode 100644
index 3b7f58c1acb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/8118b3bcdb1a5000.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
deleted file mode 100644
index c030578a397..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/00/cfa2c539de0e0d00.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3f999bb69041cf17e73bb1cec038787776a19d18
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
deleted file mode 100644
index 0cae4729da7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/1f7a8f87b9d8f501.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
deleted file mode 100644
index 9bc87bcad5e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-ZEHxSQuDDyyK92EAEQEAAQ==
-=YUaV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
deleted file mode 100644
index 3a993d282f7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/01/c59d5d06cf8d0e01.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a413f67d71beec23add0ce0acb43338e060cf9fa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
deleted file mode 100644
index 82ce5f73ae6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/72ff58594f983302.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/04/ea8543c570faf804.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
deleted file mode 100644
index 1efb468cd8d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/3a1959eef8726006.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
deleted file mode 100644
index a8b12b46251..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/06/cae38bc93d90b852d88465dd3a1959eef8726006.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
-j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
-lOiq5GM/Em0mtCSDI+i+zpD7MKCQEeV6V9d09r8Ncltf42BQb2x30ajTsGps++tH
-Z6xxhlPaYsF6OT7SBSt40cjc+rhUuAUo7D4Jt7S7zvi2aeulEr9YD+gkp6+EED2p
-f085M4tn9FjIEmYEOdfq2LkrKbel4r7x3YTypU+G0SDEeGKLJrlekNr7B97CxNat
-aP+ioa6GPY1+u8pkELSZDaUUKpqPKuYt37t1XqWHnvzGYzFyORQjuANCz2f8yAkN
-QqgImFuHiv4Zem7Y4ZagG0TG+T+BT7fZFbYIjpMxuy96mn8jdDMRvNOlskMWD+7x
-QLt1TGaworhDJ5suY4TVN7jQfUX11sTjriBkb+xoSvEFJt5MmQvEi587rIt0Xxcu
-/PKkob99JB/W178ZSbJBoOD43iTP//ifgPPlWHa8GgLBg+EyR1HNvZ6goXhfysGB
-BMV0JP4Fk7SOeV6sb2A2vUIA4uVGVzkzxkb/aG03vIl4pvf74y2Gi70/y1/mAbQp
-BWg3LAcn9ARB6t3Z/rTXWL2bfQPGQ6HWSBcG/qHLwQq+1eUR08GdG2PvwwARAQAB
-uQINBFu07sABEADvtfuYWvWH514Ykl9/BpRFWuGvjR3Xfnc2hn12vCH61Na851r9
-vfYkq3PKLMnzBq5Z/jodIcivDLm4zsNUPxVtsHsqr9PE/5xeFO4i7EWU0554Z9p1
-L2D6Q556WSXAFfO6r/41H96VbSctF3onJ4aUL8QQ4gVtPgX3LutC59DUDpcN+1Ut
-VFPsUMaRShVS7weN1PvBRo0QRIo5YbWMnbt48Hx/lY5X0IAT2ptdUbU+AGOiIh0W
-AMks+hyrKddi5fXupMTEYASnUvZOibBYKID4A6WmIma4QniaWy7CMPvGuKaHEZ9d
-DeK/kjGlHc5O9UmQ3bJgiTNTgmNij7VpxeTkiaYq+l7aPiuJo4TQRLZ7XtMv3YTf
-HnMZFZj/BJw5otPa9EWvMXOO8mi8MRg4KfraMNUzniJnEGL2iXAPAU/oMiHRlgrT
-vKS2s81Kaj7HDfgxS1pKKLLcXTvDIt4VAe2+9rl7UEmlR9UuRmFZx0dTmvby54MC
-qR6Xin0XMr+Y+NcONF8l1nN20AMhyWUzshKDoEsqdvyTyfKZjUoP6kAvqQknsmC2
-nSyp1V2ToPlPACAK5cMdJPa7R7C5xWrF+Do7j3FQsAoy1GzJezP78tbZyCxQTSDO
-MjvMg4l+2ngHa/aLIb5aLopobuH/9yVSILOcjTnO6wEL6YZHaJAMckVGcQARAQAB
-=ZdoI
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
deleted file mode 100644
index d9ae47869d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/07/402123d2f5f4af07.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
deleted file mode 100644
index 9b9c02b6032..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/3288b8be8512d6c0ca185268c51e6cbc7ff46f0b.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFbgSbABCADGGENSy3oWLjW7zfYMSsR0pm3l3eMA7ptyU5C0U/MoIYjbXwyX
-XtlGwKnNgngATh1SMpX4WDbD8tn6vdeP4uHQsDb40t0XN7/HISFcLhV5pCgz2wNR
-t1dZbreV/EaZn3f84Vnm9s6TU7RHuPP9qBne1YLbB+LKKZUfQGavqGR+n322DhrR
-NqLdC3zFNtSmCVXS6GZ17IV/B+6CiNdbmPVk0o7zZexqZCNMXxv1IFzHV1/Y8Htu
-WQBfZ0zWwrX85ZKysU7UDdoyUw2aa8/+YpZmKwo32N8GpqA6azBeUjjVXGuqktMy
-l6IcHbLlgymkkjK7TyAKltuhvp6AlBTzp9i/ABEBAAG5AQ0EVuBJsAEIALE90/PK
-unEOu2B+QGGV9e0jJMlW+rs3BV6NI9ZaRw0Uvy0xN+jqhMsyCzB8P1joTZKUsmK9
-ptaPlMuKrTaQ/0GYPi6cP5EamphyvjK8ljLhhQuiAxt7zwv78vX7CGqRUEcAszsK
-8FPBAXERsSit661rjp4Ai71cyQg8YOXDjhissHWmneF8TJ3yItocj4KxDKLxoY+h
-F64epbkjIkpfrZ34iX8zdZMRCNJlh+oTHe/xulYLQDbgkgQa+Y6gnKmUZi0QGU01
-k6eWw/U3yOC69++ehiYcZYS0dWpPE/H51Rizn7QipFeFfTsia9jkGjzMyKHGju66
-URQ8okd4E6ev3N8AEQEAAQ==
-=Kdrg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
deleted file mode 100644
index d3364e97093..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/34441e504a937f43eb0daef96a65176a0fb1cd0b.asc
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
-m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
-fKpWWkpKfHsGIFkfsOX6J83J4GVpaNJBUHsmcdep8YNf1nYDGpIZCxufihQXhuuK
-x9BPm2SUdeyFwUFdxhGN4JdalxZo+x0pvQ6sKO1hQKK14YZXQxLUV043p3me9lVy
-Ubld8kcda0edx3cyhilehib3sZPVhOm8s18GmjV5/ApPnehJN7SueivB2dzzFPN7
-mUwrslti0j2DmTdOImzcz0IT7zErmiV7xtgsgP8jgKEp2LF23VFXuWsKO2yNubQP
-shNDKpYMMgJn0PfD5gwYl8FN9Yzj3OKA5wiJpgPjPl2PveZ/+rOS91bQMG1hFc3W
-v9ZWSisJAZlNQlfyv36rD12WhwQLlupLo0zPlqp7e/i5ZJBPg4unbAYECtJI5Wqj
-Ljhyd0j68QWon1Ripi8ruqXA9MUe7JMy39ZmF3/fLT4rBiHyRVpWkVKjzLlm0Ks4
-f3cNAPxn4FWeTwM+oUzEbpkNpE/swIbR05u1J2y0f+GS6X5t0CSTcHk1VIOnOiTl
-wLzSEJe9hNkBuNJjwM9Cod7dbdorq6Qwd0ffPJoTw1SVkHMPwIjikzxU7QARAQAB
-uQENBFgMcBMBCACSC8Tx2N3ZppqJ03AuDJrBOcNJU903XTp5l37lBl0JiNCDP4+y
-gkCTUyz0/K5YKQYJfyuVmM5q0ydqhQ68nmrmlxqvFxRIug5VqaE7VWhksyNAOROt
-xGi9Lo6AukKH2vK52Vh1uqRPmK44qtB1+bk8DE1YHuht00XB1Awu4ojIt3WKuRpM
-/oSYfbsol82dPt1XpDvN1et2bxeN9qRblCp7u83NRmdvAGiBMRES6yV6n8XWpQFT
-kRYf7wyVromOzz9m81dWAW5Js5QIvh3GMbFMS+2bnT+OVIrnCtJCw0TvTX3xZxyM
-EuaCvYInCZA92frmpHwJMXau7/1u12zuHLflABEBAAG5AQ0EWAxwEwEIANt0/Ryy
-VQalOTDbpaAPCir/Ui6EsdFmGeuLg6TIqy6xyCZ02iY6l4eHTPNxhnDPP4em+3/j
-Hh84Qan01O8sJB/o4ASbijAlvPwFikaJ8Gh/oKc+FO5kUwAcij4f8dtgdknGKlyo
-BFqEdfzzAEiSlX0G7biqrqD+mR6YM3eFbBTRKfZVwnwRMjNIN8n2FUUpvMKcGe3v
-34GL97e9qg+EMIBZ6SJxdKaMtvAfKYB6XG3UImlBQdYQoS8OjKJjoH5M7NRY8qb+
-v08M5z94z+dZ2mF56zpWcIlocYIT4eVi/2J8htykgxIBBWiNPfyYLrK3r2h7GtS+
-0e2MbwhhUimjOGkAEQEAAQ==
-=+Z5g
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
deleted file mode 100644
index 1b72e8cbd2d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/66ca61ea0fc7e9ea1216f83396b88eacd463b90b.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBs2wABDAC+hlEcwcAqPBo183xD18nAU7fBJI3lkg8zCvMgpMzPH8uD54wS
-fd0q+7k+2Ddf6L3VLW7+uxuQDNw1gLfIWHcSxGI151pyXkSmYlWsLmGRRwWNSIDS
-Qhdi1nnQ+JERKXIo72IikoedbNJBhSTQLEWAeVY1RbeOEeJB61L9+ZEoG4BiB8UN
-BRyZ6OCj6BrEL8tzV1wx1GL2kBHCxbxJGEoUxsePW6IM2lfvttC96VFWfZ2aoheI
-cXExFxWyxBUJPSovE0708khSh9NmCtX7yYXAqQ/EwxLnMrVp7x/kVbQpQeQWQB3N
-zRypv9QLWcp2XUx7oMZuomhyKNA36hmodCg04iIZUfP7ytc6yMIliCxLKT9mIbmb
-jg+tr81v95U7j3EYG1/2mM7h9OblqWN6UQ+5ZKG/kra1/IBpqujd9L0AxvI8/RXj
-yJU4q+UYgNer6ijFkpvHMsp+M/DBBtdChycCjhxHF/i7CKyrj1SWyC43HdAFB5pk
-cOnnt2I+JodG3C8AEQEAAbkBjQRgbNsAAQwAwGXsT1c3H4iPHAtDxIGey6STg2s7
-YMxTNvnyXml9TJdqA1mlklUCAk3Jvuez7E3phcSu30tD/gd2JqYGsCjNVDhk1BWN
-6Rbt2u1s8XPElJia9OUYU6F9hFJlA4J7Ej0yZWJhDroJSLxG+quALhc4Ch8fnN+i
-lKXvkbOmSN3eqV6QM8vYK7ta9jeogrueS1rL0Xg1EtJGthuMZ3vLNtkNdGsg9Is3
-K47rms+RoL+EY50psXvhQn3dd6iPXOuxYlsmrV5V+tROW80WX9yrr6buYyX/tfec
-hl0ay63+6xz5wvJsjdWZ7zmjkqopZqBPXRCNchMCFMJUR5pzNx0sppX0kNCQI9jh
-QDaC+S99rMRVd+LEWAXvr7ZkNpo8s9vVxUoLFjzBFLzT9dhf8A/XlTWXmo+Mqwru
-YExcuo92T7ohkMfDh3EPmDnfX3EaTghKmLJ8KWLmMxtyLMWFglbuAqxsWSfbWgcY
-psbviBJJwATjHIqxtMcHeNAL5sjqQPUxRj/RABEBAAE=
-=cZDV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/6a65176a0fb1cd0b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
deleted file mode 100644
index b65145cdc99..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/74c249541619ff0b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5719e50eac5a4b1dd390b72c2a742740e08e7f8d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
deleted file mode 100644
index 760013c5efe..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/96b88eacd463b90b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-66ca61ea0fc7e9ea1216f83396b88eacd463b90b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
deleted file mode 100644
index 705a8014c7f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0b/c51e6cbc7ff46f0b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3288b8be8512d6c0ca185268c51e6cbc7ff46f0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
deleted file mode 100644
index 38f48c56106..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/0ae7bbd7fee66e0c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0c/6b3225e6f495dc0c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
deleted file mode 100644
index 276ae3fd4f7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/105cb91cac2aee0e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
deleted file mode 100644
index aad93447102..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/1d2c7ef8ada0f794b58c7c63436902af59edf60e.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEY4fp+xYJKwYBBAHaRw8BAQdArb04PVwQKvEhtUEmEu7/aASZivOWgEkZBqX0
-Tovwvq8=
-=TWPb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
deleted file mode 100644
index f1c8281cae8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/3684155e9365c30e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41d266db4427983a1a4afb0c3684155e9365c30e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
deleted file mode 100644
index b4b3a78ce63..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/41d266db4427983a1a4afb0c3684155e9365c30e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE1PuKEBCADkfuhQQsJzb53DYO7Am9bCMHPABIOZs3zPTzQ3c0MVvxKgalp2
-2a73JWhdGfvD3UraZKZw6G8Xf1i04vWMw7P1fwnXU0r1kABcF+an/uAY7CbIo15/
-W3cIcoTFm9upzJFGY94MKeddLHIq8A9b+YqNxSofX6q55CXyfCUBvrVmhep2TrDJ
-gQlIYZb8w4JcXsu1Ec4NLw9alGfgs3hcO+iNnKhz0V9iUZjsWp8mtJWF0qdFxsf4
-khVCZb0Aaij1vluU5zZydyAqqXK+nlUmUZy8gTm1nrDA1IzDOArN1+LrX5C4M25l
-eOhCzUeQs607Rt8QVQ9oTy9+pcE68csw6fQJABEBAAG5AQ0ETU+4oQEIANp0K7gr
-SBvq0wjiOUWVDLxP+5Nwl/5tj0YmWFtLK/tb1PXYDt8htwJ0aGQJlmZGm2+RhyrO
-QPlBBdtVAWzunGgM7cdBZD/SQuG5hVoY2Wd1T1y2mWb5fTSKwZGjcNoCtIiiV//w
-d8/F/scyOVAJtfN222DNUhQGNDXavxxTsLK/Qq7qsfbYWiVBn+9AcIWmeNhvVjCT
-+aGYumndjFFyfhTfpQ+WJYRvfiI5UCCiyXDLztLjVxOqZP7LBqUuetD4CKZCE8UY
-R/vW2rIE5PkHi7c+JzyynQfIcXCubNKRc+74RSNIYmKDwJnRUhTKlmO+xNv679dp
-kO73jR8NUlV/rJEAEQEAAQ==
-=KxMx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
deleted file mode 100644
index bc2348be82b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0e/436902af59edf60e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1d2c7ef8ada0f794b58c7c63436902af59edf60e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
deleted file mode 100644
index 8acbce9e3f9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/7a01b0f236e5430f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
deleted file mode 100644
index 6f70b6c9127..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/afcc4c7594d09e2182c60e0f7a01b0f236e5430f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
-mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
-4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
-/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
-jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
-+krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG5AQ0EVlSyJAEIAL0+8UoJ
-uUsC3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbau
-L6Lrvw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3
-Yw/xfiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/t
-DxttYkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAg
-P6kgFxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPF
-HNkLijDp+f5mkJcAEQEAAQ==
-=32WC
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
deleted file mode 100644
index f6e3fba880b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/0f/aff3e378166b1f0f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
deleted file mode 100644
index 8c912e167b1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/a7a66be60a24ce10.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
deleted file mode 100644
index 280dc187d02..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/10/bb2fb7b24b12ae10.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-58f086abb0ede8f7a04b76c34c00043bec5cb7cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/11/9f3ffb85a8582c11.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
deleted file mode 100644
index 77dd35642a3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/0a123c1ed3f13a6a0140e166c71fb765cd9de313.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGOV0eQBEADTe/ljLAoBp+z84NkWHDBqbBmEsBxcGa0VDQxGsaMMi2f6wkO2
-VDkRFNzNQbmw5xFqLisZ9ywzuVc9xmZ6qoMWLJaYs9RdsJSgD9+4hL5IkmjClxc9
-Sws/NatagNaJNEA0uYSBJ6yRTksM5+46vUNK+BaBI8e/qdDX25Sqr4833nsBIGRo
-6InBoTJJzu9jtLCWezFUt6iMcA3WgMlgYtWF8mhs8BjGAgEiHUGz6+b2YSwC/bKr
-C1JfEPmzXRH2LbR+g4t41SKBYZmJ5qCf4DzkG836SIDc13AeLEYidGYHpsirRdVK
-3ORZjgUcCNS8MTDohzSuj1HJaoQ4jpbRlvhnWYHxA4H2re+1cqieQorDdr3KCKDI
-xQR68RSoAX5tl98TOMqAfGN1n5yWYDnHKAoqa5k6WSY+nE0ESHSszEdIuMkk03Bu
-CzXKZYEJyTwKv+FZLQ4i+9cjC5AECy1dLA6lCePypNVzeZmsAQcWEii/jrEOheAt
-M/p0IsxjDGrxMOjKqqOsL6sKOgDwh04Q0STy1uL6DQp2DMfTZI1VmoVd1+jMQUDj
-hr/tWplGxGUyoXqZj+i98Zl8xWhfAcmx+p70Zm+ypJWqU9+axHlNnD16oHDZuOct
-PPdrONeR3jBVtd60fZIXrNGNrRYwm3Tq2P7dhssjRRzBg/D3VW003z4StwARAQAB
-uQINBGOV0eQBEADODM1fmfMCXF5WdDRi+BwiOTDRrUkBCl7pc3/l/PieEf/AeiX7
-B0JJJLRjid3wJpFj6RqM8jOruLJJFgkF5R54tHgg8CWveZuR/Oh+Ek/GpFPQXxPB
-FH4T9j3SnIzqJkpLZgX11rpfBg/7jBp1YTOJjJ2VXG7mmG9R+Kkej9CpPnd7owxZ
-xNmk1PAcmkjusvrxek0bSL2XdwxN+j40wEjXyNG2+u/Xgg3vMGy1AFkSGfrlzLLQ
-BV1Ohak8CZvVh4dURT3fSSwE8+zN/LRep3IVdloWVR30+eDhzPECje8pIwaMV0uL
-8VbiWIOE2x1UyS3qIh3mN9FbywYYsvSNWn3SNk4zqqhTnirvN5jd8GPCD5hZ4pmW
-To/fD16Entt+sBFNy8pgFZRLjyy0jMeOSfpBjCb0nQB7e0bmNeXxH9IAM6DtNqwz
-d40k0PRDjlkvgqADyRN7bh2+V335l4KUdBB0KXj7xNQaDCOjVhXz4L7FP/o7S0if
-hYfVKEtXYJAMibFYKmCNkOMvrNV0u3PMUgd5UMlpGkcPDAqTGAUoEdESuBs4d03b
-1B+PXEwSqMFEZB+errUmDAWyA9c60GppFSTfsgTPapOVkOlrTMl2FTIdY7SoMA/s
-S+qhtHYWZpOBXF4sXFCl26nJ2fzXL6CTMfa8JwtC2L3eXoYCkdjtK6hQ3wARAQAB
-=cyTc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
deleted file mode 100644
index 7b22e4face8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/13/c71fb765cd9de313.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0a123c1ed3f13a6a0140e166c71fb765cd9de313
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
deleted file mode 100644
index 9be987d474f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/3faad2cd5ecbb314.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b6e73d84ea4fcc47166087253faad2cd5ecbb314
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
deleted file mode 100644
index c0ba5465eaf..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/5cf48cd2f24c5214.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82d8419ba697f0e7fb85916ee91287822fdb81b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
deleted file mode 100644
index d4be53b3fd3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/b6e73d84ea4fcc47166087253faad2cd5ecbb314.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA
-Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g
-MvWpHbuhK6WsXGxjqWykAk8D2o2jfJEsUGeJhbG/12BoT87pjsUcZu7DkKilx6/L
-WoM2/sirH2e4B1FLZvE7NCKpGttZv+vEI9oZmoKgm+ZHt4cSGOPrPtrAtf19irP1
-02/+kIPghmRd9ZwnK4xEazYe6mrY+8kQlrsSWFKTaWfvXQRJjyBJCuSwZCaWgMku
-vP4P7SWTqGX471bdDhVbG8naGhil8aJjgZJlsOUZKYXUCMU6KVKf0f7qzDlJuIPx
-4nrQ3lu2QvF9H9PCnj6pCx8tD+DJBq4nRi8kE2k3lAnpjZ5VpVuW+tSwsai50Son
-ymZe5QZj9T5Nvy8tMkF4LwxA+2alWfvdHWRISuEO6jNwOuxHMtbprbD9KxY9Smd6
-YcRKKsLmKR8J6a5V7pELFTVGSLhSL2H+Z2j14fkswGE5vkxAQpGCfxQh7rbvrhw2
-lpx9OmvljnWFM7U26nfUG5tCp+ieE6pT76hcPZ5MPaqWl18Rk5dVJQhNZ3Gd52In
-ai/y0v96pn8XZBRuNFULMb2PFG88hvU2M49Y8Rdi2VW/IfN3hIh2e4FT2wARAQAB
-uQINBFhqdSMBEACzwFoQH1MJLn3UYF+viqE8yw/CESTkU1aLoI5sXBSA4wIAGC5C
-mI4kCvb/1xJEsIqtEJkNJSna3GgR8ov5NIJmx+MqqhemDKDNJS0IKvFkesNk/khd
-t0zXF7wK9O6zY3XE6lh/usB8/34mHaR0WkU5Td4kCgEhFJQIeOfPKMaG83lrxiXe
-ttRBIfmhldX+1LIRwoqYON+C0wqpfDtAeycYbOTCrjArUsYmiUkzhB23XdTive/+
-BUlvRL9ioHb+p5riHl7YfTl0vcqOKYdOfScb2d8lqgQZLtZoKzySdyIouWOriRQb
-40I/UMjVuVtGyfuhWYkIH0rPwVwpABd5kGxkBkJlrSFGPx1/o2kOx24isexGM4WX
-h56WB8K+KQMUtVEJHaSIU3fuwItcdIHoG1Xf6RXJHW9Wgw/MSZYJhDclVwfznHI2
-D5HFS+hRLKbAF1G1IVauXZBbXbOhcPyIAPwuTFdULhnPieu5ZGFetRfD9+t95rbu
-pKMt54Lvx4cG8R27LvJL86X9KrhPm4WdsDL9lKs8riEUmTliZjmbTjZD9/trIcxP
-QKHtfwtgoQnFm3aeMa7HO4lUo8KgEQiHqFbQQ4WaQruium13SlXTRgGGZuqdEtWE
-MdTEIy+3c1STPR0CkoruBxlPCe/COf8XTn2h3EoyRWnNeNqudErVq34POwARAQAB
-=6L4F
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
deleted file mode 100644
index 65b1cbfce7e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/14/d7913335bfa51814.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6cb87b18a453990eac9453f87d713008cc07e9ad
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
deleted file mode 100644
index ce1811d89fd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/223d3a74b068eca354dc385ce126833f9cf64915.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEu57KUBEAC6GSPbvdc5EtEu9GYQvWGxo44mJrCed9LbFc3rV6bawbvARQjG
-oolnQ04PRpGI6+RmjhsHU5MlbUMWhpjdkhTXWZEheTnvCFnKGTV37DXpwJeHl3aV
-kAX1C2a4gePaUBpDi93R18eaQbOzPfa+cmXq8gCltb9efFONtrR/K9QkAQzlxsbR
-d9nIsuALV1Wbpqzan+mJ2taBDrbIN7PpBObnB7sGpsfpGC8pvNaIElAGb+JRM3df
-DIkdymWZZouKHKM6akYoA1j54uf3iHSGPxIMKTuDTMZk950cfsR9FFwnDXMK8v+3
-yQV1qWHW7MEOoC3bfPNB6BH2rkzXDJmlt4fXA6yyH4vDLJS0287XZLYrCDFC4Gbm
-l5fG4dhw+DW7mhHezK3ssZJja5miRQtVJ/sBXJC/4y2tStoeyD54nY7BTtBnP4iN
-tgW1E1glxqiDjWbsbXQeyfvpNWPd1VY2JQAyPyg0G48YSHiO2LLhwqlTwXVWdP9l
-b/VHW0PkT38DnCk5DzhcpYt6hi84fKvomIqx1nASvVHKnxgNNZYZv9h63TXuU8sw
-Ct0+HwnIehw20uNE4nmjUFZmzKRi+Qm+nkE7GnBFafIVadZeKDskkBQVWVE0D7ij
-HgVn8q2NDbQ2yq8dYUcnW7HufJbuQX7e0mb3nJiI+B4RCQx9vlj9oGy0TwARAQAB
-uQINBEu57KUBEACX5n3ANsTRUmQhgsyDtYIMQ3TNBvdgJ7oD8+xLfUI0rg/p1sll
-HtKXSS1zhiKfG649dm3hx2KVOGKuIpNGptcL/MZxReXoAMN/f0MiAgf96Le43GT9
-c1MLYziAuVCl9FH8QjH02MvNnTolqtgail51vpKBgirysvuwKwaYDpeRT4bJLj8k
-waAHD77FwcUMu5AW2BJgwg8YG08tltxEQSb/5d8YJW8jktnLt8rgYlQKYWnBWzyJ
-5UiXWeuEHzn6sFdXkTzelbfqXZWbIEfFECglQztGB1Bb7/4RQ4x0K/bmja2ppWHC
-Xh0dwNqszcvFKU6rPcJkyq9P4XL4Sis/9R/xZqpgu37FiDwPfTCo2eXqFiy0lxnx
-HJkLgokOvMW7AxXlrNWO0ADQwhvCOAMVbdwjm9S6K5V1Yki0kZQN7wSXX3da0yUA
-ltwC2CejNinGiMox/2aPAkDhBH5PwbF5h2TPUV3Pa2MCNwMvL3R4G954NoGVRa1b
-sGxbO8XYgya+Dpiat/rmfwtE0hAosWoMasSUMxN7euk/0nfvfXo4bRGBBvXvKbJV
-uWUE50WO164LwIYB3JtaXl0Ay9muDKj7vi4oWiwK4j0trcIwClXzLb3UVoGHfgQb
-7Srq9k0TkBdVFv1BK6EcoAF11N0WekMb5y7fOebc8cOeBKcTLfnsEiS7cQARAQAB
-=nW0b
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
deleted file mode 100644
index dcb0ae5beb3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/56ed3b4843daacc79de555557457ca33c3ce9e15.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
-x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
-N4/BiyjQA25sdfaOolhO0sFlZuTZpYy5wG72KkA1ygNq0L+8aBKhEF6zDU61YzCC
-AxjcgTftgTeeoqkJtYa06lNz3jmJDN+zUQignfRa3ymoGtFHTzoXR9maE8RWDty4
-y+DY+8ibdGgSgKPZ0byTCDyNojgU1YTlADa/1/NY1ShYg617O1xicLNo0JEJlf2U
-Tu4Ymql36+xSkYSISU97Q6Utgq27XMuZvDUDABEBAAG5AQ0EUhfJFAEIAN9NHRd2
-bYP/3CDi+n1ilSChld0NR3DUBgS/AdqQ7IoAUfj7skyI/WyaMdV4uy6vRh5YgNg2
-g01nd0LLZR8Gf2Ck+D6F88CdZaTxlkcxHV/dXMZ8yBO+0D6yFRZEL7Imsv8Ig4QX
-OVwfuiXEPk/Ef5Dy9SdAVhcoErTGGR6BOGVVvexGtBwefsjMaOG0khkRbWIQ32Wx
-fUFuAv5XBQ0ckLrlKvYWUYhOlXg27GtFKH2EBBF0Z5ZWu7gaBFwSV0oLp9EWcD+C
-+WEwUSfBdqfRJtyXvgf4kZdwdQ5caM8P2/Sdncl2l/LU1At2Smc+plr6zhIhDlLh
-lrzKGa16oARSBdUAEQEAAQ==
-=VB22
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
deleted file mode 100644
index 62da51ed28d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/7457ca33c3ce9e15.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
deleted file mode 100644
index f30d19535b0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/15/e126833f9cf64915.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-223d3a74b068eca354dc385ce126833f9cf64915
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
deleted file mode 100644
index 82ce5f73ae6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/0588bc69a286ff16.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
deleted file mode 100644
index 8c2512e5bc9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/16/92aeca6ac21db816.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e2acb037933cdeaab7bf77d49a2c7a98e457c53d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
deleted file mode 100644
index 938204c788a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/3f999bb69041cf17e73bb1cec038787776a19d18.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEYg6Q3hYJKwYBBAHaRw8BAQdAmBUXcViWvUiXZezA2ukBqads/J5xG0Hzxa7b
-LfCaz6W4OARiDpDeEgorBgEEAZdVAQUBAQdAnHuAssKZBLKrqg+cWduQ2B395Sbx
-+/2KAQZI8clMkmkDAQgH
-=cvFE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
deleted file mode 100644
index f8b377469ce..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/7cd52b5a8295137c88fb5748dddafa7674e54418.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF8tnmMBCADROe7j1ZvgiMgfsQKqCSuSqgMkfMT2DEXwZKdHqkj0gfx8MPQg
-OP1pmMgpIwIXKr5kZ9KMGiGULNnS+WU2SNqjyKeq3MlnSYW5Di52MoAD7W4cHmry
-8ekaasF/x0AS5Q3M/6X/EBOD8YLWaFkk+h5x8D4IOSqiOiWH8olGjY4ZmGblaldX
-PLr7BWSrPKQ1QDsoICn583Mnjz3YLlc4p5IKnY2wss1zm7/gQk6KkdL5bRuASxLh
-to2adZ1LEE8MQfHweauHCK915RmMg7W3KW66/EsuCyEwZKBwq6rIpAciym2FngJt
-CPnY0o4IMFSasV7d1xSH5N4jeHL3Hh2Yd9tHABEBAAG5AQ0EXy2eYwEIANZAQd63
-jnuXS/btvoRXGM1kwaU0j3f2jeTg12sIGCUiiM4NcD2OnxWSKwvv6SWuk4/W+ahV
-3zQuTR8ZI51kNwgxvNZYKFExUyRjS+B4Oo6ArDSPp76Kyo3+82KmPaeHxxibir4s
-HoZUTSl8UKyszxEUV7BE756wS7DRHWpeE1gsjClFXc6/hnEOnXIzsoAdIFzzockf
-LW3guouh+MD5EE/x//rYyZJEotsPCu4vP/TanR9H6WnYOIn8g3jSUarV9LFGNcxN
-Ccj5sh2x3tOVjQBtPpE2SUEveLj3aHFTXzx29rU9kzSzEAxlFdK3pwUK/P+MO+V/
-qMHoOY3XwTZp3nkAEQEAAQ==
-=lsuN
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints
deleted file mode 100644
index c030578a397..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/c038787776a19d18.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3f999bb69041cf17e73bb1cec038787776a19d18
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
deleted file mode 100644
index 28f7bcf5d21..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/18/dddafa7674e54418.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/411063a3a0ffd119.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
deleted file mode 100644
index c1f484387d9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/9ff24f51b06dcc19.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a4fd709cc4b0515f2e6af04e218fa0f6a941a037
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
deleted file mode 100644
index b1fd64c7454..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/19/dddee87612e9fb95f5c8d91e411063a3a0ffd119.asc
+++ /dev/null
@@ -1,117 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-q2Gj2NRVSDymwOf/lp+NcGBH4oxg
-=swLh
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
deleted file mode 100644
index 86601279642..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/1db198f93525ec1a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
deleted file mode 100644
index eff24e1bee4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1a/679f1ee92b19609de816fde81db198f93525ec1a.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGCGrYsBEAC/Ws37TXMujQ4z2ioXlh5SlrWaCzdN5RSBAQEKaiuuQeuwdWku
-bsnhI2f7YgxfJh2if6hCsGeWx3Wd2paLT9IqJbnIltOzHQkYXajIJrJVDep31wQD
-FsjQS8DWdRGkrldc2ClWZs1PAGC4Snp9bNYrnlE8Z1uHVnmN2R0aQ3v7PGw2qpQ9
-XxsQl9m30hMDb4IZBOKy92PC+xNpb6dgee3HJ8uJ2t/nTUCuP1FsMPGP3crbK9po
-UOUigIWMKNnYTyHbx+p22EQIn3iKQU4DQTeZm1/rUnfuULp2Zhl+fTs6U/czCrdr
-7DN4MCzthK7DMhDHH7/uVk53+e0oe0FJZSxYE1ppjvLz4Ox7xMHrlOMFIqb9JOgn
-exUDV34KcPByHqY4ff7IL94Tx7YAwEplnJYBEfb0sYfmjai4PCFj74gjjCmhQUm8
-5Cbm23JvDGck9W75wc6qj7wcFpZrFtfpOsz10YsprM5TcmK9rEIV+o+bRqoNs5hS
-+heZmdz7LoWJgarJnlkPjDDOXW54bA5kS8ARlkxllzZ+f0BwaN/HBNbVv3gkBHUX
-YOxphjESdv/WByNQMgzoIBiUt02RqAJg9PECLJSjSfFzd2F9g7Lmc0TUdA/kLEZm
-DqgrDjPkfkwnSqCglI38Z/gcVoSDN2iYhEIfuGoZXbjG4IDVuFYyGZjimQARAQAB
-uQINBGCGrk4BEACTD/+Nk/tDzN3viBmw0GvgWWyeyfVKuhXTYgp1NA2Zugcsz9ZF
-jzQegH+jwekWc4JFSQTFHpxqog94eQ7UKzk3LaYeCMiPpuxyxsY8MSZooAOcysRa
-bkvVHNLFhCKiiTu7E8NkOlCT9v2+f/1aatFnM+D///1/RTR0MJ7lz3EuQWtC6gC0
-MQBydHoN9Ofov07j8RSVXBBf7TfZjl+uYfpYEkP5++bnWLw1WMv8AceaXyCjoJ/3
-L5GfrIHoNmpRujj8FLAZV0YOdpQCEwMn6gfJrcWXcPLcg3vmmYLhOWqj9kZoqE7N
-pejtzp9S4Yi9wM0ZTG+TTk2zec7dw7RstxTLEEJ8dx9IyXAkoNf8etlC9f9KuTnL
-K23lsi3cvjs58WzYxtl6MQS9x8U9QBlb86K8GMDYiwRrPyDusVvzwe0lZgrt7Sbo
-QP5+hD+wY92tJde9JQbYSVcIQwgRGPZGYIZ+DEo5g4SWBVp/y+pFTVd2dFmbu8D2
-RLunI+hy7zjBEXbdRCxhyI16/lGG5wecg6Y4N26w3trUHymeTdAPQ+5swE9F2MTz
-1D/FQrrb/pGa/6FcgusLvAvTJNCK/NAQNWx9ZJ1/teGCO8n2vhPi29950id4V93H
-dLcCy2PBAL4ltAp4gCBjXXRXZuou2jC+syfB/o8kln0/1sblBVlheopMbQARAQAB
-=XO0W
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
deleted file mode 100644
index 4f85a4e83ea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/050a37a2e0577f4baa095b52602ec18d20c4661c.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEymS9UBEADcrmFYq+YjA87HLx+UugKSIutOap7Yc5PJTZ9sAUOEtDhs0WwP
-bsyNdxu+aQJwowEIIaXci5YzimRzkuDNrfDFYpWyGq8O2yAsccMc4+HnQfcroayX
-xnF45lIY96RSbayW+pZsHkKICuKhiWGwNRQm76afuOcwcejCLAHORxQ/xB9j3g12
-Wrge8mY7zjm8V49XD4J6c8m27KZZ/qLeSB7ofC8qymBv4Hos7lbRpngYmv815rrz
-gxDSzbL+w+kAy96lfyrsiJ4J8N2PhACdDDK6bykwyQQgEa11QeLzSJ3/VJ+Uwlnl
-WKgkKIbLiXXuA7e+qVMKq0hVbf+koloAZQXGCymBzh/1p3OaU/6u/8QwyUXpmUjo
-MNcQLIJUdYKFOYdIFaH/5elsp2r8mHSsFdQABUjPVG5rk//IJro4OO/cij8zeOJ+
-H0HpciY5lXpyuXixOME6NqGbx7nTDJ9thNcCxuQgj7KjD5UAq307bbWqrHJEU2pD
-5Be9NwJKcnxGmNj5oO3CAKaiLY4gDa0yf0ka6L3vSSJUV9y5KwfmDWA8fVq6HLyn
-obDOMu+nCSl9Yb+mvmCC7T7IhfsDm/OnFwYaoheRDuAs1tR+3H/IbrPoG29iMIUj
-Eqi2iJv0Qiuad5TWBDKMGe+vbYj93WvARfHUy2Ge/ITUNGS0AiBWinT6xwARAQAB
-uQINBEymS9UBEADFF6Yo/FnteCVh/np47l3oALM7H7GDe9WJkrpakzg3chm11u4N
-e7qktzBhhQFheTqdBbXrlglrP2Q0v/AcF5Q1Hu0hRamfe8lfos9iJmF9Xuq/5O0o
-XhwKTPAO+79r9QFkwCuC5iIa4nOTJntPNntG8wvhJci6CKVNbdqz1gNHjgQEnyMz
-YbvlcbSPunAjq20XquDg/ylXmvBTKM+04eCo4xafHHYhYrxC+tdaTSCiUgUjrGXR
-+2ZSIESbU22OgDeE3KBb/lJwKd5FZCyzL5xw3+67k3cL9TKkLvAQZFZMFfYc/bwB
-S/7v8f+n7qzptHrjTcOSXDCt6l/Aca929Q8SI1xlw80R+eQFhgi6ZPQYGvvLaOrA
-9QOq8OOMUA/Y9HuaYSUJOSOv32aADbM5L67mYBN+7btPiWvYvBzLqjTuYr/G84b/
-59W7hVvINkBExYndA+YM1JAv7GmUpQhe8EVbqgUQLVJz25HVhzP/kTcCuGifHDg1
-y4K8Q1IumAMM2SQgjnZdCAA+WHhT8lAh6TXf/94BnNt9D5hRBNI2qNUaTyE2axqC
-XtKGy7VTohOHNVcsVggAhub3e1A0t6vjnOtO2ucJgVW6w8bQ4hTftPwdiwwPxM6i
-l6EGlAMuRJxWBbyprw9deXwD8s8WNUo+RSysNXujElV7oTcfkvqTFeSa3QARAQAB
-=ptF0
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
deleted file mode 100644
index 5e8d54ef968..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/602ec18d20c4661c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-050a37a2e0577f4baa095b52602ec18d20c4661c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/8067ecaa8d58321c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
deleted file mode 100644
index 85f7ae585ef..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/83552a552a0d431c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
deleted file mode 100644
index 2c9a0ea2411..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/ae5a7fb608a0221c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b02137d875d833d9b23392ecae5a7fb608a0221c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
deleted file mode 100644
index 48e9b9a10a8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1c/b02137d875d833d9b23392ecae5a7fb608a0221c.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBFKTz1wRCADOdMCDOKXlBuQpG7mnQ/5rppqhS0SXdKvNZ5pYrJKib1LLtlS/
-LOeABja3E1ky+znvTqnEEtai7fNhw36zPdUjhPKE0TZwn2aK5fyctkcfqBFsja3E
-ntJgzi4pa6gVn+MtIjCak71jv5SrC+LE0dkPM/GwupgPL7Ohfpf7HyAGjlpKihrQ
-syg6GmkpZKlhLVD+wg+nILrWngXS6Zz2I9M1rd6wfYVqH8tjYkKYNlexB4hL26zt
-f2MKX1MTRpdgO/jPEh8EI4K5qg0eT2x2e6qsii50WobmvraZfUFpQJysJlmt5jwe
-k/FWfxZ7Hlys8r88VYGa6sknvofGZfhFRZRbAQDhMzmNSQ0mBoveEA8/gd0FqVA+
-YzX8TY90YNeRQMjXJQgAt3kbBz6uyzAchGxSCyZpnS2dVFWqi6H8gqMjKmEnDn+g
-vG19F3STuAKYkJPfJZGwAVnZtTbqQ4R14WgjDuoqHPuFjRw5xrIaEVmb71gFKISP
-F8RIMw2jWygNeXbbXjRF2brEV4H+V6JXn6PnzlmBLIiB1zhzutMUu50FxnmclQxa
-gUxGMcZG/6PcQtiuhu9oKHUl1+E1fs/pexnsPK2gKkRdyUMnngHJ3aYm9vBFMWya
-draOg/6DBRTrvgoOVxzQHSFCSs9ttaHXbLDMD1e9K6DnVMKZVHdJVohNVwxsWxrh
-ibUDu0iH4Zp5MFgyx9L2kkP9kbL1hflIsTyQehDUwAgAwl/BklUfuOkw64xNZ9ww
-YZ/y4GTNuoDIdVkSArr0cKhiLR3u2Qsgy/K2CW5iuXMQGPBrYFfxcHO1Lge5Mvyt
-uYhLYvnH7gwfID/8r5Tjx7ktzoZehO2R4wfqyYfKwLoJGY19uj8hCBmKss3GOK7M
-JKLDKLZ3Lv0t4MTiaSmVsZEVRwYD3x70J7l3mUUwVHAK0QeKg9RczJQRd/i0lKzt
-OAA/d4gZYscWHbZi0dH/KxnqHzSUDkrLuWrYSdvgaln5tS9hG1ge0LFDxf82f1U9
-+ckdxzYsu5FNjgu8GFZLbLshRri0kKPWqTBX/YPubApadVU94i0eXnqjmZMajXTm
-LbkCDQRSk89cEAgAjxMmDMl2ElKXFXgWpsITsNUuxm3MwQV0oRBDA6YSgLxpf0Fq
-Hh0+5W2owt//Wnr7jjPF9xmyapTwkEUJr7W/m8XYM5e/VraPJdruYI9D8PTxbiLh
-eUfVjXvds65FK55Fg2pj3tNFTDY1sUcWjvxW1sqlRJpumALTNKLEUSXeFTokHmRy
-Z8knEIc/0GiyDIw1aQ+q+BNDwE7hUP0C6CP7Ddtg1nVxPJhn1WdqzM+hPzO1thUy
-EQTGRtoskVV+jYUXyU8iK5WSoNiGoxLCIWiqaC3BuzMb+Q8//zwYdcWC36UZqSpI
-KuJVmGulQVxO/1bFuQsHqa4ovGmITRO+D/I39wADBQf+OlVr0544kUJspemRYSkN
-P4zQtvFCmUW66diQNxrHTHkOkHQeJbx9S0LvuZoL7nleAbKGoPEAD+lgF7jpHV4J
-rhmSLih1Ocuw3gcnhrJws/+jUcFZPtarJ1pEgBQdCxZO9sc0/MG3j1Z1zB/EA7KN
-5w3Xbh9f1VrGar4G6ZXkIcdRPb7Ka8WwfKAVkpU8j4zpY0rV7ilbUY8liYeccw0w
-CjUYF/8Ww5Tj8/dP9i7G0hutvbFQFCWKfJ8pIF3QZsV4nl+mjzXpsG2kTpqj1dRW
-adYFKf9KBw2emi3T/GwAXdGVcwbo2QLD5OqILmdmlWtHo1bsxRiUY3ALKcsV/Xrf
-hA==
-=nRM3
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
deleted file mode 100644
index 25a4bac70e8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1d/9207518d06855c1d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f1182e81c792928921dbcab4cfca4a29d26468de
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/6005789e24e5ad1e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
deleted file mode 100644
index 42375c17c5a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/9842fe565aa0601e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e85aed155021af8a6c6b7a4a7c7d8456294423ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
deleted file mode 100644
index 68968d22716..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1e/d547b4a01f74ac1e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4f7e32d440ef90a83011a8fc6425559c47cc79c4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
deleted file mode 100644
index d0de6ff44ac..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/1f/9d29ae4a6b50e01f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
deleted file mode 100644
index 9864cacc67c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/011b32c57a810220.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4f752a9878e937049ef3fba7d4012dda1f1f0f82
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
deleted file mode 100644
index e733b21bbff..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/3690c240ce51b4670d30ad1c38ee757d69184620.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard
-sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI
-ayjGTBJeKItX3Npqg9D/odO9WWS1i3FQPVdrLn0YH37/BA66jeMQCRo7g7GLpaNf
-IrvYGsqTbxCwsmA37rpE7oyU4Yrf74HT091WBsRIoq/MelhbxTDMR8eu/dUGZQVc
-Kj3lN55RepwWwUUKyqarY0zMt4HkFJ7v7yRL+Cvzy92Ouv4Wf2FlhNtEs5LE4Tax
-W0PO5AEmUoKjX87SezQK0f652018b4u6Ex52cY7p+n5TII/UyoowH6+tY8UHo9yb
-fStrqgNE/mY2bhA6+AwCaOUGsFzVVPTbjtxL3HacUP/jlA1h78V8VTvTs5d55iG7
-jSqR9o05wje8rwNiXXK0xtiJahyNzL97Kn/DgPSqPIi45G+8nxWSPFM5eunBKRl9
-vAnsvwrdPRsR6YR3uMHTuVhQX9/CY891MHkaZJ6wydWtKt3yQwJLYqwo5d4DwnUX
-CduUwSKv+6RmtWI5ZmTQYOcBRcZyGKml9X9Q8iSbm6cnpFXmLrNQwCJN+D3SiYGc
-MtbltZo0ysPMa6Xj5xFaYqWk/BI4iLb2Gs+ByGo/+a0Eq4XYBMOpitNniQARAQAB
-uQINBEzEOZIBEAC/xcCnY8YD8bUqYKtUjM4GbU08i6oYBg9zWX2nR1h2ESC9/DQ1
-dyXkwO/WNs49nY+ykDw0/tGqnos01dhN4z94gkOd1Tk+HKJ7AWkAICnsaabZ0vk9
-Q6G7SAhSdBhs39B0Y+ijts0jrjorVj1pVMG71+zNCyyNvoapcdI0z6myRWf2Wuik
-7W0usXQj1VKVKmGUKaJBGXMEJlKfEPpRqCQ9rDWAmcmqet1/2gDoAhq9kV2HXTh+
-XvLxsxlvpsLQr/lkPQMt+ZhqiOTKpG2XdUG7r9m9euOxP0BBLnH0R1WyVShhj6RT
-FCbXCLcsiLeY6Pq/Qgi+ArOO3Rf/f0TcLjb6bx11MqjAUHVjWUTMeJPzRg/1r4j4
-vZupiDLouqzkLEjmqmHXFF+Datjq69zms9iT0HVH3iNt4qLdbyvIcb1AkE1dx3yY
-IYszerKVZdMkDigYhPJoiUYK4x4pR94U28aKONsQ5DQKvgkKN0AJtYmw8Sgg6tEX
-Fj43AkQDf0OTJqXKHaXSpM1dMhiEuIO7OX61a4Ff5KMdq+P2MbK/CvdPfuB/NgI0
-yhl/wZrEBQkwKgZOqeyNM8YyKif8N902QUND5+K91iJVD2n82OmvfywLzdXx0cX/
-UqQgcibLMw9N0LuX+UwfILYbHZ1Zk6O444qK3RCjLcNmhDC83Vlk0P0zVQARAQAB
-=2hIj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
deleted file mode 100644
index 8168a520dc7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/38ee757d69184620.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3690c240ce51b4670d30ad1c38ee757d69184620
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
deleted file mode 100644
index d7670dfbfbe..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/d364abaa39a47320.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ee0ca873074092f806f59b65d364abaa39a47320
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
deleted file mode 100644
index 1af4fc1bedd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/20/ee0ca873074092f806f59b65d364abaa39a47320.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr
-c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD
-m+1zSFswH2bOqeLSbFZPQ9sVIOzO6AInaOTOoecHChHnUztAhRIOIUYmhABJGiu5
-jCP5SStoXm8YtRWT1unJcduHQ51EztQe02k+RTratQ31OSkeJORle7k7cudCS+yp
-z5gTaS1Bx02v0Y8Qaw17vY9Pn8DmsECRvXL6K7ItX6zKkSdJYVGMtiF/kp4rg94I
-XodrlzrMGPGPga9fTcqMPvx/3ffwgIsgtgaKg7te++L3db/xx48XgZ2qYAU8GssE
-N14xRFQmr8sg+QiCIHL0Az88v9mILYOqgxa3RvQ79tTqAKwPg0o2w/wF/WU0Rw53
-mdNy9JTUjetWKuoTmDaXVZO4LQ2g4W2dQTbgHyomiIgV7BnLFUiqOLPo+imruSCs
-W31Arjpb8q6XGTwjySa8waJxHhyV2AvEdAHUIdNuhD4dmPKXszlfFZwXbo1OOuIF
-tUZ9lsOQiCpuO7IpIprLc8L9d1TRnCrfM8kxMbX4KVGajWL+c8FlLnUwR4gSxT1G
-qIgZZ09wL5QiTeGF3biS5mxvn+gF9ns2Ahr2QmMqA2k5AMBTJimmY/OSWwARAQAB
-uQINBGH0NlsBEAC9o6m+D2LubGjOJxLQB1BnfBOkFHadsbkb82QFdrCNsd44fJie
-aqZVP+6XHKVRHSPktwpE1FnjThBJJsLwwcvwWXwDwvED57n4bATPlrPGuG7x+LRV
-bxFBTd+LQUCcHd3puruvbEjQdV54mbgdMqAp5dSA4Fc6h2hMWVBX4EdLiH/0ui3l
-UoqYTJcB73U1/jbKcbs0+cVuXIpmAPQpIs30p0wWLOKiJqn9tTZpwfntnrdfLvKL
-3FZcRQeWZjqH1Ywt4zWlCRqGEp7yVqhK5gn4nfEdSX2koxr53OOsGk2Pjhzs/5XJ
-Li1FTOcnja5kkqOPiPGB/BxAnjPCEsSiOFmF3Af4WdYa3+TK8+ggBSEeLjjLa5zy
-qexfhADwgb5ASZitUErJZDhAvqHGwfz3VPENy3K2kJLH+maWwOT1ZRoJnz3fxwIu
-gKhPx1MzlwhTclIknK7q2CNcB61pC9lg70ICW090NgknE2DtmjrRMONhcSkuWGLZ
-BKBgRqNwITJFcAdg6+ffZzGLsnEd+6A29PdsXfLS9KJqiabvpiBg8RaAAWiv5Tqs
-Nu9YSWUQUzBZO43u8AxTtThuHYZrxasoC3sCGIcRy2V9eaq480DRJ9uotONMutIH
-UDVSdqViPmmit0+PyRiCX/DOeBHumaEOm+RqIxPE8h6W8sHrYAQ7J1a3AQARAQAB
-=V7yv
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/21/60eb70ddaac2ec21.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
deleted file mode 100644
index 7a127825fc5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/51f5b36c761aa122.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a6d6c97108b8585f91b158748671a8df71296252
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
deleted file mode 100644
index 9421a4dfd3d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/22/fe694b892910dd22.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-53c935821aa6a755bd337db53595395eb3d8e1ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
deleted file mode 100644
index b85e6475cdd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/528dc75aa68f0923.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b5569a15406ae682380f3ef8528dc75aa68f0923
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
deleted file mode 100644
index c493a9b7d1d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/23/b5569a15406ae682380f3ef8528dc75aa68f0923.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE9gdLgBCADYftTKGjQNoatNJb2Z3GM8zWVyhLXmhc98ZnMLj3kLmHIDagAK
-up+yHD1SSY7aZdrLf0mU/LArGczFRLDe86/D245DH3wSYfIeQN9d5Etg7CCzRb7n
-54xhal70VF8IoNTEOW5F2FX8PO7thIXPfxMYeqAuU3/PruMsE/ZYOj5a7YBexL+s
-HwQiN7FL4wuX/ABkVeDvnu7SuL05gHJ3ISL02zhrMuz95JTIFgE7g+K6T7mlcmJS
-XP+7C7DC1FTHNY0efxVGv3bCgxXOwsBZ9pHsGkP3SMd7mB6/2mt3ms8ci7QkCOvp
-DLnPuB0V7DJq7PapPtDAUghySsOlvQMU+/d/ABEBAAG5AQ0ET2B0uAEIAOrk4y/E
-umKpdYUf//5+VZL39GCQsuG5DWhQDp6IlS0xEH5jlgVGxIVnhYeRsbSmxloIZ80k
-qeoYZv06NEsis8kboIQRFwo644YO2L4AKZEyYvz8xSAanyTPCXVH4tfcjjZ9VP6c
-N/92SKb/GPOzfGEMLDREx1tuDmPAiJ/NcddcEBQtfUKugmClhmA+D/4NC2OVVnpT
-2HE8Qx2LPeyoK0Nhd/Mq5cZDm/XT7VigLA0leGkRjrIn/YDcrXmmq9xRo0LZtpji
-G/xtctHX1uxADI149ONMuWGrODDxxFbJpx85sN0gbjUY5mnaBTXMxc9HZQjPMSga
-fGwhnR709rAEIvMAEQEAAQ==
-=sZ4E
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
deleted file mode 100644
index 7b86060a192..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/24/b8c800fb51837224.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-07dbc3c1ab1f4468471656061c8d5ef0df2b70d4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
deleted file mode 100644
index 12ace9e88f0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/2c7b12f2a511e325.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
deleted file mode 100644
index 75e98dd9efa..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/475f3b8e59e6e63aa78067482c7b12f2a511e325.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
-2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
-bOjh4v9ZipD+px8w3o/RNrnZH/KRsoJg9yER6pf+pUZqTJfdg5lXezc1WF+/1qVo
-ypldMGfrkfLsPrUZTT689ubbig978e7eYmJEqldtaIwaAzHQnB70wIJyg/rEwFUM
-ldsvs6t6czSuJ4zPMvmh8TMpTg9e6+DMktPl1CWRONl8RPpgYMIC96gb4OnfDDjk
-Ex6clSCwgbDwdeAyOjjR6pVq+pCNTo1Pcj5jABEBAAG5AQ0ET5k74QEIALaxogmJ
-1t7arw82krV7ILlcOu6aLuuXTuy03K1/jU73oyWfUqwvPSbH4igcLb8kt1/6ogfk
-u0T9tTx+0mDsvqK8A8NZ2nDTXok3T58UAg0FTXlqUqZmy5QPtG+it2j3/xGgip3V
-5p0Ml1TqEl2SfW6gHtLptDUWzuzPi9SgK1ZFlueprPg7xwHmWhp0gwx0KSSOYWlK
-oEllj/1aDxFNcdKogWcGN5aJEsETCEguBP7olL75u6732wc3zola4zTy5bFT4kEY
-Dk30Du3VGQJrdsqlibdQpZYm8uH4AVXDmFMdEAjIs/DGRrUgde/oUqwtgm9U+p9M
-qcbmMoeLFdi7ajEAEQEAAQ==
-=ObeE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/9351716690874f25.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
deleted file mode 100644
index 5fba3d86fbd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/25/a182f48d9c2c0825.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
deleted file mode 100644
index d2f7ce18f6b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/16fbb6b6e3120829.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a9352189aeccfb4ae1f3bc616fbb6b6e3120829
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
deleted file mode 100644
index 451fe6ec348..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/29/8a9352189aeccfb4ae1f3bc616fbb6b6e3120829.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBkqm4BDAC9Q7VXP9QBAqF03u97WpLY6qRbXX7jWRBZmeQ5l0gh2612XiWT
-U1iaVfzhs4kCile40SAr4HJgeX/xnGj7HFgeozIgM5G+x39BROlEAuRZHyVvXZJT
-+MKO9qEkyUg+3JhjZO/JQNO+9AFXLmCtgd3+kcXJh6Xlb6TDbh21Cb/+Xh0TRwoU
-/mhsmkGMquLnTTZlu77E7kCLmWM1K4jYxB5yqLwiUOzYPLmg2bt/4OAxnAGv8Q/h
-hpzl7YlPduVcR6fW5eehlQvZeesaZcppCLGN4tA0eKvCibwR/WyiM4QddSJm3J/o
-hf0dix8b9T4PFYqSS/Ok9024l4IeDMZ6GlcUgsbWjoDmUhpSmynq2xpFkbMnG7kK
-0eM2E7MRui2LpyoQ2Wqzghlk8FVEyfFZJAIznSAH0MnStozf8und40J8emIC7+1v
-L4a+ArnrFIwGomrS7MQmQNQ0OlAhV80bmZXS3nrp9rWgzcfya0iLWbPMyXuJdTDW
-mrx3Gbp8kfwDITcAEQEAAbkBjQRgZKpuAQwAyi9cy8L0SmWVQCt2uXNpceksUUnA
-57IYBWhn7zUZuqBB7Ju4V590+3ZM+Wk7rCN7VwZaxLLKuJszNvqEzxmB4YP8nCyF
-voyKiH4+bDll0SObMVGe6ZekKDPGQ0sEtEjOfvz2glfEyo3yD8UR/suLZvDTCruz
-tc7D1yJmpdOSO7RYjH/vb7CZ1F3Mzeq3H7VL0Kf+fjwrca00MgP3WQtRV6T2M2Yf
-AKMYTGzWZemdmX/MKFg/67SOljKzYkPxuMLHq8aBwqjmDbLTH44oiXRZeEdazMI2
-HZU3pVT1Pr858wCt3rRncjc5yO16+0BqgXRFQR7subqMJZtLM+xc3zRVZZp+V7CE
-wv7w2EWOVIeRmYGeMSmriSkyaRhELAwdsEnDbrDTrRQgMYx2802aZnXA0PRs31eh
-UTLxYcnUMrze1UgguCAAvwWzCuIjmZQnAbqSMCw7dmhJwHrw6T7E4aZef4xt5nSH
-5xdJYI4IliKbF7mR3sMhkKhgncv/jiAU0sfxABEBAAE=
-=cc2l
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2b/d89d05374952262b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
deleted file mode 100644
index 417448c8d0f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/5f69ad087600b22c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a5bd02b93e7a40482eb1d66a5f69ad087600b22c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
deleted file mode 100644
index 0c531a4d999..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2c/a5bd02b93e7a40482eb1d66a5f69ad087600b22c.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG
-VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv
-m/7SqGx378m/qw4EvpgGUB8EYif98LYdWp5vsU/zx0Ps9auqvetAzJaL9489oE0F
-q8FVhve6BMfUUV7zOTCmJnf438YO68upjU0PVBdfFE6Qx4cgCeWbQGy2cooW5azN
-iIenhuYU1qikmxMHq2xZzN4uSTWLGDpimPyz+Y1aTSYJ/bgn9gPStbI9sojWo9SS
-5gvNK3XqJzMwxwFow86UcIE0vPD2T6ZlBAXRABEBAAG5AQ0ETslRFwEIANrjVe+1
-SPgEY9Xfe2+XGN/3q9DHHPP0PXLTGPuWKUmAzkBddNEAXTkPKtyCbH4WXhf4jBZR
-yFIpLkoGrW/yIeJZNfoq5xET7ldjDaAMNxb59/78JfyctGbEAgUlzueFONk3Dl0s
-DS5GDiWqJg4orqOtUcY+46oo6Z8ncKBbxIvOL+qv1KLWtzIoxjG81PUMk1/CfTij
-HgklKtLlbpOHs3m47/28AP2sf6kESKxBwzjgdSyeSci2nCuPoeSfLTJBJlsREL+z
-DaJES4G2nj6r/rXX9YHnuH9n0hNxFyhcY0ztsIyz1wqx0kiOYHnLIpUJ+2TcR/YN
-mFCYqZ/co98sDMUAEQEAAQ==
-=Pb2+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
deleted file mode 100644
index 31ae54d10f1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/127ce18327e55b2d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-184454fad8697760f3e00d2e4a51a45b944ffd51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
deleted file mode 100644
index 30cdc0ce87e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2d/923c08f9417b222d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
deleted file mode 100644
index 4df35d838dd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2e/a1766be5f812ac2e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-60200ac4ae761f1614d6c46766d68daa073be985
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
deleted file mode 100644
index a7c567b4543..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/2f/315693699f8d102f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
deleted file mode 100644
index 2aea540087a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/30/37de9e37c5b67c30.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a1885c07a3204611fb184ef7098a31f381819057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
deleted file mode 100644
index 8c912e167b1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/31/f8052e4e1bd0db31.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
deleted file mode 100644
index 2c5245290ee..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/31474e5e7c6b7034.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4d2db2916149baa9d0c92f3731474e5e7c6b7034
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
deleted file mode 100644
index 8dcc39045cb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/4d2db2916149baa9d0c92f3731474e5e7c6b7034.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEyOIt0BEADGQcIcc2Z5FYCS4OYZzg3CobJXOUoFCf8isSU7PzvK2I/95N1T
-NjlpP4P0SkLZrGmJg8T+5+1I6yNOLwanTQ+cMayI7/xPfINNDZvU8OjV708R3gPh
-zE9Jmxn6aDQ6ykbomXv5EFcSKz32tJWCyYAB9QGaS5SEsgO20DBKYTU9U7SbLNe8
-qScTQDkivUA0xIe3WVEZppkRZ8xi/wcnf+zoKHWK07yffRvOKy1DY+6oYo9slVT1
-QIwwbM1kwPfeZ3ZvVmn+KfdTAAaj63aqs0eHOOv1OugIqkrCJFkkYUf8lSmtqtTq
-YCmRyvecsxuPLSSblf2KpW+tqj22JMCQ64sKJAGv3YGFZIQuz2Ui+FGZFKwPLAbG
-niy6TZSNE8J9cZobLfvS6zYC4x7Yh3CYmS8U/XpTtM6P0QIFZflfFZ7IhkE4gdY6
-kOuG6kpL01miNN9Zm0yg2R4dUReDq17zaOu6N42hkWV7dGuoBUShoTCeUkKixiz+
-Cq1lWgiqRosrU/yf4c+ZL15AQ3IVnFyNzR9EvybDSaQDdPaR2Zm9GqHS/5R0iPYl
-G1ULZzWU0TtLD9Vy/PoagLLiWtZOHIh+SVwNbtl1GpPhO7NvtXMfbD+iRc9fk/+/
-ASjLYWhiPcJe1EMp+lstaVDym9sfS3cd6jTCehcZhjC1W3LDyvQDp0q0XQARAQAB
-uQINBEyOIt0BEAC71l7cbfkaQpI+Ad3+rkF5RJFWj5ZjZYBtxC6xVdal1IY2sFnP
-viqzd/O6oNQ0HZyzrWTE66y0R4/zAypP/vko7Ynm2/7FubM3Ww/KVSqEVpSh76uS
-3IQBE+wJtbXesNGRttRBMB2HS50nuMPO5LIn+4m9WKY3lxrG1pjBjCad9u7K2cZC
-bY/u9wN44z/FkxAljujIOFpAh6epEVfZwuO1az+j2PrPYUwmryLZ71u0KLjnWpCp
-EEYA9QOlkAs/NoWAgH7aVvXTOCjxESjeOLT6OAXV/BPKekaejhSKRIc7uJv3+mp2
-X85CyrIZ2wdlvk7P75ZG/DJoqW8rgyUtX/GRjEHFNe+s9mRgVS3gD9rKPoFasubK
-jtDK9+Btb47oaTC7+FE0ekTdcTGkUaIL8oEZKc4wKy5VxT7TzzXhzJjVPb1mXFyM
-jNQzAuAScbcas1cBWo43yVvBHWT32QUjXq1thRcjia0lVFPuBc39nzIJplMwZz7t
-RI7nZHE/vmOEnatnkd4Nl3i3XLG+QiHscO0an0983FIPN4YT4UJRGK8r/ttefQon
-DRXdeU2qdq2bWq1tmlQBh1FmniRvVYUR9iyC+rf61DCqdWMLoVb1t5IKRBM9E2/Z
-zs2nsHAVg5J1n9xluZrlN4YCZ4HOz5tlJIhHXhWr854sK9AEhtUHW9tIjQARAQAB
-=Vbcu
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
deleted file mode 100644
index be933a138f5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/dee12b9896f97e34.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e0d98c5fd55a8af232290e58dee12b9896f97e34
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
deleted file mode 100644
index 356760a2025..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e0d98c5fd55a8af232290e58dee12b9896f97e34.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFAxQKwBCADJGPv6pmFEq0SDwAKESEgCdnXycbR0bNXpNa/3VGboNto1xKgd
-AQ/sI5x+CmN0hpUjklEwff6QIt3MlofEMkAzSfRmTobhJTK9W7r4+p5DuhJpi5Wz
-ITdbNCMT3Cvp13rRE+dx9qY+WFQmTYPf3gq+C6T8Q1i35ePNlCTN2RayaFxxR77D
-W93zKZDdd7I1qH0Vx7GGcSwBgBlEB8jmhNAkz/zAhv53S6px3ZttqYYmuwRtg6Fi
-i/u9VoDR/c9tyUq8L6oAUtg0mo4CP/tfUF/uZnibshEsLzbRP961VQXduhn8HcRp
-k6QPTj37B1vsNWJ9U7XXJ6pYnkizQo7sl5XxABEBAAG5AQ0EUDFArAEIALyNR+z1
-eBBF4S+dOEWKXz2ANmsp6RRhvR09QeQwNycVdbdEXpOiSZUCAkw/EhuJWmHBngat
-0KBO+7CIHyQqwHnqyatizzKXi1OuaEhMzPsQMwPRfYyWHgN0aklc5oOzB2RbSJN4
-et/oVvfAplVSjgR0v+56+qXw9TFlp4kxqFeJLycZ+5ImKQ+XclsBokKuE7cjeF+g
-O5oY/CFHdkxD8d+cLF8FSNUFMypuDQ4IH9zPYGkUJqsb2t67iMyxi14RqyN2YNqK
-JcwxTL42VBlUFlTBoF2Y3w0LNll6pR2WSNvpcj+5/uBjtY1qAj5e7yVts+d1YZsX
-7D76AV742RQ31kkAEQEAAQ==
-=O33l
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
deleted file mode 100644
index 52dd86c65c0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/34/e98008460eb9bb34.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
deleted file mode 100644
index 3fe473deef0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/01f3a913fb698736.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
deleted file mode 100644
index ecd11ab7368..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/2be5d98f751f4136.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-908366594e746bf3c449f5622be5d98f751f4136
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/3bd211f725778c36.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/6c70a3b7599c5736.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
deleted file mode 100644
index 68514c2f582..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/36/908366594e746bf3c449f5622be5d98f751f4136.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBEwMV84BCAD0u42clJ3hghKlMGwFA8PPlPgSEZjyvs2dRCF+dKWBaPUnR88K
-kGfWB66jX6PBtHzeiVRa078lL002S1lSth2A+s1UfYGS5wVbE938wO6PCMwgoXJ6
-0MCLsTLP54MDlly4tq5qV0Zme1wH+9n/AC0fbKkLsEWbqXhNJLJ7F8TUh6hPziko
-mLAZCb297KeEDJ3tFN2zkzjx7V79/nkA1sKHQC9INdj5jXxkglTwZhcJgPbxYzCz
-nbGeczPxwzNrN/elx0DDnKEpEms/nURfXETsnd7t2xuUuAYhpGIadZOM+LojhP/A
-Wp0KDHsiSc5tQ0oJE//ydBksCEKid0Tu2bXPABEBAAG5AQ0ETAxXzgEIANGJ24GM
-VmW0QcuT6ykJXtjrgXW4HjOEyylQ6LQJZcCt42tNA95ZhAAiNgB0CBBUuOne7y7H
-5IW0wxnrO8qOStqvjbkUWVheqA3G0AlokZVWQRk1LjmBlABJVeHNBle0248pwrXe
-0lY3NVVywxPE1ol9DOasldSv+nKyMcRFgkZ7rPFnVaLRLoozuAIDwXXaRPczN3pg
-iegwo9BLqYV5+0Ncs24+G0hO6iTToX4166GvjWa0e0YHuJ/zztXPy9CAJ6FMJy4Q
-2ZpyfmIPua653srMDty1igFdR3TVNd7xIvyhw+laJY9GxWM0G86JOCpZhrTWDDZi
-BhgL+sF1iNPcC8kAEQEAAQ==
-=JV0b
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
deleted file mode 100644
index c1f484387d9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/218fa0f6a941a037.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a4fd709cc4b0515f2e6af04e218fa0f6a941a037
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
deleted file mode 100644
index d5e2fbaabe9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/a4fd709cc4b0515f2e6af04e218fa0f6a941a037.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjDR2UBCADDfzBacBg664xalF55ghVkhxxwLaTNUdvTJ9o0IH+cGTRj7EYr
-7QvLVa68PKigj0q7SVVwhPT7fzBLDosGjHef0UWap10ynqACBoAYSFocT9m3Www1
-nW4AGT/5chvzYfNPpN7YZ2Hkk6DUpmSzS83+6nIYdCAgrcZ5XS0Vg40vUL34TJPy
-IxJinqWxt4A14ZryqSKWbWxRcocmpCAeRLMLNxbQq5rKjjxFksTYR0Sj+t47DQsB
-rqFmnPnZFExP+Q/KG1dKQ4UE/LyvzoCzCqynuMg7gIlMuRBzDv8QB2f6DgViAHdC
-vS6m2YCTGURCQufBdJOGuGplL1uxqoEW54G3ABEBAAG5AQ0EWMNHZQEIALwz8m2S
-GdANvkFLVqXdvmOZ1RjrbrzrIP/iOjs1Bo+sD94L2qUagd+/cKjvGR2cFP3g7Zci
-YBAZVCWZpgmXTL4tL3PSZg3NVvkuXut3MU+23ksjlkl5Lfzlq0Rmidu6I1TgBsXc
-CyD8Yilr3QKtQkD0l94uXX9+Ex2PuBO92qFpNqib567wSt8druTewYm270WlAVSc
-YQ3rJzdmzJD4WT+PyKm15NSLID/wzIHxbgloe1SVs8fNmNfXP4tq3fyOY6wUnsTO
-lj5hfBuEJRiRZj1H2Fch5iFtyc7kw2pH7jhXvOHoCbztjXgA1KgAaoVixQhOHMWp
-NZMy+qDbDlmblV0AEQEAAQ==
-=rs0h
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
deleted file mode 100644
index e66ffdde36d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/19beab2d799c020f17c69126b16698a4adf4d638.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
-NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
-/HVNFvTdF8LNnuF+a5aNgg+jjLvFwzkyMFkuiPGuUDFnqEGxC+z9J8t40tpOTOIw
-tPjSzkDN41AJDpUK/simKC5F0Im78nUbwMalE5z2IsZRWpYZyIhN1HhEdDvaDIh7
-3vENjH7enAjWh0iGRu+GTP/fayZnX0uhmausCCwMMhsr489e63ZOaJrqeC//wWrX
-dtEJjcmvRmJ2hwLmgwMP4zSNKsnLGzP0sh69ABEBAAG5AQ0EUzW/0AEIAO62SMbq
-gIzEFQEHlxNN5pZHd7msqDESILFYFkI1mxlkD0twFWMbk4nMH2VXhiuT3ulqKBOU
-UUNQrO7egtfbGsgVv4bWbUHfeZkfvoWDlmbrvi1YLlR/ZxzGpCNc8e3aOcN3XKHl
-BwfUaco6pcTBvLpKPA/TAjkTOtK4A5Azv1CSwpzSJf2bVVbrn7mi/rw78SmZAV2/
-rtiOU5a9S+3fzswLk1PO/z//d4VoCcL2s2WueVO1Q99kejkE55l3lYwEiBzVuAA9
-8Q0a5wg84vRGFZQWLIw8c20On2+dZcTLZc61ZjnsI1LSnLUUyQ/fzHQ+BynQF9l4
-3ZCPKFIl125MGikAEQEAAQ==
-=9tpm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
deleted file mode 100644
index 71760e28d01..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b16698a4adf4d638.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/38/b5681e477ad61c38.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
deleted file mode 100644
index ccdffe0272d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/03281aa0289ff53a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
deleted file mode 100644
index da0794018ce..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGBJD1kBCAC2OgrVeUz5GtDnUh1fSKqEDN+3tjFKmCKj92buwiDLz8sWtzEE
-ncMlGSic0yAVxMTNIlfq0ec1AFWIFKsMkcpYX435UapQz8S19XhIIROsy5i/bZcg
-6bg4ddzAMs5CbpyLFmjzW49tOaZKQbUm0zb5c4NR4B6v7E5DWh/TCJAeqXd5yDQN
-q2CAeeolJCv5Vuw76IjcaNlGFBt9/lAr/sjOyT4Tfl/8HA+x1RujVYcv+yxeevGX
-zJOWRxO59i2EU3XgCOZXPE3F43cNNfwYpUlQso4nB4c7+vcK4D83PlmAH6t/N6G+
-6EbsOS5OsAFmV3yve2ydS9BvF0TQsOcJFKRhABEBAAG5AQ0EYEkPWQEIAOJ14ajv
-2BVqQW8oVD4EI5k7iKq1nYKquP4+63pgbx1MTMfkRAEpc6qtxSk5LasO19QkoV60
-Wf+mB2CV/USfmQQfZcqREFLF2F3bY5cy964lWcZU0yPevGFg3uLKIqGa26/zQIpX
-x3oF6QPV6sdO2vfqIMNQr08flW9BRep5WMtgvEBoAmaUyNBgYlGhdGauqahiI8ZK
-oFuPW5E63HNajErH8na5BVaGziJUoq2XjY922tooGJ0Qi4dDUtOmrqEpqBrS8oKY
-R1wszQ+USEpB90IuLd5kwut5AvIljjKe0v38o0f6T8nETfkxngdnYGjNoQt8Tbx5
-zF4deq+2ojju7jUAEQEAAQ==
-=lBfl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
deleted file mode 100644
index dd224857c0c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/b9729775c0352d3a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e05f005af50ae94e69701222b9729775c0352d3a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
deleted file mode 100644
index c77ed505b64..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3a/e05f005af50ae94e69701222b9729775c0352d3a.asc
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF9ZHHkBCAC87FdE5p9fmsIG4sr88XsPIax9ZGtDADNjlgCZwg9FxjOQIzf7
-KAHWZOZ7EAE1VYQ1xHLN654t5n21kI8Qtnek16bYrfvBVsbD9OA87G1tSVURtORH
-jJAbmsH/Cbkfzghme98XnufB8f0WqkYqgAJNmJ2Q7UVy9unLDO1UWOCypwpwvfdc
-y/vFYJbhBi13M9UAPsqUi39Eu42kHDGGrBPZLkx30H8sghWlCDPK+Ed82gj5ZSi3
-LGEktGOrDCBA4rORuR5jzZxdK1WyDkU6p/v1aU1iSUHfnU3s4C8tp4Tjj4Zfrhop
-f0fvmo4c7t+kk6iNfXIJMeGwXCTAMrTcumCJABEBAAE=
-=YY51
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
deleted file mode 100644
index 47a0f94ec37..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/06ec66d653dc633b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
deleted file mode 100644
index b6ee3744e79..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/29579f18fa8fd93b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b5cb27f94f97173b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
deleted file mode 100644
index 76e9e5c4fd0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3b/b801e2f8ef035068ec1139cc29579f18fa8fd93b.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
-h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
-XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
-RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
-XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
-MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG5AQ0EVgWIwAEIAJ29KWGH
-aEt7gXV8EweJkrYd02nwjc1LyjUT2TRwEzZ9N9qUiVqfpkgnZn4mpHCToxFoqkHa
-iv/QDfj7cp8jbZJa2wjaUkDbH2pZqLBGJ0sUUBZ1KNPM2uhhWRzAnmF/bIo3+Yfl
-hGINLNqoevkYoo9cdelP3hepef4+PUuPmKmeo856uknmaWQ89LPwLlV7oj6wiqMY
-p22sHqTGAgXeR/fSLMK7d0vSPm+57LZed5ECoRMeqYFUwSMV64RjTMkKPsvFBGvR
-hppJ+uWQiMjFFuFq2DFeNBVtueHSdgCHx1TP9i+x+7JmYsmFFmRwnEdbxO3THFXa
-gFQGr4ima+oOjLcAEQEAAQ==
-=b0N8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
deleted file mode 100644
index f1c8281cae8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/0a52516cf3e88b3d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41d266db4427983a1a4afb0c3684155e9365c30e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
deleted file mode 100644
index 1df30880d6a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
-Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
-F/EkDYC6gtNUqzJ8IcxFMIQT+J6LCd3a/eTJWwDLUwSnGXVUPTXzYf4laSVdBDVp
-jp6K+tDHQrLZ140DY4GSvT1SzcgR5+5C1Mda3XobIJNHe47AeZPzKuFzZSlKqvrX
-QNexgGGjrEDWt9I3CXeNoOVVZvI2k6jAvUSZb+jN/YWpW+onDeV1S/7AUBaKE2TE
-EJtidYIOuFsufSwLURwX0um17M47sgzxov9vZYDucGntZn4zKYcZsdkTTkrrgU7N
-RSu90mqdL7rCxkUPsSeEUWFyhleGB108QBa5HiE/Z5T5C94kxD9JV1HAocFraTaZ
-SrNr0dBvZH7SoLCUQZ6q3gXebLbLQgDSuApjn523927O1wdnig+xDgAqTP14sw9i
-9OfvpNhCSolFL7mjGYKGfzTFo4pj5CzoKvvAXcsWY4HvwslWJvmrEqvo8Ss+YTII
-fiRSL4DWurT+42yOoExPwcYNofNwEuyYy5Zr9edsXeodScvy/hlri3JuB3Ji142w
-xFCuKUfrAh7hOw6QOXgIFyFXWrW0HH/8IoeJjxvG+6euxkGx8QZutyaY6wARAQAB
-uQINBGOtCzoBEADSUdEj7dz3jsz4EObAdNXnZnJ5zAkqE4zbGtU94sXdBtxD1F++
-5dTNE0ZCVwJLtZnYvxYXYwHBEDB5ZWS7noTL9rXkgXpDP5WGVLTYIMiGjPkVu2fW
-ZZ78Tu4KIfRnkWdUoMQ2g7YNZ8cVU40cZlk63tRdt7Th71g+K/RKWdqh7NK0laua
-lahK+Glped0QEo1TfrEhNgT0JUCwWzuM4qWHDys7itF++xLJsPSwS/wAUqvsWqGz
-W/1KrYbbxgKX4vbrqL3jnk4IHvcKAub0uchLv9KR5QpsVT86TmOB3WsAAlPdosW/
-ahAc2/XyiCxv5JEo8YpErBZ5TSgUy7lJNABS0JUVCeUCq/AAZ2TScOwRX8aXCeYA
-SfRHOZCiWrWy5nMGGnXVs42MMIML9d+Hr37BCCFT3Gbw8WOTeGleE92sed5dBAjO
-PyQWP+IvYxF7zOyNs46RAVlJfg3G33VwEBQgJwLSl/sUYqSHe9QubbxI0fiMsTJd
-Z6/5fbsXVnMbGe4kQDZbDTgylotiHfMCMNefgb0+yA6Fw+EHQeN/v/AtpcpT0w12
-AOpmlNy4+zPQE8Ai73gtJeTRpiuob3k1/JwvLHemB14CtxBGiHAyYHCjPqTPyQUI
-ikj+R8mecG/60RfSmGe3HW7Hpt907BNEcc4s4V9uvJPHIJdZS/gmtSp5VQARAQAB
-=on0Y
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
deleted file mode 100644
index 8c2512e5bc9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/9a2c7a98e457c53d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e2acb037933cdeaab7bf77d49a2c7a98e457c53d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
deleted file mode 100644
index 470764d3d50..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2acb037933cdeaab7bf77d49a2c7a98e457c53d.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
-rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
-kMSzmn3nBbeacv5szjB8dzF0ZGPPgciGp28KYrjfPbxrZvnX0PgL6C5RqNkI3cTh
-oUZgYqXGUe/uj5gUiLr+eZvh5lajPqe2YF9fmxfRXklmX47TMYidFkcQKGwxIM47
-7AKa5mKCp9MPKmxA2TG5F74sOwtSe7PYfzraVgaK0GGDJhm0Xr537EdtJfOpDRJF
-GizM3hYSgOp3Yo1wjPrkFA82EfB4hCNZK6ipABEBAAG5AQ0EWM3psAEIAKi9vYsJ
-kKjFWAswJAWCTTsYsfU6WPtJnErx1q5ZZa3uYXibODcs9sd8LhmJD2u8iAQLtWuD
-l/SC6nln1ikCRYy7v1JbENmJw8gWQqIBLjmma9v5GPUe/Dg1QSJqrem6VEjNtgsz
-GJGr4+GDSCJN/AkNKlyMFgSdpRrMCBZkvpwnvSM2EFbhxonbtD/jvqSlx68OY32/
-2cesXPvS/Nj8RqQfj0RxcOK5AHGKFQGoMgK2NGXfAxdOhPOA3I2NwfQLnCNbAVbP
-OauNcV9tg9vbRg0l75CAbW0tmM1i/8Geh248QAlQL5NtApB3az11wbCEMAoFRh8m
-aFLFtTJYTnKgW1MAEQEAAQ==
-=kryq
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
deleted file mode 100644
index 9fb46924e33..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
deleted file mode 100644
index 93ee42e81e2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/4db1a49729b053caf015cee9a6adfc93ef34893e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN
-OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr
-9nFrAB4eDW0UMbSL9kPmclUm/yN+qcCZBrsVn0q6CWb/Kcd8EEXEu6sGILzOGqGe
-d433t5O+tGXWL2TjAz+Scsk2Hf4zcuDeQcxELAMnVaVgKuGuEZvibrjsdIvJDGI+
-0BzWIu8ZP8ldBl4SVtzGpEVzLvDUo3mOqBeTkj3rP7xLtFDN/3AFtowbLfL7L2Pg
-SMcTnKK+jfFHRfbHP1Ih3rQ4ilLzhCnY/QIZABEBAAG5AQ0ET7FnEgEIAM3i3e1s
-jwrx2PN8XYMPQWG+/YTtw1BYDl2+iYE+LaZvtq1hpbgeCLgEVwXrCJ4spLP1rFXo
-gWqKrkJ0LRjlpdKhKBvyH1ex4grh3cWN/bIDJcJ7JA4I/Bhqhlh8hYycS9pGFeS+
-MR3aFIsii+vadrwYYvuVYGeWvdZhB7mJKYevj5Ms0OpYTfZd95Pzo4o//lNpDnrG
-7Xd3tgTNU/fkpw6rFB/2Ib1Qlk+Kz1z6JNsp+tOPGGCBrzwfwglcikTuqS+xyRgC
-9cHh5eCol11uSoWPKcQR2Ar8Eo56nxv/UApdu15iJ7R8cA5guKeeS4jt0CGCPs2P
-huggDxI73Xvl4zsAEQEAAQ==
-=mB9L
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
deleted file mode 100644
index ad9eba9afc2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3e/a6adfc93ef34893e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
deleted file mode 100644
index 07c25468d0b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/efd4147f269a813f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3f2a008a91d11a7fac4a0786f13d3e721d56bd54
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
deleted file mode 100644
index 13ba5a6bae1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/66b50994442d2d40.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dbd744ace7ade6aa50dd591f66b50994442d2d40
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/750f9a735eecf640.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
deleted file mode 100644
index 2a9be371555..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/d8b9c51729d09d40.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3a4d86c56ca99373b6d8953dbe84d764623a3644
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
deleted file mode 100644
index b56f29b665c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/40/dbd744ace7ade6aa50dd591f66b50994442d2d40.asc
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0
-OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe
-0qGWlnAzINuQaEuZwNw+pjZqPraMlwc/hwzJB8yFNHCv25pCFohK7KXvFGr5Fc6y
-NHBp6pM3pnDQ1kbkloDr32YZY2LdrfdkRqwa9STNMcZtM724aaInValFpVGEHolF
-dklo9MIsMI6mVHlxi6UwFSSLltUfTXGYY+rt2Q2sLNnEKzK1GvVhK996vrNWCvpr
-cdtbTzGE3WK4f2knhqzlaX99OLmkM1ah+p2EkK7HgWM9oEO7SYpNxKe/F/QfRNRS
-4W0aokPsEtfKCD7vQ3cRWQXdqFwvksilv+b6pcSrwfAsaCzVuhB3lcIra4MevJcH
-ZEbPrfGMi5/MIVtLayglLHSPoZtjQBhlqo8w3nuADR/aFlIUZ6NGOwaz5yXIGVEs
-6E1wiuILRAd7ecJ3Zyr/URHjawfHfKMM2tNCJKl48cScBMY61FJ1EmYzwhDw+at5
-D4pCk75eM5/t6VdYQ1cDWm7J3LGXEANMU5aSZMqgVnb4SQEmRxkW7oq3Z+GIkQQf
-Sj4OK6Oi4cUpM7b0m7Cbcsoqb6nD27VKD3J5KTYEq3e+78h0VRjhoi0Z+QARAQAB
-=UUB8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
deleted file mode 100644
index 4dbf1af5455..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/41/9a347756830c4541.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
deleted file mode 100644
index c438265dedb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/42/a0f7d9615b3a5e42.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4c5f68d09d42ba7fac888df9a929ea2321fdbf8f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
deleted file mode 100644
index 26e5c66989f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/a6ea2e2bf22e0543.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d477d51812e692011db11e66a6ea2e2bf22e0543
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
deleted file mode 100644
index 84b1a448f56..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/43/d477d51812e692011db11e66a6ea2e2bf22e0543.asc
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
-xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
-N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO
-XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM
-XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn
-O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd
-FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP
-sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c
-C3s8XOaBCbJbKpMAEQEAAQ==
-=aVY9
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
deleted file mode 100644
index bb7f0d9e77e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/3a4d86c56ca99373b6d8953dbe84d764623a3644.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFim0TMBCADUsNfz2e7p+u2TxujjDjXRq96EBdJ7wNrVjrNneF+8roo36iQz
-KWA65eNzZ9DP0sFlhRwXOopm/AOh5VB+Ex98W499Esujv7RuiZZ5zYuKr54k4fVM
-Ei5P+byCXFZyj8r3KRQmGXwpQBHrSl8R/D0Cc15pH9JAMh/BAXGtpnRGgpg32sq+
-11MO779KSUgcZL2Cqzn4U+0SkTE75w1Srp8/Le8XIIy+0yyS3AbKEARwBgpYJmO0
-MsaWSa4I8PuoO+NK5rp/u6zuXqfMWnoPcgk1Tl1k0KPqvEN+zWVJl1kHD9AClN13
-6oJ+lm25PtKb4aKtHayYs75fgeVCkiCOIuljABEBAAG5AQ0EWKbRMwEIAMiFUp/x
-c0oSAYGw1Xf0cYp9Q5h6XFJa+LW1zf/ZiAqtrpVchkkYThnmCp9yxpWxGcTGcleJ
-bSnqIYe7qkqNatC/rrAfF5gcSok0DPcS7i56DXjX8UM+KkgjXwsp4Cyf5cVMLLow
-RYa2hGOSqt6OIEfe1uDQVB/Nf+/PCUNW0pQeyGlMrxljmhxVcJXVbSTTJvicToen
-MMM8NZXDq7Pn+ubpBfPhQC9BnOiunMGMmeFFyVvx98rME5H5sMigzDV+NYll4rEq
-i6u/NKIsESwXhbrY9ua1uXToLk9g5JvoCzUdF2jBzgins+emuCeie+75FGWxsbfO
-NtjbeGo0avZ9Dk8AEQEAAQ==
-=PKxL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
deleted file mode 100644
index 8168a520dc7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/5923a9d358adf744.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3690c240ce51b4670d30ad1c38ee757d69184620
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
deleted file mode 100644
index 2a9be371555..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/be84d764623a3644.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3a4d86c56ca99373b6d8953dbe84d764623a3644
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
deleted file mode 100644
index 71d9877faa0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c1d2a95a576a4144.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b01128c8fd304fe48e6eed2c347cd0eaed975c5f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
deleted file mode 100644
index ecd11ab7368..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/44/c7fddd147fa73f44.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-908366594e746bf3c449f5622be5d98f751f4136
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/1669c4bb543e0445.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
deleted file mode 100644
index ab62f210dd0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/353a436e043e3145.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3dbc5d7dc2fb8dd68aa429bd353a436e043e3145
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
deleted file mode 100644
index 5292cbf2211..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/3dbc5d7dc2fb8dd68aa429bd353a436e043e3145.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE1/v9YBCADaUiBecDzwU5g9Gmn3T9pAa17OlUl2iH0zn8tNTUg++bW/A9m3
-lWykQBlvPOi32lqZ5q7yewSNBGHl/pHRRVsIE6hhkVigNQbMztRFPshKCU/0RvKu
-29cew2T37crxYFGShYFwiJgOdQmXqhgIai0S2sW0Iavf5/PJJjXbrM1YIqUqkf73
-unns/lIDEiIDXCnGRNJKzGWTPsbt5R3hVo9mFraPUxapw3b9C/2GGDT/mwR51IOf
-rHkQby7Uh6XzDC8jWIH/BrFT6gFRZgKn9BRi3meB5vPip0rvcxPQnmvi2R4iUIyg
-DvCsUpXr6RpAEK6/p4k17JeglxCDlAbTDLUHABEBAAG5AQ0ETX+/1gEIAJsFRfWM
-DIoJMsLPltDrrPsg1lpl2RFQuPqjZfPM0AAiAJTB/UhRfoMoijggV/m5r0y9d6LH
-4XhCynm+2VC/6TTxkvMKHAQroZFKzBKjvpCKXYaLgiMNi0XfsQ8p7/0nEUA1XXZD
-Orol9JJQ+3XxaQv3+64u+ZiZY7JrcH9MtytyVcsqOnQe8ST02pnpjwOIqh0TZt+H
-B17PWraDWRETspAMfbmoZSB9vEBiHsSoELZYywFxcsxB+nbMunYONTjp/14MRKKl
-xeTLlH7CfJwaGV/2rvN+dKOymbg2uA4y/wrZrOJVE3G7IP5ehQ/Pitcb1TP6Q5LI
-SdAo7zGFslS9iD8AEQEAAQ==
-=6UHu
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
deleted file mode 100644
index f700439be79..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/7615ad56144df2376f49d98b1669c4bb543e0445.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
-P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
-ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
-fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
-C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
-itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
-wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
-wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
-J4hfzYUTFMsJBp0AEQEAAbkBjQRd00AnAQwAydez0OM+VFRgVVHnxJE13lZRl+KH
-Pr1DlZ/GfQd+LEJBZoLDkbsJvv9axrYazGra6NSZGuFF0sWBTArelwc+PznSW6rs
-bOg/OYrnWiHfWqMwjicqZH6a6fns9jyu6Vnjqug0P5aqjRsqB8QO9N8LISN/LDXC
-kXMqZ/739VSZTt2Y3ywlQ0MOPsja3VosJJW+EEtMcIyvQcPZvIOh4kBopfFf5C/Q
-L6Wu+qxqmj/WJ5E6OzUBtHMBG6XMTVK5Du3xSo0zjE5nz5IeaRwB1UvhbKwrMYUb
-OhG+rv6nrLR46WI+qrTCeVe6F3lCNzmfZwD3LUsaDVZ+n9KLbGmraAcHCTTYTv+m
-SBR+zZYGEDTd2uT8+ja1Nd/szBm7MWM5S+P51cIXZ/5Bz0NrZeHtke/XWuzKHQI3
-mn4popAN5xmY9Wb6NYlyi34LjPlPdJE6zyksXCasIFeEL6zvWfZZUU84XQZqxXjx
-YZcTdyXaUimFxSJ6uicJ3JjgHiA4TWGHFV4XABEBAAE=
-=A08o
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
deleted file mode 100644
index 8e917d9b89c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/45/a98bd25be464ea45.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc87a3fd0a54480f0badbebd21939ff0ca2a6567
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
deleted file mode 100644
index 13e597eb156..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/6f67467bc1adb846.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e9af5293c334c7c0b583227d2f45f85cdf082e68
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
deleted file mode 100644
index ec5761cbd92..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/873a8e86b4372146.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f254b35617dc255d9344bcfa873a8e86b4372146
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
deleted file mode 100644
index be933a138f5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/9a716f957bc42546.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e0d98c5fd55a8af232290e58dee12b9896f97e34
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
deleted file mode 100644
index f97a22c518d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo
-P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2
-SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q
-SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo
-TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg
-MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG5AQ0EY73VqQEIANJPIYj9
-IsxKKOWLOkWvxAg9o9krIkohBMaOGRsx4RxQyArOCUoaG/qsG3aVOi8wML8hQK6q
-oXADJ6FBGxQ67G8pperzRSj1O3BJILB6Fd1X8w40S6hSvUAZs+DM1FMuD4mf6ydu
-yZUVIghGRExNeSb/vfn4KVPqdSAD7uWeQiIUYveaXrwot8+U8tRNgv+LQpCjhm5h
-vWyIuxxpI+k5N07V9y0yRGWiBbgqdmfHVwdEbUSM0sMYUJUZKW+iwf5tZig9LZu3
-HAf/vyXjBWG6zkkjwO8onKFLuhL4jkygHGSawJHwYRgtlknUZ0DMVc451bbhuFHE
-0dcgQCdAYJsI66MAEQEAAQ==
-=EMGn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
deleted file mode 100644
index 9b688ce838f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-eb1b3de71713c9ec2e87cc26ee92349ad86de446
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
deleted file mode 100644
index c8186e541fc..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/f254b35617dc255d9344bcfa873a8e86b4372146.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
-C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
-q2AaCtuOk6q9OtthQX6LfOuGqwbv9uH/KLUDn91PrgKuHPVfVveiF30ZvwCggutX
-D0jTGRHzUJl7F1wViuckHJcD/2z76t0ObSuTnENi0IUjF3Toe4tv+qO+Ljs0knvK
-tu1b8A5Bs+kxNcbEqV+zdIph+6gCL9jy+dB9J+t6uZg6ACJexbIkDPsutNtbAVDV
-w5AtM7JR8930dRHfEt26ahFohFi+73V8RiA7LrmMjA8rX4zuo5Pr48xt/RR1Y/VE
-8ohCA/wOqul9eHHevxeEMDYoGVjGl2EiuIThg4eYuQDDSisBNb9a6dhE8ECQFFBx
-mGz32+I8gXSTKFAkkQUI4HmJmTX35nGJql6E7Bn5yM2OaOG04PV+xkhScJll5ZxZ
-BNEccFDL/aI4N33cwrLHyk+wFNZHBL1hnHpxpjFZYv5xfEBjmbkCDQRHXXXPEAgA
-yqEz3eBEKiZ7VbAj96HtIvGufKTdZ0ERJtrdPO4FUGVBcXpphtnPn+JOWomszUKk
-KLO4x24OaDCG/SENsPy+Ned4wjBB+4uV0YEc5Xn8gts3g4Z5p+YiVu+aWeYPPC5B
-PU61tVqc996i9ZYkZiYOs9F5Z+dKozk3KwVcijaCr0IQMjAtJ/N70zcciP23KhrN
-9Z3Nn54Xm7GezD0nxTUGP8gM79zKHnVhDBptrxIT/adCzU9/UX3UVAQcdq86FfzT
-EpqFG3TM75HBTQgHihIkkirzurE+ivh6aaF3UJwmDBe5Wu3gvxF6Rl0Ja/YBNkkC
-iOXngXSxwvUUR8KJO07RGwADBggAxOFV2DfMHsTBu++gKJ94L6VjETfVFEYPo7e4
-tO2Zn2Unzdxz2BoTJcQY0j6/M3Tl9hCwhOSVVL8Ao/wp1ykjgXnwV4vz0be4d/ZM
-L+KF15x+8730H7Th+aR+Ug6K6Khsp8XIypmLJcYgYLD02PlSnDxCq9Fbv0JDlbr6
-tbsJiVzoRjg+WNEIB3IIrJbTIiOFrRBhloinYoot216QJ1rI2nQpMEBlSuX6f4jY
-F6F7X4dAY4V4ohjFeJCb6SYkKbj4caqBA9OVrj3vh8v/vAUKDB8pqVhpaZicFpMd
-2pEEYVMEU4i1sLE3X73y9RRuaJOvPAx2HHT8MlWjsDmNdY2Mgw==
-=uzlX
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
deleted file mode 100644
index 7df0ed8dc7c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/47/dd6aefcee9eb4747.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-817ea1255546d6070a23aa00db45d3a62a183ce2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
deleted file mode 100644
index 4522d929446..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/1d185615d0a84648.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d9aa7402ba75f78720d975211d185615d0a84648
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
deleted file mode 100644
index 39e3d438ed0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/48/d9aa7402ba75f78720d975211d185615d0a84648.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE9WpyoBCAC7yailtTXVEkGsCqxTvRQ88WHmCGW61P98/b56/+q2+IyQZI/M
-9HZNm/fIXS4Ww2JgfhXMGl7oL+l2sRLfSD5S3e6A0GVg+HMdZInQjL+e1zVA4S+/
-FDqAjl7Xzk5u9Vdx6WFjCHJ85F/bUmgXDvpJXyfDFx68Nr+ALlO6Kzpz5rY/04bw
-o6xEbH2/pU/D1mkYp9nVX6iLZbit93GEOF8VvhpFaM0amBBpdvI+v4vTB4MCIjz4
-JGz6BIzFl3ueCxfx0LkkAbH4ah+sqlT0RnpStKaSBavVmh1iBr0VhSnQHHD8ZIzV
-SPHGT++lsGdNYXfyru882hLLFXxHh/DNyCQ9ABEBAAG5AQ0ET1anKgEIAL/Ind2F
-n5bIQn2xqAyFDMDAg8ykkehDZ6NOUTedjBkf5kdWI18AukNoR0QoA9dP4cmHQqB1
-m42h3f8V5UIuUP8lKdDAq501sQKbwrIA6Zc2yuCxH+722nJkb+Re8rL7zW8LC4pX
-NQOUbCp6U6iMul57cuVCWSo9lp1gINwWYRqddqBELZ0aizEr7s4+ky1ti0MzTwKQ
-UZuHeLZbqml5rQS0KYQewaLDMo319/J7Aq6iu9kTV6XDucgpfBplQ1GEq7rf2K2P
-lx1q92m5rffyCm2AYB3du9OyILiaHcO97KMCun+ke24T7bLnGaEtvMjpwo5PdiOb
-8cUfwk+UDJMcvRcAEQEAAQ==
-=fVYr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
deleted file mode 100644
index 9768ac8d196..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/59b06224fd8912e36603be79fefe78456eddc34a.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y
-gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4
-g9Z+T6LbXKNAfZgPvTv4rr7UjD05N4XS4vckrS4taYLtBRJAmqT3pt43KxlyoTbh
-f4xcO2rWeXsPqgzTYIHH7M5mYPeqA2gc9NBAhkHjesFuYfWXqUfOVcOLvzULxrra
-pZDOyrINr83WikC8DkuDrAav4mIWjIhYmfBWzuNeYJsusVnFENeOxpEHV8RT+8uE
-v1gPjbjAKUPfZoa7egvz3EmDkshpNIIym0XxNGTj5ntJWR2SLT7mDrSYPeHrZKW6
-/aKuAcOxpGLpdVOMM+y4N5mTQfdlL81G9kbGQarMmwGaJb2a82PaF20wRwVgiVfO
-p/GWgwXr0XdJNLqx13LdM8BMM5vmLomOQOjnpQBOlJWRgrYUJQOReKAEAQqNMsxS
-IW9laXkrewJtblEAEQEAAbkBjQRfsuZbAQwAr/owOCxebZMTjp9coUsDjFabJowZ
-H0F++vuh73UY/v2z+vqwug89ABjrPUIccE9/t5dRyEjBt0ED2KFM3mi692QhyYE8
-uRaUKWz0kYaMPuw0W7RTblhhXErBror1m00ibNDGSf3fIr9FZ7u5ep/RTFDCDaZg
-qtWQGVD+uLnqA5EHdwUyieWDSgeThRddM3hKXB1eld4JKJPzQ0XwXLgv8MmbOc9W
-5pxb1ULD44s17SKDjlBtRvrSRdgExgfpKU63HH0D6mn+kJP066knYddunNw7HsKg
-v2mPudTVIQXYGb8xDLhP6UYJowdvJEbM8vp1t/d/CgCMXyVVJOlTZwdJaECE0n4g
-MJ2ihDZ8qbDl81OQhTiWvgoKOFHLTwZgmyhKpt36RvkXkoywqlKNGaZVNi9Ct1Xx
-fprj4sozA5Mcf8BAaxXV9sQfZLKH7NhGrFzc/r1v2R37RYWfmYL79dJj1xsrcEN8
-26cSoyLi69+XOxvbdo4KfyopRxECTdd6Oqk/ABEBAAE=
-=+/j7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
deleted file mode 100644
index cc05455ba32..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4a/fefe78456eddc34a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-59b06224fd8912e36603be79fefe78456eddc34a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
deleted file mode 100644
index 417448c8d0f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/0440006d577eae4b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a5bd02b93e7a40482eb1d66a5f69ad087600b22c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
deleted file mode 100644
index 10049bedd6e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/700e4f39bc05364b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3c91fed3922d52296888bae9b6d3ab9bcc641282
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
deleted file mode 100644
index 8f7648dd909..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4b/71499a87dc1ff84b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
deleted file mode 100644
index 07c7120ef60..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/ccfb05b8ccbc1f4e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3692c12c7e3d336a452beb254e066e0459cd109b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
deleted file mode 100644
index e684cde6e14..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4e/f5492b20d173a94e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-670be7d076a0c89f5f07625ae57428da9e879e7d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
deleted file mode 100644
index 2145fcfe24d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/9ff25980f5ba7e4f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
deleted file mode 100644
index c2ac0348e6c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/4f/e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEPspSsRBADdguKAxMQbA32vTQrCyONR6Zs/YGdvau2Zrr3SSSSR0Ge4FMjZ
-4tzwpf6+32m4Bsf7YIwdLl0H5hI1CgT5gDl9kXvfaFUehFnwR+FDyiBRiyHjUpGF
-4dgkQfWy9diYeWGtsvszsvWHXtED4SXb322StX4MfJj+YesA1iEdTiXK6wCg1QDa
-RucfjC+kx4zPsJwkJOgYpyMEAMTiXtNwQcke6nIFb/lb5374NjwwVAuuMTrRWLyq
-5HodugEIHaw3EitQWtnFfXNkXTJZzS6t2HAGv29UTfhiBzKdkydgCkOk2MLWISOV
-fqcg0tNIp5ZJCmUHg3s+OFNSH4oUi65u+FyDseUid3OKtPI+ZhIk8N+DjOIg2Kvo
-/UALA/9q+WfBd7re+W3iUtU7TutUcwbKsjP+jpaJeUHg2ChOBxVfQKt4YlPHVdrR
-iCrfNi90Z8qbsZ0iAXuqexrfMq20pAPmpHRpe54mmP1CMT5m+Gq71eKIfkUrb3LC
-/zv08dLG2vm9oghd242wbcifaX+t7AhNAIpe/WTvQsB0gpdO4LkBDQRD7KUuEAQA
-kPbkBaDBw2AEUpiy8TFBoYiiMgYnKfgJ//lTfRy6L8rt8hTsm3I2Epx9l0KuHaEr
-H7Hcf91MXp7RKtGHMpXsPHSPvrKEccHUCTbmSNHGhTgmT4IbSb5tE1MX3HP2TUAt
-Kbdj4DlGo1TXQrp7/kqw+5cwZIahCAnUfqD+LzRZ/w8AAwUD/2YjG7uUxqoTU4Ts
-R4CweAuyU1uLSH2mMNRU2/xtzU6zaAE9okPwHz0R6F5MfDo0w0h7vkdU6kqThQDS
-C84GvEmoKvXzIUkEzmwiVoSa4nBk5bh0MY5HWhLmqAT03OmbIqET5+79LXCbLRyg
-vrrv7XFlyes9tQUPiLv9oPWvyomG
-=9fsb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
deleted file mode 100644
index d451d29611d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/50/726f4e5c34cfd750.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
deleted file mode 100644
index 295ba04bccf..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/184454fad8697760f3e00d2e4a51a45b944ffd51.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFwGkIQBEADBkuDMpFPE7nepfcYCWYYE3htn9apn6TudnT+GgeYue1g+XKct
-c5fq/TiX0OOEpBt9xKOikSOwMTgdW6A2LKm568qgDN79wMleHFHel2VOiV59z8bH
-AquBxLk8ZV26QODEjm9voOMXsf/qe2Y+lRiulL+TJP9Ze5LklB4s0rc7EKERLhQ6
-EQC7GXDTp5IY5OHp+ghXknekjgN/KbQqmZm892qQ1qgRV3Rb54CxPJeEebWK2epC
-wQSjGraka4Hrre7eIB0Uuhri2ll9O03eaBqTAQzVdz5Chl1WnbGWsxIb7tL+rw8J
-uO+R2vHazZZIVoRSXfsohPu/ZkmpRZXp1IPLeJWs3Z4YeZ6w/PDCYRx0rbSlwT45
-DUQQ3AK6iT5nh7FqPAnYom1JXELogw+bMQtWVSGHujazC62cox9UmvZdZs9H+bIW
-xRqhnqltuZaON/u7bKsHZWLifWJOd/8D/r3u+Ly4pf+LNyQY0cSC7hfcwg+s8cb8
-IbyuNIAoQvOfrwgjlHqfeWErWe26aQkBjtFtiI9AytkeofRFwhwjzBhCa3L8xMIX
-Ee+1y7yrvsgyblMq0be1+amQ3KXdf7TI+6nar6Hy/+G95kMvynwzwd1ph+CyXF3p
-Ym0u6Mgu8CEf+Bx0YZSEFfHO8r8w+m4K5tQIRE9fOYs5s67+FdTOqXl2KwARAQAB
-uQINBFwGkIQBEADlNOAuQwbGmaieY70xxnlYRdSTbpi8Cfa5/1AbALahr92eE0Rf
-0cHnKl6ysWpyFoC8EzzZhcltrOZUUwbKGLH7I5GXddJUaqH4o0psHahG+uZVRjHm
-H9/ARmKCRvtWlSmOHKhZfIV4G75hkJR4Aat3LX42dHdb/JXj7kAfo12Q8zX3B9cx
-Yn49D0VYlQ2/0awdvhMjsiv217LMzqqsb7RGHNnPfKotreKbLK2r2nVVCMOjyIVB
-58VChHvWfA8dSe+IQq9ZPcSw+sAGmNSNk0uMD/lii3nTcHrP8pyubAB+m2qxK+BG
-WanL6YDb1QZtZS4jXdThycoYiRL6/WLftspnR33NbNSvUNzZ6BBGkz0tW0TJXd1u
-FX7zpKdCCtVmiRrRqGRZOL8cKWsZXgFyjZJjlHsedowqnoAfLP4SDliHyU8hRVRx
-Y9dHarQ1TKeIKb+kb7IlQuueptbOmm+twdAnwTOFN/Ifz2nDnXTwhfuXbhuAw0am
-mOJhK3FQ39Wy/oDzKNCYQ7Tr8Ea3fdZyHrcfpPYOg1S1UzP6zs6B10wkwsShMlSJ
-v5BoVQr6a4dbhxbSl2OtlaIo51Kya8fCXKNzsZEYyTWRMINpZI+cPFG/bREot7IC
-nEiA8SYCKYUXQuH9GZmKmDZl5dzhC2WUcMT4nSPXxI2EWV3quiuQOq5ebwARAQAB
-=6qP3
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
deleted file mode 100644
index 31ae54d10f1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4a51a45b944ffd51.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-184454fad8697760f3e00d2e4a51a45b944ffd51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
deleted file mode 100644
index 790d21bd4da..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/4ac55a85d30c3499a3219500b7e2662a7640a051.asc
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGAeuPoBCADxjHFyVx9TT2s1eAeER5qcIxQfh1sR8CFcDyPQ7FsoSA0Qt8di
-3o23mEv2aP4OfezmY0eNchW0TXp2wqyuA5V0cE8RrM24dJ5p3X4PcRyVcO5KdJFk
-KfN8a0U4xwLP3A9kMQCJr84CFGqWr+EewU3MckrSJdHfOpnfge8P0yglTtKsuq6x
-ECPovrrAjEpkQ4WacgtL/4RNXVBKOSWq1inFQBE6UjRuakVkPuye586VfBtAwoAi
-9rghZGvGuUaJ/qs0/WDX+DbLd1R/Kh0Hdh5uaAwLjcl2DOvaJApfR4vkRPsZ5ZPF
-jxPbVvBBrDCWjPOZlXwhrX7EwJJoLZYZt4K3ABEBAAE=
-=mps2
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
deleted file mode 100644
index de648a3c373..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/85911f425ec61b51.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints
deleted file mode 100644
index 2b1d5b65bf8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/b7e2662a7640a051.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4ac55a85d30c3499a3219500b7e2662a7640a051
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
deleted file mode 100644
index 064d520bc4a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/51/ff6e2c001948c5f2f38b0cc385911f425ec61b51.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
-YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
-nIRoUHucmr10Xftpebr/zaJk5oR8RdaL5FapapmcZmAaHR9CDWB8XtI318u314jq
-M5rKatnAZMERoPugOvvuAOz4bfZKwdfCmZKfYUM/TMSrSinXrGExSW6z4RhtqmpC
-E5M/7OoVfvDynVJKqNazqgigpmMNhOyzAhQsiKh1K0akyxTZbjeZKsdYfhCXvq0q
-k9+KM/cTllQ54MPnFWiObLkHeK0Waw8bI/vAJ4h4x/XM9iGYpkXv7F2/FVsHQdPe
-YJcwD/CkD8KHyiPaRKMeApiUtZsdAHU0L4X/lNmcooea/7ipskruUgwcm+RdLhRZ
-P949t1e7nqDZfpEHy90NiFxmlRAPSNqBLwefxY/hwBgog2jabDALJVcLCMosFWPj
-MQhFlGSIODiVcW8folGIjzkyNZbNMWkwnl2QnWp/h2TAwYQJOMqcv2MG9o5pyzpx
-97Iz1ngq1FlM/gJnGnNUydP2tAjT2L2U3MP1uX/EdRChdgPqdolqYhdFfwCr0Fpf
-W527bUZpReHCEiQ29ABSnQ711mO+d9+qM6edRyHUoBWz89IHt8sCunuvNwARAQAB
-uQINBFrKW9IBEACdAbrfrCWIQ4uRc3rrY5lLpDPb5wWW0JZuir2hf0WcDU8edNjZ
-wC3BLbXhF9ZnGSODpK1q753VZvxOwX9JQ3d4pFLKuQDGVfS/nna+PfGaZ82yyVBf
-jt7poRZnR27QzyPDv9/tDGnQieQF+lDCNKDgQKgfhwDp04Ukh3EG/x2BLgr3Qc24
-gdr5Bh9VJUyMbA6MP1K3o/CRuDWwt50hNGjn0Fu/QnXicT0t1ZsKLA2uQOvbiNN7
-B2CsNoKk3qaxTBwfUTSdjG4oB60cSLY6mAGFpjdFDpA9AHo3LC+YPTFGWUyq7iFK
-nvSkcW2bwu8l1Y6wnnB7cqKMe5nMRsFVNOX7YOE0wjQoyiH4/86bI059YPwMvg07
-elW/6Y8Nmfzb95nddjX+hJCunIloIGNEpqxVO1+ID8WBipOaXqpkyPLqLLCDzist
-7MQuBzEce+OEAp3gJ/HK4IKCcZPSJEsVkrDjhmY5So8OTK8ZF10jIdqDUrtRoz/Z
-QyfqI8zLtdZxoWIfke6HPjdKI52xYa7A2Th0PEd3GbNKOmzQfl2R8JyI4WERzngA
-VwYRcJYde7FWoir+HCpOZWXVFj49NxBQg5/HfpZbWLElB/xOlXFRuigry+vWM4UX
-qSGisNehkMk2EjZUqiZanxjfwQ8bKJQ9k1yeZKJ7PH4yhDABt6qMUwobtQARAQAB
-=RHSx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
deleted file mode 100644
index d437fadaca0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/33cd6733af5ec452.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints
deleted file mode 100644
index ccdffe0272d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/74237ad167ffee52.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
deleted file mode 100644
index 7a127825fc5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/8671a8df71296252.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a6d6c97108b8585f91b158748671a8df71296252
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
deleted file mode 100644
index fc77b95b76e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/a6d6c97108b8585f91b158748671a8df71296252.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFoQh54BEADOuivAfgGKc4/zDwx+AwJdctjTT0znL9knRTYG6ediv2Eq+CXm
-gBM9m5twl+qhUB1NtrdHb4BH49VY9/gHr3JDyo5ewu96qkbeQl4pxW0zmHg/yJx7
-+qvAK32I1WI29iu4BFnda0EJwNCcVNrEsRuLl2dBqN5GF4cmniGW23W2XsvXiuws
-sKe/4GClWVYVSVrbINk9ODaANx/UZw+b6D0evTEI8lEio7WIvyrl3bnpK2dQ16Lb
-9JThn/xmF43D4gXK+u3mGjueGh9sQ4vMTtnpID9yyh0J8pVumY/BVScAPDAGseXu
-vJEsu4LOC9//KxeBQtij+jR5Ob704/kFrq5q83LACcfrSjsqbwkWLwWbQ/a4doRB
-8puXS0GRb/uwevvAljXrp+fCmjkKfdSMMg34TQufAktf2uzh+YCarGO0EuBSq7ug
-3Om5wKTMTu6OGHsWwZxyKTLZw+5FjUNsZXm9pG+20ocEmsWXFcG7jK5tpv73NIvi
-zys+8QoSoLtVeo4UDJa8qUuTUuu5R+d73i9iChWdDsYgTCXlxuDV0eAmVQqjBKbN
-Zpmk401Efz9QORJI0C5kaEnT9mPFltuiYhOjg8I08AbfPoijB1kgzYnKgNxXyUT3
-8vGvziOgS1A3qTGvMwNpkd1vg/n/B3wPBZC124wx/yHl4YM19b+xsvp3SQARAQAB
-uQINBFoQh54BEADdIvTFoGJA1qcRGROS+hTa8I3YgNJgLXQUHMR1voK7yfDHFtlF
-3WBsKmL48k6FC5BrgU3/gpuLEDzPl52w/k4rgtwKf9O0hkA+KGOfZlYA51Yy7ovf
-MA2aao5MXeUjwlsa2jfTgXoAFwvmrisWbB9ZiN6DBX2tLpk/gav8dy5b0nRz0WSf
-UG53ejRVPB9L0L6kXrTW6pAMlWCkh2uwAaGJoFUInNFPUMbh5f9TLPKODsrOc6j5
-Us8wgX+99ST+JWrVSx0gpQgSILEhvhUzabk0p5vsZBNt/AbVXL4M8K2TXk/+IlED
-/XUtaQptEYeqQ6FKwXavrRQzu1Ru0C0DaNsAEU0OKzG5vGNo00HHKRfMJZBgUozx
-79C6vf6CFnkeoFzhFOsBBVfWHMO7rQ4egchuDQ+DmV0a64+ubUjHaurpbtx00Ele
-w8b2NswIWJAaD46ndt+xCtew3J0KTj/Knxn3Fw3u0gEQhyAuI14Yez3z0EfyBCHB
-blEQI6SYkmAxjG1VEApNgyosjawn8uKLFOEctfLjtKz2DregfuVeuSs8ZmvF8DVR
-5pPg97TZPeEj32k8u+AE4KL7iDxG1/ftE01XBnKNzbpayFCjdjBAAjEIurPEV+pn
-h07XvwNkIHVx7OpddsGnTop3TfFcINGetFXf4/dM1Y8aJHwWaTsmQQv5LQARAQAB
-=r0XB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
deleted file mode 100644
index d2cefd5e889..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/52/b920d295bf0e61cb4cf0896c33cd6733af5ec452.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
-FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
-J7VtuhdhIE/+rUiE1go2vkQhdIaad8om/kQDsovbgqxfX6eU2hWL51bJZwCg59D5
-0lXm78y8dlbvGaW0EVdgBesEAJ6rcNAA6rjsi7BUXNIpZe+KF/G/slcLJETgylmw
-g0vquZP7n0fVhZZqB68zSmTcukxo36rd0jr9eSlhPj/6j9xs7gpk/UFWLWsziZDO
-7kZVLv58v6ktK1Dk8u0F9o75pDBjgxOGR7VPVTblur1dIJ+U14ffJ9fn6wzKY8hx
-hZrgA/wIpuJ/aSSns2ccKsErDMPRJP/TGygvrb1Mpfk3tLeGF7owI0sL8L8adKMK
-g9kT/8VFoLzeSeEwUDOKDVm2xB/A5pazoUcgxLdwYs6g/XJzA7y4Sbfcac2W5IZ0
-4WGGUobf5Gp/b3NeVuff+V/2UN1YIr/hlOnBOMQDlNie4loQhrkCDQRE7zskEAgA
-i+8rrcd671s/hYlH3mgNtPbmb6KY21axOKIkwqwVdFoG5nbO5SssW99d+naj6UDJ
-+x+mbF8zTb+0uFgEnHlrhjJ3cOSzuSPZ2UY+5X1GJn6tkHN4e9knyQzoAFKNoCbn
-YHzbMkEEyKpziDzcyAuFHEKp1JoHhXD465eX9b/RFcSaaXmjttiGn8bjGhgAiRXD
-5GAP/BLkD+nW0psTbLTraJ3GP+vVka1kwnDN0i7yvpvdSjntNi5xs+tljAtePbs4
-ogWQBeQV3xFD7GwadVhH/3yHRlISuEUNRO/DMK4YFsDYjU+zaBLk+lDka38QnAIj
-QYxhe8eypB8EuiOarDU3dwADBQf+KBZfOx/iCvuPcV3LFiUseNOAbF6xRbmAoJaq
-lxIy3E8fX0oiuEp4OVHz8U02BLsBtH4LIpiEj2/gyELx0P25GhS3S5UtfkNvcG2A
-fNZOtNlWW40GI6gj2KxyJqOaXAkfW+WcPJrgd+gH+9JpJzVfoTJyqkq6r61r6UNo
-gQI2nrhroPjv225TyA8xFuTyShdhRo0WoMP8tqZxDiWXsGzdFciPaLJ3GPwevVT4
-dCpbCvR2XHh/vVuytwC2p84O/Wrh9TUoT35Xe6vY2zkgGg9adhXdj47MDZG0BWqF
-s4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crA==
-=2muo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
deleted file mode 100644
index 99756fd22dd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/53/3046c9379f41ea53.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7b9751fc3f01f134f476464cd0eb627d4885ced1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
deleted file mode 100644
index 0a4a397e1c9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/3f2a008a91d11a7fac4a0786f13d3e721d56bd54.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGFKrJsBDAC1UjHBJhbtkcSQdZSM4sC88QLamu7CTgEpzNfhO4QT7T2P37FU
-dITcwHUOjrp0blADnBRvmTGyPgQnljTIfdeW9DX5sDyiOdMtJ/qFP1SmZ7/2XiSe
-9wIVIqsk9BqE2dcuMnr5HbVSgfC+LEpWDhsK87pV+j795+yrI6S7w27wdwPou6NF
-dpSoaRSo+bPJZmPfKrX18xo1tNdWCOs15itIXvkL0+F2wV7DWTjWnZ4CAPWjf1LK
-l2WAtfae2JJwWtsve9SCZ0968z3oDjv6oJjL+M77fNd7WrCWV1enZBEt2pRlePtF
-Td6VJNJkb2Cwz3e+Uyovjh7HjBjmwopl1MgpOCMVoH7lLztZYLmM5vg+FdKiMwkK
-GjzxQV/6/7dnsgb15aKQwbxDCGMrw9gT98HdE+DuQTL2gdOk6PyaOtvkVU/uHkfT
-mvAUlrhRi2srMvd602Cwy9G4bPqjQp6Y3J1oIJz+rhp793Qee9oLAAjPB56YvVkR
-2AcJQ7FWGpD/kI0AEQEAAbkBjQRhSqybAQwAmIHLTS4faYQ3Bshw9QCCKiVkCSWT
-XWkWstXKUAZyWl9st4FiyOMwygOJIpOQkBC9kDajf7rhEG2gXAHX6KwDXcIwDnDP
-T4AP0WDImQI/sp/b20lcP3pEREa1RJ47i0s/t7NbQkIvGgDhAXAvamO7mRxYK70Z
-SbNqH/r3h43rN15LkbjPv9I7ZTJ4zJGezP1jLyHSmGkQxOUbNQvQXYHoPpN2TzwR
-BNjkaDUV8y7cksrJz40g0L1TDycjDOqq3jJgNDhKXnx0mluLvMQph/SZxLo0+owS
-sbY45h//r0lnyjEzZAawXFtydU4ccUinTqQP9gF7mIXGttMv0iXZTV+cSjRT4KMM
-f1BIzVgvuKSf64WrWjAuqqgj887A/mTdZMKFJvNstVUM0LbhllvyhYZzOv8fx4lr
-f68q1WD0l7xakkG6IfsVfIVimTJfZwNMMBxTVUn5XI4ntAUnwtt3eU2PxjWGzzw1
-qh51lz7t2lVf2y6A/A06kXxtj2pkNQE/HYWvABEBAAE=
-=3699
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
deleted file mode 100644
index c97cfa3ce54..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/cf9f423a7d348254.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
deleted file mode 100644
index 07c25468d0b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/54/f13d3e721d56bd54.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3f2a008a91d11a7fac4a0786f13d3e721d56bd54
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
deleted file mode 100644
index b22da3df4b4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/6525fd70cc303655.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
deleted file mode 100644
index e53a26ad84c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/55/82f833963889d7ed06f1e4dc6525fd70cc303655.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEmhev8RBACz56FVQ9l701+PE7Nr6+6Lsoy5tK6wmV89pEvUDgDjT0VTs4EI
-dupAk4a0dLn8Lu87AloEYuSzbCxv5cH5vyDcvLDK6g3/sRC1LPQPydD+UlCvG8LI
-jCmzJYSJj8joVqTBLL2RBdR7xUie34e1RTvAM5b0UHnnvmsvEwwFRsb6CwCg7VFi
-5CrOZlhNeWcWqSpPZCTV4ikD/2xEBh5fUlpfo6qoWeYx2pLg7X7TIriD6IVSREmT
-ewrVXK/C5N9jcJ1zCERjkPOinyZh11MX9dau6M7I+72bapVj7Za49VHiPutDCb8t
-3OPS+ksddfTccQw0iHGDjSusJM+hX6wmHDBgY++WBCYX9TkZxz/cFutqOZ+HBYUW
-QiEjA/9p5vk/gpSB2UtmUn0StfAnwsqpiiwV4weS3sbn66qRYq3jbbAjS5v+jGwf
-KZjPpUyBitKW2Jx+BgPnFy6yk+u19gv7MOiKwikqeDqyF6M0fAjJflproQFLyHZQ
-7YFfIvhB0k76t7qSeCU9MA2wbU/DvDS/TmsMiMFqBuhjB6T8wbkCDQRJoXr/EAgA
-oJmSrlu4uHo9RhCtUmSNOczGf922j95Ldou20NKmRKd6Mki9dGdCt/TJSCaWFULf
-oQ7rKDQy8IRrP18xaJ/KzhG6fjh9uuA0v9x9ORsEHB5Xih3s9gt/TqC6NWeOSd8R
-ZeG6Y6SgtFcA+5a3UP9yFSXo0xS2It48f/ClB1/I1V+iQjVXC3pbs3LwGJlaclNE
-V8ROkXDhyYPwW6LQkWEDa043dSKCOFe6FnytD/9vv92weOFe7pSltEJiHjz9qpZl
-Aq3CANsjqsqqZJU36+8rpyiJfSiHXcdjgCiDQyzdQm5HQl0cU1e1+CabMrL/8+9X
-6C1a4dSXu++NDXgbVB5hnwAEDQf/Z3kUqSvprtKZjh2orialskkQ6jQlGTSCoX/o
-UAsBvnsVSdP0CHUnI0mYfIh4WhuiJwHgmvTfjrAzU2Jfwww9glw6OlhXP4mgvM23
-rF/Rk/gpAaUfweSy6TYlynfzFHQ6HPIYEZqGmLPJ/n8a4rsIGSWcW2+TC+OEI7Rg
-YvC+LJuoXToqn2tPQ3Av3JeEbO8nenk3SJtrR70cu5F76ANJwgCuwug/ylzvM774
-DuXQd4vPFd4jFxvj/AvKs5itQAGRaInfCxn4uHcUZc2WiGy7T28CpD1Q3ptUybs/
-ogyDCKa/xVHKXu9wRF4osf8U1DdDpjfabdKWG1+RMbx08zH7dQ==
-=WcKl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
deleted file mode 100644
index bea2cf284c4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/24d04176586361fda94ee0315f7786df73e61f56.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGEVsM0BEADiZwFLiyjeOLeGS0jAso0pOwUigT9PpwQq7JFAuJP2i9C4Eunc
-J2HWRdMhnAY12C2MVetSwhI/4QID+rIreB7ooC4xv8sz1PIC30t2oSYtXF4w5DYh
-RlHdJajbVy9Oz+qdpZtshTQgXhg301TXu5PN6KloTvWxvCZWQ9moByhhwNJrCbI6
-EScorVQexvUdv9/N3bC0P31/GvU/5u0l8mHeK21RLqGJSZINqfUKf7YAMrAXKn+R
-IlGePr0sg0BCACOCmf3NtGq6/GLtm5ShZD5PuAstaMjp7u4P9cNEW0mny+FYkde3
-H+kN4U7bWCZcMFWhGwgsLCm3VgD710C7Qb40WLY5w8pTnsY9gOgaYti7xfOIi/nH
-UF0oPecnBw3pMfHNesYPS/s5/ektju26cH4Lq35PgAX3/5QUqkHp/tgW9zXX4RIo
-r06kV+U7fKFfzDfThvINTd09D4dYorkYEoB46NJbjoIFG6tJJXM/1MTMDHLi4MEL
-rC8Zy4jIoxDjkU75oQNrgALOXsSfxkMLEdRjXcjqvJEPr1ndcJ6FxCJnWtAqbdNu
-uqgX3PiE64vQzK75m3NKKDp9uoA0BrZ9cnAMf6BwIqNA77CLo8yAzDS4WPu0N8Kj
-gmOx804d12/Ixy3soT4KcS7zqXKeWy5xzoBImScerRsm3ij/cC+fz74vAQARAQAB
-uQINBGEVsM0BEAC0Kq9yuZkMgTJX7PqLYOE1A/5VyXik3iPpHLccuIVLLiZhqhed
-dKuyDkub9zROQHqu1qyw4EO6T/5uAT8erVvlKJ/7PvNgkvL4M9yO0KUw05EbbrvG
-tWE+eskOL9umS4wD/ZYpPNOmqpLjASlz6W0ltfeDhHzp3CMfJ5qsUTMfzYCwXkOf
-5UYa4w9CDOUf3kXNEQ+I0l+r60QB0LLeNRDLKyL14nk12+dhKHSybbYYdHk4o6qe
-nUKGhr2295AmcA/Jx2G8D240/4oxlANvXVbyuKsUTsJxzwEZBSpuU9xd7/DypIvM
-+oU9XU9849x3PsC36mgHYSUCMSaCdF6qhimUn9x+rhg4LrU0lVEKP03B0JoPbgFm
-W/Kq/eysVB6b/m54LQl5/iqoPxQAs51RT9xk5/PdEAhjjzn1OgLyOqDyh13wnRH9
-pEH5fPYAMNUVsEW0ijNT+mKLGJggwJBkW+x9Av+Ff9P4MLFXkbwK7lF9K3bGX1kg
-b2A23duXxBeooEQa5cavVvrrCs5d73T4DsIe0f2bMbec5BChEVY3cbfUdwcRVrhI
-lNOwL/+ButprWMnBdlxuHiR3QU9XdUEvvP9WNyckBEqWJkKqGZG5OQd9DlHTabg1
-MspVjvmHqejOtA94gK5wAG3tOr07K1V8GI6/k5Ivhj9zFr67bxTZ9J2aAwARAQAB
-=UmaF
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
deleted file mode 100644
index c96bb8e4dd6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/56/5f7786df73e61f56.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-24d04176586361fda94ee0315f7786df73e61f56
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
deleted file mode 100644
index 2aea540087a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/098a31f381819057.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a1885c07a3204611fb184ef7098a31f381819057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
deleted file mode 100644
index b669eae6ab0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/1ab9bdf40ed49debb5caaded5b30d3b10694f057.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
-wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
-ZXaRUHGWjU/lVwtOk1J9GokIFoqtWqBaQMgNRTyyHKWKpb6xxjlzkrDqV+a3htY4
-xNe5F24QLFqf8QiiLq0nDENPzvTNNerZhGuRCHtMgV4eih2iNzmqZL+Ug/gmNzyw
-vu6tWGNw883JQ2HoJr/wC8blJvDJYiOcahrZ5enQKttNKXHiodvL6CTP6q+CTa5t
-EQwbsUAih5tndvgwKkpqVM4aZvFTmAw/AZavABEBAAG5AQ0EV/NhAwEIALdwrp4X
-XrmQqdUmtSx3suIoWefd7iK3wUY4Jzb96MDOmHycLoDorhCcErhX5OIhQfzL+lNL
-xrasCKsNx0ymsVKMRQdMFUHbPT4u4SvPa6ZGYcipj7Y2ARU90RbVHnGneV2PNt2H
-sVJKamqUsdemACLjf9Tr3HVRNJe2PMRoVRK8GtD9Q8WDxVzbhnKh6Xvj2BrWfb6t
-Z0jpv+EFIcNyjAAtIedA/nONOhKnaOZGbfIk2PknXvCvSIs5Uq/bUcauF9mmtluK
-t9k2odvmZufup7rM+dSxI3YmxQ72cuik1LLDYbKSp2B0sHxi+uN4YMw2cufKso6T
-Qv9rSUxjx+Ee2gUAEQEAAQ==
-=f5pB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
deleted file mode 100644
index da7007bf710..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/5b30d3b10694f057.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
deleted file mode 100644
index 6b5fe01a2ec..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/6366592024774157.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ce8075a251547bee249bc151a2115ae15f6b8b72
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
deleted file mode 100644
index 6df408b8035..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/57/a1885c07a3204611fb184ef7098a31f381819057.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
-95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
-Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
-VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
-5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
-1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG5AQ0ETjlN2wEIAKRxUnYM
-McvAl+AzYn3UUKKaxhvenacyhuxNZzaPbC222PTZd2wAe7jzXNYA1acb4EuJpuZN
-xdx9ijHrNl2LzKt+J+z0N6/5XvoDjON+2KVgOEAHUGGcVWaI+ZlXCCNo7w/QTvDV
-C69VcrwSblC0zjeLDiiDr6pxiy1tD3eYoLpICgcahaY2BnyamnRN8qxYjidc/g5C
-H7nYgZTaozn9Acyvry/tPDamnv2xAJz1MFnRsdkCPkBzVYyDpR0XtDO1ju52np9x
-Hc05Hx+TVDgof6PGi8n8cB0q/WieRQk7F3UJJ/zbTRPYoDsi/hOd/bUqECShuI9z
-hbIEIh/0V9SmrGMAEQEAAQ==
-=/hzd
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
deleted file mode 100644
index 4b8c258b94d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/06d34ed6ff73de368a772a781063fe98bcecb758.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFOpAXABCACsTEEMlNJ65WN4hGR+y3Dy80YQoI6oFivmf2kjOz5JqsBkoDaA
-vKl+OqLNIeYu4YXBFBe6t9YZvcBKAU660bTVuiiC50PNL2z9ZU6GrLNP34uKvyhP
-tQnZdiS+qPBn8X5Cl7XtPqlwUNRFrtqHiBgymwGGTLfhVZKJXXB0xU/UsShSHYyS
-YESrH89xe7LfdW5QAKv+4MxMDDZi/kBWSGGfdgWBvYYlsVmRv4JbKahBMmpM7qH5
-RbTw6km6AO7kOxcM2BfdwmVncUhj532zXgwS6q8ipv9jzuHCeALEzKNHr68dTq5D
-WAnJT764ovyOJ9yQ80wGmzYRyfp7Wctq80KnABEBAAG5AQ0EU6kBcAEIALL602GU
-LU0ekAqKEYqfbX9i125LJ91t/sTh3MFB/SBqfT3/q0jDiuE4A89eRtdF/ox9SYV6
-3YAg71wFx76nWKm/iAK8I9ZPiKSWF1+zBGFwXtKg8emk6obT9KZYemzSrvXpzXiz
-I03CfE4fMqk6iJGTiJKDirQ231fB80zgG/VhHdILu4qnP+zWPDfKhbBMD0zFDbLa
-i46a+5Jz3Ik8mPxnU3m9IYgcR8O+rXasJQFQIewXRJ1ChGAnLEiyZGmaTQ1jU2P2
-eQjlbqSiCFSEQIQV1mJeMxpQavMfYQsQVRNa05mjSii5ttWRKC0xU0gTFYJjMInc
-l6iFinSK3OL5cA0AEQEAAQ==
-=Bp5D
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
deleted file mode 100644
index ab9b2a13625..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/1063fe98bcecb758.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-06d34ed6ff73de368a772a781063fe98bcecb758
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
deleted file mode 100644
index 86601279642..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/58/2161d72e7dcd4258.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-679f1ee92b19609de816fde81db198f93525ec1a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
deleted file mode 100644
index 12ace9e88f0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/59/10da72cd7fbfa159.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-475f3b8e59e6e63aa78067482c7b12f2a511e325
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
deleted file mode 100644
index 3b7f58c1acb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/083891ad4774845a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dd46dec275b1f230acce4eeb083891ad4774845a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
deleted file mode 100644
index 70aae820c67..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5a/dd46dec275b1f230acce4eeb083891ad4774845a.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
-9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
-M6mGWsr02oVZCKdRzq0sTa8qO4UXrAjfciYoe0n6sc5e+URIH0Cmd8p60AmpKPaI
-L8/dyfDYA0EY6VVJgYlCa44IaDet7xb2VvwNxbTmvZ4lui/U+MSt8IDaW+4g58UH
-7gkRGFq4FK1a+cwBzQsPRdeEgAXsRZmCIQPt/Eti+ZF0XmLe34kT60lz/C+WcGb5
-h17NYkxERAhvDET4xLykSW9y64GEYqFVUvypqYpGk3xQ5Ly//stai0+CzwPDbhJV
-HZVWwyy4zCH+WrbAtoZSIhbGJNBryPVf+qV7e4kVdc7GTMDy74myl1d3W7v9XBWZ
-TGsVAXfemH/4CgznDw7Zj/xD5i6wnSd9zeX8cLVR66yWOYxUtFieuLzRnbbUEKAB
-Rf3uLWOLN1eTgfg3/w7lx6dn9PLvWzOIpkeLF3UHIW9iYHNhbs9lCop75o/YR/g8
-5t0p1bIm97tCKmGZSHppH4KmWQTHLaBG73H8RYCXlvoiwCApleQPaMT7q4FUJr8U
-Utu6YNQgzoE/xUOHAPHO66DaVvAjR0eS1ge9wf99CKWSnU54pwQXo9IGCwARAQAB
-uQINBFu1EwcBEAD1tTlKuxwUaoEm3Gh8lw6MR7fnBgiUZzED/W7obyUpCdflOSHA
-+tgLkjpbz7azO2a0beS21NkXdx4yOhJ1Yv8wjCIwmoA1HGC17SHiYXvKM3TovEFj
-BUhVpJxOMrR68GVC8Bx2r7zRNnru9fXzwWPkyq8qPOhqWqf465gXxZnn70qqBQfS
-sSXq+9hhVGqPn8PfTMUiRGb0O/8fUxL/bLDva+w1/hSPAMgwIIHJ8Vc62dHNP4be
-wV1r8yMjNZlM4mysm+yVhgFaH+WgTJm9HSDSxraFptq8QkAhIpDuRXORGFMm7Ain
-sKzUuMkgfPmW7sk60/1RBQ9MmKh4ma0ia8OkG58jby4yyNCh7TLP56tzyai7kk14
-l2os2Zr1ytBbSmXp3HKiHO6WU64Sa6HmAyqbv7+gP3qHz8nj+UtiWn6vo7e+Pzcp
-ejxcQUEZ3hyWGViQiRHJ6c8KDQLA6YlqJ+WZrzemy8Km7qudlpo/dUnjp9UzXeOL
-Yh8GIcAb0bfFFcTTyTYhD14DcBFCiBGLcQPiuPzzP7kei7IHj+7b+VkiGQ4+77wz
-shjTZrhA/P/e83X/QeGmfHGPnHOXFPHeSDYLf8sroEnG4SJcuoRXEavDeE6/b5yb
-3JgB/KOfScavAUk+MNHyssuSpJDpuLGb5X76qnwCGxsL4OBctwbGBJNU2wARAQAB
-=Q7gw
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
deleted file mode 100644
index 0c74062c389..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/11cd01355c5bcf5b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1def9646901a1652e5b3e5ea694db6f419c8d1fd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
deleted file mode 100644
index 5a57652271a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/12d16069219c90212a974d119ae296fd02e9f65b.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
-r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
-W6/+MOieKsNTghAogNiTOp6dgrFn6Uw2iCFgRUr8Z8dPUSRwtoPtw359nyIIllEf
-lBt8ZPbmTZ3rn6y9TYviFIbO+pIVc5iGuHCyr+9NXdOpNKpUKd4h2TLtixtcNWY0
-6TRLhbd4COwZVL9ZZwAlyKhQ4TbvvKvVCS9+HPd9onQ55s9iqUTA9xeRW3D5aVOA
-0VgXrFnAq5HE2x7+j1qZQRqMNpVTDgUptpDG5lj7rIdgMaYj+vL/bgmK8thg9su4
-8TdPgza1ex5Q4Hb0tbxg/H7Ucasxys0MJ9ktG91vgR0oHP0y0Lf/3uyoCyhKilKO
-yDqkKFeKcTx9TCZfV29gDs4dumH1Eirpg5ikKjPExhaITZgtV401CDsS+DgXHqEk
-YN9R59qJ27AUV6J3dAAumzXECXBDcvyLdb7pEIBs5/QtdgE2ivCH8BwFlmcdqe0+
-uKL0jgylMDsfiADVhzagv899MqrmQh8po6Sj78G0gwdfCF9neZgX2czolSFYFSy0
-rmSwUetem6IPwaXpV5r3852P+MqEvI2s86c3ZIyGFO0ltK5KSZq62DANqwARAQAB
-uQINBEzH8KcBEAC+7OdU8Xc38u7HpPQQPAmBHw5UIACUFP3/xrsh6dDj2B0TMlsb
-mKP1MDAN3qb9lwci2NEUgLKWrByQdTMMYfOuJuGwFYZ2gU0awpvaD4mb07gQ8qxV
-pHfpHSdpLMYscViIKhTcqAY4RIB85FUN26F8lpetQ93kKxSegMdLW1kwB9UTH6ik
-86hvTCT5ggbupzWdsUh1Sd+0UJBpgLn+NBQwjv7pzPVdSx8+9XA/G77iZPNeVihe
-VTtUfoubpN3BpKoRrJVieZX8YjF2RJmzSjPBzt4mLKPec8AGPxDzc7f4/NXX445k
-BkOyDJCQxwCTHjmF1LEJbxipdPTGrWiIw467U1LrFCsuqc+ewGJBZWMkXEWWMzQF
-axbIDKy8txnTgi9nkEYW/s0QjXa7+1jWUye52aVsBpNc5t/bh4JxJ53u5qcXwQYP
-hTL0o2pXkgoXpRAbwhoZ1IpRGL+FMyAONYdEPRtv4Q4udUQx3DEeNZw3oMpXHHFd
-S7KUiLhQfESgHyR7kugpZYwbCQO+feSCWys3rMKL3s+8kQq8LqjG/xXOLiLJRDku
-7n/y9FUWZzNCgpx8pftU3bQRpDLA7yow8FXRoeQbmSM4aVydYJhaehYRoEmrlJ0R
-MwlnG0OV7kgTipJgaxaBfrxP2N8Khgf4dbhdxslkZPmpD6+scgT2U6MgqwARAQAB
-=tJcb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
deleted file mode 100644
index 9be987d474f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/3260cb2def74135b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b6e73d84ea4fcc47166087253faad2cd5ecbb314
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
deleted file mode 100644
index 71760e28d01..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/32784d4f004b405b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-19beab2d799c020f17c69126b16698a4adf4d638
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
deleted file mode 100644
index 3145005c70d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9ae296fd02e9f65b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
deleted file mode 100644
index b6ee3744e79..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/9df7f2349731d55b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b801e2f8ef035068ec1139cc29579f18fa8fd93b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
deleted file mode 100644
index 13119799a98..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5c/b89991d171a02f5c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
deleted file mode 100644
index e41c7cce940..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/124dac8350968ec2a8260584ee8ecbbbc188fd5d.asc
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
-3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
-tHmG/CVFECV33C5SCvzeedzIOSSHy0ybZFrhE2DYXgZddavcxamuRyUOUZAV27yV
-Vyn4RYHSqy9YRz5WrN9R7BK+MeIh2vBJ8Nd9N36z5kBukTLeDZDsb8wujSuMyPGz
-P09gzieX6B5x7biz7Jzotqj4f5KRD0fHbCSVW60N1S7xXFsjZZf6dYdYINWW0Utc
-ABY6T1H8FOfqkd2tcfv4TqNd03vweUiPQnh0v6nWURrQKsty2z7YcVI543l4P0Bv
-/5E3YfT/B/BohsYbakT6nLSlKwgpkHz44+A25seRumMENbcYwi7XFXge1K8pfasE
-Xbf4X+Lngbt8SN7HGHvtepMLlpVIvKhGSCl76Aar/fjc5vQ4Rjd22RTbS6V6MUY2
-ROrqcjzLr8N2zpQgKEL1lG6U1huMFzjapti9CajT9le6kbR6bLU+JVUWKrQSVB4f
-4S0egNNf7gv7lFHPp5fLFwa/jaoYfihydCyYPY2BHhp7muo+k7FL2t6YvOt5rUoB
-BIYQ7LhMbG4MpLNwTlAGI0QKvPjUylZ23v0vXIIHvF8KFTq55D7C0VGW9wARAQAB
-=y/nV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
deleted file mode 100644
index 3ee15e794be..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/4bde772c338ba540e1057d0c8ea48d105232855d.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFnuhcIBCAC7AxgaKPE8BelwB1MtV061VQFddoBoEPV/RMtpX7ebEtCA1yzl
-02+JNbx+sfTqrkFfuDbKw174xFqP87iRbr+em1+dD98+dH/rX8rX9OxJIuXXcO7V
-SJQy+iBjD2XcSKzCD2IgwAmBKxlG33gCG1zzz1zP/y72e0jrO4RGE1ipyw2Yn9pv
-Hv9gPwb2U16rHeb2L/iDlwH9iPEYgE1K8ybgsi8902opahNvSvAjkPY9FFKRxbPG
-IDtDYK10B7xy/xxjI9J2BKT2m9Lu5QkfeqXuqMX4F7f9F8RZvZFhY3M1chA1HnaI
-p1wI7SjKn3eWh8GirBkRcUTyXsQYLdREHv1vABEBAAG5AQ0EWe6FwgEIAKprrLAe
-Ge2fHQtT0iGUWFmzk1NehFTd7IVZLQFLPePWpYMV9V2aT/0y1iMEIENDlw7ZCCP/
-vczpinmhK2o7274yiqdQ/ZlmKun7ff8syOYX0sXMoaPpk7d/XablcqT6/ksFYywG
-6Mg7qcsRgkdvuZn76D5dc2umWZbhHQlyIXGSRshdr5Qt9V/tMm/QX0WWO9c2XAKC
-2ZWVUTomCMYApRfIiGw4JPyid/0iFk6WF7hn/3QwRldH9qSBteZmWobeJBeBHGXI
-H8/sbhGGZyTGKudBKE5elVXqb3584KG/K6uNwTTSygRtDtgNVjeIxLgDbtBHDj2G
-Q0Tz2ohl2j2Xk10AEQEAAQ==
-=ZVUL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
deleted file mode 100644
index baa96d37f71..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/8ea48d105232855d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4bde772c338ba540e1057d0c8ea48d105232855d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
deleted file mode 100644
index 6155df6d439..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5d/ee8ecbbbc188fd5d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-124dac8350968ec2a8260584ee8ecbbbc188fd5d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
deleted file mode 100644
index de46195c1ea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/0186f8b24c5bc02c94a0e0e486f75e83e1ee085f.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
-+cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
-lsq1P5bi7RQyJmmr0JDQ70uD2i3zIHMjqLKgvOMmhXnOnstCEQR0xPauEkkcHyY9
-fSZkpoD+c/i+1NvElX8/pgf3Gx9gs2jSgVJ4eREuvTm3j4ro+D6oYRbdSFHn7+RH
-1GF3Dm4pgB9b/QQVgOSOQGrn0OGyn6zGDbc06JyOQ6EdzLQv1bzl0agLO0/wVGwt
-r63HSf9C1Fy5PmcLqP3A7e9vMJ6NYCYhfj/kXdg2YyiW9MrkD30aHg97Gpqy3/jI
-emSmu0tqVqeFADS4iNXyxnpPO7pNorGmyYvAN8ONHbSyX2zL9RusEIvAbgPWZ2sd
-5UpwSg5iw1tBNjpbprPgcRzNgdOnlKYvHcfETvVM3a0g9pf5/2buMCKijrWi6nTk
-tJ9F1xXuVKCzY++AyQaZIDnk6m+bOPxUWvcIPdqxrm3IGzUcHAU26bD8nvWAKStD
-sIlf/9C/+Wa4wQW6R7Q6NGZBa09K8MRAuesNbannvczSoCKS0npTLfAJX7KjNh0+
-ycagnocbhln1I8RuRmvSMbTD4npX7rdUmDFGyTQvT7WmOUbn99NC5arpfwARAQAB
-uQINBFHtw2cBEACjrJ7CmtJDMU35tIRODGY9ze3AOiphP//XOOfri0PAxL0NJtIx
-K4rslBZI2PkSJxhl9fGEJ7gEzmsOmaVZSlN2GQvHXjw7G0SKLNM9UUTc6lZvVDEd
-UKS9asycHs8jisTrqFEWj86aC2AunLsehBXZNPORQ5k9aqQfQqT8lZyuA3H2ypcS
-Hmq252n2oa8f+YrbQ9a5DOdySZZ/7TuyXhQqCIB0u0g9b8bO11zP9y6xc23Wbi7W
-bbSR2416/vsX3Nmyle8kqZMnn4vXIJLtsSYUgVTRMuiVOnz8xkNSM9MaosA5Owhw
-a94ZyP1irC9UHynK6oVun8ChhJmCzub1sOqc54CA+XoJvYJ80EhQpnvSoeLgqgJR
-VfVdbcAtgr1vbYfoceJ5lqSs6TVeEmxQ9iBMGAxSW6yU2mnJojBY6tzmYq9ZjCNS
-vORMGO6ZpcmZJ/kGhahN/hyou9AqC66GdNf55Q+OwW80bGXghQ8NwtlNr5cLtv5H
-R/zQX06z/ofiUmAbc4PA5uDX0CRIe2y6PK9cIBgU5YVJiQGT0yImd693J3uMlX/1
-YcWnXHbSD33CZ+xywyLX/vmUxUMqC8OFZ7GSVUK4wVLc7Ompieyk/QItqFOZ14RO
-QrOcOXA+qeYKpfkUPKUahDO07nzdRp1ebEd3A1PWt8iSvotNsHE+xb7eSwARAQAB
-=weyf
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
deleted file mode 100644
index 71d9877faa0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/347cd0eaed975c5f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b01128c8fd304fe48e6eed2c347cd0eaed975c5f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
deleted file mode 100644
index e42d6f830e6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/86f75e83e1ee085f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
deleted file mode 100644
index 76717d8305f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/ae1c126549627b5f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c758f9cc982ac877e7b295dd6e97418b04b11dcb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
deleted file mode 100644
index a38eb16d7df..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/5f/b01128c8fd304fe48e6eed2c347cd0eaed975c5f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFhntCUBCAD4TyvpNK/pLusYgw2TdhDxX0v3wk5V18XeVIs2l+Ijj64xfU2A
-DR8Md1QPOZYFWbTJZ0T17CJ5jbPtGLu9ZJWR2s4lxcwtGK7n5y9ANeMjoG38dSyp
-rsEbgNAE0h56ygrRB7/mDVCb+ryD3pzzTm7sgXx7GuNWQ35yz/wGJ4i5vKpp5C+c
-9bZb6xGiPCzVo6O5Xkd743YCLDukJZA76BJedFDyxNSxjFBgsMq4McW9s0C9OwDT
-6oYjvoR/gAlSlbu691eLKinmAxEKLt+184gVShxjlUtsCvibGI+61wYDGfmfnPxT
-jnYwn/97LXl0CqF9464LtCqStXBk03fn1p6JABEBAAG5AQ0EWGe0JQEIAL7BD5Ee
-1NXBr1IS1DTQma8rhl99TG25IXnehs7MTh8rrIFxtZBcOY0l5qINstjQY+l6o0vu
-sMkjvQp3uYHXZZRlMMIl5n+JBFPoUDqYkP2ez1N9cUDld1GB++/yWJEZa3AktIy0
-PU0kYNnEKxH2Zq3bqn9YduoHdQFdxDhiDz85WNCCP4SeDUpHGts8/NJi3KXh9uGA
-abmr5u1JkpeNkkyn53xZ4tQvuVapMgXCwJ0bZf+YC1e4HlP0xojg5b4PvGvypUQ/
-XK1CwktxqEu8Ve8jh4nFSG/6JsrzggWxzmuwdC3AsFZGWl73QjkY42ZMMqnpL7mX
-VV71EkA/KKqyPPsAEQEAAQ==
-=2EJ/
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
deleted file mode 100644
index 9f01bb4c224..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/7eb97d110dfadd60.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
deleted file mode 100644
index a2c07049cbc..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/60/a9789342f598ad5b1175ef357eb97d110dfadd60.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
-7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
-2RRGMnMaDUc91NnoxKs/7VlQ2ySk6Cm6lH3t8KVkwaJdU59lAH1ey9UKhYyvRQuT
-htenl2R63lyyDe1ZLMAlmQXi4RcCWOO+L1emChNv0q0Fsir+7go9ZNYUi6pmIEva
-jKXM8bo/VtRIHrS73DsH7BVVCURYoBWexZWlRdb86KSE993dRXLvFPy5JzlRM+eu
-mUY3CMKxx3nLaDN5qepf1nGzMW88xjq4z4rhABEBAAG5AQ0ET39ECwEIAOvByyJj
-7wUj5zLY1B3MxPoHHLFVsyxLI1WEgXDlItY+uykB20z3BwKs2CZdfbeBQDf8lNaD
-o7rv+BilZ4tu8vDRkmr82OXpU2dtpalKoKk+g46DhtgUyx7jojUSDKgZgxsuNZhK
-utgvSNdO6aiZ52wEZnXuOuOpA4mn9r5BdQbJwcdA6fd63tniauK5AH/NN3w7wPIs
-pObgxYhoN3+9CQLu2QgCnM4JQ9FlIyIjuScZ3M9rFojtjrlYHbE7mX/vU9Gjgyrm
-utGewi5+GSuGaXYm2zhKeuly3mhrsuRzyJ007K+FJ09pL6K/wJpjyjq8qfaARZz7
-3+fsERMJUDdofz8AEQEAAQ==
-=w4JL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
deleted file mode 100644
index 91a7375d718..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/379ce192d401ab61.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
deleted file mode 100644
index 26d0506b5c4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/61/8756c4f765c9ac3cb6b85d62379ce192d401ab61.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
-Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
-CBCDJg3ZaqpZti5ti2TfiaXHeawTpxaTb3V5tT4NYhY0aJqe0MGoVl2yZyoKMWsL
-8XcUiJkUYnpu98BvnzO9ORSnKWHk60YxzZuHh5buMNiV4aI331ogiTxqISzTwEdQ
-ygtlp4IeqE6w4x4RUOqQg/mu0xhqnP375KksPtKALLEr9vgqsJXfWVa5UmNl+rZP
-gMiNEt+Abwewa6IQGgSU8GuxMp3qHxZtJQRNwIPx/yb7FngtWrUKIoQXs9xJwdJB
-z4vhfFVeQlyPkEycQNcRfHVzK62oF8L5Jj/D8BIGAD+dj3x10Cy+qVK6BTY/F1zv
-5iL12LjSlz8DtmTbqjit0WGoULjXFZALAU36q6FmE/nMcFuLaTUIinGV4fMvLgf9
-Zn44juAhZMweOt63Pn4n/K0W+uOdrLSmGxJDhoxztabUdIpIMsw44wZ8gnSmPAef
-IDTCjJO2x9s2YuaZbgstpJldooxGJ+FTe52QXFphti+tkiGOg6Tpj8Xq3+ZEM3L9
-Js38SSdys0XBCHYiCv3/4Fk4jspTsCFrDzJ9HqNjsiktxPm9szmUZ72RjwARAQAB
-uQINBFTi8JIBEACq+dSR6serUWrem1itiw0MslItsFyHuOV0+K8ZUOLRge/arBSf
-Gjk7YZPFzIMVbxXo7LYiciHCydZ9K7HdqCqygC4k2IV+85Ll07ZfraPHa2vfgXsh
-u03+VZcMcp6Jxs+UPlVHV7SE2R3o2w+KvKqzLLRLb6aBREoJCsI60HTWyPjsHiHr
-aJ+XFNl0LT22tIPJFjOTeVKU/8OMBs3O5ql3zgdMG3DFGAS2ALiCb1wh+YgJ9c8T
-A44R52Jp0z1XUYXvV298FzHD6n7ejwif2MNUkLF7oFfSknQLkAw1WuqkwYn3QYoc
-fp8aW5u3139vWWR5V2yLWeGI1+/spTJqP8eXBnF+jPWuig/GkHGrWCn+MT7Xv8TT
-2wR4rdhetkYPnPNX0ra+jURZbie6tO/C5OWTYjurTSzBDiPxNLcxxUNjrOMzIbcL
-LhSRQ0DTFLiC56D+5UvPIUY/GiX5O7x4iF1kwSPcoXz1w+xzzCwfFZg9oE5voHAy
-brGkTFCIb5Oo+WKWDCY56K7yHLIUT4UmiF2Liaz7gesTc5yFSFJhP0WpkVX6FxDu
-oCryQx0L38qD+4c445N7aUfVmqbOBBp4ORpJ/w0s8Rb946yQ8TTUB06otovyIz1i
-Zsuj0yU9kzZYovrZpKJLeDEY2ThxdU/O3ZkAowEeTjW+KyddTT9rUuggAwARAQAB
-=iPxD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
deleted file mode 100644
index 2c5245290ee..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/064ac25270668162.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4d2db2916149baa9d0c92f3731474e5e7c6b7034
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
deleted file mode 100644
index dc3833722c0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/4797b4f5dcc46cea61059071a1ae06236ca2ba62.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGPAYVUBDADCs9PkY8zzhzE38bRZX+vTrr3LdChGNBmObV858NGRrXeZtyLu
-U7YwYVF7w2vHUI/JQWrlPZc5tBFicefucfUtKt790WzAk3NBjGtX4IWpG57C1Z5t
-QRI23HqWr1If0UanH2vUjy4fUgNZdYlH2KzookoU0950dIcqwA/HwiosO5RmQ9iY
-HztkwwvFW9QxiJgL+lR84EcaIVN1ukr0ZKrG1a6wOJ6HLf9S2F3DMe7fQ+O+TpT/
-A11RewOZHwE9spH8cEsNYgutBouw/MttuYHjZKD7O4hN12MmzecWeMAPyrvYgTJp
-PHcjQaVeD27OGLRpy5n5LonvkzJbhTzM+Ps1qEj/4of3EFVhxNjR0gdrkX+0Ub1A
-XXiw3gjqAQuLQVKIbwvCbfj2go+YHrfcXN6kpKkYZU8ERPxI/VBTw230PPdXXwXP
-Ux/JRQIEXOuMIuELm/91H8TXKutw6NdNRu5q+LPcUkU7W6jsv28dmQHdC+ebVHlA
-vNcBOWVSY5e8IasAEQEAAbkBjQRjwGFVAQwAvhlW4RUf3NuFjoB7ADhPe7ZdnuTU
-oY7Ggrvh7KDNgSl8oymVZC0LFzEFd7a1uhPsjxTcytXqbsoPBzEs1Vkzrfx+99Tc
-/HTIazSMHPKM5xtWTqfXzFf1Sg3KgSqnEeHI9tMGv5T04g1yd5dn+Ib0V8tRFmMP
-GE1xByeuea9tQHoz615noalvVh7yCFUIkk2NFFCEXFcTteeZfcLWlmhKgZwHHnNW
-ylK4eOrudNPD+t3s6kLqwErRQuTwY8B3a8lR861lywu86zb75sfE1QtNetpPL99i
-9exNJ74+ZsmjUV3mjeKYjR5TLzndQmYX8du5aykV7zI40eOjT65khOwAyrSNvMbw
-xMoyaCxdL+L+9pbwFVSYt+EHsT5tRcksm5ABqff3s1thmo8XlqAtnXAdKSLeK5gS
-210yzLk9gIt4KqHxO/pUE2QROgoMC81tpp3hmAF3BsFBoAitZ6RamJdJeLPIav9V
-MUTaFPk0LR3UFfKxz0/ZQK8eK3oDVsKXsxLLABEBAAE=
-=IBmq
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
deleted file mode 100644
index e42d6f830e6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/5a5c54a339b38462.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0186f8b24c5bc02c94a0e0e486f75e83e1ee085f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
deleted file mode 100644
index e06fcadb8d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD
-jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr
-vscz83dU6wpXxhFgTryUclqj0Nf6xZ9kxGAbMgP4JUZGkME/q3e6gOnwfLvbM4/t
-M8XcjLLJNKdBHQGAcuQJxTp0db4ets+VgleqQKOPP2g+oeF92uiAZ5Wz3AEMRvnH
-9TjGwXxiHv4gganqbaBq4cPH+bqoi1xxqSnj6qctbZxkfsICW03MF7Ydf16vbzzH
-48KxYkBN83M2jOIptrZVsP3vLJzelsZTI/rkmgyfigEsog+JD/1Za3+L7x8hWhY5
-arQ+QmSLJ7wyqccFexZO8gdtXkmfNQsIf/kFe1vifdRRYhuG0jrxXixa/zcj7VxZ
-waFrCbh5SqNMqhUoTwvB9WrH3BPOQGmURynvXAeklE1kR18rxiAO6Bp3QV7BGXEX
-ReYo+ITho5aGDhEAEQEAAbkBjQRcyckyAQwAwNKgqINPHy7O4nHdaaJxa6qNPBvD
-fxHsWR4mDcWlWWVBA2pQyQnvLDuNQ+QXK/+MHeYhZtuiV+SzS51ohkk+X4hSbFFk
-ngrgnY3gNJbeSNoaXIr4UgCNpBXGcUoS1pBo/XVMcgTSsmco+bH6D6152XdUEJEU
-SlXc+hcEI3H2SZT+c+nlwSv6PMdIlDjbCY8JZ+FPJxbA+QqYMJIrOA8RoTD1FWb9
-2nUxnxdEKgr3LVvfxFUAjRfXmpXHOxysZD4phzGgiqyg/fvBXdAv1fJx+zAhQSK+
-ac6TNSN62pAfwOXP+PiYWC8/T3wDZDi6YiTDLml2K2iA/2vrKuAbtIAQR409s5VF
-q9M41VbDdR/cjocNq199btp1nb9rbis6n27FGgCE7gj5IO2T3lmFnhwYIZNNhqfR
-Tz5hSvDLidvEDGv3RnYCP3NibZX1lqljlDTk7Y0EQ0DFyahDuWREdVGJ3mnO6k6b
-GMfZ4pgRyWkr4CLbD97W69aHbteZVOOS5HJRABEBAAE=
-=D0Xc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
deleted file mode 100644
index 201964b9d5a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7a8860944fad5f62.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d6f1bc78607808ec8e9f69437a8860944fad5f62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
deleted file mode 100644
index 0ab4efdad3a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/a1ae06236ca2ba62.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4797b4f5dcc46cea61059071a1ae06236ca2ba62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
deleted file mode 100644
index 601bea67127..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d6f1bc78607808ec8e9f69437a8860944fad5f62.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEvxja8BEADAzZOup1X0B12zJsNsDvXVIwmM6bB+uhEsUHoFTvmsEVwRoZtn
-i7Q0WSFoY+LDxbvC4Bg1+urCrUrstRJYRyF/pMqPYq/HokRlPjtrli/i3mUSd0zN
-PGC5+qXvAlOck3GK8Hv05PsW32SlSczZw6PSDKh0natuM3hnb+vt+w2MXadXoSwU
-EV6GtSZpj19vRzAwG/Zv+ZUDCBXVQG13mG7nr6+Q9+E0hJf8i/XZBcvTuWPy5niY
-kzWDetDqNboFgCvBXYUw6dJZTS3tHhrXXp+W6hoSZFzYnRMG+xg0ls1z1ejUZkwO
-mWPL7fr0Z/svSrOfyRxavKx1viKobEdnLwsdHIVK7TGIe5fQzR7PQgBgpMCueoMQ
-NoXkA6GqPTuwS3pgNz2k/K+Bz3ICT9l09SHXzuGcB4GObF7fPDT/UK73Mo3sM0M1
-u68Q51i3fG92Owgy4Z/YXN/IgnAUrCb+EkLYIscSHby1voyvj2a/nIXajmldHqNX
-9yPJhkIAij95VcsD4OUXonFbfqHuV7WqXBv4AhR/z+BndUbMbrlkn+r8dfL77rRY
-63EGV3k8A6IB/WJScGveJsNRGCZLReff+UyvRkRy0jVVI0/G32ge13PbpPLGHoRx
-LXiBSZ6Nuat8R4PS3ry8HKzFx6r2+VO082ptyLjl7e3yQzdVNshpxYxQZwARAQAB
-uQINBEvxja8BEADfuM4j+dpNgMDDXGemxTG2HkQYiZNro/ytH+WOBZ962EgKHWt8
-RKuHD+69fHb4bDjHKFF8yVv9+okei0qK13SWc/+uRUVyLmn1xPX9cgTvjChfsnRG
-JlioFZ3XxdQJ3vH8h/Mqb0yqxAgjoWYQIqIeAlE+7IwNYZy+LsuDD8OUUSbCN3zN
-Q9E42Mo1IDwiMgHl6IQEWvYqjuICiu6nEA42bWuMQJuc7H7UxvzyD/Wuwdiy2gxA
-HAtQMh0i9N2YcE0ZWd2ovpzSe3Dizx95pxUUsaQG7wpu3U+qvxCZjP+/XVNhkDvq
-ROuXGw7B/5g/0OMORgR/nOpodXf1TFpSEU3uPLTwwxYPow2CoQ2X9787ojJODrZE
-nQ9YdYU1ySX2Rqse7QHOu5Yf/Mnx4G3mNTLAFHYlzp/0sjaSRRzqOooKw9hUpqNY
-kvh88h6QQLckdH9TKIHqJk9UiENIEv37XJaVsr1WSAvPeHusQoMS8k/A/1knreLV
-OFh9AoUKG+2gjYs6VUR4f1epLEWLBvsBBwGwbXbwwOIb/0blrjp3h8yp50Tvy+T0
-hco9fQW1O1+50aztQCfVBIQ++/NVoQX7d5z2K6TEcRfIFoIMbANSmB/ZX2auSNIa
-U31hVn4cuEOyENnLYH3XCELaGhce6lMEACD1J1m2i0Ttfr13NeCtppsGMwARAQAB
-=0WZk
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
deleted file mode 100644
index ecc6985d262..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7186bbf993566d8c2f4f7ed7d945e643368fef62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
deleted file mode 100644
index 1ceea503257..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
-aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
-BnwoRUe0OsTItUQA+vLH8K2Uywd9f3OV9KQnqItUFMptaFhUC144hZhj3c0xhITS
-k45zucoXLKO9yqA+tlqav7taAJMrWbhRcRWXizK1wOZLyhu8NdIMUSL4Ei0blR90
-uA9i62XlOhpyvfpaC7oRh+jXHOCFK9sXe2vnvnTtJ1yqdXH4EOCYLjoheQN1R0u4
-6f6XoAy9c3tOSOZM9vwE56iOZJwv0bca6ZENnhHnYwWhbQwrY0JMIon0sUpx9RB2
-w4E7AeU8/maQG9hdB7s7vrAJFarlFQvc7kJ5FMTKFmWPalUTcT6yXntIQ3+xiH9l
-Oq0jGlAmQWYUvzHJ0SFjz1xJGBDM3GH9KfHbeoS3Xz5Emmw8YwEDUe9gt9po8bmw
-8qnA85uMZY2puh0AEQEAAbkBjQRiRjMaAQwAtcqYEeHIX/zszjNyKDyLONoZphIy
-efYlWpbrbAFgwgJVEWiIWGo1Du0f5P6g3p29QD9wSJrZ2pz8TUwUIhwpCxA50ceT
-PzEXi523znqWlXmOwdBuV6XjD7Bi0ZELg+QrumZfSDlAGb7fU6O39To1mDqg3SI1
-jybBk6OOlPYfdfII72z+1smEaUikOpXeJbnXwqkAaB8jQBgGikciACVruP8jMRwE
-Op1JcMj1hTOMjsbNYYx6s3NY8OPJvg9RqWfWAC1V6fsEBESlYVnw3IU5sMJzw949
-h60btqFFjgg6GDjD9Xk6RJQjIZti9XQVsIOAswQ2tUHYj7KmjX/5h6U+xmZtFRYS
-kPXMAjj7q31t3+Lj7Vhcm4FZGidY0AwwZAQLP6tiR2rcEtJ2E1xXqmAM9nT15eyW
-wfOVh/VVuU/DDaOlbBQyqwlTuKYxCj4UyWGVVqgSwByFzYpaKkWw91RX008eT94j
-9sj+m3Vqe5Q8VT3lRwju+TBaQz0V6Z/kKgJjABEBAAE=
-=eVjF
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
deleted file mode 100644
index 883e7879034..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-187366a3ffe6bf8f94b9136a9987b20c8f6a3064
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
deleted file mode 100644
index 8e917d9b89c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/21939ff0ca2a6567.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc87a3fd0a54480f0badbebd21939ff0ca2a6567
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
deleted file mode 100644
index e9592d71f98..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/91a4ba316974a467.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d5f46bc0b86af5dc56df58f05e975cb00c643dbf
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
deleted file mode 100644
index 294869e15d5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/67/bc87a3fd0a54480f0badbebd21939ff0ca2a6567.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFxmwqABEADNTTxqFiBcLLQwARbc0bmPUlxFl0A0Di9dTycUEjn0wTGS2xgF
-dFxWomZd8R4b/lVb9jHf0r+AEul7U7sBoKinjwk0EuPDAZK5PEy3P8ILcAulwQqW
-8lc+lnjGsmTG6GBecCQMEXeRPZv3DM4kUkljBFG7nDiFLNPfdSQqovZFTsQmmepA
-EUu/t6y0GRrsbbTMipWJtVR+J4aGKX6kJlYgB2Nja1mbaTrI77KupK/VYzi6k6Kk
-tzyxzqapJVDCLS4ypBH2JJLKSWWGghcgoVfeXtmB6iAki/nFNSRQODGru32lnLkU
-0toprQkEh+TM8giT7Ph30VKlBqruNq43qxWZso0GYNrKxStvVB2+CA95oLAyROtG
-6QrePLKkkgW1uQDN3e4iluPirLkd+QoZ4jJku44LyW/dJE63wGUKzlMIPZSb+joq
-730rqovBSayI+snQjvJv2ImfO48yGsx0Gaojv+hKhgPTjKNzQo+QxqhWV3AWHjFn
-j6vwSjDYkx45OSKEZSwfkr4AHHnvYMVb3sFuyM1a6/nQdhsGu5cc9mGvNKmXE71U
-ArDBDq1w129pi3qttrCwxXdUdTE/PtnvQyaKlVX9lD5QLORD1Pis62p4t9CEr+x+
-BaZZdy7PeLAV8pobv7H7jpfhVWnb6SrLfhokA3Uy3gMyfcq9dmIs6iteKQARAQAB
-uQINBFxmwqABEADbqeRjxCk1AW780rfUpDsCQDNhAUG2e8fPbAqDFfRa1nbOgNBp
-UF9d6hO+UqYxxLH8xQtUW9x/M/v7hEdEg1zCUMUU6vSIpKtEg4ctSEbv9VlsMM3Z
-qBQ47SpMmmVSPlsXip8PqEBX5shfv8rxCpoHtgHYrkPhGhIdEAog7Jwclz5DgwB5
-ct2VYEJrbHH/cWIF27QAXaAFphzspV2kRlgrrIBREL+PeuPRJUJKYNxbTuzI6DZZ
-yQJEZ8JZcmTqREKcVF94klMq15RbfFRpiodDXK93UYp27LMOVYq9vYOyXnPIpAmi
-u23+JcIZlQe/UMb2x7zXFWJJO++gpB8sbuxrhGChl6i2kGGUE4JYU7RcDA6YgZrP
-FJLAuP+P55xhXI4Jl0OHdLlJR9ytgWh8B4Z4QK03I5qDm2CVDXOWLtb0atqGL4zW
-oUnhkseTynRN66Rv6CoxAQ/o1n7N4GvG/yLGNkcCBZO7QpCxfhqOT78OqtFvbOXo
-MADd/cTFiNKP0OzYEiqysu06rD9zJCASorAELPmWbcccQP0FyFKigRw8YwjH+Mlq
-U0j2Fvtw/5o+Asy2T5/4aH8PJ8vy1pnnFSK3qPElB/WgpHjjkhb0gMKGly8estyV
-wAB7snGCxF7X7DcdKrrB3pdWZkx0UCV+5LThTVt5eIePiMUwQPXzTKuDBQARAQAB
-=CqJw
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
deleted file mode 100644
index 13e597eb156..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/2f45f85cdf082e68.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e9af5293c334c7c0b583227d2f45f85cdf082e68
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
deleted file mode 100644
index cbbb6fa0672..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/68/e9af5293c334c7c0b583227d2f45f85cdf082e68.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGHUzooBDADpUjFpdOCJMkgB2Wz2hc7X6/AmS/d9P3WgiumVMO7dViLDIr+q
-nAS08QwZaFtLcwOs6F47I7CdjK1XLRmIHgeOnVdeRPk+h56SfPOO1qvwyqTxpUXl
-k5CT9GyaU8mab8eenWRwtKFCCwGwTjOJ65iTB7jaUKuE3nUJwRtaIEXalTMdZIg/
-rdPTSrngqwk0v6ntSTMd4MWyF3PryyLwt4VhCkiZc6rB2GafJ4YfSdhyhu0xR7uQ
-voWBL3hdJic27LHvOxH2o82YTOb92nNVR+nVfNM0VXq+4/VBSzXYPSjaqTFHHK1O
-wNWjy9x9qlMeX3eNTPMhZS8XelSMZtshiajUKV0YlTFcULfrZNA3A73NknBedghc
-MaAXJNPgwBUKPwL/H7Pfdx/FnTkmHAtxSbFGDoCK+UoF/pC69BXYW6bvUgkQWPkV
-QGx+Lqc7bV9n5X5lunTCBh0WOphwsIGrfU1ma3YYO1p1248pfVqlukGXpyd79ehS
-8SKaZICuPDIh7UsAEQEAAbkBjQRh1M6KAQwAxMXmZGdKguIx+GOHUDvw4nyiXTW1
-54byzNwHM4qOBfGvHa+aDFklreTzm4igxX8HRWmMpGx/GveYwQXN4KS4uk8FDDoH
-56heryWCzm8033pa5/eQMZj6SiEZnoJEfPWwFmyhasA90BUKGXiUQkQlYD8TXpSN
-/HtjeX/w+VTjQzh6RnDykRE9sL0Mj8PxuZG+63YVyO22SJpJlZ7WRGIatk1Hs4hR
-abIcAoO6HG4Zu90vo18bRQ9TWvJeo1gr+utEtQB1Ye++4GQzgTesfLPAZ5wgZ4UL
-AO4Xq407BLUDNe2hM5NLgHfnodBs+ebvCBJ9zAk7EfhlkkZFjnGmz3AsJ7+EW6j8
-fobxGqQTvQTyn6VRKPeWkh2Wb/eC1b2MHpDE+tXCq/LOjrzCunYPB8gpdROGJ6vA
-/bdm3WjQ57ai3/CxIGQCiIa+07mB3+Dn84LiS1To4H1lB89225/z7sQE1L2NUn3o
-v6uqLRXcK2ap1ID4pmAZu9R6Z5gYUwwqpTjvABEBAAE=
-=sS2X
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
deleted file mode 100644
index 9b688ce838f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-eb1b3de71713c9ec2e87cc26ee92349ad86de446
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
deleted file mode 100644
index 0fbeca4c8d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/012579464d01c06a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa77dcfef2ee6eb2debedd2c012579464d01c06a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
deleted file mode 100644
index f2571636736..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/2591ba36fd00e56a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-84407e95050fb588296690862591ba36fd00e56a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
deleted file mode 100644
index bd7372b0b31..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/84407e95050fb588296690862591ba36fd00e56a.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFu1FoEBEADiStAqNqTqBTfohIHsfAA/xERAgmYWOHkXJsxgXJXfjOVyYlIw
-6ysU1cfnT4bgcLnWRP7Eb6r8CFLt9UsmbbDj2ZYKRQ0q8Rs5x3ZUDJLnalfV55K2
-MZ7uer1Jq0ws0UqgfqsXhOnfWwzkHf58Ii778dQ7buRsgkH9tBIkodsK47gqxOFe
-QuOx42/RFhXD42OymayMN/jTR9ZhbmdxAmhON/bepC4mbyhFX3QOqGyahLLr9Xeg
-d/AgJidXPWN/6qxjQos8dS9yjf6prS3oyIprzaSP2EImSaMZNUHx+nEEsPmRoCQG
-MDF7XSUGzVQ7HAEe9Njkes3uyJaArcv57O6/Wn5HVc7s/XhKaq8KbHaJNv6j7cwj
-YsabJur+rl0aN30sGOhyICxKa40kdu+79NdPFumZnaysBB5dAjeLre3yH6rqxdOT
-InMsOs12HszW5Ix8LW0Vd4wQc6ay3QF75Vu7QEWlMrKVrru60jP4SsWOyi3hbRtM
-u9L5kaooizQ7fIT1KZ/eQLYD/RLK23vZ8vb9ByMZ+gxU+Ti93JPl24ve4BIuxPdW
-J47ZCTMIY1Z0MgIOOOwQHyVMI2rbjItyulDihaJL/Bn1xAyEksSS+yic0Ps/dbK8
-9rtvxilEBfWTZ6avbFqkWYtG9ZRcSkl+xlYRGTjY1bOBPTGjT8elscs+IwARAQAB
-uQINBFu1FoQBEADmO0nzACp8oIH0LHsswMtP6A+9knm+/cqJEfFMJuN/Dfk1BnEN
-V+IA8t7ODMQycY47qz6aMFqEUdOXpF4+5NCtfsdc5Sj3PvgnAzZUUssdeuKcZt2S
-A/ptVfqqRD3b1eYECKJaI0ztcp6CjWwcLjBcyRp2tffXjvnowPwInl0NtR3iBxAF
-VwaScCQuXGi0z/GcHyt/rZA4OWTJTdKnXrcYPqM5sh/bhwyPXxhOx2/YuiPkngHu
-c2qGElBG9cF3j68q1h8NF+24LEMYuSs7X4vcxNg13fGLSJy14siT2AbhBPKEK9pN
-HFP7RiuFJyyseqkrvVZP2cY9dJYsBqvXnlYW7L7MsLwNyq+v0LGCpjTzQo6kfNpw
-GXs2KUp4qJswmESRB0fYgPonr+3lUHxt1o2KWKtvGTBNcu1d+q+pNPtyLK4zwR9i
-mQbS7/hhyV2gZM4ZiP3PHoLDPfhNxpbJ334Ghna9ivnyq2uYiX8V7du+yn0WC2h6
-zgSX+2XWE8294AxsnwuNe6HK9dFrwOU19U3nzTaeV7aVjWK4jVUCR69ZbwgGoUo5
-X+Hs479PXrGUoQh+dtoEeb9bjdhHckn+wzMRsIIakaFl2uRTMUcWFa2JtK8Txg5p
-ODyj+It/TISPtOT0MIRwE3Rs/vzuLENIDrxRav6x8QqsETAuRxD+H+m1IwARAQAB
-=oODF
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
deleted file mode 100644
index 48b0e33430f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6a/fa77dcfef2ee6eb2debedd2c012579464d01c06a.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
-agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
-dID/i1onAX1dE914J4lf3XvIAxGiAjmr3UvWO9RiFxRUkecMAMlCBp2FuHuvxkcn
-Mk8q9dP9Ef360wu8X5rj0kgP6vPhgl9/RhuPsUxlazb2Kn9Zxi/RmDKDiH/vDuwy
-WdRGFOR1OPV7l3Ws01nrs4vKd2v5rsUmsjvQ8ldxdrA1xzX4IszHRDgSC9PI8ItZ
-1VlbaKjE0L03acPfFTg/wRFSF5zsrGNbTmq1ABEBAAG5AQ0EWCeUDwEIAMGWqQT5
-ccT/Q1OypoOQGEZn+oRkgEdnzt8mjo7aOXd6pkNTkt3+LCkmb8Pp3/a3iYEfvSvB
-Zbb2JbY9xnmM8jBucWnow1iwEPxGhUuu3jlIpRsCwLk+utLkMALRkooXqanDoVRW
-xuVeFYN0as8nndgWiJT30innN4vfaR3x3E6/nS57zp5IggxZYsXTRHb25kaof9lg
-lHyXeypW7quKOP4SeES70PVVUnYZBlLpnX8a2msRtJiouWxCv/kHnYsjW62vc7nq
-vWAsSsfBT61TVx7yI9CckVFBnkpG1I8C9WpfcR+j9yauptgUMfrfDTFg3Aip7czM
-SoL4Jpu7jBcXy9UAEQEAAQ==
-=tjFi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
deleted file mode 100644
index ec5761cbd92..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6c/1afec329b615d06c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f254b35617dc255d9344bcfa873a8e86b4372146
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
deleted file mode 100644
index 47a0f94ec37..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/b2ca0dfe9ed21c6e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
deleted file mode 100644
index 03f6df2c27a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6e/c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFe9ujkBCADN5TiqHcFCxrHEwTIqzCjyv/0kADSXhQZ0Tqkz1HA0a1pxs09V
-hkM2EOJfsFJy0tFPQxKlBFmPJKEtwvL86qV7VOjrm4OvhIeFpUhIqRX8MDHDhbeJ
-fCWmfnEgcmTirxRnjVDRY2PrMM2Y2Rz6vRieZ+KxeVr5zJHmazh404cOYN01txMb
-PLICA6tgtxcJDSIqyslnHdD4mRQDeVkK+iYYXBjzgZbiTUYdFhkjSie7aVzCcu2O
-YClI4EYO/2e82Qkb8qlsS5on8MIDQE2fFMMJD2ZF7YJW7jFvCLI3CXgJgU81A/7X
-4BK+aJkEgitaxrcQCC3RgFFad2HX0KabuDQnABEBAAG5AQ0EV726OQEIANDiiR3P
-Gj0KQqwlsJluXVi4rbGU4oihddrigBG+rt5QVl5SwA3CGwNP18Q2jxqVjYU5stmV
-8oleZlC3dpQQBFZxQ5YGdMRWRy/+hOy4dhZj+4HadEtkcboN+dNYfGHOoKSHzvPx
-iMppwEcLy2OVKMEzQF+bP+CEqGKW2yWGWHVlPKsk3EKGq76dAd0UhnnngrKLUOPz
-ePxTP3VHBMCuHizujm6T4CUtqffPtYy6EZ7gDwsUN/5mlwLtEQMyNKJFwcyoJv9m
-mgCECEj0mJAMjlLrEBAUG1b6RmzkNXnWzftJaAWpAYWTqhlAA9zu/0XGXtacpPn+
-85EuI9LwFxqtO7kAEQEAAQ==
-=Cu8+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
deleted file mode 100644
index 3fe473deef0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/41321490758aad6f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7faa0f2206de228f0db01ad741321490758aad6f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
deleted file mode 100644
index 234e9d4e78a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/6f/7faa0f2206de228f0db01ad741321490758aad6f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
-Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
-+oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
-QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
-Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
-kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG5AQ0EUuZY7QEIANFoey9+
-gIJ+VBKDYOZIK5t7s0J3fmgYasBt+uOycrZ/UmZfj3I502i4nYVtjwdWJZFp0LLh
-4G+Ba7uLNdTYEiSOEowjcxyBr2tvck98wDGCKkLkiesrg0IUM56ZGBqUvc+hale+
-bKoTV3+HwWfh8Iu+pRPHlNRUGpLTnAwatQf13sJukfRD8vXKdj4em9CtMjbTbsVB
-LdJXNPRzZV75zfH1DOGHTxvHYKDRsVKUmMZn4JE+gJ555dIYxygjYoB6V5oQVIy6
-hud39dhhqmPeCQDY1bUu4VJQBVJZh6WM5+1mquc6SOtJ9CWJ4zOk7hUbWstalOkn
-ipAzIIMXD411+PsAEQEAAQ==
-=dGMI
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
deleted file mode 100644
index 73f4cef2ba0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/9857c388d7d1d9d031274cd0a5def5a76f94a471.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF09IUABEAC2p2RNMRu3DgovIw/OuG4BL101EzTepeoPzRbKll+/xtNiN270
-ekSio9Of9nn7ZV0n4AH1nFM4iQqAC4KFZ74NrgJ+EeHoh3eZr7hyQ/TW7p0z4097
-Dm+C9PbN6+7wf1sBdlaRwsQ+eNKkdkal7WGNXUX1YiUtof8WZZRkiqRFD+0Ldsnm
-frJFKc3MPPWR0UC56JmqzMaN0XeiQvcDaoJJ6W8XLT4QbzwQMJVpA1wKyfMNodPO
-kvJ7jOFNLuLA3a8hE/ZFrvMJgp6yziQoIxC+Rlim1AN0leLsfgjVU7TnqTS8Z8+B
-i2LRwpJhLS/HbaiRsJbpXOr53GPiTuZTz78OIq30nqAg40O+NWghOX93DzB7j1xF
-Aunzm/Z1VO76Feos3ORQJSB0PAQbLqCzAyyAu/xuF7DZuiobHB+b8ggZZRJEiEyL
-O64YP5UBWn3sEM+VdNy+NZujqvNKXrehISk2GBdmAQFszJP9Ti5SZiw/L3z148fz
-dERBs9s4k6iUsrbHzEtHvqxy29okKvQvW/PgsA1pImByndYBXCQQrl20giUQRxWa
-mMEy5Zt8DEeG5/D5mRDeJk/sjTxRlFoFheFZX5NGPD3I4/P7um2L59Hu93oxlEqo
-/OcAXDCr6s2lQjkEdeamUPzsGh6/4TKqdP/0wVgxZlDs0U9/iMoQPxwFUQARAQAB
-uQINBF09IUABEADeGZ7xqPNpZ7v9VLQOmZvzuj498/TZ7qaL79o9pN4svEiSP1FI
-O7ol3a7zHnwfHHvJyd76fo5lVlvRRtgqEfJeqzJASUbTQwPU5U/7cMEQhLhvNe0K
-uhLcNInIpPdSmX0z0CS0vuCUCc59wXPangyXER1plkqtaQDq+R+giY5aXRqcmutT
-DL4LW+lJYUIf0lybseVHNmgqRRKzIvD4aYowegHIKVEiBBxh826rrLmB78608/6+
-alABLErpfflPTwyJnI56D77672fu6rXE5m21NiXsEcS5a4snP8QrxcpFkJbBvxmO
-wgGuD8/6juOM263uCWmzt9Qrnj/ujA7RvwPlFXZSTTqmRchEPFTCeC/nRMNIImwR
-DmbrHZkgqsGJhNvWba7f86DitCn5+5ne+PWi7gAK6w+mjWDtUHOOIpo6U0sEegUS
-u6frHaE4U0dB2y+FxJCr2jhtuqNYjlsoFkBMNGCGKUj5zizbX5As2QR7PPtBeA2I
-ZEha74CzdNx1tmBHAqIAmARDfy6iamAoh/yMuLCcOxV0ZN4qtweu4DmNuPFJBUZg
-neDSfEYv2e9oIdVkjaMUZggfxeO5xUUoGaWZKTAemTAASx/wNef/T11D0jwxypTa
-pGMgmPtiGormuHpN8+yJMSCSnns8DvVTHaU0d7kVv+EDcMe+RQzv8NnCPQARAQAB
-=yQnj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
deleted file mode 100644
index 6d4dfa116b9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/a5def5a76f94a471.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
deleted file mode 100644
index 78a05175483..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c45d01093dcfc371.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
deleted file mode 100644
index 8f277d14010..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/c51e10bd96d06071.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
deleted file mode 100644
index c7c9334fed9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/71/d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF5I6pMBCADjBpuaibzjVWaEmkUPIMnEcYTU0yo/jxOP2b6EH/z9VMFeL72t
-k9PE7BU6yo/0/JK1ALjDDUC6v52pbfLzoD6a4ZYHzRLcXzpMI+yIbOYD2m0XPS2a
-R/4IAiEvyZw5pXQyXU0qfCS6uU7KeB/lwcb78jmSJIPMVzX8APOekMS447xHxqbg
-3cu2aTmVHAfufdBNtRhhQHG376Nq4Fkd577M+/AtjN6zRTXmdCm8sOja1ora4YQd
-Qg2lMxlHO3/EnZCsVIn1BiYrxqS6l23Tswf8Irna9FYR9FPga6izxqLA48KYMbeT
-9t/mct5Ck93wPQEfWYedvfzNZETAaeSVFsDBABEBAAG5AQ0EXkjqkwEIALvvVSwl
-GyHFYnzPk4m0BtAGzd8kIN2Eep2jciPvShsomqHcEUjbOLYJiYUjlWYTO3/ul/20
-CIlfnJzFh9uz8gzHHPJFOCASe+uJLJfIN/jasKKTt4pEcP+Z3C/JGmdriUxxEdWK
-UtMhAzT3Qh1G5fgcVTeICGx6rGVTRB8OBcoEPUhI47faju4+theq/5hcF5WfyAZP
-InxZq7loFFp9bE/YzGo9iSpUAZJmlmSS+t33lIxIpjqSbPnJKGd1av3JZF1idv6s
-pmVO0SwzQfnzt4Kiy4gXoCFiMQiMR0adQl3fqeP5+m/ovX3BzNBnmpbyu9N6sUzW
-BhK3ywWM90+P+D0AEQEAAQ==
-=kKZb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
deleted file mode 100644
index 6b5fe01a2ec..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/a2115ae15f6b8b72.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ce8075a251547bee249bc151a2115ae15f6b8b72
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
deleted file mode 100644
index a2c286c51d0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/72/ce8075a251547bee249bc151a2115ae15f6b8b72.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
-5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
-EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
-nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
-Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
-XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
-LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
-Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
-dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrkBDQQ7EiJUEAQA
-zVKWS8QrkysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT8bcE
-nz43MCSx8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6sby4
-dTVxac0rloxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2mlJoE
-7MK3vAhgKwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlphSR2q
-xJCAcBTeOMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6XEXH5
-tGJ5Qvx9Qid6ZfBaXx7bc8yKyCb4
-=XH1b
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
deleted file mode 100644
index 3af575c8f57..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/59a252fb1199d873.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
deleted file mode 100644
index ab214126296..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/7616eb882daf57a11477aaf559a252fb1199d873.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
-MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
-ymy2N3BP9cz2fJ9+3PpBccUPL+ydFKpcnEnIwiQK+p9JjEWzJBlrdUc/UEJ0R+n/
-5r/+0+BHiTEMvjAF6/SwyntpTWpu7iEzLv/pfdCuhFKa4yn+9Ciwe3wGtSiue+dh
-tqKcd4YxED3oAswObBca3CC2HWWsUEH6EmfT1jUdfy1cq4X5x7AZ26oFYfG+odqW
-W5dcB+13VkJtJRzQTO/2HKtITJYC65a1jKt3ABEBAAG5AQ0EVQEbtAEIANsILuU9
-cH/EIEL+OpwIacr/y3/6LG+ok8SKDHIlF6cSpusSsWM6L+RGcZgvCDR0S0EEid44
-yy8wFMvoYSlsXHLN4SqH/rpLIc4CD8DdCLWraKaRZrhtqzNWSsYxEgqo7n1xO6+c
-sU17VJArnpkGPHoA7ooZlaGrc0y/rlkTXH++LKqh8niO9Dap46pLFrdgvuyKbq1B
-6faAf2JMRyvqy2+fuwfVGTc7DEUUFtwGg7FniDF0zl+3rFG1ud9kH8UWz+GwCwFT
-6qhVglgOmtJgw1CSYNeDsQvDB4YTJNnMneMSdM6CkEcRhLp2+lz90+wR0K/a9QBE
-1NPubAaRB2uQR4UAEQEAAQ==
-=uaBu
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
deleted file mode 100644
index 3361d9bc60a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/73/8183e80d264ee073.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0cc641c3a62453ab390066c4a41f13c999945293
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
deleted file mode 100644
index 558cfa662b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/164779204e106a76.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e5c3b1929191df06136ccb2b164779204e106a76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
deleted file mode 100644
index dd6a1401eb8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/1aa8cf92d409a73393d0b736bff2ee42c8282e76.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEqmJkEBEADAAMOjOidXzoyK4FK9WhhRg2EEGX1gm5lK8PpJtk68Fqmz6xvv
-N8VJXMIJUgeD7M35zZSQUWJY43xEU8Yfn6oLL0KR0dIqVOclxE+7G8vxXFcIbRE9
-ziZFp7Z5yzsdzjiIzXv5MVQMczcAAMev/i0BnjiRy5Cg+k6kHXVpu/Gsn05JKPaG
-s7ZcfSxpboyS99MVKQvoFLE5Z/Shh4gFJn2rFInqK5EgVpoZbVyysF52nx0dti/e
-O0NjraQkrEDBWvsPt3cYZA0oP1gWiZiRvOLfAFIarf3poMDyoWBIwnbqb3Msv09j
-yDAmcGq9wsD3alHFHcRIiJl5SzFUStml1d5x/BvUl/Xc5VfHPi2ObKF3xOPGkyTf
-aZ6mYFLaRCAJ0v2MPW+4/grDXKsP8n8xPbE2VQvHBpxaZklD7q4Omn2d+m2sUOLX
-NRUo4n29NyfowAffBYl7ZqrYBBodR9YngWC9LpgM+APHyiw3HzauZ94bGy5Of3+L
-Yu6/riDcP4OXF6r6IH6KIsVqIkv5xzq7OGxxXmlhWg8ifNPLq5yNRccS0nWXc5BD
-/9q06ta/ceQGNkXL327XPuZC+lstWGAa4dKEosRDgcO0Pv2j2a3h8W8oHyxF+gEe
-O+9s0mGdQFxNiEA+JyeKCg+jvfx9Hv/2Syrlert76NEkfbaTFA7BJ4c3EQARAQAB
-uQINBEqmJkEBEACj6F4CCCp8iYj75LO8QVfhaiT3nFQMd0kpS8k37If4wWrfUC3e
-IbH4mXL9QDWRwZ+Kg3hpbJiergxr/MJ1GUNiJvB3o3tYe3SnizaTZ8XwUvYJ+ntm
-1yoQLCRlBO4IqalX4oxZxGNFY+k87c6vlsqoNhm8/myWTKNSVUImgGMkHkJaznKG
-XEB7APzpfsuPIS3t+gNU0iDzDkiOGQGV5KsVwLphGjGs/NhL1fCgx+yI69t2NMGY
-xFCfnSUDPbLLhH/RjCyLgm5jPwieTAgsHqRiXedsppZb4CUxwuwfgWP4yjTFh8AL
-DCdaFnD5S8xUCAZssuUYyqDIn82qEqP4U1pIsHC9lXPqlN29/9nlLZwpwQf55K2Z
-CTTXPjleWBgUj7zT2jeNxr42726K7+Dwb7e0IVY2WEHprVztrFsdV1khbLnA9iuJ
-CfIqTVsVYCKg7ifEiTpxooF/YTKbGdh1QMDnij/4yPdCd76Cqwjy2inC9SKfm9vJ
-NGo+5JeOGCasOOaW0Usf7+92x+LpXkIl0lviXMwPii8O4V97TliRJy0tviIPbDVC
-mBmToNJ8Otd2zX2cvAm8f1JE9dC858fRVujHnRsiT2E+DCTDIfz557Fr+dIxZ37t
-q7Z0VxDlF8Loy38K5gmG1x4BNymvn5kc/B8bMk5raiB7T4scPEaKn6BX8QARAQAB
-=HUzE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
deleted file mode 100644
index 2bffd2b7d5e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/254e9c64c264c176.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b0255b26003ef6f82491acd7254e9c64c264c176
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
deleted file mode 100644
index bd22f88d8ad..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/575d6c921d84ac76.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
deleted file mode 100644
index d0de6ff44ac..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/5b05ccde140c2876.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7c669810892cbd3148fa92995b05ccde140c2876
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
deleted file mode 100644
index d1f2b8f9914..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/7c669810892cbd3148fa92995b05ccde140c2876.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
-YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
-en3ClYLXT5UVx0H1ZfDVKCvmaZVirZInfkqbi3OiPQoWrUfu02c3DiHQJ+Y34kdB
-egH2sIShNH8WLfEZ3YDQ4XaWHVuN1C7VwCBM8R3OeTTfyDrTsuyqJ0SeZXRR/6df
-2pEckjF9DNSXyjzFg24MrZhuhgbnj0oR1zmRh1EF+KlBfF4DF4acfxWqqcJVJx/3
-FTtOkLe3Xjj+inyJgxOW52gD4DsJpyf1tIbjAQDZvOdlRRCqZB4FnzzIb/1GmkGD
-JpDLC4MQmqgxkm0n8wgAmmHLpqDTdmuyJXvdX9RdGycpW64sljd1mpzTWJ8UKDhj
-uFQVHSSEdLoHoVj8ItnBV2kXd2uoQ/tWzbxFBST7wE/tX0e9G5XWaPKogvOKeDus
-u9XTIds2krYp80UTYWFZ88oNwGikdIrEYURSYDsYt15miROtKHWbSOHeLVbZqgVx
-dtWPqQVfH4gJGEH97/OSmozqDVog1aZDKBLGZQosng5h4j2RAQpjkaIdxKl8m7CQ
-x0Yi9tA8yD1QhRGggANQIb4n00G/vm7RMU/7NBvvjAQ/nAFjbsyO5oX1rBY1M6Xo
-NFqIBrHSBzV9MmhS3nXU+ZjAktCRhyJ7TsoHM0OYEAf8CduM5Zzp5w02iVYkFQBB
-wAoKHMpycW5LhMMMS4w7gmOfP7y04rtg6+zVe41y6bOqn/SxHCcCgnE/nhdexlzH
-ElYE1H7+HpphoI5vEwS6uElF67CoO5r74Zrb6nshGEj2AoOqjbrsdQm0noBBNYAu
-f9RsjU0sQQFzLW8+2xahqK3oZkLWOkSxzLtVwJbm7EGaGIYxEBjg87OnGQkAi9vv
-tVPwdO3VWyvgKLuPHudLDhTpeH3AMbzKgnru1Pnh/ZpiRhPzsbuFtFPEX8PMuCyE
-n4OLzUALl98kXuPjG5ww+24UsNgKMbKbu8qq/zRu7IHlpZvd730RoCWU2/i18tnY
-zLkCDQRMFWTlEAgA+MQFGIhyA4Ww9g7J8ZiEltwSzRblrjM1q9anexsBIGsWH37A
-92rlVK1RzMVfhj5yl+BzIBGO+zHbgycX7iB5/Fwsm+6R/2Uich6NDm1Qai9rc/jg
-3MS0phOAQzgxlGKOTS2GzdbDJCBQMijDObNe+Cs5DNB/E29/nzzCTQvtRzSeplZN
-r+8Q8lWz6efXmm5EeeZxN4x1YXjjzMJCHbc3yGxOjTgYQOs962yUYsg9UDRJm1OH
-9NKZe1m3dTRIMUcZvL12dq/kyiHHR9V/6CkdiNw1AFMi3tvEdvX4D1k1/Qr/2ORZ
-E4lRzgug4sKkpgaclLnkJZ9EMczmUFTGbbkx3wADBQf/Y+2nZCJSuHiDv/+SdhQh
-OBapZ2hYPDvg29mpPqin/LwH7eFTNv/oos1wzuzGtTHHGEP5mUQLOxjwdAXsWMMj
-scSbCs66ytTN7X4O8qh+1yN7vrM6ZBL12Ix7Ku40cgkWyvTVLBXKaEGm4ElhAmSL
-Fpu+/fJw0riR6rIuwHcGB4R1IJtMWcj+b1odgw9QmJ8AGpHh2WVdXspoCGnTUN4m
-DEswZjplkKXCgLypU13SrHVOqhjd4caK5GNZUfWtCKtwNcJMnvgp2truMvh9BBn6
-widfK48hEknQtXzGjui+bZz2/AD7/OT/T1CqDspB8IQlBCMBn8J4U1grSrZ1wTJf
-HA==
-=n1By
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
deleted file mode 100644
index 254217e5604..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/b0255b26003ef6f82491acd7254e9c64c264c176.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF2swU4BCADGPBgTJhjjEKL1ulqHmw1pYLDd1HTms4tlIvBwTCrzxm1JsmU5
-vz6hcGU0U24gFtldN63EncHDrruBz2mJIbVKCbGMP7cEycQBMTklJyrpnJxSsNyL
-YaRBA7a0mBmx5pD7IDQVcL8VBNMCVhaiREemuvvzQgc0rrFu0FKnuDXQVwwXNJVY
-iBpqEk+E/qKFJhKzR7orYhIa2ahpptaWfYp8OfW+6iaj0HslLi0et8Dt0qUlxM5Q
-DMRj/Gh4n+82evfCFy09Jz8rN4iWyrZ7GSHsJJVEs/hhzFRARra7VtbXMc1JCiE8
-VIH4KHbXK4ToL9u3OKocXMfAyS9zmEuB2xTdABEBAAG5AQ0EXazBTgEIALmgCt9p
-UHBwsjqBC/QR41h2ZuZi4Ujj6G7zRZiUbp1mXWKgRUwOUYgpId78ckHua+rya/so
-WZmELdX02v6YSVAx9cYKHDsHqiWIkVG0ldoEAdq1gPtyp0UP0FnnjeKO2wYGvN+T
-jCbPxeibUQQgYMnZHzbSSZc1c8SlfDaC8+dQ2wF4m/VwWJs5Txrg/Gg0YEW8Jw/g
-fOX9yzbA/ujw1z3DWW7LSaEt8hf7wTGqTfiLxEOSx0P5BzmJahtm4F47wky8P7wo
-b4q8uLI+JzieYaaeE/QqRCFxMZozpLugq3H5TF/70MmNlvAQNMPOxEqJJbCaxlYg
-KUutrxHZY51b8VMAEQEAAQ==
-=VHmS
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
deleted file mode 100644
index 23b4752e1f9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/bff2ee42c8282e76.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1aa8cf92d409a73393d0b736bff2ee42c8282e76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
deleted file mode 100644
index 08d8dcdb67a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/76/e5c3b1929191df06136ccb2b164779204e106a76.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGCVaCABEADgQA8+JfcQ6dEzNpWGi66IFUrH1CQyqrwl6/CD6vI9O1lw9LpK
-IhWvo6832Kf1G+9WQxgUj2Ur/TNA+dAGwIQs4OpIE4HIPQnohdWpO8DF0DQKByD2
-oHSUTIfzPjK1HIU+t2qy7hVprSrvVBufl0LeSAEFXC2zLQLdI5VDaFLh83kADfC8
-8OlXYAzBYLDYoBQTmTq09r/coxNq8vmkzwmMzJBTbtvodsJO+NmRPhKJ1NJ8p4kX
-pkmM4Z36vWMMLxAdg35kA9jgU2zcK/xDma8R6cdbQSWfpMcSb8GYoeD0XLuRME2M
-uim+AjGBwhCL7B2mEEBt834bRXzShO5sjgSij9R/0y0YRDfXdyNbxyDvsPo/rj9Y
-EFdA6ym0X/LBa1k5bDFt3wrvM7Pn4RNnidKB9RFFwb+eHhCxXSIYJFOnOapIuBSD
-WA3Lt1w/5CLJ2DrWEPqTXMQpH9MWNmbAEF/W8BMjrD4vNomVb2UbHH+PrNEvyh8l
-JwRoiE5MZM7xgK71knqyWfEEAKF/CujXHuxUxRu769FG/kDYQoYsmZQvC4fc2q4Z
-fPtd9rSXI4rGLabqLRyImr3wBFV6cjdbys16JloQe/6/A/zA1VC5/wAikWbYgwtp
-20Tm9fbGNdxzuVPpV89jna5MQdQhdTqRHZAHYI9WASGHCBM9kM7mJ6dZtQARAQAB
-uQINBGCVaCABEACeANP2PRAJhpjrQARLJPRB6BN6wUpgyNhESMNEutz0suVA61iC
-9qGou/kl7SxKGxShqrl3iqACbA/r4jaDb1X3SA4Groo3ESSn3CABMU4upaCyiU4h
-TToB76LKaxyLy3gj48hKf+kiuHNBGhbd7ky+VpvpAtjd6hTU+ypRGjmXM9NWCaNA
-pTAFL2P60XNhiTEH+yZKhh33Af5HFkj0xBnBnM87NPXHXiHcrrKKWOxPWzZ9orak
-6LCK8RN0obf4BaGyfkKsof29t3lR+JsZJuZ3C30JXT2qGn72obnayY9pdD79m6Xz
-5OnuivQsn8jlnvX04Z+QTdNMCWGToD25rZ7Pw43eEDz6+sXGs2EPAQycmHDDSbcG
-Usdp2ie5ZvwF1so0q6U5NFKuu+oFVxvWAlZY49qvMLj6wXubJ/TT15yBgq9vJBdx
-DJBZ0o6Twuh8v8ypbK0gAKhG4XVEsbHHUWsq20gLPJUQonGOiB5mMx5x4YdtmsvI
-CxLsqveOsRwjcVLOnp11I9uHM8fsrDn7SbKz3nx1XcbkcUgVLxmi3ZCldyQ8MGP/
-tAUZ0BLsthMjYxZvKJ4uXS+h4fF/LIZf6iqwwd95Z3gTeuCk+PBk/3BG4YVWFTgH
-351E03eggOqmicksVyjxPU+i/7PYSLWhu/SXhQhV3I3BGuoOwg1cLFrJWwARAQAB
-=K4TH
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
deleted file mode 100644
index e8ed4474a32..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/77/7ba5338873382b77.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5c9a30ff22b2c02f30261c305b93f1df7cdb6dea
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
deleted file mode 100644
index b402bccb9c8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/08ba61cf501c09f70911b83b82216a03caa86c78.asc
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE5Kv/ABCAConhU6cL5eRQCAvVpHX8VUyflu2Lcb/X7IQXy/8BCk1Nhhp69U
-ul06/EG16A4UERZQiqZjbwsdow7CvsZiJBwr6Vf/OkM7cDqDA1nTxL8jPByUqI93
-tBtHL/8Zxr+BmdUWYDZhkRaL3HuD6Io3UpoxjQqAASYbuSelhvuVdVN5mG7VjGjq
-oB8xCFL47rdO/+yZLaGFVjoOUC5J/xsvFe7IZm+HusN+r0biRbwjdMg5ppHShzV2
-L1ETra81OQFjcohzHfATvYv00QbNG/1GUTJCIRZKzMI2qp/B0UEGa2kYiiNcQ5b8
-p5GPwjAZX/fqNuRD1pyv1zyb2oiqr5HMtXY3ABEBAAE=
-=CO2B
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
deleted file mode 100644
index bd5469bbd3f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/78/82216a03caa86c78.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-08ba61cf501c09f70911b83b82216a03caa86c78
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
deleted file mode 100644
index cc05455ba32..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7c/c3720ddc2e713b7c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-59b06224fd8912e36603be79fefe78456eddc34a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
deleted file mode 100644
index 444ad2ea08e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/670be7d076a0c89f5f07625ae57428da9e879e7d.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFeGGvYBCADLqF9MxqNfwOuDrOmkOigwfiWxdKVHIpZqjFquuWIjH6IhADER
-HzaFrAuLF9DyodBvylQWMLpWOjv8ulGnUp8ow9Gjd2hH0vjrXjR+c9ks3NWtHX9n
-uED/BTZGnIwrKS5fVrOSAaUAl8LAx/dbnxnkwDMxKwSjdcSZhAU5jYZUyKT1KXfS
-4WeZ80kEoh26mNZtsXTSZSC24ou78eyFTLmNFuFY/v+dY4Vlg4zqb8xx7IFAq3wz
-pNGimqkSE8DU5U8Ld1Xua/XQEJpipf1xxXvo+n03dRCeEm6eyFbOJYdMIkZW3HsO
-kWnKxihvfAEWIKtiAxE0DMnruY0pON9RsR/1ABEBAAG5AQ0EV4Ya9gEIALdXMNy1
-wbM6MYSQWUlK35cSE68VEzXp64jnLT7WBkX6wN9OGRb2eBiNOP0NQSRWaB2m2fjS
-dclzNBd/6LXomR36oz9pJWkTSQfiEFbNIaeurfLLcA+m2rMYnT3SlMGlsRhZdUwA
-ntVogVtPUNYGKW/Wmdd2gjE/QvVN/xVzdvAGaKpUYiP2moM2CzRaW7VmSBmycI2W
-sczlLCEZ+zjZKo5p6GD8KDW38Hy6IHinK1/Zjo2CfFocO8WC8NIR31Iyen9YabjQ
-kcALTuP3Cy3y0BL5NhOY2/bo2T3ndf27ixWhzuRwt91JWnXoaZk+MrEw8b7Wn4eo
-Oy7jiX7668plhmsAEQEAAQ==
-=EyR2
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
deleted file mode 100644
index e684cde6e14..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7d/e57428da9e879e7d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-670be7d076a0c89f5f07625ae57428da9e879e7d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/3ff44d37464bbb7e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
deleted file mode 100644
index 8bd8129ac7e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/4e2ddd47e19863bb87211544cd3038fef07d567e.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEEn15ERBADm0iBZ/KwIiEYdLWxMIIZVzwF6My1eLRX+TLvPtOO4wf8zE9zV
-fAsnMI8uCK3as3OwgqTTsKy7KQSqRyG0zd/rvCmJUEET3zHX1e5e2nYq8p1TzJzk
-mR9lXe/amtRy6687fVn5hxERSlXNioh3CZdOVv1Mum5EHuzWFQGjA3CFywCgoXKg
-dLJ9QuE4Btzf9ozvZRDcWYcEAN41LTmy3NYv0SfwvPnR5rEc+xw4T5p28qhPc1OP
-h0jGnYgHYaM3xf0QGchvWLlwLsquxvD2K41ldIJpZm+Z4RqkV9wPrjmu1k2EUqWq
-UKD2gdyyQx9pN6RH9qIN4Mh8b9x1BUrm+/KoxlmCfMxg2efLJTaPwlFgqitswZaV
-aLi1A/4+Z7l1W/sMN09ZfOvTxEmznKOscCBNQPWwu/NBFYVzCAAv2pNVFvmjU1OV
-u85pXfY8/x0lkpUlexd4bL0x1IPmrJn+H4dTI2sVFXLuKVceug1HjXW+zN/LWhT2
-08bq6V/+a9+9oVjcdYMqJldoxEe5Tac7fwExQvqRFUvteL2LTbkBDQRBJ9eUEAQA
-vAxg5za8Trgpvk3rx//r1H1u8F21mtMVC4DnDWEUw9Ts+Ew/oy4xTENPTaA3wVti
-DBxorHoQlxZquqWUNcUFnrqSSyJ7S5NDiAWKYL6ez0MgXd6lqwL8tA4rKQhDK3kP
-qnuF6RFUfC5aBrQxCbNOk5OZMS+W5/w2CiCqhjKtkHMAAwUD/04nzr26XFB0XHbb
-CF4bSbyiR3vQTWOBOmv1qkGnausQzbFpg34T1l5KYaje0C7n7+UZSlD2uWksYTbt
-R3JpAWmf486MuAbZ5ViTshy8K5ia56k2yI/ZaSErG7HZjMxa4G8ecWyK1guHT4LM
-EobWUA79cs/cwdwqvUV83S1la3Al
-=/OVc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
deleted file mode 100644
index b62f4833769..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7e/cd3038fef07d567e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4e2ddd47e19863bb87211544cd3038fef07d567e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
deleted file mode 100644
index ab9b2a13625..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/7f/25a93b1970c22a7f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-06d34ed6ff73de368a772a781063fe98bcecb758
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
deleted file mode 100644
index 2145fcfe24d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/10314d676733c080.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
deleted file mode 100644
index 798a7ce906f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/2ac7bf2f3349de80.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
deleted file mode 100644
index d8855e32ed2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/bede11eaf1164480.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e3a9f95079e84ce201f7cf60bede11eaf1164480
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
deleted file mode 100644
index f92ba04f93c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/ca890a5fa09cfd80.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34441e504a937f43eb0daef96a65176a0fb1cd0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
deleted file mode 100644
index d2a3c4a02eb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/d068f0d7b6a63980.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-13ac2213964abe1d1c147c0e1939a2520bab1d90
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
deleted file mode 100644
index a95ba010fe8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/80/e3a9f95079e84ce201f7cf60bede11eaf1164480.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBFv1EEwBDAC61jyEM99KH18hI3zlfuqvGoNjTLIh0wge5vXAH8VxMR0ndOID
-HYSBT2+L6OeiqKlyhCgF1km48F/dMzyJdTASkNO1Ni+B2Ric1sBxjsSPufkjl4en
-yMOl/FuQOB2myht1fCXhlynmOoiRia5J6xzCsCNVGOVYfSru8vpoT9QKcD1OlwoD
-WhfyBx/bXsoRvD1CMjQdalcGxv1aJRWfhRumXQwhMPZlFeARAzeDmWNpglqrMnuG
-/VADZXZsbLv8VWaequ4wEWiwTOeA6YYElx648OTSv7NjMM7iyPPPWbbUvkVbA3Em
-lLBLlGYZTx2nI0B/322SsREcEDwaBzO53GStIzP1XvaRosM/98/Y9ITwB+Oh7ZwZ
-dYmmabxN6F5O3v+TNndEW7wgP0lkbsOWZ6YNmFhvoEtd1RxZiSNov5CxokYUrug1
-cS+/vsa9oIecUwxYOG2D1v/pwYhQnr3qasYz4nEEBWHnnkhyr1BbUSuen7w2SiK+
-64cQn6V9aeZYi6cAEQEAAbkBjQRb9RBMAQwA7UCAsQ8KxX8nYO4Sy2pzlh9W5FMP
-wGluuokPA2A6g2Fz3vF62RqeaE4HrRQMpijQCsN3JTJVwDid41X84XCMItkdAxMj
-mn5zeF/yCcRuHe2Ci/+ae5BzrBaKE/VWRAkaZSZWJ1MoDdpSxJhLHNFnVrwTkM/S
-eSNUBk9ZDEC+43b0hciefX9bFlc6XPHgV+yr5ohhwcNcrZ/gbAhhN3/xIVmvKoib
-mb+ZIajhiCP1OOH+GpZAPT93w9qZWq3+2gvP4ZZ7bO+8N8Gmz24GL3/0eYI6aMUM
-wWGjy5J+iRiFjb6E+Iv/zToyZFWm2VOuOUqy5t4u+Vyk5bl0hATpJICmKa5OFtQw
-G5Uvfztk6rujjat90xv8yzsBvoEUqKqzIzjHdN36qop5hLMnBljdLdFY+Rk9CHdF
-7MW8Nf0YWbP/3uUk19utGW686Lolt8gvBQc4B5N7VtNoXFCKM/I3ufgnHQvDlf8p
-gdJOcyx/a90V/DpUI1ANlwg6IsmFZXbBQw7tABEBAAE=
-=u9+Z
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
deleted file mode 100644
index 0a0d4c846cf..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/28118c070cb22a0175a2e8d43d12ca2ac19f3181.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
-R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
-kaIj27OJgbziFcnMAtvGoFRfaPI/7TOwEw3jT7B87RXeiATX4iL8fzMUmkfZm0Hk
-qjnepMQeaz3KzMY4DfBcI45kwzl3EIBFIlk428mhBU5iAAANoyPsimfqEPRCUDjx
-vT8g7PvpkBdNZgRS6R9vLxyzKi/f5KswZIMvop/pRXIhAKDhCCyr2GD+T3JoIKp9
-kvS1MQucWeX8+TFWh5qEA3e06Xu0JSdPCEej0BH06EiTMsAOU5bWqgLAO9DVpS32
-I092KAuMJlEPCnz7IGXVkeNY5KYrlsmoKrBO3GF/zsCyiZDvSULkVJcrtBCYOrgq
-HRIzvJWQaTJ5V15MD8CZIELyjCGZ8Jy8hdZpaTjYalw0bUq+yRAqMD5slp6A1tnv
-jyqVTgU+yRGq2HB90vJ0D3P1w4xRDuNF8c02futO415Yc/qkyh3/5AjGSoocrlfX
-cMreJXpQWVsvXn3NsitjsA6XOJpMOgipCDxfvn8SSLl9fWNJf55j7fCkBokF/lIi
-81RVQbyjVCOV0OEqHJLP9asPHyAFvUppNWtcvViPxVmb52djnw/x/61WVQARAQAB
-uQINBGL4BxIBEACwpcarOeEN5TztQDTvemc+DXZuWirmHv1TyJmjOhU0hGGMzEnK
-KU6VZlUIg5YQNYknUOfOf/05pgQmsEhjjI8NBD3Cys6SVQ6wOlkA+KpDKs/dXwyJ
-ttYE+EG/IMzjwZW2DbF50HkmT2VK/oFhRSf0Par+cbVQ/mNLAVC7ueZWBVXldezq
-Vvk3tDYYZef9T8Qlf999LVXFgiMzRFrzLLcd2KEHAX4se65FTxIfFYYCrshFIKDR
-i4IWNzQqtPV7mb94wXY0Vwse5mMEgjmieGPjBGYne2JU0xYNBxtly1y3aeDXcxNl
-NrcS/Ake9AqWAYU4agtocCefb1pt5Q3li0qg3PsVKDJ5qWDceb+kgcUuHgtwHFCV
-ICoQUMsv9p5F/kWL38/OWcTR2lQ4tGerE2dmlyqFWu7mpELckAfXSpJobZltUbp8
-CO679g0lk+OJWSmxddlVybdXCFaAeOKQb0woQOkR1vo2tJHyGmGr20Eea+UX+kdL
-ojVQwYCqICdvnK4YpHuhpT5crzk6lohfZpBPMHdpR7FQQZeQEW5EbcFNfoUEwsgb
-2qkG+hQIL5Q7wRajHkGaG3WuhY2xEyoHuLSb20hP5hI2uhtxswUl/+IOjjZtDCjz
-Lz59Q+ADkDZYM+PN3eR0UJDqYKly49KTuz23zLluNjNwqo8K0y05XGCQMwARAQAB
-=Gshi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
deleted file mode 100644
index b0e2c328710..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/33aebc1f01c98081.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-314fe82e5a4c5377bca2edec5208812e1e4a6db0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
deleted file mode 100644
index bd22f88d8ad..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/3d12ca2ac19f3181.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-28118c070cb22a0175a2e8d43d12ca2ac19f3181
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
deleted file mode 100644
index 929d8dc7992..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/8da70c00df7af1b0d2f9dc74ddbcc1270a29d081.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
-85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
-9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
-JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
-D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
-3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
-LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
-AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
-o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
-TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
-nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
-uQINBFsgsskBEACsFJinwgOtkIicJPjQB31Zq14JOpaUghMQowvEb1oLe0erqS3z
-nShS0SzUeGsmyxff13Fua7Jnxe3k6J7AN75yLHyx7S2syzKFFYI/Y2Y5b43MVl+R
-fKVy+wR9MeONxmb2TSHSLfUgjjyVClWX3PVQnL8OeuBPKiGxSQUgj1TE4mzzS2cO
-TdyL+Vn3akbCIO9I1EaokjjA559VaV4ndF+YlNK7qpaouYIrnfKf9YrAbVUMohpq
-Q7NlKD2lBVMZiFif7K8TceXwMjindlrFgC59JybmiJS9ANuc08y1N1qU5Bxb4plh
-/KIKJ17Yy0H4e9BieDYwYSAI7UBVabRhjS5Xg1Uw9QCDDYpnOxsRRn+BFAICvH3A
-6xelrS7St0JwN4UlxzIM6S6NTZoq1stXH78DcJ7Huygl//msZXdbJQIJzWZd1AA4
-9oqyP49W5dp7bK4hNENTfp+9vRt85ZINE8I/yIz8aNT1uuQO2+tjw4RrWo3cHzyj
-ON3R4CfGWBi/82ireHpYbFUDwWXFDpemFfX4PXOY6gCYVCG4X7skFvvxBmJ0eP9h
-t8GyComD7LgYkMOJzdSHRk6X6FvQ8pmKSHKyyWZLdv+KnksV8R2tf6hewozqDVeV
-c2te/pi0UtjTe/x8/pXMiLmH+3cyyf1PwyMiuEAXAqpu9vSErAoCth23dwARAQAB
-=eX50
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
deleted file mode 100644
index 6e5da6e7595..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/81/ddbcc1270a29d081.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
deleted file mode 100644
index 657153c0eb5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/3c91fed3922d52296888bae9b6d3ab9bcc641282.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFhaXO0BEAC8WCdwrJNF/W+C8m9FYwAhEvKBvQ7xmoGYZqgcYe2ntT8udvgZ
-k+dRwZJnu1VI3a8feOLrAmeNI2MxPP0+l2kGeC55c10duXPzLvW9oHONm39FZpCM
-X1m66TYkUBeu/DIttNf5l0nv54dmm4VAWjutnVmlKGf5MVmmAH4mrkmgs7UTyQRK
-JKJ8B7tAt6CI1tXq2ULjzUpz9iyD1IkWal4K2gYfooSuGLayNY+SCdcT9uZkpS4B
-rnHy2QeJqPSnJv+5G1SkX1fzavWelrf72vx+su8L8QzUa6JtGJatFbAHzEdXGJ98
-JnK7TAQvR3hCyzj+TnVCY1hiRO6B+4zI3j/vSJVdc5wmLejvfZRqhiaQ8Vr4xDbu
-w7/i+raAKwr//zVGAqp/zN6zQmyoLks+cfuI4yqHuXKGaNs5RapKCxfukC/TRB2e
-fLhqCpXAbRQ8a+R+0CCBP2WYDYNQoh4FnwuqtZefnm8NVKW+2we5y3llIrXV5PQb
-FFN5WOLuNvO/JOtRQSjNd4WYttwNCDP7ATpRK6ixz7qveztGNhuiCRx01HbZ2uUE
-DKV0DW8mWRjALl9/akMRcdIeTayKHDVjeNq5amnWT0vZ2F422BJW6sQryTs/NIBK
-XGoVVZeXms3fzL9IpztcVFZTuwmk5kk1FXXaBDMwVHlR5hC5gIuLIfLVEwARAQAB
-uQINBFhaXPsBEAC3bR7f5euHbpIDDTuFYHPI0+S5X0DhuqcGBUL2HSFhWMwIlfsA
-aO+pt7GyfXLUkTmzugwmwO+sOW2QmwEZQcK2z3BrcjytZophZ9AUajbAjnadSH6U
-XCMmfExVVnaYSfl/+Uub42szQE/r3gCRIz6M6clVVAjpFv4G/mumfQUV/XzLoUEY
-XTgwTokFJ97R+hDbHvBEBrUT8M6zHP5DhN3EBug3qb6wZVOa/+HEX3M+7k4jVT/p
-pNumw0acg0DDoSNQ13VsRV6sV0XE4zr3Zfs84f8xCgXpEMs4U6DZGqs3iJVVtbRf
-0oL0fgcxNgRrmbCrBfbXYfrS4u+fJ0vB+Wrflv9eNA3i6TtVL6uYpZy9uO2B1olK
-VzfEhsgB3QrULB4jVHZjIXGe4ILn45ndMtAeY4M91wyobgG99Xl+1vPHrxV0+2zR
-P66J3puyxiKE2B7gd7hib54CB3lYyrG1S+K1kZGCI1IFKCnqmTJXY0tKoLAASS3v
-tDcknXenzR5RVSpWTDuxtusekfL0Bw8pCBoz9L4Hex8Q1j//D5CZlqcg1NKFfmBZ
-7ta9PTuJcpOsz/LaPG/0VHYt/QAv5o4eeZESl7iZyM4/0NFh2s/rq0R8Z9yVSSkI
-vvO8d8XGZ65NTm3T4NFuEihn+AEm+zg4KiGdYBEZvs8QQoW9e1+MMN8xnwARAQAB
-=pBMG
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
deleted file mode 100644
index 5015eb493bf..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/4f752a9878e937049ef3fba7d4012dda1f1f0f82.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBEwzT4oBCAC4yE4/EPw/MHB8u7mZtnk+N4e2SlHw1V4oyPHVEA6vdSUpsc5c
-l/5N1iD78W51a/3/l0JgtZMUNHlTtealzDDZxfEarCgm/fraD8v23AAVI5ccLxRE
-xKsobKOQ86QgFcbJpwwyRQbDv3QBS7ieeEvM7lJefOGIjJPa+xLgzpScd/F7qjZ+
-pGun0jhY2kcdHa2D0z73ACLRk9uEDcD1YfZtEwg6zKxdNx/vEPEn962FBf+LEICd
-urAKd9mIAg8a4I7HfveZbWBqiPijT3lZKkhfX5hbJACV5vEgsvQ6QcFs8UMpkzry
-enWg+20SlFW7xkb4ygiJZKwwAWYmjkU65yDjABEBAAG5AQ0ETDNPigEIAKVDaqOC
-orCrSpumnx+CUQN+2rUAYBwRQYwCs54q9gqLswYqmQfHfPq/3qa5z8wzNd/dgMLH
-BWl6b6uF7V0Xy7WQZe2FK3kXUVDB3jMfPN1HVIGqh+a+YviHwnEhhaydAR9eAxQU
-5cfB809z9DTCh5Sgj31U1eWZ6EomVrBeYhEdjvJKixJR/MxZtAsRGVJgX6HNc3WA
-vFvI4OWE//Om7FE3d4CGLmheMIe7nNfuNBl5gvzKAV2rdVeqNinWX3vH0KoZFly8
-9tLFGKaKaFtFUTMgaT42Ejqc83GmoFKxdfgPtMhWPTS3K7xEGvO5XJKVEe570tvI
-zVW9P53cETs1X20AEQEAAQ==
-=woQT
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
deleted file mode 100644
index 10049bedd6e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/b6d3ab9bcc641282.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3c91fed3922d52296888bae9b6d3ab9bcc641282
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
deleted file mode 100644
index 9864cacc67c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/82/d4012dda1f1f0f82.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4f752a9878e937049ef3fba7d4012dda1f1f0f82
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
deleted file mode 100644
index 8e65abd72d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/31fa045762d93f83.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/6a0975f8b1127b83.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
deleted file mode 100644
index b85e6475cdd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/83/b7d8b732f9ff1283.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b5569a15406ae682380f3ef8528dc75aa68f0923
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
deleted file mode 100644
index 552e90c2ca9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/60200ac4ae761f1614d6c46766d68daa073be985.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg
-IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd
-OlJl1bajIRC4pAoZafDzhOb+FkjJ61lEJzJ6pQtG0Yi24QWDBfXHkSiQSbZFvcC/
-FTJpZua4lwRi8QakEgUrgQQAIwQjBAHakDsvODv4+8aNawGjAd4xhwp+NsASRfJz
-FWdaIelkTfHd9yT9KIwqQivaHt5csY2UbwbFZBYTheZbG+9pKkd+IQC15mb4cBYc
-zaEJc+Dbgy4OmkIwEBMokuzaiNklU6mxqMiBOsoNmS7r9rL8ZNXTZb7arXzp5qHi
-GRt6cm0UYcriFQMBCgk=
-=gGJg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
deleted file mode 100644
index 4df35d838dd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/66d68daa073be985.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-60200ac4ae761f1614d6c46766d68daa073be985
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
deleted file mode 100644
index 1fcfded497b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/85/7679164aa2590985.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-042b29e928995b9db963c636c7ca19b7b620d787
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
deleted file mode 100644
index 64a1f282c02..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/042b29e928995b9db963c636c7ca19b7b620d787.asc
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBErg1IARBACVbmwMwp4p0ldolUYSkGl7XFJHwtEWmuikGcM4lp72h/YhAXpf
-RVsKE3aCy6HSTt7KJrcUuOL8BB67riZXLOIZtA9kDyC+0EUbnW2EbVfJXskPLP5X
-VA7RqcuvaW7lil+Fi+eWsy4dvRS0/guG7SBlMpyoOOcuSK1fGlMJkRKMEwCgopOy
-9220jSQTIvq/2nzLR0PN1o8EAIImG36FVZw8j1WMaCMfJMX8gZuYxdnBXo3AgU2H
-x+AnWvyMFlxR7fIIOsYaMmGLcIY0Re9qQCpPaZum9d9IRvqH6YGcI7s00ysk+C5K
-09FjQEtcgAe9WBVOSuHorcv4UMnX6fyDWHucu63KXrwqfq6YCHHV3OPTs6CkzgNY
-iomxA/93OVuaEXHkyPBS75br0rl2/m7Ow/qp9rvNOzS9U2ttJRctM7ts7TwtYLi1
-YHxHeTgbnq5lVCdUnY8h4hElGx/hi/lpyCJEEK076o/M0qTvq9JnA1p2dKj07lJ6
-ffANb0BKwV9zhvI9e0+hheROQiHpLM8BhXHgptSeAB2L5rjWkbkEDQRK4NSAEBAA
-wlyOxGtSEu+rS/F64OFIvrUfPUu1TjtDSem5jfHIoKME9zntQDyxSxczM90wGB5f
-nxFWWuFQQdyLb2aS3pmkoRbtDIr3WTFMBfohzjEUsxLjy651XokVh7v1zJFpqb92
-+VOeHV66GwRKQWHCTyi85G/6m4SpDEFOOopYiO3aYYs0yKNnUygoZQUX0D0YGNOe
-8kS8Lzui3VXwAFCNWN7Jh//bfQCnaR3CUGTWMnUE6NXMY6kb8fl5aBMaz3guKMdr
-+BkRd5cuS7i2o2kT8jsx/P1agavkFByYO7jMRObskMr+KX/7lwvNgnBS5r4fRVzA
-sJMP9OMQ+a1o6dQwPbsqmf0wzGJTHY8bSoWa6j6i3HiXrfhzSG4bgRAWqQQgRVDK
-uLw6zg0lFEiR7CM3GMyNXRz/jmSLl0e/NVhXb1SrYw4jPSiHxFfq/rTdITNYnuwF
-UXQnWmOAkRqNGiEVNIfhiR6q6dIFvYbhUDNmLTVgsmGT3spBn01FYI7jO6uTjTpM
-ao4GYop/QDrPapUaBGzYxfI6L5ikZQ3FRQwUdTuQHB5FLmXqTkPimiwTpGiFhez8
-ImjAvE32vZiCIsRukGE8nJFrRqaJML9fWwnkMzA0CAiExyyQkDKzzxkYo4YyJxFD
-yAd2Ak553lsmTApjQD+v3yPMJUqPbKXj+yxx0aa6VocAAwUP/RE3neYN2ny0EhBZ
-TXY9FaXA/HR8gyodzQxAWdwpDEZRQL6PW6rqAKio05dcqVcD1zeQvWJRMX7af3CQ
-VqWdSliFSEv6vlIgO50VjDCdoLF+Gt6Ex2EZzTBjFSocsTfPHiqcnAwnvcuja7r/
-7DzF8jIp6G6tIhDGeGJJTyBk656seqSy/A0WPFRFsbDk7J1eX+8F5yJgAVRQ6ZXT
-79tZlvoP7zCrMRIO7GmO44J8/kxsYEETUgGMSU+jVVmpwqB1Fb1Vgwgeq22JUKFT
-iEfyCY2k3gt4B4ee4CByEYP3kea2TCGZGevqxs+DpBD7Mzc0irgErmEaxNdaPMc+
-fD7t7Uxshiw6jVKQV7oso1+Ax9LgKhlFUc5X4U3YBYWH2n0ZuTRvpmn1L4nPfRkF
-6sAkCWATvH4CrPBWfrnV/JTo6mqNcmcMtuTZICw521ypYbdPNNOxLo//0qg7sRIZ
-yOF0JSPivF0N0dHkJGs4XxZ+XKPBzlJer3xDniMqfQdthtMuJ0kSmhwVLRKHwNS+
-KJkxD3gxbyggeoZFLDx6u38/TJAC++B1EXX4Rxnz+uzvMy8kdN7pJHKg0Pf1X8LP
-C4BTYGBhskdfSFc8HFYXVz1By8T0f4x2dTygh9xWj8PfaBHgV2t7gi5UqIFbtCFA
-uj1GTISSHu7AOSBua8sXCHl6XWjd
-=Jbye
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
deleted file mode 100644
index 3f3a6ae23ed..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/0729a0aff8999a87.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2fba29d08d2e25ee84c132c30729a0aff8999a87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
deleted file mode 100644
index fd731d816b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/2fba29d08d2e25ee84c132c30729a0aff8999a87.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-EoPsViw1nG41nzUAEQEAAQ==
-=jYli
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
deleted file mode 100644
index d771580f60d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/394cb436c56916fc01eea4a77c30f7b1329dba87.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-Vo3ZsUREArFvADUAEQEAAQ==
-=4kaP
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
deleted file mode 100644
index 82ce5f73ae6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/7c30f7b1329dba87.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
deleted file mode 100644
index 1fcfded497b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/87/c7ca19b7b620d787.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-042b29e928995b9db963c636c7ca19b7b620d787
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
deleted file mode 100644
index 780f44c7423..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/160a7a9cf46221a56b06ad64461a804f2609fd89.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=TUjT
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
deleted file mode 100644
index 64edfd2e930..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/461a804f2609fd89.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-160a7a9cf46221a56b06ad64461a804f2609fd89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
deleted file mode 100644
index d451d29611d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/4b1e11d5a4b91e89.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
deleted file mode 100644
index 39f8f25641a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/926dfb2edb329089.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
deleted file mode 100644
index 9f9a683244b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/89/f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF8QwXwBDADKNLAHhjWUqnLYiO+ws3Hy1du6tMvkR3nfsnIDqpCvSjb+3/rI
-OHSyq8TbaGLLuHOM4K/KvrKgjhTbXQxvx1WR5IpoylcINzI959yAbaywBj6gVQB3
-JX1xeZqiep8ZOD5V8YfwFOF5pOidVhabwdkC3xw03ZG9N0izgx4gyou1u8ovpa/T
-clEvZh3OnmT8FU+NtwdCDBHhQ6CpYqUzslw3Lcr7gNWJrecdqH4aZdVetGPwJXqU
-+9KOog9JNtgOb3FRUSOGiaYBnReioqTvI4giLxKHqast0xilHGUKJvkVgiKBJj7m
-kEwwhlKsym2RWVMm69cdk9wOfdLP/gHvqWqw9+eh2cQ8d4p9dqMdehkZ/KMbzeyi
-hM11wMNTz+QEAIG9xzYe/tGgoIK8Nn8Ts3jSNNQaY40tJJRzheWZrnUXrpFwAh7W
-TDUyHOS2QFCoSLZ//n1YTT1qhLeXLTkX9KpwPZWYl/qJOJhp1P4XfQLEAtfiCVhy
-HZA8CJDH1uJPuq0AEQEAAbkBjQRfEMF8AQwA5HEu5anH+a1ZZQXtkzeCAhYZiMPQ
-IplkTfhUPOAykJl5Xhdr5BPtd4OGDLdhCuSs+ylmDM1/xIyT2jQs/2Iz0rcbNWKC
-yu/QMRNKo+8zdCiw+N0guUpAvvZ3ky7gmEf4JGWNA3xeA4DHzQtKQNIyOB2p+8oj
-/eObtlKIz5rF1lEAT3SESfF7VYsxiNEhiFfR1iAi91xAHzqi3b84sml9qOd0pIWO
-Hgf7tb2icTqpd7iZzhV7729u7EEZ7X/+wi3NFyeCn5dJDmUhLuY4+RPgRsiEXWR3
-2blSv/iC6zmZLlyh73D/oy0vZ846PB1fwGMWWJkRTEdrH+Ss+wA5B6iANqqkltMv
-nVKqfX/n+Si52kZKaWdtw1CboiDuToJ/L+Fza7tZcMLUA3v/01FTv5FAkQYksaU3
-AcBSJDD1D+H7gR+sRcowjRUewUMb7ccSm7luWHBXDsXVfFpEOJ3KGRFSeAioyNnd
-KhjPxfn65lwH065ZIsT/04SW8gy+PWzuxpIFABEBAAE=
-=YwIJ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
deleted file mode 100644
index 6f3f2fdb69d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8a/ef3fa25a9e1b028a.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-feabfb0dbd7a754822d35dd9be6397e958ab7594
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/5d9ffe7b8e3dea8b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
deleted file mode 100644
index 8942c969bea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8b/7999befba1039e8b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
deleted file mode 100644
index 0629ccfcfca..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8c/0ac07d0bbd11498c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
deleted file mode 100644
index b65145cdc99..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/2a742740e08e7f8d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5719e50eac5a4b1dd390b72c2a742740e08e7f8d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
deleted file mode 100644
index e2d909ce835..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/5719e50eac5a4b1dd390b72c2a742740e08e7f8d.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBGJIi4URCADFspeHyziASBuPXpLpikWjmC3D6VtTaDT17ogOyGLf6/sjsQUz
-0KS3PzWBuPoqRGRpTtZxJ5yr10apr8mJF9Po5LFkrtcexaiYmUWAZAik894OhKt1
-O9he2Sh1OTUiTmFU4ImQY+AeRqASZMYabhbbJOfQLJV2Er+foKzRC0T2MSQVjDho
-NywU1IsQG58lXEQNOA50uCuhnaCUy7Mh/GKCejyBaqXMtd517evHhqsJd9tWMNW/
-W2xKvGiH2mWSRjgllZ0h3zHuUEo8xqetOuHrDGGRpkzRES0kIT7En39hpVpP662Y
-97Wolv4C0/UE4rlfCmiplf6mG9QPET8wZeRvAQDh+Z27sD3ODWU2P5s/EXzsmBoi
-kK2KzGE+n32kRY4fHQf7BE9PfZ3f58KICY7p5apxP/6+bl8uq9vcszGPHl1aT2cH
-oQpPm5i2UHRoWXh7U9TpKWxxqx+yvJlPhV1c2DTvdbx530xEMF6up1f04+axhlqE
-DzjzOenwpnS3DR5iUqflEM33njj4tK+Tw51kXjyBxafPmaKEwuqzYzCFoojidmSx
-Vk4la9hCvIJzGQ+3iTX6OR4d1lGvRGmVm2g2AVrpZ1yPncgjCu5qFH9UiBblE8LV
-SVGBufS86pRwTrwW+fXaKw5iIyiPMSSE11H8uw4q75uFVnmEd4JUtQxGjnv7vbjq
-7hAeE3T4HlLPFBr3y8c3829HY0ozNVKKtXs0/lBzwwgAm/59t1B/dMl61BaufnY1
-5tYFAcStTrl0c3ZAYHO6DWYTJ8ZZQqiBfeyVI3yqWKQAYg0DxC9AzTtNSOs7SGJK
-dgdencJoa0ElraZuVXfb2Pr6cBv5wKRfU7ZBvHfCE56vJ/0zAvGbIRy4DYup8+Pj
-vcLSSWvQMT0iHk9TTw6sJNV/S4aH37Ux2N3SsARvqR1nZ7rQaGN5eTg7qHmwgIgd
-AoHa2Jd3ixOKuLzwIF4hoh+XKI7bYzVHwYq6yVZWevloxlky0FfAXCH2/lrTGyvj
-i83tPUIushngZ07senzgK0IWQIuLVjl03tJ/rc12AtiZkx1/ykssQ2uJolIRLfou
-u7kCDQRiSIuFEAgA+Roa4drFpqXxAR4ZjJ2WA0v9WUGWmbZr03BpqjoWzgHvM453
-IbSQ3e+l+DYzfxw0EpVKs+7GiRLP4/a1f3v0ubBPf/QHfiY/lzfqUDwCUNfB8Zkw
-ygvsydthI+DD6hgWOnd6la3O5vtFHvpuH8cv6uYJVWIn5wVbvAbyhJIn1Ug3++Qq
-/g4Dm7QCKsu/phulcgJtaZuDTPRGKLNhmwVbO7E9chjW1peaEbYhwI0H1jHU8onX
-s+00uiM0baOnpI20+5bvI8Zm8wYu3FGmzhykOLKOwd8y8NlR2VSaTYZAGO2+h2vm
-/PWuMnnl9v8mpYi9XbHdrf9KndAcfx+gYtjdxwAFEwgAqg9KGwxXoPtahCzrBdq4
-M4FK7zJyq5GVtSQXFEzPjnlF4xvcF9ntG+67S7vuPAvTsHyhvfGaqBsssi/eDSVC
-xD9FIYXGZDrrVCCoMkM1R7qmE3EZKr2fjBKUmmQb8qu6sknjDqUkNwyolhMip129
-AUvrOW7SV0HK33SSLlbzdv9z+COYM5lyLvgqmWjInKziuXpG5ATszGqlz1BMH8xh
-tFDoOApVnVPXPO+pLGbxruy2t5DhVIEnsuV/A7rs6ko8XCXk1+njvIyCQndU4m+j
-NRqPU86Qch3+qZyUBuhwmL/u9VsKcrOl0w7KXwxWTbkqQSZynt+NVtpuPKNxoaKz
-OA==
-=DT4Z
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
deleted file mode 100644
index 2bffd2b7d5e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8d/fe4ce430fd91c78d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b0255b26003ef6f82491acd7254e9c64c264c176
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
deleted file mode 100644
index 10dcc4d8145..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/4c5f68d09d42ba7fac888df9a929ea2321fdbf8f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjw3rkBCADI29PsG4+jXT0KajnjFSb9jQynKlHeMmp59e/88goWICaTK7JA
-lM2YB5vpjBeQjA+MCv/1wRyD4defs/cXoNAAsdTeJkh6Qx2C4TyL2dKROJK2DixA
-p2ENJNICHzKQn44UFZM+gsuhDvS7M86xsj6BCKK0JAIHPtscVSdiSlEvRAkLpVQA
-iWLwhTtSju/hMjd0uPWWyQNuSR35EG/nFS8DvxOgblKKciT53CJ03HR3TWtq07XH
-wMzQMA/GfgPbzSYD3imr16Rjk1nWbZbrS7N1bpFyvl1qNI5uE84AqvJlzZf/pGNC
-PKXNjaGwXyk6OtNLrHoc5PrITava34y6QyuTABEBAAG5AQ0EWPDeuQEIAMNad8eb
-jGJH8jT8Io6KK7qBMiu/NOdyZJa+02PExO+hvQNQe2CRoRqTU29a51QKp/egrnMl
-Zv26F+Kge2NNbYtl4p/u58J+cRmrTjbjacG5crZvwBvrNgCF5q/XkWEZI+VIuhhL
-cC2YBuBRh3GvreH1HRtl4fWvhDOqKmlV+073mqGx88IZ/6EI06WdA9JpA3hRsqDg
-omzZvBPV79kL8/I/9j48OzVNPW2vWeZyyvAqd0nzcUMa9l7ZzmgdFdWMfu4mk5ma
-sGea4kk+Cmrt75fT+d0fSrvcTrtyrCY1hdPZmLCLAivTywU39jEOsR3icZt/oeNc
-Y3yDNzmlkKkQRfEAEQEAAQ==
-=vvXb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
deleted file mode 100644
index d85c89fdfd9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/79e193516be7998f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8f9a3c6d105b9f57844a721d79e193516be7998f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
deleted file mode 100644
index d9a637ecdb9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/8f9a3c6d105b9f57844a721d79e193516be7998f.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFWdcSoBCADK8j+0eVZKUGctZo/VaJ/K2Wppx4jEFgih8xiIWREQ9B3QEugJ
-mJMWZHhrnHB+sjVx5No482ch6sVhYmC+VMyTdzepItZ8beYa0pnNGJnrFT+HcTOS
-g21Ef5e6BRORNho2j9YTvxvjof29XxU4SJFVgffs48jGeJzN1EDmOz4OlZupKGU+
-98o+kMKCiFjcf6Vu03asuml97b2fMOJ09n+UQVlZbBR/Yo407ZLkL2Elx47Fz+82
-iO+M8w2qNnxT4PA/TLgaVzkVHaR/JIDlQQ4DfuyloQI1hBpMB8f60oukVr5dBGuS
-1dPZ1H7td975sLegWoj7CCOFZXrDzYUXwwXPABEBAAG5AQ0EVZ1xKgEIAKJ2COl4
-DJyi+Y49Z/95FcSgPuJtM50qDLrStwdg94Hqk8xVpQyFlBDhBNNFNpgTD1Im0PaK
-27uSGK21y0erdEDkSYh7nT9y8XbYyKlwmoHcwnsCdCn73aUf2uuXbFCy7uPr/Eey
-gR/pQVbNGjdM/Hud/WWqBjwlWlpYsm2x8HK8uLTjLvcMgXT5bdKZKkO8vmHq14Bz
-voXPbq0FWPcx1QUXtSdr6sxTjYrRZQ+QaE9/Oqc/LQYtFt9ieOp04EXrpMyVi27V
-ed38WABVK6AO2HctsWCkNslagavTa2lDam3bZRISUQ0t1nkLOIrbYPqMjLpiHTY0
-m1JWw19DuxD9eikAEQEAAQ==
-=0bpl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
deleted file mode 100644
index c438265dedb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/a929ea2321fdbf8f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4c5f68d09d42ba7fac888df9a929ea2321fdbf8f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
deleted file mode 100644
index 9f01bb4c224..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/8f/dc0b7e986bd7398f.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a9789342f598ad5b1175ef357eb97d110dfadd60
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
deleted file mode 100644
index 971e451d7d3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/13ac2213964abe1d1c147c0e1939a2520bab1d90.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv
-BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3
-67RAu42fJqJcjD2Rs37wMxlSRRGQ+/bp+Bw2HNO1pw7GwrSgmZwzwT4+1pE/TvXQ
-Wl+Nhdf3swLyBaSuWHJZT3+JOR0kEGSQuurR+57r6fKDmouWSwAKn1z97JelHuXj
-HKZeueCkQvX7dayPP4a1zpoXPcoZhYekFarLWJl411EA3aHIIV8whknsZx/lGGC5
-yF9AVIzHHnhqFC/Fr+GJbwa9oMFXj0pY06ZNABEBAAG5AQ0EUc3EzwEIAK6rZ7kR
-p3uj0CrhvuTnLHU7nEs+KvoUZKLyhcIys76sJQ7cnhEygcG7tng/EtK8bI6skLwU
-aF4fnPliDj/yIigY08p7TvFL/6HL4cLrIXR9uZe5IdvBKYhy23Ie2JXdLk6zH6jq
-5+vBE0IA7ljJUQj0PgiIL92kB73Bn6dPayvtApzctajXvGajYNfOLTYc3n1L/Kqa
-y+/UwjB5MJVlmFtZ1a/EAxyb5yHld/s3RKEaeEIpjaoPSJwXKOWNAcLdtgcPcsyf
-rV4bkgjx7ABzPvf82gYucthyIx4zPZ29hZfktSV61h7cbJL5HGrk39UcSgfstHbf
-BQiTY/1kVN9tuHkAEQEAAQ==
-=GTPB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
deleted file mode 100644
index d2a3c4a02eb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1939a2520bab1d90.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-13ac2213964abe1d1c147c0e1939a2520bab1d90
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
deleted file mode 100644
index 9fb46924e33..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1bd97a6a154e7810ee0bc832e2f38302c8075e3d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
deleted file mode 100644
index 82ce5f73ae6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/3967d4eda591b991.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-394cb436c56916fc01eea4a77c30f7b1329dba87
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
deleted file mode 100644
index 797d3916135..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
deleted file mode 100644
index 45e1dcebc71..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/92/8bcab185914c4a92.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cdcaa216b086a7b603b638c5145d819475314d97
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
deleted file mode 100644
index 910b52cf35b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/0cc641c3a62453ab390066c4a41f13c999945293.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24
-exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL
-9yCmLEVzzSt4VCStMdPmXQGLvn0JV0e6LmDFv5+UfOR+qxjyNXfeF93W7ndVFA/o
-YoYgMJN26Xneb+r9bx3rJcT1zbHYpqUqkswiQ9cZSApe5GHkDqOvu/lJnlFYfFiC
-+f0UiR2tEQtdIYy1Owkovcy81gMEKw5Mr49d6lrkQm+oES4ZHcCecZ3Y+z8V5Rqt
-qqlrV1IR960VxwhmUm1+VkxGeGClxCFF6Xo00wCWlcJ/BCAea7FXXr4QrF5a1oQb
-BDfoVDlXt2cl/0Qfo9gCivBbyZ2df883MmeG/Vc3IovAP7Snl0fkX4KgdrfWuISa
-nbARk5xsIxlfC0CsnFNU9CuNh+lg4gNV3E1BiCVEa+boy3XqvcfJIq4/ZiTUXyjq
-chI7QFHmBS+uhHGnTtqEAYzl8KgRQdHijgo2cUVw+it765tM17Ekk+NJV5oQ8C8u
-nlVS6YiWDiuaTfxZZicI3bOBq6kjTr/TZsv0ohhtbUh5JdSRKSxpK8vkWRnNP45W
-m9oFvUmI4X209lzFvu1t4/t33Xl0kzp+8q9Qs6tgnqCpSnxSbJY3MZb/QwARAQAB
-uQINBE8YNGIBEAC4ZnRG2rSszbho94Y9Qysjcb0pX2EsqqIR06uzgxClcvPAToCl
-9w2/d4OjRlf5T+225UUbqObsWpuBQ/Byc3HFFdLlHxBAoMZstv1LDA09/ZzrfOnd
-jMDRe3/etJn5KWALjAL4nqmihOxuLz7Dj8dUtU2gpis7tumPQg4OgOmysWD/YuAX
-U+uTq1EoA9nMnN7PbfcFWbM5rmATLeGMH70RJu4FMlN0/Q1TDeIhurGSpLwI1uG6
-5YNicKyv7h5JoBnCVVoK3k8YVLY89TzmTUW37qfYwBUMb6DnHp2gIB6uxduXj7Wc
-uCZBrqb35E/s4mGy2vuJ9iQtg6Wa4Qpmkoj6FEBLipAPD7W+Gju5PRm67/VvZE3O
-rvwZ5ia0RWzTp2I7IFFxTfkdgdQXLp4eaWg+T3dLUH8J93k+axmT69lOnkrLhsFu
-dYgtl+/2zXyalMPdKi+eSVTaRvFI0/opOTJbePAPM/kkANzaJEkVYfsZsi235Epa
-IC672Fn+tKor7RTG5AVZDm7yWcVVR8CpssyQWsIktDLXNaHTtYRS5p/a9De8hY8/
-ZtvtMtuzFV9TU4fptofFKl+RbaqbXSqkAvQT+jLRsmpzFJDEvM8z1dRyHTKVZdEj
-ofScPx9GufaICnm0Fhhib91lfvVvPXC2FQYt4MO9ainvstnp5CJ99bRBxwARAQAB
-=aqOn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
deleted file mode 100644
index 33cb475b44f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/2e3a1affe42b5f53af19f780bcf4173966770193.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
-DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
-tFn6YtkFhA15Aahr/vz31NBjUJlBmO4PwvkyxiF/MYP6TQ/AHar4xP1RxSYEPcCi
-dIQczQ8nXzya4OqOyTfibeGz/eiHHuwTLHi3Rd2kihQnlRQdhE1rmm8uTyzFe1H+
-P7WW7kQgygW6yxQ3J+DXrG8kG+nbe57ZY1oyv3F/fOBxzn/kuoKHZ3JJEMJmTIrT
-Lr1ngCZApgteAynRHk4t/SYZiyoyqZCuBcwHABEBAAG5AQ0EUqd5cgEIAL3PEOzt
-IFUibB6FYEkObVhsDbCnHw9yO5MAvAWB60Ohf1J4T9QK63jZ5/CiqcDrw+uab9I+
-Ruz/SgGyFS0UXAkwfTICUdhT5kUzZmGyoj2ul+iFDP9uUdEgSgyXXakrxBbBPzNa
-Mx8+GyIXRVFyRTH7+1gWgPQsdN1sGYOgZ+f8TMzAv6sxu0JVzjKXAAbXdiZTyJh9
-d6h1jS5Icilu8vRwn3Qc/ZzstBRk+eLbb69wS9YGoUlzYvDBz+5tiNwvHUriKc6z
-VT4Edngcr0mKWTdvD+AsvZffU0XK+vxbgMuRWi/51qb+VgK2gFeAseV6a+D1059u
-2+5Pn3h/Fv/vRAEAEQEAAQ==
-=EnO0
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
deleted file mode 100644
index 3361d9bc60a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/a41f13c999945293.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0cc641c3a62453ab390066c4a41f13c999945293
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
deleted file mode 100644
index 04fea655c64..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/93/bcf4173966770193.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
deleted file mode 100644
index b9936758568..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-50a628ffaf58480736b1079fd1031d14464180e0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
deleted file mode 100644
index 853cff28660..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/59ba7bfead3d7f94.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
deleted file mode 100644
index a99b5d7cf8b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/6214760097dc5cfad0175ac2c9fbaa83a8753994.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
-NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
-/1EO3VqvvDUt39gbaSqMCQNHctnFdb2QYZ7nRFTQeCqG/wyMdB05beqEnWEXzjeP
-FDF9y6gXkELn0lxUm2TKO8tU3h96TCuutDKJ0aE00lOeh/MbEaGHEbIU8kdfui6U
-znZ1X80EWbkCY8cKxEZHKD0aONSVHXwE6nETvFW9/9+K+sj/I7ytlyxwHsaQpi1H
-6aRGnq013VsIECrwkhmXBsLLXNjmhER+LkcDABEBAAG5AQ0EV5a8TAEIAN9uOpE3
-Ua9J/1WSMMNYGpfeEguI/HcMo+JIWZKwCiItISQ/yBEMEPLqmj857P2r5uBv1KT6
-IaJ8m9tU1mvv7zwtLFAQKytUv5mBMBnYuSoAFAnxdiH91M7oEwnmtIsf9g3ps71X
-g2Nih3rtbm5ijH5oKnqR4TuJrt4EdyTbDKrGKQKq9XOYB248KSQ1JG47AuQ6C525
-d/BvsKDVGdpwwwR8N3235rrK1j/wkW7TUb75VXEUc7e+z/9Eg2ubQ7jEo+RPX45x
-3j6HcOWGFG9Fe8j4wp4zS53Q6lRUIEoJmpsUpNWChGmwoL3bllFRKpubIFwiSrJi
-PMPVp1pl2Srg8sUAEQEAAQ==
-=8Tgx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
deleted file mode 100644
index 6f3f2fdb69d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/be6397e958ab7594.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-feabfb0dbd7a754822d35dd9be6397e958ab7594
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
deleted file mode 100644
index f6e3fba880b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/c9fbaa83a8753994.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6214760097dc5cfad0175ac2c9fbaa83a8753994
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
deleted file mode 100644
index 2ee06441948..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ea23db1360d9029481e7f2efecdfea3cb4493b94.asc
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=Sk0R
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/ecdfea3cb4493b94.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
deleted file mode 100644
index 0f732938752..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/feabfb0dbd7a754822d35dd9be6397e958ab7594.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGA+cG0BCAD2AHCRED4EC4gf9dHVaPuTe10GfgPTVRNVRbj9XXjW9VyU3EWO
-4OYlulI9sTXGvn39IEy8w+wQNJXYJkI3VHrymYe3rSEq85I/Z/NJbkAuWVs0HdBy
-QgFwObq8cyJLpi8f9MtVwwZkDK9VhQBBW+/Fem6y+KhAGXAE41DH4h50SNMWvydb
-kE5CqwAfwoPlSpbGhoal7pdX8LYM15aHaCeJImMsm5VN7bbQdYaGhmwO3jjl/CL5
-Z173d7LrhXs5nLeZ2VoqYnaUi/ja3cGLNrWHFsUUiKDI8Xu0vG9E9v7bsaClTrr9
-t/LIkvoOUCBbhkOGACXmDNqw2JkuCw09cIwZABEBAAG5AQ0EYD5wbQEIALTkIYJj
-T6jZmwF7oAH0T14AZo9odlnVg2QPuYWCGtJQOvFUu8SBrNW2voHHdfG1+EatLfYU
-kvpblFxt3KfsGtlQo064jJD/AD6reAyaREEWTluE8vaEyd7YwtJGsS5XX3oiViFL
-QWVQ0VLoZZSY2vIFPorXmbhyC30PBMDRnF/DrQlyESBogkz6O0SZtzce0R81UcE7
-rP7v+nXVgwqNttD3YeXM5alsO8bgOdexKPpk9f0SgpL9MnidY867Ms32rFsnPI0e
-chBd/j4X30co1iWW0nm1QPBDydBGED7aXt7uGhOup2CHxnH6iVW6vDYQ0+zpbJJf
-UxBSPWBeBgWXKYcAEQEAAQ==
-=wyy7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
deleted file mode 100644
index 0629ccfcfca..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/6601e5c08dccbb96.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-aa417737bd805456db3cbdde6601e5c08dccbb96
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
deleted file mode 100644
index b898fdf506a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/96/aa417737bd805456db3cbdde6601e5c08dccbb96.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
-WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
-anVQ8VL1Z7uPeqw4UbtqA7Or/E0aOhF3zkkmhaiE9Yrp+I3KXWH4F0Cj3X9IUcf5
-Z93CPcEFQx7ajxSJ1xw/mSgbU4AtKZXUdK1ehnFAhH3rcMVW9paFSYaXD8f+vUbj
-hdJOp3e9UYEFShsdwo2X0FRqI318ef3gPDpbTATyCaz6NMIybDgRGo9WOGwF+Ysf
-snXwLU2UnT44kpAzHjFdjZhQGcY1w7d8yGNrYX4qw/RMPhmuVefuF2yodBtRxhWW
-09dwNiIYFVuGS4S03vlnEfYZlhmRgvWZK9PDJXm0vE5GI7LdOKlqwZxvoznjGmUU
-lscRU57DtrNlAjyXMZaGdNfPIG85B+ijJmIb0REHbszvG6csX4g1MiZ+i0WID8Jl
-20YpJTUkkvIztXkAEQEAAbkBjQRgVVFjAQwAqfVaX/iL1guWx10Xum2EWJuCzu+H
-+RiAgt3KnxzXtMc8J4QzNV/Cr3vO3Y2a1qf0NO8o4dN4nHHXWbB9Vn5ntG9VHt1H
-a4WDLr7zEDyNpPiEe/sLrQLA5TD28kXIJ4WgDuVEYZ+z1tB6tkcZkUzx6182oxCV
-KHU9lYIxAvQzg+XAwFNoHElCYAQDTryKDxEADAbGDEYGFHM476/MEzz95LqgatDI
-WaxE6RDSBjnjSA44ZHsJGwcHjrmz+RXgFnhQjC/9ywSzNZQNWzWjyS9qgLmIEkHM
-b6mD/eQHrGA5SyvElqIJMMvXrRpnoG1l2FFiNn60wyuB+Fztfx9YgKlJJwdLfmDD
-QTuVInaLU5iTKvZZ9uh8ekajtYn3NUEbvAN1SK8gnWqTRhVIm/0wcBdtNViTytTH
-7CM0L0vx4FZpru7c2KyFQx2G4/0VxIolCzHz2ROD3s2oRTvP6B5r5EdCizrsJzrj
-Mljvw1hp99AnXfJPtNMyeHKwkfxVX8Kxnk2nABEBAAE=
-=iXc5
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
deleted file mode 100644
index 45e1dcebc71..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/145d819475314d97.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cdcaa216b086a7b603b638c5145d819475314d97
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
deleted file mode 100644
index 5e8d54ef968..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/4830c9fb8b680a97.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-050a37a2e0577f4baa095b52602ec18d20c4661c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
deleted file mode 100644
index 895ef3d3734..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/97/cdcaa216b086a7b603b638c5145d819475314d97.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFXaLScBCADeS/077Kn1MX98DGKx8EreZEwLTUulR8O5UbLy7tXJ1iAm5PYf
-MHENchh1w8YDsvrSk9bogOW+d6sJBCdTNRd5PzOoJfiw3GVG2O/ZeoGptWG0Ns5W
-/3foLDitf/v7ucjUsY79QE+6F4CWzV3wPMU/Jwjffpxuv7qiacJU/SBOlL4TJTlY
-vF2TxP8SDLlJaBKbj09yjZR741Au6RMOwEmWMn5yTi6hw4eD7lZB2gAzUrFJmzRp
-Fxl5j0lELkGyPeE0gzBq1m8YyQud97Mg7ky4P5UDu3iX70MlojBftP7hi5eqnYL8
-4GT0oQ7sM1yqNS3XOf7f/wqjtpTM5LxA2n9ZABEBAAG5AQ0EVdotJwEIANNnHzqd
-hHPjWUPnHQOBjZoKHA3/cs9jGm3FwPjnKCqCRNbC6eY3KLFg//fTUbe+k8L37AFa
-Y2RZ83rv2egKgm4gEtnXb7HHWz3T/1FMtR8qPtMP2KBQqQJIv5yZtzvjs0p7ad9Z
-5+4Gl8R5UkoIrYM1+3uPAbEAdJVtpjiUbqbXWKyFDVwM4FZZfdnqD4xzdAhbfG7D
-iuwrszIBQUOWgD8ZJr055F0ENZIK8HdOH7b6PzlPOLgSwooTE64h2CbialNhGmwb
-cKfx2kxdHPY8RJasv/L+JO//2956DAe3HA9i1Z3tV1gJXVD/ik3pdPv7ZtaTWrii
-qQcVuUXRuYSyIJ0AEQEAAQ==
-=oK7f
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
deleted file mode 100644
index 775b472966a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/a7764f502a938c99.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d75e25b78ebb19e47c0a99bca7764f502a938c99
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
deleted file mode 100644
index 4603c69828e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/99/d75e25b78ebb19e47c0a99bca7764f502a938c99.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFc7oMQBCADaIPEUzMrwF9gnEC+PRn2cSPG8OV4RxXxa88TZm0L7NF7D+F5N
-MNUAZ58oVqFUW+ytgb5iey3X7KjlJXZnuqES4m2Id4N7FlnvrmpeOg7MUc9VmNkt
-E7RH0O5GAo3V3o/Xp5nATUoaQ7v1WaPloB78ucyWLnH/iANw8YuxYuYUTJ0f2b15
-1oY1feqkpibbbO39kdMY36FH5h8Gsv0vvGdeS2O1p9vbzDHXEMLkNyKfcILLjbNU
-O/n2FzDL1y7hHXcFKDl6z2G7rKJCAsASH+r51YX3dOKUepE3pFcUbMAXGeG//n4B
-T8cv9YOhsYGaXBdbOMjy1WsZMvizbp0p6yIhABEBAAG5AQ0EVzugxAEIAMxtJLP4
-EGHrf/bnRuJHkyMqd/LEIMR4KszUl1AU5oeCxah7ZsK2MjwAUDD2UeLAIyANmKq+
-vXtma2wvQeOzo0QDMnxLqADSQ4xqUUcgbn71rjMq2O/T06BI9Lr2BaXeuYYjifA+
-loWzCbOHcgz78p8RRmxlChO5mWWlnrznDbUjV4Pih8M1LR/a2bUiU/Ftg14GPSrh
-ct9D3b5CjMIa4tqWMpvI+6jOjJm/ZD3Ux7WbzlHB+B9/yTw7n3pLSMXj/07PJKrp
-tUeJONprdN7V3wg1fnVS8CuQmLKoJhU1kLnucgnCFQMaHThhjxdaBMr6Mlq3urT2
-BSw970AB1qV4Wg8AEQEAAQ==
-=ysRU
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
deleted file mode 100644
index de3b80caa5d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/3692c12c7e3d336a452beb254e066e0459cd109b.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBErvEZEBEAC1bM12HNDrdM7hs/4Q40+mq2hA3w4Cfh/SqFxhe8r2s1Z1PJHM
-tY13qg9XRH1PsUer46q1YF8Y1lKc41Nm3wYab6sQqN4WaXZuerIfRzHCMkf2c9rk
-6RWzIsvSIYjGsrkRXqEXPLZ6CLkBSZaRsjPuiNulKgk7jO2tN7qmFEkbdDOJNJiD
-VGM3Z4aCLwGNO5OZShDVEDlaST6hD9JCqHXYEmCLDBHFoKtkZQ+m6GQHhR+BJDA+
-WihI9zcrkor6gyLyVeaOO/YqEVh+eMpolzTJPUkKb3zGjDHGkBQHWKzKVK9oNZQC
-6m1a3pB7qTtp/CpaMvFbdgBaYbJUb5kfY0S86qPfEzV2Ckg2b2uR+F0WTMbhfcER
-E7PVMGCkJbt18l8pOejgZmsqGkw8du2DMBO+9YPyXn+tu1Xkq3yR76zShk+5b0B2
-TpwOyopiWJ327C13xcYRwYhc/MvxupdzczVPT4Jj8U54Ykzh1nSgk4Ry9qgQeUgG
-CxNObrIa9B3tLzWnPhyfHc8ZdGIKFZTdZYxO/aof6iY1W/zEefJSwCOprwq6ueVH
-TEEDCUdN5NlV/SFw3BzCMDxTBO+ksUrvqTx/MdoPqmYwsXTEwFppTlhGNBTXKH2D
-QJtMNVU/FMll8hpE0SS/tqiNzcVwRpmw78LgnTnh3DDwsDgCXhzji1xgMQARAQAB
-uQINBErvEZEBEADF3g8hWVkCfuvFFrzNCa8XpwRmV9LNHSIC04dJcZyoBO/Gtikg
-E6cDvrsA6Vd9Zmh89bTVci2yEBCet6i602AcVrTS8ckedYPdN8ayQMq5FPVyEX6E
-WIX1YP1jSiASTlse0Phfw4C8OtEmdfYNue/mkX/NcXRCZEPTqpZ7gRTezB18jlrf
-dBIGI9rl1HDfnosZnXRLJqZCyZYKUMeSXqzXyXfVnipGF2Oa6Z+Gh8jZbGao2/o/
-qL1MFTZh3u/AaSLq53PmTHPIDKSjNeBe3sE/abfgWL5SEnN3Zt6WWfwRF/XuToin
-DXqt2oZJkVgIT/4JRLje/BCdDpdTaKlrLc8tEMEczcxMy1wriWiNLD1z9tRI23gf
-E367T3fDZ5M88MrhZYqIETrlI3FodOuavL3zBxzN3KcNdzY54jzQlWC8UdzleNv2
-y7fzTJQyZsUb+IPILOa4x3dwPrqNShhQTafDaZIuxFnZT7xq8K/am7qinA8NP7yz
-Fk87g1Susn9JhlxwjZnj4Quyh8v0JQSZWz+XwPkV+YSh+jFfxM8l6rNc0XtzcCK+
-dBSYcBek+CVgTWnFOeVGjqjuzIPVNkijy3d79hKZSF0/Qk0FHG2BnhalNIlVUNMk
-9qkKNFUSefS0lPNEKSqC+TPSbIf+UJWRDanO0BGOBUZ53WKutENQpQhl0wARAQAB
-=/gBN
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
deleted file mode 100644
index 07c7120ef60..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9b/4e066e0459cd109b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3692c12c7e3d336a452beb254e066e0459cd109b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
deleted file mode 100644
index cec29c20c59..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/c6fc46eb51cf569c.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ca491704d613780d2bee00f2c6fc46eb51cf569c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
deleted file mode 100644
index d33043ab7a8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9c/ca491704d613780d2bee00f2c6fc46eb51cf569c.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFwrYN4BCAComkN3DymSPvTeAV7G/vBEYFKEANL49MeQttSZRzHmGAIAF9Iq
-fUN9Iwp2Ii40sdUV1+03SVnprf5M2xdxO42AB1qgHdKcyQnbUM9oV/i+iwSWZOjU
-23HTSaKkEKgVGfQUQQbXibQiANTJpRmKtOtWQsz+zfyaiGKJEKEa8KZsm6guibp/
-2omOJ6xWrZNszFtQsq3fsdhTVbWTHTpaSMV8Wf4Ue/g11rMrR2CPqzMFrt2sOVVy
-Np7c6tzdDeLYzCDfS/4QS3aGRuyxnt7uNhH11hzm+IvJS16Jg2oVK4lKH5FLh/zl
-myX249Tb+ht1i+daMEn0zpPqiYlNtCTLPLMHABEBAAG5AQ0EXCtg3gEIAM48wHoZ
-BNcXlO/bQTFel8yN7vxzcq8HvAr6iuJf7YOx0rmbFZ2AgJ4hqiJxwx0kGyrgaJaB
-xseQWnkOmm5/A4ivM5RPAu2/NQX+7enFUCS7zSFg6aSOVHJvcs8oLKrAYko1kODW
-+lz2f91p9IbRDteKzfyK7w6A/oV8zNrOpilS9esVroUbQWLPf/lU+SKQnhmp+/mf
-xSDRf0N4+7ebeNOTX6yyvhz+Fvu9OaH7CqgTsSk9k9muXeCCXNfhkq1/vdx8aFFm
-3L7ZLQ0mjYwh0Fz/M3wG0t6U1fsOkD7O+9GSoaDzuF1iK8OlvhI0/bJC9tYlAdB1
-D1ag+vHCAXqDThMAEQEAAQ==
-=7M5v
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
deleted file mode 100644
index 21ba0ed5f92..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/43203be58f49479d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e83aabbb95ca37431e20422043203be58f49479d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
deleted file mode 100644
index 1f1b50f1926..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/bc900cd2fc9a9d906ecba48be3822b59020a349d.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-NUZsDd9Rnh3Pq5EAEQEAAQ==
-=DBIb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
deleted file mode 100644
index 43a7a8a00b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/c1b12a5d99c0729d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e3822b59020a349d.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
deleted file mode 100644
index 497c2b28828..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e62231331bca7e1f292c9b88c1b12a5d99c0729d.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
-lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
-3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
-FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
-0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
-UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
-0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
-TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
-W0JEQdCUVgc6MQEAEQEAAbkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83V
-rlAQcR2WulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9z
-qcRArx7aSaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpv
-uq1ZvL3ndApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0
-JA3MHOk8gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2
-Ul1C2OI+tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9Rao
-gEyFmCxiEuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkG
-qgDBQGC1PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gry
-q/vyQLg/KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAE=
-=9mb+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
deleted file mode 100644
index b2e17c92ea5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9d/e83aabbb95ca37431e20422043203be58f49479d.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF1Vn08BEADgfOupXhJxyb3t1kzDNa595spJptjF5ViyXuEJtlMQlmobPP9L
-2gZH83gNe7Ro1TsLesgWTtin3hGANSKITdi/wVH4ET6lPInv1k/8hXe0zlF11Zmi
-pBxZBhFl/ow2g+V604RY581hQybIxFhjnlMoEhooIZl9x/GdleQBsrnPdKnllmO2
-jxU2CKjjnAuaQusVXYBMQ2kCav1TrgZSr/5Tml1xe88p7K2zl1Ihi0okSJJ8CyR+
-s/I/ZngMX6OzlXNHuM2uCd1BoH+9aHGrUqQBMIjo4HBMCri+fmkAKod4Rc2lHo8n
-htMObZzRoN8wPTEUB8GN1chu5GOaX7Xsy69TQxvIs5SX7Nh5wDACk/VR0Try6ZLw
-pphhyeP3aYHvZAd+5+wuCzhcHpQQDnezhhZgeWk/7T2U/uut7LEmC+yRNhwmnWag
-LycLJ3N4dBR1VYPRMWTrbH8RqX7RpqOaCVm9oKxWtIgDsRW+nNg7K7zMsaCC+pPt
-U31ju/eKRzHVw/2CpcrZqbbQlREGRPfPv3zS5vb/rAEz+QRAKcq6iLKvR3c/hi5T
-KZg2I4ZX8Mw0aoRygku7F8gpI+WEmvHgd5wOeI8mlGGAoEwSfgQq9tn5EoxpLtzD
-8eC5NpEiYpUNNMVi5uhYdI9mYdp4WfChdsc6IkPvM3fpt/eHofSqci1rFQARAQAB
-uQINBF1Vn08BEADFtEGfSbLZTO4iKKrg2NSDmnAq9gGjtLnQ88jpzMYR61B0qSSu
-at8jUBfK2JEuj8VzEjHkYWkwCGZrX0Aq19ZtZFExohAw1btkiWtHj8JyCsgtLpkN
-+eNZH555dtKOqzkPRqsrVxtmrB5VsH74nGUmsmTG7uN7eCHbo+xWXvn7zgkiMWKC
-z89Ze4vc4kR0CKHQYs+mJVkWUyeq1KJY8a3ciyDu1wEEgA9RfEudUnuT7MvI4GBY
-0/Dqm81SN+Y0vAgBfQ1EmIZl1IUoow+sgmYFzBcEoVinbEnZH0iQjfJtJ0ddUPpC
-VI5BP4Oa17REL4xUvVGexbJCduXWK5YH8Z8fT9KNBw3or5B0xwEvMAFZfb8iD4Iu
-1rwNOv+aNQVZel73sNLNIbmvz8PuD+S1uQhAgZ3nagh5uajYF+Mh3TsE/+ZL0ChQ
-tlkBUIPyMEGqE6YyNv4QmpdiMXeHIXwSLl/6Rre/ynK1WzDi2w2UylEmdAb4JeqF
-kz93UcDmOL4qqs5WzJisKEubCzRS3sZ8HRESkc1iUkcN6ez3BtfqAeO+9AqZL1NM
-5r4xW13ZRP6+JICdH6eqT2iRQoGsbnGWCnjp9Tq6xyYDws7p3WszrOKJ5vBoJ7WY
-7jut5eV+Qxt7phazndaslmF2vGVc3tQs8cfUhyRgVHQmJweNpwiqAlQMvQARAQAB
-=d98R
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
deleted file mode 100644
index 0bf7fa00788..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/d4ff1f46313c1a9e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints
deleted file mode 100644
index 7b22e4face8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/dff2d25e2cd6139e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0a123c1ed3f13a6a0140e166c71fb765cd9de313
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
deleted file mode 100644
index 38f48c56106..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/e0130a3ed5a2079e.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa1703b1d287caea3a60f931e0130a3ed5a2079e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
deleted file mode 100644
index cf5e8eaf9a0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/9e/fa1703b1d287caea3a60f931e0130a3ed5a2079e.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFlMSXMBCADcgN0/57D/gU5cDobPiRuDT6qAxb/NWhQiqwAocKd274r4gPJm
-RbffUEZEgKhjH6l0CQfilC4R4x2QtU9sNC9kB/D6zumoS1uI0Hmx1pC4UseUy55r
-20WDxujUQ7OcJbpe2cDcQVKmMok2top7ZJqt4KVosQEeT9jjsgBBbEtg4cWb5ddR
-5rf+aJw0v/6dMLef1r9YAo0ZtLc+g2dyacqw73tcWEd3oCH++SgE26NntN+GibZu
-VXSE5u6xI4KwfT2vUT3jt5Fb29myX4sxsfB7n/xageuJYy5ms1ABS+WDO5ssEZC4
-eQEVL7eyIb9YhNAW/WtjeAuOfOKNonoqKFGXABEBAAG5AQ0EWUxJcwEIAMgrP3U+
-7YCibxSQKOZrp63RaSUkv7mCvQ3Lx4P4ZD/sDEsLOiKkAc+ZU7ETTIQkEpHaibvC
-ZNrA+R0pfAj0LYBLstEIkUxtAaVM4DBQGN13Zdup46fI8rPZEyZVb2XpZ/qS4RYi
-StFyJzUdazBJs/IB7CT0xp4DUFUOrsykVy0aWzWt4z0QBe1x3AmpAO/DdrDN5gvt
-mWzWbV3f783PuK3g41ju7F9XX5nuuatNSNHOHt65XL4vmhmSfXuP6UFjK6MKzq9z
-pbZD4ipUPoKEId5ONDSucX4C8OydpC8+rFWJCDDDvocox3/l6TzihQXf8MDDcB0u
-1TgDPz4M/S2vBh8AEQEAAQ==
-=Q2Ek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a0/7ec19439e4d4c2a0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
deleted file mode 100644
index 91a7375d718..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/0cfe993cdbe1d0a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8756c4f765c9ac3cb6b85d62379ce192d401ab61
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
deleted file mode 100644
index 0bf7fa00788..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/249dee8e2c07a0a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-253e8e4c6fb28d11748115c1249dee8e2c07a0a2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
deleted file mode 100644
index 5320cca32c7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/253e8e4c6fb28d11748115c1249dee8e2c07a0a2.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGFcp8cBDADrrm+f15GNXnwAneAT164q5fCsp5CifXMPUDAkApC4o/YEC94D
-mIiKfV/RLBoH1gcXGgiHeJypRvCY94xQrFl9lHB29+8riW3vdYCy6rS07GjfUxu7
-bKOALZ9fsnOVB2B7A+i0WUlNXgBPfhu7KSqQwKG912uaTa0IWA4HKtC31nS3ZvEw
-7bheDBBhOHih7oxJLibcI6KZ8NURFpl2ZeEcxyBJYo3MrQrJ+MWoOrfCoC+r5aq2
-nL3DFb01WkA/2i9/noWyZNYAFlDQEcLkjSdrc6rrfKYNf1L1/855ix0eYCP3UNOC
-zHbtZ1FupnjHEBk+H0CPWgwj9QHb/9AF6rP5gVeSYrnmzjsBDd46SEaEdRD0l4Pi
-ubWxZj9i1wFlPKmD6MR4AXJ441IUbeWFPzaBmjsCUUwMjTyTZ4WSyeko9SGGzpdK
-kUnnw2guvsKtBvJhKKvmkAHc5p7uRy0aQ6V+rAvbdWARbXcAY+xXJ+A/7qAxUMJH
-mvijGOctRMOBy/8AEQEAAbkBjQRhXKfHAQwA4//n/Vw5eMdFUFc7+b381d70FhF4
-E8PyDMFqYpi1t407FhNt+zsr5qPPVw9Nt5/fKTCvql/eNlNcTV4+eFUl4VuKQU7f
-dvR8LmLjAxG0fjUoHL7PzIV+Iae4IBZz7l12BvCaA2mKPHTPyUOZifGkZZGNFtp9
-rylKc5UEXJx9J/H3mMDd3fIQwFaftzRAoH9qKEFDgGjPOIF96XIrlkxGyfvwcCVn
-hLUGrox03zdy2hm0QDgv9DphuGeOc9Cyld11z5OT56j/QsEqQGJ97Vxvwsyh/s34
-rLIQOxIxp6p4CvhGiO52V1aPLcKfMYjr1rT5e0b9W3U+jHk8hjHIDPELGAm3Kmxb
-KbjSWrFANpBk3+OqxCmb3eHTlIObWPLuTLv/tJGB9G7xmkNWH9UM4zuCrG2f18YK
-lKbLdd4ezVDm6odFPYhZuDWNkYfk4jugFcpHZ9C/5KUJ0+WFkQU8kCVg0mA7Bj5r
-5BoONdNm3m3C1zGrtxzAiSq7qzA/yxCGxNAxABEBAAE=
-=5u/h
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
deleted file mode 100644
index 43a7a8a00b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/606cc6c4533e81a2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e62231331bca7e1f292c9b88c1b12a5d99c0729d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
deleted file mode 100644
index 3af575c8f57..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/92bd2d0b5b21aba2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7616eb882daf57a11477aaf559a252fb1199d873
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
deleted file mode 100644
index 8acbce9e3f9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a2/c3e640f38d845fa2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-afcc4c7594d09e2182c60e0f7a01b0f236e5430f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
deleted file mode 100644
index caed7968c22..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/1fa37fbe4453c1073e7ef61d6449005f96bc97a3.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=Izx6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/501b5adef57ce6a3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a3/6449005f96bc97a3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
deleted file mode 100644
index b5e9e1186a7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/76dba0d142fe15d6a16f6b3789af105ceec705a4.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=xF9l
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
deleted file mode 100644
index 8c912e167b1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a4/89af105ceec705a4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-76dba0d142fe15d6a16f6b3789af105ceec705a4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/6e50bb68cc1699a6.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
deleted file mode 100644
index dfb914f64d4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/ac5ec74981f9cda6.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dcba03381ef6c89096acd985ac5ec74981f9cda6
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
deleted file mode 100644
index d8d6da5b047..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a6/dcba03381ef6c89096acd985ac5ec74981f9cda6.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF0YzcYBCADmNIEEzvSsnJnxH0u89Hb5vCCkl+45dWHyCMsCLNty8yL214LV
-B35gnU+6BvRXN3DmTpreCV8/wgI2h1eq83dTO2AsnJTxTjvYpiwAtWhONxWxCU1Y
-WlH8Fsvao51CJWUwYY2HzFr9j7h7EOnm6gj2pnUDdjHRgou9/OxIk6q3M6hrwwh2
-IXw6PXFmkg4wRwlqW5FiC90I8gd3ItFCzqx0TR7DuhOFhtvOheWMlApPoMOUY+6u
-C5Ek6kVW5w5xshKafS7p2s0WOsXkOnH76avFtkBtcsPbHkwWTal4xivSMMsCpdPM
-cF6Fr2p5hF4khQ1r5pdmHeYNoXcC+hSnPM9tABEBAAG5AQ0EXRjNxgEIAKa7sUZb
-z0gyyJG0J9aHlo/AvOZZpzMtd5SFyuVyXYYcqLL//Mz7U+EWPT3ZOX9YKJ/Tr3id
-ewquXH087Srpxr0tLIdmrABXwBssfLGSXqZCz4cfkIcQytP8Wk8sJ9NQJLI1HK5E
-laRsmMJ4yQCYH55UcdAt9pFEdVMFbgR/EIcC3At/Kz/Q87zb5oIfAKBSHu9NRqtr
-iSs80dX7sp9JuoIAKTdvR5tjndwC9r6n4Flpz68nnwKD0y6e9RGKB3XXU9k6SIqU
-DHrHByrVnYdwkVOP6O1MbBp5ckSu6w9eFbU3GJSoJ4p7ij0jD4PalgiqpqFUYqeo
-9gNhjd0ExTcYeIMAEQEAAbkBDQRdG4WvAQgAtF9mZmvdsZaWF+u4+bgEDZQ8zzUw
-UrmnZtW/K8Xle6T/4KaOjiBDeiY48IGAcV21oKEOiegaVx6AWkiZ+/8d+feLofWV
-Hwk0GE7MfrEniddVF2mqE3neXSrLn9L747WDhP9PTtkSSQLj523qC5JaIUkWmz0F
-ofK5Gvw2TyIrchUPtm5G4rvYzsSomQY8I+eyYePqnD/FsoUlvd4FhKDuLOU07T6O
-xoui2s3EWornJ5llJoghT11Q8ZknZXc7HUYdF0GzKWGebRz1sIaH7ODy9LLKvgmJ
-JEXWWVfUDQL+T3LjRdsNXDuvnsD9qC4iESlmm6zlxOEtOo57EVjJBVHh0QARAQAB
-=3i2O
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
deleted file mode 100644
index 24e073b181f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/019082bc00e0324e2aef4cf00d3b328562a119a7.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
-0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
-wojLPkIr5tVo4ybeVIbQ3N4+FnqzpNfs571KZHUOa2unwdgGK7OGMTxTkP8oaRwP
-H5VenaKoknbLbp2CUchQT3pkv3Yio+NIDGgZ1VmgOTqczI2KZe1viqRY32rBVKr1
-684Bgygf0ZfzMyKd1xK5UvDGhfQU+uDZrV9f81YMqJ9dZFjbZsyIhsEtIloTp0/Y
-kDtUMlkXF1c8EExpqTEUwEBwV+ow3IKVv3YDNNpZ8g8TQa7wKcpOia7UmEdXraY6
-PdP5tzClCqV0PqOxdNh+En9tw3VNKqAjQ9EE/nSbRz5d0JgdIA6SfPeXqAK5hxuT
-fdOdleywcOa1HRVN4xoEsOljfQiS1dz2xzou0mR1NpnD4PuGRdx4wwYGmkqulbbt
-1wQJRd/psyFfnpxrqk9I4frouzxMcrPUDH+T5qAVfkX3LG5XRGFkScWbZ65SXXB6
-wg6DsFNUXl1is01Wfda0TvBXdjO19RdcVSyD/DlAlXukmQb36Av3pHatR5Y8k7xN
-c1tU4G6dSfiD/JjwnCTzfqmHBnS4c2d1JKscPGRy+Y82Ghj2lPmunn6D9QARAQAB
-uQINBE4rG7gBEADdSXw7MJF5zFEN7siT74kGxyBO40gfhW2HTIbGXyUHKGpknHOH
-V3KYS0GEtvLc8QGOHv5qLfYlCejD5cYpzoDcWIUo1KZiaqG6LulcAy8sDuX3o5z0
-LpUikutXeIxGTgxdpc3SfYPhb43ir6pPI42MhgFOOAAhHLo9yE24G5FYna5S5OZx
-eOWiwelhYUxBMTIyA+vwCUii91ZSO5ByPU9d0QJBS2Y1Xwp0SDDa5z1x+SYRx1XO
-a8aD7/tb+K1G+giuedY5J2eVKvxFB0ABqdTNT1tj9bZmXqfKEjpaziXa9WVSNNU0
-De6IYZFsDJ9yC/3mYBB4rNd3iqQnlH6bTIaSWGA1I13JZQUm0dJet9IwxP7rCgM8
-lSsPXjvdTvHZItIIYQaMihUp3360G16ESiVRXIXwRyUztm9MMNhVzTkFXkJ9G5WX
-+3Og8inNjzJViJGfqgZ4KNlXql9/BtqlsPcmTeMoZf2LCz86uTfUrhf18AVJJq2E
-B/R9M+TWQ7R9SEpQ49RoZUfVXb/HKVnWw9OjJyGFhc58MBGyT1VNGpvwDEzceJfG
-ri71lnyCAddNc10wNyfeF069wVoGTZyWklWgC7UB6dUn+9TYN2/ZpHtDzzdAoEOp
-pFdqib0+xfeY0mt9k0/jPvK2wqXMY3Vi2nvVDQNUEEJxMLSFBiqAA88EDwARAQAB
-=ZVwp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
deleted file mode 100644
index 78a05175483..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0d3b328562a119a7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-019082bc00e0324e2aef4cf00d3b328562a119a7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
deleted file mode 100644
index 558cfa662b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/0e26a79ffe07a3a7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e5c3b1929191df06136ccb2b164779204e106a76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
deleted file mode 100644
index 0cae4729da7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/7d1be4480b61e2a7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
deleted file mode 100644
index 8e0902f80d0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/a7/bc7df305d87bdfa7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ea23db1360d9029481e7f2efecdfea3cb4493b94
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
deleted file mode 100644
index ba5624358d8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3449ec3ac2efe8aa.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
deleted file mode 100644
index bb7977de5b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/3e1ac64f4e34e290503c90323449ec3ac2efe8aa.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=GTCz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
deleted file mode 100644
index 0fbeca4c8d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/aa/cb6d56b72fddf8aa.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa77dcfef2ee6eb2debedd2c012579464d01c06a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
deleted file mode 100644
index b3471a55708..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/08f0aab4d0c1a4bdde340765b341ddb020fcb6ab.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
-xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
-qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
-TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
-vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
-+fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
-0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
-Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
-YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrkCDQRKMGw7EAgA
-5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4HaR+j
-NNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw3PcE
-gCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rmwcHG
-opSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjLx0St
-a1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLjNnF4
-SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8486U
-bZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ7hsr
-Qw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxjPY7R
-H41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUGpU9v
-xZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXNYJ/p
-znXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMQ==
-=3smt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
deleted file mode 100644
index baa96d37f71..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/3b2a06173073fdab.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4bde772c338ba540e1057d0c8ea48d105232855d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
deleted file mode 100644
index a7c567b4543..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/b341ddb020fcb6ab.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-08f0aab4d0c1a4bdde340765b341ddb020fcb6ab
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
deleted file mode 100644
index f30d19535b0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ab/c64121f5021754ab.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-223d3a74b068eca354dc385ce126833f9cf64915
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
deleted file mode 100644
index 8942c969bea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/a7e989b0634097ac.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
deleted file mode 100644
index 1efb468cd8d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ac/d908a43fb7ec07ac.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cae38bc93d90b852d88465dd3a1959eef8726006
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
deleted file mode 100644
index 8f7648dd909..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/0da8a5ec02d11ead.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-517b94f8d0a46317a28d8ab30da8a5ec02d11ead
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
deleted file mode 100644
index 013825e272e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/517b94f8d0a46317a28d8ab30da8a5ec02d11ead.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
-2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
-gjkS5eq8L04f5CSuXO7r1eLTOch9iDl/ESaI5Nhq9A3mRQIhQalum+FjzwCgx0PK
-hoC4MVPVGXzOQPc5sG4jzAUD/0OX9c/yKQqjHUs38HTCgrjseM40iPhp8NfbWenP
-IwUMSWXE3lz0MMeKrGcEOcZOGWsjyepkLHXwj8DDOeGxhfh9bhFRJssdfzOCKBpf
-6S70A3fanzqOAvddxCqF/zOwDaieDmWvVntVpmZO9d+pgR/sZN0JgSIm7qGDdNqG
-Aq6eBACyywfwuVoY6lfNz70ZZqYjYuUkbKnKqpG0XmI+m5LYrUW7QuKJqaNdg+ZL
-vVgX/TdkWVSIoSRS5+eYm3fRD++cg3ZgoR6ZY4WEa7SRSp2zoidtQijWOzp8WeHs
-30rIaXBrb5wHR4GQ4FYsBGRuWkmIaferusllUmHCHFJI4ldvgbkCDQRNyzHzEAgA
-1rD70DvCcy91ShQKP2snZ4cLJnFwKArulDUcxoBZ0AG0qMbaE8jiiJTHIwgVrqsK
-aS1JENv6tVdUS8xHswu30zvd0obaj+4IGXlMVdc6052Y4SLAGNbGVw99Ah1OkQ7o
-v92gmYAYfqppOtRt1tylz7Jf+F6er0umdVBZm8fJ+QjzTw36AwERj2bjVbc6ogM7
-OsTyru5oZGOJ+oJU+M9/mh/Gq3AyrcfU8c6bL2pacXwylME4lxy4fBB7BsMogPXX
-iplZ2XRH7RmlZiAfLHv3StxVB1RrLXVcjdnqIO2guVYrK6mxH9WMG4LnOGvcnYTf
-GtWexEmNA5l8IOSgsK+InwADBQgA037clDFi3XWaZBVXst7IfkU6bKq9vhmphS4f
-uBx4wp7MBA62k0kGDmZWcbinZWnybypili9ihYSHlp3EYzCNTbUMWlbhc/ffYHuv
-rZsIT2DxMPb2iCnjPu5HMGegTM8iTTotW4xYmJUsEDIvgQUz0/UNsPHTX5XU09So
-cL3YOP5MxcEbgO0Fpjny3X76rc+ETAd9TmDJi7HOm24grKdOQXHQJr65j7nTc9M3
-zWnTxOP3fL9jcVnGTnLGRVoR7kedDpa5FsoFqtY8YMaFvNPVvI4+m+jozjNwTg2d
-GG6nU2dEC0qgDEeKMSJwF1wgO3Fe6mXHvxratgNrqfdY/rtEGQ==
-=PkzR
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
deleted file mode 100644
index 2a911f2525e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/6cb87b18a453990eac9453f87d713008cc07e9ad.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF99kCMBEADE22W+h7w4R9fHyqEQV1NpgY2qI1S1HlwSQLQnf1pt1k3ZvMzX
-Eh2q9lNAn96O5TqpiMhHm2ZEDORqXqAx6hEVpA5iy+7NrIaSpxcbM0crUxSqoceW
-xIulkSLhjE47WcEdOwrfaf2z+Nzk+lKJdBY1JykqZev4ySB4Wjwp3p3ZXorMixe5
-BjFkxmKpLKsIH83x51G5mCzL4pIvQdfHXAtWdVeUHQbqF2hB18Z4lPlzrdphbRc+
-F3fQGO3vprMRUVynhxseqYNDSqe3QsQxvB3MTb4wRu11OUJDyJCE/rAphQglxV7r
-YtkQuE6KH4ZfdA8StsQMKAeuwZMWnB9fqwZWen7ukDFAyHsHSuHWqQjh9dEF2jtT
-WXo0/Y/DEyMHEbcF2D69qQkW8rJv77DYhKmdGVllI3ZdA8Ps3In3WyuecBqKiSr6
-UPY9dIKQPKg1q49OXvbOo7dQaW+9Rp2jEEnH/hW5F4rxrAhhyusIFHK1of5CqtZ5
-tgdEd559iwpblEnQirIMP7jzH84yp2JY09gWoaUeSjUjD4s0N+6QZlc1bMI2U9c0
-LQRi7e3OigloDo/+4JFcOemHONjuNB7Sr8yFMZH+daAdbabkROoFWQg6+6gj1biu
-E0OmqL5o7eA/dxQGp+3bAtH3uBkrIkuBTVurclzRFNmftwaGq7Y4S4jAXQARAQAB
-uQINBF99kCMBEACc+NcODwdn4l/mMfMziKRsuwsod0i0O61NLcMGmOE5U6Ba+Jcq
-cKH9qULQ8PnUTPnKgDvaY4gSU+umrfz/ZAQSjOb2EJ1W4NdPvgl1VGnzn1YQZTJ0
-BtfcpwzdEFrBPLEL70H+Wc5POfhDuU1WwmlOaBmL6wAYukHtsWiYFE1LAcRrvc0f
-ndlxwq7oAUNe1KFD/yBVPMsde2H0E6tXqk05mCdvmcANjURyqx+IF99AOenMEjr1
-xEUfo0nLcZJp/hFXJ0Urmt9+zIlSxKZJP0wyYGuGdZGQhyqEr+WWE5e2Rqge6n7n
-twd7uNNu1jFZ8l9vKi7MaNU6J4jRKDmQXqVMpqg/5EFNhuZr8EeCc91F+1RXv6T9
-bYImDaL2u3ZjDTF6vkL2EOb5TNMHNSS+RyLMGmhx425saOdCqMwZiq6W8GoK2Dda
-DjUAPZNUW3BFDxNGIWB8QPZ6CZuv9j5v85Dyn27OdrJUF+5TJV5TTvjuxNi7RAgg
-ofyiNXEKm8V2FjlQq2S9v7Q9AsXpx7fJYOR35Ir3eC1UV7EigpdmSLem2wZEdfSc
-3oftIA+2HFcafuJtVM96q4YvEpo2LpKjrVR1sS/9tnO2iy4SSdgWp23dJuaG2MeD
-PzD6zehc3enxhcurA7GomOcGNDDETVaSPzRd49aErmjOF+w3DOT7A6kvDQARAQAB
-=gt+L
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
deleted file mode 100644
index 65b1cbfce7e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/7d713008cc07e9ad.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6cb87b18a453990eac9453f87d713008cc07e9ad
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
deleted file mode 100644
index ecc6985d262..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7186bbf993566d8c2f4f7ed7d945e643368fef62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
deleted file mode 100644
index ab62f210dd0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/7494750bdf4f8fae.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3dbc5d7dc2fb8dd68aa429bd353a436e043e3145
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
deleted file mode 100644
index 2b518fae3e6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/764be739ddae10f4473fecf0aef385ed6ca815ae.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF722yABDADQFCoMvjoHc58wS1blOVmfsH7G4Cnm81PJKpjfzY15ZkJSOyCz
-+Vpfsv8CJdB00gc9rZyOE8AAjZoBjVOVgJnRsxy+VRfKfU6qfWNmngsMveQwdsIO
-1Vk8IdGN7xuxWzVUnSdPmZ8xIzhnPsaecNWuW5n6NjVRJ+pw2oIAA5LLU9m3jcfH
-gDFIe/byDwmLylGNLOJ9D/Qvl+kvxCTHJIX68BR1fhLM2v5NStDzEHRk7xQeu42F
-6of7n7+R0xVR3VV2XmaZuR/gDCvq9f8b+qx80y8DMOfgl79UeXyeekWkr5zxiLZp
-riNAaVOGatFnjD+WfW5gggIN973FO3Gr3+VubN3rq/LSsLvLPjVTOD8PZUrrdyQA
-wwYXKDyYtg2gKDt2NE2RNx606BRRTsN6AC9dZCTz+WrMKh1RPPtvCyGyxWDd/hhd
-DRSJ8OoBkrfxKd8yrSjobRiso48IvjPHyVd8JPxkNAWQoBE0Sv9GGkXeJ2DYiUNr
-XQeK6+SWLLm/PK0AEQEAAbkBjQRe9tsgAQwAvowEd8ZErQ6o6iocwEy0UJAqxEVm
-DEOLbQ4lQrzBtF+pvC2ra5AU4jUlqfZGXjAaSaE83C4TFE+cuOhUhRz3rhyjwZec
-YbMxeWW4vjk0YRlGdKIS9qns0f7m8pPyoiEPd8VpBM7Diipm2yEoEb2Le+f31Rfg
-+sqFiGu/+7eo6uoseuJFVmZ0pCN5T7y8SOptR52/UvvRAHbr/3DbVXWt1J8HDqK2
-lrg+eebm5zb6i531IXdsu/926bCT0Ch62qc0ARNyzywORkS0WTAYJAVFkE5rQthz
-Q5RnuwjVV07wgW7GqeyFZMCidWxBduHjgo8K6DC+Eim43YeMcdbVMpsSiIqKRwgs
-kTeF3FD2+smBKVDEFyZPQ5b3nzkOemDn0b9FTq2LWrJr5YMxDJRJKrio7JgXV8Ef
-PebTMSCGt232l46YH+vTq2US7p26sk4pzyApFxW7+oVngw7xYzbzSJJQHeXC+2LL
-Wg6Z/DPLMNxuEHShQMoQw6PnAjJ2j4APV3kdABEBAAE=
-=k7LG
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
deleted file mode 100644
index c100ad26752..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/aef385ed6ca815ae.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-764be739ddae10f4473fecf0aef385ed6ca815ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
deleted file mode 100644
index 317a090c834..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
-9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
-DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
-KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
-xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
-BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG5AQ0ETz0uqwEIALmEZ0xN
-tuX1cLsNUzzq0HVzwDiw5IquPWy33McESXvkaMyqyQtYisW++dY06MxBCS3uV4+1
-nKI6oA7Lk482ixwzbwws0Rb8H5CeLHDEwGXfthmLAvDdxoNCUYAtpVOMGcbGpy51
-TG3V9i9JWe1px+kvhieX9BLfDzP4Pldho9lK2gYRhmpPDgUOjYZgiQXMmIPAYfdH
-IA/VdYTETC0lu4Adb56SzOwvGMpnd3rXWUiJbZg7lW97hvbOFMKudbNjBCrF7LhW
-Ah089MU9rvunuz7mquVdNtfEBkdVrqZJdvYiFBee4RUe3+qGCpHnLzynOGHr+iIt
-DG73NR9fZCzl1K8AEQEAAQ==
-=FVRo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
deleted file mode 100644
index 3477c7db965..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ae/f6d4a1d411e9d1ae.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
deleted file mode 100644
index 0ab4efdad3a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/030dd9087c31c9af.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4797b4f5dcc46cea61059071a1ae06236ca2ba62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
deleted file mode 100644
index 0cae4729da7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/af/c2148900bcd3c2af.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
deleted file mode 100644
index e60869fc33e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/314fe82e5a4c5377bca2edec5208812e1e4a6db0.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFxaxWYBCADI4/gRCJYfXwZYdUoEGlAlCfRgABy90rvebzcs8MKtolAbPVkG
-iqnjftXd28sZhEDx9YJrUfmzspdrYmU7hy1kgV1/WGIcWyTExTH3bqlnaIWnnTxA
-HD0x4NJ2AzmX5VO8LxhqGID+BErrv7uGZvVmJT6trqUIcKeNEq7mzdDJKqTBY4cw
-q+Dm8P0vs4IFTD8q5f1Vr78FmUth2srIBmsIH1wNV1nAUTmQppNBFlCmcvnWTYI1
-0UMcsFFrJ2pFT1yP2AEGUNl4Lgj4hmVHZwX38/lu9pQ7iWtHSLOwZsfuC34/goS+
-ldFt63JqDV7ZaqwAgk7Iq6jbr4pSVsB4VdglABEBAAG5AQ0EXFrFZgEIAN7XqOmH
-9d5gMZ1uDZaEBlOmjFrXEwG2Lb24sxdBNEnHqarYXBW6LuBRjfvmEFNI83+xLXNI
-Zh/4MZs0WEnQO9pUpufIVtSJL5GNSUFJ/lU//TQrAD/750nwW+S+SZAvoLX4NuqS
-ASXZgEDQCvyGFNguIAyqfFoiT+w7+zOiLhDp40ZpDLx8HchYzCr0yZZ0spXabHOh
-HF5Reec0J+MTdHMw/23tNYh/AdUmxVCyRtXb15h00Afp01QZGPq20VCAVas/WaHL
-k3yXi2ehw5XMX26Yz19jTyVaoQygFZp7obpHruah0zIFAKcQN6iAqc8ZKdDYi8BK
-ZnxB5v/NmkmTFwkAEQEAAQ==
-=E210
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
deleted file mode 100644
index b0e2c328710..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b0/5208812e1e4a6db0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-314fe82e5a4c5377bca2edec5208812e1e4a6db0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
deleted file mode 100644
index 6ea37287df5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/07d3516820bcf6b1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-635ee627345f3c1dd422b2e207d3516820bcf6b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
deleted file mode 100644
index 85f7ae585ef..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/0e91c2de43b72bb1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e92113263fc31c74ccbaab20e91c2de43b72bb1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
deleted file mode 100644
index 513827017d1..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/1a6090d3223dca95bfd25c0e38f47d3e410c47b1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
-405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
-6uNnrKcO32/v/lux2AQ7kc0OS+ChaD5rUdihAMIfokBPLuY9OGaCNMcWaQI/s0zv
-X0xPebYYwSYHU0uhLQm1y8fzwvlSNb0J8nVR/ZqzzPvqfM49CVaU8PmtLXqx5naQ
-VOytBT0vGUvQ6CcJPOYdxlVF8VI7vB2B7F6CuxKGdyJIOyFU5NqWBcjRq3oMHXyG
-/vryt3D076ZB8dMfi2gol1m02io3czxnUR1PABEBAAG5AQ0EVQri3wEIAN+aB4lj
-nIaCzy85DeQ4pDkH5Q0YGc6rfLk3ARnOPAexi/lYbUy7XWIZkZy78gjcxMLRgcjF
-jfvsfJqoQ+6bM3VoVL+p9PhMZ8ayFi9V05rtXLvvzJYyuntFeMkOlZ+A3YdhJHrU
-JtC/Cflbslctcz2Al12RrCWpa4tzyfG2roj2+Ymc6Y3PN1Sjnou8FSPSfCGaTwXU
-4W9rGvmvHTPHb060XHScwxXoz6fQWIDftOyQctCZSfFJgckbVKryOZT+LbIbG6wJ
-G0WXWTHpjaWtVVoXLJL1eh4YKGlFEW2Odtgu/MZaGtKZ6fAeLQKRm8u3nMDrqMDt
-3gsfoQk3lGwKzjcAEQEAAQ==
-=eVUr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
deleted file mode 100644
index 412dbb8a715..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/2e92113263fc31c74ccbaab20e91c2de43b72bb1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
-sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
-6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
-hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
-OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
-EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAG5AQ0EUEib/AEIAMDUgjnP
-KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
-Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
-IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
-6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
-U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
-v5/DheBwvlwheg8AEQEAAQ==
-=JXd7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
deleted file mode 100644
index 276ae3fd4f7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/38f47d3e410c47b1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1a6090d3223dca95bfd25c0e38f47d3e410c47b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
deleted file mode 100644
index 28f7bcf5d21..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/50c6cc55c6f24fb1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7cd52b5a8295137c88fb5748dddafa7674e54418
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
deleted file mode 100644
index 6ffd46c2336..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/635ee627345f3c1dd422b2e207d3516820bcf6b1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
-sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
-sHPwo1aRXdI0MvCy+7iaIiiGF4/O16AhU4LmALHnaRQZCyuN6VOQ8rlqNvcczwUf
-J2DQeLHqR/tsch7S01hGpPAptBeu19PyAlQsntYN0yLCLKoe9dFXWCDkvd1So5LF
-6So+ryPqupumBbh4WxCmTp9qwDJYJItjAE0zyPe890FurOtxrFTwtRtX6d6qGKkY
-/B4T3r0tTE1EiOUpmSnxmGNItMh7/l5UtnHjABEBAAG5AQ0EXceB0wEIAK7dVAoq
-ZqBw9twxk6psNcTmIrfQbvjasKl/+PfLCfBNklD/nwe0CLz799fFSFMezCg43ZPC
-KIescCQ5t74r0D6O/QTGMpUyZD+w4JhZkMQYy2HjImfMNtPVOWb+XaLku/RloPt9
-MSG2mtA25TTp295N4mzMPKq0r1PzSa8jj4Yfn3AzzSXXLq6PwoDiljQ91IWBvJL2
-IAUAMaxSxzq3UqJnlbX2h0yMM+VC0nbSmbkK8mUNltg1EnngJKV1mKRG+Y1GDmZZ
-1Es19tEwUMsV9x1gt05YlecC31woUkL0//8i1kWuWG7dqRMf/8cXaTFA1brVJ33b
-/G0VQP/a03UaVd8AEQEAAQ==
-=AghA
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
deleted file mode 100644
index 6e422761984..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/82d8419ba697f0e7fb85916ee91287822fdb81b1.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEtnVXUBEACz2CXck8rFZsqlmtZrwySHkCKdKQ3dO5fyya3ScYRofIS0OVi0
-BwpWyVfzezq2jl4AkjEFGS/ja0shnr4hg6tWU6w3obZ4S8dQMyPm8x5kSTxj28mn
-lkNnR1mBr7S13n33ZtA6f5c1cPu4zMqzKEFvsqVoBwD/ru5WOB0buwGi9mG173Vi
-tkTi1MtzQ4aaIo8XiJyLsm/StTq1ylU1vfqtyFDZJUzoakdYSiA4NVfVFUL2LMTl
-gPq3hpWNZjVm41+YKWuzjIJ/lidH2Y2TmjivgtQToVbHMV3sHn/PtDKw91S6Ls2q
-kSLUm/Bs19H4ZGPMhWI1MnQnQiuMMPYvqIddIh2SIog2bSowPZz2FkZxrw04ej/t
-tYrSIfiR3sRegmWoeo/FCLYVWZ32mw5L8Tw0npHg3BSi0v5FoNd/GiD1Y6//Usy3
-tQVFUI1zkh/PSWVImAgmgoE3qhcIjzlkVutsFY4NGr6LH2sUpIJBi/ECy0R38rLg
-sg5pjUPhs7QexH5M9FxshI+yDsvPOTeUjvpHysvemHhVJyPQSmpOa16ONFmx5xvz
-d90FmxKfaJJvmVMvNmGMdhdAzaAJ3XomFEJZDKfyBJoOJSoNvdOQRNBUt7aKEEKb
-3BGypY2bzr0C3WxggpywPmlD1xDohurx/b3dLFoK39hmFiTek4db0tin1QARAQAB
-uQINBEtnVXUBEACy0KBkfWgD1HBFoEnbWop47M5oHeI5DKcF2N4MkaJoq4xBaC/4
-2ksKH5+p7y1BKPSPjR+mE4mrR1M1Ko0TEt3g/mESFRcAuQVYaZzy+SLkideR5Rzx
-4y+8AgtrypeNexHljXdMRLWFkaEBRD0o+Ksm5uuchY57GgGd1bqAQBLo3VrChAQW
-xNwHvCtX4B7ukFAcfYKu28Vhd482OJYAd1Xre45NeQzx6WjMExrRwhXOe/iyArOz
-2x0mWD1D7kSJTrMuYQv7OxWC1RzMDHnH2cgxFmyqDGXKxqWqP0ZAeWe/j0lxHjDK
-MdIu+7FRWDJg46xHOluLOPIFl7fD5uj8ngr1yi9eYsggcRo2bXbter+lP9oHv1yZ
-GbLNeAPgRDYCE/zb5z9RWvkY7w8Go8bynJ3AxelPWPOBOYw7C8SGPaE62oD8cTlw
-QimLCBwk6sGDYLWKucClcVOYDrG08YBmMIBocei56U16kD1PzHYu/Og519ch/p05
-fbXxj31UtFxTCPfu7JhNoTBta/IRfu76ce4pZc3tJowv8hhO/+sa75NRUBAaVZOD
-aUmRjq+H/TvURSZq9H8EFQ4/g2qaKw1LRe3Hw4fBD3bHz5rJGLE7cqHo4LWckfkn
-KWv+WqlXFfAeAD+Gf+Nfj9NYWma/0lO/FeVh+dGv1RxwSdwr3/bx5TP4JwARAQAB
-=sxz5
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
deleted file mode 100644
index c0ba5465eaf..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b1/e91287822fdb81b1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82d8419ba697f0e7fb85916ee91287822fdb81b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
deleted file mode 100644
index 4dbf1af5455..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/1861c322c56014b2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d196a5e3e70732eeb2e5007f1861c322c56014b2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
deleted file mode 100644
index bffa646f616..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/d196a5e3e70732eeb2e5007f1861c322c56014b2.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
-inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
-iQaq2wLM5rTQfdjLsGQb1iDNDyCXU56+/l4mFZ2JiEGCq3Re9EFHelRBKQCg/7k0
-BIfyoFVTHw39PKaDBmCYF2sD/3CMD0J/WldhBM7gLOndH9/YEQaEMy+PJNXcfTWN
-WLygGPSOQdNBulyLkvcFIZjUTxFVakh7FbjMq3dsAP1oqthwmK7L8A1zsvRgp/TI
-4YMHkZSkgcs0PBBby+h/lpgRrWmtwjTPzql/K5xX4VSRS+umHye/7R+4ZEH7mABa
-m/ZABADkPGG2ECvfjNosPQDHZVFuF9oVaske0OjzxI+rU6sR1fJKtbOPl9d+bgz+
-df7rZ3mwppkPX2r/muUbd0CM1Se10sK7ZAoPYmWqHX+vB/oj3Jq+iqb6M5mDZzEz
-6h4hdnaGERyxbktZvhRV7Psco9CGi8o7RFUQTR79Y5ElnBavqLkCDQRBlStBEAgA
-9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt
-90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcw
-Yc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZr
-M2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEs
-tSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8
-vYlLIhkmuquiXsNV6TILOwACAggAw6kL0PhPZ/EPI0mPfmIYeaKUgTB8q47nDKY4
-6wDs1l/msVJHAVwGEBHuxmbC7r/qfAgfSW+/Lj4XbSLCqaZIWSu6lfY43IOIYXD4
-pe5cCnWkQij+h3LxRR6uDmBr5cwheHEuB2sMFU5lJiiQR1+eXYkPNK4FgVQpHLWe
-boODAlTf0j8gRR+aTs5eWXqfSA+UEsXpn6453bfZKELXkRmEznb4xyGWJaLW2Mlm
-aRlauYvc61M7FK8z15SSZbq6oictpnEcfkgnBxcNza3jZQV7WOWZ3BlD1nKQ661s
-bmS81/nLnxbov9ASs25K2olXBsHkERhjMnERedvv7avlmBwi1g==
-=VzpZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
deleted file mode 100644
index 8f277d14010..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b2/eaae192d27ab3eb2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d75a8c9fcf1016c0f54f2d4dc51e10bd96d06071
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
deleted file mode 100644
index 7a2b2e3234b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/2c1708ea05adf6966c32d6454a1bac7f1e3b89b3.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE5FdQoBCADPVXY4gMG2TMUl1bFyh0FjfM/T+DtCRNNw24u4wbmTjZMfHnda
-H08cT0tSbJSJ928s3a6Dn75YDrrhRbYyhBYBo1rz82swLNLOk5EOSM0VqwqHQEm9
-gmLsdeEtYWDgxmIVfJbMjF77RWwnG8T+fXR0hLAn72i6Y7mm8JT5O33A2xHP9+/Q
-g60IHYze/WTAZK678rGvyxwKF4zX2mwYTFKkoL3PaFM/7HbZbLe0HVB8sIF7x+c5
-glEVb9wMApjq83SmhtFM3u/ep0uzcg3c0ks5JXZQ/KtPDYMq0NFp7zGwaFiAF5D1
-BaLWHRFeD6k4c38EPnSQLGBTeVwm+gWHaTjBABEBAAG5AQ0ETkV1CgEIAKYlTJDL
-th/JjDRaFu6hA0xxOEtXZK3fvyrP+fTTtaCyl22E1rAgeETrvoqiK3qvxjgExO92
-XnKlpNSq3LrPiqIIZR7vjMr0HWTHmFOtEEmwhMxsgDt/fVt4sD01FvMr30HGZV1L
-+Y9wSm0VI4yJHPy/r9gcCWbTWTHJGvpSf75NeetZwMmnNZ8yneCUtSNroWHBl/Dn
-lfsj08evMhHA96HA1qO/D3NRELLYjhpF0mcIijY/7ZiEqvXQxE83KXdfESOoTaeP
-qhuepHCldq6C15bseOQ3KOq5+23TFeNDPinY68AstEdg6CIbWzlOAGGQAPR2u/WM
-e6sPsoeEBicDo3UAEQEAAQ==
-=+bYl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
deleted file mode 100644
index ebe17bd0153..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/4a1bac7f1e3b89b3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2c1708ea05adf6966c32d6454a1bac7f1e3b89b3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
deleted file mode 100644
index de648a3c373..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b3/8b2a34a7d4a9b8b3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ff6e2c001948c5f2f38b0cc385911f425ec61b51
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
deleted file mode 100644
index 32dafe909be..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/2d0e1fb8fe4b68b4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5989baf76217b843d66be55b2d0e1fb8fe4b68b4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
deleted file mode 100644
index 95cd6295d15..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b4/5989baf76217b843d66be55b2d0e1fb8fe4b68b4.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFYVT4EBEACqm1qKc6Twp2Iw0tjUqr3hrZ7mjZMWg5MemH9ZiQ9iVIqV4Lee
-KmgjVWk5jnTslriymDilDIMk0YaT67JokhgSdqMIavI29tJ6quOp0K7Rj/rNBc6p
-Um+mw4rybjOUCsYddvP1bg8skDoh1dHnJpVho13u1zoTDMhHpzW5vOdSwVoGhP6h
-OwgdRcd8ZOmHsb7q7/VjUHN6n/nrrnadOn13AJLjw0pWl9d3Ht0uR1jCK1lAgaOb
-t9RAb7p3SpaiLS84wuVzePEoYWVuTS2NfoG8NB+oCyMxbkubp9HLZOiDmFMMT9Cx
-Hzf77m/TyGDGNZtevTEodSoXNe4ZO8Yp3lL5byw1f0bPVmukLU+5VlcdiYckEWTc
-/je/kxGKYUrsGV4GWJ/wAvuSD/NQOYswxtEi2q6m8wlunpWKgy4ZeWz1V7Z+xCFl
-wp9ejY7xRbJbqmVASrKwg8u9WNKAb5QpIF3F2/DQRdhHD3kX0aZ8+a//dFfenAob
-7qOldsje5PxeJ+x6sgtcJ0kKrK5uv3Hk9gTA9fq5i1UKz8C0b3ChPdus7WoYDTiw
-RUB4+2WMtAscGnmh+8jtNVSJIaT6Azc3v+8JiF9lbek49+sMLfTZyxI2Wt8tACpY
-EpiuNTn0R4U4+bKXxfMh2OJ+CfVYvR7/xdNw1OonK5zk2nN58cllAuEZLwARAQAB
-uQINBFYVT4EBEADUwd1+5pSJIS12mfxDbPPViQQ/uy8Nn5M9oHysypvyknyIt8T2
-1fHI++BbdkHckoSeIYIVi7H6ZU0CItTJK81jOg/Xjxe7UKiM0X3mqoJ6hvxVf72X
-w2sRJq5uOpmVdM4SsAhidGyvAmv+fwGngwB2EXJzd4LI/EkrcuUMS6SNEvDJGag4
-mXg6HNS/s2FPFt05WMt478hTm9dSuE4GBLr+uexn8sBIgIWiMfMbnKsT/LAg5SQt
-PCEKEZJVt9UrQi6BjUnr4T+ZEOiSSOPrnTHF6TpSXpRjr8NLCs8dAKCRh7shhufe
-62ZWvW1xxTsyS/KEbiwTwQ4CcVugQGniI07BDelH1TCmccjlZjdOlw0+Pr3aDDi9
-pQV2c4zOxknXFs2xTY7n7mvsuWkKrRqXhETQ+V1nGCoQPEPA9zaXc8kWZLwpv4Nd
-k87pC3YJGL92yWme3/Q4mlYInXd4L8W92t6ZQ/WLc0JykQrCINlvOencpYoUcYMe
-AIOfxzTnPhiqXUc+ZlOdFw/1P1rMvyy8tQB99ND3LXu6zfVIH65gXqpsxHeuVEQG
-Edrv/7obHhyQAxsU+KOXS+z388JB86CmbYzUCYtupsFuULesubwLjhlP+OGqbo4n
-wGG3E0g/MR3nrmi9fzVlLs4a3bxJv3bv6BtvhopdBlVDvgtq1cC7sCkrGQARAQAB
-=5vEa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
deleted file mode 100644
index daf42500d86..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/015479e1055341431b4545ab72475fd306b9cab7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
-gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
-P7Ss3EUTRGX3LnhKhKN656XQhM0PutdsHQlUKjvnl2JOaKerEhbHCRxga/U/WWOT
-KdobRO+x8v1scsrnUG83J7sTSaja0McmgUhKrhJqrgSk1Tod45SxprxOyp0cgATY
-xjHrf2rkafBn7K7aFDe8a73iCJPWS77gxTZCZ72xkcnMLR0m7QI8TzFa4lRjTovA
-QcTpr7jwjmyjA1+68peL6VHdVr0cdXm34mTVABEBAAG5AQ0ETv6G4wEIANLmAn1+
-tkX0pSiu6NJ0rkaZlMbvkxeFAstHdQ5zOoSWvJV+52DAd+h8HKZy6I89/BI1alYt
-7KWALGzj1I6s1+HavaYKWftk7UvAM6hEh8PzFQD5NNziptDOjTG3oztZ0SK6Et3F
-Qaczyzh9GyPC83vC8Dr48a+Bp5Ygpo/5LbuNloptVIapHftW6PUmRuxlXVXgFdc5
-vSDI2xPqz8dzLSjBa1mRUEiAFqdi6L0na6iyBEyEd4QlQ7TnDp6EKgCSvaS3OPRB
-EOaWOZsaOIcSw5w7tkO7YlDIjbltVQKTbVLUIR0h9njGaJXlGPYvDFvssIMR766Z
-z5bb/uPlG1HtFYUAEQEAAQ==
-=fOn1
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
deleted file mode 100644
index 929317682ea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFELz9cBCAC1cr1c5jWUreRdPYYvk6DK7DwF6dgt7iN4rN2QT75M6ob9Yxow
-QeO709C7V0JXpVCOJ+7gCxnllmktpchRpj7hj3iDdvhVuKMEF4pl+tDyoyzK4Xvh
-HwDgaA7nXJLzxOE1Zn3cNqJPp0siXa76ADFvRQSGEesBvJ4U2dTGczIxIXBJAsm4
-s03DQV05gSqWsHr3iyHsFCwgE1Egy2+tIMfMTKU+wQ5AVb7AlpF5ByyeAA1jUG3n
-zuHQ4fCe3HZrBfY2O4z8WCZRSo2QnFoAGZ4mmcEQ0rZuiEqigjCHiqLdp/BoekDK
-FyvY6nOUED7x3qWx3WS9SJGpRf/2CcfKkuVxABEBAAG5AQ0EUQvP1wEIAOV94VK1
-R4VqP/P/aB0zMgi+vsjrWY1uBP01zd5TrqlO1t3ohwvqHFbll6jUPCk/l3RM3dsY
-SUdSB9Jsq4AaxotuvJPYCom3XnjjPsfK6XUHBSSHQ1CUDlnPtZR8jaNLfLSQrJ8o
-HRebL6xaidd/8X95b+aqESEVBr2hpNnj47EoUT6XBqEgv7GQnoG229xx0JpOaokO
-WO4A/eteXnG7DUyYYtYwp1LOdvnzoGpcfastiFpso5iy0SLbrSQvHs9ewyVylRt8
-0EAC2Z/9mW8w8c3n3OaNHW/bZki9Yni6S2ZlNw7DKULt5BYg/q7MOTxTx1A30071
-Onl77hYWr/3ANIsAEQEAAQ==
-=/2ZE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
deleted file mode 100644
index 4ed9f6c9144..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/72475fd306b9cab7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-015479e1055341431b4545ab72475fd306b9cab7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
deleted file mode 100644
index 47557b038da..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b7/a7f5ed0fa05d64b7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
deleted file mode 100644
index 5fba3d86fbd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/1b2718089ce964b8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-31fae244a81d64507b47182e1b2718089ce964b8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
deleted file mode 100644
index dbf018c11b3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b8/31fae244a81d64507b47182e1b2718089ce964b8.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBE4CPoURCACWBMGV/j1pioJPWkD9K9NdeRvld8sBorFBZo99DF3mcJvrXo/t
-We7gmvcx2n/8P5lL27sYPuj6WSRgtVBlSMXllJm3NL3Hu/7XRILfJEKVeLLTdxc/
-Qf0f4IDqfvdcPHYGsJwEDeODbiKJ45nE4dWsbbxDEmatXUKd5fJrNlEsI09oDNcr
-7KeJn7rTVAj/Yj7UuvM7JtYKkjZegrJe24dUWg1dh57y+xEQybOpfwyfcCDuhwyj
-e1V6Ho71BWa+iyLmIIbBFBVfWTNqyTo17Ac+2Itnpy5sU/tW3691YBhSXNiepjrj
-r+jQHduI3cLQIn4O42UognuV+HnFUwq4JsHvAQDjpwYJ9IFR7DqkphXK8FEw2xeo
-03We7F51vp4Rm6FKeQf8Cn0QdELeTxX4SkFgwxV4oEAhqJJCHhrISaZY1+AAVvSM
-CcXiCFZDYdkE8rOSWNYwRmp/wGurLpdQX02V/5ogUIcHXUxsqqi20ZE/gA/JcW9S
-OaD5Vc8iX/1spaRKOMO8Oy7ezNfD8WobQoc1Lb9XQCo6ddaihh2TG6Khpy5iqbF5
-/rTh8E6+2Yn/Y2A2V4eCuGFSnQrtIHCeFt6mv8tGAw3hRX0zC0wiA5nXonl5uj2j
-QDcXo4friVHVpLxJFivK+iurquGkYCIi72rNAg3k1oKJEZsKB0HXAqU6/3hTvXU0
-GnCHwlsf0iDsEv1Z4LLRbtYddSAnFRgvowhjX6Hiugf8CeM3wfy6AJbLOhI9DLb8
-MGEOpf4eetPiFTMI6rTw2O5MKATUA7WJF+fAYjM6SENCkXSmAwbdHe1NxRnbZ1qn
-dcjDBIR/SgaXm1HLpmJSyXmjyIbNoP5aRaYaSy3g3DvWwLSmsRyA3LqvWQI0m08S
-2CwdzSx+Z8XuOZ/THJs1O/ztd7R1MGZSbdyyEHLVX0dd80B3mcuAMO48dKNO2UBB
-QEsmzpPQ06ANmx6RnBG+H2Y/99/dxyB4C3Rv7x4HrrGqoJRQOUFpUbhFmEKeFiyK
-XxqDuUeB9KX4YCx53Q1EEoKegRAYFtt+k3chahLkQcIAG6lkOZRVA45w69ApdEoG
-E7kCDQROAj6FEAgAmlAzlKUZ/qynp4S/2fBVBhKhE1ujCxpew0WUotc0O6TCyJBD
-jQ0ofQCrQEuOQKNri+2GKHKPTmIdLwfBvREbkuUI0v3S/81vLG5E3TZqIVPJgrPY
-Y472S3Q5XyCVvwYeVjZjCoPnAuCcO2G94HrE09cmG3ABaoTFE2Jq9qPCPlABegKd
-pU2TfClkWSGdS9YMbH7pD0Vdgdy2TYHLnTR1XKKkEd3rYbwnAjJ5Pa7v+du8aHMu
-wWzyEAlUhtIvipuaebhuNiiuh5N7GpE/ij1FaKAc5kvrw/FszJtXH8dQerkmceDH
-FSYeYTh9pAhlFSFyroy/6ay1nKdGU/nXrmo1IwADBgf/fxnmg8WI2gq3AVjcQim8
-9tQj2vMYImWEZnd/GlCDZkz6+LHqFoKCGiScvW3Xvq/9j2Mq1NboTVoSKTcLOLuo
-QIPeRvOP5lcizoUF7SEUGgC9y7LHqfS+BWhnT8RloMw3cCsw6GN+LcWFw1tQzCjE
-U5lXzlNL0tlc3JBQnV0rKGPqAqc/MLQdPWxilaozw75UzugKLjkG+GsM4H/mxD50
-znIM5REadBKbRKg5XNA+UCyegNaCe+SOUS5h62XeQjUvNoMhUFmS2NC35LYAQejv
-qSp0LMBlnckqI9M1QpeWAkItO/qF428nZWhYrdhrRANq1i7n1A/x1zc9bZ1LAnDb
-Ig==
-=/kab
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
deleted file mode 100644
index 342d5d1ccac..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/5f6ba89d4b0869b9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7615ad56144df2376f49d98b1669c4bb543e0445
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
deleted file mode 100644
index 760013c5efe..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/e09f6a4522f77db9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-66ca61ea0fc7e9ea1216f83396b88eacd463b90b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
deleted file mode 100644
index 8150d9a5e39..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/b9/fb693bc97890abb9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d76260c72df74e66268f7770ab049df4ab24c1ef
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
deleted file mode 100644
index 9421a4dfd3d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/3595395eb3d8e1ba.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-53c935821aa6a755bd337db53595395eb3d8e1ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
deleted file mode 100644
index d0b448ab6db..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/53c935821aa6a755bd337db53595395eb3d8e1ba.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBErygmoBEADbs8zVUn5ZwbsG3tqT4x6U7SZYOtd3WXOtHjuu9Cyp74rZ19Pi
-XNbYwIAoCgOI/nXVWwuOrNJH0pHaQ73slbNzLxo2ahQIkw9PbK4V3YXLai1r/W6T
-xU94s7WECoiH8uuRAZFwbei87/xwwTVnfwQjKBThom05LbOebtIGHkSg4Xl3b+Me
-5iqHYiw/QOujiKOqm05s1aTWtm45KB3/u80/5y+2+/vn9HXor61gibDkC/oclDuj
-J1GYPCIAUvj95vw5n6Eq46I6aoed3BWCLD+qXBz3QJjwIKTYLOHO9iTCjPk1UmAq
-NQhrENV7eeahFIDgL+b9wsm6CwuH36B7cdobsOltqBegpMczM+kwTbeaVwyI+S6Y
-jQflqUclFctJCRxZYzUUL3C5X/yvb8Bj+WmoEjm3mSMEPUC+KwWeVGaXIrdw/yzX
-Vziqu+PVWZYovNKsLGlL5zUJt3nV0xmDJdPuLRgheIfB2t4oqn0Ki/PzMLQhhX9+
-9zWc9WD9V8cIZtiSs1hRny5Ns33nQr0KkdGOj1lfVcZVrDv64VUSzofH2nGEWS+f
-h9gkgD3aLHppt2XCH7tJK+wU/NlR5/0j+j3QwAfG5pziD0zMjvnKREfJ3aqqu9jj
-8FgdJ5vJvo7hlq0zakD7qTUO0OJiELHcf8q0jfFdiqaocs4HZp1OO1w8hQARAQAB
-uQINBErygmoBEADOoPQARJ1lrbA+C2JJDBF36+fph6URbnYnc72Y/kddWdChXAnC
-KRN5QAdZeIQWEYKnpECjqS/UnH+E46l1wXSg+YdzFvpfWTGGqdmCzcMM9ooV8AtB
-vtUevbzwa4jBWTT1Vjr2BwWVai2J0zmNJnQ3vismZAl1u1qP2DJTPn5pbViK5noh
-8UTfiPimx++TcNvtGxC4ZvumaYWNAdecGBxWjqHw326fg/vmHB6vfixcOb2u60RH
-MvUxkwS4bsUTxJgM77Hr6m+UJKjBKCj5KKfMAzh/7gAR8Jo5S/8fD92Evh1iLvlc
-wjjYH6asPT6WV8wpswuh+CVG3EED+iqAyREB6Dks0P4qjGoUGTrO0OsaNciV/pPE
-8fkxjamSLPJhVAa3caBJefP8u7PCYhB9kOYd7XlATqv4jToBjVWIgKgzPs2I92B9
-VL0TcGWQ+Gzo6WwiBYTik+em7O4GjkItAgeYyX7kh0mAU35I1VX7j6y3HhREyRqJ
-SRynQybyi6m7IHbxUb986k6qDVUGMWsW61gyNrzqZFjcGDteDrgmPt2qgVcqO89R
-+PES4hqaUSY1kzafylKxo9c8UAkbUf3L7KtV9rsvvKcCKrNbHwqsTdKeUq4Sj/ll
-UXfFHW92wnfwEJj4NiXOLFUNo8zuoIHMJUbFUNnqs+wR/CAFM8AY/YHNbQARAQAB
-=UN7K
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
deleted file mode 100644
index 42375c17c5a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/7c7d8456294423ba.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e85aed155021af8a6c6b7a4a7c7d8456294423ba
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
deleted file mode 100644
index b106ef01791..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/e85aed155021af8a6c6b7a4a7c7d8456294423ba.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEvsZw4RBADH20nX+H1xvMBYmXRj1Aae4dRr6Y6qI7QRWHO6Z7/dxr9bk/NN
-Yjq5KsVOQxZzloVdtqx75rznT7fZq98g7Nq9IeEtB6k4tnh6XQLhljJMk0a3mzdt
-q3VzdxeVbwCaPJ0zixv8XPTAH6MpRJUvP9XjzxwaYHrjwcQ1LslW4TrIzwCgi5rf
-jChLCyKcaL05gqUjl4lmefED/iqOwYZw5pJ8+X+OHUViiOB43wsJt1brAhPj4KgB
-ODStcE6WlHFKi7YzcYNLzYMebSGYn6bj65b3qNf6rybWD1hGUFK4122Q7+HCH9Ic
-J+rr8HwjGFo/yxI0/mkyaF0BthXYPy4WtdsdTM2kgx8Zr3Q2rSt1jBPuV3q8d27z
-FZMiA/9cWPkRx0RfAJmBPKmKkbBkEtBbNau3G7MY1OEAkEkRnzmnyyjr5IP84A7K
-RdjTCvkbiQrOQH00Ki4sHIg+9Xv1gDg1XLkFDzRARKA1TxjL0OeS4RWF3iia7Swk
-MOnTdhR50pjb18W8kB4mEMZY7duP4nwDfQwHMwbFZGHrjImaurkCDQRL7GcQEAgA
-thrbFDDbIGq97dbX1ZEwNGpjILdeumxZzaCc5PgldHGA86TL2V9iPpONJtv7/Csr
-1c/rvH0IA/BFu+0Kde9UP+z9JycmfJpIsd2Qtxfhn9R4+Td0VtN9NNkpt1+JcThb
-zyQq4UU82uBKwSG/wzubOI4Fn+7ypIuNgDkqK0STIL3ucKF/RV77PsOBeLHkCGKI
-VhUUfY1D51BWZKKB1efaVK7PLdnsi64lAhbaexA43dwUUtVwQOvDzJVtkycV2IMw
-XwyHonlK+4vbcwIH2BAU46LIZy+VFaI+lNNmR9+xeWH49oJYnMWIXif4RzvO1ag2
-KKwlG2sacuVTtpWVqKayBwADBQf7BGl4POKtluAbX3a/KGnX1YyibPT2e4pdOxqb
-KTwuRc7ILIK/LVcejVuLd+eOF1QmjToI7Y3qjlzvtaxSemfkxbIQpdus0SyHEEAG
-H/qjNuTs8ZwEl9tPPrKaJHbJ9kQrlDPwkufA0NDAXTE76UhcHPY0DeykAKEw2rav
-EqI7Y0nXR2WSmRLFChmQ+aNTm/9UGI/IoRdS/dgo1eaLD/7RLFeL5tGDe+2nj+B6
-j+52nZEmaRCWWU7O9jYL1cQu5WTurtneCLtIqehLsjuVz9ihBysYuUcTOV/6W0AI
-clQoMEiFR9Kyv0owDk6LtX2DgibJuAvvLlnajsiGm5nyVh3G1A==
-=6adj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
deleted file mode 100644
index 32dafe909be..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ba/fcf74afdf5947aba.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5989baf76217b843d66be55b2d0e1fb8fe4b68b4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
deleted file mode 100644
index 4522d929446..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bb/1085f41881c989bb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d9aa7402ba75f78720d975211d185615d0a84648
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
deleted file mode 100644
index 23b4752e1f9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bc/6b7edfc69f043bbc.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1aa8cf92d409a73393d0b736bff2ee42c8282e76
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
deleted file mode 100644
index 2c9a0ea2411..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/38185785755267bd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b02137d875d833d9b23392ecae5a7fb608a0221c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
deleted file mode 100644
index e25671d450a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/8799af90c06efbbd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-9a4555c237785ca8a6dc1fe58799af90c06efbbd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
deleted file mode 100644
index a7d931ebe88..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9a4555c237785ca8a6dc1fe58799af90c06efbbd.asc
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE56T+oBCAC0M/T+3OUvsOekYY/RtzHZ8OLDHOqfN27fCOtIUA+nn96a88jg
-hF6pRFUN6HMr4qbWX/BLwjfLiLYRAFrJyqY/y1xcuBxYMkxSnrTEQRRli6Q3LBCA
-0JfvTMQIbV4QEVhHmlCT0WiZ0XFUpkfmICA5xZeu+5QLPsupTYzCuxxq0qoA9aIq
-OyLaQMCUzrwMqwaXKnmocshmBiEOVm/78Lv9EmMd+4jma/VpJnhR37pqrhWLzPnx
-Azo2nj2rq81h1lwWb69UMqaIAKDz3q3iJ1SgahuekZkXkXp89yfiywYmnWxo/143
-S96GWB7oSFnNv4Az6bgdo/vniQT3z1zD5T8TABEBAAE=
-=l294
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
deleted file mode 100644
index ad9eba9afc2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bd/9c4c23e6ffe405bd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4db1a49729b053caf015cee9a6adfc93ef34893e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
deleted file mode 100644
index 797d3916135..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
deleted file mode 100644
index 794a6124934..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/41a1a08c62fca78b79d3081164a16faaec16a4be.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
-+6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
-kJJDgH2BcbNSmWJlrCqYk+E3GAyQial+szkEZED+02wXHsbs0z3vozjQGHy0RVOj
-Gc5Shwk7Hr/F3vw9EQKa1nNffWmcGEx9B+WcC9ALPVd/fpQVXvlqfbi+kaIbqv2x
-NHQr7BL8j3SpN6vhfZM/3zeghlxQ5HYWER983XwkmvbNdMxt5HWsMKWZ0utt4ocK
-TnQP8NFGlPWEQhPvRRFNb9BI0wvGD0NUb1gjABEBAAG5AQ0EVuqxPQEIAOPl0cr0
-rbuuaQWxwNjrHnfDgv9foBgqZW7tCiXtWFH7Va1leDFloszEPGPlEriw04iqHpHe
-8QyUBVL6JhvNqEj8DR9xJyIKgsKCMkoJHdJOdO7aTQP8w7SVr7AX9sY9rRQAMYgk
-tEKNqWSXm6/hzvNlvIudGXxr1dJzzVynZYlPFp9kmUmQU5ThzJ7DAW4fSnAy9z1a
-bCGSHkh4EXrDwCyPvszlvMkg1djG0owZgDnTrrT0eu83T6uht+DHgCrLiEYqypcy
-xJmK48O9t20feAhFXw091hGr51CD+C/bbZjcbXGmsNVuXUDUIIeVpSpPaUgU+i+O
-gHY7ZIF5f3EpEnMAEQEAAQ==
-=PkT4
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
deleted file mode 100644
index f2571636736..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/590c2310cee1c9be.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-84407e95050fb588296690862591ba36fd00e56a
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
deleted file mode 100644
index 4fc458aea3b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/64a16faaec16a4be.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
deleted file mode 100644
index f0a6e3b5122..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGI0UjABDAC98lMPbj3vwHKSwLc8o4oAbOf9PKi/zWxjEYj7KZky4ue9JE7R
-QiaUCY387lWc/fXcq8Wa6/IteqekJBQw2KCrDaKBcAXLjnvO93q51ecc7Eo5U1w9
-xJj31YDQOR7R5XY2x2nvSSgk5CmV3czajM3ZeRYHoVqsqp6QwhjDllp+EaPJRtuS
-Fk5mWk8e//iZcZa6GK5wFEtrZMCSjjofaeE5wrsatguhrXwbtDshbN7oW48vK5Kv
-zM+zpwjLUu3gsvydyV4TPhl0Z5gzHef1GYe88WM5dus+/A8yED8BUJ7I6OkJKNbN
-ivC5aJg3BGvLZQiLCsOLZCYIcJt3ADYBgMVwHLSLmCoNym6sS61Rklu5Ig5Ax1eh
-X1aGL06v2B5oM+pHhEvl22iXIi+AQJYXYR8Lg1MBJzEz+aCaX+h46u+GcjEt0EV+
-WGzvQgBcA5qwEvbSKewu4fG/5SuyEk53ZXHwIJHC11kFQ9SPExPnqIdHHIMFjDj2
-8OG1WtLMdGzxMCkAEQEAAbkBjQRiNFIwAQwAqL0vVX+5uzucp6vQitUmOuEyiS0S
-Wz2wldKVJXKABnNKSP7Irq0pF0FbfvEne8pRGz35NVcAi7KPYwnbXtX43tmUJsO8
-w0Yti/eKBJOzPq5bxLvMabKTLaO3y/NLmRuxCBwre1zkdQGMK21O0TdGu0bxJK6Y
-EJKx/8cX+8f8WiVIlcN7IXlTgkeyz4CohaQfJibuPi0YSYmbhnjIuS8m6S/aMduC
-vAimqzIMk9rgRcbs27JafreWG+sLZ8sYYodixyBHBsLKVnGdkJXNAOwkBD6OCfQS
-W2DOZcNLpAb0yzwxk3sS6pMu7a8lqKDTmC6xCjNhdykoKn9r66AdFLZqRtld8S/i
-TwrdRyLokVZU8cfn+g7uOLe6scKYnKh4cff++QHSjDm5elY/Gr3b371N4qtngUl5
-TECiQK7M311nYBpiGnIu3e+IuB3VFET0HTTetQn5o8qTDoq0BOyhgOErQRvy9DmJ
-pKfq3cbMgRORbbJvCuZL3NSEJ8Y05rEKgmabABEBAAE=
-=Gw4I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
deleted file mode 100644
index e9592d71f98..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/5e975cb00c643dbf.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d5f46bc0b86af5dc56df58f05e975cb00c643dbf
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc
deleted file mode 100644
index 726b8c16ac9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/bf/d5f46bc0b86af5dc56df58f05e975cb00c643dbf.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
-dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
-Am1Q6qWxTcJBUtVjjlTMoWcCRwFNP1229ICL6XdfM5djqxOuIcCMIHC55YTldrDK
-5WWgcXC2NZgUbRn7/8dpaCn8iFAyhYjYKAk1lS8kSxCDvQNU9DtdAWtaCosoWBZ7
-mWWIeWp21erk4jgC145GujHYeqynf7VmdIB80u5OeIV6CwJx2ap8AgrKcOCON3Kp
-kYa7fsDGxq6Lbzbc0rzaIfK1wyGo56dMySDK1eZuOY9Es/wzaYfpzx88gn3rrcaw
-HwTKBoug+9z09m/rWy1DThW1gruYMUrxjeyhcdXlEeVrv9EdNCbbfKcg6MbrZ1mu
-Wc9DIAfSQ40Lv2sKxTyubZXxvoyEhD5LTqSKC0tRt9xKjHWWWSG+cyhXu/2hYmp1
-Dq7XvS1p8NKjD6cAEQEAAbkBjQRh7yG0AQwAzUkcci2Ms35HcReeUZLQ5oEiqvbb
-JH0dUHK0IFr4venyXpC2C/2toZiZ231G6miC55MlJiH+8zjZQhb9dFPNaaxvcMX1
-1EzLmm6afnl1BXWwmTHO0fSRl8OYmkVo3vo4fxmngfMWN3D27Xx5F2e51pEGqu2/
-A7rSawKqN/Tbqa0Wmro31PT14/d7bpyRMaotsPvn409WkN+j2qZV0WdqlokcQJGi
-FBsY1YC7jmNRVmSY1l9lzMqTHrFEn1AlfSMJSgnPPueZuI327W5T0B5G3uc77Lcc
-Xx3WEJBp4KdazVixx0gk/k3+GOGkdifxN5qesEgVcYH4Lkt7vYdZmPXxH3tr0h1p
-FpmDZuIgwJrD5/Ck7nHG2ZQf3CiBUtwBE/GR8B6h7gm+E71MvH3m6eMqOWUZ4k1U
-En9mgP4s7sJikpqtG19IYxkQVXRkdo5Q9jQ+95ZCV1O/t7CMGNXmzVc75e+WO7JZ
-iTR7Io9uH5HmbXEpkUOwS+2aWd32IsotfzMbABEBAAE=
-=vpwg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
deleted file mode 100644
index d9ae47869d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/1241bc872c5e4ec0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-636de9055c4c75c7bd9830771241bc872c5e4ec0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
deleted file mode 100644
index f4b4f312da5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c0/636de9055c4c75c7bd9830771241bc872c5e4ec0.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
-2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
-aYgApzHAo2LtaiBIyK1T/+OaCexc05lZ/wcHFfyp1yHSzIVazxhIAqx9uwCgptMa
-23r2OeX5TN9xdjwSTUIeImUD/0Mb+AcP04pMbsw9xtjvl4g1V7YbMipLE/PdSI+H
-+YLRzmyxkdfdrBNDQRxyGGxoUI2Pi45EDV3wnLBsGVRAG/UkcQ3zE3r+0sLMrRkt
-7oyzK4wqsMuslPbuAyghUes6Dnop/MY4FJYuAKK412RDBvk5s+Tp+pdkWQGHXuvM
-/KJsBACNupFtZA5CgMMWI3bO88upPZqWsO200sA9WqobbU+A2oCUotb2DgWxOgb5
-oi7eJkyFDpS/d+S0H30pq/7mUkTvCOw4Fk/ZR5T6DGqm1/vHv9/y2Z7bOg/DxwuE
-Mu1G9AT74JCjgsYFCdLcFymrghsIpjHBpnsEVjXoI4jwqOgScLkCDQREC9ogEAgA
-w0mrmS4i5o0dQ3KjyNNUUbatkUxFxZjp3zyYrVQj7c3Gpun7s1zRwZ6YQo6poUyi
-w3gpiiLq7zPCqC+ee91aCuYRXQk5y+b400iZybXydEbSeLeZ5pNIFvafYOjLuvrD
-tFiWdV5t159i7R08+Myu5D8K3kDnt/ycKTOs29mt0YCkAdW2EJfivrbSCicPNUyc
-GrMiRh0FDI8Jv43TMUmUBbl+6DdDLmqfDp/Nl09BRzvm40KgBusSRFW7G4l5jR8u
-vuloRYqOGz2X2ifXhxfr6CWIpmN7CNAwhP5OKniTAOTXTtMxvlVM/wILrIxPQ6lp
-b8vhNVIYLP1cmpVtCq3+SwADBQf+NyC/B4lec3BWXH4elVqusCU8Kmj7XDCFCSL7
-khNqO5BF8S0bZBV0NI7W9gaoNJ9ZftnlHbkGsUVNSVl5Gltwi3cD8/nJkHr8C3LK
-6jxA2/B/xQ32NWIBykofT72jw7oNfyu1j+kkF2nUnvpG3kkcuoEvQy4Rbu+1jjaR
-/3MPLcfsLU9EfCcHyiEEgW++AGrceV1AaHB0ZTmvRw8P5Q5R47ZVPR7o6ljucrYM
-MCzFu/3tUezn2cVrxNXyjlhC+kZ6tvlbOsZ8gtmuWqzVoYWZidSYA5ybSFnUtn6w
-SB/gVg57uGVPtYDp3G8lF2ocSWSsVYHzKO9Uo7C2R1V55iA68A==
-=DP2O
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
deleted file mode 100644
index 6ea37287df5..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/11f4ce313a637cc1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-635ee627345f3c1dd422b2e207d3516820bcf6b1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
deleted file mode 100644
index 62da51ed28d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c1/abe9f3126bb741c1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-56ed3b4843daacc79de555557457ca33c3ce9e15
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
deleted file mode 100644
index d437fadaca0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c2/3624ee1473a843c2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b920d295bf0e61cb4cf0896c33cd6733af5ec452
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
deleted file mode 100644
index 2475a44f009..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/67631bc0568801c3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e52567d2589415bd74eb4c2867631bc0568801c3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints
deleted file mode 100644
index 883e7879034..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-187366a3ffe6bf8f94b9136a9987b20c8f6a3064
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
deleted file mode 100644
index f718a09d374..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/e52567d2589415bd74eb4c2867631bc0568801c3.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFfEskoBEADI7IL49Q8M6i4NXyo7lYTxaDiLFqIJNgnyC0fHSZktNPXxOflY
-rKfJqa5CPYhjJLk+jrj3z5Jkm0V2H4UNdI1HD69hlmg94Pyjhp1b3UV6xqQ80Sah
-Oeh+sOvjdUXsX0c2HNsXT0dmmN7b6fwxvdKXzEkH6VSHy+4W+AW35IsGj6sRdD5y
-rIUMJEiAOjq687nkwWHyWzByzvpFsQy8SZFjkVLrVl1fdTNAyyasybsya0BkPoz0
-97hJaJc3iKKLT8oSl5WEPyBpEw7w0V/5ydPH2WrN3TXa/WQeE8mSnleLa8MPuzR2
-pIEoQ1L0DL/uIZrHxpMzhyGXSabjsPFQy80agO3cm80k2m+tyn5dWroMQ1EOeTNg
-AMAMoGkQAohgGt/pxTo++qyUCi+7MaDpmnmEkov9ahvcj3r0qjlOUbbg0YPYbq4w
-NJyEQ/qp6ooB1WjIV1nUWIIdZmwFAtXxpM0LjysijY55pGTLrYzPg8KrU+KU+2XJ
-hl/wDYvdMNxO54OuNgWSJrKOrg1wgPoEThX2WjD0CUkvNFgYATw1aLciLc7pzkvu
-LiX89VJnH5fnRDEabytrQDoZ39ibv0ZI633wVm2AbqGAghpONOP/M24XqgHdnH9B
-FNLcM6hA0xiLqq+o15HRJPceIE90O7eQ5hFbC9qQl2l8qZPppWr0ZEBT9QARAQAB
-uQINBFfEskoBEADz4k4i0aBP2RbG0YNFbbjvoEPiaYoIjShC6vRJNwGY19SiFoau
-Ijq/tUZdTKJKb/dX1F+Gn67ucWtOHMvfZ6lEaQAUBDQVbIpDrONAw+ZOM8sbgc8K
-LmAMphMKhZ+dLBBohIxj5eZ/heDmq65voJPoqJoz5WqMiT9MdC1yBhDC5kJgWJG5
-oT8lae0ErQksbtWGkkFsGMjFfNHGI67MD/eD45UEZS1xOrMgAGCty6kauQN/mIg4
-ZJsUsWyO7qwqLBFZWoDooneKK9A8eKwGDpP6OnjCq04luvvFu5Pxh2i+4v1YZHzS
-X5wuwNA5gBN262pbpBleC1S1NNCdA3m3LypDhSmP/6j8I/D9GkuxYj7T9Eaz0MMf
-zSIydzF/bSWyqQN/5ElZFkQekpxvwcNGrYa6dhEeJbtMMH1FF+xNSrl3L35gguvp
-N54N/wW+a+gkIt73XFo5MDEEZ6yGrAhzRolIfVh3Gxeg5MQqKG6XdhK6BX/9bV81
-ppC7b9eEjz+onh7cTFiDVhq/bsMDSNudTiJ9eEJDf6SzN1gx3UO9StCKYTCvczFx
-JQMKAXufqA5Fdu8GRhx1jadEgEh+JBoH9VouOCfpY4GQSMg7mMsfiBmce47j33aB
-8AINV6MkpNWm1bQ47sMRBT+uivcFENfDAP6Y3H2J3AgSjJt/q88d8+cdNwARAQAB
-=liSz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
deleted file mode 100644
index ce87d9ef13a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/4f7e32d440ef90a83011a8fc6425559c47cc79c4.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB
-fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS
-sviDzjYdZfZtskUM0sRmjmoQL//fVQbfLxJ2zses21za2VHuS3puUbdcm8+UIl/q
-oyneDbzM7j2nYXXJPNXJOfvyVxi1+rsc7xcjMvAj5ievYlWwYlAIgYbAiz969NdL
-RkoA1Wg+cQg+59k7Wvi6xwTfzMsO4jfkV2p24xn4fpcch9J49UhADh6O7XEls1Xr
-80WjysMJWTOX1O2oTtV/BMjpI4gj08SgZRhzABEBAAG5AQ0ETdcUhQEIALq5+uXj
-S4IHZBmOWOBSf6R1EnU4pUqEza0uwgIX5Xr2uSaaCMPCm5xrbtf/Iv45VEuR8zGK
-b8/0dV74me6nXnOeqD27pkkliVE5nMPQnqKAUQmrA5aDR7Tzmey46Bmc+IFrvbWq
-iyA3yZwUpi1FKZR5VLEYhMGI0qOyoaa1NWjD3LDL7/AmQESe9QLCtT6QhNhmj/QW
-ByRpmuIhayNyPGlh5osFyiGgVcinlZE7x12uG76C1V7jo9eYrkjl/uHJHRqfB628
-oLubDFimKl1raYClRZ63jkbZBfC1fRYzxk6356mAxlB2OVDH3aYB97KKZkU8cX22
-IMawk4aBhCyhX8sAEQEAAQ==
-=zQGi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
deleted file mode 100644
index 68968d22716..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/6425559c47cc79c4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4f7e32d440ef90a83011a8fc6425559c47cc79c4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
deleted file mode 100644
index 201964b9d5a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/c189c86b813330c4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d6f1bc78607808ec8e9f69437a8860944fad5f62
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
deleted file mode 100644
index 9fddcf29fc6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/d66472cf54179cc4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e77417ac194160a3fabd04969a259c7ee636c5ed
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
deleted file mode 100644
index 21ba0ed5f92..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c5/1364c5e2df3e99c5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e83aabbb95ca37431e20422043203be58f49479d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c6/2f53295a4bbac7c6.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
deleted file mode 100644
index e2429953d4e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c7/5858009d3cc798c7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fcffe916b6670868fa0ea0391ae1504568ec4dd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
deleted file mode 100644
index d7670dfbfbe..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c8/3f606403dca455c8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ee0ca873074092f806f59b65d364abaa39a47320
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
deleted file mode 100644
index 11ac8b7abb2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f3184bcd55f4d016e30d4c9bf42e87f9665015c9.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
-Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
-9lFqWQOAuCIWB1XPzoy5iTRDquD2q9NrgldpcwLX3EVtloIPKF7QLq72cwCgrb5X
-R25dB8PUdZKUt2TtJbjB+SMD/1UzAPirgX0/RpL9wUR1i14yIrTfpFP/yM9PE4ij
-qcZ1yafVdw64E1k5W4k+Pyl4D8DvSJvbJHvYjg8/G9V66WzaKcv+987fetUuePvY
-/rwxBPztqq8y6+hjBc8QVhZGWmAoGGEFO6MIGsSyN5ohqPMpNXkczIo+NMvDxGzz
-ld5ZA/9awGTsigBdpBK2F6GOmbvBv+Xebu9rbaJvBvP+npNx01s/f5sHPCxmBTFk
-m1vtaMdZ29RovrWPSZRj8WWes0bcisw80250r1CBlYzGzqEVZ7b0Hh2RfkfaxbYh
-wikyfTfA2iX8TUGBgirsZbyegjUadElhwFNDASnvLTEuQKeVLLkCDQRLbBdqEAgA
-0sZ0JZvWoKIGb+o6MOwI6p3uMb+iWBwdYfoh2RPnUZdBwGhJjp32CiTt2Y3qYEcq
-C5NvF5FWdx1m5KOQe1O+QFoqPKnC1bPj9uZOjLVql7x5tSwCePIaMNB+fMxEh5hY
-wLWtBz8nrdCPgwm+nAwecoE8YfrpmrXZk/YLak54FOeEwLYaP8E4u2FHiEqN+WmK
-MjIRwLzVpYArWRCbTLhSSKyRBy7UxEovUH9mIa4YuU4Pb2R64LwopMHCBm5ow0U8
-kCw8vpW40GrBc/2eaIeXCX2XJ77E9s9ZPgW6MoJ6Ic1xV6voLJKIEV8t44deKNSw
-DfVNZHxyemaKa8/GgpjU5wADBQf/UzL5lXRmyTdJqRvHIfUV3g4A3X77d3vOroab
-8KKw4MFy2LiTioN7btKKxE97Jjp21YZFd7Kpmfu2i/kr9QVJo+DSxe2p2xcQozyS
-+layPK8h/61Lhyh8vjzV5AUWA5Zup+P7Jh/WRlh9Gxs0k0vimYMFKImw3mZr4EA8
-UCj2e85XIHNHBd0B1VIukq4OjU4QhRrutNebIy3GZ35ylcaXT5v18Rq/iRJAuJFo
-CzXUaE90/V9/2ob8A1CYEKGLocvOQgBsj7+2gP5WOP+WxI4TWPENRKMVchVBE8zV
-+7YZiahPCwOQr9TQWMaUIJxZ85yr7O8DhJOBX3B7EHIfpoADXQ==
-=5pHp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
deleted file mode 100644
index d41dd187ec7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/c9/f42e87f9665015c9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
deleted file mode 100644
index 4fc458aea3b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/1e8f1d57a4450bcb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-41a1a08c62fca78b79d3081164a16faaec16a4be
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
deleted file mode 100644
index ca04dc02644..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
-WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
-cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
-WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
-KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
-9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG5AQ0ETaTO7AEIALN4amR3
-pf/FN8oMFa9eAc44ognamG31ea1lkqIiPssiJLC9J2z9mShkrECbsBj4o+HxeN/3
-rwW2hQFAm8cAbitujASpPs46slp7Ylx6cfmrNqh3tOkg9BW/5izPwjXAuULovMpG
-PVf30eeDpf6huwRqyc9uYQSS6Jn9KCLi9ULxIeQOZi3UPHyMOCbnehR5aQQk70tI
-jbNytmFKC+DXFrhDiBjlRQruATgtuYYKMWUBO65b/SyvLG7zPGmHXmCSfg2qCTQI
-8xKN6wxgQY6x0PN9BeXa1du3497qYGhaHrsxnW/nM6rcQO2hKoOlY/GmicB5oK40
-MMVfji8aN/EYTS0AEQEAAQ==
-=DpMo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
deleted file mode 100644
index 280dc187d02..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/4c00043bec5cb7cb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-58f086abb0ede8f7a04b76c34c00043bec5cb7cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
deleted file mode 100644
index f1d8b5a6d68..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/58f086abb0ede8f7a04b76c34c00043bec5cb7cb.asc
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQMuBFPdIH8RCADzGwYa0pK0BdE+higqxRaui47cllWtnWE7vAwK9rTdOPCtCbiv
-peRCzYXOOy7tJ2tH+QXanhNd62Ljp4YXzb9S82LQkYN+cOIxvQ/3gx+EseAr02nj
-uapGpNNCAG0dSPG7ecnfbRKRDZ3vWdj9SeePsBboB+dyRv1BgMFg4iLpiQonFWzT
-xQsu8UogoBfWtejm4/aE54s1ynICbOs6hEjDPTGa+4tie4I2S+NSD5sy8B9ggEDy
-CEqLVRClDl5UYNNtdFY8JNinAkw28HPA1Do2SFnAGxUwfPm/jloUE9tALLMCTMn9
-4QwbuwafteFdDm+RgfwwuBxs6MkHAQcygcR3AQDZJuD1iM4DgNPGkNVplXIey88m
-eb1jXs38PcYQdxQZjQgArq+SqJbBbnYntDFwhpv3g0HitC6oaN39UhJLIUDmX698
-4JnWKjfrtyk/33I//5JSsLEMyOITE6herMXEVIltopuYYQGXFAiTOa2k6h80Ynmw
-gfrN9p5zHeNBc+VHsfW1IefKAARKqOG/zTIUJOvEjMo7qT/bon65eg9swGCXQ6CN
-LJh3xstK7GWCidYJ508bHkdUWAI7gQJMJN983RlkYIE6vjmBYkSZKKktrZfKaIqE
-4l+SCZW+jjCE2ug3pDw0IBmQ67DPFKWpbGkzbeCzdB74niS/s0bSdLKYlwqUb3Hc
-9ltJOLxoTWCQOhYN4WolS5/MgDLxfQYQ5gXvbfuuiQgAg8tXNjJmJ2cp3eu3B0Xx
-Z1XS5sxraun3INtyML/nf1plT/OYjukqAZD3yrgxLaIPO5uDChHgBfUNbz181g/C
-PsnS5MlbI/P7vYou1FJI2vg5whs5wG+1gdicp+Ert79Wqh1B2j5odnpQRYCQXO48
-wGbjZ5TdlnJXnjVqgDNCJo0EjQYgmipLsMfgfv3xUMRIMbuBFXHPuvlQHoyBAoQX
-3U12VUwL6VlAEDurXPdgjdoX9qH7e5qpZI7wayOtUIkPNEmfXd+e+21+6cJJcFUn
-Sv20JELYp/dFk7oVSG8uZO2vAp+n6kltnjSB+oF850XjX/2rcuOiJNf0C5lfzHlS
-tbkCDQRT3SB/EAgAmwRWR6xSA1JQQy/JYa78xbytDaIF4tfpe0vBKZE/BbI4Br7e
-XBBDT6Lfp1OFdiPLpCHBNrXfWf8in7vgxfk/UzRXkqfSBLgxjHmDH9p1ryP5HFPw
-0CTl+4VHu5PpPXG59N2gPf0FT1KymeQonTwIH+KY6pk9CBCAgJjbYrCtquw69zSy
-eMCyXMyNKKtJatnfH2IGa4ArEVEQO66E1xRavDEDqaZU10nnyfdG2LlqrNi98Kmw
-O8uYe2eD+j9lUKnngTFtW8Vk6y5ykypXyVe1l83E82Lr3wx52osJXKiz1ysOihum
-5ND2QvYYjmDSoa5v54qgHL+3Gyl6OtbRPulkTwADBQf+NcAHhZuzmAM1AmBQitA+
-1kViENjZ3hhg4tcDkbmJk2q5SXEYEhmmddaZ6cAxQeHSqdZBQ3tygAD+gwBC0KwB
-1K1lIFwfZEErpebpepybSS3CPX0w/+Ijcff4eRxImwzIYReklSs2r83Y3NMhWMM4
-4PH1KYimcNkjrt3a/pn4ZGhwyn2YpEoXU0XIdLHpY/odbI3s+mQ7I4S2e6ZSUclw
-I2FLfyNDnN6QpCdi7EJDb8ozT7s+IMaRpYM5RJbXcZdvIaa2Ti7DrxSyWxdN+ypV
-3TO/m3uSBqFS4JGTk+R+azM1TGCBvJdJIzpvZ81Cx+PanNU8CWgzs9Hbiziqr7Wt
-qA==
-=QV5+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
deleted file mode 100644
index 76717d8305f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/6e97418b04b11dcb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c758f9cc982ac877e7b295dd6e97418b04b11dcb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
deleted file mode 100644
index 853cff28660..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/86fdc7e2a11262cb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
deleted file mode 100644
index 6d4dfa116b9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/b15ad8efbd28d3cb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-9857c388d7d1d9d031274cd0a5def5a76f94a471
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc
deleted file mode 100644
index 32d4ab0c17e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cb/c758f9cc982ac877e7b295dd6e97418b04b11dcb.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFy2ECIBEADZYOmwjnX6CJfQxuPyzEPXAkFD0C/Zy/8EECiIvCP0cxvte17y
-9J7uL1jtMAAIcACeJrtLkWBCBRSQ3UpqjV75ua9gppetXShbAEO0ME7GJjWH7ctG
-qlPd2gySjMwhKwp7lepqCQ6+sTueI8LaWXnrQC0J1iNyQGES+Gy+FYH0R+vUdRK1
-2W78a8PBycLCN7kCYS0EQUhM8AnJOz4A/u6wwwXkLH/pk/5LpT7jWfmCE99g6ap8
-TeKjTLZjyXntKUEl1swF1D7xb8bjiXuRgaHCJEF8V0zBtNT1oqtwKF/6NiBPxYen
-bC5xM9Kl470BcNGtoQ7OX3D6luTEEUJNRrUttxZsPGSX5YOEcbpnkIQxqdqzT6jf
-YRrhFhWF33Xegy820J9NDsT0xGoJSjKZ7ps2z7kiYj+YKYGypQEjZP5IEa04q5PD
-88nsyt7OJ8tBE/KT70EJsGHSsfgJzaYg+tSwMihdJ+W9sUlU9Zk3+BnDSQUTlsI5
-EGj3QJ4RZ+pF0BF6DNfogcwfA6yw2Z2tQNYCIJsKQsdZLOXHsJhVB5t0JoPx5ysj
-xpmwsSp0pf/PWTU40ByMOwPpb/WjXbzQX0udC2ccLeLmfxZ00/+gaCgx1nLuSlJ6
-XrDUkDHQ5npauknFwYmOCrjatd7XjVRwCVM2Lo5lkFe+fIh4zHUr1de2UQARAQAB
-uQINBFy2ECIBEADSHvPiR9NMdhM+lBQxLWWNr+BwKRgxC2XsYuzg4daSpO1TnQGy
-1aROHPXV2pHxx+vEmM8ftavgtxw09ki+YM8TwwrQuFWAKz4WWiGb30oTso+5a79w
-Bi5+2cxikWGYvzYDPJvAvQ5hMAxujUnrITEBx0+zo8/4Zm1UHMt7b87HE1EnPi+z
-arwRmohpqedABzOeYC36aQeuqUp0CQFLUjAqgOXEG/xw4AqBrkYLS+h0sX08y/yR
-g/BCo3OvtJOpWPXKOOhJpKITau63B61Qo2OD77O0iVi6o6P5McGYvYCwXeK0tK9Q
-USpbsPlRZqxoQl64TJmlp6KBcOEXCarYXYXyKjElBfehLxzB9DpvxOvmQjbf3VzE
-xaONd2Xrck4W0cYU0hRrqsUNGM8rcFYlFxy4RwE5AcRY3NsT52Rxc6gRpjNlZE5R
-FnC7Bkm0NaTZsIU4nTswiiHK3oFW44dJ+pcharyq/A6yHqjSSxtdW0y4zAN+3LRG
-H0yzHXmBLKWAJ8l8m7PdVbSj7fyLfRB0sl5+tFPRMAaaiClxOq67/Q6eQ+gYRyDW
-dDr/2mUqhXC5+dW0ZevKZMt9tlVbw7SfmxaRfJVZwyI0RTsoJ90hHiLbtiC/rHPC
-6OXBdp60GgzDdYXzCeVt2VzkMjd57wSfh5d/wHEkfyXL9GAoKuDPa5rVGQARAQAB
-=nhFZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
deleted file mode 100644
index 2475a44f009..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/cd/bb9cc415c9c063cd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e52567d2589415bd74eb4c2867631bc0568801c3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ce/ccda41f01581c6ce.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
deleted file mode 100644
index 33d5176e465..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0.asc
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGO9IPgBEADHCB2evKGSjQutTtIjODtaYUoU634Tl4Iv4DYsOR+MyOQBJ3Eo
-9okST4azX6r9Fspgmc4LxpFnGm9OSEGn4NZ9ZxiTrmKaGsoXzj2w4JKtgAip4F5h
-o9Ai/ridqeA7V9VH31OLSyZ/YJvrcoBcxWdwcpydxchlKQOOYX6wKqGk0BO38870
-sI1d0y1W9pC9AiL+z7qaX3WUslOFDCGxRSxZs57x28P4pkRy0HwUWn38TrS4fnA5
-XfWuxXWr2K8/xtf+Uf2EGVUP+qiv7kDdKYbZj+SeF4ba8nLPcuFmnz6Q1iZUhA9s
-sTfruyibtm7htngt1IHFy7DT35GrIbE6D7W7S3ANqg/K+Gc/j9JXKjOwx8AM/WI0
-WQ5w4fSn3C6WhFTMpyq445c97+5ki/SKbFP45oWd7A9JqIMttMqZLzOSzFM4230J
-Cd6FQTGJdtcgfruwltQOUWl4IaCOsCAzI0XnxTIdsaCDDQ6+KspvdFw7zav03eVN
-TguQ39IkZgke2Am2He5vtxXAayv/qiTKsyTUxIIDe1ZTS5j3MJ+SNWR0faXvvDaV
-QgqVjsB9U/CHjcCYbmFhKxk2phGwa0Wc+NHKwyVwjhJkFo+U+XDGJaT2RbhDYD1H
-LeoZAT6kdngSzr2WvXWs6xJbWIXJc5FivUorfkhaiaBWam1R4o+8kSuxSwARAQAB
-=wRa/
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
deleted file mode 100644
index fdb197d87d8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/56e73ba9a0b592d0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
deleted file mode 100644
index 30cdc0ce87e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/9daadc1c9fcc82d0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
deleted file mode 100644
index 6426e25c4fb..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d0/cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFKws7QBEADEy9+PqF0cjeS1yG4xMRBV+teFNsS+WZW1ATDBl5ETASqMZT7R
-zFWjMWq8Kf3iTMfmPlKVCPIFH1FG+SgMvWpQEEcLCOmUkJR7UYtn2y3vaXXYqawz
-sDozHQtDs8WvoegtrhjzB3BhmMY0BCgXcTR944OTmc2lqYmDNJC7Picge9ql5a79
-MMqOv8H9IS4jYKyZzUrVhVf+bRD8qBEi6Ne/5C2Vnz/4gVfTs2joH5FlyDmhwtgU
-0m+/5x7CMIfBvB5+oAKgActuHAJZqZiNL+mFmN0m0UtnKkNMlFzrOR17EiT2kA4i
-ZuFrqOkl+Iw0NwTFn4gzkv5XArxDrpK0lDTwXFpEs7jYN/1odHUm3PrHMT5TsfMf
-dSC/Mq2fMTTMKALOne6fH6g1G4bkeeacBvdFbO3il+OXw5p+HDDZOe4ZwgibVgZP
-SjQeeFVevTaOJSIDI1tKQ2O3Zgn4uA27V5BZXOK8pn0BSF4i9XNJvJMRo9+YEec6
-dhe6qlyoU/HX9V8M3s1A3f036YyTXwbl+bcf+eW7koA1I2mppTxOwLeviPsr3BIN
-gJVFr4E30bnkcxJUnbQs7W7HTZ4wts1zE16Aot1B5XNe+VocwtBEQpWRSKvEkNMZ
-p/1Dp3ceba9h1VJmWpmIYa342DUALUqb8gtWTyP8uZWyAynnHq0/W1py1QARAQAB
-uQINBFKws7QBEACfb82u9+A4kyyzAvGZJPvwTZI+yQ6tHKFHAXr/GcMP9J9E/ZRz
-IQa7Sx/MNlTxHRe9fnSrKclZPw/HTvgrUAH9NchW56eXa8ypsHI2sHI3CM6M2KV0
-HWHG++1hHP+cYmqI4KZ1x2MdCgC+b0S9F25lGfArd0PhkeojWf26rPP4upDceJLX
-M7mhi6umZbGYnBYg/VKhmCuy0bPz20bYuc6HTi8rov428geyHhBGTfsHjd5m5qGs
-Ql+U7TBFyHdqJDsY1DyaZ1k5pj//A1xuxE2CSjEazJBCG3VxYLJxbL6Tr4dWpPc0
-PSqn0MeYmF9RA/8vY+56edq9ohIsvXw5+BR5FSR6sXKL05EDem0TWYgW7ATmn1/W
-SbsnVjWclrxcT2uJVdG7vIh7/qhkzVwhYIi1CyO8+2i/r/UMgqB3UBMUrGAE/K1j
-0S19rMISkwPnEprpcSjiVVEa6ubX3gxSFfbIaLPbIBE6nv/DLA0xgMljUvESg90v
-v3tmuApERPmOsU7k28juu5ggWPT5G8M39Rsyms36ZZvN8dpjGcNSuMJxU2KrnFVR
-sokJ36drb73cWv51bc6ir3VnUTr1fWeYODjRqxpRw1K1tfaZoGyBRmxyAVjYSEZh
-+uenFly42CHEndiJRy7b9NYxp8rjwSi541R1mNcpKyMRrXjWDk2/AitcBQARAQAB
-=sgiY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
deleted file mode 100644
index 1de2589772f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFPNlskBEACysou71/IxEXwgPku/U96oPoJLJVgUpA/gtfv2Qhy6JECqEA13
-g95KcLZBZfGNt3DAwEP4A8XcG2bVX4pnMMgpOQ+exf+2tHhZsA8sI7Q10N4M5+g/
-o04w2+znAA7LI+Oz5WqAx0pL/yiMoeB3/UA1v689dDhknEaeLbluA+SlMbosY+Hn
-rtCektcwKfB+mmEb3eBJrwmmkTGzOimIXO4ETgTGeDgAD+EgCtTLBxlMthTCIiBP
-wHOxfMqENhPBusbnRJMQh9v6ZKxc86SfZhKoyAaLOfpqxJ9u0EXesUP/mPj7oZHR
-IstfStRM9JqO1/WS5UooQdNffatSVmafFANDtr7qjnWF8krWZp3Dg5mFw4LqAc0g
-LCVWzvx1tzNOD7XU61lHNhv4lrCS8od1DFGou/L1foPQuioONAgzbAf3s71l/dvF
-upTDEdQhVwZvaJ8b0PnrEiEyQSr9wycIRFuhirfo/Lq86VltRfTKguQu82btbIi/
-K7I2IeCaUK+xHvj15P0j5D2h0CnXH3vYh5lnVZ6Qkjs4JZkSI/5GvVilRRx3p9rj
-iv9p9IPvVlV+Aqugd6G1EujtYahn5xwtPMeJauKgYDfyhoW8p6qSj21jwqNdOGFM
-NclhP0+m2eISK8bkofhnF7GqrRJXSVhNAGTLNAU24gNrmHbbMT5xqKxaxQARAQAB
-uQINBFPNlskBEADkNzRMohiS854dOXd2HrB2DC+3kiKNrIS6XRGnU/HV2Rp0iu49
-sjJRhIu6Egzt1uMtWC77670a26aVBFxTV95DXPSr5sRT63jqXvmWURtJ1IcUQS0f
-gM4PG9xb/2QYzlvoA3jYYgc981/I+QX/jyAq6EreieTqE+ZEO7gcobIQ3q8pUyH7
-tmRpon/2IqRkoe2gatm3rdeCk7HWbM5kwV9THtqONb/QwTbdsxoCNm1PSZl5oLPc
-3UIb6fAL+w4MMPfrDd8hcGX4kItBlLw44WybJ3aU6+jKeDPTOsJ4PV2dguenxxxg
-cLpKwWA9UH6609+ZP42W+IAuza1b7an0c894jU7BQ269ZxU6rlV83KAlPB/34Vra
-9Z6hhpQpNCsrMHE3iuyt/MAv9lNziWsqX2xAXEmOtyU74Tw/dglMW65MjmVS6CFa
-Czqcax79N7qU/qjZOOQrg2eLOAY9ZhwFTXItxvdCa+dh3JqYgqA7e/ssRwwwgoEv
-pr/dlKAO3FQn8Ec3wUFUcjKliLj+s4Q1CgZk2lJK/U6JHuPQSj33ZW56LaS/AqWn
-anhwrL4GehGL2TGJLgoVZtloD5RkGyIealX2MuyueDmj3RnJpQbcF1/tgDPGJfcN
-T6uNt2YHw9xnwMadDxcUw3qwnJafxJbGKks/y1rV1bsUOKotxTQCL9SEOQARAQAB
-=vySE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
deleted file mode 100644
index aa01fc7076d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/7b9751fc3f01f134f476464cd0eb627d4885ced1.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEN3YBARBACMx0BWLY5fSwyiNS6IpNXunE7wC/3wP1TXblBulG/LNbStJ0rY
-QRXOZunyT4PGy9Yk4JJHnofLuExc9dpVpHt04mldc9wQkh7er1dhGF5s5bgBrj4V
-w7ile6zf/z0qRUXXSi4IlblxCXgRkrcEHlz2XGcGabzTHabjOm+0Qbd66wCgyb8j
-WVt7Y9cPCI8apCdsobeO/WcD/3ThXZTGDCAtzG5HpRVyVMTKF36GAu06p32xxsui
-46OwZc98v+7xPFYnyOSBYb/e8oaA0lSZXUEW2pSWuMO2W5/s4XOkUy7WgfjBAo4i
-PBPCBtPzc/32qMPTljGQWiSxLQvVkuNaVP4udxXYiM4gG1xwkpc4JWbCuQAsMf1p
-LTzPA/9DvulXGeLAKRZuUG+FAbRCPzpxUx/N9xYPpkdfbqKKXmXtcvyvuYKTDv13
-PDFsad33WTUc14MgCg3o6/nhJuVzs2Xjb1x1mXPlBEaXGdoPyFSm3WyJVg5zKzEY
-/+DFzK13ZbFIFNj+M6BGVtcOAS/9mW4lf+1B4PMlRJHmQ8Te0LkCDQRDd2BUEAgA
-jZhtBarQ8LHAY0F3HozYhHrDvpHu5Zzc6ehQCUE1bMiU7acn7jfpMmruq+a5cU9u
-XSfX3ic/vi90zmcEOxpgQM5bhFjk2qI3F06c0dfjIiewdOYEe3/ITwROB5Yzfnj7
-BNWxQ2ev5t1jCTBLG06WaokKJM7F6ROGMpo1y5OHcBGhHTfAtvY9nF/Z6X4W+q6o
-6S9titeVXar2BhmIcyZY/P1GhlneXXszzfXInr3KYvgTGn8BRl8/4ZMVWI6mCrTr
-csG9RmT2jz3WCceDFzjjlW8MaEv87aB7ffim6zr8a0oVwq85z2EgyXHLCZNb+xUC
-BpIol/8G2AuVvagfinMlwwADBQf6AviRBKjQ0ZuObxuWvw8vF+Prkc0pCs0xEU2L
-Qdw0zcawnoca0xOupHOXpt8+carnCf6QS6SlVonR3/ykZK92y+MddZXZz/Rg9hRY
-Olgqeb2v3Lzg+VQpbXuyk2WqlDHGERg6IhOCp/GfYqNc0yoxk9u0WoCnCLm/MsCQ
-8xS5mPD1hL6On/oZ7n5oZESvHWmPrDVgs9LoStDzV7qLTUrDidp9mwe0jIuEpvup
-5ffboyJTlztq80mME3d2N5sp4mC0HEMjMThJ1ABrvQbMgsCwimgXuRkkg37/45JI
-A6l0G2Lj6D6pt1DGsQTHVlBGfXgQvWgqTYChjtoTy72bxzvpPg==
-=x2/n
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
deleted file mode 100644
index 8e65abd72d2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/9c8c892f91f8e6d1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6bfab2e3c6490b421b25c76c9c8c892f91f8e6d1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
deleted file mode 100644
index 99756fd22dd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d1/d0eb627d4885ced1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-7b9751fc3f01f134f476464cd0eb627d4885ced1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
deleted file mode 100644
index b22da3df4b4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d2/dcf4b49b4d5845d2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-82f833963889d7ed06f1e4dc6525fd70cc303655
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/0162fe0cf6e18bd4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
deleted file mode 100644
index c1e00ed9841..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/07dbc3c1ab1f4468471656061c8d5ef0df2b70d4.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFYqcQkBCACjAM0/0XQMWIe97ntE71r2LS/wvbYNuBnS1PYHPt6GSV0w62L1
-IcIBpOQhD+YZkx8sYBU3WZtb5QS7rHrQym0WbZubYyMy89mY+Nq0VRl0+aiZeKCO
-KT0CIPu2PHdO5A6xl30skL5fLAal7HknDR385qEvc43GzwEol36q9GaMQddWWmJy
-kbMJ/4R7AZvokpr3tflESspVReRt3JA/vr8Nd/V3/bFQBLOda0fNni+xqp2SI+uZ
-dfm10rTD0N2EnMkVAZsae/i91exJ8HGAygp3FVXcstdOeW/vObKPYgpPUaF8uAsb
-/vHZf24LHUEFdeQc96/BwASUB6nu3lvfvCyvABEBAAG5AQ0EVipxCQEIAL7a1rYJ
-3mjnwYO18Tt92h4h49ZFwjrwYnbHwVcIvAr3N+bz9t7ptJte8uBTsSU6gcQCHw6R
-lyeP31PdUdwHqL72xHOIrBUho/HH2YWx01AURs0spAcZdityVtF3UXmKUpwC4AKb
-sztJNvbMmi0C3lRCLFZWRfMsS69XSnxyKd6b5Kq/diZggn8Va1NgQ253jtj2JA/z
-iD1PeuRiEeYEZgvVhec3OF9rcRx6E3buh3NUQ2TJRchsgN/9QXFz18M/HJLJRp0o
-gako0o9ZYDw63aDKgWvaXICTZdTKCkGZ1yWNWLs6j7TdizwgsFv0wK26IuqlRsm4
-iFp3bbfqpSm2pMEAEQEAAQ==
-=5DDO
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
deleted file mode 100644
index 7b86060a192..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/1c8d5ef0df2b70d4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-07dbc3c1ab1f4468471656061c8d5ef0df2b70d4
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
deleted file mode 100644
index c9c100ac5c3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints
deleted file mode 100644
index b62f4833769..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a0fc00d356eef1d4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-4e2ddd47e19863bb87211544cd3038fef07d567e
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
deleted file mode 100644
index ba5624358d8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/a5c8dbb8a1599bd4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
deleted file mode 100644
index 8942c969bea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/1da784ccb5c46dd5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b4ac8cdc141af0ae468d16921da784ccb5c46dd5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
deleted file mode 100644
index a88b1830556..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d5/b4ac8cdc141af0ae468d16921da784ccb5c46dd5.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=g3cB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
deleted file mode 100644
index c100ad26752..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/d9/39f8a1784230e2d9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-764be739ddae10f4473fecf0aef385ed6ca815ae
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
deleted file mode 100644
index aa12f972563..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/da/5a3d35a6757384da.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
deleted file mode 100644
index 28e016cb361..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
deleted file mode 100644
index c0bb3cb1730..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/1fcffe916b6670868fa0ea0391ae1504568ec4dd.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFkuiigBEADmIwb2nUFzfBlCrfyWvwIM3tNYCb/VQ7+yncFkpJgChUOP7CQv
-SC3lp7wjb0kfVUiEq5LAARy2VQ4Efyl0zfySMnOlQ9TfkJUweGBGgauwgaePoRNl
-MTPt597eRNPwPzJUJg+MtCQDQtIMrYbE7nQ/Nlh9YIBp4G+WA8XN1wDXTj5jE25x
-IM1hBHyWU6JCYtV+KtbpFJadr72Lr76VhtdPFLCd0rZl91wpMjnrmxL1yqIxAF3Q
-SIpwRcqRcMk9E3+/u115OWValgOrNza662xDjfFtC7ohm0MRNZFoiqncDn1V3obA
-6kmEX+TtfLByI3p0fpDwVGu7991jJzrMfO6Wh/h5hpgVtm6EbhB5OBEBZNMq0G/Z
-6HZxCBHjRQ2FiiNhy5vzH/BXIIeQcR3JqFDdQD1nfXZbJYNnzZJjAtHI2Scixnv2
-thzqjXjlAnTOdAOMneMHWyM5HNS0n0ZClbwSXLxkOhusDEQOCc3kUajrBNL83sVr
-9TqJq/4/CRtuthPUJxvbQFOktg/oXp4gu1BjAWNG1c7tzJyXfWeSwBaIw9ELdrQL
-P7JvrzXMaMx8EL6s4w5urjkhFn+uXgY3W01r1G6ToLOQSvafbmvMZibjE8HfdMdG
-eWi1RG/EQJAlSpowuJC0yECeEVQkHf8QGz21+EzNfdrc4zk/Wn5wSE4bPQARAQAB
-uQINBFkuiigBEADREKnlLCg5EYDgkrrMsByWPTKe1m2NHBEGRHFqQHaBaRJVtVqs
-AhZmQFt7L2gV16JA5TJd5gOrSMVFt55XIWopln3LXOUT5SitFj3jgeclZ+vR1Lvi
-9KTjIzKdgerkpjo7jm3OOsWytfUmFY2jsq5NI/y1u5Oqv85lfN+h9KPEKQPWG3yM
-vv33CkxTPP8vtDMPxc2dRCo0SAORguo8cK0i1fyM1GXdZ7+VutGS0cXxkb9uwWir
-Qq1lV1klRnLGBZiTure2ATx/45nP5ODV2R5OnlXjQRHMQsu/o/dzXzLo3wVl6Pes
-aqlEmNEwEgHeD85xbBgub6Rv5puqOU2WPXtoCyUETobidon9CWOzJs39mQVYOsBA
-x4fUgBocJQf1KulhjQTBHQE1Hv242TNe5ujtCH5L/aFm2u3iBnxsOLDKDGOgzvE4
-yV90aWX72yP3kAdQNCK1LIhq2zpLBhpCAhlY5nO7S6VKlnDMjnG2ndR8P4Gv3/X8
-9YqZPgGZKLxjMzYqSJFZJ5PU509dzbAU4KZ3hXLeyOnvY5gMr4zjnuzKTz4rkBbh
-2tWnMjl+kjKTsq/UhQ7J+ehDJgkPmgwhEHWwUOaODGd101lfQx5m5xeTqRPIqmsw
-qa+o86P9nb+i3Sd2RbKRX1D/gbN70SoQQ3LiD+6WEfxGWpiyUK1Pr1TWlQARAQAB
-=ghux
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
deleted file mode 100644
index e2429953d4e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/91ae1504568ec4dd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fcffe916b6670868fa0ea0391ae1504568ec4dd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
deleted file mode 100644
index e75721c1d11..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
-20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
-y5M9gIc0yCynC4Cnmg2DmRWuafVvqogz0vDKUG3ADvPgRyaItzh0xO/PsWPZvIHD
-SlCX9Ny/RT1vZ741tBUm1flGUzxs0zAPt0I+ievjwOeKw8OeUb59sc98U3XpVOVQ
-KDD6RIzhnvronznoPkcKPGMrVgBbgyP1/6rwn1u/69CTlED+lyWervseGtDQCO4h
-nVZGTfLLo3cB1ertknmmMqyahfaQcohykvAmVzxxkzaWE1vSkOX1U2bFaUNiYuZN
-U8zJtdENX2isKQp4xSxJ1/+/hjyfrGwLAebtvnwNcsM3oDwHoevusMoLmMNGkGe0
-yLjz38gwLCIuVrSFeHtHJKdPPsnWVsA65o3iCQyEO5lp38cjDE1hkHzXGO34LiPX
-AlDHU2YzoWvAHPqSppppjPJmz1tgHqx146tukezuzoRXuEUTmDAjbpLEHxvKQuBr
-DcSfWqe4zfKKqH/CfhxlPGilUcVyLmhaHjs1ti1Bnj4YmQuWo9BR3rPdLi1gQFlp
-wZfzytmmK6Zy4Ek89la7cgt6AF3eXjNmpVtGZlAb7lr3xne9DTp98IW3iwARAQAB
-uQINBFcyNOoBEADH4HSIjsu94/e0zGBJbyrFFCE8ISGTI7HANfUQeL0Cpl7EbpQN
-jIGFbEtvdPheeaz5hJ5sg3dt/og3fQ9oBAXkkx65XmRnsLwYud5uI4bS240UV+HX
-DBBAVTE/luQfIp6CWImSY3dpfSRZWarXkU3vDtZgj3drSrY8DbLBPU6B9e7QqToy
-3qmZQ9/VN7QEXR+AyNDR2ajEbCzhkWyvXD+7VJg+lzhDnzepIxmDmpbiwmsT9J1i
-+BoG8FrN++ZRVXaOEslARP0+rvpIK6RZG9wdBtb09RJODBnufyprYP0//GmcZyOZ
-CbyLBfJqOI7vUYu78xyBcbwQgbulwMop3sN/IgxCTGFY4R4waHmgfMdagBNobCv5
-bjODfegAeKmI/Tmg4sppfH31+YahntYZ+MZCxgbCWRpODut6JlZ/KW015I/BAjrx
-cj/WooDMxGgq87SAYF6+Kl/Zm4eNp8emduIfLQguZymAryzWQixWwZFfkis/DVYA
-OhZWYvlXao1RPAMMHFhht+578atKpJYzMca6WzGX5TuLSip2tXRR5Y8k7vWMVEQa
-TlQyHQAl3jw62Sc4WI7u7vA3edbW++1wH8kQvoHTIjdUHpGEkGiNDuVi2dlr0LH1
-yEoVyoZYu+sSeRhBKezHtPsOd02iVBevJIXpnVA9z/FlTEOBfcz4oFKyiQARAQAB
-=RUvE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/106bde3d5d78bfde.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
deleted file mode 100644
index 25a4bac70e8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/cfca4a29d26468de.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f1182e81c792928921dbcab4cfca4a29d26468de
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
deleted file mode 100644
index af3dc98a73e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/de/f1182e81c792928921dbcab4cfca4a29d26468de.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFVi8aEBCADKwLgNJXN01oO8Ei23wQYdngUtFl1f1tbTG0zAq2SfeYQcH0qR
-jy4AYE/SqkxjGibOp7OL8O+cOSNNmsiGp/ZLx9C7o91g+HnW9VjofHqv3LREoZxV
-QVFBywBdoeKQNmQ6dn4m9mdq6UfG20JrPawRygGi0yDiVhs6kZkrfkeHHPE73/gP
-QdDEgMmeBhuTzv/tITw2xIYYyF4z39uYSMGlo/C5pgoonWBm1sqJyN4sDFxf7feT
-qbnqlKyiXEX7zBqByoiWi+bccfJsZdwDtaoJdcmGuO0T5baztXnbQnPqs3kUxZDL
-T/fsvLYss5SZp7Ldi/oJfl2QQjU01qFXZfYPABEBAAG5AQ0EVWLxoQEIAKQn1HcG
-Zpg+HgbnguNzA8MYPbBzQ/WlmEpFRqp0y3tbSWmDzyqfFwjWlnaoG3UIrHXcw/qh
-IWpEV/JQtyCHgfA6wYHjMc88avhEe1HpSWEwcFVzdukf9aUZQkxidrgbsUBH2v2g
-9KqXPuUNyGxA0vlOX3bFwfvUfNX1MXbJtVaOT1zLAb9Ks0IeSaUhi3BXcfG42hgv
-i5c9JcjZIZWmfCK4pCmcToMnXQzwkGgJqxDZbpzRPpHjRTYrzUW+8M8fUQMd4Z/5
-aBpq4zxH8TOZITQrj1Wpp2ECC848ezmBGz4N9JVLi22VNROLGoTjlzihF/RjnkXX
-WFPHW2J78FwXAl0AEQEAAQ==
-=Bcuw
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
deleted file mode 100644
index c2d4f8157a9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGKFXcwBEACSech69oRvhkVobrVShZGpJzl6DA/DxMNdWME3wI5XUFHmZKp5
-pD8VDhyOdYhXiF5MosdHsJtsHCz0dr+ss6FCHk3m6LEm8HHeTMFA20rbQKDcLj2P
-8o/Rl9njB8mBIsyNc3FSBtI/Gle0pXTgbfZP1FTDRvoXpQO4WJP1GC9kU3q11HKp
-XPbKRzlxfEuxKEaAywIMumkpVORvYm46sNHkavWUKbCxaPHMGgpueURUx1t5wiHk
-PmrBc/XCN1XGt6tFQSJYYiZZl9WwwOdTA9CjaM2hEHp5yZAAtWmH9a1DS6JpJuL1
-4wGiS4z0S4VxPYWfMVuMfp6aa5fl1TGbIiHx0sujagTnyu/NmYn8IwU1Y5wLAW4x
-e4SaUr4Ue7ZzdSNHEUId1sgS6JpdfbfyQpwbnN9UN34XYkl2+c6GuLegg/2vcgeF
-PsxEIkn3t/Ecuuw1zFiKMG3/gxf4dd/sWbYC4N4rSuli/0ehByY5H0McdfjEtfjM
-THoS39Dd47jnOG8tkhRuPlQCwQl2dpFtNl71nvQRcNtUfwSKf4CXUZkC2o5qchub
-tcAM1ptMF8swGsS8lwoxlZwVIPvJLo+Z/Bw+L1Xkn2oD8ySDiypcS/cA6m1JGXon
-1NEHLOrh6HEy4uHNvxZJplRBllOHR7icF9rYcqvSczlqQq/6E0yfJkg0gwARAQAB
-uQINBGKFXcwBEAC+7NJ7OePu3xiA0k6HZwgcL1SLB3wdJcf1EetIDDE+ECv0EY2c
-961lPg//khp/TKs06ZDxe8nmAbd+piSOopdgmXcmAHvybi1DecdVU7fLcYlJUf6O
-MZ128b0gxu7XtmSWm4g2MYKisDGRgh1/aBueBbCoIRtEtDth8LSUC1OwfZG8VV0o
-UAVcq/vIru7TCHx3BQV2vysc2FcuZMXNtn93D+45bjjMxyVz7Jq1a0e9O5Au8Pye
-nQmMDAT3cB83zxish/9RDgu0omILlM+aDEaKNHWUSBGpC2Wdtg68TpLAXYKqlMXE
-oJGzOv5zU7PUgfIHEqtxYPopZqOq3n6dVUBf/GlULLa6gyxOpgIWsLMC1gaCAOQw
-//MYeKOkvmyoHVzHQnrfs+lwOm40+j5bLkBpPsJ6qmy7DFRQFsq/NzfXYY3xOgZD
-NTLP4+EdSbXgEox1gbV6R6CvK8mhHWiRXOHui063R3uBcku8CzQaIvBDFENEQXyh
-BvCMjxxSrB2nehixb3B6WnPE8L7mp982Ej3/Bgcy/1hea2VDzYGsNDprukJwE1B2
-14BLZ86E5NVEde3JKZWJLY1LhlWu/AyeR+arYze0itPEDw4oW9FBmIfR4Wb3L9lY
-TnFBn2Vb9/eIcwIK4i75Ffjk9Ty9+NcVVgqCvOV+KzHd83V5ApqMZ8PWqwARAQAB
-=HlgM
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
deleted file mode 100644
index d41dd187ec7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/6064b04a9dc688e0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f3184bcd55f4d016e30d4c9bf42e87f9665015c9
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints
deleted file mode 100644
index b9936758568..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-50a628ffaf58480736b1079fd1031d14464180e0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
deleted file mode 100644
index dc98d3e3192..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/72fefd1572eb75e1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-76e94e8ff0ab5af3b6f8366972fefd1572eb75e1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
deleted file mode 100644
index 146c907bb49..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/76e94e8ff0ab5af3b6f8366972fefd1572eb75e1.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFt1xhcBCADDofPZYtlG1I5NRG67j5Fn8KArIzKK9L3bH3MfJC+XYYPY2N11
-ckiF3JQ0kXH3BPL6r0+dOQm/9SGJYsRVRYYoz2HEf/bzLSxFvKeEdEsWh66IcEzp
-xlxV7rXc3oeGCZ+EvobG7JVoRyyLegx/VareBwtBhW39lLGfBjGBzFuXEMVG4H4U
-v304N7D4sEIBYWT8c2z5Q5/Iviiyu/VgHxczDn0H6Sl1kXP1vVhWff+OBlbO7JAF
-TcW4ET3K/ASWL/CirLbyyVkO8DO5pQyuJqci7pJFWWp/56CpJBmxuyQRc4SEpPjC
-ZUOs335j1+MxAJh6z1L/xZHF9OV0GgT8cs67ABEBAAG5AQ0EW3XGFwEIAMYfnXhq
-pCttsnWLFIxpEXvARjfUEH3WNyn7kyLoFPZ0AU7V3rcdsBg9k9Ds9Ly5xhRFVUd8
-AzlrywSeAQ/bSV++iXh39xLq494PHLQTG5Wuxg8Hw21tKe709iOzJa8r6CO10sj9
-JfCn5zWilqObcxcNjKcmGOwTfoIlm8giVftdMNge1zEsJQ3XTZtMNSNHnK3Ap/I7
-tIBTx/p2AdgFKOL73owtqQIBXplmRr9AHrEiwq4vsxwh33S39HsfE3KCmVWJEIp9
-CbitNGmonb+5cFtaxhEEhnmpmXpAbuQcNsjBgOiWXIUecp7iTkPMoF/fCzJgBzHV
-x34IV/XBzi4ZuZkAEQEAAQ==
-=X4hN
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
deleted file mode 100644
index f5793d0b464..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e1/a9b9c4370b8833e1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-dddee87612e9fb95f5c8d91e411063a3a0ffd119
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
deleted file mode 100644
index 66191e07d11..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/56028df552ba32e2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c536a28bc89fb250272c9f7f56028df552ba32e2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
deleted file mode 100644
index da9b93d6f8d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/817ea1255546d6070a23aa00db45d3a62a183ce2.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE7CF+QBCACgVSxGo1xBKSebwXNvh5g6Sb4KOwOEFSTve6xixOdlENjI+Jqy
-8diCfFF0jA1ZNOd9xo/Dwo0geYfw6/W2RWFhs8HmTnOPKQu3c0DoobHGfGLXnFb7
-Lq9WAeixoIrkU1AGvll1a1V9BTaYPHVWj9sflA4tBuoV70R6JicnMMz2cSDNu0AE
-YnmRQjnOhTWJtrvLJqS3Syl18XtXuftVtAqVqvB7LpZwhqLRBnjg9k5jpnb/JApp
-VYkDvCmURTn7bVMklBQqQdWDsX92WyOyelK+D4g7dEhofA3QRg/vzBwxoy47Xpe1
-1Nj0BZB9UYvi77T3MPCvJ2n7QLVzEN92dnbBABEBAAG5AQ0ETsIX5AEIALYECndW
-IXJpzXIiZgoITlsPA07RYOdZO4oWjQalmmmBB0ajHGWbLrWqjPV0g6KK0HidV6go
-vca8qUoaufzk9HSLSrzTYzevM7hNXrlI9Fsso/GB5rZwiX4F7E7FApRtyddQ5/Hp
-ft/P/xnRQ1ETCC4STDkvZ9j83gsY7Y8MRBBg1dN34Rl/lTyKdF1s8d44hjkDl5IV
-+jyUsi1woOzx3wm4oOrHQeqhdEoqXvhDZY72ajd0Guo0jxRgKo7yn0Z00KRw2Rd8
-uz2ppvFMH79hZxItdZj2Nt330goT4WXwTQ+aJ41hub8xO/26qF7DjZ8N/SrLVTZJ
-LmFKoZ9Vram2zkcAEQEAAQ==
-=wK7a
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
deleted file mode 100644
index fa16ad361ea..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/c536a28bc89fb250272c9f7f56028df552ba32e2.asc
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-yhmyioZvuRxjrHcAEQEAAQ==
-=/3ce
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
deleted file mode 100644
index 7df0ed8dc7c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e2/db45d3a62a183ce2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-817ea1255546d6070a23aa00db45d3a62a183ce2
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
deleted file mode 100644
index 3145005c70d..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/2f3c9eeb05d1d1e3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-12d16069219c90212a974d119ae296fd02e9f65b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
deleted file mode 100644
index 8e66bc24ead..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/875c3ef9dc4638e3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c8c4b9dc1e031f788b12882b875c3ef9dc4638e3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
deleted file mode 100644
index 1ba0f83565e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/c8c4b9dc1e031f788b12882b875c3ef9dc4638e3.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF2sVzEBCACqCLAn02agm66fsdgfEEDhPGlJv/BhX/GDsw/FwCzpwZLyiFiJ
-vwcMWgV0OOP3gI2CkzPxFE9/LL3Zjc/vS9J0tGeDBsCPB7TGiToQm63+zyzNCU3R
-G7205zo+Ty8P3JX/InHRPrqxwitLh/sF68A0cF6EjGDoL4w0uuYYBMevfuGfra+b
-dGKQPAWzU0afcQSpOkXIIdwBNb5vam6fy1att+50gqgPBKfYpBMFnkBteEBFIRd4
-8qQ2NIIwMC6P2ZIRBWUAKLT5fZaQ/u5KJRZXlT2BclPmS0r0mbAJmXNo5FWEk4l2
-16rccPwFg1AcX3rdAbtJ84DyBa7+Yz4aa3J7ABEBAAG5AQ0EXaxXMQEIANBULfZK
-Rddy6Eq2d9TAPRSwYo5Volr4sTdiztr+60+Z7ink96VkoVowDrZ8OgvWQSm+tu7M
-ocTpJ96ubO2ilBRgH9g9tX8/qT3bz3QSqR+A0K7b8KADew8pN+bB8GsOzQSu7Zgp
-uqT73uAKv7YUaZ58Y5geWvVpBuxGQUxcD/ArOLyT1fBu2kvaOS6n/sRO/3kEnH27
-IlrvhCt1WEJeG7/BFHhg0z8cLVaR0RxpPvbY/l6sudtziBrrwMG6c2L11Gniz7iL
-gSHSQPhUKFiKXcfXjk+lS+bSnx2XooY4WpZt9eYEMVZLY5RpdPYyLe/xxfBXvoSm
-LtlBhI+uyGcwWbEAEQEAAQ==
-=iYeQ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
deleted file mode 100644
index dc98d3e3192..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e3/e95b8ff73f6b84e3.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-76e94e8ff0ab5af3b6f8366972fefd1572eb75e1
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
deleted file mode 100644
index 44482f78ea7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/0785b3eff60b1b1bea94e0bb7c25280eae63ebe5.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
-f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
-bhhFEuc2B85vNf2o9Y4V5GFwbD+tFNy4u24n7zg6/VgE2WDvYJ8JRqCEkwCggyLj
-ba0lsZ2XtSINh/W8ok+9f0sD/A8WhqBfDTEBuG9gnuCYXM0j7XBBPdPS+FXmmfea
-zyP+URKRprLCdt0ThZAMllIxZJrkbv7aeXVpM6KSZ/XvvaFQ/gha4o4iJFvpoKt1
-Er2j4Tz/STKztHGsMt6pqfrMNPWovu4tLuLZQmojtbIk+IwmcYxMy99owH8oV1WC
-U4HeA/9MlUxzmlmrQF7VLqFTGEEqQaEJqz95wNPj/t1DmI97hshPzXLD4zwKwa9m
-qZJPStRHM0a6xW2dztF12aXhrmYg1gIGNnsHtq+t8ZhfINZUurSWn0m65WT5notA
-15s6hwyDACHWWOgFQ9jmWuGDh0ZpiaBe7BxeTV+MsswY81sOn7kCDQRD6J8HEAgA
-sivVzAfz34QE+S4WTXCuknmYiSEEnyTwk9awb52vrYlhoQ2t2EhRClc/tR6QbhNM
-haMxPt1OYeutOvZN4q216IE2SwZzIDDTchYApP/brBdIDf4L/XGWFIqftCSn+vnb
-0LAzYNVuNXtNwRni2q/fZ3g1wniVMbJ2MrJNt2VhLrP9K/ipFz7JCJittMngmmDF
-7mEKhnrqBROLubFsUfNmz1qRC6PiEwyyCCdG+4m8fIiSyqna3CMkZr/UaVfxuGZH
-WM8HYGmiQjafqeLqo8aSbWerzDYtF2+v4hAAt9eDwdgYy8oNxXEvw7Q+G5lix+6S
-UMYV6NKLNUbBYffm9wjVuwADBQf8DbA7RpziZWLv7DHjR31AA5nnGEeud0dCRO8r
-wfQNnaQvuJq8siRmU3uPAL2NwDgMaa0cT1xt7p4/8/RU0N9otVqnzkLMUTuqq/wt
-QrQt0OWsEJRyxemWFwiL9ZpU4eTg49cfOQXjg2q3fbx9D1Xr6Bu/Pn7UDU8r9GbD
-StGJ7R3Z0kkhtCErWnGNXbuqlVd8uEsyeM2HYpM76BmH/8vMg43lOJyyh6Id20ZT
-n3HgWzRI5QaDJ1JYBhMuVChbTPUCcMox+qgiH4KtRIAjt+m3w0Axjsqo3EFPweWG
-pRfqMyiUcESt4X/Z9V2Nf41NH+nQ74v3RvpP7EWKf9FfEtFprw==
-=n2+K
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
deleted file mode 100644
index da7007bf710..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/4713a6a15a6ea9e5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1ab9bdf40ed49debb5caaded5b30d3b10694f057
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
deleted file mode 100644
index 39f8f25641a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/7c25280eae63ebe5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-0785b3eff60b1b1bea94e0bb7c25280eae63ebe5
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
deleted file mode 100644
index ebe17bd0153..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e5/b4f772a2a08563e5.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2c1708ea05adf6966c32d6454a1bac7f1e3b89b3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
deleted file mode 100644
index 6508c198200..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8a10792983023d5d14c93b488d7f1bec1e2ecae7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
-dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
-P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
-qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
-CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
-PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
-dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
-wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
-SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
-9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
-MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
-iDXIY2rT0D71IucAEQEAAQ==
-=/sM2
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
deleted file mode 100644
index 52dd86c65c0..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/8d7f1bec1e2ecae7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a10792983023d5d14c93b488d7f1bec1e2ecae7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
deleted file mode 100644
index c9c100ac5c3..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
deleted file mode 100644
index 93ae4e36dbe..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
-hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
-cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
-2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
-nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
-w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
-4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
-V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
-6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
-BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
-bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
-eFcAOJmvqC3c4pUAEQEAAQ==
-=Hn4p
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
deleted file mode 100644
index ba5624358d8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/4f89f83c363d30e8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3e1ac64f4e34e290503c90323449ec3ac2efe8aa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
deleted file mode 100644
index 775b472966a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e8/f20db7fef61ce1e8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d75e25b78ebb19e47c0a99bca7764f502a938c99
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
deleted file mode 100644
index 0cae4729da7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/e9/cff46ee3c17e53e9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
deleted file mode 100644
index 47557b038da..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/4044edf1bb73efea.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-656a225fc79ce5cbbd7dd5bfa7f5ed0fa05d64b7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
deleted file mode 100644
index e8ed4474a32..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5b93f1df7cdb6dea.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-5c9a30ff22b2c02f30261c305b93f1df7cdb6dea
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
deleted file mode 100644
index fa5f227100e..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ea/5c9a30ff22b2c02f30261c305b93f1df7cdb6dea.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFVcZesBEAC5Poew53ijRTE5kV2o2Tj+plJmoQMRtfiurMUpPQ4s/vTz8Bte
-WoHdNfJrzordHBZdy1S7V8p2kTtKWyaNFMyVoavBqo/BurmJ/3qUKH5otXkXuaAi
-zFaJPeEnR6y7pxTYkwFKyrn7TE4I84JKZEMLEbJIw1YF3t76nj055/OnzRtwc2Df
-cPyGqDALyoFXk6R04qIotVmlX3NwwF6A0M79+W+kWvPg4sD4R6SqwJb1UhcqHrqb
-kQOllg74cBjyAikRbqrCfoydHM10gc8f5w9+8v/fbDkSBtoh8Y31WSK6ocoWIg85
-I3odqHFxThwFTAYQC2tdw1M5kYcOiYVqw91JvBivpKH02vryH2BJu9zQDNFeyXud
-wyengMLlzUUmf9jBk3M8IUE4JTerw1AzWj0b3jdvG7FrgHrlszb6eCzE3BdY7zGS
-Qh6e+ROsF2LEKkbjxeAg58nl/h5iLythheY0S6sspeOTuDtgLgm8TZiGHA+j/qKH
-DY+aRReI0X2bzqNZROhTIXHSKsoX9+9g5a+1NYQeZmiICNo4vj+r4+i037QvIoy6
-3K4NSVQgKnR9bbgyQCUprifrkywKF5a8eP3wtUGtH2FNqFQg1rUKBgLjLbRJ8PF2
-Ag8O0jmJBPxdOIdVP4vz37m+jyKE6L4JWjnaFldtD3NDJI1QQYX4MmXEaQARAQAB
-uQINBFVcZesBEADFcTVSAZoaax9xpw1zxwjVgfQrNfobqnJM33r2EBSB4b80NbPO
-toHJ2OUvHq4w84PB+H4+JNAIA2KbPOvzB+u1Bn5IgJr9asH5lhrnrUSR+YCwUlnC
-w+2YJumdv/l6RKcFKbSRZHWSwTD3ZLBMuPUqX9uZkOuG1ftTkcVtfFHN3WAuckHj
-VxTSkaHhZ7ALz8LIUH+8AL3/3eThM1KEgx+bcod8YttctzjTy9cAaT93DwKOqzqH
-Xpk6Fpv9bvdiNye8Ye7f8487N0/3alMPpJqt2tHAqjxJRDb590/09cbt2N6l6B+W
-lpM5hgkV//7ViL357Hids64sqbYSnmpQjZWUdafDvVvMKYbITmx26BEoWtIqwwpj
-7+DdQlxd/7bAtyk8XiHe6Ej9FF1PUEvBQw5NXOUiCSBo0hzcMMNy1uRb/WpdoZX3
-TFKXTWulv95uzKGAo3zrUuKcfOGfDgqZ/H2dy8Yw9DaWJRnXyYwweUi1PtncNk9k
-tycypCcVbsOQhGdQJNyGVUVgVV1CWz5GJ3eqtjHY09r7HEm6bGviJRu/soskXmmj
-RUFpqwtDCRACYShDpnFjpmWTZegPcwpN+492qLP6cjh1XSN4Cg1YZ/0BMY4NV/ye
-adQf/hbM5hzPOhN6mr+VHOLulyXuV49EWisIRferqaXG67zIXbVQ4qfqfwARAQAB
-=zOLc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
deleted file mode 100644
index 13119799a98..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/995efbf4a3d20beb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
deleted file mode 100644
index 9e0b3a1c163..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/eb/adbc987d1a7b91db6b0aaa81995efbf4a3d20beb.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb
-2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME
-58xSA5quKBUfl1iO2qx23qv6Haw5G50twq4A9WJdEelJJDKzzweVw0BJdv8z01In
-/+sfiitcTzRT0NPbsuOnKCvfIa3gn87BvHCtqai2njq0b8ZQroLaMONtvzrn/gln
-R4oPBdeIpdjf1CrAdWs8zdiHAZWuL2mZBieEgr3+je074ARM3yCpo3DRw2bMwJe3
-JiqIKb0ebCs8ddmOaT00UngmQqCOx1qGjQeXwTD3x5Tzcihdyi5auP/zsBUZHf6d
-kmugzOWrgQ+rdfUCRI29gLWcwMp5dvMJxanREY+p854Hib5n4HZflmkaZCnEls28
-Xh1h3T6e5pWKvfZhsu7qefFjgY3G8O1vKmHjOQNoc/sEUwimAXJxK8E+S3iH/cSV
-9mdtr0TnlzI2r7+kXdyUy2rGgieonSRVRtd0Gdmu4MkiUkbrX3MBvqP14OvT4xkC
-6lcbQK1lrXflWSSRmtfNKpysVOfaIgT5p9F5zJJFEFGm5J25z8beCD8Pics+OHF4
-xfYB2SlM4xmbow2kr2htAE2RyT5EuUNuokkdtrZONmBGHBqzBPvj1vzncwARAQAB
-uQINBF9amNkBEAC46u0OHX2x5/hOswLlZqgGdscFpjGEtAcfAhTj1zo8v2vTNYX4
-E9aF5hQSQneH59a9SWOFDzHCvVWRgfxtupVm3AFPPyWHcb0xsQyfssG0VE6T4B3P
-BNP52pAt36tr9gh69oxfzkC/CJ/DmlKi8Dy6wqt9CzWG4vciI3v7YRj6JOdM52PS
-r+3r8Ih8EYYDaEPAYVJPqNYqt+cjO5goVqCSQfHy1DuM0ggvZ2vZQAZwAgLmKrED
-A6xQUicHVOfN22MIEsGy/qyC7TRJgyhJzU2KYavS3ySp+hPSuffNh3evpArWpFN5
-2e6vq3l+5f8iuBFuNRasnkIAf78qsu0nR25pO8EYzzdcL5Awkjq28661P2veuD9o
-eR39B8G4CsMvYQ8h9oKLh+Z8il0WACycujJGaFxJr/hm3WugCSltzhCN60ocCOaN
-BMq+5rLEx1PQ2DBaf09xmW0SW+pMl5dUDqE62/cGdXF1DaBCr8HjujZ5GXm2ZCru
-LikPaYU2zEk9pfZheRGOW4uvp+SfeuLFo9jt65TbYQvT/hX8FydwpG0dwQtuM2+9
-FUDSpu7k00NDtLMUwF+xlt6vo49Vt0E9nDMYH9OEQOozFJTtxENapOFvHEDI1ZCY
-xCcKOATKqraWzD++MpKIIfVYrRZ+CTjrh0m3Q2NA5aZDLTEmzB5SY0xliQARAQAB
-=tiDp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
deleted file mode 100644
index 4ed9f6c9144..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/1723844cf9a045ec.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-015479e1055341431b4545ab72475fd306b9cab7
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
deleted file mode 100644
index 6e5da6e7595..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2290c86d79f1dfec.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8da70c00df7af1b0d2f9dc74ddbcc1270a29d081
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
deleted file mode 100644
index 67aadd287fd..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE3go9oBCADHAkyReHbL6qVMzoEGSF+eqLswZmJNBZylIgMd83964tzT7i3X
-aUIouf7nHL6n14AHNxDKhs1FFq+/EFYN9Jfdw+uFauoeUGIvXXRxaem4yCjzkyNm
-VrfUlVV5AT9hSeN3+/PtlI9BT1zkK2ISQVad2lrFvyOxkHEnPzyAouCsXBd9aPcG
-9hmQ+6hZeJjXd/uQVxYP1DHg/G78zuXS/4u/3QJi1gSEe5IQilz8cmbGYyioi1WI
-cZFXayLBk3XQCEY4cejtGygk7j4kHSefV2Sfq+KynXRoUkOiE00GhbQrYYvQAm/G
-HZZV1eq23dUXXJo+nb/yI5o60uEELh5l0OpTABEBAAG5AQ0ETeCj2gEIAM/0YtIp
-nm4E21tXYmDNsq0/yaLs15qfUzQzawE+9stwxPt/cYlGNzmBahBm3YPCel1+ed88
-FAsn+vpvX89MsqI7cE5T/UapA7yRRYdnFVvAMPsOd5XXl/Rw3CH0ZkXAjJAmxgOO
-XF1ISLNVUOXjHktWrxx5+kDSkxw+2dU/zeOPJtSthCAMydvc89rwqybk7lHXjq2H
-7f+tENLOUX+3hWwuvrf41pJoG1oKPP/cUqk0a++bbozKxvj1QVnIQ4VB9sDgG/FV
-RJMAqM7hgeFLDrZgG4qeYzrzmYbNWfBHpaSeH7KyU5xYrbhFBacJPmN1zZB6uAgX
-MyMCcceijXfLkSEAEQEAAQ==
-=et1a
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints
deleted file mode 100644
index c97cfa3ce54..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ec/f6bc09712c8df6ec.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2f39e2a1eb9bc4e78f403b22f6bc09712c8df6ec
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
deleted file mode 100644
index 9fddcf29fc6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/9a259c7ee636c5ed.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-e77417ac194160a3fabd04969a259c7ee636c5ed
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
deleted file mode 100644
index c0335cd02e8..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/d3dbc823be4819ed.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1fa37fbe4453c1073e7ef61d6449005f96bc97a3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
deleted file mode 100644
index 385bd035fe4..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ed/e77417ac194160a3fabd04969a259c7ee636c5ed.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa
-SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la
-0d8eYXrKO8BU024o+go+LzJEBqOb3+bn23dwF96dyCUfnhabYz+ZbPd3VmZV5D3G
-fv0vBMnQnJkToOW6fVEoqjzCpEQmSFCWe6Cryj0veci2JmFIiiLA45hwuMg3hj92
-Czd+mdxcURtwm4XFfUoO32a5nAhNfrzKfz2eoV4my79MC8JA8OwQau5aksVu0Ohs
-3z5IsdXi2hUqPF3s+j6BQFwSPmLo3r5XwZWTx9RAM7D6cOHWr2jW61o32t6ABSiI
-cfhECTb0arEvjGtr56kD2JhgTA5GTIBGPwbdNBHMKZc4VmIFITnUlJ7MLoRv/gP6
-XyCerPB4Cm6kOTcNZnm33yUMNB6GfR1/l/+3hCFP+0z4/WJ0aK10d3/9opikkmep
-gmNtedS6ScgOnU3pj9UF8jEMleK47nD2njc7FhGKdB5+I59L1ri0tSUdMhpuBAEd
-u497Ei/Q1rt+vkNwA8uMQgXOGka7NLpgPcNw6sDCq1fecCEpt/HgmGrHdK6pY8KE
-3I1xEGP6GG5DcBs57cbZv1Jdjf3A8fIozX7Ntn+7nBCHUVEWCzaASlQYrQARAQAB
-uQINBFKD+PgBEAC8ZqGlqxaPZ+Y9QNsroptbfZ8/YL/+09qEki6bJ/bPn1wwAOpf
-Q57LSHryrVFZXnqMO/+oSTb6zNRvy4C5VG8Lvoc7JqGSo/fc5nfeZwFS1v58j4d+
-6AfWPPmg0f4mt3JASoHqJVwsRTEQsZsuaykPulA9DUsB5/wMQXlJLU/YewcmkDig
-QHw1bhG3KROTFnnFp1bWwEQ0C3zTaB9mJcrCswKUnauDIWGeR0r3ALGllPwvzr4R
-cwwTLUHzaQeeRzJL39oRpU+iq/3WW4HN6at8BQ2jHiat6QidtWOQNKQTvrjybs6X
-gkRskZniombGiTbDgsTp1/4BRMDb+0nRGh2z3QIj4ZPVg0d2ISf82M0AMdZpzPXX
-6Jw3o/A7Tv4pJa5gHzOUTDThkOFiQROgVP65nvPt8JPBIvwL5eaG5rzDXm4iWq6a
-cMnREGz7jQdC07UvVxRAbVa4mCHGJKNskRDbWdGZDT4clYFoMQbMup2CMMkObJac
-OTxiZ4xy7vQWZ2obNkb37RNrIKqCFxCcuQl/9AhlkbAFFrodEqTjNHOFH0uq1/0B
-uH3XiW9Xih3AZ0fL1wq7qrl2DXBIYMAbzABoQviGYoRXvApSSfuozFnV9B/y8hyJ
-DQRInzHslXW/lkdrBWiBYDb9rxKKXCzE1WYYHhcw0BG8dj3T1LJ3c4NKcwARAQAB
-=Irkl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
deleted file mode 100644
index f24401d1630..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/55e770230e69cc6de143fb5b62c82e50836eb3ee.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFeOGY0BEADIr99yL4ahwgM3KB7zMVzDk/PEkzUWpm1BSxqUxuQtzWArFj13
-Y3Zi6g1tw5jKESfxtmpXx7j7xR3qVdJbsYJMU0zQi+FehwnKox3Go3UnIKt7kydz
-CGowsRjmEuLErftU6QCDof4Xpum/IPFgu3mcQK3dp+EL2sJDDBahz52DF5bxcSZw
-4OawjX13pnjaPHGw7iWt/fhMEDRmlr6c158lTpEMGpIHH4cum/QTFW1xRf2osjbk
-RysnD/e2QMTwnm05WdImBQq0PQGU3Scz6HQr06UAWyaaukp+k9nZD//hZ7t68w5Y
-wHxHcpFI7JTxesRTv8PNgG5+EC61O2fxMgAefDv9UwhUpYDfxtc0yJYz0QTfNQQB
-RTd8Os6J3OjExDnUFUtPN0Xvgl/SzfCIbxmr/mKqWLzazJMiuNs6mfASrYVuYERl
-c8Gm5TXRU2Pg55KeL6iDAyXDuObKvmqYKb8qXM/qba+RI+KOhBLPSMfWVw5nziVL
-XY6sjXHLIyM1AfDfeM0DHReDR4aIkdnQ4yzyzshmhTodguDbZe2H1FlPNqzriS6c
-4s7CoyO8tTTSHmrxkVLJhMaTc1XazhcQrsp/1s6SJ5MUy0rFUt9QyIt8zfGqzQVH
-pqXmFZd+ISd8Eivsyh5gEU4JER+3J7kSuMQx/wMMZqzu1RczUz4gI0nzTwARAQAB
-uQINBFeOGY0BEADaPmufkJ3ZMMpXhbkBISnPYW/2QGIU0mtwGOO13PnkxFGn4bFI
-es0459axyzMAT2DiOF+cOh0R38DJN9r3ZZFgjAuiy0WTaHyFuON9Ebm3uDLN/VrC
-laXhHI2BxzcYC+uCAor/zJRytD36Cxq8c20NqqQqqq/p7mMDp5S0EjoDpuvXQ55w
-vNmH8dwqu1WBgSYbv+R52fzmQfy7OktbU/mvzkSaxnfqTiLDr2ZkAZcZjgURFvGr
-OB262jvFQ6iTj0ATCrj+xauvpazAAP3z0EgUyegFOHQX/VjA8zqJgMF7d8WcKfzG
-xohxIck7ozOXmcroLzUPLb/i8riDOftXqUcKIkuWD0vtpMVytXYG5RUAo24ypGjm
-Bmvyjy5EkPlc/Yys7Bja/tUKG6F7pcZep0OHTT5bWHUyfvC621cc0RODMC0jCOHb
-MJCetcMBtoPioGBhpjZGrGp6qXfTBg/HmvNgPfWgLDdnBL8iE7aq+Ob/PcnodIGm
-tzAskUhpzNqhtDNbkHV7GDxdlzb3ktZMBGwYgeCal6YzwF76gqlLDy9LQlc/KVme
-A//xB8TAOMEP/qrlGgNJV7kohcvY+4drpTf1MyL3zpZZvD275+sdkL/tjzV8ow95
-ggVesGRDrxvcGvbsS/saKQxf7iwaZyShaNNTCqm+131UWizvVN+enO30ZQARAQAB
-=EYyV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
deleted file mode 100644
index 798a7ce906f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ee/62c82e50836eb3ee.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-55e770230e69cc6de143fb5b62c82e50836eb3ee
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
deleted file mode 100644
index 8150d9a5e39..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/ab049df4ab24c1ef.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-d76260c72df74e66268f7770ab049df4ab24c1ef
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
deleted file mode 100644
index e6b060b17a9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/ef/d76260c72df74e66268f7770ab049df4ab24c1ef.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFkGbgoBEADXtL1z5unXjC2gSBMvM6f2Z1G60UCv5W8CD9XhWRFxqhbeo0yN
-Ld9mWpTh1b9equw85LURzVKF9SKTFrBbtSLPqAsnomgoiW4X9F4S2IQfe/d4YpTC
-wxgQ7xvG/gg1YIXg14emXLyYGhP1k5d+BTcFWp3cCRqRQyUxRp6raiSmSy8n8GwH
-SX7jY6d0tJUifpM3ol0Zyc91/BsInJsOBHgGqholZoZMAEQvgz5kZA9SG9svW+bS
-638aZ2WmNXwTvba6za43tg9HoDBV0oM0c0r1ETxa8JbHGGJCt98FSpblEhQ34Z3u
-Be80FAXpoympbTXmzwcWXfmFL+Ye44513C5fFCtqGQwDSUUpjnEAZrla18ZfJRW3
-zPt+yLL4KkA6bpr4XtRmw/GB5pRYmdW4JOWKJZAErDmjwfUumAYDCMDP1T6GU/kc
-imH9owloujSBhmIPS1q9zrl3t+XSq/TqawqmcmVb+2aALpAbh3A+E/PJpwQ3Rm7d
-RBsYtz1mQZprHd3WnU9mgYaIztBxkhyBp/2HScM3YsPMjSgbyqKDDY6Uy4Swx7au
-8sOwVSNyFTQDdVsxyS1eLqzsiVoBNZSAFchFp4zbXoMjnlysIDxh0HWOOmWheOZ3
-M9dMYHMXL8IqghCkZ7/V8lKPf6hnO8QxXAz7/7WVAoj8biIErs4eJmKY1QARAQAB
-uQINBFkGbgoBEAC8RudwGRy047m5oKjNDRCYu2iAAHAjh4aiWl6MpJCpbPKB3J07
-ViLyUsdHuyoWVwGqZRX5v63FCtO+0EZBOGy1dsv3uLtxE++5oAqv0mgYO1FIDTRr
-c56b/8HN93J9PmW7IQhtmeUPSiSfE2XqsqSVgJEmwxazZvudDGccWbBPjdr/rehG
-WmVibP6aUF4JvlgNnoZ7tvhWsqpfIagkB00H/x5h1RY7ZeYYV9uDyvMVx9G46XPE
-g1Cl3UnXMMIykIT11gg7mqn9NFn2c9HiMeT5SydIG7W3IyaG5y2NKx6UJjS2T0O2
-//3cKzbMHXjLCOyXeB48iK98VJ6Z+WG1RbyKP3F6wgDAzo5DMhB6x7GKuW75vrdt
-/SoKTIcZg7SZQf0Ym9ORZN7t/T5hnFkt48lZDR5w1HozUPbIGTShTQaKkYfBrlcQ
-35MAu9AC5WRQCQ//5W+WZ76sC7wc4Q18xNLmk0xQNOWn0ANtgJcOR2J8JVSUdAv4
-9ANZdZY3qZ7Vwh72iQCqaZ3QPAF3Ift7zDEU7UeXwUmgt8jCnISV7RSsPg/neCT3
-58iN+PzBIyblg05iEVhJGs2rF3+2A5PwKzeaTVdGWISC0NG9mjs25aI/kJ5sY1Sn
-786gq5vWSywa8UVcBiT4NDdWruPlWXLwrxPMXlvK7EpYP+qIqAAREs4AuQARAQAB
-=ef3u
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
deleted file mode 100644
index e44277c3a12..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/34d6ff19930adf43ac127792a50569c7ca7fa1f0.asc
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
-4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
-fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
-+zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
-5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
-0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
-GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
-AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
-9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrkCDQRNNXsZEAgA
-u0P3pwV/lKVCGXHXgwJgrQSLFSdrKBiaeKEZuCYEAEWXE9hLxn3T6MWrioHwB83v
-RXWU2NC8tpOg/GxLI7f7V3zKtlePspmjCK5QcaonAkK8n1BUaXwniCuxayimR7Im
-Pc34p1+f77pBpZ2nV0Us6yAiRBzo2IAKNn3R0N0TQy6QGvMCn7TYFX5vyvm9eE4m
-4GUh/C79+TyzgXmnV38Wjd6rJ6swM4KGfnEEzL202Wg6Egng0y4DbnfGJJP0H5AQ
-ZQnVecLHAzQMnPtPIoi7xbNB9Oy1d2nzVCUqxuX6Y+1HylOqsjKGKd5nSydjPPQf
-iF9OQIeryS4uJ0sjqUwZXwADBwf/fIh9jvuZ5eVhn5QNtOh4n/3zFqssSxWrYHgl
-wd+hPEk3rRwj5yjbWG/GsUJL8rhU7psgMY4UvrUmoRVzNBBDRqy3R317w6wmlZy6
-5oIXEp4FtVFV1iuTES4vfIrWqr/L4E9FN2bPqd4MNeMnHcnNYX3/VH1ijYuemSOB
-b/DO4ZiL7qymrufQjOR2SKknjpXi/bxSVqr/7ceAfI9ugMFPzcAzl7u5EWgQMruR
-ODqMw6YO983AbyAlB86uR92DelR/SmBO1NgSxQscSE+FoDyDdEg9+5bumsJQ+x/s
-Fu6GMwiISFC2PdMxfrit63jH124iqi/GxjYBP1EAmNMcb/Av+Q==
-=eVH6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
deleted file mode 100644
index 61b0b4f6326..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f0/a50569c7ca7fa1f0.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints
deleted file mode 100644
index 8e66bc24ead..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f1/603dbe5f5c9fa9f1.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-c8c4b9dc1e031f788b12882b875c3ef9dc4638e3
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
deleted file mode 100644
index d2f7ce18f6b..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f2/fc51362145a05ff2.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8a9352189aeccfb4ae1f3bc616fbb6b6e3120829
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints
deleted file mode 100644
index c96bb8e4dd6..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/73f7734b17ec71f4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-24d04176586361fda94ee0315f7786df73e61f56
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
deleted file mode 100644
index cec29c20c59..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f4/92bf193ad552c6f4.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-ca491704d613780d2bee00f2c6fc46eb51cf569c
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
deleted file mode 100644
index aa12f972563..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/bf935c771a8474f8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-f05e5f90e43e837f9dd8c781bf935c771a8474f8
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
deleted file mode 100644
index 04fea655c64..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/c9f04e6e2dc4f7f8.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-2e3a1affe42b5f53af19f780bcf4173966770193
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
deleted file mode 100644
index 4851467af2c..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f8/f05e5f90e43e837f9dd8c781bf935c771a8474f8.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFfFy6gBEADTj66jLcvIYF4tNUoAL4wyKn0UTEUO3ERr+xt3iCswUGuyCWYk
-PHRN3fRkJO8XqkDO/mjWArYt4PKZme6whYb8WJr++pAil1LJXFHo1AEoX0I0vHNZ
-j9srEKiMg63aQXczekmcLcbTeJurDrCWMR9i3qRxrjya0W6pI4ykaHDh6vQ8k/C2
-wkxIE4OcjIZy4D8+e2Cf7qDmUzdqJfZwbMB/y2RtwwWvOOzFSlrxw0zZ3nfQ+tnB
-LwGxugz2peiF5c8gRcV50EXOJQYxEMdsStkxLymIFaJO9hheW7/zJrTRbWBNHvJI
-gE7wJ0SP/9mJojDPiPH/GCfoUkcl4p42ZwZRYAzs7frHA/rmyuyqM02VqXvVsgZk
-QNI5iAuxfTNICHmj3sv3yifQ0OrAI5x2ja9PcvVXmZvTd3Ocf8Rd4mMylGlBBx9g
-kzuxl6AB8eQu+75rSTgGPKfSeDKyxyOSTkhbJj7uX4nf8thzwhVz6zI5aypyYYDL
-5FWeX7b7GPytKoeN5UiDcWgLuzwjN/wlN/IntHWDWkvUCEJ/JpN6FG5AUY+RQkvS
-FrFQLTkGTLQaP8GHo+47Weve+CApUrvTr58NXHBYh8FxXG/cpgAOYt3xy+Z4niuh
-kpcriHwO2xwd4RL0pFhCuaxvgZlgtbJsCv3yLZ5czoUgy2i4u91ZaGflhwARAQAB
-uQINBFfFy6gBEADxoYf2dNUI2DALMtmTVnwknpccOL84iFlYkG3z08DDx37c6DBi
-0ls8rZZIBw/SUxJTM2Eg2ySBqt6+v/ZihpQqoA0upOCEvqsKB1i3WK0BWPRhAE5z
-qav2hp6odIRgoaWjDes52XFFc0cX611T3oM0l2dKuUHr/9/ycne6DlUU8cHwiUzc
-/rRu+kn99rvJueh883ZgZHsNrq1jKNPsMdqNT5Fot+YQnps7ILoQduIaCMDu9PO5
-yq2JrEtuelqzEC5TrbcV1UaIAAbwS7xE47SXnjJvH/5lV4SMkQe1IqOI03HKuNR0
-k9ETAWLoHYjrHqd9A13dfq6KQgCex5psFrwav01erSq8F3ZZy2jDn09bVMLrwwlv
-eBOleFh5NrN2d/DvJq+f/DBL38gARPvvu3fsuELJHaMlLHk95HuUQINbNIMsz4EL
-esgjhc6jQQEthW7JQDReZLS7/mMuHqFCQzjXajdvd8Djw3FGZfldX2v49d+QQD0I
-u7kMk0gUxEvoUg+CLFIqDjzfMgIEBtT69xJgtnkX5KDWYZ2FXuwRQuSqOsmlRrr0
-d6DdDF71NG72ZHX2LrxgXoWJgm4raYtAOvQrK35MMHdXWSOv2fO1m5hxYrqX5Q1f
-/dARSXGjOuXb/Z+jxzt0G7h02f4OrxYQ0JWfjFbfnpShuYP3vENbgoWKWQARAQAB
-=Tdka
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
deleted file mode 100644
index d85c89fdfd9..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/9f7335d63326e7f9.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-8f9a3c6d105b9f57844a721d79e193516be7998f
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
deleted file mode 100644
index fb8c4507eef..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/a413f67d71beec23add0ce0acb43338e060cf9fa.asc
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBE0NT+kBEAD1hzO+dXStXYJj8M6FBn9fxw+grddjM9rqaEgJ2omSdpZZOPBs
-DRor7v0Rm23Ec17y/7Dd6oR1CvyAeQwhJvNBaAW4LQmUcvvqep4hfkWDhlRvh/QS
-z+0yHhMMDrMHB/dhQaCvB/SoF1IFp0mASTEYU8DieHeRgYy72glTnTC/LhBExuuH
-N8E/YP/oAlQ3djijCP4oZ/mIC5AUZzTvzmUFp60plg9trH+mIKZRFiKY7De94I7D
-yGencpy/BRPc9lLYr/vvPoxfJUVT8lObXTSsDUw2Q+X6Z7t++eMphDQRNkauII7q
-7Wgq66wCjvpMHAVU1yT/nripQOjab6OBddNyS5EE890laxN1DPn++szOlH3qElUp
-1zrq4wZK/b2ykC29D/YWU6sSUFvjXKy7RodqrB2IwcvAKf6cb3p/q6c/Ka4vr2xp
-DlRyvYnZELlHoQvXSaXzPg41mtvgGrile0bkJ5PCtTOBx/pA/4S8/5y++TDbDYgw
-AZ7Oqn82wma7tVb7AfcPCNRtP8t0nCWDJOsCczgE08PodpOwCUgqgb+AOYaduBBJ
-H8v7LZ0CX5a6PImQGUMztrjfpPK0msLLu30nkiMzJcXvo4blekOMhTZBiWZ5LF8Z
-hHnx++g+DhKXi4yLMQFliDknPGLpnxV+2enqBs3HNPU7IO+xUooWxJpdMQARAQAB
-uQINBE0NT+kBEAChIJDHA7W2T1uZg7L6e7hCYfSpQMsuIQg5j++eZObU1OssweXw
-zvf8Y0pUHjIXw8JrmWqfvxZkgjO2qnKQpwQv0zElU1GcguVVQw3jq0Qe1soblZAP
-E4Jf+luvEvVxBNqRB2x3K4QRJdqKzY7K5rxBWU5WNp2aJ1y8t3aCFtvsdc38tgg0
-Lpx1sfPg7RCrrHzx60rgCtJ/PRIGmbZMx8mKdOMlr5dNzJ7QFGIIZFx6qr+8Kkfv
-jBTSkDDxLF5smWkduTee0Aqc3ZdUkrk8yjrPb592LY8OHOnLj1wc+ACyo/p/X27K
-QHqf/v2Bgab+VgxrTKc5BAwycAqvU1KmRMfxYk3NIIgL+xhzdC0f2KXDL/ojc8lY
-lxGaTm7xEGWaPldPbF2RoGoEYkGD5IUU19fvSO6ztzdUqcKcNjZeh4vhILkjNb5W
-e1RP2hubGvcIJdrjJ7wwas4sWZiJtZLdSmpbL6VXuKBjRZ5cZNav7iWuzYAEgiat
-7NjifEEMjJMXOMqUkSdQbdD7Nyk3RqiLNlqS2yR3z07qsGVmA6BV3jvD57lOwqDx
-+rO7zHqSUc/CVwGPdMowlSrRWY338y9HboEIesh7o1+P9h+6Eii61xl3+xYJov70
-5LanmDOaKqp6lId89HeGJwEr6+sQzR6xzsl7GQaPbejeQ/aY+Cfw9/wQMQARAQAB
-=Rs0u
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
deleted file mode 100644
index 3a993d282f7..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fa/cb43338e060cf9fa.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-a413f67d71beec23add0ce0acb43338e060cf9fa
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
deleted file mode 100644
index e076fde96b2..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/3d5839a2262cbbfb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-bc900cd2fc9a9d906ecba48be3822b59020a349d
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
deleted file mode 100644
index 61b0b4f6326..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fb/cfa67e8582f7e9fb.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-34d6ff19930adf43ac127792a50569c7ca7fa1f0
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
deleted file mode 100644
index 705a8014c7f..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fc/4006cba6d352f1fc.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-3288b8be8512d6c0ca185268c51e6cbc7ff46f0b
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
deleted file mode 100644
index f1dc32f668a..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/1def9646901a1652e5b3e5ea694db6f419c8d1fd.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF2IYVABCADlkNxFiE7AUD+BirOireAA0LceQl5HMo3EThWHzrhKTq5MqTmu
-HBjOdKQjutFRfRQ6xM6VitVc70TuBKCNwsbCQqSScZ44f9pOEu+f1z2CaI2J+ojY
-YuL8MBh3yMz9nvREGfmIzKRu0VZ8kZvxa4GCiWAvUSgEj0DE/HI2zaXssPiPbPB2
-9Y8eud+gzyuUEJv+/fYgNq23mXVPZWVE1OzvYvOakzWtym8YDRmPvZLI+EnN39dB
-Xw21AKYIaie2kvWYmVloyTff/cBDSjqiU97wfx0ufUSAZUg0BytFNpLmlT0mUXER
-LNL4qNNmtLg3xmJgg1uHk6I3bCCGnKsdvztHABEBAAG5AQ0EXYhhUAEIAKT+HmwR
-gvXV5TbW8lfYfBXGw2UPtcG3+G59feMps5BwMh6vCPfO3BKQCmt3MFdIVHMrvcyK
-V4nt+ZgVOZvTbl/3eWTQjyDFHOjb3nYa8fqUSalvNBTPu6rEgsGer/HP0aMDnuNl
-A2npqfHVNnJF/3G9iBkN8PNn5tHFo2z/9S6UHIPZonie4PFRpW3xtb6naw/Fq5r6
-m8DSp8GPL7INrCSag+3LByGaZ79IYFpnQrtBp6GeLZ71b6n52KxxAWw5xiFnIWb8
-lU9c/JDOviKPqIWdNnQv1/guzAmNYVOuTW+jO4XuN0S7sQNsl9Q4FVATRRt4lK3b
-3XdNGYpE0RrlqQsAEQEAAQ==
-=cqef
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
deleted file mode 100644
index 0c74062c389..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fd/694db6f419c8d1fd.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-1def9646901a1652e5b3e5ea694db6f419c8d1fd
diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
deleted file mode 100644
index 28e016cb361..00000000000
--- a/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
new file mode 100644
index 00000000000..970f8de09e2
--- /dev/null
+++ b/gradle/verification-keyring.keys
@@ -0,0 +1,7459 @@
+pub    82216A03CAA86C78
+uid    MongoDB - 10gen <noc-admin@10gen.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE5Kv/ABCAConhU6cL5eRQCAvVpHX8VUyflu2Lcb/X7IQXy/8BCk1Nhhp69U
+ul06/EG16A4UERZQiqZjbwsdow7CvsZiJBwr6Vf/OkM7cDqDA1nTxL8jPByUqI93
+tBtHL/8Zxr+BmdUWYDZhkRaL3HuD6Io3UpoxjQqAASYbuSelhvuVdVN5mG7VjGjq
+oB8xCFL47rdO/+yZLaGFVjoOUC5J/xsvFe7IZm+HusN+r0biRbwjdMg5ppHShzV2
+L1ETra81OQFjcohzHfATvYv00QbNG/1GUTJCIRZKzMI2qp/B0UEGa2kYiiNcQ5b8
+p5GPwjAZX/fqNuRD1pyv1zyb2oiqr5HMtXY3ABEBAAG0JU1vbmdvREIgLSAxMGdl
+biA8bm9jLWFkbWluQDEwZ2VuLmNvbT4=
+=0ybl
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    85911F425EC61B51
+uid    Marc Philipp <marc@junit.org>
+
+sub    8B2A34A7D4A9B8B3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+PXCe8La72ukmaxEGbpJ8mdzS2PJko7mm
+=Xe8l
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    86F75E83E1EE085F
+uid    Uwe Schindler (CODE SIGNING KEY) <uschindler@apache.org>
+
+sub    5A5C54A339B38462
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+mqzoosZCQTInzfnyK+MmyPFRHx2IrTbvBadb+w==
+=p6bY
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    86FDC7E2A11262CB
+uid    Gary David Gregory (Code signing key) <ggregory@apache.org>
+
+sub    59BA7BFEAD3D7F94
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
+WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
+cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
+WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
+KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
+9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG0O0dhcnkgRGF2aWQgR3Jl
+Z29yeSAoQ29kZSBzaWduaW5nIGtleSkgPGdncmVnb3J5QGFwYWNoZS5vcmc+uQEN
+BE2kzuwBCACzeGpkd6X/xTfKDBWvXgHOOKIJ2pht9XmtZZKiIj7LIiSwvSds/Zko
+ZKxAm7AY+KPh8Xjf968FtoUBQJvHAG4rbowEqT7OOrJae2JcenH5qzaod7TpIPQV
+v+Ysz8I1wLlC6LzKRj1X99Hng6X+obsEasnPbmEEkuiZ/Sgi4vVC8SHkDmYt1Dx8
+jDgm53oUeWkEJO9LSI2zcrZhSgvg1xa4Q4gY5UUK7gE4LbmGCjFlATuuW/0sryxu
+8zxph15gkn4Nqgk0CPMSjesMYEGOsdDzfQXl2tXbt+Pe6mBoWh67MZ1v5zOq3EDt
+oSqDpWPxponAeaCuNDDFX44vGjfxGE0tABEBAAGJAR8EGAECAAkFAk2kzuwCGwwA
+CgkQhv3H4qESYsvEMAf/VGyqIEcw4T2D3gZZ3ITkeoBevQdxBT/27xNvoWOZyGSz
+GYlRbRQrlo+uZsjfMc9MNvaSmxyy4gLVbcdvQr3PF//GxphJ98W8pk9l+M57jfyH
+nnCumn7MO4o9ed+WuigN5oeuNJ6BIq3ff2o1DsrEvDChYOJEOeFuWxv+u7I2ABJJ
+ep7NbByM2n9PE8vlGU3zUBgWUBsk6jT+klKnEyHE76WzegPLz3jtElTuyB7jRhjy
+QJu1yiJEMbs2zH8aJGObi5f8Jum4tILZuEAdoI0M3c3VRq12cz/vLy+9VXa/s//8
+IsGn88kjyyYqOy8WJEjoOXFh++dpWiM7nZkgQcNi5A==
+=ggBv
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    873A8E86B4372146
+uid    Olivier Lamy <olamy@apache.org>
+
+sub    1AFEC329B615D06C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
+C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
+q2AaCtuOk6q9OtthQX6LfOuGqwbv9uH/KLUDn91PrgKuHPVfVveiF30ZvwCggutX
+D0jTGRHzUJl7F1wViuckHJcD/2z76t0ObSuTnENi0IUjF3Toe4tv+qO+Ljs0knvK
+tu1b8A5Bs+kxNcbEqV+zdIph+6gCL9jy+dB9J+t6uZg6ACJexbIkDPsutNtbAVDV
+w5AtM7JR8930dRHfEt26ahFohFi+73V8RiA7LrmMjA8rX4zuo5Pr48xt/RR1Y/VE
+8ohCA/wOqul9eHHevxeEMDYoGVjGl2EiuIThg4eYuQDDSisBNb9a6dhE8ECQFFBx
+mGz32+I8gXSTKFAkkQUI4HmJmTX35nGJql6E7Bn5yM2OaOG04PV+xkhScJll5ZxZ
+BNEccFDL/aI4N33cwrLHyk+wFNZHBL1hnHpxpjFZYv5xfEBjmbQfT2xpdmllciBM
+YW15IDxvbGFteUBhcGFjaGUub3JnPrkCDQRHXXXPEAgAyqEz3eBEKiZ7VbAj96Ht
+IvGufKTdZ0ERJtrdPO4FUGVBcXpphtnPn+JOWomszUKkKLO4x24OaDCG/SENsPy+
+Ned4wjBB+4uV0YEc5Xn8gts3g4Z5p+YiVu+aWeYPPC5BPU61tVqc996i9ZYkZiYO
+s9F5Z+dKozk3KwVcijaCr0IQMjAtJ/N70zcciP23KhrN9Z3Nn54Xm7GezD0nxTUG
+P8gM79zKHnVhDBptrxIT/adCzU9/UX3UVAQcdq86FfzTEpqFG3TM75HBTQgHihIk
+kirzurE+ivh6aaF3UJwmDBe5Wu3gvxF6Rl0Ja/YBNkkCiOXngXSxwvUUR8KJO07R
+GwADBggAxOFV2DfMHsTBu++gKJ94L6VjETfVFEYPo7e4tO2Zn2Unzdxz2BoTJcQY
+0j6/M3Tl9hCwhOSVVL8Ao/wp1ykjgXnwV4vz0be4d/ZML+KF15x+8730H7Th+aR+
+Ug6K6Khsp8XIypmLJcYgYLD02PlSnDxCq9Fbv0JDlbr6tbsJiVzoRjg+WNEIB3II
+rJbTIiOFrRBhloinYoot216QJ1rI2nQpMEBlSuX6f4jYF6F7X4dAY4V4ohjFeJCb
+6SYkKbj4caqBA9OVrj3vh8v/vAUKDB8pqVhpaZicFpMd2pEEYVMEU4i1sLE3X73y
+9RRuaJOvPAx2HHT8MlWjsDmNdY2Mg4hgBBgRAgAJBQJHXXXPAhsMACEJEIc6joa0
+NyFGFiEE8lSzVhfcJV2TRLz6hzqOhrQ3IUZkrACcDtB3CttHYgGrF31KCocX/gwC
+iYEAn18D875QwNruE4Qkt/W0Rhy/QRIZ
+=BrH5
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    8799AF90C06EFBBD
+uid    Rolf Lear (JDOM) (Used to sign JDOM artifacts on Maven-Central) <jdom@tuis.net>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE56T+oBCAC0M/T+3OUvsOekYY/RtzHZ8OLDHOqfN27fCOtIUA+nn96a88jg
+hF6pRFUN6HMr4qbWX/BLwjfLiLYRAFrJyqY/y1xcuBxYMkxSnrTEQRRli6Q3LBCA
+0JfvTMQIbV4QEVhHmlCT0WiZ0XFUpkfmICA5xZeu+5QLPsupTYzCuxxq0qoA9aIq
+OyLaQMCUzrwMqwaXKnmocshmBiEOVm/78Lv9EmMd+4jma/VpJnhR37pqrhWLzPnx
+Azo2nj2rq81h1lwWb69UMqaIAKDz3q3iJ1SgahuekZkXkXp89yfiywYmnWxo/143
+S96GWB7oSFnNv4Az6bgdo/vniQT3z1zD5T8TABEBAAG0T1JvbGYgTGVhciAoSkRP
+TSkgKFVzZWQgdG8gc2lnbiBKRE9NIGFydGlmYWN0cyBvbiBNYXZlbi1DZW50cmFs
+KSA8amRvbUB0dWlzLm5ldD4=
+=qJrX
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    893A028475557671
+uid    Gradle Inc. <info@gradle.com>
+
+sub    5E9AEEBA28836032
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+WzZKkqBVoahM3qqyoKOy7mfpt1hB4gEq
+=E5AV
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    89AF105CEEC705A4
+uid    Neo4j <identity@neo4j.com>
+
+sub    F8052E4E1BD0DB31
+sub    A7A66BE60A24CE10
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=Lugx
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    8D7F1BEC1E2ECAE7
+sub    E98008460EB9BB34
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
+dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
+P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
+qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
+CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
+PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
+dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
+wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
+SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
+9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
+MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
+iDXIY2rT0D71IucAEQEAAYkBPAQYAQgAJhYhBIoQeSmDAj1dFMk7SI1/G+weLsrn
+BQJfJLjlAhsMBQkDwmcAAAoJEI1/G+weLsrnbSgH/1+Wy3H0/v0mY/2qi2cod2+N
+PT2i6RBJ+LvkW8Wzp4oIr9rRjZ4jlZXTAtvdY5PVellIAztr5C65Qcwi+aRzDSTn
+a+FDzJoIMIqNPuaQUcKLGFrpUUFvng9eRnh773A868XDiLtHiqp1BGn3F7g6BZmN
+4fbpnL+XAaW5ogmZd9pVgctB7b568+C0E/d0U0j9ZfH1DeLLwrpsP/vGvIrt+tqy
+2YKDzJW08qgUWSc/nPWceQs6lhO/P1FFgdx7GINK+HG85taQ119Yz+CdLD/j4Aph
+YEfib2tDM60p8ZyAhgza4geUBMLQgu3uAZwBaYSPttcTPL0mqD1iKucdyuVgXSs=
+=FxWA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    8EA48D105232855D
+uid    Edgar Espina <espina.edgar@gmail.com>
+
+sub    3B2A06173073FDAB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFnuhcIBCAC7AxgaKPE8BelwB1MtV061VQFddoBoEPV/RMtpX7ebEtCA1yzl
+02+JNbx+sfTqrkFfuDbKw174xFqP87iRbr+em1+dD98+dH/rX8rX9OxJIuXXcO7V
+SJQy+iBjD2XcSKzCD2IgwAmBKxlG33gCG1zzz1zP/y72e0jrO4RGE1ipyw2Yn9pv
+Hv9gPwb2U16rHeb2L/iDlwH9iPEYgE1K8ybgsi8902opahNvSvAjkPY9FFKRxbPG
+IDtDYK10B7xy/xxjI9J2BKT2m9Lu5QkfeqXuqMX4F7f9F8RZvZFhY3M1chA1HnaI
+p1wI7SjKn3eWh8GirBkRcUTyXsQYLdREHv1vABEBAAG0JUVkZ2FyIEVzcGluYSA8
+ZXNwaW5hLmVkZ2FyQGdtYWlsLmNvbT65AQ0EWe6FwgEIAKprrLAeGe2fHQtT0iGU
+WFmzk1NehFTd7IVZLQFLPePWpYMV9V2aT/0y1iMEIENDlw7ZCCP/vczpinmhK2o7
+274yiqdQ/ZlmKun7ff8syOYX0sXMoaPpk7d/XablcqT6/ksFYywG6Mg7qcsRgkdv
+uZn76D5dc2umWZbhHQlyIXGSRshdr5Qt9V/tMm/QX0WWO9c2XAKC2ZWVUTomCMYA
+pRfIiGw4JPyid/0iFk6WF7hn/3QwRldH9qSBteZmWobeJBeBHGXIH8/sbhGGZyTG
+KudBKE5elVXqb3584KG/K6uNwTTSygRtDtgNVjeIxLgDbtBHDj2GQ0Tz2ohl2j2X
+k10AEQEAAYkBPAQYAQgAJhYhBEvedywzi6VA4QV9DI6kjRBSMoVdBQJZ7oXCAhsM
+BQkDwmcAAAoJEI6kjRBSMoVd7b8H/R5YSzeJxR7ZwkfEC0CB6GoOyPdIhQtQ3k8A
+zTTNE91n9U+vK30c53BX2b9FTIhz8aiRbJoRtZ63qVKGULfOfT7LULGLk/juea+e
+Dfd/rg0c4okMnNb/j23oDhBhCqg+/gHO5v8pg2vXl1mFr+5vxJgbcDejWm0zbzm7
+FLGBDO3SbOHYPZpczlX6mWCNeTGVZzKwkT7BbhQPZ76eBc03fYBjmeEAJoPVaTBj
+beu2IRj5cLfzove4A2GHYicaqxrxMlq6Sm2oSQN09M4RD1NbPJxfUQwog42UtRuf
+hkEVOFgLSLD5utXut3LFAIoCdLXYG+6JZTO+rSCjHdRH1/lgBTg=
+=OtpA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    91AE1504568EC4DD
+uid    Igor Spasi? <igor@jodd.org>
+
+sub    5858009D3CC798C7
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=ovHb
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    928FBF39003C0425
+uid    Spring Builds (JAR Signing) <spring-builds@vmware.com>
+
+sub    6F7BF836151F097C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=0x1P
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    98FE03A974CE0A0B
+uid    Kotlin Release Key <support@jetbrains.com>
+
+sub    CC3328A2F49A80C8
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFhlXQUBCACoN2nTeSRVZnGoktKHyiCgeYQ/hEKKKDDAbWubnnQwonCTILaN
+Qw3GmIT6plmi9iy4rl+rJprSzDeQDZngQCx1KPYcXCrrc0pnjERDaogw9fC3c3z2
+B6+90qT6UJSTNmxMs5zbhgzKDWb3eaDmVDqVqzsM5xz9GxX6zo83o37fTFSbVbtA
+9+c100+KaAldVL/6uLeGoQsAIxtMH8GiOPiSjrw+XCQ5mbP6e+oYYBKxEyAgu1XW
+8jP4bF0rz2+1lkIGfWfYHZmMbmSutDxXqOXA9cZomhOayOSe+iczoxXkVXkQzMxq
+bG4ru5CHxPh+RSfpwA+9StLvzLeoFrBUlqW3ABEBAAG0KktvdGxpbiBSZWxlYXNl
+IEtleSA8c3VwcG9ydEBqZXRicmFpbnMuY29tPrkBDQRYZV0FAQgAo239WGQjltcz
+GgzZdgyH0w/PruwBqpz0SLFqf8441+3JxK05UcHRiF9D2Ww14shvqpC+96yS0jV7
+G/XzDFKk34ATCugwYNIN+LGGmBp44bOPyiZc5MFnsG/vcD7h0JV6hDUX+yzg6REr
+snHmMsztO5jsgbrhdJjLoPpC8w6gjEp2oHzV/olgPNXCzMW9RRsOpVAh+Fdy4IsB
+tjG0lVXMCV0YFZH/vZSrycTd6t555mMeeIANrBT5dHYSC/VowO8/zNSlaXaZHM4o
+D7VInJeEDnr3jfmzrTg9/E90RKUqcxiWKdZk28vmutFXXm9hhTa7n2iX+DbsM4XL
+fdQKsKBngQARAQABiQEfBBgBCAAJBQJYZV0FAhsMAAoJEJj+A6l0zgoLY3AIAJMK
+WFxboZuxFpEfNJ2dcM9Q2VZ/RQM/PRqY2nyZDCzKAv6NbRrC2t/HFKpu/7WbIxAH
+uDq0sUZxMf6Op+QOw3aulDb9yetRWa6cyOQKehLKGuqiVK/2jDQvsr4URGbGrlAa
+isT8bJrzugrfyi9dmYZSzv04ZK0B4SddeS1r50OVfefJMYznYcRpps8lG/94yivJ
+k+C/zpqFqMxTFtz0t2OR1WfCP7FrlTHplW48Yd6h2r4xZNm4oz/+pP25ds6yCIpY
+nUTdg/LginuRzid73nRYad3O787doGV2qzFSy1DRptle0BWPWPYij8mC+31u0T2L
+Syx8ZPwcJq0wXCx+L3w=
+=9nKv
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    991EFB94DB91127D
+uid    Antoine Mottier <gpg@mottier.xyz>
+
+sub    C327DD2B96A50E1C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+36KJDm9B2wR+2joiMeA9BoBqpmLY5nvNcVheJw==
+=UP0+
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9987B20C8F6A3064
+sub    80CFA7C482552DC3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
+aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
+BnwoRUe0OsTItUQA+vLH8K2Uywd9f3OV9KQnqItUFMptaFhUC144hZhj3c0xhITS
+k45zucoXLKO9yqA+tlqav7taAJMrWbhRcRWXizK1wOZLyhu8NdIMUSL4Ei0blR90
+uA9i62XlOhpyvfpaC7oRh+jXHOCFK9sXe2vnvnTtJ1yqdXH4EOCYLjoheQN1R0u4
+6f6XoAy9c3tOSOZM9vwE56iOZJwv0bca6ZENnhHnYwWhbQwrY0JMIon0sUpx9RB2
+w4E7AeU8/maQG9hdB7s7vrAJFarlFQvc7kJ5FMTKFmWPalUTcT6yXntIQ3+xiH9l
+Oq0jGlAmQWYUvzHJ0SFjz1xJGBDM3GH9KfHbeoS3Xz5Emmw8YwEDUe9gt9po8bmw
+8qnA85uMZY2puh0AEQEAAbkBjQRiRjMaAQwAtcqYEeHIX/zszjNyKDyLONoZphIy
+efYlWpbrbAFgwgJVEWiIWGo1Du0f5P6g3p29QD9wSJrZ2pz8TUwUIhwpCxA50ceT
+PzEXi523znqWlXmOwdBuV6XjD7Bi0ZELg+QrumZfSDlAGb7fU6O39To1mDqg3SI1
+jybBk6OOlPYfdfII72z+1smEaUikOpXeJbnXwqkAaB8jQBgGikciACVruP8jMRwE
+Op1JcMj1hTOMjsbNYYx6s3NY8OPJvg9RqWfWAC1V6fsEBESlYVnw3IU5sMJzw949
+h60btqFFjgg6GDjD9Xk6RJQjIZti9XQVsIOAswQ2tUHYj7KmjX/5h6U+xmZtFRYS
+kPXMAjj7q31t3+Lj7Vhcm4FZGidY0AwwZAQLP6tiR2rcEtJ2E1xXqmAM9nT15eyW
+wfOVh/VVuU/DDaOlbBQyqwlTuKYxCj4UyWGVVqgSwByFzYpaKkWw91RX008eT94j
+9sj+m3Vqe5Q8VT3lRwju+TBaQz0V6Z/kKgJjABEBAAGJAbwEGAEKACYWIQQYc2aj
+/+a/j5S5E2qZh7IMj2owZAUCYkYzGgIbDAUJA8JnAAAKCRCZh7IMj2owZFvQC/4/
+QrnLGg7CnW/MIxH5iUo0JFxK4guzw3f/NGiMzNcugU4IIsApMi/Jg6y9wxqGnto3
+A30NiVDNJHhtOZh+D0pNlAe+f2nSrpA5zZN34VHhA2kNrVFoQ97pY746r6yNmM8D
+Llhb76WjpE8Z0G3y0A10eYjZaGSeM2Of1xUu79K52D3UVJY8EVgLEZgiyQMyD1kS
+bxa+6xVv3DkbQE5cn+RJBnwl/maYBt8z5EtbApjjY8Udf4YgWvrGHzCUUGPgLwNI
+cgs/nwukuvE706DNS80m9BKrKDNp99GptlIVYy4RYafV49s4Z4OuzHXTkgb2+haz
+m5PJQyLzvk0igLmedB8wdxFqzrYZmKPWe5ai4T5fggOBzVXKr8N0X6ErxL386557
+JhlLF2NiCkH6o4Nl2ez/GG6uhT2STIIoLyTgrUxb88cP0FJID/12RNCrR6uZAnZH
+ZGyzQN+5ee//uhBiY5oeXtaKkQx4AH34Zr8jI8geGC+PG2G48BRGq/4ywkCY/w4=
+=utTz
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9A259C7EE636C5ED
+uid    Liam Miller-Cushon <cushon@google.com>
+
+sub    D66472CF54179CC4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+cFYKw6eZhSnlf3dtLjLzKg==
+=hIWn
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9A2C7A98E457C53D
+sub    92AECA6AC21DB816
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
+rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
+kMSzmn3nBbeacv5szjB8dzF0ZGPPgciGp28KYrjfPbxrZvnX0PgL6C5RqNkI3cTh
+oUZgYqXGUe/uj5gUiLr+eZvh5lajPqe2YF9fmxfRXklmX47TMYidFkcQKGwxIM47
+7AKa5mKCp9MPKmxA2TG5F74sOwtSe7PYfzraVgaK0GGDJhm0Xr537EdtJfOpDRJF
+GizM3hYSgOp3Yo1wjPrkFA82EfB4hCNZK6ipABEBAAG5AQ0EWM3psAEIAKi9vYsJ
+kKjFWAswJAWCTTsYsfU6WPtJnErx1q5ZZa3uYXibODcs9sd8LhmJD2u8iAQLtWuD
+l/SC6nln1ikCRYy7v1JbENmJw8gWQqIBLjmma9v5GPUe/Dg1QSJqrem6VEjNtgsz
+GJGr4+GDSCJN/AkNKlyMFgSdpRrMCBZkvpwnvSM2EFbhxonbtD/jvqSlx68OY32/
+2cesXPvS/Nj8RqQfj0RxcOK5AHGKFQGoMgK2NGXfAxdOhPOA3I2NwfQLnCNbAVbP
+OauNcV9tg9vbRg0l75CAbW0tmM1i/8Geh248QAlQL5NtApB3az11wbCEMAoFRh8m
+aFLFtTJYTnKgW1MAEQEAAYkBNgQYAQIACQUCWM3psAIbDAAhCRCaLHqY5FfFPRYh
+BOKssDeTPN6qt7931JosepjkV8U9qkQH/RGqpU96gvTUGK+UG1w7okbN+x71zYk0
+nIx4oKvGADv0aNV11ri7t7YgiVKqBQF5tLh9b6QdmfmNzBDAidukyNBAJAAWkCI5
+2sDWlXptqPqzzB50++P6/uN8xdru51G+lnoZCjdjNWx/yf1rxlv1tf9jBQ9+Fjh5
+b+1G7TZCPW6zglUKXHAmSpIQ4aOPaYYp8gsBPs3N3EdF8N3bskRnkIv9gZuGPod5
+KC2YzlimgvCVm7TLDIXA43s1/ymS42Xnn9wCQOtxnA/GIeWKL6a3+g8GphKgNawf
+cn2I1XohTuU8/BFl6RYzJti65RLrRyvoPBd3V/XFtQtHb4Ave6J48c4=
+=NIkz
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9AE296FD02E9F65B
+uid    Luc Maisonobe <luc@orekit.org>
+
+sub    2F3C9EEB05D1D1E3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
+r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
+W6/+MOieKsNTghAogNiTOp6dgrFn6Uw2iCFgRUr8Z8dPUSRwtoPtw359nyIIllEf
+lBt8ZPbmTZ3rn6y9TYviFIbO+pIVc5iGuHCyr+9NXdOpNKpUKd4h2TLtixtcNWY0
+6TRLhbd4COwZVL9ZZwAlyKhQ4TbvvKvVCS9+HPd9onQ55s9iqUTA9xeRW3D5aVOA
+0VgXrFnAq5HE2x7+j1qZQRqMNpVTDgUptpDG5lj7rIdgMaYj+vL/bgmK8thg9su4
+8TdPgza1ex5Q4Hb0tbxg/H7Ucasxys0MJ9ktG91vgR0oHP0y0Lf/3uyoCyhKilKO
+yDqkKFeKcTx9TCZfV29gDs4dumH1Eirpg5ikKjPExhaITZgtV401CDsS+DgXHqEk
+YN9R59qJ27AUV6J3dAAumzXECXBDcvyLdb7pEIBs5/QtdgE2ivCH8BwFlmcdqe0+
+uKL0jgylMDsfiADVhzagv899MqrmQh8po6Sj78G0gwdfCF9neZgX2czolSFYFSy0
+rmSwUetem6IPwaXpV5r3852P+MqEvI2s86c3ZIyGFO0ltK5KSZq62DANqwARAQAB
+tB5MdWMgTWFpc29ub2JlIDxsdWNAb3Jla2l0Lm9yZz65Ag0ETMfwpwEQAL7s51Tx
+dzfy7sek9BA8CYEfDlQgAJQU/f/GuyHp0OPYHRMyWxuYo/UwMA3epv2XByLY0RSA
+spasHJB1Mwxh864m4bAVhnaBTRrCm9oPiZvTuBDyrFWkd+kdJ2ksxixxWIgqFNyo
+BjhEgHzkVQ3boXyWl61D3eQrFJ6Ax0tbWTAH1RMfqKTzqG9MJPmCBu6nNZ2xSHVJ
+37RQkGmAuf40FDCO/unM9V1LHz71cD8bvuJk815WKF5VO1R+i5uk3cGkqhGslWJ5
+lfxiMXZEmbNKM8HO3iYso95zwAY/EPNzt/j81dfjjmQGQ7IMkJDHAJMeOYXUsQlv
+GKl09MataIjDjrtTUusUKy6pz57AYkFlYyRcRZYzNAVrFsgMrLy3GdOCL2eQRhb+
+zRCNdrv7WNZTJ7nZpWwGk1zm39uHgnEnne7mpxfBBg+FMvSjaleSChelEBvCGhnU
+ilEYv4UzIA41h0Q9G2/hDi51RDHcMR41nDegylcccV1LspSIuFB8RKAfJHuS6Cll
+jBsJA7595IJbKzeswovez7yRCrwuqMb/Fc4uIslEOS7uf/L0VRZnM0KCnHyl+1Td
+tBGkMsDvKjDwVdGh5BuZIzhpXJ1gmFp6FhGgSauUnREzCWcbQ5XuSBOKkmBrFoF+
+vE/Y3wqGB/h1uF3GyWRk+akPr6xyBPZToyCrABEBAAGJAh8EGAEKAAkFAkzH8KcC
+GwwACgkQmuKW/QLp9ltY1g/+KtX+Thxrn9J0SH6DmJALPKOTxSBNN10C3jWEx1dc
+fIDnx5oJhWnL069iJ+DGon7hhKb2e8dWW7ZekY7eMWhh/TfNe08cwQYQMiDFGi64
++6aZ9P3Hs2YudKmTmARMrugLPyusxY7dCbKPUiyjK0NUqvkGxqIA2I14MMiFErNx
+7FOMdwGtW6slnZNrYWkejxFqb7AsxWozcNXtfYvQMDD9LtyiSp13L3uFlOu4irQ1
+bqHV0So1hhm1twrMWmNdizxkbMIC0g3G5XuFsbgv3AZIjoxWwCK5wdSR1o10KMXv
+S3jb0Uxrj2fiRi3QueTETE/ApQUHcmVuLCzjDE908TdIPkLJbDvOSqSsPQUmNG26
+CkGEFC/OJoJaOriQHORafJD8KZm9A/SKNN6muZvNksiGgTZ9YiNTiiTYHy82qYHI
+5MQtqumAmHvz7dOQzNys2axSnYKwCcd09fEn50iACHSyVz5KIQWqPPsKAIVTOSu6
+HH+LEo3/SYOuVGqq3bDA0zUn9cVXCQcSjQ74A1dXZMKeO8SaYFDZen5X7kxbA6FS
+67uzt16AF9Z84gngKJ4UOMluV2FrOd3MwDCkLoOyg9dXlEDQR5Fx5LR3PKqnuLPh
+dQV4hmqN5UfIyGb4ODa+nKXgiTXLh1AONUqyS7UpLJAF1Rd/N9uAngaAuoqGAThm
+yfc=
+=h3vZ
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9B1FDA9F3C062231
+sub    458AF764D812A037
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEWjofgRBACePEiXmSvjcjUgWkNAFQ/w7w2VSEqe1vuTCrta+ER9JsvhwipP
+2/BEHigFf99TlU0p1UC591LMeYP2UXfQnb3jiyEPKxA06aj1fTGGMoNMAilymvgd
+pcixjlSJBvsmyFYuUdYK20UghL7fAU1lD8Y7TVXz0XT0n1oMOwf78qB4vwCg/bIQ
+LlFGTwqgEBBJpFJnaVk66hMD/0wMKe5Lk3rfdm/9Ku56ddZ6GTjyuNFI6sc9gOIJ
+XWuRpZUO4d7LKq7QaKLKBQeAI1NqqZuB7gtdU6ILy7OjI2C38KTCpyu+8lj97CNQ
+gJqFh26lqhtFfMOUwKvNUUsEABDy+vnI+VCW32ZT/E1xjA+nVTSjGM9lyv4Gls7M
+8pd5A/wJ3rD8XDiriM3ZV1Sn7/pt9OBxc25YHhfbTinIQBYCBhTw3wbS3d+PLQOL
+/TmkeaZcuFA0KQW5hHEjTIY2YbOd2lPNa9ynq+/1OvJOGAseCWL8uorYAmk6ztkc
+Sy4UZuNbupNSPGOt0hZixQpSB3Tv49XlFyupd7rPnYi4F37nPLkCDQRFo6IbEAgA
+oPx5Bm4+wUuVea7pqi8NTs/CkhAdAWgNnsj6tS/YzyncXD6mjc9Sx12Y6DRCkzC+
+ZTvy89nt/IHOvbaCZ8etLuBonv9PyYXu6HmGNihqg8rBQzXUlbIPdZD/1GeVwH3k
+O2DaZ+Rt1EKjnloXlpwLGMnn2n9isWUCMWjyWSZbnNBca30tooXp+cWGBnClv+Ay
+ez3jvroWCe9vVbj8/AWM2Pn5pB6Ewzw9SLmC3kgcq15XXBTgeeEZohuTvrmsNOHG
+Nh9HFEp+Y56JD8ufPOsNayRHW3ex8btx4sZhLO2Ixj25cOjDfoKZ2aj8ByCsJAsN
+U1qgWeyn/QTrrHavOTLpmwADBQf+K5Fi7IcpD+doMksWWpu68+2F4sDiHybwi1sr
+kV9oy/R6vG0SkO4DuV2/k9rCquavHQSW7jXzfZuOoY/ErK/6/bd3GpLjZNR/K2ZN
+T2aOcHVFJoQTQgKf3GDlSmecNuskHpe1pUhbaY+zWKx+DMEjcwThchArABW2djcy
+Tk0YRygxQwqWBPGI8sjquxsrqKKrjallTVokbx9rr1VwCLcxg3HFI+GJjhHkjmYX
+JANSqzaPyIamcfR8wBQEV9+IiGx/EdRTvASx7uveg5119pPtwb0g0r95SlJpoYQe
+4wiTAagxkwwSb3qWktA06gWykX5NQkMX0VK6lsNvP0tAOvY134hgBBgRAgAJBQJF
+o6IbAhsMACEJEJsf2p88BiIxFiEEmYrw4rk1mW9c69Vrmx/anzwGIjEGagCgisY5
+6UkqfDICNqB4t69TDgy70noAoJ87koq0FkuxXdarqEIjnn6IDfnp
+=vRsa
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9C8C892F91F8E6D1
+uid    Philipp Ottlinger <pottlinger@apache.org>
+
+sub    31FA045762D93F83
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+z74Y+1/XQhaVY3fqNg==
+=SM1h
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9EB80E92EB2135B1
+uid    Slawomir Jaranowski <s.jaranowski@gmail.com>
+
+sub    E3F6790A5A167F5A
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=hVLP
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    9FF25980F5BA7E4F
+sub    10314D676733C080
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEPspSsRBADdguKAxMQbA32vTQrCyONR6Zs/YGdvau2Zrr3SSSSR0Ge4FMjZ
+4tzwpf6+32m4Bsf7YIwdLl0H5hI1CgT5gDl9kXvfaFUehFnwR+FDyiBRiyHjUpGF
+4dgkQfWy9diYeWGtsvszsvWHXtED4SXb322StX4MfJj+YesA1iEdTiXK6wCg1QDa
+RucfjC+kx4zPsJwkJOgYpyMEAMTiXtNwQcke6nIFb/lb5374NjwwVAuuMTrRWLyq
+5HodugEIHaw3EitQWtnFfXNkXTJZzS6t2HAGv29UTfhiBzKdkydgCkOk2MLWISOV
+fqcg0tNIp5ZJCmUHg3s+OFNSH4oUi65u+FyDseUid3OKtPI+ZhIk8N+DjOIg2Kvo
+/UALA/9q+WfBd7re+W3iUtU7TutUcwbKsjP+jpaJeUHg2ChOBxVfQKt4YlPHVdrR
+iCrfNi90Z8qbsZ0iAXuqexrfMq20pAPmpHRpe54mmP1CMT5m+Gq71eKIfkUrb3LC
+/zv08dLG2vm9oghd242wbcifaX+t7AhNAIpe/WTvQsB0gpdO4LkBDQRD7KUuEAQA
+kPbkBaDBw2AEUpiy8TFBoYiiMgYnKfgJ//lTfRy6L8rt8hTsm3I2Epx9l0KuHaEr
+H7Hcf91MXp7RKtGHMpXsPHSPvrKEccHUCTbmSNHGhTgmT4IbSb5tE1MX3HP2TUAt
+Kbdj4DlGo1TXQrp7/kqw+5cwZIahCAnUfqD+LzRZ/w8AAwUD/2YjG7uUxqoTU4Ts
+R4CweAuyU1uLSH2mMNRU2/xtzU6zaAE9okPwHz0R6F5MfDo0w0h7vkdU6kqThQDS
+C84GvEmoKvXzIUkEzmwiVoSa4nBk5bh0MY5HWhLmqAT03OmbIqET5+79LXCbLRyg
+vrrv7XFlyes9tQUPiLv9oPWvyomGiF0EGBECAAYFAkPspS4AIQkQn/JZgPW6fk8W
+IQTluCR6+KYZoo+Q/fyf8lmA9bp+T7YdAJ9EBFLOXMaZfMy+ZGQo+3PDDfGGQwCg
+0fS02+sKL3rpedPrhrVJdnyB9bg=
+=TIhL
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A05EBEE656F3E01B
+uid    David Jencks (geronimo) <david_jencks@yahoo.com>
+
+sub    B3AD2EE54E525FE0
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEawPygRBADKQe8iEQdS45n4jbSopR4XfDOLEVcxHHZBHrdj357vAZvSdgYI
+U738HNAX5INMHub1+pv/B2DpUkfmnnfRENGBeSYWtl6XsKZYRjodR2muI33daUYj
+lRqvxrY0ZSgmSbKlcQHAP8jMAtmPi+EG8tDcufLXSELtoLT6KTMJ183vgwCgxXgM
+xUYSo5JTdoKl426Ix9MzMjcEAKBlHorZ39y8kt+YtCaqoJdmTAqXb1YF/lSX08++
+knpPmxyjFaCZZGXaFLhRN9ru5+pTvebwjERm+/m+bObXWtWhovS3NOquykpKNJr8
+gDvo/B8ony4IlDwozDlsaa+yNx7TpkoAZ43wVh15L6Jn2j+LD4C91yFUC9EB4E5Z
+gQMuBACMD+Pf6TsT26ObkKG8aaNvk9nmPCbIhVSERWB8A/4+yloJEeskbU2HPOZL
+/74Ap5c9KWxMgajDqK/OJ7AS3ioM3emk7nAiWQ4GJfjA9eQq5DwK7zmDIBXH90wR
+sFW6YXXoJe0YdFnp0iUUg+77K+Jndmew0S0orfjUI+PPIYl4GbQwRGF2aWQgSmVu
+Y2tzIChnZXJvbmltbykgPGRhdmlkX2plbmNrc0B5YWhvby5jb20+uQINBEawPygQ
+CACYxcwR6B3mcY9tocc3cFUtLiNxhos6wDcC+hwH/hGlS78DhZjYlI3oO+e8917D
+P5i1QAXOk7ngeDz41SU2JUqwb4LAGyGLXAtAT8mdIQ0QyT4+bI9pIKvJsWY1mA/G
+axM8alZkPeLi+bh37FXTD7m7Wibw0RzK/L2oBE5TYDELFLx7SCxMEUGoDsLVIlJ/
+z5yLcPfQyU1QA70vzftWJNFsX/vwQrmnxAoEpd8Nf77ANt8iwABHQS4REaVqpQUb
+XgroNb5APAULbLXVtBsF2epNI105Btu7ArSJkJJb1lhWBULUUlrrS3b0EXY5I4yb
+nBIBIdZ8Zo+rWxpMIs5ndfvTAAMGB/4kPBnG5xSXOSnSwXdQZJhoJXBXhgxwu9AQ
+2XaV7gikKknvSBv4tgzHYOm9k/nbMno3QVcwHu5pladsl8GdtXtvmJZX6w9pDtGI
+ApABH/ljDdgAb/lR0jfl31I4jR71g11L26uFJecZUNzY/HeTXYlxGm3ekLlQ+w3b
+hjGT5q3qLKnYyzg0bon0XQuUV8hs6DOAoIYmzSB7Q6gwLBcWjoDjfJz+8qKKPA9w
+J2Ka7FkUylfPGJVC8aZz18DWbjJ7CIsLLWYpy3QlLPZWmcflAvxWg9wjFe9tMWQ3
+xydoTEvjKhlPAOwqbuKlxA3weD8vQ9QyXv795jC/01/eIJJU8NmRiGAEGBECAAkF
+AkawPygCGwwAIQkQoF6+5lbz4BsWIQSkj63lT6Vrk/5m7BegXr7mVvPgGxy3AKCw
+WsjL+86/X9NhVkCATFmxRR97EQCeN7cG7JasIe/XD/3vwMpY6s1HQ98=
+=PctU
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A2115AE15F6B8B72
+sub    6366592024774157
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
+5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
+EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
+nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
+Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
+XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
+LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
+Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
+dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrkBDQQ7EiJUEAQA
+zVKWS8QrkysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT8bcE
+nz43MCSx8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6sby4
+dTVxac0rloxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2mlJoE
+7MK3vAhgKwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlphSR2q
+xJCAcBTeOMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6XEXH5
+tGJ5Qvx9Qid6ZfBaXx7bc8yKyCb4iGUEGBECAAYFAjsSIlQAKQkQohFa4V9ri3IW
+IQTOgHWiUVR77iSbwVGiEVrhX2uLcgdlR1BHAAEBDTIAoJ3NtpI/E345LVOruElF
+KrnduWWXAJ9Adm9Mz4yoxrosHSkp5BWzXBUt4A==
+=AtDT
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A41F13C999945293
+uid    Thomas Neidhart <thomas.neidhart@gmail.com>
+
+sub    8183E80D264EE073
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+FaSYF1lb13TNIRT1q1My
+=MTP+
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A50569C7CA7FA1F0
+uid    Atsuhiko Yamanaka (ymnk) <ymnk@jcraft.com>
+
+sub    CFA67E8582F7E9FB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
+4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
+fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
++zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
+5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
+0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
+GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
+AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
+9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrQqQXRzdWhpa28g
+WWFtYW5ha2EgKHltbmspIDx5bW5rQGpjcmFmdC5jb20+uQINBE01exkQCAC7Q/en
+BX+UpUIZcdeDAmCtBIsVJ2soGJp4oRm4JgQARZcT2EvGfdPoxauKgfAHze9FdZTY
+0Ly2k6D8bEsjt/tXfMq2V4+ymaMIrlBxqicCQryfUFRpfCeIK7FrKKZHsiY9zfin
+X5/vukGlnadXRSzrICJEHOjYgAo2fdHQ3RNDLpAa8wKftNgVfm/K+b14TibgZSH8
+Lv35PLOBeadXfxaN3qsnqzAzgoZ+cQTMvbTZaDoSCeDTLgNud8Ykk/QfkBBlCdV5
+wscDNAyc+08iiLvFs0H07LV3afNUJSrG5fpj7UfKU6qyMoYp3mdLJ2M89B+IX05A
+h6vJLi4nSyOpTBlfAAMHB/98iH2O+5nl5WGflA206Hif/fMWqyxLFatgeCXB36E8
+STetHCPnKNtYb8axQkvyuFTumyAxjhS+tSahFXM0EENGrLdHfXvDrCaVnLrmghcS
+ngW1UVXWK5MRLi98itaqv8vgT0U3Zs+p3gw14ycdyc1hff9UfWKNi56ZI4Fv8M7h
+mIvurKau59CM5HZIqSeOleL9vFJWqv/tx4B8j26AwU/NwDOXu7kRaBAyu5E4OozD
+pg73zcBvICUHzq5H3YN6VH9KYE7U2BLFCxxIT4WgPIN0SD37lu6awlD7H+wW7oYz
+CIhIULY90zF+uK3reMfXbiKqL8bGNgE/UQCY0xxv8C/5iEkEGBECAAkFAk01exkC
+GwwACgkQpQVpx8p/ofDetQCfUsHcIqvYflC7YrORHkEwnkIkvfkAoKLiJqxgBmZE
+ZzI4yAQoJZJTc+YO
+=iGOw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A5DEF5A76F94A471
+sub    B15AD8EFBD28D3CB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=H/Qj
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A6EA2E2BF22E0543
+uid    Tobias Warneke (for development purposes) <t.warneke@gmx.net>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
+xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
+N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO
+XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM
+XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn
+O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd
+FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP
+sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c
+C3s8XOaBCbJbKpMAEQEAAbQ9VG9iaWFzIFdhcm5la2UgKGZvciBkZXZlbG9wbWVu
+dCBwdXJwb3NlcykgPHQud2FybmVrZUBnbXgubmV0Pg==
+=q1C6
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A7C6AFD280CA7CF0
+uid    Eclipse Metro <metro-dev@eclipse.org>
+
+sub    B6D3FC494798E478
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+2rFmeMWAWiAiXbpcRuYh9OE=
+=FM11
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    A929EA2321FDBF8F
+sub    A0F7D9615B3A5E42
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFjw3rkBCADI29PsG4+jXT0KajnjFSb9jQynKlHeMmp59e/88goWICaTK7JA
+lM2YB5vpjBeQjA+MCv/1wRyD4defs/cXoNAAsdTeJkh6Qx2C4TyL2dKROJK2DixA
+p2ENJNICHzKQn44UFZM+gsuhDvS7M86xsj6BCKK0JAIHPtscVSdiSlEvRAkLpVQA
+iWLwhTtSju/hMjd0uPWWyQNuSR35EG/nFS8DvxOgblKKciT53CJ03HR3TWtq07XH
+wMzQMA/GfgPbzSYD3imr16Rjk1nWbZbrS7N1bpFyvl1qNI5uE84AqvJlzZf/pGNC
+PKXNjaGwXyk6OtNLrHoc5PrITava34y6QyuTABEBAAG5AQ0EWPDeuQEIAMNad8eb
+jGJH8jT8Io6KK7qBMiu/NOdyZJa+02PExO+hvQNQe2CRoRqTU29a51QKp/egrnMl
+Zv26F+Kge2NNbYtl4p/u58J+cRmrTjbjacG5crZvwBvrNgCF5q/XkWEZI+VIuhhL
+cC2YBuBRh3GvreH1HRtl4fWvhDOqKmlV+073mqGx88IZ/6EI06WdA9JpA3hRsqDg
+omzZvBPV79kL8/I/9j48OzVNPW2vWeZyyvAqd0nzcUMa9l7ZzmgdFdWMfu4mk5ma
+sGea4kk+Cmrt75fT+d0fSrvcTrtyrCY1hdPZmLCLAivTywU39jEOsR3icZt/oeNc
+Y3yDNzmlkKkQRfEAEQEAAYkBNgQYAQgACQUCWPDeuQIbDAAhCRCpKeojIf2/jxYh
+BExfaNCdQrp/rIiN+akp6iMh/b+PlOIH/iqKFZFSx57DuUQQ+O0z3Le4s3FXITKA
+yyBEplpkH7JGvUz3LwlQDQGyDIaE1Vk7e6rK36MNXTGod5fX8AQgK3GiyMP36/8h
+k02+xedf/M6z2dEUnB/6wNyk6cZIAUebeEiMLCAraFU2od8YfYs2rf1t85IV7KHt
+vdjZbU14NaPo+pKFBFklDpciiRSsPNmKFfITOm4FA2rUNUubAq2P4UqApGyQkOGp
+2CgStrAnvVtus2AW1o+T6GFyNAudr6UDD7q0Kh1uuwGQdWaGNe5VOgFO3iHL+BeF
+62fe3OzGyNKLFYMem9pgYGr0I8xgx9iIkJALlW0gtk+TV04kXldTmxc=
+=tV38
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    AB049DF4AB24C1EF
+uid    Blaine Simpson <blaine.simpson@admc.com>
+
+sub    FB693BC97890ABB9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=ZFeE
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    AE5A7FB608A0221C
+uid    Robert Scholte <rfscholte@apache.org>
+
+sub    38185785755267BD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=Kqmv
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B0F3710FA64900E7
+sub    7892707E9657EBD4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
+hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
+cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
+2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
+nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
+w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
+4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
+V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
+6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
+BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
+bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
+eFcAOJmvqC3c4pUAEQEAAYkBNgQYAQoACQUCV1tJ8gIbDAAhCRCw83EPpkkA5xYh
+BMe+W8yf7BVRjP2ogrDzcQ+mSQDngUAIAIVkHZOT3oVCSvz5Yc7P3cImzhQPzw+i
+wtoqaJco/rxquMffLmOE0sHOq15mjQKt/DvkNhYhkKF1/m4sYoJZcETK0Xi6gc7L
+0u//d6ahJ56eW4VVw2MvsIg5ANGarDW38uOewtuC+XAeLHl/sjpPG78nQcolurRe
+mhOoLMUrqzEQ8cfeBm2j5d8eTzmFop3vdI4zh52SYnH6MNcRLXBvcrdKliJu3649
+V8thdbErvEBrO0RJMipn1GdgfN3/vPoM7jP/+V8HshUCq8zyBrtCPnw5t6pnHHaJ
+WK3lZRnhwTfRys0bJcf8cqUCn4H0S8Q2fCv75MjUIZi2E8sUcVzzfUs=
+=NUkB
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B16698A4ADF4D638
+uid    Checker Framework (Official Release) <checker-framework-dev@googlegroups.com>
+
+sub    32784D4F004B405B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
+NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
+/HVNFvTdF8LNnuF+a5aNgg+jjLvFwzkyMFkuiPGuUDFnqEGxC+z9J8t40tpOTOIw
+tPjSzkDN41AJDpUK/simKC5F0Im78nUbwMalE5z2IsZRWpYZyIhN1HhEdDvaDIh7
+3vENjH7enAjWh0iGRu+GTP/fayZnX0uhmausCCwMMhsr489e63ZOaJrqeC//wWrX
+dtEJjcmvRmJ2hwLmgwMP4zSNKsnLGzP0sh69ABEBAAG0TUNoZWNrZXIgRnJhbWV3
+b3JrIChPZmZpY2lhbCBSZWxlYXNlKSA8Y2hlY2tlci1mcmFtZXdvcmstZGV2QGdv
+b2dsZWdyb3Vwcy5jb20+uQENBFM1v9ABCADutkjG6oCMxBUBB5cTTeaWR3e5rKgx
+EiCxWBZCNZsZZA9LcBVjG5OJzB9lV4Yrk97paigTlFFDUKzu3oLX2xrIFb+G1m1B
+33mZH76Fg5Zm674tWC5Uf2ccxqQjXPHt2jnDd1yh5QcH1GnKOqXEwby6SjwP0wI5
+EzrSuAOQM79QksKc0iX9m1VW65+5ov68O/EpmQFdv67YjlOWvUvt387MC5NTzv8/
+/3eFaAnC9rNlrnlTtUPfZHo5BOeZd5WMBIgc1bgAPfENGucIPOL0RhWUFiyMPHNt
+Dp9vnWXEy2XOtWY57CNS0py1FMkP38x0Pgcp0BfZeN2QjyhSJdduTBopABEBAAGJ
+AR8EGAECAAkFAlM1v9ACGwwACgkQsWaYpK301jiXpQf/bw3Nxv5qyBwdT/85dBXZ
+ecEM2klXPSQf3HtNNfKbaZS+9dWn9GQ71qpmZCTZGLtJR4J54mlwdJdxhlDyGv02
+c1YBUkT4+uRVkzJAWzZ4RiMFeSFTj3Eiksg2J/f50D6ZlpeXw4/MYr+pCmMQOIY4
+0W0RrlF4iNnZ8hR7haWnH/wH/zHNFPwgw7s+WtY0uEmLmDPxxVS/dzzmc8C1Ef/h
+g7lSRZ5tdq5oxpyVYEdK1nCSiberwrAT1XyGpn5erxvjeE1kPXro/EXeIY7GDzsA
+34FSFBiIaU1Cfn89OOn5M/TFp1+0SYeoaiwF0+x23NBUxbCmAGyyW5t0Pq1PY03T
+PA==
+=QdHC
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B2CA0DFE9ED21C6E
+uid    Theo Hultberg <theo@burtcorp.com>
+
+sub    06EC66D653DC633B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFe9ujkBCADN5TiqHcFCxrHEwTIqzCjyv/0kADSXhQZ0Tqkz1HA0a1pxs09V
+hkM2EOJfsFJy0tFPQxKlBFmPJKEtwvL86qV7VOjrm4OvhIeFpUhIqRX8MDHDhbeJ
+fCWmfnEgcmTirxRnjVDRY2PrMM2Y2Rz6vRieZ+KxeVr5zJHmazh404cOYN01txMb
+PLICA6tgtxcJDSIqyslnHdD4mRQDeVkK+iYYXBjzgZbiTUYdFhkjSie7aVzCcu2O
+YClI4EYO/2e82Qkb8qlsS5on8MIDQE2fFMMJD2ZF7YJW7jFvCLI3CXgJgU81A/7X
+4BK+aJkEgitaxrcQCC3RgFFad2HX0KabuDQnABEBAAG0IVRoZW8gSHVsdGJlcmcg
+PHRoZW9AYnVydGNvcnAuY29tPrkBDQRXvbo5AQgA0OKJHc8aPQpCrCWwmW5dWLit
+sZTiiKF12uKAEb6u3lBWXlLADcIbA0/XxDaPGpWNhTmy2ZXyiV5mULd2lBAEVnFD
+lgZ0xFZHL/6E7Lh2FmP7gdp0S2Rxug3501h8Yc6gpIfO8/GIymnARwvLY5UowTNA
+X5s/4ISoYpbbJYZYdWU8qyTcQoarvp0B3RSGeeeCsotQ4/N4/FM/dUcEwK4eLO6O
+bpPgJS2p98+1jLoRnuAPCxQ3/maXAu0RAzI0okXBzKgm/2aaAIQISPSYkAyOUusQ
+EBQbVvpGbOQ1edbN+0loBakBhZOqGUAD3O7/RcZe1pyk+f7zkS4j0vAXGq07uQAR
+AQABiQElBBgBAgAPAhsMBQJahbpbBQkGimciAAoJELLKDf6e0hxubaIH/RFRBqqe
+SNX9FLDNeV7d8nUC3s8u7xpEczamRdrijfqY2jjMZPq/cAbz7qGBEpeWUzXvvsXz
+2MLxn601u7XX1kJYfcXuzdHvM5iE3X1WggrRwR4P7VGIN/tjvuR41MUwvS2Wc8yk
+Ok7rj75FRqJn4BYqqyw/h902wEC0WmzLAPWf3d98wBn4WhJIZ5SCiDfW/61572QY
+7oUvdluUMhMJ6jx+p32htP//yZegIptXJ+eMpFB2yFsbS32f9MtEd4CY54qXH3p9
+k77rSdL0YHMKKXgLbvZQ4mVQSINCA3+O9XfqsDiP0LOrcdF+A3nezce0UkUeY2MJ
+GBOP2fhUl6snhwmJASUEGAECAA8FAle9ujkCGwwFCQLH6gAACgkQssoN/p7SHG4B
+xggAzdDC6ZmfGV5Sw593ZMxfCBcVoFW3iMvn84Y7h8MM6Qn7kEXdZLNfo+WtLM6c
+69fHQwJwee8G7CYols+hXwkczy5rCbBdoIOhsZTQmZyAIpu6Jz8mYGIWKejy68fY
+eVJb/t63s6Qr74bLNBMRrgYHzVxpFJqMHwgcIRhehxxp6YRS+5cSZi/TsHvSxuXM
++/bLPxIhVMZwgBF2CbihkD7D5SSt6ZoCA3Z333wWZ/bCDbjkmV+Vc7S1DywaDuv4
+Q85YRlpz/LBJLqdqG/8X9QJky+cQ9CZ53xFkNjSO3tQkPL+cG0ReIztWWShdjOR3
+OLPHEQyNzJuTObrPhQ6r04WAyw==
+=Of1o
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B341DDB020FCB6AB
+uid    The Legion of the Bouncy Castle (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
+
+sub    315693699F8D102F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
+xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
+qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
+TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
+vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
++fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
+0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
+Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
+YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrRhVGhlIExlZ2lv
+biBvZiB0aGUgQm91bmN5IENhc3RsZSAoTWF2ZW4gUmVwb3NpdG9yeSBBcnRpZmFj
+dCBTaWduZXIpIDxiY21hdmVuc3luY0Bib3VuY3ljYXN0bGUub3JnPrkCDQRKMGw7
+EAgA5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4H
+aR+jNNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw
+3PcEgCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rm
+wcHGopSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjL
+x0Sta1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLj
+NnF4SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8
+486UbZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ
+7hsrQw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxj
+PY7RH41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUG
+pU9vxZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXN
+YJ/pznXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMYhJBBgRAgAJ
+BQJKMGw7AhsMAAoJELNB3bAg/Larfc0AnAmQbEg9XnLr/t0iUS7+V7FcL5KpAJ9k
+3LS5JI97g3GZQ2CHkQwJ3+WcPw==
+=DGI6
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B7C3B43D18EAA8B7
+uid    Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <kama@soebes.de>
+
+sub    02A4A6FB70018AD9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQQNBFT3aMQBIACl/07e2aAdqLGTocp3J694BSGxjH1M4T8BevXH0UTRTXbge0l2
+3IONp63KF1tmHg0skzUu/1Ybau6Zw7k+jRFN+9VmslRprk4fjHjgxmT5U8p1ualk
+l7HuhiNPgXllV8xBw9X84j0UII2sT1jnrvhwjvr+i+31Pj5PB0KIriMw8BGRcCeW
+QpSNdGU5I8mei6tKMp6NJg1rGER+c6jhwQUiLWTHaZJ8HVRWL0/249bkqmIUL9wr
+9p3kCful0tIQ2aPMfM++snJU3rQJqV9BfP8NimuFqA88LXfG/qBC3Kt0HfVNGcOx
+O7/5HowRlLf3rIwHJhEbxYkUvYIHSYUvRBfEQ/mu5ZtnmH65ObsObO84vkFerfpw
+oAM8GIoyQ/zNoOcBz6HffQwaaIdGvl/udFz81oMgUqJDsYjWIR9sZMHYSg549C22
+JjnaL0izC/k82d5Ukx7wC+gev9NAT3N1QJHbXGJT4BG8VvLOvdAyvoJ7BvlW/+Al
+ee+jUPh5lAdQV8eEl8Z9z1U+TlgBxaJlNrooVDfIMlLO3uqCMvcX1NXAKw3tRZtE
+ACVJ2jB7aVHZH10qEBcCqxAkkgbs/mr+2p+VB4K6UP6YlVBUIHwkzYvlnFrdCHAD
+ZSDPldqvrv5hRBmHax6F7vXd8OeWuMTOP2c3HomnWUN8ExbRGexnxAQfMQYQAkyn
+qvdSqXB3J3ByKh2b7U97ObArYvP5jeTyPeltnznBFPiSDsuKSscem9OAk4wxmu5+
+lbnNl72bvKbB5bFJKEoukwFDu37fXY4s/C9Ib40nQSKvflcn4gSHF4c/Ahj9Qcna
+/v2QIhHeod+4VcNSuw7KFNjS1PPz//Wn3jBzMVAFqG0JpqhyPHwuDtqaJvekTkjv
+4G6kSW/GMlBOCba7riJJSal0yjuXNuv3OWU9+P3TV+nMo1+Ytls6r7SdfFDSj7We
+0WqbxI2bKJhZj5B54UbJpCdvHs1yd0NjNqM/ucuktw2hiqTzUY+ZwBN0FTgil/vc
+00RJaEY1Xp8WuBNp2O6RjBIYJpu5JauaoaSjWzoEk4aod1w9mzgO2cOh14rE1HRn
+7rwTw9XoJTKEK/VGtAXWDtE5rHQPJAsiThmE6SfiVdgznvoGZAjbhJsPO6M06gi2
+MgGYZ1/KfpU8X4mkC7/txdMIksH+jDs4FngUVUL1A8zRQ2iI3GTGww718pJlRibr
+g5gHk8iHYm7aXZshj460iykLZTlzQlxb0rVdtJ5iBx8MhRY9UBmnMqiFZnjMlgo7
+beeSNwaweeVpy66rmoDg/v47086tjk20FriyotafDbCPsq/oPwaiGQVksNjxEsaN
+sst27bTULiZl8nL1nJ6hq25eZA5KvDquTdE/ABEBAAG0TEthcmwgSGVpbnogTWFy
+YmFpc2UgKFNvZnR3YXJlRW50d2lja2x1bmcgQmVyYXR1bmcgU2NodWx1bmcpIDxr
+YW1hQHNvZWJlcy5kZT65BA0EVPdoxAEgAOZ8GzTczAM4fsFYdKfB7Ly1KuQZzeja
+KlOWWCuq879g617yHWVFx3xR7FRnA4j/yPAd8XDCfDudA9faT4B5u57zfRqHSCoQ
+iRpoQEqxEYjQ31sv8QNhaEZ3vuCByYurOPKHFgXyAR4/N00uFGjmKOlFejpA85hg
+PQpysEojSXTQkn1y4yqXvjrEpJ+7veiBxh8LvPVDkI27SATBx2TxA0YibA8xqo1U
+XZhHlp2XQlsagrtMkPIm1IiEDmz6LpdF98CCx/5Jzk8vONVBqfzjChS1IEC9g6Fc
+koHOX/paclAj1dfaxMZyqu4uxTDMNEWycpZfGgS+FDoKUaQb8HUmWOt5aTZYed2V
+HJAAwxSZp0d/AQFbo+ajf0RwEwXrxVW1uZ85jjzz6dohTD/nGig2maT8rPxwhYhU
+Dn1KES8kKJKmuAA5KX35pPBdSFlKEp58W3U1MbCu8d05Z/inH+ZX9kOxcbmAXQOG
+FNjq0RCakBdqYv4VofgZ+L1wMFIMlFHn0bxqcdgvue1eKkKyF37Ipb6V+PYs9tVY
+BqorH4D0a2P/EpfTNMKhGtPzb1f53cPWnQk7HpIRa5Q0w3psYXC54G5ewiGh7mN3
+YbwIoluQIN19gofgQ6TQ23Su8Ia8Q+LwSXsBoRI/m2EBqg7PET4Mz/sQkvEzB8/P
+US+zu+8wp9MUSpNeYoC7Qa+0PRhhJLK98IW6TI/LbdsB4vlwkdStx0XLjjJEgI7l
+z78/9uAXFRF7+azckio4C59+7Pd/9e2fSYaK72zeo2ELN7nm8w0cmVIdM0ILxrfH
+acWq5Hf3D3gmpC7Qcm5fxnrCoCPx/4xu5HEV2FInxhBMuK5E41jZ3rMSsG0FaBMO
+P8VSVeNaEs/1/uHgbKSu/Trt8wVrQHXWnlg2Ypus0+ldgRytHhYaKUKsO8zSiVUz
+f5jDESsvmHk61dhu6IlRs/u9dalEILldeXgCUuRjof4h8uf2fFwJj+Q/iKsB7/KG
+WQM0t6fR2KfTtl1qZ8tpnfmsPK6oE2rfOfowUIphKGiTCTjzdp+LgLVtH6Ib8288
+Gi2jqhIzvp1vQ/wh30vGwCpHOU29ABe5ZWt1gEdqxMAsKZeERBry5wlzHzOUhktV
+51onVksv1gUzhxsApYCpRZYm/HuNDL/NYGOKwbqqmZtwtoUltwW7vzW+EiYJe9rD
+ae+9QXtN53bbI86+72eDExeGPaxb6ju/tmP5hO44VvAtLdkmx1gMcTx/wOl6+frr
+l/XDX9ScK+OnFn8gJgGwtL5eWmN+1rqWdThCtlbjQEv3ObLRGId+R0zmyIDASW9v
+V7qwzqq+VpTtEKer11t7ScToaJXunkTsdtST3tUEzWrt1rl85qqLXJcAEQEAAYkE
+JQQYAQoADwUCVPdoxAIbDAUJA8JnAAAKCRC3w7Q9GOqotyRqH/4w62t1mcfeZOGX
+LsGdbRTAV9AXr35Pwr0ZlzMNGllu37rgL2yiiFgtFziBxV5xzCLgFP0Q9G5yU+D3
+IVVNGw2r1k7dVOgjb4uHRZnCYfkRmrKijrBCKmKOis6JjmbBRQKz1SxOaF67Mxfb
+AAVQS/Jqi7Dete262cdvUT/7kFVuEiJ0sz39EFpScVy7+tamNPOq/4CEa+GChJgU
+Qm4SfC2jZhgrmJWZFNlWpyvKPvq5YTQmPVS+EhjTCknzWu5FqwUslS2la1LxnNpG
+8FZYTXNTDXfJ3+uUQtXAnbbSOSgc00FsCXO4D00S1gLVfRVW+3ANNxmv0RbLuS/s
+bFZgvpGeCj6dtpuWY2tfvmsbZpucNgYaprt7ufEdiQSIeBYhj/TOdEUQHBzkIP1/
+JkZqWIh05iMTgGhxuB1lM6fducjxNHkq83c6037opxiluN/6eNpueiUaxp7Egnqc
+7vikLNv2PF/w6mZtBzFxeBYolq2cEUhQmOYgkGUCLu+ZgW+qlo64Z7r0nB/Mri2o
+OlU4/kbTmPD+GO4aVd54COVAAn1g9ePxiIZ06pLnXyQOYtjOtrmpkAdNSEAxvAFK
+hYo6BUHjbj/nYqLE7WVh/M93zkqCCxTJbvvoN/LB3hG+p6sNdIePgLqFwqWnxZrL
++IONBCy9lkW4LCCnTO3tbXcYOZO/TefJ7InJBTivf2OB8+8CSLhP1jO/VTNGUpMd
+gPRkNLiETGpClwvyNyw2aYbzRFh8X3dLBLjpiK7nfK9cYdc0YyG0VeMA5yu+NfQK
+oGJ6in1E2fwdd5qnRqbPZcGDawbClSYjYw6yTabU5+gKSssJoq1rJErqLEBqjdmt
+KYbWw4lZuW/sV4hag3Ny6/tWspwvAMH6kjXcXl7RGYQYa5rbhNWwOkvnZbrpT9Wg
+xLq6jl/jzw25pxSNeCZmyKDTPw18dSzjFCF9pJqqVFw6kABE94mfMyQFPXvP2K60
+EwrmiOE6RnokNlvvnMldlRNacAVSE3Sxc7AncmtsL47li8Tm6Rk+P/8SVEK2DdC6
+iSAIhu6Zi3C7L578XvQZo8Qzz9FxZJ0pTD9/HWGzR6CQvatdPFXXqeEc7NKeVAXM
+Lo6GYeGXn6EY+U6thR+/7CSunNHllfZ4kQP6EEJqXRb8lvsOt9lUVe7M1TKSnY1Y
+EUSqwXc78bTOWIIsA4XY/6nYwbb7SPiCsX1AuC594t4jrskdzqGXsUcN0uzplzpg
+lhHZ4xQfuoXNEvGoVHPTOu12ZhzE60PseAZxALL4vSX84TmczfkaMSespONaWUgD
+pB14g5zRRBJQHvpg0paY1VlEORo61WrVENaBMf06xMHQYSM2kcHogpDcFph6wXxG
+hRjYldaB
+=uKqQ
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B7E2662A7640A051
+uid    FormDev Software GmbH <info@formdev.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBGAeuPoBCADxjHFyVx9TT2s1eAeER5qcIxQfh1sR8CFcDyPQ7FsoSA0Qt8di
+3o23mEv2aP4OfezmY0eNchW0TXp2wqyuA5V0cE8RrM24dJ5p3X4PcRyVcO5KdJFk
+KfN8a0U4xwLP3A9kMQCJr84CFGqWr+EewU3MckrSJdHfOpnfge8P0yglTtKsuq6x
+ECPovrrAjEpkQ4WacgtL/4RNXVBKOSWq1inFQBE6UjRuakVkPuye586VfBtAwoAi
+9rghZGvGuUaJ/qs0/WDX+DbLd1R/Kh0Hdh5uaAwLjcl2DOvaJApfR4vkRPsZ5ZPF
+jxPbVvBBrDCWjPOZlXwhrX7EwJJoLZYZt4K3ABEBAAG0KEZvcm1EZXYgU29mdHdh
+cmUgR21iSCA8aW5mb0Bmb3JtZGV2LmNvbT4=
+=hpLc
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B95BBD3FA43C4492
+sub    520FC47ED23D6048
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEOdvssRBADJG+C5R7J8K5J4X01qLyIdHHMFj87wnMihOqhbfPd1mW9BCvqR
+R/RGeUfXmDYDOLMaT4iPmQGAcQ9NGhya3NAJ3xvTBOlRXPPloZ0enxoFgrZ+Y83L
+1y0/rF8SuV7lwiFE+8Bb4qSQKPKA0x/0R7UBV/n4j4mX8+6AgHYR0zYWfwCgm/MZ
+zdi5naRUoarjqnO5bm1itLED/RUb/lUV6zNJbVBW39thdSXfnKY2c5TABs6NZZfl
+BhCEMDYSwXxMdei95VEIra8Yd+UWth+uBd20M9zXtrnckxEGhplP4vXB1vydK7MV
+m1hW80FVlY9CJH4A3AOR3jKj5wHR10ZNqFGE0qDOgHd9Onj/F1Kilf2Z35QQNHVt
+JOoTA/9UFx0dGBj94T3QHjShS9z0UpP1VKWKUG+uvzNW3nZrEEb5b6PcM3aj6eQ5
+FHzzFU1R/3+7/1Aqt1BtO8Qktl/gyNl7PF49Aj5Tkxk4V8z+y5DIKv03Tpe5KPiG
+g0SerD1WYS31jislXXzy5VxdF0WV1w9j04EpnyL9OQQloJPYTbkCDQRDnb8BEAgA
+n5HiL4lx7nPqLsBr23BS57Sq7LXsE5kQUuz07v/CF9ev8yhOkM8y9HmPq3MTDWS2
+r4Gq0rDHph+AW3IIblNIjuRk9pc18O/As0zMKi5oZQkET3ZGWmJMkLC8SwAugDL9
+I216p2KC+K1vjfmcnT9rwpFUPdkT6WsDj4uKifBgpUlaCM9x+lvtKhY+b9KC4oIv
+v4qtwjtHQZzJTvMrwn6WePPGVgnZA5MPfJCjUvueaBVwO1veO0bRv+QHomalFnn8
+uDpoge2Q0W6eLmnzXxOUn0ol9PL4r/bb+xB/KymRJdW8i8N01eYlmaoPt7KYkUrv
+mXH6u3dlHikqlrCVGSk16wADBQf/SAFhqtrhWpvqoSvPJuGqpKg0rxQ2b625X+wW
+dgg8hEsf+p8NIevEaKgq/jD1ovFF5mhnCWSZHh/lgKOyi+IhxXjsMGnOIrjcRRyH
+8nUwZRbhmWBhstB8RG1hVjiYEMGgDJj+NaZov2lkgvkk3gz91wXze847LB3DOMYQ
+Bhd2Xh0JPwFC7xB5dNUJXe9ZyGyfW1ajiMe0AoSpkrKu49hi4SVJJwifzG44KA14
+ypjZnAM/qSe90xca5R9xPHqG6LL50gBRpdlxiJsfZYnVkU+Ob+3lXLEyDYW0xpgR
+TF5RqTGI+gIGiR5kkcLRSsRttbKFoXX6mRDRQe0pptZahhXLbIhgBBgRAgAJBQJD
+nb8BAhsMACEJELlbvT+kPESSFiEEbhMVbA7mU/C5hGY6uVu9P6Q8RJIPaQCdGhsy
+c10rQDgIwANvTjl9YNs8g0MAn0ogXquKO4yeSJdFddbpG503NQe2
+=GlPk
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    B9729775C0352D3A
+uid    Tom Akehurst <tom@wiremock.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF9ZHHkBCAC87FdE5p9fmsIG4sr88XsPIax9ZGtDADNjlgCZwg9FxjOQIzf7
+KAHWZOZ7EAE1VYQ1xHLN654t5n21kI8Qtnek16bYrfvBVsbD9OA87G1tSVURtORH
+jJAbmsH/Cbkfzghme98XnufB8f0WqkYqgAJNmJ2Q7UVy9unLDO1UWOCypwpwvfdc
+y/vFYJbhBi13M9UAPsqUi39Eu42kHDGGrBPZLkx30H8sghWlCDPK+Ed82gj5ZSi3
+LGEktGOrDCBA4rORuR5jzZxdK1WyDkU6p/v1aU1iSUHfnU3s4C8tp4Tjj4Zfrhop
+f0fvmo4c7t+kk6iNfXIJMeGwXCTAMrTcumCJABEBAAG0H1RvbSBBa2VodXJzdCA8
+dG9tQHdpcmVtb2NrLm9yZz4=
+=NFoD
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BCF4173966770193
+uid    IntelliJ IDEA Sign Key <intellij-idea-sign-key-noreply@jetbrains.com>
+
+sub    C9F04E6E2DC4F7F8
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
+DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
+tFn6YtkFhA15Aahr/vz31NBjUJlBmO4PwvkyxiF/MYP6TQ/AHar4xP1RxSYEPcCi
+dIQczQ8nXzya4OqOyTfibeGz/eiHHuwTLHi3Rd2kihQnlRQdhE1rmm8uTyzFe1H+
+P7WW7kQgygW6yxQ3J+DXrG8kG+nbe57ZY1oyv3F/fOBxzn/kuoKHZ3JJEMJmTIrT
+Lr1ngCZApgteAynRHk4t/SYZiyoyqZCuBcwHABEBAAG0RUludGVsbGlKIElERUEg
+U2lnbiBLZXkgPGludGVsbGlqLWlkZWEtc2lnbi1rZXktbm9yZXBseUBqZXRicmFp
+bnMuY29tPrkBDQRSp3lyAQgAvc8Q7O0gVSJsHoVgSQ5tWGwNsKcfD3I7kwC8BYHr
+Q6F/UnhP1ArreNnn8KKpwOvD65pv0j5G7P9KAbIVLRRcCTB9MgJR2FPmRTNmYbKi
+Pa6X6IUM/25R0SBKDJddqSvEFsE/M1ozHz4bIhdFUXJFMfv7WBaA9Cx03WwZg6Bn
+5/xMzMC/qzG7QlXOMpcABtd2JlPImH13qHWNLkhyKW7y9HCfdBz9nOy0FGT54ttv
+r3BL1gahSXNi8MHP7m2I3C8dSuIpzrNVPgR2eByvSYpZN28P4Cy9l99TRcr6/FuA
+y5FaL/nWpv5WAraAV4Cx5Xpr4PXTn27b7k+feH8W/+9EAQARAQABiQElBBgBAgAP
+BQJSp3lyAhsMBQkSzAMAAAoJELz0FzlmdwGTSqAIAJ0/yTJRlWp+dwDZGxAffw0V
+iEHPkwAQ4iEKburA8LpcbTwJRl+k9d1RvFkZSWITq+F+Putlu9QooeVwcM+ht1Mm
+oah/aO3Yx+yMnXwljR7FJa5VOY2aoALeCyIx8QYiqNAVaid+bQ53gC924u5zRM+T
+J+vSChtqSBi+EOOTt5C+ALVB8qWTqEcD84AVbvvippCzKsA2sV69FrsIFAShvpXo
+3xpXW83GCXxrp8nM9M0E46Y/SarvGTqfKRC6phNUXKp9c3SnVttPEcGhb9+92LOL
+vMxKy4GRZS18bXDI3vS6gRDNJDCqBYIhp13Os9k+ZpnwK3PPIHv4l1I0i0EHZKk=
+=WJEa
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BE6397E958AB7594
+uid    Lets-Plot (Maven artifacts sign) <lets-plot@jetbrains.com>
+
+sub    EF3FA25A9E1B028A
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBGA+cG0BCAD2AHCRED4EC4gf9dHVaPuTe10GfgPTVRNVRbj9XXjW9VyU3EWO
+4OYlulI9sTXGvn39IEy8w+wQNJXYJkI3VHrymYe3rSEq85I/Z/NJbkAuWVs0HdBy
+QgFwObq8cyJLpi8f9MtVwwZkDK9VhQBBW+/Fem6y+KhAGXAE41DH4h50SNMWvydb
+kE5CqwAfwoPlSpbGhoal7pdX8LYM15aHaCeJImMsm5VN7bbQdYaGhmwO3jjl/CL5
+Z173d7LrhXs5nLeZ2VoqYnaUi/ja3cGLNrWHFsUUiKDI8Xu0vG9E9v7bsaClTrr9
+t/LIkvoOUCBbhkOGACXmDNqw2JkuCw09cIwZABEBAAG0OkxldHMtUGxvdCAoTWF2
+ZW4gYXJ0aWZhY3RzIHNpZ24pIDxsZXRzLXBsb3RAamV0YnJhaW5zLmNvbT65AQ0E
+YD5wbQEIALTkIYJjT6jZmwF7oAH0T14AZo9odlnVg2QPuYWCGtJQOvFUu8SBrNW2
+voHHdfG1+EatLfYUkvpblFxt3KfsGtlQo064jJD/AD6reAyaREEWTluE8vaEyd7Y
+wtJGsS5XX3oiViFLQWVQ0VLoZZSY2vIFPorXmbhyC30PBMDRnF/DrQlyESBogkz6
+O0SZtzce0R81UcE7rP7v+nXVgwqNttD3YeXM5alsO8bgOdexKPpk9f0SgpL9Mnid
+Y867Ms32rFsnPI0echBd/j4X30co1iWW0nm1QPBDydBGED7aXt7uGhOup2CHxnH6
+iVW6vDYQ0+zpbJJfUxBSPWBeBgWXKYcAEQEAAYkBPAQYAQgAJhYhBP6r+w29enVI
+ItNd2b5jl+lYq3WUBQJgPnBtAhsMBQkDwmcAAAoJEL5jl+lYq3WUMSMIAJLhGvnM
+vludOHexMBjwij/fCj+tqAzHyf9htCv/TDtgQNzwnzxJjHz2ImZzpuiHfihJocST
+R+cnC3pZ4i5UrcxmmGh4skEVqIugzAjMDwKHDyqwxErP7BsPjKLMojh7vejnXcYV
+QfvHnfltqSOATrpDUk28lt+RfPbVBKa2fdEyLvoBjYCmuczhNZcBwNIUJqtKP+iB
+Ft9s83OlhnfcAZYTmjWSCif6G7H8VMM7SHzKwW5nXj8SDWAAoBbn8oJ+0nWulV5z
+Q3PRjoLFQPJ3gPRdyAG1V+Intgn1H1JkcrHaGudTv99lOoMbIg3qwcE9IhX/0IPd
+d8N+c1t7YJ3P9NE=
+=MhWq
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BE84D764623A3644
+uid    Evgenii Kliuchnikov <eustas+gpg@google.com>
+
+sub    D8B9C51729D09D40
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFim0TMBCADUsNfz2e7p+u2TxujjDjXRq96EBdJ7wNrVjrNneF+8roo36iQz
+KWA65eNzZ9DP0sFlhRwXOopm/AOh5VB+Ex98W499Esujv7RuiZZ5zYuKr54k4fVM
+Ei5P+byCXFZyj8r3KRQmGXwpQBHrSl8R/D0Cc15pH9JAMh/BAXGtpnRGgpg32sq+
+11MO779KSUgcZL2Cqzn4U+0SkTE75w1Srp8/Le8XIIy+0yyS3AbKEARwBgpYJmO0
+MsaWSa4I8PuoO+NK5rp/u6zuXqfMWnoPcgk1Tl1k0KPqvEN+zWVJl1kHD9AClN13
+6oJ+lm25PtKb4aKtHayYs75fgeVCkiCOIuljABEBAAG0K0V2Z2VuaWkgS2xpdWNo
+bmlrb3YgPGV1c3RhcytncGdAZ29vZ2xlLmNvbT65AQ0EWKbRMwEIAMiFUp/xc0oS
+AYGw1Xf0cYp9Q5h6XFJa+LW1zf/ZiAqtrpVchkkYThnmCp9yxpWxGcTGcleJbSnq
+IYe7qkqNatC/rrAfF5gcSok0DPcS7i56DXjX8UM+KkgjXwsp4Cyf5cVMLLowRYa2
+hGOSqt6OIEfe1uDQVB/Nf+/PCUNW0pQeyGlMrxljmhxVcJXVbSTTJvicToenMMM8
+NZXDq7Pn+ubpBfPhQC9BnOiunMGMmeFFyVvx98rME5H5sMigzDV+NYll4rEqi6u/
+NKIsESwXhbrY9ua1uXToLk9g5JvoCzUdF2jBzgins+emuCeie+75FGWxsbfONtjb
+eGo0avZ9Dk8AEQEAAYkBPAQYAQgAJgIbDBYhBDpNhsVsqZNzttiVPb6E12RiOjZE
+BQJcZX3dBQkHgROqAAoJEL6E12RiOjZEqF8H/iOBHTzu2A0cti4e9/DiXpFq2CUm
+c7t/1P42OvYNzmARVHpgb64xMtjauUnRzyqgS7boABpyDhoBHIw5XQMii5+caouC
+jUX+YrM8X0mXd5SpcgG4UR/vuN/n8Fx527vQ3hZVRsHWnFSnykGnsMbPXyuKhIwI
+YhWyDQWtKV3S4txLq3ELm1M14Cf75X0T/gxamLWtFZ3a95aKKe+V8WGrIyqy5jEK
+kVL00rhrOk8gu4JcuGKM7E0bTJg9dL8eZ9yuYw5fvCHzLMAu9dHV5V9EDM8B12o3
+rTscex+WHaB6kx0/EoV7fs6yngXwIZG0WgqrSXrDzNLVIXevwaHTwNpbSHWJASUE
+GAEIAA8FAlim0TMCGwwFCQPCZwAACgkQvoTXZGI6NkTgpggAwYJ2c38btxmfnvY/
+gCvvT3pE5+bbHo63R2x/9vqTCykoBAkvc289/3ZDggYj8bOoU++GmqLMeOJWOfRC
+0JhwHE+R/INEfy1GZgKztNuHsA/lHu7CgAOBAGEg8pOIzTg7HSp/c02fihBCy4Fy
+WD+nUaH77OjZs0mXs4g4lv4nxhLwPHB7XLDSU6sO2QsJwtooXA2YxKachsD/uiw9
+r/Nqe4QZThIsW49wKSchwdg45z8EJX6rwjYVLEcin1b6VMMwJhfqx/IucwVSD/3Z
++uqSnRpmmlUhn77LwLlMnXYx+p8syXQKJiVbVr7V/3fbBDHhrCzTAA+rQQRZx76C
+l1H2Lg==
+=0P6w
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BEDE11EAF1164480
+uid    Joe Schmetzer <joe@exubero.com>
+
+sub    4BE257B370130000
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBFv1EEwBDAC61jyEM99KH18hI3zlfuqvGoNjTLIh0wge5vXAH8VxMR0ndOID
+HYSBT2+L6OeiqKlyhCgF1km48F/dMzyJdTASkNO1Ni+B2Ric1sBxjsSPufkjl4en
+yMOl/FuQOB2myht1fCXhlynmOoiRia5J6xzCsCNVGOVYfSru8vpoT9QKcD1OlwoD
+WhfyBx/bXsoRvD1CMjQdalcGxv1aJRWfhRumXQwhMPZlFeARAzeDmWNpglqrMnuG
+/VADZXZsbLv8VWaequ4wEWiwTOeA6YYElx648OTSv7NjMM7iyPPPWbbUvkVbA3Em
+lLBLlGYZTx2nI0B/322SsREcEDwaBzO53GStIzP1XvaRosM/98/Y9ITwB+Oh7ZwZ
+dYmmabxN6F5O3v+TNndEW7wgP0lkbsOWZ6YNmFhvoEtd1RxZiSNov5CxokYUrug1
+cS+/vsa9oIecUwxYOG2D1v/pwYhQnr3qasYz4nEEBWHnnkhyr1BbUSuen7w2SiK+
+64cQn6V9aeZYi6cAEQEAAbQfSm9lIFNjaG1ldHplciA8am9lQGV4dWJlcm8uY29t
+PrkBjQRb9RBMAQwA7UCAsQ8KxX8nYO4Sy2pzlh9W5FMPwGluuokPA2A6g2Fz3vF6
+2RqeaE4HrRQMpijQCsN3JTJVwDid41X84XCMItkdAxMjmn5zeF/yCcRuHe2Ci/+a
+e5BzrBaKE/VWRAkaZSZWJ1MoDdpSxJhLHNFnVrwTkM/SeSNUBk9ZDEC+43b0hcie
+fX9bFlc6XPHgV+yr5ohhwcNcrZ/gbAhhN3/xIVmvKoibmb+ZIajhiCP1OOH+GpZA
+PT93w9qZWq3+2gvP4ZZ7bO+8N8Gmz24GL3/0eYI6aMUMwWGjy5J+iRiFjb6E+Iv/
+zToyZFWm2VOuOUqy5t4u+Vyk5bl0hATpJICmKa5OFtQwG5Uvfztk6rujjat90xv8
+yzsBvoEUqKqzIzjHdN36qop5hLMnBljdLdFY+Rk9CHdF7MW8Nf0YWbP/3uUk19ut
+GW686Lolt8gvBQc4B5N7VtNoXFCKM/I3ufgnHQvDlf8pgdJOcyx/a90V/DpUI1AN
+lwg6IsmFZXbBQw7tABEBAAGJAbwEGAEKACYWIQTjqflQeehM4gH3z2C+3hHq8RZE
+gAUCW/UQTAIbDAUJA8JnAAAKCRC+3hHq8RZEgEy+C/4lsgrKCmq2Nc7eTdN1AxwM
+kj28XQFmkqO8orfJm1hAtVK1KRizkX52RNeRN6QX3pX9s1e3DjJi3Hpa1UWqeicP
+A0kKTi2ytUlxR/iZDkaQkLyCCZtWnGHr/eRBdOjblprl5O+v/tcyrmQGC04TqOnt
+Mumuk7JNjZ0QAVkZUxdmfi9bHaF5W5vlcaFYT5gdWpkOQ0YaWXXw5ynh6Ookjhq0
+g4pZNjl2rdWWyTC59YIvC9THx0+vuyN7xnSWIb8J1IjEEYvPqRfpd8s1Vf2AA0JR
+PjUG2UV8MZqu8k8x4iC2gbdji/vyg/ycdlRT/ULyNprz1nTLMfhBT0Wmy8B5lFVm
+e3URmld8T90RPln6Dy+c+IKb/79z3FPujuSbipXzx3QvGwVYyP80JFn7CJluOl/u
+8vxi2EVFN6aVqdzwoswFE3+0W0AfbpHUUT4oeBW5OBTJ5i1Qb0DT6WXk3Y2j1Z08
+xxhY1RITnc2C33wjXAW0h+qq7/7Yq3w3/7ncv9sWIzU=
+=3nku
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BF1518E0160788A2
+uid    Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
+
+sub    C163B490C5CDC967
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQQNBFT3VuYBIADPQxdM6fJajMSyeiKbfpSjllBkGA16DE9IFJ76B6281k8sfya2
+k6UOAKNIprxY3JCRulbnkn3BcdbY1vZDhaf/fbdkvJ+o/XVzrxojq1jS3tvSq95L
+qOzITCHK1rSApWUuVFTlvdhJy8rVlAVfiV5Qkb2EFBQtqQPIdyjRDk7NkM5CfzQj
+E54xPCAM/oVtr7bCAjtUKkOjXYjv/L33pSOeig1+Dah1OjDpkqmUspiFWJKJfYyw
+1MvR/lZTAm+aZpfx40vlBIkhBtJBsufjBwxLOJXUzPHC8io103K9EjHgpxeuKj21
+HvbT4EbL8jMEts4uvkjGhQoa0yZ/X0//VOA+s9vNE4egPtQSZR7gT8y12s1x9EE4
+nn7XGCfYYbbkpFGLKKHr37wRkzQ0ABzLwPuOZMvq0jAYtS4BA5BRzT63JTTAH1gT
+O141lSmRc36Xxqa0/KFN+UEsk2tNZy8c+KA9zRYW/rZfPz90S7V+BZqBfE/oyMwf
+394FOVAcpldYWmlBzQQsrHIZ7c5Z3gygN8naQuHcqO89SlYOkvMk2jxmvvCi7qzG
+W8j61lwrzV/HytULYRW/3gCbbjtBKP8IgeYVTzE+JTzZbd4FvUXv5jWtN8cxcBG7
+A1UaFG7n3XbXdGaifQ/qNrXUOQxqeFv1PTdxNhPSRG9/TvVmuGsTXXll++gc3J6P
+nCW378EE9wqn9ti20TIaBus1+teZv3BjwFd5msSytrvDewLYrhqDyOaBR01ux4Ea
+5FYAidqIJ9UqmGfLCJy+xF2re1Ra6Vmfk/jlkCCIyIp57+K+o0a6XIC9+fZXmdqY
+PmCThaqTJxQix54Di+FmFmceiURMx70dyCs5Py51vlszDoOttJxGpU2qkVGLdnlu
+BItKLvzt5e30HOnpj8KC37/2u7ahWBfFtwrflIWoC92DElp+dVdDfSw0wwvxadY+
+7/nGon/IAi+Nk7vQn0ngJA9QA5gm+bPuC4w1H+Nw2mUmoUvB/fd/fYS/bm2ggbyw
+mNtaP1s9AQsKZ82SkRQgWiHi4RgV6xSSKCzA3sprYjGGFG3hCaRfdcXnfN75yi9p
+rQv/H6GFvjKDcVRYCAWwIRRixDBnSFJuAPVlGUer2GLzimy+RMJx1owXjigW9ZZf
+5Cm4+0JRESZqRUReY2hcUD5GE9bUCCiheHma8shU1/FDRYY87OFdXmkKSPZKSghO
+4ANGScK0LWx9L5dXqlQM1uhrM+SW3Pd4eKmmsVVj1YhAgrJcYPJKEXWftuG2VdcM
++U2tTuYLAQz1uSUf1ShB60xTdFYu355qQfRFey9GAG20iPNY65ktkxWXbLBqCeCm
+XyWiPPHo53w0GPbbKt1J0ycE/5HB3iKg5UQrABEBAAG0NUthcmwgSGVpbnogTWFy
+YmFpc2UgKEFTRiBLZXkpIDxraG1hcmJhaXNlQGFwYWNoZS5vcmc+uQQNBFT3VuYB
+IACYmSu8e3gsb5h8CBt9xPi8RDfMWgOAhDCWV8trJwycStlhSh1hUQ0MdH9CPELX
+oi7DmKo0SG/+zPQfJ26zLumKUB9j27UqgHZJRxXqyYFaVizmo+mWrOtiwR2dpF1g
+P37VT1OsELcLQYl5YKaJFLMCapjoZhUXZ7wleUY5dYijoaH74glU2TdFvcN2u46p
+O0vqTnWe7YdANBPfVs1lrZr4Mml0OEVVGuUnBBxIAtuvIi6C/Sgbzd7AL/kXUJD5
+dqtWtXwO0OeBASBPjb5PfStjN56k8qJ8H4M9PflBc2jy+982j/aTZGAVsXw9hGJK
+wwI25AI59MAKHzbuiqs3Vfm2xNqZ6PipvkhQ0HdlnKkMIkUsyr9sdQKWsF7JX5gS
+cQEJ2jFptIYsD4548ijp/kMS7Lt2/DW0gh87S5HODy4VAhcUTLSzXMdsy9TYktJy
+/cRC1cR9yNMp4/1mF9McdBvcQimGmF2Atlwr9OGJsF8weX/pQCgV4lFv7rLo0T/k
+JzEa2bOSJrs1mrm/XHdwcyVEBA4rHXwQShOXyEym6tBWg0C4GhCdzCsjZTKtkn+8
+wAcyDx7V1z+jhMICZOtCNJCdcSV3OEg76b/vpYsiJxncEu6KG6S0ej/BY9U6laRd
+Zx7ShV/9mLlOHgFHBZ6ZFT7ThpDU9SUTAtty/N/60jgDBiXzItIiOADU0eLw1+av
+5bFGCoTI1uGqJkd5PHvTU/UT6zokzcEbNe1VCj16slCaalYIZMA1xjoBcz+fXM1D
+JDTXCR4omNN/S9jlBIQ6frs5easBbIwLPqVYjh1oGdqvC16qbycKVYoYHBoWZMrf
+EWjUcimYhL7fQOJb4aM3eBk7hXzdK80yVelkXxEjEZUGK3n5nO7z63rr7eXXtltA
+FwtI+0s/QUpv6FeuWltSwEUH9FMWESsNgtkGhSM6VLOTx81VuHprlYL7IszZc8rH
+od07BeQBnRaw+w2gp8+HRssYpK8nYaDp+jKC/94df61h0mlhzCe+QsQOGY+QZ8dA
+u/z5pbVvGMRMpIsxvX0o2vWKNmRSmazdFKg8GoyWDOYIf42gGZuBGOaaNLCcviYS
+MXp/1nwhcgoLEhe2kv/jrWT5+VhyFOTBzKEAfLNdZIiMHaxB7gjuop9zuwZzWuBl
+6VwWYYFm+cGlBHaSn45R+Iy39Ol7SlthH4AdmeQLFNY6iiTzSIL7LcFvObJGRq5s
+Q11DYERDheIsGmDqhhLwDJEWezCZbpcjbV5VfUik3pNB74ipJ+jBisd/9xcwgWKi
+niLH1N3el95Ll2AqFj7qIFoUuL2NvMoD1bi5/e3RU8n3G3BIOhph/s5Kz6Sh0xgB
+HbooL7MVqe/vHJwcrL3cve9pABEBAAGJBCUEGAEKAA8FAlT3VuYCGwwFCQPCZwAA
+CgkQvxUY4BYHiKJgph/7BLXGMyQt6j8eESAKsPOzg4D1qQwwnrosy0SNWdOPYdez
+7ZZatrglwwSXjsdbR4e/EhRd2y63gzdajpLki/7nNyg/NkiKVUKId8SKGOlnkfx4
+owU4DVjbsuLm/ms1Bv83jNXnWghCjib23KOASPjUahTw/VpNiLP5gWdnIwG4TxoL
+s6iYLHX/elOPrNA0yNz55IsUxEOH2ueINPl7aE15TUPIjfoECq6G8ntna/htsSQQ
+wPNAZ9WyknO46ggfzKzpQoQS3CQT3m7Z1jEd9tCacrSa4qXGpxKWVbIYNdWcUpl6
+VGQH5flD3lTqiSXWW5dU9g8ZKI2J7yki/sPvaHH11wYFGrGyy+Z1REByXAS3yOHm
+/Zdo3UUdw3Qb3VDtMQtPSsM+qcO9qbTYOCkB7vraOnqverHQFk3wCh3zcgdjKyYb
+C7UVXVebYw3u5qTjW1tBAKy9ywv08hB9YFvV1kKGEKgaRgv/zgpCIPgGofpsCT/B
+7aFsD3K0maa66Q4zriMAk4ekB2gC/j/UToVYNBHo54qufY72/miQ7ksBADBigPTO
+b+gjJxzUW9vVJe8Z8fQVh/Nkg/LopQGCKq7Z/+xQkGhaC+YeucbSR7W5vXxb0uNZ
+ZQr0OLbOfcfKKXKq5CgVHAkHSWCSLoWrhAPGuncDwKn7mUAP3ev0eEd4sbhkoy7C
+bnLxImO5nNs5y3CfKGiv1I1uQTemgtenieihXjeoBXs5rHe3CaXGediVTFF2jFm6
+QpmcMT6mVlJ3WRusJkoUoIcMv2SXItJhVE/ZjNNkhE9oprjPnbmpuiEp0UvZZ3+2
+YeSBJ41Yik4MGVoAKYMN61MSq4ZSYUgEP/Dj+wxFFhZoaEYvwnRP44Sh8OGVgZN0
+97t0Cae+rRTg6rJVatx/YzOmduunaRmVkslOWvz+Bwbf10IiSExntJY6hV7JUGkc
+ohrNITu14T5A0/2x/TyZ8wtreThs2bnyHU4MORbYRDeQltp4UPE3xKIjOhcZ70/H
+M+Em3ie9UsrAH9Ot0Xp6v8LgaNNRRsmq1LYWp630Kuw3my1CCtw/cOFfVKfwEFB1
+Lfy7WZPU9WzdK9e9esptI6F6uuq0A2wY/G/LYynEwyQfwSMp7IIyrjPTzNNzhWG5
+I33A5P1B24V56+/tKOJ2hFlzngbPFi7HKz89HHniYsPIgHNk7Kg0EgwiBkHUIjX0
+l2sRYdWRwuSJUeUb5tN5nlZT6owX1YeTdQ44qzYq3v4dbogiIPokLeEsq2/xL/QP
+M0ZrFTGmfS0UxKtpuFBDXdtVHJS5g1N+vat8eBq/tlcFFFSXNxK1GZoYMFA0DDhX
+VNzF1FVYsoxk6SP2Etdg+f5qaSsqiAmAHL+6tEDuwQ==
+=1s5i
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BFF2EE42C8282E76
+uid    Jean-Baptiste Onofr? <jbonofre@apache.org>
+
+sub    6B7EDFC69F043BBC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+kg0Ahp+q2Q0dhNs7mt7U
+=7rPI
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BFFC9B54721244AD
+uid    Bernd Eckenfels <ecki@apache.org>
+
+sub    788E173C196BC673
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBFRRGVMBDADAQcmG+x0mHZwJ3uKgODjUZXkGRkuz7aP/qRmuQVn93tl8DmA1
+lgvXndvChUjzYt4DJnQhRsapAXEmP5/YYIkWOzuk9EpXGtqUieocylvNXP9eDF9y
+4mRbGbCUmz5W6Y/3w7wIsrz4kbCC5xij7cavCxxSGGg1IsyDHYkOMpcQyZH41vXJ
+IPMyDvkJUON2/YA+xPph4XkmNA+hJZ1fEa+06Cd5P4j8GeTnpibkkgzqzjuiUlo1
+PcXMXUzkGnf5IwMQOdDYbmDC0K+QUKEPheWY6NsmTdZTuyEdD7BunWA++mUlrqZW
+n81HMNijG9fQbipvuGiOn7OfmVF1eqfH+NtP9csBCjn84ZMUHHArzsWgb9LWpoki
++vQyc2K+egdykeDJG3hFZ0Ztbz1YPQAUy8BN3r/OmKuSwJ33cleugxyDe123kyUX
+KhBdGEY9pTZ8dbBKn6PfA51XvuWQSVPJRjG3bPFphLPDYNJr/MUuYqo3TSTSp1O9
+EGUz6yVG/S01tJ0AEQEAAbQhQmVybmQgRWNrZW5mZWxzIDxlY2tpQGFwYWNoZS5v
+cmc+uQGNBFRRGVMBDADlCM8PdjqSIZpxPuVd2Fhg3WbSIdV12To2kRFtCfs0Cdws
+jzLHaRYK0XZsFi6O/+mVJ8wpmYpJHZVTHc1fCYbhAPRavQYCOFLzWOuYCMQSzop/
+R++KEmflnl8kDIMHQExgBGEI+1AGZnmD+YtBao8SPTSRpdy9nI9ozA6+QWk2jAi0
+B2P6jG32/YNLTNhI1ChG0XxaRfwZ5TmPnIvyXf52C70IqVIIz4OqdukwOJcN0Olz
+noJrmNK4jzn5zRNijpki+f/fieZYwPl0gxDbnThCv4K5z2C7fMgkv06nlM+kMosy
+GIX4916znW6egUye4soyZs9a0gAheSmF3VCRVOeGv/KKqHqAbIYPfnbQUtOpH4Cr
+jgJRQg1Y3acFNuCsBoTjYHQ9EZWO2ZOqhgkHOKKDQVuq36YE/C9Pn6pGVf1+21xX
+g2SGBqfsk0fYHvEvTuZZcA6J+gaaQB4IfnLlMq/Ek4IZPDTXs03TlEKxBMewv7Q6
+GNTfaG+FEattBM2rXucAEQEAAYkBpQQYAQIADwIbDAUCVFEb/wUJAeE2HgAKCRC/
+/JtUchJErWBoC/4uDcYXUsVsdCVPQOIXxwAnt/RVOISCkpFIeHVIn2bA8lgz7rQc
+0evb+Lr7xowwvpVXLyCg69jNJb0E+BNjvA8XkcnqTT2TMM/5H+0bvheOtk0XBl9F
+D2sB4CUxVhek9xR+jYWkzy29HwcoC8kk1l88YS1WQgmclLOllyotftJw50rJa75v
+Kjv5Sgg0XS9a8eitYemzSIw0O2sIvVCI1bEYxgfT68r5rQLMYz8LYmWU/yHMtzxq
+cmOO1wXbEhkYv+uhCdqXqDb46Uqa1dKB0PAY7MQU8iMwdTYK+yNE9fZFt3Mo6Mij
+/jJuMq1u+tuJc99Q5HJv9pDw8ccBldpDrJTUtFMIj6oD6C6wUK0qmTtG9dB2jqwh
+yumq8t8ABYvtIHrNXSu0gWo8eHT02UsncsiX7ZQrjdJruBOPzxd8Vlh5/Rub4hmN
+IaYRplUSJccHv0BfIPcNkOEdfx+Zwki+9pm37pXfhk5oogZEBNbygAaMax6sAqvW
+u8veAZEXwuJGYHE=
+=gx4v
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C038787776A19D18
+uid    Lukas Krecan <lukas@krecan.net>
+
+sub    CFA2C539DE0E0D00
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mDMEYg6Q3hYJKwYBBAHaRw8BAQdAmBUXcViWvUiXZezA2ukBqads/J5xG0Hzxa7b
+LfCaz6W0H0x1a2FzIEtyZWNhbiA8bHVrYXNAa3JlY2FuLm5ldD64OARiDpDeEgor
+BgEEAZdVAQUBAQdAnHuAssKZBLKrqg+cWduQ2B395Sbx+/2KAQZI8clMkmkDAQgH
+iH4EGBYKACYWIQQ/mZu2kEHPF+c7sc7AOHh3dqGdGAUCYg6Q3gIbDAUJA8JnAAAK
+CRDAOHh3dqGdGFbyAQDphxI7mTZ5jlDvl4IAekaufzJbKNXMb8dSRVF9nbd3kgD8
+DnFStGRCtew0cyP1qYnCucjUzMrXDYFuQLY75Ad4OwM=
+=dmjU
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C1B12A5D99C0729D
+uid    Valentin Fondaratov <fondarat@gmail.com>
+
+sub    606CC6C4533E81A2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
+lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
+3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
+FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
+0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
+UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
+0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
+TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
+W0JEQdCUVgc6MQEAEQEAAbQoVmFsZW50aW4gRm9uZGFyYXRvdiA8Zm9uZGFyYXRA
+Z21haWwuY29tPrkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83VrlAQcR2W
+ulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9zqcRArx7a
+SaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpvuq1ZvL3n
+dApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0JA3MHOk8
+gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2Ul1C2OI+
+tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9RaogEyFmCxi
+EuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkGqgDBQGC1
+PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gryq/vyQLg/
+KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAGJAbwEGAEIACYWIQTmIjEzG8p+Hyks
+m4jBsSpdmcBynQUCYCJz/gIbDAUJA8JnAAAKCRDBsSpdmcBynQaPC/wIP9hArjec
+DiSx6omRgFBaAILsQG7eKPwXCjob4GE2jtnWQi1jobE32GuXoRO/Hj2gz9+Ipsvf
+vWKmyMzJ8noPkCNsvVehuGwp1FQyyk+c6MHww4vLa3abr2e61EEaqVUEyXQ99m6K
+h7+FQq8apyCp6L41AN4mb1/g4hWzrCv/18evLzxZ3sC0sTZfrx8ECc7iGhsOgkI4
+Ls+ME48vYt5c+8Vmq+Gae/IZgQQKupRTxCqRWGTqwDsXOfXIwxcJ4eW8cNWCa+V/
+MIVSBri7/6jRXufu3lYEby3rYjV7JHaWE9ZFQrpwvxk2riyNd/6OJdJg8mfuGVF0
+78KBRtMCorx0t3tGqjqhZz2fftFJ94VXrvjm7dvPhP69u2bVVFeA83B7pCNu+lXu
+30d8b5D319qJCx6c31wQvj4SvQuB9uBDDNePl6Bkn8QeKcudTJJUPB+dS/lTVpQO
++b//JnTWDaGUkhM6IdLK+pJDxQwFRJBJfDHZj4y10zQANp5u2nyyg8Q=
+=T2sw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C212662E12F3E1DD
+uid    David Blevins <dblevins@apache.org>
+
+sub    94A0B66A1FF197A8
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBECNzFoRBACkPc/egsWYAWgJWZilzefm8UkUKQ1V7pkNP8nXY2JghXQGL+TM
+3knOiVu51j9a76kU4tTz5L80Qr3erk6RrqprtoKHw2RfpNqyOXQXhGIoZLPjlLfs
+a/UDn0nlDusI74nOQxeEQzpmoN1obhNC4A2bTVeQxSdrnjtaIi2mcak+qwCgmIaa
+57+0+80fdqY3/Bnuh1+Mo/UD/jblLYrqO3+EatqI3MaukUNhuzWl5lCo7EHjCoZL
+Ci8VSlmfC7PLSESyANcg6LukKC/O0R0TeBO9xzDJ+AMH7YUeejARHWhBnLhiShf+
+/VY0AEh1iGvnSipqY2BCKJxY7Nu/8NcKgfKZInHzVMHXVDMGMsjnZA5CGIMdH8/W
+j4LQA/90WUJkuv1Fd7979X4TnqxPoTRERiH/KZ2x/A5llMpQF293R6YbpjGLxMmY
+UtIBv9U0W7QSiyem3WxTjMs3MbVlM5XP6476EoM6SzypTXledYXLDLRDvb51AoDy
+V+UbJzKRgiQZHADHbf1bP7eo9Mz3qo0XbSrBQTn5HPXQwSVga7QjRGF2aWQgQmxl
+dmlucyA8ZGJsZXZpbnNAYXBhY2hlLm9yZz65AQ0EQI3MXBAEANgqnyDDJVfDmvlf
+/nSQgo7bK2+EGTZo0GIpAz5KYNhDQIQVvHDUSlqE+oEOqNv9CtdxPv28Bax2Yg9E
+7kS5PfaxE+S+bwJypQwWFYguTCzl5wi2Ah01oV4oN/ciDAe8U2TfN7eDP6frSwvP
+n8o3uKtta/EV3QgITsLbOTnGH/0/AAMFBACa+pyHiWcuZVhdDkV0YJkm60Q5nuuD
+lq6L20nZ6oUZla/FBbsGPs1TEFVgUYRtJoYNQqVgXGdK29U1wHTXI9pTcbdLIDan
+SZVT4DXdSNiY91QlXtqni9SkdC5WIWirLxMfw4ASjjg33e3Tvtd58zx/7F8kVT/1
+ywJZCa92wWH7r4hGBBgRAgAGBQJAjcxcAAoJEMISZi4S8+HdoR8Anj15Th97gPp3
+VzAKyb1OZnKSBbzhAJ96natbmeiNkijIzk8vUpdCTH18IA==
+=2vOe
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C92C5FEC70161C62
+uid    Herve Boutemy <hboutemy@apache.org>
+
+sub    64863FF4D1BF1809
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEdUhrIRBADCU9cuKc92CWQlZxwtRuSIV/36Qmj264YD+Lix+r1Qe1PqRr1I
+/MObOo83ulorWigSkx1k81Mnr56NwmIeo2bMhjmgRgf7EG6XEbKdRKfJcJRR1lDV
+Ml4ru40W958M3PX5fsi0m0g2TuVrAKIS4vscUt4L/Cf4IT2/0OhaT6bWswCgsNws
+Qq6NtCkLkpWSBNYGT4zb6yUEALlhHMnfzPSDerKjDOaYHTz3PRc/GGUDSBTSVj6W
+hQIDrgTqrPxoB5JMnfUz8BLSayk0d6HiwspJ4Wnxe2/jdIT+6xhX9xBYXVHZVs4R
+cr8zbBNcW2kwFg5Mqy7TiAPzakzCslKAAX+cjAKSOWyRbmkEYnNgMlctdyENOR9+
+BpP+A/9anoVEfULqoETShmgWdi94gx713qymhNBpFZnPpm4j4JuxKopl/unQmw5i
+Jwtu93cg38UfaOMJjTi6tJ6F6SE8xXv43nKs3Xb+Ll1MpTgaGUXEhCOeTZl223Qe
+NBUp8kvfcys6aVX6GT93dmWxtMewlc6gc7HVQnUnyCFsVeoy/7QjSGVydmUgQm91
+dGVteSA8aGJvdXRlbXlAYXBhY2hlLm9yZz65Ag0ER1SGshAIAPzs1unq2BMWlk4y
+O8D5w9br9S3qtlkYRtSOWH7ilOyvdUzIpQZvC/qgphdUBIO8hepmLXcF4zogNGKB
+jlRHjSRC4SRSmTqHmaG/kdwwtOblLAZe8YtzYAfDLGoLOTeKvp6mUjGWhA5eSUeG
+QIWAmQcucQZp75kT1C+dAgzdiASsR1TmlJZQSGQ7XbVR9+xsGlc17oT8bC4gDnid
+vVtbfEayD/U40JT4c8Luz/Rat/yXApoRfMTpnJ98Hwmf1TLXhVafGk6+GjuLqNDv
+x2IrG0rVMNmAxnv0Zl4jTg/AlxxToNP3OLXrbUYbZ5fDjt4UOLK2OXspgRuLZ1dN
+pd/2NgsAAwYIANouVBiqlgyeOi74ktazcwSyxz7+xgEhYnEGOB8TE70RHQSHW/qd
+vO2s6dJdIsWi0Dquh4EjGW3sURvw3Q0mpMZTq/pIpeTSZx5mfbV8xppyz9VqMUBH
+NhVXRv4yk4OoM9sfQs9aUTMcQBzejrPnO4cWCmw+uPXwWxj4GTz9Dgo8Kx1X7t1m
+jGnpONUMZxX5ObPmDRDZcvl33l9j7mC8CsLlZGCX7aqIVPW0cdKYXQ4EFmyGTFc4
+oca+ck8X5Ar5h5ayx5/pQDs9zd8YdEIfw6H1hAwHnvLpPqW8wl0jjdr+IjvZbB4P
+sF2C0RAR8XRNBK3mbtlcwRWvYjdp4bSZ7kyISQQYEQIACQUCR1SGsgIbDAAKCRDJ
+LF/scBYcYnKDAJ9NS1MPppAX0CRbDC3QqcfjjkWDzgCfWEb3wKP15906jEy3qUAQ
+dfV4cuo=
+=PKNA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C9FBAA83A8753994
+uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>
+
+sub    AFF3E378166B1F0F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
+NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
+/1EO3VqvvDUt39gbaSqMCQNHctnFdb2QYZ7nRFTQeCqG/wyMdB05beqEnWEXzjeP
+FDF9y6gXkELn0lxUm2TKO8tU3h96TCuutDKJ0aE00lOeh/MbEaGHEbIU8kdfui6U
+znZ1X80EWbkCY8cKxEZHKD0aONSVHXwE6nETvFW9/9+K+sj/I7ytlyxwHsaQpi1H
+6aRGnq013VsIECrwkhmXBsLLXNjmhER+LkcDABEBAAG0NVRhdHUgU2Fsb3JhbnRh
+IChjb3d0b3duY29kZXIpIDx0YXR1LnNhbG9yYW50YUBpa2kuZmk+uQENBFeWvEwB
+CADfbjqRN1GvSf9VkjDDWBqX3hILiPx3DKPiSFmSsAoiLSEkP8gRDBDy6po/Oez9
+q+bgb9Sk+iGifJvbVNZr7+88LSxQECsrVL+ZgTAZ2LkqABQJ8XYh/dTO6BMJ5rSL
+H/YN6bO9V4NjYod67W5uYox+aCp6keE7ia7eBHck2wyqxikCqvVzmAduPCkkNSRu
+OwLkOguduXfwb7Cg1RnacMMEfDd9t+a6ytY/8JFu01G++VVxFHO3vs//RINrm0O4
+xKPkT1+Ocd4+h3DlhhRvRXvI+MKeM0ud0OpUVCBKCZqbFKTVgoRpsKC925ZRUSqb
+myBcIkqyYjzD1adaZdkq4PLFABEBAAGJASUEGAECAA8FAleWvEwCGwwFCQeEzgAA
+CgkQyfuqg6h1OZQ6swf/Vm0ndBcvdK0qCoubR/WOsynS1wdQ2rGKJC5oVsUN4YVC
+Zhg9OMhwMSO3EOBPdxtq4A8bSZp/8ZWmHLohE8QHD8AgaQBtRZyNkvMRiN157XGk
+PEBRWdHw6XAvx/lE31W+19qFRnAE8BbERE3gieJcG4CKWy5CyzXnjSM+znZvDQ8J
+7MfG+LxKbr7zUHQH9ZWsk8V9D+GXDgpuyZc4ct1tNDLcn6784FubcdrD3RLMiOAY
+SSgKSgoELRzB8zZds+WKFuiAYXZSdzCbjJJ2VqnJnQtYHN7Z5r3ySqbG7w3rRen+
+Ett6PX9Hrvc1MTy/UUdb3s08C0wD0x+ZzFzqUXKTZg==
+=Yytq
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    CB43338E060CF9FA
+uid    Evgeny Mandrikov (CODE SIGNING KEY) <mandrikov@gmail.com>
+
+sub    C59D5D06CF8D0E01
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=a1yG
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    CBAEBE39A46C4CA1
+uid    Matt Hogstrom <hogstrom@apache.org>
+
+sub    32DAD70C2FD8C3E0
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEO9oSkRBADW6zrFzi3FNVApHusdx/vNRkoCqY6DF0aOKa6fuia3GMt9Cu5z
+LmZ2727uSg3ovojI79bcUARatQGPhntfJcdTHZJGn616oEbORBAB8ZyvUON9OkaB
+D0oXnmXidJ3QUS93tOdEuDBlQS4B3Lh29zwZgxyfcLFnKqA2DkSiEz+9PwCg28cq
+yPVvdghM9blcqoHOtPP/QEUEALTtl+HjseQjoZowPp8aiS1U9G486HovtYxJjtTJ
+0Tpdpa3Tt0jqwQqjMQRpoFP67/osAB38wp7GUk+dSKrgmLLXNc0VhsviN5Wv7M+n
+Qqb21/OuE+/VY42lFL9karLmQ7wKYFuwe94t/Qtvg07PDAjG+78VU34GJg0FzN81
+rKqXA/0bGpkf3zl4z+dR8Kzaz25Hymsmfv4EojQ4zsKZUsS4Kvvpwcn3EFjHR3E0
+aQ+NFhvlu4b0Mspk1jfxdDSYDg1YFiNStChGeE+1boMILDTjxz21zbpvPsPCLQ13
+KZU1/ZuKvjRz9ExjlxDTL+n8PCV3B0eaPBtdKlu7BXXOPf6Pg7QjTWF0dCBIb2dz
+dHJvbSA8aG9nc3Ryb21AYXBhY2hlLm9yZz65Ag0EQ72hXRAIAMsha0HD/g2gypZS
+P70Z0DaK2F0HCh/Fs8TPSSPv8lPmIN+Y8wM4G7qkK+YJqz2yc33sM7ga2bl9OAnH
+00jgIAXnvOjltyYN/w9R5t8lSRGkSmLV5yhRC6zBACiWCG12A1ZgIURjSzutOPIc
+AfjN//ukFbzoCo+Put8jGFwgkBkynvwbV5OWakvpxiyWLA+XhzLS2gv5dGfNvHf8
+lOlx6JdHcC/PRmcCJ5kQURChtLw8Ky5wPsvrQhHTIOQDbUtodpFEOUjGXT3KiCdS
+fxewpEi2NHZ4jGrmX6tMWrxCQjrMioOjSw3Pcmeb83bA+LlterCSR3tNAGbC0mhS
+uYnb1ecABRMIAKSIvV1A59R6oBVgSA8vkGhSKF2YNo1BDT8d2WXhP0B3ScYjDlHp
+IrmBwf2qJdMOSJA2g/rDE+o0XelnKd+1IiIu4Yb+rQNKUdT+EoT4APB4OJL/CjRK
+XgjDXaWjVYD3TuQZOJ58LBhJ0/71YomiZUtvEkNjsp94sT/78EVdNNcfxDnPb5p1
+Iy4+MYTmpKtvPD+a/Y+ZCabsrNWpZSb4HAmiWKifXJX5in1XJEdH86on0t8Tnmcm
+VFYI2uwV5zirH0Qh6v4bP/QBlz7YebOIPSxzgM7WAtpdfQawpEyPeXk3aIKTOtnv
+L8lBi7vrutXfGY2hi0PeBqhZRRJu15D2OXeISQQYEQIACQUCQ72hXQIbDAAKCRDL
+rr45pGxMoXy3AJwPQn/Q6bq6yuoroy0ccdVCv0vbMwCfYZonPuhPnBjWcRU+sxTa
+Lh0RrLU=
+=dQue
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    CD3038FEF07D567E
+uid    Phil Steitz (For signing Apache distributions) <psteitz@apache.org>
+
+sub    A0FC00D356EEF1D4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEEn15ERBADm0iBZ/KwIiEYdLWxMIIZVzwF6My1eLRX+TLvPtOO4wf8zE9zV
+fAsnMI8uCK3as3OwgqTTsKy7KQSqRyG0zd/rvCmJUEET3zHX1e5e2nYq8p1TzJzk
+mR9lXe/amtRy6687fVn5hxERSlXNioh3CZdOVv1Mum5EHuzWFQGjA3CFywCgoXKg
+dLJ9QuE4Btzf9ozvZRDcWYcEAN41LTmy3NYv0SfwvPnR5rEc+xw4T5p28qhPc1OP
+h0jGnYgHYaM3xf0QGchvWLlwLsquxvD2K41ldIJpZm+Z4RqkV9wPrjmu1k2EUqWq
+UKD2gdyyQx9pN6RH9qIN4Mh8b9x1BUrm+/KoxlmCfMxg2efLJTaPwlFgqitswZaV
+aLi1A/4+Z7l1W/sMN09ZfOvTxEmznKOscCBNQPWwu/NBFYVzCAAv2pNVFvmjU1OV
+u85pXfY8/x0lkpUlexd4bL0x1IPmrJn+H4dTI2sVFXLuKVceug1HjXW+zN/LWhT2
+08bq6V/+a9+9oVjcdYMqJldoxEe5Tac7fwExQvqRFUvteL2LTbRDUGhpbCBTdGVp
+dHogKEZvciBzaWduaW5nIEFwYWNoZSBkaXN0cmlidXRpb25zKSA8cHN0ZWl0ekBh
+cGFjaGUub3JnPrkBDQRBJ9eUEAQAvAxg5za8Trgpvk3rx//r1H1u8F21mtMVC4Dn
+DWEUw9Ts+Ew/oy4xTENPTaA3wVtiDBxorHoQlxZquqWUNcUFnrqSSyJ7S5NDiAWK
+YL6ez0MgXd6lqwL8tA4rKQhDK3kPqnuF6RFUfC5aBrQxCbNOk5OZMS+W5/w2CiCq
+hjKtkHMAAwUD/04nzr26XFB0XHbbCF4bSbyiR3vQTWOBOmv1qkGnausQzbFpg34T
+1l5KYaje0C7n7+UZSlD2uWksYTbtR3JpAWmf486MuAbZ5ViTshy8K5ia56k2yI/Z
+aSErG7HZjMxa4G8ecWyK1guHT4LMEobWUA79cs/cwdwqvUV83S1la3AliEYEGBEC
+AAYFAkPJaW8ACgkQzTA4/vB9Vn6ABwCgkyd1L3p2o9Kp+A7OY3RqmzdKnvkAnRnh
+fXU0ijWlrXrpaEXqE1WcxMEMiEYEGBECAAYFAkOk2EIACgkQzTA4/vB9Vn6MMACe
+IY50naQyEbjh7VFpdIj/RpRkybQAn3frnpK3nov6td69QQDooDK/5xBZiEwEGBEC
+AAwFAkEn15QFCQPCZwAACgkQzTA4/vB9Vn7UAgCfVlQqtD3j4iWDPsptZtfWg4TL
+e7QAoIbyRlaNcTy+z1Jj0+cwvDVVoEoQ
+=/KOD
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    CE8B1D1D2530EDC5
+sub    7ECBD740FF06AEB5
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+D138Zo/Xr9x/cYkFS8ieh6XR0y1Yx4xZIDTi3Q==
+=cUeD
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    D0EB627D4885CED1
+uid    Nathan Bubna <nbubna@apache.org>
+
+sub    3046C9379F41EA53
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEN3YBARBACMx0BWLY5fSwyiNS6IpNXunE7wC/3wP1TXblBulG/LNbStJ0rY
+QRXOZunyT4PGy9Yk4JJHnofLuExc9dpVpHt04mldc9wQkh7er1dhGF5s5bgBrj4V
+w7ile6zf/z0qRUXXSi4IlblxCXgRkrcEHlz2XGcGabzTHabjOm+0Qbd66wCgyb8j
+WVt7Y9cPCI8apCdsobeO/WcD/3ThXZTGDCAtzG5HpRVyVMTKF36GAu06p32xxsui
+46OwZc98v+7xPFYnyOSBYb/e8oaA0lSZXUEW2pSWuMO2W5/s4XOkUy7WgfjBAo4i
+PBPCBtPzc/32qMPTljGQWiSxLQvVkuNaVP4udxXYiM4gG1xwkpc4JWbCuQAsMf1p
+LTzPA/9DvulXGeLAKRZuUG+FAbRCPzpxUx/N9xYPpkdfbqKKXmXtcvyvuYKTDv13
+PDFsad33WTUc14MgCg3o6/nhJuVzs2Xjb1x1mXPlBEaXGdoPyFSm3WyJVg5zKzEY
+/+DFzK13ZbFIFNj+M6BGVtcOAS/9mW4lf+1B4PMlRJHmQ8Te0LQgTmF0aGFuIEJ1
+Ym5hIDxuYnVibmFAYXBhY2hlLm9yZz65Ag0EQ3dgVBAIAI2YbQWq0PCxwGNBdx6M
+2IR6w76R7uWc3OnoUAlBNWzIlO2nJ+436TJq7qvmuXFPbl0n194nP74vdM5nBDsa
+YEDOW4RY5NqiNxdOnNHX4yInsHTmBHt/yE8ETgeWM354+wTVsUNnr+bdYwkwSxtO
+lmqJCiTOxekThjKaNcuTh3ARoR03wLb2PZxf2el+FvquqOkvbYrXlV2q9gYZiHMm
+WPz9RoZZ3l17M831yJ69ymL4Exp/AUZfP+GTFViOpgq063LBvUZk9o891gnHgxc4
+45VvDGhL/O2ge334pus6/GtKFcKvOc9hIMlxywmTW/sVAgaSKJf/BtgLlb2oH4pz
+JcMAAwUH+gL4kQSo0NGbjm8blr8PLxfj65HNKQrNMRFNi0HcNM3GsJ6HGtMTrqRz
+l6bfPnGq5wn+kEukpVaJ0d/8pGSvdsvjHXWV2c/0YPYUWDpYKnm9r9y84PlUKW17
+spNlqpQxxhEYOiITgqfxn2KjXNMqMZPbtFqApwi5vzLAkPMUuZjw9YS+jp/6Ge5+
+aGRErx1pj6w1YLPS6ErQ81e6i01Kw4nafZsHtIyLhKb7qeX326MiU5c7avNJjBN3
+djebKeJgtBxDIzE4SdQAa70GzILAsIpoF7kZJIN+/+OSSAOpdBti4+g+qbdQxrEE
+x1ZQRn14EL1oKk2AoY7aE8u9m8c76T6IRgQYEQIABgUCQ3dgVAAKCRDQ62J9SIXO
+0VYsAKDCSH3N6afXWIDTcw9LOzGPDNJ7ewCgmRSHj447wm+Xsp75H8GDwGQ5AV0=
+=aCqR
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    D1031D14464180E0
+uid    Viktor Klang <viktor.klang@gmail.com>
+
+sub    326BA6BD408BFA94
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=0Zos
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    D364ABAA39A47320
+uid    Liam Miller-Cushon (Error Prone releases) <cushon@google.com>
+
+sub    3F606403DCA455C8
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr
+c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD
+m+1zSFswH2bOqeLSbFZPQ9sVIOzO6AInaOTOoecHChHnUztAhRIOIUYmhABJGiu5
+jCP5SStoXm8YtRWT1unJcduHQ51EztQe02k+RTratQ31OSkeJORle7k7cudCS+yp
+z5gTaS1Bx02v0Y8Qaw17vY9Pn8DmsECRvXL6K7ItX6zKkSdJYVGMtiF/kp4rg94I
+XodrlzrMGPGPga9fTcqMPvx/3ffwgIsgtgaKg7te++L3db/xx48XgZ2qYAU8GssE
+N14xRFQmr8sg+QiCIHL0Az88v9mILYOqgxa3RvQ79tTqAKwPg0o2w/wF/WU0Rw53
+mdNy9JTUjetWKuoTmDaXVZO4LQ2g4W2dQTbgHyomiIgV7BnLFUiqOLPo+imruSCs
+W31Arjpb8q6XGTwjySa8waJxHhyV2AvEdAHUIdNuhD4dmPKXszlfFZwXbo1OOuIF
+tUZ9lsOQiCpuO7IpIprLc8L9d1TRnCrfM8kxMbX4KVGajWL+c8FlLnUwR4gSxT1G
+qIgZZ09wL5QiTeGF3biS5mxvn+gF9ns2Ahr2QmMqA2k5AMBTJimmY/OSWwARAQAB
+tD1MaWFtIE1pbGxlci1DdXNob24gKEVycm9yIFByb25lIHJlbGVhc2VzKSA8Y3Vz
+aG9uQGdvb2dsZS5jb20+uQINBGH0NlsBEAC9o6m+D2LubGjOJxLQB1BnfBOkFHad
+sbkb82QFdrCNsd44fJieaqZVP+6XHKVRHSPktwpE1FnjThBJJsLwwcvwWXwDwvED
+57n4bATPlrPGuG7x+LRVbxFBTd+LQUCcHd3puruvbEjQdV54mbgdMqAp5dSA4Fc6
+h2hMWVBX4EdLiH/0ui3lUoqYTJcB73U1/jbKcbs0+cVuXIpmAPQpIs30p0wWLOKi
+Jqn9tTZpwfntnrdfLvKL3FZcRQeWZjqH1Ywt4zWlCRqGEp7yVqhK5gn4nfEdSX2k
+oxr53OOsGk2Pjhzs/5XJLi1FTOcnja5kkqOPiPGB/BxAnjPCEsSiOFmF3Af4WdYa
+3+TK8+ggBSEeLjjLa5zyqexfhADwgb5ASZitUErJZDhAvqHGwfz3VPENy3K2kJLH
++maWwOT1ZRoJnz3fxwIugKhPx1MzlwhTclIknK7q2CNcB61pC9lg70ICW090Ngkn
+E2DtmjrRMONhcSkuWGLZBKBgRqNwITJFcAdg6+ffZzGLsnEd+6A29PdsXfLS9KJq
+iabvpiBg8RaAAWiv5TqsNu9YSWUQUzBZO43u8AxTtThuHYZrxasoC3sCGIcRy2V9
+eaq480DRJ9uotONMutIHUDVSdqViPmmit0+PyRiCX/DOeBHumaEOm+RqIxPE8h6W
+8sHrYAQ7J1a3AQARAQABiQI2BBgBCgAgFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAF
+AmH0NlsCGwwACgkQ02SrqjmkcyAsehAAps6j+qpjyNGUet/B6Z7nJcobSxnCIP/c
++uUPD1oB6Uuht6NTYWQdwmEqL5BGz8WNTsBd0cQYvSztrMiz5tCDoiGGrWcgWxrr
+Nxc1EVydhBbT4PpiG6CBWFCoEXN76/f0ndxZbjjobElTXbQ6oaLh2812OavgMdiJ
+UVBgXrtfgi5/h49Wpc5o/IDM3bfujfrn5nvPIkd7Ee+GaK2YSCT7pfK4N/eW1g1S
+usqRQxBKCU3C5MVgVjkpBa82U0kTxUGDFYUUcS+Yjhi/w4uynwIXW0pSl5wvxVVx
+NBfGFH5fkprkpcuVXp9B6SRVM85uUoZJFaIFyoAhU9uQQfVe6ugwP9BbhzRzDpJe
+9tiOcaazwzNnP5Zj31nIV6UltZu7mVSl1JwIcWxW3b36p4Ht9G5jIPQc8xS+oMd/
+/p8r4sYFB4KOYas1ukRNiCshn9tJfeohkKj9ewxyUNf1rS8uOUJvZC3c3XRF8CJX
+RpxmHu2pPNf0QxFVhghLY2cJU1OWGi6NyZN65EdfmkTbeDxdlSNv89STD4Vp6MmF
+trA4JZDSR0Bp1zEPKiSxjpG5FpfVv6lXmFboa5qkXAHG9+bcaRYoXun+wJ3ioWo+
+cQEdy/bsX03+MHMsms8likmfPIGVw73RF3HXjJ8GVqTkqbo4ZpgTw/7Z3+fAYE/v
+xquhnpl2HvE=
+=A/Aj
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    D4012DDA1F1F0F82
+uid    Daniel Strassenburg <daniel.strassenburg@coremedia.com>
+
+sub    011B32C57A810220
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBEwzT4oBCAC4yE4/EPw/MHB8u7mZtnk+N4e2SlHw1V4oyPHVEA6vdSUpsc5c
+l/5N1iD78W51a/3/l0JgtZMUNHlTtealzDDZxfEarCgm/fraD8v23AAVI5ccLxRE
+xKsobKOQ86QgFcbJpwwyRQbDv3QBS7ieeEvM7lJefOGIjJPa+xLgzpScd/F7qjZ+
+pGun0jhY2kcdHa2D0z73ACLRk9uEDcD1YfZtEwg6zKxdNx/vEPEn962FBf+LEICd
+urAKd9mIAg8a4I7HfveZbWBqiPijT3lZKkhfX5hbJACV5vEgsvQ6QcFs8UMpkzry
+enWg+20SlFW7xkb4ygiJZKwwAWYmjkU65yDjABEBAAG0N0RhbmllbCBTdHJhc3Nl
+bmJ1cmcgPGRhbmllbC5zdHJhc3NlbmJ1cmdAY29yZW1lZGlhLmNvbT65AQ0ETDNP
+igEIAKVDaqOCorCrSpumnx+CUQN+2rUAYBwRQYwCs54q9gqLswYqmQfHfPq/3qa5
+z8wzNd/dgMLHBWl6b6uF7V0Xy7WQZe2FK3kXUVDB3jMfPN1HVIGqh+a+YviHwnEh
+haydAR9eAxQU5cfB809z9DTCh5Sgj31U1eWZ6EomVrBeYhEdjvJKixJR/MxZtAsR
+GVJgX6HNc3WAvFvI4OWE//Om7FE3d4CGLmheMIe7nNfuNBl5gvzKAV2rdVeqNinW
+X3vH0KoZFly89tLFGKaKaFtFUTMgaT42Ejqc83GmoFKxdfgPtMhWPTS3K7xEGvO5
+XJKVEe570tvIzVW9P53cETs1X20AEQEAAYkBHwQYAQIACQUCTDNPigIbDAAKCRDU
+AS3aHx8PguhFB/4vQK4iev0hXnjh2WnELfIMH/d94X7o/3TNBw6JxpzikqW+PtID
+f+EYRQOjKZevlVd0zPvYUbQjjsndrE/TBvY43jxZDPVsE3nVD4vgBVz4eDBYGxaf
+hoyDV2NhkKS7rubn8CEageKArhOZ8Ppn6zQZ8vPZgQNiZoHTNmr0wGqXPbefaf1k
+/vmBkvPoRyqnqTuYSzvvM4QoH2noUVldEk29G9kSvDMoIikvrP7RLzB1fT0i6bw0
+vkbVIrbPsJUcxOiGxapts4Wra6aVG1un3UuD9pca6r9sAMkZ3kBEDfeUZPRw96WR
+TCtdc3TDY1XNn+30UGrRyZSpPS+GAxOkQPlR
+=nIHm
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    D945E643368FEF62
+uid    Werner M. Dietl <wdietl@gmail.com>
+
+sub    A8D88140C35897AD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD
+jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr
+vscz83dU6wpXxhFgTryUclqj0Nf6xZ9kxGAbMgP4JUZGkME/q3e6gOnwfLvbM4/t
+M8XcjLLJNKdBHQGAcuQJxTp0db4ets+VgleqQKOPP2g+oeF92uiAZ5Wz3AEMRvnH
+9TjGwXxiHv4gganqbaBq4cPH+bqoi1xxqSnj6qctbZxkfsICW03MF7Ydf16vbzzH
+48KxYkBN83M2jOIptrZVsP3vLJzelsZTI/rkmgyfigEsog+JD/1Za3+L7x8hWhY5
+arQ+QmSLJ7wyqccFexZO8gdtXkmfNQsIf/kFe1vifdRRYhuG0jrxXixa/zcj7VxZ
+waFrCbh5SqNMqhUoTwvB9WrH3BPOQGmURynvXAeklE1kR18rxiAO6Bp3QV7BGXEX
+ReYo+ITho5aGDhEAEQEAAbQiV2VybmVyIE0uIERpZXRsIDx3ZGlldGxAZ21haWwu
+Y29tPrkBjQRcyckyAQwAwNKgqINPHy7O4nHdaaJxa6qNPBvDfxHsWR4mDcWlWWVB
+A2pQyQnvLDuNQ+QXK/+MHeYhZtuiV+SzS51ohkk+X4hSbFFkngrgnY3gNJbeSNoa
+XIr4UgCNpBXGcUoS1pBo/XVMcgTSsmco+bH6D6152XdUEJEUSlXc+hcEI3H2SZT+
+c+nlwSv6PMdIlDjbCY8JZ+FPJxbA+QqYMJIrOA8RoTD1FWb92nUxnxdEKgr3LVvf
+xFUAjRfXmpXHOxysZD4phzGgiqyg/fvBXdAv1fJx+zAhQSK+ac6TNSN62pAfwOXP
++PiYWC8/T3wDZDi6YiTDLml2K2iA/2vrKuAbtIAQR409s5VFq9M41VbDdR/cjocN
+q199btp1nb9rbis6n27FGgCE7gj5IO2T3lmFnhwYIZNNhqfRTz5hSvDLidvEDGv3
+RnYCP3NibZX1lqljlDTk7Y0EQ0DFyahDuWREdVGJ3mnO6k6bGMfZ4pgRyWkr4CLb
+D97W69aHbteZVOOS5HJRABEBAAGJAbwEGAEKACYWIQRxhrv5k1ZtjC9PftfZReZD
+No/vYgUCXMnJMgIbDAUJA8JnAAAKCRDZReZDNo/vYhkzDACJBsiz7Anbo7UaD7sF
+OFNF5BXQA27kYpBSjDpNsezmfoOI0sVnBBlymQcmm2AM4wB9uSIeuUmc6/wzhfQg
+GzQnoKnSyLUO8sUOumeVSTobs7cKt7X67jbwVRn6xmgbHbtmfuKtsi+KlQYV7QM/
+BUiWVwQy42v9zfCPuverJbyU+ofR0DcrFmJkP+bQT9vhi63q80FU+BhX8chBg8Ag
++B2R8odIYmNP2uHJJ2qzu6HKUE4G9CjXp12F12XMxjBdz84wZHvuptSEUaooJPP7
+NNgPUpeM6DcXyZpuetWcb2WuYUohiyjIbDNTEx5SLy7zROUrLQvlhVpcqn1m6Rfc
+gBnAjTqcO7q6EU1hNt6dtXGtCFhQ3+INbXe+6hmDW2xq6ucG6VvkMdAyAyUtYEvA
+lAl1IfZoPh2IvTtzNwBRb6LfNBVaNUfygcIhSy6zicGmblxt+dxFH5w2bj/Anwt9
+rixdM/OxJGJQKBx7X2SR+9gEdzcOygAWwjL67zJ/DNIcZ70=
+=uG33
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    DB45D3A62A183CE2
+uid    Tom Eugelink <tbee@tbee.org>
+
+sub    DD6AEFCEE9EB4747
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE7CF+QBCACgVSxGo1xBKSebwXNvh5g6Sb4KOwOEFSTve6xixOdlENjI+Jqy
+8diCfFF0jA1ZNOd9xo/Dwo0geYfw6/W2RWFhs8HmTnOPKQu3c0DoobHGfGLXnFb7
+Lq9WAeixoIrkU1AGvll1a1V9BTaYPHVWj9sflA4tBuoV70R6JicnMMz2cSDNu0AE
+YnmRQjnOhTWJtrvLJqS3Syl18XtXuftVtAqVqvB7LpZwhqLRBnjg9k5jpnb/JApp
+VYkDvCmURTn7bVMklBQqQdWDsX92WyOyelK+D4g7dEhofA3QRg/vzBwxoy47Xpe1
+1Nj0BZB9UYvi77T3MPCvJ2n7QLVzEN92dnbBABEBAAG0HFRvbSBFdWdlbGluayA8
+dGJlZUB0YmVlLm9yZz65AQ0ETsIX5AEIALYECndWIXJpzXIiZgoITlsPA07RYOdZ
+O4oWjQalmmmBB0ajHGWbLrWqjPV0g6KK0HidV6govca8qUoaufzk9HSLSrzTYzev
+M7hNXrlI9Fsso/GB5rZwiX4F7E7FApRtyddQ5/Hpft/P/xnRQ1ETCC4STDkvZ9j8
+3gsY7Y8MRBBg1dN34Rl/lTyKdF1s8d44hjkDl5IV+jyUsi1woOzx3wm4oOrHQeqh
+dEoqXvhDZY72ajd0Guo0jxRgKo7yn0Z00KRw2Rd8uz2ppvFMH79hZxItdZj2Nt33
+0goT4WXwTQ+aJ41hub8xO/26qF7DjZ8N/SrLVTZJLmFKoZ9Vram2zkcAEQEAAYkB
+HwQYAQIACQUCTsIX5AIbDAAKCRDbRdOmKhg84jTtCACQl8S0Z+xXMs/r2lkDek1n
+yaj08CEh1O8kUtFiCqavOCEfbmK6UaAEmB05qtlTyHpv+4ogOl0ql1qblU1dTQXT
+IFiuFfgm59ynPWuI4elgpO5EKZBKAHLvv7dIP2cw0qgoMHCK4zHeq+rJDJZsOI51
+KRNzHaziWGG6c0np3DnW7kcnMS2jZQ9myYrUDadO00NCC0/PLNUBUa0wlG6o53pW
+0KKnMX8Mi3O/1G6jURp6Aj7OcMn9d/b6HgtUWi2XRlDd+gOuCu23VBniKXJUXAMu
+5wmMi+gF8Ox2lnw06P+ANCbKgne2xcRWiCxeiQ3BJ5XX+xGp68x7v4JlOwIFm/K4
+=zGsv
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    DEE12B9896F97E34
+uid    Harold Cooper <harold@x.st>
+
+sub    9A716F957BC42546
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+bbXFk77+xasQTKxjSZ0ZTQ==
+=u5Qn
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E126833F9CF64915
+uid    Richard Kenneth McGuire (CODE SIGNING KEY) <rickmcguire@apache.org>
+
+sub    C64121F5021754AB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBEu57KUBEAC6GSPbvdc5EtEu9GYQvWGxo44mJrCed9LbFc3rV6bawbvARQjG
+oolnQ04PRpGI6+RmjhsHU5MlbUMWhpjdkhTXWZEheTnvCFnKGTV37DXpwJeHl3aV
+kAX1C2a4gePaUBpDi93R18eaQbOzPfa+cmXq8gCltb9efFONtrR/K9QkAQzlxsbR
+d9nIsuALV1Wbpqzan+mJ2taBDrbIN7PpBObnB7sGpsfpGC8pvNaIElAGb+JRM3df
+DIkdymWZZouKHKM6akYoA1j54uf3iHSGPxIMKTuDTMZk950cfsR9FFwnDXMK8v+3
+yQV1qWHW7MEOoC3bfPNB6BH2rkzXDJmlt4fXA6yyH4vDLJS0287XZLYrCDFC4Gbm
+l5fG4dhw+DW7mhHezK3ssZJja5miRQtVJ/sBXJC/4y2tStoeyD54nY7BTtBnP4iN
+tgW1E1glxqiDjWbsbXQeyfvpNWPd1VY2JQAyPyg0G48YSHiO2LLhwqlTwXVWdP9l
+b/VHW0PkT38DnCk5DzhcpYt6hi84fKvomIqx1nASvVHKnxgNNZYZv9h63TXuU8sw
+Ct0+HwnIehw20uNE4nmjUFZmzKRi+Qm+nkE7GnBFafIVadZeKDskkBQVWVE0D7ij
+HgVn8q2NDbQ2yq8dYUcnW7HufJbuQX7e0mb3nJiI+B4RCQx9vlj9oGy0TwARAQAB
+tENSaWNoYXJkIEtlbm5ldGggTWNHdWlyZSAoQ09ERSBTSUdOSU5HIEtFWSkgPHJp
+Y2ttY2d1aXJlQGFwYWNoZS5vcmc+uQINBEu57KUBEACX5n3ANsTRUmQhgsyDtYIM
+Q3TNBvdgJ7oD8+xLfUI0rg/p1sllHtKXSS1zhiKfG649dm3hx2KVOGKuIpNGptcL
+/MZxReXoAMN/f0MiAgf96Le43GT9c1MLYziAuVCl9FH8QjH02MvNnTolqtgail51
+vpKBgirysvuwKwaYDpeRT4bJLj8kwaAHD77FwcUMu5AW2BJgwg8YG08tltxEQSb/
+5d8YJW8jktnLt8rgYlQKYWnBWzyJ5UiXWeuEHzn6sFdXkTzelbfqXZWbIEfFECgl
+QztGB1Bb7/4RQ4x0K/bmja2ppWHCXh0dwNqszcvFKU6rPcJkyq9P4XL4Sis/9R/x
+Zqpgu37FiDwPfTCo2eXqFiy0lxnxHJkLgokOvMW7AxXlrNWO0ADQwhvCOAMVbdwj
+m9S6K5V1Yki0kZQN7wSXX3da0yUAltwC2CejNinGiMox/2aPAkDhBH5PwbF5h2TP
+UV3Pa2MCNwMvL3R4G954NoGVRa1bsGxbO8XYgya+Dpiat/rmfwtE0hAosWoMasSU
+MxN7euk/0nfvfXo4bRGBBvXvKbJVuWUE50WO164LwIYB3JtaXl0Ay9muDKj7vi4o
+WiwK4j0trcIwClXzLb3UVoGHfgQb7Srq9k0TkBdVFv1BK6EcoAF11N0WekMb5y7f
+Oebc8cOeBKcTLfnsEiS7cQARAQABiQIfBBgBAgAJBQJLueylAhsMAAoJEOEmgz+c
+9kkVct4P/j0f9scypTkuKxvCpbnPBOJqtLLyfE4M1eqOPtsI6yJpZwO+7tYHz1JH
+RToWr76jzBX/SBGrET/wB+VgvLAZ2j1X0CXTeTjAFSx6tVb40xVaVksDVtti2xyJ
+REZrPrCHyYs0kb9mjnUQwMRGJyb3f1IJkemVeaHCht9bIjCPzPCoWMwJlurZzCZv
+Zq7wPxnZgOpII4bi9XL8dYFmGXRwMjjuoGQn28dwntv8xoqGpptzruglvyGnXLjq
+/GNnOn4FphDSeX5yEPLBM6qdxF9+UcjiKhgzR2sipTCImgEzfU2rV4dKvqIDK+9N
+PAnGDD0sgIxr5QlKgCAhJZd1SqJnnOJMGof9Y00EHjigeLfaXk93mSSxakDgvJ0h
+XvHntIlQWEpGavDobolbG+ai/QqxPvQnABx7+r0U2VoKaIgbUHpCw5NKKjaIOpmm
+mBoIXgGWAKVz3+LcIrECKTGExV0Ob/4u2yCvCL1GljA6mJawvg4+J7L8FBtN6PQs
+Mkc2YQptZ6+CvEd9DC/TuDYfqTNf/umhi+3JpiKDj+KWniHqNo4tOje9600uzXYe
+0j3izhMuQ87eNKYB+qsuXgSX9iZXnW61a8DSahCVsq1j86WoF+HafZjFjPjG+JRf
+9J5i8dKtFE/K8Cj7jdklC9la+4FIh/zu8dun9tDt7dGu3veX8fbS
+=Z/CA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E2F38302C8075E3D
+uid    Gradle Inc. <maven-publishing@gradle.com>
+
+sub    1B80C80E07BC7190
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=Rl7p
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E3822B59020A349D
+sub    9351716690874F25
+sub    60EB70DDAAC2EC21
+sub    3D5839A2262CBBFB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+7NiDKVeUGNDvkoQ7y3HGMcay4JG1oQ==
+=11iv
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E57428DA9E879E7D
+uid    Philip Helger (Maven Central key) <philip@helger.com>
+
+sub    F5492B20D173A94E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFeGGvYBCADLqF9MxqNfwOuDrOmkOigwfiWxdKVHIpZqjFquuWIjH6IhADER
+HzaFrAuLF9DyodBvylQWMLpWOjv8ulGnUp8ow9Gjd2hH0vjrXjR+c9ks3NWtHX9n
+uED/BTZGnIwrKS5fVrOSAaUAl8LAx/dbnxnkwDMxKwSjdcSZhAU5jYZUyKT1KXfS
+4WeZ80kEoh26mNZtsXTSZSC24ou78eyFTLmNFuFY/v+dY4Vlg4zqb8xx7IFAq3wz
+pNGimqkSE8DU5U8Ld1Xua/XQEJpipf1xxXvo+n03dRCeEm6eyFbOJYdMIkZW3HsO
+kWnKxihvfAEWIKtiAxE0DMnruY0pON9RsR/1ABEBAAG0NVBoaWxpcCBIZWxnZXIg
+KE1hdmVuIENlbnRyYWwga2V5KSA8cGhpbGlwQGhlbGdlci5jb20+uQENBFeGGvYB
+CAC3VzDctcGzOjGEkFlJSt+XEhOvFRM16euI5y0+1gZF+sDfThkW9ngYjTj9DUEk
+Vmgdptn40nXJczQXf+i16Jkd+qM/aSVpE0kH4hBWzSGnrq3yy3APptqzGJ090pTB
+pbEYWXVMAJ7VaIFbT1DWBilv1pnXdoIxP0L1Tf8Vc3bwBmiqVGIj9pqDNgs0Wlu1
+ZkgZsnCNlrHM5SwhGfs42SqOaehg/Cg1t/B8uiB4pytf2Y6NgnxaHDvFgvDSEd9S
+Mnp/WGm40JHAC07j9wst8tAS+TYTmNv26Nk953X9u4sVoc7kcLfdSVp16GmZPjKx
+MPG+1p+HqDsu44l++uvKZYZrABEBAAGJAR8EGAECAAkFAleGGvYCGwwACgkQ5XQo
+2p6Hnn1/Lgf/eiy4kVmQS+N6AP1PpmswwDu2YfKDMS5+d2IXeGUrTY2MK1O1DCD7
+843kP9jz4s2dMBB5wk3cbO1Vojd/jtt265swzGsaoShWMWMKnkknGG1h5MS/nJLr
+8hXZeb6DjlfntznLuiD9aYuRltvP6Q00InAOLiuJ9gWINvWLxAK5OAaEFmWMkBx6
+BD9JCXc83EM+EymRiw3Lh0EELOq3pONeKIjgpbxvv0EhnLqNWGncA7FEC8GH3pr6
+NxuYKDybW5R6iEnr5ADAjZiXLgPcsF2NpBBynVDpIAUIhX9C2qZBSBRu0wbYgjWk
+LJrHciKHigbVRfiq0M/AqpYbytLWkOJE/Q==
+=pSwN
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E6039456D5BBD4F8
+uid    FuseSource (CODE SIGNING KEY) <admin@fusesource.com>
+
+sub    4697DFC8F2696A57
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+3i1fFPTLkDPpOUpVEh9FB0MrCNxY+0pa
+=iicM
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    E91287822FDB81B1
+uid    Mark Struberg (Apache) <struberg@apache.org>
+
+sub    5CF48CD2F24C5214
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+JtchwdNBzxrmkygs1IMB6Q==
+=7xse
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    ECDFEA3CB4493B94
+uid    Guillaume Nodet <gnodet@gmail.com>
+
+sub    8611CD28F472E006
+sub    6C70A3B7599C5736
+sub    BC7DF305D87BDFA7
+sub    3BD211F725778C36
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+hiM=
+=VkIA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    EE8ECBBBC188FD5D
+uid    Andrew Oberstar (Artifact Signing) <ajoberstar@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
+3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
+tHmG/CVFECV33C5SCvzeedzIOSSHy0ybZFrhE2DYXgZddavcxamuRyUOUZAV27yV
+Vyn4RYHSqy9YRz5WrN9R7BK+MeIh2vBJ8Nd9N36z5kBukTLeDZDsb8wujSuMyPGz
+P09gzieX6B5x7biz7Jzotqj4f5KRD0fHbCSVW60N1S7xXFsjZZf6dYdYINWW0Utc
+ABY6T1H8FOfqkd2tcfv4TqNd03vweUiPQnh0v6nWURrQKsty2z7YcVI543l4P0Bv
+/5E3YfT/B/BohsYbakT6nLSlKwgpkHz44+A25seRumMENbcYwi7XFXge1K8pfasE
+Xbf4X+Lngbt8SN7HGHvtepMLlpVIvKhGSCl76Aar/fjc5vQ4Rjd22RTbS6V6MUY2
+ROrqcjzLr8N2zpQgKEL1lG6U1huMFzjapti9CajT9le6kbR6bLU+JVUWKrQSVB4f
+4S0egNNf7gv7lFHPp5fLFwa/jaoYfihydCyYPY2BHhp7muo+k7FL2t6YvOt5rUoB
+BIYQ7LhMbG4MpLNwTlAGI0QKvPjUylZ23v0vXIIHvF8KFTq55D7C0VGW9wARAQAB
+tDlBbmRyZXcgT2JlcnN0YXIgKEFydGlmYWN0IFNpZ25pbmcpIDxham9iZXJzdGFy
+QGdtYWlsLmNvbT4=
+=12l3
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    EE92349AD86DE446
+uid    Thomas Ball <tball@google.com>
+
+sub    E68665C8F91BDE69
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo
+P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2
+SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q
+SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo
+TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg
+MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG0HlRob21hcyBCYWxsIDx0
+YmFsbEBnb29nbGUuY29tPrkBDQRjvdWpAQgA0k8hiP0izEoo5Ys6Ra/ECD2j2Ssi
+SiEExo4ZGzHhHFDICs4JShob+qwbdpU6LzAwvyFArqqhcAMnoUEbFDrsbyml6vNF
+KPU7cEkgsHoV3VfzDjRLqFK9QBmz4MzUUy4PiZ/rJ27JlRUiCEZETE15Jv+9+fgp
+U+p1IAPu5Z5CIhRi95pevCi3z5Ty1E2C/4tCkKOGbmG9bIi7HGkj6Tk3TtX3LTJE
+ZaIFuCp2Z8dXB0RtRIzSwxhQlRkpb6LB/m1mKD0tm7ccB/+/JeMFYbrOSSPA7yic
+oUu6EviOTKAcZJrAkfBhGC2WSdRnQMxVzjnVtuG4UcTR1yBAJ0BgmwjrowARAQAB
+iQE8BBgBCAAmFiEE6xs95xcTyewuh8wm7pI0mtht5EYFAmO91akCGwwFCQPCZwAA
+CgkQ7pI0mtht5EY0LQf/UkEplnz4ksZwZ59yGwRbFw1E3zIG0O0MzykSwL30+36/
+MtoBhgVs9UqnOvnvMjFm+2byZRtY5rhnx4e3MtFAQWKsq693jthQ87Ie1915xyvR
+7uJBDaulGY5WueQq7gscj5/iMUSb4977cLIth7+0Eop4E4qNEBalCLsnPUZBS670
+kW7h9SmHPPTPkvJsYdrVPtBn7Z7DySouXwQR5kCrjH9u6VtpfTnS9+yBQufVf0AQ
+JbQJf85p+8W5KsRmwtRLDQrObOow84sxc6H8RmyinXsOqEZ7k07sagKezdfGqOmC
+AwT14IRCih4oeUsICRfb9e23BVJGWs2x1VvzaIrLsQ==
+=vv+C
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F13D3E721D56BD54
+sub    EFD4147F269A813F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGFKrJsBDAC1UjHBJhbtkcSQdZSM4sC88QLamu7CTgEpzNfhO4QT7T2P37FU
+dITcwHUOjrp0blADnBRvmTGyPgQnljTIfdeW9DX5sDyiOdMtJ/qFP1SmZ7/2XiSe
+9wIVIqsk9BqE2dcuMnr5HbVSgfC+LEpWDhsK87pV+j795+yrI6S7w27wdwPou6NF
+dpSoaRSo+bPJZmPfKrX18xo1tNdWCOs15itIXvkL0+F2wV7DWTjWnZ4CAPWjf1LK
+l2WAtfae2JJwWtsve9SCZ0968z3oDjv6oJjL+M77fNd7WrCWV1enZBEt2pRlePtF
+Td6VJNJkb2Cwz3e+Uyovjh7HjBjmwopl1MgpOCMVoH7lLztZYLmM5vg+FdKiMwkK
+GjzxQV/6/7dnsgb15aKQwbxDCGMrw9gT98HdE+DuQTL2gdOk6PyaOtvkVU/uHkfT
+mvAUlrhRi2srMvd602Cwy9G4bPqjQp6Y3J1oIJz+rhp793Qee9oLAAjPB56YvVkR
+2AcJQ7FWGpD/kI0AEQEAAbkBjQRhSqybAQwAmIHLTS4faYQ3Bshw9QCCKiVkCSWT
+XWkWstXKUAZyWl9st4FiyOMwygOJIpOQkBC9kDajf7rhEG2gXAHX6KwDXcIwDnDP
+T4AP0WDImQI/sp/b20lcP3pEREa1RJ47i0s/t7NbQkIvGgDhAXAvamO7mRxYK70Z
+SbNqH/r3h43rN15LkbjPv9I7ZTJ4zJGezP1jLyHSmGkQxOUbNQvQXYHoPpN2TzwR
+BNjkaDUV8y7cksrJz40g0L1TDycjDOqq3jJgNDhKXnx0mluLvMQph/SZxLo0+owS
+sbY45h//r0lnyjEzZAawXFtydU4ccUinTqQP9gF7mIXGttMv0iXZTV+cSjRT4KMM
+f1BIzVgvuKSf64WrWjAuqqgj887A/mTdZMKFJvNstVUM0LbhllvyhYZzOv8fx4lr
+f68q1WD0l7xakkG6IfsVfIVimTJfZwNMMBxTVUn5XI4ntAUnwtt3eU2PxjWGzzw1
+qh51lz7t2lVf2y6A/A06kXxtj2pkNQE/HYWvABEBAAGJAbwEGAEIACYWIQQ/KgCK
+kdEaf6xKB4bxPT5yHVa9VAUCYUqsmwIbDAUJA8JnAAAKCRDxPT5yHVa9VCxxDACG
+pmeRm/tr/oztDg+y+u/TEwDD4H+894GPk2zwUWZG3GZR9kHgTtHAj5Lb37sSbK8d
+FZ62nUdb5ULCOmXnm44jFQus0Ruv2xOyADjnVu0EckVBiJJ/Yi3WcjTb3mCEF6gC
+qV5Di8Tr31aJln3QR1m3dyFmbXJPJPfG4PD2XsLGus+PmZVC3Isp0iIROyNH0693
+m+dZ/5kZSDwz/SMWU+AmJex5vW2hBl/v3MrLM0CuHedgU2UpMH2a6tSWAy1knKqY
+NXRGrhpjEbbTbM6cSNtmkykM59XHeXIpXUhYbF0TacsZs6x9FBI99wSFBPotoqys
+6bhr5ehqeEy2VCMPQx61VC45xqdXjJvHNiqvKlub4u1HS0fX4J5YsNRmhAyh7D9L
+8i9sJbTgRekiXzuyvImkcOC3ZxJgjT2eLD6+LgKPmR/JrMeObzvrURFdnhq9zk5g
+6mWY8kvAJjEcdu8ghLfuW79z+YQIdOytuwp+Pkwi+ujiutxGpGBaIcWJ236tS4k=
+=BZrr
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F2A01147D830C125
+uid    Eddu Melendez <eddu.melendez@gmail.com>
+
+sub    82047FB369DD111A
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFf0S68BCACovMXnHqnBYRmC+rsIIPOoT1vSusHWu56beDBG7t/og/nziZq1
+mcZhX4oFG/IKnY3af20Flcv0X0gNodH9fOErvQ7hZDvHBgB9HVpeKiMx7OQqRWke
++vV/vcUFkt0ICyMzDvEVod7asjAakKZHKiVpEb0mM8Zvn3MPUzFDveK+tHWdbuWo
+WFmmNzmRpkK6hbMlXlyeTYs5jvYv9P5FHm3xYTcHJxrPYTF/uZTJu8Tqol8K1ImX
+kH11pnhgTzI6l0oIm0JmH+40LGNYrsczW0JdxwQzfQbsQM3LR9kCAMr0LMEya70l
+ozvY4LsX8Y7irBqlF1519pakI6Ss9Cz6sSLpABEBAAG0J0VkZHUgTWVsZW5kZXog
+PGVkZHUubWVsZW5kZXpAZ21haWwuY29tPrkBDQRX9EuvAQgAwcy6UW6/C4HoSruO
+hwnze51m7WyfPFu1HlC21PAv8KTpnAP/x2YVjUKGLylokmwfNJmmjo1SJpVGoGC9
+H+6Ywwc1N2VR+0p0r2lsbr+E95LDbznoL5wUe4koMB9toAiAxvYwgwBYvaJOV73N
+zsgEz2XLSuP0vuGtbjpjFoEpkPhcawWCm//b9OeSralkzqi7+QPIABTbwDmRtrNJ
+pTbn9ryM+nl0VbWoJmY00k3h3ZO+9dvqnHPv0Hnhp2ARBwY5yTXs+j1+ScP9Fx5f
+lVsWlcg+5pTcZ0vSV57uAM5YZvJNuCeXHklPN6YaIOprL2jd8ykhGPPuZ5V/jUAU
+R53G/QARAQABiQEfBBgBAgAJBQJX9EuvAhsMAAoJEPKgEUfYMMEl57kH/RAuYxie
+4LNEjNk+eoBUEBwsALZE/EYMRN2rBx+D2/dvOGTprD74yTO9nOfX+VtJyCFNxhVO
++03LYzmaQIuwcpEDL4U3s6jCBKjLJ1aeBKVCkEwvQaFAdJuiiRdRZ2eqnhzM5K1k
+eXDUB+7/0hlLaaqHF3YvCgyxG4XNibJv0bWJtPVfKFQ29MpT1PjSopydYlIEvYsn
+vGL6+Hx8oFr2Mv2mMnCcRt7FjwBeUnOC7l+2OoBYDpUclnoDUhKnmgvOeJbiSGpq
+zc0mylSOyg+E1ZLP0GVRV0KiErGf989rF9XFQvOVGvgKHQ6C88JAQrTHWrw228B8
+8FilLwwu9PNOBpQ=
+=/V4m
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F3D1600878E85A3D
+uid    Netty Project Bot <netty-project-bot@users.noreply.github.com>
+
+sub    1C9F436B883DCCF6
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+WASB7yEJYwsl
+=qHo0
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F42E87F9665015C9
+uid    Jonathan Hedley <jonathan@hedley.net>
+
+sub    6064B04A9DC688E0
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
+Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
+9lFqWQOAuCIWB1XPzoy5iTRDquD2q9NrgldpcwLX3EVtloIPKF7QLq72cwCgrb5X
+R25dB8PUdZKUt2TtJbjB+SMD/1UzAPirgX0/RpL9wUR1i14yIrTfpFP/yM9PE4ij
+qcZ1yafVdw64E1k5W4k+Pyl4D8DvSJvbJHvYjg8/G9V66WzaKcv+987fetUuePvY
+/rwxBPztqq8y6+hjBc8QVhZGWmAoGGEFO6MIGsSyN5ohqPMpNXkczIo+NMvDxGzz
+ld5ZA/9awGTsigBdpBK2F6GOmbvBv+Xebu9rbaJvBvP+npNx01s/f5sHPCxmBTFk
+m1vtaMdZ29RovrWPSZRj8WWes0bcisw80250r1CBlYzGzqEVZ7b0Hh2RfkfaxbYh
+wikyfTfA2iX8TUGBgirsZbyegjUadElhwFNDASnvLTEuQKeVLLQlSm9uYXRoYW4g
+SGVkbGV5IDxqb25hdGhhbkBoZWRsZXkubmV0PrkCDQRLbBdqEAgA0sZ0JZvWoKIG
+b+o6MOwI6p3uMb+iWBwdYfoh2RPnUZdBwGhJjp32CiTt2Y3qYEcqC5NvF5FWdx1m
+5KOQe1O+QFoqPKnC1bPj9uZOjLVql7x5tSwCePIaMNB+fMxEh5hYwLWtBz8nrdCP
+gwm+nAwecoE8YfrpmrXZk/YLak54FOeEwLYaP8E4u2FHiEqN+WmKMjIRwLzVpYAr
+WRCbTLhSSKyRBy7UxEovUH9mIa4YuU4Pb2R64LwopMHCBm5ow0U8kCw8vpW40GrB
+c/2eaIeXCX2XJ77E9s9ZPgW6MoJ6Ic1xV6voLJKIEV8t44deKNSwDfVNZHxyemaK
+a8/GgpjU5wADBQf/UzL5lXRmyTdJqRvHIfUV3g4A3X77d3vOroab8KKw4MFy2LiT
+ioN7btKKxE97Jjp21YZFd7Kpmfu2i/kr9QVJo+DSxe2p2xcQozyS+layPK8h/61L
+hyh8vjzV5AUWA5Zup+P7Jh/WRlh9Gxs0k0vimYMFKImw3mZr4EA8UCj2e85XIHNH
+Bd0B1VIukq4OjU4QhRrutNebIy3GZ35ylcaXT5v18Rq/iRJAuJFoCzXUaE90/V9/
+2ob8A1CYEKGLocvOQgBsj7+2gP5WOP+WxI4TWPENRKMVchVBE8zV+7YZiahPCwOQ
+r9TQWMaUIJxZ85yr7O8DhJOBX3B7EHIfpoADXYhgBBgRAgAJBQJLbBdqAhsMACEJ
+EPQuh/lmUBXJFiEE8xhLzVX00BbjDUyb9C6H+WZQFcl+zwCcDKIILbGBUNHRGY57
+mmZ5xKMWbCsAnRbmM18GlK1TKRcOcqqEPWSusurHiGAEGBECAAkFAktsF2oCGwwA
+IQkQ9C6H+WZQFckWIQTzGEvNVfTQFuMNTJv0Lof5ZlAVyX7PAJ9ztvyEP04cy6zP
+9lHt0qXdrucDfgCgh1OIUk0pFzNYBt3PXvOeyD5FQbk=
+=dtK1
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F6BC09712C8DF6EC
+uid    Uriel Chemouni (dev) <uchemouni@gmail.com>
+
+sub    CF9F423A7D348254
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE3go9oBCADHAkyReHbL6qVMzoEGSF+eqLswZmJNBZylIgMd83964tzT7i3X
+aUIouf7nHL6n14AHNxDKhs1FFq+/EFYN9Jfdw+uFauoeUGIvXXRxaem4yCjzkyNm
+VrfUlVV5AT9hSeN3+/PtlI9BT1zkK2ISQVad2lrFvyOxkHEnPzyAouCsXBd9aPcG
+9hmQ+6hZeJjXd/uQVxYP1DHg/G78zuXS/4u/3QJi1gSEe5IQilz8cmbGYyioi1WI
+cZFXayLBk3XQCEY4cejtGygk7j4kHSefV2Sfq+KynXRoUkOiE00GhbQrYYvQAm/G
+HZZV1eq23dUXXJo+nb/yI5o60uEELh5l0OpTABEBAAG0KlVyaWVsIENoZW1vdW5p
+IChkZXYpIDx1Y2hlbW91bmlAZ21haWwuY29tPrkBDQRN4KPaAQgAz/Ri0imebgTb
+W1diYM2yrT/JouzXmp9TNDNrAT72y3DE+39xiUY3OYFqEGbdg8J6XX553zwUCyf6
++m9fz0yyojtwTlP9RqkDvJFFh2cVW8Aw+w53ldeX9HDcIfRmRcCMkCbGA45cXUhI
+s1VQ5eMeS1avHHn6QNKTHD7Z1T/N448m1K2EIAzJ29zz2vCrJuTuUdeOrYft/60Q
+0s5Rf7eFbC6+t/jWkmgbWgo8/9xSqTRr75tujMrG+PVBWchDhUH2wOAb8VVEkwCo
+zuGB4UsOtmAbip5jOvOZhs1Z8EelpJ4fsrJTnFituEUFpwk+Y3XNkHq4CBczIwJx
+x6KNd8uRIQARAQABiQEfBBgBAgAJBQJN4KPaAhsMAAoJEPa8CXEsjfbsc1oH/3h4
+WabrJuYVX6IbshGOcuKGhbNxOpDrzrdWO1zQ0BKdqZvyuJJedxAyqi8klHT4thtG
+iI5Eqhf7eZ7nJDRrwvf9eB0yOpWHVuT2rxN2sYs6CNURa3nQU6uDPU0KvJ4vgu4J
+uq9x0qj9UruSUMTGKvCXjArjfffFSXTEtMvhmA/qw5qqQxeT1x4JgZ6hc2+gN9D8
+Odzoi8rg6LtfaQeLjvbMqR5O+fVPJU/M94c/t2J+nr2JrgFTUoUcMnEtvIXowHe+
+rAAJ3El6hkBBeZMyyjMw5UksU0+nvX0EeXyhoPeX74SyTn8DGooys1Ewy948VUfu
+ARPRkWTpvQ2tcYDP6AY=
+=SvbG
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    F6D4A1D411E9D1AE
+uid    Christopher Povirk <cpovirk@google.com>
+
+sub    B5CB27F94F97173B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
+9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
+DmFlISm9HkYpoVjcFUp1oivyeJ5LRTJTd5JGEd/SWFRbB4TimdKXBzej9fIm2zVl
+KInEMMd8HnSYE6nm3aNkbyiqhx81bFvl8x6X3ZMWcKs+TAVXdP9uLVvWowUwcApk
+xpee442Ld1QfzMqdDnA6bGrp8LN8PZF9AXQ9Z6LTQL3p9PIq/6LPueQjpJWM+2j8
+BfhbW/F2kyHRwVNkjaa68A544shgxJcrxWzJABEBAAG0J0NocmlzdG9waGVyIFBv
+dmlyayA8Y3Bvdmlya0Bnb29nbGUuY29tPrkBDQRPPS6rAQgAuYRnTE225fVwuw1T
+POrQdXPAOLDkiq49bLfcxwRJe+RozKrJC1iKxb751jTozEEJLe5Xj7WcojqgDsuT
+jzaLHDNvDCzRFvwfkJ4scMTAZd+2GYsC8N3Gg0JRgC2lU4wZxsanLnVMbdX2L0lZ
+7WnH6S+GJ5f0Et8PM/g+V2Gj2UraBhGGak8OBQ6NhmCJBcyYg8Bh90cgD9V1hMRM
+LSW7gB1vnpLM7C8Yymd3etdZSIltmDuVb3uG9s4Uwq51s2MEKsXsuFYCHTz0xT2u
++6e7Puaq5V0218QGR1Wupkl29iIUF57hFR7f6oYKkecvPKc4Yev6Ii0Mbvc1H19k
+LOXUrwARAQABiQEfBBgBAgAJBQJPPS6rAhsMAAoJEPbUodQR6dGunSQH/A+4/Zbr
+2jB46q1JEN/UV4U3MBQiNvCOSD9tOPMnBvVzJ53HutvGGkmafbtbwDZaN+YMs6fi
+itBMqjF/eQ/pJ54aFguTPGMFrlFyjz2n/pffkHLpVHgs8V5M4ALITttwCOo8Vv7u
+3VjO+ea5kiCm9MqJySrUP2Dv4lPVB32eoEUqWDxoyeACihW+Utdo8TBDVd+R8w36
+W3CUSvujW2z9jMNTF+VoVWDQWc3up7Nqb+ztW9wrjqs73nJCv9bLPahUPNzfh742
+v9vak3TkwMcDR1eZv+KvA8GXSZM6ACALzTmqRHXjGF3UZ4vowQDfiTzZKr87eBaE
+FoHco7Lnn+W+8qk=
+=9+x+
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    FE6C7D77A1CE15A6
+uid    GradleX Code Signing <team@gradlex.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBGL3vDQBEAC06DyZDdCJFMDH2/J7zrbhN5oJmYpM/mkwmOjkHbsIMJRcocz5
+7gYQC8OeMyfs+dkorsrY31UpgMW+efjEZbDKItfbcs+y1iEhQ0fkKKam/lzNyjK0
+wb1ew3QPMz6NFPcE9+ZmHpQDV3oHJSdNB2wrVPxrDgyxQE5Qufz4KBgbggY+Mn63
+yNPxeo7axeK0GgGzoDMw3Iu/pQCVz6eNMn8+0OKowNiE9U8PyYYNdghrmsFEe9sS
+ShS8y6GmEYGz4qErI4TpkG5ZkXuIG1ZEgQlP/BuBrY4AIwkUJADGXowr70JMeeZB
+1oFWa1aTx3iIHBtr2ksVOqOuQRmnFdGcUZnqEebQov+q9ZwAge5l1jHiZqZfxQ6m
+oQnj7vK7rIA0FW+IznZ3De3M+vUnL/D5EIChySvsxjWOqaRCF8gCUA+KrR7Rqifl
+lndVJc4gLFj/NhBvh0TwNYUu2wAEWVEuN40KFs4GcVymdPvy9nJwGqrPOZ3jqdqT
+fOskvrgZJtj75wbSppED9Z+pdHLUc85lC5OzjzgE1qKiBh+cxLUwUgRSDFE797Vt
+ucYWH2coJQRh92I40koTYgPBV4chkNMc3R8/Gy7LJNMIJcjS513tPuVawCMJRDYO
+vz5BSWCgfily85jLX8eK2ceYt1m7OUA8LOElxmzysCGbARgP+lpCMfvHeQARAQAB
+tCdHcmFkbGVYIENvZGUgU2lnbmluZyA8dGVhbUBncmFkbGV4Lm9yZz4=
+=5N7Z
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    FEFE78456EDDC34A
+uid    Mattia Tommasone <mattia.tommasone@gmail.com>
+
+sub    C3720DDC2E713B7C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y
+gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4
+g9Z+T6LbXKNAfZgPvTv4rr7UjD05N4XS4vckrS4taYLtBRJAmqT3pt43KxlyoTbh
+f4xcO2rWeXsPqgzTYIHH7M5mYPeqA2gc9NBAhkHjesFuYfWXqUfOVcOLvzULxrra
+pZDOyrINr83WikC8DkuDrAav4mIWjIhYmfBWzuNeYJsusVnFENeOxpEHV8RT+8uE
+v1gPjbjAKUPfZoa7egvz3EmDkshpNIIym0XxNGTj5ntJWR2SLT7mDrSYPeHrZKW6
+/aKuAcOxpGLpdVOMM+y4N5mTQfdlL81G9kbGQarMmwGaJb2a82PaF20wRwVgiVfO
+p/GWgwXr0XdJNLqx13LdM8BMM5vmLomOQOjnpQBOlJWRgrYUJQOReKAEAQqNMsxS
+IW9laXkrewJtblEAEQEAAbQtTWF0dGlhIFRvbW1hc29uZSA8bWF0dGlhLnRvbW1h
+c29uZUBnbWFpbC5jb20+uQGNBF+y5lsBDACv+jA4LF5tkxOOn1yhSwOMVpsmjBkf
+QX76+6HvdRj+/bP6+rC6Dz0AGOs9QhxwT3+3l1HISMG3QQPYoUzeaLr3ZCHJgTy5
+FpQpbPSRhow+7DRbtFNuWGFcSsGuivWbTSJs0MZJ/d8iv0Vnu7l6n9FMUMINpmCq
+1ZAZUP64ueoDkQd3BTKJ5YNKB5OFF10zeEpcHV6V3gkok/NDRfBcuC/wyZs5z1bm
+nFvVQsPjizXtIoOOUG1G+tJF2ATGB+kpTrccfQPqaf6Qk/TrqSdh126c3DsewqC/
+aY+51NUhBdgZvzEMuE/pRgmjB28kRszy+nW3938KAIxfJVUk6VNnB0loQITSfiAw
+naKENnypsOXzU5CFOJa+Cgo4UctPBmCbKEqm3fpG+ReSjLCqUo0ZplU2L0K3VfF+
+muPiyjMDkxx/wEBrFdX2xB9ksofs2EasXNz+vW/ZHftFhZ+Zgvv10mPXGytwQ3zb
+pxKjIuLr35c7G9t2jgp/KilHEQJN13o6qT8AEQEAAYkBvAQYAQgAJhYhBFmwYiT9
+iRLjZgO+ef7+eEVu3cNKBQJfsuZbAhsMBQkDwmcAAAoJEP7+eEVu3cNKJfwMAJOe
+VNi01GBqtS3gz85GUGBngKt04cvVL1JgG3ov6YCJ9fw4a4WSQIhQU6Q8w4EJ+Nr1
+64IIpv7N5G2mhLJSJVcUzlA8G8ZFXPiW6opYwQFh9HhrqMA92yrwdXYzxGKyhaXZ
+TMXZfGryjuHLs8YMQfSXX8giGZLtvJSMkfJsM5TWi4bjlMqpoJ3P8qgmTm9dni74
+tdAWWP0VpFiDl6nD7mz7IP4S1ntcsl8IGCD8bKmnYoL9IGIhXlBatKqPra+hyNrI
+iGZQciVA8vxmVFBGnuuR5oCCYDiwuH9/BMWjyj1sGlN+dk7HI7phL+kwwxVpyTYW
+Oyt20j/MShit+/cGsDEXkgHgnKi7sxKIgenBz/ECSGEjYiLioZcxnIdBYSfdfDG/
+LvFJeNoNu0g3HZeNNcvKRB2/mlJ/HeJssV41ctc0sL3F3ShOK9NlzY4nNn8yKtv7
+Shma5nGIB6R1N366OBlUvjTs0ggfYypbVA+6WqpzParu/r7S8VozcUwcNZt4Cw==
+=Ru9R
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    012579464D01C06A
+uid    Herve Boutemy <hboutemy@apache.org>
+
+sub    CB6D56B72FDDF8AA
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
+agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
+dID/i1onAX1dE914J4lf3XvIAxGiAjmr3UvWO9RiFxRUkecMAMlCBp2FuHuvxkcn
+Mk8q9dP9Ef360wu8X5rj0kgP6vPhgl9/RhuPsUxlazb2Kn9Zxi/RmDKDiH/vDuwy
+WdRGFOR1OPV7l3Ws01nrs4vKd2v5rsUmsjvQ8ldxdrA1xzX4IszHRDgSC9PI8ItZ
+1VlbaKjE0L03acPfFTg/wRFSF5zsrGNbTmq1ABEBAAG0I0hlcnZlIEJvdXRlbXkg
+PGhib3V0ZW15QGFwYWNoZS5vcmc+uQENBFgnlA8BCADBlqkE+XHE/0NTsqaDkBhG
+Z/qEZIBHZ87fJo6O2jl3eqZDU5Ld/iwpJm/D6d/2t4mBH70rwWW29iW2PcZ5jPIw
+bnFp6MNYsBD8RoVLrt45SKUbAsC5PrrS5DAC0ZKKF6mpw6FUVsblXhWDdGrPJ53Y
+FoiU99Ip5zeL32kd8dxOv50ue86eSIIMWWLF00R29uZGqH/ZYJR8l3sqVu6rijj+
+EnhEu9D1VVJ2GQZS6Z1/GtprEbSYqLlsQr/5B52LI1utr3O56r1gLErHwU+tU1ce
+8iPQnJFRQZ5KRtSPAvVqX3Efo/cmrqbYFDH63w0xYNwIqe3MzEqC+Cabu4wXF8vV
+ABEBAAGJAR8EGAEKAAkFAlgnlA8CGwwACgkQASV5Rk0BwGqRkwf6AqArLie+te4K
+XLhAF8VkwX3FyqOM/DmwXpNkVIdAGPWl40WEs8MG7VRUQtNRLK+0fW+UnGO1tUw0
+ASi9DkkWd48Mu/4QO5PD+8QKd5guPhXR2hzB/Jxs9iG1Ixlpd2KdNTUZ+I3PIHJx
+56nFH3+z17ETFLSd3Z27CGDqwQG1ipXdO0VREFMmn4FH3RfXMXuj/7JUmcQEya5S
+D73geW4HFQzDMNVEDaiS/S1j9iDO8XJYzgR2O46sKp0OKUREfdlc4S3bbHcBdB9U
+rhEaQ8QQLom3ITKAn0NxxEfitpk1KCdOMaIOzELNmmjMEm3ptSzLzQWf5nxe0DGH
+zFdp+62yJA==
+=hl8O
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    03281AA0289FF53A
+uid    Carlos Ballesteros Velasco (Deploy) <soywiz+deploy@gmail.com>
+
+sub    74237AD167FFEE52
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBGBJD1kBCAC2OgrVeUz5GtDnUh1fSKqEDN+3tjFKmCKj92buwiDLz8sWtzEE
+ncMlGSic0yAVxMTNIlfq0ec1AFWIFKsMkcpYX435UapQz8S19XhIIROsy5i/bZcg
+6bg4ddzAMs5CbpyLFmjzW49tOaZKQbUm0zb5c4NR4B6v7E5DWh/TCJAeqXd5yDQN
+q2CAeeolJCv5Vuw76IjcaNlGFBt9/lAr/sjOyT4Tfl/8HA+x1RujVYcv+yxeevGX
+zJOWRxO59i2EU3XgCOZXPE3F43cNNfwYpUlQso4nB4c7+vcK4D83PlmAH6t/N6G+
+6EbsOS5OsAFmV3yve2ydS9BvF0TQsOcJFKRhABEBAAG0PUNhcmxvcyBCYWxsZXN0
+ZXJvcyBWZWxhc2NvIChEZXBsb3kpIDxzb3l3aXorZGVwbG95QGdtYWlsLmNvbT65
+AQ0EYEkPWQEIAOJ14ajv2BVqQW8oVD4EI5k7iKq1nYKquP4+63pgbx1MTMfkRAEp
+c6qtxSk5LasO19QkoV60Wf+mB2CV/USfmQQfZcqREFLF2F3bY5cy964lWcZU0yPe
+vGFg3uLKIqGa26/zQIpXx3oF6QPV6sdO2vfqIMNQr08flW9BRep5WMtgvEBoAmaU
+yNBgYlGhdGauqahiI8ZKoFuPW5E63HNajErH8na5BVaGziJUoq2XjY922tooGJ0Q
+i4dDUtOmrqEpqBrS8oKYR1wszQ+USEpB90IuLd5kwut5AvIljjKe0v38o0f6T8nE
+TfkxngdnYGjNoQt8Tbx5zF4deq+2ojju7jUAEQEAAYkBNgQYAQoAIBYhBBvi3Usf
+zyUv5PCh0QMoGqAon/U6BQJgSQ9ZAhsMAAoJEAMoGqAon/U6h/IH+wR0ZB7IETDG
+sRzdACw8VziCOkWFa1ZljL8yJkDjqfvaaEzER60F6kvD0vjVfR7Iu2CCJ8HeM1x6
+/k6l2YLzmVuws7F+kcck2wbQKZQBukptJ8DIPIPP3RGEyhhoaM8oqqoE9o5BNAGK
+DMAGgIOFBUCGO4Y598HaQyEStjCZ7FWNVoSzmDzZsqjzTB7lbkcZ0j2vUYhaFz3o
+rdOCEaM3DEAAcBM1CO4gE32YnVjYVwr1jOYnfPIpN7i5ZinpcN79n3g8ABp5g+6k
+buWxmtQIuXkdel5Pr+hpq7n11s1bjDcuprsJv7t3vuQGojw7u7HgchT3X2B+OXma
+0CO5hAJNhr4=
+=l6RL
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    0374CF2E8DD1BDFD
+uid    Sonatype, Inc. (Sonatype release key) <dev@sonatype.com>
+
+sub    F2E4DE8FA750E060
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEmoKU8RBADEN0Q6AuEWEeddjARAzNXcjEx1WfTbLxW5abiiy7zLEht63mhF
+kBlbyxEIRnHCSrPLUqY5ROWdyey8MJw+bsQn005RZmSvq2rniXz3MpcyAcYPVPWx
+zgoqKUiu+pn3R7eldoDpMcQRsdNbK4TOFWNUomII70Lkj4u/DP9eko6xowCgvK/R
+oRhshwRoxJl1LauUFuTeVHUD/i5DryK5j/P9tv9BWSb/2Jji6gbg6Q3MThZ+jCTi
+leOHR6PSqajYphOFaA8xVWQAkvbqfSps9HnmdFJ37zxOn2ps9d1L8NLoX1GMu7dv
+UZkCY5hR4gwaAk5YpyKa93NpaS5nX6beKiCes7lDy7DezjQLZVbKI3Vsd5t70eTW
+tD7JA/4lGUSkole28jxo4ZKKkGMFnAXkV5mWeOTz14BibW7JqhkiIpckDfyq4NjK
+ts1EzMmnXmPkB/u5QHHe6fJP+Laoe//gP3Y5+xlnAsyI4iEfEjydJWiSNx48c/2l
+qCQ/wdOb28xoFavdCCBavqSKXKJREHXul1UGMICpu3rq9EOk47Q4U29uYXR5cGUs
+IEluYy4gKFNvbmF0eXBlIHJlbGVhc2Uga2V5KSA8ZGV2QHNvbmF0eXBlLmNvbT65
+Ag0ESagpTxAIANEHh8lujiAJyotn/aMY57BpYtWH3ia5xAA9CsYcMwHzvXgeK5OY
+Ao9gydiENr0IZxa43AnZ4WoJ96AHLX3OtXJhr8jdvfEHrrHpH7sHgEgrlv3VYw2H
+ZSU9cmfv+yviC7BSrQqa6LfOwSaWizg5ZOrCG7J2FAKhCnRdwa8ZOs2P0/Pu6asB
+4G03mnVaR62ZShntFx4iSWlO78caKUQbB5OgK8oYA1k9YA4EReSwZMlKWpfGOqgw
+HGw+xuRkXUObzlhaTWvfXgPr5RsxZzIviKH4EXSfdiIp2QzqZjM/drmfIx9r6Ai2
++c5WKOIyt0WaX0HWOGsh1t9bBPs2FrrO1H8AAwUH/RxVVWYuO20H8oR1bp5zkjof
+wgWk7t6NSXZu7mZMZwqaRgx7gXB89Dq4jALw4xXsAWebgYadReWef1ZSUlx8Lz1M
+KOikCAld18lvqf/lfvrHi+ZHInNzqYcAdamT2BKoXHhIIR5jf6/8Flf/FsZGe0sN
+QJw8Kl0yYiGYWhI0VV1CIzeVqSDSLLM/g4xZ07u+kt7/VUjo05lFO6jyCNxIO3SR
+IBNML9xNXfZSDz21GtKW2ve9+bjC6qEDa0/O5FykoyoUFA9LuW7t05i3T26B81AV
+mB/9NMxKHcJI1itU8We7L+IAvKC106chw4SxhXYxa/G6fxTNlkPSKdcPGsdFALaI
+SQQYEQIACQUCSagpTwIbDAAKCRADdM8ujdG9/auQAKCCtFUmslioIPSjZkWVLJpo
+77IquQCfcgYbAHsCuMFkHkZ1oZQA/f/ku6Q=
+=YmFm
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    049FE94F2D5DAD9D
+uid    Eclipse Jakarta EE Platform <jakarta-platform-dev@eclipse.org>
+
+sub    953E02E4F573B46F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+pKNG3IY=
+=QfmY
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    0729A0AFF8999A87
+uid    Kotlin Release <kt-a@jetbrains.com>
+
+sub    3FF44D37464BBB7E
+sub    6A0975F8B1127B83
+sub    6005789E24E5AD1E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+KzsH9fpdPeIAPxCxefNNz4CkoQ==
+=5KY5
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    07D3516820BCF6B1
+uid    Ben Manes <ben.manes@gmail.com>
+
+sub    11F4CE313A637CC1
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
+sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
+sHPwo1aRXdI0MvCy+7iaIiiGF4/O16AhU4LmALHnaRQZCyuN6VOQ8rlqNvcczwUf
+J2DQeLHqR/tsch7S01hGpPAptBeu19PyAlQsntYN0yLCLKoe9dFXWCDkvd1So5LF
+6So+ryPqupumBbh4WxCmTp9qwDJYJItjAE0zyPe890FurOtxrFTwtRtX6d6qGKkY
+/B4T3r0tTE1EiOUpmSnxmGNItMh7/l5UtnHjABEBAAG0H0JlbiBNYW5lcyA8YmVu
+Lm1hbmVzQGdtYWlsLmNvbT65AQ0EXceB0wEIAK7dVAoqZqBw9twxk6psNcTmIrfQ
+bvjasKl/+PfLCfBNklD/nwe0CLz799fFSFMezCg43ZPCKIescCQ5t74r0D6O/QTG
+MpUyZD+w4JhZkMQYy2HjImfMNtPVOWb+XaLku/RloPt9MSG2mtA25TTp295N4mzM
+PKq0r1PzSa8jj4Yfn3AzzSXXLq6PwoDiljQ91IWBvJL2IAUAMaxSxzq3UqJnlbX2
+h0yMM+VC0nbSmbkK8mUNltg1EnngJKV1mKRG+Y1GDmZZ1Es19tEwUMsV9x1gt05Y
+lecC31woUkL0//8i1kWuWG7dqRMf/8cXaTFA1brVJ33b/G0VQP/a03UaVd8AEQEA
+AYkBNgQYAQgAIBYhBGNe5ic0Xzwd1CKy4gfTUWggvPaxBQJdx4HTAhsMAAoJEAfT
+UWggvPaxrJIIAKJsimeWznAmR9fUH/u0ONaTaEQZlhwBKvTGn8MPBKAnl50HK5A1
+AXtEe4KTSR7ohAZ/K0wsmVd4Qi7v0O+A9qTEE/mIb5zT3kVuFG772cISRGpC+inh
+8Dtl2G56s7K45tbPz6jdnZHLBY9eUr4X/2ImI7+q2+Z05G6KQm031XGC8BS8A1lG
+2XOMvb3qnRMnMapeHJ6vjoIeX9iPtO1foSmdkOCJpBs5ZEU5nnHzXEjv1tAPsTAP
+N+vBAduNAOSqGTA6hXparbf1loeHqnsZcedCQMxDQf/tja3Do8flUzx8MmQkoXY8
+i6QmtRdrToqqt1n1jGq9Ka7lRjq0xJHAZak=
+=5JCQ
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    083891AD4774845A
+uid    Eclipse Project for JAXB <jaxb-dev@eclipse.org>
+
+sub    8118B3BCDB1A5000
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+mfMjMgP4QIPQl4W7IExkjfLxmiDnDUJ7XCfM
+=4S73
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    098A31F381819057
+uid    Marc Guillemot <mguillemot@yahoo.fr>
+
+sub    37DE9E37C5B67C30
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
+95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
+Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
+VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
+5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
+1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG0JE1hcmMgR3VpbGxlbW90
+IDxtZ3VpbGxlbW90QHlhaG9vLmZyPrkBDQROOU3bAQgApHFSdgwxy8CX4DNifdRQ
+oprGG96dpzKG7E1nNo9sLbbY9Nl3bAB7uPNc1gDVpxvgS4mm5k3F3H2KMes2XYvM
+q34n7PQ3r/le+gOM437YpWA4QAdQYZxVZoj5mVcII2jvD9BO8NULr1VyvBJuULTO
+N4sOKIOvqnGLLW0Pd5igukgKBxqFpjYGfJqadE3yrFiOJ1z+DkIfudiBlNqjOf0B
+zK+vL+08Nqae/bEAnPUwWdGx2QI+QHNVjIOlHRe0M7WO7naen3EdzTkfH5NUOCh/
+o8aLyfxwHSr9aJ5FCTsXdQkn/NtNE9igOyL+E539tSoQJKG4j3OFsgQiH/RX1Kas
+YwARAQABiQEfBBgBAgAJBQJOOU3bAhsMAAoJEAmKMfOBgZBXYewH/2mytdowDcKk
+nPDjiL5MwAvqs6sEk30MqCvZohhFnnC1arLU0pO1QaSZqQPtliHARCwIYdluIfvH
+IMrFX8wDvSCntzw/johbJ5Bgrgg9QW674S2PjqrC2foUnksSt1WtGWCQr2xx3NY0
+uy/hTefV+LFtCgpIHpiJ4jHad32+cIJWuKGetWhdnbTfnG4ArGZ+AVicgb0Ojh6X
+WW3pmvsSl3judWv7p/2hywYFhpMierlFSJvycQXp1svYS8UOiLT6qehkQVGQUmJC
+vpsFmyy5Jbro56q4JEosWCAi9uXVeW3SSBW4jbu3plJNMrnBvBgPM8TI8G3+5hEG
+f2vHkgXOGMk=
+=2bDb
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    0D3B328562A119A7
+uid    Aleksey Shipilev <aleksey@shipilev.net>
+
+sub    C45D01093DCFC371
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=UEKr
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    0DA8A5EC02D11EAD
+uid    Paul Holser <pholser@alumni.rice.edu>
+
+sub    71499A87DC1FF84B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
+2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
+gjkS5eq8L04f5CSuXO7r1eLTOch9iDl/ESaI5Nhq9A3mRQIhQalum+FjzwCgx0PK
+hoC4MVPVGXzOQPc5sG4jzAUD/0OX9c/yKQqjHUs38HTCgrjseM40iPhp8NfbWenP
+IwUMSWXE3lz0MMeKrGcEOcZOGWsjyepkLHXwj8DDOeGxhfh9bhFRJssdfzOCKBpf
+6S70A3fanzqOAvddxCqF/zOwDaieDmWvVntVpmZO9d+pgR/sZN0JgSIm7qGDdNqG
+Aq6eBACyywfwuVoY6lfNz70ZZqYjYuUkbKnKqpG0XmI+m5LYrUW7QuKJqaNdg+ZL
+vVgX/TdkWVSIoSRS5+eYm3fRD++cg3ZgoR6ZY4WEa7SRSp2zoidtQijWOzp8WeHs
+30rIaXBrb5wHR4GQ4FYsBGRuWkmIaferusllUmHCHFJI4ldvgbQlUGF1bCBIb2xz
+ZXIgPHBob2xzZXJAYWx1bW5pLnJpY2UuZWR1PrkCDQRNyzHzEAgA1rD70DvCcy91
+ShQKP2snZ4cLJnFwKArulDUcxoBZ0AG0qMbaE8jiiJTHIwgVrqsKaS1JENv6tVdU
+S8xHswu30zvd0obaj+4IGXlMVdc6052Y4SLAGNbGVw99Ah1OkQ7ov92gmYAYfqpp
+OtRt1tylz7Jf+F6er0umdVBZm8fJ+QjzTw36AwERj2bjVbc6ogM7OsTyru5oZGOJ
++oJU+M9/mh/Gq3AyrcfU8c6bL2pacXwylME4lxy4fBB7BsMogPXXiplZ2XRH7Rml
+ZiAfLHv3StxVB1RrLXVcjdnqIO2guVYrK6mxH9WMG4LnOGvcnYTfGtWexEmNA5l8
+IOSgsK+InwADBQgA037clDFi3XWaZBVXst7IfkU6bKq9vhmphS4fuBx4wp7MBA62
+k0kGDmZWcbinZWnybypili9ihYSHlp3EYzCNTbUMWlbhc/ffYHuvrZsIT2DxMPb2
+iCnjPu5HMGegTM8iTTotW4xYmJUsEDIvgQUz0/UNsPHTX5XU09SocL3YOP5MxcEb
+gO0Fpjny3X76rc+ETAd9TmDJi7HOm24grKdOQXHQJr65j7nTc9M3zWnTxOP3fL9j
+cVnGTnLGRVoR7kedDpa5FsoFqtY8YMaFvNPVvI4+m+jozjNwTg2dGG6nU2dEC0qg
+DEeKMSJwF1wgO3Fe6mXHvxratgNrqfdY/rtEGYhJBBgRAgAJBQJNyzHzAhsMAAoJ
+EA2opewC0R6tNKgAnigkHDCNu7Owm8x01E9+aL73JmDXAKCj7ROh7Wu1iZQbjeJf
+ypM6CQ+fdw==
+=5ywb
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    0E91C2DE43B72BB1
+sub    83552A552A0D431C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
+sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
+6sMc67BlnEaCZRNuB9ATeUE/4wCO7fWg79jJuNl8tKQ8EYIrVGizzjmZHt76OwAi
+hQtD6A19+qjQ02SyPUJS6a2lKx+gwaHNxv4L2FqImCFGOOEToyRb12GD18Mgbf5o
+OtQVVtr3qbT07odFQt8Iyy1DiNUJbOfC+YO2wO7eMTr5xaFr1HejsTvKZiTDC0Nr
+EjtctqGxrjxPmoUPNwtxwEDTEh1lyKMhnqgJABEBAAG5AQ0EUEib/AEIAMDUgjnP
+KBeHIN0KNmXTS/uXXC4LTGltnQJ57OG2kmPz/JjAjYLoLvINY+xtghehMhRY3DmQ
+Dy/ufZsgO9oH8PztcC8QL5/dV6VTYf4U3FndbiSKgikaBX7yu5Qcrtkv8XgkJ+aw
+IEUgTGDXn2VT1hH6yEG1tA97iT/d7ZUxLEBsVgbxz9VtPellTNK5x/8NGY4NW+fM
+6+yGFpjr5juZVYRLa8u565vGBQO5FU7bg/69DftmL7vO4KRLs154VpsfAsTeo1rm
+U/8kIjgCVeKFClJG+Sg+m9rsJNYgiKy9dGfD/qDmVlEeWBuhtlAfqM7pHTv1Mu8m
+v5/DheBwvlwheg8AEQEAAYkBNgQYAQIACQUCUEib/AIbDAAhCRAOkcLeQ7crsRYh
+BC6SETJj/DHHTMuqsg6Rwt5DtyuxoTQH/j/5lyN1R8s+UqT/wEfS0xp8RY4a+pjx
+sbhinEaglkdP8tv9ydYMu9nOz3wVVpDcModnBCGG2dAiGe6m/FIdfnAt4Fky0AA0
+ZAtq4an4DdLVYFVEezSbM52VUNvMm7tFbvaaeRExKhV3TXx+Hh5DT5WlmHQ9/0p8
+okPCkS4RI/X7olwssG9BeUQlgc6TtSnl5GSGWN0jDPdOVK4n2wKxxOAzQ8jv8vV4
+U/+IKBkgEeGmWVVXq/kgZfHc/lDthBTLfbMKuG3i319210ty3WPp41oBB08BT3Vq
+5JtiG5UKmOAo2nA6/VQuhJYtRQ8w1blBzhkMqr7LA4SW840ydfihpDU=
+=aiSX
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1063FE98BCECB758
+sub    25A93B1970C22A7F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFOpAXABCACsTEEMlNJ65WN4hGR+y3Dy80YQoI6oFivmf2kjOz5JqsBkoDaA
+vKl+OqLNIeYu4YXBFBe6t9YZvcBKAU660bTVuiiC50PNL2z9ZU6GrLNP34uKvyhP
+tQnZdiS+qPBn8X5Cl7XtPqlwUNRFrtqHiBgymwGGTLfhVZKJXXB0xU/UsShSHYyS
+YESrH89xe7LfdW5QAKv+4MxMDDZi/kBWSGGfdgWBvYYlsVmRv4JbKahBMmpM7qH5
+RbTw6km6AO7kOxcM2BfdwmVncUhj532zXgwS6q8ipv9jzuHCeALEzKNHr68dTq5D
+WAnJT764ovyOJ9yQ80wGmzYRyfp7Wctq80KnABEBAAG5AQ0EU6kBcAEIALL602GU
+LU0ekAqKEYqfbX9i125LJ91t/sTh3MFB/SBqfT3/q0jDiuE4A89eRtdF/ox9SYV6
+3YAg71wFx76nWKm/iAK8I9ZPiKSWF1+zBGFwXtKg8emk6obT9KZYemzSrvXpzXiz
+I03CfE4fMqk6iJGTiJKDirQ231fB80zgG/VhHdILu4qnP+zWPDfKhbBMD0zFDbLa
+i46a+5Jz3Ik8mPxnU3m9IYgcR8O+rXasJQFQIewXRJ1ChGAnLEiyZGmaTQ1jU2P2
+eQjlbqSiCFSEQIQV1mJeMxpQavMfYQsQVRNa05mjSii5ttWRKC0xU0gTFYJjMInc
+l6iFinSK3OL5cA0AEQEAAYkBNQQYAQIACQUCU6kBcAIbDAAhCRAQY/6YvOy3WBYh
+BAbTTtb/c942incqeBBj/pi87LdYNlUH+N4zEaJ2xnlFLWFtq3RpnZcjri4En3UY
+RnJPJjAKucIzFhVUa1y1JX5GUEbb0BMxwwcMoqSA3BOjtvnaX2K+wNAVuVODLJbj
+CTJbFwscDnv8A+bzgVXAyH7UkJzwLU/k28tTHEsyne6KzfzAJ6b8Ctf2Cah/9Sy/
+tTDP6LNbK2+gc2UYzBgulQzmPYdD3GrAIRNbHqSsxdKQnkPTA3tmwijMPHhjDZrB
+vcsb7Ln7VBkyVNAvxT3dbadGwIq3ddfm35jfagb2QxoGrghgaGFCbmtco63PXNlQ
+YauuFdKHKzn72X+iAJQgiVtlHt5xxm8DnCt8RGdK9ohuBCmE4xkiXw==
+=Kajw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1241BC872C5E4EC0
+uid    Henri Yandell (For signing ASF releases) <bayard@apache.org>
+
+sub    402123D2F5F4AF07
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
+2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
+aYgApzHAo2LtaiBIyK1T/+OaCexc05lZ/wcHFfyp1yHSzIVazxhIAqx9uwCgptMa
+23r2OeX5TN9xdjwSTUIeImUD/0Mb+AcP04pMbsw9xtjvl4g1V7YbMipLE/PdSI+H
++YLRzmyxkdfdrBNDQRxyGGxoUI2Pi45EDV3wnLBsGVRAG/UkcQ3zE3r+0sLMrRkt
+7oyzK4wqsMuslPbuAyghUes6Dnop/MY4FJYuAKK412RDBvk5s+Tp+pdkWQGHXuvM
+/KJsBACNupFtZA5CgMMWI3bO88upPZqWsO200sA9WqobbU+A2oCUotb2DgWxOgb5
+oi7eJkyFDpS/d+S0H30pq/7mUkTvCOw4Fk/ZR5T6DGqm1/vHv9/y2Z7bOg/DxwuE
+Mu1G9AT74JCjgsYFCdLcFymrghsIpjHBpnsEVjXoI4jwqOgScLQ8SGVucmkgWWFu
+ZGVsbCAoRm9yIHNpZ25pbmcgQVNGIHJlbGVhc2VzKSA8YmF5YXJkQGFwYWNoZS5v
+cmc+uQINBEQL2iAQCADDSauZLiLmjR1DcqPI01RRtq2RTEXFmOnfPJitVCPtzcam
+6fuzXNHBnphCjqmhTKLDeCmKIurvM8KoL5573VoK5hFdCTnL5vjTSJnJtfJ0RtJ4
+t5nmk0gW9p9g6Mu6+sO0WJZ1Xm3Xn2LtHTz4zK7kPwreQOe3/JwpM6zb2a3RgKQB
+1bYQl+K+ttIKJw81TJwasyJGHQUMjwm/jdMxSZQFuX7oN0Muap8On82XT0FHO+bj
+QqAG6xJEVbsbiXmNHy6+6WhFio4bPZfaJ9eHF+voJYimY3sI0DCE/k4qeJMA5NdO
+0zG+VUz/AgusjE9DqWlvy+E1Uhgs/VyalW0Krf5LAAMFB/43IL8HiV5zcFZcfh6V
+Wq6wJTwqaPtcMIUJIvuSE2o7kEXxLRtkFXQ0jtb2Bqg0n1l+2eUduQaxRU1JWXka
+W3CLdwPz+cmQevwLcsrqPEDb8H/FDfY1YgHKSh9PvaPDug1/K7WP6SQXadSe+kbe
+SRy6gS9DLhFu77WONpH/cw8tx+wtT0R8JwfKIQSBb74Aatx5XUBocHRlOa9HDw/l
+DlHjtlU9HujqWO5ytgwwLMW7/e1R7OfZxWvE1fKOWEL6Rnq2+Vs6xnyC2a5arNWh
+hZmJ1JgDnJtIWdS2frBIH+BWDnu4ZU+1gOncbyUXahxJZKxVgfMo71SjsLZHVXnm
+IDrwiEkEGBECAAkFAkQL2iACGwwACgkQEkG8hyxeTsAJtgCgpbLK9Zd0CYHxjPwO
+pXIm3TUM14sAn3V0cheXNRVmD2OhB5yqYpYd0Hn1
+=ezg4
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    164779204E106A76
+uid    Shigeru Chiba (Javassist Developer) <chiba@javassist.org>
+
+sub    0E26A79FFE07A3A7
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+YM0/Z4ojbX/WFQ==
+=AKY2
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1669C4BB543E0445
+uid    Emily Johnston <epmjohnston@google.com>
+
+sub    5F6BA89D4B0869B9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
+P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
+ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
+fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
+C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
+itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
+wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
+wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
+J4hfzYUTFMsJBp0AEQEAAbQnRW1pbHkgSm9obnN0b24gPGVwbWpvaG5zdG9uQGdv
+b2dsZS5jb20+uQGNBF3TQCcBDADJ17PQ4z5UVGBVUefEkTXeVlGX4oc+vUOVn8Z9
+B34sQkFmgsORuwm+/1rGthrMatro1Jka4UXSxYFMCt6XBz4/OdJbquxs6D85iuda
+Id9aozCOJypkfprp+ez2PK7pWeOq6DQ/lqqNGyoHxA703wshI38sNcKRcypn/vf1
+VJlO3ZjfLCVDQw4+yNrdWiwklb4QS0xwjK9Bw9m8g6HiQGil8V/kL9Avpa76rGqa
+P9YnkTo7NQG0cwEbpcxNUrkO7fFKjTOMTmfPkh5pHAHVS+FsrCsxhRs6Eb6u/qes
+tHjpYj6qtMJ5V7oXeUI3OZ9nAPctSxoNVn6f0otsaatoBwcJNNhO/6ZIFH7NlgYQ
+NN3a5Pz6NrU13+zMGbsxYzlL4/nVwhdn/kHPQ2tl4e2R79da7ModAjeafimikA3n
+GZj1Zvo1iXKLfguM+U90kTrPKSxcJqwgV4QvrO9Z9llRTzhdBmrFePFhlxN3JdpS
+KYXFInq6JwncmOAeIDhNYYcVXhcAEQEAAYkBvAQYAQoAJhYhBHYVrVYUTfI3b0nZ
+ixZpxLtUPgRFBQJd00AnAhsMBQkDwmcAAAoJEBZpxLtUPgRF32gMAJoI+6dvnT7G
+OJB4S0HAB2qhizmQ5MWiO7QE1HKQ6ShylihJfAIMnAMlLPhorr1ITZXaNMFO+rWN
+O76BdsBxAkd0rKIIjMTU5r1HuS+XCGFzitffkJ2TgQ2K4vKnSgEpCsBilgCJzdJe
+vrYoCAudkZAaeBcT0fsTtQDnWHUJSkyWro0ovaaPF5tJzMkFZQBlaNyb+DmWPyNt
+5TP6iORnmeLNE0OajrUawFUcLUITdutn2t/PRE9LBDSlewE9Gabv79z8ZGAw7jPK
+x/p+ePpIj6J05TM0BR9KLrk3avMIK+eKwcvm+nCyYA1jKr7c9E4bg+6sRbc6igvV
+L4QeKzjeGll3vjifmghVXVKVBOW1fk10cMNKaTEkGng8OfLhJDQDXuNz4m8/pMA/
+wyGfH3HBGSx+F3GZUb00kU0HbxV2Vt0QlyjwT9vJfVGQ4Y+GhnMF6qErtdX8cBIW
+FJXLEW77wWHN+QpRD6BShYZDvUA2mtO0zlB8reU+VCxgnFfm66DkUg==
+=jYDe
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    16FBB6B6E3120829
+uid    Igor Alshannikov <igor.alshan@gmail.com>
+
+sub    FC51362145A05FF2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGBkqm4BDAC9Q7VXP9QBAqF03u97WpLY6qRbXX7jWRBZmeQ5l0gh2612XiWT
+U1iaVfzhs4kCile40SAr4HJgeX/xnGj7HFgeozIgM5G+x39BROlEAuRZHyVvXZJT
++MKO9qEkyUg+3JhjZO/JQNO+9AFXLmCtgd3+kcXJh6Xlb6TDbh21Cb/+Xh0TRwoU
+/mhsmkGMquLnTTZlu77E7kCLmWM1K4jYxB5yqLwiUOzYPLmg2bt/4OAxnAGv8Q/h
+hpzl7YlPduVcR6fW5eehlQvZeesaZcppCLGN4tA0eKvCibwR/WyiM4QddSJm3J/o
+hf0dix8b9T4PFYqSS/Ok9024l4IeDMZ6GlcUgsbWjoDmUhpSmynq2xpFkbMnG7kK
+0eM2E7MRui2LpyoQ2Wqzghlk8FVEyfFZJAIznSAH0MnStozf8und40J8emIC7+1v
+L4a+ArnrFIwGomrS7MQmQNQ0OlAhV80bmZXS3nrp9rWgzcfya0iLWbPMyXuJdTDW
+mrx3Gbp8kfwDITcAEQEAAbQoSWdvciBBbHNoYW5uaWtvdiA8aWdvci5hbHNoYW5A
+Z21haWwuY29tPrkBjQRgZKpuAQwAyi9cy8L0SmWVQCt2uXNpceksUUnA57IYBWhn
+7zUZuqBB7Ju4V590+3ZM+Wk7rCN7VwZaxLLKuJszNvqEzxmB4YP8nCyFvoyKiH4+
+bDll0SObMVGe6ZekKDPGQ0sEtEjOfvz2glfEyo3yD8UR/suLZvDTCruztc7D1yJm
+pdOSO7RYjH/vb7CZ1F3Mzeq3H7VL0Kf+fjwrca00MgP3WQtRV6T2M2YfAKMYTGzW
+ZemdmX/MKFg/67SOljKzYkPxuMLHq8aBwqjmDbLTH44oiXRZeEdazMI2HZU3pVT1
+Pr858wCt3rRncjc5yO16+0BqgXRFQR7subqMJZtLM+xc3zRVZZp+V7CEwv7w2EWO
+VIeRmYGeMSmriSkyaRhELAwdsEnDbrDTrRQgMYx2802aZnXA0PRs31ehUTLxYcnU
+Mrze1UgguCAAvwWzCuIjmZQnAbqSMCw7dmhJwHrw6T7E4aZef4xt5nSH5xdJYI4I
+liKbF7mR3sMhkKhgncv/jiAU0sfxABEBAAGJAbwEGAEIACYWIQSKk1IYmuzPtK4f
+O8YW+7a24xIIKQUCYGSqbgIbDAUJA8JnAAAKCRAW+7a24xIIKY/yDACrAk8mcXhq
+c4pmszvLzxgth1C8awvLO6vUIoMvoaXvzF43NB3OGEnizw0WeM0kKawsLWB3XjaG
+siWtwJbwldCsYBPNGw0VjV4xl8ftV5PIIqRo5clPB0YOVMqwpzXMaOHt5MBSlz9T
+CArdb7Pqne2P0SbLYpXJqmzJa7a3D3QU4njA9CPJP8psJ0+ytmiZlFaSwVOa4WGK
+x0xh0RE7nwxnt0GwQWSuaghpTaXJv0zo/aauV65Rn79lAmCyKsLDYtUL9eWO3euR
+nrBiI9KtxXWrAY7Sqd1ZASCAeCBjTKnnd0EUc8z+vEAHWX+Ve2JH7DMGBRVaCBFR
+ET2i/MGfGClFGZ3xI+mLf97PQS2WwKWnyazusDKxOw9RlxcdS7uc1IS6cPHkE3hs
+JduNKATZJhG31yjglAjvgavXDF9k+gHxxyPTNauAtEgbLMj0ytEoU9EFTuH4+/X5
+q5Ru/lMoBMcJjV1n4nZ13dj2e+rYMN06ued0zR5NwVopLZ4MVUSqb/8=
+=QMxW
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1861C322C56014B2
+uid    Niall Pemberton (Code signing) <niallp@apache.org>
+
+sub    9A347756830C4541
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
+inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
+iQaq2wLM5rTQfdjLsGQb1iDNDyCXU56+/l4mFZ2JiEGCq3Re9EFHelRBKQCg/7k0
+BIfyoFVTHw39PKaDBmCYF2sD/3CMD0J/WldhBM7gLOndH9/YEQaEMy+PJNXcfTWN
+WLygGPSOQdNBulyLkvcFIZjUTxFVakh7FbjMq3dsAP1oqthwmK7L8A1zsvRgp/TI
+4YMHkZSkgcs0PBBby+h/lpgRrWmtwjTPzql/K5xX4VSRS+umHye/7R+4ZEH7mABa
+m/ZABADkPGG2ECvfjNosPQDHZVFuF9oVaske0OjzxI+rU6sR1fJKtbOPl9d+bgz+
+df7rZ3mwppkPX2r/muUbd0CM1Se10sK7ZAoPYmWqHX+vB/oj3Jq+iqb6M5mDZzEz
+6h4hdnaGERyxbktZvhRV7Psco9CGi8o7RFUQTR79Y5ElnBavqLQyTmlhbGwgUGVt
+YmVydG9uIChDb2RlIHNpZ25pbmcpIDxuaWFsbHBAYXBhY2hlLm9yZz65Ag0EQZUr
+QRAIAPZCV7cIfwgXcqK61qlC8wXo+VMROU+28W65Szgg2gGnVqMU6Y9AVfPQB8bL
+Q6mUrfdMZIZJ+AyDvWXpF9Sh01D49Vlf3HZSTz09jdvOmeFXklnN/biudE/F/Ha8
+g8VHMGHOfMlm/xX5u/2RXscBqtNbno2gpXI61Brwv0YAWCvl9Ij9WE5J280gtJ3k
+kQc2azNsOA1FHQ98iLMcfFstjvbzySPAQ/ClWxiNjrtVjLhdONM0/XwXV0OjHRhs
+3jMhLLUq/zzhsSlAGBGNfISnCnLWhsQDGcgHKXrKlQzZlp+r0ApQmwJG0wg9ZqRd
+QZ+cfL2JSyIZJrqrol7DVekyCzsAAgIIAMOpC9D4T2fxDyNJj35iGHmilIEwfKuO
+5wymOOsA7NZf5rFSRwFcBhAR7sZmwu6/6nwIH0lvvy4+F20iwqmmSFkrupX2ONyD
+iGFw+KXuXAp1pEIo/ody8UUerg5ga+XMIXhxLgdrDBVOZSYokEdfnl2JDzSuBYFU
+KRy1nm6DgwJU39I/IEUfmk7OXll6n0gPlBLF6Z+uOd232ShC15EZhM52+MchliWi
+1tjJZmkZWrmL3OtTOxSvM9eUkmW6uqInLaZxHH5IJwcXDc2t42UFe1jlmdwZQ9Zy
+kOutbG5kvNf5y58W6L/QErNuStqJVwbB5BEYYzJxEXnb7+2r5ZgcItaITAQYEQIA
+DAUCQZUrQQUbDAAAAAAKCRAYYcMixWAUshk0AJ9rvwrz8ysEb9RVJD2Ee+dY/Txs
+AwCeJD7drnKPGp/aTvf6KlOr5WVK9/M=
+=+Q1z
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1939A2520BAB1D90
+uid    Daniel Dekany <ddekany@apache.org>
+
+sub    D068F0D7B6A63980
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv
+BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3
+67RAu42fJqJcjD2Rs37wMxlSRRGQ+/bp+Bw2HNO1pw7GwrSgmZwzwT4+1pE/TvXQ
+Wl+Nhdf3swLyBaSuWHJZT3+JOR0kEGSQuurR+57r6fKDmouWSwAKn1z97JelHuXj
+HKZeueCkQvX7dayPP4a1zpoXPcoZhYekFarLWJl411EA3aHIIV8whknsZx/lGGC5
+yF9AVIzHHnhqFC/Fr+GJbwa9oMFXj0pY06ZNABEBAAG0IkRhbmllbCBEZWthbnkg
+PGRkZWthbnlAYXBhY2hlLm9yZz65AQ0EUc3EzwEIAK6rZ7kRp3uj0CrhvuTnLHU7
+nEs+KvoUZKLyhcIys76sJQ7cnhEygcG7tng/EtK8bI6skLwUaF4fnPliDj/yIigY
+08p7TvFL/6HL4cLrIXR9uZe5IdvBKYhy23Ie2JXdLk6zH6jq5+vBE0IA7ljJUQj0
+PgiIL92kB73Bn6dPayvtApzctajXvGajYNfOLTYc3n1L/Kqay+/UwjB5MJVlmFtZ
+1a/EAxyb5yHld/s3RKEaeEIpjaoPSJwXKOWNAcLdtgcPcsyfrV4bkgjx7ABzPvf8
+2gYucthyIx4zPZ29hZfktSV61h7cbJL5HGrk39UcSgfstHbfBQiTY/1kVN9tuHkA
+EQEAAYkBHwQYAQIACQUCUc3EzwIbDAAKCRAZOaJSC6sdkEFjCADEzcJtTbykHeSP
+GykEtUnApHYM8oZixHWFvDdjkGhePMTvBRJpByS/hdS4Mnb2AfBoV696eCFAtm+D
+6iuOA1OYgc1CnGhilxRVpzjgbD0S6bG0tyiKz1dk0HKkGh36wumST1bU2qdA/UN0
+CoRIA9Csb+mg+h8c+y3QixjbpTSS4shhXpzfj8QsZmPn38S1amaSTEv8zqF8pArP
+U93184TQfJBPrjAShTEitAmX3FQlSL5v5sZms7T5S/kOHkcHm4zNlwXRJ9avqb8k
+q2rcDJX4sCe7PjoMX3y2mTk2YezY4LrYbhEeOGcMNg7XOXlhtBBJ4OuqQtXo65Lc
+T7dK1Uyb
+=9sp3
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1A2A1C94BDE89688
+uid    Michael Osipov <michaelo@apache.org>
+
+sub    A3F393B5D034A0A3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=MeIR
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1DA784CCB5C46DD5
+uid    Rafael Winterhalter <rafael.wth@gmail.com>
+
+sub    A7E989B0634097AC
+sub    7999BEFBA1039E8B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=DUsm
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1DB198F93525EC1A
+uid    SonarSource S.A. <infra@sonarsource.com>
+
+sub    2161D72E7DCD4258
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=Upka
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    1F7A8F87B9D8F501
+uid    Download <download@jetbrains.com>
+
+sub    7D1BE4480B61E2A7
+sub    C2148900BCD3C2AF
+sub    CFF46EE3C17E53E9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+a3HXnE2l2ony
+=gs9m
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    205C8673DC742C7C
+uid    Brian E Fox (CODE SIGNING KEY) <brianf@apache.org>
+
+sub    AD9CEBA0521B1945
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+gMqQQpNoy+5xrNg+uv6po4Jjtidfww==
+=sfdU
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    218FA0F6A941A037
+uid    Kevin L. Stern (for ossrh signatures) <kevin.l.stern@gmail.com>
+
+sub    9FF24F51B06DCC19
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFjDR2UBCADDfzBacBg664xalF55ghVkhxxwLaTNUdvTJ9o0IH+cGTRj7EYr
+7QvLVa68PKigj0q7SVVwhPT7fzBLDosGjHef0UWap10ynqACBoAYSFocT9m3Www1
+nW4AGT/5chvzYfNPpN7YZ2Hkk6DUpmSzS83+6nIYdCAgrcZ5XS0Vg40vUL34TJPy
+IxJinqWxt4A14ZryqSKWbWxRcocmpCAeRLMLNxbQq5rKjjxFksTYR0Sj+t47DQsB
+rqFmnPnZFExP+Q/KG1dKQ4UE/LyvzoCzCqynuMg7gIlMuRBzDv8QB2f6DgViAHdC
+vS6m2YCTGURCQufBdJOGuGplL1uxqoEW54G3ABEBAAG0P0tldmluIEwuIFN0ZXJu
+IChmb3Igb3Nzcmggc2lnbmF0dXJlcykgPGtldmluLmwuc3Rlcm5AZ21haWwuY29t
+PrkBDQRYw0dlAQgAvDPybZIZ0A2+QUtWpd2+Y5nVGOtuvOsg/+I6OzUGj6wP3gva
+pRqB379wqO8ZHZwU/eDtlyJgEBlUJZmmCZdMvi0vc9JmDc1W+S5e63cxT7beSyOW
+SXkt/OWrRGaJ27ojVOAGxdwLIPxiKWvdAq1CQPSX3i5df34THY+4E73aoWk2qJvn
+rvBK3x2u5N7BibbvRaUBVJxhDesnN2bMkPhZP4/IqbXk1IsgP/DMgfFuCWh7VJWz
+x82Y19c/i2rd/I5jrBSexM6WPmF8G4QlGJFmPUfYVyHmIW3JzuTDakfuOFe84egJ
+vO2NeADUqABqhWLFCE4cxak1kzL6oNsOWZuVXQARAQABiQEfBBgBAgAJBQJYw0dl
+AhsMAAoJECGPoPapQaA3cdUH/3ykeyaeo067yl+Wb7ShHOH3NDKmMJwqUVkzRZDu
+MhGCE5ikgrHL7MKPcdT3XXRTrgkr8874AA4CoeeHVdepcKigwhqk+2g9Xtafmu8r
+VqCwMdSp47nIkqVkxuPrQF5/qpHyK4srTudn4YlxqXY0JGr+3bXai1cPt/vSt8Pm
+63TswMzeJ+ZkV2nbt4QbEI5NoN/4rNmE/kpQW0Bw0am5dcARbq38mon7qH0Rul11
+DCAuxLChZqjincVHK7r1mosJ4bH+LPYHFh5Qf6g2IWHW7oGKjhn3zPN7h4YPl9Ph
+HNxbCoy/IvFaO8SNXK5wbsiF3xpD4nuPSO2h+v3Fqx691Gc=
+=xySD
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    21939FF0CA2A6567
+uid    Alex Herbert (CODE SIGNING KEY) <aherbert@apache.org>
+
+sub    A98BD25BE464EA45
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+NblrOf6LII4Pqx0ip7s95q54JSpekQZ65g==
+=3q/e
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    21A24B3F8B0F594A
+uid    Karl Heinz Marbaise (Apache Software Foundation) <khmarbaise@apache.org>
+
+sub    D658968EFD5E9F85
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+jEA=
+=Pdn8
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    254E9C64C264C176
+uid    Jannis Weis <weisj@arcor.de>
+
+sub    FE4CE430FD91C78D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF2swU4BCADGPBgTJhjjEKL1ulqHmw1pYLDd1HTms4tlIvBwTCrzxm1JsmU5
+vz6hcGU0U24gFtldN63EncHDrruBz2mJIbVKCbGMP7cEycQBMTklJyrpnJxSsNyL
+YaRBA7a0mBmx5pD7IDQVcL8VBNMCVhaiREemuvvzQgc0rrFu0FKnuDXQVwwXNJVY
+iBpqEk+E/qKFJhKzR7orYhIa2ahpptaWfYp8OfW+6iaj0HslLi0et8Dt0qUlxM5Q
+DMRj/Gh4n+82evfCFy09Jz8rN4iWyrZ7GSHsJJVEs/hhzFRARra7VtbXMc1JCiE8
+VIH4KHbXK4ToL9u3OKocXMfAyS9zmEuB2xTdABEBAAG0HEphbm5pcyBXZWlzIDx3
+ZWlzakBhcmNvci5kZT65AQ0EXazBTgEIALmgCt9pUHBwsjqBC/QR41h2ZuZi4Ujj
+6G7zRZiUbp1mXWKgRUwOUYgpId78ckHua+rya/soWZmELdX02v6YSVAx9cYKHDsH
+qiWIkVG0ldoEAdq1gPtyp0UP0FnnjeKO2wYGvN+TjCbPxeibUQQgYMnZHzbSSZc1
+c8SlfDaC8+dQ2wF4m/VwWJs5Txrg/Gg0YEW8Jw/gfOX9yzbA/ujw1z3DWW7LSaEt
+8hf7wTGqTfiLxEOSx0P5BzmJahtm4F47wky8P7wob4q8uLI+JzieYaaeE/QqRCFx
+MZozpLugq3H5TF/70MmNlvAQNMPOxEqJJbCaxlYgKUutrxHZY51b8VMAEQEAAYkB
+PAQYAQgAJhYhBLAlWyYAPvb4JJGs1yVOnGTCZMF2BQJdrMFOAhsMBQkDwydSAAoJ
+ECVOnGTCZMF2SIMH/iqKuDRsec44JBAxOHeFxEnksnJe9HiyZk9g9WZzlSIIJW3+
+Fln9FTr7lPfxZPyDuud1Wa8e3rHuFhVinMpGxqsoTnY+fqCpiPMbJWqRsbD3qr52
+6Y4CYM/J3ufNcf1qwKxGW1na3uT70MLeMLFuBp9GI/RTbOx1h2dAs59csrXiah5a
+M4N/caujb2WudIBMI9HU9Zbv12bVVp8baYkEnaK+s0XqUO+5WGPkvKJoJhAW6Ktc
+Gs4mbRxN5MXQkVsPF4D8d9mYQcBeaSDMRjROLAp5zWk4/RKe/tzVSklRzTtydKgw
+RFIsPREvvu5tme8fWkkMMbd+hZ1007zBuNCNPm4=
+=05pd
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    29579F18FA8FD93B
+uid    Tom Ball <tball724@gmail.com>
+
+sub    9DF7F2349731D55B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
+h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
+XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
+RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
+XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
+MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG0HVRvbSBCYWxsIDx0YmFs
+bDcyNEBnbWFpbC5jb20+uQENBFYFiMABCACdvSlhh2hLe4F1fBMHiZK2HdNp8I3N
+S8o1E9k0cBM2fTfalIlan6ZIJ2Z+JqRwk6MRaKpB2or/0A34+3KfI22SWtsI2lJA
+2x9qWaiwRidLFFAWdSjTzNroYVkcwJ5hf2yKN/mH5YRiDSzaqHr5GKKPXHXpT94X
+qXn+Pj1Lj5ipnqPOerpJ5mlkPPSz8C5Ve6I+sIqjGKdtrB6kxgIF3kf30izCu3dL
+0j5vuey2XneRAqETHqmBVMEjFeuEY0zJCj7LxQRr0YaaSfrlkIjIxRbhatgxXjQV
+bbnh0nYAh8dUz/YvsfuyZmLJhRZkcJxHW8Tt0xxV2oBUBq+IpmvqDoy3ABEBAAGJ
+AR8EGAECAAkFAlYFiMACGwwACgkQKVefGPqP2TvmWQgAi9Q5WlckTYzccwvt9F+s
+RspD8AncDERdwkY6HiInLLNqQSUWiHU2BaYN2wmSiSeSgwurPtN85nd3XZyhKtXx
+H0XKC2fTzQWBdyBEh5zT5UevES9nIzIKurHoG4TsWr9d2XDiDp8q1s4G1cNGYDfD
+97wpZRbYn8L7hedL07ISEWNdRvBpbrvhme7X0pD8MBKPqUXfLHHaJetmlFKOmu9a
+wzjINlz1C89JdocSln3lLJLE+RGNN7HmXdwmKjmnC0fo2h8jnOTYekdTM3Ec+uWE
+8M1WyqZV7WYzoITIfq0uHgyIxCpaOOejOLKShQW031G/kEvZApAVPHLFM8BdJ5P6
+Dw==
+=INDk
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    2A742740E08E7F8D
+sub    74C249541619FF0B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQMuBGJIi4URCADFspeHyziASBuPXpLpikWjmC3D6VtTaDT17ogOyGLf6/sjsQUz
+0KS3PzWBuPoqRGRpTtZxJ5yr10apr8mJF9Po5LFkrtcexaiYmUWAZAik894OhKt1
+O9he2Sh1OTUiTmFU4ImQY+AeRqASZMYabhbbJOfQLJV2Er+foKzRC0T2MSQVjDho
+NywU1IsQG58lXEQNOA50uCuhnaCUy7Mh/GKCejyBaqXMtd517evHhqsJd9tWMNW/
+W2xKvGiH2mWSRjgllZ0h3zHuUEo8xqetOuHrDGGRpkzRES0kIT7En39hpVpP662Y
+97Wolv4C0/UE4rlfCmiplf6mG9QPET8wZeRvAQDh+Z27sD3ODWU2P5s/EXzsmBoi
+kK2KzGE+n32kRY4fHQf7BE9PfZ3f58KICY7p5apxP/6+bl8uq9vcszGPHl1aT2cH
+oQpPm5i2UHRoWXh7U9TpKWxxqx+yvJlPhV1c2DTvdbx530xEMF6up1f04+axhlqE
+DzjzOenwpnS3DR5iUqflEM33njj4tK+Tw51kXjyBxafPmaKEwuqzYzCFoojidmSx
+Vk4la9hCvIJzGQ+3iTX6OR4d1lGvRGmVm2g2AVrpZ1yPncgjCu5qFH9UiBblE8LV
+SVGBufS86pRwTrwW+fXaKw5iIyiPMSSE11H8uw4q75uFVnmEd4JUtQxGjnv7vbjq
+7hAeE3T4HlLPFBr3y8c3829HY0ozNVKKtXs0/lBzwwgAm/59t1B/dMl61BaufnY1
+5tYFAcStTrl0c3ZAYHO6DWYTJ8ZZQqiBfeyVI3yqWKQAYg0DxC9AzTtNSOs7SGJK
+dgdencJoa0ElraZuVXfb2Pr6cBv5wKRfU7ZBvHfCE56vJ/0zAvGbIRy4DYup8+Pj
+vcLSSWvQMT0iHk9TTw6sJNV/S4aH37Ux2N3SsARvqR1nZ7rQaGN5eTg7qHmwgIgd
+AoHa2Jd3ixOKuLzwIF4hoh+XKI7bYzVHwYq6yVZWevloxlky0FfAXCH2/lrTGyvj
+i83tPUIushngZ07senzgK0IWQIuLVjl03tJ/rc12AtiZkx1/ykssQ2uJolIRLfou
+u7kCDQRiSIuFEAgA+Roa4drFpqXxAR4ZjJ2WA0v9WUGWmbZr03BpqjoWzgHvM453
+IbSQ3e+l+DYzfxw0EpVKs+7GiRLP4/a1f3v0ubBPf/QHfiY/lzfqUDwCUNfB8Zkw
+ygvsydthI+DD6hgWOnd6la3O5vtFHvpuH8cv6uYJVWIn5wVbvAbyhJIn1Ug3++Qq
+/g4Dm7QCKsu/phulcgJtaZuDTPRGKLNhmwVbO7E9chjW1peaEbYhwI0H1jHU8onX
+s+00uiM0baOnpI20+5bvI8Zm8wYu3FGmzhykOLKOwd8y8NlR2VSaTYZAGO2+h2vm
+/PWuMnnl9v8mpYi9XbHdrf9KndAcfx+gYtjdxwAFEwgAqg9KGwxXoPtahCzrBdq4
+M4FK7zJyq5GVtSQXFEzPjnlF4xvcF9ntG+67S7vuPAvTsHyhvfGaqBsssi/eDSVC
+xD9FIYXGZDrrVCCoMkM1R7qmE3EZKr2fjBKUmmQb8qu6sknjDqUkNwyolhMip129
+AUvrOW7SV0HK33SSLlbzdv9z+COYM5lyLvgqmWjInKziuXpG5ATszGqlz1BMH8xh
+tFDoOApVnVPXPO+pLGbxruy2t5DhVIEnsuV/A7rs6ko8XCXk1+njvIyCQndU4m+j
+NRqPU86Qch3+qZyUBuhwmL/u9VsKcrOl0w7KXwxWTbkqQSZynt+NVtpuPKNxoaKz
+OIh4BBgRCAAgFiEEVxnlDqxaSx3TkLcsKnQnQOCOf40FAmJIi4UCGwwACgkQKnQn
+QOCOf42iegD9F3smyyT3RNkuHTgs3Q1pGN/xnu80ftuHRuyI8Km0oUYA/3De7KtT
+YEUO8pAj8YdGToyTSkmMqyrk/gwgHdbhb3E8
+=nuCp
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    2C7B12F2A511E325
+sub    10DA72CD7FBFA159
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
+2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
+bOjh4v9ZipD+px8w3o/RNrnZH/KRsoJg9yER6pf+pUZqTJfdg5lXezc1WF+/1qVo
+ypldMGfrkfLsPrUZTT689ubbig978e7eYmJEqldtaIwaAzHQnB70wIJyg/rEwFUM
+ldsvs6t6czSuJ4zPMvmh8TMpTg9e6+DMktPl1CWRONl8RPpgYMIC96gb4OnfDDjk
+Ex6clSCwgbDwdeAyOjjR6pVq+pCNTo1Pcj5jABEBAAG5AQ0ET5k74QEIALaxogmJ
+1t7arw82krV7ILlcOu6aLuuXTuy03K1/jU73oyWfUqwvPSbH4igcLb8kt1/6ogfk
+u0T9tTx+0mDsvqK8A8NZ2nDTXok3T58UAg0FTXlqUqZmy5QPtG+it2j3/xGgip3V
+5p0Ml1TqEl2SfW6gHtLptDUWzuzPi9SgK1ZFlueprPg7xwHmWhp0gwx0KSSOYWlK
+oEllj/1aDxFNcdKogWcGN5aJEsETCEguBP7olL75u6732wc3zola4zTy5bFT4kEY
+Dk30Du3VGQJrdsqlibdQpZYm8uH4AVXDmFMdEAjIs/DGRrUgde/oUqwtgm9U+p9M
+qcbmMoeLFdi7ajEAEQEAAYkBNgQYAQIACQUCT5k74QIbDAAhCRAsexLypRHjJRYh
+BEdfO45Z5uY6p4BnSCx7EvKlEeMlX0UIAKS+4ZAKrGG9jbWfzTTDbu9zzkXgV13s
+uMD+XcGz10DkdluTUBXj8wWlp289fXNm4E49ipsNK+dcZ+gOATjUvb1Llh6D6bHz
+1QM7olxBCeU2feTmYYKBH8GYY9JZzfAXNMQhcNiiPj+ntZqePy/EFA4uZHM7We7v
+l2c7CBcDAq1NNeEczo0KvG7AWt6QoaMVmbvA14EKadNzrmEy9apkag1BKvwzXInY
+CvIHMa9ZqicOSUcI5QCYu5TufvIE7Eq3Khh2Ex1FiOaEA+57LMrt6NsSKXrB8JNY
+bI5pqE1rxJXZnYtx3ZpPAAEfLjPdi1AOkWhvhsoPmiGFC6ebYQ5eVbI=
+=+5D1
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    2D0E1FB8FE4B68B4
+sub    FCF74AFDF5947ABA
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBFYVT4EBEACqm1qKc6Twp2Iw0tjUqr3hrZ7mjZMWg5MemH9ZiQ9iVIqV4Lee
+KmgjVWk5jnTslriymDilDIMk0YaT67JokhgSdqMIavI29tJ6quOp0K7Rj/rNBc6p
+Um+mw4rybjOUCsYddvP1bg8skDoh1dHnJpVho13u1zoTDMhHpzW5vOdSwVoGhP6h
+OwgdRcd8ZOmHsb7q7/VjUHN6n/nrrnadOn13AJLjw0pWl9d3Ht0uR1jCK1lAgaOb
+t9RAb7p3SpaiLS84wuVzePEoYWVuTS2NfoG8NB+oCyMxbkubp9HLZOiDmFMMT9Cx
+Hzf77m/TyGDGNZtevTEodSoXNe4ZO8Yp3lL5byw1f0bPVmukLU+5VlcdiYckEWTc
+/je/kxGKYUrsGV4GWJ/wAvuSD/NQOYswxtEi2q6m8wlunpWKgy4ZeWz1V7Z+xCFl
+wp9ejY7xRbJbqmVASrKwg8u9WNKAb5QpIF3F2/DQRdhHD3kX0aZ8+a//dFfenAob
+7qOldsje5PxeJ+x6sgtcJ0kKrK5uv3Hk9gTA9fq5i1UKz8C0b3ChPdus7WoYDTiw
+RUB4+2WMtAscGnmh+8jtNVSJIaT6Azc3v+8JiF9lbek49+sMLfTZyxI2Wt8tACpY
+EpiuNTn0R4U4+bKXxfMh2OJ+CfVYvR7/xdNw1OonK5zk2nN58cllAuEZLwARAQAB
+uQINBFYVT4EBEADUwd1+5pSJIS12mfxDbPPViQQ/uy8Nn5M9oHysypvyknyIt8T2
+1fHI++BbdkHckoSeIYIVi7H6ZU0CItTJK81jOg/Xjxe7UKiM0X3mqoJ6hvxVf72X
+w2sRJq5uOpmVdM4SsAhidGyvAmv+fwGngwB2EXJzd4LI/EkrcuUMS6SNEvDJGag4
+mXg6HNS/s2FPFt05WMt478hTm9dSuE4GBLr+uexn8sBIgIWiMfMbnKsT/LAg5SQt
+PCEKEZJVt9UrQi6BjUnr4T+ZEOiSSOPrnTHF6TpSXpRjr8NLCs8dAKCRh7shhufe
+62ZWvW1xxTsyS/KEbiwTwQ4CcVugQGniI07BDelH1TCmccjlZjdOlw0+Pr3aDDi9
+pQV2c4zOxknXFs2xTY7n7mvsuWkKrRqXhETQ+V1nGCoQPEPA9zaXc8kWZLwpv4Nd
+k87pC3YJGL92yWme3/Q4mlYInXd4L8W92t6ZQ/WLc0JykQrCINlvOencpYoUcYMe
+AIOfxzTnPhiqXUc+ZlOdFw/1P1rMvyy8tQB99ND3LXu6zfVIH65gXqpsxHeuVEQG
+Edrv/7obHhyQAxsU+KOXS+z388JB86CmbYzUCYtupsFuULesubwLjhlP+OGqbo4n
+wGG3E0g/MR3nrmi9fzVlLs4a3bxJv3bv6BtvhopdBlVDvgtq1cC7sCkrGQARAQAB
+iQI2BBgBAgAJBQJWFU+BAhsMACEJEC0OH7j+S2i0FiEEWYm692IXuEPWa+VbLQ4f
+uP5LaLQDZg//a7zDPtbeP1V+t102mpSTirkFf8OuiHptOCm3/dRlgc4TF+RrH1Zv
+3xZmmLI8FHkgwiheC0/oipWfuIc802ZzOXguLfhSlRTAvG95bef4eGOyKCVpYlko
+xFBtcyI9h5yAI4Pflmk6+L29k0XhIIHdgv3+huam94eKNnArv6MpYVaSjyz1Fx5f
+YeNPReeqPDfhiRfceNc9MG+sXm0zEKijjIjWpz1B+nLIoZiCWGGIiao9hsRDOiRs
+Vyy7+kI/4K6/PEaAceAYRllMuvu1rFN9XJTklU7w8/DAjxM7HL08svDzyX1IQGGG
+pL1yAnZOZavI/Zlajzo4Bl9usU+2eMVVxNNbMAPPYUs/7X3btTQOXZnAXXBZGHG4
+T1MGkhbfaKEJbvrQnlCSqJsboOdf4B+ibYc7z4fFxF3ZRTBioWbfZ+Skiy1jTO+G
+ddD27aT0uAMQcN3Ko4arzOmbSdyeXuc61gAh7b0Z7H6j4XeY6OTWJuyIlfpB2OrF
+h1uX4ygBNpC7/x678kr2YccD742UQcJVxGfMwEPyS6bgeXfegCdkhF7YvAoj8PDE
+W+lGnfJRYPlsP9pyzJTtLsqvd0cCOKhzhwRNt/TeIYYpax1hYAIQh8BzzLVd+RSs
+PXWGS/Q1HUAeI73glv6fq+vHmetd2i2z3pgu9A+/CaVyUYBy9b4m/vk=
+=ELRU
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    2E2010F8A7FF4A41
+uid    Benjamin Bentmann (CODE SIGNING KEY) <bentmann@apache.org>
+
+sub    E4D15F24364C7906
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEnOgPURBADYutfvXAtNgf67BQ2gWTI6+nKfILIwMPzCbQPMd7pykzF5nPMu
+Nswt3E7efo5IP1Zsv6DRrLafAW0OJSmL/oo8/ta0AfqcxCCbJ6CUyViifRZ5T4nU
+WfuWTZiaKRQ57jtt0WnNpFNFf00gDbYJWs5b4RU5Vac/0B0WDQ0wvOJfBwCgylAw
+LrDQmwyOZcws9VbpvZvz9pMEAMRkV6DN8kvmfktpbUnHNuZJOps5botqKyffQVj/
+b2zh9mQ9yFpaSWESdFgpJNeBGtQJEDOz2G/q9ydTrYyCD8ILMKmsUlj/DAjaE7mU
+/NmSpHBUO97NJN/fdMgkkbkSlk4j64lGaVovQph9ehw3DsuSTF8IPvr/DXV9nuIc
+duxTBACUE6vsxZlzB9dXe5HjKCoPGr90kUm8uCG/CVu6fBVpZZa9B6+OM6NhEkLG
+FA/EKgKc/tvNIlPsRwX1R2RoV9/tR9N772ZjhLcEBKV2UO9mb5iAWWZaMJtQ06SI
+Ws9fyd+Zx3GGY1+iwWPUxZ2lSGLlfg3Sunl7Cni86tb0fTHTrrQ6QmVuamFtaW4g
+QmVudG1hbm4gKENPREUgU0lHTklORyBLRVkpIDxiZW50bWFubkBhcGFjaGUub3Jn
+PrkCDQRJzoD1EAgAlYw+EWr/t9pNqJhzVpAZ9u3LMKJfrGopbO+jOW0T58mIdVF4
+oMF5WZ4lHPTgHrRLKxXNcGlzaxjxBKtkUbnjRTSGk7ExzGIcWoqq65RI8JgONif1
+VpBaS4Y8WwX/akQBnCAL+eV7UwHttVUKEmt4xUW5CNa4BgCFKtVdiomvdxnBHBCg
+fWNHXpNnQLWhuOGJZVyqq1ZAh0/vIxUBDSJZPxmEh5235+2CDK8Zu4FCcsi409zr
+LTtga+ggsN4tp22xvRgNs6nwARsk4paFII3OMkdMVJlGqU0oQ+H5I5PADBFSUYwp
+cIYne/+k19+QMR1xIk+7EavzdOribLC/nwaLFwADBQf+INE8jnD6qg3g1gRN3S9M
+Nh+PAPEsrM/7Gw0NCAhaf3METVwSzZfwVNiXM8DVEGjaBAPTBpuJdveHpTG43E4e
+ibjXWTe7j5A5QSUxO7p3W4AXNTKldFnlKkVs+6ZKCkKeasY2/7do6Cf2Ed6lL1CD
+XEYcZRZ6BbkXruI/HqT/IP2mTw1i53S5Gxj3gaG/jOroXN5cBZnRoaPJQpuri9hd
+UJVqPNIDhe8dz3ZxkHEgVPMoanp8xti86ErSjgvsxGs6xjjuxC9CNjMjyod7d6E1
+NSt7gvVdksX3vok3QvIqQKDO6l777R9LQcxEStPz91mrBRTAyO6b7AtCk4/5S2hT
+dYhJBBgRAgAJBQJJzoD1AhsMAAoJEC4gEPin/0pBVNMAoLT0LzbZNVmium/JNdBh
+Dhufgi7JAJ9s7DMysnT2e4S6/VitgWdoI9iCfA==
+=P/a4
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    2F45F85CDF082E68
+uid    Gregory Brail (Rhino Automated Builds) <greg+rhino@brail.org>
+
+sub    6F67467BC1ADB846
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGHUzooBDADpUjFpdOCJMkgB2Wz2hc7X6/AmS/d9P3WgiumVMO7dViLDIr+q
+nAS08QwZaFtLcwOs6F47I7CdjK1XLRmIHgeOnVdeRPk+h56SfPOO1qvwyqTxpUXl
+k5CT9GyaU8mab8eenWRwtKFCCwGwTjOJ65iTB7jaUKuE3nUJwRtaIEXalTMdZIg/
+rdPTSrngqwk0v6ntSTMd4MWyF3PryyLwt4VhCkiZc6rB2GafJ4YfSdhyhu0xR7uQ
+voWBL3hdJic27LHvOxH2o82YTOb92nNVR+nVfNM0VXq+4/VBSzXYPSjaqTFHHK1O
+wNWjy9x9qlMeX3eNTPMhZS8XelSMZtshiajUKV0YlTFcULfrZNA3A73NknBedghc
+MaAXJNPgwBUKPwL/H7Pfdx/FnTkmHAtxSbFGDoCK+UoF/pC69BXYW6bvUgkQWPkV
+QGx+Lqc7bV9n5X5lunTCBh0WOphwsIGrfU1ma3YYO1p1248pfVqlukGXpyd79ehS
+8SKaZICuPDIh7UsAEQEAAbQ9R3JlZ29yeSBCcmFpbCAoUmhpbm8gQXV0b21hdGVk
+IEJ1aWxkcykgPGdyZWcrcmhpbm9AYnJhaWwub3JnPrkBjQRh1M6KAQwAxMXmZGdK
+guIx+GOHUDvw4nyiXTW154byzNwHM4qOBfGvHa+aDFklreTzm4igxX8HRWmMpGx/
+GveYwQXN4KS4uk8FDDoH56heryWCzm8033pa5/eQMZj6SiEZnoJEfPWwFmyhasA9
+0BUKGXiUQkQlYD8TXpSN/HtjeX/w+VTjQzh6RnDykRE9sL0Mj8PxuZG+63YVyO22
+SJpJlZ7WRGIatk1Hs4hRabIcAoO6HG4Zu90vo18bRQ9TWvJeo1gr+utEtQB1Ye++
+4GQzgTesfLPAZ5wgZ4ULAO4Xq407BLUDNe2hM5NLgHfnodBs+ebvCBJ9zAk7Efhl
+kkZFjnGmz3AsJ7+EW6j8fobxGqQTvQTyn6VRKPeWkh2Wb/eC1b2MHpDE+tXCq/LO
+jrzCunYPB8gpdROGJ6vA/bdm3WjQ57ai3/CxIGQCiIa+07mB3+Dn84LiS1To4H1l
+B89225/z7sQE1L2NUn3ov6uqLRXcK2ap1ID4pmAZu9R6Z5gYUwwqpTjvABEBAAGJ
+AbYEGAEKACAWIQTpr1KTwzTHwLWDIn0vRfhc3wguaAUCYdTOigIbDAAKCRAvRfhc
+3wguaHtwC/98LIyPpDJGRfquTXPf32B0g+TxGxXl1hjBssKcrY1XmucHamz/6xoC
+bvs4p8hKUd10+wdLA6KFqjTapU+FGSOyXy3JLqAAc6lMLebppeKIwYmcN2Gym9ga
+eQw9wh9KVUU1LB5cdbHrE89T7jVvez6zFGQpjgj+vgjdsxpTyXPaMEIxks8Yq5JT
+Au1MbtmK8WQ75Kc+Dnfbx9xw3Jt0QwkzqsVFOEQub+0IT03pf6u2AM4aNtjU0wYB
+RXUktkmQDTo+RLYLoJd1N0vY/Ri/RJ1+QOuYW/X8mMBvTtD3AQ4Ya/AkM5K9/0LF
+4IlblHa4WyoyPH1HxBs6C7srpaPxduAdCIWwsQduHNJRchspv7H6y386/iA9FtBn
+pg9pQ8Ea1vt0ENedHQNYThQLFdqc/QAaFzsZhpkE9MwfF9VAXf15EQUMw7vRE/lU
+XXqXz9aF8GKL6nhkBhiI0W4yOs3/Z+7XzNY0QqHpMO9tcAss5RM2XO3A4Xu2fElV
+26cpBYjJ/og=
+=gae3
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    31474E5E7C6B7034
+uid    Emmanuel Lecharny (CODE SIGNING KEY) <elecharny@apache.org>
+
+sub    064AC25270668162
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=I0zP
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    33CD6733AF5EC452
+uid    Dennis Lundberg (CODE SIGNING KEY) <dennisl@apache.org>
+
+sub    3624EE1473A843C2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
+FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
+J7VtuhdhIE/+rUiE1go2vkQhdIaad8om/kQDsovbgqxfX6eU2hWL51bJZwCg59D5
+0lXm78y8dlbvGaW0EVdgBesEAJ6rcNAA6rjsi7BUXNIpZe+KF/G/slcLJETgylmw
+g0vquZP7n0fVhZZqB68zSmTcukxo36rd0jr9eSlhPj/6j9xs7gpk/UFWLWsziZDO
+7kZVLv58v6ktK1Dk8u0F9o75pDBjgxOGR7VPVTblur1dIJ+U14ffJ9fn6wzKY8hx
+hZrgA/wIpuJ/aSSns2ccKsErDMPRJP/TGygvrb1Mpfk3tLeGF7owI0sL8L8adKMK
+g9kT/8VFoLzeSeEwUDOKDVm2xB/A5pazoUcgxLdwYs6g/XJzA7y4Sbfcac2W5IZ0
+4WGGUobf5Gp/b3NeVuff+V/2UN1YIr/hlOnBOMQDlNie4loQhrQ3RGVubmlzIEx1
+bmRiZXJnIChDT0RFIFNJR05JTkcgS0VZKSA8ZGVubmlzbEBhcGFjaGUub3JnPrkC
+DQRE7zskEAgAi+8rrcd671s/hYlH3mgNtPbmb6KY21axOKIkwqwVdFoG5nbO5Sss
+W99d+naj6UDJ+x+mbF8zTb+0uFgEnHlrhjJ3cOSzuSPZ2UY+5X1GJn6tkHN4e9kn
+yQzoAFKNoCbnYHzbMkEEyKpziDzcyAuFHEKp1JoHhXD465eX9b/RFcSaaXmjttiG
+n8bjGhgAiRXD5GAP/BLkD+nW0psTbLTraJ3GP+vVka1kwnDN0i7yvpvdSjntNi5x
+s+tljAtePbs4ogWQBeQV3xFD7GwadVhH/3yHRlISuEUNRO/DMK4YFsDYjU+zaBLk
++lDka38QnAIjQYxhe8eypB8EuiOarDU3dwADBQf+KBZfOx/iCvuPcV3LFiUseNOA
+bF6xRbmAoJaqlxIy3E8fX0oiuEp4OVHz8U02BLsBtH4LIpiEj2/gyELx0P25GhS3
+S5UtfkNvcG2AfNZOtNlWW40GI6gj2KxyJqOaXAkfW+WcPJrgd+gH+9JpJzVfoTJy
+qkq6r61r6UNogQI2nrhroPjv225TyA8xFuTyShdhRo0WoMP8tqZxDiWXsGzdFciP
+aLJ3GPwevVT4dCpbCvR2XHh/vVuytwC2p84O/Wrh9TUoT35Xe6vY2zkgGg9adhXd
+j47MDZG0BWqFs4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crIhJ
+BBgRAgAJBQJE7zskAhsMAAoJEDPNZzOvXsRSDZYAniVhMgZQDbg2AGd7sWBAvTK1
+F8GKAJ4wlBaXv5JsdMMyJvQc+xtjXg7OVA==
+=AG3B
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3449EC3AC2EFE8AA
+uid    Ingo Bauersachs <ingo@jitsi.org>
+
+sub    4F89F83C363D30E8
+sub    A5C8DBB8A1599BD4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=LVlw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3684155E9365C30E
+uid    kalle stenflo (gpg) <kalle.stenflo@gmail.com>
+
+sub    0A52516CF3E88B3D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE1PuKEBCADkfuhQQsJzb53DYO7Am9bCMHPABIOZs3zPTzQ3c0MVvxKgalp2
+2a73JWhdGfvD3UraZKZw6G8Xf1i04vWMw7P1fwnXU0r1kABcF+an/uAY7CbIo15/
+W3cIcoTFm9upzJFGY94MKeddLHIq8A9b+YqNxSofX6q55CXyfCUBvrVmhep2TrDJ
+gQlIYZb8w4JcXsu1Ec4NLw9alGfgs3hcO+iNnKhz0V9iUZjsWp8mtJWF0qdFxsf4
+khVCZb0Aaij1vluU5zZydyAqqXK+nlUmUZy8gTm1nrDA1IzDOArN1+LrX5C4M25l
+eOhCzUeQs607Rt8QVQ9oTy9+pcE68csw6fQJABEBAAG0LWthbGxlIHN0ZW5mbG8g
+KGdwZykgPGthbGxlLnN0ZW5mbG9AZ21haWwuY29tPrkBDQRNT7ihAQgA2nQruCtI
+G+rTCOI5RZUMvE/7k3CX/m2PRiZYW0sr+1vU9dgO3yG3AnRoZAmWZkabb5GHKs5A
++UEF21UBbO6caAztx0FkP9JC4bmFWhjZZ3VPXLaZZvl9NIrBkaNw2gK0iKJX//B3
+z8X+xzI5UAm183bbYM1SFAY0Ndq/HFOwsr9Cruqx9thaJUGf70BwhaZ42G9WMJP5
+oZi6ad2MUXJ+FN+lD5YlhG9+IjlQIKLJcMvO0uNXE6pk/ssGpS560PgIpkITxRhH
++9basgTk+QeLtz4nPLKdB8hxcK5s0pFz7vhFI0hiYoPAmdFSFMqWY77E2/rv12mQ
+7veNHw1SVX+skQARAQABiQEfBBgBAgAJBQJNT7ihAhsMAAoJEDaEFV6TZcMOpfQI
+ALRQKGUzh0XJxkshMsGRSh3HROx4uNZxSoBAowB+zmAT02mCfZL2l7QoIoSmvunj
+IfCdKNYl7FKd7B9PxqHlvet92TzvF+fTAgndpy2Ox/KJ26uvk9st6d7xnJErZpBl
+8QWdf9B11dOiFRSZanVnqdID+k+hZie0XrKyo6Z9sax1Tz/6AUcp9YXuYlohAhRj
+hpAr/FZ1AS46jA9YW9ZNS6po1pF04qEd9blGVsLq9nPGFr+iwXWh7Y26ZMNMIDif
+yaoyOl3vLvjeojXZ7HEbAzokkVeYaZlqX6e/7wniKAB5zmDNXA4KXBsZA+p7pgDV
+UlxAuwSE5Ic4Jwx0dwoVRV8=
+=F0eI
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    379CE192D401AB61
+uid    Bintray (by JFrog) <bintray@bintray.com>
+
+sub    0CFE993CDBE1D0A2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
+Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
+CBCDJg3ZaqpZti5ti2TfiaXHeawTpxaTb3V5tT4NYhY0aJqe0MGoVl2yZyoKMWsL
+8XcUiJkUYnpu98BvnzO9ORSnKWHk60YxzZuHh5buMNiV4aI331ogiTxqISzTwEdQ
+ygtlp4IeqE6w4x4RUOqQg/mu0xhqnP375KksPtKALLEr9vgqsJXfWVa5UmNl+rZP
+gMiNEt+Abwewa6IQGgSU8GuxMp3qHxZtJQRNwIPx/yb7FngtWrUKIoQXs9xJwdJB
+z4vhfFVeQlyPkEycQNcRfHVzK62oF8L5Jj/D8BIGAD+dj3x10Cy+qVK6BTY/F1zv
+5iL12LjSlz8DtmTbqjit0WGoULjXFZALAU36q6FmE/nMcFuLaTUIinGV4fMvLgf9
+Zn44juAhZMweOt63Pn4n/K0W+uOdrLSmGxJDhoxztabUdIpIMsw44wZ8gnSmPAef
+IDTCjJO2x9s2YuaZbgstpJldooxGJ+FTe52QXFphti+tkiGOg6Tpj8Xq3+ZEM3L9
+Js38SSdys0XBCHYiCv3/4Fk4jspTsCFrDzJ9HqNjsiktxPm9szmUZ72RjwARAQAB
+tChCaW50cmF5IChieSBKRnJvZykgPGJpbnRyYXlAYmludHJheS5jb20+uQINBFTi
+8JIBEACq+dSR6serUWrem1itiw0MslItsFyHuOV0+K8ZUOLRge/arBSfGjk7YZPF
+zIMVbxXo7LYiciHCydZ9K7HdqCqygC4k2IV+85Ll07ZfraPHa2vfgXshu03+VZcM
+cp6Jxs+UPlVHV7SE2R3o2w+KvKqzLLRLb6aBREoJCsI60HTWyPjsHiHraJ+XFNl0
+LT22tIPJFjOTeVKU/8OMBs3O5ql3zgdMG3DFGAS2ALiCb1wh+YgJ9c8TA44R52Jp
+0z1XUYXvV298FzHD6n7ejwif2MNUkLF7oFfSknQLkAw1WuqkwYn3QYocfp8aW5u3
+139vWWR5V2yLWeGI1+/spTJqP8eXBnF+jPWuig/GkHGrWCn+MT7Xv8TT2wR4rdhe
+tkYPnPNX0ra+jURZbie6tO/C5OWTYjurTSzBDiPxNLcxxUNjrOMzIbcLLhSRQ0DT
+FLiC56D+5UvPIUY/GiX5O7x4iF1kwSPcoXz1w+xzzCwfFZg9oE5voHAybrGkTFCI
+b5Oo+WKWDCY56K7yHLIUT4UmiF2Liaz7gesTc5yFSFJhP0WpkVX6FxDuoCryQx0L
+38qD+4c445N7aUfVmqbOBBp4ORpJ/w0s8Rb946yQ8TTUB06otovyIz1iZsuj0yU9
+kzZYovrZpKJLeDEY2ThxdU/O3ZkAowEeTjW+KyddTT9rUuggAwARAQABiQIfBBgB
+AgAJBQJU4vCSAhsMAAoJEDec4ZLUAathzJIQAJkh7/G8uMQ+GJW1SpwAI/JcvhTu
+4D5Xk5tlVGYoqWS6ircBAZCz8sDIJJggZHDXeECfVfq2eKt5O/68SgwNpfSwHWpT
+Dj1Y64HyHvU1oX9Rho96GNFbI02rlSX6Jw3Bzwjy2B+RRQUKb9rmcmHyllZ+j7jT
+i6MQnMgjZCTpKhmqFurbGtOAKusofEbkan5rflja/5MLw6QA3ca70sGDf23TnzEC
+sGKSTwiOd4JsikNXkW/k70nUa4UQcUfY0iiVoamkQ6zB3QAuzfM6ZDwo5nEtrgae
+fn2CRDr/wNvXNdNbVBRBaLKW8W17Sr59xLCEoSAkrLI3Sm2ThjbutyVnEsy88CNb
+X1uqdVG2KCNYcmXGYHNfZuh0tZvHV5GJLlAh46TfYJmVA3sQTSWeIotU0dF4KsGa
+IFVEf2SwoVsVp+zawj3sU/ZDJJC66BwzfSoO60DYKijnxKgBgBgz7QmUpLDAVEfS
+YYM8KLDFLM67gE2UijFCHcTOuyaLKIHiFY+f2rNflUzYhe+0vVbO/ytS2kA2Syj0
+w+OwwB/Vj8oEFpSbRB6GgzAJYX/UrCwX0Q27rGifiX4Z+Q+G4KwQcR2pYhUZesMt
+KyEwZnsd3IC1Qc9dcVXQUJPcqpXhSImuMDO/uOp9JJSxdPxB/gf6ELyVN9IFsU1/
+E/XhP4QkRJrZI1F/
+=Jm2n
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    38F47D3E410C47B1
+uid    Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
+
+sub    105CB91CAC2AEE0E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
+405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
+6uNnrKcO32/v/lux2AQ7kc0OS+ChaD5rUdihAMIfokBPLuY9OGaCNMcWaQI/s0zv
+X0xPebYYwSYHU0uhLQm1y8fzwvlSNb0J8nVR/ZqzzPvqfM49CVaU8PmtLXqx5naQ
+VOytBT0vGUvQ6CcJPOYdxlVF8VI7vB2B7F6CuxKGdyJIOyFU5NqWBcjRq3oMHXyG
+/vryt3D076ZB8dMfi2gol1m02io3czxnUR1PABEBAAG0L1ZsYWRpbWlyIFNpdG5p
+a292IDxzaXRuaWtvdi52bGFkaW1pckBnbWFpbC5jb20+uQENBFUK4t8BCADfmgeJ
+Y5yGgs8vOQ3kOKQ5B+UNGBnOq3y5NwEZzjwHsYv5WG1Mu11iGZGcu/II3MTC0YHI
+xY377HyaqEPumzN1aFS/qfT4TGfGshYvVdOa7Vy778yWMrp7RXjJDpWfgN2HYSR6
+1CbQvwn5W7JXLXM9gJddkawlqWuLc8nxtq6I9vmJnOmNzzdUo56LvBUj0nwhmk8F
+1OFvaxr5rx0zx29OtFx0nMMV6M+n0FiA37TskHLQmUnxSYHJG1Sq8jmU/i2yGxus
+CRtFl1kx6Y2lrVVaFyyS9XoeGChpRRFtjnbYLvzGWhrSmenwHi0CkZvLt5zA66jA
+7d4LH6EJN5RsCs43ABEBAAGJASUEGAECAA8FAlUK4t8CGwwFCRLMAwAACgkQOPR9
+PkEMR7GC+wf/aH8P8caJJcw26pkOLEr/+wXaJFf+u6jL2ksLIcDlMbY5njzbjWa6
+37QgcT7GqAX4Lq/ALHn1Vcj5tjD7iLrYLtI1hKHuklWn0lSh/O+dn+dVquSxHpTq
+INjFO5yAMzpez5emgPa8jSib+MHu+vomphaKVuXml4tpOTCGWsiVSmTv1urEi8X/
+XBaQt/6PMXQ29A6+2iaoSjsdrHYIkmP1zoMnLMlVIqtSPjbLkGtrZHzmNjQoQZQY
+s/hCm73XnJYkQp1urhsElETAZIeXis2lkUB20kDO2uxtTqpXG+MLw601ga2gORWi
+1ObD218DIG7UqtCb8abuiObf0g/7jQbpSw==
+=pwKc
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3A1959EEF8726006
+uid    Eclipse Project for JAF <jaf-dev@eclipse.org>
+
+sub    D908A43FB7EC07AC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+x8rPAFrvagaS2grj0z9tIo3Ki5HXDlWO9Q==
+=rPkh
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3D12CA2AC19F3181
+uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>
+
+sub    575D6C921D84AC76
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+96Um/Inf
+=ec6I
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3FAAD2CD5ECBB314
+sub    3260CB2DEF74135B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA
+Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g
+MvWpHbuhK6WsXGxjqWykAk8D2o2jfJEsUGeJhbG/12BoT87pjsUcZu7DkKilx6/L
+WoM2/sirH2e4B1FLZvE7NCKpGttZv+vEI9oZmoKgm+ZHt4cSGOPrPtrAtf19irP1
+02/+kIPghmRd9ZwnK4xEazYe6mrY+8kQlrsSWFKTaWfvXQRJjyBJCuSwZCaWgMku
+vP4P7SWTqGX471bdDhVbG8naGhil8aJjgZJlsOUZKYXUCMU6KVKf0f7qzDlJuIPx
+4nrQ3lu2QvF9H9PCnj6pCx8tD+DJBq4nRi8kE2k3lAnpjZ5VpVuW+tSwsai50Son
+ymZe5QZj9T5Nvy8tMkF4LwxA+2alWfvdHWRISuEO6jNwOuxHMtbprbD9KxY9Smd6
+YcRKKsLmKR8J6a5V7pELFTVGSLhSL2H+Z2j14fkswGE5vkxAQpGCfxQh7rbvrhw2
+lpx9OmvljnWFM7U26nfUG5tCp+ieE6pT76hcPZ5MPaqWl18Rk5dVJQhNZ3Gd52In
+ai/y0v96pn8XZBRuNFULMb2PFG88hvU2M49Y8Rdi2VW/IfN3hIh2e4FT2wARAQAB
+uQINBFhqdSMBEACzwFoQH1MJLn3UYF+viqE8yw/CESTkU1aLoI5sXBSA4wIAGC5C
+mI4kCvb/1xJEsIqtEJkNJSna3GgR8ov5NIJmx+MqqhemDKDNJS0IKvFkesNk/khd
+t0zXF7wK9O6zY3XE6lh/usB8/34mHaR0WkU5Td4kCgEhFJQIeOfPKMaG83lrxiXe
+ttRBIfmhldX+1LIRwoqYON+C0wqpfDtAeycYbOTCrjArUsYmiUkzhB23XdTive/+
+BUlvRL9ioHb+p5riHl7YfTl0vcqOKYdOfScb2d8lqgQZLtZoKzySdyIouWOriRQb
+40I/UMjVuVtGyfuhWYkIH0rPwVwpABd5kGxkBkJlrSFGPx1/o2kOx24isexGM4WX
+h56WB8K+KQMUtVEJHaSIU3fuwItcdIHoG1Xf6RXJHW9Wgw/MSZYJhDclVwfznHI2
+D5HFS+hRLKbAF1G1IVauXZBbXbOhcPyIAPwuTFdULhnPieu5ZGFetRfD9+t95rbu
+pKMt54Lvx4cG8R27LvJL86X9KrhPm4WdsDL9lKs8riEUmTliZjmbTjZD9/trIcxP
+QKHtfwtgoQnFm3aeMa7HO4lUo8KgEQiHqFbQQ4WaQruium13SlXTRgGGZuqdEtWE
+MdTEIy+3c1STPR0CkoruBxlPCe/COf8XTn2h3EoyRWnNeNqudErVq34POwARAQAB
+iQI2BBgBAgAJBQJYanUjAhsMACEJED+q0s1ey7MUFiEEtuc9hOpPzEcWYIclP6rS
+zV7LsxQpKw//YzIs4eHJfxmxrPOBuST2N06dX1/gK93+5ArvxzfxHj+1+Ila0hsm
+BFHm/Xxls7vjYAXBxjgfkL2/CZHwltTaWj5APz69lkWK7ZUuhGufKtMNrF9Gjv5S
+wCtCXt09DDYRrOENqC7JsxVhjQmSsu7ULg6SYNhJ0Xe+MfXUAKdCnMaGn+TgX9n5
+yluljNDdcBNVixNyDAqTh05bodcxEcNkVlVV5K4A45fJe4rGBNxOD3adS2UBFp2g
+qjGhoVLWv5NGL0dzFL/aAcQxRf+I9ejO0ZuHFxc+mvmnsV2SN43CtQfWQARQaGqa
+nEsn8nrXlj6WPVqvm7ShnMxJx/86yaGi6Q+FqvT4ZsPmToWxlTUqHMiDDeozidOT
+9FvGYBNWrcDkBleQeE5thHQmItJQf/Aa3PzpP9C7ImOj/FSpL3i1qdhaYOT9EZ3c
+2qvRI7zpAC0p7LdK4WwqG7oHLUIRsqk2WDmQbEMVC/SrXN7fBTxplWqFX3Kf5oXz
+d4IPWQlfyVWLoV/b1ktgKOekgqnWZKLThDga+7kDKib6XXK9Vi/pqiRgM4V7jj3N
+/+5iTFL+qK9+oWj7ZDB2tWI82sNpJBeQ89PsREOGLD8qvn4EOx4ZZL91cn6N1K8V
+bCSvsEa2cBXwSbD+0JRfuRvpa8CC4KDFkbU3Nb26dEvWPz+jpC3BnVI=
+=t3XY
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    3FF95B4331B1F3B7
+uid    Kevin Wittek <kevin@wittek.dev>
+
+sub    B62C7B23EDD13DD9
+sub    B3DE72E647D35161
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBGFtXEEBEAC5zhWNCSAVmtbCQKqYwcR/7hVifekBu0YXLpQKEgvS2GEhEnUI
+KU42HvXLBkcyWv9gBGdkWHThNiU2LmGQFTpTwal1kBBJqwGNjxPi5DKGXQGwsnLt
+dmj0WUqbo6rhFr9dLwgm9biEiYi3IvCk60ONJ5HbYZ0SMQLNQ+DGkwbggThInpZp
+ud/hpXxWZXpwsIk0yQWZIW/tbhFIPMDNz5N/m+qXTs9+AhUkH7fEt1oC7+IsIYfs
+w16SsxbVUaq7a10Vmuqf4TFHyjqTZyOVDrM7PEakQSacqCORx+Jl18t3ui1gT4AG
+j31AE8K8uRPNPa+9M+bIiW4ArlzlgaSVxrrHvnsAoYlb0u84A64F9IeQ1Ko4Xqzu
+j+9UqxmFUwZKZeyla0j8TMU81H4KTdkheoymSbvSDzjnC08WPX2zI2htyEA5wmBy
+T5LmK8TW75P+MmTpT9NIv250JODwlU0WMgCPIZLXqv/vUoVd/0jZQi+h1Net0iOZ
+u7uoRi+VU5Rja5JutSz9bK1YZg6rY1pFnjxz59paZWnMvmpmLmz7j+d2KAXjLraM
+9lkQAKc1k6H0z4BaS4bVfTcvgZzyM4qLmLh1qn0Y24ChACSZijRRPxv83+fMpKva
+dAl1R2E5838eCrgUoejOCqpVDEq5VsVTGkXnXMN9HXkliZ0FYpGmztNT5QARAQAB
+tB9LZXZpbiBXaXR0ZWsgPGtldmluQHdpdHRlay5kZXY+uQENBGFtXEEBCACtDY1n
+HnCQ9XtxuMS4TfEu8E0bpk7rvp8tEQoykdnjOLc8nuPZHIPuc6Hq3acGh6T8lQOA
+J3DSX6xxYi9hiogJrP4ZfLIZJRy1bjTSWBx3HwzkLIu0tRdYq2rcilsGFZ9PBdgk
+W3B923i4Qiw1ecOlQpNe0QOicPuucoYEuQchQ+yQvao0DGZCSPtPnIS8YHXq9eZl
+hOcstysTHKjewAN8Ucj8EiP6gBQ6/RN93w85jYzgt+DndIp1zKclxWAJHlxk5TMQ
+/wzMQLOVucqSEI9t5uAie9xK2lR1CDZAOkhO6lXjPsgJgwkenK7T6DAP5sEvRLT2
+jTwcUlR4eQTG7XarABEBAAGJA0QEGAEKAA8FAmFtXEEFCQ8JnAACGwwBKQkQP/lb
+QzGx87fAXSAEGQEKAAYFAmFtXEEACgkQtix7I+3RPdltDwf/Zo9wOzu9sJZKp0Tb
+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
+=Hiph
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    411063A3A0FFD119
+uid    Stian Soiland-Reyes <s.soilandreyes@uva.nl>
+
+sub    9242AFEA89C20E0A
+sub    2F53295A4BBAC7C6
+sub    6E50BB68CC1699A6
+sub    6B3225E6F495DC0C
+sub    CCDA41F01581C6CE
+sub    106BDE3D5D78BFDE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+NDiSxLQ=
+=VAJO
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    41321490758AAD6F
+uid    Groovy Operator (Groovy Language Continuous Integration Server) <ci@groovy-lang.org>
+
+sub    01F3A913FB698736
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
+Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
++oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
+QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
+Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
+kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG0VEdyb292eSBPcGVyYXRv
+ciAoR3Jvb3Z5IExhbmd1YWdlIENvbnRpbnVvdXMgSW50ZWdyYXRpb24gU2VydmVy
+KSA8Y2lAZ3Jvb3Z5LWxhbmcub3JnPrkBDQRS5ljtAQgA0Wh7L36Agn5UEoNg5kgr
+m3uzQnd+aBhqwG3647Jytn9SZl+PcjnTaLidhW2PB1YlkWnQsuHgb4Fru4s11NgS
+JI4SjCNzHIGva29yT3zAMYIqQuSJ6yuDQhQznpkYGpS9z6FqV75sqhNXf4fBZ+Hw
+i76lE8eU1FQaktOcDBq1B/Xewm6R9EPy9cp2Ph6b0K0yNtNuxUEt0lc09HNlXvnN
+8fUM4YdPG8dgoNGxUpSYxmfgkT6Annnl0hjHKCNigHpXmhBUjLqG53f12GGqY94J
+ANjVtS7hUlAFUlmHpYzn7Waq5zpI60n0JYnjM6TuFRtay1qU6SeKkDMggxcPjXX4
++wARAQABiQEfBBgBAgAJBQJS5ljtAhsMAAoJEEEyFJB1iq1vAZYIAIzyvdma+vU9
+m8vrfZ7M2D8a4Udzl3hLYmgQR5Z6DypMsBOc650vi60EMazVlDQXZtsvE70N+efk
+O7HMEKHg5Sa1C7tBbNKpkIB3osIXaFVT/0XLs1PAA70kppNipKRS9xraBEV7n1P9
+thithugcgqgneBNDS9N7nGrrJjYkAj7C8TxuKHB0Y3AliUZ0UU97OSyW+oDFlh7I
+VuTNPh4eYCwsobBmX1lNZWmC319HR/ASDOEt8DZSdJtuWrwtRVmdorBnuAjkcT7u
+RakpdpESTALYfjjTLQlMpT/rfU7yor59oU96nLptJ96PrnnIk10Ps4EOOB/8ssA/
+jfDQGVY4ZIY=
+=iMij
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    461A804F2609FD89
+uid    Stanley Shyiko <stanley.shyiko@gmail.com>
+
+sub    8067ECAA8D58321C
+sub    750F9A735EECF640
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=7uxM
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    4A1BAC7F1E3B89B3
+sub    B4F772A2A08563E5
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE5FdQoBCADPVXY4gMG2TMUl1bFyh0FjfM/T+DtCRNNw24u4wbmTjZMfHnda
+H08cT0tSbJSJ928s3a6Dn75YDrrhRbYyhBYBo1rz82swLNLOk5EOSM0VqwqHQEm9
+gmLsdeEtYWDgxmIVfJbMjF77RWwnG8T+fXR0hLAn72i6Y7mm8JT5O33A2xHP9+/Q
+g60IHYze/WTAZK678rGvyxwKF4zX2mwYTFKkoL3PaFM/7HbZbLe0HVB8sIF7x+c5
+glEVb9wMApjq83SmhtFM3u/ep0uzcg3c0ks5JXZQ/KtPDYMq0NFp7zGwaFiAF5D1
+BaLWHRFeD6k4c38EPnSQLGBTeVwm+gWHaTjBABEBAAG5AQ0ETkV1CgEIAKYlTJDL
+th/JjDRaFu6hA0xxOEtXZK3fvyrP+fTTtaCyl22E1rAgeETrvoqiK3qvxjgExO92
+XnKlpNSq3LrPiqIIZR7vjMr0HWTHmFOtEEmwhMxsgDt/fVt4sD01FvMr30HGZV1L
++Y9wSm0VI4yJHPy/r9gcCWbTWTHJGvpSf75NeetZwMmnNZ8yneCUtSNroWHBl/Dn
+lfsj08evMhHA96HA1qO/D3NRELLYjhpF0mcIijY/7ZiEqvXQxE83KXdfESOoTaeP
+qhuepHCldq6C15bseOQ3KOq5+23TFeNDPinY68AstEdg6CIbWzlOAGGQAPR2u/WM
+e6sPsoeEBicDo3UAEQEAAYkBNgQYAQIACQUCTkV1CgIbDAAhCRBKG6x/HjuJsxYh
+BCwXCOoFrfaWbDLWRUobrH8eO4mzlkoH/3LWnzC3x0zNtd9bctpecKu5cgZeaZqQ
+Lbur7bAmn5uwzzbkrAag2J94hNoZmdMQMwCXjkLBXUUELsL3IUNVFoOQYqq2fl83
+Y0A8nxamDeyLuZ6pnKWomBkPDW96VkDjCy2QmCViuhJLXqtWzd9I8VPbqj7vNcT/
+7GXPjjD5jczjSxMYBy/B5562kRSVyyzhOBd0qMu7LpaHDNyYvKL37VpPW+9rmD22
+NnsFqUqYVAD28XLRf5Mn1/zJDV0h03DYpZvCmEGEFwgTDpt/jtt4pK5o33gu4TQ6
+w92QnX1ytOczI2kclynmhKvsr1Qq446LkS9VpX0J62danwmjr+X9eoY=
+=Ljzu
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    4A51A45B944FFD51
+uid    Tim Allison (ASF signing key) <tallison@apache.org>
+
+sub    127CE18327E55B2D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBFwGkIQBEADBkuDMpFPE7nepfcYCWYYE3htn9apn6TudnT+GgeYue1g+XKct
+c5fq/TiX0OOEpBt9xKOikSOwMTgdW6A2LKm568qgDN79wMleHFHel2VOiV59z8bH
+AquBxLk8ZV26QODEjm9voOMXsf/qe2Y+lRiulL+TJP9Ze5LklB4s0rc7EKERLhQ6
+EQC7GXDTp5IY5OHp+ghXknekjgN/KbQqmZm892qQ1qgRV3Rb54CxPJeEebWK2epC
+wQSjGraka4Hrre7eIB0Uuhri2ll9O03eaBqTAQzVdz5Chl1WnbGWsxIb7tL+rw8J
+uO+R2vHazZZIVoRSXfsohPu/ZkmpRZXp1IPLeJWs3Z4YeZ6w/PDCYRx0rbSlwT45
+DUQQ3AK6iT5nh7FqPAnYom1JXELogw+bMQtWVSGHujazC62cox9UmvZdZs9H+bIW
+xRqhnqltuZaON/u7bKsHZWLifWJOd/8D/r3u+Ly4pf+LNyQY0cSC7hfcwg+s8cb8
+IbyuNIAoQvOfrwgjlHqfeWErWe26aQkBjtFtiI9AytkeofRFwhwjzBhCa3L8xMIX
+Ee+1y7yrvsgyblMq0be1+amQ3KXdf7TI+6nar6Hy/+G95kMvynwzwd1ph+CyXF3p
+Ym0u6Mgu8CEf+Bx0YZSEFfHO8r8w+m4K5tQIRE9fOYs5s67+FdTOqXl2KwARAQAB
+tDNUaW0gQWxsaXNvbiAoQVNGIHNpZ25pbmcga2V5KSA8dGFsbGlzb25AYXBhY2hl
+Lm9yZz65Ag0EXAaQhAEQAOU04C5DBsaZqJ5jvTHGeVhF1JNumLwJ9rn/UBsAtqGv
+3Z4TRF/RwecqXrKxanIWgLwTPNmFyW2s5lRTBsoYsfsjkZd10lRqofijSmwdqEb6
+5lVGMeYf38BGYoJG+1aVKY4cqFl8hXgbvmGQlHgBq3ctfjZ0d1v8lePuQB+jXZDz
+NfcH1zFifj0PRViVDb/RrB2+EyOyK/bXsszOqqxvtEYc2c98qi2t4pssravadVUI
+w6PIhUHnxUKEe9Z8Dx1J74hCr1k9xLD6wAaY1I2TS4wP+WKLedNwes/ynK5sAH6b
+arEr4EZZqcvpgNvVBm1lLiNd1OHJyhiJEvr9Yt+2ymdHfc1s1K9Q3NnoEEaTPS1b
+RMld3W4VfvOkp0IK1WaJGtGoZFk4vxwpaxleAXKNkmOUex52jCqegB8s/hIOWIfJ
+TyFFVHFj10dqtDVMp4gpv6RvsiVC656m1s6ab63B0CfBM4U38h/PacOddPCF+5du
+G4DDRqaY4mErcVDf1bL+gPMo0JhDtOvwRrd91nIetx+k9g6DVLVTM/rOzoHXTCTC
+xKEyVIm/kGhVCvprh1uHFtKXY62VoijnUrJrx8Jco3OxkRjJNZEwg2lkj5w8Ub9t
+ESi3sgKcSIDxJgIphRdC4f0ZmYqYNmXl3OELZZRwxPidI9fEjYRZXeq6K5A6rl5v
+ABEBAAGJAjUEGAEIACAWIQQYRFT62Gl3YPPgDS5KUaRblE/9UQUCXAaQhAIbDAAK
+CRBKUaRblE/9UX6kD/i0B4k6knoMmT5/7g/JWJlKreHYcRmmQrhWci8jFovIGq30
+HguI14WjzXnIcePyer1iTzUrczjUstxh4/lGd4HigsdF3JVibgN+2eF3NDhUqGVg
+YgDSerC5SlRTxAEgGZtG0z7b80poqPo1gkxcRXkO302KlQ35w2+CBhi3LZp397XN
+fL135vg3xwIUX2pAfdIf8iDDgFIYPgtO6W0KRAK2jOgf8yNU8WCJBKVVxxyf+iIR
+zWQNsdmxDxQWgvOJSO1ugeaPMjpzrgn/yURVGe17q6cKAi9j/f8QneB+MoQL8/E+
+uh1C0SKmb0gjrEhsh89e57pBkcxuZezFulmcNY02EMGaWP1SOWCoabHJjw3asWth
+XRyZ9lxkWLGSuLEd9tkbuQPlgcvC4xAB/lNoEiipAGi62E/zUy+XomflZTJK3dL5
+foxC5vKr0mqyfpHXnUCOL4A7StXlB2333WGUwQTUgY5ttQ2uoD/fMu+xOYttRwAb
+6r65RFFJgZCoAbQBIRC4FlkjBvLLXFO7uu2PpNMQXfu1IwLzFDG114O1f3b8dsXN
+xnBM8vYZ085cF5rVxMmVSOi+0lSkbEj3GXeQt87t/OEj9SaCO6T6MBRp9OPGnfk7
+v3JHvrCaJXEbW914XzMKKAHta4Eiy9YjQjP5avrJ+xn+ZPAqorRsKaZk4Tip
+=V6aq
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    4C00043BEC5CB7CB
+uid    Robert Futrell <robert.e.futrell@gmail.com>
+
+sub    BB2FB7B24B12AE10
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+Dw==
+=QOGP
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    4E066E0459CD109B
+uid    Henri Biestro (CODE SIGNING KEY) <henrib@apache.org>
+
+sub    CCFB05B8CCBC1F4E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBErvEZEBEAC1bM12HNDrdM7hs/4Q40+mq2hA3w4Cfh/SqFxhe8r2s1Z1PJHM
+tY13qg9XRH1PsUer46q1YF8Y1lKc41Nm3wYab6sQqN4WaXZuerIfRzHCMkf2c9rk
+6RWzIsvSIYjGsrkRXqEXPLZ6CLkBSZaRsjPuiNulKgk7jO2tN7qmFEkbdDOJNJiD
+VGM3Z4aCLwGNO5OZShDVEDlaST6hD9JCqHXYEmCLDBHFoKtkZQ+m6GQHhR+BJDA+
+WihI9zcrkor6gyLyVeaOO/YqEVh+eMpolzTJPUkKb3zGjDHGkBQHWKzKVK9oNZQC
+6m1a3pB7qTtp/CpaMvFbdgBaYbJUb5kfY0S86qPfEzV2Ckg2b2uR+F0WTMbhfcER
+E7PVMGCkJbt18l8pOejgZmsqGkw8du2DMBO+9YPyXn+tu1Xkq3yR76zShk+5b0B2
+TpwOyopiWJ327C13xcYRwYhc/MvxupdzczVPT4Jj8U54Ykzh1nSgk4Ry9qgQeUgG
+CxNObrIa9B3tLzWnPhyfHc8ZdGIKFZTdZYxO/aof6iY1W/zEefJSwCOprwq6ueVH
+TEEDCUdN5NlV/SFw3BzCMDxTBO+ksUrvqTx/MdoPqmYwsXTEwFppTlhGNBTXKH2D
+QJtMNVU/FMll8hpE0SS/tqiNzcVwRpmw78LgnTnh3DDwsDgCXhzji1xgMQARAQAB
+tDRIZW5yaSBCaWVzdHJvIChDT0RFIFNJR05JTkcgS0VZKSA8aGVucmliQGFwYWNo
+ZS5vcmc+uQINBErvEZEBEADF3g8hWVkCfuvFFrzNCa8XpwRmV9LNHSIC04dJcZyo
+BO/GtikgE6cDvrsA6Vd9Zmh89bTVci2yEBCet6i602AcVrTS8ckedYPdN8ayQMq5
+FPVyEX6EWIX1YP1jSiASTlse0Phfw4C8OtEmdfYNue/mkX/NcXRCZEPTqpZ7gRTe
+zB18jlrfdBIGI9rl1HDfnosZnXRLJqZCyZYKUMeSXqzXyXfVnipGF2Oa6Z+Gh8jZ
+bGao2/o/qL1MFTZh3u/AaSLq53PmTHPIDKSjNeBe3sE/abfgWL5SEnN3Zt6WWfwR
+F/XuToinDXqt2oZJkVgIT/4JRLje/BCdDpdTaKlrLc8tEMEczcxMy1wriWiNLD1z
+9tRI23gfE367T3fDZ5M88MrhZYqIETrlI3FodOuavL3zBxzN3KcNdzY54jzQlWC8
+UdzleNv2y7fzTJQyZsUb+IPILOa4x3dwPrqNShhQTafDaZIuxFnZT7xq8K/am7qi
+nA8NP7yzFk87g1Susn9JhlxwjZnj4Quyh8v0JQSZWz+XwPkV+YSh+jFfxM8l6rNc
+0XtzcCK+dBSYcBek+CVgTWnFOeVGjqjuzIPVNkijy3d79hKZSF0/Qk0FHG2Bnhal
+NIlVUNMk9qkKNFUSefS0lPNEKSqC+TPSbIf+UJWRDanO0BGOBUZ53WKutENQpQhl
+0wARAQABiQI2BBgBAgAJBQJK7xGRAhsMACEJEE4GbgRZzRCbFiEENpLBLH49M2pF
+K+slTgZuBFnNEJt/TQ//WwhiFAoqDXj0mS7Ei4uJ1c5dXLQfbGaTrb+FfPNKpk/J
+tSTqs7/YhPk0LkLu0sGezENlXB7n82Cm9kuJtTCJwv24cCm4+3E8ss55gq9Gu8Hd
++92ce4cBpwkqcHPaAIbHFh+FXrpl3fJQUmEOeGtyPb4ddF0Ggj/L4cKUzXd8pVdQ
+XsgRTwI6Jp5xNkp3IzhKXPoXxXtJdcfZrpCMq0zozxC1EcdYy5jWplcsGv8OBd6J
+KqD/vJkXAYdXX4EGy2nA741KKSZuJj8fT6iyRctr87nxvF2B0LKEp9sJ/cS5hHJj
+rDkkJdQ8ocz1xIY9wPLIZqPKmxA81a9emzGgJTOl6fWHpZxHhb9NYSciL+4VhMr0
+fPJ+hyMN5om8lV5uc0Jjr64VTESXN9sXaPSuYMEuksczHrSKKJjE1litfbTzsdhs
+kLJQennnSeKIdPhh7tS5svL4AAlQFaXzPiivYz9RSellZu+GSl8ONg7VJrJDMxWB
+6mjjWRHSyTcGQK3Yk8dUNkZ/jpV7x2hby57it0iC272DqRRCr3nZaoBmMM6PS+mO
+eBgdPJuDHbfpHfw4KcLAiOriMj6iqnFD9n8fk1wV3hWysly2aJxG/t9lcJQmSDNK
+iuJyhxM0gsMTw1tWNTIUotayzgqdbeAyYr0fly8nVZfScNordFT990Y0pkbR5e0=
+=gC7I
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    528DC75AA68F0923
+uid    Mark Collin <mark.collin@lazeryattack.com>
+
+sub    B7D8B732F9FF1283
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE9gdLgBCADYftTKGjQNoatNJb2Z3GM8zWVyhLXmhc98ZnMLj3kLmHIDagAK
+up+yHD1SSY7aZdrLf0mU/LArGczFRLDe86/D245DH3wSYfIeQN9d5Etg7CCzRb7n
+54xhal70VF8IoNTEOW5F2FX8PO7thIXPfxMYeqAuU3/PruMsE/ZYOj5a7YBexL+s
+HwQiN7FL4wuX/ABkVeDvnu7SuL05gHJ3ISL02zhrMuz95JTIFgE7g+K6T7mlcmJS
+XP+7C7DC1FTHNY0efxVGv3bCgxXOwsBZ9pHsGkP3SMd7mB6/2mt3ms8ci7QkCOvp
+DLnPuB0V7DJq7PapPtDAUghySsOlvQMU+/d/ABEBAAG0Kk1hcmsgQ29sbGluIDxt
+YXJrLmNvbGxpbkBsYXplcnlhdHRhY2suY29tPrkBDQRPYHS4AQgA6uTjL8S6Yql1
+hR///n5Vkvf0YJCy4bkNaFAOnoiVLTEQfmOWBUbEhWeFh5GxtKbGWghnzSSp6hhm
+/To0SyKzyRughBEXCjrjhg7YvgApkTJi/PzFIBqfJM8JdUfi19yONn1U/pw3/3ZI
+pv8Y87N8YQwsNETHW24OY8CIn81x11wQFC19Qq6CYKWGYD4P/g0LY5VWelPYcTxD
+HYs97KgrQ2F38yrlxkOb9dPtWKAsDSV4aRGOsif9gNyteaar3FGjQtm2mOIb/G1y
+0dfW7EAMjXj040y5Yas4MPHEVsmnHzmw3SBuNRjmadoFNczFz0dlCM8xKBp8bCGd
+HvT2sAQi8wARAQABiQJEBBgBAgAPBQJPYHS4AhsuBQkHhh+AASkJEFKNx1qmjwkj
+wF0gBBkBAgAGBQJPYHS4AAoJELfYtzL5/xKDo24H/AwHUKJ2NU9yQOLnjVcY4ZJf
+VZGR6UVHslli9stJfRJ+fxwPyxnCFKTzDRBQxHZ/cWB14iUX2byPYmyuIq1dMmrq
+NloI2t6Nq6JPfXjH1Os8Ps9lHzj34/9IpA/+nnfJyyRsMG+KvGuVEHhrnCLN//vE
+61EvJ/FmmJd8GZHvZGmrJxVGZkIbweS4r0SGKau6Lgj6q95PHTF2FbKD78k1RR8o
+Qcc3NqIkP2Y3mNPVCYAB867ErdrZqyOCCfhBdZdNFemgzltWojG1M8ZSJNZHuomE
+j3treus6l+k7eToH0HxfsN25QLGvwDJgHSxH6yHzyBlTOaEozVs4awrSmavQD5Mm
+pAgAnEJq2XZuBDKUhgCOAUcjKV7zy6m2t45a/merDOHORrDU1HEA+H7bDsxWmZvI
+v/btE4+FP3gPlzn0UvOllNtLn2Nio8D7kUsJ5U6Q3hh2jeAGedRYMha3W4QAv+Wv
+T4zypvyOqeqnEBQuWjqUzxIThtbxEHbLLPh38/dYRYJBNqwuJPXzBqwYnaW5bUwz
+MsonkOX2sPbJoewsdeib7Xvj+T7tpVTgBjB0rUPKWFAfJkgZXd5/lo6dlMIAbWCz
+tRm5/5unoF405Sy5e4aMAQhEIixJ8DcOSdngQheFBvJpRGm8P53D12Mns9Vl900f
+pyYELsj5uHzDtLodBkqdZR6WuQ==
+=JAXb
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    56028DF552BA32E2
+uid    Dokka Release <dokka@jetbrains.com>
+
+sub    7EC19439E4D4C2A0
+sub    D89D05374952262B
+sub    B5681E477AD61C38
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBF+7lwIBDACcXIXAwFDoWvCCWn+OImyyJQvSnnte93Mc1ZJtlArkrjeGU7Mu
+5giUH+FOyiXlj7CU4G9RTnAzDgM8XPncWOERgRG2dXtO03Li7iUEX4Z8PCUGsTxP
+2VKGuCF4Je1ZPGxeKG49N0L3IIBBxfCzumE37LP3diw7Ups8xJUhZE1ecF/Ow4uE
+y6lBOyaJM8VJN65GLOdlbjOTKaFKR6aY7lPcEGyClh+SnMcGTocLf9joBpDI8WZM
+NQoQlVtiT6ItvbxjxJmA2hsodm1Ix/xX2xo3hdXH+opmsxlNGSK26hOSMKTMQXXR
+m96Slky889SPpT+Rnbp+zPSsWqUJBzTT83DAfH7PJ210bRuzHJZzSox/2iiVbm09
+e8rny09ju/OTA5sVvg0ibNscO2wyGsFjoBTFB4x27Bl+4bloBot2lBO7mRkhOIaT
+KxDkKPSw6vQnhA3a7p5nGMo20MgNhP09ui9CwO5Yh3kwnA81clldlMcjQMLy35ch
+kSoqW9jnqm2CI5EAEQEAAbQjRG9ra2EgUmVsZWFzZSA8ZG9ra2FAamV0YnJhaW5z
+LmNvbT65AY0EX7uX3QEMAJpgrB0PwR3KYUthxrU+zvZvh5gR3Wumqs75dDrTsgiz
+6uDT05YEmflEO8/lvvZQmdQkv6RP1rRjlQsZEYjt6nlzwhlgn3TFIXagUMUfq39f
+Dp0Eq1W4Y2hCfk/jOe8YMknYrFI9TGjAfwX0t/bZ2VYOE1FEk17XBNdCc/yvrgTt
+F6XSmEOoCWv+2HGfPNo2M1cwX+wJ43TZO2jxHOx//1DGV/gkLoqa3Yqe3ZNwWKVn
+wapnqfwlmrNJC42Y26MtsIa4ktsOURpKgAB1uQ7oKtesvaKh3XwW65tgv0kMeixg
+vbRtrpQ3hDk+H9iGtIqx+C/1NvzfoIa8fKiby4D8+rXj5S+gjtwVZrY1t059wQSD
+JNCWmD4PG/RoowYzdJmwfDxUMptcygJ6yYfn3psTbGF3HV/0jUzqrKDziLjCsKzh
+d2Lxca71ItQYbLDjCsI9diiW7U0s+M2PBImvDU8UWwqnprimLCVhsMrRAgaTb4mU
+gFF8MoK4QbRCpWOJz4joCQARAQABiQG8BBgBCgAmAhsgFiEExTaii8ifslAnLJ9/
+VgKN9VK6MuIFAmb5wc4FCQsAkPEACgkQVgKN9VK6MuJziwv/dAAYdjuWkkJd2IDa
+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
+VHF8XjqIapJdEkbmMXU=
+=0izm
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    56E73BA9A0B592D0
+uid    ASF Logging Services RM <private@logging.apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQINBGO9IPgBEADHCB2evKGSjQutTtIjODtaYUoU634Tl4Iv4DYsOR+MyOQBJ3Eo
+9okST4azX6r9Fspgmc4LxpFnGm9OSEGn4NZ9ZxiTrmKaGsoXzj2w4JKtgAip4F5h
+o9Ai/ridqeA7V9VH31OLSyZ/YJvrcoBcxWdwcpydxchlKQOOYX6wKqGk0BO38870
+sI1d0y1W9pC9AiL+z7qaX3WUslOFDCGxRSxZs57x28P4pkRy0HwUWn38TrS4fnA5
+XfWuxXWr2K8/xtf+Uf2EGVUP+qiv7kDdKYbZj+SeF4ba8nLPcuFmnz6Q1iZUhA9s
+sTfruyibtm7htngt1IHFy7DT35GrIbE6D7W7S3ANqg/K+Gc/j9JXKjOwx8AM/WI0
+WQ5w4fSn3C6WhFTMpyq445c97+5ki/SKbFP45oWd7A9JqIMttMqZLzOSzFM4230J
+Cd6FQTGJdtcgfruwltQOUWl4IaCOsCAzI0XnxTIdsaCDDQ6+KspvdFw7zav03eVN
+TguQ39IkZgke2Am2He5vtxXAayv/qiTKsyTUxIIDe1ZTS5j3MJ+SNWR0faXvvDaV
+QgqVjsB9U/CHjcCYbmFhKxk2phGwa0Wc+NHKwyVwjhJkFo+U+XDGJaT2RbhDYD1H
+LeoZAT6kdngSzr2WvXWs6xJbWIXJc5FivUorfkhaiaBWam1R4o+8kSuxSwARAQAB
+tDRBU0YgTG9nZ2luZyBTZXJ2aWNlcyBSTSA8cHJpdmF0ZUBsb2dnaW5nLmFwYWNo
+ZS5vcmc+
+=DAIw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    571A5291E827E1C7
+uid    Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) <central@sonatype.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
+3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
+RSCCRr7A8m6y83npkTVDW6m2oFN2cjFwPLm/vxg1gu5pO+NCwz5iBRHdewCg1idO
+Gl6gBAZVNteCRMVnGnX4EhMD/RaYBO2j511h7gR+p+6BBeJTEIA1+tsi+GhTBkS9
+mUMGuD9Z8PyvwL7quGQyXJ/kTe3eB6iyDFn0oemB1w736FQe3vcIX6eePOEiDZs5
+1Uepv7bXI4wn1i3Z3kzynXNKcjCd5ZxAmML5VlQ0zWeE0W18reCjt1P5q5xxBFjw
+0L8WA/9aPi4d5VPakzuDvxfKK29BogScTLn2C3fpEnqWsTfpoWSkNXkRsoB4jUU4
+oIqRFMTxwsjUmjVUPOG+YqoeAaVpj+RBpp+V+CqgfNWpnH4caxzODE9f+6RYRCGm
+LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA7SfQ2VudHJhbCBS
+ZXBvc2l0b3J5IHN5bmMgd2l0aCBtYXZlbi5qYXZhLm5ldCAoVXNlZCBmb3Igc2ln
+bmluZyBhcnRpZmFjdHMgdGhhdCBzdXBwb3J0IHN5bmNpbmcgbWF2ZW4uamF2YS5u
+ZXQgd2l0aCB0aGUgQ2VudHJhbCBSZXBvc2l0b3J5KSA8Y2VudHJhbEBzb25hdHlw
+ZS5jb20+
+=2jV3
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5796E91EE6619C69
+uid    Eclipse EE4J Project <ee4j-dev@eclipse.org>
+
+sub    153E7A3C2B4E5118
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+gfA=
+=Sm83
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    586654072EAD6677
+uid    Joel Orlina (Sonatype, Inc.) <jorlina@sonatype.com>
+
+sub    2E74CACB6918A897
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBE1VSkkRBACkCgvt26sMi+0X+EOJDMqdK0Sziy06k47LJf1jOg4tTZ2T9QtP
+OZ8fD+va/O5+q8Kna993jzcO5n0Nv+R/K3+MvUqSmdITshCIjBt3cC0n6FWndGyl
+jY7rOmzdNnvSkMGE3V2fQ18stkJRleqk3EuWwv+EwpxcYeVfCO+UCJGz5wCgtqnZ
+JYdRHcDkDYaIZ4eizpbV4d0D/3cgBdpcbSrwIGtft+lDxacaJrWpT5Jh5P0gLlYu
++6PFz8ZIC4+/aOSi4S4mgZxk8dBL8ZBqLqcW9rc//CYKNtPq33sdf9vxcusMIXvS
+PBODjDpoOsTJwy51fgCEL14qnp0v14y9p7ejjN5+GipiNY/JHo9S9kTdVhMYqt6x
+6a6MA/40vMejIbZ4q3Ia63jbHPi348fLDq3Gp8Wos7Sh2HnLC+pRdC46qX/5wL4t
+Vzj78yW9FdH5yeeE6nQLOBWh7PnSfMt2wYHoarEnkkkycP7WLpRME7qsBYqkNUNa
+2EQZSy8DnGiayYDij1YPNUHI9kpK6H/e3puhmgNkzrZj26T85LQzSm9lbCBPcmxp
+bmEgKFNvbmF0eXBlLCBJbmMuKSA8am9ybGluYUBzb25hdHlwZS5jb20+uQINBE1V
+SlkQCADrG964NxqHiAULSXYEVH1CwlTRILkiTBEkL/cZyoBBnkF/SLVX3TC67y23
++MksiCdUoQUfJPNF5PDOgtlwPnNeAFVK7T1B5rHjud02NJ9lY2Q+ZrO0zmP3Kvg4
+XkwS85cTbCvOatI2VzitvkpYr/WkQSJf/N3NYkuZATO+n8y1marIrqkLC1LxL6Ap
+lCNlks4Sd7OLN5whx7avrEJHGi2qdxTB9SD6MxRSVkpSUrCHhOtgMUeF63xrNcum
+MQPQBIbv+kFgNtE+eZaFfU0+IHgy8sMROvHrtqzPOuwZdnH1OvrVuEVtErINjmJr
+//nTXtWBK0YCpuSQI1kcadCc3OO7AAMFCADoDnwynvulS0K1WF8FGfOIqQRoKfyc
+Kmoz88WvGKHTx9AnfG38Nt+kHHfUeTLsozW4uDNkSd6S5TRmrCArdqpaDzSagpok
+3FRl13mit4Whuw7um16O3miZfqTF0aM9yU63UzyxzoT4DexHlrZAL/0G2zjabJzX
+Morr7p3dSl9SWqBo+9dsZOyKwzuO3gO1XPqZctPKMCJZ47Tt1xtKOBm5GcexIImh
+vNOY20VM/UOBR5yBNw4rZqOAay7MuqRtpCcr9GJEjOqQUhaXPyvOVg1eHxMD3QEt
+4ZdK5U4RbsYEhzx9WezqjXQ52wCqfMRCpwJm/94cdeO31PlaBXd6nLnXiEkEGBEC
+AAkFAk1VSlkCGwwACgkQWGZUBy6tZndAQwCgs/qSu+5vFRvBeGVsg7YSIxOHf8wA
+oLIHbQ4IMkRivPgSpuxw53Hofe7A
+=9YZ+
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    59A252FB1199D873
+uid    Tagir Valeev <lany@ngs.ru>
+
+sub    92BD2D0B5B21ABA2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
+MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
+ymy2N3BP9cz2fJ9+3PpBccUPL+ydFKpcnEnIwiQK+p9JjEWzJBlrdUc/UEJ0R+n/
+5r/+0+BHiTEMvjAF6/SwyntpTWpu7iEzLv/pfdCuhFKa4yn+9Ciwe3wGtSiue+dh
+tqKcd4YxED3oAswObBca3CC2HWWsUEH6EmfT1jUdfy1cq4X5x7AZ26oFYfG+odqW
+W5dcB+13VkJtJRzQTO/2HKtITJYC65a1jKt3ABEBAAG0GlRhZ2lyIFZhbGVldiA8
+bGFueUBuZ3MucnU+uQENBFUBG7QBCADbCC7lPXB/xCBC/jqcCGnK/8t/+ixvqJPE
+igxyJRenEqbrErFjOi/kRnGYLwg0dEtBBIneOMsvMBTL6GEpbFxyzeEqh/66SyHO
+Ag/A3Qi1q2imkWa4baszVkrGMRIKqO59cTuvnLFNe1SQK56ZBjx6AO6KGZWhq3NM
+v65ZE1x/viyqofJ4jvQ2qeOqSxa3YL7sim6tQen2gH9iTEcr6stvn7sH1Rk3OwxF
+FBbcBoOxZ4gxdM5ft6xRtbnfZB/FFs/hsAsBU+qoVYJYDprSYMNQkmDXg7ELwweG
+EyTZzJ3jEnTOgpBHEYS6dvpc/dPsEdCv2vUARNTT7mwGkQdrkEeFABEBAAGJAR8E
+GAECAAkFAlUBG7QCGwwACgkQWaJS+xGZ2HNriQgAxxwfwZnOPGHtcZek+p2zRIjA
+nZqSG2viTRZxFnLnquMZNMaF11EqQZ4y2lj0K1WSh13TMZpkdwY4bRb7C4Hmo8qS
+1JFQ5SjJHRkLbFly9Gm6+HDaDA4l1EcZW14MWfPoSLP6yklirbq6wg9leDFy7EFe
+MQK4dXs5CRRAwN7URs444M4OTMJq5i+x+T3Her1dSnutAZrxWL740cE+FMNTg9F5
+brjzmmok4m4TxAnOcy8Qc/fnkUrEW8XHDRMz2CUvF5ffoSMO2OzndfOHDqHscXaC
+PyudpB+wOcnxI9pFwmZubWMpcir4BqXM1nWbqFd7tcYPre/0JYIUzKCQANB+Rg==
+=NhW5
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5B05CCDE140C2876
+uid    Matthias Sohn <matthias.sohn@sap.com>
+
+sub    9D29AE4A6B50E01F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=4fam
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5B30D3B10694F057
+uid    Disposable Szpak CI <szpak-ci@users.noreply.github.com>
+
+sub    4713A6A15A6EA9E5
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
+wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
+ZXaRUHGWjU/lVwtOk1J9GokIFoqtWqBaQMgNRTyyHKWKpb6xxjlzkrDqV+a3htY4
+xNe5F24QLFqf8QiiLq0nDENPzvTNNerZhGuRCHtMgV4eih2iNzmqZL+Ug/gmNzyw
+vu6tWGNw883JQ2HoJr/wC8blJvDJYiOcahrZ5enQKttNKXHiodvL6CTP6q+CTa5t
+EQwbsUAih5tndvgwKkpqVM4aZvFTmAw/AZavABEBAAG0N0Rpc3Bvc2FibGUgU3pw
+YWsgQ0kgPHN6cGFrLWNpQHVzZXJzLm5vcmVwbHkuZ2l0aHViLmNvbT65AQ0EV/Nh
+AwEIALdwrp4XXrmQqdUmtSx3suIoWefd7iK3wUY4Jzb96MDOmHycLoDorhCcErhX
+5OIhQfzL+lNLxrasCKsNx0ymsVKMRQdMFUHbPT4u4SvPa6ZGYcipj7Y2ARU90RbV
+HnGneV2PNt2HsVJKamqUsdemACLjf9Tr3HVRNJe2PMRoVRK8GtD9Q8WDxVzbhnKh
+6Xvj2BrWfb6tZ0jpv+EFIcNyjAAtIedA/nONOhKnaOZGbfIk2PknXvCvSIs5Uq/b
+UcauF9mmtluKt9k2odvmZufup7rM+dSxI3YmxQ72cuik1LLDYbKSp2B0sHxi+uN4
+YMw2cufKso6TQv9rSUxjx+Ee2gUAEQEAAYkBJQQYAQgADwIbDAUCV/qbNgUJAPSI
+MwAKCRBbMNOxBpTwV/NAB/4u/mchd/CCIBRK7GDPFu9PSzzQxvIw2Vy9YAtEzueq
+fb9V06/+wGepUFJ4cB68b5T83be4MAW7Mu23gwa973hN1iHPC5k90tHw69GaMHR1
+5RIEjUhBQXu9vWvH58m/YW0OKF8YO81sqgsOYs3rlWGarJWRxNCkJRFs/cFJHUX1
+p1Ac/J7dWpJSRJP515L+Dl/vSH9zc0Xn0R6NuCGLg71bidcrkzXYOojmfD5t5laG
+CmVz3kRpgEAajCMi1PL1ncEtk/rN6uE1f5SfWGpjHkAMrG77bmNDiq5HC6HkwQN0
+ZrgDbm/oIDX0fmxt+2UyudwU7Yv0kQCjMpYSRAxQeONi
+=UQZe
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5B93F1DF7CDB6DEA
+uid    Simon Steiner (CODE SIGNING KEY) <ssteiner@apache.org>
+
+sub    7BA5338873382B77
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+9Qf0nkc9gMSCkGoPEPcTUJir9xUWEpBHGko=
+=GkZV
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5E975CB00C643DBF
+uid    Xiaoming Jia <xiaoming.m.jia@gmail.com>
+
+sub    91A4BA316974A467
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
+dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
+Am1Q6qWxTcJBUtVjjlTMoWcCRwFNP1229ICL6XdfM5djqxOuIcCMIHC55YTldrDK
+5WWgcXC2NZgUbRn7/8dpaCn8iFAyhYjYKAk1lS8kSxCDvQNU9DtdAWtaCosoWBZ7
+mWWIeWp21erk4jgC145GujHYeqynf7VmdIB80u5OeIV6CwJx2ap8AgrKcOCON3Kp
+kYa7fsDGxq6Lbzbc0rzaIfK1wyGo56dMySDK1eZuOY9Es/wzaYfpzx88gn3rrcaw
+HwTKBoug+9z09m/rWy1DThW1gruYMUrxjeyhcdXlEeVrv9EdNCbbfKcg6MbrZ1mu
+Wc9DIAfSQ40Lv2sKxTyubZXxvoyEhD5LTqSKC0tRt9xKjHWWWSG+cyhXu/2hYmp1
+Dq7XvS1p8NKjD6cAEQEAAbQnWGlhb21pbmcgSmlhIDx4aWFvbWluZy5tLmppYUBn
+bWFpbC5jb20+uQGNBGHvIbQBDADNSRxyLYyzfkdxF55RktDmgSKq9tskfR1QcrQg
+Wvi96fJekLYL/a2hmJnbfUbqaILnkyUmIf7zONlCFv10U81prG9wxfXUTMuabpp+
+eXUFdbCZMc7R9JGXw5iaRWje+jh/GaeB8xY3cPbtfHkXZ7nWkQaq7b8DutJrAqo3
+9NuprRaaujfU9PXj93tunJExqi2w++fjT1aQ36PaplXRZ2qWiRxAkaIUGxjVgLuO
+Y1FWZJjWX2XMypMesUSfUCV9IwlKCc8+55m4jfbtblPQHkbe5zvstxxfHdYQkGng
+p1rNWLHHSCT+Tf4Y4aR2J/E3mp6wSBVxgfguS3u9h1mY9fEfe2vSHWkWmYNm4iDA
+msPn8KTuccbZlB/cKIFS3AET8ZHwHqHuCb4TvUy8febp4yo5ZRniTVQSf2aA/izu
+wmKSmq0bX0hjGRBVdGR2jlD2ND73lkJXU7+3sIwY1ebNVzvl75Y7slmJNHsij24f
+keZtcSmRQ7BL7ZpZ3fYiyi1/MxsAEQEAAYkBvAQYAQoAJhYhBNX0a8C4avXcVt9Y
+8F6XXLAMZD2/BQJh7yG0AhsMBQkDwmcAAAoJEF6XXLAMZD2/kY4MAKDX+NsPosjH
+t95895Z2H8A6JXOEt2F/LqUZ6XOqW1AAeLj+cGMWBDDQYNp/IkizV4iMynmlHlzg
+YivT+52xrUvEzOqMRUrDNTPrbkLUjc/Wm+TA2J2ZGUSjZZUmP1sBTqSIa1NCqWl1
+VRWZcmbckCHz5oyoeXKM0EKGnPwOZP0lf8M7f6QDUJY5DS/5RTIp+6BxHhtRi5uZ
+BN5QLcamhIADwR9fIlfoFfXEwEAQl5Z2YTnyMf/6/5FWVgAS1PPFqvI9H0HiWPx+
+XSfgJV6K10GwRTtdhT12M4teNFsFUNhngsvO8WCZKsxz4CV+Ai8bSMmWpNsYk72C
+bRMoEHMrHuVXKKaKv70eFd+BaGTuLPd8hZgsDuKxU83OpS+LGOYV7Lb3sZNEeqWa
+sWMqjeQC/CzEAE+Qfj0RuucswEZGZ2NWvwouGJcTvLAKaUelMr5IuWTkTZYmXww7
+ffu+Fps7qSMnU+mxOl6TkfoQw/cNRpZdMqwI/7119TnFeK5/AORupA==
+=YL2l
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    5F69AD087600B22C
+uid    Eric Bruneton <ebruneton@free.fr>
+
+sub    0440006D577EAE4B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG
+VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv
+m/7SqGx378m/qw4EvpgGUB8EYif98LYdWp5vsU/zx0Ps9auqvetAzJaL9489oE0F
+q8FVhve6BMfUUV7zOTCmJnf438YO68upjU0PVBdfFE6Qx4cgCeWbQGy2cooW5azN
+iIenhuYU1qikmxMHq2xZzN4uSTWLGDpimPyz+Y1aTSYJ/bgn9gPStbI9sojWo9SS
+5gvNK3XqJzMwxwFow86UcIE0vPD2T6ZlBAXRABEBAAG0IUVyaWMgQnJ1bmV0b24g
+PGVicnVuZXRvbkBmcmVlLmZyPrkBDQROyVEXAQgA2uNV77VI+ARj1d97b5cY3/er
+0Mcc8/Q9ctMY+5YpSYDOQF100QBdOQ8q3IJsfhZeF/iMFlHIUikuSgatb/Ih4lk1
++irnERPuV2MNoAw3Fvn3/vwl/Jy0ZsQCBSXO54U42TcOXSwNLkYOJaomDiiuo61R
+xj7jqijpnydwoFvEi84v6q/Uota3MijGMbzU9QyTX8J9OKMeCSUq0uVuk4ezebjv
+/bwA/ax/qQRIrEHDOOB1LJ5JyLacK4+h5J8tMkEmWxEQv7MNokRLgbaePqv+tdf1
+gee4f2fSE3EXKFxjTO2wjLPXCrHSSI5gecsilQn7ZNxH9g2YUJipn9yj3ywMxQAR
+AQABiQEfBBgBAgAJBQJOyVEXAhsMAAoJEF9prQh2ALIsrWwH/3s8uN8/gDnbcbTX
++7N/ZfQBXJZ+H9GGikmYRJE1xoOeEt9MOqZyGDTZfGM/qNKeDGfar7pcRQlMK/A4
+Nts5E6d1OX8fBkUBtYanyyjNLlT3yDjO6VaV0SCsgAzNjUZqc4lxS9atN6md5m6l
+WLAdHghrXuV6LsiKOS+96htchoCvTvm7mcPI7w146yJRSyCC5+PybG3ult5Y6QAS
+kwI3ZWB0u0PKUoqglwWngplu+0Fib2rxQvL32is4YrYaZ+XwoR6u/Bgv0ZvZiypk
+17Uk17rDb/JfeLqDn7oW6Hlgi9KOLbRRIg7vwZVo2Ixco7aGxZp5c4zSfaPvn241
+v813ZcA=
+=a3mq
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    602EC18D20C4661C
+uid    J?rg Schaible (Codehaus) <joerg.schaible@gmx.de>
+
+sub    4830C9FB8B680A97
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+MbGOFKhQ4eOuFNSHamKyekKHiShaICR2aZgq
+=hSJA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    6425559C47CC79C4
+uid    java_re <GF_RELEASE_WW@oracle.com>
+
+sub    D547B4A01F74AC1E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB
+fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS
+sviDzjYdZfZtskUM0sRmjmoQL//fVQbfLxJ2zses21za2VHuS3puUbdcm8+UIl/q
+oyneDbzM7j2nYXXJPNXJOfvyVxi1+rsc7xcjMvAj5ievYlWwYlAIgYbAiz969NdL
+RkoA1Wg+cQg+59k7Wvi6xwTfzMsO4jfkV2p24xn4fpcch9J49UhADh6O7XEls1Xr
+80WjysMJWTOX1O2oTtV/BMjpI4gj08SgZRhzABEBAAG0ImphdmFfcmUgPEdGX1JF
+TEVBU0VfV1dAb3JhY2xlLmNvbT65AQ0ETdcUhQEIALq5+uXjS4IHZBmOWOBSf6R1
+EnU4pUqEza0uwgIX5Xr2uSaaCMPCm5xrbtf/Iv45VEuR8zGKb8/0dV74me6nXnOe
+qD27pkkliVE5nMPQnqKAUQmrA5aDR7Tzmey46Bmc+IFrvbWqiyA3yZwUpi1FKZR5
+VLEYhMGI0qOyoaa1NWjD3LDL7/AmQESe9QLCtT6QhNhmj/QWByRpmuIhayNyPGlh
+5osFyiGgVcinlZE7x12uG76C1V7jo9eYrkjl/uHJHRqfB628oLubDFimKl1raYCl
+RZ63jkbZBfC1fRYzxk6356mAxlB2OVDH3aYB97KKZkU8cX22IMawk4aBhCyhX8sA
+EQEAAYkBHwQYAQIACQUCTdcUhQIbDAAKCRBkJVWcR8x5xIbAB/9HU+RuaFxAIVwy
+SrAvBwycrq5qb850RU9+KgrKo8CSCKTLdmphgBSE3pCMr6A/Q1QtOUndbm7SSq+X
+qODhij4FfUx0Kz669iPEVEZgZCausY7LH9aTmTJCRM+Ey2eM32Skz+ur0T812dN3
+iNd8HtC/iaJAoGFAnWRHetcH03QMEuogZp80NBg0CHV5Is8x0uh8JRHi8hWD1f6v
+Vq9/GwbgRsDOppVa8Z2BgyHOsBDoec/fYC3i4iF8rHuuSGqajswzG9SnFN1zLcGh
+LEUEOJzeDCANb1b2sJO2r9xEvfNcswj6ksY5lgItE1roCI61unkajH4ViHheqLZ/
+7wRm6eOF
+=Tyvm
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    64A16FAAEC16A4BE
+uid    Evan Ward <evanward@apache.org>
+
+sub    1E8F1D57A4450BCB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
++6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
+kJJDgH2BcbNSmWJlrCqYk+E3GAyQial+szkEZED+02wXHsbs0z3vozjQGHy0RVOj
+Gc5Shwk7Hr/F3vw9EQKa1nNffWmcGEx9B+WcC9ALPVd/fpQVXvlqfbi+kaIbqv2x
+NHQr7BL8j3SpN6vhfZM/3zeghlxQ5HYWER983XwkmvbNdMxt5HWsMKWZ0utt4ocK
+TnQP8NFGlPWEQhPvRRFNb9BI0wvGD0NUb1gjABEBAAG0H0V2YW4gV2FyZCA8ZXZh
+bndhcmRAYXBhY2hlLm9yZz65AQ0EVuqxPQEIAOPl0cr0rbuuaQWxwNjrHnfDgv9f
+oBgqZW7tCiXtWFH7Va1leDFloszEPGPlEriw04iqHpHe8QyUBVL6JhvNqEj8DR9x
+JyIKgsKCMkoJHdJOdO7aTQP8w7SVr7AX9sY9rRQAMYgktEKNqWSXm6/hzvNlvIud
+GXxr1dJzzVynZYlPFp9kmUmQU5ThzJ7DAW4fSnAy9z1abCGSHkh4EXrDwCyPvszl
+vMkg1djG0owZgDnTrrT0eu83T6uht+DHgCrLiEYqypcyxJmK48O9t20feAhFXw09
+1hGr51CD+C/bbZjcbXGmsNVuXUDUIIeVpSpPaUgU+i+OgHY7ZIF5f3EpEnMAEQEA
+AYkBHwQYAQIACQUCVuqxPQIbDAAKCRBkoW+q7BakvjJrB/9YMjhWouRH1Gppfdqb
++RLzjzWlk9ZlSUIIvuM40Htft4YGK38WOZBbN8vmdYAQHmqGbaqoKC+C0+ZXEKtA
+sQJWZoaYMWaEYgWHxNCxi9Ak8rodkPFmP3uVQqwb+iM5jhkCu9mexcFToL3rdBRk
+X4/lQvnafWkT8HIxXVHd6cR+tghf7BmyU7Hm5EU5Hx2BSkb+iGHa+QUJooPoolAe
+boLmUYGBQ2oYwXGnWeScolo2piqO+KmmbopyhxYBF9MfHpebeYGrGKCamxqVQoAa
+mNyzGwgRjqOec3/mLnLVd6iRNjzp+oS3Y5IVKRaICmqrqXExGW5OKrfdtKq5PFKi
+Yp9B
+=P9s8
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    6601E5C08DCCBB96
+sub    0AC07D0BBD11498C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
+WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
+anVQ8VL1Z7uPeqw4UbtqA7Or/E0aOhF3zkkmhaiE9Yrp+I3KXWH4F0Cj3X9IUcf5
+Z93CPcEFQx7ajxSJ1xw/mSgbU4AtKZXUdK1ehnFAhH3rcMVW9paFSYaXD8f+vUbj
+hdJOp3e9UYEFShsdwo2X0FRqI318ef3gPDpbTATyCaz6NMIybDgRGo9WOGwF+Ysf
+snXwLU2UnT44kpAzHjFdjZhQGcY1w7d8yGNrYX4qw/RMPhmuVefuF2yodBtRxhWW
+09dwNiIYFVuGS4S03vlnEfYZlhmRgvWZK9PDJXm0vE5GI7LdOKlqwZxvoznjGmUU
+lscRU57DtrNlAjyXMZaGdNfPIG85B+ijJmIb0REHbszvG6csX4g1MiZ+i0WID8Jl
+20YpJTUkkvIztXkAEQEAAbkBjQRgVVFjAQwAqfVaX/iL1guWx10Xum2EWJuCzu+H
++RiAgt3KnxzXtMc8J4QzNV/Cr3vO3Y2a1qf0NO8o4dN4nHHXWbB9Vn5ntG9VHt1H
+a4WDLr7zEDyNpPiEe/sLrQLA5TD28kXIJ4WgDuVEYZ+z1tB6tkcZkUzx6182oxCV
+KHU9lYIxAvQzg+XAwFNoHElCYAQDTryKDxEADAbGDEYGFHM476/MEzz95LqgatDI
+WaxE6RDSBjnjSA44ZHsJGwcHjrmz+RXgFnhQjC/9ywSzNZQNWzWjyS9qgLmIEkHM
+b6mD/eQHrGA5SyvElqIJMMvXrRpnoG1l2FFiNn60wyuB+Fztfx9YgKlJJwdLfmDD
+QTuVInaLU5iTKvZZ9uh8ekajtYn3NUEbvAN1SK8gnWqTRhVIm/0wcBdtNViTytTH
+7CM0L0vx4FZpru7c2KyFQx2G4/0VxIolCzHz2ROD3s2oRTvP6B5r5EdCizrsJzrj
+Mljvw1hp99AnXfJPtNMyeHKwkfxVX8Kxnk2nABEBAAGJAbYEGAEIACAWIQSqQXc3
+vYBUVts8vd5mAeXAjcy7lgUCYFVRYwIbDAAKCRBmAeXAjcy7ltznC/9eY/f7EO5s
+zFXgED0JYTGhYba4XjD8n9HjqK5JbCfWn3AT7GDwrWN974myc5uNzIj3srPrVuNg
+dO4t8Fp63EtGQoYAh8xqKpxdUEbvjvhvIWexAETVzLvhgJmNrMQnRerybYBGObSD
+PNiPXbTDJWqr8eoSrFaMfWGZLytsi+MdBf51Q9VUE3981L2Ta63a6MCH93CLgU85
+IExOxa32i7L3QWQtrDWLrjQGPeMx7H6paaQhjY0geSIO9Ev2Kj6dVmMVOsolz0TG
+OqsjSDuDZAJrSCRRBA73mG26bzAWGKPL3FYxF7gjkFkLjG35zFru9Iwgv9xNM5/E
+XmxCOZHV8ZNA+PqQ4d0xVZ6oIuNHW8JhxL+KdOiAQs2kqMsw32B9GOYvZGeM1DNU
+vRhDrRcIBFsQ/NINWFPloDK/ZPtGH1f8Fw2yDy6HXNSfTgp8Kq8yZ8WYkTtKv8TO
+9fSlYbCakdCPXuba6T637QAOHxAH7Cttqv82Vhp9Wg7NUcs3Uqa3Ddo=
+=tRDN
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    67631BC0568801C3
+uid    Ohad Shai <ohadshai@gmail.com>
+
+sub    BB9CC415C9C063CD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+GMk=
+=zGhj
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    689CBE64F4BC997F
+uid    Szczepan Faber <szczepiq@gmail.com>
+
+sub    C0058C509A81C102
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGAofm8BDADhvXfCdHebhi2I1nd+n+1cTk0Kfv8bq4BQ1T2O85XlFpp1jaIR
+70GAm2MOt8+eEXt/TuPkVBWnJovDpBbkUfYWxSIpPxJzcxWV+4WJi/25fBOq2EuP
+QQhkqHQRECQ0CsogzsqI/Tn3FksiGKB7v67hAetM3KpwZ5IlG8chLoaeDf7k3P3S
+fBWO9MFxYW/7K5G3vqARKXHvzq/jYiXziMDeWIKswwTPqfeDc89tsEdE6GMT6m2u
+ECaulbHlzEzazSAh322/yyf/nfVZ/yZhK1y0MjvwpOhGxFbay5hA7L4bHAwR3qb9
+YGiPIL+K97TYY1G5+3X0TSvTIg4VsW5VDu50oB2iYK7uGE08GhT4uc73tiDlZm8L
+BUwT/KtKT7g++LYwAMeZJ5+rfIKKxblXUN06vz9stylo1rNVhTXftuqqO+x5uVGG
+KlOWzx3p9N3nqrufwuoQNvIMzCAvJZNm99j/Y/40wsrUkBxVBGNs6nEpQ6c5lvf3
+24Dfk3nY/7Fts1cAEQEAAbQjU3pjemVwYW4gRmFiZXIgPHN6Y3plcGlxQGdtYWls
+LmNvbT65AY0EYCh+bwEMALVHwkeMzw/wcUboKcEUmmXmiGgwDn4xac47U9x75JgC
+OqQE1+4Hxu5qULrPlCLLP1PDmD2PK/QUwbGpjjEuw4YxI6JjuOQ9sQa7HbzRVOmw
+0kd0T4hr4Xa37D3E4oAxqwpeXcPsUWewtpjoqjLpTDBuaRpp/x3sFFmM9+s2ci4S
+614yppuWqu4X/u7w5CbWFYMKl/N5aqK5RYYMAgPUqsI4J0NKwb5UszFuatFevTvD
+MuwOf9LfW7kun13s0Z+/+hWGlNhk38ahIR8PSr4yT1pR271dUQKCTtZUFC6ObVAY
+WAaEzrJ2XuJMnbHjpciv9WqaXFLpda7eE4TucmjU3+W29kWer9ts48EkD8Hv+a8T
+BXXzK8KBi0ACUJi6uma1DWdUk6tqe2CniwirRzR1mWhKfOmQqr487pH5h0jMSPN8
+Dhyyuw4Ef2BLmTQmvbDYv9bwkeisskKjg108OoWOid1tbXudFdPQWqNc8FVPMlde
+kza4cC4qBd+vjVcKHrEx3wARAQABiQG8BBgBCAAmFiEEFHtpGhkJdiSQL06paJy+
+ZPS8mX8FAmAofm8CGwwFCQPCZwAACgkQaJy+ZPS8mX9PxQwAn+LmPCqO6ig0fsgi
+nOhUaoM2QX6A//IiFDXa2pY3bKaWf5LAYpuvRAyMsGPI3ceAnwfFSMXjktlssmD5
+bQKFisEuCuFQ0B+dlMO/+BZ1Id1Nldi8yKRTfcffgONO4kuKGKN7MKWPBX6/cJfA
+pwHV7QubGEl/b/UNjPVFv34QCLU1ZFhVKHO582m0N94dwkwThaQQZX/op+cT2kSC
+DWn7zl38KoYSy/6ThxKyIWKimiEpug0VeRHDoYw2NUyVvidj/F3jsnbEiNTH1Rpp
+DzXuJbN7c/fxaAAhlAgxnt/hvrECPylnA98CPd1tBl8Q6IDcgbXmIa/jLS+Rqv5Q
+xUNYlwhcFP9WxU8RwzxIHo9SiVRUaLcqit5eVI+eZbcL+TZP5b8wtLoKr199Ej2F
+xNkL3+InFdjTH2Ir6RZpmqeY4NI6ujL41iUru20RzTNCAQA8jgmCMq9kDxaykpzd
+SvFHnyijywCZB1jblPtxo2UqRO/qhPfqSkoVcpWmxgiPUFOr
+=E7F7
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    694DB6F419C8D1FD
+uid    Stewart Bissett <stewart@exparity.com>
+
+sub    11CD01355C5BCF5B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF2IYVABCADlkNxFiE7AUD+BirOireAA0LceQl5HMo3EThWHzrhKTq5MqTmu
+HBjOdKQjutFRfRQ6xM6VitVc70TuBKCNwsbCQqSScZ44f9pOEu+f1z2CaI2J+ojY
+YuL8MBh3yMz9nvREGfmIzKRu0VZ8kZvxa4GCiWAvUSgEj0DE/HI2zaXssPiPbPB2
+9Y8eud+gzyuUEJv+/fYgNq23mXVPZWVE1OzvYvOakzWtym8YDRmPvZLI+EnN39dB
+Xw21AKYIaie2kvWYmVloyTff/cBDSjqiU97wfx0ufUSAZUg0BytFNpLmlT0mUXER
+LNL4qNNmtLg3xmJgg1uHk6I3bCCGnKsdvztHABEBAAG0JlN0ZXdhcnQgQmlzc2V0
+dCA8c3Rld2FydEBleHBhcml0eS5jb20+uQENBF2IYVABCACk/h5sEYL11eU21vJX
+2HwVxsNlD7XBt/hufX3jKbOQcDIerwj3ztwSkAprdzBXSFRzK73MileJ7fmYFTmb
+025f93lk0I8gxRzo2952GvH6lEmpbzQUz7uqxILBnq/xz9GjA57jZQNp6anx1TZy
+Rf9xvYgZDfDzZ+bRxaNs//UulByD2aJ4nuDxUaVt8bW+p2sPxaua+pvA0qfBjy+y
+DawkmoPtywchmme/SGBaZ0K7Qaehni2e9W+p+discQFsOcYhZyFm/JVPXPyQzr4i
+j6iFnTZ0L9f4LswJjWFTrk1vozuF7jdEu7EDbJfUOBVQE0UbeJSt2913TRmKRNEa
+5akLABEBAAGJAR8EGAECAAkFAl2IYVACGwwACgkQaU229BnI0f0afAf8D65ZIupv
+c89CsoMkaOo5ev/wIB8Dat39y8vv3WOWnYr5u61bSPi32YycanuyYFliLoTWlucM
+77/ZxRwZ7NvwEbbMKyaA0THK7cm/RgC7lFYRn1ELuPUcfg0ogQzOusQgfikWBw35
+1OCwLa5WcLGh6/CwAvPt6OxnbegTgYYiEiZLPdpy7tyF91LyI15jo+H08iKdfdvw
+homGHgWbx+AKptUAAjJ2ICx2sczPR3Oud87MELx2nKX2cc+hAZjrmBMLW9e27gmS
+LLkzT0Yvxv8YlEC/kksBSQfdS4wtMY2lw9Pt3IvcQ/WKxEo+rhavZR3jhuD5aFAf
+IcgqzRrqKKVJhg==
+=YISB
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    6A65176A0FB1CD0B
+sub    EA8543C570FAF804
+sub    CA890A5FA09CFD80
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+fYlYx9aDC9B+YtR+
+=hPt8
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    6CCC36CC6C69FC17
+uid    Gregory Kick <gak@google.com>
+
+sub    C694465FAACEE66F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBEtrDFABCADLXGAhjPxdh+naC6XU5kficZYEVAURNRa8MTnaMKr+31v2zcAk
+nyqyjihcXGQBCeaNsz2mQkc/MrKdnFNVSwp715JcmcqDJGfR9aIDMUs9PvoNkkqv
+IDtx9Tn73piqbplT2xQxd7HjFvaVuy7oXI68gwcyAGDvQZeiFUodcbAsKrVwFT+R
+94JU6UODFqE/Ihq15Za8Sc8WhWitm8XTQsCsLeh8abGhkvNEmRLi56fh8/Bz8LHv
+8T7r8zkROoQFlUEYaOR2wH5bbipww9+HEg64hrcak2w5smNt0NJUXZ2O1l00u3sF
+Qdu54hM9nZ51xxcqvo+tGft9kIr2AfTrJ28ZABEBAAG0HUdyZWdvcnkgS2ljayA8
+Z2FrQGdvb2dsZS5jb20+uQENBEtrDFABCADqp4wT0RY1+OwMZRfTSYczlBAidkGq
+HszDnCkO0U5w4Tog4v085dDFyaKO5LZHkgDJTyF5WyvwtqqzNoU+tjv+RkkctXTx
+K02ced5jSFk7E9MI0AoMXogLP/uW6nHmoUTuDxEtCye1UfsIglD99wiCvxGtnOjg
+wfezkpctP0WPe41mzNccCrs3hx+R9ECkyZMtQiHYPmr3X3nhwQxKQotwWQOeSYgC
+jLhTWJfkOMn/xaGCNGaihYSMCtDkC2PrpyD5V/qj8gek5DyI/bXCv3Hm6Td1XBbz
+c1ZHKmF3ccFFPRtBsswtwXuN+6Ms5t0iVsNQ0XdhY8BXoi9H1jo8HH75ABEBAAGJ
+AR8EGAECAAkFAktrDFACGwwACgkQbMw2zGxp/BdCxAf/TvMMBA7kY4nbH5WU6KTL
+Nnaykv0zfxAf5XgRbDqrcO9dvnWEjYTPyyVWXIVkvMtESx0DAHeml/PaKCab5pIo
+ybyYQfWLbh8Jhn0+NLnKOwE6m6OrWFv2gNa3zrPRwIy29VFkLxLC/velrIkES8CK
+F+gGinmxupi2IpIiio4uCyUaeR1XV6U8UWl/50j0i2mrutle1yiV2lYBb0k8uMZ9
+nqYeHkVQAispv6bDZF20co9Zmn+GtbHat1jHYg0R0p960SrFBlb+x8ROOb0e1u4a
+jdAZ2uFczoDRKHEQijvaQxIjpl7Cl1LwyQTq703XSVR19/5ufOR2XWtXa7UoBL90
+bA==
+=d1Fs
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    6E97418B04B11DCB
+uid    Francois Papon (CODE SIGNING KEY) <fpapon@apache.org>
+
+sub    AE1C126549627B5F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=elTZ
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    72475FD306B9CAB7
+uid    Daniel Lemire <lemire@gmail.com>
+
+sub    1723844CF9A045EC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
+gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
+P7Ss3EUTRGX3LnhKhKN656XQhM0PutdsHQlUKjvnl2JOaKerEhbHCRxga/U/WWOT
+KdobRO+x8v1scsrnUG83J7sTSaja0McmgUhKrhJqrgSk1Tod45SxprxOyp0cgATY
+xjHrf2rkafBn7K7aFDe8a73iCJPWS77gxTZCZ72xkcnMLR0m7QI8TzFa4lRjTovA
+QcTpr7jwjmyjA1+68peL6VHdVr0cdXm34mTVABEBAAG0IERhbmllbCBMZW1pcmUg
+PGxlbWlyZUBnbWFpbC5jb20+uQENBE7+huMBCADS5gJ9frZF9KUorujSdK5GmZTG
+75MXhQLLR3UOczqElryVfudgwHfofBymcuiPPfwSNWpWLeylgCxs49SOrNfh2r2m
+Cln7ZO1LwDOoRIfD8xUA+TTc4qbQzo0xt6M7WdEiuhLdxUGnM8s4fRsjwvN7wvA6
++PGvgaeWIKaP+S27jZaKbVSGqR37Vuj1JkbsZV1V4BXXOb0gyNsT6s/Hcy0owWtZ
+kVBIgBanYui9J2uosgRMhHeEJUO05w6ehCoAkr2ktzj0QRDmljmbGjiHEsOcO7ZD
+u2JQyI25bVUCk21S1CEdIfZ4xmiV5Rj2Lwxb7LCDEe+umc+W2/7j5RtR7RWFABEB
+AAGJAR8EGAECAAkFAk7+huMCGwwACgkQckdf0wa5yrcgCAgAh0VKQHRwwov6YDV2
+1H0/h0vv934brwNWxIPz46WVa0xI+fmA0wYXg+1OTQBy7rqJHWoK0I3M6qjZvvaK
+o77yUUtdye16gf/SxKPUwXMyTg98ojOvq7orvDF0ktE59stzayjUs3vrR7xDh/mx
+pwiCN602Jk27vCCTdg0AHbu/CsK+Cu1rkqlqa9nQ0O0No0IiGJdDK51/ZluGBhhB
+73xQ+jqgAf/g1qabG0Zyv2N+5tw+Alp9sqDsfyA119B6q3xKoaJqo+9h+zQ0vpZr
+NMuph0EDebGxR9VMiO2F98dacAm/Qr8QTyRj4424rkCSK2VbZtvalewylY514xg2
+lV/Shw==
+=qKIA
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7457CA33C3CE9E15
+uid    Colin Decker <cgdecker@google.com>
+
+sub    ABE9F3126BB741C1
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
+x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
+N4/BiyjQA25sdfaOolhO0sFlZuTZpYy5wG72KkA1ygNq0L+8aBKhEF6zDU61YzCC
+AxjcgTftgTeeoqkJtYa06lNz3jmJDN+zUQignfRa3ymoGtFHTzoXR9maE8RWDty4
+y+DY+8ibdGgSgKPZ0byTCDyNojgU1YTlADa/1/NY1ShYg617O1xicLNo0JEJlf2U
+Tu4Ymql36+xSkYSISU97Q6Utgq27XMuZvDUDABEBAAG0IkNvbGluIERlY2tlciA8
+Y2dkZWNrZXJAZ29vZ2xlLmNvbT65AQ0EUhfJFAEIAN9NHRd2bYP/3CDi+n1ilSCh
+ld0NR3DUBgS/AdqQ7IoAUfj7skyI/WyaMdV4uy6vRh5YgNg2g01nd0LLZR8Gf2Ck
++D6F88CdZaTxlkcxHV/dXMZ8yBO+0D6yFRZEL7Imsv8Ig4QXOVwfuiXEPk/Ef5Dy
+9SdAVhcoErTGGR6BOGVVvexGtBwefsjMaOG0khkRbWIQ32WxfUFuAv5XBQ0ckLrl
+KvYWUYhOlXg27GtFKH2EBBF0Z5ZWu7gaBFwSV0oLp9EWcD+C+WEwUSfBdqfRJtyX
+vgf4kZdwdQ5caM8P2/Sdncl2l/LU1At2Smc+plr6zhIhDlLhlrzKGa16oARSBdUA
+EQEAAYkCPgQYAQoACQUCUhfJFAIbLgEpCRB0V8ozw86eFcBdIAQZAQoABgUCUhfJ
+FAAKCRCr6fMSa7dBwURMCADHrqwRNHkbG1QsXJr9oUK6KVkLsPhcngIhxRLlqe89
+omg9G7eGNauzs2PKsB3txotCFc7ROVNv/TAuSDYzkPos8G46p3bGesjfJb24zc6G
+MT4RGIJoh1oNG1IciafIIHjp2ZJHRmEDwmvZG24OHJ+mlHLjaedtqlWu+zwwhH2V
+ZrI/U3gW/x4imbk9UyyzciEIxrAc+fc19xl5PkUVcSDVC0cAqGpeZz8+SxFaf3Rr
+0aGnSbeuHRjNupmoxkQOAey1ztmdWiCPf5RFfmFD+fENh+/xqYiGorYpcIN7UAsM
+kvD5UHc5ZG2tTD41jM99w9Lm/xHJ9ks8gNwZESwIzr6ABKIH/1ulsflI216qPz5o
+7uUxlTm8NfTyATfCUuZEDMYGOjDQPqQa8hFebqjWWYBUq2SlaKD2xMeEuEXV+M5k
+88Cx6T2nvaZWMsrD7uGj+tTsFaKBGxP5p2OSEWOTETKKv6Cx7vcMTQmrqSFo47bF
+KlNSs+aVM48UnQeFtTDyOhwa5jvtqtst4eQHwHWQ99BK0TEymNx0vF0nPjWA76CR
+rfopOwXKdxJgoKq4MrxE92ot5I82AZBPeiWVJ+6wECeK/GoBIXZ5jEUqrQmmzIbo
+WA5G5PMJ8egzLJNRJjTWHjCWrUTnwNcqaD4/qZxIlW4Lt0uvGlx6pKOJQ05u+9X/
+BzoVWrw=
+=fJQM
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7A01B0F236E5430F
+uid    Inderjeet Singh <inder@alumni.stanford.edu>
+
+sub    C3E640F38D845FA2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
+mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
+4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
+/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
+jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
++krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG0K0luZGVyamVldCBTaW5n
+aCA8aW5kZXJAYWx1bW5pLnN0YW5mb3JkLmVkdT65AQ0EVlSyJAEIAL0+8UoJuUsC
+3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbauL6Lr
+vw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3Yw/x
+fiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/tDxtt
+YkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAgP6kg
+FxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPFHNkL
+ijDp+f5mkJcAEQEAAYkBHwQYAQIACQUCVlSyJAIbDAAKCRB6AbDyNuVDD2xjCACq
+L670xI/26dWsz66ZyHQ2yJI7DNQxoiU3OZs2bfrRZxLpGP9Q6YWCehb+iucvmFFv
+LZBoGGWzffmVBisD2Yz3mHtF3wLx+2zJXHt1Xz7H6W89M54T3qUhQTTV6pl5f5/J
+CXK1DP9iC0y453ORY5B60byrGIUvBAv+qWXBPn3ECZ/3oEkErb5ZGof+gJjffqvW
+RAN3Li0WBRj0ldXpJoP/YE8naDJ7UdPfzcnh3tnOTfUDvFer1Nh00ilMmf6EYznR
+waN9whc9W/1HwvDeXrijrc6/1U7Hp1r5b1DddTtx6aHxpWrcwYw1yXGcm82fjXnR
+domz6nBt2DF400YubAZR
+=RPJ7
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7A8860944FAD5F62
+uid    Sebastian Bazley (ASF CODE SIGNING KEY) <sebb@apache.org>
+
+sub    C189C86B813330C4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=9dUG
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7C25280EAE63EBE5
+sub    926DFB2EDB329089
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
+f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
+bhhFEuc2B85vNf2o9Y4V5GFwbD+tFNy4u24n7zg6/VgE2WDvYJ8JRqCEkwCggyLj
+ba0lsZ2XtSINh/W8ok+9f0sD/A8WhqBfDTEBuG9gnuCYXM0j7XBBPdPS+FXmmfea
+zyP+URKRprLCdt0ThZAMllIxZJrkbv7aeXVpM6KSZ/XvvaFQ/gha4o4iJFvpoKt1
+Er2j4Tz/STKztHGsMt6pqfrMNPWovu4tLuLZQmojtbIk+IwmcYxMy99owH8oV1WC
+U4HeA/9MlUxzmlmrQF7VLqFTGEEqQaEJqz95wNPj/t1DmI97hshPzXLD4zwKwa9m
+qZJPStRHM0a6xW2dztF12aXhrmYg1gIGNnsHtq+t8ZhfINZUurSWn0m65WT5notA
+15s6hwyDACHWWOgFQ9jmWuGDh0ZpiaBe7BxeTV+MsswY81sOn7kCDQRD6J8HEAgA
+sivVzAfz34QE+S4WTXCuknmYiSEEnyTwk9awb52vrYlhoQ2t2EhRClc/tR6QbhNM
+haMxPt1OYeutOvZN4q216IE2SwZzIDDTchYApP/brBdIDf4L/XGWFIqftCSn+vnb
+0LAzYNVuNXtNwRni2q/fZ3g1wniVMbJ2MrJNt2VhLrP9K/ipFz7JCJittMngmmDF
+7mEKhnrqBROLubFsUfNmz1qRC6PiEwyyCCdG+4m8fIiSyqna3CMkZr/UaVfxuGZH
+WM8HYGmiQjafqeLqo8aSbWerzDYtF2+v4hAAt9eDwdgYy8oNxXEvw7Q+G5lix+6S
+UMYV6NKLNUbBYffm9wjVuwADBQf8DbA7RpziZWLv7DHjR31AA5nnGEeud0dCRO8r
+wfQNnaQvuJq8siRmU3uPAL2NwDgMaa0cT1xt7p4/8/RU0N9otVqnzkLMUTuqq/wt
+QrQt0OWsEJRyxemWFwiL9ZpU4eTg49cfOQXjg2q3fbx9D1Xr6Bu/Pn7UDU8r9GbD
+StGJ7R3Z0kkhtCErWnGNXbuqlVd8uEsyeM2HYpM76BmH/8vMg43lOJyyh6Id20ZT
+n3HgWzRI5QaDJ1JYBhMuVChbTPUCcMox+qgiH4KtRIAjt+m3w0Axjsqo3EFPweWG
+pRfqMyiUcESt4X/Z9V2Nf41NH+nQ74v3RvpP7EWKf9FfEtFpr4hdBBgRAgAGBQJD
+6J8HACEJEHwlKA6uY+vlFiEEB4Wz7/YLGxvqlOC7fCUoDq5j6+U3vQCfV0asXnE+
+aHo/jdT35nAky2TXxokAn3R9/kTwWykkKH89mxse/54k3fao
+=w15g
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7C30F7B1329DBA87
+uid    Ktor Release <ktor@jetbrains.com>
+
+sub    72FF58594F983302
+sub    3967D4EDA591B991
+sub    0588BC69A286FF16
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBF+TCd4BDACbIA94MfIWL0SpvZwBddXgx36Lp9GYOWNgGoQCWSvk9vaMrLaI
+rEll0xnoP98CfBQYrVSAmHDMhSLBCjNB3V1Sdz8GRdOG7HUffF7Cqwbm3Fxo3H/h
++Tsrodv23NuvKsDpgglUL6nJy5e/FO8y9dcxLXRRVdPFDhJubi08SiUJy9FQbnfA
+yb2LuTzXtjDmjEsMZpdpQUlQkk0xNDkrrq+2miwxemVd35cnVQCFP0K7c4T0ksGg
+Rf9A2r45DBbPfvwTL+ZbrGtCssUpCneWhPl79UsMxeY+vJjEggqqqRqbHRn6nOQd
+3gKSaEqdALZURPzvkKxLUeUUtMk/tkFdsNe/ea7edk6G3MI4dbUY7p0XLS54S9cB
+1JUAHNEFtuJQKGWNuwWO58Yun1EBtOdUEvnIIoQ+CIN/XeKrnEIXE3LSblB8BR3H
+bqX54BMe9AzsmDQtc5pUOm2pfvCoiv8xFXQznBg24dGqo2A/jMoUnGj6oRj7k8mt
+i9AdPLigldr0S0sAEQEAAbQhS3RvciBSZWxlYXNlIDxrdG9yQGpldGJyYWlucy5j
+b20+uQGNBF+TCpABDADRarOqvERlpMCJjNXGZpK5sV7Umndyu1rwVOfEBhINkRX1
+vzzFJFciIfWEZ2c+vSNnXZC+vFuAYtwnHqTWwyodHU+/jwHeEWQ9WcD2buSwJvps
+kSei7ZMSWx7zAGWM4ae0FmjJrVHEQhM1CgeDwrxIzJqoOhrC26IorT7bGB5M2Z2n
+NStGz9fen71jNeyo0fHvvy9xkcEWsfDd9A5V0odRb5y1yKiHH4Puz+o6Gys43/PQ
+Gzf2NBx1sjzQjmJrrufvMIzRWrJwySYJQZkr/qdJyqbKZgbA/BWTmpN9POranNd0
+YO2/lbD7eiDkBflNGnWcb305VVzyZSD1kXXeLAc+y4cQugj+FkA/9Tv2c75sIhXP
+QAlZAG3ldj8WSiAlyyVuuWZh3eyxxH8J9LKDXJpBqvNvzucso1PQS2HzKhT98GxX
+45LRTsZo6yM5XAFgqw42KqTmcOy97mzluVCos090d25zYwCYsFoSaIX06wYz1GuS
+sW/JHXyUwsG6BWScgqMAEQEAAYkBvAQYAQoAJgIbIBYhBDlMtDbFaRb8Ae6kp3ww
+97EynbqHBQJm+cFdBQkLKR3NAAoJEHww97EynbqHNPcL/0LeMIWEx9SGbxuBBtIl
+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
+s/VObsFtKMUFPmME
+=svP6
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7C7D8456294423BA
+uid    Henri Tremblay <henri.tremblay@gmail.com>
+
+sub    9842FE565AA0601E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBEvsZw4RBADH20nX+H1xvMBYmXRj1Aae4dRr6Y6qI7QRWHO6Z7/dxr9bk/NN
+Yjq5KsVOQxZzloVdtqx75rznT7fZq98g7Nq9IeEtB6k4tnh6XQLhljJMk0a3mzdt
+q3VzdxeVbwCaPJ0zixv8XPTAH6MpRJUvP9XjzxwaYHrjwcQ1LslW4TrIzwCgi5rf
+jChLCyKcaL05gqUjl4lmefED/iqOwYZw5pJ8+X+OHUViiOB43wsJt1brAhPj4KgB
+ODStcE6WlHFKi7YzcYNLzYMebSGYn6bj65b3qNf6rybWD1hGUFK4122Q7+HCH9Ic
+J+rr8HwjGFo/yxI0/mkyaF0BthXYPy4WtdsdTM2kgx8Zr3Q2rSt1jBPuV3q8d27z
+FZMiA/9cWPkRx0RfAJmBPKmKkbBkEtBbNau3G7MY1OEAkEkRnzmnyyjr5IP84A7K
+RdjTCvkbiQrOQH00Ki4sHIg+9Xv1gDg1XLkFDzRARKA1TxjL0OeS4RWF3iia7Swk
+MOnTdhR50pjb18W8kB4mEMZY7duP4nwDfQwHMwbFZGHrjImaurQpSGVucmkgVHJl
+bWJsYXkgPGhlbnJpLnRyZW1ibGF5QGdtYWlsLmNvbT65Ag0ES+xnEBAIALYa2xQw
+2yBqve3W19WRMDRqYyC3XrpsWc2gnOT4JXRxgPOky9lfYj6TjSbb+/wrK9XP67x9
+CAPwRbvtCnXvVD/s/ScnJnyaSLHdkLcX4Z/UePk3dFbTfTTZKbdfiXE4W88kKuFF
+PNrgSsEhv8M7mziOBZ/u8qSLjYA5KitEkyC97nChf0Ve+z7DgXix5AhiiFYVFH2N
+Q+dQVmSigdXn2lSuzy3Z7IuuJQIW2nsQON3cFFLVcEDrw8yVbZMnFdiDMF8Mh6J5
+SvuL23MCB9gQFOOiyGcvlRWiPpTTZkffsXlh+PaCWJzFiF4n+Ec7ztWoNiisJRtr
+GnLlU7aVlaimsgcAAwUH+wRpeDzirZbgG192vyhp19WMomz09nuKXTsamyk8LkXO
+yCyCvy1XHo1bi3fnjhdUJo06CO2N6o5c77WsUnpn5MWyEKXbrNEshxBABh/6ozbk
+7PGcBJfbTz6ymiR2yfZEK5Qz8JLnwNDQwF0xO+lIXBz2NA3spAChMNq2rxKiO2NJ
+10dlkpkSxQoZkPmjU5v/VBiPyKEXUv3YKNXmiw/+0SxXi+bRg3vtp4/geo/udp2R
+JmkQlllOzvY2C9XELuVk7q7Z3gi7SKnoS7I7lc/YoQcrGLlHEzlf+ltACHJUKDBI
+hUfSsr9KMA5Oi7V9g4ImybgL7y5Z2o7IhpuZ8lYdxtSISQQYEQIACQUCS+xnEAIb
+DAAKCRB8fYRWKUQjuol1AJ0XC8Ne5QYXv1nChUZMxE0sWiXIyACePz9TTTp/3knC
+3cdu7I3u6t7ARDc=
+=xYLL
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7D713008CC07E9AD
+uid    Aur?lien Pupier <apupier@redhat.com>
+
+sub    D7913335BFA51814
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+=oANj
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    7EB97D110DFADD60
+uid    Niall Gallagher (www.npgall.com) <niall@npgall.com>
+
+sub    DC0B7E986BD7398F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
+7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
+2RRGMnMaDUc91NnoxKs/7VlQ2ySk6Cm6lH3t8KVkwaJdU59lAH1ey9UKhYyvRQuT
+htenl2R63lyyDe1ZLMAlmQXi4RcCWOO+L1emChNv0q0Fsir+7go9ZNYUi6pmIEva
+jKXM8bo/VtRIHrS73DsH7BVVCURYoBWexZWlRdb86KSE993dRXLvFPy5JzlRM+eu
+mUY3CMKxx3nLaDN5qepf1nGzMW88xjq4z4rhABEBAAG0M05pYWxsIEdhbGxhZ2hl
+ciAod3d3Lm5wZ2FsbC5jb20pIDxuaWFsbEBucGdhbGwuY29tPrkBDQRPf0QLAQgA
+68HLImPvBSPnMtjUHczE+gccsVWzLEsjVYSBcOUi1j67KQHbTPcHAqzYJl19t4FA
+N/yU1oOjuu/4GKVni27y8NGSavzY5elTZ22lqUqgqT6DjoOG2BTLHuOiNRIMqBmD
+Gy41mEq62C9I107pqJnnbARmde4646kDiaf2vkF1BsnBx0Dp93re2eJq4rkAf803
+fDvA8iyk5uDFiGg3f70JAu7ZCAKczglD0WUjIiO5Jxncz2sWiO2OuVgdsTuZf+9T
+0aODKua60Z7CLn4ZK4ZpdibbOEp66XLeaGuy5HPInTTsr4UnT2kvor/AmmPKOryp
+9oBFnPvf5+wREwlQN2h/PwARAQABiQJEBBgBAgAPBQJPf0QLAhsuBQkHhh+AASkJ
+EH65fREN+t1gwF0gBBkBAgAGBQJPf0QLAAoJENwLfphr1zmPJtcH/RJ5ba5m0Obq
+BGbcJpJwhEjpB6tCOufdzvvJGAMMAuH0Vs5kXrASIJPyVgJ2ab4txg6U3DKIfxnE
+IGjfdH9okl/oHRYrI/EDMN0PnIkE1JidhVOEOj3UWaoLUS8vvobKq0XP8B6J+P4q
+NA5L3cPlBBtH7yqzVNavi6ljJcsJH3g7L5vJDQyw+xxfOvQq66y4lcO8ptAqB+nw
+oHfSsfRKQQgT+Xlp4lG+acf+Kc0bLjWWUnBRgJfkhbGPVYHQ/QfnxbuLvlqohive
+HEV+d/PxCwUHq4EtLC9d8V3ADCZgb3v9YE03abItwg7tnQBd/LuJ4qdOEbjAWI4c
+crfZTmD74BlsewgAsOy6q3qjZwBwDjUHc4+Mq9ZwaehZ4Lau9EjyrOPZw1kSCWc7
+rcxlTbPa+2xUrv382Zc7KovIMmEos4RJ1gaFfXvreGKzCOrlsA4knXcwp9nywjZH
+2Hd+p7l+/EB2YA99rMglXl/5Nfs5k2I1bTqfOb2eOXde5p8Akh1exvuIyJmRf/pR
+eRA/8dXKCE/qG+KZkJOh8H9gD/8nX8n/5Qfm6Ff0iFF3mdBLM9QdBa36/qowBYQz
+u25YFH0NKiziF0Y2r0pd4NQhoAirGdamVPfWKzvHhZ8XWhklr1Ve+3X9NqZIOcXQ
+x1rrD3BL6LwVJtHcfQxuT3IRDnjnYXZAUOVAlQ==
+=NFKb
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
new file mode 100644
index 00000000000..adc795a9ffe
--- /dev/null
+++ b/gradle/verification-metadata.xml
@@ -0,0 +1,783 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.3.xsd">
+   <configuration>
+      <verify-metadata>true</verify-metadata>
+      <verify-signatures>true</verify-signatures>
+      <ignored-keys>
+         <ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
+      </ignored-keys>
+      <trusted-keys>
+         <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH"/>
+         <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
+         <trusted-key id="050A37A2E0577F4BAA095B52602EC18D20C4661C">
+            <trusting group="com.thoughtworks.xstream"/>
+            <trusting group="io.github.x-stream"/>
+         </trusted-key>
+         <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools" name="checkstyle" version="10.12.6"/>
+         <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
+         <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
+         <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="org.neo4j.driver"/>
+         <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb" name="mongo-java-driver" version="2.14.3"/>
+         <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
+         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
+         <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
+         <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons" name="commons-math3" version="3.2"/>
+         <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker" name="freemarker"/>
+         <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
+         <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
+         <trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064" group="com.google.protobuf"/>
+         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
+         <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
+         <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
+         <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.7.0"/>
+         <trusted-key id="1DEF9646901A1652E5B3E5EA694DB6F419C8D1FD" group="org.exparity" name="hamcrest-date" version="2.0.8"/>
+         <trusted-key id="1FCFFE916B6670868FA0EA0391AE1504568EC4DD" group="org.jodd"/>
+         <trusted-key id="223D3A74B068ECA354DC385CE126833F9CF64915" group="org.apache.xbean"/>
+         <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
+         <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
+         <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
+         <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier" name="equalsverifier" version="3.15.5"/>
+         <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
+            <trusting group="commons-codec"/>
+            <trusting group="commons-io"/>
+            <trusting group="commons-logging"/>
+            <trusting group="commons-net"/>
+            <trusting group="org.apache.commons"/>
+            <trusting group="xalan"/>
+            <trusting group="xml-apis"/>
+         </trusted-key>
+         <trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains" name="annotations" version="13.0"/>
+         <trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
+         <trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC" group="net.minidev"/>
+         <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains" name="annotations" version="24.1.0"/>
+         <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.codehaus.groovy"/>
+         <trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0" group="com.jcraft"/>
+         <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons" name="commons-jexl3" version="3.2.1"/>
+         <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
+         <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava" name="dnsjava" version="2.1.9"/>
+         <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections" name="reflections" version="0.10.2"/>
+         <trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18" group="net.javacrumbs.json-unit"/>
+         <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons" name="commons-math3" version="3.6.1"/>
+         <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath" name="json-path" version="2.8.0"/>
+         <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
+         <trusted-key id="4AC55A85D30C3499A3219500B7E2662A7640A051" group="com.formdev" name="svgSalamander" version="1.1.4"/>
+         <trusted-key id="4BDE772C338BA540E1057D0C8EA48D105232855D" group="com.github.jknack"/>
+         <trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
+            <trusting group="net.sf.saxon"/>
+            <trusting group="org.xmlresolver"/>
+         </trusted-key>
+         <trusted-key id="4D2DB2916149BAA9D0C92F3731474E5E7C6B7034">
+            <trusting group="org.apache.ftpserver"/>
+            <trusting group="org.apache.mina"/>
+         </trusted-key>
+         <trusted-key id="4E2DDD47E19863BB87211544CD3038FEF07D567E" group="org.apache.commons" name="commons-pool2" version="2.12.0"/>
+         <trusted-key id="4F752A9878E937049EF3FBA7D4012DDA1F1F0F82" group="net.sf.jtidy" name="jtidy" version="r938"/>
+         <trusted-key id="4F7E32D440EF90A83011A8FC6425559C47CC79C4">
+            <trusting group="javax.activation"/>
+            <trusting group="javax.mail"/>
+            <trusting group="javax.servlet"/>
+            <trusting group="^com[.]sun($|([.].*))" regex="true"/>
+         </trusted-key>
+         <trusted-key id="50A628FFAF58480736B1079FD1031D14464180E0" group="org.reactivestreams" name="reactive-streams" version="1.0.4"/>
+         <trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple" name="jopt-simple" version="5.0.4"/>
+         <trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D" group="org.antlr"/>
+         <trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB" group="com.fifesoft" name="rsyntaxtextarea" version="3.3.4"/>
+         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="org.eclipse.jetty" name="jetty-bom"/>
+         <trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
+         <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
+         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994" group="org.codehaus.woodstox"/>
+         <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine" name="caffeine"/>
+         <trusted-key id="636DE9055C4C75C7BD9830771241BC872C5E4EC0" group="commons-lang" name="commons-lang" version="2.4"/>
+         <trusted-key id="66D7CBFF956830FE9F5A723AFE6C7D77A1CE15A6" group="org.gradlex" name="build-parameters" version="1.4.4"/>
+         <trusted-key id="670BE7D076A0C89F5F07625AE57428DA9E879E7D" group="^com[.]helger($|([.].*))" regex="true"/>
+         <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="com.google.guava"/>
+         <trusted-key id="6BFAB2E3C6490B421B25C76C9C8C892F91F8E6D1" group="org.apache.rat"/>
+         <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces" name="xercesImpl"/>
+         <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC" group="jakarta.activation"/>
+         <trusted-key id="6E13156C0EE653F0B984663AB95BBD3FA43C4492" group="org.apache" name="apache"/>
+         <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop" name="dataflow-errorprone" version="3.41.0-eisop1"/>
+         <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
+         <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
+         <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
+         <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity" name="velocity" version="1.7"/>
+         <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
+         <trusted-key id="7FAA0F2206DE228F0DB01AD741321490758AAD6F" group="org.codehaus.groovy"/>
+         <trusted-key id="817EA1255546D6070A23AA00DB45D3A62A183CE2" group="com.miglayout"/>
+         <trusted-key id="82D8419BA697F0E7FB85916EE91287822FDB81B1" group="org.apache.geronimo.genesis"/>
+         <trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache" name="apache"/>
+         <trusted-key id="8756C4F765C9AC3CB6B85D62379CE192D401AB61">
+            <trusting group="info.picocli"/>
+            <trusting group="org.springframework"/>
+            <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
+         </trusted-key>
+         <trusted-key id="8A10792983023D5D14C93B488D7F1BEC1E2ECAE7" group="^com[.]fasterxml($|([.].*))" regex="true"/>
+         <trusted-key id="8A9352189AECCFB4AE1F3BC616FBB6B6E3120829" group="org.jetbrains.lets-plot" name="lets-plot-kotlin-jvm" version="4.5.0"/>
+         <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx" name="kotlinx-html-jvm" version="0.7.5"/>
+         <trusted-key id="9056B710F1E332780DE7AF34CBAEBE39A46C4CA1" group="org.apache.geronimo.genesis.config"/>
+         <trusted-key id="98465301A4939C0279F2E847D89D05374952262B" group="org.jetbrains.dokka"/>
+         <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.0.4"/>
+         <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom" name="jdom" version="1.1.3"/>
+         <trusted-key id="A1885C07A3204611FB184EF7098A31F381819057" group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.16"/>
+         <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
+         <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
+         <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern" name="software-and-algorithms" version="1.0"/>
+         <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
+         <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
+         <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1"/>
+         <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli" name="picocli" version="4.7.5"/>
+         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
+         <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
+         <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus" name="plexus-classworlds" version="2.6.0"/>
+         <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
+         <trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923" group="jcharts" name="jcharts" version="0.7.5"/>
+         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
+            <trusting group="commons-beanutils"/>
+            <trusting group="commons-cli"/>
+            <trusting group="commons-fileupload"/>
+            <trusting group="org.apache.commons"/>
+         </trusted-key>
+         <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations"/>
+         <trusted-key id="B920D295BF0E61CB4CF0896C33CD6733AF5EC452" group="commons-logging"/>
+         <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
+         <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>
+         <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
+         <trusted-key id="C758F9CC982AC877E7B295DD6E97418B04B11DCB" group="org.apache.xbean"/>
+         <trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7">
+            <trusting group="com.google.code.gson"/>
+            <trusting group="^com[.]google[.]auto($|([.].*))" regex="true"/>
+         </trusted-key>
+         <trusted-key id="CE8075A251547BEE249BC151A2115AE15F6B8B72">
+            <trusting group="org.apache.commons"/>
+            <trusting group="org.xmlunit"/>
+         </trusted-key>
+         <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
+            <trusting group="com.github.autostyle"/>
+            <trusting group="com.github.vlsi.gradle"/>
+         </trusted-key>
+         <trusted-key id="D196A5E3E70732EEB2E5007F1861C322C56014B2">
+            <trusting group="commons-beanutils"/>
+            <trusting group="commons-collections"/>
+            <trusting group="commons-lang"/>
+            <trusting group="org.apache.commons"/>
+         </trusted-key>
+         <trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
+         <trusted-key id="D5F46BC0B86AF5DC56DF58F05E975CB00C643DBF" group="com.google.inject"/>
+         <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="^org[.]apache($|([.].*))" regex="true"/>
+         <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb" name="hsqldb" version="2.7.2"/>
+         <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell" name="bsh" version="2.0b6"/>
+         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A" group="com.github.tomakehurst" name="wiremock-jre8" version="2.35.2"/>
+         <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections" name="pcollections" version="3.1.4"/>
+         <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D" group="org.springframework"/>
+         <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
+         <trusted-key id="E52567D2589415BD74EB4C2867631BC0568801C3" group="io.github.microutils"/>
+         <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
+         <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist" name="javassist" version="3.28.0-GA"/>
+         <trusted-key id="E62231331BCA7E1F292C9B88C1B12A5D99C0729D" group="org.jetbrains"/>
+         <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="^com[.]google($|([.].*))" regex="true"/>
+         <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
+         <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
+         <trusted-key id="E9AF5293C334C7C0B583227D2F45F85CDF082E68" group="org.mozilla" name="rhino" version="1.7.14"/>
+         <trusted-key id="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94" group="org.apache.geronimo.specs"/>
+         <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc" name="j2objc-annotations" version="2.8"/>
+         <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
+         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
+            <trusting group="org.codehaus.mojo"/>
+            <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
+         </trusted-key>
+         <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup" name="jsoup"/>
+         <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
+            <trusting group="org.apache" name="apache"/>
+            <trusting group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
+            <trusting group="org.codehaus.plexus"/>
+         </trusted-key>
+         <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
+         <trusted-key id="FEABFB0DBD7A754822D35DD9BE6397E958AB7594" group="org.jetbrains.lets-plot"/>
+         <trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51">
+            <trusting group="junit"/>
+            <trusting group="org.apiguardian"/>
+            <trusting group="org.junit"/>
+            <trusting group="org.junit.jupiter"/>
+            <trusting group="org.junit.platform"/>
+            <trusting group="org.opentest4j"/>
+         </trusted-key>
+      </trusted-keys>
+   </configuration>
+   <components>
+      <component group="aopalliance" name="aopalliance" version="1.0">
+         <artifact name="aopalliance-1.0.jar">
+            <sha256 value="0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="aopalliance-1.0.pom">
+            <sha256 value="26e82330157d6b844b67a8064945e206581e772977183e3e31fec6058aa9a59b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="bsf" name="bsf" version="2.4.0">
+         <artifact name="bsf-2.4.0.jar">
+            <sha256 value="f873773deb91c1a1c12150f6cdb13b8a2e1b496a75ac903c4bbfa103b363a7c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="bsf-2.4.0.pom">
+            <sha256 value="239f3397b79f91a866e6067cf04974146d7e864feb2aa34a9943831c9f6daeab" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="38">
+         <artifact name="oss-parent-38.pom">
+            <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
+         </artifact>
+      </component>
+      <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
+         <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
+            <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="1.90">
+         <artifact name="com.github.vlsi.crlf.gradle.plugin-1.90.pom">
+            <sha256 value="f54318e1908eb9a6371bc8e5c397f65a23537bf007deeb66d5b06b72565778c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="1.90">
+         <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-1.90.pom">
+            <sha256 value="ba427413f70704d470c3e5d477a1c447b392d54b82abb2bcedf06cff89745759" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="1.90">
+         <artifact name="com.github.vlsi.ide.gradle.plugin-1.90.pom">
+            <sha256 value="e27deb8959eb60b3dcc88083fe0a96af47bc27560d221c83da1867e2d2f6a72f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="1.90">
+         <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-1.90.pom">
+            <sha256 value="37656ed0e5626bf87a0b5f59dab729becbf8dbe5dbf77a533145acf567163add" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.google" name="google" version="1">
+         <artifact name="google-1.pom">
+            <sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.google" name="google" version="5">
+         <artifact name="google-5.pom">
+            <pgp value="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17"/>
+         </artifact>
+      </component>
+      <component group="com.google.collections" name="google-collections" version="1.0">
+         <artifact name="google-collections-1.0.pom">
+            <sha256 value="893d56afcea1b22f83220fd7e49a6668c5b8901e39bd59dc57b42f55673721ce" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1">
+         <artifact name="concurrent-trees-2.6.1.pom">
+            <pgp value="A9789342F598AD5B1175EF357EB97D110DFADD60"/>
+         </artifact>
+      </component>
+      <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.0.2">
+         <artifact name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin-2.0.2.pom">
+            <sha256 value="f6111fd512eabacff117c7a46d730033c6f7eb78cc05ce73fe97cb195cf330f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.gradle.develocity" name="com.gradle.develocity.gradle.plugin" version="3.18.2">
+         <artifact name="com.gradle.develocity.gradle.plugin-3.18.2.pom">
+            <sha256 value="0095b536e4c60a1325946ccdb1a9fbbb97249df276d89bb0eb1ba698a8a64f3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest" name="ktlint" version="0.40.0">
+         <artifact name="ktlint-0.40.0.jar">
+            <sha256 value="37bfa6c412482fed94975facc6e589d2be7e65b0b2d30bff5ea96536c8bd12d1" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-0.40.0.module">
+            <sha256 value="debce7cc007b7eeec908de8e897954e2142e770eaba2e7140d8e1f2d8b6ec990" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-core" version="0.40.0">
+         <artifact name="ktlint-core-0.40.0.jar">
+            <sha256 value="67045459446f2100a820835e1ba7b11080ecb0a7bdc540a92a2dde3e1ad5df4e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-core-0.40.0.module">
+            <sha256 value="76be1138d128476a058907298b52f737422a878448979aa27ec01c7694544d85" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-reporter-baseline" version="0.40.0">
+         <artifact name="ktlint-reporter-baseline-0.40.0.jar">
+            <sha256 value="08c294b9e76301f29b4ceb7f8891f68e8a38a985a61770fae2a239c8ab786f99" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-reporter-baseline-0.40.0.module">
+            <sha256 value="43a29d1ad7a4099b17ecbbe3ce67876e6d941a4b7c925f3e75dbc418e56f3b78" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-reporter-checkstyle" version="0.40.0">
+         <artifact name="ktlint-reporter-checkstyle-0.40.0.jar">
+            <sha256 value="c33dcb83392124ea1e2bb39b0a3bbd219ae1e614c60c5f0807eb829820b493ad" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-reporter-checkstyle-0.40.0.module">
+            <sha256 value="1f109dc7f13a14f3713fb56dcd8d5dcdc8dcf33f77f1eb2019acf6fbc4e20971" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-reporter-html" version="0.40.0">
+         <artifact name="ktlint-reporter-html-0.40.0.jar">
+            <sha256 value="f2326b16af601c87c191762463e65939ba9bfae2ce2383d0e1b7a7f6f3241b5c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-reporter-html-0.40.0.module">
+            <sha256 value="09223dd04bf2ef82da5f3714659cddee8a3b7ff4f7855579d88fb868f3f6ddde" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-reporter-json" version="0.40.0">
+         <artifact name="ktlint-reporter-json-0.40.0.jar">
+            <sha256 value="4648e8a52797527f7d23273a95f6370ea3f47798f29a8cc45d31918333635a69" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-reporter-json-0.40.0.module">
+            <sha256 value="101441329b498fb6df6cf58cd366211a778b8929569e4f68d015202a2bacee9f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-reporter-plain" version="0.40.0">
+         <artifact name="ktlint-reporter-plain-0.40.0.jar">
+            <sha256 value="f6828c5f089c0fa3c07f2365134690ab6224f7b8b2cd355a4536b3e2d18a965c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-reporter-plain-0.40.0.module">
+            <sha256 value="a3335eb853ee606b9445b51eccd26bc0e2cdff504764994ab453bdb190879830" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-ruleset-experimental" version="0.40.0">
+         <artifact name="ktlint-ruleset-experimental-0.40.0.jar">
+            <sha256 value="6565be6fa2ea178214ce797aee7e5e8a9a5f320e9ac3ee532ff47943475f03bf" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-ruleset-experimental-0.40.0.module">
+            <sha256 value="670d01ae614d05143fbbc013052de39cacea3c6901be8c2649bb37e78a9886ab" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-ruleset-standard" version="0.40.0">
+         <artifact name="ktlint-ruleset-standard-0.40.0.jar">
+            <sha256 value="a8fc82f0661e40e7fd4e96b790e141e5999fc71567aa37ede109b12dcd24f43d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-ruleset-standard-0.40.0.module">
+            <sha256 value="a079ddd01a576fc09569548547b8782a1238a5f6db457340d2ad8138975021ed" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-ruleset-test" version="0.40.0">
+         <artifact name="ktlint-ruleset-test-0.40.0.jar">
+            <sha256 value="b5d6b10b21eb8f5be8293458a3f4288812afbeaf7d73de205393dbc8c332cfcc" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="ktlint-ruleset-test-0.40.0.module">
+            <sha256 value="63db70e1c2ea9ab26e45be1844dd236adcfa09c80a0f0c350463fc2b3c2f37ee" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.sun.activation" name="all" version="1.2.1">
+         <artifact name="all-1.2.1.pom">
+            <pgp value="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC"/>
+         </artifact>
+      </component>
+      <component group="com.sun.xml.bind" name="jaxb-bom-ext" version="2.3.5">
+         <artifact name="jaxb-bom-ext-2.3.5.pom">
+            <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
+         </artifact>
+      </component>
+      <component group="com.sun.xml.ws" name="jaxws-ri-bom" version="2.3.5">
+         <artifact name="jaxws-ri-bom-2.3.5.pom">
+            <pgp value="E725C3877939E8FFEA7E3C44B6D3FC494798E478"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.0.4">
+         <artifact name="commons-logging-1.0.4.pom">
+            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.2">
+         <artifact name="commons-logging-1.2.pom">
+            <pgp value="0CC641C3A62453AB390066C4A41F13C999945293"/>
+         </artifact>
+      </component>
+      <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
+         <artifact name="nexus-publish-plugin-0.4.0.jar">
+            <sha256 value="b5fed9f29022119b6d5dd87b3073e19991bec6196117e306334608927cd1f620" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="nexus-publish-plugin-0.4.0.pom">
+            <sha256 value="dccd2171f5644d418b2504a317c247b99efde4656b6a483d1a59130501feb08d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="de.thetaphi" name="forbiddenapis" version="3.6">
+         <artifact name="forbiddenapis-3.6.jar">
+            <ignored-keys>
+               <ignored-key id="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="8c0606b1444f1d456abce555d2de5cb3f374c92ca9658007ab5f06e33eac4351" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+         <artifact name="forbiddenapis-3.6.pom">
+            <ignored-keys>
+               <ignored-key id="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="6231f560501df4c42863ef2e81134cccf04c3d3d8b9631a55f85041913c4a81b" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="de.thetaphi.forbiddenapis" name="de.thetaphi.forbiddenapis.gradle.plugin" version="3.6">
+         <artifact name="de.thetaphi.forbiddenapis.gradle.plugin-3.6.pom">
+            <sha256 value="563093977165b0c40643a0f7dbde12d473569468d97911acaf75eaba82dc86f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.7">
+         <artifact name="gradle-idea-ext-1.1.7.jar">
+            <sha256 value="f7a9e1519b8d9c597e5a2ce0d67fdfeef4063fc227d14efaa12c200f37d14390" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-idea-ext-1.1.7.pom">
+            <sha256 value="f8f16eb8be341a1d29e15b715fb34d920ef5f9a6f15555c48c2c7f9825a5f83f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="io.codearte.gradle.nexus" name="gradle-nexus-staging-plugin" version="0.21.2">
+         <artifact name="gradle-nexus-staging-plugin-0.21.2.jar">
+            <pgp value="1AB9BDF40ED49DEBB5CAADED5B30D3B10694F057"/>
+         </artifact>
+         <artifact name="gradle-nexus-staging-plugin-0.21.2.pom">
+            <ignored-keys>
+               <ignored-key id="1AB9BDF40ED49DEBB5CAADED5B30D3B10694F057" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="11ba6d768baf4ba6b1e98f97fab3cc24e1052482c18c38718f65d1163a9fbddf" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="io.fabric8" name="kubernetes-client-bom" version="5.12.4">
+         <artifact name="kubernetes-client-bom-5.12.4.pom">
+            <pgp value="A42FEF087AF29AE864684EAEE6039456D5BBD4F8"/>
+         </artifact>
+      </component>
+      <component group="io.freefair.gradle" name="lombok-plugin" version="5.3.3.3">
+         <artifact name="lombok-plugin-5.3.3.3.jar">
+            <sha256 value="fd6426a37450f6b68fedce4ac26c570830ca3c9ecd415c44c81478da1f1eb0e0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="lombok-plugin-5.3.3.3.module">
+            <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-bom" version="4.1.104.Final">
+         <artifact name="netty-bom-4.1.104.Final.pom">
+            <pgp value="0D35D3F60078655126908E8AF3D1600878E85A3D"/>
+         </artifact>
+      </component>
+      <component group="io.projectreactor" name="reactor-bom" version="2023.0.1">
+         <artifact name="reactor-bom-2023.0.1.pom">
+            <pgp value="48B086A7D843CFA258E83286928FBF39003C0425"/>
+         </artifact>
+      </component>
+      <component group="javax.inject" name="javax.inject" version="1">
+         <artifact name="javax.inject-1.jar">
+            <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="javax.inject-1.pom">
+            <sha256 value="943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.jmh" name="jmh-gradle-plugin" version="0.7.2">
+         <artifact name="jmh-gradle-plugin-0.7.2.jar">
+            <sha256 value="d9672099ff8fc3f9bf3d4d015864e1586f07ecbd2a8a177a66184ef0b68aba65" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="jmh-gradle-plugin-0.7.2.module">
+            <sha256 value="6d849ae7454ab391718e5fc70e2716418ef3ed264472345bd80c6de64e00b6c4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.2">
+         <artifact name="me.champeau.jmh.gradle.plugin-0.7.2.pom">
+            <sha256 value="57e0c23ac60945aefb5a0c4a9339bea68a295364ca47c7a9079a032f79013abb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="net.java" name="jvnet-parent" version="1">
+         <artifact name="jvnet-parent-1.pom">
+            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
+         </artifact>
+      </component>
+      <component group="net.java" name="jvnet-parent" version="3">
+         <artifact name="jvnet-parent-3.pom">
+            <pgp value="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7"/>
+         </artifact>
+      </component>
+      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="3.1.0">
+         <artifact name="net.ltgt.errorprone.gradle.plugin-3.1.0.pom">
+            <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
+         <artifact name="gradle-errorprone-plugin-3.1.0.jar">
+            <sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-errorprone-plugin-3.1.0.module">
+            <sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="net.sf.ezmorph" name="ezmorph" version="1.0.6">
+         <artifact name="ezmorph-1.0.6.jar">
+            <sha256 value="2be06a2380f8656426b5c610db694bbd75314caf3e9191affcd7942721398ed7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="ezmorph-1.0.6.pom">
+            <sha256 value="f943e454c4c6d349ff00a1fd6c7eaf391501d20de3770d1f8d22cbe11ac080dd" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="net.sf.json-lib" name="json-lib" version="2.3">
+         <artifact name="json-lib-2.3-jdk15.jar">
+            <sha256 value="1e58cc49a02f2ae22049c73de69d03a6aa44f197533c42106a302e03c95c40ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="json-lib-2.3.pom">
+            <sha256 value="e119846ac53eca6bcff05cc4fd5151617663895c7e7ca82bd8ce91f9f9e8ea83" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.ajoberstar.grgit" name="grgit-gradle" version="4.1.1">
+         <artifact name="grgit-gradle-4.1.1.pom">
+            <ignored-keys>
+               <ignored-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="13">
+         <artifact name="apache-13.pom">
+            <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="16">
+         <artifact name="apache-16.pom">
+            <pgp value="0CDE80149711EB46DFF17AE421A24B3F8B0F594A"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="17">
+         <artifact name="apache-17.pom">
+            <pgp value="AE9E53FC28FF2AB1012273D0BF1518E0160788A2"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="18">
+         <artifact name="apache-18.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="6">
+         <artifact name="apache-6.pom">
+            <pgp value="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="7">
+         <artifact name="apache-7.pom">
+            <pgp value="BA926F64CA647B6D853A38672E2010F8A7FF4A41"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="9">
+         <artifact name="apache-9.pom">
+            <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="39">
+         <artifact name="commons-parent-39.pom">
+            <pgp value="808D78B17A5A2D7C3668E31FBFFC9B54721244AD"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="5">
+         <artifact name="commons-parent-5.pom">
+            <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
+         </artifact>
+      </component>
+      <component group="org.apache.geronimo.genesis" name="genesis" version="1.2">
+         <artifact name="genesis-1.2.pom">
+            <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="12">
+         <artifact name="httpcomponents-parent-12.pom">
+            <pgp value="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
+         <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
+            <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="checkerframework-gradle-plugin-0.6.37.module">
+            <sha256 value="daa3999ad4a9c4ceb9eb8c928602ba755ad8fbe7836c5072fb416f20f8f693ae" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.37">
+         <artifact name="org.checkerframework.gradle.plugin-0.6.37.pom">
+            <sha256 value="5d14cf67298d07b980d44e4dbdf42cd4fb0aa99d9dc326db8d824b83216561ed" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.groovy.modules.http-builder" name="http-builder" version="0.7.1">
+         <artifact name="http-builder-0.7.1.jar">
+            <sha256 value="17ae791dd0f09b54b7c5496ac3e0d028e97130c6503932cb077f9d3ee395a448" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="http-builder-0.7.1.pom">
+            <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.mojo" name="mojo-parent" version="40">
+         <artifact name="mojo-parent-40.pom">
+            <pgp value="D433F9C895710DB8AB087FA6B7C3B43D18EAA8B7"/>
+         </artifact>
+      </component>
+      <component group="org.fusesource" name="fusesource-pom" version="1.10">
+         <artifact name="fusesource-pom-1.10.pom">
+            <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.5">
+         <artifact name="jaxb-bom-2.3.5.pom">
+            <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="4.4.0">
+         <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-4.4.0.pom">
+            <sha256 value="6739a6baa7c19632dcfbd7656fe7b54eff391bfee2f3e2eab5d5acb9acb11da2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="4.4.0">
+         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-4.4.0.pom">
+            <sha256 value="22f335523145d2c8400d4d63b783e24750f9f984cf5e28ca1edffdf7f9a9de7b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="0.7.0">
+         <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.7.0.pom">
+            <sha256 value="c8a443e2faef876f338a391233c20a91ad5b83f69c1c6ba20d39a7b39106240a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.gradlex.build-parameters" name="org.gradlex.build-parameters.gradle.plugin" version="1.4.4">
+         <artifact name="org.gradlex.build-parameters.gradle.plugin-1.4.4.pom">
+            <sha256 value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.infinispan" name="infinispan-bom" version="11.0.15.Final">
+         <artifact name="infinispan-bom-11.0.15.Final.pom">
+            <sha256 value="07386ee62c8464618770d209f8c060da8e51f56e76314d1b29caec9c302130e9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.infinispan" name="infinispan-build-configuration-parent" version="11.0.15.Final">
+         <artifact name="infinispan-build-configuration-parent-11.0.15.Final.pom">
+            <sha256 value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jboss" name="jboss-parent" version="36">
+         <artifact name="jboss-parent-36.pom">
+            <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.9.10">
+         <artifact name="dokka-gradle-plugin-1.9.10.pom">
+            <ignored-keys>
+               <ignored-key id="98465301A4939C0279F2E847D89D05374952262B" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="1.9.10">
+         <artifact name="org.jetbrains.dokka.gradle.plugin-1.9.10.pom">
+            <sha256 value="27bb52753f97b2cbedd5ad72e111e05e53e0b08a4d22a2aaa80069df5d527ae1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
+         <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.7.pom">
+            <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.30">
+         <artifact name="kotlin-stdlib-common-1.3.30.pom">
+            <pgp value="BAE5C184E3B70CB15617700598FE03A974CE0A0B"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.9.22">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.9.22.pom">
+            <sha256 value="1cb4ecb933c919b2fbfd765efca5fe4907a08712e8c9942c33a208b2b169b18c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="1.9.22">
+         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-1.9.22.pom">
+            <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.mockito" name="mockito-bom" version="4.11.0">
+         <artifact name="mockito-bom-4.11.0.pom">
+            <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
+         </artifact>
+      </component>
+      <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
+         <artifact name="creadur-rat-gradle-0.8.1.jar">
+            <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="creadur-rat-gradle-0.8.1.module">
+            <sha256 value="02ad9b8b0c7fad0f01bdb71434d8e5b61a32c0c2ccee99336d72ec1cb80e69ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.nosphere.apache.rat" name="org.nosphere.apache.rat.gradle.plugin" version="0.8.1">
+         <artifact name="org.nosphere.apache.rat.gradle.plugin-0.8.1.pom">
+            <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.5.1">
+         <artifact name="ow2-1.5.1.pom">
+            <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
+         </artifact>
+      </component>
+      <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
+         <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
+            <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="4.4.1.3373">
+         <artifact name="sonarqube-gradle-plugin-4.4.1.3373.jar">
+            <sha256 value="39c349b63a650e5bb48a499304b2faf385410cf8613c875a22398f14b9bfb831" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sonarqube-gradle-plugin-4.4.1.3373.module">
+            <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="5">
+         <artifact name="oss-parent-5.pom">
+            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="6">
+         <artifact name="oss-parent-6.pom">
+            <sha256 value="b4306d13e8f5392458a1b30866f1cff161b3d2e6999a88d059eea3932c8a8499" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="7">
+         <artifact name="oss-parent-7.pom">
+            <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <pgp value="44FBDBBC1A00FE414F1C1873586654072EAD6677"/>
+         </artifact>
+      </component>
+      <component group="org.testcontainers" name="testcontainers-bom" version="1.16.1">
+         <artifact name="testcontainers-bom-1.16.1.pom">
+            <pgp value="D022218DCC08AAD6EF3AF876B3DE72E647D35161"/>
+         </artifact>
+      </component>
+      <component group="org.testcontainers" name="testcontainers-bom" version="1.19.3">
+         <artifact name="testcontainers-bom-1.19.3.pom">
+            <pgp value="2655176F748FD83725B4805FF2A01147D830C125"/>
+         </artifact>
+      </component>
+      <component group="oro" name="oro" version="2.0.8">
+         <artifact name="oro-2.0.8.jar">
+            <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="oro-2.0.8.pom">
+            <sha256 value="9aa9dfeb2e85e1d5e7932c87140697cecc2b0fadd933d679fd420a2e43831a82" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="xml-apis" name="xml-apis-ext" version="1.3.04">
+         <artifact name="xml-apis-ext-1.3.04.jar">
+            <sha256 value="d0b4887dc34d57de49074a58affad439a013d0baffa1a8034f8ef2a5ea191646" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="xml-apis-ext-1.3.04.pom">
+            <sha256 value="1b5939a9310a59c0df0c03726721d5fc9521e87d6c203bfa7220bae82a30d9e8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="xml-resolver" name="xml-resolver" version="1.2">
+         <artifact name="xml-resolver-1.2.jar">
+            <sha256 value="47dcde8986019314ef78ae7280a94973a21d2ed95075a40a000b42da956429e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="xml-resolver-1.2.pom">
+            <sha256 value="581d5e1783ddd7b5da1365b778dc12f79671a4309d74221c4fbd935988987a9b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="xmlpull" name="xmlpull" version="1.1.3.1">
+         <artifact name="xmlpull-1.1.3.1.jar">
+            <sha256 value="34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="xmlpull-1.1.3.1.pom">
+            <sha256 value="8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+   </components>
+</verification-metadata>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 96fe431f4b7..ef25693b2c7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -125,13 +125,8 @@ develocity {
     }
 }
 
-// Checksum plugin sources can be validated at https://github.com/vlsi/vlsi-release-plugins
 buildscript {
     dependencies {
-        classpath("com.github.vlsi.gradle:checksum-dependency-plugin:${settings.extra["com.github.vlsi.checksum-dependency.version"]}") {
-            // Gradle ships kotlin-stdlib which is good enough
-            exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-        }
         // Remove when Autostyle updates jgit dependency
         classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r")
     }
@@ -140,64 +135,6 @@ buildscript {
     }
 }
 
-// Note: we need to verify the checksum for checksum-dependency-plugin itself
-val expectedSha512 = mapOf(
-    // TODO: remove JavaEWAH-1.1.12.jar, org.eclipse.jgit-5.13.0.202109080827-r.jar, slf4j-api-1.7.30.jar when Autostyle updates jgit
-    "ECBBFD1C6593AFBAA4CA7F65E10BC67B12FF75EB221E490051522FAC8D291B202A0A165644A9C5AC9E5618CD771817C9052F171E5E6210CB021DF5A6E4CBF787"
-        to "JavaEWAH-1.1.12.jar",
-    "5A3821A07EEBC9B56F87054C71B9BAFA0D9D0B556AA16191F8676D748CEC755A741CD5500E8676493FFCA69E6C9608CAF86D80B60B5934EE108D77030C490194"
-        to "JavaEWAH-1.1.13.jar",
-    "3EA1DC755BFC93EA97ACA9C3E40CA922C369907E31338DC06DE5226B51FF79D7E2584D5AE8CC011FF11C94DB750414E9E46F6DD712F945973A4992D6A2969B1"
-        to "common-custom-user-data-gradle-plugin-2.0.2.jar",
-    "768DBB3BA2649A7025338197B4703B414983E4608138719B0D69201F7F49E57E0454846B41B775B135B083F820824749DA6121F20A812C4F155A97F09C9B15AC"
-        to "org.eclipse.jgit-5.13.0.202109080827-r.jar",
-    "DD1453E479CAC4E0D20143A1955654DC6C163916CA07C11F70F482F317BBF00A5FEDC8B198AF60BF17E9843E76DDA3103DAB3463384536F73A90AC0206CFB0E0"
-        to "org.eclipse.jgit-5.13.1.202206130422-r.jar",
-    "37ED7485AF83C40D3FC1965512F88E73D139D1CD099CFC71A7E87A38B2D2CD14BB34918718EC7F19A155AC0632B97BAC77295CFFC49F11275B1F7D82D0655357"
-        to "org.eclipse.jgit-5.13.2.202306221912-r.jar",
-    "E5435852569DDA596BA46138AF8EE9C4ECBA8A7A43F4F1E7897AEB4430523A0F037088A7B63877DF5734578F19D331F03D7B0F32D5AE6C425DF211947B3E6173"
-        to "slf4j-api-1.7.30.jar",
-    "24638FE67382EBDA9529F00A54FA6133EA5434D870E6C1D20622F007E8CC1C00408060D7D578CFE62195650A1785FE7E65DC87B1D92FB27B31AB4134AEADAC0E"
-        to "develocity-gradle-plugin-3.18.2.jar",
-    "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
-        to "bcpg-jdk15on-1.70.jar",
-    "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
-        to "bcprov-jdk15on-1.70.jar",
-    "17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
-        to "okhttp-4.1.0.jar",
-    "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
-        to "okio-2.2.2.jar",
-    "A7E32B1E638C47049683ED945BBCD2678F9FC2AEE1E329C61C05DF8FF426DF5FAE21C81446F4361ABBDB18E5B3B7B7DD01AA1074EDCB3A6D5D148C2B3DEB3FC9"
-        to "foojay-resolver-0.7.0.jar",
-    "10BF91C79AB151B684834E3CA8BA7D7E19742A3EEB580BDE690FBA433F9FFFE3ABBD79ED3FE3F97986C3A2BADC4D14E28835A8EF89167B4B9CC6014242338769"
-        to "gson-2.9.1.jar",
-    settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString()
-        to "checksum-dependency-plugin.jar"
-)
-
-fun File.sha512(): String {
-    val md = java.security.MessageDigest.getInstance("SHA-512")
-    forEachBlock { buffer, bytesRead ->
-        md.update(buffer, 0, bytesRead)
-    }
-    return BigInteger(1, md.digest()).toString(16).uppercase(Locale.ROOT)
-}
-
-val violations =
-    buildscript.configurations["classpath"]
-        .resolve()
-        .sortedBy { it.name }
-        .associateWith { it.sha512() }
-        .filterNot { (_, sha512) -> expectedSha512.contains(sha512) }
-        .entries
-        .joinToString("\n  ") { (file, sha512) -> "SHA-512(${file.name}) = $sha512 ($file)" }
-
-if (violations.isNotBlank()) {
-    throw GradleException("Buildscript classpath has files that were not explicitly permitted:\n  $violations")
-}
-
-apply(plugin = "com.github.vlsi.checksum-dependency")
-
 // This enables to try local Autostyle
 property("localAutostyle")?.ifBlank { "../autostyle" }?.let {
     println("Importing project '$it'")

From 577b7b60cfe90608cca34cb0f89404271f507aac Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 18 Jul 2025 16:28:31 +0300
Subject: [PATCH 0812/1037] chore: run Errorprone verifications by default

---
 .github/workflows/main.yml                    | 4 +++-
 build-logic/build-parameters/build.gradle.kts | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 92a22d3157d..6e2a80aae67 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,6 +80,8 @@ jobs:
           jdkBuildVersion=17
           jdkTestVersion=${{ matrix.java_version }}
           jdkTestVendor=${{ matrix.java_vendor }}
+          # We have a separate job with Errorprone verifications, so avoid duplicate warnings
+          enableErrorprone=false
           # We provision JDKs with GitHub Actions for caching purposes, so Gradle should rather fail in case JDK is not found
           org.gradle.java.installations.auto-download=false
       env:
@@ -101,6 +103,6 @@ jobs:
       with:
         job-id: errprone
         multi-cache-enabled: false
-        arguments: --scan --no-parallel --no-daemon -PenableErrorprone classes
+        arguments: --scan --no-parallel --no-daemon classes
       env:
         DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 9af59d0bc24..7172aba71d4 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -99,8 +99,7 @@ buildParameters {
         description.set("Skip suppressPomMetadataWarningsFor warnings triggered by inability to map test fixtures dependences to Maven pom.xml")
     }
     bool("enableErrorprone") {
-        // By default, disable errorProne in CI so we don't perform the same checks in several jobs
-        defaultValue.set(System.getenv("CI") != "true")
+        defaultValue.set(true)
         description.set("Enable ErrorProne verifications")
     }
     bool("skipJavadoc") {

From 9220e261368cf19a89965bd952cd0e303a16943d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 18 Jul 2025 13:42:16 +0000
Subject: [PATCH 0813/1037] chore(deps): update dependency gradle to v8.14.3

---
 gradle/verification-metadata.xml         | 205 ++++++++++++++++++++++-
 gradle/wrapper/gradle-wrapper.properties |   4 +-
 2 files changed, 206 insertions(+), 3 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index adc795a9ffe..1441aa5584c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -20,12 +20,16 @@
          <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb" name="mongo-java-driver" version="2.14.3"/>
          <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
          <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
+         <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty" name="netty-bom" version="4.1.104.Final"/>
+         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons" name="commons-math3" version="3.2"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker" name="freemarker"/>
+         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito" name="mockito-bom" version="4.11.0"/>
          <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
          <trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064" group="com.google.protobuf"/>
+         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
@@ -36,6 +40,7 @@
          <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
          <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
+         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD" group="net.java"/>
          <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier" name="equalsverifier" version="3.15.5"/>
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
             <trusting group="commons-codec"/>
@@ -59,7 +64,9 @@
          <trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18" group="net.javacrumbs.json-unit"/>
          <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons" name="commons-math3" version="3.6.1"/>
          <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath" name="json-path" version="2.8.0"/>
+         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
+         <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425" group="io.projectreactor" name="reactor-bom" version="2023.0.1"/>
          <trusted-key id="4AC55A85D30C3499A3219500B7E2662A7640A051" group="com.formdev" name="svgSalamander" version="1.1.4"/>
          <trusted-key id="4BDE772C338BA540E1057D0C8EA48D105232855D" group="com.github.jknack"/>
          <trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
@@ -120,6 +127,7 @@
          <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom" name="jdom" version="1.1.3"/>
          <trusted-key id="A1885C07A3204611FB184EF7098A31F381819057" group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.16"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
+         <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
          <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
          <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern" name="software-and-algorithms" version="1.0"/>
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
@@ -127,6 +135,7 @@
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli" name="picocli" version="4.7.5"/>
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
+         <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache" name="apache" version="17"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus" name="plexus-classworlds" version="2.6.0"/>
          <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
@@ -139,6 +148,7 @@
          </trusted-key>
          <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations"/>
          <trusted-key id="B920D295BF0E61CB4CF0896C33CD6733AF5EC452" group="commons-logging"/>
+         <trusted-key id="BA926F64CA647B6D853A38672E2010F8A7FF4A41" group="org.apache" name="apache" version="7"/>
          <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
          <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>
          <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
@@ -151,6 +161,7 @@
             <trusting group="org.apache.commons"/>
             <trusting group="org.xmlunit"/>
          </trusted-key>
+         <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers" name="testcontainers-bom" version="1.16.1"/>
          <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
             <trusting group="com.github.autostyle"/>
             <trusting group="com.github.vlsi.gradle"/>
@@ -165,6 +176,7 @@
          <trusted-key id="D5F46BC0B86AF5DC56DF58F05E975CB00C643DBF" group="com.google.inject"/>
          <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="^org[.]apache($|([.].*))" regex="true"/>
          <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb" name="hsqldb" version="2.7.2"/>
+         <trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C" group="org.apache" name="apache" version="9"/>
          <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell" name="bsh" version="2.0b6"/>
          <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A" group="com.github.tomakehurst" name="wiremock-jre8" version="2.35.2"/>
          <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections" name="pcollections" version="3.1.4"/>
@@ -188,8 +200,8 @@
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup" name="jsoup"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
             <trusting group="org.apache" name="apache"/>
-            <trusting group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
             <trusting group="org.codehaus.plexus"/>
+            <trusting group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
          <trusted-key id="FEABFB0DBD7A754822D35DD9BE6397E958AB7594" group="org.jetbrains.lets-plot"/>
@@ -225,6 +237,46 @@
             <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="43">
+         <artifact name="oss-parent-43.pom">
+            <sha256 value="e5585cc1c37079b2e3817a8997945736f158831844d59d0e4d3a45b27611f926" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="50">
+         <artifact name="oss-parent-50.pom">
+            <sha256 value="f5da55dd7b88fb170c46801d17774a652fb2f4581fb5b1d0a5fc86aa182b8577" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="56">
+         <artifact name="oss-parent-56.pom">
+            <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.4.20221013">
+         <artifact name="jackson-bom-2.13.4.20221013.pom">
+            <sha256 value="cb63f8ff98c7ccbe531e3764be2c91d275b8fcfe2972cd67aa7f0a781a239a36" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.16.0">
+         <artifact name="jackson-bom-2.16.0.pom">
+            <sha256 value="5aaa28874405bf04fba8e2c57159227824461ba6f7d552abdb8e8d3a0ba6f8bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.13">
+         <artifact name="jackson-parent-2.13.pom">
+            <sha256 value="2bba89978172af1effcb4d143d09921a3f3082ca4dcf122b1ded98bf55b2ad57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.15">
+         <artifact name="jackson-parent-2.15.pom">
+            <sha256 value="6cdf97bc66f389f63e36850d2f552d1216688f8e5a58727d3f6a98edf8675cde" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
+         <artifact name="jackson-parent-2.16.pom">
+            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
          <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -260,6 +312,11 @@
             <pgp value="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17"/>
          </artifact>
       </component>
+      <component group="com.google.auto.service" name="auto-service-aggregator" version="1.1.1">
+         <artifact name="auto-service-aggregator-1.1.1.pom">
+            <sha256 value="e2dc3e263a5db0cc8172fb2eb9bcd232acecfdc96e817103eab3c8d9f1900c6a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.collections" name="google-collections" version="1.0">
          <artifact name="google-collections-1.0.pom">
             <sha256 value="893d56afcea1b22f83220fd7e49a6668c5b8901e39bd59dc57b42f55673721ce" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -434,6 +491,7 @@
       <component group="io.fabric8" name="kubernetes-client-bom" version="5.12.4">
          <artifact name="kubernetes-client-bom-5.12.4.pom">
             <pgp value="A42FEF087AF29AE864684EAEE6039456D5BBD4F8"/>
+            <sha256 value="d232392a89c3efdc85ab299c5a94e8b9dd35bc02f340ce8446ff659aa15913a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.freefair.gradle" name="lombok-plugin" version="5.3.3.3">
@@ -447,6 +505,7 @@
       <component group="io.netty" name="netty-bom" version="4.1.104.Final">
          <artifact name="netty-bom-4.1.104.Final.pom">
             <pgp value="0D35D3F60078655126908E8AF3D1600878E85A3D"/>
+            <sha256 value="5a65e06a159d20d3b4800624a570c646dbee710b2b539b3449a268558c289e9c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.projectreactor" name="reactor-bom" version="2023.0.1">
@@ -454,6 +513,16 @@
             <pgp value="48B086A7D843CFA258E83286928FBF39003C0425"/>
          </artifact>
       </component>
+      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
+         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
+            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
+         <artifact name="jakartaee-api-parent-9.1.0.pom">
+            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -478,6 +547,7 @@
       <component group="net.java" name="jvnet-parent" version="1">
          <artifact name="jvnet-parent-1.pom">
             <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
+            <sha256 value="281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.java" name="jvnet-parent" version="3">
@@ -535,11 +605,58 @@
       <component group="org.apache" name="apache" version="17">
          <artifact name="apache-17.pom">
             <pgp value="AE9E53FC28FF2AB1012273D0BF1518E0160788A2"/>
+            <sha256 value="398044b74b5a719326be218ae08124e5e2f3318ab5d78fe199d504efc2e0d43f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="18">
          <artifact name="apache-18.pom">
             <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+            <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="19">
+         <artifact name="apache-19.pom">
+            <sha256 value="91f7a33096ea69bac2cbaf6d01feb934cac002c48d8c8cfa9c240b40f1ec21df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="23">
+         <artifact name="apache-23.pom">
+            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="24">
+         <artifact name="apache-24.pom">
+            <sha256 value="2e93bbabe3413af89a0c3bfb9e6bf71dbc9e8f9fb14ccbb1d78bd0275df1c525" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="25">
+         <artifact name="apache-25.pom">
+            <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="27">
+         <artifact name="apache-27.pom">
+            <sha256 value="b2b0fc69e22a650c3892f1c366d77076f29575c6738df4c7a70a44844484cdf9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="3">
+         <artifact name="apache-3.pom">
+            <sha256 value="393c50afb4b7aa6eb57e5377a55a1a0610b19f75b52ece01308db04a1187a20e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="30">
+         <artifact name="apache-30.pom">
+            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="31">
+         <artifact name="apache-31.pom">
+            <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="4">
+         <artifact name="apache-4.pom">
+            <sha256 value="9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="6">
@@ -550,11 +667,18 @@
       <component group="org.apache" name="apache" version="7">
          <artifact name="apache-7.pom">
             <pgp value="BA926F64CA647B6D853A38672E2010F8A7FF4A41"/>
+            <sha256 value="1397ce1db433adc9f223dbf07496d133681448751f4ae29e58f68e78fb4b6c25" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="9">
          <artifact name="apache-9.pom">
             <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
+            <sha256 value="4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="22">
+         <artifact name="commons-parent-22.pom">
+            <sha256 value="fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.commons" name="commons-parent" version="39">
@@ -562,11 +686,26 @@
             <pgp value="808D78B17A5A2D7C3668E31FBFFC9B54721244AD"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="47">
+         <artifact name="commons-parent-47.pom">
+            <sha256 value="8a8ecb570553bf9f1ffae211a8d4ca9ee630c17afe59293368fba7bd9b42fcb7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="5">
          <artifact name="commons-parent-5.pom">
             <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="52">
+         <artifact name="commons-parent-52.pom">
+            <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="62">
+         <artifact name="commons-parent-62.pom">
+            <sha256 value="74cd62d68b09aad7fb9424ea88269ab76aba0d65088d9569ff273bd207427439" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.geronimo.genesis" name="genesis" version="1.2">
          <artifact name="genesis-1.2.pom">
             <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
@@ -577,6 +716,11 @@
             <pgp value="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="13">
+         <artifact name="httpcomponents-parent-13.pom">
+            <sha256 value="e4287867035856c737420368dd586e5e57e702098135840cf3d73e9c8363d7b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -603,6 +747,16 @@
             <pgp value="D433F9C895710DB8AB087FA6B7C3B43D18EAA8B7"/>
          </artifact>
       </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
+         <artifact name="project-1.0.7.pom">
+            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.50.v20221201">
+         <artifact name="jetty-bom-9.4.50.v20221201.pom">
+            <sha256 value="4cde6e533d601eaf8b65acee956b7706c18192f2755d023d7e8d19bb7d5b3943" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -618,11 +772,21 @@
             <sha256 value="6739a6baa7c19632dcfbd7656fe7b54eff391bfee2f3e2eab5d5acb9acb11da2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="5.2.0">
+         <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-5.2.0.pom">
+            <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="4.4.0">
          <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-4.4.0.pom">
             <sha256 value="22f335523145d2c8400d4d63b783e24750f9f984cf5e28ca1edffdf7f9a9de7b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="5.2.0">
+         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom">
+            <sha256 value="a57bb439ba4260a256f2d608471d7081189077a0a4ddfb028dd1817be5bc1237" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="0.7.0">
          <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.7.0.pom">
             <sha256 value="c8a443e2faef876f338a391233c20a91ad5b83f69c1c6ba20d39a7b39106240a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -643,6 +807,11 @@
             <sha256 value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.build" version="0.8.13">
+         <artifact name="org.jacoco.build-0.8.13.pom">
+            <sha256 value="994c3ae1cfca6765968fe3ede4f379986aeb2e7eb51a2014caa4a09d71a8f4a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jboss" name="jboss-parent" version="36">
          <artifact name="jboss-parent-36.pom">
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -666,6 +835,11 @@
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.21">
+         <artifact name="kotlin-gradle-plugins-bom-2.0.21.pom">
+            <sha256 value="675013d4cbeee09c88920ae2ba246f99f28a789b874f634049e012fa3eebf4c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.30">
          <artifact name="kotlin-stdlib-common-1.3.30.pom">
             <pgp value="BAE5C184E3B70CB15617700598FE03A974CE0A0B"/>
@@ -681,9 +855,30 @@
             <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.6.4">
+         <artifact name="kotlinx-coroutines-bom-1.6.4.pom">
+            <sha256 value="ab2614855fba66aa8a42514dbe3d5a884315ffe1ed63f5932e710a8006245ce1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.7.3">
+         <artifact name="kotlinx-coroutines-bom-1.7.3.pom">
+            <sha256 value="4e5d1900e6379ef3f5970d04a8f30529adc82f859e8cc107c21ce8149ef666c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.10.0">
+         <artifact name="junit-bom-5.10.0.pom">
+            <sha256 value="e006dd8894f9fc7b75fc32bb12fe5ed8be65667d5b454f99e2e0b8c5bb8d30b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.10.1">
+         <artifact name="junit-bom-5.10.1.pom">
+            <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="4.11.0">
          <artifact name="mockito-bom-4.11.0.pom">
             <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
+            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
@@ -702,6 +897,12 @@
       <component group="org.ow2" name="ow2" version="1.5.1">
          <artifact name="ow2-1.5.1.pom">
             <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
+            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-bom" version="9.8">
+         <artifact name="asm-bom-9.8.pom">
+            <sha256 value="0da1dcb226e6cdfdadb4dac591916bb917b57374674d91bd2f13003137b41520" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
@@ -735,11 +936,13 @@
       <component group="org.sonatype.oss" name="oss-parent" version="9">
          <artifact name="oss-parent-9.pom">
             <pgp value="44FBDBBC1A00FE414F1C1873586654072EAD6677"/>
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.testcontainers" name="testcontainers-bom" version="1.16.1">
          <artifact name="testcontainers-bom-1.16.1.pom">
             <pgp value="D022218DCC08AAD6EF3AF876B3DE72E647D35161"/>
+            <sha256 value="5061ba84c98536e5a6b4ce280fbcecb00e335f3b04c5d484629162fcb4624778" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.testcontainers" name="testcontainers-bom" version="1.19.3">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 340af228290..2b9acbeca2e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From d980ddf4c10b70bc2d0315ba5217f9a3613ad811 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 19 Jul 2025 19:20:33 +0300
Subject: [PATCH 0814/1037] chore: trust -javadoc, -sources, and gradle:gradle
 artifacts

Those artifacts are used by IDEs when downloading dependency sources.
---
 gradle/verification-metadata.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1441aa5584c..5e74c99f54b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3,6 +3,11 @@
    <configuration>
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
+      <trusted-artifacts>
+         <trust group="gradle" name="gradle"/>
+         <trust file=".*-javadoc[.]jar" regex="true"/>
+         <trust file=".*-sources[.]jar" regex="true"/>
+      </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>

From 4166b4b1062b85dfb96c17d80935e2d540f89a95 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 19 Jul 2025 19:19:35 +0300
Subject: [PATCH 0815/1037] fix: replace deprecated dependencyProject.path with
 .path

---
 build.gradle.kts          | 32 ++++----------------------------
 src/bom/build.gradle.kts  |  6 +++---
 src/dist/build.gradle.kts |  6 +++---
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 50ac4136f7d..d34c1aa458d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,7 +44,7 @@ val platformProjects by extra {
     setOf(
         projects.src.bom,
         projects.src.bomThirdparty,
-    ).mapTo(mutableSetOf()) { it.dependencyProject }
+    ).mapTo(mutableSetOf()) { it.path }
 }
 
 val notPublishedProjects by extra {
@@ -62,35 +62,11 @@ val notPublishedProjects by extra {
         projects.src.testkit,
         projects.src.testkitWiremock,
         projects.src.testServices,
-    ).mapTo(mutableSetOf()) { it.dependencyProject }
+    ).mapTo(mutableSetOf()) { it.path }
 }
 
 val publishedProjects by extra {
-    allprojects - notPublishedProjects
-}
-
-notPublishedProjects.forEach { project ->
-    if (project != rootProject) {
-        project.plugins.withId("maven-publish") {
-            throw IllegalStateException(
-                "Project ${project.path} is listed in notPublishedProjects, however it has maven-publish plugin applied. " +
-                    "Please remove maven-publish plugin (e.g. replace build-logic.jvm-published-library with build-logic.jvm-library) or " +
-                    "move the project to the list of published ones"
-            )
-        }
-    }
-}
-
-publishedProjects.forEach {project ->
-    project.afterEvaluate {
-        if (!pluginManager.hasPlugin("maven-publish")) {
-            throw IllegalStateException(
-                "Project ${project.path} is listed in publishedProjects, however it misses maven-publish plugin. " +
-                    "Please add maven-publish plugin (e.g. replace build-logic.jvm-library with build-logic.jvm-published-library) or " +
-                    "move the project to the list of notPublishedProjects"
-            )
-        }
-    }
+    allprojects.mapTo(mutableSetOf()) { it.path } - notPublishedProjects
 }
 
 val displayVersion by extra {
@@ -116,7 +92,7 @@ tasks.validateBeforeBuildingReleaseArtifacts {
 }
 
 releaseArtifacts {
-    fromProject(projects.src.dist.dependencyProject.path)
+    fromProject(projects.src.dist.path)
     previewSite {
         into("rat")
         from(tasks.rat) {
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 454bfaf8876..69251578388 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -23,10 +23,10 @@ description = "A platform that aligns versions of all JMeter components"
 
 dependencies {
     constraints {
-        val publishedProjects: Set<Project> by rootProject.extra
-        val platformProjects: Set<Project> by rootProject.extra
+        val publishedProjects: Set<String> by rootProject.extra
+        val platformProjects: Set<String> by rootProject.extra
         (publishedProjects - platformProjects).forEach {
-            api(it)
+            api(project(it))
         }
     }
 }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 8ac383a052d..40cf7b67b93 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -128,9 +128,9 @@ val populateLibs by tasks.registering {
     doLast {
         val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
         // This ensures project exists, if project is renamed, names should be corrected here as wells
-        val launcherProject = projects.src.launcher.dependencyProject.path
-        val bshclientProject = projects.src.bshclient.dependencyProject.path
-        val jorphanProject = projects.src.jorphan.dependencyProject.path
+        val launcherProject = projects.src.launcher.path
+        val bshclientProject = projects.src.bshclient.path
+        val jorphanProject = projects.src.jorphan.path
         listOf(libs, libsExt, binLibs).forEach {
             it.filePermissions {
                 unix("rw-r--r--")

From b495352805dfc42a824d9fc5b03303cea4a05b20 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 18 Jul 2025 13:39:59 +0000
Subject: [PATCH 0816/1037] chore(deps): update plugin com.github.autostyle to
 v4

---
 build-logic/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 457336af365..14feec3f256 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     `embedded-kotlin` apply false
-    id("com.github.autostyle") version "3.2"
+    id("com.github.autostyle") version "4.0"
 }
 
 allprojects {

From 6d6654ed3b171e3599c8c59454e28d570aaa485a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 21 Jul 2025 16:56:29 +0300
Subject: [PATCH 0817/1037] chore: remove removeUnusedImports() rule

removeUnusedImports causes issues with parsing newer Java, and
google-java-format requires --add-exports when running with Java 17+

We'd better use OpenRewrite for imports.
---
 .../src/main/kotlin/build-logic.autostyle.gradle.kts      | 1 -
 .../java/org/apache/jmeter/assertions/SizeAssertion.java  | 2 +-
 .../main/java/org/apache/jmeter/functions/ChangeCase.java | 2 +-
 .../jmeter/protocol/http/proxy/TestHttpRequestHdr.java    | 8 ++++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
index 7117e87abad..eb874732ff4 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -75,7 +75,6 @@ plugins.withId("java") {
         java {
             license()
             importOrder("static ", "java.", "javax", "org", "net", "com", "")
-            removeUnusedImports()
             indentWithSpaces(4)
         }
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
index 5e83d920c46..ac2ad0132b4 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
@@ -249,7 +249,7 @@ private String compareSize(long resultSize) {
         if (operator == null) {
             return "ERROR - invalid condition";
         }
-        
+
         if (operator.evaluate(resultSize, allowedSize)) {
             return "";
         } else {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index faf5c841b07..44187fb4e99 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -86,7 +86,7 @@ protected String changeCase(String originalString, String mode) {
             LOGGER.error("Unknown mode {}, returning {} unchanged", mode, originalString);
             return originalString;
         }
-        
+
         return switch (changeCaseMode) {
             case UPPER -> StringUtils.upperCase(originalString);
             case LOWER -> StringUtils.lowerCase(originalString);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index d538a73e99c..da4868a20f2 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -81,7 +81,7 @@ public void testRepeatedArguments() throws Exception {
                 Content-type: %s\r
                 Content-length: %d\r
                 \r
-                %s""".formatted(url, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED, 
+                %s""".formatted(url, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED,
                               getBodyLength(postBody, contentEncoding), postBody);
         s = getSamplerForRequest(url, testPostRequest, contentEncoding);
         assertEquals(HTTPConstants.POST, s.getMethod());
@@ -597,15 +597,15 @@ public void testPostMultipartFileUpload() throws Exception {
     private String createMultipartFormBody(String titleValue, String descriptionValue,
             String contentEncoding, boolean includeExtraHeaders,
             String boundary, String endOfLine) {
-        
+
         String titleHeaders = includeExtraHeaders ? """
                 Content-Type: text/plain; charset=%s%s\
                 Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
-        
+
         String descriptionHeaders = includeExtraHeaders ? """
                 Content-Type: text/plain; charset=%s%s\
                 Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
-        
+
         return """
                 --%s%s\
                 Content-Disposition: form-data; name="title"%s\

From 16b13bc8faff9463dd72962dd07b5d3630bdcc8a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 17:08:42 +0300
Subject: [PATCH 0818/1037] chore: Oracle JDK supports only 21 or later

---
 .github/workflows/matrix.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index acf5472f941..581855dda02 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -83,6 +83,8 @@ matrix.exclude({os: 'macos-latest', java_distribution: {value: 'oracle'}})
 // Ignore builds with JAVA EA for now, see https://github.com/apache/jmeter/issues/6114
 matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// Oracle JDK is only supported for JDK 21 and later
+matrix.imply({java_distribution: {value: 'oracle'}}, {java_version: v => v === eaJava || v >= 21});
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'});
 // Ensure at least one job with "same" hashcode exists

From dd192d41a16b28c3d61e1bac8c20401bde4c3fb6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 17:17:37 +0300
Subject: [PATCH 0819/1037] chore: fix release-drafter so it uses the version
 from gradle.properties

Previously, release drafter was inferring v0.0.1.
Now we force the proper version for the draft.
---
 .github/workflows/release-drafter.yml | 28 ++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 087a6b7d71b..380b2e88c07 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -8,13 +8,36 @@ on:
       - 'release/**'
   # pull_request_target allows PR from forks to access secrets, so please NEVER add pull_request_target
 
+# Declare default permissions as read-only.
+permissions: read-all
+
 jobs:
   update_release_draft:
     # Skip release drafts in forks
-    if: github.repository_owner == 'apache'
+    if: vars.RUN_RELEASE_DRAFTER == 'true'
     name: Update Release Draft
     runs-on: ubuntu-latest
+    permissions:
+      # write permission is required to create a github release
+      contents: write
     steps:
+      - name: Get the current version
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+        id: current_version
+        with:
+          # language=javascript
+          script: |
+            const response = await github.rest.repos.getContent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              path: 'gradle.properties',
+              ref: context.sha
+            });
+            const content = Buffer.from(response.data.content, 'base64').toString();
+            const version = content.match(/^jmeter\.version=(.+)$/m)[1];
+            console.log(`Version is ${version}`);
+            return version;
+
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
         uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
@@ -23,5 +46,8 @@ jobs:
         with:
         #   config-name: my-config.yml
            disable-autolabeler: true
+           publish: false
+           latest: ${{ github.ref_name == github.event.repository.default_branch }}
+           version: ${{ steps.current_version.outputs.result }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 3c2a66e9c7d2778b37e1499f7c4d396438d3a860 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 17:26:52 +0300
Subject: [PATCH 0820/1037] chore: remove stale release-drafter configuration

---
 .github/release-drafter.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index f6010e0a3e6..0a09f1b3941 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,9 +1,6 @@
 # See https://github.com/release-drafter/release-drafter#configuration-options
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'rel/v$RESOLVED_VERSION'
-# Filter previous releases to consider only those with the target matching the current branch
-filter-by-commitish: true
-tag-prefix: REL
 exclude-labels:
   - 'skip-changelog'
 categories:

From 64d6bfdd3900243b22087fbfabd89613361e175c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 16 Jun 2025 11:57:31 +0000
Subject: [PATCH 0821/1037] chore(deps): update oracle-actions/setup-java
 action to v1.4.2

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e2a80aae67..7cbf9111e82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
       if: ${{ matrix.oracle_java_website != '' }}
-      uses: oracle-actions/setup-java@7a0114d66dbd02646abd345c3395b34c148e6126 # v1.3.2
+      uses: oracle-actions/setup-java@b1546e588c27008e88bfcabda44d11c22316b9b8 # v1.4.2
       with:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}

From 65832b032d41a807b03463fbe64d12dec0ea529d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 17:59:47 +0300
Subject: [PATCH 0822/1037] chore: add auto-download-jdk to build-logic and
 build-logic-commons modules

The modules require Java 17 to be available, however, they missed org.gradle.toolchains.foojay plugin
---
 build-logic-commons/settings.gradle.kts |   4 +
 build-logic/settings.gradle.kts         |   4 +-
 gradle/verification-keyring.keys        | 268 ++++++++++--------------
 gradle/verification-metadata.xml        |   5 +
 settings.gradle.kts                     |   2 +-
 5 files changed, 120 insertions(+), 163 deletions(-)

diff --git a/build-logic-commons/settings.gradle.kts b/build-logic-commons/settings.gradle.kts
index 28f941e2070..accf056d625 100644
--- a/build-logic-commons/settings.gradle.kts
+++ b/build-logic-commons/settings.gradle.kts
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 dependencyResolutionManagement {
     repositories {
         gradlePluginPortal()
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index e433509799b..6693f40e417 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-import java.util.*
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
 
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 970f8de09e2..ab4ff4d9dd4 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -2,7 +2,6 @@ pub    82216A03CAA86C78
 uid    MongoDB - 10gen <noc-admin@10gen.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE5Kv/ABCAConhU6cL5eRQCAvVpHX8VUyflu2Lcb/X7IQXy/8BCk1Nhhp69U
 ul06/EG16A4UERZQiqZjbwsdow7CvsZiJBwr6Vf/OkM7cDqDA1nTxL8jPByUqI93
@@ -19,7 +18,6 @@ uid    Marc Philipp <marc@junit.org>
 
 sub    8B2A34A7D4A9B8B3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
 YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
@@ -64,7 +62,6 @@ uid    Uwe Schindler (CODE SIGNING KEY) <uschindler@apache.org>
 
 sub    5A5C54A339B38462
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
 +cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
@@ -109,7 +106,6 @@ uid    Gary David Gregory (Code signing key) <ggregory@apache.org>
 
 sub    59BA7BFEAD3D7F94
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
 WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
@@ -138,7 +134,6 @@ uid    Olivier Lamy <olamy@apache.org>
 
 sub    1AFEC329B615D06C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
 C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
@@ -170,7 +165,6 @@ pub    8799AF90C06EFBBD
 uid    Rolf Lear (JDOM) (Used to sign JDOM artifacts on Maven-Central) <jdom@tuis.net>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE56T+oBCAC0M/T+3OUvsOekYY/RtzHZ8OLDHOqfN27fCOtIUA+nn96a88jg
 hF6pRFUN6HMr4qbWX/BLwjfLiLYRAFrJyqY/y1xcuBxYMkxSnrTEQRRli6Q3LBCA
@@ -188,7 +182,6 @@ uid    Gradle Inc. <info@gradle.com>
 
 sub    5E9AEEBA28836032
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGUVRogBEAChVh0t3YAJIdreb6SP/lf4x097IRpOiJ7Ww+DDtXFUhKJBwgfC
 4T10TBGP835tV6TfkEeCPGWABoxaD88zUlSHs7k7v/SfedwfOKbOE3c+oR43JL7P
@@ -234,7 +227,6 @@ uid    Neo4j <identity@neo4j.com>
 sub    F8052E4E1BD0DB31
 sub    A7A66BE60A24CE10
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBF5qBdoBEADKspeDzHQBeKsaIh1Vl3xCQ3B7orubJ4DoRJoz+Wd3WKz/ie2k
 a3HWb+ZIzWviJcq7dilaPiSqAQsQ6QWD6eLHlQrGe5cjySq+5jlZXDro8e2nN0BJ
@@ -478,7 +470,6 @@ ydosffBt6EsCLeQgvxXGzeXk/jExbSwiPPHlO1k=
 pub    8D7F1BEC1E2ECAE7
 sub    E98008460EB9BB34
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
 dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
@@ -506,7 +497,6 @@ uid    Edgar Espina <espina.edgar@gmail.com>
 
 sub    3B2A06173073FDAB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFnuhcIBCAC7AxgaKPE8BelwB1MtV061VQFddoBoEPV/RMtpX7ebEtCA1yzl
 02+JNbx+sfTqrkFfuDbKw174xFqP87iRbr+em1+dD98+dH/rX8rX9OxJIuXXcO7V
@@ -535,7 +525,6 @@ uid    Igor Spasi? <igor@jodd.org>
 
 sub    5858009D3CC798C7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFkuiigBEADmIwb2nUFzfBlCrfyWvwIM3tNYCb/VQ7+yncFkpJgChUOP7CQv
 SC3lp7wjb0kfVUiEq5LAARy2VQ4Efyl0zfySMnOlQ9TfkJUweGBGgauwgaePoRNl
@@ -579,7 +568,6 @@ uid    Spring Builds (JAR Signing) <spring-builds@vmware.com>
 
 sub    6F7BF836151F097C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGPF4agBEADsWnQn3m/dMw1Q6FLALQCEucRkRLw4wcmtzXuuYb2M17aHvEb5
 +OnXDdgQ2QcnnjK4S3zQp/Jt4ZQnnLORqx919+c+1gT24U06VxeGPW/TLRn/hnKA
@@ -636,7 +624,6 @@ uid    Kotlin Release Key <support@jetbrains.com>
 
 sub    CC3328A2F49A80C8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFhlXQUBCACoN2nTeSRVZnGoktKHyiCgeYQ/hEKKKDDAbWubnnQwonCTILaN
 Qw3GmIT6plmi9iy4rl+rJprSzDeQDZngQCx1KPYcXCrrc0pnjERDaogw9fC3c3z2
@@ -665,7 +652,6 @@ uid    Antoine Mottier <gpg@mottier.xyz>
 
 sub    C327DD2B96A50E1C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBF6WyHgBEADOrbvGGDYVckFcUofqKiYrBneClFJH1ANheF+KIekmnFV2SH1Z
 RS2rw12IbpCjwqjhFTMWH2UTLF6pAsSGIufTrSVUAF2WxHw84Y60KmwuYayJCVd3
@@ -708,7 +694,6 @@ Eyu0p4HmyiU45vlPgeM3IMHDEVFhmb3DXxL1BvgsJ1bNdlVFEtsiMpXdrWpH3nwB
 pub    9987B20C8F6A3064
 sub    80CFA7C482552DC3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
 aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
@@ -744,7 +729,6 @@ uid    Liam Miller-Cushon <cushon@google.com>
 
 sub    D66472CF54179CC4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa
 SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la
@@ -787,7 +771,6 @@ cFYKw6eZhSnlf3dtLjLzKg==
 pub    9A2C7A98E457C53D
 sub    92AECA6AC21DB816
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
 rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
@@ -815,7 +798,6 @@ uid    Luc Maisonobe <luc@orekit.org>
 
 sub    2F3C9EEB05D1D1E3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
 r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
@@ -858,7 +840,6 @@ yfc=
 pub    9B1FDA9F3C062231
 sub    458AF764D812A037
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEWjofgRBACePEiXmSvjcjUgWkNAFQ/w7w2VSEqe1vuTCrta+ER9JsvhwipP
 2/BEHigFf99TlU0p1UC591LMeYP2UXfQnb3jiyEPKxA06aj1fTGGMoNMAilymvgd
@@ -890,7 +871,6 @@ uid    Philipp Ottlinger <pottlinger@apache.org>
 
 sub    31FA045762D93F83
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFPNlskBEACysou71/IxEXwgPku/U96oPoJLJVgUpA/gtfv2Qhy6JECqEA13
 g95KcLZBZfGNt3DAwEP4A8XcG2bVX4pnMMgpOQ+exf+2tHhZsA8sI7Q10N4M5+g/
@@ -935,7 +915,6 @@ uid    Slawomir Jaranowski <s.jaranowski@gmail.com>
 
 sub    E3F6790A5A167F5A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGHDIagBEADpzdCwVjVlHuo8qpu9HtmqNpEW4TB7y6+NX7Q39mj8w+iVskE1
 sL0+BOCdP6ZMiQziWbOQ2FxCd3mD0ixZ7v1i7+0jowySPacJbVNaPPECP38gDte4
@@ -978,7 +957,6 @@ mMc1ojZ9QHu9WXM+cEND6KY3m407KYw2ItiMcY3Y5fNTRdEMvu7S
 pub    9FF25980F5BA7E4F
 sub    10314D676733C080
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEPspSsRBADdguKAxMQbA32vTQrCyONR6Zs/YGdvau2Zrr3SSSSR0Ge4FMjZ
 4tzwpf6+32m4Bsf7YIwdLl0H5hI1CgT5gDl9kXvfaFUehFnwR+FDyiBRiyHjUpGF
@@ -1005,7 +983,6 @@ uid    David Jencks (geronimo) <david_jencks@yahoo.com>
 
 sub    B3AD2EE54E525FE0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEawPygRBADKQe8iEQdS45n4jbSopR4XfDOLEVcxHHZBHrdj357vAZvSdgYI
 U738HNAX5INMHub1+pv/B2DpUkfmnnfRENGBeSYWtl6XsKZYRjodR2muI33daUYj
@@ -1036,7 +1013,6 @@ WsjL+86/X9NhVkCATFmxRR97EQCeN7cG7JasIe/XD/3vwMpY6s1HQ98=
 pub    A2115AE15F6B8B72
 sub    6366592024774157
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
@@ -1063,7 +1039,6 @@ uid    Thomas Neidhart <thomas.neidhart@gmail.com>
 
 sub    8183E80D264EE073
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24
 exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL
@@ -1108,7 +1083,6 @@ uid    Atsuhiko Yamanaka (ymnk) <ymnk@jcraft.com>
 
 sub    CFA67E8582F7E9FB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
 4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
@@ -1139,7 +1113,6 @@ ZzI4yAQoJZJTc+YO
 pub    A5DEF5A76F94A471
 sub    B15AD8EFBD28D3CB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBF09IUABEAC2p2RNMRu3DgovIw/OuG4BL101EzTepeoPzRbKll+/xtNiN270
 ekSio9Of9nn7ZV0n4AH1nFM4iQqAC4KFZ74NrgJ+EeHoh3eZr7hyQ/TW7p0z4097
@@ -1182,7 +1155,6 @@ pub    A6EA2E2BF22E0543
 uid    Tobias Warneke (for development purposes) <t.warneke@gmx.net>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
 xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
@@ -1202,7 +1174,6 @@ uid    Eclipse Metro <metro-dev@eclipse.org>
 
 sub    B6D3FC494798E478
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFu1G94BEADg+PwQwGIKoJuDFsDNWiBVqT1ERAcW4bQB2dVMJjN7gQbOrBku
 Hw3msetvNsEP9mjgvUZlHekM8Jk/vwV15dWSmTpUllNEHASjHFL6pjhIFSf1HZr5
@@ -1281,7 +1252,6 @@ fWBxGDjhA8wNbvnZJ8+aCgFzBad6um8PJQ9M5ofxiYmOlJHOi+EfYPlYDj3gVhi8
 pub    A929EA2321FDBF8F
 sub    A0F7D9615B3A5E42
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFjw3rkBCADI29PsG4+jXT0KajnjFSb9jQynKlHeMmp59e/88goWICaTK7JA
 lM2YB5vpjBeQjA+MCv/1wRyD4defs/cXoNAAsdTeJkh6Qx2C4TyL2dKROJK2DixA
@@ -1309,7 +1279,6 @@ uid    Blaine Simpson <blaine.simpson@admc.com>
 
 sub    FB693BC97890ABB9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFkGbgoBEADXtL1z5unXjC2gSBMvM6f2Z1G60UCv5W8CD9XhWRFxqhbeo0yN
 Ld9mWpTh1b9equw85LURzVKF9SKTFrBbtSLPqAsnomgoiW4X9F4S2IQfe/d4YpTC
@@ -1450,7 +1419,6 @@ uid    Robert Scholte <rfscholte@apache.org>
 
 sub    38185785755267BD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQMuBFKTz1wRCADOdMCDOKXlBuQpG7mnQ/5rppqhS0SXdKvNZ5pYrJKib1LLtlS/
 LOeABja3E1ky+znvTqnEEtai7fNhw36zPdUjhPKE0TZwn2aK5fyctkcfqBFsja3E
@@ -1489,7 +1457,6 @@ vvzB6IAo6+u3AQDURXWfVKKr73oZFosnOt63VHnW6BV9mMqjj3wenu9FlQ==
 pub    B0F3710FA64900E7
 sub    7892707E9657EBD4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
 hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
@@ -1517,7 +1484,6 @@ uid    Checker Framework (Official Release) <checker-framework-dev@googlegroups.
 
 sub    32784D4F004B405B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
 NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
@@ -1547,7 +1513,6 @@ uid    Theo Hultberg <theo@burtcorp.com>
 
 sub    06EC66D653DC633B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFe9ujkBCADN5TiqHcFCxrHEwTIqzCjyv/0kADSXhQZ0Tqkz1HA0a1pxs09V
 hkM2EOJfsFJy0tFPQxKlBFmPJKEtwvL86qV7VOjrm4OvhIeFpUhIqRX8MDHDhbeJ
@@ -1582,7 +1547,6 @@ uid    The Legion of the Bouncy Castle (Maven Repository Artifact Signer) <bcmav
 
 sub    315693699F8D102F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
 xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
@@ -1616,7 +1580,6 @@ uid    Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <kama@soebes.
 
 sub    02A4A6FB70018AD9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQQNBFT3aMQBIACl/07e2aAdqLGTocp3J694BSGxjH1M4T8BevXH0UTRTXbge0l2
 3IONp63KF1tmHg0skzUu/1Ybau6Zw7k+jRFN+9VmslRprk4fjHjgxmT5U8p1ualk
@@ -1693,7 +1656,6 @@ pub    B7E2662A7640A051
 uid    FormDev Software GmbH <info@formdev.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBGAeuPoBCADxjHFyVx9TT2s1eAeER5qcIxQfh1sR8CFcDyPQ7FsoSA0Qt8di
 3o23mEv2aP4OfezmY0eNchW0TXp2wqyuA5V0cE8RrM24dJ5p3X4PcRyVcO5KdJFk
@@ -1708,7 +1670,6 @@ cmUgR21iSCA8aW5mb0Bmb3JtZGV2LmNvbT4=
 pub    B95BBD3FA43C4492
 sub    520FC47ED23D6048
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEOdvssRBADJG+C5R7J8K5J4X01qLyIdHHMFj87wnMihOqhbfPd1mW9BCvqR
 R/RGeUfXmDYDOLMaT4iPmQGAcQ9NGhya3NAJ3xvTBOlRXPPloZ0enxoFgrZ+Y83L
@@ -1739,7 +1700,6 @@ pub    B9729775C0352D3A
 uid    Tom Akehurst <tom@wiremock.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBF9ZHHkBCAC87FdE5p9fmsIG4sr88XsPIax9ZGtDADNjlgCZwg9FxjOQIzf7
 KAHWZOZ7EAE1VYQ1xHLN654t5n21kI8Qtnek16bYrfvBVsbD9OA87G1tSVURtORH
@@ -1756,7 +1716,6 @@ uid    IntelliJ IDEA Sign Key <intellij-idea-sign-key-noreply@jetbrains.com>
 
 sub    C9F04E6E2DC4F7F8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
 DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
@@ -1785,7 +1744,6 @@ uid    Lets-Plot (Maven artifacts sign) <lets-plot@jetbrains.com>
 
 sub    EF3FA25A9E1B028A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBGA+cG0BCAD2AHCRED4EC4gf9dHVaPuTe10GfgPTVRNVRbj9XXjW9VyU3EWO
 4OYlulI9sTXGvn39IEy8w+wQNJXYJkI3VHrymYe3rSEq85I/Z/NJbkAuWVs0HdBy
@@ -1815,7 +1773,6 @@ uid    Evgenii Kliuchnikov <eustas+gpg@google.com>
 
 sub    D8B9C51729D09D40
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFim0TMBCADUsNfz2e7p+u2TxujjDjXRq96EBdJ7wNrVjrNneF+8roo36iQz
 KWA65eNzZ9DP0sFlhRwXOopm/AOh5VB+Ex98W499Esujv7RuiZZ5zYuKr54k4fVM
@@ -1851,7 +1808,6 @@ uid    Joe Schmetzer <joe@exubero.com>
 
 sub    4BE257B370130000
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBFv1EEwBDAC61jyEM99KH18hI3zlfuqvGoNjTLIh0wge5vXAH8VxMR0ndOID
 HYSBT2+L6OeiqKlyhCgF1km48F/dMzyJdTASkNO1Ni+B2Ric1sBxjsSPufkjl4en
@@ -1888,7 +1844,6 @@ uid    Karl Heinz Marbaise (ASF Key) <khmarbaise@apache.org>
 
 sub    C163B490C5CDC967
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQQNBFT3VuYBIADPQxdM6fJajMSyeiKbfpSjllBkGA16DE9IFJ76B6281k8sfya2
 k6UOAKNIprxY3JCRulbnkn3BcdbY1vZDhaf/fbdkvJ+o/XVzrxojq1jS3tvSq95L
@@ -1965,7 +1920,6 @@ uid    Jean-Baptiste Onofr? <jbonofre@apache.org>
 
 sub    6B7EDFC69F043BBC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEqmJkEBEADAAMOjOidXzoyK4FK9WhhRg2EEGX1gm5lK8PpJtk68Fqmz6xvv
 N8VJXMIJUgeD7M35zZSQUWJY43xEU8Yfn6oLL0KR0dIqVOclxE+7G8vxXFcIbRE9
@@ -2010,7 +1964,6 @@ uid    Bernd Eckenfels <ecki@apache.org>
 
 sub    788E173C196BC673
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBFRRGVMBDADAQcmG+x0mHZwJ3uKgODjUZXkGRkuz7aP/qRmuQVn93tl8DmA1
 lgvXndvChUjzYt4DJnQhRsapAXEmP5/YYIkWOzuk9EpXGtqUieocylvNXP9eDF9y
@@ -2047,7 +2000,6 @@ uid    Lukas Krecan <lukas@krecan.net>
 
 sub    CFA2C539DE0E0D00
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mDMEYg6Q3hYJKwYBBAHaRw8BAQdAmBUXcViWvUiXZezA2ukBqads/J5xG0Hzxa7b
 LfCaz6W0H0x1a2FzIEtyZWNhbiA8bHVrYXNAa3JlY2FuLm5ldD64OARiDpDeEgor
@@ -2063,7 +2015,6 @@ uid    Valentin Fondaratov <fondarat@gmail.com>
 
 sub    606CC6C4533E81A2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
 lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
@@ -2100,7 +2051,6 @@ uid    David Blevins <dblevins@apache.org>
 
 sub    94A0B66A1FF197A8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBECNzFoRBACkPc/egsWYAWgJWZilzefm8UkUKQ1V7pkNP8nXY2JghXQGL+TM
 3knOiVu51j9a76kU4tTz5L80Qr3erk6RrqprtoKHw2RfpNqyOXQXhGIoZLPjlLfs
@@ -2122,12 +2072,90 @@ VzAKyb1OZnKSBbzhAJ96natbmeiNkijIzk8vUpdCTH18IA==
 =2vOe
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    C6FC46EB51CF569C
+uid    Elliotte Rusty Harold <elharo@ibiblio.org>
+
+sub    92BF193AD552C6F4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFwrYN4BCAComkN3DymSPvTeAV7G/vBEYFKEANL49MeQttSZRzHmGAIAF9Iq
+fUN9Iwp2Ii40sdUV1+03SVnprf5M2xdxO42AB1qgHdKcyQnbUM9oV/i+iwSWZOjU
+23HTSaKkEKgVGfQUQQbXibQiANTJpRmKtOtWQsz+zfyaiGKJEKEa8KZsm6guibp/
+2omOJ6xWrZNszFtQsq3fsdhTVbWTHTpaSMV8Wf4Ue/g11rMrR2CPqzMFrt2sOVVy
+Np7c6tzdDeLYzCDfS/4QS3aGRuyxnt7uNhH11hzm+IvJS16Jg2oVK4lKH5FLh/zl
+myX249Tb+ht1i+daMEn0zpPqiYlNtCTLPLMHABEBAAG0KkVsbGlvdHRlIFJ1c3R5
+IEhhcm9sZCA8ZWxoYXJvQGliaWJsaW8ub3JnPrkBDQRcK2DeAQgAzjzAehkE1xeU
+79tBMV6XzI3u/HNyrwe8CvqK4l/tg7HSuZsVnYCAniGqInHDHSQbKuBoloHGx5Ba
+eQ6abn8DiK8zlE8C7b81Bf7t6cVQJLvNIWDppI5Ucm9yzygsqsBiSjWQ4Nb6XPZ/
+3Wn0htEO14rN/IrvDoD+hXzM2s6mKVL16xWuhRtBYs9/+VT5IpCeGan7+Z/FINF/
+Q3j7t5t405NfrLK+HP4W+705ofsKqBOxKT2T2a5d4IJc1+GSrX+93HxoUWbcvtkt
+DSaNjCHQXP8zfAbS3pTV+w6QPs770ZKhoPO4XWIrw6W+EjT9skL21iUB0HUPVqD6
+8cIBeoNOEwARAQABiQE8BBgBCAAmAhsMFiEEykkXBNYTeA0r7gDyxvxG61HPVpwF
+AmMeHvoFCQq1JRwACgkQxvxG61HPVpxaNAf/d+B0mSE3BGn3nAn6dRG/3cmZjJ/1
+LUshQWGRImEeOXxdpEIgbtvozcmEzJc9iPIHbY5PzpbuUUPoFcKgwE7R9mrGxckX
+WonPflogxhiziMsD7wNdJ1eB3zpS8H/DgquhB7ZyXVp8V/laLkSm0TQFaBGoyYer
+6SrDb5UNGc1fQNvtvDwQfZdZ/6vUugi+TzM0uQGnQ03aR9rbDn+tUVyJU9KmCptI
+eTWR5grKXL1M+/7qIR41+nApuYe+Btu+gCRYCyp7JpfROCHnP7bSSqBMAt3PcywC
++a/sh3U4uwmoU1U/sO3XXKxQzELQ129UyiyS4p3wEfjI3viF57wHab6iIokBPAQY
+AQgAJhYhBMpJFwTWE3gNK+4A8sb8RutRz1acBQJcK2DeAhsMBQkDwmcAAAoJEMb8
+RutRz1ac3K4H/RMOjjOC4ReAJrmvJOAEBSu06b2NjBgAQIPCS7w30ygXCMzyRsSg
+6dFfTeRQGndJ5/cytZN4Q5wMhL0yowa4DDrqvhaWLqImSE5J7IEaQznm2pauDZFa
+qQH5WAQ8jor1YlZ3KmV+s2SBbjCVZs062TGrloY+gPEiijE04UjHGURoLNwE+aLm
+JykYwcaaYdYJ+VkgoPwUaYOqenjVTmjncY7siEiqFENgBAVsdTzXikt6JoIZJqKu
+vopirIOpisWdQZoEMYEQ0ASAjHWbTaNm21gNpPi/dSpPzi5np24la3bu3OdZ6Egr
+PfP2wFRW9D1ZB46nQIwhEzJkDcBFn2JHCnU=
+=rXpr
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    C7CA19B7B620D787
+uid    Stephen Connolly <stephenc@apache.org>
+
+sub    7679164AA2590985
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+wRo6LpahA0hXIR/dwnekHH7Faw==
+=sl+a
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    C92C5FEC70161C62
 uid    Herve Boutemy <hboutemy@apache.org>
 
 sub    64863FF4D1BF1809
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEdUhrIRBADCU9cuKc92CWQlZxwtRuSIV/36Qmj264YD+Lix+r1Qe1PqRr1I
 /MObOo83ulorWigSkx1k81Mnr56NwmIeo2bMhjmgRgf7EG6XEbKdRKfJcJRR1lDV
@@ -2160,7 +2188,6 @@ uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>
 
 sub    AFF3E378166B1F0F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
 NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
@@ -2189,7 +2216,6 @@ uid    Evgeny Mandrikov (CODE SIGNING KEY) <mandrikov@gmail.com>
 
 sub    C59D5D06CF8D0E01
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBE0NT+kBEAD1hzO+dXStXYJj8M6FBn9fxw+grddjM9rqaEgJ2omSdpZZOPBs
 DRor7v0Rm23Ec17y/7Dd6oR1CvyAeQwhJvNBaAW4LQmUcvvqep4hfkWDhlRvh/QS
@@ -2234,7 +2260,6 @@ uid    Matt Hogstrom <hogstrom@apache.org>
 
 sub    32DAD70C2FD8C3E0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEO9oSkRBADW6zrFzi3FNVApHusdx/vNRkoCqY6DF0aOKa6fuia3GMt9Cu5z
 LmZ2727uSg3ovojI79bcUARatQGPhntfJcdTHZJGn616oEbORBAB8ZyvUON9OkaB
@@ -2267,7 +2292,6 @@ uid    Phil Steitz (For signing Apache distributions) <psteitz@apache.org>
 
 sub    A0FC00D356EEF1D4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEEn15ERBADm0iBZ/KwIiEYdLWxMIIZVzwF6My1eLRX+TLvPtOO4wf8zE9zV
 fAsnMI8uCK3as3OwgqTTsKy7KQSqRyG0zd/rvCmJUEET3zHX1e5e2nYq8p1TzJzk
@@ -2296,7 +2320,6 @@ e7QAoIbyRlaNcTy+z1Jj0+cwvDVVoEoQ
 pub    CE8B1D1D2530EDC5
 sub    7ECBD740FF06AEB5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFuX5CkBEADkTgn4nzuq0lWR+7kFGYLKvmPLjes4j2nmygIafUjVbNmD70gY
 DPpbSP02HxgicM6xSSqzZuBVxpbcffqjMPXf8LkVX4iWKZtyzLpf34yaojigU3qF
@@ -2375,7 +2398,6 @@ uid    Nathan Bubna <nbubna@apache.org>
 
 sub    3046C9379F41EA53
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEN3YBARBACMx0BWLY5fSwyiNS6IpNXunE7wC/3wP1TXblBulG/LNbStJ0rY
 QRXOZunyT4PGy9Yk4JJHnofLuExc9dpVpHt04mldc9wQkh7er1dhGF5s5bgBrj4V
@@ -2407,7 +2429,6 @@ uid    Viktor Klang <viktor.klang@gmail.com>
 
 sub    326BA6BD408BFA94
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGKFXcwBEACSech69oRvhkVobrVShZGpJzl6DA/DxMNdWME3wI5XUFHmZKp5
 pD8VDhyOdYhXiF5MosdHsJtsHCz0dr+ss6FCHk3m6LEm8HHeTMFA20rbQKDcLj2P
@@ -2452,7 +2473,6 @@ uid    Liam Miller-Cushon (Error Prone releases) <cushon@google.com>
 
 sub    3F606403DCA455C8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr
 c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD
@@ -2498,7 +2518,6 @@ uid    Daniel Strassenburg <daniel.strassenburg@coremedia.com>
 
 sub    011B32C57A810220
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBEwzT4oBCAC4yE4/EPw/MHB8u7mZtnk+N4e2SlHw1V4oyPHVEA6vdSUpsc5c
 l/5N1iD78W51a/3/l0JgtZMUNHlTtealzDDZxfEarCgm/fraD8v23AAVI5ccLxRE
@@ -2527,7 +2546,6 @@ uid    Werner M. Dietl <wdietl@gmail.com>
 
 sub    A8D88140C35897AD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD
 jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr
@@ -2564,7 +2582,6 @@ uid    Tom Eugelink <tbee@tbee.org>
 
 sub    DD6AEFCEE9EB4747
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE7CF+QBCACgVSxGo1xBKSebwXNvh5g6Sb4KOwOEFSTve6xixOdlENjI+Jqy
 8diCfFF0jA1ZNOd9xo/Dwo0geYfw6/W2RWFhs8HmTnOPKQu3c0DoobHGfGLXnFb7
@@ -2592,7 +2609,6 @@ uid    Harold Cooper <harold@x.st>
 
 sub    9A716F957BC42546
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFAxQKwBCADJGPv6pmFEq0SDwAKESEgCdnXycbR0bNXpNa/3VGboNto1xKgd
 AQ/sI5x+CmN0hpUjklEwff6QIt3MlofEMkAzSfRmTobhJTK9W7r4+p5DuhJpi5Wz
@@ -2652,7 +2668,6 @@ uid    Richard Kenneth McGuire (CODE SIGNING KEY) <rickmcguire@apache.org>
 
 sub    C64121F5021754AB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEu57KUBEAC6GSPbvdc5EtEu9GYQvWGxo44mJrCed9LbFc3rV6bawbvARQjG
 oolnQ04PRpGI6+RmjhsHU5MlbUMWhpjdkhTXWZEheTnvCFnKGTV37DXpwJeHl3aV
@@ -2697,7 +2712,6 @@ uid    Gradle Inc. <maven-publishing@gradle.com>
 
 sub    1B80C80E07BC7190
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
 Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
@@ -2742,7 +2756,6 @@ sub    9351716690874F25
 sub    60EB70DDAAC2EC21
 sub    3D5839A2262CBBFB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBF/RX/MBDADSqelDQKobURExWUKALq86yTPMxMasxmDlccKFpk5xjWrryL7z
 qg4Fnb7IK5fKDtcnTANtOv2hlIli1h131+SmjJdD3qhfly7QoszOpr5izDS+FOCj
@@ -2860,7 +2873,6 @@ uid    Philip Helger (Maven Central key) <philip@helger.com>
 
 sub    F5492B20D173A94E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFeGGvYBCADLqF9MxqNfwOuDrOmkOigwfiWxdKVHIpZqjFquuWIjH6IhADER
 HzaFrAuLF9DyodBvylQWMLpWOjv8ulGnUp8ow9Gjd2hH0vjrXjR+c9ks3NWtHX9n
@@ -2889,7 +2901,6 @@ uid    FuseSource (CODE SIGNING KEY) <admin@fusesource.com>
 
 sub    4697DFC8F2696A57
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEzdTPIBEADki1HMFzssqhU2l3jJr0zNE/gyPohjzI5ugw1dNWUd/ht6oUnm
 2StYcsRnFHlY7aIp56v6cZtAKYDZTlEArIurH5xyQXQ3PLfxQZPVS6HDUghaa0rJ
@@ -2934,7 +2945,6 @@ uid    Mark Struberg (Apache) <struberg@apache.org>
 
 sub    5CF48CD2F24C5214
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEtnVXUBEACz2CXck8rFZsqlmtZrwySHkCKdKQ3dO5fyya3ScYRofIS0OVi0
 BwpWyVfzezq2jl4AkjEFGS/ja0shnr4hg6tWU6w3obZ4S8dQMyPm8x5kSTxj28mn
@@ -2982,7 +2992,6 @@ sub    6C70A3B7599C5736
 sub    BC7DF305D87BDFA7
 sub    3BD211F725778C36
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBERFeVERBACjfASThn15ynIICr0Gu8quGCl2rSSRar8TsjrbiwYB2MTW35Rg
 NjLU6MN5Nq4d5G8D5aMeoyGODstIHH8zA52sDGeHOMKfDaAraL+lGzElbpmaqP2s
@@ -3054,7 +3063,6 @@ pub    EE8ECBBBC188FD5D
 uid    Andrew Oberstar (Artifact Signing) <ajoberstar@gmail.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGGmcvMBEAC7BcmYnWIy1635ba+JXKwXtZLZCLX6y4LbDcAmToKM3MXQoYU9
 3J+Gt3riZIDDZ6x0/lLf4IQlJnfd/QhKGE+SsfF6nCEWMOKIS4hRI3LczC4x3hrY
@@ -3077,7 +3085,6 @@ uid    Thomas Ball <tball@google.com>
 
 sub    E68665C8F91BDE69
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo
 P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2
@@ -3104,7 +3111,6 @@ AwT14IRCih4oeUsICRfb9e23BVJGWs2x1VvzaIrLsQ==
 pub    F13D3E721D56BD54
 sub    EFD4147F269A813F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGFKrJsBDAC1UjHBJhbtkcSQdZSM4sC88QLamu7CTgEpzNfhO4QT7T2P37FU
 dITcwHUOjrp0blADnBRvmTGyPgQnljTIfdeW9DX5sDyiOdMtJ/qFP1SmZ7/2XiSe
@@ -3140,7 +3146,6 @@ uid    Eddu Melendez <eddu.melendez@gmail.com>
 
 sub    82047FB369DD111A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFf0S68BCACovMXnHqnBYRmC+rsIIPOoT1vSusHWu56beDBG7t/og/nziZq1
 mcZhX4oFG/IKnY3af20Flcv0X0gNodH9fOErvQ7hZDvHBgB9HVpeKiMx7OQqRWke
@@ -3169,7 +3174,6 @@ uid    Netty Project Bot <netty-project-bot@users.noreply.github.com>
 
 sub    1C9F436B883DCCF6
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGAhOxEBEADdB5Jy2sSOndOMCTyk8IFIJYPogjXtN7CnyIlqr4jEB5G87TJf
 m7OxB95aIVS1vSA5ghCm88N1mKtW6jyYjgLFQbbyD9/X3ShVZjh8B2R4atL93SSK
@@ -3215,7 +3219,6 @@ uid    Jonathan Hedley <jonathan@hedley.net>
 
 sub    6064B04A9DC688E0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
 Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
@@ -3250,7 +3253,6 @@ uid    Uriel Chemouni (dev) <uchemouni@gmail.com>
 
 sub    CF9F423A7D348254
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE3go9oBCADHAkyReHbL6qVMzoEGSF+eqLswZmJNBZylIgMd83964tzT7i3X
 aUIouf7nHL6n14AHNxDKhs1FFq+/EFYN9Jfdw+uFauoeUGIvXXRxaem4yCjzkyNm
@@ -3279,7 +3281,6 @@ uid    Christopher Povirk <cpovirk@google.com>
 
 sub    B5CB27F94F97173B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
 9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
@@ -3307,7 +3308,6 @@ pub    FE6C7D77A1CE15A6
 uid    GradleX Code Signing <team@gradlex.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGL3vDQBEAC06DyZDdCJFMDH2/J7zrbhN5oJmYpM/mkwmOjkHbsIMJRcocz5
 7gYQC8OeMyfs+dkorsrY31UpgMW+efjEZbDKItfbcs+y1iEhQ0fkKKam/lzNyjK0
@@ -3329,7 +3329,6 @@ uid    Mattia Tommasone <mattia.tommasone@gmail.com>
 
 sub    C3720DDC2E713B7C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y
 gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4
@@ -3366,7 +3365,6 @@ uid    Herve Boutemy <hboutemy@apache.org>
 
 sub    CB6D56B72FDDF8AA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
 agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
@@ -3395,7 +3393,6 @@ uid    Carlos Ballesteros Velasco (Deploy) <soywiz+deploy@gmail.com>
 
 sub    74237AD167FFEE52
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBGBJD1kBCAC2OgrVeUz5GtDnUh1fSKqEDN+3tjFKmCKj92buwiDLz8sWtzEE
 ncMlGSic0yAVxMTNIlfq0ec1AFWIFKsMkcpYX435UapQz8S19XhIIROsy5i/bZcg
@@ -3425,7 +3422,6 @@ uid    Sonatype, Inc. (Sonatype release key) <dev@sonatype.com>
 
 sub    F2E4DE8FA750E060
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEmoKU8RBADEN0Q6AuEWEeddjARAzNXcjEx1WfTbLxW5abiiy7zLEht63mhF
 kBlbyxEIRnHCSrPLUqY5ROWdyey8MJw+bsQn005RZmSvq2rniXz3MpcyAcYPVPWx
@@ -3458,7 +3454,6 @@ uid    Eclipse Jakarta EE Platform <jakarta-platform-dev@eclipse.org>
 
 sub    953E02E4F573B46F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFxlMc4BEADbWFmOqHBqUUAcO9nPRSqtrmIdjBCzqsRosPk80n3Nd+jWc44T
 /O5TObVbn4NxCmbLxklWpIU7eTEo3u5LnwhkgcsxMykWYdq6DqyzENO9PeE/McrN
@@ -3518,7 +3513,6 @@ sub    3FF44D37464BBB7E
 sub    6A0975F8B1127B83
 sub    6005789E24E5AD1E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBFzy4ngBDAC4mz6ELMWjfJ8GZtolq3E96T7qjfp4J9FxGVxdbJxkEDnn6MTg
 V8zhD7yeSZcUSvwzPiDlB/b4RYnh+5LjzKHTsrtr9ja0SupuCkVGkMGWeHhpIGV9
@@ -3748,7 +3742,6 @@ uid    Ben Manes <ben.manes@gmail.com>
 
 sub    11F4CE313A637CC1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
 sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
@@ -3777,7 +3770,6 @@ uid    Eclipse Project for JAXB <jaxb-dev@eclipse.org>
 
 sub    8118B3BCDB1A5000
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
 9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
@@ -3858,7 +3850,6 @@ uid    Marc Guillemot <mguillemot@yahoo.fr>
 
 sub    37DE9E37C5B67C30
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
 95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
@@ -3887,7 +3878,6 @@ uid    Aleksey Shipilev <aleksey@shipilev.net>
 
 sub    C45D01093DCFC371
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
 0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
@@ -3991,7 +3981,6 @@ uid    Paul Holser <pholser@alumni.rice.edu>
 
 sub    71499A87DC1FF84B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
 2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
@@ -4022,7 +4011,6 @@ ypM6CQ+fdw==
 pub    0E91C2DE43B72BB1
 sub    83552A552A0D431C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
 sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
@@ -4048,7 +4036,6 @@ U/+IKBkgEeGmWVVXq/kgZfHc/lDthBTLfbMKuG3i319210ty3WPp41oBB08BT3Vq
 pub    1063FE98BCECB758
 sub    25A93B1970C22A7F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFOpAXABCACsTEEMlNJ65WN4hGR+y3Dy80YQoI6oFivmf2kjOz5JqsBkoDaA
 vKl+OqLNIeYu4YXBFBe6t9YZvcBKAU660bTVuiiC50PNL2z9ZU6GrLNP34uKvyhP
@@ -4076,7 +4063,6 @@ uid    Henri Yandell (For signing ASF releases) <bayard@apache.org>
 
 sub    402123D2F5F4AF07
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEQL2goRBACk3zYVPnNvmOQiqaQlH3hPYKsWxdzNBA8rIM29GaFbmpAPVIVO
 2XK2wARURYianyAWHA6EOmEbZwFQSGqAV62KNwD22zLCZE5SG/ESd8weBA52qQf7
@@ -4109,7 +4095,6 @@ uid    Shigeru Chiba (Javassist Developer) <chiba@javassist.org>
 
 sub    0E26A79FFE07A3A7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGCVaCABEADgQA8+JfcQ6dEzNpWGi66IFUrH1CQyqrwl6/CD6vI9O1lw9LpK
 IhWvo6832Kf1G+9WQxgUj2Ur/TNA+dAGwIQs4OpIE4HIPQnohdWpO8DF0DQKByD2
@@ -4155,7 +4140,6 @@ uid    Emily Johnston <epmjohnston@google.com>
 
 sub    5F6BA89D4B0869B9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
 P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
@@ -4192,7 +4176,6 @@ uid    Igor Alshannikov <igor.alshan@gmail.com>
 
 sub    FC51362145A05FF2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBkqm4BDAC9Q7VXP9QBAqF03u97WpLY6qRbXX7jWRBZmeQ5l0gh2612XiWT
 U1iaVfzhs4kCile40SAr4HJgeX/xnGj7HFgeozIgM5G+x39BROlEAuRZHyVvXZJT
@@ -4229,7 +4212,6 @@ uid    Niall Pemberton (Code signing) <niallp@apache.org>
 
 sub    9A347756830C4541
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
 inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
@@ -4262,7 +4244,6 @@ uid    Daniel Dekany <ddekany@apache.org>
 
 sub    D068F0D7B6A63980
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv
 BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3
@@ -4291,7 +4272,6 @@ uid    Michael Osipov <michaelo@apache.org>
 
 sub    A3F393B5D034A0A3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBEzxj6sBCADGV4szLvjBwrAOKYWw3efASDI2yo5Aq4oevm9cUB4G9G/D/fuR
 XhodLaG2smZLd8sNafWTSbPHswsZtMAjHGzka9Uj4Ow0etl3+kTh0DE6Loezkj7s
@@ -4383,7 +4363,6 @@ uid    Rafael Winterhalter <rafael.wth@gmail.com>
 sub    A7E989B0634097AC
 sub    7999BEFBA1039E8B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBF3Ep5QBEADZfs6o1IpZbZ1qlBkoJ7oWL0vFCcdPUgF/PRFXWKlsuFHVVV/N
 oZF9SDiCJxfvsVXmI+IHTVMR2SszU2xDF2SlScRfZQwrLhBsDP9nv9N1eGIoA5Ny
@@ -4462,7 +4441,6 @@ uid    SonarSource S.A. <infra@sonarsource.com>
 
 sub    2161D72E7DCD4258
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGCGrYsBEAC/Ws37TXMujQ4z2ioXlh5SlrWaCzdN5RSBAQEKaiuuQeuwdWku
 bsnhI2f7YgxfJh2if6hCsGeWx3Wd2paLT9IqJbnIltOzHQkYXajIJrJVDep31wQD
@@ -4521,7 +4499,6 @@ sub    7D1BE4480B61E2A7
 sub    C2148900BCD3C2AF
 sub    CFF46EE3C17E53E9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBP58sBDADYRZmxLOkqrz0QZ/yESRpv7IeHGLqDE1a8QfFtFb14MJCLSAAS
 3nMD6Szi9mEjEqYdJURRcMjbUBhePgbhzGa3FYkjAB8lj6IKbu+ogCwVm1S8+caZ
@@ -4640,7 +4617,6 @@ uid    Brian E Fox (CODE SIGNING KEY) <brianf@apache.org>
 
 sub    AD9CEBA0521B1945
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEry8yoBEADnhvT3m/zzzuiUKyAeIfnN9CeN0ilQx4P0kFMhyZchRR4Ekb41
 iKw7tDL9q+g7xSo3yUT9dKjDWJ3yhDpdAhp6d4y8GAuWqlOu8CQdEHJOKK0yxTzX
@@ -4685,7 +4661,6 @@ uid    Kevin L. Stern (for ossrh signatures) <kevin.l.stern@gmail.com>
 
 sub    9FF24F51B06DCC19
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFjDR2UBCADDfzBacBg664xalF55ghVkhxxwLaTNUdvTJ9o0IH+cGTRj7EYr
 7QvLVa68PKigj0q7SVVwhPT7fzBLDosGjHef0UWap10ynqACBoAYSFocT9m3Www1
@@ -4714,7 +4689,6 @@ uid    Alex Herbert (CODE SIGNING KEY) <aherbert@apache.org>
 
 sub    A98BD25BE464EA45
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFxmwqABEADNTTxqFiBcLLQwARbc0bmPUlxFl0A0Di9dTycUEjn0wTGS2xgF
 dFxWomZd8R4b/lVb9jHf0r+AEul7U7sBoKinjwk0EuPDAZK5PEy3P8ILcAulwQqW
@@ -4759,7 +4733,6 @@ uid    Karl Heinz Marbaise (Apache Software Foundation) <khmarbaise@apache.org>
 
 sub    D658968EFD5E9F85
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQQNBFMPOkYBIACdXZi+34dvl+8q0IGIjLzFP7JvUH8ail4vrf2zwliW/QZskB/7
 pFXCpV2/hX+0n+kJz0eqenl1l/+lT6p0MQ1TMCtiMccnX7WseQM+xSv4ug82nAwa
@@ -4837,7 +4810,6 @@ uid    Jannis Weis <weisj@arcor.de>
 
 sub    FE4CE430FD91C78D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBF2swU4BCADGPBgTJhjjEKL1ulqHmw1pYLDd1HTms4tlIvBwTCrzxm1JsmU5
 vz6hcGU0U24gFtldN63EncHDrruBz2mJIbVKCbGMP7cEycQBMTklJyrpnJxSsNyL
@@ -4866,7 +4838,6 @@ uid    Tom Ball <tball724@gmail.com>
 
 sub    9DF7F2349731D55B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
 h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
@@ -4893,7 +4864,6 @@ Dw==
 pub    2A742740E08E7F8D
 sub    74C249541619FF0B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQMuBGJIi4URCADFspeHyziASBuPXpLpikWjmC3D6VtTaDT17ogOyGLf6/sjsQUz
 0KS3PzWBuPoqRGRpTtZxJ5yr10apr8mJF9Po5LFkrtcexaiYmUWAZAik894OhKt1
@@ -4932,7 +4902,6 @@ YEUO8pAj8YdGToyTSkmMqyrk/gwgHdbhb3E8
 pub    2C7B12F2A511E325
 sub    10DA72CD7FBFA159
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
 2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
@@ -4958,7 +4927,6 @@ bI5pqE1rxJXZnYtx3ZpPAAEfLjPdi1AOkWhvhsoPmiGFC6ebYQ5eVbI=
 pub    2D0E1FB8FE4B68B4
 sub    FCF74AFDF5947ABA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFYVT4EBEACqm1qKc6Twp2Iw0tjUqr3hrZ7mjZMWg5MemH9ZiQ9iVIqV4Lee
 KmgjVWk5jnTslriymDilDIMk0YaT67JokhgSdqMIavI29tJ6quOp0K7Rj/rNBc6p
@@ -5002,7 +4970,6 @@ uid    Benjamin Bentmann (CODE SIGNING KEY) <bentmann@apache.org>
 
 sub    E4D15F24364C7906
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEnOgPURBADYutfvXAtNgf67BQ2gWTI6+nKfILIwMPzCbQPMd7pykzF5nPMu
 Nswt3E7efo5IP1Zsv6DRrLafAW0OJSmL/oo8/ta0AfqcxCCbJ6CUyViifRZ5T4nU
@@ -5035,7 +5002,6 @@ uid    Gregory Brail (Rhino Automated Builds) <greg+rhino@brail.org>
 
 sub    6F67467BC1ADB846
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGHUzooBDADpUjFpdOCJMkgB2Wz2hc7X6/AmS/d9P3WgiumVMO7dViLDIr+q
 nAS08QwZaFtLcwOs6F47I7CdjK1XLRmIHgeOnVdeRPk+h56SfPOO1qvwyqTxpUXl
@@ -5073,7 +5039,6 @@ uid    Emmanuel Lecharny (CODE SIGNING KEY) <elecharny@apache.org>
 
 sub    064AC25270668162
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEyOIt0BEADGQcIcc2Z5FYCS4OYZzg3CobJXOUoFCf8isSU7PzvK2I/95N1T
 NjlpP4P0SkLZrGmJg8T+5+1I6yNOLwanTQ+cMayI7/xPfINNDZvU8OjV708R3gPh
@@ -5118,7 +5083,6 @@ uid    Dennis Lundberg (CODE SIGNING KEY) <dennisl@apache.org>
 
 sub    3624EE1473A843C2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBETvOwgRBADbar1BLaiJnuVnDEg0aej0Q01fdOnMB8e9fxe3TJZ266LLGljS
 FNekCafvn52nx1KyVvkgdgMxqBfw70FKQXdrBBMzowuVAz1ZAcpDjkXeyKa3n/iW
@@ -5152,7 +5116,6 @@ uid    Ingo Bauersachs <ingo@jitsi.org>
 sub    4F89F83C363D30E8
 sub    A5C8DBB8A1599BD4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFEFWH8BEADVKcPP0vdSh+5CiTy/b41AdRthOCOECLZLkgdXOjn1r+x8UpBI
 pBjErlSRgLoCotD6zZpwRuuCObfZojf2+ISC7kZn0VTT97PBBMswXnDvpSfp6NtR
@@ -5243,7 +5206,6 @@ uid    kalle stenflo (gpg) <kalle.stenflo@gmail.com>
 
 sub    0A52516CF3E88B3D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE1PuKEBCADkfuhQQsJzb53DYO7Am9bCMHPABIOZs3zPTzQ3c0MVvxKgalp2
 2a73JWhdGfvD3UraZKZw6G8Xf1i04vWMw7P1fwnXU0r1kABcF+an/uAY7CbIo15/
@@ -5272,7 +5234,6 @@ uid    Bintray (by JFrog) <bintray@bintray.com>
 
 sub    0CFE993CDBE1D0A2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
 Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
@@ -5317,7 +5278,6 @@ uid    Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
 
 sub    105CB91CAC2AEE0E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFUK4t8BCADnmE/Ejenq1qJhG/9d4L7iY35Fw/Qy+I/4x9yVlCAGf7Z5TfPX
 405/aF7sjWv1manCCdbr22uR7slcCRUV9CmIRe0lMDXozy22XVnpdE9ApHD7Qw2P
@@ -5346,7 +5306,6 @@ uid    Eclipse Project for JAF <jaf-dev@eclipse.org>
 
 sub    D908A43FB7EC07AC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
 j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
@@ -5427,7 +5386,6 @@ uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>
 
 sub    575D6C921D84AC76
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
 R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
@@ -5471,7 +5429,6 @@ LBaslDFjyxMECWr3v7TuEmEmNcD+KwNyACFNuBjEBWeuJZYwCkAkVy8AyitrTMh8
 pub    3FAAD2CD5ECBB314
 sub    3260CB2DEF74135B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA
 Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g
@@ -5516,7 +5473,6 @@ uid    Kevin Wittek <kevin@wittek.dev>
 sub    B62C7B23EDD13DD9
 sub    B3DE72E647D35161
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGFtXEEBEAC5zhWNCSAVmtbCQKqYwcR/7hVifekBu0YXLpQKEgvS2GEhEnUI
 KU42HvXLBkcyWv9gBGdkWHThNiU2LmGQFTpTwal1kBBJqwGNjxPi5DKGXQGwsnLt
@@ -5589,7 +5545,6 @@ sub    6B3225E6F495DC0C
 sub    CCDA41F01581C6CE
 sub    106BDE3D5D78BFDE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBDxLUR8RBACODyeCEGdqm62+6DiVYq1Y2DwnItiVOlWDZM0ds488iUZPGhlr
 kZqHX3Pd5iHtYWZhjBBpXMAvsLdX4OTSnFa706RbOU9acldqHcQ1YRKDU42dY4CS
@@ -5815,7 +5770,6 @@ uid    Groovy Operator (Groovy Language Continuous Integration Server) <ci@groov
 
 sub    01F3A913FB698736
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
 Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
@@ -5846,7 +5800,6 @@ uid    Stanley Shyiko <stanley.shyiko@gmail.com>
 sub    8067ECAA8D58321C
 sub    750F9A735EECF640
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFkgff4BEADQW10I1gEirYflEkNU9ukvBD/UFzsNxtKKxiDB58O1j9/o8bJN
 uM56B/skfFg1V4Gkpmnf9sJyakI8jHIvZ720dPHB8nVRBKV+sUD7hoI2QYVJMJMV
@@ -5912,7 +5865,6 @@ J6jqJeZDwjISStUqtlM2ACKov6zJC0QodTq3cxI=
 pub    4A1BAC7F1E3B89B3
 sub    B4F772A2A08563E5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE5FdQoBCADPVXY4gMG2TMUl1bFyh0FjfM/T+DtCRNNw24u4wbmTjZMfHnda
 H08cT0tSbJSJ928s3a6Dn75YDrrhRbYyhBYBo1rz82swLNLOk5EOSM0VqwqHQEm9
@@ -5940,7 +5892,6 @@ uid    Tim Allison (ASF signing key) <tallison@apache.org>
 
 sub    127CE18327E55B2D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFwGkIQBEADBkuDMpFPE7nepfcYCWYYE3htn9apn6TudnT+GgeYue1g+XKct
 c5fq/TiX0OOEpBt9xKOikSOwMTgdW6A2LKm568qgDN79wMleHFHel2VOiV59z8bH
@@ -5985,7 +5936,6 @@ uid    Robert Futrell <robert.e.futrell@gmail.com>
 
 sub    BB2FB7B24B12AE10
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQMuBFPdIH8RCADzGwYa0pK0BdE+higqxRaui47cllWtnWE7vAwK9rTdOPCtCbiv
 peRCzYXOOy7tJ2tH+QXanhNd62Ljp4YXzb9S82LQkYN+cOIxvQ/3gx+EseAr02nj
@@ -6027,7 +5977,6 @@ uid    Henri Biestro (CODE SIGNING KEY) <henrib@apache.org>
 
 sub    CCFB05B8CCBC1F4E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBErvEZEBEAC1bM12HNDrdM7hs/4Q40+mq2hA3w4Cfh/SqFxhe8r2s1Z1PJHM
 tY13qg9XRH1PsUer46q1YF8Y1lKc41Nm3wYab6sQqN4WaXZuerIfRzHCMkf2c9rk
@@ -6072,7 +6021,6 @@ uid    Mark Collin <mark.collin@lazeryattack.com>
 
 sub    B7D8B732F9FF1283
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE9gdLgBCADYftTKGjQNoatNJb2Z3GM8zWVyhLXmhc98ZnMLj3kLmHIDagAK
 up+yHD1SSY7aZdrLf0mU/LArGczFRLDe86/D245DH3wSYfIeQN9d5Etg7CCzRb7n
@@ -6109,7 +6057,6 @@ sub    7EC19439E4D4C2A0
 sub    D89D05374952262B
 sub    B5681E477AD61C38
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBF+7lwIBDACcXIXAwFDoWvCCWn+OImyyJQvSnnte93Mc1ZJtlArkrjeGU7Mu
 5giUH+FOyiXlj7CU4G9RTnAzDgM8XPncWOERgRG2dXtO03Li7iUEX4Z8PCUGsTxP
@@ -6264,7 +6211,6 @@ pub    56E73BA9A0B592D0
 uid    ASF Logging Services RM <private@logging.apache.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBGO9IPgBEADHCB2evKGSjQutTtIjODtaYUoU634Tl4Iv4DYsOR+MyOQBJ3Eo
 9okST4azX6r9Fspgmc4LxpFnGm9OSEGn4NZ9ZxiTrmKaGsoXzj2w4JKtgAip4F5h
@@ -6286,7 +6232,6 @@ pub    571A5291E827E1C7
 uid    Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) <central@sonatype.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
 3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
@@ -6309,7 +6254,6 @@ uid    Eclipse EE4J Project <ee4j-dev@eclipse.org>
 
 sub    153E7A3C2B4E5118
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFri3Q8BEAC90D8TTu6C05m/eq6HbU8gOHFc+2VJriVmnoyODTlEk/LAsT6h
 BRok7nzY0LpNUzUREjJy/w80YTOjLs25IFhnqA6mq8BGLjFwjhBPA4piCyhW/Elh
@@ -6389,7 +6333,6 @@ uid    Joel Orlina (Sonatype, Inc.) <jorlina@sonatype.com>
 
 sub    2E74CACB6918A897
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBE1VSkkRBACkCgvt26sMi+0X+EOJDMqdK0Sziy06k47LJf1jOg4tTZ2T9QtP
 OZ8fD+va/O5+q8Kna993jzcO5n0Nv+R/K3+MvUqSmdITshCIjBt3cC0n6FWndGyl
@@ -6422,7 +6365,6 @@ uid    Tagir Valeev <lany@ngs.ru>
 
 sub    92BD2D0B5B21ABA2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
 MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
@@ -6450,7 +6392,6 @@ uid    Matthias Sohn <matthias.sohn@sap.com>
 
 sub    9D29AE4A6B50E01F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
 YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
@@ -6494,7 +6435,6 @@ uid    Disposable Szpak CI <szpak-ci@users.noreply.github.com>
 
 sub    4713A6A15A6EA9E5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFfzYQMBCACiDABDh/kWrGri1JDodHd1RgH2RkP7s6TSv6hweBOnw1GWDhTx
 wQtSAX2q7Jp2EEGmk5mmBPc/NqEr4uPQ0M7HVIiuvbUQdy0Jaujq4tXZKnGvxES+
@@ -6523,7 +6463,6 @@ uid    Simon Steiner (CODE SIGNING KEY) <ssteiner@apache.org>
 
 sub    7BA5338873382B77
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFVcZesBEAC5Poew53ijRTE5kV2o2Tj+plJmoQMRtfiurMUpPQ4s/vTz8Bte
 WoHdNfJrzordHBZdy1S7V8p2kTtKWyaNFMyVoavBqo/BurmJ/3qUKH5otXkXuaAi
@@ -6568,7 +6507,6 @@ uid    Xiaoming Jia <xiaoming.m.jia@gmail.com>
 
 sub    91A4BA316974A467
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
 dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
@@ -6605,7 +6543,6 @@ uid    Eric Bruneton <ebruneton@free.fr>
 
 sub    0440006D577EAE4B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG
 VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv
@@ -6634,7 +6571,6 @@ uid    J?rg Schaible (Codehaus) <joerg.schaible@gmx.de>
 
 sub    4830C9FB8B680A97
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEymS9UBEADcrmFYq+YjA87HLx+UugKSIutOap7Yc5PJTZ9sAUOEtDhs0WwP
 bsyNdxu+aQJwowEIIaXci5YzimRzkuDNrfDFYpWyGq8O2yAsccMc4+HnQfcroayX
@@ -6679,7 +6615,6 @@ uid    java_re <GF_RELEASE_WW@oracle.com>
 
 sub    D547B4A01F74AC1E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB
 fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS
@@ -6708,7 +6643,6 @@ uid    Evan Ward <evanward@apache.org>
 
 sub    1E8F1D57A4450BCB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
 +6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
@@ -6735,7 +6669,6 @@ Yp9B
 pub    6601E5C08DCCBB96
 sub    0AC07D0BBD11498C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
 WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
@@ -6771,7 +6704,6 @@ uid    Ohad Shai <ohadshai@gmail.com>
 
 sub    BB9CC415C9C063CD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFfEskoBEADI7IL49Q8M6i4NXyo7lYTxaDiLFqIJNgnyC0fHSZktNPXxOflY
 rKfJqa5CPYhjJLk+jrj3z5Jkm0V2H4UNdI1HD69hlmg94Pyjhp1b3UV6xqQ80Sah
@@ -6816,7 +6748,6 @@ uid    Szczepan Faber <szczepiq@gmail.com>
 
 sub    C0058C509A81C102
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBGAofm8BDADhvXfCdHebhi2I1nd+n+1cTk0Kfv8bq4BQ1T2O85XlFpp1jaIR
 70GAm2MOt8+eEXt/TuPkVBWnJovDpBbkUfYWxSIpPxJzcxWV+4WJi/25fBOq2EuP
@@ -6853,7 +6784,6 @@ uid    Stewart Bissett <stewart@exparity.com>
 
 sub    11CD01355C5BCF5B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBF2IYVABCADlkNxFiE7AUD+BirOireAA0LceQl5HMo3EThWHzrhKTq5MqTmu
 HBjOdKQjutFRfRQ6xM6VitVc70TuBKCNwsbCQqSScZ44f9pOEu+f1z2CaI2J+ojY
@@ -6881,7 +6811,6 @@ pub    6A65176A0FB1CD0B
 sub    EA8543C570FAF804
 sub    CA890A5FA09CFD80
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
 m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
@@ -6950,7 +6879,6 @@ uid    Gregory Kick <gak@google.com>
 
 sub    C694465FAACEE66F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBEtrDFABCADLXGAhjPxdh+naC6XU5kficZYEVAURNRa8MTnaMKr+31v2zcAk
 nyqyjihcXGQBCeaNsz2mQkc/MrKdnFNVSwp715JcmcqDJGfR9aIDMUs9PvoNkkqv
@@ -6979,7 +6907,6 @@ uid    Francois Papon (CODE SIGNING KEY) <fpapon@apache.org>
 
 sub    AE1C126549627B5F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBFy2ECIBEADZYOmwjnX6CJfQxuPyzEPXAkFD0C/Zy/8EECiIvCP0cxvte17y
 9J7uL1jtMAAIcACeJrtLkWBCBRSQ3UpqjV75ua9gppetXShbAEO0ME7GJjWH7ctG
@@ -7024,7 +6951,6 @@ uid    Daniel Lemire <lemire@gmail.com>
 
 sub    1723844CF9A045EC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW
 gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug
@@ -7053,7 +6979,6 @@ uid    Colin Decker <cgdecker@google.com>
 
 sub    ABE9F3126BB741C1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
 x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
@@ -7083,12 +7008,39 @@ BzoVWrw=
 =fJQM
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    79E193516BE7998F
+uid    Filip Jirs?k <filip@jirsak.org>
+
+sub    9F7335D63326E7F9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFWdcSoBCADK8j+0eVZKUGctZo/VaJ/K2Wppx4jEFgih8xiIWREQ9B3QEugJ
+mJMWZHhrnHB+sjVx5No482ch6sVhYmC+VMyTdzepItZ8beYa0pnNGJnrFT+HcTOS
+g21Ef5e6BRORNho2j9YTvxvjof29XxU4SJFVgffs48jGeJzN1EDmOz4OlZupKGU+
+98o+kMKCiFjcf6Vu03asuml97b2fMOJ09n+UQVlZbBR/Yo407ZLkL2Elx47Fz+82
+iO+M8w2qNnxT4PA/TLgaVzkVHaR/JIDlQQ4DfuyloQI1hBpMB8f60oukVr5dBGuS
+1dPZ1H7td975sLegWoj7CCOFZXrDzYUXwwXPABEBAAG0IEZpbGlwIEppcnPDoWsg
+PGZpbGlwQGppcnNhay5vcmc+uQENBFWdcSoBCACidgjpeAycovmOPWf/eRXEoD7i
+bTOdKgy60rcHYPeB6pPMVaUMhZQQ4QTTRTaYEw9SJtD2itu7khittctHq3RA5EmI
+e50/cvF22MipcJqB3MJ7AnQp+92lH9rrl2xQsu7j6/xHsoEf6UFWzRo3TPx7nf1l
+qgY8JVpaWLJtsfByvLi04y73DIF0+W3SmSpDvL5h6teAc76Fz26tBVj3MdUFF7Un
+a+rMU42K0WUPkGhPfzqnPy0GLRbfYnjqdOBF66TMlYtu1Xnd/FgAVSugDth3LbFg
+pDbJWoGr02tpQ2pt22USElENLdZ5CziK22D6jIy6Yh02NJtSVsNfQ7sQ/XopABEB
+AAGJAR8EGAEIAAkFAlWdcSoCGwwACgkQeeGTUWvnmY8ABQf+K0Uy8ar+uLVqVFeE
+tuHHz8ebAEGSBLzAK7+ggg8RnhaNEHwR8RgAxuaq2ZsYVz+UvZBLG+oByxQYWVWp
+F75TH0uKVDH/zjO8Ppob3R5PN8Wk1QeSAE5LumhFsOCBVoJK4NgqLJNzTuEc2XiJ
+k43dVKI5pd//ivNsjO/SfSzBzSzTQ3UhzAj+k/7vi362Z8fg9SNnBQLpxccwdJ+8
+iYA7aE8wBt3esn9k79lXCM2hyNHl9CP8xI6CXmGJcSS4F2iqgPSVMkxgLA+DA8Y1
+wGvbF5c4rF4iVtgbCH+PcCwrQ6m6pQl9nnC8ANt2Zyj7o+JqefWrRa+F+ZFqJ7sg
+8ba0HQ==
+=DwAM
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    7A01B0F236E5430F
 uid    Inderjeet Singh <inder@alumni.stanford.edu>
 
 sub    C3E640F38D845FA2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
 mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
@@ -7117,7 +7069,6 @@ uid    Sebastian Bazley (ASF CODE SIGNING KEY) <sebb@apache.org>
 
 sub    C189C86B813330C4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBEvxja8BEADAzZOup1X0B12zJsNsDvXVIwmM6bB+uhEsUHoFTvmsEVwRoZtn
 i7Q0WSFoY+LDxbvC4Bg1+urCrUrstRJYRyF/pMqPYq/HokRlPjtrli/i3mUSd0zN
@@ -7160,7 +7111,6 @@ DHdF2x8pWC+ok+JbFn916yL/54nwMp3l9/9ITv8=
 pub    7C25280EAE63EBE5
 sub    926DFB2EDB329089
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
 f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
@@ -7194,7 +7144,6 @@ sub    72FF58594F983302
 sub    3967D4EDA591B991
 sub    0588BC69A286FF16
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGNBF+TCd4BDACbIA94MfIWL0SpvZwBddXgx36Lp9GYOWNgGoQCWSvk9vaMrLaI
 rEll0xnoP98CfBQYrVSAmHDMhSLBCjNB3V1Sdz8GRdOG7HUffF7Cqwbm3Fxo3H/h
@@ -7350,7 +7299,6 @@ uid    Henri Tremblay <henri.tremblay@gmail.com>
 
 sub    9842FE565AA0601E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQGiBEvsZw4RBADH20nX+H1xvMBYmXRj1Aae4dRr6Y6qI7QRWHO6Z7/dxr9bk/NN
 Yjq5KsVOQxZzloVdtqx75rznT7fZq98g7Nq9IeEtB6k4tnh6XQLhljJMk0a3mzdt
@@ -7383,7 +7331,6 @@ uid    Aur?lien Pupier <apupier@redhat.com>
 
 sub    D7913335BFA51814
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQINBF99kCMBEADE22W+h7w4R9fHyqEQV1NpgY2qI1S1HlwSQLQnf1pt1k3ZvMzX
 Eh2q9lNAn96O5TqpiMhHm2ZEDORqXqAx6hEVpA5iy+7NrIaSpxcbM0crUxSqoceW
@@ -7428,7 +7375,6 @@ uid    Niall Gallagher (www.npgall.com) <niall@npgall.com>
 
 sub    DC0B7E986BD7398F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v@RELEASE_NAME@
 
 mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN
 7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5e74c99f54b..8e1efb6573a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -797,6 +797,11 @@
             <sha256 value="c8a443e2faef876f338a391233c20a91ad5b83f69c1c6ba20d39a7b39106240a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="1.0.0">
+         <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-1.0.0.pom">
+            <sha256 value="f133249a18754ae6a1d2701d00d849b1afba7b0683ddb5fc1b18a70071cec2fa" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradlex.build-parameters" name="org.gradlex.build-parameters.gradle.plugin" version="1.4.4">
          <artifact name="org.gradlex.build-parameters.gradle.plugin-1.4.4.pom">
             <sha256 value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef25693b2c7..daf326e5599 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ pluginManagement {
 plugins {
     id("com.gradle.develocity") version "3.18.2"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 dependencyResolutionManagement {

From 0916220b4e6beeccd0a81b49903ec12ddbc19ae6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 22 Jul 2025 14:38:51 +0000
Subject: [PATCH 0823/1037] fix(deps): update dependency checkstyle to v10.26.1

---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 2012ca9dece..d101203b262 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -35,7 +35,7 @@ checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "10.12.6"
+    toolVersion = "10.26.1"
     configProperties = mapOf(
         "cache_file" to layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )

From c15bd88b5a4792bbe71e7951cf4cc0453c7195f2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 19:41:21 +0300
Subject: [PATCH 0824/1037] chore: use group-level trust for pgp keys in Gradle
 dependency verification

---
 gradle/verification-keyring.keys |  93 +++++
 gradle/verification-metadata.xml | 640 ++++++-------------------------
 2 files changed, 216 insertions(+), 517 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index ab4ff4d9dd4..e64b12bae3d 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -691,6 +691,51 @@ Eyu0p4HmyiU45vlPgeM3IMHDEVFhmb3DXxL1BvgsJ1bNdlVFEtsiMpXdrWpH3nwB
 =UP0+
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    995EFBF4A3D20BEB
+uid    Ktlint (ktlint signing key) <ktlint-admin@pinterest.com>
+
+sub    B89991D171A02F5C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+bZRG
+=N23Z
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    9987B20C8F6A3064
 sub    80CFA7C482552DC3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -1711,6 +1756,34 @@ dG9tQHdpcmVtb2NrLm9yZz4=
 =NFoD
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    BAC30622339994C4
+uid    Chris Povirk <cpovirk@google.com>
+
+sub    FC9BDC25FB378008
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlMExYBCACmdTDSXPwSJeYbfYvHoDl5C7vx/0+LOTunDGJN38pNQHYQAZnv
+Gyoc9ZmChrhLoim7z4ILqmNo8eegknepQ3dGdUij4NVIhR+m+8irayTbsNHvo3UG
+9y7eM5tTSjyNYkyk5fAVuT7OhzIzMA+qtc3GRVxNYRKnaHajt+pOSqr+uoDtMG3n
+6eAMHCAnhgh5Nd+dCFcNT+syl3zCwolA1wrzGxxOaif+xi5wwXjmF/lAt4PDIuDT
+etA2/AqPM4zAC0BtC0iqVgVypjFV3EAexm/g0LNMiG/M/krzwjPq5gf1DY/57jU0
+02FpKd79HmR7bHdc4e2olEf9NlHxfbPXDDsHABEBAAG0IUNocmlzIFBvdmlyayA8
+Y3Bvdmlya0Bnb29nbGUuY29tPrkBDQRZTBMWAQgA2YylXc0rxousuBBPKHn75163
+wLcPdPm2QR2WMc643fX+p0o2B7wfq4ofzNdFmyPml3xp2laQPhPMgy/MjDOLOwbD
+fg72F/UTZc+gOq9Cvf2nWyi9fc94O9Elj/skU230OymFVzfFZB82QLsl0w9rolGI
+Ud3fKd9tD7CmV/i19oNWfUlcBanQ1IaAy1d+fmLX2EdBaOZE0Ao1At1WfxRzMjxd
+1UzttLiCIOlAy6RLKOyOACjjrqJErb7x/wHAhF7UlG8XfsF2du9OD93OiLX8Ti6T
+BUkPpgTYuUPDN0aej0rE+VGy5jeeeF5WCNusYnZcpEmQiTztwwaHjVUrDovi6wAR
+AQABiQEfBBgBAgAJBQJZTBMWAhsMAAoJELrDBiIzmZTESIcIAJBWIY4eLQGhnvxk
+nPovjxg0zHx9J1K/dgnzciHWfkNYImCsNXlLf951iKeShUjQu6zLcx1+1GDo5Zpg
+645N/oxhx107+ZjfreOIwHJ/1SHcOqriwqpUtGdlsCqAPWh1GiPY2QRB+AQf8fgl
+FWvGq7MAqhbAmHcyFj6RqNglEnJZ9zX8GbcGPW1wwaUZ4hB+BaF54yDeTGvEn1Nc
++pWLpVU9o8ohTmLyXjpL5aDe68yzy8LdfM4i+FjpzCC4m/1SSNnAYNIj3nbAuqdE
+QzLSAVn44AHSomlgzecMR6RZk/fwbzSSiOc3rW1mNFOG70iLz9v4/BJb6dbcSlBl
+0upm05Q=
+=Gf3Y
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    BCF4173966770193
 uid    IntelliJ IDEA Sign Key <intellij-idea-sign-key-noreply@jetbrains.com>
 
@@ -6699,6 +6772,26 @@ vRhDrRcIBFsQ/NINWFPloDK/ZPtGH1f8Fw2yDy6HXNSfTgp8Kq8yZ8WYkTtKv8TO
 =tRDN
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    66D68DAA073BE985
+uid    Ceki Gulcu <ceki@qos.ch>
+
+sub    A1766BE5F812AC2E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg
+IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd
+OlJl1bajIRC4pAoZafDzhOb+FkjJ61lEJzJ6pQtG0Yi24QWDBfXHkSiQSbZFvcC/
+FTJpZua0GENla2kgR3VsY3UgPGNla2lAcW9zLmNoPriXBGLxBqQSBSuBBAAjBCME
+AdqQOy84O/j7xo1rAaMB3jGHCn42wBJF8nMVZ1oh6WRN8d33JP0ojCpCK9oe3lyx
+jZRvBsVkFhOF5lsb72kqR34hALXmZvhwFhzNoQlz4NuDLg6aQjAQEyiS7NqI2SVT
+qbGoyIE6yg2ZLuv2svxk1dNlvtqtfOnmoeIZG3pybRRhyuIVAwEKCYi6BBgTCgAg
+FiEEYCAKxK52HxYU1sRnZtaNqgc76YUFAmLxBqQCGwwACgkQZtaNqgc76YUkLAIH
+aAcCM1niPs/kj3NEmFl3P9ivExlWa6Q45l8qPgitCLO2v932TElX+ux8O+fv0Ax2
+XJezAj+eMV+lYScyvXpmzbwCB36nuPmtsCJ31kYLXhN2WIJWPvPVesreI/GQUq0W
+uAngfd6DOtCKYtNKP7xqDu/2bMU23cxGaRj2ToH4RfCClg1B
+=rv9Q
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    67631BC0568801C3
 uid    Ohad Shai <ohadshai@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 8e1efb6573a..15fb78bffa0 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,70 +9,90 @@
          <trust file=".*-sources[.]jar" regex="true"/>
       </trusted-artifacts>
       <ignored-keys>
+         <ignored-key id="66D68DAA073BE985" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
-         <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH"/>
+         <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah"/>
          <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
+         <trusted-key id="042B29E928995B9DB963C636C7CA19B7B620D787" group="com.github.stephenc.jcip"/>
+         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
+            <trusting group="com.sun.xml.bind"/>
+            <trusting group="org.glassfish.jaxb"/>
+         </trusted-key>
          <trusted-key id="050A37A2E0577F4BAA095B52602EC18D20C4661C">
             <trusting group="com.thoughtworks.xstream"/>
             <trusting group="io.github.x-stream"/>
          </trusted-key>
-         <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools" name="checkstyle" version="10.12.6"/>
+         <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools"/>
          <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
          <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
          <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="org.neo4j.driver"/>
-         <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb" name="mongo-java-driver" version="2.14.3"/>
+         <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb"/>
          <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
-         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
-         <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty" name="netty-bom" version="4.1.104.Final"/>
-         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
+         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
+            <trusting group="commons-collections"/>
+            <trusting group="commons-logging"/>
+         </trusted-key>
+         <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache"/>
+         <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
+         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
-         <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons" name="commons-math3" version="3.2"/>
-         <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker" name="freemarker"/>
-         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito" name="mockito-bom" version="4.11.0"/>
-         <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
+         <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
+         <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
+         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito"/>
+         <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
          <trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064" group="com.google.protobuf"/>
-         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
-         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
+         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
+         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
-         <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.7.0"/>
-         <trusted-key id="1DEF9646901A1652E5B3E5EA694DB6F419C8D1FD" group="org.exparity" name="hamcrest-date" version="2.0.8"/>
+         <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte"/>
+         <trusted-key id="1DEF9646901A1652E5B3E5EA694DB6F419C8D1FD" group="org.exparity"/>
          <trusted-key id="1FCFFE916B6670868FA0EA0391AE1504568EC4DD" group="org.jodd"/>
          <trusted-key id="223D3A74B068ECA354DC385CE126833F9CF64915" group="org.apache.xbean"/>
+         <trusted-key id="2655176F748FD83725B4805FF2A01147D830C125" group="org.testcontainers"/>
          <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
          <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
-         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD" group="net.java"/>
-         <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier" name="equalsverifier" version="3.15.5"/>
+         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD">
+            <trusting group="net.java"/>
+            <trusting group="org.sonatype.oss"/>
+         </trusted-key>
+         <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier"/>
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
+            <trusting group="commons-beanutils"/>
             <trusting group="commons-codec"/>
             <trusting group="commons-io"/>
             <trusting group="commons-logging"/>
             <trusting group="commons-net"/>
+            <trusting group="org.apache.bcel"/>
             <trusting group="org.apache.commons"/>
             <trusting group="xalan"/>
             <trusting group="xml-apis"/>
          </trusted-key>
-         <trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains" name="annotations" version="13.0"/>
+         <trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains"/>
          <trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
          <trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC" group="net.minidev"/>
-         <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains" name="annotations" version="24.1.0"/>
+         <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains"/>
          <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.codehaus.groovy"/>
          <trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0" group="com.jcraft"/>
-         <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons" name="commons-jexl3" version="3.2.1"/>
+         <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons"/>
          <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
-         <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava" name="dnsjava" version="2.1.9"/>
-         <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections" name="reflections" version="0.10.2"/>
+         <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava"/>
+         <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections"/>
          <trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18" group="net.javacrumbs.json-unit"/>
-         <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons" name="commons-math3" version="3.6.1"/>
-         <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath" name="json-path" version="2.8.0"/>
-         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
+         <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons"/>
+         <trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify"/>
+         <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath"/>
+         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
-         <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425" group="io.projectreactor" name="reactor-bom" version="2023.0.1"/>
-         <trusted-key id="4AC55A85D30C3499A3219500B7E2662A7640A051" group="com.formdev" name="svgSalamander" version="1.1.4"/>
+         <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
+            <trusting group="io.projectreactor"/>
+            <trusting group="org.springframework"/>
+         </trusted-key>
+         <trusted-key id="4AC55A85D30C3499A3219500B7E2662A7640A051" group="com.formdev"/>
          <trusted-key id="4BDE772C338BA540E1057D0C8EA48D105232855D" group="com.github.jknack"/>
          <trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
             <trusting group="net.sf.saxon"/>
@@ -82,94 +102,117 @@
             <trusting group="org.apache.ftpserver"/>
             <trusting group="org.apache.mina"/>
          </trusted-key>
-         <trusted-key id="4E2DDD47E19863BB87211544CD3038FEF07D567E" group="org.apache.commons" name="commons-pool2" version="2.12.0"/>
-         <trusted-key id="4F752A9878E937049EF3FBA7D4012DDA1F1F0F82" group="net.sf.jtidy" name="jtidy" version="r938"/>
+         <trusted-key id="4E2DDD47E19863BB87211544CD3038FEF07D567E" group="org.apache.commons"/>
+         <trusted-key id="4F752A9878E937049EF3FBA7D4012DDA1F1F0F82" group="net.sf.jtidy"/>
          <trusted-key id="4F7E32D440EF90A83011A8FC6425559C47CC79C4">
             <trusting group="javax.activation"/>
             <trusting group="javax.mail"/>
             <trusting group="javax.servlet"/>
             <trusting group="^com[.]sun($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="50A628FFAF58480736B1079FD1031D14464180E0" group="org.reactivestreams" name="reactive-streams" version="1.0.4"/>
-         <trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple" name="jopt-simple" version="5.0.4"/>
+         <trusted-key id="50A628FFAF58480736B1079FD1031D14464180E0" group="org.reactivestreams"/>
+         <trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple"/>
          <trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D" group="org.antlr"/>
-         <trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB" group="com.fifesoft" name="rsyntaxtextarea" version="3.3.4"/>
-         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="org.eclipse.jetty" name="jetty-bom"/>
+         <trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB" group="com.fifesoft"/>
+         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="org.eclipse.jetty"/>
          <trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
-         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994" group="org.codehaus.woodstox"/>
-         <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine" name="caffeine"/>
-         <trusted-key id="636DE9055C4C75C7BD9830771241BC872C5E4EC0" group="commons-lang" name="commons-lang" version="2.4"/>
-         <trusted-key id="66D7CBFF956830FE9F5A723AFE6C7D77A1CE15A6" group="org.gradlex" name="build-parameters" version="1.4.4"/>
+         <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
+         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994">
+            <trusting group="com.fasterxml"/>
+            <trusting group="org.codehaus.woodstox"/>
+         </trusted-key>
+         <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine"/>
+         <trusted-key id="636DE9055C4C75C7BD9830771241BC872C5E4EC0" group="commons-lang"/>
+         <trusted-key id="66D7CBFF956830FE9F5A723AFE6C7D77A1CE15A6" group="org.gradlex"/>
          <trusted-key id="670BE7D076A0C89F5F07625AE57428DA9E879E7D" group="^com[.]helger($|([.].*))" regex="true"/>
          <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="com.google.guava"/>
+         <trusted-key id="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688" group="org.apache.httpcomponents"/>
          <trusted-key id="6BFAB2E3C6490B421B25C76C9C8C892F91F8E6D1" group="org.apache.rat"/>
-         <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces" name="xercesImpl"/>
-         <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC" group="jakarta.activation"/>
-         <trusted-key id="6E13156C0EE653F0B984663AB95BBD3FA43C4492" group="org.apache" name="apache"/>
+         <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces"/>
+         <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC">
+            <trusting group="com.sun.activation"/>
+            <trusting group="jakarta.activation"/>
+         </trusted-key>
+         <trusted-key id="6E13156C0EE653F0B984663AB95BBD3FA43C4492" group="org.apache"/>
          <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
-         <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop" name="dataflow-errorprone" version="3.41.0-eisop1"/>
+         <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop"/>
          <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
-         <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
+         <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
-         <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity" name="velocity" version="1.7"/>
+         <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
          <trusted-key id="7FAA0F2206DE228F0DB01AD741321490758AAD6F" group="org.codehaus.groovy"/>
+         <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons"/>
          <trusted-key id="817EA1255546D6070A23AA00DB45D3A62A183CE2" group="com.miglayout"/>
          <trusted-key id="82D8419BA697F0E7FB85916EE91287822FDB81B1" group="org.apache.geronimo.genesis"/>
-         <trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache" name="apache"/>
+         <trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache"/>
          <trusted-key id="8756C4F765C9AC3CB6B85D62379CE192D401AB61">
             <trusting group="info.picocli"/>
             <trusting group="org.springframework"/>
             <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="8A10792983023D5D14C93B488D7F1BEC1E2ECAE7" group="^com[.]fasterxml($|([.].*))" regex="true"/>
-         <trusted-key id="8A9352189AECCFB4AE1F3BC616FBB6B6E3120829" group="org.jetbrains.lets-plot" name="lets-plot-kotlin-jvm" version="4.5.0"/>
-         <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx" name="kotlinx-html-jvm" version="0.7.5"/>
+         <trusted-key id="8A9352189AECCFB4AE1F3BC616FBB6B6E3120829" group="org.jetbrains.lets-plot"/>
+         <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx"/>
+         <trusted-key id="8F9A3C6D105B9F57844A721D79E193516BE7998F" group="org.dom4j"/>
          <trusted-key id="9056B710F1E332780DE7AF34CBAEBE39A46C4CA1" group="org.apache.geronimo.genesis.config"/>
          <trusted-key id="98465301A4939C0279F2E847D89D05374952262B" group="org.jetbrains.dokka"/>
-         <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.0.4"/>
-         <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom" name="jdom" version="1.1.3"/>
-         <trusted-key id="A1885C07A3204611FB184EF7098A31F381819057" group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.16"/>
+         <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471">
+            <trusting group="com.github.spotbugs"/>
+            <trusting group="com.github.spotbugs.snom"/>
+         </trusted-key>
+         <trusted-key id="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231" group="org.apache"/>
+         <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom"/>
+         <trusted-key id="A1885C07A3204611FB184EF7098A31F381819057" group="net.sourceforge.nekohtml"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
-         <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
+         <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8"/>
          <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
-         <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern" name="software-and-algorithms" version="1.0"/>
+         <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern"/>
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
-         <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1"/>
-         <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli" name="picocli" version="4.7.5"/>
-         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
-         <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache" name="apache" version="17"/>
+         <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
+         <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
+         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
+         <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
-         <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus" name="plexus-classworlds" version="2.6.0"/>
+         <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus"/>
          <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
-         <trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923" group="jcharts" name="jcharts" version="0.7.5"/>
+         <trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923" group="jcharts"/>
          <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
             <trusting group="commons-beanutils"/>
             <trusting group="commons-cli"/>
             <trusting group="commons-fileupload"/>
             <trusting group="org.apache.commons"/>
          </trusted-key>
-         <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations"/>
-         <trusted-key id="B920D295BF0E61CB4CF0896C33CD6733AF5EC452" group="commons-logging"/>
-         <trusted-key id="BA926F64CA647B6D853A38672E2010F8A7FF4A41" group="org.apache" name="apache" version="7"/>
-         <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
-         <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>
+         <trusted-key id="B7574789F5018690043E6DD9C212662E12F3E1DD" group="org.apache.geronimo.genesis"/>
+         <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc"/>
+         <trusted-key id="B920D295BF0E61CB4CF0896C33CD6733AF5EC452">
+            <trusting group="commons-logging"/>
+            <trusting group="org.apache.commons"/>
+         </trusted-key>
+         <trusted-key id="BA926F64CA647B6D853A38672E2010F8A7FF4A41" group="org.apache"/>
+         <trusted-key id="BAE5C184E3B70CB15617700598FE03A974CE0A0B" group="org.jetbrains.kotlin"/>
+         <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec"/>
+         <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE">
+            <trusting group="com.google.guava"/>
+            <trusting group="com.google.j2objc"/>
+         </trusted-key>
          <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
          <trusted-key id="C758F9CC982AC877E7B295DD6E97418B04B11DCB" group="org.apache.xbean"/>
          <trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7">
             <trusting group="com.google.code.gson"/>
             <trusting group="^com[.]google[.]auto($|([.].*))" regex="true"/>
          </trusted-key>
+         <trusted-key id="CA491704D613780D2BEE00F2C6FC46EB51CF569C" group="jaxen"/>
          <trusted-key id="CE8075A251547BEE249BC151A2115AE15F6B8B72">
             <trusting group="org.apache.commons"/>
             <trusting group="org.xmlunit"/>
          </trusted-key>
-         <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers" name="testcontainers-bom" version="1.16.1"/>
+         <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
          <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
             <trusting group="com.github.autostyle"/>
-            <trusting group="com.github.vlsi.gradle"/>
+            <trusting group="^com[.]github[.]vlsi($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="D196A5E3E70732EEB2E5007F1861C322C56014B2">
             <trusting group="commons-beanutils"/>
@@ -180,31 +223,35 @@
          <trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
          <trusted-key id="D5F46BC0B86AF5DC56DF58F05E975CB00C643DBF" group="com.google.inject"/>
          <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="^org[.]apache($|([.].*))" regex="true"/>
-         <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb" name="hsqldb" version="2.7.2"/>
-         <trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C" group="org.apache" name="apache" version="9"/>
-         <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell" name="bsh" version="2.0b6"/>
-         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A" group="com.github.tomakehurst" name="wiremock-jre8" version="2.35.2"/>
-         <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections" name="pcollections" version="3.1.4"/>
+         <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb"/>
+         <trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C" group="org.apache"/>
+         <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell"/>
+         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A" group="com.github.tomakehurst"/>
+         <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections"/>
          <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D" group="org.springframework"/>
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
          <trusted-key id="E52567D2589415BD74EB4C2867631BC0568801C3" group="io.github.microutils"/>
          <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
-         <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist" name="javassist" version="3.28.0-GA"/>
+         <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist"/>
          <trusted-key id="E62231331BCA7E1F292C9B88C1B12A5D99C0729D" group="org.jetbrains"/>
+         <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws"/>
          <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
+         <trusted-key id="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7" group="net.java"/>
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
-         <trusted-key id="E9AF5293C334C7C0B583227D2F45F85CDF082E68" group="org.mozilla" name="rhino" version="1.7.14"/>
+         <trusted-key id="E9AF5293C334C7C0B583227D2F45F85CDF082E68" group="org.mozilla"/>
          <trusted-key id="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94" group="org.apache.geronimo.specs"/>
-         <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc" name="j2objc-annotations" version="2.8"/>
+         <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
+         <trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17" group="com.google"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
          <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
+            <trusting group="org.apache"/>
             <trusting group="org.codehaus.mojo"/>
             <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup" name="jsoup"/>
+         <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
-            <trusting group="org.apache" name="apache"/>
+            <trusting group="org.apache"/>
             <trusting group="org.codehaus.plexus"/>
             <trusting group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
          </trusted-key>
@@ -237,51 +284,6 @@
             <sha256 value="239f3397b79f91a866e6067cf04974146d7e864feb2aa34a9943831c9f6daeab" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.fasterxml" name="oss-parent" version="38">
-         <artifact name="oss-parent-38.pom">
-            <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml" name="oss-parent" version="43">
-         <artifact name="oss-parent-43.pom">
-            <sha256 value="e5585cc1c37079b2e3817a8997945736f158831844d59d0e4d3a45b27611f926" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml" name="oss-parent" version="50">
-         <artifact name="oss-parent-50.pom">
-            <sha256 value="f5da55dd7b88fb170c46801d17774a652fb2f4581fb5b1d0a5fc86aa182b8577" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml" name="oss-parent" version="56">
-         <artifact name="oss-parent-56.pom">
-            <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.4.20221013">
-         <artifact name="jackson-bom-2.13.4.20221013.pom">
-            <sha256 value="cb63f8ff98c7ccbe531e3764be2c91d275b8fcfe2972cd67aa7f0a781a239a36" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.16.0">
-         <artifact name="jackson-bom-2.16.0.pom">
-            <sha256 value="5aaa28874405bf04fba8e2c57159227824461ba6f7d552abdb8e8d3a0ba6f8bf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.13">
-         <artifact name="jackson-parent-2.13.pom">
-            <sha256 value="2bba89978172af1effcb4d143d09921a3f3082ca4dcf122b1ded98bf55b2ad57" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.15">
-         <artifact name="jackson-parent-2.15.pom">
-            <sha256 value="6cdf97bc66f389f63e36850d2f552d1216688f8e5a58727d3f6a98edf8675cde" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
-         <artifact name="jackson-parent-2.16.pom">
-            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
          <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -307,31 +309,6 @@
             <sha256 value="37656ed0e5626bf87a0b5f59dab729becbf8dbe5dbf77a533145acf567163add" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.google" name="google" version="1">
-         <artifact name="google-1.pom">
-            <sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="com.google" name="google" version="5">
-         <artifact name="google-5.pom">
-            <pgp value="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17"/>
-         </artifact>
-      </component>
-      <component group="com.google.auto.service" name="auto-service-aggregator" version="1.1.1">
-         <artifact name="auto-service-aggregator-1.1.1.pom">
-            <sha256 value="e2dc3e263a5db0cc8172fb2eb9bcd232acecfdc96e817103eab3c8d9f1900c6a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.collections" name="google-collections" version="1.0">
-         <artifact name="google-collections-1.0.pom">
-            <sha256 value="893d56afcea1b22f83220fd7e49a6668c5b8901e39bd59dc57b42f55673721ce" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1">
-         <artifact name="concurrent-trees-2.6.1.pom">
-            <pgp value="A9789342F598AD5B1175EF357EB97D110DFADD60"/>
-         </artifact>
-      </component>
       <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.0.2">
          <artifact name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin-2.0.2.pom">
             <sha256 value="f6111fd512eabacff117c7a46d730033c6f7eb78cc05ce73fe97cb195cf330f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -342,111 +319,11 @@
             <sha256 value="0095b536e4c60a1325946ccdb1a9fbbb97249df276d89bb0eb1ba698a8a64f3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.pinterest" name="ktlint" version="0.40.0">
-         <artifact name="ktlint-0.40.0.jar">
-            <sha256 value="37bfa6c412482fed94975facc6e589d2be7e65b0b2d30bff5ea96536c8bd12d1" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-0.40.0.module">
-            <sha256 value="debce7cc007b7eeec908de8e897954e2142e770eaba2e7140d8e1f2d8b6ec990" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-core" version="0.40.0">
-         <artifact name="ktlint-core-0.40.0.jar">
-            <sha256 value="67045459446f2100a820835e1ba7b11080ecb0a7bdc540a92a2dde3e1ad5df4e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-core-0.40.0.module">
-            <sha256 value="76be1138d128476a058907298b52f737422a878448979aa27ec01c7694544d85" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-reporter-baseline" version="0.40.0">
-         <artifact name="ktlint-reporter-baseline-0.40.0.jar">
-            <sha256 value="08c294b9e76301f29b4ceb7f8891f68e8a38a985a61770fae2a239c8ab786f99" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-reporter-baseline-0.40.0.module">
-            <sha256 value="43a29d1ad7a4099b17ecbbe3ce67876e6d941a4b7c925f3e75dbc418e56f3b78" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-reporter-checkstyle" version="0.40.0">
-         <artifact name="ktlint-reporter-checkstyle-0.40.0.jar">
-            <sha256 value="c33dcb83392124ea1e2bb39b0a3bbd219ae1e614c60c5f0807eb829820b493ad" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-reporter-checkstyle-0.40.0.module">
-            <sha256 value="1f109dc7f13a14f3713fb56dcd8d5dcdc8dcf33f77f1eb2019acf6fbc4e20971" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-reporter-html" version="0.40.0">
-         <artifact name="ktlint-reporter-html-0.40.0.jar">
-            <sha256 value="f2326b16af601c87c191762463e65939ba9bfae2ce2383d0e1b7a7f6f3241b5c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-reporter-html-0.40.0.module">
-            <sha256 value="09223dd04bf2ef82da5f3714659cddee8a3b7ff4f7855579d88fb868f3f6ddde" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-reporter-json" version="0.40.0">
-         <artifact name="ktlint-reporter-json-0.40.0.jar">
-            <sha256 value="4648e8a52797527f7d23273a95f6370ea3f47798f29a8cc45d31918333635a69" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-reporter-json-0.40.0.module">
-            <sha256 value="101441329b498fb6df6cf58cd366211a778b8929569e4f68d015202a2bacee9f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-reporter-plain" version="0.40.0">
-         <artifact name="ktlint-reporter-plain-0.40.0.jar">
-            <sha256 value="f6828c5f089c0fa3c07f2365134690ab6224f7b8b2cd355a4536b3e2d18a965c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-reporter-plain-0.40.0.module">
-            <sha256 value="a3335eb853ee606b9445b51eccd26bc0e2cdff504764994ab453bdb190879830" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-ruleset-experimental" version="0.40.0">
-         <artifact name="ktlint-ruleset-experimental-0.40.0.jar">
-            <sha256 value="6565be6fa2ea178214ce797aee7e5e8a9a5f320e9ac3ee532ff47943475f03bf" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-ruleset-experimental-0.40.0.module">
-            <sha256 value="670d01ae614d05143fbbc013052de39cacea3c6901be8c2649bb37e78a9886ab" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-ruleset-standard" version="0.40.0">
-         <artifact name="ktlint-ruleset-standard-0.40.0.jar">
-            <sha256 value="a8fc82f0661e40e7fd4e96b790e141e5999fc71567aa37ede109b12dcd24f43d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-ruleset-standard-0.40.0.module">
-            <sha256 value="a079ddd01a576fc09569548547b8782a1238a5f6db457340d2ad8138975021ed" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.pinterest.ktlint" name="ktlint-ruleset-test" version="0.40.0">
-         <artifact name="ktlint-ruleset-test-0.40.0.jar">
-            <sha256 value="b5d6b10b21eb8f5be8293458a3f4288812afbeaf7d73de205393dbc8c332cfcc" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="ktlint-ruleset-test-0.40.0.module">
-            <sha256 value="63db70e1c2ea9ab26e45be1844dd236adcfa09c80a0f0c350463fc2b3c2f37ee" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="com.sun.activation" name="all" version="1.2.1">
-         <artifact name="all-1.2.1.pom">
-            <pgp value="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC"/>
-         </artifact>
-      </component>
-      <component group="com.sun.xml.bind" name="jaxb-bom-ext" version="2.3.5">
-         <artifact name="jaxb-bom-ext-2.3.5.pom">
-            <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
-         </artifact>
-      </component>
-      <component group="com.sun.xml.ws" name="jaxws-ri-bom" version="2.3.5">
-         <artifact name="jaxws-ri-bom-2.3.5.pom">
-            <pgp value="E725C3877939E8FFEA7E3C44B6D3FC494798E478"/>
-         </artifact>
-      </component>
       <component group="commons-logging" name="commons-logging" version="1.0.4">
          <artifact name="commons-logging-1.0.4.pom">
             <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="commons-logging" name="commons-logging" version="1.2">
-         <artifact name="commons-logging-1.2.pom">
-            <pgp value="0CC641C3A62453AB390066C4A41F13C999945293"/>
-         </artifact>
-      </component>
       <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
          <artifact name="nexus-publish-plugin-0.4.0.jar">
             <sha256 value="b5fed9f29022119b6d5dd87b3073e19991bec6196117e306334608927cd1f620" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -493,12 +370,6 @@
             <sha256 value="11ba6d768baf4ba6b1e98f97fab3cc24e1052482c18c38718f65d1163a9fbddf" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="io.fabric8" name="kubernetes-client-bom" version="5.12.4">
-         <artifact name="kubernetes-client-bom-5.12.4.pom">
-            <pgp value="A42FEF087AF29AE864684EAEE6039456D5BBD4F8"/>
-            <sha256 value="d232392a89c3efdc85ab299c5a94e8b9dd35bc02f340ce8446ff659aa15913a0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.freefair.gradle" name="lombok-plugin" version="5.3.3.3">
          <artifact name="lombok-plugin-5.3.3.3.jar">
             <sha256 value="fd6426a37450f6b68fedce4ac26c570830ca3c9ecd415c44c81478da1f1eb0e0" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -507,27 +378,6 @@
             <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-bom" version="4.1.104.Final">
-         <artifact name="netty-bom-4.1.104.Final.pom">
-            <pgp value="0D35D3F60078655126908E8AF3D1600878E85A3D"/>
-            <sha256 value="5a65e06a159d20d3b4800624a570c646dbee710b2b539b3449a268558c289e9c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.projectreactor" name="reactor-bom" version="2023.0.1">
-         <artifact name="reactor-bom-2023.0.1.pom">
-            <pgp value="48B086A7D843CFA258E83286928FBF39003C0425"/>
-         </artifact>
-      </component>
-      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
-         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
-            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
-         <artifact name="jakartaee-api-parent-9.1.0.pom">
-            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -549,17 +399,6 @@
             <sha256 value="57e0c23ac60945aefb5a0c4a9339bea68a295364ca47c7a9079a032f79013abb" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="net.java" name="jvnet-parent" version="1">
-         <artifact name="jvnet-parent-1.pom">
-            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
-            <sha256 value="281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="net.java" name="jvnet-parent" version="3">
-         <artifact name="jvnet-parent-3.pom">
-            <pgp value="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7"/>
-         </artifact>
-      </component>
       <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="3.1.0">
          <artifact name="net.ltgt.errorprone.gradle.plugin-3.1.0.pom">
             <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -597,135 +436,6 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="org.apache" name="apache" version="13">
-         <artifact name="apache-13.pom">
-            <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="16">
-         <artifact name="apache-16.pom">
-            <pgp value="0CDE80149711EB46DFF17AE421A24B3F8B0F594A"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="17">
-         <artifact name="apache-17.pom">
-            <pgp value="AE9E53FC28FF2AB1012273D0BF1518E0160788A2"/>
-            <sha256 value="398044b74b5a719326be218ae08124e5e2f3318ab5d78fe199d504efc2e0d43f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="18">
-         <artifact name="apache-18.pom">
-            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
-            <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="19">
-         <artifact name="apache-19.pom">
-            <sha256 value="91f7a33096ea69bac2cbaf6d01feb934cac002c48d8c8cfa9c240b40f1ec21df" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="23">
-         <artifact name="apache-23.pom">
-            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="24">
-         <artifact name="apache-24.pom">
-            <sha256 value="2e93bbabe3413af89a0c3bfb9e6bf71dbc9e8f9fb14ccbb1d78bd0275df1c525" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="25">
-         <artifact name="apache-25.pom">
-            <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="27">
-         <artifact name="apache-27.pom">
-            <sha256 value="b2b0fc69e22a650c3892f1c366d77076f29575c6738df4c7a70a44844484cdf9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="3">
-         <artifact name="apache-3.pom">
-            <sha256 value="393c50afb4b7aa6eb57e5377a55a1a0610b19f75b52ece01308db04a1187a20e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="30">
-         <artifact name="apache-30.pom">
-            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="31">
-         <artifact name="apache-31.pom">
-            <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="4">
-         <artifact name="apache-4.pom">
-            <sha256 value="9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="6">
-         <artifact name="apache-6.pom">
-            <pgp value="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="7">
-         <artifact name="apache-7.pom">
-            <pgp value="BA926F64CA647B6D853A38672E2010F8A7FF4A41"/>
-            <sha256 value="1397ce1db433adc9f223dbf07496d133681448751f4ae29e58f68e78fb4b6c25" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="9">
-         <artifact name="apache-9.pom">
-            <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
-            <sha256 value="4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="22">
-         <artifact name="commons-parent-22.pom">
-            <sha256 value="fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="39">
-         <artifact name="commons-parent-39.pom">
-            <pgp value="808D78B17A5A2D7C3668E31FBFFC9B54721244AD"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="47">
-         <artifact name="commons-parent-47.pom">
-            <sha256 value="8a8ecb570553bf9f1ffae211a8d4ca9ee630c17afe59293368fba7bd9b42fcb7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="5">
-         <artifact name="commons-parent-5.pom">
-            <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="52">
-         <artifact name="commons-parent-52.pom">
-            <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="62">
-         <artifact name="commons-parent-62.pom">
-            <sha256 value="74cd62d68b09aad7fb9424ea88269ab76aba0d65088d9569ff273bd207427439" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.geronimo.genesis" name="genesis" version="1.2">
-         <artifact name="genesis-1.2.pom">
-            <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
-         </artifact>
-      </component>
-      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="12">
-         <artifact name="httpcomponents-parent-12.pom">
-            <pgp value="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688"/>
-         </artifact>
-      </component>
-      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="13">
-         <artifact name="httpcomponents-parent-13.pom">
-            <sha256 value="e4287867035856c737420368dd586e5e57e702098135840cf3d73e9c8363d7b3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -747,56 +457,21 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.codehaus.mojo" name="mojo-parent" version="40">
-         <artifact name="mojo-parent-40.pom">
-            <pgp value="D433F9C895710DB8AB087FA6B7C3B43D18EAA8B7"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
-         <artifact name="project-1.0.7.pom">
-            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.50.v20221201">
-         <artifact name="jetty-bom-9.4.50.v20221201.pom">
-            <sha256 value="4cde6e533d601eaf8b65acee956b7706c18192f2755d023d7e8d19bb7d5b3943" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.5">
-         <artifact name="jaxb-bom-2.3.5.pom">
-            <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
-         </artifact>
-      </component>
-      <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="4.4.0">
-         <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-4.4.0.pom">
-            <sha256 value="6739a6baa7c19632dcfbd7656fe7b54eff391bfee2f3e2eab5d5acb9acb11da2" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-5.2.0.pom">
             <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="4.4.0">
-         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-4.4.0.pom">
-            <sha256 value="22f335523145d2c8400d4d63b783e24750f9f984cf5e28ca1edffdf7f9a9de7b" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom">
             <sha256 value="a57bb439ba4260a256f2d608471d7081189077a0a4ddfb028dd1817be5bc1237" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="0.7.0">
-         <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.7.0.pom">
-            <sha256 value="c8a443e2faef876f338a391233c20a91ad5b83f69c1c6ba20d39a7b39106240a" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="1.0.0">
          <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-1.0.0.pom">
             <sha256 value="f133249a18754ae6a1d2701d00d849b1afba7b0683ddb5fc1b18a70071cec2fa" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -817,11 +492,6 @@
             <sha256 value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jacoco" name="org.jacoco.build" version="0.8.13">
-         <artifact name="org.jacoco.build-0.8.13.pom">
-            <sha256 value="994c3ae1cfca6765968fe3ede4f379986aeb2e7eb51a2014caa4a09d71a8f4a3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jboss" name="jboss-parent" version="36">
          <artifact name="jboss-parent-36.pom">
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -845,16 +515,6 @@
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.21">
-         <artifact name="kotlin-gradle-plugins-bom-2.0.21.pom">
-            <sha256 value="675013d4cbeee09c88920ae2ba246f99f28a789b874f634049e012fa3eebf4c8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.30">
-         <artifact name="kotlin-stdlib-common-1.3.30.pom">
-            <pgp value="BAE5C184E3B70CB15617700598FE03A974CE0A0B"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.9.22">
          <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.9.22.pom">
             <sha256 value="1cb4ecb933c919b2fbfd765efca5fe4907a08712e8c9942c33a208b2b169b18c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -865,32 +525,6 @@
             <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.6.4">
-         <artifact name="kotlinx-coroutines-bom-1.6.4.pom">
-            <sha256 value="ab2614855fba66aa8a42514dbe3d5a884315ffe1ed63f5932e710a8006245ce1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.7.3">
-         <artifact name="kotlinx-coroutines-bom-1.7.3.pom">
-            <sha256 value="4e5d1900e6379ef3f5970d04a8f30529adc82f859e8cc107c21ce8149ef666c4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.10.0">
-         <artifact name="junit-bom-5.10.0.pom">
-            <sha256 value="e006dd8894f9fc7b75fc32bb12fe5ed8be65667d5b454f99e2e0b8c5bb8d30b3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.10.1">
-         <artifact name="junit-bom-5.10.1.pom">
-            <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.mockito" name="mockito-bom" version="4.11.0">
-         <artifact name="mockito-bom-4.11.0.pom">
-            <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
-            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -904,15 +538,9 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.ow2" name="ow2" version="1.5.1">
-         <artifact name="ow2-1.5.1.pom">
-            <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
-            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.ow2.asm" name="asm-bom" version="9.8">
-         <artifact name="asm-bom-9.8.pom">
-            <sha256 value="0da1dcb226e6cdfdadb4dac591916bb917b57374674d91bd2f13003137b41520" origin="Generated by Gradle"/>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
@@ -928,11 +556,6 @@
             <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="5">
-         <artifact name="oss-parent-5.pom">
-            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
-         </artifact>
-      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="6">
          <artifact name="oss-parent-6.pom">
             <sha256 value="b4306d13e8f5392458a1b30866f1cff161b3d2e6999a88d059eea3932c8a8499" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -943,23 +566,6 @@
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="9">
-         <artifact name="oss-parent-9.pom">
-            <pgp value="44FBDBBC1A00FE414F1C1873586654072EAD6677"/>
-            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.testcontainers" name="testcontainers-bom" version="1.16.1">
-         <artifact name="testcontainers-bom-1.16.1.pom">
-            <pgp value="D022218DCC08AAD6EF3AF876B3DE72E647D35161"/>
-            <sha256 value="5061ba84c98536e5a6b4ce280fbcecb00e335f3b04c5d484629162fcb4624778" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.testcontainers" name="testcontainers-bom" version="1.19.3">
-         <artifact name="testcontainers-bom-1.19.3.pom">
-            <pgp value="2655176F748FD83725B4805FF2A01147D830C125"/>
-         </artifact>
-      </component>
       <component group="oro" name="oro" version="2.0.8">
          <artifact name="oro-2.0.8.jar">
             <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 91ed1279438cbc2553121c8ea1afded0605b38e5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 22 Jul 2025 20:57:19 +0300
Subject: [PATCH 0825/1037] chore: add key for ktlint

---
 gradle/verification-metadata.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 15fb78bffa0..80f46201810 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3,15 +3,12 @@
    <configuration>
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
+      <keyring-format>armored</keyring-format>
       <trusted-artifacts>
          <trust group="gradle" name="gradle"/>
          <trust file=".*-javadoc[.]jar" regex="true"/>
          <trust file=".*-sources[.]jar" regex="true"/>
       </trusted-artifacts>
-      <ignored-keys>
-         <ignored-key id="66D68DAA073BE985" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
-      </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah"/>
          <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
@@ -174,6 +171,7 @@
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
+         <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus"/>

From 9e8470dbb8cb21f3764097a94bb93c83071e8918 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 8 Oct 2025 12:25:42 +0300
Subject: [PATCH 0826/1037] chore: bump Dokka to v2, and reduce Gradle daemon
 memory consumption

Previously, Dokka (kotlin doc + javadoc) was running within Gradle Daemon process,
so it required every Gradle Daemon to allocate lots of heap.

The change allows reducing heap consumption
---
 build-logic/jvm/build.gradle.kts              |  2 +-
 .../build-logic.dokka-javadoc.gradle.kts      | 14 ++++--
 gradle.properties                             |  6 ++-
 gradle/verification-keyring.keys              | 44 +++++++++++++++++++
 gradle/verification-metadata.xml              | 12 +++--
 5 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 899c13c1560..d4edfc896dd 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
-    api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
+    api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
index 1be932a5730..096cdc37f8b 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("java-base")
-    id("org.jetbrains.dokka")
+    id("org.jetbrains.dokka-javadoc")
 }
 
 java {
@@ -30,15 +30,21 @@ tasks.named<Jar>("javadocJar") {
     archiveClassifier.set("javadoc_java")
 }
 
-tasks.dokkaJavadoc {
-    moduleName.set("Apache JMeter ${project.name}")
+dokka {
+    moduleName = "Apache JMeter ${project.name}"
+    dokkaGeneratorIsolation = ProcessIsolation {
+        maxHeapSize = "2g"
+    }
+}
+
+tasks.dokkaGeneratePublicationJavadoc {
     mustRunAfter("kaptKotlin")
 }
 
 val dokkaJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
     description = "Assembles a jar archive containing javadoc"
-    from(tasks.dokkaJavadoc)
+    from(tasks.dokkaGeneratePublicationJavadoc)
     archiveClassifier.set("javadoc")
 }
 
diff --git a/gradle.properties b/gradle.properties
index c5f97deb259..22f90ee6b3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m
+org.gradle.jvmargs=-Xms128m -Xmx768m -XX:MaxMetaspaceSize=768m
 org.gradle.parallel=true
 # Build cache can be disabled with --no-build-cache option
 org.gradle.caching=true
@@ -24,6 +24,10 @@ org.gradle.dependency.verification.console=verbose
 
 kapt.include.compile.classpath=false
 
+# Kotlin Dokka is experemental, and we want silence the build warning
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 # See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
 # repository.apache.org does not yet support .sha256 and .sha512 checksums
 systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index e64b12bae3d..e38624dc127 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -3946,6 +3946,50 @@ f2vHkgXOGMk=
 =2bDb
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    0C0A9468268C79AE
+uid    JetBrains Markdown <markdown@jetbrains.com>
+
+sub    FA258103C03E2F42
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=M/EH
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    0D3B328562A119A7
 uid    Aleksey Shipilev <aleksey@shipilev.net>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 80f46201810..a97892498b5 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -207,6 +207,7 @@
             <trusting group="org.apache.commons"/>
             <trusting group="org.xmlunit"/>
          </trusted-key>
+         <trusted-key id="CFBE6E7934FB211224EE1C2B0C0A9468268C79AE" group="org.jetbrains"/>
          <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
          <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
             <trusting group="com.github.autostyle"/>
@@ -503,9 +504,14 @@
             <sha256 value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="1.9.10">
-         <artifact name="org.jetbrains.dokka.gradle.plugin-1.9.10.pom">
-            <sha256 value="27bb52753f97b2cbedd5ad72e111e05e53e0b08a4d22a2aaa80069df5d527ae1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="2.0.0">
+         <artifact name="org.jetbrains.dokka.gradle.plugin-2.0.0.pom">
+            <sha256 value="e1fc686a01837e7e86291185901507ffeaf794b8a9ec947b5d04368fa70e00ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
+         <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
+            <sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">

From 9a7173c3f26857495501d518e5cb269554092d03 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 8 Oct 2025 12:34:56 +0000
Subject: [PATCH 0827/1037] fix(deps): update dependency
 me.champeau.jmh:me.champeau.jmh.gradle.plugin to v0.7.3

---
 build-logic/jvm/build.gradle.kts |  2 +-
 gradle/verification-metadata.xml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index d4edfc896dd..92d5e7eb712 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     api(projects.buildParameters)
     api(projects.verification)
-    api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.2")
+    api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.3")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a97892498b5..d4a14de579f 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -393,11 +393,24 @@
             <sha256 value="6d849ae7454ab391718e5fc70e2716418ef3ed264472345bd80c6de64e00b6c4" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="me.champeau.jmh" name="jmh-gradle-plugin" version="0.7.3">
+         <artifact name="jmh-gradle-plugin-0.7.3.jar">
+            <sha256 value="d7097e619541d90e0a970b2a68573e22ad01d2999ee5365d56d59830765bf98f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="jmh-gradle-plugin-0.7.3.module">
+            <sha256 value="3487d1aba24fe0af527c6d5f78b5f0e8fd64fe9878708b460e6600e39a47bc43" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.2">
          <artifact name="me.champeau.jmh.gradle.plugin-0.7.2.pom">
             <sha256 value="57e0c23ac60945aefb5a0c4a9339bea68a295364ca47c7a9079a032f79013abb" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.3">
+         <artifact name="me.champeau.jmh.gradle.plugin-0.7.3.pom">
+            <sha256 value="d516226b3b114e4b32d42544d1d2796c732c5465d5dae7cc846be6b23bed8d1d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="3.1.0">
          <artifact name="net.ltgt.errorprone.gradle.plugin-3.1.0.pom">
             <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 389390c664d9612ffc905f6c9504f2e40a9c99b2 Mon Sep 17 00:00:00 2001
From: KingRabbid <13966341+KingRabbid@users.noreply.github.com>
Date: Mon, 6 Oct 2025 23:30:03 +0300
Subject: [PATCH 0828/1037] Unify the JSR223 logging error statements

---
 .../apache/jmeter/assertions/BSFAssertion.java   |  2 +-
 .../jmeter/assertions/JSR223Assertion.java       |  2 +-
 .../jmeter/extractor/BSFPostProcessor.java       |  2 +-
 .../jmeter/extractor/JSR223PostProcessor.java    |  2 +-
 .../apache/jmeter/modifiers/BSFPreProcessor.java |  2 +-
 .../jmeter/modifiers/BeanShellPreProcessor.java  |  2 +-
 .../jmeter/modifiers/JSR223PreProcessor.java     |  2 +-
 .../java/org/apache/jmeter/timers/BSFTimer.java  |  2 +-
 .../org/apache/jmeter/timers/BeanShellTimer.java |  2 +-
 .../org/apache/jmeter/timers/JSR223Timer.java    |  2 +-
 .../jmeter/visualizers/JSR223Listener.java       |  2 +-
 .../gui/action/CompileJSR223TestElements.java    |  6 +++---
 .../apache/jmeter/util/JSR223TestElement.java    | 16 ++++++++--------
 .../java/org/apache/jmeter/functions/Groovy.java |  2 +-
 .../protocol/java/sampler/JSR223Sampler.java     |  2 +-
 15 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
index 57ea8ae84cb..0358c6179c8 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
@@ -42,7 +42,7 @@ public AssertionResult getResult(SampleResult response) {
             processFileOrScript(mgr);
             result.setError(false);
         } catch (BSFException e) {
-            log.warn("Problem in BSF script", e);
+            log.warn("Problem in BSF element named: '{}'", getName(), e);
             result.setFailure(true);
             result.setError(true);
             result.setFailureMessage(e.toString());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
index ffffe0de725..7ffb8acdbaf 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java
@@ -50,7 +50,7 @@ public AssertionResult getResult(SampleResult response) {
             processFileOrScript(scriptEngine, bindings);
             result.setError(false);
         } catch (IOException | ScriptException e) {
-            log.error("Problem in JSR223 script: {}", getName(), e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
             result.setError(true);
             result.setFailureMessage(e.toString());
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
index 323c01daeb7..1fe97de5925 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java
@@ -39,7 +39,7 @@ public void process(){
             processFileOrScript(mgr);
         } catch (BSFException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BSF script: {}", e.toString());
+                log.warn("Problem in BSF element named: '{}'", getName(), e);
             }
         } finally {
             if (mgr != null) {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
index 1f3d51ae660..2eadc59f1ff 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java
@@ -44,7 +44,7 @@ public void process() {
             ScriptEngine scriptEngine = getScriptEngine();
             processFileOrScript(scriptEngine, null);
         } catch (ScriptException | IOException e) {
-            log.error("Problem in JSR223 script, {}", getName(), e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
         }
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
index 0e8a4a7e1ce..0c9d8b21158 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java
@@ -42,7 +42,7 @@ public void process(){
             processFileOrScript(mgr);
         } catch (BSFException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BSF script. {}", e.toString());
+                log.warn("Problem in BSF element named: '{}'", getName(), e);
             }
         } finally {
             if (mgr != null) {
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
index f01991dd657..1a56a4d223a 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
@@ -62,7 +62,7 @@ public void process(){
             processFileOrScript(bshInterpreter);
         } catch (JMeterException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BeanShell script. {}", e.toString());
+                log.warn("Problem in BeanShell element named: '{}'", getName(), e);
             }
         }
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
index 1d2b5132ce4..690ebede485 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java
@@ -44,7 +44,7 @@ public void process() {
             ScriptEngine scriptEngine = getScriptEngine();
             processFileOrScript(scriptEngine, null);
         } catch (ScriptException | IOException e) {
-            log.error("Problem in JSR223 script, {}", getName(), e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
         }
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
index ae324dba7bf..c4abd9a16a6 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java
@@ -44,7 +44,7 @@ public long delay() {
             delay = Long.parseLong(o.toString());
         } catch (NumberFormatException | BSFException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BSF script. {}", e.toString());
+                log.warn("Problem in BSF element named: '{}'", getName(), e);
             }
         } finally {
             if(mgr != null) {
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
index c383f2c49b4..9da5a2fa45a 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java
@@ -59,7 +59,7 @@ public long delay() {
             }
         } catch (JMeterException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BeanShell script. {}", e.toString());
+                log.warn("Problem in BeanShell element named: '{}'", getName(), e);
             }
         }
         try {
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
index 6ae5ef2fd4c..36455d575d4 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java
@@ -47,7 +47,7 @@ public long delay() {
             }
             delay = Long.parseLong(o.toString());
         } catch (NumberFormatException | IOException | ScriptException e) {
-            log.error("Problem in JSR223 script, {}", getName(), e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
         }
         return delay;
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
index ac066f6d7bd..3d795ac8ebb 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java
@@ -53,7 +53,7 @@ public void sampleOccurred(SampleEvent event) {
             bindings.put("sampleResult", event.getResult());
             processFileOrScript(scriptEngine, bindings);
         } catch (ScriptException | IOException e) {
-            log.error("Problem in JSR223 script, {}", getName(), e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
index 7539d09d6d9..0c7b5995420 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
@@ -70,16 +70,16 @@ public void addNode(Object object, HashTree subTree) {
                 JSR223TestElement element = (JSR223TestElement) userObject;
                 TestBeanHelper.prepare(element);
                 try {
-                    log.info("Compiling {}", element.getName());
+                    log.info("Compiling JSR223 element named: '{}'", element.getName());
                     if(!element.compile()) {
                         elementsWithCompilationErrors++;
                         treeNode.setMarkedBySearch(true);
                     } else {
-                        log.info("Compilation succeeded for {}", element.getName());
+                        log.info("Compilation succeeded for JSR223 element named: '{}'", element.getName());
                     }
                 } catch (Exception e) {
                     treeNode.setMarkedBySearch(true);
-                    log.error("Error compiling test element {}", element.getName(), e);
+                    log.error("Error compiling JSR223 element named: '{}'", element.getName(), e);
                 }
             }
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index b46b555d152..19cc910da2c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -114,7 +114,7 @@ protected ScriptEngine getScriptEngine() throws ScriptException {
         String lang = getScriptLanguageWithDefault();
         ScriptEngine scriptEngine = getInstance().getEngineByName(lang);
         if (scriptEngine == null) {
-            throw new ScriptException("Cannot find engine named: '"+lang+"', ensure you set language field in JSR223 Test Element: "+getName());
+            throw new ScriptException("Cannot find engine named: '"+lang+"', ensure you set language field in JSR223 element named: " + getName());
         }
 
         return scriptEngine;
@@ -192,11 +192,11 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
             if (!StringUtils.isEmpty(filename)) {
                 if (!scriptFile.isFile()) {
                     throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
-                            + "' is not a file for element: " + getName());
+                            + "' is not a file for JSR223 element named: " + getName());
                 }
                 if (!scriptFile.canRead()) {
                     throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
-                            + "' is not readable for element:" + getName());
+                            + "' is not readable for JSR223 element named: " + getName());
                 }
                 if (!supportsCompilable) {
                     try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) {
@@ -232,7 +232,7 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
                     return scriptEngine.eval(script, bindings);
                 }
             } else {
-                throw new ScriptException("Both script file and script text are empty for element:" + getName());
+                throw new ScriptException("Both script file and script text are empty for JSR223 element named: " + getName());
             }
         } catch (ScriptException ex) {
             Throwable rootCause = ex.getCause();
@@ -257,11 +257,11 @@ private static <T extends ScriptCacheKey> CompiledScript getCompiledScript(
         } catch (ScriptCompilationInvocationTargetException e) {
             Throwable cause = e.getCause();
             if (cause instanceof IOException) {
-                cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey));
+                cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey));
                 throw (IOException) cause;
             }
             if (cause instanceof ScriptException) {
-                cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey));
+                cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey));
                 throw (ScriptException) cause;
             }
             throw e;
@@ -287,7 +287,7 @@ public boolean compile()
                 ((Compilable) scriptEngine).compile(getScript());
                 return true;
             } catch (ScriptException e) { // NOSONAR
-                logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage());
+                logger.error("Error compiling script for JSR223 element named: '{}', error: {}", getName(), e.getMessage());
                 return false;
             }
         } else {
@@ -297,7 +297,7 @@ public boolean compile()
                     ((Compilable) scriptEngine).compile(fileReader);
                     return true;
                 } catch (ScriptException e) { // NOSONAR
-                    logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage());
+                    logger.error("Error compiling script for JSR223 element named: '{}', error: {}", getName(), e.getMessage());
                     return false;
                 }
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
index 23612d0eb23..aad80d35f42 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
@@ -130,7 +130,7 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
             }
         } catch (Exception ex) // Mainly for bsh.EvalError
         {
-            log.warn("Error running groovy script", ex);
+            log.warn("Error running Groovy script in element named: {}", currentSampler.getName(), ex);
         }
         log.debug("__groovy({},{})={}",script, varName, resultStr);
         return resultStr;
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
index 22ffd43dee1..b8a540c9599 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
@@ -74,7 +74,7 @@ public SampleResult sample(Entry entry) {
                 result.setResponseData(ret.toString(), null);
             }
         } catch (IOException | ScriptException e) {
-            log.error("Problem in JSR223 script {}, message: {}", getName(), e, e);
+            log.error("Problem in JSR223 element named: '{}'", getName(), e);
             result.setSuccessful(false);
             result.setResponseCode("500"); // $NON-NLS-1$
             result.setResponseMessage(e.toString());

From cc9ba1f2406ad3883a7a60717a43bacd65196a98 Mon Sep 17 00:00:00 2001
From: KingRabbid <13966341+KingRabbid@users.noreply.github.com>
Date: Mon, 6 Oct 2025 23:42:45 +0300
Subject: [PATCH 0829/1037] Another set

---
 .../main/java/org/apache/jmeter/visualizers/BSFListener.java    | 2 +-
 .../java/org/apache/jmeter/visualizers/BeanShellListener.java   | 2 +-
 .../src/main/java/org/apache/jmeter/functions/Groovy.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
index cbdbabc31d9..09bfb20d919 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java
@@ -52,7 +52,7 @@ public void sampleOccurred(SampleEvent event) {
             processFileOrScript(mgr);
         } catch (BSFException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BSF script. {}", e.toString());
+                log.warn("Problem in BSF element named: '{}'", getName(), e);
             }
         } finally {
             if (mgr != null) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
index 8cbe234697e..920af76185c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java
@@ -66,7 +66,7 @@ public void sampleOccurred(SampleEvent se) {
             processFileOrScript(bshInterpreter);
         } catch (JMeterException e) {
             if (log.isWarnEnabled()) {
-                log.warn("Problem in BeanShell script. {}", e.toString());
+                log.warn("Problem in BeanShell element named: '{}'", getName(), e);
             }
         }
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
index aad80d35f42..7b1087ced9f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
@@ -130,7 +130,7 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
             }
         } catch (Exception ex) // Mainly for bsh.EvalError
         {
-            log.warn("Error running Groovy script in element named: {}", currentSampler.getName(), ex);
+            log.warn("Error running Groovy script in element named: '{}'", currentSampler.getName(), ex);
         }
         log.debug("__groovy({},{})={}",script, varName, resultStr);
         return resultStr;

From 71559972dca5c7f23dafe884eb9fd386028c54f8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 8 Oct 2025 12:48:17 +0000
Subject: [PATCH 0830/1037] chore(config): migrate config renovate.json

---
 renovate.json | 160 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 108 insertions(+), 52 deletions(-)

diff --git a/renovate.json b/renovate.json
index dd41f3bdbf4..10778e9bd8a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,121 +1,177 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
+  ],
+  "labels": [
+    "dependencies"
+  ],
+  "schedule": [
+    "every 3 weeks on Monday"
   ],
-  "labels": ["dependencies"],
-  "schedule": ["every 3 weeks on Monday"],
   "packageRules": [
     {
-      "matchPackagePrefixes": ["com.fasterxml.jackson.core"],
-      "groupName": "com.fasterxml.jackson.core"
+      "groupName": "com.fasterxml.jackson.core",
+      "matchPackageNames": [
+        "com.fasterxml.jackson.core{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.github.ben-manes.caffeine"],
       "description": "TODO: Caffeine 3.0 requires Java 11",
-      "allowedVersions": "< 3.0"
+      "allowedVersions": "< 3.0",
+      "matchPackageNames": [
+        "com.github.ben-manes.caffeine{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.github.vlsi"],
-      "groupName": "com.github.vlsi"
+      "groupName": "com.github.vlsi",
+      "matchPackageNames": [
+        "com.github.vlsi{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.github.weisj"],
-      "groupName": "com.github.weisj"
+      "groupName": "com.github.weisj",
+      "matchPackageNames": [
+        "com.github.weisj{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.google.auto.service"],
-      "groupName": "com.google.auto.service"
+      "groupName": "com.google.auto.service",
+      "matchPackageNames": [
+        "com.google.auto.service{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.google.errorprone", "net.ltgt.errorprone"],
-      "groupName": "com.google.errorprone"
+      "groupName": "com.google.errorprone",
+      "matchPackageNames": [
+        "com.google.errorprone{/,}**",
+        "net.ltgt.errorprone{/,}**"
+      ]
     },
     {
-      "matchPackageNames": ["com.google.guava:guava"],
+      "matchPackageNames": [
+        "com.google.guava:guava"
+      ],
       "groupName": "guava",
       "matchCurrentVersion": "0",
       "enabled": false
     },
     {
-      "matchPackagePrefixes": ["com.helger"],
-      "groupName": "com.helger"
+      "groupName": "com.helger",
+      "matchPackageNames": [
+        "com.helger{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["io.burt"],
-      "groupName": "io.burt"
+      "groupName": "io.burt",
+      "matchPackageNames": [
+        "io.burt{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["net.minidev:accessors-smart", "net.minidev:json-smart"],
-      "groupName": "net.minidev json-smart"
+      "groupName": "net.minidev json-smart",
+      "matchPackageNames": [
+        "net.minidev:accessors-smart{/,}**",
+        "net.minidev:json-smart{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["com.miglayout"],
       "groupName": "com.miglayout",
-      "allowedVersions": "< 11.0"
+      "allowedVersions": "< 11.0",
+      "matchPackageNames": [
+        "com.miglayout{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.ajoberstar.grgit"],
       "groupName": "org.ajoberstar.grgit",
       "description": "TODO: grgit 5.0 requires Java 11",
-      "allowedVersions": "< 5.0"
+      "allowedVersions": "< 5.0",
+      "matchPackageNames": [
+        "org.ajoberstar.grgit{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.activemq"],
       "groupName": "org.apache.activemq",
       "description": "TODO: activemq 5.17.0 requires Java 11",
-      "allowedVersions": "< 5.17.0"
+      "allowedVersions": "< 5.17.0",
+      "matchPackageNames": [
+        "org.apache.activemq{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.ftpserver"],
-      "groupName": "org.apache.ftpserver"
+      "groupName": "org.apache.ftpserver",
+      "matchPackageNames": [
+        "org.apache.ftpserver{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.httpcomponents:"],
-      "groupName": "org.apache.httpcomponents4"
+      "groupName": "org.apache.httpcomponents4",
+      "matchPackageNames": [
+        "org.apache.httpcomponents:{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.httpcomponents.client5:"],
-      "groupName": "org.apache.httpcomponents5"
+      "groupName": "org.apache.httpcomponents5",
+      "matchPackageNames": [
+        "org.apache.httpcomponents.client5:{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.logging.log4j"],
-      "groupName": "org.apache.logging.log4j"
+      "groupName": "org.apache.logging.log4j",
+      "matchPackageNames": [
+        "org.apache.logging.log4j{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.apache.tika"],
-      "groupName": "org.apache.tika"
+      "groupName": "org.apache.tika",
+      "matchPackageNames": [
+        "org.apache.tika{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.checkerframework"],
-      "groupName": "org.checkerframework"
+      "groupName": "org.checkerframework",
+      "matchPackageNames": [
+        "org.checkerframework{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.eclipse.jgit"],
       "groupName": "org.eclipse.jgit",
       "description": "TODO: jgit 6.0 requires Java 11",
-      "allowedVersions": "< 6.0"
+      "allowedVersions": "< 6.0",
+      "matchPackageNames": [
+        "org.eclipse.jgit{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.jetbrains.lets-plot"],
-      "groupName": "org.jetbrains.lets-plot"
+      "groupName": "org.jetbrains.lets-plot",
+      "matchPackageNames": [
+        "org.jetbrains.lets-plot{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.jodd"],
-      "groupName": "org.jodd"
+      "groupName": "org.jodd",
+      "matchPackageNames": [
+        "org.jodd{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.openjdk.jmh"],
-      "groupName": "org.openjdk.jmh"
+      "groupName": "org.openjdk.jmh",
+      "matchPackageNames": [
+        "org.openjdk.jmh{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["org.slf4j"],
       "groupName": "org.slf4j",
-      "allowedVersions": "< 2.0.0"
+      "allowedVersions": "< 2.0.0",
+      "matchPackageNames": [
+        "org.slf4j{/,}**"
+      ]
     },
     {
-      "matchPackagePatterns": ["^src:protocol"],
-      "enabled": false
+      "enabled": false,
+      "matchPackageNames": [
+        "/^src:protocol/"
+      ]
     }
   ]
 }

From 17b24b4e2d29a7f318fa91b7cede4b86ab6885fb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 8 Oct 2025 21:48:53 +0300
Subject: [PATCH 0831/1037] chore: suppress checkstyle warnings for text blocks
 with long strings

We can't make those strings shorter, and we can't wrap them.
---
 config/checkstyle/checkstyle.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index e54989ba38a..a4c84bd516a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -73,6 +73,13 @@
     <property name="max" value="160"/>
     <property name="fileExtensions" value="java, kt, kts, groovy"/>
   </module>
+  <!-- See https://checkstyle.sourceforge.io/checks/sizes/linelength.html#Example6-config -->
+  <!-- See https://github.com/checkstyle/checkstyle/issues/17707 -->
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="checkFormat" value="LineLength"/>
+    <property name="offCommentFormat" value='^.*"""$'/>
+    <property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
+  </module>
 
   <module name="TreeWalker">
 

From a9c12cf6e960e45c9b1d300a7cf89dbaa5e31233 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 8 Oct 2025 13:21:36 +0000
Subject: [PATCH 0832/1037] fix(deps): update dependency checkstyle to v11

---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts           | 2 +-
 gradle/verification-metadata.xml                                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index d101203b262..a4e03b9bed8 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -35,7 +35,7 @@ checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "10.26.1"
+    toolVersion = "11.1.0"
     configProperties = mapOf(
         "cache_file" to layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d4a14de579f..ab1434fbacd 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -196,6 +196,7 @@
             <trusting group="com.google.guava"/>
             <trusting group="com.google.j2objc"/>
          </trusted-key>
+         <trusted-key id="C3259D20DAEC4ACE6D57CC83340B090F727518D8" group="com.google.j2objc" name="j2objc-annotations" version="3.1"/>
          <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
          <trusted-key id="C758F9CC982AC877E7B295DD6E97418B04B11DCB" group="org.apache.xbean"/>
          <trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7">

From 75fe23d1aa1fa7ef2ae61a0b147a92bf923d624d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 9 Oct 2025 21:27:26 +0300
Subject: [PATCH 0833/1037] chore: add errorprone rule to enforce braces for
 control flow

See https://errorprone.info/bugpattern/MissingBraces
See https://google.github.io/styleguide/javaguide.html#s4.1.1-braces-always-used
---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 740919157a4..94d7249a2ed 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -47,6 +47,7 @@ if (buildParameters.enableErrorprone) {
                 disableWarningsInGeneratedCode.set(true)
                 enable(
                     "MissingDefault",
+                    "MissingBraces",
                     "PackageLocation",
                     "RedundantOverride",
                     "StronglyTypeTime",

From 0dea9e0373a61d98741b09b4ca55f677aaf953c9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 18:48:09 +0000
Subject: [PATCH 0834/1037] chore(deps): update actions/github-script digest to
 f28e40c

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 380b2e88c07..c54f6364cda 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -22,7 +22,7 @@ jobs:
       contents: write
     steps:
       - name: Get the current version
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         id: current_version
         with:
           # language=javascript

From c660671f35d136f2bff4860ec20eb42669d3ad15 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 9 Oct 2025 21:59:12 +0300
Subject: [PATCH 0835/1037] chore: add missing verification metadata

---
 gradle/verification-keyring.keys | 15 +++++++++++++++
 gradle/verification-metadata.xml | 10 ++++++++++
 2 files changed, 25 insertions(+)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index e38624dc127..4a38743b362 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -5227,6 +5227,21 @@ F8GKAJ4wlBaXv5JsdMMyJvQc+xtjXg7OVA==
 =AG3B
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    340B090F727518D8
+uid    Thomas Ball <tball@google.com>
+
+sub    6EAC8515E0EBB87E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaJzwtxYJKwYBBAHaRw8BAQdAmw8gRfE8mqvum1kG2Zlm6t46bkXFvJIHRVBZ
+OctVLVe0HlRob21hcyBCYWxsIDx0YmFsbEBnb29nbGUuY29tPrg4BGic8LcSCisG
+AQQBl1UBBQEBB0A+DJUNDeULyBrFpk3P07SXnEAch7KoDYah6j0PxgnNQgMBCAeI
+fgQYFgoAJhYhBMMlnSDa7ErObVfMgzQLCQ9ydRjYBQJonPC3AhsMBQkFo5qAAAoJ
+EDQLCQ9ydRjY3/MA/38kMom8Qy8gO3AH31GqVqguYruG848SaIJugavlTT4sAP9D
+EfbsFU4kymcgABRT9CyDsNAmI/lxRNEB+pxiNp1/DA==
+=GoMW
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    3449EC3AC2EFE8AA
 uid    Ingo Bauersachs <ingo@jitsi.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ab1434fbacd..38ea4794e21 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -449,6 +449,11 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="18">
+         <artifact name="apache-18.pom">
+            <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -584,6 +589,11 @@
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="oro" name="oro" version="2.0.8">
          <artifact name="oro-2.0.8.jar">
             <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 34b6eceefd5d4e40b4cdeb1261637c0f7c066d1e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 19:05:19 +0000
Subject: [PATCH 0836/1037] chore(deps): update oracle-actions/setup-java
 action to v1.5.0

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7cbf9111e82..0587359905a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
       if: ${{ matrix.oracle_java_website != '' }}
-      uses: oracle-actions/setup-java@b1546e588c27008e88bfcabda44d11c22316b9b8 # v1.4.2
+      uses: oracle-actions/setup-java@fff43251af9936a0e6a4d5d0946e14f1680e9b6b # v1.5.0
       with:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}

From c720992c79962212f8182ea9f3cae7eae6c6e190 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 7 Jul 2025 17:11:44 +0000
Subject: [PATCH 0837/1037] fix(deps): update dependency jacoco to v0.8.13

---
 .../verification/src/main/kotlin/build-logic.jacoco.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
index 8fb628da79b..ace4c95cd48 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.13"
     providers.gradleProperty("jacoco.version")
         .takeIf { it.isPresent }
         ?.let { toolVersion = it.get() }

From 1f171ce5c48f709212c2ecba9c84209f8ed8bcca Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 20:00:40 +0000
Subject: [PATCH 0838/1037] chore(deps): update actions/setup-java action to v5

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0587359905a..719e629094a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,7 +53,7 @@ jobs:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}
     - name: Set up Java 17 and ${{ matrix.non_ea_java_version }}, ${{ matrix.java_distribution }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         # The latest one will be the default, so we use Java 17 for launching Gradle
         java-version: |
@@ -94,7 +94,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'zulu'

From fd4a2619f18ffe9d6048d25d58b09a0e14f37c9d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 20:00:33 +0000
Subject: [PATCH 0839/1037] chore(deps): update actions/checkout action to v5

---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/main.yml                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b1889d479d8..5d924bd25c5 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: gradle/wrapper-validation-action@v3
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 719e629094a..1bc0ce72f53 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
       # Number of jobs to generate in matrix.js
       MATRIX_JOBS: 4
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - id: set-matrix
         run: |
           node .github/workflows/matrix.js
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       # max-parallel: 4
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
@@ -92,7 +92,7 @@ jobs:
     name: 'Error Prone (JDK 17)'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: 'Set up JDK 17'
       uses: actions/setup-java@v5
       with:

From 20711fa71f32045972829f61a9940e82d4306901 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 20:00:37 +0000
Subject: [PATCH 0840/1037] chore(deps): update actions/github-script action to
 v8

---
 .github/workflows/main.yml            | 2 +-
 .github/workflows/release-drafter.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1bc0ce72f53..c47b1883e69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,7 +62,7 @@ jobs:
         distribution: ${{ matrix.java_distribution }}
         architecture: x64
     - name: Steps to reproduce
-      uses: actions/github-script@v7
+      uses: actions/github-script@v8
       with:
         script: |
           console.log('The following command might help reproducing CI results, use Java ${{ matrix.java_version }}')
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index c54f6364cda..184141092f4 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -22,7 +22,7 @@ jobs:
       contents: write
     steps:
       - name: Get the current version
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         id: current_version
         with:
           # language=javascript

From e6107dacd27f6f5616e16c2435adb74d876c5305 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 7 Jul 2025 00:54:31 +0000
Subject: [PATCH 0841/1037] fix(deps): update dependency
 org.apache.commons:commons-collections4 to v4.5.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6d54246c2b1..b6616c8d27f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -92,7 +92,7 @@ dependencies {
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.6")
         api("org.apache-extras.beanshell:bsh:2.0b6")
-        api("org.apache.commons:commons-collections4:4.4")
+        api("org.apache.commons:commons-collections4:4.5.0")
         api("org.apache.commons:commons-dbcp2:2.9.0")
         api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")

From 61a24e171422232afcb0f0b03ff3b70f60f67b69 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 16 Jun 2025 03:10:12 +0000
Subject: [PATCH 0842/1037] fix(deps): update dependency
 org.apache.commons:commons-pool2 to v2.12.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b6616c8d27f..c5244e4d795 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -98,7 +98,7 @@ dependencies {
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.14.0")
         api("org.apache.commons:commons-math3:3.6.1")
-        api("org.apache.commons:commons-pool2:2.12.0")
+        api("org.apache.commons:commons-pool2:2.12.1")
         api("org.apache.commons:commons-text:1.11.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.3")

From b5c96a8a3a1d91544e47550afc4049474108c8a7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Oct 2025 09:49:26 +0300
Subject: [PATCH 0843/1037] fix(deps): update dependency org.junit:junit-bom to
 v5.14.0

---
 .../jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts      | 2 ++
 src/bom-testing/build.gradle.kts                                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index fc83cd6e117..2434b0123a3 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -25,6 +25,8 @@ plugins {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.hamcrest:hamcrest")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 plugins.withId("java-test-fixtures") {
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 21330035d81..4301a662c6a 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.junit:junit-bom:5.10.1"))
+    api(platform("org.junit:junit-bom:5.14.0"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From b36213767d69b63453c1768302a122d19b50b517 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Oct 2025 16:02:11 +0300
Subject: [PATCH 0844/1037] chore: replace all commons-lang3 usages with core
 Java, drop commons-lang3 dependency

commons-lang3 is a heavy, and it is not modular, so a CVE in one of its classes
would affect JMeter even if we do not use that.

At the same time both modern Java and Kotlin are much better when
10 years ago.
---
 src/bom-thirdparty/build.gradle.kts           |   4 +-
 src/components/build.gradle.kts               |   1 -
 .../jmeter/assertions/HTMLAssertion.java      |   6 +-
 .../jmeter/assertions/ResponseAssertion.java  |   8 +-
 .../jmeter/assertions/SMIMEAssertion.java     |   6 +-
 .../jmeter/assertions/XMLSchemaAssertion.java |   3 +-
 .../jmeter/assertions/XPath2Assertion.java    |   4 +-
 .../jmeter/assertions/XPathAssertion.java     |   4 +-
 .../assertions/gui/MD5HexAssertionGUI.java    |   3 +-
 .../org/apache/jmeter/config/CSVDataSet.java  |   4 +-
 .../jmeter/config/CSVDataSetBeanInfo.java     |   3 +-
 .../apache/jmeter/config/KeystoreConfig.java  |   8 +-
 .../jmeter/config/RandomVariableConfig.java   |  17 +-
 .../control/CriticalSectionController.java    |   7 +-
 .../jmeter/control/IncludeController.java     |   3 +-
 .../jmeter/control/SwitchController.java      |   6 +-
 .../jmeter/extractor/BoundaryExtractor.java   |  14 +-
 .../jmeter/extractor/HtmlExtractor.java       |   4 +-
 .../jmeter/extractor/JSoupExtractor.java      |   4 +-
 .../jmeter/extractor/JoddExtractor.java       |   4 +-
 .../json/jmespath/JMESPathExtractor.java      |   9 +-
 .../json/jsonpath/JSONPostProcessor.java      |   7 +-
 .../render/AbstractRenderAsJsonRenderer.java  |   3 +-
 .../jmeter/modifiers/CounterConfig.java       |   3 +-
 .../apache/jmeter/reporters/MailerModel.java  |   6 +-
 .../org/apache/jmeter/sampler/TestAction.java |   4 +-
 .../RenderAsBoundaryExtractor.java            |   6 +-
 .../jmeter/visualizers/RenderAsCssJQuery.java |   6 +-
 .../jmeter/visualizers/RenderAsJSON.java      |   7 +-
 .../jmeter/visualizers/RenderAsRegexp.java    |   6 +-
 .../jmeter/visualizers/RenderAsXPath.java     |   8 +-
 .../jmeter/visualizers/RenderAsXPath2.java    |   8 +-
 .../jmeter/visualizers/RequestViewRaw.java    |   5 +-
 .../visualizers/RespTimeGraphVisualizer.java  |   6 +-
 .../jmeter/visualizers/SearchTreePanel.java   |   4 +-
 .../visualizers/StatGraphVisualizer.java      |   3 +-
 .../ViewResultsFullVisualizer.java            |   9 +-
 .../XMLDefaultMutableTreeNode.java            |   7 +-
 .../backend/BackendListenerGui.java           |   4 +-
 .../visualizers/backend/ErrorMetric.java      |   9 +-
 .../AbstractGraphiteMetricsSender.java        |   5 +-
 .../GraphiteBackendListenerClient.java        |   4 +-
 .../backend/influxdb/HttpMetricsSender.java   |   4 +-
 .../InfluxDBRawBackendListenerClient.java     |  26 ++-
 .../InfluxdbBackendListenerClient.java        |  10 +-
 .../jmeter/extractor/TestXPathExtractor.java  |   5 +-
 .../main/java/org/apache/jmeter/JMeter.java   |   7 +-
 .../org/apache/jmeter/config/Argument.java    |   9 +-
 .../jmeter/config/gui/ArgumentsPanel.java     |   4 +-
 .../jmeter/engine/util/CompoundVariable.java  |   3 +-
 .../util/ReplaceFunctionsWithStrings.java     |   6 +-
 .../engine/util/UndoVariableReplacement.java  |   4 +-
 .../jmeter/functions/AbstractFunction.java    |   4 +-
 .../jmeter/functions/gui/FunctionHelper.java  |   5 +-
 .../gui/AbstractJMeterGuiComponent.java       |   7 +-
 .../apache/jmeter/gui/JMeterGUIComponent.java |   7 +-
 .../java/org/apache/jmeter/gui/MainFrame.java |   8 +-
 .../jmeter/gui/action/ChangeParent.java       |   4 +-
 .../jmeter/gui/action/RawTextSearcher.java    |   8 +-
 .../jmeter/gui/action/RegexpSearcher.java     |   4 +-
 .../org/apache/jmeter/gui/action/Restart.java |   4 +-
 .../jmeter/gui/action/SchematicView.java      |   4 +-
 .../jmeter/gui/action/SearchTreeDialog.java   |  57 +++---
 .../gui/action/template/TemplateManager.java  |   4 +-
 .../gui/logging/GuiLogEventAppender.java      |   3 +-
 .../jmeter/gui/tree/JMeterCellRenderer.java   |   7 +-
 .../apache/jmeter/gui/util/FileDialoger.java  |   4 +-
 .../apache/jmeter/gui/util/JMeterToolBar.java |   5 +-
 .../config/ReportGeneratorConfiguration.java  |  13 +-
 .../jmeter/report/core/CsvSampleReader.java   |  12 +-
 .../jmeter/report/core/CsvSampleWriter.java   |  12 +-
 .../apache/jmeter/report/core/JsonUtil.java   |   6 +-
 .../org/apache/jmeter/report/core/Sample.java |   3 +-
 .../jmeter/report/core/SampleMetadata.java    |   3 +-
 .../dashboard/AbstractDataExporter.java       |   3 +-
 .../dashboard/HtmlTemplateExporter.java       |   8 +-
 .../jmeter/report/dashboard/JsonExporter.java |   4 +-
 .../processor/ApdexSummaryConsumer.java       |   4 +-
 .../report/processor/CsvFileSampleSource.java |   5 +-
 .../processor/ErrorsSummaryConsumer.java      |  10 +-
 .../processor/ExternalSampleSorter.java       |   6 +-
 .../graph/AbstractSeriesSelector.java         |   5 +-
 .../graph/impl/CustomGraphConsumer.java       |   4 +-
 .../jmeter/report/utils/MetricUtils.java      |   4 +-
 .../jmeter/reporters/ResultCollector.java     |   3 +-
 .../java/org/apache/jmeter/rmi/RmiUtils.java  |  13 +-
 .../apache/jmeter/samplers/SampleResult.java  |   3 +-
 .../samplers/SampleSaveConfiguration.java     |  24 +--
 .../apache/jmeter/save/CSVSaveService.java    |  34 +++-
 .../org/apache/jmeter/save/SaveService.java   |  11 +-
 .../TestResultWrapperConverter.java           |   3 +-
 .../apache/jmeter/services/FileServer.java    |   8 +-
 .../testbeans/gui/ComboStringEditor.java      |   3 +-
 .../gui/GenericTestBeanCustomizer.java        |  40 +++-
 .../jmeter/testbeans/gui/TableEditor.java     |   4 +-
 .../apache/jmeter/testelement/TestPlan.java   |   3 +-
 .../property/AbstractProperty.java            |  11 +-
 .../jmeter/util/BeanShellInterpreter.java     |   4 +-
 .../org/apache/jmeter/util/JMeterUtils.java   |  12 +-
 .../apache/jmeter/util/JSR223TestElement.java |  10 +-
 .../util/PropertiesBasedPrefixResolver.java   |   4 +-
 .../apache/jmeter/util/StringUtilities.java   |  19 +-
 .../jmeter/util/XPathQueryCacheLoader.java    |  10 +-
 .../org/apache/jmeter/util/XPathUtil.java     |  20 +-
 .../jmeter/util/keystore/JmeterKeyStore.java  |  11 +-
 .../samplers/TestSampleSaveConfiguration.java |   1 -
 .../jmeter/util/JSR223TestElementTest.java    |   9 +-
 .../jmeter/util/StringUtilitiesTest.java      |   9 +-
 src/dist-check/build.gradle.kts               |   3 -
 .../ComponentReferenceFunctionTest.java       |   4 +-
 .../org/apache/jmeter/junit/JMeterTest.java   |  10 +-
 src/functions/build.gradle.kts                |   3 -
 .../apache/jmeter/functions/ChangeCase.java   |  14 +-
 .../functions/DateTimeConvertFunction.java    |   3 +-
 .../functions/DigestEncodeFunction.java       |   4 +-
 .../jmeter/functions/FileRowColContainer.java |   3 +-
 .../org/apache/jmeter/functions/Groovy.java   |   4 +-
 .../org/apache/jmeter/functions/LongSum.java  |   3 +-
 .../apache/jmeter/functions/RandomDate.java   |   6 +-
 .../functions/RandomFromMultipleVars.java     |   8 +-
 .../apache/jmeter/functions/RandomString.java |   6 +-
 .../jmeter/functions/RegexFunction.java       |   3 +-
 .../jmeter/functions/StringFromFile.java      |   2 +-
 .../apache/jmeter/functions/StringToFile.java |   4 +-
 .../apache/jmeter/functions/TimeShift.java    |  10 +-
 src/jorphan/build.gradle.kts                  |   1 -
 .../org/apache/jorphan/exec/KeyToolUtils.java |  11 +-
 .../apache/jorphan/exec/SystemCommand.java    |   5 +-
 .../apache/jorphan/gui/ObjectTableSorter.java |   5 +-
 .../apache/jorphan/math/StatCalculator.java   |  23 ++-
 .../apache/jorphan/reflect/ClassTools.java    |   7 +-
 .../org/apache/jorphan/util/BooleanUtils.java |  60 ++++++
 .../org/apache/jorphan/util/CharUtils.java    |  33 ++++
 .../apache/jorphan/util/ExceptionUtils.java   |  78 ++++++++
 .../org/apache/jorphan/util/JOrphanUtils.java |  21 +-
 .../apache/jorphan/util/StringUtilities.java  | 180 +++++++++++++++++-
 .../apache/jorphan/util/TestJorphanUtils.java |   2 +
 .../apache/jorphan/util/BooleanUtilsTest.kt   |  62 ++++++
 .../java/org/apache/jmeter/NewDriver.java     |   2 +-
 src/protocol/bolt/build.gradle.kts            |   1 -
 .../bolt/sampler/AbstractBoltTestElement.java |  10 +-
 .../protocol/bolt/sampler/BoltSampler.java    |   7 +-
 src/protocol/ftp/build.gradle.kts             |   3 -
 .../protocol/ftp/sampler/FTPSampler.java      |   4 +-
 src/protocol/http/build.gradle.kts            |   3 -
 .../http/config/MultipartUrlConfig.java       |   6 +-
 .../http/config/gui/GraphQLUrlConfigGui.java  |  16 +-
 .../http/config/gui/HttpDefaultsGui.java      |   5 +-
 .../http/config/gui/UrlConfigGui.java         |   5 +-
 .../protocol/http/control/AuthManager.java    |   4 +-
 .../protocol/http/control/CacheManager.java   |  26 ++-
 .../protocol/http/control/CookieManager.java  |   3 +-
 .../protocol/http/control/HeaderManager.java  |   3 +-
 .../http/control/HttpMirrorServer.java        |   4 +-
 .../http/control/gui/HttpTestSampleGui.java   |   8 +-
 .../protocol/http/curl/ArgumentHolder.java    |   8 +-
 .../protocol/http/curl/BasicCurlParser.java   |  28 +--
 .../http/curl/FileArgumentHolder.java         |   5 +-
 .../http/curl/StringArgumentHolder.java       |   6 +-
 .../protocol/http/gui/HTTPArgumentsPanel.java |   8 +-
 .../protocol/http/gui/HTTPFileArgsPanel.java  |   4 +-
 .../gui/action/ParseCurlCommandAction.java    |  18 +-
 .../http/modifier/RegExUserParameters.java    |   3 +-
 .../http/modifier/URLRewritingModifier.java   |   3 +-
 .../protocol/http/parser/CssParser.java       |  44 +++--
 .../http/parser/CssParserCacheLoader.java     |  15 +-
 .../protocol/http/parser/HTMLParser.java      |   6 +-
 .../http/parser/HtmlParsingUtils.java         |   7 +-
 .../protocol/http/parser/JTidyHTMLParser.java |  10 +-
 .../http/parser/JsoupBasedHtmlParser.java     |  12 +-
 .../http/parser/LagartoBasedHtmlParser.java   |  14 +-
 .../protocol/http/parser/URLCollection.java   |   3 +-
 .../http/proxy/DefaultSamplerCreator.java     |   4 +-
 .../http/proxy/FormCharSetFinder.java         |   4 +-
 .../protocol/http/proxy/HttpRequestHdr.java   |   4 +-
 .../jmeter/protocol/http/proxy/Proxy.java     |   9 +-
 .../protocol/http/proxy/ProxyControl.java     |  21 +-
 .../http/proxy/gui/ProxyControlGui.java       |  26 +--
 .../http/sampler/AccessLogSampler.java        |  16 +-
 .../http/sampler/HTTPAbstractImpl.java        |   2 +-
 .../protocol/http/sampler/HTTPHC4Impl.java    |  99 +++++-----
 .../http/sampler/HTTPHCAbstractImpl.java      |   9 +-
 .../protocol/http/sampler/HTTPJavaImpl.java   |   2 +-
 .../http/sampler/HTTPSampleResult.java        |   3 +-
 .../http/sampler/HTTPSamplerBase.java         |  30 +--
 .../http/sampler/HTTPSamplerFactory.java      |   6 +-
 .../protocol/http/sampler/PostWriter.java     |   7 +-
 .../protocol/http/sampler/PutWriter.java      |   3 +-
 .../protocol/http/util/ConversionUtils.java   |   6 +-
 .../http/util/GraphQLRequestParamUtils.java   |  39 ++--
 .../protocol/http/util/HTTPArgument.java      |   3 +-
 .../protocol/http/util/HTTPFileArg.java       |   6 +-
 .../http/visualizers/RequestViewHTTP.java     |  12 +-
 .../jmeter/protocol/http/HttpClientState.kt   |  29 +++
 .../jmeter/curl/BasicCurlParserTest.java      |  47 ++---
 .../http/parser/NotReusableParser.java        |   4 +-
 .../protocol/http/parser/ReusableParser.java  |   4 +-
 .../protocol/http/parser/TestHTMLParser.java  |   3 +-
 .../http/proxy/TestHttpRequestHdr.java        |   5 +-
 ...stHTTPSamplersAgainstHttpMirrorServer.java |  15 +-
 .../util/TestGraphQLRequestParamUtils.java    |   3 +-
 .../http/visualizers/RequestViewHTTPTest.java |  24 +--
 src/protocol/java/build.gradle.kts            |   3 -
 .../java/config/gui/JavaConfigGui.java        |   6 +-
 .../jmeter/protocol/java/test/JavaTest.java   |   5 +-
 src/protocol/jdbc/build.gradle.kts            |   3 -
 .../jdbc/AbstractJDBCTestElement.java         |   8 +-
 .../jdbc/config/DataSourceElement.java        |  13 +-
 .../config/DataSourceElementBeanInfo.java     |   4 +-
 .../jdbc/processor/AbstractJDBCProcessor.java |   4 +-
 .../protocol/jdbc/sampler/JDBCSampler.java    |   8 +-
 src/protocol/jms/build.gradle.kts             |   3 -
 .../jms/client/InitialContextFactory.java     |   6 +-
 .../jms/client/ReceiveSubscriber.java         |  20 +-
 .../protocol/jms/sampler/BaseJMSSampler.java  |   4 +-
 .../protocol/jms/sampler/JMSSampler.java      |  10 +-
 .../jms/sampler/PublisherSampler.java         |   7 +-
 .../jmeter/protocol/jms/sampler/Receiver.java |   4 +-
 .../jms/sampler/SubscriberSampler.java        |   4 +-
 src/protocol/junit/build.gradle.kts           |   3 -
 .../java/control/gui/ClassFilter.java         |   5 +-
 .../protocol/java/sampler/JUnitSampler.java   |   3 +-
 src/protocol/ldap/build.gradle.kts            |   3 -
 .../protocol/ldap/sampler/LDAPExtSampler.java |   3 +-
 src/protocol/mail/build.gradle.kts            |   3 -
 .../protocol/smtp/sampler/SmtpSampler.java    |  24 ++-
 .../sampler/protocol/SendMailCommand.java     |   7 +-
 src/protocol/mongodb/build.gradle.kts         |   3 -
 .../protocol/mongodb/mongo/MongoDB.java       |   3 +-
 .../protocol/mongodb/mongo/MongoUtils.java    |   9 +-
 src/protocol/native/build.gradle.kts          |   4 -
 .../jmeter/protocol/system/SystemSampler.java |   7 +-
 .../protocol/system/gui/SystemSamplerGui.java |  14 +-
 src/protocol/tcp/build.gradle.kts             |   3 -
 .../protocol/tcp/sampler/TCPClientImpl.java   |   4 +-
 .../protocol/tcp/sampler/TCPSampler.java      |   6 +-
 236 files changed, 1455 insertions(+), 914 deletions(-)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/util/CharUtils.java
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/util/ExceptionUtils.java
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/util/BooleanUtilsTest.kt
 create mode 100644 src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/HttpClientState.kt

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c5244e4d795..237ed8b5ec7 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -96,7 +96,9 @@ dependencies {
         api("org.apache.commons:commons-dbcp2:2.9.0")
         api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")
-        api("org.apache.commons:commons-lang3:3.14.0")
+        api("org.apache.commons:commons-lang3:3.14.0") {
+            because("User might still rely on commons-lang3")
+        }
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.12.1")
         api("org.apache.commons:commons-text:1.11.0")
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 10d6b508dda..49631f641c6 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -67,7 +67,6 @@ dependencies {
     implementation("org.apache.httpcomponents:httpasyncclient")
     implementation("org.apache.httpcomponents:httpcore-nio")
     implementation("org.jsoup:jsoup")
-    implementation("org.apache.commons:commons-lang3")
     implementation("net.sf.jtidy:jtidy")
     implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3")
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index a7fbc6fb0e1..b1bcc913818 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -29,13 +29,13 @@
 import java.nio.file.Paths;
 import java.text.MessageFormat;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.tidy.Node;
@@ -192,7 +192,7 @@ private void writeOutput(String inOutput) {
         String filename = getFilename();
 
         // check if filename defined
-        if (StringUtils.isNotBlank(filename)) {
+        if (StringUtilities.isNotBlank(filename)) {
             try (Writer writer = Files.newBufferedWriter(Paths.get(filename))) {
                 // write to file
                 writer.write(inOutput);
@@ -248,7 +248,7 @@ public long getWarningThreshold() {
      *            used
      */
     public void setDoctype(String inDoctype) {
-        if (StringUtils.isAllBlank(inDoctype)) {
+        if (StringUtilities.isBlank(inDoctype)) {
             setProperty(new StringProperty(DOCTYPE_KEY, DEFAULT_DOCTYPE));
         } else {
             setProperty(new StringProperty(DOCTYPE_KEY, inDoctype));
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index a646e6198b0..24e7673045b 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -24,7 +24,6 @@
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.gui.AssertionGui;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedAssertion;
@@ -35,6 +34,7 @@
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.Document;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
@@ -312,7 +312,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
 
         log.debug("Test Type Info: contains={}, notTest={}, orTest={}", contains, notTest, orTest);
 
-        if (StringUtils.isEmpty(toCheck)) {
+        if (StringUtilities.isEmpty(toCheck)) {
             if (notTest) { // Not should always succeed against an empty result
                 return result;
             }
@@ -365,7 +365,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
                         log.debug("Failed: {}", stringPattern);
                         result.setFailure(true);
                         String customMsg = getCustomFailureMessage();
-                        if (StringUtils.isEmpty(customMsg)) {
+                        if (StringUtilities.isEmpty(customMsg)) {
                             result.setFailureMessage(getFailText(stringPattern, toCheck));
                         } else {
                             result.setFailureMessage(customMsg);
@@ -378,7 +378,7 @@ private AssertionResult evaluateResponse(SampleResult response) {
             if (orTest && !hasTrue){
                 result.setFailure(true);
                 String customMsg = getCustomFailureMessage();
-                if (StringUtils.isEmpty(customMsg)) {
+                if (StringUtilities.isEmpty(customMsg)) {
                     result.setFailureMessage(
                             allCheckMessage.stream()
                                     .collect(Collectors.joining("\t", "", "\t")));
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
index 5f6729ba930..5c08bbbe20d 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
@@ -39,7 +39,7 @@
 import javax.mail.internet.MimeMultipart;
 
 import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.bouncycastle.asn1.x500.AttributeTypeAndValue;
 import org.bouncycastle.asn1.x500.RDN;
 import org.bouncycastle.asn1.x500.X500Name;
@@ -279,7 +279,7 @@ private static void checkSubject(SMIMEAssertionTestElement testElement, Assertio
     private static void checkEmail(SMIMEAssertionTestElement testElement, AssertionResult res,
             X509CertificateHolder cert, StringBuilder failureMessage) {
         String email = testElement.getSignerEmail();
-        if (!JOrphanUtils.isBlank(email)) {
+        if (StringUtilities.isNotBlank(email)) {
             List<String> emailFromCert = getEmailFromCert(cert);
             if (!emailFromCert.contains(email)) {
                 res.setFailure(true);
@@ -295,7 +295,7 @@ private static void checkEmail(SMIMEAssertionTestElement testElement, AssertionR
     private static void checkSerial(SMIMEAssertionTestElement testElement, AssertionResult res,
             X509CertificateHolder cert, StringBuilder failureMessage) {
         String serial = testElement.getSignerSerial();
-        if (!JOrphanUtils.isBlank(serial)) {
+        if (StringUtilities.isNotBlank(serial)) {
             BigInteger serialNbr = readSerialNumber(serial);
             if (!serialNbr.equals(cert.getSerialNumber())) {
                 res.setFailure(true);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
index 17b949a204f..204675821b2 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
@@ -28,6 +28,7 @@
 
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.ErrorHandler;
@@ -64,7 +65,7 @@ public AssertionResult getResult(SampleResult response) {
 
         String xsdFileName = getXsdFileName();
         log.debug("xmlString: {}, xsdFileName: {}", resultData, xsdFileName);
-        if (xsdFileName == null || xsdFileName.length() == 0) {
+        if (StringUtilities.isEmpty(xsdFileName)) {
             result.setResultForFailure(FILE_NAME_IS_REQUIRED);
         } else {
             setSchemaResult(result, resultData, xsdFileName);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
index 4a3b0099b50..01bc921e95f 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
@@ -20,12 +20,12 @@
 import java.io.Serializable;
 import java.util.concurrent.CompletionException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedAssertion;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.XPathUtil;
+import org.apache.jorphan.util.StringUtilities;
 
 import net.sf.saxon.s9api.SaxonApiException;
 
@@ -56,7 +56,7 @@ public AssertionResult getResult(SampleResult response) {
         String responseData = null;
         if (isScopeVariable()) {
             String inputString = getThreadContext().getVariables().get(getVariableName());
-            if (!StringUtils.isEmpty(inputString)) {
+            if (StringUtilities.isNotEmpty(inputString)) {
                 responseData = inputString;
             }
         } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java
index 890fa83120e..268fd7a7222 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java
@@ -24,7 +24,6 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedAssertion;
 import org.apache.jmeter.testelement.property.BooleanProperty;
@@ -32,6 +31,7 @@
 import org.apache.jmeter.util.TidyException;
 import org.apache.jmeter.util.XPathUtil;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -80,7 +80,7 @@ public AssertionResult getResult(SampleResult response) {
         try {
             if (isScopeVariable()){
                 String inputString=getThreadContext().getVariables().get(getVariableName());
-                if (!StringUtils.isEmpty(inputString)) {
+                if (StringUtilities.isNotEmpty(inputString)) {
                     responseData = inputString.getBytes(StandardCharsets.UTF_8);
                 }
             } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
index 446907f5c8e..700fb51c86f 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
@@ -29,6 +29,7 @@
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * GUI class supporting the MD5Hex assertion functionality.
@@ -100,7 +101,7 @@ public void modifyTestElement(TestElement element) {
         configureTestElement(element);
         String md5HexString = this.md5HexInput.getText();
         // initialize to empty string, this will fail the assertion
-        if (md5HexString == null || md5HexString.length() == 0) {
+        if (StringUtilities.isEmpty(md5HexString)) {
             md5HexString = "";
         }
         ((MD5HexAssertion) element).setAllowedMD5Hex(md5HexString);
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index 3731fd43753..7e0f66068dc 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.ResourceBundle;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoConfigMerge;
@@ -40,6 +39,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -204,7 +204,7 @@ private void initVars(FileServer server, final JMeterContext context, String del
         String fileName = getFilename().trim();
         setAlias(context, fileName);
         final String names = getVariableNames();
-        if (StringUtils.isEmpty(names)) {
+        if (StringUtilities.isEmpty(names)) {
             String header = server.reserveFile(fileName, getFileEncoding(), alias, true);
             try {
                 vars = CSVSaveService.csvSplitString(header, delim.charAt(0));
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
index ebbc5890a8a..2d3f5aeab03 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
@@ -24,6 +24,7 @@
 import org.apache.jmeter.testbeans.gui.TypeEditor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 public class CSVDataSetBeanInfo extends BeanInfoSupport {
 
@@ -106,7 +107,7 @@ public CSVDataSetBeanInfo() {
     }
 
     public static int getShareModeAsInt(String mode) {
-        if (mode == null || mode.length() == 0){
+        if (StringUtilities.isEmpty(mode)){
             return SHARE_ALL; // default (e.g. if test plan does not have definition)
         }
         for (int i = 0; i < SHARE_TAGS.length; i++) {
diff --git a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
index 899e459c78a..558f0e09f0f 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
@@ -17,13 +17,13 @@
 
 package org.apache.jmeter.config;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.SSLManager;
 import org.apache.jorphan.util.JMeterStopTestException;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,13 +67,13 @@ public void testStarted() {
     @Override
     public void testStarted(String host) {
         String reuseSSLContext = JMeterUtils.getProperty("https.use.cached.ssl.context");
-        if(StringUtils.isEmpty(reuseSSLContext)||"true".equals(reuseSSLContext)) {
+        if (StringUtilities.isEmpty(reuseSSLContext) || "true".equals(reuseSSLContext)) {
             log.warn("https.use.cached.ssl.context property must be set to false to ensure Multiple Certificates are used");
         }
         int startIndexAsInt = JMeterUtils.getPropDefault(KEY_STORE_START_INDEX, 0);
         int endIndexAsInt = JMeterUtils.getPropDefault(KEY_STORE_END_INDEX, -1);
 
-        if(!StringUtils.isEmpty(this.startIndex)) {
+        if(!(this.startIndex == null || this.startIndex.isEmpty())) {
             try {
                 startIndexAsInt = Integer.parseInt(this.startIndex);
             } catch(NumberFormatException e) {
@@ -82,7 +82,7 @@ public void testStarted(String host) {
             }
         }
 
-        if(!StringUtils.isEmpty(this.endIndex)) {
+        if(!(this.endIndex == null || this.endIndex.isEmpty())) {
             try {
                 endIndexAsInt = Integer.parseInt(this.endIndex);
             } catch(NumberFormatException e) {
diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
index 478aae865b5..0f81571dde8 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
@@ -20,7 +20,6 @@
 import java.text.DecimalFormat;
 import java.util.Random;
 
-import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoConfigMerge;
@@ -30,6 +29,7 @@
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,9 +87,18 @@ private Object readResolve(){
      */
     private void init(){
         final String minAsString = getMinimumValue();
-        minimum = NumberUtils.toLong(minAsString);
+        try {
+            minimum = Long.parseLong(minAsString);
+        } catch (NumberFormatException e) {
+            log.warn("Unable to parse minimum value as long: {}", minAsString, e);
+        }
         final String maxAsString = getMaximumValue();
-        long maximum = NumberUtils.toLong(maxAsString);
+        long maximum = 0;
+        try {
+            maximum = Long.parseLong(maxAsString);
+        } catch (NumberFormatException e) {
+            log.warn("Unable to parse maximum value as long: {}", maxAsString, e);
+        }
         long rangeL=maximum-minimum+1; // This can overflow
         if (minimum > maximum){
             log.error("maximum({}) must be >= minimum({})", maxAsString, minAsString);
@@ -130,7 +139,7 @@ public void iterationStart(LoopIterationEvent iterEvent) {
     // Use format to create number; if it fails, use the default
     private String formatNumber(long value){
         String format = getOutputFormat();
-        if (format != null && format.length() > 0) {
+        if (StringUtilities.isNotEmpty(format)) {
             try {
                 DecimalFormat myFormatter = new DecimalFormat(format);
                 return myFormatter.format(value);
diff --git a/src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java b/src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java
index 0cff89c36c0..0c291cfd571 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java
@@ -20,11 +20,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -124,7 +124,8 @@ public String getLockName() {
      */
     @Override
     public Sampler next() {
-        if (StringUtils.isEmpty(getLockName())) {
+        String lockName = getLockName();
+        if (StringUtilities.isEmpty(lockName)) {
             if (log.isWarnEnabled()) {
                 log.warn("Empty lock name in Critical Section Controller: {}", getName());
             }
@@ -140,7 +141,7 @@ public Sampler next() {
             long endTime = System.currentTimeMillis();
             if (log.isDebugEnabled()) {
                 log.debug("Thread ('{}') acquired lock: '{}' in Critical Section Controller {}  in: {} ms",
-                        Thread.currentThread(), getLockName(), getName(), endTime - startTime);
+                        Thread.currentThread(), lockName, getName(), endTime - startTime);
             }
         }
         return super.next();
diff --git a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
index 4913bd7eb14..e33cf9f5f50 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java
@@ -30,6 +30,7 @@
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -128,7 +129,7 @@ protected HashTree loadIncludedElements() {
         // only try to load the JMX test plan if there is one
         final String includePath = getIncludePath();
         HashTree tree = null;
-        if (includePath != null && includePath.length() > 0) {
+        if (StringUtilities.isNotEmpty(includePath)) {
             String fileName=PREFIX+includePath;
             try {
                 File file = new File(fileName.trim());
diff --git a/src/components/src/main/java/org/apache/jmeter/control/SwitchController.java b/src/components/src/main/java/org/apache/jmeter/control/SwitchController.java
index 476dffb22dc..9f47f56d2e9 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/SwitchController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/SwitchController.java
@@ -19,10 +19,10 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jorphan.util.StringUtilities;
 
 // For unit tests @see TestSwitchController
 
@@ -88,11 +88,11 @@ public void setSelection(String inputValue) {
     private int getSelectionAsInt() {
         getProperty(SWITCH_VALUE).recoverRunningVersion(null);
         String sel = getSelection();
-        if (StringUtils.isEmpty(sel)) {
+        if (StringUtilities.isEmpty(sel)) {
             return 0;
         } else {
             try {
-                if(StringUtils.isNumeric(sel)) {
+                if (StringUtilities.isNumeric(sel)) {
                     int ret = Integer.parseInt(sel);
                     if (ret < 0 || ret >= getSubControllers().size()) {
                         // Out of range, we return first one
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index ac64abe41fd..6ae48f346da 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -24,7 +24,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
@@ -34,6 +33,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.Document;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,17 +92,17 @@ public void process() {
         if (log.isDebugEnabled()) {
             log.debug("Boundary Extractor {}: processing result", getName());
         }
-        if (StringUtils.isEmpty(getRefName())) {
+        String refName = getRefName();
+        if (StringUtilities.isEmpty(refName)) {
             throw new IllegalArgumentException(
                     "One of the mandatory properties is missing in Boundary Extractor:" + getName());
         }
 
         JMeterVariables vars = context.getVariables();
 
-        String refName = getRefName();
         final String defaultValue = getDefaultValue();
 
-        if (StringUtils.isNotBlank(defaultValue) || isEmptyDefaultValue()) {
+        if (StringUtilities.isNotBlank(defaultValue) || isEmptyDefaultValue()) {
             vars.put(refName, defaultValue);
         }
 
@@ -261,11 +261,11 @@ static List<String> extract(
      */
     @VisibleForTesting
     static List<String> extract(String leftBoundary, String rightBoundary, int matchNumber, String inputString) {
-        if (StringUtils.isBlank(inputString)) {
+        if (StringUtilities.isBlank(inputString)) {
             return Collections.emptyList();
         }
-        boolean isEmptyLeftBoundary = StringUtils.isEmpty(leftBoundary);
-        boolean isEmptyRightBoundary = StringUtils.isEmpty(rightBoundary);
+        boolean isEmptyLeftBoundary = StringUtilities.isEmpty(leftBoundary);
+        boolean isEmptyRightBoundary = StringUtilities.isEmpty(rightBoundary);
         if (isEmptyLeftBoundary && isEmptyRightBoundary) {
             return Collections.singletonList(inputString);
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
index b7ed581f83d..360f0666df0 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
@@ -22,7 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -30,6 +29,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -166,7 +166,7 @@ private List<String> extractMatchingStrings(
         List<String> result = new ArrayList<>();
         if (isScopeVariable()){
             String inputString=vars.get(getVariableName());
-            if (!StringUtils.isEmpty(inputString)) {
+            if (StringUtilities.isNotEmpty(inputString)) {
                 getExtractorImpl().extract(expression, attribute, matchNumber, inputString, result, found, "-1");
             } else {
                 if (inputString==null && log.isWarnEnabled()) {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
index b9fbab4bba8..93d858cf9af 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java
@@ -20,7 +20,7 @@
 import java.util.List;
 
 import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -79,7 +79,7 @@ public int extract(String expression, String attribute, int matchNumber,
      * @return String value
      */
     private static String extractValue(String attribute, Element element) {
-        if (!JOrphanUtils.isBlank(attribute)) {
+        if (StringUtilities.isNotBlank(attribute)) {
             return element.attr(attribute);
         } else {
             return element.text().trim();
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
index 1296ce87611..18b632b280a 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java
@@ -21,7 +21,7 @@
 
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
@@ -95,7 +95,7 @@ public int extract(String expression, String attribute, int matchNumber,
 
 
     private static String extractValue(String attribute, Node element) {
-        if (!JOrphanUtils.isBlank(attribute)) {
+        if (StringUtilities.isNotBlank(attribute)) {
             return element.getAttribute(attribute);
         } else {
             return element.getTextContent().trim();
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
index 85650c9c9a6..c8576ca39fb 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -33,6 +32,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,10 +74,11 @@ public void process() {
         String refName = getRefName();
         String defaultValue = getDefaultValue();
         int matchNumber;
-        if (StringUtils.isBlank(getMatchNumber())) {
+        String matchNumberText = getMatchNumber();
+        if (StringUtilities.isBlank(matchNumberText)) {
             matchNumber = 0;
         } else {
-            matchNumber = Integer.parseInt(getMatchNumber());
+            matchNumber = Integer.parseInt(matchNumberText);
         }
         final String jsonPathExpression = getJmesPathExpression().trim();
         clearOldRefVars(vars, refName);
@@ -181,7 +182,7 @@ private List<String> getData(JMeterVariables vars, JMeterContext context) {
             if (previousResult != null) {
                 List<String> results = getSampleList(previousResult).stream()
                         .map(SampleResult::getResponseDataAsString)
-                        .filter(StringUtils::isNotBlank)
+                        .filter(StringUtilities::isNotBlank)
                         .collect(Collectors.toList());
                 if (log.isDebugEnabled()) {
                     log.debug("JMESExtractor {} working on Responses: {}", getName(), results);
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index 7d40b92b5f8..9b30cfb8b2e 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -26,7 +26,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -34,7 +33,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -226,7 +225,7 @@ private List<String> extractJsonResponse(JMeterContext context, JMeterVariables
             if (previousResult != null) {
                 List<String> results = getSampleList(previousResult).stream()
                         .map(SampleResult::getResponseDataAsString)
-                        .filter(StringUtils::isNotBlank)
+                        .filter(StringUtilities::isNotBlank)
                         .collect(Collectors.toList());
                 if (log.isDebugEnabled()) {
                     log.debug("JSON Extractor {} working on Responses: {}", getName(), results);
@@ -304,7 +303,7 @@ public int[] getMatchNumbersAsInt(int arraySize) {
 
         String matchNumbersAsString = getMatchNumbers();
         int[] result = new int[arraySize];
-        if (JOrphanUtils.isBlank(matchNumbersAsString)) {
+        if (StringUtilities.isBlank(matchNumbersAsString)) {
             Arrays.fill(result, 0);
         } else {
             String[] matchNumbersAsStringArray =
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
index 38f41a02a9f..549679ff57d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
@@ -42,6 +42,7 @@
 import org.apache.jmeter.visualizers.ViewResultsFullVisualizer;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
 
@@ -103,7 +104,7 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse the text that will be parsed
      */
     protected void executeTester(String textToParse) {
-        if (textToParse != null && textToParse.length() > 0
+        if (StringUtilities.isNotEmpty(textToParse)
                 && this.expressionField.getText().length() > 0) {
             this.resultField.setText(process(textToParse));
             this.resultField.setCaretPosition(0); // go to first line
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
index 9eda96dae9b..80451ae18c9 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
@@ -29,6 +29,7 @@
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -123,7 +124,7 @@ public void iterationStart(LoopIterationEvent event) {
     // Use format to create number; if it fails, use the default
     private String formatNumber(long value){
         String format = getFormat();
-        if (format != null && format.length() > 0) {
+        if (StringUtilities.isNotEmpty(format)) {
             try {
                 DecimalFormat myFormatter = new DecimalFormat(format);
                 return myFormatter.format(value);
diff --git a/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java b/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
index 7ea43028532..6666bac9fe9 100644
--- a/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
+++ b/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
@@ -35,10 +35,10 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -360,7 +360,7 @@ public void sendMail(String from, List<String> vEmails, String subject,
                 }
         }
 
-        if(!StringUtils.isEmpty(user)) {
+        if (StringUtilities.isNotEmpty(user)) {
             authenticator =
                     new javax.mail.Authenticator() {
                         @Override
@@ -425,7 +425,7 @@ public void setSmtpHost(String str) {
     }
 
     public void setSmtpPort(String value) {
-        if(StringUtils.isEmpty(value)) {
+        if (StringUtilities.isEmpty(value)) {
             value = DEFAULT_SMTP_PORT;
         }
         setProperty(PORT_KEY, value, DEFAULT_SMTP_PORT);
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
index f8f1e589f9f..c862c141646 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
@@ -22,7 +22,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.samplers.AbstractSampler;
 import org.apache.jmeter.samplers.Entry;
@@ -35,6 +34,7 @@
 import org.apache.jmeter.threads.JMeterContext.TestLogicalAction;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.timers.TimerService;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -143,7 +143,7 @@ public SampleResult sample(Entry e) {
     private void pause(String timeInMillis) {
         long millis;
         try {
-            if (!StringUtils.isEmpty(timeInMillis)) {
+            if (StringUtilities.isNotEmpty(timeInMillis)) {
                 millis = Long.parseLong(timeInMillis);
             } else {
                 log.warn("Duration value is empty, defaulting to 0");
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
index 236d2db7f33..77f701984e6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
@@ -34,12 +34,12 @@
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.extractor.BoundaryExtractor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.google.auto.service.AutoService;
 
@@ -73,7 +73,7 @@ public class RenderAsBoundaryExtractor implements ResultRenderer, ActionListener
     public void actionPerformed(ActionEvent e) {
         String command = e.getActionCommand();
         String boundaryExtractorDataFieldText = boundaryExtractorDataField.getText();
-        if (StringUtils.isNotEmpty(boundaryExtractorDataFieldText) && BOUNDARY_EXTRACTOR_TESTER_COMMAND.equals(command)) {
+        if (StringUtilities.isNotEmpty(boundaryExtractorDataFieldText) && BOUNDARY_EXTRACTOR_TESTER_COMMAND.equals(command)) {
             executeAndShowBoundaryExtractorTester(boundaryExtractorDataFieldText);
         }
     }
@@ -83,7 +83,7 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse
      */
     private void executeAndShowBoundaryExtractorTester(String textToParse) {
-        if (textToParse != null && textToParse.length() > 0
+        if (StringUtilities.isNotEmpty(textToParse)
                 && this.boundaryExtractorFieldLeft.getText().length() > 0
                 && this.boundaryExtractorFieldRight.getText().length() > 0) {
             this.boundaryExtractorResultField.setText(process(textToParse));
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
index aa0be670a02..73958fc31f2 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
@@ -37,7 +37,6 @@
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.extractor.Extractor;
 import org.apache.jmeter.extractor.HtmlExtractor;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
@@ -47,6 +46,7 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
 import com.google.auto.service.AutoService;
@@ -101,7 +101,7 @@ public void init() {
     public void actionPerformed(ActionEvent e) {
         String command = e.getActionCommand();
         String cssJqueryDataFieldText = cssJqueryDataField.getText();
-        if (StringUtils.isNotEmpty(cssJqueryDataFieldText) && CSSJQUEY_TESTER_COMMAND.equals(command)) {
+        if (StringUtilities.isNotEmpty(cssJqueryDataFieldText) && CSSJQUEY_TESTER_COMMAND.equals(command)) {
             executeAndShowCssJqueryTester(cssJqueryDataFieldText);
         }
     }
@@ -111,7 +111,7 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse
      */
     private void executeAndShowCssJqueryTester(String textToParse) {
-        if (textToParse != null && textToParse.length() > 0
+        if (StringUtilities.isNotEmpty(textToParse)
                 && this.cssJqueryField.getText().length() > 0) {
             this.cssJqueryResultField.setText(process(textToParse));
             this.cssJqueryResultField.setCaretPosition(0); // go to first line
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
index b99d3d6c590..a94e4ee43a2 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -91,7 +90,7 @@ public String toString() {
 
     private static class PrettyJSONStyle extends JSONStyle {
         private int level = 0;
-        private String indentString = TAB_SEPARATOR;
+        private final String indentString;
 
         public PrettyJSONStyle(String indentString) {
             this.indentString = indentString;
@@ -99,7 +98,9 @@ public PrettyJSONStyle(String indentString) {
 
         private void indent(Appendable out) throws IOException {
             out.append('\n');
-            out.append(StringUtils.repeat(indentString, level));
+            for (int i = 0; i < level; i++) {
+                 out.append(indentString);
+            }
         }
 
         @Override
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
index 01d8358e033..de0e7252506 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java
@@ -37,11 +37,11 @@
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.PatternCacheLRU;
 import org.apache.oro.text.regex.MatchResult;
@@ -98,7 +98,7 @@ public void init() {
     public void actionPerformed(ActionEvent e) {
         String command = e.getActionCommand();
         String xmlDataFieldText = regexpDataField.getText();
-        if (StringUtils.isNotEmpty(xmlDataFieldText) && REGEXP_TESTER_COMMAND.equals(command)) {
+        if (StringUtilities.isNotEmpty(xmlDataFieldText) && REGEXP_TESTER_COMMAND.equals(command)) {
             executeAndShowRegexpTester(xmlDataFieldText);
         }
     }
@@ -108,7 +108,7 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse
      */
     private void executeAndShowRegexpTester(String textToParse) {
-        if (textToParse != null && !textToParse.isEmpty()
+        if (StringUtilities.isNotEmpty(textToParse)
                 && !this.regexpField.getText().isEmpty()) {
             this.regexpResultField.setText(process(textToParse));
             this.regexpResultField.setCaretPosition(0); // go to first line
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
index 6058ce7ca3f..715e504d2cd 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
@@ -40,8 +40,6 @@
 import javax.swing.border.EmptyBorder;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.jmeter.assertions.gui.XMLConfPanel;
 import org.apache.jmeter.extractor.XPathExtractor;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
@@ -52,7 +50,9 @@
 import org.apache.jmeter.util.XPathUtil;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -113,7 +113,7 @@ public void init() {
     public void actionPerformed(ActionEvent e) {
         String command = e.getActionCommand();
         String xmlDataFieldText = xmlDataField.getText();
-        if (StringUtils.isNotEmpty(xmlDataFieldText) && XPATH_TESTER_COMMAND.equals(command)) {
+        if (StringUtilities.isNotEmpty(xmlDataFieldText) && XPATH_TESTER_COMMAND.equals(command)) {
             XPathExtractor extractor = new XPathExtractor();
             xmlConfPanel.modifyTestElement(extractor);
             extractor.setFragment(getFragment.isSelected());
@@ -126,7 +126,7 @@ public void actionPerformed(ActionEvent e) {
      * @param textToParse
      */
     private void executeAndShowXPathTester(String textToParse, XPathExtractor extractor) {
-        if (textToParse != null && textToParse.length() > 0
+        if (StringUtilities.isNotEmpty(textToParse)
                 && this.xpathExpressionField.getText().length() > 0) {
             this.xpathResultField.setText(process(textToParse, extractor));
             this.xpathResultField.setCaretPosition(0); // go to first line
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
index 42214a70afe..9d11aced478 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
@@ -36,14 +36,14 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.jmeter.extractor.XPath2Extractor;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.XPathUtil;
+import org.apache.jorphan.util.ExceptionUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +103,7 @@ public void init() {
     public void actionPerformed(ActionEvent e) {
         String command = e.getActionCommand();
         String xmlDataFieldText = xmlDataField.getText();
-        if (StringUtils.isEmpty(xmlDataFieldText)) {
+        if (StringUtilities.isEmpty(xmlDataFieldText)) {
             return;
         }
         if (XPATH_TESTER_COMMAND.equals(command)) {
@@ -121,7 +121,7 @@ else if (XPATH_NAMESPACES_COMMAND.equals(command)) {
      * @param textToParse
      */
     private void executeAndShowXPathTester(String textToParse, XPath2Extractor extractor) {
-        if (textToParse != null && textToParse.length() > 0
+        if (StringUtilities.isNotEmpty(textToParse)
                 && this.xpathExpressionField.getText().length() > 0) {
             this.xpathResultField.setText(process(textToParse, extractor));
             this.xpathResultField.setCaretPosition(0); // go to first line
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
index b253e0381d7..b0caf1d5629 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
@@ -29,6 +29,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.GuiUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.google.auto.service.AutoService;
 
@@ -95,12 +96,12 @@ public void setSamplerResult(Object objectResult) {
             SampleResult sampleResult = (SampleResult) objectResult;
             // Don't display Request headers label if rh is null or empty
             String rh = sampleResult.getRequestHeaders();
-            if (rh != null && !rh.isEmpty()) {
+            if (StringUtilities.isNotEmpty(rh)) {
                 headerData.setInitialText(rh);
                 sampleDataField.setCaretPosition(0);
             }
             String data = sampleResult.getSamplerData();
-            if (data != null && !data.isEmpty()) {
+            if (StringUtilities.isNotEmpty(data)) {
                 sampleDataField.setText(data);
                 sampleDataField.setCaretPosition(0);
             } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index 99e4da7dccd..e0d4cf91d08 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -50,7 +50,6 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeListener;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
@@ -68,6 +67,7 @@
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.apache.jorphan.gui.JMeterUIDefaults;
 import org.apache.jorphan.math.StatCalculatorLong;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -279,7 +279,7 @@ public RespTimeGraphVisualizer() {
     }
 
     private static String[] keys(Map<String, ?> map) {
-        return map.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
+        return map.keySet().toArray(new String[0]);
     }
 
     @Override
@@ -543,7 +543,7 @@ public void actionPerformed(ActionEvent event) {
             } else if (forceReloadData) {
                 pattern = null;
             }
-            if (getFile() != null && getFile().length() > 0) {
+            if (StringUtilities.isNotEmpty(getFile())) {
                 // Reload data from file
                 clearData();
                 FilePanel filePanel = (FilePanel) getFilePanel();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
index e4502ff985f..14e4c7dea03 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
@@ -34,7 +34,6 @@
 import javax.swing.JTextField;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.Searchable;
 import org.apache.jmeter.gui.action.KeyStrokes;
 import org.apache.jmeter.gui.action.RawTextSearcher;
@@ -43,6 +42,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.utils.Colors;
 import org.apache.jorphan.gui.JFactory;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,7 +165,7 @@ private static void doResetSearch(SearchableTreeNode searchableTreeNode) {
      */
     private boolean doSearch() {
         String wordToSearch = searchTF.getText();
-        if (StringUtils.isEmpty(wordToSearch)) {
+        if (StringUtilities.isEmpty(wordToSearch)) {
             return false;
         }
         Searcher searcher = isRegexpCB.isSelected() ?
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 1d909eba6b9..32703f1517b 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -64,7 +64,6 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.table.TableCellRenderer;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
@@ -337,7 +336,7 @@ static final Object[][] getGraphColumnsMsgParameters() {
     }
 
     private static String[] keys(Map<String, ?> map) {
-        return map.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
+        return map.keySet().toArray(new String[0]);
     }
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 1c9470b45c4..4c5f70aa28c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -62,7 +62,6 @@
 import javax.swing.tree.TreeSelectionModel;
 
 import org.apache.commons.collections4.queue.CircularFifoQueue;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
@@ -74,6 +73,7 @@
 import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
 import org.apache.jorphan.gui.JMeterUIDefaults;
 import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.jorphan.util.StringWrap;
 import org.apiguardian.api.API;
 import org.slf4j.Logger;
@@ -413,8 +413,9 @@ private void valueChanged(TreeSelectionEvent e, boolean forceRendering) {
      * @return true if sampleResult is text or has empty content type
      */
     protected static boolean isTextDataType(SampleResult sampleResult) {
-        return SampleResult.TEXT.equals(sampleResult.getDataType())
-                || StringUtils.isEmpty(sampleResult.getDataType());
+        String dataType = sampleResult.getDataType();
+        return SampleResult.TEXT.equals(dataType) ||
+                StringUtilities.isEmpty(dataType);
     }
 
     private synchronized Component createLeftPanel() {
@@ -563,7 +564,7 @@ public static String getResponseAsString(SampleResult res) {
 
     @API(status = API.Status.INTERNAL, since = "5.5")
     public static String wrapLongLines(String input) {
-        if (input == null || input.isEmpty()) {
+        if (StringUtilities.isEmpty(input)) {
             return input;
         }
         if (SOFT_WRAP_LINE_SIZE > 0 && MAX_LINE_SIZE > 0) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
index 88f83c0c8c6..8858d3bb1e7 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
@@ -19,6 +19,7 @@
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
@@ -160,7 +161,7 @@ private static void initAttributeNode(Node node, DefaultMutableTreeNode mTreeNod
      */
     private static void initCommentNode(Comment node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String data = node.getData();
-        if (data != null && data.length() > 0) {
+        if (StringUtilities.isNotEmpty(data)) {
             String value = "<!--" + node.getData() + "-->"; // $NON-NLS-1$ $NON-NLS-2$
             XMLDefaultMutableTreeNode commentNode = new XMLDefaultMutableTreeNode(value, node);
             mTreeNode.add(commentNode);
@@ -176,7 +177,7 @@ private static void initCommentNode(Comment node, DefaultMutableTreeNode mTreeNo
      */
     private static void initCDATASectionNode(CDATASection node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String data = node.getData();
-        if (data != null && data.length() > 0) {
+        if (StringUtilities.isNotEmpty(data)) {
             String value = "<!-[CDATA" + node.getData() + "]]>"; // $NON-NLS-1$ $NON-NLS-2$
             XMLDefaultMutableTreeNode commentNode = new XMLDefaultMutableTreeNode(value, node);
             mTreeNode.add(commentNode);
@@ -192,7 +193,7 @@ private static void initCDATASectionNode(CDATASection node, DefaultMutableTreeNo
      */
     private static void initTextNode(Text node, DefaultMutableTreeNode mTreeNode) throws SAXException {
         String text = node.getNodeValue().trim();
-        if (text != null && text.length() > 0) {
+        if (StringUtilities.isNotEmpty(text)) {
             XMLDefaultMutableTreeNode textNode = new XMLDefaultMutableTreeNode(text, node);
             mTreeNode.add(textNode);
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
index 2e79427ed17..0a7f3337ba2 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
@@ -32,7 +32,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -44,6 +43,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.gui.AbstractListenerGui;
 import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -196,7 +196,7 @@ private static Arguments copyDefaultArguments(Map<String, String> currArgsMap, A
                 // values that they did in the original test.
                 if (currArgsMap.containsKey(name)) {
                     String newVal = currArgsMap.get(name);
-                    if (StringUtils.isNotBlank(newVal)) {
+                    if (StringUtilities.isNotBlank(newVal)) {
                         value = newVal;
                     }
                 }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
index 3ccf49f4c53..9ae7694998e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
@@ -19,9 +19,9 @@
 
 import java.util.Locale;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Object representing an error by a response code and response message
@@ -43,9 +43,10 @@ public ErrorMetric() {
     }
 
     public ErrorMetric(SampleResult result) {
+        // TODO: responseCode is known to be empty here, so condition seems useless
         if (MetricUtils.isSuccessCode(responseCode) ||
-                (StringUtils.isEmpty(responseCode) &&
-                        !StringUtils.isEmpty(result.getFirstAssertionFailureMessage()))) {
+                (StringUtilities.isEmpty(responseCode) &&
+                        StringUtilities.isNotEmpty(result.getFirstAssertionFailureMessage()))) {
             responseCode = MetricUtils.ASSERTION_FAILED;
             responseMessage = result.getFirstAssertionFailureMessage();
         } else {
@@ -69,7 +70,7 @@ public String getResponseCode() {
      * @return the response message, 'none' if the code is empty
      */
     public String getResponseMessage() {
-        if (responseMessage == null || responseMessage.isEmpty()) {
+        if (StringUtilities.isEmpty(responseMessage)) {
             return "None";
         } else {
             return responseMessage.trim();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
index d9b68ecef21..387eaf591c6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
@@ -19,9 +19,9 @@
 
 import java.time.Duration;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Base class for {@link GraphiteMetricsSender}
@@ -63,7 +63,6 @@ protected GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> crea
      * @return the sanitized text
      */
     static String sanitizeString(String s) {
-        // String#replace uses regexp
-        return StringUtils.replaceChars(s, "\\ .", "--_");
+        return StringUtilities.replaceChars(s, "\\ .", "--_");
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
index 36ad35ec000..0ef08025f2c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
@@ -32,7 +32,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
@@ -41,6 +40,7 @@
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
 import org.apache.jmeter.visualizers.backend.SamplerMetric;
 import org.apache.jmeter.visualizers.backend.UserMetric;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -313,7 +313,7 @@ public void setupTest(BackendListenerContext context) throws Exception {
         allPercentiles = new HashMap<>(percentilesStringArray.length);
         Arrays.stream(percentilesStringArray)
                 .map(String::trim)
-                .filter(StringUtils::isNotEmpty)
+                .filter(StringUtilities::isNotEmpty)
                 .forEach(this::initPercentileMaps);
         Class<?> clazz = Class.forName(graphiteMetricsSenderClass);
         this.graphiteMetricsManager = (GraphiteMetricsSender) clazz.getDeclaredConstructor().newInstance();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
index 6a346000aca..6e2c2e25d4b 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
@@ -43,6 +42,7 @@
 import org.apache.http.util.EntityUtils;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -141,7 +141,7 @@ private static HttpPost createRequest(URL url, String token) throws URISyntaxExc
 
         HttpPost currentHttpRequest = new HttpPost(url.toURI());
         currentHttpRequest.setConfig(defaultRequestConfig);
-        if (StringUtils.isNotBlank(token)) {
+        if (StringUtilities.isNotBlank(token)) {
             currentHttpRequest.setHeader(AUTHORIZATION_HEADER_NAME, AUTHORIZATION_HEADER_VALUE + token);
         }
         log.debug("Created InfluxDBMetricsSender with url: {}", url);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
index 2d18049c2e5..740ce1b2b16 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java
@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.visualizers.backend.BackendListenerClient;
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
+import org.apache.jorphan.util.StringUtilities;
 import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -135,14 +135,34 @@ static String createTags(SampleResult sampleResult) {
         boolean isError = sampleResult.getErrorCount() != 0;
         String status = isError ? TAG_KO : TAG_OK;
         // remove surrounding quotes and spaces from sample label
-        String label = StringUtils.strip(sampleResult.getSampleLabel(), "\" ");
+        String label = StringUtilities.strip(sampleResult.getSampleLabel(), "\" ");
         String transaction = AbstractInfluxdbMetricsSender.tagToStringValue(label);
-        String threadName = StringUtils.deleteWhitespace(sampleResult.getThreadName());
+        String threadName = deleteWhitespace(sampleResult.getThreadName());
         return "status=" + status
                 + ",transaction=" + transaction
                 + ",threadName=" + threadName;
     }
 
+    /**
+     * Deletes all whitespace from a string.
+     *
+     * @param str the string to remove whitespace from, may be null
+     * @return the string without whitespace, or null if input was null
+     */
+    private static String deleteWhitespace(String str) {
+        if (str == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder(str.length());
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (!Character.isWhitespace(c)) {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
     @VisibleForTesting
     static String createFields(SampleResult sampleResult) {
         long duration = sampleResult.getTime();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
index 11a8739b8c9..c4d1525e276 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
@@ -31,7 +31,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
@@ -41,6 +40,7 @@
 import org.apache.jmeter.visualizers.backend.ErrorMetric;
 import org.apache.jmeter.visualizers.backend.SamplerMetric;
 import org.apache.jmeter.visualizers.backend.UserMetric;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -349,10 +349,10 @@ private void initUserTags(BackendListenerContext context) {
         // Check if more rows which started with 'TAG_' are filled ( corresponding to user tag )
         StringBuilder userTagBuilder = new StringBuilder();
         context.getParameterNamesIterator().forEachRemaining(name -> {
-            if (StringUtils.isNotBlank(name)
+            if (StringUtilities.isNotBlank(name)
                     && !DEFAULT_ARGS.containsKey(name.trim())
                     && name.startsWith("TAG_")
-                    && StringUtils.isNotBlank(context.getParameter(name))) {
+                    && StringUtilities.isNotBlank(context.getParameter(name))) {
                 final String tagName = name.trim().substring(4);
                 final String tagValue = context.getParameter(name).trim();
                 userTagBuilder.append(',')
@@ -374,7 +374,7 @@ private void initPercentiles(BackendListenerContext context) {
         DecimalFormat format = new DecimalFormat("0.##");
         for (String percentile : percentilesStringArray) {
             String trimmedPercentile = percentile.trim();
-            if (StringUtils.isEmpty(trimmedPercentile)) {
+            if (StringUtilities.isEmpty(trimmedPercentile)) {
                 continue;
             }
             try {
@@ -438,7 +438,7 @@ public void teardownTest(BackendListenerContext context) throws Exception {
     private void addAnnotation(boolean isStartOfTest) {
         String tags = TAG_APPLICATION + applicationName +
                 ",title=ApacheJMeter" + userTag +
-                (StringUtils.isNotEmpty(testTags) ? TAGS + testTags : "");
+                (StringUtilities.isNotEmpty(testTags) ? TAGS + testTags : "");
         String field = TEXT +
                 AbstractInfluxdbMetricsSender.fieldToStringValue(
                         testTitle + (isStartOfTest ? " started" : " ended")) + "\"";
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
index 6138fb1dbf7..1bb72f696cd 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
@@ -26,7 +26,6 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Locale;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.threads.JMeterContext;
@@ -122,8 +121,8 @@ public void testVariableExtraction() throws Exception {
         extractor.setMatchNumber(0);
         extractor.process();
         assertEquals("1", vars.get(VAL_NAME_NR));
-        assertTrue(StringUtils.isNoneEmpty(vars.get(VAL_NAME)));
-        assertTrue(StringUtils.isNoneEmpty(vars.get(VAL_NAME + "_1")));
+        assertTrue(vars.get(VAL_NAME) != null && !vars.get(VAL_NAME).isEmpty());
+        assertTrue(vars.get(VAL_NAME + "_1") != null && !vars.get(VAL_NAME + "_1").isEmpty());
         assertNull(vars.get(VAL_NAME + "_2"));
         assertNull(vars.get(VAL_NAME + "_3"));
 
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 5fa41bec70a..70d790b3c37 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -60,7 +60,6 @@
 import org.apache.commons.cli.avalon.CLUtil;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.control.ReplaceableController;
 import org.apache.jmeter.engine.ClientJMeterEngine;
 import org.apache.jmeter.engine.DistributedRunner;
@@ -98,6 +97,7 @@
 import org.apache.jorphan.util.HeapDumper;
 import org.apache.jorphan.util.JMeterException;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.jorphan.util.ThreadDumper;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -645,7 +645,8 @@ static void runInitScripts() {
             log.info("Running JSR-223 init script in file: {}", jsr223Init);
             File file = new File(jsr223Init);
             if(file.exists() && file.canRead()) {
-                String extension = StringUtils.defaultIfBlank(FilenameUtils.getExtension(jsr223Init), "Groovy");
+                String ext = FilenameUtils.getExtension(jsr223Init);
+                String extension = StringUtilities.isBlank(ext) ? "Groovy" : ext;
                 try (Reader reader = Files.newBufferedReader(file.toPath())) {
                     ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
                     ScriptEngine engine = scriptEngineManager.getEngineByExtension(extension);
@@ -712,7 +713,7 @@ private static void setProxy(CLArgsParser parser) throws IllegalUserActionExcept
             String proxyScheme = null;
             if (parser.getArgumentById(PROXY_SCHEME) != null) {
                 proxyScheme = parser.getArgumentById(PROXY_SCHEME).getArgument();
-                if(!StringUtils.isBlank(proxyScheme)){
+                if (StringUtilities.isNotBlank(proxyScheme)) {
                     System.setProperty("http.proxyScheme",  proxyScheme );// $NON-NLS-1$
                 }
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/config/Argument.java b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
index 570d201de88..c5d4f680f33 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Argument.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Argument.java
@@ -19,10 +19,9 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Class representing an argument. Each argument consists of a name/value pair,
@@ -122,7 +121,7 @@ public ArgumentSchema getSchema() {
      */
     @Override
     public void setName(String newName) {
-        set(getSchema().getArgumentName(), StringUtils.strip(newName));
+        set(getSchema().getArgumentName(), (newName == null ? null : newName.strip()));
     }
 
     /**
@@ -195,7 +194,7 @@ public String getMetaData() {
     @Override
     public String toString() {
         final String desc = getDescription();
-        if (desc == null || desc.isEmpty()) {
+        if (StringUtilities.isEmpty(desc)) {
             return getName() + getMetaData() + getValue();
         } else {
             return getName() + getMetaData() + getValue() + " //" + getDescription();
@@ -210,7 +209,7 @@ public String toString() {
      * @return true if parameter should be skipped
      */
     public boolean isSkippable(String parameterName) {
-        if (JOrphanUtils.isBlank(parameterName)){
+        if (StringUtilities.isBlank(parameterName)){
             return true; // Skip parameters with a blank name (allows use of optional variables in parameter lists)
         }
         // TODO: improve this test
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index 7fe323b9a5d..0c9fd32dba8 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -42,7 +42,6 @@
 import javax.swing.JViewport;
 import javax.swing.ListSelectionModel;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.gui.TestElementMetadata;
@@ -53,6 +52,7 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * A GUI panel allowing the user to enter name-value argument pairs. These
@@ -300,7 +300,7 @@ public void modifyTestElement(TestElement args) {
             Iterator<Argument> modelData = (Iterator<Argument>) tableModel.iterator();
             while (modelData.hasNext()) {
                 Argument arg = modelData.next();
-                if(StringUtils.isEmpty(arg.getName()) && StringUtils.isEmpty(arg.getValue())) {
+                if (StringUtilities.isEmpty(arg.getName()) && StringUtilities.isEmpty(arg.getValue())) {
                     continue;
                 }
                 arg.setMetaData("="); // $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
index b298fde061d..5a9b9024579 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
@@ -32,6 +32,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -177,7 +178,7 @@ public void clear() {
 
     public void setParameters(String parameters) throws InvalidVariableException {
         this.rawParameters = parameters;
-        if (parameters == null || parameters.length() == 0) {
+        if (StringUtilities.isEmpty(parameters)) {
             return;
         }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
index e4a2d45b38f..67294d19786 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
@@ -24,7 +24,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.util.StringUtilities;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternCompiler;
@@ -97,7 +97,7 @@ private JMeterProperty transformValueWithOroRegex(JMeterProperty prop) throws In
                     log.warn("Malformed pattern: {}", value);
                 }
             } else {
-                input = StringUtilities.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
+                input = JOrphanUtils.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
             }
         }
         return new StringProperty(prop.getName(), input);
@@ -119,7 +119,7 @@ private JMeterProperty transformValueWithJavaRegex(JMeterProperty prop) throws I
                     log.warn("Malformed pattern: {}", value);
                 }
             } else {
-                input = StringUtilities.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
+                input = JOrphanUtils.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
             }
         }
         return new StringProperty(prop.getName(), input);
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java b/src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java
index a37cf9e0daf..02cda30f742 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java
@@ -22,7 +22,7 @@
 import org.apache.jmeter.functions.InvalidVariableException;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jmeter.util.StringUtilities;
+import org.apache.jorphan.util.JOrphanUtils;
 
 /**
  * Replaces ${key} by value extracted from
@@ -41,7 +41,7 @@ public JMeterProperty transformValue(JMeterProperty prop) throws InvalidVariable
         for (Map.Entry<String, String> entry : getVariables().entrySet()) {
             String key = entry.getKey();
             String value = entry.getValue();
-            input = StringUtilities.substitute(input, "${" + key + "}", value);
+            input = JOrphanUtils.substitute(input, "${" + key + "}", value);
         }
         return new StringProperty(prop.getName(), input);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java b/src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java
index d798566e686..e6df0d74933 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java
@@ -19,13 +19,13 @@
 
 import java.util.Collection;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Provides common methods for all functions
@@ -154,7 +154,7 @@ protected void checkMinParameterCount(Collection<CompoundVariable> parameters, i
     protected final void addVariableValue(String value, CompoundVariable[] values, int index) {
         if (values.length > index) {
             String variableName = values[index].execute().trim();
-            if (StringUtils.isNotEmpty(variableName)) {
+            if (StringUtilities.isNotEmpty(variableName)) {
                 JMeterVariables vars = getVariables();
                 if (vars != null) {
                     vars.put(variableName, value);
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
index ef659afab1d..eca5090967c 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
@@ -41,7 +41,6 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -67,6 +66,7 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -254,8 +254,7 @@ public void actionPerformed(ActionEvent e) {
                 resultTextArea.setText(function.execute().trim());
             } catch(Exception ex) {
                 log.error("Error calling function {}", functionCall, ex);
-                resultTextArea.setText(ex.getMessage() + ", \nstacktrace:\n "+
-                        ExceptionUtils.getStackTrace(ex));
+                resultTextArea.setText(ex.getMessage() + ", \nstacktrace:\n "+ ExceptionUtils.getStackTrace(ex));
                 resultTextArea.setCaretPosition(0);
             }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
index 4c6a79144e0..ddafba9c212 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
@@ -35,7 +35,6 @@
 import javax.swing.JTextField;
 import javax.swing.border.Border;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestElementSchema;
@@ -260,7 +259,8 @@ public void modifyTestElement(TestElement element) {
      */
     @API(status = DEPRECATED, since = "5.6.3")
     protected void configureTestElement(TestElement mc) {
-        mc.setName(StringUtils.defaultIfEmpty(getName(), null));
+        String name = getName();
+        mc.setName(name.isEmpty() ? null : name);
         TestElementSchema schema = TestElementSchema.INSTANCE;
         mc.set(schema.getGuiClass(), getClass());
         mc.set(schema.getTestClass(), mc.getClass());
@@ -282,7 +282,8 @@ private void modifyTestElementEnabledAndComment(TestElement mc) {
         mc.set(TestElementSchema.INSTANCE.getEnabled(), enabled ? null : Boolean.FALSE);
         // Note: we can't use editors for "comments" as getComments() is not a final method, so plugins might
         // override it and provide a different implementation.
-        mc.setComment(StringUtils.defaultIfEmpty(getComment(), null));
+        String comment = getComment();
+        mc.setComment(comment.isEmpty() ? null : comment);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
index c7df480a759..9d0772f08b5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java
@@ -21,7 +21,6 @@
 
 import javax.swing.JPopupMenu;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestElementSchema;
 import org.apiguardian.api.API;
@@ -155,7 +154,8 @@ default TestElement makeTestElement() {
      * @param element test element to configure
      */
     default void assignDefaultValues(TestElement element) {
-        element.setName(StringUtils.defaultIfEmpty(getStaticLabel(), null));
+        String label = getStaticLabel();
+        element.setName(label.isEmpty() ? null : label);
         TestElementSchema schema = TestElementSchema.INSTANCE;
         element.set(schema.getGuiClass(), getClass());
         element.set(schema.getTestClass(), element.getClass());
@@ -201,7 +201,8 @@ default void modifyTestElement(TestElement element) {
         // TODO: should we keep .clear() here? It probably makes it easier to remove all properties before populating
         //   the values from UI, however, it might be inefficient.
         element.clear();
-        element.setName(StringUtils.defaultIfEmpty(getName(), null));
+        String name = getName();
+        element.setName(name.isEmpty() ? null : name);
         TestElementSchema schema = TestElementSchema.INSTANCE;
         element.set(schema.getGuiClass(), getClass());
         element.set(schema.getTestClass(), element.getClass());
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 969bed78c3b..bfc46e01f6c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -78,7 +78,6 @@
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
 import org.apache.jmeter.gui.action.KeyStrokes;
@@ -104,6 +103,7 @@
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.JMeterUIDefaults;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -408,7 +408,7 @@ public void showStoppingMessage(String host) {
         }
         stoppingMessage = new EscapeDialog(this, JMeterUtils.getResString("stopping_test_title"), true); //$NON-NLS-1$
         String label = JMeterUtils.getResString("stopping_test"); //$NON-NLS-1
-        if (!StringUtils.isEmpty(host)) {
+        if (StringUtilities.isNotEmpty(host)) {
             label = label + " " + JMeterUtils.getResString("stopping_test_host") + ": " + host;
         }
         JLabel stopLabel = new JLabel(label); //$NON-NLS-1$$NON-NLS-2$
@@ -673,8 +673,8 @@ public String getToolTipText(MouseEvent event) {
                         Object testElement = ((DefaultMutableTreeNode) treeNode).getUserObject();
                         if (testElement instanceof TestElement) {
                             String comment = ((TestElement) testElement).getComment();
-                            if (StringUtils.isNotBlank(comment)) {
-                                return StringUtils.abbreviate(comment, 80);
+                            if (StringUtilities.isNotBlank(comment)) {
+                                return comment.length() <= 80 ? comment : comment.substring(0, 77) + "...";
                             }
                         }
                     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
index 8c9729416a9..22789f77653 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java
@@ -27,7 +27,6 @@
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.JMeterGUIComponent;
@@ -35,6 +34,7 @@
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,7 +87,7 @@ private static void changeParent(TestElement newParent, GuiPackage guiPackage, J
         Controller currentController = (Controller) currentNode.getUserObject();
         JMeterGUIComponent currentGui = guiPackage.getCurrentGui();
         String defaultName = JMeterUtils.getResString(currentGui.getLabelResource());
-        if(StringUtils.isNotBlank(currentController.getName())
+        if (StringUtilities.isNotBlank(currentController.getName())
                 && !currentController.getName().equals(defaultName)){
             newParent.setName(currentController.getName());
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
index 946e9c3163e..9f3348b5781 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java
@@ -19,7 +19,9 @@
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
+
+import kotlin.text.StringsKt;
 
 /**
  * Searcher implementation that searches text as is
@@ -44,8 +46,8 @@ public RawTextSearcher(boolean caseSensitive, String textToSearch) {
     @Override
     public boolean search(List<String> textTokens) {
         return textTokens.stream()
-                .filter(StringUtils::isNotEmpty)
-                .anyMatch(token -> caseSensitive ? token.contains(textToSearch) : StringUtils.containsAnyIgnoreCase(token, textToSearch));
+                .filter(StringUtilities::isNotEmpty)
+                .anyMatch(token -> StringsKt.contains(token, textToSearch, !caseSensitive));
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
index c672bb32808..c96c8f5e5ee 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Regexp search implementation
@@ -52,7 +52,7 @@ public boolean search(List<String> textTokens) {
             pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
         }
         return textTokens.stream()
-                .filter(token -> !StringUtils.isEmpty(token))
+                .filter(StringUtilities::isNotEmpty)
                 .anyMatch(token -> pattern.matcher(token).find());
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
index 9c0597735c0..d7aa6a094af 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java
@@ -32,10 +32,10 @@
 import javax.swing.JOptionPane;
 import javax.swing.MenuElement;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.plugin.MenuCreator;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -108,7 +108,7 @@ public void doActionAfterCheck(ActionEvent e) {
     public static void restartApplication(Runnable runBeforeRestart) {
         String javaCommand = System.getProperty(SUN_JAVA_COMMAND);
         List<String> processArgs = new ArrayList<>();
-        if(StringUtils.isEmpty(javaCommand)) {
+        if (StringUtilities.isEmpty(javaCommand)) {
             JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
                     JMeterUtils.getResString("restart_error")+":\n This command is only supported on Open JDK or Oracle JDK" ,  //$NON-NLS-1$  //$NON-NLS-2$
                     JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
index 8b0f1c9b645..77c896e66c5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java
@@ -39,11 +39,11 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.plugin.MenuCreator;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +77,7 @@ public void generate(HashTree testPlan, File testPlanFile, OutputStream outputSt
                     "net.sf.saxon.BasicTransformerFactory", Thread.currentThread().getContextClassLoader());
             factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             Source xslt;
-            if (!StringUtils.isEmpty(DEFAULT_XSL_FILE)) {
+            if (StringUtilities.isNotEmpty(DEFAULT_XSL_FILE)) {
                 log.info("Will use file {} for Schematic View generation", DEFAULT_XSL_FILE);
                 xslt = new StreamSource(new File(DEFAULT_XSL_FILE));
             } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index 51f0f7c63ac..dc54b002430 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -28,6 +28,7 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -49,9 +50,6 @@
 import javax.swing.JTree;
 import javax.swing.tree.TreePath;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.lang3.tuple.Triple;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.Replaceable;
 import org.apache.jmeter.gui.Searchable;
@@ -62,6 +60,7 @@
 import org.apache.jorphan.documentation.VisibleForTesting;
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.JFactory;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,6 +71,8 @@
  */
 public class SearchTreeDialog extends JDialog implements ActionListener { // NOSONAR
 
+    record SearchConditions(String word, Boolean caseSensitive, Boolean regex) {}
+
     private static final long serialVersionUID = -4436834972710248247L;
 
     private static final Logger logger = LoggerFactory.getLogger(SearchTreeDialog.class);
@@ -105,7 +106,7 @@ public class SearchTreeDialog extends JDialog implements ActionListener { // NOS
     private JCheckBox isCaseSensitiveCB;
 
 
-    private transient Triple<String, Boolean, Boolean> lastSearchConditions = null;
+    private transient SearchConditions lastSearchConditions = null;
 
     private final List<JMeterTreeNode> lastSearchResult = new ArrayList<>();
     private int currentSearchIndex;
@@ -159,9 +160,9 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         searchTF = new JTextField(20);
         searchTF.setAlignmentY(TOP_ALIGNMENT);
         if (lastSearchConditions != null) {
-            searchTF.setText(lastSearchConditions.getLeft());
-            isCaseSensitiveCB.setSelected(lastSearchConditions.getMiddle());
-            isRegexpCB.setSelected(lastSearchConditions.getRight());
+            searchTF.setText(lastSearchConditions.word());
+            isCaseSensitiveCB.setSelected(lastSearchConditions.caseSensitive());
+            isRegexpCB.setSelected(lastSearchConditions.regex());
         }
 
         replaceTF = new JTextField(20);
@@ -288,9 +289,9 @@ private void doReplace() {
                 String wordToReplace = replaceTF.getText();
                 String regex = isRegexpCB.isSelected() ? wordToSearch : Pattern.quote(wordToSearch);
                 boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
-                Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(currentNode, regex, wordToReplace, caseSensitiveReplacement);
+                Map.Entry<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(currentNode, regex, wordToReplace, caseSensitiveReplacement);
                 if(pair != null) {
-                    nbReplacements = pair.getLeft();
+                    nbReplacements = pair.getKey();
                     GuiPackage.getInstance().updateCurrentGui();
                     GuiPackage.getInstance().getMainFrame().repaint();
                 }
@@ -302,15 +303,15 @@ private void doReplace() {
     private JMeterTreeNode doNavigateToSearchResult(boolean isNext) {
         boolean doSearchAgain =
                 lastSearchConditions == null ||
-                !Triple.of(searchTF.getText(), isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected())
+                !new SearchConditions(searchTF.getText(), isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected())
                 .equals(lastSearchConditions);
         if(doSearchAgain) {
             String wordToSearch = searchTF.getText();
-            if (StringUtils.isEmpty(wordToSearch)) {
+            if (StringUtilities.isEmpty(wordToSearch)) {
                 this.lastSearchConditions = null;
                 return null;
             } else {
-                this.lastSearchConditions = Triple.of(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
+                this.lastSearchConditions = new SearchConditions(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
             }
             Searcher searcher = createSearcher(wordToSearch);
             searchInTree(GuiPackage.getInstance(), searcher, wordToSearch);
@@ -336,11 +337,11 @@ private JMeterTreeNode doNavigateToSearchResult(boolean isNext) {
     private void doSearch(ActionEvent e) {
         boolean expand = e.getSource()==searchAndExpandButton;
         String wordToSearch = searchTF.getText();
-        if (StringUtils.isEmpty(wordToSearch)) {
+        if (StringUtilities.isEmpty(wordToSearch)) {
             this.lastSearchConditions = null;
             return;
         } else {
-            this.lastSearchConditions = Triple.of(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
+            this.lastSearchConditions = new SearchConditions(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
         }
 
         // reset previous result
@@ -351,9 +352,9 @@ private void doSearch(ActionEvent e) {
         guiPackage.beginUndoTransaction();
         int numberOfMatches = 0;
         try {
-            Pair<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
-            numberOfMatches = result.getLeft();
-            markConcernedNodes(expand, result.getRight());
+            Map.Entry<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
+            numberOfMatches = result.getKey();
+            markConcernedNodes(expand, result.getValue());
         } finally {
             guiPackage.endUndoTransaction();
         }
@@ -376,7 +377,7 @@ private Searcher createSearcher(String wordToSearch) {
         }
     }
 
-    private Pair<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, Searcher searcher, String wordToSearch) {
+    private Map.Entry<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, Searcher searcher, String wordToSearch) {
         int numberOfMatches = 0;
         JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
         Set<JMeterTreeNode> nodes = new LinkedHashSet<>();
@@ -396,7 +397,7 @@ private Pair<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, S
         this.currentSearchIndex = -1;
         this.lastSearchResult.clear();
         this.lastSearchResult.addAll(nodes);
-        return Pair.of(numberOfMatches, nodes);
+        return Map.entry(numberOfMatches, nodes);
     }
 
     /**
@@ -426,7 +427,7 @@ private void doReplaceAll(ActionEvent e) {
         boolean expand = e.getSource()==searchAndExpandButton;
         String wordToSearch = searchTF.getText();
         String wordToReplace = replaceTF.getText();
-        if (StringUtils.isEmpty(wordToReplace)) {
+        if (StringUtilities.isEmpty(wordToReplace)) {
             return;
         }
         // Save any change to current node
@@ -438,14 +439,14 @@ private void doReplaceAll(ActionEvent e) {
         GuiPackage guiPackage = GuiPackage.getInstance();
         boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
         int totalReplaced = 0;
-        Pair<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
-        Set<JMeterTreeNode> matchingNodes = result.getRight();
+        Map.Entry<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
+        Set<JMeterTreeNode> matchingNodes = result.getValue();
         Set<JMeterTreeNode> replacedNodes = new HashSet<>();
         for (JMeterTreeNode jMeterTreeNode : matchingNodes) {
-            Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(jMeterTreeNode, regex, wordToReplace, caseSensitiveReplacement);
+            Map.Entry<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(jMeterTreeNode, regex, wordToReplace, caseSensitiveReplacement);
             if(pair != null) {
-                totalReplaced += pair.getLeft();
-                replacedNodes.add(pair.getRight());
+                totalReplaced += pair.getKey();
+                replacedNodes.add(pair.getValue());
             }
         }
         statusLabel.setText(MessageFormat.format("Replaced {0} occurrences", totalReplaced));
@@ -465,9 +466,9 @@ private void doReplaceAll(ActionEvent e) {
      * @param regex Text to search (can be regex)
      * @param replaceBy Replacement text
      * @param caseSensitiveReplacement boolean if search is case sensitive
-     * @return null if no replacement occurred or Pair of (number of replacement, current tree node)
+     * @return null if no replacement occurred or Map.Entry of (number of replacement, current tree node)
      */
-    private static Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
+    private static Map.Entry<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
             String regex, String replaceBy, boolean caseSensitiveReplacement) {
         try {
             if (jMeterTreeNode.getUserObject() instanceof Replaceable) {
@@ -478,7 +479,7 @@ private static Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTr
                         logger.info("Replaced {} in element:{}", numberOfReplacements,
                                 ((TestElement) jMeterTreeNode.getUserObject()).getName());
                     }
-                    return Pair.of(numberOfReplacements, jMeterTreeNode);
+                    return Map.entry(numberOfReplacements, jMeterTreeNode);
                 }
             }
         } catch (Exception ex) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
index a41f6dd86f6..0d495197ba4 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
@@ -28,8 +28,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -91,7 +91,7 @@ private Map<String, Template> readTemplates() {
 
         final String[] templateFiles = TEMPLATE_FILES.split(",");
         for (String templateFile : templateFiles) {
-            if(!StringUtils.isEmpty(templateFile)) {
+            if (StringUtilities.isNotEmpty(templateFile)) {
                 final File file = new File(JMeterUtils.getJMeterHome(), templateFile);
                 try {
                     if(file.exists() && file.canRead()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java
index c52dec0d227..18d05db80d6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java
@@ -20,6 +20,7 @@
 import java.io.Serializable;
 
 import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
@@ -56,7 +57,7 @@ public void append(LogEvent logEvent) {
         if (instance != null) {
             final String serializedString = getStringLayout().toSerializable(logEvent);
 
-            if (serializedString != null && !serializedString.isEmpty()) {
+            if (StringUtilities.isNotEmpty(serializedString)) {
                 LogEventObject logEventObject = new LogEventObject(logEvent, serializedString);
                 instance.getLogEventBus().postEvent(logEventObject);
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
index c0f5f2c6984..a3bf9b8fe68 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
@@ -26,8 +26,7 @@
 import javax.swing.border.Border;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Class to render the test tree - sets the enabled/disabled versions of the icons
@@ -37,7 +36,7 @@ public class JMeterCellRenderer extends DefaultTreeCellRenderer {
 
     private static final int DEFAULT_LENGTH = 15;
 
-    private static final String BLANK = StringUtils.repeat(' ', DEFAULT_LENGTH);
+    private static final String BLANK = " ".repeat(DEFAULT_LENGTH);
 
     private static final Border RED_BORDER = BorderFactory.createLineBorder(Color.red);
     private static final Border BLUE_BORDER = BorderFactory.createLineBorder(Color.blue);
@@ -49,7 +48,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
             boolean leaf, int row, boolean p_hasFocus) {
         JMeterTreeNode node = (JMeterTreeNode) value;
         super.getTreeCellRendererComponent(tree,
-                JOrphanUtils.isBlank(node.getName()) ? BLANK : node.getName(),
+                StringUtilities.isBlank(node.getName()) ? BLANK : node.getName(),
                         sel, expanded, leaf, row, p_hasFocus);
         boolean enabled = node.isEnabled();
         ImageIcon ic = node.getIcon(enabled);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
index 908017795fe..41b8f7b0069 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
@@ -24,9 +24,9 @@
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.JMeterFileFilter;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,7 +203,7 @@ public static JFileChooser promptToOpenFile(Component parentComponent, String[]
 
     private static void setCurrentDirOnJFC(String... dirNames) {
         for (String dirName : dirNames) {
-            if (StringUtils.isBlank(dirName)) {
+            if (StringUtilities.isBlank(dirName)) {
                 continue;
             }
             File possibleDir = new File(dirName);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index 73a59b33b49..d30bc318a7c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -32,7 +32,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.JToolBar;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.UndoHistory;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
@@ -45,6 +44,8 @@
 import com.github.weisj.darklaf.icons.ThemedSVGIcon;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 
+import kotlin.text.StringsKt;
+
 /**
  * The JMeter main toolbar class
  *
@@ -159,7 +160,7 @@ private static Icon loadIcon(IconToolbarBean iconBean, String iconPath) throws U
         if (imageURL == null) {
             throw new IllegalArgumentException("No icon for: " + iconBean.getActionName());
         }
-        if (StringUtils.endsWithIgnoreCase(iconBean.getIconPath(), ".svg")) {
+        if (StringsKt.endsWith(iconBean.getIconPath(), ".svg", true)) {
             return new ThemedSVGIcon(imageURL.toURI(), iconBean.getWidth(), iconBean.getHeight());
         }
         return new ImageIcon(imageURL);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
index 1291c6627d5..c7922aff9f3 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
@@ -27,7 +27,7 @@
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -666,13 +666,13 @@ public static ReportGeneratorConfiguration loadFromProperties(
                 REPORT_GENERATOR_KEY_END_DATE, String.class);
 
         String rangeDateFormat = getOptionalProperty(props, REPORT_GENERATOR_KEY_RANGE_DATE_FORMAT, String.class);
-        if (StringUtils.isEmpty(rangeDateFormat)) {
+        if (StringUtilities.isEmpty(rangeDateFormat)) {
             rangeDateFormat = RANGE_DATE_FORMAT_DEFAULT;
         }
         SimpleDateFormat dateFormat = new SimpleDateFormat(rangeDateFormat, Locale.ENGLISH);
 
         try {
-            if(!StringUtils.isEmpty(startDateValue)) {
+            if (StringUtilities.isNotEmpty(startDateValue)) {
                 reportStartDate = dateFormat.parse(startDateValue);
                 configuration.setStartDate(reportStartDate);
             }
@@ -681,7 +681,7 @@ public static ReportGeneratorConfiguration loadFromProperties(
                     startDateValue, rangeDateFormat, e);
         }
         try {
-            if(!StringUtils.isEmpty(endDateValue)) {
+            if (StringUtilities.isNotEmpty(endDateValue)) {
                 reportEndDate = dateFormat.parse(endDateValue);
                 configuration.setEndDate(reportEndDate);
             }
@@ -728,8 +728,7 @@ public static ReportGeneratorConfiguration loadFromProperties(
      */
     public static Map<String, Long[]> getApdexPerTransactionParts(String apdexPerTransaction) {
         Map <String, Long[]> specificApdexes = new HashMap<>();
-        if (StringUtils.isEmpty(apdexPerTransaction) ||
-                apdexPerTransaction.trim().length() == 0) {
+        if (StringUtilities.isBlank(apdexPerTransaction)) {
             log.info("apdex_per_transaction is empty, not APDEX per transaction customization");
         } else {
             // data looks like : sample(\d+):1000|2000;samples12:3000|4000;scenar01-12:5000|6000
@@ -771,7 +770,7 @@ public void setReportTitle(String reportTitle) {
      * @return the filteredSamplesPattern
      */
     public Pattern getFilteredSamplesPattern() {
-        if(StringUtils.isEmpty(sampleFilter)) {
+        if (StringUtilities.isEmpty(sampleFilter)) {
             return null;
         }
         if(filteredSamplesPattern == null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
index b47fcb188cd..a661ead23fe 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
@@ -28,8 +28,8 @@
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.samplers.SampleEvent;
 import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.save.CSVSaveService;
@@ -116,9 +116,9 @@ private CsvSampleReader(File inputFile, SampleMetadata metadata,
         }
         boolean usingHeadersInCsv = true;
         if (metadata == null) {
-            Pair<Boolean, SampleMetadata> localMd = readMetadata(separator, useSaveSampleCfg);
-            this.metadata = localMd.getRight();
-            usingHeadersInCsv = localMd.getLeft();
+            Map.Entry<Boolean, SampleMetadata> localMd = readMetadata(separator, useSaveSampleCfg);
+            this.metadata = localMd.getValue();
+            usingHeadersInCsv = localMd.getKey();
         } else {
             this.metadata = metadata;
         }
@@ -135,7 +135,7 @@ private CsvSampleReader(File inputFile, SampleMetadata metadata,
         this.lastSampleRead = nextSample();
     }
 
-    private Pair<Boolean, SampleMetadata> readMetadata(char separator, boolean useSaveSampleCfg) {
+    private Map.Entry<Boolean, SampleMetadata> readMetadata(char separator, boolean useSaveSampleCfg) {
         try {
             SampleMetadata result;
             // Read first line
@@ -166,7 +166,7 @@ private Pair<Boolean, SampleMetadata> readMetadata(char separator, boolean useSa
                 result = new SampleMetaDataParser(separator).parse(line);
                 hasHeaders = true;
             }
-            return Pair.of(hasHeaders, result);
+            return Map.entry(hasHeaders, result);
         } catch (Exception e) {
             throw new SampleException("Could not read metadata !", e);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
index 5dcb5517ae4..4cbb1a8c036 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java
@@ -21,8 +21,6 @@
 import java.io.OutputStream;
 import java.io.Writer;
 
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.save.CSVSaveService;
 
 /**
@@ -117,7 +115,9 @@ public void setWriter(Writer writer) {
      * header information will be written in the middle of the file.
      */
     public void writeHeader() {
-        Validate.validState(writer != null, "No writer set! Call setWriter() first!");
+        if (writer == null) {
+            throw new IllegalStateException("No writer set! Call setWriter() first!");
+        }
         StringBuilder row = new StringBuilder();
         for (int i = 0; i < columnCount; i++) {
             row.append(metadata.getColumnName(i));
@@ -130,10 +130,12 @@ public void writeHeader() {
 
     @Override
     public long write(Sample sample) {
-        Validate.validState(writer != null, "No writer set! Call setWriter() first!");
+        if (writer == null) {
+            throw new IllegalStateException("No writer set! Call setWriter() first!");
+        }
         StringBuilder row = new StringBuilder();
         char[] specials = new char[] { separator,
-                CSVSaveService.QUOTING_CHAR, CharUtils.CR, CharUtils.LF };
+                CSVSaveService.QUOTING_CHAR, '\r', '\n' };
         for (int i = 0; i < columnCount; i++) {
             String data = sample.getData(i);
             row.append(CSVSaveService.quoteDelimiters(data, specials))
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java b/src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java
index 84f1f02f752..0e5526fb304 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java
@@ -19,8 +19,6 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * The class JsonUtil provides helper functions to generate Json.
  *
@@ -36,7 +34,7 @@ public final class JsonUtil {
      * @return the json string
      */
     public static String toJsonArray(final String... array) {
-        return '[' + StringUtils.join(array, ", ") + ']';
+        return '[' + String.join(", ", array) + ']';
     }
 
     /**
@@ -55,7 +53,7 @@ public static String toJsonObject(Map<String, String> map) {
                 array[index] = '"' + entry.getKey() + "\": " + entry.getValue();
                 index++;
             }
-            result += StringUtils.join(array, ", ");
+            result += String.join(", ", array);
         }
         return result + "}";
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
index 62ffac26fdf..efa09ff3114 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.report.core;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -139,7 +138,7 @@ public <T> T getData(Class<T> clazz, String name) {
      */
     @Override
     public String toString() {
-        return StringUtils.join(data, metadata.getSeparator());
+        return String.join(String.valueOf(metadata.getSeparator()), data);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index c066097810d..2728cb1e8e4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -23,7 +23,6 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.save.CSVSaveService;
 
@@ -226,6 +225,6 @@ public int ensureIndexOf(String col) {
      */
     @Override
     public String toString() {
-        return StringUtils.join(columns, separator);
+        return String.join(String.valueOf(separator), columns);
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
index d0f159a6a2a..f52bf191d63 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.report.dashboard;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.report.config.ConfigurationException;
 import org.apache.jmeter.report.config.SubConfiguration;
 import org.apache.jmeter.report.processor.MapResultData;
@@ -73,7 +72,7 @@ protected static <T> T findValue(Class<T> clazz, String data, ResultData root) {
      * @return the ResultData matching the data name
      */
     protected static ResultData findData(String data, ResultData root) {
-        String[] pathItems = StringUtils.split(data, '.');
+        String[] pathItems = data.split("\\.");
         if (pathItems == null || !(root instanceof MapResultData)) {
             return null;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index cdb25dc3a46..d36cc6a33f4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -28,7 +28,6 @@
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.report.config.ExporterConfiguration;
@@ -46,6 +45,7 @@
 import org.apache.jmeter.report.processor.graph.AbstractGraphConsumer;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -317,7 +317,7 @@ public void export(SampleContext context, File file,
         File outputDir = getPropertyFromConfig(exportCfg, OUTPUT_DIR,
                 new File(JMeterUtils.getJMeterBinDir(), OUTPUT_DIR_NAME_DEFAULT), File.class);
         String globallyDefinedOutputDir = JMeterUtils.getProperty(JMeter.JMETER_REPORT_OUTPUT_DIR_PROPERTY);
-        if(!StringUtils.isEmpty(globallyDefinedOutputDir)) {
+        if (StringUtilities.isNotEmpty(globallyDefinedOutputDir)) {
             outputDir = new File(globallyDefinedOutputDir);
         }
 
@@ -337,7 +337,7 @@ public void export(SampleContext context, File file,
         // Add the series filter to the context
         final String seriesFilter = exportCfg.getSeriesFilter();
         Pattern filterPattern = null;
-        if (StringUtils.isNotBlank(seriesFilter)) {
+        if (StringUtilities.isNotBlank(seriesFilter)) {
             try {
                 filterPattern = Pattern.compile(seriesFilter);
             } catch (PatternSyntaxException ex) {
@@ -428,7 +428,7 @@ public void export(SampleContext context, File file,
                 dataContext);
 
         // Add report title to the context
-        if (StringUtils.isNotEmpty(configuration.getReportTitle())) {
+        if (StringUtilities.isNotEmpty(configuration.getReportTitle())) {
             dataContext.put(DATA_CTX_REPORT_TITLE, StringEscapeUtils.escapeHtml4(configuration.getReportTitle()));
         }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index c942ee45eac..2b05ed26102 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.report.config.ExporterConfiguration;
 import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
@@ -36,6 +35,7 @@
 import org.apache.jmeter.report.processor.ValueResultData;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -107,7 +107,7 @@ private File checkAndGetOutputFolder(ReportGeneratorConfiguration reportGenerato
         File outputDir = getPropertyFromConfig(exportCfg, HtmlTemplateExporter.OUTPUT_DIR,
                 new File(JMeterUtils.getJMeterBinDir(), HtmlTemplateExporter.OUTPUT_DIR_NAME_DEFAULT), File.class);
         String globallyDefinedOutputDir = JMeterUtils.getProperty(JMeter.JMETER_REPORT_OUTPUT_DIR_PROPERTY);
-        if(!StringUtils.isEmpty(globallyDefinedOutputDir)) {
+        if (StringUtilities.isNotEmpty(globallyDefinedOutputDir)) {
             outputDir = new File(globallyDefinedOutputDir);
         }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
index 6fc9144ae06..72f1f703a38 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.report.processor;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -57,8 +56,7 @@ protected ListResultData createDataResult(String key, ApdexSummaryData data) {
         ApdexThresholdsInfo thresholdsInfo = data.getApdexThresholdInfo();
         Long satisfiedThreshold = thresholdsInfo.getSatisfiedThreshold();
         Long toleratedThreshold = thresholdsInfo.getToleratedThreshold();
-        String keyOrDefault = ObjectUtils.defaultIfNull(
-                key, JMeterUtils.getResString("reportgenerator_summary_total"));
+        String keyOrDefault = (key != null ? key : JMeterUtils.getResString("reportgenerator_summary_total"));
 
         ListResultData result = new ListResultData();
         result.addResult(new ValueResultData(apdex));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 904b6dc8126..0ccca5a3a0f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -24,7 +24,6 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.report.core.CsvSampleReader;
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.core.SampleException;
@@ -162,7 +161,9 @@ private static String time(long t) {
      */
     private void produce() {
         SampleContext context = getSampleContext();
-        Validate.validState(context != null, "Set a sample context before producing samples.");
+        if (context == null) {
+            throw new IllegalStateException("Set a sample context before producing samples.");
+        }
 
         for (int i = 0; i < csvReaders.length; i++) {
             long sampleCount = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index 982198b921f..139680380a3 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.report.processor;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 
@@ -93,16 +93,16 @@ static String getErrorKey(Sample sample) {
         }
         String responseCode = sample.getResponseCode();
         String responseMessage = sample.getResponseMessage();
-        String key = responseCode + (!StringUtils.isEmpty(responseMessage) ?
+        String key = responseCode + (StringUtilities.isNotEmpty(responseMessage) ?
                  "/" + escapeJson(responseMessage) : "");
 
         if (MetricUtils.isSuccessCode(responseCode) ||
-                (StringUtils.isEmpty(responseCode) &&
-                   StringUtils.isNotBlank(sample.getFailureMessage()))) {
+                (StringUtilities.isEmpty(responseCode) &&
+                   StringUtilities.isNotBlank(sample.getFailureMessage()))) {
             key = MetricUtils.ASSERTION_FAILED;
             if (ASSERTION_RESULTS_FAILURE_MESSAGE) {
                 String msg = sample.getFailureMessage();
-                if (StringUtils.isNotBlank(msg)) {
+                if (StringUtilities.isNotBlank(msg)) {
                     key = escapeJson(msg);
                 }
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
index d049e3671a8..3ca6c2fa2e4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java
@@ -30,7 +30,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.report.core.CsvFile;
 import org.apache.jmeter.report.core.CsvSampleReader;
 import org.apache.jmeter.report.core.CsvSampleWriter;
@@ -271,8 +270,9 @@ private void sort(CsvSampleReader csvReader, File output,
 
     @Override
     public void startConsuming() {
-        Validate.validState(sampleComparator != null,
-                "sampleComparator is not set, call setSampleComparator() first.");
+        if (sampleComparator == null) {
+            throw new IllegalStateException("sampleComparator is not set, call setSampleComparator() first.");
+        }
 
         File workDir = getWorkingDirectory();
         workDir.mkdir();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
index 1b3c871c465..ce812820f42 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
@@ -19,7 +19,8 @@
 
 import java.util.Arrays;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
+
 
 /**
  * The class AbstractSeriesSelector provide an abstract base class for
@@ -66,6 +67,6 @@ public final boolean allowsControllersDiscrimination() {
      * @return input or default value wrapped in a list
      */
     protected Iterable<String> withDefaultIfEmpty(String value, String defaultValue) {
-        return Arrays.asList(StringUtils.defaultIfBlank(value, defaultValue));
+        return Arrays.asList(StringUtilities.isBlank(value) ? defaultValue : value);
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
index 48eb9a023cf..72420a3585e 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.report.core.ConvertException;
 import org.apache.jmeter.report.core.Converters;
 import org.apache.jmeter.report.core.Sample;
@@ -38,6 +37,7 @@
 import org.apache.jmeter.report.processor.graph.GroupInfo;
 import org.apache.jmeter.report.processor.graph.TimeStampKeysSelector;
 import org.apache.jmeter.save.CSVSaveService;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * The class CustomGraphConsumer is added by the custom Graphs plugin.
@@ -208,7 +208,7 @@ public Iterable<String> select(Sample sample) {
                         + CSVSaveService.VARIABLE_NAME_QUOTE_CHAR);
             }
 
-            if (StringUtils.isEmpty(value) || "null".equals(value)) {
+            if (StringUtilities.isEmpty(value) || "null".equals(value)) {
                 return null;
             }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java b/src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java
index b8ded8490d4..1c2b2f75047 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.report.utils;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * @since 5.0
@@ -41,7 +41,7 @@ private MetricUtils() {
      * @return whether in range 200-399 or not
      */
     public static boolean isSuccessCode(String codeAsString) {
-        if (StringUtils.isNumeric(codeAsString)) {
+        if (StringUtilities.isNumeric(codeAsString)) {
             try {
                 int code = Integer.parseInt(codeAsString);
                 return isSuccessCode(code);
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
index 0138e1c2528..25a90d49ea8 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
@@ -51,6 +51,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.Visualizer;
 import org.apache.jorphan.util.JMeterError;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -438,7 +439,7 @@ private static void writeFileEnd(PrintWriter pw, SampleSaveConfiguration saveCon
 
     private static PrintWriter getFileWriter(final String pFilename, SampleSaveConfiguration saveConfig)
             throws IOException {
-        if (pFilename == null || pFilename.length() == 0) {
+        if (StringUtilities.isEmpty(pFilename)) {
             return null;
         }
         if(log.isDebugEnabled()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java b/src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java
index c9a849e2d8d..b73e8a43540 100644
--- a/src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java
@@ -23,9 +23,8 @@
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,12 +84,11 @@ public static RMIClientSocketFactory createClientSocketFactory() {
             log.info("Disabling SSL for RMI as server.rmi.ssl.disable is set to 'true'");
             return null;
         }
-        if (StringUtils.isBlank(KEYSTORE_FILE)) {
-            Validate.validState(SSL_DISABLED,
+        if (StringUtilities.isBlank(KEYSTORE_FILE)) {
+            throw new IllegalStateException(
                     "No keystore for RMI over SSL specified. Set 'server.rmi.ssl.disable' to true, if this is intentional,"
                     + "if not run create-rmi-keystore.bat/create-rmi-keystore.sh to create a keystore and distribute it on client and servers"
                     + "used for distributed testing.");
-            return null;
         }
         final SSLRMIClientSocketFactory factory = new SSLRMIClientSocketFactory();
         factory.setAlias(KEYSTORE_ALIAS);
@@ -104,10 +102,9 @@ public static RMIServerSocketFactory createServerSocketFactory() throws RemoteEx
             log.info("Disabling SSL for RMI as server.rmi.ssl.disable is set to 'true'");
             return null;
         }
-        if (StringUtils.isBlank(KEYSTORE_FILE)) {
-            Validate.validState(SSL_DISABLED,
+        if (StringUtilities.isBlank(KEYSTORE_FILE)) {
+            throw new IllegalStateException(
                     "No keystore for RMI over SSL specified. Set 'server.rmi.ssl.disable' to true, if this is intentional.");
-            return new RMIServerSocketFactoryImpl(getRmiHost());
         }
         SSLRMIServerSocketFactory factory = new SSLRMIServerSocketFactory(getRmiHost());
         factory.setAlias(KEYSTORE_ALIAS);
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index 66589162432..4f69f05105c 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -35,6 +35,7 @@
 import org.apache.jmeter.threads.JMeterContext.TestLogicalAction;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1003,7 +1004,7 @@ public String getDataEncodingWithDefault() {
      * @return the value of the dataEncoding or the provided default
      */
     protected String getDataEncodingWithDefault(String defaultEncoding) {
-        if (dataEncoding != null && dataEncoding.length() > 0) {
+        if (StringUtilities.isNotEmpty(dataEncoding)) {
             return dataEncoding;
         }
         return defaultEncoding;
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
index 2aff60a108f..a3b3019cadf 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
@@ -20,17 +20,17 @@
 import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.CharUtils;
 import org.apache.jorphan.util.JMeterError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -300,11 +300,11 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
         String dlm = JMeterUtils.getDelimiter(props.getProperty(DEFAULT_DELIMITER_PROP, DEFAULT_DELIMITER));
         char ch = dlm.charAt(0);
 
-        if (CharUtils.isAsciiAlphanumeric(ch) || ch == CSVSaveService.QUOTING_CHAR){
+        if ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch == CSVSaveService.QUOTING_CHAR){
             throw new JMeterError("Delimiter '"+ch+"' must not be alphanumeric or "+CSVSaveService.QUOTING_CHAR+".");
         }
 
-        if (ch != '\t' && !CharUtils.isAsciiPrintable(ch)){
+        if (ch != '\t' && !CharUtils.isAscii(ch)){
             throw new JMeterError("Delimiter (code "+(int)ch+") must be printable.");
         }
 
@@ -478,12 +478,12 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
     private transient String dateFormat = DATE_FORMAT;
 
     /** A formatter for the time stamp.
-     * Make transient as we don't want to save the FastDateFormat class
+     * Make transient as we don't want to save the DateTimeFormatter class
      * Also, there's currently no way to change the value via the GUI, so changing it
      * later means editing the JMX, or recreating the Listener.
      */
-    private transient FastDateFormat timestampFormatter =
-        dateFormat != null ? FastDateFormat.getInstance(dateFormat) : null;
+    private transient DateTimeFormatter timestampFormatter =
+        dateFormat != null ? DateTimeFormatter.ofPattern(dateFormat) : null;
 
     // Don't save this, as not settable via GUI
     private String delimiter = DELIMITER;
@@ -598,7 +598,7 @@ private Object readResolve(){
     private void setupDateFormat(String pDateFormat) {
         this.dateFormat = pDateFormat;
         if(dateFormat != null) {
-            this.timestampFormatter = FastDateFormat.getInstance(dateFormat);
+            this.timestampFormatter = DateTimeFormatter.ofPattern(dateFormat);
         } else {
             this.timestampFormatter = null;
         }
@@ -609,7 +609,7 @@ public Object clone() {
         try {
             SampleSaveConfiguration clone = (SampleSaveConfiguration)super.clone();
             if(this.dateFormat != null) {
-                clone.timestampFormatter = (FastDateFormat)this.threadSafeLenientFormatter().clone();
+                clone.timestampFormatter = this.threadSafeLenientFormatter();
             }
             return clone;
         }
@@ -963,14 +963,14 @@ public DateFormat strictDateFormatter() {
     }
 
     /**
-     * @return {@link FastDateFormat} Thread safe lenient formatter
+     * @return {@link DateTimeFormatter} Thread safe lenient formatter
      */
-    public FastDateFormat threadSafeLenientFormatter() {
+    public DateTimeFormatter threadSafeLenientFormatter() {
         // When restored by XStream threadSafeLenientFormatter may not have
         // been initialized
         if(timestampFormatter == null) {
             timestampFormatter =
-                    dateFormat != null ? FastDateFormat.getInstance(dateFormat) : null;
+                    dateFormat != null ? DateTimeFormatter.ofPattern(dateFormat) : null;
         }
         return timestampFormatter;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index adece7104fe..76907e81e78 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -31,6 +31,8 @@
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -40,8 +42,6 @@
 import javax.swing.table.DefaultTableModel;
 
 import org.apache.commons.collections4.map.LinkedMap;
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.reporters.ResultCollector;
 import org.apache.jmeter.samplers.SampleEvent;
 import org.apache.jmeter.samplers.SampleResult;
@@ -769,8 +769,8 @@ static final class StringQuoter {
 
         public StringQuoter(char delim) {
             sb = new StringBuilder(150);
-            specials = new char[] { delim, QUOTING_CHAR, CharUtils.CR,
-                    CharUtils.LF };
+            specials = new char[] { delim, QUOTING_CHAR, '\r',
+                    '\n' };
             addDelim = false; // Don't add delimiter first time round
         }
 
@@ -854,7 +854,7 @@ public static String resultToDelimitedString(SampleEvent event,
                 text.append(sample.getTimeStamp());
             } else if (saveConfig.threadSafeLenientFormatter() != null) {
                 String stamp = saveConfig.threadSafeLenientFormatter().format(
-                        new Date(sample.getTimeStamp()));
+                        Instant.ofEpochMilli(sample.getTimeStamp()).atZone(ZoneId.systemDefault()));
                 text.append(stamp);
             }
         }
@@ -983,7 +983,7 @@ public static String resultToDelimitedString(SampleEvent event,
      * contains a special character, <code>null</code> for null string input
      */
     public static String quoteDelimiters(String input, char[] specialChars) {
-        if (StringUtils.containsNone(input, specialChars)) {
+        if (containsNone(input, specialChars)) {
             return input;
         }
         StringBuilder buffer = new StringBuilder(input.length() + 10);
@@ -1000,6 +1000,28 @@ public static String quoteDelimiters(String input, char[] specialChars) {
         return buffer.toString();
     }
 
+    /**
+     * Helper method to check if a string contains none of the specified characters.
+     *
+     * @param str the string to check
+     * @param chars the characters to look for
+     * @return true if the string contains none of the characters, false otherwise
+     */
+    private static boolean containsNone(String str, char[] chars) {
+        if (str == null) {
+            return true;
+        }
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            for (char ch : chars) {
+                if (c == ch) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     // State of the parser
     private enum ParserState {INITIAL, PLAIN, QUOTED, EMBEDDEDQUOTE}
 
diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
index bfc3d0b57c7..6aba447dfb6 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
@@ -37,16 +37,16 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.jmeter.reporters.ResultCollectorHelper;
 import org.apache.jmeter.samplers.SampleEvent;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.NameUpdater;
 import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.apache.jorphan.util.JMeterError;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -358,7 +358,7 @@ public static synchronized void saveSampleResult(SampleEvent evt, Writer writer)
      */
     private static String showDebuggingInfo(SampleResult result) {
         try {
-            return "class:"+result.getClass()+",content:"+ToStringBuilder.reflectionToString(result);
+            return "class:"+result.getClass()+",content:"+result.toString();
         } catch(Exception e) {
             return "Exception occurred creating debug from event, message:"+e.getMessage();
         }
@@ -461,6 +461,7 @@ private static HashTree readTree(InputStream inputStream, File file)
         }
 
     }
+
     private static InputStreamReader getInputStreamReader(InputStream inStream) {
         // Check if we have a encoding to use from properties
         Charset charset = getFileEncodingCharset();
@@ -481,7 +482,7 @@ private static OutputStreamWriter getOutputStreamWriter(OutputStream outStream)
      */
     // Used by ResultCollector when creating output files
     public static String getFileEncoding(String dflt){
-        if(fileEncoding != null && fileEncoding.length() > 0) {
+        if (StringUtilities.isNotEmpty(fileEncoding)) {
             return fileEncoding;
         }
         else {
@@ -492,7 +493,7 @@ public static String getFileEncoding(String dflt){
     // @NotNull
     private static Charset getFileEncodingCharset() {
         // Check if we have a encoding to use from properties
-        if(fileEncoding != null && fileEncoding.length() > 0) {
+        if (StringUtilities.isNotEmpty(fileEncoding)) {
             return Charset.forName(fileEncoding);
         }
         else {
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
index 419457260d5..b9bf040d9d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
@@ -24,6 +24,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.save.TestResultWrapper;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -83,7 +84,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         TestResultWrapper results = new TestResultWrapper();
         Collection<SampleResult> samples = new ArrayList<>();
         String ver = reader.getAttribute("version");  //$NON-NLS-1$
-        if (ver == null || ver.length() == 0) {
+        if (StringUtilities.isEmpty(ver)) {
             ver = "1.0";  //$NON-NLS-1$
         }
         results.setVersion(ver);
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index efd4ad781c6..05e383e6790 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -38,7 +38,7 @@
 import org.apache.jmeter.gui.JMeterFileFilter;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -252,7 +252,7 @@ public void reserveFile(String filename, String charsetName, String alias) {
      * @throws IllegalArgumentException if header could not be read or filename is null or empty
      */
     public synchronized String reserveFile(String filename, String charsetName, String alias, boolean hasHeader) {
-        if (filename == null || filename.isEmpty()){
+        if (StringUtilities.isEmpty(filename)){
             throw new IllegalArgumentException("Filename must not be null or empty");
         }
         if (alias == null){
@@ -428,7 +428,7 @@ private static BufferedReader createBufferedReader(FileEntry fileEntry) throws I
         InputStreamReader isr = null;
         // If file encoding is specified, read using that encoding, otherwise use default platform encoding
         String charsetName = fileEntry.charSetEncoding;
-        if(!JOrphanUtils.isBlank(charsetName)) {
+        if (StringUtilities.isNotBlank(charsetName)) {
             isr = new InputStreamReader(fis, charsetName);
         } else if (fis.hasBOM()) {
             isr = new InputStreamReader(fis, fis.getBOM().getCharsetName());
@@ -461,7 +461,7 @@ private static BufferedWriter createBufferedWriter(FileEntry fileEntry) throws I
         OutputStreamWriter osw;
         // If file encoding is specified, write using that encoding, otherwise use default platform encoding
         String charsetName = fileEntry.charSetEncoding;
-        if(!JOrphanUtils.isBlank(charsetName)) {
+        if (StringUtilities.isNotBlank(charsetName)) {
             osw = new OutputStreamWriter(fos, charsetName);
         } else {
             @SuppressWarnings("DefaultCharset")
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
index dcb95e9b289..4bf70be892b 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
@@ -30,7 +30,6 @@
 import javax.swing.JComboBox;
 import javax.swing.text.JTextComponent;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -109,7 +108,7 @@ class ComboStringEditor extends PropertyEditorSupport implements ItemListener, C
 
     ComboStringEditor(String []pTags, boolean noEdit, boolean noUndefined, ResourceBundle rb) {
 
-        tags = pTags == null ? ArrayUtils.EMPTY_STRING_ARRAY : pTags.clone();
+        tags = pTags == null ? new String[0] : pTags.clone();
 
         model = new DefaultComboBoxModel<>();
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
index 1923b161c26..e053e9d2090 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
@@ -39,7 +39,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
 
-import org.apache.commons.lang3.ClassUtils;
 import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.testbeans.TestBeanHelper;
 import org.apache.jmeter.util.JMeterUtils;
@@ -333,7 +332,7 @@ private static void validateAttributes(PropertyDescriptor pd, PropertyEditor pe)
         } else {
             final Class<?> defltClass = deflt.getClass(); // the DEFAULT class
             // Convert int to Integer etc:
-            final Class<?> propClass = ClassUtils.primitiveToWrapper(pd.getPropertyType());
+            final Class<?> propClass = primitiveToWrapper(pd.getPropertyType());
             if (!propClass.isAssignableFrom(defltClass) ){
                 if (log.isWarnEnabled()) {
                     log.warn("{} has a DEFAULT of class {}", getDetails(pd), defltClass.getCanonicalName());
@@ -360,6 +359,43 @@ private static void validateAttributes(PropertyDescriptor pd, PropertyEditor pe)
         }
     }
 
+    /**
+     * Convert primitive class to its wrapper class.
+     * @param cls the class to convert
+     * @return wrapper class for primitives, or the class itself if not primitive
+     */
+    private static Class<?> primitiveToWrapper(Class<?> cls) {
+        if (cls == null || !cls.isPrimitive()) {
+            return cls;
+        }
+        Class<?> res = null;
+        if (cls == boolean.class) {
+            res = Boolean.class;
+        }
+        if (cls == byte.class) {
+            res = Byte.class;
+        }
+        if (cls == char.class) {
+            res = Character.class;
+        }
+        if (cls == short.class) {
+            res = Short.class;
+        }
+        if (cls == int.class) {
+            res = Integer.class;
+        }
+        if (cls == long.class) {
+            res = Long.class;
+        }
+        if (cls == float.class) {
+            res = Float.class;
+        }
+        if (cls == double.class) {
+            res = Double.class;
+        }
+        return res;
+    }
+
     /**
      * Identify the property from the descriptor.
      *
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
index 71e8794da91..f5a5998120d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
@@ -43,13 +43,13 @@
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -226,7 +226,7 @@ void initializeModel()
                 throw new RuntimeException("attribute OBJECT_PROPERTIES must be a String array");
             }
             List<String> props = Arrays.stream((String[]) value)
-                    .map(StringUtils::capitalize)
+                    .map(StringUtilities::capitalize)
                     .collect(Collectors.toList());
             Functor[] writers = createWriters(props);
             Functor[] readers = createReaders(clazz, props);
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
index b73f8359c60..4f9058ef5f4 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
@@ -29,6 +29,7 @@
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -236,7 +237,7 @@ public void testEnded(String host) {
      */
     @Override
     public void testStarted() {
-        if (getBasedir() != null && getBasedir().length() > 0) {
+        if (StringUtilities.isNotEmpty(getBasedir())) {
             try {
                 FileServer.getFileServer().setBasedir(FileServer.getFileServer().getBaseDir() + getBasedir());
             } catch (IllegalStateException e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
index 8166c4b8271..8e974dccabf 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java
@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -108,7 +109,7 @@ public AbstractProperty clone() {
     @Override
     public int getIntValue() {
         String val = getStringValue();
-        if (val == null || val.isEmpty()) {
+        if (StringUtilities.isEmpty(val)) {
             return 0;
         }
         try {
@@ -126,7 +127,7 @@ public int getIntValue() {
     @Override
     public long getLongValue() {
         String val = getStringValue();
-        if (val == null || val.isEmpty()) {
+        if (StringUtilities.isEmpty(val)) {
             return 0;
         }
         try {
@@ -144,7 +145,7 @@ public long getLongValue() {
     @Override
     public double getDoubleValue() {
         String val = getStringValue();
-        if (val == null || val.isEmpty()) {
+        if (StringUtilities.isEmpty(val)) {
             return 0;
         }
         try {
@@ -163,7 +164,7 @@ public double getDoubleValue() {
     @Override
     public float getFloatValue() {
         String val = getStringValue();
-        if (val == null || val.isEmpty()) {
+        if (StringUtilities.isEmpty(val)) {
             return 0;
         }
         try {
@@ -182,7 +183,7 @@ public float getFloatValue() {
     @Override
     public boolean getBooleanValue() {
         String val = getStringValue();
-        if (val == null || val.isEmpty()) {
+        if (StringUtilities.isEmpty(val)) {
             return false;
         }
         return Boolean.parseBoolean(val.trim());
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
index 1e0869b9297..e50ad150034 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
@@ -20,8 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jorphan.util.JMeterException;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,7 +72,7 @@ private void init() {
                 log.warn("Can't set logger variable", e);
             }
         }
-        if (StringUtils.isNotBlank(initFile)) {
+        if (StringUtilities.isNotBlank(initFile)) {
             String fileToUse=initFile;
             // Check file so we can distinguish file error from script error
             File in = new File(fileToUse);
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 32f8f2be718..47912cc3d1e 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -40,6 +40,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.ResourceBundle;
@@ -57,8 +58,6 @@
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.gui.JFactory;
@@ -68,6 +67,7 @@
 import org.apache.jorphan.test.UnitTestManager;
 import org.apache.jorphan.util.JMeterError;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.PatternCacheLRU;
 import org.apache.oro.text.regex.Pattern;
@@ -108,13 +108,13 @@ private static final class LazyJavaPatternCacheHolder {
         private LazyJavaPatternCacheHolder() {
             super();
         }
-        public static final LoadingCache<Pair<String, Integer>, java.util.regex.Pattern> INSTANCE =
+        public static final LoadingCache<Map.Entry<String, Integer>, java.util.regex.Pattern> INSTANCE =
                 Caffeine
                         .newBuilder()
                         .maximumSize(getPropDefault("jmeter.regex.patterncache.size", 1000))
                         .build(key -> {
                             //noinspection MagicConstant
-                            return java.util.regex.Pattern.compile(key.getLeft(), key.getRight().intValue());
+                            return java.util.regex.Pattern.compile(key.getKey(), key.getValue().intValue());
                         });
     }
 
@@ -281,7 +281,7 @@ public static java.util.regex.Pattern compilePattern(String expression) {
     }
 
     public static java.util.regex.Pattern compilePattern(String expression, int flags) {
-        return LazyJavaPatternCacheHolder.INSTANCE.get(Pair.of(expression, Integer.valueOf(flags)));
+        return LazyJavaPatternCacheHolder.INSTANCE.get(Map.entry(expression, Integer.valueOf(flags)));
     }
 
     public static PatternCacheLRU getPatternCache() {
@@ -821,7 +821,7 @@ public static boolean getPropDefault(String propName, boolean defaultVal) {
     public static String[] getArrayPropDefault(String propName, String[] defaultVal) {
         try {
             String strVal = appProperties.getProperty(propName);
-            if (StringUtils.isNotBlank(strVal)) {
+            if (StringUtilities.isNotBlank(strVal)) {
                 return strVal.trim().split("\\s+");
             }
         } catch (Exception e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index 19cc910da2c..c41e9f755a5 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -33,7 +33,6 @@
 import javax.script.ScriptException;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.TestStateListener;
@@ -41,6 +40,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -125,7 +125,7 @@ protected ScriptEngine getScriptEngine() throws ScriptException {
      */
     private String getScriptLanguageWithDefault() {
         String lang = getScriptLanguage();
-        if (StringUtils.isNotEmpty(lang)) {
+        if (StringUtilities.isNotEmpty(lang)) {
             return lang;
         }
         return DEFAULT_SCRIPT_LANGUAGE;
@@ -189,7 +189,7 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
         boolean supportsCompilable = scriptEngine instanceof Compilable
                 && !"bsh.engine.BshScriptEngine".equals(scriptEngine.getClass().getName()); // NOSONAR // $NON-NLS-1$
         try {
-            if (!StringUtils.isEmpty(filename)) {
+            if (StringUtilities.isNotEmpty(filename)) {
                 if (!scriptFile.isFile()) {
                     throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
                             + "' is not a file for JSR223 element named: " + getName());
@@ -216,7 +216,7 @@ protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings p
                 return compiledScript.eval(bindings);
             }
             String script = getScript();
-            if (!StringUtils.isEmpty(script)) {
+            if (StringUtilities.isNotEmpty(script)) {
                 if (supportsCompilable &&
                         !ScriptingBeanInfoSupport.FALSE_AS_STRING.equals(cacheKey)) {
                     computeScriptMD5(script);
@@ -282,7 +282,7 @@ public boolean compile()
         if(!supportsCompilable) {
             return true;
         }
-        if (!StringUtils.isEmpty(getScript())) {
+        if (!(getScript() == null || getScript().isEmpty())) {
             try {
                 ((Compilable) scriptEngine).compile(getScript());
                 return true;
diff --git a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
index 4cd789485f1..f2c0cdd2326 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.xml.utils.PrefixResolver;
 import org.apache.xml.utils.PrefixResolverDefault;
 import org.slf4j.Logger;
@@ -43,7 +43,7 @@ public class PropertiesBasedPrefixResolver extends PrefixResolverDefault {
     private static final Map<String, String> NAMESPACE_MAP = new HashMap<>();
     static {
         String pathToNamespaceConfig = JMeterUtils.getPropDefault(XPATH_NAMESPACE_CONFIG, "");
-        if(!StringUtils.isEmpty(pathToNamespaceConfig)) {
+        if (StringUtilities.isNotEmpty(pathToNamespaceConfig)) {
             Properties properties = new Properties();
             InputStream inputStream = null;
             try {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java b/src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java
index ebb3e5da86d..77ad1368d25 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java
@@ -17,6 +17,11 @@
 
 package org.apache.jmeter.util;
 
+import org.apache.jorphan.util.JOrphanUtils;
+import org.apiguardian.api.API;
+
+@Deprecated
+@API(since = "6.0.0", status = API.Status.DEPRECATED)
 public final class StringUtilities {
 
     /**
@@ -36,17 +41,9 @@ private StringUtilities() {
      * @param sub - replacement
      * @return the updated string
      */
+    @Deprecated
+    @API(since = "6.0.0", status = API.Status.DEPRECATED)
     public static String substitute(final String input, final String pattern, final String sub) {
-        StringBuilder ret = new StringBuilder(input.length());
-        int start = 0;
-        int index = -1;
-        final int length = pattern.length();
-        while ((index = input.indexOf(pattern, start)) >= start) {
-            ret.append(input.substring(start, index));
-            ret.append(sub);
-            start = index + length;
-        }
-        ret.append(input.substring(start));
-        return ret.toString();
+        return JOrphanUtils.substitute(input, pattern, sub);
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java b/src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java
index 61eb0b3620d..d185aa21b4d 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java
@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.jmeter.util.XPathUtil.XPathCacheKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,15 +35,15 @@
  * Return the compiled XPathQuery with the associated
  * namespaces.
  */
-public class XPathQueryCacheLoader implements CacheLoader<ImmutablePair<String, String>, XPathExecutable> {
+public class XPathQueryCacheLoader implements CacheLoader<XPathCacheKey, XPathExecutable> {
 
     private static final Logger log = LoggerFactory.getLogger(XPathQueryCacheLoader.class);
 
     @Override
-    public XPathExecutable load(ImmutablePair<String, String> key)
+    public XPathExecutable load(XPathCacheKey key)
             throws Exception {
-        String xPathQuery = key.left;
-        String namespacesString = key.right;
+        String xPathQuery = key.query();
+        String namespacesString = key.namespaces();
 
         Processor processor = XPathUtil.getProcessor();
         XPathCompiler xPathCompiler = processor.newXPathCompiler();
diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
index e8deab16ebf..7a9865f7ca0 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
@@ -46,9 +46,8 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.jmeter.assertions.AssertionResult;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.xml.utils.PrefixResolver;
 import org.apache.xpath.XPathAPI;
 import org.apache.xpath.objects.XObject;
@@ -81,9 +80,14 @@
  */
 public class XPathUtil {
 
+    /**
+     * Simple record to hold a pair of values for cache keys.
+     */
+    public record XPathCacheKey(String query, String namespaces) {}
+
     private static final Logger log = LoggerFactory.getLogger(XPathUtil.class);
 
-    private static final LoadingCache<ImmutablePair<String, String>, XPathExecutable> XPATH_CACHE;
+    private static final LoadingCache<XPathCacheKey, XPathExecutable> XPATH_CACHE;
     static {
         final int cacheSize = JMeterUtils.getPropDefault(
                 "xpath2query.parser.cache.size", 400);
@@ -419,11 +423,11 @@ public static void putValuesForXPathInListUsingSaxon(
             throws SaxonApiException, FactoryConfigurationError {
 
         // generating the cache key
-        final ImmutablePair<String, String> key = ImmutablePair.of(xPathQuery, namespaces);
+        final XPathCacheKey key = new XPathCacheKey(xPathQuery, namespaces);
 
         //check the cache
         XPathExecutable xPathExecutable;
-        if(StringUtils.isNotEmpty(xPathQuery)) {
+        if (StringUtilities.isNotEmpty(xPathQuery)) {
             xPathExecutable = XPATH_CACHE.get(key);
         }
         else {
@@ -522,7 +526,7 @@ public static List<String[]> getNamespaces(String xml)
             throws XMLStreamException, FactoryConfigurationError{
         List<String[]> res= new ArrayList<>();
         XMLStreamReader reader;
-        if(StringUtils.isNotEmpty(xml)) {
+        if (StringUtilities.isNotEmpty(xml)) {
             reader = XMLInputFactory.newFactory().createXMLStreamReader(new StringReader(xml));
             while (reader.hasNext()) {
                 int event = reader.next();
@@ -674,10 +678,10 @@ public static void computeAssertionResult(AssertionResult result,
    public static void computeAssertionResultUsingSaxon(AssertionResult result, String xmlFile, String xPathQuery,
            String namespaces, Boolean isNegated) throws SaxonApiException, FactoryConfigurationError {
        // generating the cache key
-       final ImmutablePair<String, String> key = ImmutablePair.of(xPathQuery, namespaces);
+       final XPathCacheKey key = new XPathCacheKey(xPathQuery, namespaces);
        // check the cache
        XPathExecutable xPathExecutable;
-       if (StringUtils.isNotEmpty(xPathQuery)) {
+       if (StringUtilities.isNotEmpty(xPathQuery)) {
            xPathExecutable = XPATH_CACHE.get(key);
        } else {
            log.warn("Error : {}", JMeterUtils.getResString("xpath2_extractor_empty_query"));
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index e93e720eb4c..14212d0c5fa 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -40,9 +40,8 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -226,7 +225,7 @@ private static void logDetailsOnKeystore(KeyStore keystore) {
     }
 
     private static String decodeSanList(Collection<? extends List<?>> subjectAlternativeNames) {
-        List<Pair<String, String>> decodedEntries = new ArrayList<>();
+        List<Map.Entry<String, String>> decodedEntries = new ArrayList<>();
         for (List<?> entry : subjectAlternativeNames) {
             Object indexData = entry.get(0);
             Object data = entry.get(1);
@@ -234,7 +233,7 @@ private static String decodeSanList(Collection<? extends List<?>> subjectAlterna
                 Integer generalNameIndex = (Integer) indexData;
                 String description = sanGeneralNameIndexToName(generalNameIndex);
                 String valueString = sanDataToString(data);
-                decodedEntries.add(Pair.of(description, valueString));
+                decodedEntries.add(Map.entry(description, valueString));
             }
         }
         return decodedEntries.stream()
@@ -304,9 +303,9 @@ public X509Certificate[] getCertificateChain(String alias) {
      *                                  is not empty and no key for this alias could be found
      */
     public String getAlias() {
-        if (StringUtils.isNotEmpty(clientCertAliasVarName)) {
+        if (StringUtilities.isNotEmpty(clientCertAliasVarName)) {
             String aliasName = JMeterContextService.getContext().getVariables().get(clientCertAliasVarName);
-            if (StringUtils.isEmpty(aliasName)) {
+            if (StringUtilities.isEmpty(aliasName)) {
                 log.error("No var called '{}' found", clientCertAliasVarName);
                 throw new IllegalArgumentException("No var called '" + clientCertAliasVarName + "' found");
             }
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
index b208ce05bd4..0735445a2ff 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
@@ -153,7 +153,6 @@ public void testFormatter() throws Exception {
         assertTrue(a.equals(b), "Objects should be equal");
         assertTrue(b.equals(a), "Objects should be equal");
         assertTrue(a.strictDateFormatter().equals(b.strictDateFormatter()), "Objects should be equal");
-        assertTrue(a.threadSafeLenientFormatter().equals(b.threadSafeLenientFormatter()), "Objects should be equal");
     }
 
     @Test
diff --git a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
index f433c492514..1beb45840c2 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
@@ -19,10 +19,10 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.apache.commons.lang3.JavaVersion;
 import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 public class JSR223TestElementTest {
 
@@ -31,11 +31,8 @@ public class JSR223TestElementTest {
     };
 
     @Test
+    @DisabledForJreRange(min = JRE.JAVA_15, max = JRE.OTHER, disabledReason = "The default JavaScript engine has been removed in Java 15+")
     public void testGetScriptEngineJS() throws Exception {
-        Assumptions.assumeTrue(
-                JavaVersion.JAVA_RECENT.atMost(JavaVersion.JAVA_14),
-                "The default JavaScript engine has been removed in Java 15+, current Java is " + JavaVersion.JAVA_RECENT
-        );
         element.setScriptLanguage("JavaScript");
         assertThat(element.getScriptEngine().getFactory().getLanguageName(),
                 CoreMatchers.containsString("Script"));
diff --git a/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java b/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
index eeb1558d163..ac71d01bc1b 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.apache.jorphan.util.JOrphanUtils;
 import org.junit.jupiter.api.Test;
 
 public class StringUtilitiesTest {
@@ -36,7 +37,7 @@ public void testSub1() throws Exception {
         String input = "http://jakarta.apache.org/jmeter/index.html";
         String pattern = "jakarta.apache.org";
         String sub = "${server}";
-        assertEquals("http://${server}/jmeter/index.html", StringUtilities.substitute(input, pattern, sub));
+        assertEquals("http://${server}/jmeter/index.html", JOrphanUtils.substitute(input, pattern, sub));
     }
 
     @Test
@@ -44,7 +45,7 @@ public void testSub2() throws Exception {
         String input = "arg1=param1;param1";
         String pattern = "param1";
         String sub = "${value}";
-        assertEquals("arg1=${value};${value}", StringUtilities.substitute(input, pattern, sub));
+        assertEquals("arg1=${value};${value}", JOrphanUtils.substitute(input, pattern, sub));
     }
 
     @Test
@@ -52,7 +53,7 @@ public void testSub3() throws Exception {
         String input = "jakarta.apache.org";
         String pattern = "jakarta.apache.org";
         String sub = "${server}";
-        assertEquals("${server}", StringUtilities.substitute(input, pattern, sub));
+        assertEquals("${server}", JOrphanUtils.substitute(input, pattern, sub));
     }
 
     @Test
@@ -60,7 +61,7 @@ public void testSub4() throws Exception {
         String input = "//a///b////c";
         String pattern = "//";
         String sub = "/";
-        assertEquals("/a//b//c", StringUtilities.substitute(input, pattern, sub));
+        assertEquals("/a//b//c", JOrphanUtils.substitute(input, pattern, sub));
     }
 
 }
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 38094102510..e01f4bb449c 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -35,9 +35,6 @@ dependencies {
 
     testImplementation(testFixtures(projects.src.core))
     testImplementation(testFixtures(projects.src.components))
-    testImplementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
     testImplementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
index 861e4da6bbb..ed3b56c694f 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
@@ -32,10 +32,10 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTest;
 import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jorphan.util.StringUtilities;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -110,7 +110,7 @@ public void createFunctionSet() throws Exception {
                             components.item(j);
                     funcTitles.put(comp.getAttribute("name"), Boolean.FALSE);
                     String tag = comp.getAttribute("tag");
-                    if (!StringUtils.isEmpty(tag)){
+                    if (StringUtilities.isNotEmpty(tag)){
                         funcTitles.put(tag, Boolean.FALSE);
                     }
                 }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 5fd25546bb7..4e64f94ba20 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -56,7 +56,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.gui.ObsoleteGui;
 import org.apache.jmeter.control.IfControllerSchema;
 import org.apache.jmeter.control.LoopControllerSchema;
@@ -95,6 +94,7 @@
 import org.apache.jmeter.visualizers.backend.BackendListenerGui;
 import org.apache.jorphan.reflect.ClassFinder;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;
@@ -203,7 +203,7 @@ public static void createTagSet() throws Exception {
                     org.w3c.dom.Element comp = (org.w3c.dom.Element)
                             components.item(j);
                     String tag = comp.getAttribute("tag");
-                    if (!StringUtils.isEmpty(tag)){
+                    if (StringUtilities.isNotEmpty(tag)){
                         guiTags.put(tag, Boolean.FALSE);
                     }
                 }
@@ -279,7 +279,7 @@ public void runGUITitle(GuiComponentHolder componentHolder) throws Exception {
             }
             String name = guiItem.getClass().getName();
             if (// Is this a work in progress or an internal GUI component?
-                title != null && !title.isEmpty() // Will be "" for internal components
+                StringUtilities.isNotEmpty(title) // Will be "" for internal components
                 && !title.toUpperCase(Locale.ENGLISH).contains("(ALPHA")
                 && !title.toUpperCase(Locale.ENGLISH).contains("(BETA")
                 && !title.toUpperCase(Locale.ENGLISH).contains("(DEPRECATED")
@@ -337,7 +337,7 @@ public void GUIComponents2(GuiComponentHolder componentHolder) throws Exception
         assertEquals(name, el.getPropertyAsString(TestElement.GUI_CLASS), "GUI-CLASS: Failed on " + name);
 
         assertEquals(guiItem.getName(), el.getName(), () -> "NAME: Failed on " + name);
-        if (StringUtils.isEmpty(el.getName())) {
+        if (StringUtilities.isEmpty(el.getName())) {
             fail("Name of the element must not be blank. Gui class " + name + ", element class " + el.getClass().getName());
         }
         assertEquals(el.getClass().getName(), el
@@ -467,7 +467,7 @@ public void propertiesShouldNotBeInitializedToNullValues(GuiComponentHolder comp
         TestElement el = guiItem.createTestElement();
 
         assertFalse(
-                StringUtils.isEmpty(el.getName()),
+                StringUtilities.isEmpty(el.getName()),
                 () -> "Name should be non-blank for element " + componentHolder);
         PropertyIterator it = el.propertyIterator();
         while (it.hasNext()) {
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 180dfbf9e7c..34bf2366dce 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -27,9 +27,6 @@ dependencies {
     implementation("commons-codec:commons-codec")
     implementation("org.apache.commons:commons-jexl")
     implementation("org.apache.commons:commons-jexl3")
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
     implementation("commons-io:commons-io") {
         because("FileUtils")
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index 44187fb4e99..4242eb871ef 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -23,11 +23,11 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,7 +71,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         if (values.length > 1) {
             mode = values[1].execute();
         }
-        if(StringUtils.isEmpty(mode)){
+        if (StringUtilities.isEmpty(mode)){
             mode = ChangeCaseMode.UPPER.getName(); // default
         }
         String targetString = changeCase(originalString, mode);
@@ -87,10 +87,14 @@ protected String changeCase(String originalString, String mode) {
             return originalString;
         }
 
+        if (originalString == null) {
+            return null;
+        }
+
         return switch (changeCaseMode) {
-            case UPPER -> StringUtils.upperCase(originalString);
-            case LOWER -> StringUtils.lowerCase(originalString);
-            case CAPITALIZE -> StringUtils.capitalize(originalString);
+            case UPPER -> originalString.toUpperCase(Locale.ROOT);
+            case LOWER -> originalString.toLowerCase(Locale.ROOT);
+            case CAPITALIZE -> StringUtilities.capitalize(originalString);
         };
     }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
index 47e9a0d612e..289fc994c33 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java
@@ -28,6 +28,7 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,7 +76,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
                     .ofPattern(targetDateFormat)
                     .withZone(ZoneId.systemDefault());
             String newDate;
-            if (sourceDateFormat != null && !sourceDateFormat.isEmpty()) {
+            if (StringUtilities.isNotEmpty(sourceDateFormat)) {
                 DateTimeFormatter sourceDateFormatter = DateTimeFormatter
                         .ofPattern(sourceDateFormat)
                         .withZone(ZoneId.systemDefault());
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
index 36c9f479e84..b7325ad23a8 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
@@ -26,11 +26,11 @@
 import java.util.Locale;
 
 import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +81,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         try {
             MessageDigest md = MessageDigest.getInstance(digestAlgorithm);
             md.update(stringToEncode.getBytes(StandardCharsets.UTF_8));
-            if (StringUtils.isNotEmpty(salt)) {
+            if (StringUtilities.isNotEmpty(salt)) {
                 md.update(salt.getBytes(StandardCharsets.UTF_8));
             }
             byte[] bytes = md.digest();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java
index 5d3897e114b..9e2f9c608e5 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java
@@ -28,6 +28,7 @@
 
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ private void load() throws IOException, FileNotFoundException {
              * N.B. Stop reading the file if we get a blank line: This allows
              * for trailing comments in the file
              */
-            while (line != null && line.length() > 0) {
+            while (StringUtilities.isNotEmpty(line)) {
                 fileData.add(splitLine(line, delimiter));
                 line = myBread.readLine();
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
index 7b1087ced9f..e8bd9e737b1 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
@@ -29,7 +29,6 @@
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -38,6 +37,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.JSR223TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -144,7 +144,7 @@ public void setParameters(Collection<CompoundVariable> parameters) throws Invali
         scriptEngine = JSR223TestElement.getInstance().getEngineByName(GROOVY_ENGINE_NAME); //$NON-NLS-N$
 
         String fileName = JMeterUtils.getProperty(INIT_FILE);
-        if(!StringUtils.isEmpty(fileName)) {
+        if (StringUtilities.isNotEmpty(fileName)) {
             File file = new File(fileName);
             if(!(file.exists() && file.canRead())) {
                 // File maybe relative to JMeter home
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java b/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
index b29a3551d6d..b134f6c4f17 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java
@@ -26,6 +26,7 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.google.auto.service.AutoService;
 
@@ -79,7 +80,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         }
 
         String totalString = Long.toString(sum);
-        if (vars != null && varName != null && varName.length() > 0){// vars will be null on TestPlan
+        if (vars != null && StringUtilities.isNotEmpty(varName)){// vars will be null on TestPlan
             vars.put(varName, totalString);
         }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index d28e815546f..77480c94629 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -31,11 +31,11 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.apache.commons.lang3.LocaleUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -137,13 +137,13 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         DateTimeFormatter formatter;
         if(values.length>3) {
             String localeAsString = values[3].execute().trim();
-            if (!localeAsString.trim().isEmpty()) {
+            if (!localeAsString.isEmpty()) {
                 locale = LocaleUtils.toLocale(localeAsString);
             }
         }
 
         String format = values[0].execute().trim();
-        if (!StringUtils.isEmpty(format)) {
+        if (StringUtilities.isNotEmpty(format)) {
             try {
                 LocaleFormatObject lfo = new LocaleFormatObject(format, locale);
                 formatter = dateRandomFormatterCache.get(lfo, key -> createFormatter((LocaleFormatObject) key));
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
index ff5554de5d1..e170e1e1f51 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java
@@ -22,12 +22,12 @@
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,7 +78,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             List<String> results = new ArrayList<>();
             String[] variables = variablesNamesSplitBySeparatorValue.split(SEPARATOR);
             for (String currentVarName : variables) {
-                if(!StringUtils.isEmpty(currentVarName)) {
+                if (StringUtilities.isNotEmpty(currentVarName)) {
                     extractVariableValuesToList(currentVarName, vars, results);
                 }
             }
@@ -115,7 +115,7 @@ private static void extractVariableValuesToList(String variableName,
             JMeterVariables vars, List<? super String> results) {
         String matchNumberAsStr = vars.get(variableName+"_matchNr");
         int matchNumber = 0;
-        if(!StringUtils.isEmpty(matchNumberAsStr)) {
+        if (StringUtilities.isNotEmpty(matchNumberAsStr)) {
             matchNumber = Integer.parseInt(matchNumberAsStr);
         }
         if(matchNumber > 0) {
@@ -124,7 +124,7 @@ private static void extractVariableValuesToList(String variableName,
             }
         } else {
             String value = vars.get(variableName);
-            if(!StringUtils.isEmpty(value)) {
+            if (StringUtilities.isNotEmpty(value)) {
                 results.add(value);
             }
         }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
index e0528d1c770..0497799171e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
@@ -22,12 +22,12 @@
 import java.util.List;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,8 +89,8 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             myName = values[PARAM_NAME - 1].execute().trim();
         }
 
-        String myValue = null;
-        if(StringUtils.isEmpty(charsToUse)) {
+        String myValue;
+        if (StringUtilities.isEmpty(charsToUse)) {
             myValue = RandomStringUtils.random(length);
         } else {
             myValue = RandomStringUtils.random(length, charsToUse);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
index ffcfcc30de0..898a2a2771d 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java
@@ -30,6 +30,7 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
@@ -149,7 +150,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             textToMatch = previousResult.getResponseDataAsString();
         }
 
-        if (textToMatch == null || textToMatch.isEmpty()) {
+        if (StringUtilities.isEmpty(textToMatch)) {
             return defaultValue;
         }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
index 8e4c5500414..bd33c7ab244 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
@@ -273,7 +273,7 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
             }
         }
 
-        if (myName.length() > 0) {
+        if (!myName.isEmpty()) {
             JMeterVariables vars = getVariables();
             if (vars != null) {// Can be null if called from Config item testEnded() method
                 vars.put(myName, myValue);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
index 41a363976be..cca45cc4bc6 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
@@ -33,11 +33,11 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,7 +96,7 @@ private boolean writeToFile() throws IOException {
         Charset charset = StandardCharsets.UTF_8;
         if (values.length == 4) {
             String charsetParamValue = ((CompoundVariable) values[3]).execute();
-            if (StringUtils.isNotEmpty(charsetParamValue)) {
+            if (StringUtilities.isNotEmpty(charsetParamValue)) {
                 charset = Charset.forName(charsetParamValue);
             }
         }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index 2b011401b81..dea75e9ac04 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -32,12 +32,12 @@
 import java.util.Locale;
 
 import org.apache.commons.lang3.LocaleUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -145,7 +145,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         ZonedDateTime zonedDateTimeToShift = ZonedDateTime.now(systemDefaultZoneID);
 
         DateTimeFormatter formatter = null;
-        if (!StringUtils.isEmpty(format)) {
+        if (StringUtilities.isNotEmpty(format)) {
             try {
                 LocaleFormatObject lfo = new LocaleFormatObject(format, locale);
                 formatter = dateTimeFormatterCache.get(lfo, TimeShift::createFormatter);
@@ -172,7 +172,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         }
 
         // Check amount value to shift
-        if (!StringUtils.isEmpty(amountToShift)) {
+        if (StringUtilities.isNotEmpty(amountToShift)) {
             try {
                 Duration duration = Duration.parse(amountToShift);
                 zonedDateTimeToShift = zonedDateTimeToShift.plus(duration);
@@ -190,7 +190,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
             dateString = String.valueOf(zonedDateTimeToShift.toInstant().toEpochMilli());
         }
 
-        if (!StringUtils.isEmpty(variableName)) {
+        if (StringUtilities.isNotEmpty(variableName)) {
             JMeterVariables vars = getVariables();
             if (vars != null) {// vars will be null on TestPlan
                 vars.put(variableName, dateString);
@@ -232,7 +232,7 @@ public void setParameters(Collection<CompoundVariable> parameters) throws Invali
             variableName = ((CompoundVariable) values[3]).execute().trim();
         } else {
             String localeAsString = ((CompoundVariable) values[3]).execute().trim();
-            if (!localeAsString.trim().isEmpty()) {
+            if (!localeAsString.isEmpty()) {
                 locale = LocaleUtils.toLocale(localeAsString);
             }
             variableName = ((CompoundVariable) values[4]).execute().trim();
diff --git a/src/jorphan/build.gradle.kts b/src/jorphan/build.gradle.kts
index 4143caaa938..7f87d061936 100644
--- a/src/jorphan/build.gradle.kts
+++ b/src/jorphan/build.gradle.kts
@@ -26,7 +26,6 @@ dependencies {
 
     implementation("commons-io:commons-io")
     implementation("org.apache.commons:commons-collections4")
-    implementation("org.apache.commons:commons-lang3")
     implementation("org.apache.commons:commons-math3")
     implementation("org.apache.commons:commons-text")
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index cf184c04a1b..ac7b3fadf15 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -29,8 +29,6 @@
 import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -94,8 +92,9 @@ public class KeyToolUtils {
         } else {
             keytoolPath = KEYTOOL;
             if (!checkKeytool(keytoolPath)) { // Not found on PATH, check Java Home
-                File javaHome = SystemUtils.getJavaHome();
-                if (javaHome != null) {
+                String javaHomePath = System.getProperty("java.home");
+                if (javaHomePath != null) {
+                    File javaHome = new File(javaHomePath);
                     keytoolPath = new File(new File(javaHome, "bin"), KEYTOOL).getPath(); // $NON-NLS-1$
                     if (!checkKeytool(keytoolPath)) {
                         keytoolPath = null;
@@ -314,7 +313,7 @@ private static void generateSignedCert(File keystore, String password,
      * @return a string that is safe to use as subject name
      */
     private static String guardSubjectName(String subject) {
-        if (NumberUtils.isDigits(subject.substring(0,1))) {
+        if (!subject.isEmpty() && Character.isDigit(subject.charAt(0))) {
             return "ip" + subject;
         }
         return subject;
@@ -328,7 +327,7 @@ private static String guardSubjectName(String subject) {
      * @return prefixed extension
      */
     private static String chooseExtension(String subject) {
-        if (NumberUtils.isDigits(subject.substring(0,1))) {
+        if (!subject.isEmpty() && Character.isDigit(subject.charAt(0))) {
             return "ip:" + subject;
         }
         return "dns:" + subject;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
index 9e3cfa5a864..e1980e8ca3c 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java
@@ -33,6 +33,7 @@
 import java.util.concurrent.TimeoutException;
 
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Utility class for invoking native system applications
@@ -77,7 +78,7 @@ public SystemCommand(File directory, long timeoutMillis, int pollInterval, Map<S
     }
 
     private static InputStream checkIn(String stdin) throws FileNotFoundException {
-        String in = JOrphanUtils.nullifyIfEmptyTrimmed(stdin);
+        String in = StringUtilities.trimToNull(stdin);
         if (in == null) {
             return null;
         } else {
@@ -86,7 +87,7 @@ private static InputStream checkIn(String stdin) throws FileNotFoundException {
     }
 
     private static OutputStream checkOut(String path) throws IOException {
-        String in = JOrphanUtils.nullifyIfEmptyTrimmed(path);
+        String in = StringUtilities.trimToNull(path);
         if (in == null) {
             return null;
         } else {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
index cd7bf6f8510..5bb09ff0ef1 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
@@ -31,7 +31,6 @@
 import javax.swing.RowSorter;
 import javax.swing.SortOrder;
 
-import org.apache.commons.lang3.ObjectUtils;
 
 /**
  * Implementation of a {@link RowSorter} for {@link ObjectTableModel}
@@ -148,7 +147,7 @@ public ObjectTableSorter fixLastRow() {
      */
     public ObjectTableSorter setValueComparator(int column, Comparator<?> comparator) {
         invalidate();
-        valueComparators[column] = ObjectUtils.defaultIfNull(comparator, getDefaultComparator(column));
+        valueComparators[column] = comparator != null ? comparator : getDefaultComparator(column);
         return this;
     }
 
@@ -185,7 +184,7 @@ protected Comparator<?> getDefaultComparator(int column) {
      */
     public ObjectTableSorter setFallbackComparator(Comparator<Row> comparator) {
         invalidate();
-        fallbackComparator = ObjectUtils.defaultIfNull(comparator, Comparator.comparingInt(Row::getIndex));
+        fallbackComparator = Objects.requireNonNullElse(comparator, Comparator.comparingInt(Row::getIndex));
         return this;
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java
index 6136f15da8f..5232fbf3b99 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java
@@ -21,8 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
-
-import org.apache.commons.lang3.mutable.MutableLong;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * This class serves as a way to calculate the median, max, min etc. of a list of values.
@@ -34,7 +33,7 @@
 public abstract class StatCalculator<T extends Number & Comparable<? super T>> {
 
     // key is the type to collect (usually long), value = count of entries
-    private final Map<T, MutableLong> valuesMap = new TreeMap<>();
+    private final Map<T, AtomicLong> valuesMap = new TreeMap<>();
     // We use a TreeMap because we need the entries to be sorted
 
     // Running values, updated for each sample
@@ -107,8 +106,8 @@ public void addSentBytes(long newValue) {
     }
 
     public void addAll(StatCalculator<T> calc) {
-        for(Map.Entry<T, MutableLong> ent : calc.valuesMap.entrySet()) {
-            addEachValue(ent.getKey(), ent.getValue().longValue());
+        for(Map.Entry<T, AtomicLong> ent : calc.valuesMap.entrySet()) {
+            addEachValue(ent.getKey(), ent.getValue().get());
         }
     }
 
@@ -161,8 +160,8 @@ public T getPercentPoint(double percent) {
         // use Math.round () instead of simple (long) to provide correct value rounding
         long target = Math.round(count * percent);
         try {
-            for (Map.Entry<T, MutableLong> val : valuesMap.entrySet()) {
-                target -= val.getValue().longValue();
+            for (Map.Entry<T, AtomicLong> val : valuesMap.entrySet()) {
+                target -= val.getValue().get();
                 if (target <= 0){
                     return val.getKey();
                 }
@@ -182,10 +181,10 @@ public T getPercentPoint(double percent) {
     public Map<Number, Number[]> getDistribution() {
         Map<Number, Number[]> items = new HashMap<>();
 
-        for (Map.Entry<T, MutableLong> entry : valuesMap.entrySet()) {
+        for (Map.Entry<T, AtomicLong> entry : valuesMap.entrySet()) {
             Number[] dis = new Number[2];
             dis[0] = entry.getKey();
-            dis[1] = entry.getValue();
+            dis[1] = entry.getValue().get();
             items.put(entry.getKey(), dis);
         }
         return items;
@@ -280,12 +279,12 @@ public void addValue(T val) {
     }
 
     private void updateValueCount(T actualValue, long sampleCount) {
-        MutableLong count = valuesMap.get(actualValue);
+        AtomicLong count = valuesMap.get(actualValue);
         if (count != null) {
-            count.add(sampleCount);
+            count.addAndGet(sampleCount);
         } else {
             // insert new value
-            valuesMap.put(actualValue, new MutableLong(sampleCount));
+            valuesMap.put(actualValue, new AtomicLong(sampleCount));
         }
     }
 }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
index 82f29b62b5f..35d32febb44 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
@@ -21,7 +21,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.commons.lang3.ClassUtils;
 import org.apache.jorphan.util.JMeterException;
 
 /**
@@ -40,7 +39,7 @@ public class ClassTools {
     public static Object construct(String className) throws JMeterException {
         Object instance = null;
         try {
-            instance = ClassUtils.getClass(className).getDeclaredConstructor().newInstance();
+            instance = Class.forName(className).getDeclaredConstructor().newInstance();
         } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
             throw new JMeterException(e);
         }
@@ -58,7 +57,7 @@ public static Object construct(String className, int parameter) throws JMeterExc
     {
         Object instance = null;
         try {
-            Class<?> clazz = ClassUtils.getClass(className);
+            Class<?> clazz = Class.forName(className);
             Constructor<?> constructor = clazz.getConstructor(Integer.TYPE);
             instance = constructor.newInstance(parameter);
         } catch (ClassNotFoundException | InvocationTargetException
@@ -112,7 +111,7 @@ public static void invoke(Object instance, String methodName)
     {
         Method m;
         try {
-            m = ClassUtils.getPublicMethod(instance.getClass(), methodName, new Class [] {});
+            m = instance.getClass().getMethod(methodName);
             m.invoke(instance, (Object [])null);
         } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
             throw new JMeterException(e);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
new file mode 100644
index 00000000000..ebbff1bf8a2
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+import org.apiguardian.api.API;
+
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public class BooleanUtils {
+    private BooleanUtils() {
+    }
+
+    /**
+     * Converts a String to a Boolean object based on predefined values.
+     * "true", "on", "y", "t", "yes" or "1" (case-insensitive) will return {@code true}.
+     * "false", "off", "n", "f", "no" or "0" (case-insensitive) will return {@code false}.
+     * Otherwise, {@code null} is returned.
+     *
+     * @param s the String to convert, may be null
+     * @return {@link Boolean#TRUE}, {@link Boolean#FALSE}, or {@code null}
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+    public static Boolean toBooleanObject(String s) {
+        if (StringUtilities.isEmpty(s)) {
+            return null;
+        }
+
+        int len = s.length();
+        char firstChar = s.charAt(0);
+
+        @SuppressWarnings("NullTernary")
+        Boolean result = switch (firstChar) {
+            case 't', 'T' -> len == 1 || "true".equalsIgnoreCase(s) ? Boolean.TRUE : null;
+            case 'y', 'Y' -> len == 1 || "yes".equalsIgnoreCase(s) ? Boolean.TRUE : null;
+            case 'o', 'O' -> "on".equalsIgnoreCase(s) ? Boolean.TRUE : (
+                    "off".equalsIgnoreCase(s) ? Boolean.FALSE : null
+            );
+            case '1' -> len == 1 ? Boolean.TRUE : null;
+            case 'f', 'F' -> len == 1 || "false".equalsIgnoreCase(s) ? Boolean.FALSE : null;
+            case 'n', 'N' -> len == 1 || "no".equalsIgnoreCase(s) ? Boolean.FALSE : null;
+            case '0' -> len == 1 ? Boolean.FALSE : null;
+            default -> null;
+        };
+        return result;
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/CharUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/CharUtils.java
new file mode 100644
index 00000000000..bba3ea6b564
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/CharUtils.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+public class CharUtils {
+    private CharUtils() {
+    }
+
+    /**
+     * Checks if the given character is an ASCII printable character.
+     *
+     * @param c the character to check
+     * @return true if the character is an ASCII printable character, false otherwise
+     */
+    public static boolean isAscii(char c) {
+        return c >= 32 && c <= 126;
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/ExceptionUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/ExceptionUtils.java
new file mode 100644
index 00000000000..e4c7997ab2a
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/ExceptionUtils.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+
+import org.apiguardian.api.API;
+
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public class ExceptionUtils {
+    private ExceptionUtils() {
+    }
+
+    /**
+     * Converts the stack trace of a {@code Throwable} into a string representation.
+     *
+     * @param throwable the {@code Throwable} whose stack trace is to be converted to a string
+     * @return the string representation of the stack trace of the specified {@code Throwable}
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+    public static String getStackTrace(Throwable throwable) {
+        StringWriter sw = new StringWriter();
+        try (PrintWriter pw = new PrintWriter(sw)) {
+            throwable.printStackTrace(pw);
+        }
+        return sw.toString();
+    }
+
+    /**
+     * Converts the stack trace of a {@code Throwable} into a byte array representation using PrintStream.
+     *
+     * @param throwable the {@code Throwable} whose stack trace is to be converted to bytes
+     * @param charset the character set to be used for encoding the stack trace
+     * @return the byte array representation of the stack trace of the specified {@code Throwable}
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+    public static byte[] getStackTraceAsBytes(Throwable throwable, Charset charset) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (PrintStream ps = new PrintStream(baos, false, charset)) {
+            throwable.printStackTrace(ps);
+        }
+        return baos.toByteArray();
+    }
+
+    /**
+     * Helper method to get the root cause message from a throwable.
+     *
+     * @param t the throwable
+     * @return the root cause message
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+    public static String getRootCauseMessage(Throwable t) {
+        Throwable cause = t;
+        while (cause.getCause() != null && cause.getCause() != cause) {
+            cause = cause.getCause();
+        }
+        return cause.getMessage();
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 8120ef25fd5..3d25f35a777 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -34,8 +34,8 @@
 import java.util.regex.Matcher;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.RandomStringGenerator;
+import org.apiguardian.api.API;
 
 /**
  * This class contains frequently-used static utility methods.
@@ -517,16 +517,12 @@ public static void displayThreads(boolean includeDaemons) {
      *
      * @param input String
      * @return trimmed input or {@code null}
+     * @deprecated use {@link StringUtilities#trimToNull(String)}
      */
+    @Deprecated
+    @API(since = "6.0.0", status = API.Status.DEPRECATED)
     public static String nullifyIfEmptyTrimmed(final String input) {
-        if (input == null) {
-            return null;
-        }
-        String trimmed = input.trim();
-        if (trimmed.length() == 0) {
-            return null;
-        }
-        return trimmed;
+        return StringUtilities.trimToNull(input);
     }
 
     /**
@@ -534,9 +530,12 @@ public static String nullifyIfEmptyTrimmed(final String input) {
      *
      * @param value Value
      * @return {@code true} if the String is not empty (""), not {@code null} and not whitespace only.
+     * @deprecated use {@link StringUtilities#isBlank(CharSequence)}
      */
+    @Deprecated
+    @API(since = "6.0.0", status = API.Status.DEPRECATED)
     public static boolean isBlank(final String value) {
-        return StringUtils.isBlank(value);
+        return StringUtilities.isBlank(value);
     }
 
     /**
@@ -719,7 +718,7 @@ public static Object[] replaceAllWithRegex(
      * @return number of matches that were replaced
      */
     public static int replaceValue(String regex, String replaceBy, boolean caseSensitive, String value, Consumer<? super String> setter) {
-        if (StringUtils.isBlank(value)) {
+        if (StringUtilities.isBlank(value)) {
             return 0;
         }
         Object[] result = replaceAllWithRegex(value, regex, replaceBy, caseSensitive);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
index 413a87c8a95..f247cb3b03c 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
@@ -20,9 +20,13 @@
 import org.apiguardian.api.API;
 
 /**
- * Functions that are missing in other libraries.
+ * Utility class for performing various String-related operations.
+ * This class provides methods to manipulate and evaluate strings, including
+ * checking if strings are empty, blank, or contain specific characters,
+ * as well as methods for replacing, capitalizing, and trimming strings.
  *
- * @since 5.6
+ * This class is marked as {@code @API(status = API.Status.EXPERIMENTAL)}, indicating
+ * its API is still evolving and might change in future releases.
  */
 @API(status = API.Status.EXPERIMENTAL, since = "5.6")
 public class StringUtilities {
@@ -48,4 +52,176 @@ public static int count(String input, char ch) {
         }
         return count;
     }
+
+    /**
+     * Checks if a CharSequence is empty (""), null, or contains only whitespace characters.
+     *
+     * @param cs the CharSequence to check, may be null
+     * @return true if the CharSequence is null, empty, or only contains whitespace; false otherwise
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static boolean isBlank(CharSequence cs) {
+        if (cs == null) {
+            return true;
+        }
+        if (cs instanceof String s) {
+            return s.isBlank(); // fast path
+        }
+        int strLen = cs.length();
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(cs.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Checks if a CharSequence is not empty, not null, and does not contain only whitespace characters.
+     *
+     * @param cs the CharSequence to check, may be null
+     * @return true if the CharSequence is not null, not empty, and contains at least one non-whitespace character; false otherwise
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static boolean isNotBlank(CharSequence cs) {
+        return !isBlank(cs);
+    }
+
+    /**
+     * Checks if a CharSequence is null or empty ("").
+     *
+     * @param cs the CharSequence to check, may be null
+     * @return true if the CharSequence is null or empty; false otherwise
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static boolean isEmpty(CharSequence cs) {
+        return cs == null || cs.isEmpty();
+    }
+
+    /**
+     * Checks if a CharSequence is not null and not empty ("").
+     *
+     * @param cs the CharSequence to check, may be null
+     * @return true if the CharSequence is not null and not empty; false otherwise
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static boolean isNotEmpty(CharSequence cs) {
+        return !isEmpty(cs);
+    }
+
+    /**
+     * Replaces multiple characters in a string.
+     *
+     * @param str the string to modify, may be null
+     * @param searchChars the characters to search for, may be null
+     * @param replaceChars the characters to replace with, may be null
+     * @return the modified string, or null if input was null
+     */
+    public static String replaceChars(String str, String searchChars, String replaceChars) {
+        if (StringUtilities.isEmpty(str) || StringUtilities.isEmpty(searchChars)) {
+            return str;
+        }
+        StringBuilder sb = new StringBuilder(str.length());
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            int index = searchChars.indexOf(c);
+            if (index < 0) {
+                sb.append(c);
+            } else {
+                if (replaceChars != null && index < replaceChars.length()) {
+                    sb.append(replaceChars.charAt(index));
+                }
+                // If replaceChars is null or index is out of bounds, character is deleted
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Trims the string and returns null if the result is empty.
+     *
+     * @param str the String to be trimmed, may be null
+     * @return the trimmed String, or null if empty or null input
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static String trimToNull(String str) {
+        if (str == null) {
+            return null;
+        }
+        String trimmed = str.trim();
+        return trimmed.isEmpty() ? null : trimmed;
+    }
+
+    /**
+     * Capitalizes a string by converting the first character to title case.
+     * Properly handles Unicode surrogate pairs.
+     *
+     * @param str the string to capitalize, may be null
+     * @return the capitalized string, or null if input was null
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static String capitalize(String str) {
+        if (StringUtilities.isEmpty(str)) {
+            return str;
+        }
+        int firstCodepoint = str.codePointAt(0);
+        int titleCaseCodepoint = Character.toTitleCase(firstCodepoint);
+
+        if (firstCodepoint == titleCaseCodepoint) {
+            // No change needed
+            return str;
+        }
+
+        StringBuilder sb = new StringBuilder(str.length());
+        sb.appendCodePoint(titleCaseCodepoint);
+        sb.append(str, Character.charCount(firstCodepoint), str.length());
+        return sb.toString();
+    }
+
+    /**
+     * Strips any of the specified characters from the start and end of a string.
+     *
+     * @param str the string to strip, may be null
+     * @param stripChars the characters to remove, null treated as whitespace
+     * @return the stripped string, or null if input was null
+     */
+    @API(since = "6.0.0", status = API.Status.EXPERIMENTAL)
+    public static String strip(String str, String stripChars) {
+        if (StringUtilities.isEmpty(str)) {
+            return str;
+        }
+        int start = 0;
+        int end = str.length();
+
+        // Strip from start
+        while (start < end && stripChars.indexOf(str.charAt(start)) >= 0) {
+            start++;
+        }
+
+        // Strip from end
+        while (start < end && stripChars.indexOf(str.charAt(end - 1)) >= 0) {
+            end--;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * Checks if the string contains only digits (0-9).
+     *
+     * @param str the string to check
+     * @return true if all characters are digits, false otherwise
+     */
+    @API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+    public static boolean isNumeric(String str) {
+        if (isEmpty(str)) {
+            return false;
+        }
+        for (int i = 0; i < str.length(); i++) {
+            if (!Character.isDigit(str.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
index 87ae723fb73..30c271e1866 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
@@ -288,6 +288,7 @@ private void assertEqualsArray(byte[] expected, byte[] actual) {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testNullifyIfEmptyTrimmed() {
         assertNull(JOrphanUtils.nullifyIfEmptyTrimmed(null));
         assertNull(JOrphanUtils.nullifyIfEmptyTrimmed("\u0001"));
@@ -295,6 +296,7 @@ public void testNullifyIfEmptyTrimmed() {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testIsBlank() {
         assertTrue(JOrphanUtils.isBlank(""));
         assertTrue(JOrphanUtils.isBlank(null));
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/util/BooleanUtilsTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/BooleanUtilsTest.kt
new file mode 100644
index 00000000000..d66d43fcf47
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/util/BooleanUtilsTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.util
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+class BooleanUtilsTest {
+    @ParameterizedTest
+    @CsvSource(
+        textBlock = """
+        abc,
+        ,
+        true,true
+        on,true
+        y,true
+        t,true
+        yes,true
+        1,true
+        abc,
+        false,false
+        off,false
+        n,false
+        f,false
+        no,false
+        0,false
+        TRUE,true
+        ON,true
+        Y,true
+        T,true
+        YES,true
+        1,true
+        ABC,
+        FALSE,false
+        OFF,false
+        N,false
+        F,false
+        NO,false
+        0,false"""
+    )
+    fun test(input: String?, expected: Boolean?) {
+        assertEquals(expected, BooleanUtils.toBooleanObject(input)) {
+            "BooleanUtils.toBooleanObject($input)"
+        }
+    }
+}
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 1e2a7715843..7c28ec55a12 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -79,7 +79,7 @@ public final class NewDriver {
             }
         } else {// e.g. started from IDE with full classpath
             tmpDir = System.getProperty("jmeter.home", System.getenv("JMETER_HOME"));// Allow override $NON-NLS-1$ $NON-NLS-2$
-            if (tmpDir == null || tmpDir.length() == 0) {
+            if (tmpDir == null || tmpDir.isEmpty()) {
                 File userDir = new File(System.getProperty("user.dir"));// $NON-NLS-1$
                 tmpDir = userDir.getAbsoluteFile().getParent();
             }
diff --git a/src/protocol/bolt/build.gradle.kts b/src/protocol/bolt/build.gradle.kts
index 86be43ac195..e28be931acb 100644
--- a/src/protocol/bolt/build.gradle.kts
+++ b/src/protocol/bolt/build.gradle.kts
@@ -23,7 +23,6 @@ dependencies {
     api(projects.src.core)
 
     implementation("org.neo4j.driver:neo4j-java-driver")
-    implementation("org.apache.commons:commons-lang3")
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
 
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
index 5b996817f68..e65f53fdadd 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/AbstractBoltTestElement.java
@@ -19,9 +19,8 @@
 
 import java.time.Duration;
 
-import org.apache.commons.lang3.EnumUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.neo4j.driver.AccessMode;
 import org.neo4j.driver.SessionConfig;
 import org.neo4j.driver.TransactionConfig;
@@ -51,8 +50,11 @@ public String getAccessMode() {
     }
 
     public void setAccessMode(String accessMode) {
-        if (EnumUtils.isValidEnum(AccessMode.class, accessMode)) {
+        try {
+            AccessMode.valueOf(accessMode);
             this.accessMode = accessMode;
+        } catch (IllegalArgumentException ignored) {
+            // ignore
         }
     }
 
@@ -93,7 +95,7 @@ public SessionConfig getSessionConfig() {
         SessionConfig.Builder sessionConfigBuilder = SessionConfig.builder()
                 .withDefaultAccessMode(Enum.valueOf(AccessMode.class, getAccessMode()));
 
-        if (StringUtils.isNotBlank(database)) {
+        if (StringUtilities.isNotBlank(database)) {
             sessionConfigBuilder.withDatabase(database);
         }
 
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
index 78f2a413381..6a8d8af6136 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
@@ -24,9 +24,9 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.util.ConfigMergabilityIndicator;
 import org.apache.jmeter.gui.TestElementMetadata;
@@ -36,6 +36,7 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Result;
@@ -132,14 +133,14 @@ private static SampleResult handleException(SampleResult res, Exception ex) {
             res.setResponseCode("500");
         }
         res.setResponseData(
-                ObjectUtils.defaultIfNull(ex.getMessage(), "NO MESSAGE"),
+                Objects.requireNonNullElse(ex.getMessage(), "NO MESSAGE"),
                 res.getDataEncodingNoDefault());
         res.setSuccessful(false);
         return res;
     }
 
     private Map<String, Object> getParamsAsMap() throws IOException {
-        if (getParams() != null && getParams().length() > 0) {
+        if (StringUtilities.isNotEmpty(getParams())) {
             return Holder.OBJECT_READER.readValue(getParams());
         } else {
             return Collections.emptyMap();
diff --git a/src/protocol/ftp/build.gradle.kts b/src/protocol/ftp/build.gradle.kts
index 52a1a5765f2..18abceccede 100644
--- a/src/protocol/ftp/build.gradle.kts
+++ b/src/protocol/ftp/build.gradle.kts
@@ -26,9 +26,6 @@ dependencies {
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
 
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
index 5808730a494..8042c45fe4b 100644
--- a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+++ b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
@@ -35,7 +35,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.io.output.TeeOutputStream;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
@@ -45,6 +44,7 @@
 import org.apache.jmeter.samplers.Interruptible;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -273,7 +273,7 @@ public SampleResult sample(Entry e) {
             } else {
                 res.setResponseCode("501");
                 String replyString = ftp.getReplyString();
-                if(StringUtils.isEmpty(replyString)) {
+                if (StringUtilities.isEmpty(replyString)) {
                     res.setResponseMessage("Could not connect");
                 }
                 else {
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 2b1dd7f1aca..804fe8ab076 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -39,9 +39,6 @@ dependencies {
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
     implementation("org.apache.commons:commons-text") {
         because("StringEscapeUtils")
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
index 4e8173a67b7..8481458856c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
@@ -20,7 +20,6 @@
 import java.io.Serializable;
 import java.util.regex.Matcher;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HeaderElement;
 import org.apache.http.NameValuePair;
 import org.apache.http.ParseException;
@@ -30,6 +29,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPFileArgs;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
@@ -113,7 +113,7 @@ private void addNonEncodedArgument(String name, String value, String contentType
         Arguments myArgs = getArguments();
         // The value is not encoded
         HTTPArgument arg = new HTTPArgument(name, value, false);
-        if(!StringUtils.isEmpty(contentType)) {
+        if (StringUtilities.isNotEmpty(contentType)) {
             int indexOfSemiColon = contentType.indexOf(';');
             if(indexOfSemiColon > 0) {
                 arg.setContentType(contentType.substring(0, indexOfSemiColon));
@@ -157,7 +157,7 @@ public void parseArguments(String queryString) {
                         path = getParameterValue(element, "filename", null);
                     }
                 }
-                if (path != null && !path.isEmpty()) {
+                if (StringUtilities.isNotEmpty(path)) {
                     // Set the values retrieved for the file upload
                     files.addHTTPFileArg(path, name, contentType);
                 } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index fa2ced67245..0038839b760 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -25,7 +25,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
@@ -39,6 +38,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Extending {@link UrlConfigGui}, GraphQL over HTTP Request configuration GUI, providing more convenient UI elements
@@ -95,9 +95,11 @@ public void modifyTestElement(TestElement element) {
         final GraphQLRequestParams params = new GraphQLRequestParams(operationNameText.getText(),
                 queryContent.getText(), variablesContent.getText());
 
-        element.setProperty(OPERATION_NAME, defaultIfEmpty(params.getOperationName(), null));
+        String operationName = params.getOperationName();
+        element.setProperty(OPERATION_NAME, defaultIfEmpty(operationName, null));
         element.setProperty(QUERY, defaultIfEmpty(params.getQuery(), null));
-        element.setProperty(VARIABLES, defaultIfEmpty(params.getVariables(), null));
+        String variables = params.getVariables();
+        element.setProperty(VARIABLES, defaultIfEmpty(variables, null));
         element.setProperty(HTTPSamplerBase.POST_BODY_RAW, !HTTPConstants.GET.equals(method));
 
         final Arguments args;
@@ -105,16 +107,16 @@ public void modifyTestElement(TestElement element) {
         if (HTTPConstants.GET.equals(method)) {
             args = createHTTPArgumentsTestElement();
 
-            if (StringUtils.isNotBlank(params.getOperationName())) {
-                args.addArgument(createHTTPArgument("operationName", params.getOperationName().trim(), true));
+            if (StringUtilities.isNotBlank(operationName)) {
+                args.addArgument(createHTTPArgument("operationName", operationName.trim(), true));
             }
 
             args.addArgument(createHTTPArgument("query",
                     GraphQLRequestParamUtils.queryToGetParamValue(params.getQuery()), true));
 
-            if (StringUtils.isNotBlank(params.getVariables())) {
+            if (StringUtilities.isNotBlank(variables)) {
                 final String variablesParamValue = GraphQLRequestParamUtils
-                        .variablesToGetParamValue(params.getVariables());
+                        .variablesToGetParamValue(variables);
                 if (variablesParamValue != null) {
                     args.addArgument(createHTTPArgument("variables", variablesParamValue, true));
                 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index 61f5b56653f..f7b6589dce0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -29,7 +29,6 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.config.gui.AbstractConfigGui;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
@@ -46,6 +45,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JEditableCheckBox;
 import org.apache.jorphan.gui.JFactory;
+import org.apache.jorphan.util.StringUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -144,7 +144,8 @@ public void modifyTestElement(TestElement config) {
             config.removeProperty(httpSchema.getConcurrentDownloadPoolSize());
         }
 
-        if(!StringUtils.isEmpty(sourceIpAddr.getText())) {
+        String text = sourceIpAddr.getText();
+        if (StringUtilities.isNotEmpty(text)) {
             config.set(httpSchema.getIpSourceType(), sourceIpType.getSelectedIndex());
         } else {
             config.removeProperty(httpSchema.getIpSourceType());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index bb0ce92879e..593d54a782f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -30,7 +30,6 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.gui.BindingGroup;
@@ -51,6 +50,7 @@
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Basic URL / HTTP Request configuration:
@@ -490,7 +490,8 @@ protected int getValidatedTabIndex(int currentTabIndex, int newTabIndex) {
         private boolean canSwitchToRawBodyPane() {
             Arguments arguments = argsPanel.createTestElement();
             for (int i = 0; i < arguments.getArgumentCount(); i++) {
-                if(!StringUtils.isEmpty(arguments.getArgument(i).getName())) {
+                String name = arguments.getArgument(i).getName();
+                if (StringUtilities.isNotEmpty(name)) {
                     return false;
                 }
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index 20b41daccb4..c3c5be458ae 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -51,7 +51,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -390,7 +390,7 @@ public void addFile(String authFile) throws IOException {
             String line;
             while ((line = reader.readLine()) != null) {
                 try {
-                    if (line.startsWith("#") || JOrphanUtils.isBlank(line)) { //$NON-NLS-1$
+                    if (line.startsWith("#") || StringUtilities.isBlank(line)) { //$NON-NLS-1$
                         continue;
                     }
                     String[] tokens = line.split("\t"); //$NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index aed697b28b7..6b1c1d48b15 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -21,6 +21,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -28,11 +29,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpResponse;
@@ -49,6 +46,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -200,14 +198,14 @@ public void saveDetails(URLConnection conn, HTTPSampleResult res){
 
     private static boolean anyNotBlank(String... values) {
         for (String value: values) {
-            if (StringUtils.isNotBlank(value)) {
+            if (StringUtilities.isNotBlank(value)) {
                 return true;
             }
         }
         return false;
     }
 
-    private static Pair<String, String> getVaryHeader(String headerName, Header[] reqHeaders) {
+    private static Map.Entry<String, String> getVaryHeader(String headerName, Header[] reqHeaders) {
         if (headerName == null) {
             return null;
         }
@@ -222,7 +220,7 @@ private static Pair<String, String> getVaryHeader(String headerName, Header[] re
                 values.get(header.getName()).add(header.getValue());
             }
         }
-        return new ImmutablePair<>(headerName, values.toString());
+        return new AbstractMap.SimpleEntry<>(headerName, values.toString());
     }
 
     /**
@@ -252,7 +250,7 @@ public void saveDetails(HttpResponse method, HTTPSampleResult res) {
 
     // helper method to save the cache entry
     private void setCache(String lastModified, String cacheControl, String expires,
-            String etag, String url, String date, Pair<String, String> varyHeader) {
+            String etag, String url, String date, Map.Entry<String, String> varyHeader) {
         log.debug("setCache({}, {}, {}, {}, {}, {}, {})", lastModified,
                 cacheControl, expires, etag, url, date, varyHeader);
         Date expiresDate = null; // i.e. not using Expires
@@ -278,10 +276,10 @@ private void setCache(String lastModified, String cacheControl, String expires,
             if (log.isDebugEnabled()) {
                 log.debug("Set entry into cache for url {} and vary {} ({})", url,
                         varyHeader,
-                        varyUrl(url, varyHeader.getLeft(), varyHeader.getRight()));
+                        varyUrl(url, varyHeader.getKey(), varyHeader.getValue()));
             }
-            getCache().put(url, new CacheEntry(lastModified, expiresDate, etag, varyHeader.getLeft()));
-            getCache().put(varyUrl(url, varyHeader.getLeft(), varyHeader.getRight()), new CacheEntry(lastModified, expiresDate, etag, null));
+            getCache().put(url, new CacheEntry(lastModified, expiresDate, etag, varyHeader.getKey()));
+            getCache().put(varyUrl(url, varyHeader.getKey(), varyHeader.getValue()), new CacheEntry(lastModified, expiresDate, etag, null));
         } else {
             // Makes expiresDate effectively-final
             Date entryExpiresDate = expiresDate;
@@ -334,7 +332,7 @@ private static Date extractExpiresDateFromCacheControl(String lastModified,
     @SuppressWarnings("JavaUtilDate")
     private static Date calcExpiresDate(String lastModified, String cacheControl,
             String expires, String etag, String url, String date) {
-        if(!StringUtils.isEmpty(lastModified) && !StringUtils.isEmpty(date)) {
+        if (StringUtilities.isNotEmpty(lastModified) && StringUtilities.isNotEmpty(date)) {
             try {
                 Date responseDate = DateUtils.parseDate(date);
                 Date lastModifiedAsDate = DateUtils.parseDate(lastModified);
@@ -556,12 +554,12 @@ private CacheEntry getEntry(String url, Header[] headers) {
             }
             return null;
         }
-        Pair<String, String> varyPair = getVaryHeader(entry.getVaryHeader(), headers);
+        Map.Entry<String, String> varyPair = getVaryHeader(entry.getVaryHeader(), headers);
         if (varyPair != null) {
             if(log.isDebugEnabled()) {
                 log.debug("Looking again for {} because of {} with vary: {} ({})", url, entry, entry.getVaryHeader(), varyPair);
             }
-            return getEntry(varyUrl(url, entry.getVaryHeader(), varyPair.getRight()), null);
+            return getEntry(varyUrl(url, entry.getVaryHeader(), varyPair.getValue()), null);
         }
         return null;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
index 25c921fc0f5..75051b37de1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
@@ -42,6 +42,7 @@
 import org.apache.jorphan.reflect.ClassTools;
 import org.apache.jorphan.util.JMeterException;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -222,7 +223,7 @@ public void addFile(String cookieFile) throws IOException {
             final CollectionProperty cookies = getCookies();
             while ((line = reader.readLine()) != null) {
                 try {
-                    if (line.startsWith("#") || JOrphanUtils.isBlank(line)) {//$NON-NLS-1$
+                    if (line.startsWith("#") || StringUtilities.isBlank(line)) {//$NON-NLS-1$
                         continue;
                     }
                     String[] st = JOrphanUtils.split(line, TAB, false);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 1ce98e1a5bb..7849b152d1a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -35,6 +35,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * This class provides an interface to headers file to pass HTTP headers along
@@ -155,7 +156,7 @@ public void addFile(String headerFile) throws IOException {
             String line;
             while ((line = reader.readLine()) != null) {
                 try {
-                    if (line.startsWith("#") || JOrphanUtils.isBlank(line)) {// $NON-NLS-1$
+                    if (line.startsWith("#") || StringUtilities.isBlank(line)) {// $NON-NLS-1$
                         continue;
                     }
                     String[] st = JOrphanUtils.split(line, "\t", " ");// $NON-NLS-1$ $NON-NLS-2$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
index 995df7012cc..b8cef36fa73 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
@@ -29,10 +29,10 @@
 import org.apache.commons.cli.avalon.CLOption;
 import org.apache.commons.cli.avalon.CLOptionDescriptor;
 import org.apache.commons.cli.avalon.CLUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.Stoppable;
 import org.apache.jmeter.testelement.NonTestElement;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.slf4j.Logger;
@@ -256,7 +256,7 @@ private static void setLogLevel(CLArgsParser parser) {
         }
 
         String value = logLevelOption.getArgument(1);
-        if (StringUtils.isEmpty(value)) {
+        if (StringUtilities.isEmpty(value)) {
             // Set root level
             getLogger().info("Setting root log level to '{}'", name);// $NON-NLS-1$
             Configurator.setRootLevel(logLevel);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index f5151b91d86..72557cf02f8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -30,7 +30,6 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.JBooleanPropertyEditor;
 import org.apache.jmeter.gui.JTextComponentBinding;
@@ -48,6 +47,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JEditableCheckBox;
 import org.apache.jorphan.gui.JFactory;
+import org.apache.jorphan.util.StringUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -170,13 +170,15 @@ public void modifyTestElement(TestElement sampler) {
         HTTPSamplerBaseSchema httpSchema = samplerBase.getSchema();
         enableConcurrentDwn();
         if (!isAJP) {
-            if (!StringUtils.isEmpty(sourceIpAddr.getText())) {
+            String text = sourceIpAddr.getText();
+            if (StringUtilities.isNotEmpty(text)) {
                 samplerBase.set(httpSchema.getIpSourceType(), sourceIpType.getSelectedIndex());
             } else {
                 samplerBase.removeProperty(httpSchema.getIpSourceType());
             }
             String selectedImplementation = String.valueOf(httpImplementation.getSelectedItem());
-            samplerBase.set(httpSchema.getImplementation(), StringUtils.defaultIfBlank(selectedImplementation, null));
+            samplerBase.set(httpSchema.getImplementation(),
+                    StringUtilities.isBlank(selectedImplementation) ? null : selectedImplementation);
         }
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/ArgumentHolder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/ArgumentHolder.java
index ea9294a58ac..2385ea80853 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/ArgumentHolder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/ArgumentHolder.java
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.protocol.http.curl;
 
+import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang3.tuple.Pair;
 
 public interface ArgumentHolder {
 
@@ -38,7 +38,7 @@ default boolean hasContenType() {
         return getMetadata().containsKey("type");
     }
 
-    static Pair<String, Map<String, String>> parse(String name) {
+    static Map.Entry<String, Map<String, String>> parse(String name) {
         if (name.contains(";")) {
             String[] parts = name.split(";");
             String realName = parts[0];
@@ -47,9 +47,9 @@ static Pair<String, Map<String, String>> parse(String name) {
                 String[] typeParts = parts[i].split("\\s*=\\s*", 2);
                 metadata.put(typeParts[0].toLowerCase(Locale.US), typeParts[1]);
             }
-            return Pair.of(realName, metadata);
+            return new AbstractMap.SimpleEntry<>(realName, metadata);
         } else {
-            return Pair.of(name, Collections.emptyMap());
+            return new AbstractMap.SimpleEntry<>(name, Collections.emptyMap());
         }
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 1b5c6f3eebd..15fdd15f745 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -44,11 +45,10 @@
 import org.apache.commons.cli.avalon.CLOption;
 import org.apache.commons.cli.avalon.CLOptionDescriptor;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.protocol.http.control.AuthManager.Mechanism;
 import org.apache.jmeter.protocol.http.control.Authorization;
 import org.apache.jmeter.protocol.http.control.Cookie;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -126,7 +126,7 @@ public class BasicCurlParser {
     public static final class Request {
         private boolean compressed;
         private String url;
-        private final List<Pair<String, String>> headers = new ArrayList<>();
+        private final List<Map.Entry<String, String>> headers = new ArrayList<>();
         private String method = "GET";
         private String postData;
         private String interfaceName;
@@ -136,8 +136,8 @@ public static final class Request {
         private String filepathCookie="";
         private final Authorization authorization = new Authorization();
         private String caCert = "";
-        private final List<Pair<String, ArgumentHolder>> formData = new ArrayList<>();
-        private final List<Pair<String, String>> formStringData = new ArrayList<>();
+        private final List<Map.Entry<String, ArgumentHolder>> formData = new ArrayList<>();
+        private final List<Map.Entry<String, String>> formStringData = new ArrayList<>();
         private final Set<String> dnsServers = new HashSet<>();
         private boolean isKeepAlive = true;
         private double maxTime = -1;
@@ -173,7 +173,7 @@ public void setMethod(String method) {
          * @param value the post data
          */
         public void setPostData(String value) {
-            if (StringUtils.isBlank(this.postData)) {
+            if (StringUtilities.isBlank(this.postData)) {
                 this.postData = value;
             } else {
                 this.postData = this.postData + "&" + value;
@@ -212,9 +212,9 @@ public void addHeader(String name, String value) {
                 return;
             } else {
                 if (UNIQUE_HEADERS.contains(name.toLowerCase(Locale.US))) {
-                    headers.removeIf(p -> p.getLeft().equalsIgnoreCase(name));
+                    headers.removeIf(p -> p.getKey().equalsIgnoreCase(name));
                 }
-                headers.add(Pair.of(name, value));
+                headers.add(new AbstractMap.SimpleEntry<>(name, value));
             }
         }
 
@@ -252,7 +252,7 @@ public void setUrl(String url) {
         /**
          * @return the headers
          */
-        public List<Pair<String, String>> getHeaders() {
+        public List<Map.Entry<String, String>> getHeaders() {
             return Collections.unmodifiableList(this.headers);
         }
 
@@ -412,7 +412,7 @@ public void addDnsServers(String dnsServer) {
         /**
          * @return the map of form data
          */
-        public List<Pair<String,String>> getFormStringData() {
+        public List<Map.Entry<String,String>> getFormStringData() {
             return Collections.unmodifiableList(this.formStringData);
         }
 
@@ -421,13 +421,13 @@ public List<Pair<String,String>> getFormStringData() {
          * @param value the value of form data
          */
         public void addFormStringData(String key, String value) {
-            formStringData.add(Pair.of(key, value));
+            formStringData.add(new AbstractMap.SimpleEntry<>(key, value));
         }
 
         /**
          * @return the map of form data
          */
-        public List<Pair<String,ArgumentHolder>> getFormData() {
+        public List<Map.Entry<String,ArgumentHolder>> getFormData() {
             return Collections.unmodifiableList(this.formData);
         }
 
@@ -436,7 +436,7 @@ public List<Pair<String,ArgumentHolder>> getFormData() {
          * @param value the value of form data
          */
         public void addFormData(String key, ArgumentHolder value) {
-            formData.add(Pair.of(key, value));
+            formData.add(new AbstractMap.SimpleEntry<>(key, value));
         }
 
         /**
@@ -828,7 +828,7 @@ public Request parse(String commandLine) {
      * An empty or null toProcess parameter results in a zero sized array.
      */
     public static String[] translateCommandline(String toProcess) {
-        if (toProcess == null || toProcess.isEmpty()) {
+        if (StringUtilities.isEmpty(toProcess)) {
             //no command? no string
             return new String[0];
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
index df3ed241635..171f1925efc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/FileArgumentHolder.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.lang3.tuple.Pair;
 
 public class FileArgumentHolder implements ArgumentHolder {
     private final String name;
@@ -36,8 +35,8 @@ public static FileArgumentHolder of(String name) {
         if (name == null) {
             return new FileArgumentHolder("", Collections.emptyMap());
         }
-        Pair<String, Map<String, String>> parsed = ArgumentHolder.parse(name);
-        return new FileArgumentHolder(parsed.getLeft(), parsed.getRight());
+        Map.Entry<String, Map<String, String>> parsed = ArgumentHolder.parse(name);
+        return new FileArgumentHolder(parsed.getKey(), parsed.getValue());
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
index 8930fa97ab0..e0a80f40264 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/StringArgumentHolder.java
@@ -21,8 +21,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.lang3.tuple.Pair;
-
 public class StringArgumentHolder implements ArgumentHolder {
 
     @Override
@@ -54,8 +52,8 @@ private StringArgumentHolder(String name, Map<String, String> metadata) {
     }
 
     public static StringArgumentHolder of(String name) {
-        Pair<String, Map<String, String>> argdata = ArgumentHolder.parse(name);
-        return new StringArgumentHolder(argdata.getLeft(), argdata.getRight());
+        Map.Entry<String, Map<String, String>> argdata = ArgumentHolder.parse(name);
+        return new StringArgumentHolder(argdata.getKey(), argdata.getValue());
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index 1f4af2befa2..3b91976f1a9 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -23,8 +23,6 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
 
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -35,6 +33,8 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.BooleanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * A GUI panel allowing the user to enter HTTP Parameters.
@@ -148,7 +148,7 @@ public void configure(TestElement el) {
 
     protected boolean isMetaDataNormal(HTTPArgument arg) {
         return arg.getMetaData() == null || arg.getMetaData().equals("=")
-                || (arg.getValue() != null && arg.getValue().length() > 0);
+                || StringUtilities.isNotEmpty(arg.getValue());
     }
 
     @Override
@@ -198,7 +198,7 @@ private void transformNameIntoVariable() {
         int[] rowsSelected = getTable().getSelectedRows();
         for (int selectedRow : rowsSelected) {
             String name = (String) tableModel.getValueAt(selectedRow, 0);
-            if (StringUtils.isNotBlank(name)) {
+            if (StringUtilities.isNotBlank(name)) {
                 name = name.trim();
                 name = name.replaceAll("\\$", "_");
                 name = name.replaceAll("\\{", "_");
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
index ecdd06c2bf6..8c0b1b2e174 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
@@ -40,7 +40,6 @@
 import javax.swing.JViewport;
 import javax.swing.ListSelectionModel;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.gui.RowDetailDialog;
 import org.apache.jmeter.gui.util.FileDialoger;
 import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
@@ -51,6 +50,7 @@
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.StringUtilities;
 
 /*
  * Note: this class is currently only suitable for use with HTTSamplerBase.
@@ -283,7 +283,7 @@ private void runCommandOnRow(String command, int rowSelected) {
             tableModel.removeRow(rowSelected);
         } else if (BROWSE.equals(command)) {
             String path = browseAndGetFilePath();
-            if(StringUtils.isNotBlank(path)) {
+            if (StringUtilities.isNotBlank(path)) {
                 tableModel.setValueAt(path, rowSelected, 0);
             }
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 2818fc8fab3..bb15159c6b1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -50,8 +50,6 @@
 import javax.swing.tree.TreePath;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.KeystoreConfig;
 import org.apache.jmeter.control.Controller;
@@ -105,6 +103,7 @@
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.JMeterUIDefaults;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.tika.Tika;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
@@ -312,8 +311,9 @@ private HTTPSamplerProxy createSampler(Request request, String commentText) thro
             httpSampler.setPort(url.getPort());
         }
         String path = url.getPath();
-        if (StringUtils.isNotEmpty(url.getQuery())) {
-            path += "?" + url.getQuery();
+        String query = url.getQuery();
+        if (StringUtilities.isNotEmpty(query)) {
+            path += "?" + query;
         }
         // setMethod must be before setPath as setPath uses method to determine if parameters should be parsed or not
         httpSampler.setMethod(request.getMethod());
@@ -370,7 +370,7 @@ private static HeaderManager createHeaderManager(Request request) {
         headerManager.setProperty(TestElement.NAME, "HTTP HeaderManager");
         headerManager.setProperty(TestElement.COMMENTS, getDefaultComment());
         boolean hasAcceptEncoding = false;
-        for (Pair<String, String> header : request.getHeaders()) {
+        for (Map.Entry<String, String> header : request.getHeaders()) {
             String key = header.getKey();
             hasAcceptEncoding = hasAcceptEncoding || key.equalsIgnoreCase(ACCEPT_ENCODING);
             headerManager.getHeaders().addItem(new Header(key, header.getValue()));
@@ -539,12 +539,12 @@ private void setFormData(Request request, HTTPSamplerProxy httpSampler) {
             throw new IllegalArgumentException("--form and --data can't appear in the same command");
         }
         List<HTTPFileArg> httpFileArgs = new ArrayList<>();
-        for (Pair<String, String> entry : request.getFormStringData()) {
+        for (Map.Entry<String, String> entry : request.getFormStringData()) {
             String formName = entry.getKey();
             String formValue = entry.getValue();
             httpSampler.addNonEncodedArgument(formName, formValue, "");
         }
-        for (Pair<String, ArgumentHolder> entry : request.getFormData()) {
+        for (Map.Entry<String, ArgumentHolder> entry : request.getFormData()) {
             String formName = entry.getKey();
             ArgumentHolder formValueObject = entry.getValue();
             String formValue = formValueObject.getName();
@@ -630,10 +630,10 @@ public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand().equals(CREATE_REQUEST)) {
             List<String> commandsList = null;
             try {
-                if (!filePanel.getFilename().trim().isEmpty() && cURLCommandTA.getText().trim().isEmpty()) {
+                if (StringUtilities.isNotBlank(filePanel.getFilename()) && StringUtilities.isBlank(cURLCommandTA.getText())) {
                     commandsList = readFromFile(filePanel.getFilename().trim());
                     isReadFromFile = true;
-                } else if (filePanel.getFilename().trim().isEmpty() && !cURLCommandTA.getText().trim().isEmpty()) {
+                } else if (StringUtilities.isBlank(filePanel.getFilename()) && StringUtilities.isNotBlank(cURLCommandTA.getText())) {
                     commandsList = readFromTextPanel(cURLCommandTA.getText().trim());
                 } else {
                     throw new IllegalArgumentException(
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
index da196d7a946..c092152dafe 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
@@ -28,6 +28,7 @@
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,7 +66,7 @@ public void process() {
         }
 
         Map<String, String> paramMap = buildParamsMap();
-        if(paramMap == null || paramMap.isEmpty()){
+        if (paramMap == null || paramMap.isEmpty()){
             log.info(
                     "RegExUserParameters element: {} => Referenced RegExp was not found, no parameter will be changed",
                     getName());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index 858c03d7406..cb8f6defeec 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -30,6 +30,7 @@
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
@@ -95,7 +96,7 @@ public void process() {
 
         // Bug 15025 - save session value across samplers
         if (shouldCache()) {
-            if (value == null || value.isEmpty()) {
+            if (StringUtilities.isEmpty(value)) {
                 value = savedValue;
             } else {
                 savedValue = value;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
index 952f61fb3ac..30a6c9b8356 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
@@ -22,10 +22,9 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutableTriple;
-import org.apache.commons.lang3.tuple.Triple;
+import org.apache.commons.lang3.stream.Streams;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +41,26 @@ public class CssParser implements LinkExtractorParser {
     private static final URLCollection EMPTY_URL_COLLECTION = new URLCollection(Collections.emptyList());
     private static final Logger LOG = LoggerFactory.getLogger(CssParser.class);
 
-    private static final LoadingCache<Triple<String, URL, Charset>, URLCollection> CSS_URL_CACHE;
+    private static final LoadingCache<CssCacheKey, URLCollection> CSS_URL_CACHE;
+
+    record CssCacheKey(URL baseUrl, String cssContents, Charset charset) {
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            CssCacheKey that = (CssCacheKey) o;
+            return Objects.equals(baseUrl, that.baseUrl) && Objects.equals(cssContents, that.cssContents);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = Objects.hashCode(baseUrl);
+            result = 31 * result + Objects.hashCode(cssContents);
+            return result;
+        }
+    }
+
     static {
         final int cacheSize = JMeterUtils.getPropDefault(
                 "css.parser.cache.size", 400);
@@ -60,13 +78,13 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] data,
             throws LinkExtractorParseException {
         try {
             final String cssContent = new String(data, encoding);
-            final Charset charset = Charset.forName(encoding);
-            final Triple<String, URL, Charset> triple = ImmutableTriple.of(
-                    cssContent, baseUrl, charset);
-            final URLCollection urlCollection = orDefault(CSS_URL_CACHE.get(triple), EMPTY_URL_COLLECTION);
+            final CssCacheKey key = new CssCacheKey(baseUrl, cssContent, Charset.forName(encoding));
+            final URLCollection urlCollection =
+                    Objects.requireNonNullElse(CSS_URL_CACHE.get(key), EMPTY_URL_COLLECTION);
 
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Parsed: {}, got: {}", baseUrl, StringUtils.join(urlCollection, ","));
+                LOG.debug("Parsed: {}, got: {}", baseUrl,
+                        Streams.of(urlCollection).map(String::valueOf).collect(Collectors.joining(",")));
             }
 
             return urlCollection.iterator();
@@ -75,14 +93,6 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] data,
         }
     }
 
-    private static URLCollection orDefault(URLCollection urlCollection,
-            URLCollection defaultValue) {
-        if (urlCollection == null) {
-            return Objects.requireNonNull(defaultValue);
-        }
-        return urlCollection;
-    }
-
     @Override
     public boolean isReusable() {
         return true;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
index 8b511f643c8..43aedc9471b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
@@ -21,9 +21,8 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Triple;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,18 +41,18 @@
 import com.helger.css.reader.errorhandler.LoggingCSSParseErrorHandler;
 
 public class CssParserCacheLoader implements
-        CacheLoader<Triple<String, URL, Charset>, URLCollection> {
+        CacheLoader<CssParser.CssCacheKey, URLCollection> {
 
     private static final Logger LOG = LoggerFactory.getLogger(CssParserCacheLoader.class);
     private static final boolean IGNORE_ALL_CSS_ERRORS = JMeterUtils
             .getPropDefault("css.parser.ignore_all_css_errors", true);
 
     @Override
-    public URLCollection load(Triple<String, URL, Charset> triple)
+    public URLCollection load(CssParser.CssCacheKey triple)
             throws Exception {
-        final String cssContent = triple.getLeft();
-        final URL baseUrl = triple.getMiddle();
-        final Charset charset = triple.getRight();
+        final String cssContent = triple.cssContents();
+        final URL baseUrl = triple.baseUrl();
+        final Charset charset = triple.charset();
         final CSSReaderSettings readerSettings = new CSSReaderSettings()
                 .setBrowserCompliantMode(true)
                 .setFallbackCharset(charset)
@@ -80,7 +79,7 @@ public URLCollection load(Triple<String, URL, Charset> triple)
             @Override
             public void onImport(CSSImportRule rule) {
                 final String location = rule.getLocationString();
-                if (!StringUtils.isEmpty(location)) {
+                if (StringUtilities.isNotEmpty(location)) {
                     urls.addURL(location, baseUrl);
                 }
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
index af67dc063ce..31a9a36ab8e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
@@ -25,7 +25,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,7 +203,7 @@ protected static boolean isEnableConditionalComments(Float ieVersion) {
      * @return version null if not IE or the version after MSIE
      */
     protected Float extractIEVersion(String userAgent) {
-        if (StringUtils.isEmpty(userAgent)) {
+        if (StringUtilities.isEmpty(userAgent)) {
             log.info("userAgent is null");
             return null;
         }
@@ -229,7 +229,7 @@ protected Float extractIEVersion(String userAgent) {
      * @return normalized url
      */
     protected static String normalizeUrlValue(CharSequence url) {
-        if (!StringUtils.isEmpty(url)) {
+        if (StringUtilities.isNotEmpty(url)) {
             String trimmed = NORMALIZE_URL_PATTERN.matcher(url.toString().trim()).replaceAll("");
             if (!trimmed.isEmpty()) {
                 return trimmed;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
index 8521315d5f8..1b77a579430 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
@@ -34,6 +34,7 @@
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.PatternCacheLRU;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
@@ -82,7 +83,7 @@ public static boolean isAnchorMatched(HTTPSamplerBase newLink, HTTPSamplerBase c
             query = URLDecoder.decode(newLink.getQueryString(), StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             // UTF-8 unsupported? You must be joking!
-            log.error("UTF-8 encoding not supported!");
+            log.error("UTF-8 charset not supported!");
             throw new Error("Should not happen: " + e.toString(), e);
         }
 
@@ -101,7 +102,7 @@ private static boolean isAnchorMatchedWithJavaRegex(HTTPSamplerBase newLink, HTT
         }
 
         final String domain = config.getDomain();
-        if (domain != null && !domain.isEmpty()) {
+        if (StringUtilities.isNotEmpty(domain)) {
             if (!isEqualOrMatchesWithJavaRegex(newLink.getDomain(), domain)) {
                 return false;
             }
@@ -136,7 +137,7 @@ private static boolean isAnchorMatchedWithOroRegex(HTTPSamplerBase newLink, HTTP
         }
 
         final String domain = config.getDomain();
-        if (domain != null && !domain.isEmpty()) {
+        if (StringUtilities.isNotEmpty(domain)) {
             if (!isEqualOrMatches(newLink.getDomain(), domain, matcher, patternCache)){
                 return false;
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
index 782ef9c2f19..a540fa65d55 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
@@ -23,8 +23,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -113,10 +113,10 @@ private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws
             if (name.equalsIgnoreCase(TAG_APPLET)) {
                 String codebase = getValue(attrs, ATT_CODEBASE);
                 String code = getValue(attrs, ATT_ARCHIVE);
-                if (StringUtils.isBlank(code)) {
+                if (StringUtilities.isBlank(code)) {
                     code = getValue(attrs, ATT_CODE);
                 }
-                if (StringUtils.isBlank(codebase)) {
+                if (StringUtilities.isBlank(codebase)) {
                     urls.addURL(code, baseUrl);
                 } else {
                     urls.addURL(codebase + "/" + code, baseUrl);
@@ -126,12 +126,12 @@ private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws
 
             if (name.equalsIgnoreCase(TAG_OBJECT)) {
                 String data = getValue(attrs, "codebase");
-                if(!StringUtils.isEmpty(data)) {
+                if (StringUtilities.isNotEmpty(data)) {
                     urls.addURL(data, baseUrl);
                 }
 
                 data = getValue(attrs, "data");
-                if(!StringUtils.isEmpty(data)) {
+                if (StringUtilities.isNotEmpty(data)) {
                     urls.addURL(data, baseUrl);
                 }
                 break;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
index 3e2ab33d563..9e1ccb70531 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
@@ -22,8 +22,8 @@
 import java.util.Iterator;
 import java.util.Locale;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -84,7 +84,7 @@ public void head(Node node, int depth) {
             } else if (tagName.equals(TAG_BASE)) {
                 String baseref = tag.attr(ATT_HREF);
                 try {
-                    if (!StringUtils.isEmpty(baseref))// Bugzilla 30713
+                    if (StringUtilities.isNotEmpty(baseref))// Bugzilla 30713
                     {
                         baseUrl.url = ConversionUtils.makeRelativeURL(baseUrl.url, baseref);
                     }
@@ -97,12 +97,12 @@ public void head(Node node, int depth) {
                 CharSequence codebase = tag.attr(ATT_CODEBASE);
                 CharSequence archive = tag.attr(ATT_ARCHIVE);
                 CharSequence code = tag.attr(ATT_CODE);
-                if (StringUtils.isNotBlank(codebase)) {
+                if (StringUtilities.isNotBlank(codebase)) {
                     String result;
-                    if (StringUtils.isNotBlank(archive)) {
-                        result = codebase.toString() + "/" + archive;
+                    if (StringUtilities.isNotBlank(archive)) {
+                        result = codebase + "/" + archive;
                     } else {
-                        result = codebase.toString() + "/" + code;
+                        result = codebase + "/" + code;
                     }
                     urls.addURL(normalizeUrlValue(result), baseUrl.url);
                 } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index a14b6bace15..9c30ee8d8f1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -24,8 +24,8 @@
 import java.util.Deque;
 import java.util.Iterator;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 
 import jodd.lagarto.EmptyTagVisitor;
@@ -118,7 +118,7 @@ public void tag(Tag tag) {
                 } else if (tag.nameEquals(TAG_BASE)) {
                     CharSequence baseref = tag.getAttributeValue(ATT_HREF);
                     try {
-                        if (!StringUtils.isEmpty(baseref))// Bugzilla 30713
+                        if (StringUtilities.isNotEmpty(baseref))// Bugzilla 30713
                         {
                             baseUrl.url = ConversionUtils.makeRelativeURL(baseUrl.url, baseref.toString());
                         }
@@ -131,12 +131,12 @@ public void tag(Tag tag) {
                     CharSequence codebase = tag.getAttributeValue(ATT_CODEBASE);
                     CharSequence archive = tag.getAttributeValue(ATT_ARCHIVE);
                     CharSequence code = tag.getAttributeValue(ATT_CODE);
-                    if (StringUtils.isNotBlank(codebase)) {
+                    if (StringUtilities.isNotBlank(codebase)) {
                         String result;
-                        if (StringUtils.isNotBlank(archive)) {
-                            result = codebase.toString() + "/" + archive;
+                        if (StringUtilities.isNotBlank(archive)) {
+                            result = codebase + "/" + archive;
                         } else {
-                            result = codebase.toString() + "/" + code;
+                            result = codebase + "/" + code;
                         }
                         urls.addURL(normalizeUrlValue(result), baseUrl.url);
                     } else {
@@ -176,7 +176,7 @@ public void tag(Tag tag) {
                 }
                 // Now look for URLs in the STYLE attribute
                 CharSequence styleTagStr = tag.getAttributeValue(ATT_STYLE);
-                if(!StringUtils.isEmpty(styleTagStr)) {
+                if (StringUtilities.isNotEmpty(styleTagStr)) {
                     HtmlParsingUtils.extractStyleURLs(baseUrl.url, urls, styleTagStr.toString());
                 }
                 break;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index 99728479e6a..02a1ad68231 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -25,6 +25,7 @@
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,7 +77,7 @@ public boolean add(URL u) {
      *         collection
      */
     public boolean addURL(String url, URL baseUrl) {
-        if (url == null || url.length() == 0) {
+        if (StringUtilities.isEmpty(url)) {
             return false;
         }
         url=StringEscapeUtils.unescapeXml(url);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index e06ebda7ebc..558c2f98938 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -36,7 +36,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
@@ -51,6 +50,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
@@ -462,7 +462,7 @@ protected void computeContentEncoding(HTTPSamplerBase sampler,
                 formEncodings, urlWithoutQuery);
 
         // Set the content encoding
-        if(!StringUtils.isEmpty(contentEncoding)) {
+        if (StringUtilities.isNotEmpty(contentEncoding)) {
             sampler.setContentEncoding(contentEncoding);
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
index 936807905d7..ef7e2c572a8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
@@ -19,9 +19,9 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.parser.HTMLParseException;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -61,7 +61,7 @@ public void addFormActionsAndCharSet(String html, Map<? super String, ? super St
         Elements forms = document.select("form");
         for (Element element : forms) {
             String action = element.attr("action");
-            if (!StringUtils.isEmpty(action)) {
+            if (StringUtilities.isNotEmpty(action)) {
                 // We use the page encoding where the form resides, as the
                 // default encoding for the form
                 String formCharSet = pageEncoding;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index b10e5d27dda..b3cdcd0f102 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang3.CharUtils;
 import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
 import org.apache.jmeter.protocol.http.control.Header;
 import org.apache.jmeter.protocol.http.control.HeaderManager;
@@ -40,6 +39,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.CharUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -157,7 +157,7 @@ public byte[] parse(InputStream in) throws IOException {
         while ((inHeaders || readLength < dataLength) && ((x = in.read()) != -1)) {
             line.write(x);
             clientRequest.write(x);
-            if (firstLine && !CharUtils.isAscii((char) x)){// includes \n
+            if (firstLine && x >= 128){// includes \n
                 throw new IllegalArgumentException("Only ASCII supported in headers (perhaps SSL was used?)");
             }
             if (inHeaders && (byte) x == (byte) '\n') { // $NON-NLS-1$
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
index 84cc35ce7ad..6c16ba227a1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
@@ -19,15 +19,14 @@
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintStream;
 import java.net.Socket;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -52,6 +51,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.apache.jorphan.util.JMeterException;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
@@ -486,9 +486,8 @@ private static SampleResult generateErrorResult(SampleResult result, HttpRequest
     private static SampleResult generateErrorResult(SampleResult result, HttpRequestHdr request, Exception e, String msg) {
         if (result == null) {
             result = new SampleResult();
-            ByteArrayOutputStream text = new ByteArrayOutputStream(200);
-            e.printStackTrace(new PrintStream(text)); // NOSONAR we store the Stacktrace in the result
-            result.setResponseData(text.toByteArray());
+            result.setResponseData(ExceptionUtils.getStackTraceAsBytes(e, StandardCharsets.UTF_8));
+            result.setDataEncoding(StandardCharsets.UTF_8.name());
             result.setSamplerData(request.getFirstLine());
             result.setSampleLabel(request.getUrl());
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 5fbbc1a34eb..5fb176c28f3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -44,13 +44,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.prefs.Preferences;
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.apache.jmeter.assertions.Assertion;
 import org.apache.jmeter.assertions.ResponseAssertion;
 import org.apache.jmeter.assertions.gui.AssertionGui;
@@ -101,6 +101,7 @@
 import org.apache.jmeter.visualizers.Visualizer;
 import org.apache.jorphan.exec.KeyToolUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
@@ -807,7 +808,7 @@ public String[] getCertificateDetails() {
     // Package protected to allow test case access
     boolean filterUrl(HTTPSamplerBase sampler) {
         String domain = sampler.getDomain();
-        if (domain == null || domain.isEmpty()) {
+        if (StringUtilities.isEmpty(domain)) {
             return false;
         }
 
@@ -839,14 +840,14 @@ boolean filterContentType(SampleResult result) {
         String excludeExp = getContentTypeExclude();
 
         // If no expressions are specified, we let the sample pass
-        if ((includeExp == null || includeExp.isEmpty()) &&
-                (excludeExp == null || excludeExp.isEmpty())) {
+        if (StringUtilities.isEmpty(includeExp) &&
+                StringUtilities.isEmpty(excludeExp)) {
             return true;
         }
 
         // Check that we have a content type
         String sampleContentType = result.getContentType();
-        if (sampleContentType == null || sampleContentType.isEmpty()) {
+        if (StringUtilities.isEmpty(sampleContentType)) {
             if (log.isDebugEnabled()) {
                 log.debug("No Content-type found for : {}", result.getUrlAsString());
             }
@@ -881,7 +882,7 @@ boolean filterContentType(SampleResult result) {
      * @return boolean true if Matching expression
      */
     private static boolean testPattern(String expression, String sampleContentType, boolean expectedToMatch) {
-        if (expression == null || expression.isEmpty()) {
+        if (StringUtilities.isEmpty(expression)) {
             return true;
         }
         if(log.isDebugEnabled()) {
@@ -1351,7 +1352,7 @@ private static void removeValuesFromSampler(HTTPSamplerBase sampler, Collection<
             for (ConfigTestElement config : configurations) {
                 String configValue = config.getPropertyAsString(name);
 
-                if (configValue != null && !configValue.isEmpty()) {
+                if (StringUtilities.isNotEmpty(configValue)) {
                     if (configValue.equals(value)) {
                         sampler.setProperty(name, ""); // $NON-NLS-1$
                     }
@@ -1556,7 +1557,7 @@ private void initUserKeyStore() {
                 log.error("Could not find key with alias {}", CERT_ALIAS);
                 keyStore = null;
             } else {
-                caCert.checkValidity(new Date(System.currentTimeMillis() + DateUtils.MILLIS_PER_DAY));
+                caCert.checkValidity(new Date(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)));
             }
         } catch (Exception e) {
             keyStore = null;
@@ -1580,7 +1581,7 @@ private void initDynamicKeyStore() throws IOException, GeneralSecurityException
                         keyStore = null; // no CA key - probably the wrong store type.
                         break; // cannot continue
                     } else {
-                        caCert.checkValidity(new Date(System.currentTimeMillis()+DateUtils.MILLIS_PER_DAY));
+                        caCert.checkValidity(new Date(System.currentTimeMillis()+TimeUnit.DAYS.toMillis(1)));
                         log.info("Valid alias found for {}", alias);
                     }
                 }
@@ -1671,7 +1672,7 @@ private void initJMeterKeyStore() throws IOException, GeneralSecurityException {
             try {
                 keyStore = getKeyStore(storePassword.toCharArray());
                 X509Certificate caCert = (X509Certificate) keyStore.getCertificate(JMETER_SERVER_ALIAS);
-                caCert.checkValidity(new Date(System.currentTimeMillis() + DateUtils.MILLIS_PER_DAY));
+                caCert.checkValidity(new Date(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)));
             } catch (Exception e) { // store is faulty, we need to recreate it
                 keyStore = null; // if cert is not valid, flag up to recreate it
                 log.warn(
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index 7ac8c0ae97f..4ad7feb4aa2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -62,8 +62,6 @@
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.control.gui.LogicControllerGui;
 import org.apache.jmeter.control.gui.TreeNodeWrapper;
@@ -92,6 +90,8 @@
 import org.apache.jorphan.exec.KeyToolUtils;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -346,8 +346,9 @@ public void modifyTestElement(TestElement el) {
             model.setContentTypeInclude(contentTypeInclude.getText());
             model.setContentTypeExclude(contentTypeExclude.getText());
             httpSampleNameFormat.setEnabled(httpSampleNamingMode.getSelectedIndex() == 3);
-            if (StringUtils.isNotBlank(httpSampleNameFormat.getText())) {
-                model.setHttpSampleNameFormat(httpSampleNameFormat.getText());
+            String httpSampleNameFormat = this.httpSampleNameFormat.getText();
+            if (StringUtilities.isNotBlank(httpSampleNameFormat)) {
+                model.setHttpSampleNameFormat(httpSampleNameFormat);
             }
             TreeNodeWrapper nw = (TreeNodeWrapper) targetNodes.getSelectedItem();
             if (nw == null) {
@@ -699,14 +700,17 @@ void enableRestart() {
     }
 
     void setSetCounters() {
-        if ((counterValue.getText().length() > 0) && NumberUtils.isParsable(counterValue.getText())) {
-            Proxy.setCounter(Integer.parseInt(counterValue.getText()));
-        } else {
-            JOptionPane.showMessageDialog(this,
-                    JMeterUtils.getResString("proxy_settings_counter_error_digits"), // $NON-NLS-1$
-                    JMeterUtils.getResString("proxy_settings_counter_error_invalid_data"), // $NON-NLS-1$
-                    JOptionPane.WARNING_MESSAGE);
+        String counterValue = this.counterValue.getText();
+        try {
+            Proxy.setCounter(Integer.parseInt(counterValue));
+            return;
+        } catch (NumberFormatException ignore) {
+            // ignore
         }
+        JOptionPane.showMessageDialog(this,
+                JMeterUtils.getResString("proxy_settings_counter_error_digits"), // $NON-NLS-1$
+                JMeterUtils.getResString("proxy_settings_counter_error_invalid_data"), // $NON-NLS-1$
+                JOptionPane.WARNING_MESSAGE);
     }
     /** {@inheritDoc} */
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
index a48146247df..d63c38fddfe 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.protocol.http.control.CookieManager;
 import org.apache.jmeter.protocol.http.util.accesslog.Filter;
@@ -29,6 +28,7 @@
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.util.JMeterException;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -197,11 +197,13 @@ public SampleResult sample(Entry e) {
     public void instantiateParser() {
         if (parser == null) {
             try {
-                if (StringUtils.isNotBlank(this.getParserClassName())) {
-                    if (StringUtils.isNotBlank(this.getLogFile())) {
-                        parser = Class.forName(getParserClassName())
+                String parserClassName = this.getParserClassName();
+                if (StringUtilities.isNotBlank(parserClassName)) {
+                    String logFile = this.getLogFile();
+                    if (StringUtilities.isNotBlank(logFile)) {
+                        parser = Class.forName(parserClassName)
                                 .asSubclass(LogParser.class).getDeclaredConstructor().newInstance();
-                        parser.setSourceFile(this.getLogFile());
+                        parser.setSourceFile(logFile);
                         parser.setFilter(filter);
                     } else {
                         log.error("No log file specified");
@@ -302,7 +304,7 @@ public AccessLogSampler() {
     }
 
     protected void initFilter() {
-        if (filter == null && StringUtils.isNotBlank(filterClassName)) {
+        if (filter == null && StringUtilities.isNotBlank(filterClassName)) {
             try {
                 filter = Class.forName(filterClassName)
                     .asSubclass(Filter.class).getDeclaredConstructor().newInstance();
@@ -318,7 +320,7 @@ protected void initFilter() {
     @Override
     public Object clone() {
         AccessLogSampler s = (AccessLogSampler) super.clone();
-        if (started && StringUtils.isNotBlank(filterClassName)) {
+        if (started && StringUtilities.isNotBlank(filterClassName)) {
 
             try {
                 if (TestCloneable.class.isAssignableFrom(Class.forName(filterClassName))) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
index 8323270f604..cdcdd50abad 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
@@ -232,7 +232,7 @@ protected String getIpSource() {
      */
     protected InetAddress getIpSourceAddress() throws UnknownHostException, SocketException {
         final String ipSource = getIpSource();
-        if (ipSource.trim().length() > 0) {
+        if (!ipSource.isBlank()) {
             Class<? extends InetAddress> ipClass = null;
             final SourceType sourceType = HTTPSamplerBase.SourceType.values()[testElement.getIpSourceType()];
             switch (sourceType) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index bc4478eecb3..429bff5bef6 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -46,8 +46,6 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.MutableTriple;
 import org.apache.http.Header;
 import org.apache.http.HttpClientConnection;
 import org.apache.http.HttpConnectionMetrics;
@@ -138,6 +136,7 @@
 import org.apache.http.util.CharArrayBuffer;
 import org.apache.http.util.EntityUtils;
 import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.protocol.http.HttpClientState;
 import org.apache.jmeter.protocol.http.api.auth.DigestParameters;
 import org.apache.jmeter.protocol.http.control.AuthManager;
 import org.apache.jmeter.protocol.http.control.AuthManager.Mechanism;
@@ -166,6 +165,7 @@
 import org.apache.jmeter.util.JsseSSLManager;
 import org.apache.jmeter.util.SSLManager;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.brotli.dec.BrotliInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -297,7 +297,7 @@ public void process(HttpRequest request, HttpContext context) throws HttpExcepti
                 HttpClientKey key = (HttpClientKey) localContext.getAttribute(CONTEXT_ATTRIBUTE_CLIENT_KEY);
                 AuthScope authScope = null;
                 CredentialsProvider credentialsProvider = localContext.getCredentialsProvider();
-                if (key.hasProxy && !StringUtils.isEmpty(key.proxyUser)) {
+                if (key.hasProxy && !(key.proxyUser == null || key.proxyUser.isEmpty())) {
                     authScope = new AuthScope(key.proxyHost, key.proxyPort);
                     credentials = credentialsProvider.getCredentials(authScope);
                 }
@@ -524,11 +524,10 @@ public void process(HttpResponse response, HttpContext context)
     /**
      * 1 HttpClient instance per combination of (HttpClient,HttpClientKey)
      */
-    private static final ThreadLocal<Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>>>
-            HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY = new InheritableThreadLocal<Map<HttpClientKey,
-                    MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>>>() {
+    private static final ThreadLocal<Map<HttpClientKey, HttpClientState>>
+            HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY = new InheritableThreadLocal<>() {
         @Override
-        protected Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> initialValue() {
+        protected Map<HttpClientKey, HttpClientState> initialValue() {
             return new HashMap<>(5);
         }
     };
@@ -618,10 +617,10 @@ protected HTTPSampleResult sample(URL url, String method,
         HttpClientContext clientContext = HttpClientContext.adapt(localContext);
         clientContext.setAttribute(CONTEXT_ATTRIBUTE_AUTH_MANAGER, getAuthManager());
         HttpClientKey key = createHttpClientKey(url);
-        MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple;
+        HttpClientState clientState;
         try {
-            triple = setupClient(key, jMeterVariables, clientContext);
-            httpClient = triple.getLeft();
+            clientState = setupClient(key, jMeterVariables, clientContext);
+            httpClient = clientState.getClient();
             URI uri = url.toURI();
             httpRequest = createHttpRequest(uri, method, areFollowingRedirect);
             setupRequest(url, httpRequest, res); // can throw IOException
@@ -649,7 +648,7 @@ protected HTTPSampleResult sample(URL url, String method,
             // perform the sample
             httpResponse =
                     executeRequest(httpClient, httpRequest, localContext, url);
-            saveProxyAuth(triple, localContext);
+            saveProxyAuth(clientState, localContext);
             if (log.isDebugEnabled()) {
                 log.debug("Headers in request before:{}", Arrays.asList(httpRequest.getAllHeaders()));
             }
@@ -769,24 +768,24 @@ protected HTTPSampleResult sample(URL url, String method,
 
     /**
      * Associate Proxy state to thread
-     * @param triple {@link MutableTriple}
+     * @param clientState {@link HttpClientState}
      * @param localContext {@link HttpContext}
      */
     private static void saveProxyAuth(
-            MutableTriple<CloseableHttpClient, ? super AuthState, PoolingHttpClientConnectionManager> triple,
+            HttpClientState clientState,
             HttpContext localContext) {
-        triple.setMiddle((AuthState) localContext.getAttribute(HttpClientContext.PROXY_AUTH_STATE));
+        clientState.setAuthState((AuthState) localContext.getAttribute(HttpClientContext.PROXY_AUTH_STATE));
     }
 
     /**
-     * Store in localContext Proxy auth state of triple
-     * @param triple {@link MutableTriple} May be null if first request
+     * Store in localContext Proxy auth state of clientState
+     * @param clientState {@link HttpClientState} May be null if first request
      * @param localContext {@link HttpContext}
      */
-    private static void setupProxyAuthState(MutableTriple<CloseableHttpClient, ? extends AuthState, PoolingHttpClientConnectionManager> triple,
+    private static void setupProxyAuthState(HttpClientState clientState,
             HttpContext localContext) {
-        if (triple != null) {
-            AuthState proxyAuthState = triple.getMiddle();
+        if (clientState != null) {
+            AuthState proxyAuthState = clientState.getAuthState();
             localContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, proxyAuthState);
         }
     }
@@ -1053,28 +1052,28 @@ public String toString() {
         }
     }
 
-    private MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> setupClient(HttpClientKey key, JMeterVariables jMeterVariables,
+    private HttpClientState setupClient(HttpClientKey key, JMeterVariables jMeterVariables,
             HttpClientContext clientContext) throws GeneralSecurityException {
-        Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey =
+        Map<HttpClientKey, HttpClientState> mapHttpClientPerHttpClientKey =
                 HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY.get();
         clientContext.setAttribute(CONTEXT_ATTRIBUTE_CLIENT_KEY, key);
         CloseableHttpClient httpClient = null;
-        MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple = null;
+        HttpClientState clientState = null;
         boolean concurrentDwn = this.testElement.isConcurrentDwn();
         Map<String, Object> samplerContext = JMeterContextService.getContext().getSamplerContext();
         if(concurrentDwn) {
-            triple = (MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>)
+            clientState = (HttpClientState)
                     samplerContext.get(CONTEXT_ATTRIBUTE_PARENT_SAMPLE_CLIENT_STATE);
         }
-        if (triple == null) {
-            triple = mapHttpClientPerHttpClientKey.get(key);
+        if (clientState == null) {
+            clientState = mapHttpClientPerHttpClientKey.get(key);
         }
 
-        if(triple != null) {
-            httpClient = triple.getLeft();
+        if(clientState != null) {
+            httpClient = clientState.getClient();
         }
-        setupProxyAuthState(triple, clientContext);
-        resetStateIfNeeded(triple, jMeterVariables, clientContext, mapHttpClientPerHttpClientKey);
+        setupProxyAuthState(clientState, clientContext);
+        resetStateIfNeeded(clientState, jMeterVariables, clientContext, mapHttpClientPerHttpClientKey);
 
         if (httpClient == null) { // One-time init for this client
             DnsResolver resolver = this.testElement.getDNSResolver();
@@ -1167,8 +1166,8 @@ private MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectio
             if (log.isDebugEnabled()) {
                 log.debug("Created new HttpClient: @{} {}", System.identityHashCode(httpClient), key);
             }
-            triple = MutableTriple.of(httpClient, null, pHCCM);
-            mapHttpClientPerHttpClientKey.put(key, triple); // save the agent for next time round
+            clientState = new HttpClientState(httpClient, pHCCM);
+            mapHttpClientPerHttpClientKey.put(key, clientState); // save the agent for next time round
         } else {
             if (log.isDebugEnabled()) {
                 log.debug("Reusing the HttpClient: @{} {}", System.identityHashCode(httpClient),key);
@@ -1176,9 +1175,9 @@ private MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectio
         }
 
         if(concurrentDwn) {
-            samplerContext.put(CONTEXT_ATTRIBUTE_PARENT_SAMPLE_CLIENT_STATE, triple);
+            samplerContext.put(CONTEXT_ATTRIBUTE_PARENT_SAMPLE_CLIENT_STATE, clientState);
         }
-        return triple;
+        return clientState;
     }
 
     protected AuthenticationStrategy getProxyAuthStrategy() {
@@ -1222,19 +1221,19 @@ private HttpClientKey createHttpClientKey(URL url) {
      * </ul>
      * @param jMeterVariables {@link JMeterVariables}
      * @param clientContext {@link HttpClientContext}
-     * @param mapHttpClientPerHttpClientKey Map of {@link MutableTriple} holding {@link CloseableHttpClient} and {@link PoolingHttpClientConnectionManager}
+     * @param mapHttpClientPerHttpClientKey Map of {@link HttpClientState} holding {@link CloseableHttpClient} and {@link PoolingHttpClientConnectionManager}
      */
     private static void resetStateIfNeeded(
-            MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple,
+            HttpClientState clientState,
             JMeterVariables jMeterVariables,
             HttpClientContext clientContext,
-            Map<HttpClientKey, ? extends MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
+            Map<HttpClientKey, ? extends HttpClientState> mapHttpClientPerHttpClientKey) {
         if (resetStateOnThreadGroupIteration.get()) {
             closeCurrentConnections(mapHttpClientPerHttpClientKey);
             clientContext.removeAttribute(HttpClientContext.USER_TOKEN);
             clientContext.removeAttribute(HttpClientContext.PROXY_AUTH_STATE);
-            if (triple != null) {
-                triple.setMiddle(null);
+            if (clientState != null) {
+                clientState.setAuthState(null);
             }
             jMeterVariables.remove(JMETER_VARIABLE_USER_TOKEN);
             ((JsseSSLManager) SSLManager.getInstance()).resetContext();
@@ -1246,10 +1245,10 @@ private static void resetStateIfNeeded(
      * @param mapHttpClientPerHttpClientKey
      */
     private static void closeCurrentConnections(
-            Map<HttpClientKey, ? extends MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) {
-        for (MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple :
+            Map<HttpClientKey, ? extends HttpClientState> mapHttpClientPerHttpClientKey) {
+        for (HttpClientState clientState :
                 mapHttpClientPerHttpClientKey.values()) {
-            PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = triple.getRight();
+            PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = clientState.getConnectionManager();
             poolingHttpClientConnectionManager.closeExpiredConnections();
             poolingHttpClientConnectionManager.closeIdleConnections(1L, TimeUnit.MICROSECONDS);
         }
@@ -1310,7 +1309,7 @@ protected void setupRequest(URL url, HttpRequestBase httpRequest, HTTPSampleResu
         String cookies = setConnectionCookie(httpRequest, url, getCookieManager());
 
         if (res != null) {
-            if(cookies != null && !cookies.isEmpty()) {
+            if (StringUtilities.isNotEmpty(cookies)) {
                 res.setCookies(cookies);
             } else {
                 // During recording Cookie Manager doesn't handle cookies
@@ -1610,7 +1609,7 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
             // Check if the header manager had a content type header
             // This allows the user to specify their own content-type for a POST request
             Header contentTypeHeader = entityEnclosingRequest.getFirstHeader(HTTPConstants.HEADER_CONTENT_TYPE);
-            boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.getValue() != null && contentTypeHeader.getValue().length() > 0;
+            boolean hasContentTypeHeader = contentTypeHeader != null && StringUtilities.isNotEmpty(contentTypeHeader.getValue());
             // If there are no arguments, we can send a file as the body of the request
             // TODO: needs a multiple file upload scenario
             if(!hasArguments() && getSendFileAsPostBody()) {
@@ -1618,7 +1617,7 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
                 HTTPFileArg file = files[0];
                 if(!hasContentTypeHeader) {
                     // Allow the mimetype of the file to control the content type
-                    if(file.getMimeType() != null && file.getMimeType().length() > 0) {
+                    if (StringUtilities.isNotEmpty(file.getMimeType())) {
                         entityEnclosingRequest.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, file.getMimeType());
                     }
                     else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
@@ -1643,7 +1642,7 @@ else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
                     // TODO: needs a multiple file upload scenario
                     if(!hasContentTypeHeader) {
                         HTTPFileArg file = files.length > 0? files[0] : null;
-                        if(file != null && file.getMimeType() != null && file.getMimeType().length() > 0) {
+                        if(file != null && StringUtilities.isNotEmpty(file.getMimeType())) {
                             entityEnclosingRequest.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, file.getMimeType());
                         }
                         else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
@@ -1732,7 +1731,7 @@ protected String sendEntityData( HttpEntityEnclosingRequestBase entity) throws I
         // but just sending the content of nameless parameters
         final HTTPFileArg file = files.length > 0? files[0] : null;
         String contentTypeValue;
-        if(file != null && file.getMimeType() != null && file.getMimeType().length() > 0) {
+        if(file != null && StringUtilities.isNotEmpty(file.getMimeType())) {
             contentTypeValue = file.getMimeType();
             entity.setHeader(HEADER_CONTENT_TYPE, contentTypeValue); // we provide the MIME type here
         }
@@ -1857,12 +1856,12 @@ protected void threadFinished() {
 
     private static void closeThreadLocalConnections() {
         // Does not need to be synchronised, as all access is from same thread
-        Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>>
+        Map<HttpClientKey, HttpClientState>
             mapHttpClientPerHttpClientKey = HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY.get();
         if (mapHttpClientPerHttpClientKey != null ) {
-            for (MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager> triple : mapHttpClientPerHttpClientKey.values() ) {
-                JOrphanUtils.closeQuietly(triple.getLeft());
-                JOrphanUtils.closeQuietly(triple.getRight());
+            for (HttpClientState clientState : mapHttpClientPerHttpClientKey.values() ) {
+                JOrphanUtils.closeQuietly(clientState.getClient());
+                JOrphanUtils.closeQuietly(clientState.getConnectionManager());
             }
             mapHttpClientPerHttpClientKey.clear();
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
index 602fd7bb8a4..a703d39cf93 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
@@ -25,10 +25,9 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,7 +104,7 @@ public abstract class HTTPHCAbstractImpl extends HTTPAbstractImpl {
             ThreadLocal.withInitial(() -> Boolean.FALSE);
 
     static {
-        if(!StringUtils.isEmpty(JMeterUtils.getProperty("httpclient.timeout"))) { //$NON-NLS-1$
+        if (!JMeterUtils.getPropDefault("httpclient.timeout", "").isEmpty()) { //$NON-NLS-1$
             log.warn("You're using property 'httpclient.timeout' that will soon be deprecated for HttpClient3.1, you should either set "
                     + "timeout in HTTP Request GUI, HTTP Request Defaults or set http.socket.timeout in httpclient.parameters");
         }
@@ -166,7 +165,7 @@ protected static boolean isPartialMatch(String host) {
      * @return {@code true} iff both ProxyPort and ProxyHost are defined.
      */
     protected boolean isDynamicProxy(String proxyHost, int proxyPort){
-        return !JOrphanUtils.isBlank(proxyHost) && proxyPort > 0;
+        return StringUtilities.isNotBlank(proxyHost) && proxyPort > 0;
     }
 
     /**
@@ -184,6 +183,6 @@ protected static boolean isStaticProxy(String host){
      * @return true if value is null or empty trimmed
      */
     protected static boolean isNullOrEmptyTrimmed(String value) {
-        return JOrphanUtils.isBlank(value);
+        return StringUtilities.isBlank(value);
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index da3a7ebc8c9..217e1bd4f99 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -204,7 +204,7 @@ protected HttpURLConnection setupConnection(URL u, String method, HTTPSampleResu
 
         if (res != null) {
             res.setRequestHeaders(getAllHeadersExceptCookie(conn, securityHeaders));
-            if(cookies != null && !cookies.isEmpty()) {
+            if (StringUtilities.isNotEmpty(cookies)) {
                 res.setCookies(cookies);
             } else {
                 // During recording Cookie Manager doesn't handle cookies
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
index 29919f47280..71251018fc0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
@@ -28,6 +28,7 @@
 
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * This is a specialisation of the SampleResult class for the HTTP protocol.
@@ -227,7 +228,7 @@ public void setQueryString(String string) {
     @Override
     public String getDataEncodingWithDefault(String defaultEncoding) {
         String dataEncodingNoDefault = getDataEncodingNoDefault();
-        if(dataEncodingNoDefault != null && dataEncodingNoDefault.length()> 0) {
+        if (StringUtilities.isNotEmpty(dataEncodingNoDefault)) {
             return dataEncodingNoDefault;
         }
         return defaultEncoding;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 3b3b37d0141..b078a020124 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -17,17 +17,16 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PrintStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -46,7 +45,6 @@
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -87,7 +85,9 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Matcher;
@@ -240,7 +240,7 @@ public abstract class HTTPSamplerBase extends AbstractSampler
         ));
         String userDefinedMethods = JMeterUtils.getPropDefault(
                 "httpsampler.user_defined_methods", "");
-        if (StringUtils.isNotBlank(userDefinedMethods)) {
+        if (StringUtilities.isNotBlank(userDefinedMethods)) {
             defaultMethods.addAll(Arrays.asList(userDefinedMethods.split("\\s*,\\s*")));
         }
         METHODLIST = Collections.unmodifiableList(defaultMethods);
@@ -449,7 +449,8 @@ public boolean getUseMultipart() {
 
     private static boolean hasNoMissingFile(HTTPFileArg[] files) {
         for (HTTPFileArg httpFileArg : files) {
-            if(StringUtils.isEmpty(httpFileArg.getPath())) {
+            String path = httpFileArg.getPath();
+            if (StringUtilities.isEmpty(path)) {
                 log.warn("File {} is invalid as no path is defined", httpFileArg);
                 return false;
             }
@@ -468,7 +469,7 @@ public void setProtocol(String value) {
      */
     public String getProtocol() {
         String protocol = getString(getSchema().getProtocol());
-        if (protocol == null || protocol.isEmpty()) {
+        if (StringUtilities.isEmpty(protocol)) {
             return HTTPConstants.PROTOCOL_HTTP;
         }
         return protocol;
@@ -672,7 +673,7 @@ public void addEncodedArgument(String name, String value, String metaData, Strin
                 contentEncoding);
 
         HTTPArgument arg;
-        final boolean nonEmptyEncoding = !StringUtils.isEmpty(contentEncoding);
+        final boolean nonEmptyEncoding = StringUtilities.isNotEmpty(contentEncoding);
         if (nonEmptyEncoding) {
             arg = new HTTPArgument(name, value, metaData, true, contentEncoding);
         } else {
@@ -786,7 +787,7 @@ public static int getDefaultPort(String protocol, int port) {
      */
     public int getPortIfSpecified() {
         String portAsString = getString(getSchema().getPort());
-        if(portAsString == null || portAsString.isEmpty()) {
+        if (StringUtilities.isEmpty(portAsString)) {
             return UNSPECIFIED_PORT;
         }
 
@@ -1069,9 +1070,8 @@ public void setEmbeddedUrlExcludeRE(String regex) {
     protected HTTPSampleResult errorResult(Throwable e, HTTPSampleResult res) {
         res.setSampleLabel(res.getSampleLabel());
         res.setDataType(SampleResult.TEXT);
-        ByteArrayOutputStream text = new ByteArrayOutputStream(200);
-        e.printStackTrace(new PrintStream(text)); // NOSONAR Stacktrace will be used in the response
-        res.setResponseData(text.toByteArray());
+        res.setResponseData(ExceptionUtils.getStackTraceAsBytes(e, StandardCharsets.UTF_8));
+        res.setDataEncoding(StandardCharsets.UTF_8.name());
         res.setResponseCode(NON_HTTP_RESPONSE_CODE+": " + e.getClass().getName());
         res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE+": " + e.getMessage());
         res.setSuccessful(false);
@@ -1162,7 +1162,7 @@ public String getQueryString(final String contentEncoding) {
         }
         String lContentEncoding = contentEncoding;
         // Check if the sampler has a specified content encoding
-        if (JOrphanUtils.isBlank(lContentEncoding)) {
+        if (StringUtilities.isBlank(lContentEncoding)) {
             // We use the encoding which should be used according to the HTTP spec, which is UTF-8
             lContentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
         }
@@ -1255,7 +1255,7 @@ public void parseArguments(String queryString, String contentEncoding) {
                 log.debug("Name: {} Value: {} Metadata: {}", name, value, metaData);
                 // If we know the encoding, we can decode the argument value,
                 // to make it easier to read for the user
-                if (!StringUtils.isEmpty(contentEncoding)) {
+                if (StringUtilities.isNotEmpty(contentEncoding)) {
                     addEncodedArgument(name, value, metaData, contentEncoding);
                 } else {
                     // If we do not know the encoding, we just use the encoded value
@@ -1487,7 +1487,7 @@ protected HTTPSampleResult downloadPageResources(final HTTPSampleResult pRes, fi
     }
 
     private static Predicate<URL> generateMatcherPredicate(String regex, String explanation, boolean defaultAnswer) {
-        if (StringUtils.isEmpty(regex)) {
+        if (StringUtilities.isEmpty(regex)) {
             return s -> defaultAnswer;
         }
         if (USE_JAVA_REGEX) {
@@ -1525,7 +1525,7 @@ private static LinkExtractorParser getParser(HTTPSampleResult res)
             throws LinkExtractorParseException {
         String parserClassName =
                 PARSERS_FOR_CONTENT_TYPE.get(res.getMediaType());
-        if (!StringUtils.isEmpty(parserClassName)) {
+        if (StringUtilities.isNotEmpty(parserClassName)) {
             return BaseParser.getParser(parserClassName);
         }
         return null;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
index f56ab49df1c..1b9798bad4f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
@@ -18,7 +18,7 @@
 package org.apache.jmeter.protocol.http.sampler;
 
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Factory to return the appropriate HTTPSampler for use with classes that need
@@ -67,7 +67,7 @@ public static HTTPSamplerBase newInstance() {
      * @throws UnsupportedOperationException if alias is not recognised
      */
     public static HTTPSamplerBase newInstance(String alias) {
-        if (alias ==null || alias.length() == 0) {
+        if (StringUtilities.isEmpty(alias)) {
             return new HTTPSamplerProxy();
         }
         if (alias.equals(HTTP_SAMPLER_JAVA) || alias.equals(IMPL_JAVA)) {
@@ -87,7 +87,7 @@ public static HTTPAbstractImpl getImplementation(String impl, HTTPSamplerBase ba
         if (HTTPSamplerBase.PROTOCOL_FILE.equals(base.getProtocol())) {
             return new HTTPFileImpl(base);
         }
-        if (JOrphanUtils.isBlank(impl)){
+        if (StringUtilities.isBlank(impl)){
             impl = DEFAULT_CLASSNAME;
         }
         if (IMPL_JAVA.equals(impl) || HTTP_SAMPLER_JAVA.equals(impl)) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index 60d01217525..c34d4308291 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -35,6 +35,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Class for setting the necessary headers for a POST request, and sending the
@@ -242,7 +243,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
             // Check if the header manager had a content type header
             // This allows the user to specify their own content-type for a POST request
             String contentTypeHeader = connection.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE);
-            boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.length() > 0;
+            boolean hasContentTypeHeader = StringUtilities.isNotEmpty(contentTypeHeader);
 
             // If there are no arguments, we can send a file as the body of the request
             if(sampler.getArguments() != null && sampler.getArguments().getArgumentCount() == 0 && sampler.getSendFileAsPostBody()) {
@@ -251,7 +252,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
                 HTTPFileArg file = files[0];
                 if(!hasContentTypeHeader) {
                     // Allow the mimetype of the file to control the content type
-                    if(file.getMimeType() != null && file.getMimeType().length() > 0) {
+                    if (StringUtilities.isNotEmpty(file.getMimeType())) {
                         connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE, file.getMimeType());
                     }
                     else {
@@ -287,7 +288,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
                     // TODO: needs a multiple file upload scenario
                     if(!hasContentTypeHeader) {
                         HTTPFileArg file = files.length > 0? files[0] : null;
-                        if(file != null && file.getMimeType() != null && file.getMimeType().length() > 0) {
+                        if(file != null && StringUtilities.isNotEmpty(file.getMimeType())) {
                             connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE, file.getMimeType());
                         }
                         else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
index d6f5c87cd59..cce2b856471 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
@@ -26,6 +26,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * Class for setting the necessary headers for a PUT request, and sending the
@@ -50,7 +51,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
         // Check if the header manager had a content type header
         // This allows the user to specify their own content-type for a PUT request
         String contentTypeHeader = connection.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE);
-        boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.length() > 0;
+        boolean hasContentTypeHeader = StringUtilities.isNotEmpty(contentTypeHeader);
 
         HTTPFileArg[] files = sampler.getHTTPFiles();
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index 6d885a5abf7..cccf09982d2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -36,7 +36,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apiguardian.api.API;
 
 // @see TestHTTPUtils for unit tests
@@ -78,9 +78,9 @@ public static String getEncodingFromContentType(String contentType){
                 charSet = contentType.substring(charSetStartPos + CHARSET_EQ_LEN);
                 if (charSet != null) {
                     // Remove quotes from charset name, see bug 55852
-                    charSet = StringUtils.replaceChars(charSet, "\'\"", null);
+                    charSet = StringUtilities.replaceChars(charSet, "'\"", null);
                     charSet = charSet.trim();
-                    if (charSet.length() > 0) {
+                    if (!charSet.isEmpty()) {
                         // See Bug 44784
                         int semi = charSet.indexOf(';');
                         if (semi == 0){
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
index f64ba780992..8875a532d72 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
@@ -25,13 +25,12 @@
 import java.net.URLDecoder;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -72,7 +71,7 @@ private GraphQLRequestParamUtils() {
      * @return true if the content type is GraphQL content type
      */
     public static boolean isGraphQLContentType(final String contentType) {
-        if (StringUtils.isEmpty(contentType)) {
+        if (StringUtilities.isEmpty(contentType)) {
             return false;
         }
         final ContentType type = ContentType.parse(contentType);
@@ -91,14 +90,16 @@ public static String toPostBodyString(final GraphQLRequestParams params) {
         try (JsonGenerator gen = jsonFactory.createGenerator(writer)) {
             gen.writeStartObject();
 
-            gen.writeStringField(OPERATION_NAME_FIELD, StringUtils.trimToNull(params.getOperationName()));
+            gen.writeStringField(OPERATION_NAME_FIELD, StringUtilities.trimToNull(params.getOperationName()));
 
-            if (StringUtils.isNotBlank(params.getVariables())) {
+            String variables = params.getVariables();
+            if (StringUtilities.isNotEmpty(variables)) {
                 gen.writeFieldName(VARIABLES_FIELD);
-                gen.writeRawValue(StringUtils.trim(params.getVariables()));
+                gen.writeRawValue(variables.trim());
             }
 
-            gen.writeStringField(QUERY_FIELD, StringUtils.trim(params.getQuery()));
+            String query = params.getQuery();
+            gen.writeStringField(QUERY_FIELD, query == null ? null : query.trim());
 
             gen.writeEndObject();
         } catch (IOException e) {
@@ -114,7 +115,10 @@ public static String toPostBodyString(final GraphQLRequestParams params) {
      * @return an HTTP GET request parameter value converted from the GraphQL Query input string
      */
     public static String queryToGetParamValue(final String query) {
-        return RegExUtils.replaceAll(StringUtils.trim(query), WHITESPACES_PATTERN, " ");
+        if (query == null) {
+            return null;
+        }
+        return WHITESPACES_PATTERN.matcher(query.trim()).replaceAll(" ");
     }
 
     /**
@@ -123,7 +127,7 @@ public static String queryToGetParamValue(final String query) {
      * @return an HTTP GET request parameter value converted from the GraphQL Variables JSON input string
      */
     public static String variablesToGetParamValue(final String variables) {
-        return StringUtils.trimToNull(variables);
+        return StringUtilities.trimToNull(variables);
     }
 
     /**
@@ -137,7 +141,7 @@ public static String variablesToGetParamValue(final String variables) {
      */
     public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final String contentEncoding)
             throws JsonProcessingException, UnsupportedEncodingException {
-        final String encoding = StringUtils.isNotEmpty(contentEncoding) ? contentEncoding
+        final String encoding = StringUtilities.isNotEmpty(contentEncoding) ? contentEncoding
                 : EncoderCache.URL_ARGUMENT_ENCODING;
 
         ObjectNode data;
@@ -162,8 +166,8 @@ public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final
         }
         final JsonNode queryNode = data.get(QUERY_FIELD);
         query = getJsonNodeTextContent(queryNode, false);
-        final String trimmedQuery = StringUtils.trim(query);
-        if (!StringUtils.startsWith(trimmedQuery, QUERY_FIELD) && !StringUtils.startsWith(trimmedQuery, "mutation")) {
+        final String trimmedQuery = query == null ? null : query.trim();
+        if (trimmedQuery != null && !trimmedQuery.startsWith(QUERY_FIELD) && !trimmedQuery.startsWith("mutation")) {
             throw new IllegalArgumentException("Not a valid GraphQL query.");
         }
 
@@ -192,7 +196,8 @@ public static GraphQLRequestParams toGraphQLRequestParams(byte[] postData, final
      */
     public static GraphQLRequestParams toGraphQLRequestParams(final Arguments arguments, final String contentEncoding)
             throws UnsupportedEncodingException {
-        final String encoding = StringUtils.defaultIfEmpty(contentEncoding, EncoderCache.URL_ARGUMENT_ENCODING);
+        final String encoding =
+                contentEncoding != null && contentEncoding.isEmpty() ? contentEncoding : EncoderCache.URL_ARGUMENT_ENCODING;
 
         String operationName = null;
         String query = null;
@@ -206,7 +211,7 @@ public static GraphQLRequestParams toGraphQLRequestParams(final Arguments argume
 
             final String name = arg.getName();
             final String metadata = arg.getMetaData();
-            final String value = StringUtils.trimToNull(arg.getValue());
+            final String value = StringUtilities.trimToNull(arg.getValue());
 
             if ("=".equals(metadata) && value != null) {
                 final boolean alwaysEncoded = ((HTTPArgument) arg).isAlwaysEncoded();
@@ -241,13 +246,11 @@ private static String encodedField(final String value, final String encoding, fi
     }
 
     private static boolean isNoJsonObject(String variables) {
-        return StringUtils.isNotEmpty(variables)
-                && (!StringUtils.startsWith(variables, "{") || !StringUtils.endsWith(variables, "}"));
+        return StringUtilities.isNotEmpty(variables) && (!variables.startsWith("{") || !variables.endsWith("}"));
     }
 
     private static boolean isNoQueryOrMutation(String query) {
-        return StringUtils.isEmpty(query)
-                || (!StringUtils.startsWith(query, QUERY_FIELD) && !StringUtils.startsWith(query, "mutation"));
+        return StringUtilities.isEmpty(query) || !query.startsWith(QUERY_FIELD) && !query.startsWith("mutation");
     }
 
     private static String getJsonNodeTextContent(final JsonNode jsonNode, final boolean nullable) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
index 3353589b1f8..be534a3b23e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
@@ -27,6 +27,7 @@
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ public void setUseEquals(boolean ue) {
 
     public boolean isUseEquals() {
         boolean eq = get(getSchema().getUseEquals());
-        if (getMetaData().equals("=") || (getValue() != null && getValue().length() > 0)) {
+        if (getMetaData().equals("=") || StringUtilities.isNotEmpty(getValue())) {
             setUseEquals(true);
             return true;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index d94a613be2c..2ef27c2f3ee 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -22,11 +22,11 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.testelement.schema.PropertyDescriptor;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.tika.Tika;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
@@ -97,11 +97,11 @@ private static Tika createTika() {
     }
 
     private static String detectMimeType(String path, String mimetype) {
-        if (StringUtils.isNotBlank(mimetype)) {
+        if (StringUtilities.isNotBlank(mimetype)) {
             return mimetype;
         }
         mimetype = Objects.toString(mimetype, "");
-        if (StringUtils.isBlank(path)) {
+        if (StringUtilities.isBlank(path)) {
             return mimetype;
         }
         File file = new File(path);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index 06c95cf8bf8..743a80a6bfc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -36,7 +36,6 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
 import org.apache.jmeter.gui.util.TextBoxDialoger.TextBoxDoubleClick;
@@ -53,6 +52,7 @@
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.gui.RendererUtils;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -208,14 +208,14 @@ public void setSamplerResult(Object objectResult) {
 
                 // Concatenate query post if exists
                 String queryPost = sampleResult.getQueryString();
-                if (!isMultipart && StringUtils.isNotBlank(queryPost)) {
+                if (!isMultipart && StringUtilities.isNotBlank(queryPost)) {
                     if (queryGet.length() > 0) {
                         queryGet += PARAM_CONCATENATE;
                     }
                     queryGet += queryPost;
                 }
 
-                if (StringUtils.isNotBlank(queryGet)) {
+                if (StringUtilities.isNotBlank(queryGet)) {
                     Set<Map.Entry<String, String[]>> keys = RequestViewHTTP.getQueryMap(queryGet).entrySet();
                     for (Map.Entry<String, String[]> entry : keys) {
                         for (String value : entry.getValue()) {
@@ -224,7 +224,7 @@ public void setSamplerResult(Object objectResult) {
                     }
                 }
 
-                if(isMultipart && StringUtils.isNotBlank(queryPost)) {
+                if (isMultipart && StringUtilities.isNotBlank(queryPost)) {
                     String contentType = lhm.get(HTTPConstants.HEADER_CONTENT_TYPE);
                     String boundaryString = extractBoundary(contentType);
                     MultipartUrlConfig urlconfig = new MultipartUrlConfig(boundaryString);
@@ -239,7 +239,7 @@ public void setSamplerResult(Object objectResult) {
 
             // Display cookie in headers table (same location on http protocol)
             String cookie = sampleResult.getCookies();
-            if (cookie != null && cookie.length() > 0) {
+            if (StringUtilities.isNotEmpty(cookie)) {
                 headersModel.addRow(new RowResult(
                         JMeterUtils.getParsedLabel("view_results_table_request_http_cookie"), //$NON-NLS-1$
                         sampleResult.getCookies()));
@@ -336,7 +336,7 @@ public static Map<String, String[]> getQueryMap(String query) {
      *            query will be returned.
      */
     public static String decodeQuery(String query) {
-        if (query != null && query.length() > 0) {
+        if (StringUtilities.isNotEmpty(query)) {
             try {
                 return URLDecoder.decode(query, CHARSET_DECODE); // better  ISO-8859-1 than UTF-8
             } catch (IllegalArgumentException | UnsupportedEncodingException e) {
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/HttpClientState.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/HttpClientState.kt
new file mode 100644
index 00000000000..8da4ce0e45a
--- /dev/null
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/HttpClientState.kt
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http
+
+import org.apache.http.auth.AuthState
+import org.apache.http.impl.client.CloseableHttpClient
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager
+
+public class HttpClientState(
+    public val client: CloseableHttpClient,
+    public val connectionManager: PoolingHttpClientConnectionManager,
+) {
+    public var authState: AuthState? = null
+}
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
index 53ade9f3d3c..d7be1f145e9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
@@ -26,11 +26,12 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.jmeter.protocol.http.control.Cookie;
 import org.apache.jmeter.protocol.http.curl.ArgumentHolder;
 import org.apache.jmeter.protocol.http.curl.BasicCurlParser;
@@ -94,10 +95,10 @@ public void testFFParsing() {
         assertEquals(5, request.getHeaders().size());
         assertTrue(request.isCompressed());
         assertEquals("GET", request.getMethod());
-        String resParser = "Request [compressed=true, url=http://jmeter.apache.org/, method=GET, headers=[(User-Agent,Mozilla/5.0 "
-                +"(Macintosh; Intel Mac OS X 10.11; rv:63.0) Gecko/20100101 Firefox/63.0), (Accept,text/html,application/xhtml+xml,"
-                + "application/xml;q=0.9,*/*;q=0.8), (Accept-Language,en-US,en;q=0.5), (DNT,1), "
-                + "(Upgrade-Insecure-Requests,1)]]";
+        String resParser = "Request [compressed=true, url=http://jmeter.apache.org/, method=GET, headers=["
+                + "User-Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:63.0) Gecko/20100101 Firefox/63.0"
+                + ", Accept=text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
+                + ", Accept-Language=en-US,en;q=0.5, DNT=1, Upgrade-Insecure-Requests=1]]";
         assertEquals(resParser, request.toString(),
                 "The method 'toString' should get all parameters correctly");
     }
@@ -245,7 +246,7 @@ public void testUserAgent() {
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
         assertEquals(5, request.getHeaders().size(),
                 "With method 'parser', the quantity of Headers should be 5'");
-        assertTrue(request.getHeaders().contains(Pair.of("User-Agent", "Mozilla/5.0")),
+        assertTrue(request.getHeaders().contains(new AbstractMap.SimpleEntry<>("User-Agent", "Mozilla/5.0")),
                 "With method 'parser', Headers need to add 'user-agent' with value 'Mozilla/5.0' ");
     }
 
@@ -463,8 +464,8 @@ public void testForm() {
                 + "-H 'cache-control: no-cache' -F 'test=name' -F 'test1=name1' ";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("test1", StringArgumentHolder.of("name1"))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("test1", StringArgumentHolder.of("name1"))),
                 "With method 'parser', we should post form data");
     }
 
@@ -473,8 +474,8 @@ public void testFormWithEmptyValue() {
         String cmdLine = "curl 'https://example.invalid' -F 'test=\"\"' ";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("test", StringArgumentHolder.of(""))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("test", StringArgumentHolder.of(""))),
                 "With method 'parser', we should post form data: " + request.getFormData());
     }
 
@@ -483,8 +484,8 @@ public void testFormWithEmptyHeader() {
         String cmdLine = "curl 'https://example.invalid' -H 'X-Something;' ";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String, String>> res = request.getHeaders();
-        assertTrue(res.contains(Pair.of("X-Something", "")),
+        List<Map.Entry<String, String>> res = request.getHeaders();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("X-Something", "")),
                 "With method 'parser', we should post form data: " + request.getFormData());
     }
 
@@ -494,8 +495,8 @@ public void testFormWithQuotedValue() {
                 + "--form 'test=\"something quoted\"'";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("test", StringArgumentHolder.of("something quoted"))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("test", StringArgumentHolder.of("something quoted"))),
                 "With method 'form', we should post form data");
     }
 
@@ -505,8 +506,8 @@ public void testFormWithQuotedValueWithQuotes() {
                 + "--form 'test=\"something \\\"quoted\\\"\"'";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("test", StringArgumentHolder.of("something \"quoted\""))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("test", StringArgumentHolder.of("something \"quoted\""))),
                 "With method 'form', we should post form data");
     }
 
@@ -517,8 +518,8 @@ public void testFormWithQuotedFilename() {
                 + "--form 'image=@\"/some/file.jpg\"'";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("image", FileArgumentHolder.of("/some/file.jpg"))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("image", FileArgumentHolder.of("/some/file.jpg"))),
                 "With method 'form', we should post form data: " + request.getFormData());
     }
 
@@ -529,8 +530,8 @@ public void testFormWithQuotedNotFilename() {
                 + "--form 'image=\"@/some/file.jpg\"'";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,ArgumentHolder>> res = request.getFormData();
-        assertTrue(res.contains(Pair.of("image", StringArgumentHolder.of("@/some/file.jpg"))),
+        List<Map.Entry<String,ArgumentHolder>> res = request.getFormData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("image", StringArgumentHolder.of("@/some/file.jpg"))),
                 "With method 'form', we should post form data");
     }
 
@@ -540,8 +541,8 @@ public void testFormString() {
                 + "-H 'cache-control: no-cache' --form-string 'image=@C:\\Test\\test.jpg' ";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        List<Pair<String,String>> res = request.getFormStringData();
-        assertTrue(res.contains(Pair.of("image", "@C:\\Test\\test.jpg")),
+        List<Map.Entry<String,String>> res = request.getFormStringData();
+        assertTrue(res.contains(new AbstractMap.SimpleEntry<>("image", "@C:\\Test\\test.jpg")),
                 "With method 'parser', we should post form data: " + request.getFormStringData());
     }
 
@@ -634,7 +635,7 @@ public void testReferer() {
         String cmdLine = "curl 'http://jmeter.apache.org/' --referer 'www.baidu.com'";
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         BasicCurlParser.Request request = basicCurlParser.parse(cmdLine);
-        assertTrue(request.getHeaders().contains(Pair.of("Referer", "www.baidu.com")));
+        assertTrue(request.getHeaders().contains(new AbstractMap.SimpleEntry<>("Referer", "www.baidu.com")));
     }
 
     @Test
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java
index 0a0e38c9650..59e9675011e 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java
@@ -20,8 +20,6 @@
 import java.net.URL;
 import java.util.Iterator;
 
-import org.apache.commons.lang3.NotImplementedException;
-
 /**
  * Test class, that implements an dummy {@link LinkExtractorParser} that is not
  * reusable
@@ -32,7 +30,7 @@ public class NotReusableParser implements LinkExtractorParser {
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent,
             byte[] responseData, URL baseUrl, String encoding)
             throws LinkExtractorParseException {
-        throw new NotImplementedException("Test class");
+        throw new UnsupportedOperationException("Test class");
     }
 
     @Override
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java
index 76c0a96f55c..385a7227e9f 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java
@@ -20,8 +20,6 @@
 import java.net.URL;
 import java.util.Iterator;
 
-import org.apache.commons.lang3.NotImplementedException;
-
 /**
  * Test class, that implements an dummy {@link LinkExtractorParser} that is
  * reusable
@@ -32,7 +30,7 @@ public class ReusableParser implements LinkExtractorParser {
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent,
             byte[] responseData, URL baseUrl, String encoding)
             throws LinkExtractorParseException {
-        throw new NotImplementedException("Test class");
+        throw new UnsupportedOperationException("Test class");
     }
 
     @Override
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 2a14fcc5cc1..9f94e49eb6c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -43,6 +43,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -394,7 +395,7 @@ private static void filetest(HTMLParser p, String file, String url, String resul
 
     // Get expected results as a List
     private static List<String> getFile(String file) throws Exception {
-        if (file == null || file.isEmpty()) {
+        if (StringUtilities.isEmpty(file)) {
             return Collections.emptyList();
         }
         try (InputStream is = getInputStream(file);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index da4868a20f2..c1a7cfda483 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -37,6 +37,7 @@
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
+import org.apache.jorphan.util.StringUtilities;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -686,7 +687,7 @@ private void checkArgument(
             boolean expectedEncoded) throws IOException {
         assertEquals(expectedName, arg.getName());
         assertEquals(expectedValue, arg.getValue());
-        if(contentEncoding != null && contentEncoding.length() > 0) {
+        if (StringUtilities.isNotEmpty(contentEncoding)) {
             assertEquals(expectedEncodedValue, arg.getEncodedValue(contentEncoding));
         }
         else {
@@ -697,7 +698,7 @@ private void checkArgument(
     }
 
     private int getBodyLength(String postBody, String contentEncoding) throws IOException {
-        if(contentEncoding != null && !contentEncoding.isEmpty()) {
+        if (StringUtilities.isNotEmpty(contentEncoding)) {
             return postBody.getBytes(contentEncoding).length;
         }
         else {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 76cc184a29a..0d6877e4475 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -46,6 +46,7 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternMatcherInput;
@@ -821,7 +822,7 @@ private void checkPostRequestUrlEncoded(
             String descriptionField,
             String descriptionValue,
             boolean valuesAlreadyUrlEncoded) throws IOException {
-        if (contentEncoding == null || contentEncoding.isEmpty()) {
+        if (StringUtilities.isEmpty(contentEncoding)) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -852,7 +853,7 @@ private void checkPostRequestFormMultipart(
             String titleValue,
             String descriptionField,
             String descriptionValue) throws IOException {
-        if (contentEncoding == null || contentEncoding.isEmpty()) {
+        if (StringUtilities.isEmpty(contentEncoding)) {
             contentEncoding = DEFAULT_HTTP_CONTENT_ENCODING;
         }
         // Check URL
@@ -900,7 +901,7 @@ private void checkPostRequestFileUpload(
             File fileValue,
             String fileMimeType,
             byte[] fileContent) throws IOException {
-        if (contentEncoding == null || contentEncoding.isEmpty()) {
+        if (StringUtilities.isEmpty(contentEncoding)) {
             contentEncoding = DEFAULT_HTTP_CONTENT_ENCODING;
         }
         // Check URL
@@ -940,7 +941,7 @@ private void checkPostRequestBody(
             String contentEncoding,
             String expectedPostBody,
             String expectedContentType) throws IOException {
-        if (contentEncoding == null || contentEncoding.isEmpty()) {
+        if (StringUtilities.isEmpty(contentEncoding)) {
             contentEncoding = samplerDefaultEncoding;
         }
         // Check URL
@@ -1021,7 +1022,7 @@ private void checkGetRequest_Parameters(
             String descriptionField,
             String descriptionValue,
             boolean valuesAlreadyUrlEncoded) throws IOException {
-        if (contentEncoding == null || contentEncoding.isEmpty()) {
+        if (StringUtilities.isEmpty(contentEncoding)) {
             contentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
         }
         // Check URL
@@ -1077,7 +1078,7 @@ private void checkMethodPathQuery(
         assertEquals(expectedMethod, methodSent);
         String uriSent = headersSent.substring(indexFirstSpace + 1, indexSecondSpace);
         int indexQueryStart = uriSent.indexOf('?');
-        if (expectedQueryString != null && !expectedQueryString.isEmpty()) {
+        if (StringUtilities.isNotEmpty(expectedQueryString)) {
             // We should have a query string part
             if (indexQueryStart <= 0 || indexQueryStart == uriSent.length() - 1) {
                 fail("Could not find query string in URI");
@@ -1094,7 +1095,7 @@ private void checkMethodPathQuery(
         String pathSent = uriSent.substring(0, indexQueryStart);
         assertEquals(expectedPath, pathSent);
         // Check query
-        if (expectedQueryString != null && !expectedQueryString.isEmpty()) {
+        if (StringUtilities.isNotEmpty(expectedQueryString)) {
             String queryStringSent = uriSent.substring(indexQueryStart + 1);
             // Is it only the parameter values which are encoded in the specified
             // content encoding, the rest of the query is encoded in UTF-8
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
index f15972b7616..0d91144e6be 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java
@@ -27,7 +27,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.junit.jupiter.api.BeforeEach;
@@ -74,7 +73,7 @@ class TestGraphQLRequestParamUtils {
             "{"
             + "\"operationName\":null,"
             + "\"variables\":" + EXPECTED_VARIABLES_GET_PARAM_VALUE + ","
-            + "\"query\":\"" + StringUtils.replace(QUERY.trim(), "\n", "\\n") + "\""
+            + "\"query\":\"" + (QUERY.trim() == null ? null : QUERY.trim().replace("\n", "\\n")) + "\""
             + "}";
 
     private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 4fcb3dd4620..88003b84b71 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -17,14 +17,14 @@
 
 package org.apache.jmeter.protocol.http.visualizers;
 
+import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
+import org.apache.jorphan.util.StringUtilities;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
@@ -157,7 +157,7 @@ void testGetQueryMapBug52491() {
         Assertions.assertNotNull(param1);
         Assertions.assertEquals(1, param1.getValue().length);
         Assertions.assertEquals(query, param1.getValue()[0]);
-        Assertions.assertTrue(StringUtils.isBlank(param1.getKey()));
+        Assertions.assertTrue(StringUtilities.isBlank(param1.getKey()));
     }
 
     @Test
@@ -199,11 +199,11 @@ void testGetQueryMapSoapHack() {
         Assertions.assertNotNull(param1);
         Assertions.assertEquals(1, param1.getValue().length);
         Assertions.assertEquals(query, param1.getValue()[0]);
-        Assertions.assertTrue(StringUtils.isBlank(param1.getKey()));
+        Assertions.assertTrue(StringUtilities.isBlank(param1.getKey()));
     }
 
     @SafeVarargs
-    private static Map<String, List<String>> mapOf(Pair<String, String>... args) {
+    private static Map<String, List<String>> mapOf(Map.Entry<String, String>... args) {
         Map<String, List<String>> results = new HashMap<>();
         Arrays.stream(args)
                 .forEach(arg -> results.put(arg.getKey(), Arrays.asList(arg.getValue().split(","))));
@@ -213,18 +213,18 @@ private static Map<String, List<String>> mapOf(Pair<String, String>... args) {
     private static Stream<Arguments> data() {
         return Stream.of(Arguments.of("k1=v1&=&k2=v2",
                 mapOf(
-                        Pair.of("k1", "v1"),
-                        Pair.of("k2", "v2"))),
+                        new AbstractMap.SimpleEntry<>("k1", "v1"),
+                        new AbstractMap.SimpleEntry<>("k2", "v2"))),
                 Arguments.of("=", mapOf()),
                 Arguments.of("k1=v1&=value&k2=v2",
                         mapOf(
-                                Pair.of("k1", "v1"),
-                                Pair.of("", "value"),
-                                Pair.of("k2", "v2"))),
+                                new AbstractMap.SimpleEntry<>("k1", "v1"),
+                                new AbstractMap.SimpleEntry<>("", "value"),
+                                new AbstractMap.SimpleEntry<>("k2", "v2"))),
                 Arguments.of("a=1&a=2&=abc&=def",
                         mapOf(
-                                Pair.of("a", "1,2"),
-                                Pair.of("", "abc,def"))));
+                                new AbstractMap.SimpleEntry<>("a", "1,2"),
+                                new AbstractMap.SimpleEntry<>("", "abc,def"))));
     }
 
     @ParameterizedTest
diff --git a/src/protocol/java/build.gradle.kts b/src/protocol/java/build.gradle.kts
index 3b10dad423e..bd0f3484421 100644
--- a/src/protocol/java/build.gradle.kts
+++ b/src/protocol/java/build.gradle.kts
@@ -22,9 +22,6 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("org.apache.commons:commons-lang3") {
-        because("ArrayUtils")
-    }
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
index ea25256a6ee..96e9fb150f5 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
@@ -33,7 +33,6 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.AbstractConfigGui;
@@ -49,6 +48,7 @@
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.reflect.LogAndIgnoreServiceLoadExceptionHandler;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -149,7 +149,7 @@ private JPanel createClassnamePanel() {
 
         classNameLabeledChoice = new JLabeledChoice(
                 JMeterUtils.getResString("protocol_java_classname"),
-                possibleClasses.toArray(ArrayUtils.EMPTY_STRING_ARRAY), true,
+                possibleClasses.toArray(new String[0]), true,
                 false);
         classNameLabeledChoice.addChangeListener(this);
 
@@ -213,7 +213,7 @@ private void configureClassName() {
                     // values that they did in the original test.
                     if (currArgsMap.containsKey(name)) {
                         String newVal = currArgsMap.get(name);
-                        if (newVal != null && newVal.length() > 0) {
+                        if (StringUtilities.isNotEmpty(newVal)) {
                             value = newVal;
                         }
                     }
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
index 5efcb1fe189..18deb724048 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
@@ -28,6 +28,7 @@
 import org.apache.jmeter.samplers.Interruptible;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -279,13 +280,13 @@ public SampleResult runTest(JavaSamplerContext context) {
         results.setResponseMessage(responseMessage);
         results.setSampleLabel(label);
 
-        if (samplerData != null && samplerData.length() > 0) {
+        if (StringUtilities.isNotEmpty(samplerData)) {
             results.setSamplerData(samplerData);
         }
         if(samplerData != null) {
             results.setSentBytes(samplerData.length());
         }
-        if (resultData != null && resultData.length() > 0) {
+        if (StringUtilities.isNotEmpty(resultData)) {
             results.setResponseData(resultData, null);
         }
         results.setDataType(SampleResult.TEXT); // It's always text type even if empty
diff --git a/src/protocol/jdbc/build.gradle.kts b/src/protocol/jdbc/build.gradle.kts
index 702d139c624..2b5521c6ca9 100644
--- a/src/protocol/jdbc/build.gradle.kts
+++ b/src/protocol/jdbc/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     implementation("org.apache.commons:commons-dbcp2")
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils, ObjectUtils")
-    }
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index 0680cf52e7d..2c808edad96 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -43,12 +43,12 @@
 import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -386,7 +386,7 @@ private int countRows(ResultSet resultSet) throws SQLException {
     }
 
     private int[] setArguments(PreparedStatement pstmt) throws SQLException, IOException {
-        if (getQueryArguments().trim().length()==0) {
+        if (getQueryArguments().isBlank()) {
             return new int[]{};
         }
         String[] arguments = CSVSaveService.csvSplitString(getQueryArguments(), COMMA_CHAR);
@@ -659,7 +659,7 @@ public static void close(ResultSet rs) {
      */
     public int getIntegerQueryTimeout() {
         int timeout;
-        if(StringUtils.isEmpty(queryTimeout)) {
+        if (StringUtilities.isEmpty(queryTimeout)) {
             return 0;
         } else {
             try {
@@ -690,7 +690,7 @@ public void setQueryTimeout(String queryTimeout) {
      */
     public int getIntegerResultSetMaxRows() {
         int maxrows;
-        if(StringUtils.isEmpty(resultSetMaxRows)) {
+        if (StringUtilities.isEmpty(resultSetMaxRows)) {
             return -1;
         } else {
             try {
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 2d5ae2e9adc..838894a9777 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -27,7 +27,6 @@
 import java.util.Set;
 
 import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.testbeans.TestBean;
@@ -36,7 +35,7 @@
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -115,7 +114,7 @@ public void testStarted() {
         TestBeanHelper.prepare(this);
         JMeterVariables variables = getThreadContext().getVariables();
         String poolName = getDataSource();
-        if (JOrphanUtils.isBlank(poolName)) {
+        if (StringUtilities.isBlank(poolName)) {
             throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
         } else if (variables.getObject(poolName) != null) {
             log.error("JDBC data source already defined for: {}", poolName);
@@ -220,16 +219,16 @@ private BasicDataSource initPool(String maxPool) {
         dataSource.setMinIdle(0);
         dataSource.setInitialSize(poolSize);
         dataSource.setAutoCommitOnReturn(false);
-        if(StringUtils.isNotEmpty(initQuery)) {
+        if (StringUtilities.isNotEmpty(initQuery)) {
             String[] sqls = initQuery.split("\n");
             dataSource.setConnectionInitSqls(Arrays.asList(sqls));
         } else {
             dataSource.setConnectionInitSqls(Collections.emptyList());
         }
-        if(StringUtils.isNotEmpty(connectionProperties)) {
+        if (StringUtilities.isNotEmpty(connectionProperties)) {
             dataSource.setConnectionProperties(connectionProperties);
         }
-        if (StringUtils.isNotEmpty(poolPreparedStatements)) {
+        if (StringUtilities.isNotEmpty(poolPreparedStatements)) {
             int maxPreparedStatements = Integer.parseInt(poolPreparedStatements);
             if (maxPreparedStatements < 0) {
                 dataSource.setPoolPreparedStatements(false);
@@ -263,7 +262,7 @@ private BasicDataSource initPool(String maxPool) {
         if(isKeepAlive()) {
             dataSource.setTestWhileIdle(true);
             String validationQuery = getCheckQuery();
-            if (StringUtils.isBlank(validationQuery)) {
+            if (StringUtilities.isBlank(validationQuery)) {
                 dataSource.setValidationQuery(null);
             } else {
                 dataSource.setValidationQuery(validationQuery);
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
index c3309487cad..f7847a898b1 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
@@ -23,11 +23,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.testbeans.gui.TypeEditor;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,7 +131,7 @@ public DataSourceElementBeanInfo() {
      * @return integer value of the given transaction isolation mode
      */
     public static int getTransactionIsolationMode(String tag) {
-        if (!StringUtils.isEmpty(tag)) {
+        if (StringUtilities.isNotEmpty(tag)) {
             Integer isolationMode = TRANSACTION_ISOLATION_MAP.get(tag);
             if (isolationMode == null) {
                 try {
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
index 53dfb4072a3..ee1cda160fc 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
@@ -23,7 +23,7 @@
 
 import org.apache.jmeter.protocol.jdbc.AbstractJDBCTestElement;
 import org.apache.jmeter.protocol.jdbc.config.DataSourceElement;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +40,7 @@ public abstract class AbstractJDBCProcessor extends AbstractJDBCTestElement {
      * Calls the JDBC code to be executed.
      */
     protected void process() {
-        if (JOrphanUtils.isBlank(getDataSource())) {
+        if (StringUtilities.isBlank(getDataSource())) {
             throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
         }
         try (Connection conn = DataSourceElement.getConnection(getDataSource())){
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
index 81bdae0649d..b816867b794 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
@@ -21,9 +21,9 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.util.ConfigMergabilityIndicator;
 import org.apache.jmeter.gui.TestElementMetadata;
@@ -34,7 +34,7 @@
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 /**
  * A sampler which understands JDBC database requests.
@@ -73,7 +73,7 @@ public SampleResult sample(Entry e) {
 
         try {
             String dataSource = getDataSource();
-            if (JOrphanUtils.isBlank(dataSource)) {
+            if (StringUtilities.isBlank(dataSource)) {
                 throw new IllegalArgumentException("Name for DataSource must not be empty in " + getName());
             }
 
@@ -94,7 +94,7 @@ public SampleResult sample(Entry e) {
             res.setResponseMessage(ex.toString());
             res.setResponseCode("000");
             res.setResponseData(
-                    ObjectUtils.defaultIfNull(ex.getMessage(), "NO MESSAGE"),
+                    Objects.requireNonNullElse(ex.getMessage(), "NO MESSAGE"),
                     res.getDataEncodingWithDefault());
             res.setSuccessful(false);
         } finally {
diff --git a/src/protocol/jms/build.gradle.kts b/src/protocol/jms/build.gradle.kts
index dda2009c79b..b65f2764f75 100644
--- a/src/protocol/jms/build.gradle.kts
+++ b/src/protocol/jms/build.gradle.kts
@@ -28,9 +28,6 @@ dependencies {
     // TODO: technically speaking, jms_1.1_spec should be compileOnly
     // since we either include a JMS implementation or we can't use JMS at all
     implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
index bbcb4a7046c..d588fd719be 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
@@ -24,7 +24,7 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,11 +105,11 @@ private static String createKey(
        builder.append("#");
        builder.append(providerUrl);
        builder.append("#");
-       if(!StringUtils.isEmpty(securityPrincipal)) {
+       if (StringUtilities.isNotEmpty(securityPrincipal)) {
            builder.append(securityPrincipal);
            builder.append("#");
        }
-       if(!StringUtils.isEmpty(securityCredentials)) {
+       if (StringUtilities.isNotEmpty(securityCredentials)) {
            builder.append(securityCredentials);
        }
        return builder.toString();
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
index 93db4ea5c63..f562e01b057 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
@@ -33,6 +33,7 @@
 import javax.naming.NamingException;
 
 import org.apache.jmeter.protocol.jms.Utils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -230,7 +231,7 @@ private ReceiveSubscriber(int queueSize, boolean useProps,
             Context ctx = InitialContextFactory.getContext(useProps,
                     initialContextFactory, providerUrl, useAuth, securityPrincipal, securityCredentials);
             connection = Utils.getConnection(ctx, connfactory);
-            if(!isEmpty(clientId)) {
+            if (StringUtilities.isNotEmpty(clientId)) {
                 connection.setClientID(clientId);
             }
             session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -272,14 +273,14 @@ private ReceiveSubscriber(int queueSize, boolean useProps,
     private static MessageConsumer createSubscriber(Session session,
             Destination destination, String durableSubscriptionId,
             String jmsSelector) throws JMSException {
-        if (isEmpty(durableSubscriptionId)) {
-            if(isEmpty(jmsSelector)) {
+        if (StringUtilities.isEmpty(durableSubscriptionId)) {
+            if (StringUtilities.isEmpty(jmsSelector)) {
                 return session.createConsumer(destination);
             } else {
                 return session.createConsumer(destination, jmsSelector);
             }
         } else {
-            if(isEmpty(jmsSelector)) {
+            if (StringUtilities.isEmpty(jmsSelector)) {
                 return session.createDurableSubscriber((Topic) destination, durableSubscriptionId);
             } else {
                 return session.createDurableSubscriber((Topic) destination, durableSubscriptionId, jmsSelector, false);
@@ -369,15 +370,4 @@ public void onMessage(Message message) {
             log.warn("Could not add message to queue");
         }
     }
-
-
-    /**
-     * Checks whether string is empty
-     *
-     * @param s1
-     * @return True if input is null, an empty string, or a white space-only string
-     */
-    private static boolean isEmpty(String s1) {
-        return s1 == null || s1.trim().isEmpty();
-    }
 }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
index 0ff317f76a1..7bd0e473e7b 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
@@ -26,7 +26,6 @@
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.AbstractSampler;
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;
@@ -406,7 +405,8 @@ public Predicate<String> getIsReconnectErrorCode() {
      *
      */
     protected void configureIsReconnectErrorCode() {
-        String regex = StringUtils.trimToEmpty(getReconnectionErrorCodes());
+        String codes = getReconnectionErrorCodes();
+        String regex = codes == null ? "" : codes.trim();
         if (regex.isEmpty()) {
             isReconnectErrorCode = e -> false;
         } else {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index aac95f997b3..f40cd204466 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -46,7 +46,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jmeter.samplers.AbstractSampler;
@@ -61,6 +60,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -699,11 +699,11 @@ public void threadStarted() {
     private Context getInitialContext() throws NamingException {
         Hashtable<String, String> table = new Hashtable<>();
 
-        if (getInitialContextFactory() != null && getInitialContextFactory().trim().length() > 0) {
+        if (StringUtilities.isNotBlank(getInitialContextFactory())) {
             LOGGER.debug("Using InitialContext [{}]", getInitialContextFactory());
             table.put(Context.INITIAL_CONTEXT_FACTORY, getInitialContextFactory());
         }
-        if (getContextProvider() != null && getContextProvider().trim().length() > 0) {
+        if (StringUtilities.isNotBlank(getContextProvider())) {
             LOGGER.debug("Using Provider [{}]", getContextProvider());
             table.put(Context.PROVIDER_URL, getContextProvider());
         }
@@ -766,7 +766,7 @@ private void logThreadStart() {
 
     private int getTimeoutAsInt() {
         String propAsString = getPropertyAsString(TIMEOUT);
-        if(StringUtils.isEmpty(propAsString)){
+        if (StringUtilities.isEmpty(propAsString)){
             return DEFAULT_TIMEOUT;
         } else {
             return Integer.parseInt(propAsString);
@@ -827,7 +827,7 @@ public void threadFinished() {
 
     private boolean useTemporyQueue() {
         String recvQueue = getReceiveQueue();
-        return recvQueue == null || recvQueue.trim().length() == 0;
+        return StringUtilities.isBlank(recvQueue);
     }
 
     public void setArguments(Arguments args) {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
index 8cf7c1cc0c7..dc02d8cc638 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
@@ -51,6 +51,7 @@
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -291,10 +292,8 @@ private void handleError(SampleResult result, Exception e, boolean checkForRecon
             result.setResponseCode(errorCode);
         }
 
-        StringWriter writer = new StringWriter();
-        e.printStackTrace(new PrintWriter(writer)); // NOSONAR We're getting it
-                                                    // to put it in ResponseData
-        result.setResponseData(writer.toString(), "UTF-8");
+        result.setResponseData(ExceptionUtils.getStackTraceAsBytes(e, StandardCharsets.UTF_8));
+        result.setDataEncoding(StandardCharsets.UTF_8.name());
     }
 
     protected static Cache<Object, Object> buildCache(String configChoice) {
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
index 74944597a3d..40fc740ec0f 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
@@ -25,8 +25,8 @@
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.jms.Utils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,7 +69,7 @@ private Receiver(ConnectionFactory factory, Destination receiveQueue, String pri
         }
         session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         log.debug("Receiver - ctor. Creating consumer with JMS Selector:{}", jmsSelector);
-        if(StringUtils.isEmpty(jmsSelector)) {
+        if (StringUtilities.isEmpty(jmsSelector)) {
             consumer = session.createConsumer(receiveQueue);
         } else {
             consumer = session.createConsumer(receiveQueue, jmsSelector);
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
index 1361d61c600..a740a2bf8fe 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
@@ -29,7 +29,6 @@
 import javax.naming.NamingException;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jmeter.protocol.jms.client.InitialContextFactory;
 import org.apache.jmeter.protocol.jms.client.ReceiveSubscriber;
@@ -39,6 +38,7 @@
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -307,7 +307,7 @@ private void extractContent(StringBuilder buffer, StringBuilder propBuffer,
                     }
                 }
                 Utils.messageProperties(propBuffer, msg);
-                if(!isLast && !StringUtils.isEmpty(separator)) {
+                if(!isLast && StringUtilities.isNotEmpty(separator)) {
                     propBuffer.append(separator);
                     buffer.append(separator);
                 }
diff --git a/src/protocol/junit/build.gradle.kts b/src/protocol/junit/build.gradle.kts
index 4f291a368da..f2612645b7c 100644
--- a/src/protocol/junit/build.gradle.kts
+++ b/src/protocol/junit/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     api("junit:junit")
-    implementation("org.apache.commons:commons-lang3") {
-        because("ArrayUtils")
-    }
     implementation("org.exparity:hamcrest-date") {
         because("hamcrest-date.jar was historically shipped with JMeter")
     }
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
index 96eb2669291..a9419004dc8 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.ArrayUtils;
 
 class ClassFilter {
 
@@ -52,9 +51,9 @@ String[] filterArray(List<String> items) {
             }
         }
         if (!newList.isEmpty()) {
-            return newList.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
+            return newList.toArray(new String[0]);
         } else {
-            return ArrayUtils.EMPTY_STRING_ARRAY;
+            return new String[0];
         }
     }
 
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
index c3acf2a5dd9..14ba70b487f 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
@@ -28,6 +28,7 @@
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.ThreadListener;
+import org.apache.jorphan.util.StringUtilities;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -506,7 +507,7 @@ private static Object getClassInstance(String className, String label){
                     // we have to check and make sure the constructor is
                     // accessible. if we didn't it would throw an exception
                     // and cause a NPE.
-                    if (label == null || label.length() == 0) {
+                    if (StringUtilities.isEmpty(label)) {
                         label = className;
                     }
                     if (strCon.getModifiers() == Modifier.PUBLIC) {
diff --git a/src/protocol/ldap/build.gradle.kts b/src/protocol/ldap/build.gradle.kts
index 482a2259e00..f1a1e0c15aa 100644
--- a/src/protocol/ldap/build.gradle.kts
+++ b/src/protocol/ldap/build.gradle.kts
@@ -25,9 +25,6 @@ dependencies {
     implementation("org.apache.commons:commons-text") {
         because("StringEscapeUtils")
     }
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
 
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
index ce490d0c264..ace5e651a4f 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
@@ -38,7 +38,6 @@
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchResult;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
@@ -945,7 +944,7 @@ private static void writeSearchResult(final SearchResult sr, final XMLBuffer xml
                         sortedVals.add(value.toString());
                     }
                     Collections.sort(sortedVals);
-                    sb.append(StringUtils.join(sortedVals, ", "));
+                    sb.append(String.join(", ", sortedVals));
                 }
                 xmlb.tag(attr.getID(),sb);
             }
diff --git a/src/protocol/mail/build.gradle.kts b/src/protocol/mail/build.gradle.kts
index 1b37e852da3..6128add8a84 100644
--- a/src/protocol/mail/build.gradle.kts
+++ b/src/protocol/mail/build.gradle.kts
@@ -30,9 +30,6 @@ dependencies {
     // This is an API-only jar. javax.activation is present in Java 8,
     // however it is not there in Java 9
     compileOnly("javax.activation:javax.activation-api")
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index 3ac30303d2e..d896a5d5261 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -44,7 +44,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.CountingOutputStream;
 import org.apache.commons.io.output.NullOutputStream;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.protocol.smtp.sampler.gui.SecuritySettingsPanel;
 import org.apache.jmeter.protocol.smtp.sampler.protocol.SendMailCommand;
@@ -54,10 +53,10 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.apache.jorphan.util.CharUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * Sampler-Class for JMeter - builds, starts and interprets the results of the
  * sampler. Has to implement some standard-methods for JMeter in order to be
@@ -381,7 +380,7 @@ private List<InternetAddress> getPropAsAddresses(String propKey) throws AddressE
 
     private static String encodeAddress(String address) {
         String trimmedAddress = address.trim();
-        if (!StringUtils.isAsciiPrintable(trimmedAddress)) {
+        if (!isAsciiPrintable(trimmedAddress)) {
             try {
                 final int startOfRealAddress = trimmedAddress.indexOf('<');
                 if (startOfRealAddress >= 0) {
@@ -395,6 +394,25 @@ private static String encodeAddress(String address) {
         return trimmedAddress;
     }
 
+    /**
+     * Checks if the string contains only ASCII printable characters (32-126).
+     *
+     * @param str the string to check
+     * @return true if all characters are ASCII printable, false otherwise
+     */
+    private static boolean isAsciiPrintable(String str) {
+        if (str == null) {
+            return false;
+        }
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (!CharUtils.isAscii(c)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
      */
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
index 9153df2ac8b..f19bbd3eb93 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
@@ -44,11 +44,11 @@
 import javax.net.ssl.SSLContext;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.util.TrustAllSSLSocketFactory;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -282,10 +282,9 @@ private void configureCertificateTrust(Properties props) throws IOException {
     void configureTLSProtocols(Properties props, String protocol) {
         String tlsProtocolsToUse = getTlsProtocolsToUse();
         if (useStartTLS || useSSL) {
-            if (StringUtils.isEmpty(tlsProtocolsToUse)) {
+            if (StringUtilities.isEmpty(tlsProtocolsToUse)) {
                 try {
-                    tlsProtocolsToUse = StringUtils.join(
-                        SSLContext.getDefault().getSupportedSSLParameters().getProtocols(), " ");
+                    tlsProtocolsToUse = String.join(" ", SSLContext.getDefault().getSupportedSSLParameters().getProtocols());
                 } catch (Exception e) {
                     logger.error("Problem setting ssl/tls protocols for mail", e);
                 }
diff --git a/src/protocol/mongodb/build.gradle.kts b/src/protocol/mongodb/build.gradle.kts
index bdd7e16ceb5..5ee76c19c0b 100644
--- a/src/protocol/mongodb/build.gradle.kts
+++ b/src/protocol/mongodb/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     api("org.mongodb:mongo-java-driver")
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
 
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
index ceb918fce8b..c869524815e 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
@@ -19,6 +19,7 @@
 
 import java.util.List;
 
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +54,7 @@ public DB getDB(String database, String username, String password) {
         boolean authenticated = db.isAuthenticated();
 
         if(!authenticated) {
-            if(username != null && password != null && username.length() > 0 && password.length() > 0) {
+            if (StringUtilities.isNotEmpty(username) && StringUtilities.isNotEmpty(password)) {
                 authenticated = db.authenticate(username, password.toCharArray());
             }
         }
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
index dbaa298e429..29e068338f6 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
@@ -22,7 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.StringUtilities;
 
 import com.mongodb.ServerAddress;
 
@@ -40,8 +40,11 @@ public static List<ServerAddress> toServerAddresses(String connections) throws U
         for(String connection : Arrays.asList(connections.split(","))) {
             int port = DEFAULT_PORT;
             String[] hostPort = connection.split(":");
-            if(hostPort.length > 1 && !StringUtils.isEmpty(hostPort[1])) {
-                port = Integer.parseInt(hostPort[1].trim());
+            if(hostPort.length > 1) {
+                String portValue = hostPort[1];
+                if (StringUtilities.isNotEmpty(portValue)) {
+                    port = Integer.parseInt(portValue.trim());
+                }
             }
             addresses.add(new ServerAddress(hostPort[0], port));
         }
diff --git a/src/protocol/native/build.gradle.kts b/src/protocol/native/build.gradle.kts
index faa55ac0b94..0ea60237494 100644
--- a/src/protocol/native/build.gradle.kts
+++ b/src/protocol/native/build.gradle.kts
@@ -22,9 +22,5 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("org.apache.commons:commons-lang3") {
-        because("StringUtils")
-    }
-
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
index 31c04bc1056..7cd2b2d39bf 100644
--- a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
+++ b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java
@@ -28,7 +28,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -39,6 +38,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jorphan.exec.SystemCommand;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -125,13 +125,14 @@ public SampleResult sample(Entry entry) {
         }
 
         File directory;
-        if(StringUtils.isEmpty(getDirectory())) {
+        String directoryName = getDirectory();
+        if (StringUtilities.isEmpty(directoryName)) {
             directory = new File(FileServer.getDefaultBase());
             if(log.isDebugEnabled()) {
                 log.debug("Using default directory:"+directory.getAbsolutePath());
             }
         } else {
-            directory = new File(getDirectory());
+            directory = new File(directoryName);
             if(log.isDebugEnabled()) {
                 log.debug("Using configured directory:"+directory.getAbsolutePath());
             }
diff --git a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
index 7b43e03364e..f559cea15cc 100644
--- a/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
+++ b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
@@ -27,7 +27,6 @@
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -41,6 +40,7 @@
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.apache.jorphan.gui.ObjectTableModel;
 import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -116,8 +116,9 @@ public void modifyTestElement(TestElement sampler) {
         SystemSampler systemSampler = (SystemSampler)sampler;
         systemSampler.setCheckReturnCode(checkReturnCode.isSelected());
         if(checkReturnCode.isSelected()) {
-            if(!StringUtils.isEmpty(desiredReturnCode.getText())) {
-                systemSampler.setExpectedReturnCode(Integer.parseInt(desiredReturnCode.getText()));
+            String desiredReturnCode = this.desiredReturnCode.getText();
+            if (StringUtilities.isNotEmpty(desiredReturnCode)) {
+                systemSampler.setExpectedReturnCode(Integer.parseInt(desiredReturnCode));
             } else {
                 systemSampler.setExpectedReturnCode(SystemSampler.DEFAULT_RETURN_CODE);
             }
@@ -131,11 +132,12 @@ public void modifyTestElement(TestElement sampler) {
         systemSampler.setStdin(stdin.getFilename());
         systemSampler.setStdout(stdout.getFilename());
         systemSampler.setStderr(stderr.getFilename());
-        if(!StringUtils.isEmpty(timeout.getText())) {
+        String timeout = this.timeout.getText();
+        if (StringUtilities.isNotEmpty(timeout)) {
             try {
-                systemSampler.setTimout(Long.parseLong(timeout.getText()));
+                systemSampler.setTimout(Long.parseLong(timeout));
             } catch (NumberFormatException e) {
-                log.error("Error parsing timeout field value:"+timeout.getText(), e);
+                log.error("Error parsing timeout field value:"+ timeout, e);
             }
         }
     }
diff --git a/src/protocol/tcp/build.gradle.kts b/src/protocol/tcp/build.gradle.kts
index a4f388fc3f5..49ccaad424b 100644
--- a/src/protocol/tcp/build.gradle.kts
+++ b/src/protocol/tcp/build.gradle.kts
@@ -22,9 +22,6 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("org.apache.commons:commons-lang3") {
-        because("ArrayUtils")
-    }
     implementation("commons-io:commons-io") {
         because("IOUtils")
     }
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
index 12565f81f9c..d8c8167bbe8 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
@@ -24,9 +24,9 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +52,7 @@ public TCPClientImpl() {
         }
         setCharset(CHARSET);
         String configuredCharset = JMeterUtils.getProperty("tcp.charset");
-        if(StringUtils.isEmpty(configuredCharset)) {
+        if (StringUtilities.isEmpty(configuredCharset)) {
             log.info("Using platform default charset:{}",CHARSET);
         } else {
             log.info("Using charset:{}", configuredCharset);
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
index 64c4ff09c10..3822400e22f 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
@@ -36,7 +36,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.samplers.AbstractSampler;
 import org.apache.jmeter.samplers.Entry;
@@ -45,6 +44,7 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -295,7 +295,7 @@ public void setClassname(String classname) {
 
     public String getClassname() {
         String clazz = getPropertyAsString(CLASSNAME,"");
-        if (clazz==null || clazz.length()==0){
+        if (StringUtilities.isEmpty(clazz)){
             clazz = JMeterUtils.getPropDefault("tcp.handler", "TCPClientImpl"); //$NON-NLS-1$ $NON-NLS-2$
         }
         return clazz;
@@ -445,7 +445,7 @@ private static boolean setupSampleResult(SampleResult sampleResult,
         }
         boolean isSuccessful = exception == null;
         // Reset the status code if the message contains one
-        if (!StringUtils.isEmpty(readResponse) && STATUS_PREFIX.length() > 0) {
+        if (StringUtilities.isNotEmpty(readResponse) && STATUS_PREFIX.length() > 0) {
             int i = readResponse.indexOf(STATUS_PREFIX);
             int j = readResponse.indexOf(STATUS_SUFFIX, i + STATUS_PREFIX.length());
             if (i != -1 && j > i) {

From 285b1e64fa234d3664f09c317adbc1569bd39528 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Oct 2025 22:53:20 +0300
Subject: [PATCH 0845/1037] chore: update expected_release_jars.csv when
 updating dependency verification info

This should make Renovate update the release jars automatically along with the dependency verification info.
---
 build.gradle.kts          | 6 ++++++
 src/dist/build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d34c1aa458d..dec43a2c8c2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,6 +35,12 @@ fun Project.boolProp(name: String) =
 val String.v: String get() = rootProject.extra["$this.version"] as String
 version = "jmeter".v + releaseParams.snapshotSuffix
 
+if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
+    tasks.named("dependencies") {
+        dependsOn(":src:dist:verifyReleaseDependencies")
+    }
+}
+
 allprojects {
     group = "org.apache.jmeter"
     version = rootProject.version
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 40cf7b67b93..e7b653aceec 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -160,7 +160,7 @@ val populateLibs by tasks.registering {
     }
 }
 
-val updateExpectedJars by props()
+val updateExpectedJars by props(default = gradle.startParameter.writeDependencyVerifications.isNotEmpty())
 
 val verifyReleaseDependencies by tasks.registering {
     description = "Verifies if binary release archive contains the expected set of external jars"

From f8016d373e069b2cdfd50aa2f4a74786f47fafa3 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Oct 2025 22:56:59 +0300
Subject: [PATCH 0846/1037] chore: update expected release jars and
 verification metadata

---
 gradle/verification-metadata.xml            | 20 ++++++++++++++++++++
 src/dist/src/dist/expected_release_jars.csv |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 38ea4794e21..9c13a224bc1 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -454,6 +454,21 @@
             <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="33">
+         <artifact name="apache-33.pom">
+            <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="79">
+         <artifact name="commons-parent-79.pom">
+            <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="81">
+         <artifact name="commons-parent-81.pom">
+            <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -548,6 +563,11 @@
             <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.11.4">
+         <artifact name="junit-bom-5.11.4.pom">
+            <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 3acb3234866..476638871fc 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -26,7 +26,7 @@
 230830,checker-qual-3.42.0.jar
 360738,commons-codec-1.16.0.jar
 588337,commons-collections-3.2.2.jar
-751914,commons-collections4-4.4.jar
+898652,commons-collections4-4.5.0.jar
 211301,commons-dbcp2-2.9.0.jar
 501218,commons-io-2.15.1.jar
 267634,commons-jexl-2.1.1.jar
@@ -36,7 +36,7 @@
 73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
 322780,commons-net-3.10.0.jar
-150048,commons-pool2-2.12.0.jar
+152289,commons-pool2-2.12.1.jar
 246659,commons-text-1.11.0.jar
 1547509,darklaf-core-2.7.3.jar
 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar

From 8584f2a3cc0c1e21a6460918925f18a1d5e4983b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 19:54:28 +0000
Subject: [PATCH 0847/1037] fix(deps): update dependency
 org.apache.commons:commons-lang3 to v3.19.0

---
 gradle/verification-metadata.xml                       | 10 ++++++++++
 src/bom-thirdparty/build.gradle.kts                    |  2 +-
 src/dist/src/dist/expected_release_jars.csv            |  2 +-
 .../java/org/apache/jmeter/functions/RandomString.java |  4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9c13a224bc1..bac953e9e29 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -459,6 +459,11 @@
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="35">
+         <artifact name="apache-35.pom">
+            <sha256 value="ea297dcd114136e8b8e8b630230d52a76c2fc69f6c5db25d672b1857000728b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="79">
          <artifact name="commons-parent-79.pom">
             <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
@@ -568,6 +573,11 @@
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.13.4">
+         <artifact name="junit-bom-5.13.4.pom">
+            <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 237ed8b5ec7..a5364458c6a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -96,7 +96,7 @@ dependencies {
         api("org.apache.commons:commons-dbcp2:2.9.0")
         api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")
-        api("org.apache.commons:commons-lang3:3.14.0") {
+        api("org.apache.commons:commons-lang3:3.19.0") {
             because("User might still rely on commons-lang3")
         }
         api("org.apache.commons:commons-math3:3.6.1")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 476638871fc..d8386b4c717 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -32,7 +32,7 @@
 267634,commons-jexl-2.1.1.jar
 462124,commons-jexl3-3.2.1.jar
 760623,commons-jvm-4.1.0.jar
-657952,commons-lang3-3.14.0.jar
+709075,commons-lang3-3.19.0.jar
 73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
 322780,commons-net-3.10.0.jar
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
index 0497799171e..04949cec177 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
@@ -91,9 +91,9 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
 
         String myValue;
         if (StringUtilities.isEmpty(charsToUse)) {
-            myValue = RandomStringUtils.random(length);
+            myValue = RandomStringUtils.insecure().next(length);
         } else {
-            myValue = RandomStringUtils.random(length, charsToUse);
+            myValue = RandomStringUtils.insecure().next(length, charsToUse);
         }
 
         if (myName.length() > 0) {

From b9fc5485b08f3c718742750410c30269e9aa18c7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 10 Oct 2025 17:03:08 +0000
Subject: [PATCH 0848/1037] fix(deps): update dependency
 org.apache.commons:commons-text to v1.14.0

---
 gradle/verification-metadata.xml                             | 5 +++++
 src/bom-thirdparty/build.gradle.kts                          | 2 +-
 src/dist/src/dist/expected_release_jars.csv                  | 2 +-
 .../src/main/java/org/apache/jorphan/util/JOrphanUtils.java  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bac953e9e29..019927d6c29 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -573,6 +573,11 @@
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.13.1">
+         <artifact name="junit-bom-5.13.1.pom">
+            <sha256 value="fa68451ea830572ed43ffe51d75b6a05f7a5e665a602a51f49d6be02063a65f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.13.4">
          <artifact name="junit-bom-5.13.4.pom">
             <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a5364458c6a..7cc966ea6ac 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -101,7 +101,7 @@ dependencies {
         }
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.12.1")
-        api("org.apache.commons:commons-text:1.11.0")
+        api("org.apache.commons:commons-text:1.14.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.3")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index d8386b4c717..2f4eb909398 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -37,7 +37,7 @@
 2213560,commons-math3-3.6.1.jar
 322780,commons-net-3.10.0.jar
 152289,commons-pool2-2.12.1.jar
-246659,commons-text-1.11.0.jar
+259876,commons-text-1.14.0.jar
 1547509,darklaf-core-2.7.3.jar
 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
 93477,darklaf-macos-2.7.3.jar
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 3d25f35a777..1ca523bc6e9 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -763,7 +763,7 @@ public static String generateRandomAlphanumericPassword(int length) {
         RandomStringGenerator pwdGenerator = new RandomStringGenerator.Builder()
                 .usingRandom(LazySecureRandom.INSTANCE::nextInt)
                 .withinRange(pairs)
-                .build();
+                .get();
         return pwdGenerator.generate(length);
     }
 }

From 2f56efce24904b77c3efa6f94d12eac3b8d1f4ef Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 9 Oct 2025 19:48:43 +0000
Subject: [PATCH 0849/1037] fix(deps): update dependency commons-io:commons-io
 to v2.20.0

---
 gradle/verification-metadata.xml              | 20 +++++++++++++++++++
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 src/dist/src/dist/expected_release_jars.csv   |  2 +-
 .../protocol/http/sampler/HTTPJavaImpl.java   |  9 +++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 019927d6c29..34b6ef77cb2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -454,6 +454,11 @@
             <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="29">
+         <artifact name="apache-29.pom">
+            <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="33">
          <artifact name="apache-33.pom">
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
@@ -464,6 +469,11 @@
             <sha256 value="ea297dcd114136e8b8e8b630230d52a76c2fc69f6c5db25d672b1857000728b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="58">
+         <artifact name="commons-parent-58.pom">
+            <sha256 value="2d4b12e18899063abd7c75278b5fa97a3729d80878ceecb6a40d946e9c0d5590" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="79">
          <artifact name="commons-parent-79.pom">
             <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
@@ -474,6 +484,11 @@
             <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="85">
+         <artifact name="commons-parent-85.pom">
+            <sha256 value="d189ff2c0027e96bb65d31e6f227ed2af966169b36af1e973dd5ba08926dc7b5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -583,6 +598,11 @@
             <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.9.3">
+         <artifact name="junit-bom-5.9.3.pom">
+            <sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 7cc966ea6ac..c5a4866a4ee 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -64,7 +64,7 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.16.0")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.15.1")
+        api("commons-io:commons-io:2.20.0")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.3.5")
         api("commons-net:commons-net:3.10.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 2f4eb909398..69ca4530bc0 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -28,7 +28,7 @@
 588337,commons-collections-3.2.2.jar
 898652,commons-collections4-4.5.0.jar
 211301,commons-dbcp2-2.9.0.jar
-501218,commons-io-2.15.1.jar
+563971,commons-io-2.20.0.jar
 267634,commons-jexl-2.1.1.jar
 462124,commons-jexl3-3.2.1.jar
 760623,commons-jvm-4.1.0.jar
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 217e1bd4f99..28714b250ae 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -33,7 +33,7 @@
 import java.util.function.Predicate;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
 import org.apache.jmeter.protocol.http.control.AuthManager;
 import org.apache.jmeter.protocol.http.control.Authorization;
 import org.apache.jmeter.protocol.http.control.CacheManager;
@@ -241,9 +241,10 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
 
         // works OK even if ContentEncoding is null
         boolean gzipped = HTTPConstants.ENCODING_GZIP.equals(conn.getContentEncoding());
-        CountingInputStream instream = null;
+
+        BoundedInputStream instream = null;
         try {
-            instream = new CountingInputStream(conn.getInputStream());
+            instream = BoundedInputStream.builder().setInputStream(conn.getInputStream()).get();
             if (gzipped) {
                 in = new GZIPInputStream(instream);
             } else {
@@ -295,7 +296,7 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
         // N.B. this closes 'in'
         byte[] responseData = readResponse(res, in, contentLength);
         if (instream != null) {
-            res.setBodySize(instream.getByteCount());
+            res.setBodySize(instream.getCount());
             instream.close();
         }
         return responseData;

From a972b8ebd94b297a0402e6ea749b1b59ec60046b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 10 Oct 2025 23:53:35 +0300
Subject: [PATCH 0850/1037] chore: skip building the classes when writing
 dependnecy verification

Currently, renovate executes dependencies task which builds all JMeter jars,
however, we do not need it.
---
 .../src/main/kotlin/build-logic.java.gradle.kts  |  3 +++
 .../main/kotlin/build-logic.kotlin.gradle.kts    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index bb7366a3a1e..c91d3170a0a 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -45,6 +45,9 @@ tasks.configureEach<JavaCompile> {
     // Use --release=<targetJavaVersion> for javac so the generated bytecode does not include methods introduced in
     // next Java releases
     options.release.set(buildParameters.targetJavaVersion)
+    if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
+        enabled = false
+    }
 }
 
 tasks.configureEach<JavaExec> {
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index bc2591ad1ff..01adbad0a65 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -17,6 +17,8 @@
 
 import com.github.vlsi.gradle.dsl.configureEach
 import com.github.vlsi.gradle.properties.dsl.props
+import org.jetbrains.kotlin.gradle.tasks.BaseKapt
+import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -43,6 +45,9 @@ kotlin {
 }
 
 tasks.configureEach<KotlinCompile> {
+    if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
+        enabled = false
+    }
     kotlinOptions {
         if (!name.startsWith("compileTest")) {
             apiVersion = "kotlin.api".v
@@ -54,6 +59,17 @@ tasks.configureEach<KotlinCompile> {
     }
 }
 
+if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
+    plugins.withId("org.jetbrains.kotlin.kapt") {
+        tasks.configureEach<BaseKapt> {
+            enabled = false
+        }
+        tasks.configureEach<KaptGenerateStubs> {
+            enabled = false
+        }
+    }
+}
+
 if (file("src/main/kotlin").isDirectory) {
     // When main code contains Kotlin, use Dokka instead of Javadoc
     apply(plugin = "build-logic.dokka-javadoc")

From 27416797d7ecdbf4ded95154bc4b5d7a4902e8c7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 00:02:42 +0300
Subject: [PATCH 0851/1037] chore: add dependency submission workflow

This enables GitHub security scanning for all the transitive dependencies
---
 .../workflows/gradle-dependency-submit.yaml   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/gradle-dependency-submit.yaml

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
new file mode 100644
index 00000000000..6b4290011fe
--- /dev/null
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -0,0 +1,31 @@
+name: Dependency Submission
+
+# See https://github.com/gradle/actions/blob/768a17f3488dc3fe0155ff431553e1f53d57e22e/dependency-submission/README.md#the-dependency-submission-action
+# The action allows GitHub to alert about reported vulnerabilities in the project
+on:
+  push:
+    branches:
+      - main
+
+# Declare default permissions as read-only.
+permissions: read-all
+
+jobs:
+  dependency-submission:
+    name: Submit dependencies
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      with:
+        persist-credentials: false
+    - name: Set up JDK 21
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+      with:
+        distribution: zulu
+        java-version: 21
+        server-id: central
+    - name: Generate and submit dependency graph
+      uses: gradle/actions/dependency-submission@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4

From 8eea047a9bba433498efe2ec930b9fb8bf2a0b59 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 00:08:25 +0300
Subject: [PATCH 0852/1037] chore: fix trigger branch name for dependency
 submission workflow

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index 6b4290011fe..a2d9fcbaf8c 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -5,7 +5,7 @@ name: Dependency Submission
 on:
   push:
     branches:
-      - main
+      - master
 
 # Declare default permissions as read-only.
 permissions: read-all

From 67782623f6c04cc92bf1f2d8e2702e012ffd5e35 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 11:43:17 +0300
Subject: [PATCH 0853/1037] chore: skip jar task as well when writing
 dependency verification

---
 build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index c91d3170a0a..00c8aaa05f3 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -56,6 +56,12 @@ tasks.configureEach<JavaExec> {
     }
 }
 
+if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
+    tasks.configureEach<Jar> {
+        enabled = false
+    }
+}
+
 tasks.configureEach<Checkstyle> {
     buildParameters.buildJdk?.let {
         javaLauncher.convention(javaToolchains.launcherFor(it))

From 4ca19e87dc6691b621f9f9a6ced1194ee59fd264 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 10 Oct 2025 21:33:18 +0000
Subject: [PATCH 0854/1037] chore(deps): update actions/setup-java action to v5

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index a2d9fcbaf8c..bd7516f76b4 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -22,7 +22,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Set up JDK 21
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
       with:
         distribution: zulu
         java-version: 21

From 6f08eac9688301eb4b9136a52e1ed723894ab7f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Oct 2025 21:13:56 +0000
Subject: [PATCH 0855/1037] chore(deps): bump org.eclipse.jgit:org.eclipse.jgit

Bumps org.eclipse.jgit:org.eclipse.jgit from 5.13.2.202306221912-r to 6.10.1.202505221210-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-version: 6.10.1.202505221210-r
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build-logic/batchtest/build.gradle.kts | 2 +-
 settings.gradle.kts                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/batchtest/build.gradle.kts b/build-logic/batchtest/build.gradle.kts
index 22472a2bbee..99396e12129 100644
--- a/build-logic/batchtest/build.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -21,5 +21,5 @@ plugins {
 
 dependencies {
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index daf326e5599..ef2d7c40974 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -128,7 +128,7 @@ develocity {
 buildscript {
     dependencies {
         // Remove when Autostyle updates jgit dependency
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r")
     }
     repositories {
         gradlePluginPortal()

From d06fc43e6786cdab994f658682a0c830ee8a89ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Oct 2025 21:14:04 +0000
Subject: [PATCH 0856/1037] chore(deps): bump
 org.apache.activemq:activemq-client

Bumps [org.apache.activemq:activemq-client](https://github.com/apache/activemq) from 5.16.7 to 5.16.8.
- [Commits](https://github.com/apache/activemq/compare/activemq-5.16.7...activemq-5.16.8)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  dependency-version: 5.16.8
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/bom-testing/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 4301a662c6a..60ca1e6e879 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,9 +42,9 @@ dependencies {
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.7")
-        api("org.apache.activemq:activemq-client:5.16.7")
-        api("org.apache.activemq:activemq-spring:5.16.7")
+        api("org.apache.activemq:activemq-broker:5.16.8")
+        api("org.apache.activemq:activemq-client:5.16.8")
+        api("org.apache.activemq:activemq-spring:5.16.8")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.3")

From 9fb32d0260240bb538b0750a74719952f720111e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 16 Jun 2025 03:10:16 +0000
Subject: [PATCH 0857/1037] fix(deps): update dependency
 org.codehaus.groovy:groovy-bom to v3.0.25

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c5a4866a4ee..a871a18fb65 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:3.0.20"))
+    api(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 
     constraints {

From 3f83a405e22d1c8da3fa0baf5c6046db77386864 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 12:38:51 +0300
Subject: [PATCH 0858/1037] chore: disable Dependabot updates

We use Renovate bot.
---
 .asf.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 2eaa5c930b8..4dc8f59efac 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -8,6 +8,9 @@ github:
     - test
     - java
 
+  dependabot_alerts:  true
+  dependabot_updates: false
+
   enabled_merge_buttons:
     squash: true
     merge:  false

From dd1e5399820e35239061febc761301dcf137b05c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 15:48:05 +0300
Subject: [PATCH 0859/1037] chore: update verification metadata and expected
 release jars

---
 gradle/verification-metadata.xml            | 10 ++++++++++
 src/dist/src/dist/expected_release_jars.csv | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 34b6ef77cb2..ebd9d63da55 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -454,6 +454,11 @@
             <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="25">
+         <artifact name="apache-25.pom">
+            <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="29">
          <artifact name="apache-29.pom">
             <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
@@ -510,6 +515,11 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
+         <artifact name="jetty-bom-9.4.53.v20231009.pom">
+            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 69ca4530bc0..2a1985fc3b8 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -54,15 +54,15 @@
 16829,error_prone_annotations-2.24.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8046016,groovy-3.0.20.jar
-15172,groovy-datetime-3.0.20.jar
-7400,groovy-dateutil-3.0.20.jar
-132982,groovy-jmx-3.0.20.jar
-128872,groovy-json-3.0.20.jar
-16832,groovy-jsr223-3.0.20.jar
-78909,groovy-sql-3.0.20.jar
-94157,groovy-templates-3.0.20.jar
-291709,groovy-xml-3.0.20.jar
+8057404,groovy-3.0.25.jar
+15175,groovy-datetime-3.0.25.jar
+7402,groovy-dateutil-3.0.25.jar
+133002,groovy-jmx-3.0.25.jar
+128875,groovy-json-3.0.25.jar
+16835,groovy-jsr223-3.0.25.jar
+78912,groovy-sql-3.0.25.jar
+94088,groovy-templates-3.0.25.jar
+291624,groovy-xml-3.0.25.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar

From 1e9f864be8a20e09c655e1752ba6d0d9e55d180e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 11 Oct 2025 10:18:54 +0000
Subject: [PATCH 0860/1037] fix(deps): update net.minidev json-smart to v2.6.0

---
 gradle/verification-keyring.keys            | 44 +++++++++++++++++++++
 gradle/verification-metadata.xml            |  1 +
 src/bom-thirdparty/build.gradle.kts         |  4 +-
 src/dist/src/dist/expected_release_jars.csv |  6 +--
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 4a38743b362..b1fcf99bbc4 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -4474,6 +4474,50 @@ nTkUyTmIOtAfpcNxqIzJjYoir41vgaegw20EnoHgJiCD5OB6Xzn03h+rTXI=
 =MeIR
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    1D0690E353BE126D
+uid    uriel chemouni <uriel.chemouni@gmail.com>
+
+sub    E8A2523CD0552340
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGAUIkQBEADx6YhQKqsahrW6elbzNMFz0gs7vZZ6EpOOdS2WJIniaVs4FBKj
+DTfFA4UooC8mcwaXKlnfeIM6S8w/HIU0ADw9VOLIWT3KXMs8OBC5E+PQB205Azef
+zMQhEZbycsk4n5PeBfroCBhF4xf2PGmZ1oh2Pz6Y4JuU0WSYf7Tq/UffjBvuurWr
+rc+DWUIcmVBh40UPayR0j+nxzNJhH2VODyqklNZCBxdfD8B+9E/xOi1TGP8pFiPW
+ZQHViFPi7DWJa71zL6terSsMGXLzfwHuCO3F2I93lX3H5JMNn7HLxB264t6bvgYY
+zr3QgBsrzUwX7q+QhOhzqJ+bICbgjSz21RYfYfOR4Ra0J4yBQI+Ibg8FmAPMBIG6
+bkUqPNu/yTax7VA/B3ShG+4uA1cy+y3lTnooxTj3Ct8tUWD/J5pfxKmH5rxiIWSs
+Y6ikodiFMgtfm8gbGG4i2F68Ia2RdYdLs1ltCZwPVAi9L+CS2aHg3HR8Ked1bVx4
+Os/CwyARuWgqXIx77/pYsPngwKWiep+jcQfm6qaXFw75787rDbBZbN3qnq+EroAG
+bCfr/4RbMfSqk1787tIT4LsphY4SZGhgMfJyrAkL1osqUbT9o02AGfAYfWeRCbiU
+YbPLszxflVcmKiWmu1tON4o6sBo6wJlsq7mAFTxOwUI/UOXhgX81PSPMeQARAQAB
+tCl1cmllbCBjaGVtb3VuaSA8dXJpZWwuY2hlbW91bmlAZ21haWwuY29tPrkCDQRg
+FCJEARAAq1oetRRLjtidxEhLTMxEwstQLcULH8IUHz36c6DogB8UG+8LvSqEQjwV
+ZLwAk5cMuAyq1C9jLxg0Ksz3ZUSlCWAVRKl1+YS2aP2xr6KjB1QYQ+yRiPTrs+D4
+aqJDzPgwZzBW2LKF2YuVvakvMs2fNOHOPoY73b0xWc1rvJOklnwXv0EbhGlyHPfw
+C5KAApY+ZRrcB7eF7w3GZExs8DLhBJuHBG5Sxdl6347GWkuKG+bsfxhchHAXWg5l
+a39cZCSgHwxa8QACfl3H9vZli5ENmRCF+PEbpAQtBKeymVO0sAMJahQ3JoDmzgUi
+sPQOXALurdkPjlzGHTAXUgz4f0qEqiKFJ+kcWXTrFaCABVlyEOV8FFb4LN1NbT+e
+/iYT0/sAntqkOwNBK+YQGbifBA+/q5MoU43/97g/OJ5V5NaCHwbcWcsosSboupv6
+TYaQRbE7cvKNvVb5MsVLvEWWLOwhPU3UWd36l1TO3hbwXrtoobKDslwN867OrmHg
+n4feJMOZ75z9odOy5/AgqcDvGn9vkkSzl5uZSS7crd1mnTAXbFoDbfOVfLu9pxPb
+s/drTyk6L/GNgM8bfbCZLuMRQXiGoAcC/QK/+EBC4UJ17MA1+M36WwLblsgGxowA
+NdO3nmTm8k+1V8vrwoSxY2UfnaJSvH6dEzaudhYdk6dLHD8l1rEAEQEAAYkCNgQY
+AQgAIBYhBB0EpCT1BTlNvtFdRR0GkONTvhJtBQJgFCJEAhsMAAoJEB0GkONTvhJt
+5t8P+QEcwNT7SpOlYH+8RBFC0dSVGyRJsNs6UktqUUa/zq9NBEj6438o2569hDps
+a1Xq4zjqrMtWPLBTM9iEGCdjuL/pVFQWuD+pKF+ACeXS2apQOBJXo9ncR8SO6tK5
+Ex3jy4Sa70Zkr4cpkmRayNGQOSCz6tiaD7QxTzWoqwLK+3IitwfkfWxenS5SNC3O
+ot8rdkFnIEwNBg+Ps/YeadKSW242rUWstyhNEEJpO1TJM4qMBc9Sjfrs6WGZ4eyg
+C7hSJ+scyxqwnIVmr+fOcnKjs47h1sJeQjxmr8V+7eNM3Fkx7URLIcwnrsVBoKn5
+bW3tMGXj4GbOoN3vp6R6J34j0XGlmFrb0bZTiC6yd6itadQs0qLvd7cyeLnnIB1d
+FSvoQNHdpaueftFMI0vCHyzl7ztotOrGWQ2iaZoYOAiRZKqIGCX0SIq85ahnYycz
+CRD4amlfMWGdXZbibNRJ86HXEGqbaYxwVwOdJg+FjqPYkwJkCFVpYtUntpcnJsiz
+waZqfCMj78t4EfeLh9sbU7Sm4G0Mn2lCbQgZ/ZP6GlcBMaSXQLqAdEx5PV8Uxyzq
+tjPPOOaPQ90UqDp7Iw5SlCYrwr3zbI8TcV9I0c2B9vouMFeUJU7Bu+yZFAhrc7+8
+FqFKGBLNsdQDzjnuIR6XoPvTes3QjfMrn5NQgL9bXXENWSTU
+=3gtf
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    1DA784CCB5C46DD5
 uid    Rafael Winterhalter <rafael.wth@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ebd9d63da55..40e9f2d9e54 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -46,6 +46,7 @@
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte"/>
+         <trusted-key id="1D04A424F505394DBED15D451D0690E353BE126D" group="net.minidev"/>
          <trusted-key id="1DEF9646901A1652E5B3E5EA694DB6F419C8D1FD" group="org.exparity"/>
          <trusted-key id="1FCFFE916B6670868FA0EA0391AE1504568EC4DD" group="org.jodd"/>
          <trusted-key id="223D3A74B068ECA354DC385CE126833F9CF64915" group="org.apache.xbean"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a871a18fb65..21cf8595191 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -87,8 +87,8 @@ dependencies {
         api("org.hamcrest:hamcrest:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("net.minidev:accessors-smart:2.5.0")
-        api("net.minidev:json-smart:2.5.0")
+        api("net.minidev:accessors-smart:2.6.0")
+        api("net.minidev:json-smart:2.6.0")
         api("net.sf.jtidy:jtidy:r938")
         api("net.sf.saxon:Saxon-HE:11.6")
         api("org.apache-extras.beanshell:bsh:2.0b6")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 2a1985fc3b8..3521f3c98f0 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,7 +1,7 @@
-29901,accessors-smart-2.5.0.jar
+30245,accessors-smart-2.6.0.jar
 30570,annotations-24.1.0.jar
 6806,apiguardian-api-1.1.2.jar
-123598,asm-9.6.jar
+126093,asm-9.7.1.jar
 485898,batik-anim-1.16.jar
 424607,batik-awt-util-1.16.jar
 704905,batik-bridge-1.16.jar
@@ -87,7 +87,7 @@
 19858,jodd-log-5.0.13.jar
 26047,jodd-props-5.0.13.jar
 277582,json-path-2.8.0.jar
-120233,json-smart-2.5.0.jar
+122808,json-smart-2.6.0.jar
 473788,jsoup-1.17.1.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar

From 0903d88ab3f4f7f56df6334d8f193b40311e5e49 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 11 Oct 2025 23:07:47 +0300
Subject: [PATCH 0861/1037] test: add missing JMeter initialization to test
 classes

Previously, the tests might trigger initialization of jmeter function classes
before JMeter itself was loaded.

For instance, StringToFile loads resources in its clint block,
so if StringToFile initializes too early, the descriptions don't load from the resources.

We should probably avoid clinit for resource-loading in the long run (locale might change on the fly),
however adding the initialization does not look that bad either.
---
 .../java/org/apache/jmeter/engine/DistributedRunnerTest.java   | 2 ++
 .../apache/jmeter/functions/StringFromFileFunctionTest.java    | 3 ++-
 .../java/org/apache/jmeter/functions/XPathConcurrencyTest.java | 3 ++-
 .../test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt  | 3 ++-
 .../kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt | 3 ++-
 .../kotlin/org/apache/jmeter/functions/IterationCounterTest.kt | 3 ++-
 .../http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java  | 2 ++
 .../jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt    | 2 ++
 .../jmeter/protocol/jms/sampler/PublisherSamplerTest.java      | 2 ++
 .../jmeter/protocol/mail/sampler/TestMailReaderSampler.java    | 2 ++
 10 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index bca31541424..cfab03df32b 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -34,9 +34,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Isolated("modifies jmeter locale")
 @Execution(ExecutionMode.SAME_THREAD) // System.setOut must not be run concurrently with other tests
 public class DistributedRunnerTest {
 
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
index 25db680cf24..26e68c16163 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
@@ -25,12 +25,13 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-public class StringFromFileFunctionTest {
+public class StringFromFileFunctionTest extends JMeterTestCase {
     private static Path dir;
 
     @BeforeAll
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/XPathConcurrencyTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/XPathConcurrencyTest.java
index 02a56b7bf25..bfed45fbaf0 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/XPathConcurrencyTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/XPathConcurrencyTest.java
@@ -26,12 +26,13 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.testkit.ResourceLocator;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-public class XPathConcurrencyTest {
+public class XPathConcurrencyTest extends JMeterTestCase {
     enum ReferenceEquality {
         SAME_OBJECTS, DIFFERENT_OBJECTS
     }
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
index fd01972510f..eb17aa710a6 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/ChangeCaseTest.kt
@@ -18,6 +18,7 @@
 package org.apache.jmeter.functions
 
 import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.samplers.SampleResult
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
@@ -27,7 +28,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.util.Locale
 
-class ChangeCaseTest {
+class ChangeCaseTest : JMeterTestCase() {
     data class ExecuteCase(val input: String, val mode: String, val output: String)
 
     companion object {
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
index 32ad1d29132..d7b394a2a2b 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/FunctionServicesTest.kt
@@ -17,12 +17,13 @@
 
 package org.apache.jmeter.functions
 
+import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.util.JMeterUtils
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import java.util.ServiceLoader
 
-class FunctionServicesTest {
+class FunctionServicesTest : JMeterTestCase() {
     @Test
     fun `__counter loads`() {
         val functions = JMeterUtils.loadServicesAndScanJars(
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
index 7b1445d410d..062214efd6f 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/functions/IterationCounterTest.kt
@@ -18,6 +18,7 @@
 package org.apache.jmeter.functions
 
 import org.apache.jmeter.engine.util.CompoundVariable
+import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.threads.JMeterContextService
 import org.apache.jmeter.threads.JMeterVariables
 import org.junit.jupiter.api.Assertions
@@ -25,7 +26,7 @@ import org.junit.jupiter.api.Test
 import java.util.concurrent.CountDownLatch
 import kotlin.concurrent.thread
 
-class IterationCounterTest {
+class IterationCounterTest : JMeterTestCase() {
 
     @Test
     fun `Counter per thread counts for each thread`() {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 0d6877e4475..4164c82c61c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -56,6 +56,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -64,6 +65,7 @@
  * The samples are executed against the HttpMirrorServer, which is
  * started when the unit tests are executed.
  */
+@Isolated("modifies jmeter locale")
 public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCase {
     private static final java.util.regex.Pattern EMPTY_LINE_PATTERN = java.util.regex.Pattern.compile("^$",
             java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
index 589cb0308e3..e84b11efef5 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerPrintDslTest.kt
@@ -29,10 +29,12 @@ import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.parallel.Isolated
 import org.junit.jupiter.api.parallel.ResourceLock
 import org.junit.jupiter.api.parallel.Resources
 import java.util.Locale
 
+@Isolated("modifies jmeter locale")
 @ResourceLock(value = Resources.LOCALE)
 class HttpSamplerPrintDslTest : JMeterTestCase() {
     companion object {
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
index c60afc0ecb1..bd611b9a1c9 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java
@@ -27,9 +27,11 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import com.github.benmanes.caffeine.cache.Cache;
 
+@Isolated("modifies jmeter locale")
 public class PublisherSamplerTest {
 
     @BeforeEach
diff --git a/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java b/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
index 406d55b9988..81b2beb80f9 100644
--- a/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
+++ b/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java
@@ -25,7 +25,9 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
+@Isolated("modifies jmeter locale")
 public class TestMailReaderSampler {
 
     @SuppressWarnings("CatchAndPrintStackTrace")

From 00ede7ae0b42c06096378a95d4f37d22436ca989 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 11 Oct 2025 09:50:18 +0000
Subject: [PATCH 0862/1037] fix(deps): update dependency
 commons-net:commons-net to v3.12.0

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 21cf8595191..68e279f851e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
         api("commons-io:commons-io:2.20.0")
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.3.5")
-        api("commons-net:commons-net:3.10.0")
+        api("commons-net:commons-net:3.12.0")
         api("dnsjava:dnsjava:2.1.9")
         api("io.burt:jmespath-core:0.6.0")
         api("io.burt:jmespath-jackson:0.6.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 3521f3c98f0..544dff5ab12 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -35,7 +35,7 @@
 709075,commons-lang3-3.19.0.jar
 73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
-322780,commons-net-3.10.0.jar
+330333,commons-net-3.12.0.jar
 152289,commons-pool2-2.12.1.jar
 259876,commons-text-1.14.0.jar
 1547509,darklaf-core-2.7.3.jar

From 7151e97c75217c3bca0d5e464d9dd5b6f4201eb4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 11 Oct 2025 09:47:32 +0000
Subject: [PATCH 0863/1037] fix(deps): update dependency
 commons-codec:commons-codec to v1.19.0

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 68e279f851e..77232e8bf6a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.21")
-        api("commons-codec:commons-codec:1.16.0")
+        api("commons-codec:commons-codec:1.19.0")
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.20.0")
         api("commons-lang:commons-lang:2.6")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 544dff5ab12..f2adbb3dd22 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -24,7 +24,7 @@
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
 230830,checker-qual-3.42.0.jar
-360738,commons-codec-1.16.0.jar
+374716,commons-codec-1.19.0.jar
 588337,commons-collections-3.2.2.jar
 898652,commons-collections4-4.5.0.jar
 211301,commons-dbcp2-2.9.0.jar

From 9863932ff82c8782579dc89ade89dc7253d6e1f5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 16 Jun 2025 03:10:14 +0000
Subject: [PATCH 0864/1037] fix(deps): update dependency
 org.apache.mina:mina-core to v2.2.4

---
 gradle/verification-metadata.xml | 5 +++++
 src/bom-testing/build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 40e9f2d9e54..da329819310 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -465,6 +465,11 @@
             <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="30">
+         <artifact name="apache-30.pom">
+            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="33">
          <artifact name="apache-33.pom">
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 60ca1e6e879..564c8044156 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
         api("org.apache.activemq:activemq-spring:5.16.8")
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
-        api("org.apache.mina:mina-core:2.2.3")
+        api("org.apache.mina:mina-core:2.2.4")
         api("org.hamcrest:hamcrest-core:2.2")
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")

From 6fc29c949430a765b4dabf9d729732fc03b96b7f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 13 Oct 2025 19:52:53 +0300
Subject: [PATCH 0865/1037] fix(deps): update org.jodd, skip Internet Explorer
 6-9

Previously, JMeter analyzed conditional commens and it could parse
HTML pages as if it was Internet Explorer of a specific version.
However, Internet Explorer 10 no longer supports conditional comments,
and IE 9 has been unsupported for quite some time already.

See https://github.com/oblac/jodd-lagarto/issues/25
---
 src/bom-thirdparty/build.gradle.kts           |  8 +--
 .../http/parser/LagartoBasedHtmlParser.java   | 58 +--------------
 .../protocol/http/parser/TestHTMLParser.java  | 71 ++++---------------
 xdocs/changes.xml                             |  5 ++
 4 files changed, 25 insertions(+), 117 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 77232e8bf6a..4d54c9168c7 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -129,10 +129,10 @@ dependencies {
         api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")
-        api("org.jodd:jodd-core:5.0.13")
-        api("org.jodd:jodd-lagarto:5.0.13")
-        api("org.jodd:jodd-log:5.0.13")
-        api("org.jodd:jodd-props:5.0.13")
+        api("org.jodd:jodd-core:5.3.0")
+        api("org.jodd:jodd-lagarto:6.0.6")
+        api("org.jodd:jodd-log:5.1.6")
+        api("org.jodd:jodd-props:6.0.2")
         api("org.jsoup:jsoup:1.17.1")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 9c30ee8d8f1..2338e83f295 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -19,9 +19,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayDeque;
 import java.util.Collections;
-import java.util.Deque;
 import java.util.Iterator;
 
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
@@ -34,7 +32,6 @@
 import jodd.lagarto.Tag;
 import jodd.lagarto.TagType;
 import jodd.lagarto.dom.HtmlCCommentExpressionMatcher;
-import jodd.lagarto.dom.LagartoDomBuilderConfig;
 import jodd.log.LoggerFactory;
 import jodd.log.impl.Slf4jLogger;
 import jodd.util.CharSequenceUtil;
@@ -60,21 +57,16 @@ private URLPointer(URL newUrl) {
     }
 
     private static final class JMeterTagVisitor extends EmptyTagVisitor {
-        private HtmlCCommentExpressionMatcher htmlCCommentExpressionMatcher;
         private final URLCollection urls;
         private final URLPointer baseUrl;
-        private final Float ieVersion;
-        private final Deque<Boolean> enabled = new ArrayDeque<>();
 
         /**
          * @param baseUrl base url to add possibly missing information to urls found in <code>urls</code>
          * @param urls collection of urls to consider
-         * @param ieVersion version number of IE to emulate
          */
-        public JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls, Float ieVersion) {
+        public JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls) {
             this.urls = urls;
             this.baseUrl = baseUrl;
-            this.ieVersion = ieVersion;
         }
 
         private void extractAttribute(Tag tag, String attributeName) {
@@ -93,9 +85,6 @@ private void extractAttribute(Tag tag, String attributeName) {
          */
         @Override
         public void script(Tag tag, CharSequence body) {
-            if (!enabled.peek()) {
-                return;
-            }
             extractAttribute(tag, ATT_SRC);
         }
 
@@ -106,9 +95,6 @@ public void script(Tag tag, CharSequence body) {
          */
         @Override
         public void tag(Tag tag) {
-            if (!enabled.peek()) {
-                return;
-            }
             TagType tagType = tag.getType();
             switch (tagType) {
             case START:
@@ -184,54 +170,16 @@ public void tag(Tag tag) {
                 break;
             }
         }
-
-        /* (non-Javadoc)
-         * @see jodd.lagarto.EmptyTagVisitor#condComment(java.lang.CharSequence, boolean, boolean, boolean)
-         */
-        @Override
-        public void condComment(CharSequence expression, boolean isStartingTag,
-                boolean isHidden, boolean isHiddenEndTag) {
-            // See http://css-tricks.com/how-to-create-an-ie-only-stylesheet/
-            if(!isStartingTag) {
-                enabled.pop();
-            } else {
-                if (htmlCCommentExpressionMatcher == null) {
-                    htmlCCommentExpressionMatcher = new HtmlCCommentExpressionMatcher();
-                }
-                String expressionString = expression.toString().trim();
-                enabled.push(htmlCCommentExpressionMatcher.match(ieVersion,
-                        expressionString));
-            }
-        }
-
-        /* (non-Javadoc)
-         * @see jodd.lagarto.EmptyTagVisitor#start()
-         */
-        @Override
-        public void start() {
-            super.start();
-            enabled.clear();
-            enabled.push(Boolean.TRUE);
-        }
     }
 
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] html, URL baseUrl,
             URLCollection coll, String encoding) throws HTMLParseException {
         try {
-            Float ieVersion = extractIEVersion(userAgent);
-
             String contents = new String(html,encoding);
             LagartoParser lagartoParser = new LagartoParser(contents.toCharArray());
-            LagartoDomBuilderConfig config = new LagartoDomBuilderConfig();
-            config.setCaseSensitive(false);
-            // Conditional comments only apply for IE < 10
-            config.setEnableConditionalComments(isEnableConditionalComments(ieVersion));
-            if(ieVersion != null) {
-                config.setCondCommentIEVersion(ieVersion);
-            }
-            lagartoParser.setConfig(config);
-            JMeterTagVisitor tagVisitor = new JMeterTagVisitor(new URLPointer(baseUrl), coll, ieVersion);
+            lagartoParser.getConfig().setCaseSensitive(false);
+            JMeterTagVisitor tagVisitor = new JMeterTagVisitor(new URLPointer(baseUrl), coll);
             lagartoParser.parse(tagVisitor);
             return coll.iterator();
         } catch (LagartoException e) {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 9f94e49eb6c..9f61d454c99 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -30,6 +30,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -61,12 +62,6 @@ public class TestHTMLParser extends JMeterTestCase {
 
     private static final String DEFAULT_UA  = "Apache-HttpClient/4.2.6";
     private static final String UA_FF       = "Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0";
-    private static final String UA_IE55     = "Mozilla/4.0 (compatible;MSIE 5.5; Windows 98)";
-    private static final String UA_IE6      = "Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)";
-    private static final String UA_IE7      = "Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)";
-    private static final String UA_IE8      = "Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; "
-            + "GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)";
-    private static final String UA_IE9      = "Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))";
     private static final String UA_IE10     = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)";
 
     private static class StaticTestClass // Can't instantiate
@@ -119,6 +114,10 @@ private TestData(String htmlFileName, String baseUrl, String expectedSet, String
             this.userAgent = userAgent;
         }
 
+        @Override
+        public String toString() {
+            return "TestData [userAgent=" + userAgent + ", htmlFileName=" + fileName + ", expectedList=" + expectedList + "]";
+        }
     }
 
     private static final String DEFAULT_JMETER_PARSER =
@@ -183,26 +182,6 @@ static String[] getParsers() {
                 null,
                 "testfiles/HTMLParserTestCaseWithConditional1_FF.all",
                 UA_FF),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional1.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional1_IE6.all",
-                UA_IE6),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional1.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional1_IE7.all",
-                UA_IE7),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional1.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional1_IE8.all",
-                UA_IE8),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional1.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional1_IE8.all",
-                UA_IE8),
 
         // FF gets mixed up by nested comments
         new TestData("testfiles/HTMLParserTestCaseWithConditional2.html",
@@ -211,41 +190,17 @@ static String[] getParsers() {
                 "testfiles/HTMLParserTestCaseWithConditional2_FF.all",
                 UA_FF),
 
-        new TestData("testfiles/HTMLParserTestCaseWithConditional2.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional2_IE7.all",
-                UA_IE7),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional2.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional2_IE8.all",
-                UA_IE8),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional2.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional2_IE9.all",
-                UA_IE9),
         new TestData("testfiles/HTMLParserTestCaseWithConditional3.html",
                 "http://localhost/mydir/myfile.html",
                 null,
                 "testfiles/HTMLParserTestCaseWithConditional3_FF.all",
                 UA_FF),
+
         new TestData("testfiles/HTMLParserTestCaseWithConditional3.html",
                 "http://localhost/mydir/myfile.html",
                 null,
                 "testfiles/HTMLParserTestCaseWithConditional3_IE10.all",
                 UA_IE10),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional3.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional3_IE55.all",
-                UA_IE55),
-        new TestData("testfiles/HTMLParserTestCaseWithConditional3.html",
-                "http://localhost/mydir/myfile.html",
-                null,
-                "testfiles/HTMLParserTestCaseWithConditional3_IE6.all",
-                UA_IE6)
     };
 
     static Stream<Arguments> parsersAndTestNumbers() {
@@ -255,8 +210,8 @@ static Stream<Arguments> parsersAndTestNumbers() {
     }
 
     static Stream<Arguments> specificParserTests() {
-        return IntStream.range(0, SPECIFIC_PARSER_TESTS.length)
-                        .mapToObj(testNumber -> arguments(DEFAULT_JMETER_PARSER, testNumber));
+        return Arrays.stream(SPECIFIC_PARSER_TESTS)
+                .map(testData -> arguments(DEFAULT_JMETER_PARSER, testData));
     }
 
     // Test if can instantiate parser using property name
@@ -354,13 +309,13 @@ public void testParserList(String parserName, int testNumber) throws Exception {
 
     @ParameterizedTest
     @MethodSource("specificParserTests")
-    public void testSpecificParserList(String parserName, int testNumber) throws Exception {
+    public void testSpecificParserList(String parserName, TestData testData) throws Exception {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
-        filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
-                SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
-                SPECIFIC_PARSER_TESTS[testNumber].expectedList,
+        filetest(p, testData.fileName,
+                testData.baseUrl,
+                testData.expectedList,
                 new ArrayList<>(), true,
-                SPECIFIC_PARSER_TESTS[testNumber].userAgent);
+                testData.userAgent);
     }
 
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f50ac08b508..eea3c92ab07 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -70,6 +70,11 @@ Summary
     <li><issue>6357</issue><pr>6358</pr> Ensure writable directories when copying template files while report generation.</li>
   </ul>
 
+  <h3>HTTP Samplers and Test Script Recorder</h3>
+  <ul>
+    <li><pr>5891</pr>Skip Internet Explorer 6-9 conditional comment processing when fetching resource links</li>
+  </ul>
+
  <!--  =================== Thanks =================== -->
 
 <ch_section>Thanks</ch_section>

From a561eb2f6593e01b2dab5a8fcfe1549e0d522fdb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 16 Oct 2025 22:21:45 +0300
Subject: [PATCH 0866/1037] fix: update expected release jars after jodd bump

---
 src/dist/src/dist/expected_release_jars.csv | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index f2adbb3dd22..ef32d27e8d9 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -82,10 +82,11 @@
 16555,jcl-over-slf4j-1.7.36.jar
 489286,jmespath-core-0.6.0.jar
 7090,jmespath-jackson-0.6.0.jar
-403497,jodd-core-5.0.13.jar
-220475,jodd-lagarto-5.0.13.jar
-19858,jodd-log-5.0.13.jar
-26047,jodd-props-5.0.13.jar
+104067,jodd-core-5.3.0.jar
+226181,jodd-lagarto-6.0.6.jar
+20311,jodd-log-5.1.6.jar
+25989,jodd-props-6.0.2.jar
+337315,jodd-util-6.1.0.jar
 277582,json-path-2.8.0.jar
 122808,json-smart-2.6.0.jar
 473788,jsoup-1.17.1.jar

From b68f8e14624bf99575933ef2e4390b864c92833b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 13 Oct 2025 19:52:53 +0300
Subject: [PATCH 0867/1037] fix: bump Kotlin compiler to 2.2.20, use Kotlin
 2.0.0 API

We target Kotlin 1.9 (released July 2023), so the projects using Kotlin 1.9+
should be able to use JMeter.
---
 build-logic/jvm/build.gradle.kts                 |  4 ++--
 .../main/kotlin/build-logic.kotlin.gradle.kts    | 16 +++++++++-------
 build-logic/root-build/build.gradle.kts          |  2 +-
 gradle.properties                                |  4 ++--
 gradle/verification-metadata.xml                 | 10 ++++++++++
 .../processor/Top5ErrorsSummaryDataTest.kt       |  8 ++++----
 src/dist/src/dist/expected_release_jars.csv      |  2 +-
 .../http/sampler/HTTPSamplerBaseSchema.kt        |  2 +-
 xdocs/changes.xml                                |  1 +
 9 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 92d5e7eb712..85a87cf15eb 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.3")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
-    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.20")
     api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
 }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 01adbad0a65..e554f83a460 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -19,7 +19,9 @@ import com.github.vlsi.gradle.dsl.configureEach
 import com.github.vlsi.gradle.properties.dsl.props
 import org.jetbrains.kotlin.gradle.tasks.BaseKapt
 import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     id("java-library")
@@ -44,18 +46,18 @@ kotlin {
     }
 }
 
-tasks.configureEach<KotlinCompile> {
+tasks.configureEach<KotlinJvmCompile> {
     if (gradle.startParameter.writeDependencyVerifications.isNotEmpty()) {
         enabled = false
     }
-    kotlinOptions {
+    compilerOptions {
         if (!name.startsWith("compileTest")) {
-            apiVersion = "kotlin.api".v
+            apiVersion = KotlinVersion.fromVersion("kotlin.api".v)
         }
-        freeCompilerArgs += "-Xjvm-default=all"
+        freeCompilerArgs.add("-Xjvm-default=all")
         val jdkRelease = buildParameters.targetJavaVersion.toString()
-        freeCompilerArgs += "-Xjdk-release=$jdkRelease"
-        kotlinOptions.jvmTarget = jdkRelease
+        freeCompilerArgs.add("-Xjdk-release=$jdkRelease")
+        jvmTarget = JvmTarget.fromTarget(jdkRelease)
     }
 }
 
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index d0a7975f544..121878e1d90 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -32,5 +32,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
 }
diff --git a/gradle.properties b/gradle.properties
index 22f90ee6b3e..02c6f4759fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,8 +42,8 @@ systemProp.sonar.gradle.skipCompile=true
 jmeter.version=6.0.0
 
 # Plugins
-# Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
-kotlin.api.version=1.5
+# Restrict uses of Kotlin APIs to 1.9 only, so projects that use Kotlin 2.0 can use JMeter
+kotlin.api.version=1.9
 # See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
 kotlin.explicitApi=true
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index da329819310..779887ac7de 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -594,11 +594,21 @@
             <sha256 value="1cb4ecb933c919b2fbfd765efca5fe4907a08712e8c9942c33a208b2b169b18c" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.20">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.20.pom">
+            <sha256 value="4eb87defec3e7c2fece0e1a1ecdf22a70cdd61898262555b1d92e7c7b3f3b95d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="1.9.22">
          <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-1.9.22.pom">
             <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.20">
+         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.20.pom">
+            <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.11.4">
          <artifact name="junit-bom-5.11.4.pom">
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
index f47fb67abe4..3a1ab62553a 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataTest.kt
@@ -52,7 +52,7 @@ class Top5ErrorsSummaryDataTest {
         val input = listOf("A", "B", "C", "D", "E", "F")
         input.forEach { sut.registerError(it) }
         assertArrayEquals(
-            input.take(5).map { arrayOf(it, 1L) }.toTypedArray(),
+            input.take(5).map { arrayOf<Any>(it, 1L) }.toTypedArray(),
             sut.getTop5ErrorsMetrics(),
             "registerErrors $input, then call getTop5ErrorsMetrics"
         )
@@ -64,9 +64,9 @@ class Top5ErrorsSummaryDataTest {
         input.forEach { sut.registerError(it) }
         assertArrayEquals(
             arrayOf(
-                arrayOf("A", 3L),
-                arrayOf("B", 2L),
-                arrayOf("C", 1L)
+                arrayOf<Any>("A", 3L),
+                arrayOf<Any>("B", 2L),
+                arrayOf<Any>("C", 1L)
             ),
             sut.top5ErrorsMetrics,
             "registerErrors $input, then call getTop5ErrorsMetrics"
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ef32d27e8d9..28e2e92e4f6 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -93,7 +93,7 @@
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 32033,kotlin-logging-jvm-2.0.5.jar
-1718956,kotlin-stdlib-1.9.22.jar
+1761444,kotlin-stdlib-2.2.20.jar
 959,kotlin-stdlib-jdk7-1.9.10.jar
 965,kotlin-stdlib-jdk8-1.9.10.jar
 1551152,kotlinx-coroutines-core-jvm-1.7.3.jar
diff --git a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
index 5f2a31790a5..89bb2f58e28 100644
--- a/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
+++ b/src/protocol/http/src/main/kotlin/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseSchema.kt
@@ -79,7 +79,7 @@ public abstract class HTTPSamplerBaseSchema : TestElementSchema() {
     public val path: StringPropertyDescriptor<HTTPSamplerBaseSchema>
         by string("HTTPSampler.path")
 
-    public val proxy: HTTPSamplerProxyParamsSchema<HTTPSamplerBaseSchema> by HTTPSamplerProxyParamsSchema()
+    public val proxy: HTTPSamplerProxyParamsSchema<HTTPSamplerBaseSchema> by HTTPSamplerProxyParamsSchema<HTTPSamplerBaseSchema>()
 
     public val contentEncoding: StringPropertyDescriptor<HTTPSamplerBaseSchema>
         by string("HTTPSampler.contentEncoding", default = StandardCharsets.UTF_8.name())
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index eea3c92ab07..17d8185c337 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -64,6 +64,7 @@ Summary
   <h3>General</h3>
   <ul>
     <li><pr>6220</pr> Require Java 17 or later for running JMeter</li>
+    <li><pr>6550</pr> Require Kotlin 1.9 or later for running JMeter</li>
     <li><pr>6274</pr> Change references to old MySQL driver to new class <code>com.mysql.cj.jdbc.Driver</code></li>
     <li><issue>6352</issue> Calculate delays in Open Model Thread Group and Precise Throughput
         Timer relative to start of Thread Group instead of the start of the test.</li>

From a17fd4250b47dd319bbd6d4829186efe7dd1b986 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 19 Oct 2025 12:19:49 +0300
Subject: [PATCH 0868/1037] chore: add missing pgp keys to Gradle verification
 metadata

---
 gradle/verification-keyring.keys |  44 +++++++++++
 gradle/verification-metadata.xml | 128 ++-----------------------------
 2 files changed, 51 insertions(+), 121 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index b1fcf99bbc4..6a244c4a0c6 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -13,6 +13,25 @@ biA8bm9jLWFkbWluQDEwZ2VuLmNvbT4=
 =0ybl
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    84E913A8E3A748C0
+uid    The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGR/8HUBDADJ+V5VgTXFG4xVI/1r07a/pTXoAQhHyJMkVdFScGARsps07VXI
+IsYgPsifOFU55E7uRMZPTLAx5F1uxoZAWGtXIz0d4ISKhobFquH8jZe7TnsJBJNV
+eo3u7G54iSfLifiJ4q17NvaESBNSirPaAPfEni93+gQvdn3zVnDPfO+mhO00l/fE
+5GnqHt/Q2z2WKVQt3Vg0R66phe2XaFnycY/d+an73FiXqhuhm4sXlcA++gfSt1H1
+K7+ApqJsX9yw79A1FlGTPOeimqZqE75+OyQ9Kz0XTvN/GmHeEygTrNEnMDTr1BWz
+P0/ut0UXmktJtJXgLi5wUCncwwi+UpCSwwou7/3r+eBh5aykxSo9OtYe4xPNKWSo
+EiPZXpCH5Wjq9TpXOuhnZvRFqbR24mWz5+J/DoaVP3pwEhGXxr5VjVc1f8gJ8A34
+YYPlxUGcl8f3kykzvl4X5HDIbHb9MAl+9qtwQo1tFA9umD2Da/8bSsxrnZdkkzEA
+OpJYwT1EkQRZRcUAEQEAAbRmVGhlIExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3Rs
+ZSBJbmMuIChNYXZlbiBSZXBvc2l0b3J5IEFydGlmYWN0IFNpZ25lcikgPGJjbWF2
+ZW5zeW5jQGJvdW5jeWNhc3RsZS5vcmc+
+=/HDf
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    85911F425EC61B51
 uid    Marc Philipp <marc@junit.org>
 
@@ -4324,6 +4343,31 @@ q5Ru/lMoBMcJjV1n4nZ13dj2e+rYMN06ued0zR5NwVopLZ4MVUSqb/8=
 =QMxW
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    17A27CE7A60FF5F0
+sub    E86F52398AF20855
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF/AfL8BCADpdkr7+1epRZLZJ6/si+Aj6fmELbzWHZmSSUYmRszcCgPq78xy
+bsW/d0grOOEEn9I/5N22gOoEumcFAsN6hn1thjsZyXLmaBfRj+8vri/zigAqrE7W
+zk7mKKK3IUuEi1rDqoEwGQbzHFP9UxiIouiWbYGhbkER0E8zDwmPlWZDXoQEzqWT
+KcgxAXldiZ6l0FACtxgU3n9oOq0hNQBqfpn22BM2FPjZDrM4rEfbeSt8ztORIviw
+7G9oUtYsbTbDvvADCL0wW05GcNz6BvcmDm79d+fk+5gb+GIaHurWuyTtmw5HCeXW
+QcKN1S96Wfm5Dz6UMOMeXujlvK1rxmsIIl3BABEBAAG5AQ0EX8B8vwEIAOkm8U7a
+QLAJ0FtUuY6ru+JQM3yHhIBA7dADpoyq+f/WN86Es9vw7gavO6tnJPnYh1IozEmQ
+4/OaXfKir2G8geLR6hvCsclgXT+RUS9Z60XBFWWhYwX8OrkdfHNnZPeSM8pwiQbh
+L8QGfF5AiJzG34ecIPekBWL0l0nYtVblAHQ5oKCv0h2e/cPylyBgJUGCtF0pLKuY
+l/jeH44UPz6ZUfTL662zbz7AGn8yX62h5PXyH2ZVuuwA2+vuAZCeTP+cQ7OGlIj/
+EDmggsSrcjVa/G/v+O9lPw9SGnnjoEzX+Ng+tEJNUEx22gvAISajFfM+XWVxVEqs
+z0B4U6PLa2feuVsAEQEAAYkBNgQYAQgAIBYhBD8F3anzFzAeknE21BeifOemD/Xw
+BQJfwHy/AhsMAAoJEBeifOemD/XwJ3cH/27Z8H7Bx53msUwaNO0RbWJNz65xrecM
+w5dvRVjjERYm+5UA5oQdySozlgrpWCAx8q13OMVpGRhodebFEqDZDHsjvJgm10Q7
+Q9fHkP56lCgxt68WPwmof8bkTYC8l9PmPfqdJgQlyX0zqOzxjETCfe+f1gc/m1lx
+tgnUeD3/ktyTkYu1hTt8rWM1ceCnZ08bIcjwjFZJDHZl+BmQ52zxUHJ5JAExZNn3
+vWkvn9JHGWPh6M7evaCcNAdv20A9AB45/aZlYRUN8hCI6xpHiMt4/tDbiImzko74
+zzMvjuz0NEEhREM8f0ld3G/7Meh/OudSEgtQAmwJ0UMZWJWaZ0FhnLI=
+=5I6i
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    1861C322C56014B2
 uid    Niall Pemberton (Code signing) <niallp@apache.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 779887ac7de..62231390615 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4,6 +4,11 @@
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
       <keyring-format>armored</keyring-format>
+      <key-servers>
+         <key-server uri="https://keyserver.ubuntu.com"/>
+         <key-server uri="https://keys.openpgp.org"/>
+         <key-server uri="https://pgp.mit.edu"/>
+      </key-servers>
       <trusted-artifacts>
          <trust group="gradle" name="gradle"/>
          <trust file=".*-javadoc[.]jar" regex="true"/>
@@ -79,6 +84,7 @@
          <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons"/>
          <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
          <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava"/>
+         <trusted-key id="3F05DDA9F317301E927136D417A27CE7A60FF5F0" group="io.opentelemetry"/>
          <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections"/>
          <trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18" group="net.javacrumbs.json-unit"/>
          <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons"/>
@@ -137,6 +143,7 @@
          <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop"/>
          <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
+         <trusted-key id="7B121B76A7ED6CE6E60AD51784E913A8E3A748C0" group="org.bouncycastle"/>
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
          <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
@@ -387,14 +394,6 @@
             <sha256 value="943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="me.champeau.jmh" name="jmh-gradle-plugin" version="0.7.2">
-         <artifact name="jmh-gradle-plugin-0.7.2.jar">
-            <sha256 value="d9672099ff8fc3f9bf3d4d015864e1586f07ecbd2a8a177a66184ef0b68aba65" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="jmh-gradle-plugin-0.7.2.module">
-            <sha256 value="6d849ae7454ab391718e5fc70e2716418ef3ed264472345bd80c6de64e00b6c4" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="me.champeau.jmh" name="jmh-gradle-plugin" version="0.7.3">
          <artifact name="jmh-gradle-plugin-0.7.3.jar">
             <sha256 value="d7097e619541d90e0a970b2a68573e22ad01d2999ee5365d56d59830765bf98f" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -403,11 +402,6 @@
             <sha256 value="3487d1aba24fe0af527c6d5f78b5f0e8fd64fe9878708b460e6600e39a47bc43" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.2">
-         <artifact name="me.champeau.jmh.gradle.plugin-0.7.2.pom">
-            <sha256 value="57e0c23ac60945aefb5a0c4a9339bea68a295364ca47c7a9079a032f79013abb" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.3">
          <artifact name="me.champeau.jmh.gradle.plugin-0.7.3.pom">
             <sha256 value="d516226b3b114e4b32d42544d1d2796c732c5465d5dae7cc846be6b23bed8d1d" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -450,56 +444,6 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="org.apache" name="apache" version="18">
-         <artifact name="apache-18.pom">
-            <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="25">
-         <artifact name="apache-25.pom">
-            <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="29">
-         <artifact name="apache-29.pom">
-            <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="30">
-         <artifact name="apache-30.pom">
-            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="33">
-         <artifact name="apache-33.pom">
-            <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="35">
-         <artifact name="apache-35.pom">
-            <sha256 value="ea297dcd114136e8b8e8b630230d52a76c2fc69f6c5db25d672b1857000728b8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="58">
-         <artifact name="commons-parent-58.pom">
-            <sha256 value="2d4b12e18899063abd7c75278b5fa97a3729d80878ceecb6a40d946e9c0d5590" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="79">
-         <artifact name="commons-parent-79.pom">
-            <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="81">
-         <artifact name="commons-parent-81.pom">
-            <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="85">
-         <artifact name="commons-parent-85.pom">
-            <sha256 value="d189ff2c0027e96bb65d31e6f227ed2af966169b36af1e973dd5ba08926dc7b5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -521,11 +465,6 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
-         <artifact name="jetty-bom-9.4.53.v20231009.pom">
-            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -566,19 +505,6 @@
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.9.10">
-         <artifact name="dokka-gradle-plugin-1.9.10.pom">
-            <ignored-keys>
-               <ignored-key id="98465301A4939C0279F2E847D89D05374952262B" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="2.0.0">
-         <artifact name="org.jetbrains.dokka.gradle.plugin-2.0.0.pom">
-            <sha256 value="e1fc686a01837e7e86291185901507ffeaf794b8a9ec947b5d04368fa70e00ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
          <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
             <sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -589,46 +515,16 @@
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.9.22">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.9.22.pom">
-            <sha256 value="1cb4ecb933c919b2fbfd765efca5fe4907a08712e8c9942c33a208b2b169b18c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.20">
          <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.20.pom">
             <sha256 value="4eb87defec3e7c2fece0e1a1ecdf22a70cdd61898262555b1d92e7c7b3f3b95d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="1.9.22">
-         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-1.9.22.pom">
-            <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.20">
          <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.20.pom">
             <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.junit" name="junit-bom" version="5.11.4">
-         <artifact name="junit-bom-5.11.4.pom">
-            <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.13.1">
-         <artifact name="junit-bom-5.13.1.pom">
-            <sha256 value="fa68451ea830572ed43ffe51d75b6a05f7a5e665a602a51f49d6be02063a65f3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.13.4">
-         <artifact name="junit-bom-5.13.4.pom">
-            <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.9.3">
-         <artifact name="junit-bom-5.9.3.pom">
-            <sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -642,11 +538,6 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.ow2" name="ow2" version="1.5">
-         <artifact name="ow2-1.5.pom">
-            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
          <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -670,11 +561,6 @@
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="9">
-         <artifact name="oss-parent-9.pom">
-            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="oro" name="oro" version="2.0.8">
          <artifact name="oro-2.0.8.jar">
             <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 0ac2d661a69295293f05d81657900d8b623b6256 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Oct 2025 21:29:40 +0300
Subject: [PATCH 0869/1037] test: fix :src:dist-check:test failures

gui.action.TestLoad test was not initializing JMeter home properly, so
subsequent saveservice tests failed
---
 .../src/test/java/org/apache/jmeter/gui/action/TestLoad.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
index 40387d5e4d0..63b6018ee47 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jorphan.collections.HashTree;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -37,7 +38,7 @@
  *
  * Test JMX files to check that they can be loaded OK.
  */
-public class TestLoad  {
+public class TestLoad extends JMeterTestCase {
 
     private static final String basedir = new File(System.getProperty("user.dir")).getParentFile().getParent();
     private static final File testfiledir = new File(basedir,"bin/testfiles");

From 599f6c3ce5cb4993e691f96099c13ffec33c121f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 24 Oct 2025 22:54:46 +0300
Subject: [PATCH 0870/1037] chore: skip "localhost is bound" check for public
 IPs

Apache buildbox fails as follows:

    org.opentest4j.AssertionFailedError: localHost: 3.234.254.195 is bound to an interface ==> expected: <true> but was: <false>
        at app//org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
        at app//org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
        at app//org.junit.jupiter.api.AssertTrue.failNotTrue(AssertTrue.java:63)
        at app//org.junit.jupiter.api.AssertTrue.assertTrue(AssertTrue.java:42)
        at app//org.junit.jupiter.api.Assertions.assertTrue(Assertions.java:191)
        at app//org.apache.jmeter.engine.LocalHostTest.testInterfaces(LocalHostTest.java:56)

    java.rmi.server.hostname=null
    bb-worker1-ec2-va/3.234.254.195
    isSiteLocalAddress:false
    isAnyLocalAddress:false
    isLinkLocalAddress:false
    isLoopbackAddress:false
    isMulticastAddress:false
    localhost/127.0.0.1
    isSiteLocalAddress:false
    isAnyLocalAddress:false
    isLinkLocalAddress:false
    isLoopbackAddress:true
    isMulticastAddress:false
    ====================
    bb-worker1-ec2-va/3.234.254.195
    isSiteLocalAddress:false
    isAnyLocalAddress:false
    isLinkLocalAddress:false
    isLoopbackAddress:false
    isMulticastAddress:false
---
 .../test/java/org/apache/jmeter/engine/LocalHostTest.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
index 9d27c75d25b..956727f7651 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
@@ -47,6 +47,13 @@ public void testInterfaces() throws Exception {
         String externInterface = guessExternalIPv4Interface();
         perr("Choose " + externInterface + " to talk to external services");
         String localHost = getLocalHost().getHostAddress();
+        InetAddress lh = InetAddress.getByName(localHost);
+        if (!lh.isSiteLocalAddress() && !lh.isLoopbackAddress()) {
+            // CI/container/cloud setups might resolve to a public/NAT or external DNS,
+            // so we should not check for localHost binding in that case
+            perr("Skipping localHost binding check for non-site-local address: " + localHost);
+            return;
+        }
         boolean localHostIsBound = Collections
                 .list(NetworkInterface.getNetworkInterfaces()).stream()
                 .flatMap(iface -> iface.getInterfaceAddresses().stream())

From 5df1cd0017c80af2580fa93f46205dfc7f586425 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 25 Oct 2025 20:57:10 +0300
Subject: [PATCH 0871/1037] chore: use 127.0.0.1 or ::1 for client-server tests

InetAddress.getLocalHost().canonicalHostName might resolve to a public NAT
DNS name, and there will be no way to bind a server port for it.

Here's an example how the bind fails in Apache Jenkins EC2 instance:

[server] Server failed to start: java.rmi.server.ExportException: Listen failed on port: 0; nested exception is:
[server] 	java.io.IOException: Could not bind to bb-worker1-ec2-va.apache.org/3.234.254.195 using port 0

The workaround is to avoid InetAddress.getLocalHost() altogether,
so we use 127.0.0.1 when IPv4 is available or ::1 otherwise.
---
 .../jmeter/buildtools/batchtest/BatchTest.kt  | 46 +++++++++++++++++--
 .../buildtools/batchtest/BatchTestServer.kt   | 28 +++++------
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index cf19f446124..45291f1eb75 100644
--- a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -32,9 +32,12 @@ import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.JavaExec
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.kotlin.dsl.property
 import java.io.File
 import java.net.InetAddress
+import java.net.ServerSocket
 import javax.inject.Inject
 
 open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
@@ -107,13 +110,23 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
         get() = project.rootProject.layout.projectDirectory.dir("lib").asFileTree
 
     @get:InputFile
+    @get:PathSensitive(PathSensitivity.NONE)
     val jmeterJar
         get() = project.rootProject.layout.projectDirectory.dir("bin").file("ApacheJMeter.jar")
 
+    @Internal
+    val serverWorkingDir = objects.directoryProperty()
+        .convention(project.rootProject.layout.projectDirectory.dir("bin"))
+
+    @InputFile
+    @PathSensitive(PathSensitivity.NONE)
+    val jmeterProperties = objects.fileProperty()
+        .convention(serverWorkingDir.file("jmeter.properties"))
+
     init {
         group = BATCH_TESTS_GROUP_NAME
         description = "Runs jmx file via process fork and verifies outputs"
-        workingDir = File(project.rootDir, "bin")
+        workingDir = serverWorkingDir.get().asFile
         mainClass.set("org.apache.jmeter.NewDriver")
         classpath(jmeterJar)
 
@@ -121,10 +134,37 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
         // It enables to override the properties later (e.g. in the build script)
         maxHeapSize = "128m"
         jvmArgs("-Xss256k", "-XX:MaxMetaspaceSize=128m")
-        systemProperty("java.rmi.server.hostname", InetAddress.getLocalHost().canonicalHostName)
+        systemProperty("java.rmi.server.hostname", getServerHost())
         systemProperty("java.awt.headless", "true")
     }
 
+    @Internal
+    protected fun getServerHost(): String {
+        // If JVM has IPv4 enabled, 127.0.0.1 will work; otherwise fall back to ::1
+        return try {
+            // Will throw if IPv4 is completely disabled in the JVM/OS
+            InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))
+            "127.0.0.1"
+        } catch (_: Exception) {
+            "::1"
+        }
+    }
+
+    protected fun getFreePort(retries: Int = 10): Int {
+        repeat(retries - 1) {
+            try {
+                ServerSocket(0).use {
+                    return it.localPort
+                }
+            } catch (_: Exception) {
+                Thread.sleep(25)
+            }
+        }
+        ServerSocket(0).use {
+            return it.localPort
+        }
+    }
+
     fun jmeterArgument(name: String, value: String) {
         args("-J$name=$value")
     }
@@ -162,7 +202,7 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
         systemProperty("user.language", userLanguage.get())
         systemProperty("user.region", userRegion.get())
         systemProperty("user.country", userCountry.get())
-        args("-pjmeter.properties")
+        args("-p${jmeterProperties.get().asFile.name}")
         args("-q", batchProperties.get())
         args("-n")
         args("-t", jmx.get())
diff --git a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
index b48369d62ca..096867d4dba 100644
--- a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
+++ b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
@@ -25,11 +25,9 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.property
+import org.gradle.process.ExecOperations
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
-import java.io.File
 import java.net.ConnectException
-import java.net.InetAddress
-import java.net.ServerSocket
 import java.net.Socket
 import java.time.Duration
 import java.util.concurrent.Executors
@@ -37,7 +35,7 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 import javax.inject.Inject
 
-open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTest(objects) {
+abstract class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTest(objects) {
     private val executor =
         Executors.newFixedThreadPool(project.gradle.startParameter.maxWorkerCount)
 
@@ -53,22 +51,20 @@ open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTe
     val startupTimeout = objects.property<Duration>()
         .convention(Duration.ofSeconds(15))
 
+    @get:Inject
+    abstract val execOperations: ExecOperations
+
     private fun deleteWorkfiles() {
         project.delete(serverLogFile)
     }
 
-    private fun getFreePort(): Int =
-        ServerSocket(0).use {
-            return it.localPort
-        }
-
     private fun waitForPort(host: String, port: Int, timeout: Duration): Boolean {
-        val deadline = System.nanoTime() + timeout.toNanos()
-        while (System.nanoTime() < deadline) {
+        val start = System.nanoTime()
+        while (System.nanoTime() - start <  timeout.toNanos()) {
             try {
                 Socket(host, port).close()
                 return true
-            } catch (e: ConnectException) {
+            } catch (_: ConnectException) {
                 /* ignore */
                 Thread.sleep(50)
             }
@@ -86,7 +82,7 @@ open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTe
 
         val client = this
         val serverPort = getFreePort()
-        val serverHost = InetAddress.getLocalHost().canonicalHostName
+        val serverHost = getServerHost()
         args("-R$serverHost:$serverPort")
         val jacoco = extensions.findByType<JacocoTaskExtension>()
         // The extension might not exist, so don't fail if so
@@ -106,8 +102,8 @@ open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTe
             jvmarg
         }
         val server = executor.submit {
-            project.javaexec {
-                workingDir = File(project.rootDir, "bin")
+            execOperations.javaexec {
+                workingDir = serverWorkingDir.get().asFile
                 mainClass.set("org.apache.jmeter.NewDriver")
                 classpath(client.classpath)
                 standardOutput = System.out.writer().withPrefix("[server] ")
@@ -124,7 +120,7 @@ open class BatchTestServer @Inject constructor(objects: ObjectFactory) : BatchTe
                 systemProperty("user.region", userRegion.get())
                 systemProperty("user.country", userCountry.get())
 
-                args("-pjmeter.properties")
+                args("-p${jmeterProperties.get().asFile.name}")
                 args("-q", batchProperties.get())
                 args("-i", log4jXml.get())
                 args("-j", serverLogFile.get())

From 873560160bd781b97ea59b766c5efdba051cde5d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 24 Mar 2025 06:33:17 +0000
Subject: [PATCH 0872/1037] fix(deps): update wiremock to 3.13.1

---
 gradle/verification-keyring.keys              | 276 ++++++++++++++++++
 gradle/verification-metadata.xml              |  37 ++-
 src/bom-testing/build.gradle.kts              |   2 +-
 src/bom-thirdparty/build.gradle.kts           |   2 +-
 .../influxdb/HttpMetricsSenderTest.java       |   3 +-
 src/dist/src/dist/expected_release_jars.csv   |   6 +-
 src/protocol/http/build.gradle.kts            |   2 +-
 .../sampler/ParallelResourcesAndIpSource.java |  14 +-
 src/testkit-wiremock/build.gradle.kts         |   2 +-
 .../jmeter/wiremock/RequestCountDown.java     |  14 +-
 10 files changed, 325 insertions(+), 33 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 6a244c4a0c6..eb0d2dc9f00 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -582,6 +582,21 @@ X5YMgwSL9/YSSjMR2mQTEdyWCrEf9V16o1+9cceijPsDp0NNKG8hoieZhC+WqPHJ
 =ovHb
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    9266326161C26F29
+uid    Lukas Krecan <lukas@krecan.net>
+
+sub    315AC4FAFFE2E4C0
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZcE89BYJKwYBBAHaRw8BAQdA7Ni9rQFR9Uw6LaJRNfxMfrAKM/DHwZF5WtGM
+SFy4gdG0H0x1a2FzIEtyZWNhbiA8bHVrYXNAa3JlY2FuLm5ldD64OARlwTz0Egor
+BgEEAZdVAQUBAQdAEdB/seuPDCQkURZTgPLfmuuyCwl+iHXMD4xaE+WvrhwDAQgH
+iH4EGBYKACYWIQTu1iAgOISbR/7q0eySZjJhYcJvKQUCZcE89AIbDAUJBaOagAAK
+CRCSZjJhYcJvKZVQAQCxnUXOtUZkdAbLnw4S8GOZ+8u7S4nv5oyiMM4SlU7W/QEA
+rOVOI2fhj6BHyTEUdDX/G56L/D2nMpzzcjG8mCJItw8=
+=KHEO
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    928FBF39003C0425
 uid    Spring Builds (JAR Signing) <spring-builds@vmware.com>
 
@@ -974,6 +989,21 @@ z74Y+1/XQhaVY3fqNg==
 =SM1h
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    9E31AB27445478DB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGLFUBsBDADA5+ZXKX+8DOgWuJqgfU894pplb/jDl3gxDfieWCOf8l+Ii1/Z
+BYqyiy/JWp5mI5Y+nnLafBSvqv5Voqu5m7E88rmsbRYL06Nuss46I/QV0v8Glsx/
+0NekPjuS6kJVWMYeYT5vZ4u44+T+TR3BEKzlQfLaFxIM2DOCzi0/vzrdPLvjGO32
+COu98t4wBcF8nQdgQicfa85PShzT6uOLTRhG2pGDDMlTe8sLJ1+TbDHClHtdM1C9
+YAMV6U/9UjU03HWvbzcJoefl4IZkg1AkVLCvCQx9rvraKJXq7s7IUjHKkj+7cheh
+55VAeO68r4XlLVPTZCeTsmLvJlJKVpYw/VEyeT5yD0cSoZztD8wzbs3O+ZjzG7Z/
+DIiwAty/ixdwYDOnDdP2AagUIutzi5iIKaWVMkgelADa4AyyEfmzZa//JKrnYVoU
+RRGi9WkUJYQwQxCvDq7x4wz6uG6M+01Rk5UNrAwrWVPA2QDluLJ4/87oZFpWs3vL
+UkHwJryFEsC5fvUAEQEAAQ==
+=LKcH
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    9EB80E92EB2135B1
 uid    Slawomir Jaranowski <s.jaranowski@gmail.com>
 
@@ -1518,6 +1548,36 @@ vvzB6IAo6+u3AQDURXWfVKKr73oZFosnOt63VHnW6BV9mMqjj3wenu9FlQ==
 =Kqmv
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    AFBD3AF8EAFA72DA
+uid    Stefan Bodewig <bodewig@apache.org>
+
+sub    7280CDF0944021EB
+sub    23738DFD7C40DE43
+sub    5CF0293EA49D19DD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZ3LX/xYJKwYBBAHaRw8BAQdAIdAjqLeHEeaXXtvamSE2M95tcMTIgPQuvvSz
+BqTnpEK0I1N0ZWZhbiBCb2Rld2lnIDxib2Rld2lnQGFwYWNoZS5vcmc+uDMEZ3LZ
+kRYJKwYBBAHaRw8BAQdAZeHA/xPzLbmHCIYqrguQWSGZcQowJLnVVi3qLeTg9C2I
+9QQYFgoAJhYhBLwmxTr1Mfi0s/WTCq+9Ovjq+nLaBQJnctmRAhsCBQkFo5qAAIEJ
+EK+9Ovjq+nLadiAEGRYKAB0WIQQAV2cH1DOdzYiPrAJygM3wlEAh6wUCZ3LZkQAK
+CRBygM3wlEAh6zTLAP9Jnxxgj6f2+NCzDjVZY1OOIMMJK36hdmIzvVwqu8cLGgEA
+luqqLtzs+O2G6xe/RgYiA0wsmYiYQ62Mi0ubAnc/LQommAEA/kr7WBndUSqCPs8Z
+5x0eERdbKUaQM/43GyLQTm19uXABAOTV9fQrmC0EJt99zTtEJOmHQqseeuSbI1+/
+hXBi2+wIuDMEZ3LZexYJKwYBBAHaRw8BAQdAnjgzX41KUvzRR1ht18HWrpmDiSEE
+FuP8nY9Nb7Xo366I9QQYFgoAJhYhBLwmxTr1Mfi0s/WTCq+9Ovjq+nLaBQJnctl7
+AhsCBQkFo5qAAIEJEK+9Ovjq+nLadiAEGRYKAB0WIQRqkxYesZkOg0bnuisjc439
+fEDeQwUCZ3LZewAKCRAjc439fEDeQzmdAQDaMrecftNbQuzrvhomns/ZBpfn4B4d
+Br0RknZA+l0bowD+ORGuCSyemOZarGba7iIOd7cGjLnGNeVPQ7ymnmSRnwjKyQD/
+TUGY+dJrA0b39CPfXOwKxtkwTpifTR/+RF+rFMqpGUUBAN5FO/6OrOpOaNaBS0jj
+ZbvDfSERKlfE+P47d6zm3QgPuDgEZ3LX/xIKKwYBBAGXVQEFAQEHQGzQJC2D3B64
+mOg20hAlCftcfA9HQa005px3upnGYRkpAwEIB4h+BBgWCgAmFiEEvCbFOvUx+LSz
+9ZMKr706+Or6ctoFAmdy1/8CGwwFCQWjmoAACgkQr706+Or6ctpB4wEAykj/I0p8
+J3ydtrFDLoPLopH0hYFjMppfl/q7+Gq3wVQA+wT46QO4EimDLt69hB0+MlKRvBXd
+ykWk1Wysqwq51xwM
+=JFPz
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    B0F3710FA64900E7
 sub    7892707E9657EBD4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -1639,6 +1699,42 @@ BQJKMGw7AhsMAAoJELNB3bAg/Larfc0AnAmQbEg9XnLr/t0iUS7+V7FcL5KpAJ9k
 =DGI6
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    B460E7C4ED66826D
+uid    ethlo <maven@ethlo.com>
+
+sub    CF1DA7EADAD9F49D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF6GGxUBDAC3c0QZ72oaErIkaF/xEzAId982m5FgtV3DpZAANZyPRK9csDci
+49QPkqpLM/QCmxGYn1ckZJQmXsGjrNuCFKDCEsKwFa4h0IsoHn2OlqCBNq3MxeFm
+sGtYAqZ1d/pChyKZIi2yk1UMHEufm78jSgLS/WX0DRe3xNn6j1/lVguulwHnM6GM
+HbSahVIlt6Eeh25VKpSJ0ACC3zFopeIwX91nmXmDwslU4HbQZvZ3TC2murj7x5Fs
+K7rU0lOHor0L4Y7lAjosKqUFMHKzreSEhvgGDSg8KpVdQXprd6vsWo+2Ys9+aA9J
+tbfO94px4B6dH0pwCFlw3YveAhxQV9ZGpch4dhb+38Ffm4o9eCyqYn4K4ZUWYyOU
+YzGemfADmX0DLFTo3OcLkwfCOQppGaL6x7Ym8VWXv31zH9esmsXizmlGK81964oo
+pT2HlpL9XIAFHd2Efh29soVsXSOfmHenGSpcpV6fmH7HjfInVl2aQsXzvcKNeOFV
+qrismNf06p18BAEAEQEAAbQXZXRobG8gPG1hdmVuQGV0aGxvLmNvbT65AY0EXoYb
+FQEMANanagx2CO3gBzIEHHhnwJj+jRQ7Sir9QrYMeeMMPkbWZ+mmUsjYopL90WXF
+VNj2kRA4cci10JIurUm7FtLUQ98szeMgmrdjbw44A1Mligyvhfgk2vgrhG5SOG4S
+OedQEnEeHKjQsM9cRfc30Fdl01eLWIJJdagywb/mpKhMItbUuu1DAww+bdbt2CWX
+rurCJu1L9Wr9/a/ws8Ydfk/mM2vRtbB8qGu6MQiCXJ/qk1dVAn2TutopT9ERTHVq
+j2rslpSzETUIy0Js+V7jygZVp8RPQciqtiHNt61YiV8K3kVh06wbYwACiF6HE+pQ
+m5fG7n5dMUXMN3ov+B3RUtCDIC1LVyg8jfT90gklF4hDSm7rmKGDoU1O9JOBrunX
+xzC+eYPxiKd0UUEGqBfn7PhB9tQT2IsvDxP59yF7oY6pnQszyv/SW0c5PlILbYWz
+63f0sb4q3RACKv+F55j4ZGbeNEdUYJk7eAP8Lv8c3uGgxJ+qtcsdcqAbHzSXwonz
+H3QlGwARAQABiQG8BBgBCgAmFiEEsoaEbDQbty0eX4XKtGDnxO1mgm0FAl6GGxUC
+GwwFCQPCZwAACgkQtGDnxO1mgm3mCAv/b8RjgGsVU4hFPqAsrCoOueiQgiJhrbq5
+gwVyCsB4TQTYwgd1I6EJKu7TxmoYtosjisxqoGq059UfNSO6vOX+8osMzfLBZYmH
+1qrTmsKCAz7aInRs3b5oZzg2jQP0AU1IVPxbfmqPtZBRh9pV4Q9whkbM3RYQX/4G
+T72kZWI0+SyhUyZ03LZAphh5iFo2eDnzYa6YSC5M/zyzJ8i3Rg8GoIuYYrC/eFVp
+Axl7QzlsuXamCWVp+bxUK9uzr2K2dZYnm/fqPv5foLjdsKoziOCVJIjtNk+CTLNe
+VnI0pCmL/oDCql5q70GRQiA1WWC/geCy+aSD2kNPiDtAoLiQgAWLR7V1/5llDQ26
+l94OGXKc0+w/qMZano87wau3p5ct2cAGf9N4BFHITEo/AgkhngOB3W/njg8sO9B/
+uEGefNSYlEWXseq+ucvUlrtStV0lKYVBKAgFibb0Wk8ayfSvIfDI/9Kd610n/IOI
+cZYUskQLV+tetMac6Lb3AOJ7HzGV3DSn
+=6FIP
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    B7C3B43D18EAA8B7
 uid    Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <kama@soebes.de>
 
@@ -3340,6 +3436,21 @@ IQkQ9C6H+WZQFckWIQTzGEvNVfTQFuMNTJv0Lof5ZlAVyX7PAJ9ztvyEP04cy6zP
 =dtK1
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    F5C81DE10A0B8ECC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGY/odABDADzlZ1BXT0zN3rL+z4HP8r/2xM6zN950fwRimBTOiT6uE8aQSxq
+283R/gIgM+yQBGjStLP3k/TsFJ2FCz7sug+7s1RP70ymkshalTRg+9QHBr2MU1Cx
+Xoh3fiH8BLOb3FIxH1wdAtOOoNxbz64Ftcptu3L0I1y2qEwOGNOyvqbntdCuwNbX
+/zwZUyb3tOVVrrZ5bp+6jMoBKEEWS7effqhGqXLlO4yTMBXR4pwzhch2IGCe+4M3
+a5C2SIJbR70PMk6aJ2+no2LycYRYJx/t2umAbxuCtwT6t/xh8v5ekbXAu5G3h5y+
+T2bF8rjMhVe6DBgJ08uFge3Oom5a5uZx8sQASdLCng8nKjGO4Q8jWmsEj+OiHnnX
+g0oKkirnWbAVrWysgNKAXfwGfDBG95K1F67kVhNjXTx0MDcxpsT9TPxz/nDuzRpQ
+ey5M11+Bl/fEM5UuzRpPgPd//bU+L3FgEUguB4kzsiYlhsUQRyCq1x868AchLWey
+vaVIq2DY101GIP0AEQEAAQ==
+=YHos
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    F6BC09712C8DF6EC
 uid    Uriel Chemouni (dev) <uchemouni@gmail.com>
 
@@ -4194,6 +4305,61 @@ YauuFdKHKzn72X+iAJQgiVtlHt5xxm8DnCt8RGdK9ohuBCmE4xkiXw==
 =Kajw
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    10C01C5A2F6059E7
+uid    Mark E D Thomas <markt@apache.org>
+
+sub    A05557215E763BEC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=MTrZ
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    1241BC872C5E4EC0
 uid    Henri Yandell (For signing ASF releases) <bayard@apache.org>
 
@@ -5493,6 +5659,34 @@ E/XhP4QkRJrZI1F/
 =Jm2n
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    37B0A85F5CE89B0C
+uid    Jan Bartel <janb@webtide.com>
+
+sub    F4C2E0BAE735043B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF13JbQBCAC5jCFhdOUjOjKXayzbVXWZ+wY/htARuLE8wgcVu5xBl996esmb
+a+d4/hB167TjbdPzrT5nBI+QpgaSsGrBQQhnImLnhDQJOww1pbclF/DpZkDry2JH
+4kmuKwkNlaXsYqIv4aE+SdP084ZfjBVdgS/nHkzc/VwVhSUr2pV0dwD3oSRBdIo1
+KgNMHwRoUOJ4B4jxFINap+m1DNdal9M/4aGkJwE4hv1pt/A0coL/Y3Y2c/xyNzz8
+eRMPSnLELjIKmNikcd/Ts+lsVy+YETkUIce+YF3t93Y+PBuoxiSkYW+EF8ctskWK
+Mta5WTwatuLfgc3GVkSnPs9NWyufAba+fjz3ABEBAAG0HUphbiBCYXJ0ZWwgPGph
+bmJAd2VidGlkZS5jb20+uQENBF13JbQBCACqdEUpA0xJfi4HAeJBwZSb0SS+jbZP
+gRayP8TQlfK6i7UZjwR2/W0QCKUTlO3dJ23bNYRnOD7MobQspM/hDmQbGCTEYs0O
+Dj2Om6o4AZmOn6MW8QDE7VkW1rx/zEM23YYSS8o2Js/jAU0+B3fxtNUW1aXNek2/
+dXLxbRb9kbKU2fvx7FPlQGDzjDdvxr45xvlwaibI129L8VmqqFY0JuaQOSspvGy5
+ahVfAisyTHdL1XQ7BZhjh5pmxpxezWioRLZO+YcDW93BVDcdMJigY+wC4W7tXzs4
+qOuVSUxamk7XIhYD2K5eztJuUVW/8T1qDlTy4QN4OGFtUQ26RPAGZkfDABEBAAGJ
+ATYEGAEKACAWIQQaLWCL9tN67xLVOk83sKhfXOibDAUCXXcltAIbDAAKCRA3sKhf
+XOibDJ9xB/9tNrIKnuS3s5ofLFVqufg9xw8/lOgtTiasKbMwbDyfTW/4Itg6lcrx
+8oUAVV1LPeo+Fx4tpnS/oaDd0nv2DdIITmSq29yxYyCocCcfTLm0V3eKRliOYTj5
+VBER8gh7pOJqO1aSlM6b0NpcJuoW7VniokugdJJlIemZgYrnSlztjKaVbfJPKIUC
+D8dLC32i0B5MEwtpjWSMh37EcC9r5l9am6rfd/Y4bEHEF7Dx/CBL3US55MQ1Vejs
+wE0zZV3fOXs1SJRPs0AqwMoUMaKcypgtXhyKJp6YxxuRPvBEVB0Ofz4SKxxjmMBt
+7KLHmod19SouonvoOPMekaoIHsnJ6SeJ
+=vFzc
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    38F47D3E410C47B1
 uid    Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
 
@@ -5646,6 +5840,31 @@ LBaslDFjyxMECWr3v7TuEmEmNcD+KwNyACFNuBjEBWeuJZYwCkAkVy8AyitrTMh8
 =ec6I
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    3EFC46EE83C40224
+sub    2401EE009B11575B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFfJfakBCACebHYGckuH6xTvSWARlY1P/PJ+qSsJ/oFOrcG219GERXXO5s3+
+HId4Qm76C4dWKlAJN8P3sXYAlmHrC452dbwiRUUqd0fuoSR7viLyuMvSpcNIzJdh
+CvCVJYdk1hH39/VXAEWN9P2WSinUIj4tdO+UfjaL3oeInPtrR7F0yvKFVTkBQSze
+jOxbPhTcL17g/ihbuXqMCtm/yjlRR3B2w+cZcEvdRoQHYBoHGw3Gom1Sr5be3sn+
+K/wPFdshWKDvUZDrqFp91icqKAlOcHLYaJskWT8Vb+vF5c1zdAxJhUEYcUZUPr/H
+DNSWYkmYbugc4uOx3Qe3i+7x9oCk1GP1RlVdABEBAAG5AQ0EV8l9qQEIAK+bhc6S
+2RqCFmPcp4Odh+MhjxvR7irpd+KFLvLMOEdSl1mgplB4hY+0jp9y0rXOZFEC8odU
+/jv6uqBl7lVSNRPstQxNT6HF8cmzuYtf7N8HNUwPLlkIRgxILnFQDjm/bhgNRAo2
+deSaC7G6JxMdhVLkNUjSj7LyYEvzXmntmacJzhQHj72EMqihnJvppsYogowNe8dM
+K66ApwyUowTivpZVx7Chx6pmiHdxroagYUKoSyfsisUO78WpJR/1E2XL6hT3Y9Nd
+4/piDIeY4kENF/Sqhsf2SPQONhJ/gGNaONzQk27MC4ko/t7Wjn8avOG+og253ufQ
+x/3h9aKhgLaoOvsAEQEAAYkBNgQYAQIACQUCV8l9qQIbDAAhCRA+/Ebug8QCJBYh
+BK6x4a7ANcZvo5WJ0T78Ru6DxAIkkGwH/2LBw5jF4ji1Vdj0a996A/GW29tNhM0Y
+kL47Gax2G8SLNbPC9GU36p7u88/j0qPaBqPgNnHNOd2dgMemm7FSgKrj8H8hZKyM
+Dc3Y6A64Ab4vcNNawHB04r9HJWN9gMHqwHJYMkdnzHC+3nurbvUEcNIaVzwCzVng
+5e7s7JpLgdLYZ1nMtRZjfgYmT+DhplGzcr0pLKobvL9TMi3Nob70ysvgtKW2/FJ7
+qdNv533xRVXLO7KHM6RcQMnVUuWFaUToip8Xqc9ss3638UE1DZdfJk0ykthRlTjD
+aTBmCu/YU5nL2vvCqIyIQ/Ykapv/YbWaU9b4AV61oVClCiVeY12b0cA=
+=wSYG
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    3FAAD2CD5ECBB314
 sub    3260CB2DEF74135B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -6082,6 +6301,35 @@ J6jqJeZDwjISStUqtlM2ACKov6zJC0QodTq3cxI=
 =7uxM
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    4692A312EF600C15
+uid    WireMock Release Bot (See the wiremock/community docs) <release-bot@wiremock.org>
+
+sub    6BFDA69683BBEA4A
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGUtW3gBCAChS/J82zuStCV9PjvQHdwPHVuWZMi2gSZvDouup4A2E1ikWLS4
+SHS9H9eU/lEDMLwuitpXOz6pU115SXJ8GZFB7V60+MuS+aHMcdxrpvA+0jachJzZ
+vKPphHeCBIBWNg3kZB7NItW1zwneB2OHMFP+s8XRPbLqwvHdq9XyxX2H6Cx2G7zT
+EccT0N0RfS+WNcQLajdUvvMIhkryg+G+jsz2fDJr5bwXV8pQfft8LMMsRX1xxcMS
+X0x8pqy6JXJhNwqOb2r353U1hNLIXASgURlk5KAvEFAIrLFFIgD0Z2J0Tqk+4vHg
+4c9ggJ5jW/FCRDINTYb68dgMs+k4qPwVaP1JABEBAAG0UVdpcmVNb2NrIFJlbGVh
+c2UgQm90IChTZWUgdGhlIHdpcmVtb2NrL2NvbW11bml0eSBkb2NzKSA8cmVsZWFz
+ZS1ib3RAd2lyZW1vY2sub3JnPrkBDQRlLVt4AQgA0j9WPkRvxbqWI+4MxePnn70w
+HWpJ/roiB/ZaU21p7Iqr8Reg8ZB+N//XWxaU9tTD2cWax58Xf1oGt+jgIkIbh0Pj
+Yiz/L9KFJXvyDo3WW4nFHlII9wt7EaEJ8AZS0Sv0fhXfGrrWKj3dLZG6gWKRwhOB
+AIYyHaTbgLox9eAVc1vkiXrlM755XzZ5HzXnuYQsyYEEMe3n9KC4OEkniOD9cl8C
+SPoLojI0Rv27X2HwLGmRyC5pTuc24nVDdkLjQaZiKY07FVmhCZ5RpqtBC8qNZkLd
+DQ+mwNg0PjvgQ3U5JN1fG5AO0n38mzdxbq/EGTuRmXSaH0DklmI9dVplCpCEAQAR
+AQABiQE2BBgBCAAgFiEECkqi18YFOrBo0gaqRpKjEu9gDBUFAmUtW3gCGwwACgkQ
+RpKjEu9gDBXVaAf/cEFXX+vF3o923S2aEeOEs0Gk2D8oB8KQG1MQ+xR2jPdmBSKa
+3HSZVq+ffCr9ysPjf/9KezzWVUW1vpJQG9Wtel1y6tzgnGVTwV2wvwibbu9KXkBs
+ACwLv7c5P9vBvvR3kajcsXYoozVpxvHrb9K3FB3dDUjZs7KB7eDu7TD1vrpEIBto
+SO5nv4EvtGFbWmAve1gaL4DC8g5PeQG9jWQ+XmepMf86HGEth42lHg5A2WtJ6uO3
+2CQaMuZ+pDE25Nv6SWshpxKO65FgckTAKe4DfnFGPGps/WEDsFgMg75Ukb/YTEhi
+La1stwX/Z5ZqDEqNVBvg4BSqzRiXwbmosLRRyQ==
+=rpIZ
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    4A1BAC7F1E3B89B3
 sub    B4F772A2A08563E5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -6270,6 +6518,19 @@ pyYELsj5uHzDtLodBkqdZR6WuQ==
 =JAXb
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    55C7E5E701832382
+uid    Andrey Somov (SnakeYAML) <public.somov@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mI0EVdDLQQEEAJMtYCaTA56YsP5RzQzPvqVTaR2nZ27qRk36blHB9WmXK+NHpGeH
+PHgq59mLPVueo2/M5k/fFrCe36jHePP31gYpFtueeYDfsofHwod0WhsHyC7JfG8d
+jEnSczTCmOHRZ3ed9ef6SeWUozYCQAX/tAbpoCthe0lTDYhFhkzVCe/FABEBAAG0
+MUFuZHJleSBTb21vdiAoU25ha2VZQU1MKSA8cHVibGljLnNvbW92QGdtYWlsLmNv
+bT4=
+=MKAK
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    56028DF552BA32E2
 uid    Dokka Release <dokka@jetbrains.com>
 
@@ -6830,6 +7091,21 @@ MbGOFKhQ4eOuFNSHamKyekKHiShaICR2aZgq
 =hSJA
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    636D10E7975B6E6F
+uid    ethlo <dev@ethlo.com>
+
+sub    708FD22F6805A6DE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZtbW6xYJKwYBBAHaRw8BAQdAVRRnooHomzkCvAbwOt9260ltfVmCpI/ibfaL
+ObWFsgS0FWV0aGxvIDxkZXZAZXRobG8uY29tPrg4BGbW1usSCisGAQQBl1UBBQEB
+B0BEfL8PhO+ac4WaOoiQDGTdUuQo3Y9ekfPUfuVRljKfbgMBCAeIfgQYFgoAJhYh
+BLGGeaF6Id55/53osGNtEOeXW25vBQJm1tbrAhsMBQkFo5qAAAoJEGNtEOeXW25v
+4rcBANF7z5GHPMQNErcZdNqIwA8h9/Xmdpe6Yfy546u5hfe0APwI04BjhEW9L8bN
+4rmDTxARN8gDJ41MFXurJAdf4Uo2Cw==
+=DDog
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    6425559C47CC79C4
 uid    java_re <GF_RELEASE_WW@oracle.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 62231390615..62d46d97f2e 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -32,6 +32,7 @@
          <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="org.neo4j.driver"/>
          <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb"/>
          <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
+         <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock" name="wiremock" version="3.13.1"/>
          <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
             <trusting group="commons-collections"/>
             <trusting group="commons-logging"/>
@@ -39,6 +40,7 @@
          <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
          <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2"/>
+         <trusted-key id="120D6F34E627ED3A772EBBFE55C7E5E701832382" group="org.yaml" name="snakeyaml" version="2.2"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
@@ -48,6 +50,7 @@
          <trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064" group="com.google.protobuf"/>
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
+         <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain" name="jetty-jakarta-servlet-api" version="5.0.2"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte"/>
@@ -67,6 +70,7 @@
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
             <trusting group="commons-beanutils"/>
             <trusting group="commons-codec"/>
+            <trusting group="commons-fileupload" name="commons-fileupload" version="1.6.0"/>
             <trusting group="commons-io"/>
             <trusting group="commons-logging"/>
             <trusting group="commons-net"/>
@@ -78,6 +82,7 @@
          <trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains"/>
          <trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
          <trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC" group="net.minidev"/>
+         <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC" group="org.yaml" name="snakeyaml"/>
          <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains"/>
          <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.codehaus.groovy"/>
          <trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0" group="com.jcraft"/>
@@ -118,7 +123,10 @@
          <trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple"/>
          <trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D" group="org.antlr"/>
          <trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB" group="com.fifesoft"/>
-         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="org.eclipse.jetty"/>
+         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4">
+            <trusting group="org.eclipse.jetty"/>
+            <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
@@ -132,6 +140,7 @@
          <trusted-key id="670BE7D076A0C89F5F07625AE57428DA9E879E7D" group="^com[.]helger($|([.].*))" regex="true"/>
          <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="com.google.guava"/>
          <trusted-key id="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688" group="org.apache.httpcomponents"/>
+         <trusted-key id="6A93161EB1990E8346E7BA2B23738DFD7C40DE43" group="org.xmlunit"/>
          <trusted-key id="6BFAB2E3C6490B421B25C76C9C8C892F91F8E6D1" group="org.apache.rat"/>
          <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces"/>
          <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC">
@@ -177,13 +186,17 @@
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
+         <trusted-key id="A9C5DF4D22E99998D9875A5110C01C5A2F6059E7" group="commons-fileupload" name="commons-fileupload" version="1.5"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
+         <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt" name="json-schema-validator" version="1.5.7"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus"/>
          <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
+         <trusted-key id="B18679A17A21DE79FF9DE8B0636D10E7975B6E6F" group="com.ethlo.time" name="itu" version="1.10.3"/>
+         <trusted-key id="B286846C341BB72D1E5F85CAB460E7C4ED66826D" group="com.ethlo.time" name="itu" version="1.7.0"/>
          <trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923" group="jcharts"/>
          <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
             <trusting group="commons-beanutils"/>
@@ -234,7 +247,10 @@
          <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb"/>
          <trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C" group="org.apache"/>
          <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell"/>
-         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A" group="com.github.tomakehurst"/>
+         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A">
+            <trusting group="com.github.tomakehurst"/>
+            <trusting group="org.wiremock" name="wiremock" version="3.0.1"/>
+         </trusted-key>
          <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections"/>
          <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D" group="org.springframework"/>
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
@@ -252,12 +268,14 @@
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
          <trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17" group="com.google"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
+         <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
          <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
             <trusting group="org.apache"/>
             <trusting group="org.codehaus.mojo"/>
             <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
+         <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB" group="org.infinispan"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
             <trusting group="org.apache"/>
             <trusting group="org.codehaus.plexus"/>
@@ -490,16 +508,6 @@
             <sha256 value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.infinispan" name="infinispan-bom" version="11.0.15.Final">
-         <artifact name="infinispan-bom-11.0.15.Final.pom">
-            <sha256 value="07386ee62c8464618770d209f8c060da8e51f56e76314d1b29caec9c302130e9" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="org.infinispan" name="infinispan-build-configuration-parent" version="11.0.15.Final">
-         <artifact name="infinispan-build-configuration-parent-11.0.15.Final.pom">
-            <sha256 value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jboss" name="jboss-parent" version="36">
          <artifact name="jboss-parent-36.pom">
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -538,6 +546,11 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.ow2" name="ow2" version="1.5.1">
+         <artifact name="ow2-1.5.1.pom">
+            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
          <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 564c8044156..361448c7dfa 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("com.github.tomakehurst:wiremock-jre8:2.35.2")
+        api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.13.17")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4d54c9168c7..4f2da8b2468 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -103,7 +103,7 @@ dependencies {
         api("org.apache.commons:commons-pool2:2.12.1")
         api("org.apache.commons:commons-text:1.14.0")
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
-        api("org.apache.httpcomponents.client5:httpclient5:5.3")
+        api("org.apache.httpcomponents.client5:httpclient5:5.5.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.14")
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
index 79de86514e2..d5ae6d951d1 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
@@ -36,6 +36,7 @@
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ServeEventListener;
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.matching.StringValuePattern;
@@ -47,7 +48,7 @@ public class HttpMetricsSenderTest {
     private MappingBuilder influxRequest(CountDownLatch latch) {
         return WireMock.post(API_URL)
                 .willReturn(WireMock.aResponse().withStatus(HttpURLConnection.HTTP_NO_CONTENT))
-                .withPostServeAction("countdown", Parameters.one("latch", latch));
+                .withServeEventListener(ServeEventListener.RequestPhase.AFTER_COMPLETE, "countdown", Parameters.one("latch", latch));
     }
 
     static Collection<Arguments> emptyTokens() {
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 28e2e92e4f6..c7c9a27f23a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -68,11 +68,11 @@
 109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
-861640,httpclient5-5.3.jar
+959302,httpclient5-5.5.1.jar
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
-855013,httpcore5-5.2.4.jar
-237145,httpcore5-h2-5.2.4.jar
+909490,httpcore5-5.3.6.jar
+242521,httpcore5-h2-5.3.6.jar
 41727,httpmime-4.5.14.jar
 78480,jackson-annotations-2.16.1.jar
 578125,jackson-core-2.16.1.jar
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 804fe8ab076..36551cd9996 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -76,7 +76,7 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind")
     testImplementation(testFixtures(projects.src.core))
     testImplementation(testFixtures(projects.src.testkitWiremock))
-    testImplementation("com.github.tomakehurst:wiremock-jre8")
+    testImplementation("org.wiremock:wiremock")
     // For some reason JMeter bundles just tika-core and tika-parsers without transitive
     // dependencies. So we exclude those
     implementation("org.apache.tika:tika-core") {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
index 7f0bff9637a..2d9d1679224 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
@@ -123,14 +123,12 @@ public static Iterable<Arguments> implementationsAndIps() throws SocketException
                     continue;
                 }
 
-                localIps.forEach(localIp -> {
-                    if (finalLocal4 != null) {
-                        res.add(arguments(impl, targetHost, finalLocal4));
-                    }
-                    if (finalLocal6 != null) {
-                        res.add(arguments(impl, targetHost, finalLocal6));
-                    }
-                });
+                if (finalLocal4 != null) {
+                    res.add(arguments(impl, targetHost, finalLocal4));
+                }
+                if (finalLocal6 != null) {
+                    res.add(arguments(impl, targetHost, finalLocal6));
+                }
             }
         }
         return res;
diff --git a/src/testkit-wiremock/build.gradle.kts b/src/testkit-wiremock/build.gradle.kts
index 0aa354d375a..34b1bcd12c1 100644
--- a/src/testkit-wiremock/build.gradle.kts
+++ b/src/testkit-wiremock/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 
 dependencies {
     api(platform(projects.src.bomTesting))
-    api("com.github.tomakehurst:wiremock-jre8")
+    api("org.wiremock:wiremock")
     api("org.junit.jupiter:junit-jupiter-api")
 }
 
diff --git a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
index 8a680c8b86f..e3737090505 100644
--- a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
+++ b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
@@ -19,20 +19,24 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import com.github.tomakehurst.wiremock.core.Admin;
 import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.extension.PostServeAction;
+import com.github.tomakehurst.wiremock.extension.ServeEventListener;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 
-public class RequestCountDown extends PostServeAction {
+public class RequestCountDown implements ServeEventListener {
     @Override
     public String getName() {
         return "countdown";
     }
 
     @Override
-    public void doAction(ServeEvent serveEvent, Admin admin, Parameters parameters) {
+    public void onEvent(RequestPhase requestPhase, ServeEvent serveEvent, Parameters parameters) {
+        if (requestPhase != RequestPhase.AFTER_COMPLETE) {
+            return;
+        }
         CountDownLatch latch = (CountDownLatch) parameters.get("latch");
-        latch.countDown();
+        if (latch != null) {
+            latch.countDown();
+        }
     }
 }

From ceda7663853caf733ad4dd28f172d7174129009e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 26 Oct 2025 21:27:34 +0300
Subject: [PATCH 0873/1037] chore: bump groovy to 5.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 src/core/build.gradle.kts           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4f2da8b2468..2b9875722a8 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
+    api(platform("org.apache.groovy:groovy-bom:5.0.2"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 
     constraints {
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 98160b953a5..fb3a14338e6 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -71,11 +71,11 @@ dependencies {
         because("XPathUtil: throws SaxonApiException")
     }
 
-    runtimeOnly("org.codehaus.groovy:groovy") {
+    runtimeOnly("org.apache.groovy:groovy") {
         because("Groovy is a default JSR232 engine")
     }
     arrayOf("dateutil", "datetime", "jmx", "json", "jsr223", "sql", "templates").forEach {
-        runtimeOnly("org.codehaus.groovy:groovy-$it") {
+        runtimeOnly("org.apache.groovy:groovy-$it") {
             because("Groovy is a default JSR232 engine")
         }
     }

From 974638d0d10adde105b96d4319993ecf55014702 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 26 Oct 2025 21:44:18 +0300
Subject: [PATCH 0874/1037] chore: update verification metadata after groovy
 update

---
 gradle/verification-metadata.xml            | 24 ++++++++++++++++++++-
 src/dist/src/dist/expected_release_jars.csv | 18 ++++++++--------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 62d46d97f2e..5dfe11130ad 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -84,10 +84,14 @@
          <trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC" group="net.minidev"/>
          <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC" group="org.yaml" name="snakeyaml"/>
          <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains"/>
-         <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.codehaus.groovy"/>
+         <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B">
+            <trusting group="org.apache.groovy"/>
+            <trusting group="org.codehaus.groovy"/>
+         </trusted-key>
          <trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0" group="com.jcraft"/>
          <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons"/>
          <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
+         <trusted-key id="3CAC6E7DC43343FF75ECBAC27E6EB7BB6A7712DC" group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.22"/>
          <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava"/>
          <trusted-key id="3F05DDA9F317301E927136D417A27CE7A60FF5F0" group="io.opentelemetry"/>
          <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections"/>
@@ -454,6 +458,14 @@
             <sha256 value="e119846ac53eca6bcff05cc4fd5151617663895c7e7ca82bd8ce91f9f9e8ea83" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.22">
+         <artifact name="nekohtml-1.9.22.jar">
+            <sha256 value="452978e8b6667c7b8357fd3f0a2f2f405e4560a7148143a69181735da5d19045" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="nekohtml-1.9.22.pom">
+            <sha256 value="2871c7442b83dd0eec56ebd75461e671bec32dcfe4161eb359266e6794ca5ab5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.ajoberstar.grgit" name="grgit-gradle" version="4.1.1">
          <artifact name="grgit-gradle-4.1.1.pom">
             <ignored-keys>
@@ -462,6 +474,16 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="33">
+         <artifact name="apache-33.pom">
+            <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="79">
+         <artifact name="commons-parent-79.pom">
+            <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c7c9a27f23a..c016fce855f 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -54,15 +54,15 @@
 16829,error_prone_annotations-2.24.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
-8057404,groovy-3.0.25.jar
-15175,groovy-datetime-3.0.25.jar
-7402,groovy-dateutil-3.0.25.jar
-133002,groovy-jmx-3.0.25.jar
-128875,groovy-json-3.0.25.jar
-16835,groovy-jsr223-3.0.25.jar
-78912,groovy-sql-3.0.25.jar
-94088,groovy-templates-3.0.25.jar
-291624,groovy-xml-3.0.25.jar
+8057697,groovy-5.0.2.jar
+20224,groovy-datetime-5.0.2.jar
+12371,groovy-dateutil-5.0.2.jar
+116723,groovy-jmx-5.0.2.jar
+138755,groovy-json-5.0.2.jar
+21460,groovy-jsr223-5.0.2.jar
+86636,groovy-sql-5.0.2.jar
+98394,groovy-templates-5.0.2.jar
+223993,groovy-xml-5.0.2.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
 109741,hamcrest-date-2.0.8.jar

From 759dd4690544f928ada556b4c0b1acd81bd644b1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sun, 26 Oct 2025 21:44:47 +0300
Subject: [PATCH 0875/1037] chore: bump com.github.vlsi plugins to 2.0.0

---
 build-logic/build-parameters/build.gradle.kts |  2 +-
 build-logic/jvm/build.gradle.kts              |  4 +-
 build-logic/root-build/build.gradle.kts       |  6 +--
 build-logic/verification/build.gradle.kts     |  4 +-
 gradle/verification-keyring.keys              | 28 +++++++++++++
 gradle/verification-metadata.xml              | 39 +++++++++++++++++++
 settings.gradle.kts                           |  3 +-
 7 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 7172aba71d4..a97941ef67c 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("org.gradlex.build-parameters") version "1.4.4"
-    id("com.github.vlsi.gradle-extensions") version "1.90"
+    id("com.github.vlsi.gradle-extensions") version "2.0.0"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
 
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 85a87cf15eb..01ab58728af 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     api(projects.buildParameters)
     api(projects.verification)
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.3")
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:2.0.0")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.20")
     api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 121878e1d90..b0983dd5cd7 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,9 +27,9 @@ dependencies {
     }
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:1.90")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:2.0.0")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index f9e901c1679..037a86cfe62 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -24,8 +24,8 @@ dependencies {
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.4")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:1.90")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.37")
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index eb0d2dc9f00..ff364c3a525 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -7886,6 +7886,34 @@ IpJ/48U/m/cU9Lk+RrPpyBjVPO0HeGc9KsiWPdVWAfg=
 =oANj
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    7E6EB7BB6A7712DC
+uid    Marc Guillemot <mguillemot@yahoo.fr>
+
+sub    DCADAFED3CB17787
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFEt1BYBCADcGrEqNpH+27l3swE+E0E3YXLSfiX6rsf+MXgwov4KRh0+qO7T
+MYP7AhihEGRFPAe3YcAcEWw3vRttcwen/AOtd1EPSAvR+gxlKH2euGnkOV1h2emW
+k2Fx1m459AdqEIyidwK0fXN4naN7nzEtgYrI6JPIr/811492IxSmbN9JvtlNzS+L
+xZJDMTTIHHKjKuGDGYyv1F6W079nGujynFjqKrOS64Vj3yMfLDNzEOZvs61mCfgC
+TKVK7LyISyqf5I464rOAnymNgN6+/4n0w/Y3rYLvyu6/LQbhjAQq71h4xDU9Sqhb
+5wBzCXMiiV9EL7Nk3bBZO+iGzAujjmwZWNqpABEBAAG0JE1hcmMgR3VpbGxlbW90
+IDxtZ3VpbGxlbW90QHlhaG9vLmZyPrkBDQRRLdQWAQgAx9qI0mjlpQuYV5Pr1mYR
+/XfgHHkBdKMe38JJ5IK+INEp5zZKSb5r4VnAAZw2HO/TGWvN4XTEYiU43mhyWorM
+rudClbSxy3DIAvybRvGCDh81WD0PrlNkBn4r7goAWXDnmDk/kwTmINjcB/hzHWNh
+/dBPfljFSEQ72KwRYPlMLO4rBibUoiPCPe95IOV3g4wg1kQDrHm9duhhHBGd6zWG
+sqQ2P1qdM99Trdgk7BWmnQqiAat7Jp6Hsms9NW2TWF3FZcW3VZ5xg16c2Aj68nGi
+W5qDfRZ6DhbYL6Rtdsxs4KLqfV2ko/M0W++o2HTZMZYkvbVxbCeAovSHXUMClsR+
+BwARAQABiQEfBBgBAgAJBQJRLdQWAhsMAAoJEH5ut7tqdxLcrzYIAKMc3gTA6tAg
+PJMcMvJz2Wj/RzTjucdXrV3JZyHwP3cEMGa8Li+WuoKdN2eDUoJ0ZAgw2Jet5lUa
+/SzpWyUKCVfah/VfcVIoEj/gG0st67zjHenzgKxNSGNnS2yNCoNp91IwlTTjHT6H
+GZLbHVVVwuin5suwERXrskromM4wdHbG24W5/ai/p70kkoTPoN0WOZKhF0WZ6uNa
+T4RfKivt2ADtKs7W8aXns8UxGsVCTkoT5MfoyBW8WlfliRcMQvTHG2zGjzoGa2tM
+Ub5DclLQ453iBG350sK8d99ZDjiFYU9ZvsCH5Sc4F+9R2RffJl6uWt144t8dKXpo
+JOlNl0Wo7ho=
+=WJjr
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    7EB97D110DFADD60
 uid    Niall Gallagher (www.npgall.com) <niall@npgall.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5dfe11130ad..67c65a5fa36 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -51,6 +51,7 @@
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain" name="jetty-jakarta-servlet-api" version="5.0.2"/>
+         <trusted-key id="1A6090D3223DCA95BFD25C0E38F47D3E410C47B1" group="com.github.vlsi.gradle"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte"/>
@@ -324,21 +325,41 @@
             <sha256 value="f54318e1908eb9a6371bc8e5c397f65a23537bf007deeb66d5b06b72565778c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="2.0.0">
+         <artifact name="com.github.vlsi.crlf.gradle.plugin-2.0.0.pom">
+            <sha256 value="fdd676d789d97e249bb312568659343e40bb68ab2cc7bb355e5f925a71a2e67d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="1.90">
          <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-1.90.pom">
             <sha256 value="ba427413f70704d470c3e5d477a1c447b392d54b82abb2bcedf06cff89745759" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="2.0.0">
+         <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-2.0.0.pom">
+            <sha256 value="d251352a0a25549bd0bbb14526ea68acbda303c9b91295d0618adac1339e162f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="1.90">
          <artifact name="com.github.vlsi.ide.gradle.plugin-1.90.pom">
             <sha256 value="e27deb8959eb60b3dcc88083fe0a96af47bc27560d221c83da1867e2d2f6a72f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="2.0.0">
+         <artifact name="com.github.vlsi.ide.gradle.plugin-2.0.0.pom">
+            <sha256 value="87b8dabfd24a97e80ac73a79be56df6b5d8270c254f558145c01c8458d088463" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="1.90">
          <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-1.90.pom">
             <sha256 value="37656ed0e5626bf87a0b5f59dab729becbf8dbe5dbf77a533145acf567163add" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="2.0.0">
+         <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-2.0.0.pom">
+            <sha256 value="f3f33cd3e4c01914c9f353dd2649cc9710173b7ca7cabcd5718468c413c9626e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.0.2">
          <artifact name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin-2.0.2.pom">
             <sha256 value="f6111fd512eabacff117c7a46d730033c6f7eb78cc05ce73fe97cb195cf330f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -381,6 +402,14 @@
             <sha256 value="563093977165b0c40643a0f7dbde12d473569468d97911acaf75eaba82dc86f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.10">
+         <artifact name="gradle-idea-ext-1.1.10.jar">
+            <sha256 value="fea76e0c13f9e96c2516d0176e649be44d979f4ec80319f3c8628a6e7947512d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-idea-ext-1.1.10.pom">
+            <sha256 value="97bd2047b9b581d3a1baddcc8bc332c0a527142175f3e19d187d704abeb5b2bb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.7">
          <artifact name="gradle-idea-ext-1.1.7.jar">
             <sha256 value="f7a9e1519b8d9c597e5a2ce0d67fdfeef4063fc227d14efaa12c200f37d14390" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -540,6 +569,11 @@
             <sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.10">
+         <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.10.pom">
+            <sha256 value="3fc9468d71b90b3f98afa8a2978cbf9065ae3606a0a153a2e5acd7afec92c512" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
          <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.7.pom">
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -555,6 +589,11 @@
             <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.11.4">
+         <artifact name="junit-bom-5.11.4.pom">
+            <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef2d7c40974..68e72139129 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.util.*
 
 pluginManagement {
     plugins {
-        id("com.github.vlsi.stage-vote-release") version "1.90"
+        id("com.github.vlsi.stage-vote-release") version "2.0.0"
     }
 }
 

From 613a69e7c3e614fafc833f329670f04948f1bdc7 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 19:48:39 +0300
Subject: [PATCH 0876/1037] chore: bump autostyle to 4.0

---
 build-logic/verification/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 037a86cfe62..4f4b496f939 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     api(projects.basics)
     api(projects.buildParameters)
-    api("com.github.autostyle:com.github.autostyle.gradle.plugin:3.2")
+    api("com.github.autostyle:com.github.autostyle.gradle.plugin:4.0")
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.4")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")

From 7c4edb3117cadb3c98724179ddf7affdff917951 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 20:41:33 +0300
Subject: [PATCH 0877/1037] chore: bump springframework to 6.2.12 (used in
 testing only)

---
 src/bom-testing/build.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 361448c7dfa..b510fea230e 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -27,6 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.junit:junit-bom:5.14.0"))
+    api(platform("org.springframework:spring-framework-bom:6.2.12"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"
@@ -55,7 +56,5 @@ dependencies {
         api("org.objenesis:objenesis:3.3")
         api("org.openjdk.jmh:jmh-core:1.37")
         api("org.openjdk.jmh:jmh-generator-annprocess:1.37")
-        api("org.springframework:spring-beans:4.3.30.RELEASE")
-        api("org.springframework:spring-context:4.3.30.RELEASE")
     }
 }

From 35bfb1644278b1dab188937a78f7c60404dcda61 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 20:56:07 +0300
Subject: [PATCH 0878/1037] chore: bump org.eclipse.jetty to 11.0.26 (used in
 testing only)

---
 gradle/verification-metadata.xml | 1 +
 renovate.json                    | 8 ++++----
 src/bom-testing/build.gradle.kts | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 67c65a5fa36..5093e268c1c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -103,6 +103,7 @@
          <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
          <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
+            <trusting group="io.micrometer"/>
             <trusting group="io.projectreactor"/>
             <trusting group="org.springframework"/>
          </trusted-key>
diff --git a/renovate.json b/renovate.json
index 10778e9bd8a..c47ad81ee43 100644
--- a/renovate.json
+++ b/renovate.json
@@ -135,11 +135,11 @@
       ]
     },
     {
-      "groupName": "org.eclipse.jgit",
-      "description": "TODO: jgit 6.0 requires Java 11",
-      "allowedVersions": "< 6.0",
+      "groupName": "org.eclipse.jetty",
+      "description": "wiremock uses jetty 11",
+      "allowedVersions": "< 12.0",
       "matchPackageNames": [
-        "org.eclipse.jgit{/,}**"
+        "org.eclipse.jetty{/,}**"
       ]
     },
     {
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index b510fea230e..1b2ccdb39e6 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -28,6 +28,7 @@ javaPlatform {
 dependencies {
     api(platform("org.junit:junit-bom:5.14.0"))
     api(platform("org.springframework:spring-framework-bom:6.2.12"))
+    api(platform("org.eclipse.jetty:jetty-bom:11.0.26"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From 6a1c84fc27dfac78db28a43c6211a4e9fede2e25 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:02:11 +0300
Subject: [PATCH 0879/1037] chore: bump org.jdom:jdom to 2.0.2

jdom is used for building the documentation only
---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 2b9875722a8..4b384d3a88b 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -125,7 +125,7 @@ dependencies {
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
-        api("org.jdom:jdom:1.1.3")
+        api("org.jdom:jdom:2.0.2")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")

From 26bcab946f3785c4c28273441742638cf757f5fb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:09:24 +0300
Subject: [PATCH 0880/1037] Revert "chore: bump org.jdom:jdom to 2.0.2"

This reverts commit 6a1c84fc27dfac78db28a43c6211a4e9fede2e25.
---
 renovate.json                       | 8 ++++++++
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index c47ad81ee43..602682c8953 100644
--- a/renovate.json
+++ b/renovate.json
@@ -142,6 +142,14 @@
         "org.eclipse.jetty{/,}**"
       ]
     },
+    {
+      "groupName": "org.jdom",
+      "description": "Velocity Anakia uses JDOM 1.0",
+      "allowedVersions": "< 2.0",
+      "matchPackageNames": [
+        "org.jdom{/,}**"
+      ]
+    },
     {
       "groupName": "org.jetbrains.lets-plot",
       "matchPackageNames": [
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4b384d3a88b..2b9875722a8 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -125,7 +125,7 @@ dependencies {
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
-        api("org.jdom:jdom:2.0.2")
+        api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")

From 09de2577d034dc2db6d2b4de480b6f04003da4b9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:23:26 +0300
Subject: [PATCH 0881/1037] chore: bump protobuf to 4.33.0 for errorprone
 verifier

---
 .../kotlin/build-logic.errorprone.gradle.kts  |  1 +
 gradle/verification-keyring.keys              | 33 +++++++++++++++++++
 gradle/verification-metadata.xml              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 94d7249a2ed..a4c509987d1 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,6 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
+        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.0"))
         "errorprone"("com.google.errorprone:error_prone_core:2.24.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index ff364c3a525..880e5f69a0d 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -7524,6 +7524,39 @@ BzoVWrw=
 =fJQM
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    7905DE25C78AD456
+sub    DBC5123E2E98FEFE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGSsZCsBDADJZoPoHGJNAB3sn/kFQ3zlj+vZ7OY5aWoH2nL3tHQYZvN/pJRs
+8wu4Cw1ApatqLIaur6S6LR+s4xB7HxnMvpiF3NMwr6ZeZBUUTGEJbRgFhY9TqZam
+CZJ/xPz/FevPhZn3/McqDGbjEx+G7hciUl0EwIOhanAQQvVYaWxDL+Pesqqh23U7
+Cex2NcotieICt7dWJ7SAM3TOSLP9OQd4scRvYLWqv6/vu/nQ68RwqaonR2QzxhUY
+Uul7vR3iNRXtbnS31qIgCYWAoX6w0xHf6KUeIPWV21ZIUu5cg6kQr/sPt/OQuGS2
+nKk+InYtopDi6d7AUh8WI2TP7qAMIoRkhAeDEQ99DiopwFNPA/7M4g99AQfFSmp3
+acPCdeXXAZeDAqoFGFKTlqzg3FLWpGkubI/iXyHkpQfOXv4MtYuPGVNheBXGcWbf
+XPjbkFYjkGIN2Wx4i7yf43hMCk6ArhswfgCcgoORI+DCVdm7ORID1PjIU2Z71EA2
+qDdFwdoOdEV42YUAEQEAAbkBjQRkrGQrAQwArgt5OPV2vwX0T3xSnrLgAodjRlt5
+vm9z9POwlfpQK53PKBhNtCcRys8hwnlMlXmV6eICXGepTP+onGakG0YI0frdz36I
+k2FWokRmH11u6mpCf6aq0G+w8AFsdT4LjpMt5uY4rhH33OC3FWVJhpsm5u4bYyqe
+r3qa60FRYojeJjmPQkAwtjUMl6wAbABY/yC9RkeF3gsk3eKKQ1JNbJQTQefCbZUo
+WrhzEj/qpoKnO1+5IPXLQmmVJ+YpF355wtKqEO+UxmTCKBSmMK8XuJJo++nFZ2QV
+ptJ+sx4iPBsZT98tXyKXC089vntfo2uT00hR1VrplvGK4gSshyncl+B9R/LvDFwj
+9SMyrUjnQ07CLMtWmtluYq/U/zxsAKZ2ifrXamcOGGzzimEmYDt/ND+MCoXUlDgK
+t3Mv7qDnoqTHVWU3d1KY+O7JyNPPKS43Bn8WLQuP0LODgtWnql5Kw9ZL6Wn2H205
+LO2VB6/4ZeJAplNi3wnG8E86SbSF3kzfQENvABEBAAGJAbwEGAEKACYWIQQaVfCR
+rSjAf4MfpE15Bd4lx4rUVgUCZKxkKwIbDAUJA8JnAAAKCRB5Bd4lx4rUVtf3DACY
+sEpDwmWMTCTQqpjFrCu6xZfBof7Ujze6t/9aw4lgSQqiJA5uwUZO5qiXKWfpkfIX
+6C24p5a2Vu8bppeq/1ddyxVAbs0wZ0QDLoNM2Pvu4EBcxZPFWkPT2JV56m9ZKLPu
+vsyDMl+W42AYM4YqmTHEiNLw2c4Cwr26q7K8FBr3sj5ieJqtOSmdVamBJH/tXccd
+/pDZoIoveKF0ra4hLh0isWL6ZUK3bMNp3xTw3tLYa/ZU7+8EX6EgUJXvzyEsf0d5
+fd/vQT31fnuGtUKHQx4KiU4hXXPArwYt5XtumvrHXXHlyOK/bvGTL3la17IfnD3D
+9epO7Q1DljIpf/Q9RhVfeYuzn0ftbKzoA3KBYmzn0lPgpLBvekgRXuBZLCneZaSy
+2UWbhOr936BUXrgi2sfKVmDRakc+/Wz50fr+1ZywGeSBH85Lfc+SKNCC8xbiKZA1
+HGDKY5kh24ddfVf4rOVFlNe+/i1IWchDSZZjXJKI4lAlLZYAFXAWkVzysQKbp40=
+=UiVm
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    79E193516BE7998F
 uid    Filip Jirs?k <filip@jirsak.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5093e268c1c..00816573c3b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -51,6 +51,7 @@
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain" name="jetty-jakarta-servlet-api" version="5.0.2"/>
+         <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
          <trusted-key id="1A6090D3223DCA95BFD25C0E38F47D3E410C47B1" group="com.github.vlsi.gradle"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>

From 04bd01aa41b86483b56178224c83e3532e23799a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:31:51 +0300
Subject: [PATCH 0882/1037] chore: bump lets-plot-batik to 4.7.3,
 lets-plot-kotlin-jvm to 4.11.2, xmlgraphics-commons tp 2.11

---
 gradle/verification-keyring.keys            | 36 +++++++++++
 gradle/verification-metadata.xml            |  6 ++
 src/bom-thirdparty/build.gradle.kts         |  6 +-
 src/dist/src/dist/expected_release_jars.csv | 71 +++++++++++----------
 4 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 880e5f69a0d..72f64f77dd9 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -5615,6 +5615,42 @@ UlxAuwSE5Ic4Jwx0dwoVRV8=
 =F0eI
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    36D4E9618F3ADAB5
+uid    Ohad Shai <ohadshai@gmail.com>
+
+sub    C4935FA8AC763C70
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGGiftwBDAC94Yhhh/5yO8jYFkg01MPnooXKZEPwxAbAg9wn5iM0tHxhEpkU
+zJVYZ+JYq013+Ldp8Of7A/d6hKTtZ0xwSeY7S/WFykIk6tc0P5j0sfFS3pGPDk+W
+D3DwUa+8m0PriF7iA57vCOE51znO/IUIA3PG2YAK6jv2/i8MDXOOq3qB7VrbvKGB
+kIPubp5PbjvP+LFhLuUReU9m2y/3q9lNFXdd9kE2iScqGmu3FDhRJxBK/WQ2kqiv
+sJZjAYeHEVNcc88Ah6vXI73uYrvWVGCErzswYy9UrxCAQ/x2OxUdLw7NTHwjZSYC
+JvH5JPPTlDxMgfwTIsmaECtw4QgiVmvDp+RVa9zyrdI++RNr0InsXv9gWMv3p3yf
+TF20ZL8znFYVUi6XkeQhZjT4fHwDqDVnxhSAFe3E0cwHFJBQe2EFLljwNy6VYnio
+wBr7HrAxczRRqlUy4a3bH5KwiNwwvxgqfdMj9KTVpP9t98/TA36bIohwGFRWB7W4
+i395S90NsTbCh/cAEQEAAbQeT2hhZCBTaGFpIDxvaGFkc2hhaUBnbWFpbC5jb20+
+uQGNBGGiftwBDAC0+YpwzX/Pywwme3iwd7ed1ew51KpMltGQBx3IM7UXiqCPnP3C
+SuVVUoa5W2YlLeqZH3TVD6gf4mozpR4aqE2KDghC8wSJCON6W8pcxf089XOU/6Br
+ljX/aadSaCZhcrjToJTtppDeGzv75cOiedBS3mdYX11dP7Er9IMtgyTmLVM2o9UV
+kE+bjgekiMoY0lcPtW//nPrb6EqzCkteBi3xHP3kHIadyNDUujYzVPVj8S7CVGhz
+1FN3IAFq9JBZUsojPqQozgt6NqONG8ufJsxS6DQImXmaeLhwdfH23SkyUbkMTY7e
+ZkvBOBZwnxy7YK0/ED2It9W8UBOHGTdmK2QSEKEG0b39XwPgOJMiG3pt3j3GQc/m
+nG0H9+6j2U1vRrFIFo4B5qe3coDoXq+SL5yGcaE4WpXUokdzFgbtWwbWFiHLkhtm
+yDgZ1xd9PDAXX+aryS8d/JOQHLocwMbCmvQBM2evE7u0lOJWoO7F++IZBSOokhAO
+ezp8z0Ejg5+lfKMAEQEAAYkBtgQYAQgAIBYhBEfraDYkXS1A6J37QTbU6WGPOtq1
+BQJhon7cAhsMAAoJEDbU6WGPOtq1EFwMAIJ+GxoIW8wlOWzmVP91xOpIJglhnIOP
+3kOVOJpE2RecAatPITjk+eYku/oUVnNJl2794sTyWzYxj8paqdlhhXYxy3+nAMMt
+KN0A381JF70d4CHY5LWQ143ZIhygvnmASh0oE1IyKxj03fKUszEdk9rks0Gj6P3B
++0RpWLZ9NfwsMkVC9Q5nd/tzPd/q7jYV4dSpoubZqUdBKR9MHfIi7weajYRceHhR
+/BOZLnk4EYtD3V3yd67s9yKaoJ5p14db6pjmDmGvk00vEwD6f6/A8ZxA3GDSUfZc
+F2UUFsAQsQbExwptbnVAvaH4R3AbNP+crciJr+qbc3nRnXaP+GHOiGV/tNCOHMHj
+dZvF5/3glsppy+eDy3+Ebf6fxQBJDOLMJKf+gyRdCiZd1B7kkWAkKuhTYJ+t0WZl
+9uSSr2YCLzQEtQQAY1NRCuD9bf1VfX+SUaJeJa2lTyCr+1IZFAddPAbnep6OVS0o
+jfXlmLM6EmKeJIPHh9lorbMH1GVmSud3Vg==
+=wur2
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    379CE192D401AB61
 uid    Bintray (by JFrog) <bintray@bintray.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 00816573c3b..727aae1b236 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -103,6 +103,7 @@
          <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath"/>
          <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
+         <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.microutils"/>
          <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
             <trusting group="io.micrometer"/>
             <trusting group="io.projectreactor"/>
@@ -317,6 +318,11 @@
             <sha256 value="239f3397b79f91a866e6067cf04974146d7e864feb2aa34a9943831c9f6daeab" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.formdev" name="svgSalamander" version="1.1.2.4">
+         <artifact name="svgSalamander-1.1.2.4.pom">
+            <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
+         </artifact>
+      </component>
       <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
          <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 2b9875722a8..1bd99acc94a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -117,7 +117,7 @@ dependencies {
         api("org.apache.tika:tika-core:1.28.5")
         api("org.apache.tika:tika-parsers:1.28.5")
         api("org.apache.velocity:velocity:1.7")
-        api("org.apache.xmlgraphics:xmlgraphics-commons:2.9")
+        api("org.apache.xmlgraphics:xmlgraphics-commons:2.11")
         api("org.apiguardian:apiguardian-api:1.1.2")
         api("org.bouncycastle:bcmail-jdk15on:1.70")
         api("org.bouncycastle:bcpkix-jdk15on:1.70")
@@ -126,8 +126,8 @@ dependencies {
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
-        api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
-        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
+        api("org.jetbrains.lets-plot:lets-plot-batik:4.7.3")
+        api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.11.2")
         api("org.jetbrains:annotations:24.1.0")
         api("org.jodd:jodd-core:5.3.0")
         api("org.jodd:jodd-lagarto:6.0.6")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c016fce855f..137ad6251ca 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -2,24 +2,24 @@
 30570,annotations-24.1.0.jar
 6806,apiguardian-api-1.1.2.jar
 126093,asm-9.7.1.jar
-485898,batik-anim-1.16.jar
-424607,batik-awt-util-1.16.jar
-704905,batik-bridge-1.16.jar
-112371,batik-codec-1.16.jar
-8431,batik-constants-1.16.jar
-330361,batik-css-1.16.jar
-184060,batik-dom-1.16.jar
-10239,batik-ext-1.16.jar
-192085,batik-gvt-1.16.jar
-11464,batik-i18n-1.16.jar
-76872,batik-parser-1.16.jar
-25198,batik-script-1.16.jar
-6665,batik-shared-resources-1.16.jar
-232734,batik-svg-dom-1.16.jar
-227487,batik-svggen-1.16.jar
-129300,batik-transcoder-1.16.jar
-127485,batik-util-1.16.jar
-33870,batik-xml-1.16.jar
+485992,batik-anim-1.17.jar
+424429,batik-awt-util-1.17.jar
+704814,batik-bridge-1.17.jar
+112314,batik-codec-1.17.jar
+8436,batik-constants-1.17.jar
+330640,batik-css-1.17.jar
+184033,batik-dom-1.17.jar
+10244,batik-ext-1.17.jar
+192067,batik-gvt-1.17.jar
+11427,batik-i18n-1.17.jar
+76812,batik-parser-1.17.jar
+24654,batik-script-1.17.jar
+6670,batik-shared-resources-1.17.jar
+230456,batik-svg-dom-1.17.jar
+227423,batik-svggen-1.17.jar
+129208,batik-transcoder-1.17.jar
+127142,batik-util-1.17.jar
+33826,batik-xml-1.17.jar
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
@@ -31,7 +31,7 @@
 563971,commons-io-2.20.0.jar
 267634,commons-jexl-2.1.1.jar
 462124,commons-jexl3-3.2.1.jar
-760623,commons-jvm-4.1.0.jar
+924068,commons-jvm-4.7.3.jar
 709075,commons-lang3-3.19.0.jar
 73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
@@ -47,9 +47,8 @@
 89456,darklaf-theme-2.7.3.jar
 69133,darklaf-utils-2.7.3.jar
 217795,darklaf-windows-2.7.3.jar
-353322,datamodel-jvm-4.1.0.jar
+362793,datamodel-jvm-4.7.3.jar
 98115,dec-0.1.2.jar
-95287,deprecated-in-v4-jvm-4.1.0.jar
 320748,dnsjava-2.1.9.jar
 16829,error_prone_annotations-2.24.0.jar
 1736381,freemarker-2.3.32.jar
@@ -90,16 +89,18 @@
 277582,json-path-2.8.0.jar
 122808,json-smart-2.6.0.jar
 473788,jsoup-1.17.1.jar
+511129,jsvg-1.3.0.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
-32033,kotlin-logging-jvm-2.0.5.jar
+43729,kotlin-logging-jvm-2.1.23.jar
 1761444,kotlin-stdlib-2.2.20.jar
-959,kotlin-stdlib-jdk7-1.9.10.jar
-965,kotlin-stdlib-jdk8-1.9.10.jar
-1551152,kotlinx-coroutines-core-jvm-1.7.3.jar
-9964,kotlinx-coroutines-swing-1.7.3.jar
-996,lets-plot-batik-4.1.0.jar
-996,lets-plot-common-4.1.0.jar
+963,kotlin-stdlib-jdk7-1.8.20.jar
+969,kotlin-stdlib-jdk8-1.8.20.jar
+1548360,kotlinx-coroutines-core-jvm-1.8.0.jar
+9846,kotlinx-coroutines-swing-1.8.0.jar
+675271,kotlinx-datetime-jvm-0.6.2.jar
+996,lets-plot-batik-4.7.3.jar
+996,lets-plot-common-4.7.3.jar
 356564,log4j-1.2-api-2.22.1.jar
 335001,log4j-api-2.22.1.jar
 1900022,log4j-core-2.22.1.jar
@@ -113,12 +114,12 @@
 65261,oro-2.0.8.jar
 1314621,ph-commons-10.2.5.jar
 530791,ph-css-6.5.0.jar
-133403,platf-awt-jvm-4.1.0.jar
-81351,platf-batik-jvm-4.1.0.jar
-1353287,plot-api-jvm-4.5.0.jar
-1614468,plot-base-jvm-4.1.0.jar
-1283358,plot-builder-jvm-4.1.0.jar
-969648,plot-stem-jvm-4.1.0.jar
+182088,platf-awt-4.7.3.jar
+88933,platf-batik-4.7.3.jar
+1525466,plot-api-jvm-4.11.2.jar
+2039714,plot-base-jvm-4.7.3.jar
+1471910,plot-builder-jvm-4.7.3.jar
+1482543,plot-stem-jvm-4.7.3.jar
 11640,reactive-streams-1.0.4.jar
 1383644,rhino-1.7.14.jar
 1297525,rsyntaxtextarea-3.3.4.jar
@@ -134,7 +135,7 @@
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
-678189,xmlgraphics-commons-2.9.jar
+686441,xmlgraphics-commons-2.11.jar
 7188,xmlpull-1.1.3.1.jar
 1027769,xmlresolver-5.2.1-data.jar
 165689,xmlresolver-5.2.1.jar

From 2d9182383f996cb665eada88c2e3767b53aa9389 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:37:19 +0300
Subject: [PATCH 0883/1037] chore: bump org.bouncycastle to 1.82

---
 src/bom-thirdparty/build.gradle.kts |  6 +++---
 src/components/build.gradle.kts     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1bd99acc94a..6e79280cc7a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -119,9 +119,9 @@ dependencies {
         api("org.apache.velocity:velocity:1.7")
         api("org.apache.xmlgraphics:xmlgraphics-commons:2.11")
         api("org.apiguardian:apiguardian-api:1.1.2")
-        api("org.bouncycastle:bcmail-jdk15on:1.70")
-        api("org.bouncycastle:bcpkix-jdk15on:1.70")
-        api("org.bouncycastle:bcprov-jdk15on:1.70")
+        api("org.bouncycastle:bcmail-jdk18on:1.82")
+        api("org.bouncycastle:bcpkix-jdk18on:1.82")
+        api("org.bouncycastle:bcprov-jdk18on:1.82")
         api("org.brotli:dec:0.1.2")
         api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 49631f641c6..111475b0906 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -78,13 +78,13 @@ dependencies {
     }
     implementation("com.miglayout:miglayout-swing")
     // we use bcmail for compilation only, and bcmail is not shipped in the release
-    compileOnly("org.bouncycastle:bcmail-jdk15on")
-    compileOnly("org.bouncycastle:bcpkix-jdk15on")
-    compileOnly("org.bouncycastle:bcprov-jdk15on")
+    compileOnly("org.bouncycastle:bcmail-jdk18on")
+    compileOnly("org.bouncycastle:bcpkix-jdk18on")
+    compileOnly("org.bouncycastle:bcprov-jdk18on")
     // Certain tests use bouncycastle, so it is added to test classpath
-    testRuntimeOnly("org.bouncycastle:bcmail-jdk15on")
-    testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on")
-    testRuntimeOnly("org.bouncycastle:bcprov-jdk15on")
+    testRuntimeOnly("org.bouncycastle:bcmail-jdk18on")
+    testRuntimeOnly("org.bouncycastle:bcpkix-jdk18on")
+    testRuntimeOnly("org.bouncycastle:bcprov-jdk18on")
     testImplementation("nl.jqno.equalsverifier:equalsverifier")
     testImplementation(testFixtures(projects.src.testkitWiremock))
     testFixturesImplementation(testFixtures(projects.src.core))

From 64887f0ad410769c6dc5e92380a8f3b97659bd71 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 27 Oct 2025 21:40:42 +0300
Subject: [PATCH 0884/1037] chore: bump commons-lang3 for checkstyle task to
 3.19.0

See https://github.com/apache/maven-doxia/issues/1006
---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index a4e03b9bed8..e9ccf15cba0 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -31,6 +31,12 @@ configurations.checkstyle {
     }
 }
 
+dependencies {
+    constraints {
+        "checkstyle"("org.apache.commons:commons-lang3:3.19.0")
+    }
+}
+
 checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")

From c6c6c07e5c8def261959c9abda8f64ca839ed392 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 27 Oct 2025 17:27:23 +0000
Subject: [PATCH 0885/1037] fix(deps): update dependency dnsjava:dnsjava to v3,
 support ip:host for custom resolvers

---
 gradle/verification-keyring.keys              |  44 +++
 gradle/verification-metadata.xml              |   6 +
 src/bom-thirdparty/build.gradle.kts           |   2 +-
 src/dist/src/dist/expected_release_jars.csv   |   2 +-
 src/licenses/build.gradle.kts                 |   2 +-
 .../http/control/DNSCacheManager.java         |  94 ++++++-
 .../protocol/http/control/DnsManagerTest.java |  62 -----
 .../http/control/DNSCacheManagerTest.kt       | 112 +++++++-
 .../protocol/http/util/MockDnsServer.kt       | 250 ++++++++++++++++++
 9 files changed, 501 insertions(+), 73 deletions(-)
 delete mode 100644 src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/MockDnsServer.kt

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 72f64f77dd9..6aac783a607 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -4120,6 +4120,50 @@ x/uXMcOo9YWnMc38gnN+Em4HltkFgKPpM3lPzjN9DqJg5VlBkGUL9Xnm4os=
 =M/EH
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    0CA7139CBC7026F9
+uid    dnsjava <dev@dnsjava.org>
+
+sub    6DA2B39D3A4085B5
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+PeLQQS4CUQM4f21Ij/FbUFuptPs=
+=1Vdr
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    0D3B328562A119A7
 uid    Aleksey Shipilev <aleksey@shipilev.net>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 727aae1b236..06a1536bada 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -259,6 +259,7 @@
             <trusting group="com.github.tomakehurst"/>
             <trusting group="org.wiremock" name="wiremock" version="3.0.1"/>
          </trusted-key>
+         <trusted-key id="E06A36F67D8C1BD13F1F278D0CA7139CBC7026F9" group="dnsjava" name="dnsjava" version="3.6.3"/>
          <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections"/>
          <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D" group="org.springframework"/>
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
@@ -615,6 +616,11 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.ow2" name="ow2" version="1.5.1">
          <artifact name="ow2-1.5.1.pom">
             <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6e79280cc7a..0ba7064d265 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
         api("commons-lang:commons-lang:2.6")
         api("commons-logging:commons-logging:1.3.5")
         api("commons-net:commons-net:3.12.0")
-        api("dnsjava:dnsjava:2.1.9")
+        api("dnsjava:dnsjava:3.6.3")
         api("io.burt:jmespath-core:0.6.0")
         api("io.burt:jmespath-jackson:0.6.0")
         api("javax.activation:javax.activation-api:1.2.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 137ad6251ca..3321bc7501a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -49,7 +49,7 @@
 217795,darklaf-windows-2.7.3.jar
 362793,datamodel-jvm-4.7.3.jar
 98115,dec-0.1.2.jar
-320748,dnsjava-2.1.9.jar
+588267,dnsjava-3.6.3.jar
 16829,error_prone_annotations-2.24.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index e2292467861..6a0ef80a107 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -104,7 +104,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     // That enables to have "version-independent" MIT license in licenses/slf4j-api, and
     // it would be copied provided the detected license for slf4j-api is MIT.
 
-    overrideLicense("dnsjava:dnsjava:2.1.9") {
+    overrideLicense("dnsjava:dnsjava:3.6.3") {
         expectedLicense = SpdxLicense.BSD_2_Clause
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index 8b67fa1f760..7af898b28d5 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -19,7 +19,9 @@
 
 import java.io.Serializable;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -46,6 +48,7 @@
 import org.xbill.DNS.Lookup;
 import org.xbill.DNS.Record;
 import org.xbill.DNS.Resolver;
+import org.xbill.DNS.SimpleResolver;
 import org.xbill.DNS.TextParseException;
 import org.xbill.DNS.Type;
 
@@ -121,13 +124,22 @@ Resolver getResolver() {
     private Resolver createResolver() {
         CollectionProperty dnsServers = getServers();
         try {
-            String[] serverNames = new String[dnsServers.size()];
-            int index = 0;
+            List<Resolver> resolvers = new ArrayList<>();
             for (JMeterProperty jMeterProperty : dnsServers) {
-                serverNames[index] = jMeterProperty.getStringValue();
-                index++;
+                // it can be either ipv4 or ipv6
+                String hostPort = jMeterProperty.getStringValue();
+                InetSocketAddress address = parseHostPort(hostPort);
+                // dnsjava needs resolved address
+                InetSocketAddress resolvedDnsServer = new InetSocketAddress(address.getHostString(), address.getPort());
+                // Check if the address is unresolved (hostname couldn't be resolved or invalid IP format)
+                if (resolvedDnsServer.isUnresolved()) {
+                    throw new UnknownHostException("Cannot resolve DNS server address: " + hostPort);
+                }
+                SimpleResolver resolver = new SimpleResolver(resolvedDnsServer);
+                resolver.setTimeout(ExtendedResolver.DEFAULT_TIMEOUT); // it was previously in new ExtendedResolver(String[])
+                resolvers.add(resolver);
             }
-            ExtendedResolver result = new ExtendedResolver(serverNames);
+            ExtendedResolver result = new ExtendedResolver(resolvers);
             if (log.isDebugEnabled()) {
                 log.debug("Using DNS Resolvers: {}", Arrays.asList(result.getResolvers()));
             }
@@ -141,6 +153,73 @@ private Resolver createResolver() {
         }
     }
 
+    /**
+     * Parses a hostPort string into an InetSocketAddress.
+     * Supports formats:
+     * - hostname (e.g., "one.one.one.one")
+     * - IPv4 (e.g., "1.1.1.1")
+     * - IPv6 (e.g., "::1", "2001:db8::1", "ff06:0:0:0:0:0:0:c3")
+     * - hostname:port (e.g., "one.one.one.one:53")
+     * - IPv4:port (e.g., "1.1.1.1:53")
+     * - [IPv6]:port (e.g., "[::1]:53", "[ff06:0:0:0:0:0:0:c3]:53")
+     *
+     * @param hostPort the host and optional port string
+     * @return InetSocketAddress with default port 53 if not specified
+     * @throws UnknownHostException if the format is invalid
+     */
+    @VisibleForTesting
+    static InetSocketAddress parseHostPort(String hostPort) throws UnknownHostException {
+        String host;
+        int port = 53; // Default DNS port
+
+        if (hostPort.startsWith("[")) {
+            // IPv6 with optional port: [::1] or [::1]:53
+            int closeBracket = hostPort.lastIndexOf(']');
+            if (closeBracket == -1) {
+                throw new UnknownHostException("Invalid IPv6 address format: " + hostPort);
+            }
+            host = hostPort.substring(1, closeBracket);
+            if (closeBracket + 1 < hostPort.length()) {
+                if (hostPort.charAt(closeBracket + 1) == ':') {
+                    try {
+                        port = Integer.parseInt(hostPort.substring(closeBracket + 2));
+                    } catch (NumberFormatException e) {
+                        throw new UnknownHostException("Invalid port in: " + hostPort);
+                    }
+                } else {
+                    throw new UnknownHostException("Invalid format after IPv6 address: " + hostPort);
+                }
+            }
+        } else {
+            // Could be:
+            //   * single colon: hostname:port, IPv4:port
+            //   * 0 or 2+ colons: hostname, IPv4, or bare IPv6
+            // Single colon means
+            int firstColon = hostPort.indexOf(':');
+            int secondColon = firstColon == -1 ? -1 : hostPort.indexOf(':', firstColon + 1);
+
+            if (firstColon == -1 || secondColon != -1) {
+                // Zero or 2+ colons indicate bare IPv4, bare hostname, or bare IPv6 address
+                // Examples: ::1, 2001:db8::1, ff06:0:0:0:0:0:0:c3
+                host = hostPort;
+            } else {
+                // Single colon: check if it's a port separator
+                int colonPos = hostPort.indexOf(':');
+                String possiblePort = hostPort.substring(colonPos + 1);
+                try {
+                    port = Integer.parseInt(possiblePort);
+                    // It's a valid port, so everything before is the host
+                    host = hostPort.substring(0, colonPos);
+                } catch (NumberFormatException e) {
+                    // Not a port, treat entire string as host
+                    host = hostPort;
+                }
+            }
+        }
+
+        return InetSocketAddress.createUnresolved(host, port);
+    }
+
     /**
      * Resolves address using system or custom DNS resolver
      */
@@ -270,7 +349,7 @@ private InetAddress[] customRequestLookup(String host) throws UnknownHostExcepti
             Lookup lookup = new Lookup(host, Type.A);
             lookup.setCache(lookupCache);
             if (timeoutMs > 0) {
-                resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000);
+                resolver.setTimeout(Duration.ofMillis(timeoutMs));
             }
             lookup.setResolver(resolver);
             Record[] records = lookup.run();
@@ -281,6 +360,9 @@ private InetAddress[] customRequestLookup(String host) throws UnknownHostExcepti
             for (int i = 0; i < records.length; i++) {
                 addresses[i] = ((ARecord) records[i]).getAddress();
             }
+        } catch (java.nio.channels.UnresolvedAddressException uae) {
+            // Thrown when DNS server address itself couldn't be resolved
+            throw new UnknownHostException("DNS server address is unresolved: " + uae.getMessage());
         } catch (TextParseException tpe) { // NOSONAR Exception handled
             log.debug("Failed to create Lookup object for host:{}, error message:{}", host, tpe.toString());
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java
deleted file mode 100644
index 1f52c9c9d71..00000000000
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.http.control;
-
-import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
-import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
-import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
-import org.apache.jmeter.protocol.http.sampler.ResultAsString;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.wiremock.WireMockExtension;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-@ExtendWith(WireMockExtension.class)
-public class DnsManagerTest {
-    @ParameterizedTest
-    @MethodSource("org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory#getImplementations")
-    void badDnsInCustomResolverShouldFailHttpSampler(String httpImplementation, WireMockServer server) {
-        Assumptions.assumeTrue(!HTTPSamplerFactory.IMPL_JAVA.equals(httpImplementation),
-                "Java implementation does not support custom DNS resolver yet");
-        DNSCacheManager dns = new DNSCacheManager();
-        dns.setCustomResolver(true);
-        dns.addServer("20.0.118.11");
-        // By default it uses 3 retries (see org.xbill.DNS.ExtendedResolver#setRetries)
-        dns.setTimeoutMs(2000);
-        HTTPSamplerBase http = HTTPSamplerFactory.newInstance(httpImplementation);
-        http.setDNSResolver(dns);
-        http.setMethod(HTTPSampler.GET);
-        http.setPort(server.port());
-        http.setDomain("localhost");
-        http.setPath("/index.html");
-
-        http.setRunningVersion(true);
-
-        SampleResult result = http.sample();
-        Assertions.assertEquals(
-                "Non HTTP response message: Failed to resolve host name: localhost",
-                result.getResponseMessage(), () ->
-                        "HTTP is using a custom DNS resolver, so it must fail resolving localhost \n" +
-                                ResultAsString.toString(result));
-    }
-}
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
index 1c23d84a4a5..d56144eb3a6 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt
@@ -17,20 +17,37 @@
 
 package org.apache.jmeter.protocol.http.control
 
+import com.github.tomakehurst.wiremock.WireMockServer
+import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.get
+import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
+import org.apache.jmeter.protocol.http.sampler.HTTPSampler
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory
+import org.apache.jmeter.protocol.http.sampler.ResultAsString
+import org.apache.jmeter.protocol.http.util.MockDnsServer
+import org.apache.jmeter.wiremock.WireMockExtension
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty
+import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.api.fail
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.MethodSource
 import org.xbill.DNS.ExtendedResolver
 import org.xbill.DNS.ResolverConfig
+import java.net.Inet4Address
+import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.UnknownHostException
 
+@ExtendWith(WireMockExtension::class)
 class DNSCacheManagerTest {
 
     companion object {
@@ -120,7 +137,7 @@ class DNSCacheManagerTest {
     fun `Valid DNS resolves and caches with custom resolve true`() {
         assumeLocalDnsResolverOK()
         for (dns in VALID_DNS_SERVERS) {
-            sut.addServer(dns)
+            sut.addServer(dns.hostString)
         }
         sut.isCustomResolver = true
         sut.timeoutMs = 5000
@@ -134,7 +151,7 @@ class DNSCacheManagerTest {
     fun `Cache should be used where entries exist`() {
         assumeLocalDnsResolverOK()
         for (dns in VALID_DNS_SERVERS) {
-            sut.addServer(dns)
+            sut.addServer(dns.hostString)
         }
         sut.isCustomResolver = true
         sut.timeoutMs = 5000
@@ -190,4 +207,95 @@ class DNSCacheManagerTest {
         }
         assertNull(sut.resolver, ".resolver")
     }
+
+    @ParameterizedTest
+    @MethodSource("org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory#getImplementations")
+    fun `custom resolver should use mock DNS server to resolve host`(
+        httpImplementation: String,
+        server: WireMockServer
+    ) {
+        assumeTrue(
+            httpImplementation != HTTPSamplerFactory.IMPL_JAVA,
+            "Java implementation does not support custom DNS resolver yet"
+        )
+
+        // Set up WireMock to respond to requests
+        server.stubFor(
+            get(urlEqualTo("/index.html"))
+                .willReturn(
+                    aResponse()
+                        .withStatus(200)
+                        .withBody("OK")
+                )
+        )
+
+        val testDomainName = "non.existing.domain.for.tests"
+        // Resolve
+        val mockDnsServer = MockDnsServer(
+            answers = mapOf(
+                // This should map to WireMock listen address, and it is not clear
+                // how to tell if WireMock listens on IPv4 or IPv6
+                testDomainName to listOf("127.0.0.1")
+            )
+        )
+
+        mockDnsServer.start()
+        try {
+            // Use a custom DNS resolver with a mock DNS server
+            val dns = DNSCacheManager().apply {
+                isCustomResolver = true
+                addServer(
+                    when (mockDnsServer.localAddress) {
+                        is Inet4Address -> "127.0.0.1"
+                        is Inet6Address -> "[::1]"
+                        else -> TODO("Unexpected address type of mockDnsServer.localAddress: ${mockDnsServer.localAddress::class.simpleName}")
+                    } + ":" + mockDnsServer.boundPort
+                )
+            }
+
+            val http = HTTPSamplerFactory.newInstance(httpImplementation).apply {
+                dnsResolver = dns
+                method = HTTPSampler.GET
+                port = server.port()
+                domain = testDomainName
+                path = "/index.html"
+                isRunningVersion = true
+            }
+
+            val result = http.sample()
+
+            assertTrue(result.isSuccessful) {
+                "HTTP request should succeed using custom DNS resolver with mock DNS server. " +
+                    "Response: ${result.responseMessage}\n" +
+                    ResultAsString.toString(result)
+            }
+
+            assertEquals("200", result.responseCode) {
+                "Expected 200 response code\n${ResultAsString.toString(result)}"
+            }
+        } finally {
+            mockDnsServer.close()
+        }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        "one.one.one.one, one.one.one.one, 53",
+        "1.1.1.1, 1.1.1.1, 53",
+        "::1, ::1, 53",
+        "one.one.one.one:8053, one.one.one.one, 8053",
+        "1.1.1.1:53, 1.1.1.1, 53",
+        "[::1]:53, ::1, 53",
+        "127.0.0.1:53, 127.0.0.1, 53",
+        "ff06:0:0:0:0:0:0:c3, ff06:0:0:0:0:0:0:c3, 53",
+        "2001:db8:85a3:0:0:8a2e:370:7334, 2001:db8:85a3:0:0:8a2e:370:7334, 53",
+        "[ff06:0:0:0:0:0:0:c3]:8053, ff06:0:0:0:0:0:0:c3, 8053"
+    )
+    fun parseHostPort(input: String, expectedHost: String, expectedPort: Int) {
+        val addr = DNSCacheManager.parseHostPort(input)
+        assertAll(
+            { assertEquals(expectedHost, addr.hostString) { "host from $input" } },
+            { assertEquals(expectedPort, addr.port) { "port from $input" } }
+        )
+    }
 }
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/MockDnsServer.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/MockDnsServer.kt
new file mode 100644
index 00000000000..bc4cacb46df
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/util/MockDnsServer.kt
@@ -0,0 +1,250 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.util
+
+import org.slf4j.LoggerFactory
+import org.xbill.DNS.AAAARecord
+import org.xbill.DNS.ARecord
+import org.xbill.DNS.Message
+import org.xbill.DNS.Name
+import org.xbill.DNS.Rcode
+import org.xbill.DNS.Record
+import org.xbill.DNS.Section
+import org.xbill.DNS.Type
+import java.io.Closeable
+import java.net.DatagramPacket
+import java.net.DatagramSocket
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.time.Duration
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * A lightweight mock DNS server for testing purposes.
+ *
+ * Supports A and AAAA record queries with configurable responses. Useful for testing
+ * DNS resolution behavior without requiring external DNS infrastructure.
+ *
+ * Example usage:
+ * ```
+ * val server = MockDnsServer(
+ *     answers = mapOf("example.com" to listOf("192.0.2.1", "2001:db8::1"))
+ * )
+ * server.start()
+ * // ... perform tests using server.boundPort() ...
+ * server.close()
+ * ```
+ *
+ * @param port The port to bind to (0 = auto-assign)
+ * @param answers Static hostname-to-IP mappings (hostname without trailing dot)
+ * @param ttl Time-to-live for DNS records
+ * @param soTimeout Socket timeout for graceful shutdown checks
+ * @param answerProvider Custom record provider for dynamic responses (overrides [answers])
+ */
+class MockDnsServer(
+    private val port: Int = 0,
+    private val answers: Map<String, List<String>> = emptyMap(),
+    private val ttl: Duration = Duration.ofSeconds(60),
+    private val soTimeout: Duration = Duration.ofMillis(250),
+    private val answerProvider: ((Name, Int, Int) -> List<Record>)? = null
+) : Closeable {
+    companion object {
+        private val logger = LoggerFactory.getLogger(MockDnsServer::class.java)
+        private const val UDP_SIZE = 512
+    }
+
+    private val running = AtomicBoolean(false)
+    private val requests = AtomicInteger(0)
+    private val receivedQueries = ConcurrentLinkedQueue<QueryInfo>()
+
+    /**
+     * Returns the number of DNS queries received by this server.
+     */
+    val requestCount: Int get() = requests.get()
+
+    /**
+     * Returns a list of all DNS queries received by this server.
+     * Useful for test assertions.
+     */
+    fun getReceivedQueries(): List<QueryInfo> = receivedQueries.toList()
+
+    /**
+     * Clears the history of received queries.
+     */
+    fun clearQueryHistory() = receivedQueries.clear()
+
+    /**
+     * Information about a received DNS query.
+     */
+    data class QueryInfo(
+        val name: String,
+        val type: Int,
+        val typeName: String,
+        val dclass: Int
+    )
+
+    // single-thread executor for serving; daemon thread to not hang JVM
+    private val executor: ExecutorService = Executors.newSingleThreadExecutor { r ->
+        Thread(r, "mock-dns-server-$port").apply { isDaemon = true }
+    }
+
+    @Volatile private var socket: DatagramSocket? = null
+
+    var boundPort: Int = -1
+        private set
+
+    val localAddress: InetAddress get() = socket!!.localAddress
+
+    /**
+     * Starts the DNS server on the configured port.
+     *
+     * @return The port the server is bound to
+     * @throws IllegalStateException if port is invalid
+     * @throws java.net.BindException if port is already in use
+     */
+    fun start(): Int {
+        if (!running.compareAndSet(false, true)) return boundPort // idempotent
+
+        require(port in 0..65535) { "Port must be in range 0-65535, got: $port" }
+
+        try {
+            val ds = DatagramSocket(port)
+            ds.soTimeout = soTimeout.toMillis().toInt()
+            socket = ds
+            boundPort = (ds.localSocketAddress as InetSocketAddress).port
+            logger.debug("MockDnsServer started on port $boundPort")
+            executor.execute { serve(ds) }
+            return boundPort
+        } catch (e: Exception) {
+            running.set(false)
+            throw e
+        }
+    }
+
+    private fun serve(ds: DatagramSocket) {
+        val buf = ByteArray(UDP_SIZE)
+        while (running.get()) {
+            try {
+                val packet = DatagramPacket(buf, buf.size)
+                ds.receive(packet) // times out periodically due to soTimeout
+                requests.incrementAndGet()
+                val request = Message(packet.data)
+                val response = buildResponse(request)
+                val wire = response.toWire()
+                val out = DatagramPacket(wire, wire.size, packet.address, packet.port)
+                ds.send(out)
+            } catch (e: java.net.SocketTimeoutException) {
+                // loop again, check running flag
+            } catch (e: Exception) {
+                if (running.get()) {
+                    logger.debug("MockDnsServer error while serving", e)
+                } else {
+                    break
+                }
+            }
+        }
+    }
+
+    private fun buildResponse(req: Message): Message {
+        val q = req.getQuestion()
+
+        // Record query for test inspection
+        receivedQueries.offer(
+            QueryInfo(
+                name = q.name.toString(true).trimEnd('.'),
+                type = q.type,
+                typeName = Type.string(q.type),
+                dclass = q.dClass
+            )
+        )
+
+        val resp = Message(req.header.id)
+        resp.addRecord(q, Section.QUESTION)
+        resp.header.rcode = Rcode.NOERROR
+        val records = provideRecords(q.name, q.type, q.dClass)
+        if (records.isEmpty()) {
+            resp.header.rcode = Rcode.NXDOMAIN
+        } else {
+            records.forEach { resp.addRecord(it, Section.ANSWER) }
+        }
+        return resp
+    }
+
+    private fun provideRecords(name: Name, type: Int, dclass: Int): List<Record> {
+        answerProvider?.let { return it(name, type, dclass) }
+        val key = name.toString(true).trimEnd('.') // canonical hostname key
+        val ips = answers[key] ?: return emptyList()
+        val ttl = this.ttl.toSeconds()
+        return ips.mapNotNull { ip ->
+            try {
+                val addr = InetAddress.getByName(ip)
+                val recordType = if (addr.address.size == 4) Type.A else Type.AAAA
+
+                // Return record only if query type matches or is ANY
+                when {
+                    type == Type.ANY -> when (recordType) {
+                        Type.A -> ARecord(name, dclass, ttl, addr)
+                        Type.AAAA -> AAAARecord(name, dclass, ttl, addr)
+                        else -> null
+                    }
+                    type == recordType -> when (recordType) {
+                        Type.A -> ARecord(name, dclass, ttl, addr)
+                        Type.AAAA -> AAAARecord(name, dclass, ttl, addr)
+                        else -> null
+                    }
+                    else -> null // query type doesn't match this address type
+                }
+            } catch (e: Exception) {
+                logger.debug("Failed to parse IP address: $ip", e)
+                null
+            }
+        }
+    }
+
+    override fun close() {
+        stop()
+    }
+
+    /**
+     * Stops the DNS server gracefully.
+     * This method is idempotent and can be called multiple times safely.
+     */
+    fun stop() {
+        if (!running.compareAndSet(true, false)) return // idempotent
+        logger.debug("Stopping MockDnsServer on port $boundPort")
+        try {
+            socket?.close()
+        } catch (e: Exception) {
+            logger.debug("Error closing socket", e)
+        }
+        socket = null
+        executor.shutdownNow()
+        try {
+            if (!executor.awaitTermination(1, TimeUnit.SECONDS)) {
+                logger.warn("MockDnsServer executor did not terminate in time")
+            }
+        } catch (e: InterruptedException) {
+            Thread.currentThread().interrupt()
+        }
+    }
+}

From 1eefce6a2dc67ea6f2f00a8dde6d8946dd0b4ef9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 29 Oct 2025 12:35:56 +0300
Subject: [PATCH 0886/1037] test: fix CompareAssertionTest flakiness

sampleEnd() caused System.currentTimeMillis(), thus it induces flaky failures
---
 .../kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt b/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
index c33bac5faeb..2d7e008c94a 100644
--- a/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
+++ b/src/components/src/test/kotlin/org/apache/jmeter/assertions/CompareAssertionTest.kt
@@ -39,7 +39,6 @@ class CompareAssertionTest {
         fun simpleResult(data: String, elapsed: Long) =
             SampleResult(0, elapsed).apply {
                 setResponseData(data, Charsets.UTF_8.name())
-                sampleEnd()
             }
 
         @JvmStatic

From d80673665e5437348f4add108c83ef2c3e8e67a6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 10:19:45 +0000
Subject: [PATCH 0887/1037] fix(deps): update dependency io.mockk:mockk to
 v1.14.6

---
 gradle/verification-metadata.xml | 1 +
 src/bom-testing/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 06a1536bada..11a9a138e94 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -200,6 +200,7 @@
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
          <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt" name="json-schema-validator" version="1.5.7"/>
+         <trusted-key id="AF7512AF66FE4004D84DEC8A04C8C902FEFB1A01" group="io.mockk"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus"/>
          <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 1b2ccdb39e6..3fe50af4346 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("org.wiremock:wiremock:3.13.1")
-        api("io.mockk:mockk:1.13.17")
+        api("io.mockk:mockk:1.14.6")
         api("net.bytebuddy:byte-buddy:1.14.11")
         api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
         // activemq-all should not be used as it provides secondary slf4j binding

From 0cd2b605650d80021387d30e890932af5143997b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 29 Oct 2025 21:37:18 +0300
Subject: [PATCH 0888/1037] chore: add mokk pgp signing key

---
 gradle/verification-keyring.keys | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 6aac783a607..ad53fd4cb21 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -3709,6 +3709,18 @@ pKNG3IY=
 =QfmY
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    04C8C902FEFB1A01
+sub    741DB70D5BD02528
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaFhhgRYJKwYBBAHaRw8BAQdA8Tl+3HkVTIQq7QvPzpgZV6i7/z0LabiWTt3G
+fH8CKuy4OARoWGGBEgorBgEEAZdVAQUBAQdAaPAe0Es6+EY3/PwrQP5FynZnJL4x
+BR9vZ6+Z3pYRaxYDAQgHiH4EGBYKACYWIQSvdRKvZv5ABNhN7IoEyMkC/vsaAQUC
+aFhhgQIbDAUJBaOagAAKCRAEyMkC/vsaAX4YAP9RAqd/WoIBEi2Ix9DMStr1mOCF
+xF+S3TSFWPLVVVoo+gD9FGYeKnDDga+F1O3zW0ghkiaYxdpuD21/ySNA0+W3/gc=
+=LFrf
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    0729A0AFF8999A87
 uid    Kotlin Release <kt-a@jetbrains.com>
 

From 0fcfbbeb4ef1e18068725e2afe5cac381234e59e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 18:30:10 +0000
Subject: [PATCH 0889/1037] fix(deps): update org.apache.tika to v3

---
 gradle/verification-metadata.xml    | 5 +++++
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 11a9a138e94..dbff8fb66b7 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -197,6 +197,7 @@
          <trusted-key id="A9C5DF4D22E99998D9875A5110C01C5A2F6059E7" group="commons-fileupload" name="commons-fileupload" version="1.5"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
+         <trusted-key id="AA782B04ABD9E36CF3096037B59D3D0F9F9C8684" group="org.apache.cxf"/>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
          <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt" name="json-schema-validator" version="1.5.7"/>
@@ -293,6 +294,10 @@
          </trusted-key>
          <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
          <trusted-key id="FEABFB0DBD7A754822D35DD9BE6397E958AB7594" group="org.jetbrains.lets-plot"/>
+         <trusted-key id="FEB9209F2F2F3F4664841E55AC107B386692DADD">
+            <trusting group="com.amazonaws"/>
+            <trusting group="software.amazon.awssdk"/>
+         </trusted-key>
          <trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51">
             <trusting group="junit"/>
             <trusting group="org.apiguardian"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 0ba7064d265..b16820de10c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -114,8 +114,8 @@ dependencies {
         api("org.apache.logging.log4j:log4j-core:2.22.1")
         api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1")
         api("org.apache.rat:apache-rat:0.15")
-        api("org.apache.tika:tika-core:1.28.5")
-        api("org.apache.tika:tika-parsers:1.28.5")
+        api("org.apache.tika:tika-core:3.2.3")
+        api("org.apache.tika:tika-parsers:3.2.3")
         api("org.apache.velocity:velocity:1.7")
         api("org.apache.xmlgraphics:xmlgraphics-commons:2.11")
         api("org.apiguardian:apiguardian-api:1.1.2")

From 75ba08441a713995d40cbe53ba8323488c9a62f5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 27 Oct 2025 17:28:29 +0000
Subject: [PATCH 0890/1037] fix(deps): update dependency net.sf.saxon:saxon-he
 to v12

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b16820de10c..4f351f3ba54 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
         api("net.minidev:accessors-smart:2.6.0")
         api("net.minidev:json-smart:2.6.0")
         api("net.sf.jtidy:jtidy:r938")
-        api("net.sf.saxon:Saxon-HE:11.6")
+        api("net.sf.saxon:Saxon-HE:12.9")
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.5.0")
         api("org.apache.commons:commons-dbcp2:2.9.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 3321bc7501a..15b2cbc5f1d 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -67,11 +67,8 @@
 109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
-959302,httpclient5-5.5.1.jar
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
-909490,httpcore5-5.3.6.jar
-242521,httpcore5-h2-5.3.6.jar
 41727,httpmime-4.5.14.jar
 78480,jackson-annotations-2.16.1.jar
 578125,jackson-core-2.16.1.jar
@@ -123,7 +120,7 @@
 11640,reactive-streams-1.0.4.jar
 1383644,rhino-1.7.14.jar
 1297525,rsyntaxtextarea-3.3.4.jar
-5104657,Saxon-HE-11.6.jar
+5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 41125,slf4j-api-1.7.36.jar
 320794,svgSalamander-1.1.4.jar
@@ -137,6 +134,6 @@
 85686,xml-apis-ext-1.3.04.jar
 686441,xmlgraphics-commons-2.11.jar
 7188,xmlpull-1.1.3.1.jar
-1027769,xmlresolver-5.2.1-data.jar
-165689,xmlresolver-5.2.1.jar
+1033122,xmlresolver-5.3.3-data.jar
+167889,xmlresolver-5.3.3.jar
 646504,xstream-1.4.21.jar

From b70634a0122cd30c8cfab628f13c5106db2df035 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 00:23:20 +0000
Subject: [PATCH 0891/1037] fix(deps): update com.helger to 12.0.4

---
 gradle/verification-keyring.keys              | 244 ++++++++++++++++++
 gradle/verification-metadata.xml              |  11 +
 src/bom-thirdparty/build.gradle.kts           |   4 +-
 src/dist/src/dist/expected_release_jars.csv   |  20 +-
 .../http/parser/CssParserCacheLoader.java     |   2 -
 5 files changed, 272 insertions(+), 9 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index ad53fd4cb21..a62ae1b31ba 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -1508,6 +1508,132 @@ cDs10GRLphmPfGxL0wSlJeYPTeu0ujcKKUXkRNO1f1EAcszcfqtP8RZ3kTTzu7w/
 =ZFeE
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    AC107B386692DADD
+uid    AWS SDKs and Tools <aws-dr-tools@amazon.com>
+
+sub    BA7BF054B50BBA5B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=x9Cy
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    AE5A7FB608A0221C
 uid    Robert Scholte <rfscholte@apache.org>
 
@@ -1735,6 +1861,47 @@ cZYUskQLV+tetMac6Lb3AOJ7HzGV3DSn
 =6FIP
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    B59D3D0F9F9C8684
+sub    813F15CDC1270665
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=KK4E
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    B7C3B43D18EAA8B7
 uid    Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <kama@soebes.de>
 
@@ -5779,6 +5946,83 @@ wE0zZV3fOXs1SJRPs0AqwMoUMaKcypgtXhyKJp6YxxuRPvBEVB0Ofz4SKxxjmMBt
 =vFzc
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    37ECFC571637667C
+sub    0E325BECB6962A24
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFu05YQBEADkmjRAiOjT4IG7OFMy+pQOPhu65Kzi64/rRMZ8TcoPZSXWRFF1
+TSOQmpdE0duqgQx7ulpCvuxMEfzRdQMmMsIKD2mhNtY7ZQX4D6T8a3TM5yB8NQLo
+nZWJ11Aqqz7Wfk7XtqbmnQE5XsA+OWUxaNjTF4NX8lsQ8gGsDgjnhImIp//uhTRr
+vYshmcnq9Th/A7dzl+pdlXgKkivgf6pDEApuzAcxBlKfuLz+uJoFv1RdojagiDig
+mCqG+lgLz9S0K78BsuMafE2qLiNJ878zUm0p2GdoNEpDbZZAyxjepdu/sYynP8o/
+GKvtRhHTVGl3Rf0InyvkF5Fp8zMHIHK/YdwwV+zFEIA+TXi09yqXqFZaMeqdBjol
+3QbkWPH1ghpLaCmwdmileGiWx1U/y7axAH470pNFWks3oLGLMx8yztlqDDzzufHu
+lpMOxmg6LH2SCW4+fd/VkqBCZZ82dbvMbq0N4oNHhECO/PRqrmMXVoPAL4d5JM5r
+fkxN86RdelfmyLQCIt5UsV3gbBK7L4j/sULxkYCXaZIUIIqqjapUilDrZqoQ7nzV
+HpMN1YF4fRiXQCpe0AMkqlB90mNvFmdAFRlV+mTRL+XSnwSwN7xYun3Rt1Piag9d
+zYplSG+1Zah87zcBhZMyqZIXGaE4Is3w0hisp3ss2/edYmZabKcb7Wd/fwARAQAB
+uQINBFu05YgBEAC5zhVY+9+aiOj0u20KJGYkc59CgTQxlkLW6gZZdGs2J9D0U4RS
+AKBEShybE/0KaynEOQG5SWBjUXcb2M2SuHzBHymYwih2axqsd7S6mPJawQ1DWNTW
+OX9hPvtoSJZolcCsQNGLCIVn8OxCpyDX7+gZKtNVDrAUYDXWLJ6IqVeUpZmdvXcf
+kUrVsuukjdQIvqo1Wvt6YjJ/VP4FEiU1NPVRjpeUgLt+4BPinlXjs1xsWvai81Dn
+a95mElAbKFcYiOz87LqC8AZyIP4T4F9TCPKpjbs+l4zVqUAmquOjUAKlVVVMEfBp
+Do8IF65knPT9sMgw/tvyBLFT4Qp5BiB/KUtjt7g4Dcn1sUwQqUt3HUPjNNVGsf1i
+Y//muoRw/4HVCxDZdHvSDMCLfzKkveEzoyuhYb44dEXpa/F9qLxpOJUwo4VaaVIN
+9iQdFStmyzsni7b29lxG0Qy+IMs7Z+tZE/5Z8+Q+vq0Ccv5VESl5+JPXPXL7TJEO
+Kaez0w49W4dxSKfWkUxFV1vGpd9lbBGqJuxvYrsPqFo55B/yk33OfAub8ODvBPp7
+LlYnSm+LUg0hrQltw26wg1Yf/+83Ylei83X6mX7kv5/NQNd1Lwz+SSWpmT/DqcKd
+FTZfrcj4api80Q6OJfkxWA/9W9u9fuSLAR3sxyaxZoyJ4ysZ4rtAemUmrQARAQAB
+iQRyBBgBCAAmAhsCFiEE9s5GD9vhqr0alkVnN+z8VxY3ZnwFAmUdMjYFCRLOTi4C
+QAkQN+z8VxY3ZnzBdCAEGQEIAB0WIQRZqOFpc5MB/UgTnKAOMlvstpYqJAUCW7Tl
+iAAKCRAOMlvstpYqJG8vD/wIiDULwyXZ+9qI3QiOAQkg1SzFTdJL2IsM3WIfZx5R
+xGZN5n/v5VtH8QnAXUT7EJsSxFkvVwiusAGzFTi6pNDMZA1pn3SQLHb3AzZm5Q3e
+lEeTs2ta2k77k3AOEoi6LvKM9sU5hWTncPyLLpSlHPtx/coYIwuiX/Ftu7RNwNr1
+8fSB13TbAXfXZk6ikaSFACJm5tWhu8KCOv//4JB70YX8LhnsidOjTTAPAwqwfB6W
+T7LyUPe8Kz4J0Vhzat7dGx8pghA1rUKKJqjzES1/IXefHLJ2geJW83C1kzkm0Gfv
+IsQUOCkw6MN+aYRl7WQFoDA4qrX4Z9Y8dpHr54j24HdItEIB82x+sBts/jaCF9sF
+m8whW114DXCqQ18Htf5TONRM4yIK05aGqg8WDc58c7b+nxGdjEskGyXtokfaj3tI
+m+IAYlGqUprR+7qw64458GVzTLF0yU+7SpBvHjbyuSYWCBP+mlp+P6lh6JnPW9wi
+/s5uDtLV+0TZ0wbQw3A9xAP3b7BkXKcX1zWG749vMbirVRuDwGTYjfyem4PDvLof
+1U6jsgKIjUWroTPpGi4JKru7qXbhhZJDxCqJQ+j8a6CBJW8dyeVfOWCxcNLjw2JA
+6QyUf/ud955uYNVVHVjeQ8Sq4qoyYfTMInNFrJeWaD+tylNelREae4rbOrTe1Oq2
+Wu69D/90RlTh154tA5lV9JEnz7E7cjuQm4XXQIUbdLIDWHQ6Or78H0IwNXRj/u7A
+hKtDoQavGYz8tJJAWAntDy2paTgHGRJwL0/sai4mxtDcWKS/pDFmc2Ot23vDM8tW
+K6YkpvlosZIGjucLLZhK/6ukyXJlXVg0ipQoLTuYS7jGWEpA+/Y9jkjS1mAOj4mG
+rgqEkIoEHjR+dLqVl5lnRV0TlpxVMzVPIp3d0R0y7J4ZGJNAXYuuPtR4DoF2bpkp
+DXnBz1KNzDBsJW5RVE/tjjysWOk+dawntJb5klh3wNW7HIRwc/Ypx5xrdfzEGbv0
+CJkXHhxoxn7/yYy6VsnP91tLXCDeRim6bYbXfwcbwjUDO7pKGpsBkaOD7uXQlYBz
+ERXtcA2CqoY1OB2DFPE1aUQyfrBvAbnXlAkdFaa/H17+A40nT3a4/5FaDx/FZ6wv
+5TYaHeiMu13fZRvzqHVtZyJ8Qw2ioR9JDaBul2iARKANWqc8FV27ctkMKEDFbw+I
+YRRR2d+4K7P9epg1nLpQNm7t2DkHlwLHaEkkfLe8veDdg8L0C7shFrm0lcFDh8lv
++xtNFJtdtbZBMgP+M7Ip7pCflFS9R69RzScYYtjUSSEU3rrL1h22ZwaEM2mS1mK2
+60q6RRdAWVDj44SRhZSj0sxaQeXJgW3y4kfbgxrDAOSuWKAobokEcgQYAQgAJhYh
+BPbORg/b4aq9GpZFZzfs/FcWN2Z8BQJbtOWIAhsCBQkJZgGAAkAJEDfs/FcWN2Z8
+wXQgBBkBCAAdFiEEWajhaXOTAf1IE5ygDjJb7LaWKiQFAlu05YgACgkQDjJb7LaW
+KiRvLw/8CIg1C8Ml2fvaiN0IjgEJINUsxU3SS9iLDN1iH2ceUcRmTeZ/7+VbR/EJ
+wF1E+xCbEsRZL1cIrrABsxU4uqTQzGQNaZ90kCx29wM2ZuUN3pRHk7NrWtpO+5Nw
+DhKIui7yjPbFOYVk53D8iy6UpRz7cf3KGCMLol/xbbu0TcDa9fH0gdd02wF312ZO
+opGkhQAiZubVobvCgjr//+CQe9GF/C4Z7InTo00wDwMKsHwelk+y8lD3vCs+CdFY
+c2re3RsfKYIQNa1Ciiao8xEtfyF3nxyydoHiVvNwtZM5JtBn7yLEFDgpMOjDfmmE
+Ze1kBaAwOKq1+GfWPHaR6+eI9uB3SLRCAfNsfrAbbP42ghfbBZvMIVtdeA1wqkNf
+B7X+UzjUTOMiCtOWhqoPFg3OfHO2/p8RnYxLJBsl7aJH2o97SJviAGJRqlKa0fu6
+sOuOOfBlc0yxdMlPu0qQbx428rkmFggT/ppafj+pYeiZz1vcIv7Obg7S1ftE2dMG
+0MNwPcQD92+wZFynF9c1hu+PbzG4q1Ubg8Bk2I38npuDw7y6H9VOo7ICiI1Fq6Ez
+6RouCSq7u6l24YWSQ8QqiUPo/GuggSVvHcnlXzlgsXDS48NiQOkMlH/7nfeebmDV
+VR1Y3kPEquKqMmH0zCJzRayXlmg/rcpTXpURGnuK2zq03tTqtlpU8g//fEPdELfW
+IFiAcUKDqg27h+nRD8SE1gXDE/WOQ+6Ad6DPmBF5/lMGFa0GK/xSyIpE45C6eoyK
+y9C36XMglsSBrkHhgEWSlvmNEdIKdwpxTtbY4iLSERDrZ8HsMqZD72L1Pct6UfCa
+2dB21kf8bY5oHHrfmWJlB8ZfqZSUW2Rewtjk5MkMQjhnowHqiYO2+Y7Yp0aK6wi8
+zKfQ2hZGVxBXYNvQ40k3nlJVE6gjXk/6SWZFDEKNsAEy11Tr3h25jal4kuCgXO0x
+jfo/E0NtZnb1WAe0Vz5PFyLRY909EGj7dmHeaCRcTmi/TXzYbbAFQdDslZV2t6mK
+iWWPSLHHdC8jEyQW28V3rqGtEVBa0jjTsf6WMtvEbLD4j+au5C3hx24p9lfPR4oO
+71nAlgwAKVA321nuaduVcdhaPOnTpUtibV/gO988UJZYKqoeozC22XEAgd7edCqd
+MyJoqB2u4OY9DR6DqCZji9eE0NrG8fCmc+qTLDY0nd3XP7sivzOhPlJLpV78m6a2
+aNVTkZXoxDxKe8bLomIO8mGJBepL2cU1Y+jhlDcrUNvQDP55jN0XVCXvEPOnwq5x
+UYduqWspwPw6gkfg3vvYZRsaK8tT1WouhwQ9UOl/vJgYVD4Yt7RYCdA28GATTgAf
+X+6qOD4CgbDYd2jOK/xPN/fEt00FppRFrZ4=
+=bgDK
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    38F47D3E410C47B1
 uid    Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index dbff8fb66b7..12a731815c0 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -135,6 +135,7 @@
             <trusting group="org.eclipse.jetty"/>
             <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
          </trusted-key>
+         <trusted-key id="59A8E169739301FD48139CA00E325BECB6962A24" group="jakarta.annotation" name="jakarta.annotation-api" version="3.0.0"/>
          <trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
@@ -549,11 +550,21 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.9">
+         <artifact name="project-1.0.9.pom">
+            <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.glassfish.jaxb" name="jaxb-bom" version="4.0.5">
+         <artifact name="jaxb-bom-4.0.5.pom">
+            <sha256 value="ec97ec42d937d3c89519797e44246f80de0850819ac7a7ae675c4497b7075c39" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-5.2.0.pom">
             <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4f351f3ba54..a09704537af 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -55,8 +55,8 @@ dependencies {
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.24.0")
-        api("com.helger.commons:ph-commons:10.2.5")
-        api("com.helger:ph-css:6.5.0")
+        api("com.helger.commons:ph-commons:12.0.4")
+        api("com.helger:ph-css:8.0.1")
         api("com.jayway.jsonpath:json-path:2.8.0")
         api("com.miglayout:miglayout-core:5.3")
         api("com.miglayout:miglayout-swing:5.3")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 15b2cbc5f1d..1711ea8c62e 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -73,6 +73,7 @@
 78480,jackson-annotations-2.16.1.jar
 578125,jackson-core-2.16.1.jar
 1637611,jackson-databind-2.16.1.jar
+26378,jakarta.annotation-api-3.0.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -109,8 +110,18 @@
 29680,mxparser-1.2.2.jar
 5223562,neo4j-java-driver-4.4.13.jar
 65261,oro-2.0.8.jar
-1314621,ph-commons-10.2.5.jar
-530791,ph-css-6.5.0.jar
+41831,ph-annotations-12.0.4.jar
+508951,ph-base-12.0.4.jar
+31368,ph-cache-12.0.4.jar
+196187,ph-collection-12.0.4.jar
+122576,ph-commons-12.0.4.jar
+525513,ph-css-8.0.1.jar
+119770,ph-datetime-12.0.4.jar
+148153,ph-io-12.0.4.jar
+40268,ph-mime-12.0.4.jar
+41515,ph-statistics-12.0.4.jar
+158210,ph-text-12.0.4.jar
+83971,ph-typeconvert-12.0.4.jar
 182088,platf-awt-4.7.3.jar
 88933,platf-batik-4.7.3.jar
 1525466,plot-api-jvm-4.11.2.jar
@@ -122,12 +133,11 @@
 1297525,rsyntaxtextarea-3.3.4.jar
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
-41125,slf4j-api-1.7.36.jar
+69908,slf4j-api-2.0.17.jar
 320794,svgSalamander-1.1.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
-736051,tika-core-1.28.5.jar
-1588025,tika-parsers-1.28.5.jar
+778543,tika-core-3.2.3.jar
 3455761,xalan-2.7.3.jar
 1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
index 43aedc9471b..be3dd482ce6 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.github.benmanes.caffeine.cache.CacheLoader;
-import com.helger.css.ECSSVersion;
 import com.helger.css.decl.CSSDeclaration;
 import com.helger.css.decl.CSSExpressionMemberTermURI;
 import com.helger.css.decl.CSSImportRule;
@@ -56,7 +55,6 @@ public URLCollection load(CssParser.CssCacheKey triple)
         final CSSReaderSettings readerSettings = new CSSReaderSettings()
                 .setBrowserCompliantMode(true)
                 .setFallbackCharset(charset)
-                .setCSSVersion(ECSSVersion.CSS30)
                 .setCustomErrorHandler(new LoggingCSSParseErrorHandler())
                 .setUseSourceLocation(false)
                 .setCustomExceptionHandler(

From 60be7121b906bb88c4a01c2a530ef9978f8dd6d8 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 29 Oct 2025 21:59:18 +0300
Subject: [PATCH 0892/1037] chore: replace log4j-slf4j-impl with
 log4j-slf4j2-impl to account for slf4j 2.0 switch

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/core/build.gradle.kts                   | 2 +-
 src/dist-check/build.gradle.kts             | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a09704537af..5f2c1a278bf 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -112,7 +112,7 @@ dependencies {
         api("org.apache.logging.log4j:log4j-1.2-api:2.22.1")
         api("org.apache.logging.log4j:log4j-api:2.22.1")
         api("org.apache.logging.log4j:log4j-core:2.22.1")
-        api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1")
+        api("org.apache.logging.log4j:log4j-slf4j2-impl:2.22.1")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:3.2.3")
         api("org.apache.tika:tika-parsers:3.2.3")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index fb3a14338e6..4f0b2239ce3 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
     kapt("org.apache.logging.log4j:log4j-core") {
         because("Generates a plugin cache file for GuiLogEventAppender")
     }
-    api("org.apache.logging.log4j:log4j-slf4j-impl") {
+    api("org.apache.logging.log4j:log4j-slf4j2-impl") {
         because("Both log4j and slf4j are included, so it makes sense to just add log4j->slf4j bridge as well")
     }
     api("org.apiguardian:apiguardian-api")
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index e01f4bb449c..00d5edb3961 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
     loggingClasspath("org.apache.logging.log4j:log4j-api")
     loggingClasspath("org.apache.logging.log4j:log4j-core")
     loggingClasspath("org.apache.logging.log4j:log4j-1.2-api")
-    loggingClasspath("org.apache.logging.log4j:log4j-slf4j-impl")
+    loggingClasspath("org.apache.logging.log4j:log4j-slf4j2-impl")
 }
 
 val libOpt = copySpec {
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 1711ea8c62e..cafb7082db3 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -102,7 +102,7 @@
 356564,log4j-1.2-api-2.22.1.jar
 335001,log4j-api-2.22.1.jar
 1900022,log4j-core-2.22.1.jar
-24583,log4j-slf4j-impl-2.22.1.jar
+27364,log4j-slf4j2-impl-2.22.1.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar

From 68a9c36ff2dafddf4333a2a141489a6a43ff256b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 19:29:01 +0000
Subject: [PATCH 0893/1037] fix(deps): update dependency
 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin to v4

---
 build-logic/verification/build.gradle.kts |  2 +-
 gradle/verification-metadata.xml          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 4f4b496f939..cda2bc030fd 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
-    api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0")
+    api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.37")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 12a731815c0..dedc3365bb9 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -479,6 +479,11 @@
             <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
+         <artifact name="net.ltgt.errorprone.gradle.plugin-4.3.0.pom">
+            <sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
          <artifact name="gradle-errorprone-plugin-3.1.0.jar">
             <sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -487,6 +492,14 @@
             <sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
+         <artifact name="gradle-errorprone-plugin-4.3.0.jar">
+            <sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-errorprone-plugin-4.3.0.module">
+            <sha256 value="6d2b0a7809ffde227ec15a4cf28e68929be22a1a12a0f56ad5e795d5058f2f6e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="net.sf.ezmorph" name="ezmorph" version="1.0.6">
          <artifact name="ezmorph-1.0.6.jar">
             <sha256 value="2be06a2380f8656426b5c610db694bbd75314caf3e9191affcd7942721398ed7" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 5ee27934c6e8070b03d7a005127422f53394034f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 19:24:35 +0000
Subject: [PATCH 0894/1037] fix(deps): update dependency checkstyle to v12

---
 .../kotlin/build-logic.checkstyle.gradle.kts  |  2 +-
 gradle/verification-metadata.xml              | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index e9ccf15cba0..d9aabdb5527 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -41,7 +41,7 @@ checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "11.1.0"
+    toolVersion = "12.1.1"
     configProperties = mapOf(
         "cache_file" to layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index dedc3365bb9..c6efad0350b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -326,6 +326,16 @@
             <sha256 value="239f3397b79f91a866e6067cf04974146d7e864feb2aa34a9943831c9f6daeab" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="56">
+         <artifact name="oss-parent-56.pom">
+            <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
+         <artifact name="jackson-parent-2.16.pom">
+            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.formdev" name="svgSalamander" version="1.1.2.4">
          <artifact name="svgSalamander-1.1.2.4.pom">
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
@@ -453,6 +463,21 @@
             <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-bom" version="4.1.104.Final">
+         <artifact name="netty-bom-4.1.104.Final.pom">
+            <sha256 value="5a65e06a159d20d3b4800624a570c646dbee710b2b539b3449a268558c289e9c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
+         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
+            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
+         <artifact name="jakartaee-api-parent-9.1.0.pom">
+            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -532,6 +557,11 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="31">
+         <artifact name="apache-31.pom">
+            <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="33">
          <artifact name="apache-33.pom">
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
@@ -563,11 +593,21 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
+         <artifact name="project-1.0.7.pom">
+            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.ee4j" name="project" version="1.0.9">
          <artifact name="project-1.0.9.pom">
             <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
+         <artifact name="jetty-bom-9.4.53.v20231009.pom">
+            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -628,11 +668,21 @@
             <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.10.1">
+         <artifact name="junit-bom-5.10.1.pom">
+            <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.11.4">
          <artifact name="junit-bom-5.11.4.pom">
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="4.11.0">
+         <artifact name="mockito-bom-4.11.0.pom">
+            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -679,6 +729,11 @@
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="oro" name="oro" version="2.0.8">
          <artifact name="oro-2.0.8.jar">
             <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>

From d5e1dd8d99d053bd68026c89a2ec91001a2fe844 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 19:18:44 +0000
Subject: [PATCH 0895/1037] chore(deps): update gradle/actions action to v5

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index bd7516f76b4..4eff276b4e6 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -28,4 +28,4 @@ jobs:
         java-version: 21
         server-id: central
     - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4
+      uses: gradle/actions/dependency-submission@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5

From 3c8dfc0c57136362625236cb8bb697da01d88179 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 20:37:30 +0000
Subject: [PATCH 0896/1037] fix(deps): update dependency
 org.jetbrains:annotations to v26

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5f2c1a278bf..176dcc1df8e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -128,7 +128,7 @@ dependencies {
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.7.3")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.11.2")
-        api("org.jetbrains:annotations:24.1.0")
+        api("org.jetbrains:annotations:26.0.2-1")
         api("org.jodd:jodd-core:5.3.0")
         api("org.jodd:jodd-lagarto:6.0.6")
         api("org.jodd:jodd-log:5.1.6")

From 0435ea971b38c22d2b4ec3d92064f4cf052f2dc1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 20:30:57 +0000
Subject: [PATCH 0897/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v4

---
 gradle/verification-metadata.xml | 15 +++++++++++++++
 src/bom-testing/build.gradle.kts |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c6efad0350b..03e24f689d1 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -557,6 +557,11 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="23">
+         <artifact name="apache-23.pom">
+            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="31">
          <artifact name="apache-31.pom">
             <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
@@ -567,6 +572,11 @@
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="52">
+         <artifact name="commons-parent-52.pom">
+            <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="79">
          <artifact name="commons-parent-79.pom">
             <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
@@ -673,6 +683,11 @@
             <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.10.2">
+         <artifact name="junit-bom-5.10.2.pom">
+            <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.11.4">
          <artifact name="junit-bom-5.11.4.pom">
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 3fe50af4346..ee4ea4abd82 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
         api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.14.6")
         api("net.bytebuddy:byte-buddy:1.14.11")
-        api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
+        api("nl.jqno.equalsverifier:equalsverifier:4.2.1")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.8")
         api("org.apache.activemq:activemq-client:5.16.8")

From aa86d3f549af071b5c403f96413b0550e93abb2b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 29 Oct 2025 19:18:36 +0000
Subject: [PATCH 0898/1037] fix(deps): update org.apache.logging.log4j to
 v2.25.2

---
 gradle/verification-keyring.keys            | 61 +++++++++++++++++++++
 gradle/verification-metadata.xml            | 17 ++++++
 src/bom-thirdparty/build.gradle.kts         |  8 +--
 src/dist/src/dist/expected_release_jars.csv | 10 ++--
 4 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index a62ae1b31ba..506b4349081 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -6201,6 +6201,38 @@ aTBmCu/YU5nL2vvCqIyIQ/Ykapv/YbWaU9b4AV61oVClCiVeY12b0cA=
 =wSYG
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    3F1EB974E7AB9B37
+uid    Peter Kriens (ONLY FOR SIGNING JARS) <Peter.Kriens@aQute.biz>
+
+sub    79F2237F143E7EAD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEqeQPYRBACiaEylrnzFWbHE+Zca8bgA9/iex2gOzLDqtS9+3Uf1y0m/BDj6
+m0VBpDlHDUyd2jcLdewO5If2D/fQ0JIHxBHTWKG0CctL4OB1kDMlF0Ue4mTfbIS0
+wxuqonh4iCoKUFx0SRDRlpAoEQdbIZCdadBOlMv5cWMBABXi3rvc0O/UxwCg9T09
+fqrC2cV1UwkZckw8d7tl+7cD/39P/X30a15SKJWqbQOqjHkS6FVTqS/7Y24n2uDa
+5oTp0RqNOQZH8p+xbgMMepvpIF8KHoHIGNbkUGyzRjjpS3SaQbXnQh9fvyycj/ZE
+3i9RQwulmEqTrHjZag+tTVUto3L5v3ovcsx/lxuLBHorFPyW7fhu0ucA4uAKwNjI
+KgNfBACCKo5HFYLvDoRDmigRGaw8RoIVzRG2XRJDENyFcNm3Vr+YyMgdWWcduuo/
+cOKNZ/ahqidnZ7nZGPZmnyjcNH0eou9eQg8v9sP+v+05uPknqt82OfqVn45iLxpo
+Q14kN8g5b6AuL4WxtfSfKFrn599Qyu81jVvxrBqNFVQLClWE67Q9UGV0ZXIgS3Jp
+ZW5zIChPTkxZIEZPUiBTSUdOSU5HIEpBUlMpIDxQZXRlci5LcmllbnNAYVF1dGUu
+Yml6PrkCDQRKnkD2EAgAs0Uqq3cgR7Bv1U1pK1sC7B2W4mXOmbB9eX9H028KVrsU
+olaKzT5wS7+JYp94SeLtdYKSjQpC1lsfrCs672+5gkgwThBc0GkQ4xAs4G3Qu6G+
+Gy/TK3Sy5UQHy9px5w/tlIfcR7TEOFoJC8Tv93YSBTchP7USktel8kV2eeej6nd5
+JgjVOTMvsRs2p1xVtLL+Mx929IdigqPJKkUYQ7BmbiaZ91mpMk0WB+vDclDzSTCb
+7fMWq4qKdUwUS14lR95xsaQex8KJHyp/i6sJlE2sm8/HS8zKEkXNOK0+U3NaFQqX
+Yhm1w9rsC3vnuaqVWX+PAFDd69N9QP5Sh1XYgAFH2wADBQf/f6rBSnLAVEBGOkIZ
+A75MIVMU2hxlb0HDsyTJ2S8k4jlA7O3kudVAdBVHhtcW4uTxxediC1nK+Ok/KI9w
+/1t1TZBqJdpg5vMxzBJGGTWDu90bE/84AF2IeIyPO1t6F6tfMS/czsZuIFQAc31V
+3E18O4RfVIWJ/Sz+8cFs4hdVMgGOGyqrAcO/dq/AbGIw2Ewrl8hdnakCWvycjC2l
+wErKTARRhFJTEZuYF02tkzpETDWECxj5PzowQ/5VAXojNB5S4lANupNKm7bkzKQv
+Vj3QwqO9Ibmsbu8aC7CbgnYJ9zl6kKRYC3e0AFN5Jo8azDVna+YiuT6JuievZchJ
+p1u//ohJBBgRAgAJBQJKnkD2AhsMAAoJED8euXTnq5s3RMQAn2qf+kdicT5lQYmN
+hg5Z+lb0fDvkAJ96jroWo6RQqdq+KMhly2Lgqh6Jlg==
+=tK2T
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    3FAAD2CD5ECBB314
 sub    3260CB2DEF74135B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -7826,6 +7858,35 @@ lV/Shw==
 =qKIA
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    734AEF3D43509290
+uid    BJ Hargrave (bintray.com osgi organization) <hargrave@us.ibm.com>
+
+sub    49D2ED97DAA8B33F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFRZXAUBCACqPBEjQ7si90PYbccyR/K2tg78HzJfmECvmtE9mKaUpAWGkid8
+xvSWNIunJMqMEyAM6lbyGUE/lQX8k0Ap4qk/UIf9vxdFirmlzD1lhfxDls33Y6et
+TxpsRP2Rm0f6fW01R3L275FAvHLkQcOUQVoD407Eb3al41sYy6vdRZpdTJ923w9X
+ol0a/6G7wueIMNO4TtxLNGSe+WPjtAWmLOl1H2pg2eOcKR2+finbeWpPZPCjR4I1
+CaMcGfdwv/4goI1b/931t0TlKAyGVhCgTa/1DKtRsJazwtw6MQZkE+/8t4JIuSVx
+GlOWUrlU2HCbN+eAHj/5/G0suIw0OZpdtNPBABEBAAG0QUJKIEhhcmdyYXZlIChi
+aW50cmF5LmNvbSBvc2dpIG9yZ2FuaXphdGlvbikgPGhhcmdyYXZlQHVzLmlibS5j
+b20+uQENBFRZXAUBCAC+ddgLBX0/BBS+EH6JiIqbFhclAnMEGwIAGyfk7rpvlwwW
+CFQDYDSRW4AjWwcDV07ckKI+3HQQ+iLD9xwiMWRSyo8RRbuq2xypbPKd4ET4XtMU
+uNweMpuyCgOMceMVUd4LbzilopWzOKCo2NBAExRjMoBGKdTyaCrQ/lEouEGATlzw
+oOcrewUpWKfG0qb+D3XTZ5Dwqo/ylCtE1QlZASJGF8jGEMc9UXkMH2e4cg6GUBbg
+iC0iKA4zwgLKCBaSWNUHt4fhO1pt3pVPrMaFL/3foLpa63xi9DdpL+LXDhIo165T
+KOpXwDaeaZoRNC1qRggeLasxeMfL0Vm9P1DrZteTABEBAAGJATYEGAECAAkFAlRZ
+XAUCGwwAIQkQc0rvPUNQkpAWIQTq/B87L87Wr9BGx9VzSu89Q1CSkI3mB/9MeIad
+HLstPTc+cDgnoBa0vX0cu1GbgVdBAL5fm6bxpt3vgc/MCDPRnajSu3aCrjTEfHPI
+xaa12nKVKtF1+7CVW5Wl/xxkMyJc1VdMr/CcHISarN/A0Ln7bWz8UeLRtB1ubkOM
+fPWPPpHAZQd1NnStFZXjhU/G1gJmv9+K775Fr/KxQIIys2HjZSEx8fnLD2lBnEzk
+1M94RfK2toyHKV3FFiwk2M7s5EqXeMwWK8ByetkWWaLDbgoNgRTdA1lmQ3GmvuDa
+X1UuIWGQzZAhEZU9tUsfMbnAPYvlz2nOGYVtc7VlahAwDzcLg4VXT55yeBr96BbW
+R2kHnSR4SF/5wsOP
+=FJZy
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    7457CA33C3CE9E15
 uid    Colin Decker <cgdecker@google.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 03e24f689d1..58067a5faa0 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -230,6 +230,7 @@
          </trusted-key>
          <trusted-key id="C3259D20DAEC4ACE6D57CC83340B090F727518D8" group="com.google.j2objc" name="j2objc-annotations" version="3.1"/>
          <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
+         <trusted-key id="C668130C58722C9DC1C0FC633F1EB974E7AB9B37" group="biz.aQute.bnd" name="biz.aQute.bnd.annotation" version="7.1.0"/>
          <trusted-key id="C758F9CC982AC877E7B295DD6E97418B04B11DCB" group="org.apache.xbean"/>
          <trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7">
             <trusting group="com.google.code.gson"/>
@@ -277,6 +278,7 @@
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
          <trusted-key id="E9AF5293C334C7C0B583227D2F45F85CDF082E68" group="org.mozilla"/>
          <trusted-key id="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94" group="org.apache.geronimo.specs"/>
+         <trusted-key id="EAFC1F3B2FCED6AFD046C7D5734AEF3D43509290" group="org.osgi"/>
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
          <trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17" group="com.google"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
@@ -331,11 +333,26 @@
             <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="68">
+         <artifact name="oss-parent-68.pom">
+            <sha256 value="25eafd96dae242b6b5a7108f55b2c14015b828daa5abe234289fd6e774a1ce57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.19.1">
+         <artifact name="jackson-bom-2.19.1.pom">
+            <sha256 value="ba6d68eeab3a1cc13a77a8ade2197ff9a32aa1cffeac72847d49badd82e1b9ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
          <artifact name="jackson-parent-2.16.pom">
             <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.19.2">
+         <artifact name="jackson-parent-2.19.2.pom">
+            <sha256 value="639a2b63dd05da4e381081303985caadfbb7ad9f85b1d2320638f6b11f208365" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.formdev" name="svgSalamander" version="1.1.2.4">
          <artifact name="svgSalamander-1.1.2.4.pom">
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 176dcc1df8e..8314c724172 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -109,10 +109,10 @@ dependencies {
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
         api("org.apache.httpcomponents:httpcore:4.4.16")
         api("org.apache.httpcomponents:httpmime:4.5.14")
-        api("org.apache.logging.log4j:log4j-1.2-api:2.22.1")
-        api("org.apache.logging.log4j:log4j-api:2.22.1")
-        api("org.apache.logging.log4j:log4j-core:2.22.1")
-        api("org.apache.logging.log4j:log4j-slf4j2-impl:2.22.1")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.25.2")
+        api("org.apache.logging.log4j:log4j-api:2.25.2")
+        api("org.apache.logging.log4j:log4j-core:2.25.2")
+        api("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2")
         api("org.apache.rat:apache-rat:0.15")
         api("org.apache.tika:tika-core:3.2.3")
         api("org.apache.tika:tika-parsers:3.2.3")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index cafb7082db3..afaf841ffb4 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,5 +1,5 @@
 30245,accessors-smart-2.6.0.jar
-30570,annotations-24.1.0.jar
+31170,annotations-26.0.2-1.jar
 6806,apiguardian-api-1.1.2.jar
 126093,asm-9.7.1.jar
 485992,batik-anim-1.17.jar
@@ -99,10 +99,10 @@
 675271,kotlinx-datetime-jvm-0.6.2.jar
 996,lets-plot-batik-4.7.3.jar
 996,lets-plot-common-4.7.3.jar
-356564,log4j-1.2-api-2.22.1.jar
-335001,log4j-api-2.22.1.jar
-1900022,log4j-core-2.22.1.jar
-27364,log4j-slf4j2-impl-2.22.1.jar
+358528,log4j-1.2-api-2.25.2.jar
+349595,log4j-api-2.25.2.jar
+2018265,log4j-core-2.25.2.jar
+30232,log4j-slf4j2-impl-2.25.2.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar

From a5a4bcee19d0f49248be3b36b47f2eb28bf5a28c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 27 Oct 2025 17:23:59 +0000
Subject: [PATCH 0899/1037] fix(deps): update com.github.weisj to 3.1.1

---
 gradle/verification-keyring.keys              | 20 +++++++++++++
 gradle/verification-metadata.xml              |  2 +-
 src/bom-thirdparty/build.gradle.kts           |  9 +++---
 src/core/build.gradle.kts                     |  1 -
 .../java/org/apache/jmeter/SplashScreen.java  |  2 +-
 .../jmeter/gui/action/LookAndFeelCommand.java |  2 +-
 .../apache/jmeter/gui/util/JMeterToolBar.java |  2 +-
 src/dist/src/dist/expected_release_jars.csv   | 26 +++++++++--------
 src/licenses/build.gradle.kts                 |  5 ----
 src/licenses/licenses/svgSalamander/LICENSE   | 28 -------------------
 10 files changed, 43 insertions(+), 54 deletions(-)
 delete mode 100644 src/licenses/licenses/svgSalamander/LICENSE

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 506b4349081..1d206cb0bff 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -5591,6 +5591,26 @@ Dhufgi7JAJ9s7DMysnT2e4S6/VitgWdoI9iCfA==
 =P/a4
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    2E2A3AECF13B25AC
+uid    Jannis Weis (OSS Signing) <oss@jannisweis.de>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGhj2dEBEADI1JT9QJwJ3GyDF361DPVEfO7+A3IVHAgY73aVNvaA++5+puCq
+rGaAnrVYl3hxG0CLg9AiiIFubHNdXXUj4uYvDcL4JxNsEq7l/u2ut6LJho8CBcKq
+yKgJYZNUm6BjlW7nV6fcE2XYVcIPHoKB23q+CLhERk1chtMTYlg6LcoHWcOA4a6A
+nY8Wc2fbwGTpVB5yKqSU8Xg88nTaANdTH+qy0FiWvvVmRxtXm+oFgEMY8r8VZvlM
+9oOB3m21i2a9yFPB4emqcJsDrguwmkzDYtHmjhfieGxv/eJOCMUMuKW+0/qWoEv4
+Myg0wd1gzDbv2qY9bOn2A8TIHwYFmvQMi1xC0J3dx1M474+tk/CiZzwzHJ80cMUF
+cq7eWeBJGg+urKBYG1NniWrSli/WvwlcWElwlyXslvZrjiO9ntNUF0vHxjmQxXtw
+y99n6U2CTnMa20vVB7V0EiKGT7BM+NOYUzbR7S+mvsF6KiYYA2gIBWlMPKFVleRf
+r8tn+dcgr+FOYMaj5kbHhzmwO0ujRGnZqUGVKqdXow/i580PHYhUXO9HKe+JzgPw
+NGeI6DQvAjPvXHoiwArTVOaLvxat3/jHYl0vaTqxkpWXpoblvULcxuQKn4ABg8EH
+UOydkq+ingfuZlrboais4CnnxX1p8isnFQz7QzeFRltNhmgIubgb/Yub4wARAQAB
+tC1KYW5uaXMgV2VpcyAoT1NTIFNpZ25pbmcpIDxvc3NAamFubmlzd2Vpcy5kZT4=
+=MLt7
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    2F45F85CDF082E68
 uid    Gregory Brail (Rhino Automated Builds) <greg+rhino@brail.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 58067a5faa0..f1df8d9a563 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -7,7 +7,6 @@
       <key-servers>
          <key-server uri="https://keyserver.ubuntu.com"/>
          <key-server uri="https://keys.openpgp.org"/>
-         <key-server uri="https://pgp.mit.edu"/>
       </key-servers>
       <trusted-artifacts>
          <trust group="gradle" name="gradle"/>
@@ -26,6 +25,7 @@
             <trusting group="com.thoughtworks.xstream"/>
             <trusting group="io.github.x-stream"/>
          </trusted-key>
+         <trusted-key id="066C167DC7BA919F2E168DFA2E2A3AECF13B25AC" group="com.github.weisj"/>
          <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools"/>
          <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
          <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 8314c724172..c6ce5d3aa4b 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -46,12 +46,11 @@ dependencies {
         api("com.fasterxml.jackson.core:jackson-core:2.16.1")
         api("com.fasterxml.jackson.core:jackson-databind:2.16.1")
         api("com.fifesoft:rsyntaxtextarea:3.3.4")
-        api("com.formdev:svgSalamander:1.1.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
-        api("com.github.weisj:darklaf-core:2.7.3")
-        api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
-        api("com.github.weisj:darklaf-property-loader:2.7.3")
-        api("com.github.weisj:darklaf-theme:2.7.3")
+        api("com.github.weisj:darklaf-core:3.1.1")
+        api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")
+        api("com.github.weisj:darklaf-property-loader:3.1.1")
+        api("com.github.weisj:darklaf-theme:3.1.1")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.24.0")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 4f0b2239ce3..d8bef3e9fcb 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -85,7 +85,6 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-annotations")
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("com.formdev:svgSalamander")
     implementation("com.github.ben-manes.caffeine:caffeine")
     implementation("com.github.weisj:darklaf-core")
     implementation("com.github.weisj:darklaf-theme")
diff --git a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
index b3326bb221b..d7cfa8005e8 100644
--- a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
+++ b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon;
 
 /**
  * Splash Screen
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 0821b8a05d3..be7f62c379c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -202,7 +202,7 @@ public LookAndFeelCommand() {
     }
 
     public static boolean isDarklafTheme() {
-        return "Darklaf".equalsIgnoreCase(UIManager.getLookAndFeel().getID()); // $NON-NLS-1$
+        return LafManager.isInstalled();
     }
 
     public static boolean isDark() {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index d30bc318a7c..801f626ab11 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -41,7 +41,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 
 import kotlin.text.StringsKt;
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index afaf841ffb4..283887ad232 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -38,15 +38,20 @@
 330333,commons-net-3.12.0.jar
 152289,commons-pool2-2.12.1.jar
 259876,commons-text-1.14.0.jar
-1547509,darklaf-core-2.7.3.jar
-20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
-93477,darklaf-macos-2.7.3.jar
-8492,darklaf-native-utils-2.7.3.jar
-4049,darklaf-platform-base-2.7.3.jar
-98109,darklaf-property-loader-2.7.3.jar
-89456,darklaf-theme-2.7.3.jar
-69133,darklaf-utils-2.7.3.jar
-217795,darklaf-windows-2.7.3.jar
+36593,darklaf-compatibility-3.1.1.jar
+1497802,darklaf-core-3.1.1.jar
+20753,darklaf-extensions-rsyntaxarea-0.4.1.jar
+178278,darklaf-iconset-3.1.1.jar
+50670,darklaf-macos-3.1.1.jar
+10818,darklaf-native-utils-3.1.1.jar
+8900,darklaf-platform-base-3.1.1.jar
+23913,darklaf-platform-decorations-3.1.1.jar
+5741,darklaf-platform-preferences-3.1.1.jar
+116522,darklaf-property-loader-3.1.1.jar
+80886,darklaf-theme-3.1.1.jar
+14750,darklaf-theme-spec-3.1.1.jar
+62869,darklaf-utils-3.1.1.jar
+232074,darklaf-windows-3.1.1.jar
 362793,datamodel-jvm-4.7.3.jar
 98115,dec-0.1.2.jar
 588267,dnsjava-3.6.3.jar
@@ -87,7 +92,7 @@
 277582,json-path-2.8.0.jar
 122808,json-smart-2.6.0.jar
 473788,jsoup-1.17.1.jar
-511129,jsvg-1.3.0.jar
+723652,jsvg-2.0.0.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 43729,kotlin-logging-jvm-2.1.23.jar
@@ -134,7 +139,6 @@
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 69908,slf4j-api-2.0.17.jar
-320794,svgSalamander-1.1.4.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
 778543,tika-core-3.2.3.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 6a0ef80a107..cad6668c4dd 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -108,11 +108,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.BSD_2_Clause
     }
 
-    overrideLicense("com.formdev:svgSalamander") {
-        // See https://github.com/blackears/svgSalamander/blob/d6b6fe9a8ece7d0e0e7aeb3de82f027a38a6fe25/www/license/license-bsd.txt
-        effectiveLicense = SpdxLicense.BSD_3_Clause
-    }
-
     for (mig in listOf("com.miglayout:miglayout-core", "com.miglayout:miglayout-swing")) {
         overrideLicense(mig) {
             expectedLicense = SimpleLicense("BSD", uri("http://www.debian.org/misc/bsd.license"))
diff --git a/src/licenses/licenses/svgSalamander/LICENSE b/src/licenses/licenses/svgSalamander/LICENSE
deleted file mode 100644
index eefe5f619c2..00000000000
--- a/src/licenses/licenses/svgSalamander/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2010, Mark McKay
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-  * Neither the name of the JXLayer project nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 01d5985e037a695b6d6e40001a5cf1e66e8acb80 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 10:04:08 +0300
Subject: [PATCH 0900/1037] test: replace the usage of org.hamcrest with
 junit's assertions

---
 .../kotlin/build-logic.test-junit5.gradle.kts |   1 -
 lib/aareadme.txt                              |   5 -
 src/bom-thirdparty/build.gradle.kts           |   1 -
 .../extractor/TestBoundaryExtractor.java      |  29 +++--
 .../extractor/TestHtmlExtractorJSoup.java     |  22 ++--
 .../extractor/TestJSONPostProcessor.java      |  78 +++++++-------
 .../jmeter/extractor/TestRegexExtractor.java  |  16 ++-
 .../jmeter/extractor/TestXPath2Extractor.java |   2 +-
 .../jmeter/extractor/TestXPathExtractor.java  |  28 ++---
 .../json/jmespath/TestJMESPathExtractor.java  |  73 +++++++------
 .../jmeter/timers/TimerServiceTest.java       |  46 +++-----
 .../visualizers/TestSampleCompareTo.java      |   6 +-
 .../report/core/CsvSampleReaderTest.java      |  11 +-
 .../graph/impl/CustomGraphConsumerTest.java   |  52 ++++-----
 .../TestDataStrippingSampleSender.java        |   7 +-
 .../property/AbstractPropertyTest.java        |  25 ++---
 .../testelement/property/MapPropertyTest.java |   7 +-
 .../TestUnmodifiableJMeterVariables.java      |  28 ++---
 .../jmeter/util/JSR223TestElementTest.java    |  12 +--
 .../org/apache/jmeter/util/XPathUtilTest.java |  24 ++---
 .../gui/AbstractJMeterGuiComponentTest.kt     |   6 +-
 .../jorphan/reflect/TestClassFinder.java      |  10 +-
 src/dist/src/dist/expected_release_jars.csv   |   1 -
 src/functions/build.gradle.kts                |   2 -
 .../functions/TestRandomFromMultipleVars.java |  25 +++--
 .../functions/TestTimeRandomDateFunction.java |  28 +++--
 .../functions/TestTimeShiftFunction.java      |  48 +++++----
 .../jorphan/gui/MinMaxLongRendererTest.java   |   6 +-
 .../jorphan/gui/ObjectTableSorterTest.java    |  25 +++--
 .../apache/jorphan/util/TestJorphanUtils.java | 100 +++++++++---------
 src/licenses/licenses/hamcrest-date/LICENSE   |  24 -----
 .../http/control/TestAuthorization.java       |   5 +-
 .../http/parser/TestBug60842HtmlParser.java   |  10 +-
 .../protocol/http/parser/TestCssParser.java   |  15 ++-
 .../http/sampler/TestDecompression.java       |  24 +++--
 .../protocol/http/sampler/TestRedirects.java  |   2 +-
 .../sampler/TestSerializedHTTPSampler.java    |   7 +-
 .../http/visualizers/RequestViewHTTPTest.java |  14 +--
 .../render/BinaryMessageRendererTest.java     |  98 ++++-------------
 src/protocol/junit/build.gradle.kts           |   3 -
 40 files changed, 414 insertions(+), 512 deletions(-)
 delete mode 100644 src/licenses/licenses/hamcrest-date/LICENSE

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index 2434b0123a3..a82326e5b42 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -24,7 +24,6 @@ plugins {
 
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.hamcrest:hamcrest")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index ee01ff8812d..b2f886e2d0d 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -106,11 +106,6 @@ groovy-3.0.3
 ----------------------
 Advised scripting language for JSR223 Test Elements
 
-hamcrest-core-1.3
-----------------------
-- unit tests, JUnit sampler
-https://github.com/hamcrest/JavaHamcrest
-
 freemarker-2.3.29.jar
 ----------------------
 - used by Report/Dashboard feature
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c6ce5d3aa4b..f55ed3e043d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -122,7 +122,6 @@ dependencies {
         api("org.bouncycastle:bcpkix-jdk18on:1.82")
         api("org.bouncycastle:bcprov-jdk18on:1.82")
         api("org.brotli:dec:0.1.2")
-        api("org.exparity:hamcrest-date:2.0.8")
         api("org.freemarker:freemarker:2.3.32")
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.7.3")
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestBoundaryExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestBoundaryExtractor.java
index 26ce6ecb8df..934078c8d6e 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestBoundaryExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestBoundaryExtractor.java
@@ -17,14 +17,13 @@
 
 package org.apache.jmeter.extractor;
 
-
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -63,9 +62,9 @@ public void testNoBoundariesOneVariable() {
         extractor.setScopeVariable("content");
         extractor.setThreadContext(jmctx);
         extractor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is("one"));
-        assertThat("Indexed variable name should be null", vars.get("varname_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat("MatchNumber is incorrect", vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals("one", vars.get("varname"));
+        assertNull(vars.get("varname_1"), "Indexed variable name should be null");
+        assertNull(vars.get("varname_matchNr"), "MatchNumber is incorrect");
     }
 
     @Test
@@ -76,9 +75,9 @@ public void testNoBoundaries() {
         extractor.setScopeVariable("content");
         extractor.setThreadContext(jmctx);
         extractor.process();
-        assertThat("Non indexed variable name should be null", vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat("First match is incorrect", vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat("MatchNumber is incorrect", vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"), "Non indexed variable name should be null");
+        assertEquals("one", vars.get("varname_1"), "First match is incorrect");
+        assertEquals("1", vars.get("varname_matchNr"), "MatchNumber is incorrect");
     }
 
     @Test
@@ -91,9 +90,9 @@ public void testOnlyLeftBoundary() {
         extractor.setThreadContext(jmctx);
         extractor.process();
 
-        assertThat("Non indexed variable name should be null", vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat("First match is incorrect", vars.get("varname_1"), CoreMatchers.is("ne"));
-        assertThat("MatchNumber is incorrect", vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"), "Non indexed variable name should be null");
+        assertEquals("ne", vars.get("varname_1"), "First match is incorrect");
+        assertEquals("1", vars.get("varname_matchNr"), "MatchNumber is incorrect");
     }
 
     @Test
@@ -105,8 +104,8 @@ public void testOnlyRightBoundary() {
         extractor.setScopeVariable("content");
         extractor.setThreadContext(jmctx);
         extractor.process();
-        assertThat("Non indexed variable name should be null", vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat("First match is incorrect", vars.get("varname_1"), CoreMatchers.is("on"));
-        assertThat("MatchNumber is incorrect", vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"), "Non indexed variable name should be null");
+        assertEquals("on", vars.get("varname_1"), "First match is incorrect");
+        assertEquals("1", vars.get("varname_matchNr"), "MatchNumber is incorrect");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
index 0d456956627..0fa76e71429 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.extractor;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -25,7 +24,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -65,9 +63,9 @@ public void testProcessAllElementsSingleMatch() {
         extractor.setScopeVariable("content");
         extractor.setThreadContext(jmctx);
         extractor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is("http://jmeter.apache.org/"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"));
+        assertEquals("http://jmeter.apache.org/", vars.get("varname_1"));
+        assertEquals("1", vars.get("varname_matchNr"));
     }
 
     @Test
@@ -82,10 +80,10 @@ public void testProcessAllElementsMultipleMatches() {
         extractor.setScopeVariable("content");
         extractor.setThreadContext(jmctx);
         extractor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is("http://www.apache.org/"));
-        assertThat(vars.get("varname_2"), CoreMatchers.is("http://jmeter.apache.org/"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("2"));
+        assertNull(vars.get("varname"));
+        assertEquals("http://www.apache.org/", vars.get("varname_1"));
+        assertEquals("http://jmeter.apache.org/", vars.get("varname_2"));
+        assertEquals("2", vars.get("varname_matchNr"));
     }
 
     @Test
@@ -147,7 +145,7 @@ public void testMultipleVariableExtraction() throws Exception {
         extractor.setAttribute("href");
         extractor.setMatchNumber(-1);
         extractor.process();
-        assertThat(vars.get("regVal_matchNr"), CoreMatchers.is("2"));
+        assertEquals("2", vars.get("regVal_matchNr"));
         assertEquals("http://example.com/", vars.get("regVal_1"));
         assertEquals("http://example2.com/", vars.get("regVal_2"));
     }
@@ -157,7 +155,7 @@ public void testMultipleVariableExtractionWithAttribute() throws Exception {
         extractor.setExpression("b");
         extractor.setMatchNumber(-1);
         extractor.process();
-        assertThat(vars.get("regVal_matchNr"), CoreMatchers.is("2"));
+        assertEquals("2", vars.get("regVal_matchNr"));
         assertEquals("example1", vars.get("regVal_1"));
         assertEquals("example2", vars.get("regVal_2"));
     }
@@ -167,7 +165,7 @@ public void testMultipleVariableExtractionNoMatch() throws Exception {
         extractor.setExpression("c");
         extractor.setMatchNumber(-1);
         extractor.process();
-        assertThat(vars.get("regVal_matchNr"), CoreMatchers.is("0"));
+        assertEquals("0", vars.get("regVal_matchNr"));
         assertNull(vars.get("regVal"));
         assertNull(vars.get("regVal_1"));
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
index 57d131bb1fe..f82bf2cab95 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java
@@ -17,8 +17,9 @@
 
 package org.apache.jmeter.extractor;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.nio.charset.StandardCharsets;
 import java.util.function.Consumer;
@@ -30,7 +31,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -93,7 +93,7 @@ void testAssertionWithScope(AccessMode accessMode, String path, String matchNumb
         context.setPreviousResult(sampleResult);
         context.setVariables(vars);
         processor.process();
-        assertThat(vars.get("result"), CoreMatchers.is(resultObject));
+        assertEquals(resultObject, vars.get("result"));
     }
 
     @Test
@@ -108,9 +108,9 @@ void testProcessAllElementsOneMatch() {
         context.setVariables(vars);
         vars.put("contentvar", "[\"one\"]");
         processor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("1", vars.get("varname_matchNr"));
     }
 
     @Test
@@ -125,9 +125,9 @@ void testProcessAllElementsMultipleMatches() {
         context.setVariables(vars);
         vars.put("contentvar", "[\"one\", \"two\"]");
         processor.process();
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_2"), CoreMatchers.is("two"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("2"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("two", vars.get("varname_2"));
+        assertEquals("2", vars.get("varname_matchNr"));
     }
 
     @Test
@@ -142,10 +142,13 @@ void testProcessRandomElementMultipleMatches() {
         context.setVariables(vars);
         vars.put("contentvar", "[\"one\", \"two\"]");
         processor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.anyOf(CoreMatchers.is("one"), CoreMatchers.is("two"))));
-        assertThat(vars.get("varname_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_2"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
+        String varname = vars.get("varname");
+        if (!"one".equals(varname) && !"two".equals(varname)) {
+            fail("vars.get(\"varname\") should be one or two, got " + varname);
+        }
+        assertNull(vars.get("varname_1"));
+        assertNull(vars.get("varname_2"));
+        assertNull(vars.get("varname_matchNr"));
     }
 
     @Test
@@ -160,14 +163,14 @@ void testPR235CaseEmptyResponse() {
         context.setVariables(vars);
         vars.put("contentvar", "[\"one\", \"two\"]");
         processor.process();
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_2"), CoreMatchers.is("two"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("2"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("two", vars.get("varname_2"));
+        assertEquals("2", vars.get("varname_matchNr"));
         vars.put("contentvar", "");
         processor.process();
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_2"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertNull(vars.get("varname_matchNr"));
+        assertNull(vars.get("varname_1"));
+        assertNull(vars.get("varname_2"));
     }
 
     @Test
@@ -182,13 +185,13 @@ void testCaseEmptyVarBug62860() {
         context.setVariables(vars);
         vars.remove("contentvar");
         processor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is("NONE"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals("NONE", vars.get("varname"));
+        assertNull(vars.get("varname_matchNr"));
 
         vars.put("contentvar", "");
         processor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is("NONE"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals("NONE", vars.get("varname"));
+        assertNull(vars.get("varname_matchNr"));
     }
 
     @Test
@@ -203,16 +206,19 @@ void testPR235CaseMatchOneWithZero() {
         context.setVariables(vars);
         vars.put("contentvar", "[\"one\", \"two\"]");
         processor.process();
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_2"), CoreMatchers.is("two"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("2"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("two", vars.get("varname_2"));
+        assertEquals("2", vars.get("varname_matchNr"));
         vars.put("contentvar", "[\"A\", \"B\"]");
         processor.setMatchNumbers("0");
         processor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.anyOf(CoreMatchers.is("A"), CoreMatchers.is("B"))));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_2"), CoreMatchers.is(CoreMatchers.nullValue()));
+        String varname = vars.get("varname");
+        if (!"A".equals(varname) && !"B".equals(varname)) {
+            fail("vars.get(\"varname\") should be A or B, got " + varname);
+        }
+        assertNull(vars.get("varname_matchNr"));
+        assertNull(vars.get("varname_1"));
+        assertNull(vars.get("varname_2"));
     }
 
     private static Stream<Arguments> provideEmptyOrNullResultArgs() {
@@ -243,9 +249,9 @@ void testEmptyOrNullResult(String contextValue, String jsonPath, String matchNum
         processor.setScopeAll();
         processor.process();
 
-        assertThat(vars.get(VAR_NAME), CoreMatchers.is(expectedResult));
-        assertThat(vars.get(VAR_NAME + "_matchNr"), CoreMatchers.is(expectedMatchNumber));
-        assertThat(vars.get(VAR_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals(expectedResult, vars.get(VAR_NAME));
+        assertEquals(expectedMatchNumber, vars.get(VAR_NAME + "_matchNr"));
+        assertNull(vars.get(VAR_NAME + "_1"));
     }
 
     @Test
@@ -267,9 +273,9 @@ void testBug59609() throws ParseException {
 
         JSONParser parser = new JSONParser(0);
         Object expectedValue = parser.parse(innerValue);
-        assertThat(parser.parse(vars.get(VAR_NAME)), CoreMatchers.is(expectedValue));
-        assertThat(vars.get(VAR_NAME + "_matchNr"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(VAR_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals(expectedValue, parser.parse(vars.get(VAR_NAME)));
+        assertNull(vars.get(VAR_NAME + "_matchNr"));
+        assertNull(vars.get(VAR_NAME + "_1"));
     }
 
     @Test
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
index c4d42b97b15..4e39a7889e5 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
@@ -18,7 +18,6 @@
 package org.apache.jmeter.extractor;
 
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,7 +30,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -76,9 +74,9 @@ public void testProcessAllElementsSingleMatch() {
         extractor.setThreadContext(jmctx);
         extractor.setTemplate("$1$");
         extractor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("1"));
+        assertNull(vars.get("varname"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("1", vars.get("varname_matchNr"));
     }
 
     @Test
@@ -91,10 +89,10 @@ public void testProcessAllElementsMultipleMatches() {
         extractor.setThreadContext(jmctx);
         extractor.setTemplate("$1$");
         extractor.process();
-        assertThat(vars.get("varname"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get("varname_1"), CoreMatchers.is("one"));
-        assertThat(vars.get("varname_2"), CoreMatchers.is("two"));
-        assertThat(vars.get("varname_matchNr"), CoreMatchers.is("2"));
+        assertNull(vars.get("varname"));
+        assertEquals("one", vars.get("varname_1"));
+        assertEquals("two", vars.get("varname_2"));
+        assertEquals("2", vars.get("varname_matchNr"));
     }
 
     @Test
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
index 906f93a7a33..f7830a02c46 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java
@@ -282,6 +282,6 @@ public void testPreviousResultIsEmpty() throws Exception {
         jmc.setPreviousResult(null);
         extractor.setXPathQuery("/book/preface");
         extractor.process();
-        assertEquals(null, vars.get(VAL_NAME));
+        assertNull(vars.get(VAL_NAME));
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
index 1bb72f696cd..9cf66000d5c 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
@@ -17,8 +17,6 @@
 
 package org.apache.jmeter.extractor;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -274,15 +272,15 @@ public void testInvalidXpath() throws Exception {
         assertEquals(1, result.getAssertionResults().length);
         AssertionResult firstResult = result.getAssertionResults()[0];
         assertEquals(extractor.getName(), firstResult.getName());
-        assertThat(
-                "'<' is an invalid character in xpath, so it is expected to be present in the error message",
+        assertContains(
                 firstResult.getFailureMessage(),
-                containsString("<")
-        );
+                "<",
+                "'<' is an invalid character in xpath, so it is expected to be present in the error message");
         if (Locale.getDefault().getLanguage().startsWith(Locale.ENGLISH.getLanguage())) {
-            assertThat(
+            assertContains(
                     firstResult.getFailureMessage(),
-                    containsString("A location path was expected, but the following token was encountered")
+                    "A location path was expected, but the following token was encountered",
+                    ""
             );
         }
         assertEquals("Default", vars.get(VAL_NAME));
@@ -296,8 +294,9 @@ public void testNonXmlDocument() throws Exception {
         extractor.process();
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertThat(result.getAssertionResults()[0].getFailureMessage(),
-                containsString("Content is not allowed in prolog"));
+        assertContains(result.getAssertionResults()[0].getFailureMessage(),
+                "Content is not allowed in prolog",
+                "");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
@@ -310,10 +309,15 @@ public void testInvalidDocument() throws Exception {
 
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertThat(result.getAssertionResults()[0].getFailureMessage(),
-                containsString("XML document structures must start and end within the same entity"));
+        assertContains(result.getAssertionResults()[0].getFailureMessage(),
+                "XML document structures must start and end within the same entity",
+                "");
 
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
+
+    private void assertContains(String value, String substring, String message) {
+        assertTrue(value.contains(substring), () -> message + ": " + value + " should contain " + substring);
+    }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
index d2e7f77dfec..0cce79b990d 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
@@ -17,7 +17,9 @@
 
 package org.apache.jmeter.extractor.json.jmespath;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -27,7 +29,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -64,7 +65,7 @@ void testNoMatchNumberSet() {
         JMESPathExtractor processor = setupProcessor(vars, sampleResult, "[1]", false, "");
         processor.setJmesPathExpression("[*]");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is("1"));
+        assertEquals("1", vars.get(REFERENCE_NAME));
     }
 
     private static Stream<Arguments> dataOneMatch() {
@@ -98,13 +99,13 @@ private void testOneMatchOnAllExtractedValues(boolean fromVars, String data, Str
         JMESPathExtractor processor = setupProcessor(vars, sampleResult, data, fromVars, "-1");
         processor.setJmesPathExpression(jmesPath);
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME + "_1"), CoreMatchers.is(expectedResult));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(expectedMatchNumber));
+        assertNull(vars.get(REFERENCE_NAME));
+        assertEquals(expectedResult, vars.get(REFERENCE_NAME + "_1"));
+        assertEquals(expectedMatchNumber, vars.get(REFERENCE_NAME_MATCH_NUMBER));
 
         processor.clearOldRefVars(vars, REFERENCE_NAME);
-        assertThat(vars.get(REFERENCE_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertNull(vars.get(REFERENCE_NAME + "_1"));
+        assertNull(vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     private static Stream<Arguments> dataMultipleMatches() {
@@ -137,11 +138,11 @@ private void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String da
         // test1
         processor.setJmesPathExpression(jmesPath);
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertNull(vars.get(REFERENCE_NAME));
         for (int i = 0; i < expectedResults.length; i++) {
-            assertThat(vars.get(REFERENCE_NAME + "_"+(i+1)), CoreMatchers.is(expectedResults[i]));
+            assertEquals(expectedResults[i], vars.get(REFERENCE_NAME + "_"+(i+1)));
         }
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(expectedMatchNumber));
+        assertEquals(expectedMatchNumber, vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     private static final String TEST_DATA = "{\r\n" + "  \"people\": [\r\n" + "    {\"first\": \"James\", \"last\": \"d\", \"age\":10},\r\n"
@@ -182,8 +183,8 @@ private void testMatchNumberMoreThanZeroOn1ExtractedValue(boolean fromVars, Stri
         processor.setMatchNumber(matchNumber);
         processor.setJmesPathExpression(jmesPath);
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(expectedResult));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(expectedMatchNumber));
+        assertEquals(expectedResult, vars.get(REFERENCE_NAME));
+        assertEquals(expectedMatchNumber, vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     enum AccessMode {
@@ -232,9 +233,9 @@ void testRandomElementAllMatches(AccessMode accessMode, String path, String matc
         accessMode.configure(processor);
 
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(resultObject));
-        assertThat(vars.get(REFERENCE_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(resultCount));
+        assertEquals(resultObject, vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME + "_1"));
+        assertEquals(resultCount, vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     private static Stream<Arguments> dataSourceVarOrResponse() {
@@ -250,9 +251,9 @@ void testRandomElementOneMatch(boolean fromVariables) {
 
         processor.setJmesPathExpression("a.b.c.d");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is("value"));
-        assertThat(vars.get(REFERENCE_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is("1"));
+        assertEquals("value", vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME + "_1"));
+        assertEquals("1", vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     @ParameterizedTest
@@ -264,11 +265,13 @@ void testRandomElementMultipleMatches(boolean fromVariables) {
 
         processor.setJmesPathExpression("[*]");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME),
-                CoreMatchers.is(CoreMatchers.anyOf(CoreMatchers.is("one"), CoreMatchers.is("two"))));
-        assertThat(vars.get(REFERENCE_NAME + "_1"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME + "_2"), CoreMatchers.is(CoreMatchers.nullValue()));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is("2"));
+        String varValue = vars.get(REFERENCE_NAME);
+        if (!"one".equals(varValue) && !"two".equals(varValue)) {
+            fail("vars.get(REFERENCE_NAME) should be one or two, got " + varValue);
+        }
+        assertNull(vars.get(REFERENCE_NAME + "_1"));
+        assertNull(vars.get(REFERENCE_NAME + "_2"));
+        assertEquals("2", vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     @ParameterizedTest
@@ -280,8 +283,8 @@ void testEmptySourceData(boolean fromVariables) {
 
         processor.setJmesPathExpression("[*]");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(DEFAULT_VALUE));
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is(CoreMatchers.nullValue()));
+        assertEquals(DEFAULT_VALUE, vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     @ParameterizedTest
@@ -293,9 +296,9 @@ void testErrorInJMESPath(boolean fromVariables) {
 
         processor.setJmesPathExpression("$.k");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(DEFAULT_VALUE));
-        assertThat(vars.get(REFERENCE_NAME+ "_1"), CoreMatchers.nullValue());
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.nullValue());
+        assertEquals(DEFAULT_VALUE, vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME+ "_1"));
+        assertNull(vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     @ParameterizedTest
@@ -307,9 +310,9 @@ void testNoMatch(boolean fromVariables) {
 
         processor.setJmesPathExpression("a.b.c.f");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(DEFAULT_VALUE));
-        assertThat(vars.get(REFERENCE_NAME+ "_1"), CoreMatchers.nullValue());
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.is("0"));
+        assertEquals(DEFAULT_VALUE, vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME+ "_1"));
+        assertEquals("0", vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
     @ParameterizedTest
@@ -321,8 +324,8 @@ void testNoInput(boolean fromVariables) {
 
         processor.setJmesPathExpression("a.b");
         processor.process();
-        assertThat(vars.get(REFERENCE_NAME), CoreMatchers.is(DEFAULT_VALUE));
-        assertThat(vars.get(REFERENCE_NAME+ "_1"), CoreMatchers.nullValue());
-        assertThat(vars.get(REFERENCE_NAME_MATCH_NUMBER), CoreMatchers.nullValue());
+        assertEquals(DEFAULT_VALUE, vars.get(REFERENCE_NAME));
+        assertNull(vars.get(REFERENCE_NAME+ "_1"));
+        assertNull(vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java b/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
index fa818784799..7f3f80234de 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.timers;
 
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Description;
-import org.hamcrest.MatcherAssert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 
 public class TimerServiceTest {
@@ -31,48 +29,34 @@ public class TimerServiceTest {
     public void testBigInitialDelayAndDontWait() {
         long now = System.currentTimeMillis();
         long adjustedDelay = sut.adjustDelay(Long.MAX_VALUE, now + 1000L, false);
-        MatcherAssert.assertThat("TimerService should return -1 as delay would lead to a time after end time",
-                adjustedDelay, CoreMatchers.is((long) -1));
+        assertEquals(
+                -1L,
+                adjustedDelay,
+                "TimerService should return -1 as delay would lead to a time after end time");
     }
 
     @Test
     public void testBigInitialDelayAndWait() {
         long now = System.currentTimeMillis();
         long adjustedDelay = sut.adjustDelay(Long.MAX_VALUE, now + 1000L);
-        MatcherAssert.assertThat("TimerService should return -1 as delay would lead to a time after end time",
-                adjustedDelay, isAlmost(1000L, 200L));
-    }
-
-    private BaseMatcher<Long> isAlmost(long value, long precision) {
-        return new BaseMatcher<Long>() {
-
-            @Override
-            public boolean matches(Object item) {
-                if (item instanceof Long) {
-                    Long other = (Long) item;
-                    return Math.abs(other - value) < precision;
-                }
-                return false;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("the number is within a precision of " + precision + " near " + value);
-            }
-      };
+        assertEquals(1000.0, adjustedDelay, 200.0, "TimerService should return -1 as delay would lead to a time after end time");
     }
 
     @Test
     public void testSmallInitialDelay() {
         long now = System.currentTimeMillis();
-        MatcherAssert.assertThat("TimerService should not change the delay as the end time is far away",
-                sut.adjustDelay(1000L, now + 20000L), CoreMatchers.is(1000L));
+        assertEquals(
+                1000L,
+                sut.adjustDelay(1000L, now + 20000L),
+                "TimerService should not change the delay as the end time is far away");
     }
 
     @Test
     public void testNegativeEndTime() {
-        MatcherAssert.assertThat("TimerService should not change the delay as the indicated end time is far away",
-                sut.adjustDelay(1000L, -1), CoreMatchers.is(1000L));
+        assertEquals(
+                1000L,
+                sut.adjustDelay(1000L, -1),
+                "TimerService should not change the delay as the indicated end time is far away");
     }
 
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
index 586aca92b94..9e4fb3b4b6f 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
@@ -17,11 +17,10 @@
 
 package org.apache.jmeter.visualizers;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.stream.Stream;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -44,8 +43,7 @@ private static Stream<Arguments> data() {
     @ParameterizedTest
     @MethodSource("data")
     void testCompareTo(long thisCount, long otherCount, int compareResult) {
-        assertThat(sample(thisCount).compareTo(sample(otherCount)),
-                CoreMatchers.is(compareResult));
+        assertEquals(compareResult, sample(thisCount).compareTo(sample(otherCount)));
     }
 
     private Sample sample(long count) {
diff --git a/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java b/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
index 1df86af511e..3dc15c34d82 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.report.core;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -28,7 +27,6 @@
 import java.io.IOException;
 
 import org.apache.jmeter.junit.JMeterTestCase;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -65,8 +63,7 @@ public void testConstructorWithInvalidFile() {
     @Test
     public void testGetMetadata() {
         try (CsvSampleReader reader = new CsvSampleReader(tempCsv, metadata)) {
-            assertThat(reader.getMetadata().toString(),
-                    CoreMatchers.is(metadata.toString()));
+            assertEquals(metadata.toString(), reader.getMetadata().toString());
         }
     }
 
@@ -76,8 +73,7 @@ public void testReadSample() {
             for (long i = 0; i < NR_ROWS; i++) {
                 Sample expected = new SampleBuilder(metadata).add(i)
                         .add("a" + i).build();
-                assertThat(reader.readSample().toString(),
-                        CoreMatchers.is(expected.toString()));
+                assertEquals(expected.toString(), reader.readSample().toString());
             }
         }
     }
@@ -88,8 +84,7 @@ public void testPeek() {
             for (long i = 0; i < NR_ROWS; i++) {
                 Sample expected = new SampleBuilder(metadata).add(i)
                         .add("a" + i).build();
-                assertThat(reader.peek().toString(),
-                        CoreMatchers.is(expected.toString()));
+                assertEquals(expected.toString(), reader.peek().toString());
                 reader.readSample();
             }
         }
diff --git a/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
index 30569724327..952574d3953 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
@@ -17,8 +17,10 @@
 
 package org.apache.jmeter.report.processor.graph.impl;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -65,16 +67,16 @@ public void init() {
 
     @Test
     public void testGetters() {
-        assertThat(customGraphConsumer.getTitle(), equalTo("graph title"));
-        assertThat(customGraphConsumer.getXAxis(), equalTo("X axis name"));
-        assertThat(customGraphConsumer.getYAxis(), equalTo("Y axis name"));
-        assertThat(customGraphConsumer.getContentMessage(), equalTo("content message"));
-        assertThat(customGraphConsumer.getSampleVariableName(), equalTo("ulp_lag_ratio"));
-        assertThat(customGraphConsumer.getIsNativeSampleVariableName(), equalTo(false));
+        assertEquals("graph title", customGraphConsumer.getTitle());
+        assertEquals("X axis name", customGraphConsumer.getXAxis());
+        assertEquals("Y axis name", customGraphConsumer.getYAxis());
+        assertEquals("content message", customGraphConsumer.getContentMessage());
+        assertEquals("ulp_lag_ratio", customGraphConsumer.getSampleVariableName());
+        assertFalse(customGraphConsumer.getIsNativeSampleVariableName());
 
         // bytes is one of the native sample variables names
         customGraphConsumer.setSampleVariableName(CSVSaveService.CSV_BYTES);
-        assertThat(customGraphConsumer.getIsNativeSampleVariableName(), equalTo(true));
+        assertTrue(customGraphConsumer.getIsNativeSampleVariableName());
     }
 
     @Test
@@ -87,15 +89,15 @@ public void testInitializeExtraResults() {
             String key = entrySet.getKey();
 
             if (key.equals("granularity")) {
-                assertThat(testedValue, equalTo("60000"));
+                assertEquals("60000", testedValue);
             } else if (key.equals("X_Axis")) {
-                assertThat(testedValue, equalTo("\"X axis name\""));
+                assertEquals("\"X axis name\"", testedValue);
             } else if (key.equals("Y_Axis")) {
-                assertThat(testedValue, equalTo("\"Y axis name\""));
+                assertEquals("\"Y axis name\"", testedValue);
             } else if (key.equals("sample_Metric_Name")) {
-                assertThat(testedValue, equalTo("\"ulp_lag_ratio\""));
+                assertEquals("\"ulp_lag_ratio\"", testedValue);
             } else if (key.equals("content_Message")) {
-                assertThat(testedValue, equalTo("\"content message\""));
+                assertEquals("\"content message\"", testedValue);
             }
         }
     }
@@ -104,30 +106,30 @@ public void testInitializeExtraResults() {
     public void testCreateTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
         keysSelector.setSelectBeginTime(false);
-        assertThat(customGraphConsumer.createTimeStampKeysSelector().getGranularity(), equalTo(keysSelector.getGranularity()));
+        assertEquals(keysSelector.getGranularity(), customGraphConsumer.createTimeStampKeysSelector().getGranularity());
     }
 
     @Test
     public void testCreateGroupInfos() {
         // Testing defaults values
-        assertThat(map.containsKey("Generic group"), equalTo(true));
-        assertThat(map.containsKey("foo"), equalTo(false));
-        assertThat(map.get("Generic group").getAggregatorFactory().getClass(),
-                equalTo(org.apache.jmeter.report.processor.MeanAggregatorFactory.class));
+        assertTrue(map.containsKey("Generic group"));
+        assertFalse(map.containsKey("foo"));
+        assertEquals(org.apache.jmeter.report.processor.MeanAggregatorFactory.class,
+                map.get("Generic group").getAggregatorFactory().getClass());
         GroupData groupData = map.get("Generic group").getGroupData();
-        assertThat(groupData.getOverallSeries(), equalTo(null));
-        assertThat(groupData.getSeriesInfo(), equalTo(new HashMap<String, SeriesData>()));
+        assertNull(groupData.getOverallSeries());
+        assertEquals(new HashMap<String, SeriesData>(), groupData.getSeriesInfo());
 
         // Testing native sample variable
         customGraphConsumer.setSampleVariableName("bytes");
         Sample sample = new Sample(0, sampleMetaData, data);
         Double testedValue = map.get("Generic group").getValueSelector().select("bytes", sample);
-        assertThat(testedValue, equalTo(492.0));
+        assertEquals(492.0, testedValue);
 
         // Testing non-native sample variable
         customGraphConsumer.setSampleVariableName("mm-miss");
         testedValue = map.get("Generic group").getValueSelector().select("mm-miss", sample);
-        assertThat(testedValue, equalTo(null));
+        assertNull(testedValue);
 
         // Testing empty data value, the change between data and data2
         // is on the last value that switchs from "null" to ""
@@ -136,7 +138,7 @@ public void testCreateGroupInfos() {
                 "null", "null", "null", "null", "null", "null", "null", "null", "null", "null", "null", "null", "null", ""};
         sample = new Sample(0, sampleMetaData, data2);
         testedValue = map.get("Generic group").getValueSelector().select("mm-miss", sample);
-        assertThat(testedValue, equalTo(null));
+        assertNull(testedValue);
     }
 
     // Test the exception when the column data is not a Double
@@ -154,7 +156,7 @@ public void testCreateGroupInfosExceptions() {
     public void testSelectMetric() {
         Sample sample = new Sample(0, sampleMetaData, data);
         String testString = map.get("Generic group").getSeriesSelector().select(sample).toString();
-        assertThat(testString, equalTo("[ulp_lag_ratio]"));
+        assertEquals("[ulp_lag_ratio]", testString);
     }
 
     // Create a static SampleMetadataObject
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
index a2168564efe..b14f85f273c 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
@@ -19,7 +19,7 @@
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -30,7 +30,6 @@
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.test.JMeterSerialTest;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -60,11 +59,11 @@ void testSampleOccurred(boolean successfulParent, String content, Boolean stripO
         SampleResult sample = result(successfulParent, result(result(result())));
         sut.sampleOccurred(event(sample));
         assertResultsHaveContent(content, sample);
-        assertThat(sample, CoreMatchers.is(nextSender.getResult()));
+        assertEquals(nextSender.getResult(), sample);
     }
 
     private void assertResultsHaveContent(String content, SampleResult sample) {
-        assertThat(sample.getResponseDataAsString(), CoreMatchers.is(content));
+        assertEquals(content, sample.getResponseDataAsString());
         for (SampleResult subResult : sample.getSubResults()) {
             assertResultsHaveContent(content, subResult);
         }
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
index f9d3d008fc5..d632bc6441e 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
@@ -17,7 +17,9 @@
 
 package org.apache.jmeter.testelement.property;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,7 +29,6 @@
 import java.util.Map;
 
 import org.apache.jmeter.testelement.TestElement;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -69,15 +70,15 @@ public Object getObjectValue() {
     public void testNormalizeListWithEmptyList() {
         Collection<JMeterProperty> emptyCollection = Collections.emptyList();
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(emptyCollection);
-        assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
+        assertEquals(emptyCollection, newCollection);
     }
 
     @Test
     public void testNormalizeListWithEmptyArrayList() {
         Collection<JMeterProperty> emptyCollection = new ArrayList<>();
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(emptyCollection);
-        assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(emptyCollection)));
-        assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
+        assertNotSame(emptyCollection, newCollection);
+        assertEquals(emptyCollection, newCollection);
     }
 
     @Test
@@ -85,23 +86,23 @@ public void testNormalizeListWithFilledArrayList() {
         List<JMeterProperty> filledCollection = new ArrayList<>();
         filledCollection.add(new StringProperty("key", "value"));
         Collection<JMeterProperty> newCollection = dummyProperty.normalizeList(filledCollection);
-        assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(filledCollection)));
-        assertThat(newCollection, CoreMatchers.equalTo(filledCollection));
+        assertNotSame(filledCollection, newCollection);
+        assertEquals(filledCollection, newCollection);
     }
 
     @Test
     public void testNormalizeListWithEmptyMap() {
         Map<String, JMeterProperty> emptyCollection = Collections.emptyMap();
         Map<String, JMeterProperty> newCollection = dummyProperty.normalizeMap(emptyCollection);
-        assertThat(newCollection, CoreMatchers.nullValue());
+        assertNull(newCollection);
     }
 
     @Test
     public void testNormalizeMapWithEmptyHashMap() {
         Map<String, JMeterProperty> emptyCollection = new HashMap<>();
         Map<String, JMeterProperty> newCollection = dummyProperty.normalizeMap(emptyCollection);
-        assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(emptyCollection)));
-        assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
+        assertNotSame(emptyCollection, newCollection);
+        assertEquals(emptyCollection, newCollection);
     }
 
     @Test
@@ -109,7 +110,7 @@ public void testNormalizeMapWithFilledHashMap() {
         Map<String, JMeterProperty> filledCollection = new HashMap<>();
         filledCollection.put("someKey", new StringProperty("key", "value"));
         Map<String, JMeterProperty> newCollection = dummyProperty.normalizeMap(filledCollection);
-        assertThat(newCollection, CoreMatchers.not(CoreMatchers.sameInstance(filledCollection)));
-        assertThat(newCollection, CoreMatchers.equalTo(filledCollection));
+        assertNotSame(filledCollection, newCollection);
+        assertEquals(filledCollection, newCollection);
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
index d229f7619c9..40937d04506 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
@@ -17,12 +17,11 @@
 
 package org.apache.jmeter.testelement.property;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 
 public class MapPropertyTest {
@@ -36,13 +35,13 @@ public void testBug62281MapProperty() {
     @Test
     public void testGetPropertyTypeOfEmptyMap() {
         MapProperty props = new MapProperty("foo", new HashMap<>());
-        assertThat(props.getPropertyType(), CoreMatchers.equalTo(NullProperty.class));
+        assertEquals(NullProperty.class, props.getPropertyType());
     }
 
     public void testGetPropertyTypeOfStringElements() {
         Map<String, Integer> numberMap = new HashMap<>();
         numberMap.put("One", 1);
         MapProperty props = new MapProperty("foo", numberMap);
-        assertThat(props.getPropertyType(), CoreMatchers.equalTo(IntegerProperty.class));
+        assertEquals(IntegerProperty.class, props.getPropertyType());
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
index 3a6b68bbb7d..4b04e6bd1ae 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
@@ -17,15 +17,15 @@
 
 package org.apache.jmeter.threads;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -47,12 +47,12 @@ public void setUp() {
 
     @Test
     public void testGetThreadName() {
-        assertThat(unmodifiables.getThreadName(), CoreMatchers.is(vars.getThreadName()));
+        assertEquals(vars.getThreadName(), unmodifiables.getThreadName());
     }
 
     @Test
     public void testGetIteration() {
-        assertThat(unmodifiables.getIteration(), CoreMatchers.is(vars.getIteration()));
+        assertEquals(vars.getIteration(), unmodifiables.getIteration());
     }
 
     @Test
@@ -92,18 +92,18 @@ public void testPutAllJMeterVariables() {
 
     @Test
     public void testGet() {
-        assertThat(unmodifiables.get(MY_KEY), CoreMatchers.is(vars.get(MY_KEY)));
+        assertEquals(vars.get(MY_KEY), unmodifiables.get(MY_KEY));
     }
 
     @Test
     public void testGetObject() {
-        assertThat(unmodifiables.getObject(MY_OBJECT_KEY), CoreMatchers.is(vars.getObject(MY_OBJECT_KEY)));
+        assertEquals(vars.getObject(MY_OBJECT_KEY), unmodifiables.getObject(MY_OBJECT_KEY));
     }
 
     @Test
     public void testGetIteratorIsUnmodifable() {
         Iterator<Map.Entry<String, Object>> iterator = unmodifiables.getIterator();
-        assertThat(iterator.hasNext(), CoreMatchers.is(true));
+        assertTrue(iterator.hasNext());
         iterator.next();
         assertThrowsUnsupportedOperation(iterator::remove);
     }
@@ -117,7 +117,7 @@ private void assertThrowsUnsupportedOperation(Executable executable) {
 
     @Test
     public void testGetIterator() {
-        assertThat(iteratorToMap(unmodifiables.getIterator()), CoreMatchers.is(iteratorToMap(vars.getIterator())));
+        assertEquals(iteratorToMap(vars.getIterator()), iteratorToMap(unmodifiables.getIterator()));
     }
 
     private <K, V> Map<K, V> iteratorToMap(Iterator<Map.Entry<K, V>> it) {
@@ -131,29 +131,29 @@ private <K, V> Map<K, V> iteratorToMap(Iterator<Map.Entry<K, V>> it) {
 
     @Test
     public void testEntrySet() {
-        assertThat(unmodifiables.entrySet(), CoreMatchers.is(vars.entrySet()));
+        assertEquals(vars.entrySet(), unmodifiables.entrySet());
     }
 
     @Test
     public void testEqualsObjectSymmetry() {
         UnmodifiableJMeterVariables otherUnmodifiables = new UnmodifiableJMeterVariables(vars);
-        assertThat(unmodifiables, CoreMatchers.is(otherUnmodifiables));
-        assertThat(otherUnmodifiables, CoreMatchers.is(unmodifiables));
+        assertEquals(otherUnmodifiables, unmodifiables);
+        assertEquals(unmodifiables, otherUnmodifiables);
     }
 
     @Test
     public void testEqualsObjectReflexivity() {
-        assertThat(unmodifiables, CoreMatchers.is(unmodifiables));
+        assertEquals(unmodifiables, unmodifiables);
     }
 
     @Test
     public void testEqualsObjectWithJMeterVariables() {
-        assertThat(unmodifiables.equals(vars), CoreMatchers.is(vars.equals(unmodifiables)));
+        assertEquals(vars.equals(unmodifiables), unmodifiables.equals(vars));
     }
 
     @Test
     public void testHashCode() {
         UnmodifiableJMeterVariables otherUnmodifiables = new UnmodifiableJMeterVariables(vars);
-        assertThat(unmodifiables.hashCode(), CoreMatchers.is(otherUnmodifiables.hashCode()));
+        assertEquals(otherUnmodifiables.hashCode(), unmodifiables.hashCode());
     }
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
index 1beb45840c2..1a3ca4da8f3 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.util;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -34,15 +34,15 @@ public class JSR223TestElementTest {
     @DisabledForJreRange(min = JRE.JAVA_15, max = JRE.OTHER, disabledReason = "The default JavaScript engine has been removed in Java 15+")
     public void testGetScriptEngineJS() throws Exception {
         element.setScriptLanguage("JavaScript");
-        assertThat(element.getScriptEngine().getFactory().getLanguageName(),
-                CoreMatchers.containsString("Script"));
+        String languageName = element.getScriptEngine().getFactory().getLanguageName();
+        assertTrue(languageName.contains("Script"),
+                () -> "getFactory().getLanguageName() should contain Script, got " + languageName);
     }
 
     @Test
     public void testGetScriptEngineDefault() throws Exception {
         element.setScriptLanguage("");
-        assertThat(element.getScriptEngine().getFactory().getLanguageName(),
-                CoreMatchers.is("Groovy"));
+        assertEquals("Groovy", element.getScriptEngine().getFactory().getLanguageName());
     }
 
 }
diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index 3ebf8c2cd37..3f95fc8de2d 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.jmeter.util;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,7 +38,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.jmeter.assertions.AssertionResult;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -146,22 +144,25 @@ public void testnamespacesParse(String namespaces, String key, String value, int
 
     @Test
     public void testFormatXmlSimple() {
-        assertThat(XPathUtil.formatXml("<one foo='bar'>Test</one>"),
-                CoreMatchers.is("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-                        + "<one foo=\"bar\">Test</one>" + lineSeparator));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                        + "<one foo=\"bar\">Test</one>" + lineSeparator,
+                XPathUtil.formatXml("<one foo='bar'>Test</one>"));
     }
 
     @Test
     public void testFormatXmlComplex() {
-        assertThat(
-                XPathUtil.formatXml(
-                        "<one foo='bar'><two/><three><four p=\"1\"/></three>...</one>"),
-                CoreMatchers.is(String.join(lineSeparator, "<?xml version=\"1.0\" encoding=\"UTF-8\"?><one foo=\"bar\">",
+        assertEquals(
+                String.join(
+                        lineSeparator,
+                        "<?xml version=\"1.0\" encoding=\"UTF-8\"?><one foo=\"bar\">",
                         "  <two/>",
                         "  <three>",
                         "    <four p=\"1\"/>",
                         "  </three>...</one>",
-                        "")));
+                        ""),
+                XPathUtil.formatXml(
+                        "<one foo='bar'><two/><three><four p=\"1\"/></three>...</one>"));
     }
 
     @Test
@@ -175,8 +176,7 @@ public void write(int b) throws IOException {
                     // ignore output
                 }
             }));
-            assertThat("No well formed xml here", CoreMatchers
-                    .is(XPathUtil.formatXml("No well formed xml here")));
+            assertEquals("No well formed xml here", XPathUtil.formatXml("No well formed xml here"));
         } finally {
             System.setErr(origErr);
         }
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt
index 38c17c4bba4..37e36fca394 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/gui/AbstractJMeterGuiComponentTest.kt
@@ -18,7 +18,7 @@
 package org.apache.jmeter.gui
 
 import org.apache.jmeter.testelement.TestElement
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import javax.swing.JPopupMenu
 
@@ -37,9 +37,9 @@ class AbstractJMeterGuiComponentTest {
             override fun getMenuCategories(): MutableCollection<String> = TODO()
         }
 
-        assertEquals(true, element.isEnabled, "element.isEnabled after creation of the element")
+        assertTrue(element.isEnabled, "element.isEnabled after creation of the element")
 
         element.clearGui()
-        assertEquals(true, element.isEnabled, "element.isEnabled after element.clearGui()")
+        assertTrue(element.isEnabled, "element.isEnabled after element.clearGui()")
     }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
index 182bfd1643a..488b59da1ae 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
@@ -27,8 +27,6 @@
 import org.apache.jmeter.junit.JMeterTestUtils;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.logging.log4j.LoggingException;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -53,7 +51,9 @@ public void testFindClassesThatExtendStringArrayClassOfQArray() throws IOExcepti
         List<String> findClassesThatExtend = ClassFinder.findClassesThatExtend(
                 libDirs,
                 new Class<?>[] { Exception.class });
-        MatcherAssert.assertThat(findClassesThatExtend, CoreMatchers.hasItem(LoggingException.class.getName()));
+        assertTrue(
+                findClassesThatExtend.contains(LoggingException.class.getName()),
+                () -> "findClassesThatExtend(.., Exception.class) should contain LoggingException, got " + findClassesThatExtend);
     }
 
     @Test
@@ -74,7 +74,9 @@ public void testFindClassesThatExtendStringArrayClassOfQArrayFalse() throws Exce
                 new Class<?>[] { Exception.class },
                 false);
         assertTrue(findClassesThatExtend.stream().noneMatch(s -> s.contains("$")));
-        MatcherAssert.assertThat(findClassesThatExtend, CoreMatchers.hasItem(LoggingException.class.getName()));
+        assertTrue(
+                findClassesThatExtend.contains(LoggingException.class.getName()),
+                () -> "findClassesThatExtend(.., Exception.class) should contain LoggingException, got " + findClassesThatExtend);
     }
 
     @Test
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 283887ad232..63e0fc63176 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -69,7 +69,6 @@
 223993,groovy-xml-5.0.2.jar
 123360,hamcrest-2.2.jar
 1499,hamcrest-core-2.2.jar
-109741,hamcrest-date-2.0.8.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
 327891,httpcore-4.4.16.jar
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 34bf2366dce..b9482469624 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -35,6 +35,4 @@ dependencies {
     }
     implementation("com.github.ben-manes.caffeine:caffeine")
     implementation("oro:oro")
-    testImplementation("org.hamcrest:hamcrest-core")
-    testImplementation("org.exparity:hamcrest-date")
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
index 486097fbb9f..f0248193501 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java
@@ -17,8 +17,14 @@
 
 package org.apache.jmeter.functions;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -26,8 +32,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -72,10 +76,13 @@ void testExtractionFromMultipleVars() throws Exception {
         params.add(new CompoundVariable("var1|var2"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        MatcherAssert.assertThat(returnValue,
-                CoreMatchers.anyOf(CoreMatchers.is("var1_value"),
-                        CoreMatchers.is("var2_value1"),
-                        CoreMatchers.is("var2_value2")));
+
+        Set<String> expectedValues = new HashSet<>(
+                Arrays.asList("var1_value", "var2_value1", "var2_value2")
+        );
+        assertTrue(
+                expectedValues.contains(returnValue),
+                () -> returnValue + " should be one of " + expectedValues);
         Assertions.assertNull(vars.get("outputVar"));
     }
 
@@ -87,7 +94,7 @@ public void test1Extraction() throws Exception {
         params.add(new CompoundVariable("var1"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        Assertions.assertEquals("value1", returnValue);
+        assertEquals("value1", returnValue);
         Assertions.assertNull(vars.get("outputVar"));
     }
 
@@ -100,7 +107,7 @@ public void test1ExtractionWithOutputVar() throws Exception {
         params.add(new CompoundVariable("outputVar"));
         function.setParameters(params);
         String returnValue = function.execute(result, null);
-        Assertions.assertEquals("value1", returnValue);
-        Assertions.assertEquals("value1", vars.get("outputVar"));
+        assertEquals("value1", returnValue);
+        assertEquals("value1", vars.get("outputVar"));
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
index b0e99fd660e..95de9d93847 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
@@ -18,9 +18,7 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -80,7 +78,7 @@ void testDefault2() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-dd-MM", "", endDate, "", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        Assertions.assertEquals(10, value.length());
+        assertEquals(10, value.length());
     }
 
     @Test
@@ -104,7 +102,7 @@ void testFormatDate2() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, "", endDate, "", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        Assertions.assertEquals(8, value.length());
+        assertEquals(8, value.length());
     }
 
     @Test
@@ -116,7 +114,7 @@ void testFormatDate3() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("29 Aug 2111")));
+        assertEquals("29 Aug 2111", value);
     }
 
     @Test
@@ -128,7 +126,7 @@ void testFrenchFormatDate() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("29 mars 2111")));
+        assertEquals("29 mars 2111", value);
     }
 
     @Test
@@ -140,7 +138,7 @@ void testEmptyFormatDate() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2111-03-29")));
+        assertEquals("2111-03-29", value);
     }
 
     @Test
@@ -152,7 +150,7 @@ void testEndDateBeforeStartDate() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("")));
+        assertEquals("", value);
     }
 
     @Test
@@ -164,7 +162,7 @@ void testEndDateBeforeStartDateNullVariable() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, null);
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2111-03-29")));
+        assertEquals("2111-03-29", value);
     }
 
     @Test
@@ -176,8 +174,8 @@ void testEndDateBeforeStartDateWithVariable() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "MY_VAR");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2111-03-29")));
-        assertThat(vars.get("MY_VAR"), is(equalTo("2111-03-29")));
+        assertEquals("2111-03-29", value);
+        assertEquals("2111-03-29", vars.get("MY_VAR"));
     }
 
     @Test
@@ -189,7 +187,7 @@ void testInvalidFormat() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("")));
+        assertEquals("", value);
     }
 
     @Test
@@ -201,7 +199,7 @@ void testInvalidStartDateFormat() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("")));
+        assertEquals("", value);
     }
 
     @Test
@@ -213,6 +211,6 @@ void testInvalidEndDateFormat() throws Exception {
         Collection<CompoundVariable> params = makeParams(formatDate, startDate, endDate, localeAsString, "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("")));
+        assertEquals("", value);
     }
 }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
index a307ed8334f..b93829c13ed 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
@@ -18,11 +18,8 @@
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
-import static org.exparity.hamcrest.date.LocalDateMatchers.sameDay;
-import static org.exparity.hamcrest.date.LocalDateTimeMatchers.within;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -31,7 +28,6 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.time.zone.ZoneRules;
 import java.util.Collection;
 import java.util.Random;
@@ -66,12 +62,19 @@ void setUp() {
         function = new TimeShift();
     }
 
+    private void assertDateEquals(LocalDateTime expected, LocalDateTime actual, Duration delta) {
+        Duration diff = Duration.between(expected, actual);
+        if (diff.abs().compareTo(delta) > 0) {
+            fail(expected + " should be within " + delta + " of " + actual + ", actual diff is " + diff);
+        }
+    }
+
     @Test
     void testDatePlusOneDay() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-dd-MM", "2017-01-01", "P1D", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-02-01")));
+        assertEquals("2017-02-01", value);
     }
 
     @Test
@@ -79,7 +82,7 @@ void testDatePlusOneDayInVariable() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-dd-MM", "2017-01-01", "P1d", "VAR");
         function.setParameters(params);
         function.execute(result, null);
-        assertThat(vars.get("VAR"), is(equalTo("2017-02-01")));
+        assertEquals("2017-02-01", vars.get("VAR"));
     }
 
     @Test
@@ -87,7 +90,7 @@ void testDatePlusComplexPeriod() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-dd-MM HH:m", "2017-01-01 12:00", "P+32dT-1H-5m", "VAR");
         function.setParameters(params);
         String value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-02-02 10:55")));
+        assertEquals("2017-02-02 10:55", value);
     }
 
     @Test
@@ -98,7 +101,7 @@ void testDefault() throws Exception {
         long resultat = Long.parseLong(value);
         LocalDateTime nowFromFunction = LocalDateTime.ofInstant(Instant.ofEpochMilli(resultat),
                 TimeZone.getDefault().toZoneId());
-        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now(ZoneId.systemDefault())));
+        assertDateEquals(LocalDateTime.now(ZoneId.systemDefault()), nowFromFunction, Duration.ofSeconds(5));
     }
 
     @Test
@@ -108,7 +111,7 @@ void testNowPlusOneDay() throws Exception {
         value = function.execute(result, null);
         LocalDate tomorrow = LocalDate.now(ZoneId.systemDefault()).plusDays(1);
         LocalDate tomorrowFromFunction = LocalDate.parse(value);
-        assertThat(tomorrowFromFunction, sameDay(tomorrow));
+        assertEquals(tomorrow, tomorrowFromFunction);
     }
 
     @Test
@@ -123,7 +126,7 @@ void testNowWithComplexPeriod() throws Exception {
         LocalDateTime futureDate = LocalDateTime.now(ZoneId.systemDefault())
                 .plusDays(10).plusHours(-1).plusMinutes(-5).plusSeconds(5);
         LocalDateTime futureDateFromFunction = LocalDateTime.parse(value);
-        assertThat(futureDateFromFunction, within(1, ChronoUnit.SECONDS, futureDate));
+        assertDateEquals(futureDate, futureDateFromFunction, Duration.ofSeconds(1));
     }
 
     private static BooleanSupplier dstChangeAhead(String duration) {
@@ -150,7 +153,7 @@ void testPotentialBugWithComplexPeriod() throws Exception {
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd' 'HH:mm:ss");
         LocalDateTime baseDate = LocalDateTime.parse("2017-12-21 12:00:00", dateFormat);
         LocalDateTime futureDate = baseDate.plusDays(10).plusHours(-1).plusMinutes(-5).plusSeconds(5);
-        assertThat(futureDateFromFunction, within(1, ChronoUnit.SECONDS, futureDate));
+        assertDateEquals(futureDate, futureDateFromFunction, Duration.ofSeconds(1));
     }
 
     @Test
@@ -165,8 +168,7 @@ void testShiftWithTimeZone() throws Exception {
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(pattern);
         LocalDateTime baseDate = ZonedDateTime.parse(timeString, dateFormat).toLocalDateTime();
         LocalDateTime futureDate = baseDate.plusDays(10).plusHours(-1).plusMinutes(-5).plusSeconds(5);
-        assertThat(futureDateFromFunction.toLocalDateTime(), within(1, ChronoUnit.SECONDS, futureDate));
-
+        assertDateEquals(futureDate, futureDateFromFunction.toLocalDateTime(), Duration.ofSeconds(1));
     }
 
     static void main(String[] args) {
@@ -182,7 +184,7 @@ void testWrongAmountToAdd() throws Exception {
         long resultat = Long.parseLong(value);
         LocalDateTime nowFromFunction = LocalDateTime.ofInstant(Instant.ofEpochMilli(resultat),
                 TimeZone.getDefault().toZoneId());
-        assertThat(nowFromFunction, within(5, ChronoUnit.SECONDS, LocalDateTime.now(ZoneId.systemDefault())));
+        assertDateEquals(LocalDateTime.now(ZoneId.systemDefault()), nowFromFunction, Duration.ofSeconds(5));
     }
 
     @Test
@@ -190,7 +192,7 @@ void testWrongFormatDate() throws Exception {
         Collection<CompoundVariable> params = makeParams("hjfdjyra:fd", "", "P1D", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("")));
+        assertEquals("", value);
     }
 
     @Test
@@ -203,13 +205,13 @@ void testRandomPeriod() throws Exception {
         value = function.execute(result, null);
         LocalDateTime randomFutureDate = LocalDateTime.parse(value);
         LocalDateTime checkFutureDate = LocalDateTime.now(ZoneId.systemDefault()).plusMinutes(randomInt);
-        assertThat(randomFutureDate, within(5, ChronoUnit.SECONDS, checkFutureDate));
+        assertDateEquals(checkFutureDate, randomFutureDate, Duration.ofSeconds(5));
         randomInt = r.ints(1, 60).limit(1).findFirst().getAsInt();
         vars.put("random", String.valueOf(randomInt));
         value = function.execute(result, null);
         randomFutureDate = LocalDateTime.parse(value);
         checkFutureDate = LocalDateTime.now(ZoneId.systemDefault()).plusMinutes(randomInt);
-        assertThat(randomFutureDate, within(5, ChronoUnit.SECONDS, checkFutureDate));
+        assertDateEquals(checkFutureDate, randomFutureDate, Duration.ofSeconds(5));
     }
 
     @Test
@@ -217,19 +219,19 @@ void testNowPlusOneDayWithLocale() throws Exception {
         Collection<CompoundVariable> params = makeParams("yyyy-MMMM-dd", "2017-juillet-01", "P1D", "fr_FR", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-juillet-02")));
+        assertEquals("2017-juillet-02", value);
         params = makeParams("yyyy-MMMM-dd", "2017-July-01", "P1D", "en_EN", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-July-02")));
+        assertEquals("2017-July-02", value);
         params = makeParams("yyyy-MMMM-dd", "2017-julio-01", "P1D", "es_ES", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-julio-02")));
+        assertEquals("2017-julio-02", value);
         params = makeParams("yyyy-MMMM-dd", "2017-Juli-01", "P1D", "de_DE", "");
         function.setParameters(params);
         value = function.execute(result, null);
-        assertThat(value, is(equalTo("2017-Juli-02")));
+        assertEquals("2017-Juli-02", value);
     }
 
 }
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
index 0e92b30d104..fea48b24eeb 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
@@ -17,11 +17,11 @@
 
 package org.apache.jorphan.gui;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -48,7 +48,7 @@ void testRendering(Object value, String expected) {
             @Override
             public void setText(String text) {
                 if (afterInit.get()) {
-                    MatcherAssert.assertThat(text, CoreMatchers.is(expected));
+                    assertEquals(expected, text);
                 }
             }
         };
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
index f776065fcc9..4f51f6f4854 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
@@ -21,14 +21,11 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -48,7 +45,6 @@
 import javax.swing.SortOrder;
 
 import org.apache.jorphan.reflect.Functor;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -145,25 +141,25 @@ private ObjectTableModel createTableModel(
     @Test
     public void getDefaultComparatorForNullClass() {
         ObjectTableSorter sorter = new ObjectTableSorter(createTableModel("null", null));
-        assertThat(sorter.getValueComparator(0), is(nullValue()));
+        assertNull(sorter.getValueComparator(0));
     }
 
     @Test
     public void getDefaultComparatorForStringClass() {
         ObjectTableSorter sorter = new ObjectTableSorter(createTableModel("string", String.class));
-        assertThat(sorter.getValueComparator(0), is(CoreMatchers.notNullValue()));
+        assertNotNull(sorter.getValueComparator(0));
     }
 
     @Test
     public void getDefaultComparatorForIntegerClass() {
         ObjectTableSorter sorter = new ObjectTableSorter(createTableModel("integer", Integer.class));
-        assertThat(sorter.getValueComparator(0), is(CoreMatchers.notNullValue()));
+        assertNotNull(sorter.getValueComparator(0));
     }
 
     @Test
     public void getDefaultComparatorForObjectClass() {
         ObjectTableSorter sorter = new ObjectTableSorter(createTableModel("object", Object.class));
-        assertThat(sorter.getValueComparator(0), is(nullValue()));
+        assertNull(sorter.getValueComparator(0));
     }
 
     @Test
@@ -229,7 +225,10 @@ public void setSortKeys_withSortedThenUnsorted() {
     public void setSortKeys_single() {
         List<SortKey> keys = singletonList(new SortKey(0, SortOrder.ASCENDING));
         sorter.setSortKeys(keys);
-        assertThat(sorter.getSortKeys(), allOf(is(not(sameInstance(keys))), is(equalTo(keys))));
+        assertAll(
+                () -> assertNotSame(keys, sorter.getSortKeys(), "keys vs sorter.getSortKeys()"),
+                () -> assertEquals(keys, sorter.getSortKeys(), "keys vs sorter.getSortKeys()")
+        );
     }
 
     @Test
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
index 30c271e1866..b044302124c 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
@@ -17,7 +17,6 @@
 
 package org.apache.jorphan.util;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -26,8 +25,6 @@
 
 import java.nio.charset.StandardCharsets;
 
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -80,75 +77,83 @@ public void testReplace8() {
     public void testSplitStringStringTrueWithTrailingSplitChars() {
         // Test ignore trailing split characters
         // Ignore adjacent delimiters
-        assertThat("Ignore trailing split chars", JOrphanUtils.split("a,bc,,", ",", true),
-                CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(
+                new String[]{"a", "bc"},
+                JOrphanUtils.split("a,bc,,", ",", true),
+                "Ignore trailing split chars");
     }
 
     @Test
     public void testSplitStringStringFalseWithTrailingSplitChars() {
         // Test ignore trailing split characters
-        assertThat("Include the trailing split chars", JOrphanUtils.split("a,bc,,", ",", false),
-                CoreMatchers.equalTo(new String[]{"a", "bc", "", ""}));
+        assertArrayEquals(
+                new String[]{"a", "bc", "", ""},
+                JOrphanUtils.split("a,bc,,", ",", false),
+                "Include the trailing split chars");
     }
 
     @Test
     public void testSplitStringStringTrueWithLeadingSplitChars() {
         // Test leading split characters
-        assertThat("Ignore leading split chars", JOrphanUtils.split(",,a,bc", ",", true),
-                CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(
+                new String[]{"a", "bc"},
+                JOrphanUtils.split(",,a,bc", ",", true),
+                "Ignore leading split chars");
     }
 
     @Test
     public void testSplitStringStringFalseWithLeadingSplitChars() {
         // Test leading split characters
-        assertThat("Include leading split chars", JOrphanUtils.split(",,a,bc", ",", false),
-                CoreMatchers.equalTo(new String[]{"", "", "a", "bc"}));
+        assertArrayEquals(
+                new String[]{"", "", "a", "bc"},
+                JOrphanUtils.split(",,a,bc", ",", false),
+                "Include leading split chars");
     }
 
     @Test
     public void testSplit3() {
         String in = "a,bc,,"; // Test ignore trailing split characters
         String[] out = JOrphanUtils.split(in, ",", true);// Ignore adjacent delimiters
-        assertThat(out, CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(new String[]{"a", "bc"}, out);
         out = JOrphanUtils.split(in, ",", false);
-        assertThat(out, CoreMatchers.equalTo(new String[]{"a", "bc", "", ""}));
+        assertArrayEquals(new String[]{"a", "bc", "", ""}, out);
     }
 
     @Test
     public void testSplitStringStringTrueWithLeadingComplexSplitCharacters() {
         // Test leading split characters
-        assertThat(JOrphanUtils.split(" , ,a ,bc", " ,", true), CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(new String[]{"a", "bc"}, JOrphanUtils.split(" , ,a ,bc", " ,", true));
     }
 
     @Test
     public void testSplitStringStringFalseWithLeadingComplexSplitCharacters() {
         // Test leading split characters
-        assertThat(JOrphanUtils.split(" , ,a ,bc", " ,", false),
-                CoreMatchers.equalTo(new String[]{"", "", "a", "bc"}));
+        assertArrayEquals(new String[]{"", "", "a", "bc"},
+                JOrphanUtils.split(" , ,a ,bc", " ,", false));
     }
 
     @Test
     public void testSplitStringStringTrueTruncate() throws Exception {
-        assertThat(JOrphanUtils.split("a;,b;,;,;,d;,e;,;,f", ";,", true),
-                CoreMatchers.equalTo(new String[]{"a", "b", "d", "e", "f"}));
+        assertArrayEquals(new String[]{"a", "b", "d", "e", "f"},
+                JOrphanUtils.split("a;,b;,;,;,d;,e;,;,f", ";,", true));
     }
 
     @Test
     public void testSplitStringStringFalseTruncate() throws Exception {
-        assertThat(JOrphanUtils.split("a;,b;,;,;,d;,e;,;,f", ";,", false),
-                CoreMatchers.equalTo(new String[]{"a", "b", "", "", "d", "e", "", "f"}));
+        assertArrayEquals(new String[]{"a", "b", "", "", "d", "e", "", "f"},
+                JOrphanUtils.split("a;,b;,;,;,d;,e;,;,f", ";,", false));
     }
 
     @Test
     public void testSplitStringStringTrueDoubledSplitChar() throws Exception {
-        assertThat(JOrphanUtils.split("a;;b;;;;;;d;;e;;;;f", ";;", true),
-                CoreMatchers.equalTo(new String[]{"a", "b", "d", "e", "f"}));
+        assertArrayEquals(new String[]{"a", "b", "d", "e", "f"},
+                JOrphanUtils.split("a;;b;;;;;;d;;e;;;;f", ";;", true));
     }
 
     @Test
     public void testSplitStringStringFalseDoubledSplitChar() throws Exception {
-        assertThat(JOrphanUtils.split("a;;b;;;;;;d;;e;;;;f", ";;", false),
-                CoreMatchers.equalTo(new String[]{"a", "b", "", "", "d", "e", "", "f"}));
+        assertArrayEquals(new String[]{"a", "b", "", "", "d", "e", "", "f"},
+                JOrphanUtils.split("a;;b;;;;;;d;;e;;;;f", ";;", false));
     }
 
     // Empty string
@@ -162,37 +167,37 @@ public void testEmpty() {
     @Test
     public void testSplitSSSSingleDelimiterWithDefaultValue() {
         // Test non-empty parameters
-        assertThat(JOrphanUtils.split("a,bc,,", ",", "?"), CoreMatchers.equalTo(new String[]{"a", "bc", "?", "?"}));
+        assertArrayEquals(new String[]{"a", "bc", "?", "?"}, JOrphanUtils.split("a,bc,,", ",", "?"));
     }
 
     @Test
     public void testSplitSSSSingleDelimiterWithEmptyValue() {
         // Empty default
-        assertThat(JOrphanUtils.split("a,bc,,", ",", ""), CoreMatchers.equalTo(new String[]{"a", "bc", "", ""}));
+        assertArrayEquals(new String[]{"a", "bc", "", ""}, JOrphanUtils.split("a,bc,,", ",", ""));
     }
 
     @Test
     public void testSplitSSSEmptyDelimiter() {
         String in = "a,bc,,"; // Empty delimiter
-        assertThat(JOrphanUtils.split(in, "", "?"), CoreMatchers.equalTo(new String[]{in}));
+        assertArrayEquals(new String[]{in}, JOrphanUtils.split(in, "", "?"));
     }
 
     @Test
     public void testSplitSSSMultipleDelimCharsWithDefaultValue() {
         // Multiple delimiters
-        assertThat(JOrphanUtils.split("a,b;c,,", ",;", "?"),
-                CoreMatchers.equalTo(new String[]{"a", "b", "c", "?", "?"}));
+        assertArrayEquals(new String[]{"a", "b", "c", "?", "?"},
+                JOrphanUtils.split("a,b;c,,", ",;", "?"));
     }
 
     @Test
     public void testSplitSSSMultipleDelimCharsWithEmptyValue() {
         // Multiple delimiters
-        assertThat(JOrphanUtils.split("a,b;c,,", ",;", ""), CoreMatchers.equalTo(new String[]{"a", "b", "c", "", ""}));
+        assertArrayEquals(new String[]{"a", "b", "c", "", ""}, JOrphanUtils.split("a,b;c,,", ",;", ""));
     }
 
     @Test
     public void testSplitSSSSameDelimiterAsDefaultValue() {
-        assertThat(JOrphanUtils.split("a,bc,,", ",", ","), CoreMatchers.equalTo(new String[]{"a", "bc", ",", ","}));
+        assertArrayEquals(new String[]{"a", "bc", ",", ","}, JOrphanUtils.split("a,bc,,", ",", ","));
     }
 
     @Test
@@ -211,12 +216,12 @@ public void testSplitStringNullString() {
 
     @Test
     public void testSplitStringStringNullWithSingleDelimiter() {
-        assertThat(JOrphanUtils.split("a,bc,,", ",", null), CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(new String[]{"a", "bc"}, JOrphanUtils.split("a,bc,,", ",", null));
     }
 
     @Test
     public void testSplitStringStringNullWithMultipleDelimiter() {
-        assertThat(JOrphanUtils.split("a,;bc,;,", ",;", null), CoreMatchers.equalTo(new String[]{"a", "bc"}));
+        assertArrayEquals(new String[]{"a", "bc"}, JOrphanUtils.split("a,;bc,;,", ",;", null));
     }
 
     @Test
@@ -228,7 +233,7 @@ public void testSplitSSSWithEmptyInput() {
     @Test
     public void testSplitSSSWithEmptyDelimiter() {
         final String in = "a,;bc,;,";
-        assertThat(JOrphanUtils.split(in, "", "x"), CoreMatchers.equalTo(new String[]{in}));
+        assertArrayEquals(new String[]{in}, JOrphanUtils.split(in, "", "x"));
     }
 
     @Test
@@ -274,17 +279,9 @@ public void testBaToHexStringSeparator() {
 
     @Test
     public void testbaToByte() throws Exception {
-        assertEqualsArray(new byte[]{}, JOrphanUtils.baToHexBytes(new byte[]{}));
-        assertEqualsArray(new byte[]{'0', '0'}, JOrphanUtils.baToHexBytes(new byte[]{0}));
-        assertEqualsArray("0f107f8081ff".getBytes(StandardCharsets.UTF_8),
-                JOrphanUtils.baToHexBytes(new byte[]{15, 16, 127, -128, -127, -1}));
-    }
-
-    private void assertEqualsArray(byte[] expected, byte[] actual) {
-        assertEquals(expected.length, actual.length, "arrays must be same length");
-        for (int i = 0; i < expected.length; i++) {
-            assertEquals(expected[i], actual[i], "values must be the same for index: " + i);
-        }
+        assertArrayEquals(new byte[]{}, JOrphanUtils.baToHexBytes(new byte[]{}));
+        assertArrayEquals(new byte[]{'0', '0'}, JOrphanUtils.baToHexBytes(new byte[]{0}));
+        assertArrayEquals("0f107f8081ff".getBytes(StandardCharsets.UTF_8), JOrphanUtils.baToHexBytes(new byte[]{15, 16, 127, -128, -127, -1}));
     }
 
     @Test
@@ -373,16 +370,14 @@ public void testReplaceAllWithRegex() {
 
     @Test
     public void testReplaceValueWithNullValue() {
-        assertThat(JOrphanUtils.replaceValue(null, null, false, null, null),
-                CoreMatchers.is(0));
+        assertEquals(0, JOrphanUtils.replaceValue(null, null, false, null, null));
     }
 
     @Test
     public void testReplaceValueWithValidValueAndValidSetter() {
         Holder h = new Holder();
-        assertThat(JOrphanUtils.replaceValue("\\d+", "${port}", true, "80", s -> h.value = s),
-                CoreMatchers.is(1));
-        assertThat(h.value, CoreMatchers.is("${port}"));
+        assertEquals(1, JOrphanUtils.replaceValue("\\d+", "${port}", true, "80", s -> h.value = s));
+        assertEquals("${port}", h.value);
     }
 
     private static class Holder {
@@ -405,6 +400,9 @@ public void testUnsplit() {
 
     @Test
     public void testGenerateRandomAlphanumericPassword20() {
-        assertThat(JOrphanUtils.generateRandomAlphanumericPassword(20), Matchers.matchesPattern("[A-Za-z0-9]{20}"));
+        String password = JOrphanUtils.generateRandomAlphanumericPassword(20);
+        assertTrue(
+                password.matches("[A-Za-z0-9]{20}"),
+                () -> "generateRandomAlphanumericPassword(20) should match pattern \"[A-Za-z0-9]{20}\", got " + password);
     }
 }
diff --git a/src/licenses/licenses/hamcrest-date/LICENSE b/src/licenses/licenses/hamcrest-date/LICENSE
deleted file mode 100644
index 72934585dd6..00000000000
--- a/src/licenses/licenses/hamcrest-date/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2012, Stewart Bissett
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of its contributors may
-      be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java
index 7d9a39689b7..ab49f77302c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java
@@ -17,10 +17,9 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.jmeter.protocol.http.control.AuthManager.Mechanism;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 
 public class TestAuthorization {
@@ -29,7 +28,7 @@ public class TestAuthorization {
     public void testToBasicHeader() {
         Authorization basicAuthorization = new Authorization("http://example.com", "foo", "bar", null, "Test Realm",
                 Mechanism.BASIC);
-        assertThat(basicAuthorization.toBasicHeader(), CoreMatchers.is("Basic Zm9vOmJhcg=="));
+        assertEquals("Basic Zm9vOmJhcg==", basicAuthorization.toBasicHeader());
     }
 
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java
index 9eb008d2e1a..5e75d2fdffb 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java
@@ -17,7 +17,7 @@
 
 package org.apache.jmeter.protocol.http.parser;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -29,7 +29,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -114,10 +113,11 @@ void testGetEmbeddedResourceURLsStringByteArrayURLURLCollectionString(HTMLParser
                 StandardCharsets.UTF_8.name());
         List<String> urlNames = c.stream().map(u -> u.toString())
                 .collect(Collectors.toList());
-        assertThat(
+        assertEquals(
+                links.toString(),
+                urlNames.toString(),
                 String.format("Parse with %s the page %s to get %s",
-                        parser.getClass().getSimpleName(), html, links),
-                urlNames, CoreMatchers.is(CoreMatchers.equalTo(links)));
+                        parser.getClass().getSimpleName(), html, links));
     }
 
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
index 0482d58261f..c85bd547dc5 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
@@ -17,10 +17,8 @@
 
 package org.apache.jmeter.protocol.http.parser;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,7 +28,6 @@
 import java.util.List;
 
 import org.apache.jmeter.junit.JMeterTestCase;
-import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 
 public class TestCssParser extends JMeterTestCase {
@@ -48,24 +45,24 @@ public class TestCssParser extends JMeterTestCase {
     public void testGetEmbeddedResourceURLsNoUrls() throws Exception {
         CssParser nonIgnoreParser = new CssParser();
         List<URL> result = extractUrls(nonIgnoreParser, "..");
-        assertThat(result, is(empty()));
+        assertEquals("[]", result.toString());
     }
 
     @Test
     public void testGetEmbeddedResourceURLsnOneUrl() throws Exception {
         List<URL> result = extractUrls("@import url(http://example.com/abc.css);");
-        assertThat(result, is(not(empty())));
+        assertEquals("[http://example.com/abc.css]", result.toString());
     }
 
     @Test
     public void testExtractUrlsFromBrokenData() throws Exception {
         List<URL> result = extractUrls(CSS_IN_ERROR);
-        assertThat(result, is(empty()));
+        assertEquals("[]", result.toString());
     }
 
     @Test
     public void testIsReusable() {
-        assertThat(parser.isReusable(), CoreMatchers.is(true));
+        assertTrue(parser.isReusable());
     }
 
     private List<URL> extractUrls(String css) throws LinkExtractorParseException,
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
index 24938c2ed9c..40b972ec553 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
@@ -17,6 +17,10 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -26,9 +30,6 @@
 
 import org.apache.jmeter.protocol.http.control.Header;
 import org.apache.jmeter.protocol.http.control.HeaderManager;
-import org.hamcrest.Matcher;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -39,6 +40,8 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 
+import kotlin.text.StringsKt;
+
 public class TestDecompression {
     enum ClientGzip {
         REQUESTED, NOT_REQUESTED
@@ -91,16 +94,19 @@ public void mockServer(String httpImpl, ClientGzip clientGzip, ServerGzip server
             HTTPSampleResult res = http.sample(new URL(server.url("/gzip")), "GET", false, 1);
 
             Assertions.assertAll(
+                    () -> assertEquals(expectedResponse, res.getResponseDataAsString(), "response body"),
                     () -> {
-                        Matcher<String> matcher;
                         if (clientGzip == ClientGzip.NOT_REQUESTED || serverGzip == ServerGzip.NOT_SUPPORTED) {
-                            matcher = Matchers.not(Matchers.containsStringIgnoringCase("Content-Encoding:"));
+                            assertFalse(
+                                    StringsKt.contains(res.getResponseHeaders(), "Content-Encoding:", false),
+                                    () -> "clientGzip is " + clientGzip + ", so Content-Encoding header should NOT be present"
+                            );
                         } else {
-                            matcher = Matchers.containsStringIgnoringCase("Content-Encoding: gzip");
+                            assertTrue(
+                                    StringsKt.contains(res.getResponseHeaders(), "Content-Encoding: gzip", false),
+                                    () -> "clientGzip is " + clientGzip + ", so Content-Encoding: gzip header should be present"
+                            );
                         }
-                        MatcherAssert.assertThat("getResponseHeaders", res.getResponseHeaders(), matcher);
-                    }, () -> {
-                        Assertions.assertEquals(expectedResponse, res.getResponseDataAsString(), "response body");
                     }
             );
         } finally {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index 849ab038183..42e63d359bc 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -72,7 +72,7 @@ void testRedirect(String httpImpl, int redirectCode, boolean shouldRedirect, Str
             if (shouldRedirect) {
                 Assertions.assertEquals(server.url("/redirected"), res.getRedirectLocation());
             } else {
-                Assertions.assertEquals(null, res.getRedirectLocation());
+                Assertions.assertNull(res.getRedirectLocation());
             }
             Assertions.assertEquals("" + redirectCode, res.getResponseCode());
         } finally {
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java
index 512a4fe52e2..becffb7666b 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java
@@ -17,9 +17,7 @@
 
 package org.apache.jmeter.protocol.http.sampler;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.File;
 
@@ -45,7 +43,8 @@ public void checkThatFilesAreReadRelativeToBaseDir() {
             sampler.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg(file.getName(), "", "")});
 
             SampleResult sample = sampler.sample();
-            assertThat(sample.getResponseDataAsString(), not(containsString("java.io.FileNotFoundException:")));
+            assertFalse(sample.getResponseDataAsString().contains("java.io.FileNotFoundException:"),
+                    () -> sample.getResponseDataAsString() + " should not contain java.io.FileNotFoundException:");
         } finally {
             FileServer.getFileServer().setBase(baseDir);
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 88003b84b71..6688898f76e 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.protocol.http.visualizers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -25,8 +27,6 @@
 import java.util.stream.Stream;
 
 import org.apache.jorphan.util.StringUtilities;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -233,9 +233,11 @@ void testGetQueryMapWithEmptyKeyAndValue(String query, Map<String, List<String>>
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
         Assertions.assertNotNull(params);
         Assertions.assertEquals(expected.size(), params.size());
-        expected.forEach((key, values) -> {
-            MatcherAssert.assertThat(params, Matchers.hasKey(key));
-            Assertions.assertArrayEquals(values.toArray(), params.get(key));
-        });
+        expected.forEach((key, values) ->
+                assertEquals(
+                        values.toString(),
+                        Arrays.asList(params.get(key)).toString(),
+                        "RequestViewHTTP.getQueryMap(..).get(" + key + ")"
+                ));
     }
 }
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
index 9feba1ac6ad..bba2c621fbc 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
@@ -17,87 +17,23 @@
 
 package org.apache.jmeter.protocol.jms.sampler.render;
 
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.jmeter.threads.JMeterVariables;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.TypeSafeMatcher;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class BinaryMessageRendererTest extends MessageRendererTest<byte[]> {
-    public static class ThrowableMessageMatcher<T extends Throwable> extends
-            TypeSafeMatcher<T> {
-
-        private final Matcher<String> matcher;
-
-        public ThrowableMessageMatcher(Matcher<String> matcher) {
-            this.matcher = matcher;
-        }
-
-        public void describeTo(Description description) {
-            description.appendText("exception with message ");
-            description.appendDescriptionOf(matcher);
-        }
-
-        @Override
-        protected boolean matchesSafely(T item) {
-            return matcher.matches(item.getMessage());
-        }
-
-        @Override
-        protected void describeMismatchSafely(T item, Description description) {
-            description.appendText("message ");
-            matcher.describeMismatch(item.getMessage(), description);
-        }
-    }
-
-    public static class ThrowableCauseMatcher<T extends Throwable> extends
-            TypeSafeMatcher<T> {
-
-        private final Matcher<?> causeMatcher;
-
-        public ThrowableCauseMatcher(Matcher<?> causeMatcher) {
-            this.causeMatcher = causeMatcher;
-        }
-
-        public void describeTo(Description description) {
-            description.appendText("exception with cause ");
-            description.appendDescriptionOf(causeMatcher);
-        }
-
-        @Override
-        protected boolean matchesSafely(T item) {
-            return causeMatcher.matches(item.getCause());
-        }
-
-        @Override
-        protected void describeMismatchSafely(T item, Description description) {
-            description.appendText("cause ");
-            causeMatcher.describeMismatch(item.getCause(), description);
-        }
-    }
-
-    public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
-        return new ThrowableMessageMatcher<T>(matcher);
-    }
-
-    public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
-        return new ThrowableCauseMatcher<T>(matcher);
-    }
-
     private BinaryMessageRenderer render = RendererFactory.getInstance().getBinary();
 
     @Override
@@ -129,11 +65,14 @@ public void readNonExistingContent() {
                 RuntimeException.class,
                 () -> render.getContent("__file_that_may_not_exists_else_it_will_fail")
         );
-
-        MatcherAssert.assertThat(ex, allOf(
-                hasMessage(containsString("Can't read content of __file_that_may_not_exists_else_it_will_fail")),
-                hasCause(instanceOf(IOException.class))
-        ));
+        assertAll(
+                () -> assertInstanceOf(IOException.class, ex.getCause(), "ex.getCause()"),
+                () -> assertContains(
+                        ex.getMessage(),
+                        "Can't read content of __file_that_may_not_exists_else_it_will_fail",
+                        "ex.getCause().getMessage()"
+                )
+        );
     }
 
     @Test
@@ -159,11 +98,12 @@ public void getValueFromFile_withInvalidEncoding() {
                 RuntimeException.class,
                 () -> render.getValueFromFile("utf8.txt", "banana", true, cache)
         );
-        MatcherAssert.assertThat(
-                ex,
-                allOf(
-                        hasMessage(containsString("utf8.txt")),
-                        hasCause(instanceOf(UnsupportedEncodingException.class))
+        assertAll(
+                () -> assertInstanceOf(UnsupportedEncodingException.class, ex.getCause(), "ex.getCause()"),
+                () -> assertContains(
+                        ex.getMessage(),
+                        "utf8.txt",
+                        "ex.getCause().getMessage()"
                 )
         );
     }
@@ -176,6 +116,10 @@ public void getValueFromFile_inRawMode() throws IOException {
         assertCacheContentInBytes(text);
     }
 
+    private void assertContains(String value, String substring, String message) {
+        assertTrue(value.contains(substring), () -> message + ": " + value + " should contain " + substring);
+    }
+
     protected void assertValueFromFile(String expected, String fileName, boolean hasVariable) {
         assertValueFromFile(actual -> assertBytesEquals(expected, actual), fileName, hasVariable);
     }
diff --git a/src/protocol/junit/build.gradle.kts b/src/protocol/junit/build.gradle.kts
index f2612645b7c..c9fe345b1ec 100644
--- a/src/protocol/junit/build.gradle.kts
+++ b/src/protocol/junit/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     api("junit:junit")
-    implementation("org.exparity:hamcrest-date") {
-        because("hamcrest-date.jar was historically shipped with JMeter")
-    }
     implementation("com.miglayout:miglayout-swing")
 
     testImplementation(testFixtures(projects.src.core))

From 74d3ea2565bd9d0575dd8242f5fbfcae46e06c3b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 13:28:29 +0300
Subject: [PATCH 0901/1037] chore: bump jacoco to 0.8.14

---
 .../verification/src/main/kotlin/build-logic.jacoco.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
index ace4c95cd48..1656a1e1308 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.13"
+    toolVersion = "0.8.14"
     providers.gradleProperty("jacoco.version")
         .takeIf { it.isPresent }
         ?.let { toolVersion = it.get() }

From ad456c4cc2cd520f8d3c4939eb0ced7d874eb35e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 13:32:25 +0300
Subject: [PATCH 0902/1037] chore: bump org.ow2.asm to 9.9

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f55ed3e043d..2a72371137d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
         // compilation classpath (e.g. it is used as a transitive by a third-party library)
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
-        api("org.ow2.asm:asm:9.6")
+        api("org.ow2.asm:asm:9.9")
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 63e0fc63176..35b439216df 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,7 +1,7 @@
 30245,accessors-smart-2.6.0.jar
 31170,annotations-26.0.2-1.jar
 6806,apiguardian-api-1.1.2.jar
-126093,asm-9.7.1.jar
+126122,asm-9.9.jar
 485992,batik-anim-1.17.jar
 424429,batik-awt-util-1.17.jar
 704814,batik-bridge-1.17.jar

From 57767aef1d2d32b7fee083d7c24cd19a9dca6a99 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 13:39:16 +0300
Subject: [PATCH 0903/1037] chore: bump org.jetbrains.dokka-javadoc to 2.1.0

---
 build-logic/jvm/build.gradle.kts | 2 +-
 gradle/verification-metadata.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 01ab58728af..e8ffd717f01 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.20")
-    api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
+    api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.1.0")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index f1df8d9a563..755110a6947 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -675,6 +675,11 @@
             <sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.1.0">
+         <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.1.0.pom">
+            <sha256 value="de9bdcea93102c43427c70128943625131530cbb0e38ec6bbbad9bda6141a2c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.10">
          <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.10.pom">
             <sha256 value="3fc9468d71b90b3f98afa8a2978cbf9065ae3606a0a153a2e5acd7afec92c512" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 9b2e03ab0ce122179f5df25b869badd43425d2fe Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 13:42:10 +0300
Subject: [PATCH 0904/1037] chore: bump org.jetbrains.kotlin to 2.2.21

---
 build-logic/jvm/build.gradle.kts            |  4 ++--
 build-logic/root-build/build.gradle.kts     |  2 +-
 gradle/verification-metadata.xml            | 15 +++++++++++++++
 src/dist/src/dist/expected_release_jars.csv |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index e8ffd717f01..17101499029 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.3")
     api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
-    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.20")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
+    api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.21")
     api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.1.0")
 }
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index b0983dd5cd7..3262ff0e54c 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -32,5 +32,5 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
-    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.20")
+    api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 755110a6947..5a7ca4db992 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -690,16 +690,31 @@
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.21">
+         <artifact name="kotlin-compiler-runner-2.2.21.pom">
+            <sha256 value="1f103d8bde08ddd614bd983abdfcb7949139c606ac60cd8a68941fd0fb1ee124" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.20">
          <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.20.pom">
             <sha256 value="4eb87defec3e7c2fece0e1a1ecdf22a70cdd61898262555b1d92e7c7b3f3b95d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.21">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.21.pom">
+            <sha256 value="5c3bde6e7f1dc0fa44e14c85a1ba6a03aaff86cabb19700830f4d2dd1de13dc4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.20">
          <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.20.pom">
             <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.21">
+         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.21.pom">
+            <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.10.1">
          <artifact name="junit-bom-5.10.1.pom">
             <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 35b439216df..381697c86bd 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -95,7 +95,7 @@
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
 43729,kotlin-logging-jvm-2.1.23.jar
-1761444,kotlin-stdlib-2.2.20.jar
+1761445,kotlin-stdlib-2.2.21.jar
 963,kotlin-stdlib-jdk7-1.8.20.jar
 969,kotlin-stdlib-jdk8-1.8.20.jar
 1548360,kotlinx-coroutines-core-jvm-1.8.0.jar

From 611c21acf1b7bf447e8faa35523f77662cb6f42c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 13:46:54 +0300
Subject: [PATCH 0905/1037] chore: bump com.fasterxml.jackson to 2.20.0

---
 src/bom-thirdparty/build.gradle.kts         | 4 +---
 src/dist/src/dist/expected_release_jars.csv | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 2a72371137d..b10c825e52e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -28,6 +28,7 @@ javaPlatform {
 dependencies {
     api(platform("org.apache.groovy:groovy-bom:5.0.2"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
+    api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"
@@ -42,9 +43,6 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fasterxml.jackson.core:jackson-annotations:2.16.1")
-        api("com.fasterxml.jackson.core:jackson-core:2.16.1")
-        api("com.fasterxml.jackson.core:jackson-databind:2.16.1")
         api("com.fifesoft:rsyntaxtextarea:3.3.4")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:3.1.1")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 381697c86bd..6d79b32359a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -74,9 +74,9 @@
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
 41727,httpmime-4.5.14.jar
-78480,jackson-annotations-2.16.1.jar
-578125,jackson-core-2.16.1.jar
-1637611,jackson-databind-2.16.1.jar
+79195,jackson-annotations-2.20.jar
+593063,jackson-core-2.20.0.jar
+1688471,jackson-databind-2.20.0.jar
 26378,jakarta.annotation-api-3.0.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar

From 4b4e8af93be59e4c2df861c38596c22ccaa5d05c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 30 Oct 2025 10:54:08 +0000
Subject: [PATCH 0906/1037] chore(deps): update release-drafter/release-drafter
 action to v6

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 184141092f4..664c65d35ac 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -40,7 +40,7 @@ jobs:
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
-        uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
+        uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6
         id: prepare_release
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:

From e8c339cf1be47b9d9458ac0cebd933e7f909dd52 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:12:11 +0300
Subject: [PATCH 0907/1037] test: fix expected failure message after jackson
 upgrade

Previoulsy the reported column was wrong, so the expected message was wrong as well.
---
 .../jmeter/assertions/jmespath/TestJMESPathAssertion.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
index 2e38339eaa8..a5025d00191 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
@@ -105,7 +105,7 @@ private static Stream<Arguments> data() {
                 Arguments.of(InvertType.USE_NO_INVERT, "{'one': '1'}", "one", ValidationType.USE_VALIDATION,
                         ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, "2", ResultType.ERROR,
                         "Unexpected character (''' (code 39)): was expecting double-quote to start field name\n at"
-                                + " [Source: (String)\"{'one': '1'}\"; line: 1, column: 3]"),
+                                + " [Source: (String)\"{'one': '1'}\"; line: 1, column: 2]"),
                 Arguments.of(InvertType.USE_NO_INVERT, "{\"one\": \"\"}", "one", ValidationType.USE_VALIDATION,
                         ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, "1", ResultType.FAILURE,
                         "Value expected to be equal to 1"),

From e31d87859214f1cd531439832faf9a856869e013 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 30 Oct 2025 10:47:19 +0000
Subject: [PATCH 0908/1037] fix(deps): update org.checkerframework

---
 build-logic/verification/build.gradle.kts           |  2 +-
 .../kotlin/build-logic.checkerframework.gradle.kts  |  2 +-
 gradle/verification-metadata.xml                    | 13 +++++++++++++
 src/bom-thirdparty/build.gradle.kts                 |  2 +-
 src/dist/src/dist/expected_release_jars.csv         |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index cda2bc030fd..bd9fe84d7e1 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.37")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.60")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index 40c028c8e99..c377cacd173 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.42.0"
+        val checkerframeworkVersion = "3.51.1"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5a7ca4db992..2b2157a8bdf 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -607,11 +607,24 @@
             <sha256 value="daa3999ad4a9c4ceb9eb8c928602ba755ad8fbe7836c5072fb416f20f8f693ae" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.60">
+         <artifact name="checkerframework-gradle-plugin-0.6.60.jar">
+            <sha256 value="3e992ff19fda07a4f2b2f05f5df412ba63af091a130512641aae12392b0c78ba" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="checkerframework-gradle-plugin-0.6.60.module">
+            <sha256 value="6981196fd608bc0b32a41cd6658f9b6f9020b3c2e6feb9904ee79d91500690f6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.37">
          <artifact name="org.checkerframework.gradle.plugin-0.6.37.pom">
             <sha256 value="5d14cf67298d07b980d44e4dbdf42cd4fb0aa99d9dc326db8d824b83216561ed" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.60">
+         <artifact name="org.checkerframework.gradle.plugin-0.6.60.pom">
+            <sha256 value="09ccbaa275aa7e7b31fb3dcede8c13653aaf481d0718f990b9a752c86eddcd18" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy.modules.http-builder" name="http-builder" version="0.7.1">
          <artifact name="http-builder-0.7.1.jar">
             <sha256 value="17ae791dd0f09b54b7c5496ac3e0d028e97130c6503932cb077f9d3ee395a448" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b10c825e52e..bf30329e511 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.42.0")
+        api("org.checkerframework:checker-qual:3.51.1")
         api("org.hamcrest:hamcrest-core:2.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 6d79b32359a..c8a88732557 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -23,7 +23,7 @@
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
-230830,checker-qual-3.42.0.jar
+241630,checker-qual-3.51.1.jar
 374716,commons-codec-1.19.0.jar
 588337,commons-collections-3.2.2.jar
 898652,commons-collections4-4.5.0.jar

From 7b85febfe8d30d29dd10c498cd55ae3b1e30e55d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 30 Oct 2025 10:54:04 +0000
Subject: [PATCH 0909/1037] chore(deps): update plugin com.gradle.develocity to
 v4

---
 gradle/verification-metadata.xml | 5 +++++
 settings.gradle.kts              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 2b2157a8bdf..63948a4d8be 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -413,6 +413,11 @@
             <sha256 value="0095b536e4c60a1325946ccdb1a9fbbb97249df276d89bb0eb1ba698a8a64f3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.gradle.develocity" name="com.gradle.develocity.gradle.plugin" version="4.2.2">
+         <artifact name="com.gradle.develocity.gradle.plugin-4.2.2.pom">
+            <sha256 value="85a8106475e7ca345c4e604a659345794516056c7f974ce9f8c72011a13f11d5" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-logging" name="commons-logging" version="1.0.4">
          <artifact name="commons-logging-1.0.4.pom">
             <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 68e72139129..772cf2a7488 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,7 +22,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.develocity") version "3.18.2"
+    id("com.gradle.develocity") version "4.2.2"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }

From c3a1e0dcabd079698579e784714c1333b9c7b831 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:19:07 +0300
Subject: [PATCH 0910/1037] chore: fix annotationProcessorOptionProviders
 deprecation warning

---
 src/test-services/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test-services/build.gradle.kts b/src/test-services/build.gradle.kts
index 24a4319b871..f7d9c72a1b9 100644
--- a/src/test-services/build.gradle.kts
+++ b/src/test-services/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
 tasks.configureEach<Kapt> {
     // ServiceNotImplementingInterface does not implement the service interface for testing purposes,
     // so we disable AutoService verifications
-    annotationProcessorOptionProviders.add(
-        listOf(CommandLineArgumentProvider { listOf("-Averify=false") })
+    annotationProcessorOptionsProviders.add(
+        CommandLineArgumentProvider { listOf("-Averify=false") }
     )
 }

From a44ea5a56f03d3f2a39b030c77d98c69858f9b75 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:41:30 +0300
Subject: [PATCH 0911/1037] chore: bump de.thetaphi.forbiddenapis to 3.10

---
 build-logic/verification/build.gradle.kts        |  2 +-
 .../kotlin/build-logic.forbidden-apis.gradle.kts |  3 ---
 gradle/verification-metadata.xml                 | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index bd9fe84d7e1..860c7b22137 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.4")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
-    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.6")
+    api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.60")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
diff --git a/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
index 5eed88a7d70..27fbb47fce9 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.forbidden-apis.gradle.kts
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 
-import com.github.vlsi.gradle.dsl.configureEach
-import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
-
 plugins {
     id("de.thetaphi.forbiddenapis")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 63948a4d8be..c0de4cfec79 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -431,6 +431,17 @@
             <sha256 value="dccd2171f5644d418b2504a317c247b99efde4656b6a483d1a59130501feb08d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="de.thetaphi" name="forbiddenapis" version="3.10">
+         <artifact name="forbiddenapis-3.10.jar">
+            <pgp value="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F"/>
+         </artifact>
+         <artifact name="forbiddenapis-3.10.pom">
+            <ignored-keys>
+               <ignored-key id="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="df4e17c848ebc8dd4d7b5df3a24168fd259b123733a3e6472e42d8a1cc188a01" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
+         </artifact>
+      </component>
       <component group="de.thetaphi" name="forbiddenapis" version="3.6">
          <artifact name="forbiddenapis-3.6.jar">
             <ignored-keys>
@@ -445,6 +456,11 @@
             <sha256 value="6231f560501df4c42863ef2e81134cccf04c3d3d8b9631a55f85041913c4a81b" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
+      <component group="de.thetaphi.forbiddenapis" name="de.thetaphi.forbiddenapis.gradle.plugin" version="3.10">
+         <artifact name="de.thetaphi.forbiddenapis.gradle.plugin-3.10.pom">
+            <sha256 value="872532f826dc5ba71082362b2e71e634e5f7562573c21ca96329179787b3460b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="de.thetaphi.forbiddenapis" name="de.thetaphi.forbiddenapis.gradle.plugin" version="3.6">
          <artifact name="de.thetaphi.forbiddenapis.gradle.plugin-3.6.pom">
             <sha256 value="563093977165b0c40643a0f7dbde12d473569468d97911acaf75eaba82dc86f3" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 0600c3e4516457bc5adf0aa5980ab291c0e1778c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:46:30 +0300
Subject: [PATCH 0912/1037] chore: bump net.bytebuddy to 1.17.8

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index ee4ea4abd82..0c0416cc646 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
         // to make runtime classpath consistent with the compile one.
         api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.14.6")
-        api("net.bytebuddy:byte-buddy:1.14.11")
+        api("net.bytebuddy:byte-buddy:1.17.8")
         api("nl.jqno.equalsverifier:equalsverifier:4.2.1")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.8")

From 88b763f163836d481f4e4a63737e52da7eec5878 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:48:44 +0300
Subject: [PATCH 0913/1037] chore: bump org.apache.rat to 0.17

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index bf30329e511..4a0ab7c069d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -110,7 +110,7 @@ dependencies {
         api("org.apache.logging.log4j:log4j-api:2.25.2")
         api("org.apache.logging.log4j:log4j-core:2.25.2")
         api("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2")
-        api("org.apache.rat:apache-rat:0.15")
+        api("org.apache.rat:apache-rat:0.17")
         api("org.apache.tika:tika-core:3.2.3")
         api("org.apache.tika:tika-parsers:3.2.3")
         api("org.apache.velocity:velocity:1.7")

From 8933d845c377b467db009e8fcde3c6cdc89466b0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:52:37 +0300
Subject: [PATCH 0914/1037] chore: bump org.objenesis to 3.4

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 0c0416cc646..7100ba77575 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("org.hamcrest:hamcrest-library:2.2")
         api("org.hamcrest:hamcrest:2.2")
         api("org.hsqldb:hsqldb:2.7.2")
-        api("org.objenesis:objenesis:3.3")
+        api("org.objenesis:objenesis:3.4")
         api("org.openjdk.jmh:jmh-core:1.37")
         api("org.openjdk.jmh:jmh-generator-annprocess:1.37")
     }

From 832c3b2edc05521fc6f5c5751a2ad0a24e18d0e0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 15:57:19 +0300
Subject: [PATCH 0915/1037] chore: bump org.jsoup to 1.21.2

---
 build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts | 3 ++-
 src/bom-thirdparty/build.gradle.kts                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 00c8aaa05f3..b4bf3a06977 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -88,7 +88,8 @@ dependencies {
 tasks.register<DependencyInsightReportTask>("allDependencyInsight") {
     group = HelpTasksPlugin.HELP_GROUP
     description =
-        "Shows insights where the dependency is used. For instance: allDependencyInsight --configuration compile --dependency org.jsoup:jsoup"
+        "Shows insights where the dependency is used. For instance: allDependencyInsight --configuration compileClasspath --dependency org.jsoup:jsoup"
+    showingAllVariants = false
 }
 
 tasks.configureEach<JavaCompile> {
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4a0ab7c069d..a6ee95d0e7e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -129,7 +129,7 @@ dependencies {
         api("org.jodd:jodd-lagarto:6.0.6")
         api("org.jodd:jodd-log:5.1.6")
         api("org.jodd:jodd-props:6.0.2")
-        api("org.jsoup:jsoup:1.17.1")
+        api("org.jsoup:jsoup:1.21.2")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
         api("org.neo4j.driver:neo4j-java-driver:4.4.13")

From fc1d6682eae9ef73f3e0ae8da347439a34be48cd Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 16:08:26 +0300
Subject: [PATCH 0916/1037] chore: use Java 21 for building the sources

---
 .github/workflows/main.yml                         | 14 +++++++-------
 .github/workflows/matrix.js                        |  5 +++--
 build-logic-commons/gradle-plugin/build.gradle.kts |  4 ++--
 ...build-logic.kotlin-dsl-gradle-plugin.gradle.kts |  4 ++--
 build-logic/build-parameters/build.gradle.kts      |  2 +-
 .../src/main/kotlin/build-logic.java.gradle.kts    |  4 ++--
 .../jmeter/gui/action/HtmlReportGeneratorTest.kt   | 13 -------------
 7 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c47b1883e69..b645c63dae8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,13 +52,13 @@ jobs:
       with:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}
-    - name: Set up Java 17 and ${{ matrix.non_ea_java_version }}, ${{ matrix.java_distribution }}
+    - name: Set up Java 21 and ${{ matrix.non_ea_java_version }}, ${{ matrix.java_distribution }}
       uses: actions/setup-java@v5
       with:
-        # The latest one will be the default, so we use Java 17 for launching Gradle
+        # The latest one will be the default, so we use Java 21 for launching Gradle
         java-version: |
           ${{ matrix.non_ea_java_version }}
-          17
+          21
         distribution: ${{ matrix.java_distribution }}
         architecture: x64
     - name: Steps to reproduce
@@ -77,7 +77,7 @@ jobs:
         properties: |
           testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}
           testDisableCaching=${{ matrix.testDisableCaching }}
-          jdkBuildVersion=17
+          jdkBuildVersion=21
           jdkTestVersion=${{ matrix.java_version }}
           jdkTestVendor=${{ matrix.java_vendor }}
           # We have a separate job with Errorprone verifications, so avoid duplicate warnings
@@ -89,14 +89,14 @@ jobs:
         DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
   errorprone:
-    name: 'Error Prone (JDK 17)'
+    name: 'Error Prone (JDK 21)'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - name: 'Set up JDK 17'
+    - name: 'Set up JDK 21'
       uses: actions/setup-java@v5
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
     - uses: burrunan/gradle-cache-action@v3
       name: Test
diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 581855dda02..aad48000fde 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -28,6 +28,7 @@ matrix.addAxis({
   values: [
     '17',
     '21',
+    '25',
     eaJava,
   ]
 });
@@ -95,8 +96,8 @@ matrix.generateRow({os: 'windows-latest'});
 // matrix.generateRow({os: 'ubuntu-latest'});
 // Ensure there will be at least one job with Java 17
 matrix.generateRow({java_version: "17"});
-// Ensure there will be at least one job with Java 21
-matrix.generateRow({java_version: "21"});
+// Ensure there will be at least one job with Java 25
+matrix.generateRow({java_version: "25"});
 // Ensure there will be at least one job with Java EA
 // matrix.generateRow({java_version: eaJava});
 const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index 97cd2f00d9b..dbc4a4fbb83 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -32,8 +32,8 @@ dependencies {
 }
 
 // We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin
-// So we settle on 17 or 11 if the current JVM supports it
-listOf(17, 11)
+// So we settle on 21, 17, or 11 if the current JVM supports it
+listOf(21, 17, 11)
     .firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
     ?.let { buildScriptJvmTarget ->
         java {
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
index f5e69752512..3d13b5c219a 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -26,8 +26,8 @@ tasks.validatePlugins {
 }
 
 // We need to figure out a version that is supported by the current JVM, and by the Kotlin Gradle plugin
-// So we settle on 17 or 11 if the current JVM supports it
-listOf(17, 11)
+// So we settle on 21, 17, or 11 if the current JVM supports it
+listOf(21, 17, 11)
     .firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
     ?.let { buildScriptJvmTarget ->
         java {
diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index a97941ef67c..945caebbc55 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -43,7 +43,7 @@ buildParameters {
         description.set("Java version for source and target compatibility")
     }
     integer("jdkBuildVersion") {
-        defaultValue.set(17)
+        defaultValue.set(21)
         mandatory.set(true)
         description.set("JDK version to use for building JMeter. If the value is 0, then the current Java is used. (see https://docs.gradle.org/8.0/userguide/toolchains.html#sec:consuming)")
     }
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index b4bf3a06977..f29bcff1fe7 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -131,14 +131,14 @@ tasks.configureEach<Javadoc> {
         docTitle = "Apache JMeter ${project.name} API"
         windowTitle = "Apache JMeter ${project.name} API"
         header = "<b>Apache JMeter</b>"
-        addStringOption("source", "17")
+        addStringOption("source", "21")
         addStringOption("Xmaxwarns", "10")
         addBooleanOption("Xdoclint:all,-missing", true)
         val lastEditYear: String by rootProject.extra
         bottom =
             "Copyright &copy; 1998-$lastEditYear Apache Software Foundation. All Rights Reserved."
         addBooleanOption("html5", true)
-        links("https://docs.oracle.com/en/java/javase/17/docs/api/")
+        links("https://docs.oracle.com/en/java/javase/21/docs/api/")
     }
 }
 
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
index 3b8104bcdbe..77ed5decec4 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
@@ -83,19 +83,6 @@ class HtmlReportGeneratorTest : JMeterTestCase() {
                     )
                 )
             },
-            CheckArgumentsCase(
-                "",
-                "",
-                "",
-                listOf(
-                    JMeterUtils.getResString("generate_report_ui.csv_file") +
-                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
-                    JMeterUtils.getResString("generate_report_ui.user_properties_file") +
-                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
-                    JMeterUtils.getResString("generate_report_ui.output_directory") +
-                        MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY), "")
-                )
-            ),
             combine("testfiles", "testReport", "oneLevel", "twolevel").let { outputDirectoryPath ->
                 CheckArgumentsCase(
                     combine("testfiles", "HTMLReportTestFile.csv"),

From da2b151d555d1dd936117a73286a3d898702a1bb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 20:24:26 +0300
Subject: [PATCH 0917/1037] chore: bump com.google.errorprone to 2.43.0

---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts        | 2 +-
 gradle/verification-metadata.xml                             | 5 ++++-
 src/bom-thirdparty/build.gradle.kts                          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index a4c509987d1..9ba1fa07a92 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -30,7 +30,7 @@ if (buildParameters.enableErrorprone) {
 
     dependencies {
         "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.0"))
-        "errorprone"("com.google.errorprone:error_prone_core:2.24.0")
+        "errorprone"("com.google.errorprone:error_prone_core:2.43.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c0de4cfec79..5f5cc7c2b42 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -281,7 +281,10 @@
          <trusted-key id="EAFC1F3B2FCED6AFD046C7D5734AEF3D43509290" group="org.osgi"/>
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
          <trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17" group="com.google"/>
-         <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
+         <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320">
+            <trusting group="com.google.errorprone"/>
+            <trusting group="com.google.googlejavaformat"/>
+         </trusted-key>
          <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
          <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
             <trusting group="org.apache"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a6ee95d0e7e..4f607fa2d52 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:3.1.1")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
-        api("com.google.errorprone:error_prone_annotations:2.24.0")
+        api("com.google.errorprone:error_prone_annotations:2.43.0")
         api("com.helger.commons:ph-commons:12.0.4")
         api("com.helger:ph-css:8.0.1")
         api("com.jayway.jsonpath:json-path:2.8.0")

From 47bd32e0aa2d804a196570c05b52e88aabdc7e4f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 30 Oct 2025 20:24:52 +0300
Subject: [PATCH 0918/1037] style: resolve issues identified by errorprone

---
 .../apache/jmeter/util/BeanShellClient.java   |   2 +-
 .../assertions/CompareAssertionBeanInfo.java  |  14 +-
 .../jmeter/assertions/HTMLAssertion.java      |   4 +-
 .../jmeter/assertions/JSONPathAssertion.java  |   7 +-
 .../jmeter/assertions/ResponseAssertion.java  |  34 +--
 .../jmeter/assertions/SMIMEAssertion.java     |   6 +-
 .../jmeter/assertions/SizeAssertion.java      |  25 +--
 .../jmeter/assertions/XMLAssertion.java       |   2 +-
 .../jmeter/assertions/XMLSchemaAssertion.java |  18 +-
 .../jmeter/assertions/gui/AssertionGui.java   |   5 +-
 .../assertions/gui/DurationAssertionGui.java  |   6 +-
 .../assertions/gui/JSONPathAssertionGui.java  |   6 +-
 .../assertions/gui/MD5HexAssertionGUI.java    |   6 -
 .../assertions/gui/XPath2AssertionGui.java    |   3 +-
 .../assertions/gui/XPathAssertionGui.java     |   3 +-
 .../jmespath/JMESPathAssertion.java           |   3 -
 .../jmespath/gui/JMESPathAssertionGui.java    |   6 +-
 .../org/apache/jmeter/config/CSVDataSet.java  |   4 +-
 .../jmeter/config/CSVDataSetBeanInfo.java     |  36 +--
 .../jmeter/config/KeystoreConfigBeanInfo.java |  12 +-
 .../jmeter/config/RandomVariableConfig.java   |  10 +-
 .../config/RandomVariableConfigBeanInfo.java  |  18 +-
 .../jmeter/control/ForeachController.java     |   2 +-
 .../gui/CriticalSectionControllerGui.java     |   6 +-
 .../control/gui/ForeachControlPanel.java      |   3 +-
 .../control/gui/ModuleControllerGui.java      |   2 +-
 .../jmeter/extractor/BoundaryExtractor.java   |   2 +-
 .../extractor/DebugPostProcessorBeanInfo.java |  32 +--
 .../jmeter/extractor/HtmlExtractor.java       |   2 +-
 .../jmeter/extractor/RegexExtractor.java      |   8 +-
 .../jmeter/extractor/XPath2Extractor.java     |   2 +-
 .../jmeter/extractor/XPathExtractor.java      |   2 +-
 .../extractor/gui/BoundaryExtractorGui.java   |   6 +-
 .../extractor/gui/HtmlExtractorGui.java       |   6 +-
 .../extractor/gui/RegexExtractorGui.java      |   6 +-
 .../extractor/gui/XPath2ExtractorGui.java     |   3 +-
 .../extractor/gui/XPathExtractorGui.java      |   3 +-
 .../json/jmespath/JMESPathCache.java          |   4 +-
 .../jmespath/gui/JMESPathExtractorGui.java    |   3 +-
 .../extractor/json/jsonpath/JSONManager.java  |   4 +-
 .../jsonpath/gui/JSONPostProcessorGui.java    |   3 +-
 .../render/AbstractRenderAsJsonRenderer.java  |   6 +-
 .../ExportTransactionAndSamplerNames.java     |   5 +-
 .../jmeter/modifiers/SampleTimeout.java       |   3 +-
 .../jmeter/modifiers/UserParameters.java      |   2 +-
 .../modifiers/gui/CounterConfigGui.java       |   3 +-
 .../apache/jmeter/reporters/MailerModel.java  |  14 +-
 .../jmeter/sampler/DebugSamplerBeanInfo.java  |  24 +-
 .../timers/ConstantThroughputTimer.java       |  10 +-
 .../ConstantThroughputTimerBeanInfo.java      |   5 +-
 .../org/apache/jmeter/timers/SyncTimer.java   |  12 +-
 .../jmeter/timers/SyncTimerBeanInfo.java      |   4 +-
 .../ConstantPoissonProcessGenerator.java      |   4 +-
 .../PreciseThroughputTimerBeanInfo.java       |  16 +-
 .../ComponentTreeClonerForValidation.java     |   3 +-
 .../visualizers/ComparisonVisualizer.java     |   4 +-
 .../jmeter/visualizers/MailerVisualizer.java  |   3 +-
 .../RenderAsBoundaryExtractor.java            |   4 +-
 .../jmeter/visualizers/RenderAsCssJQuery.java |   2 +-
 .../jmeter/visualizers/RenderAsHTML.java      |  25 +--
 .../jmeter/visualizers/RenderAsJSON.java      |  10 +-
 .../jmeter/visualizers/RenderAsXML.java       |  43 ++--
 .../jmeter/visualizers/RenderAsXPath.java     |   2 +-
 .../jmeter/visualizers/RenderAsXPath2.java    |   2 +-
 .../jmeter/visualizers/RenderInBrowser.java   |   3 -
 .../jmeter/visualizers/RequestViewRaw.java    |  18 +-
 .../visualizers/RespTimeGraphChart.java       |   2 +-
 .../visualizers/RespTimeGraphVisualizer.java  |  10 +-
 .../jmeter/visualizers/SamplerResultTab.java  |  28 +--
 .../visualizers/SearchTextExtension.java      |   2 +-
 .../jmeter/visualizers/SearchTreePanel.java   |   4 +-
 .../visualizers/StatGraphVisualizer.java      |  15 +-
 .../jmeter/visualizers/StatVisualizer.java    |   4 +-
 .../jmeter/visualizers/TreeNodeRenderer.java  |   4 +-
 .../ViewResultsFullVisualizer.java            |  14 +-
 .../XMLDefaultMutableTreeNode.java            |  24 +-
 .../visualizers/backend/BackendListener.java  |  10 +-
 .../backend/BackendListenerGui.java           |   3 -
 .../visualizers/backend/ErrorMetric.java      |   3 +-
 .../graphite/PickleGraphiteMetricsSender.java |  13 --
 .../graphite/TextGraphiteMetricsSender.java   |   9 -
 .../backend/influxdb/HttpMetricsSender.java   |  10 +-
 .../jmeter/assertions/SizeAssertionTest.java  |   6 +-
 .../assertions/TestJSONPathAssertion.java     |  27 +--
 .../assertions/XMLSchemaAssertionTest.java    |   4 +-
 .../jmeter/assertions/XPathAssertionTest.java |   4 +-
 .../jmeter/assertions/XmlAssertionTest.java   |   7 +-
 .../jmespath/TestJMESPathAssertion.java       |  22 +-
 .../apache/jmeter/config/TestCVSDataSet.java  |   2 +-
 .../jmeter/control/TestWhileController.java   |   6 +-
 .../jmeter/extractor/TestRegexExtractor.java  |  15 +-
 .../jmeter/extractor/TestXPathExtractor.java  |   2 +-
 .../json/jmespath/TestJMESPathExtractor.java  |  53 +++--
 .../apache/jmeter/timers/SyncTimerTest.java   |   4 +-
 .../visualizers/TestSampleCompareTo.java      |   2 +-
 .../backend/SamplerMetricFixedModeTest.java   |  16 +-
 .../backend/SamplerMetricTimedModeTest.java   |  12 +-
 .../influxdb/HttpMetricsSenderTest.java       |   6 +-
 .../main/java/org/apache/jmeter/JMeter.java   | 208 +++++++++---------
 .../org/apache/jmeter/ProxyAuthenticator.java |  11 +-
 .../assertions/CompareAssertionResult.java    |   6 +-
 .../jmeter/config/gui/ArgumentsPanel.java     |   7 +-
 .../jmeter/config/gui/RowDetailDialog.java    |  27 ++-
 .../jmeter/control/GenericController.java     |  12 +-
 .../apache/jmeter/control/IfController.java   |  18 +-
 .../org/apache/jmeter/control/RunTime.java    |   2 +-
 .../jmeter/control/TransactionController.java |   3 +-
 .../jmeter/control/gui/IfControllerPanel.java |   6 +-
 .../jmeter/control/gui/LoopControlPanel.java  |  12 +-
 .../apache/jmeter/control/gui/RunTimeGui.java |  12 +-
 .../jmeter/control/gui/TestPlanGui.java       |   6 +-
 .../control/gui/WhileControllerGui.java       |  12 +-
 .../jmeter/control/gui/WorkBenchGui.java      |   3 +-
 .../jmeter/engine/ClientJMeterEngine.java     |  13 +-
 .../jmeter/engine/ConvertListeners.java       |   4 +-
 .../org/apache/jmeter/engine/PreCompiler.java |  22 +-
 .../jmeter/engine/RemoteJMeterEngineImpl.java |   4 -
 .../jmeter/engine/StandardJMeterEngine.java   |  22 +-
 .../org/apache/jmeter/engine/TreeCloner.java  |   4 +-
 .../apache/jmeter/engine/TurnElementsOn.java  |   4 +-
 .../jmeter/engine/util/CompoundVariable.java  |  10 +-
 .../jmeter/engine/util/FunctionParser.java    |  18 +-
 .../jmeter/engine/util/ValueReplacer.java     |   3 +-
 .../jmeter/functions/gui/FunctionHelper.java  |   2 +-
 .../gui/AbstractJMeterGuiComponent.java       |   2 +-
 .../org/apache/jmeter/gui/GuiPackage.java     |  15 +-
 .../org/apache/jmeter/gui/HtmlReportUI.java   |  52 ++---
 .../org/apache/jmeter/gui/LoggerPanel.java    |   3 -
 .../java/org/apache/jmeter/gui/MainFrame.java |  13 +-
 .../java/org/apache/jmeter/gui/NamePanel.java |  16 +-
 .../jmeter/gui/action/AbstractAction.java     |  27 +--
 .../org/apache/jmeter/gui/action/Clear.java   |   7 +-
 .../gui/action/CompileJSR223TestElements.java |   8 +-
 .../org/apache/jmeter/gui/action/Copy.java    |   3 -
 .../apache/jmeter/gui/action/Duplicate.java   |   3 -
 .../org/apache/jmeter/gui/action/Help.java    |  13 +-
 .../jmeter/gui/action/LoadRecentProject.java  |  45 +---
 .../org/apache/jmeter/gui/action/Save.java    |   2 +-
 .../jmeter/gui/action/SaveGraphics.java       |   4 +-
 .../jmeter/gui/action/SearchTreeDialog.java   |   6 +-
 .../org/apache/jmeter/gui/action/Start.java   |  17 +-
 .../jmeter/gui/action/StopStoppables.java     |   9 -
 .../validation/TreeClonerForValidation.java   |   6 +-
 .../jmeter/gui/logging/LogEventObject.java    |   4 +-
 .../gui/menu/StaticJMeterGUIComponent.java    |   2 +-
 .../jmeter/gui/tree/JMeterTreeModel.java      |   3 +-
 .../gui/tree/JMeterTreeTransferHandler.java   |   2 +-
 .../apache/jmeter/gui/util/FileDialoger.java  |   2 +-
 .../util/HeaderAsPropertyRendererWrapper.java |   3 +-
 .../jmeter/gui/util/HorizontalPanel.java      |   4 +-
 .../apache/jmeter/gui/util/JDateField.java    |   6 +-
 .../apache/jmeter/gui/util/JMeterMenuBar.java |  13 +-
 .../apache/jmeter/gui/util/JMeterToolBar.java |  27 +--
 .../gui/util/NumberFieldErrorListener.java    |   8 +-
 .../jmeter/gui/util/PowerTableModel.java      |   2 +-
 .../gui/util/TextAreaTableCellEditor.java     |   4 +-
 .../jmeter/gui/util/TristateCheckBox.java     |  18 +-
 .../apache/jmeter/gui/util/VerticalPanel.java |   4 +-
 .../config/ReportGeneratorConfiguration.java  |   8 +-
 .../core/ControllerSamplePredicate.java       |   7 -
 .../org/apache/jmeter/report/core/Sample.java |   5 -
 .../jmeter/report/core/SampleMetadata.java    |   5 -
 .../dashboard/AbstractDataExporter.java       |  21 +-
 .../dashboard/HtmlTemplateExporter.java       |  28 +--
 .../jmeter/report/dashboard/JsonExporter.java |   3 +-
 .../report/dashboard/JsonizerVisitor.java     |  21 --
 .../report/dashboard/TemplateVisitor.java     |  12 -
 .../processor/AbstractAggregatorFactory.java  |  20 --
 .../processor/AbstractSampleProcessor.java    |  27 ---
 .../processor/AbstractSampleSource.java       |  38 ----
 .../processor/AbstractSummaryConsumer.java    |  17 --
 .../report/processor/AggregateConsumer.java   |  17 --
 .../processor/ApdexSummaryConsumer.java       |  22 --
 .../report/processor/CsvFileSampleSource.java |  27 +--
 .../processor/ErrorsSummaryConsumer.java      |  34 ---
 .../report/processor/ListResultData.java      |  15 --
 .../report/processor/MapResultData.java       |  10 -
 .../report/processor/MaxAggregator.java       |  20 --
 .../processor/MaxAggregatorFactory.java       |   7 -
 .../report/processor/MeanAggregator.java      |  20 --
 .../processor/MeanAggregatorFactory.java      |   7 -
 .../processor/MedianAggregatorFactory.java    |   7 -
 .../report/processor/MinAggregator.java       |  20 --
 .../processor/PercentileAggregator.java       |  20 --
 .../PercentileAggregatorFactory.java          |   7 -
 .../processor/RequestsSummaryConsumer.java    |  11 -
 .../processor/StatisticsSummaryConsumer.java  |  29 ---
 .../report/processor/SumAggregator.java       |  20 --
 .../processor/SumAggregatorFactory.java       |   7 -
 .../report/processor/TimeRateAggregator.java  |  20 --
 .../processor/TimeRateAggregatorFactory.java  |   7 -
 .../Top5ErrorsBySamplerConsumer.java          |  21 --
 .../report/processor/ValueResultData.java     |  10 -
 .../graph/AbstractGraphConsumer.java          |  29 +--
 .../graph/AbstractOverTimeGraphConsumer.java  |  18 --
 .../graph/AbstractSeriesSelector.java         |   6 -
 .../AbstractVersusRequestsGraphConsumer.java  |  54 +----
 .../processor/graph/CodeSeriesSelector.java   |   7 -
 .../graph/ConnectTimeValueSelector.java       |   7 -
 .../graph/ElapsedTimeValueSelector.java       |   5 -
 .../processor/graph/IndexedNameSelector.java  |   7 -
 .../processor/graph/LatencyValueSelector.java |   7 -
 .../processor/graph/NameSeriesSelector.java   |   7 -
 .../processor/graph/StaticSeriesSelector.java |   7 -
 .../processor/graph/StatusSeriesSelector.java |   7 -
 .../graph/TimeStampKeysSelector.java          |   7 -
 .../impl/ActiveThreadsGraphConsumer.java      |  13 --
 .../impl/BytesThroughputGraphConsumer.java    |  13 --
 .../impl/CodesPerSecondGraphConsumer.java     |  13 --
 .../ConnectTimeOverTimeGraphConsumer.java     |  13 --
 .../graph/impl/CustomGraphConsumer.java       |  13 --
 .../impl/HitsPerSecondGraphConsumer.java      |  13 --
 .../impl/LatencyOverTimeGraphConsumer.java    |  13 --
 .../impl/LatencyVSRequestGraphConsumer.java   |  12 -
 .../ResponseCustomGraphGraphConsumer.java     |  13 --
 ...ResponseTimeDistributionGraphConsumer.java |  18 --
 .../ResponseTimeOverTimeGraphConsumer.java    |  13 --
 .../ResponseTimePerSampleGraphConsumer.java   |  18 --
 .../ResponseTimePercentilesGraphConsumer.java |  18 --
 .../ResponseTimeVSRequestGraphConsumer.java   |  12 -
 ...ResponseTimeDistributionGraphConsumer.java |  14 +-
 .../graph/impl/TimeVSThreadGraphConsumer.java |  18 --
 .../graph/impl/TotalTPSGraphConsumer.java     |  13 --
 .../TransactionsPerSecondGraphConsumer.java   |  13 --
 .../jmeter/reporters/ResultCollector.java     |   2 +-
 .../apache/jmeter/reporters/ResultSaver.java  |   2 +-
 .../apache/jmeter/reporters/Summariser.java   |  19 +-
 .../jmeter/samplers/AsynchSampleSender.java   |   6 +-
 .../samplers/DiskStoreSampleSender.java       |   4 +-
 .../samplers/RemoteSampleListenerImpl.java    |   8 +-
 .../apache/jmeter/samplers/SampleResult.java  |   6 +-
 .../apache/jmeter/save/CSVSaveService.java    |  90 ++++----
 .../org/apache/jmeter/save/SaveService.java   |   2 +-
 .../save/converters/ConversionHelp.java       |   8 +-
 .../converters/SampleResultConverter.java     |  12 +-
 .../save/converters/TestElementConverter.java |   2 +-
 .../org/apache/jmeter/swing/HtmlPane.java     |   2 +-
 .../testbeans/gui/BooleanPropertyEditor.java  |   8 +-
 .../testbeans/gui/ComboStringEditor.java      |   8 +-
 .../jmeter/testbeans/gui/EnumEditor.java      |  13 +-
 .../testbeans/gui/FieldStringEditor.java      |   4 +-
 .../gui/GenericTestBeanCustomizer.java        |  27 ++-
 .../testbeans/gui/IntegerPropertyEditor.java  |   4 +-
 .../testbeans/gui/LongPropertyEditor.java     |   4 +-
 .../jmeter/testbeans/gui/PasswordEditor.java  |   4 +-
 .../jmeter/testbeans/gui/TableEditor.java     |  14 +-
 .../jmeter/testbeans/gui/TestBeanGUI.java     |   6 +-
 .../jmeter/testbeans/gui/TextAreaEditor.java  |   3 +-
 .../jmeter/testbeans/gui/WrapperEditor.java   |  10 +-
 .../testelement/AbstractTestElement.java      |  14 +-
 .../apache/jmeter/testelement/TestPlan.java   |   4 +-
 .../testelement/property/BooleanProperty.java |   4 +-
 .../property/CollectionProperty.java          |   4 +-
 .../property/FunctionProperty.java            |   4 +-
 .../testelement/property/MapProperty.java     |   4 +-
 .../testelement/property/MultiProperty.java   |   4 +-
 .../testelement/property/NumberProperty.java  |   4 +-
 .../property/TestElementProperty.java         |   4 +-
 .../FindTestElementsUpToRootTraverser.java    |   4 +-
 .../apache/jmeter/threads/JMeterThread.java   |  34 ++-
 .../jmeter/threads/JMeterVariables.java       |   4 +-
 .../threads/RemoteThreadsListenerImpl.java    |   3 -
 .../apache/jmeter/threads/TestCompiler.java   |   2 +-
 .../apache/jmeter/threads/ThreadGroup.java    |   2 +-
 .../jmeter/threads/gui/ThreadGroupGui.java    |   4 +-
 .../apache/jmeter/timers/TimerService.java    |   2 +-
 .../jmeter/util/BSFJavaScriptEngine.java      |  24 +-
 .../apache/jmeter/util/BSFTestElement.java    |   4 +-
 .../jmeter/util/BeanShellBeanInfoSupport.java |  14 +-
 .../apache/jmeter/util/BeanShellServer.java   |   6 +-
 .../jmeter/util/BeanShellTestElement.java     |   2 +-
 .../jmeter/util/CustomX509TrustManager.java   |  28 ++-
 .../java/org/apache/jmeter/util/Document.java |   2 +-
 .../util/HttpSSLProtocolSocketFactory.java    |   5 +-
 .../org/apache/jmeter/util/JMeterUtils.java   |   4 +-
 .../apache/jmeter/util/JSR223TestElement.java |  13 +-
 .../apache/jmeter/util/JsseSSLManager.java    |   8 +-
 .../org/apache/jmeter/util/SSLManager.java    |   2 +-
 .../jmeter/util/ScriptingBeanInfoSupport.java |  16 +-
 .../org/apache/jmeter/util/XPathUtil.java     |  58 ++---
 .../jmeter/util/keystore/JmeterKeyStore.java  |  11 +-
 .../org/apache/jmeter/visualizers/Sample.java |   4 +-
 .../jmeter/visualizers/TableSample.java       |   4 +-
 .../visualizers/gui/AbstractVisualizer.java   |   3 +-
 .../java/org/apache/jmeter/JMeterTest.java    |  86 ++++----
 .../jmeter/engine/DistributedRunnerTest.java  |   2 +-
 .../apache/jmeter/engine/LocalHostTest.java   |   6 +-
 .../jmeter/engine/util/TestValueReplacer.java |   4 +-
 .../gui/logging/TestGuiLogEventAppender.java  |   4 +-
 .../processor/ErrorsSummaryConsumerTest.java  |   2 +-
 .../graph/impl/CustomGraphConsumerTest.java   |   2 +-
 .../TestDataStrippingSampleSender.java        |   2 +-
 .../jmeter/samplers/TestSampleResult.java     |  10 +-
 .../jmeter/save/TestCSVSaveService.java       |   4 +-
 .../gui/TestBooleanPropertyEditor.java        |   8 +-
 .../testbeans/gui/TestComboStringEditor.java  |   4 +-
 .../testbeans/gui/TestFieldStringEditor.java  |   4 +-
 .../testelement/property/PackageTest.java     |   4 +-
 .../jmeter/threads/TestJMeterThread.java      |   6 +-
 .../TestUnmodifiableJMeterVariables.java      |   4 +-
 .../util/SecurityProviderLoaderTest.java      |   2 +-
 .../apache/jmeter/junit/JMeterTestCase.java   |   4 +-
 .../apache/jmeter/resources/PackageTest.java  |  28 +--
 .../jmeter/control/TestSwitchController.java  |  18 +-
 .../ComponentReferenceFunctionTest.java       |  16 +-
 .../apache/jmeter/gui/action/TestLoad.java    |   4 +-
 .../org/apache/jmeter/junit/JMeterTest.java   |  26 +--
 .../apache/jmeter/save/TestSaveService.java   |   8 +-
 .../jmeter/testelement/TestElementTest.java   |   5 +-
 .../jmeter/threads/ThreadGroupLoad.java       |  83 +++----
 .../jorphan/reflect/TestClassFinder.java      |   2 +-
 src/dist/src/dist/expected_release_jars.csv   |   4 +-
 .../sampler/gui/ExampleSamplerGui.java        |   2 +-
 .../testbeans/example3/Example3BeanInfo.java  |   8 +-
 .../jmeter/functions/AbstractHostIPName.java  |   8 +-
 .../apache/jmeter/functions/BeanShell.java    |   5 +-
 .../apache/jmeter/functions/FileToString.java |   2 +-
 .../apache/jmeter/functions/FileWrapper.java  |   8 +-
 .../org/apache/jmeter/functions/Groovy.java   |   2 +-
 .../apache/jmeter/functions/IsVarDefined.java |   2 +-
 .../jmeter/functions/IterationCounter.java    |   2 +-
 .../apache/jmeter/functions/JavaScript.java   |   2 +-
 .../jmeter/functions/Jexl2Function.java       |   2 +-
 .../jmeter/functions/Jexl3Function.java       |   2 +-
 .../apache/jmeter/functions/LogFunction.java  |   6 +-
 .../apache/jmeter/functions/LogFunction2.java |   2 +-
 .../org/apache/jmeter/functions/Property.java |   2 +-
 .../org/apache/jmeter/functions/Random.java   |   2 +-
 .../apache/jmeter/functions/RandomDate.java   |  12 +-
 .../apache/jmeter/functions/RandomString.java |   2 +-
 .../apache/jmeter/functions/SamplerName.java  |   2 +-
 .../jmeter/functions/SplitFunction.java       |   2 +-
 .../apache/jmeter/functions/TimeShift.java    |   9 +-
 .../jmeter/functions/CSVReadFunctionTest.java |   4 +-
 .../jmeter/functions/RandomFunctionTest.java  |   2 +-
 .../functions/StringFromFileFunctionTest.java |   4 +-
 .../jmeter/functions/SumFunctionTest.java     |   2 +-
 .../apache/jmeter/functions/Synchronizer.java |   8 +-
 .../jmeter/functions/TestStringtoFile.java    |   2 +-
 .../functions/TestTimeShiftFunction.java      |   2 +-
 .../apache/commons/cli/avalon/CLOption.java   |   2 +-
 .../org/apache/jorphan/collections/Data.java  |   8 +-
 .../apache/jorphan/collections/HashTree.java  |   9 +-
 .../jorphan/collections/ListedHashTree.java   |   3 +-
 .../jorphan/gui/AbstractTreeTableModel.java   |   4 +-
 .../org/apache/jorphan/gui/DynamicStyle.java  |  18 +-
 .../org/apache/jorphan/gui/FocusActions.java  |   4 +-
 .../org/apache/jorphan/gui/MenuScroller.java  |   6 +-
 .../jorphan/gui/MinMaxLongRenderer.java       |   4 +-
 .../apache/jorphan/gui/ObjectTableSorter.java |  11 +-
 .../org/apache/jorphan/gui/RateRenderer.java  |   5 +-
 .../jorphan/gui/ui/KerningOptimizer.java      |   4 +-
 .../jorphan/gui/ui/TextComponentUI.java       |   4 +-
 .../java/org/apache/jorphan/io/TextFile.java  |   3 +-
 .../apache/jorphan/reflect/ClassFinder.java   |   5 +-
 .../org/apache/jorphan/util/BooleanUtils.java |  16 +-
 .../org/apache/jorphan/util/Converter.java    |   2 +-
 .../org/apache/jorphan/util/HeapDumper.java   |   8 +-
 .../org/apache/jorphan/util/StringWrap.java   |   4 +-
 .../org/apache/jorphan/util/XMLBuffer.java    |   2 +-
 .../commons/cli/avalon/ClutilTestCase.java    |   2 +-
 .../apache/jorphan/exec/TestKeyToolUtils.java |   2 +-
 .../jorphan/gui/ObjectTableSorterTest.java    |   2 +-
 .../util/TestAlphaNumericKeyComparator.java   |   2 +-
 .../java/org/apache/jmeter/NewDriver.java     |  12 +-
 .../config/BoltConnectionElementBeanInfo.java |   8 +-
 .../protocol/bolt/sampler/BoltSampler.java    |   4 +-
 .../BoltTestElementBeanInfoSupport.java       |  14 +-
 .../protocol/ftp/sampler/FTPSampler.java      |   6 +-
 .../http/config/gui/HttpDefaultsGui.java      |   1 +
 .../protocol/http/control/CacheManager.java   |  11 +-
 .../protocol/http/control/CookieManager.java  |   6 +-
 .../control/DelegatingKerberosScheme.java     |   4 +-
 .../http/control/DelegatingSPNegoScheme.java  |   4 +-
 .../control/DynamicKerberosSchemeFactory.java |   4 +-
 .../control/DynamicSPNegoSchemeFactory.java   |   4 +-
 .../protocol/http/control/HeaderManager.java  |   3 +-
 .../http/control/HttpMirrorServer.java        |   2 +-
 .../http/control/KerberosManager.java         |   6 +-
 .../control/gui/HttpMirrorControlGui.java     |   4 +-
 .../http/control/gui/HttpTestSampleGui.java   |   1 +
 .../protocol/http/curl/BasicCurlParser.java   |  71 +++---
 .../jmeter/protocol/http/gui/AuthPanel.java   |  70 +++---
 .../jmeter/protocol/http/gui/CookiePanel.java |   3 +-
 .../protocol/http/gui/DNSCachePanel.java      |   3 +-
 .../protocol/http/gui/HTTPArgumentsPanel.java |   6 +-
 .../protocol/http/gui/HTTPFileArgsPanel.java  |   6 +-
 .../jmeter/protocol/http/gui/HeaderPanel.java |   8 +-
 .../gui/action/ParseCurlCommandAction.java    |  24 +-
 .../http/modifier/AnchorModifier.java         |   6 +-
 .../http/modifier/RegExUserParameters.java    |   3 +-
 .../http/modifier/URLRewritingModifier.java   |   4 +-
 .../modifier/gui/RegExUserParametersGui.java  |   6 +-
 .../protocol/http/parser/BaseParser.java      |   4 +-
 .../protocol/http/parser/JTidyHTMLParser.java | 183 ++++++++-------
 .../http/parser/JsoupBasedHtmlParser.java     |   7 +-
 .../http/parser/LagartoBasedHtmlParser.java   | 140 ++++++------
 .../protocol/http/parser/URLCollection.java   |   4 +-
 .../http/proxy/AbstractSamplerCreator.java    |   4 +-
 .../http/proxy/DefaultSamplerCreator.java     |  15 +-
 .../protocol/http/proxy/HttpReplyHdr.java     |   2 +-
 .../protocol/http/proxy/HttpRequestHdr.java   |   2 +-
 .../jmeter/protocol/http/proxy/Proxy.java     |  49 ++---
 .../protocol/http/proxy/ProxyControl.java     |  74 +++----
 .../http/proxy/gui/ProxyControlGui.java       |  17 +-
 .../http/proxy/gui/RecorderDialog.java        |   6 +-
 .../http/sampler/AccessLogSampler.java        |   8 +-
 .../sampler/AccessLogSamplerBeanInfo.java     |  26 +--
 .../http/sampler/HTTPAbstractImpl.java        |  36 ++-
 .../protocol/http/sampler/HTTPFileImpl.java   |   2 +-
 .../protocol/http/sampler/HTTPHC4Impl.java    |  34 ++-
 .../http/sampler/HTTPHCAbstractImpl.java      |   8 +-
 .../protocol/http/sampler/HTTPJavaImpl.java   |  10 +-
 .../http/sampler/HTTPSampleResult.java        |   5 +-
 .../http/sampler/HTTPSamplerBase.java         |  37 ++--
 .../http/sampler/HTTPSamplerProxy.java        |   3 -
 .../sampler/HttpClientDefaultParameters.java  |   4 +-
 .../protocol/http/sampler/PutWriter.java      |   4 +-
 .../http/sampler/ResourcesDownloader.java     |   3 +-
 .../sampler/hc/LaxDeflateInputStream.java     |   3 -
 .../http/sampler/hc/LaxGZIPInputStream.java   |   3 -
 .../protocol/http/util/ConversionUtils.java   |   2 +-
 .../http/util/GraphQLRequestParamUtils.java   |   4 +-
 .../protocol/http/util/HTTPFileArg.java       |   6 +-
 .../http/util/HTTPResultConverter.java        |   6 +-
 .../http/util/accesslog/SessionFilter.java    |   5 -
 .../util/accesslog/SharedTCLogParser.java     |   2 +-
 .../http/util/accesslog/TCLogParser.java      |   2 +-
 .../http/visualizers/RequestViewHTTP.java     |  21 +-
 .../action/ParseCurlCommandActionTest.java    |  10 +-
 .../http/config/MultipartUrlConfigTest.java   | 104 ++++-----
 .../http/control/TestCacheManagerBase.java    |   2 +-
 .../http/control/TestCacheManagerHC4.java     |  15 --
 .../TestCacheManagerThreadIteration.java      |  28 ---
 .../TestCacheManagerUrlConnection.java        |   2 +-
 .../http/control/TestHTTPMirrorThread.java    |   4 +-
 .../http/modifier/TestAnchorModifier.java     |   4 +-
 .../modifier/TestURLRewritingModifier.java    |   2 +-
 .../protocol/http/parser/TestCssParser.java   |   2 +-
 .../protocol/http/parser/TestHTMLParser.java  |   6 +-
 .../http/proxy/TestHttpRequestHdr.java        |  24 +-
 .../protocol/http/sampler/HTTPSampler3.java   |   3 -
 .../protocol/http/sampler/PackageTest.java    |   2 +-
 .../sampler/ParallelResourcesAndIpSource.java |  44 ++--
 .../protocol/http/sampler/PostWriterTest.java |  42 ++--
 .../http/sampler/SamplingNamingTest.java      |   2 +-
 .../http/sampler/TestDecompression.java       |   2 +-
 ...stHTTPSamplersAgainstHttpMirrorServer.java | 123 +++++------
 .../protocol/http/sampler/TestRedirects.java  |   2 +-
 .../protocol/http/util/TestHTTPFileArgs.java  |   7 +-
 .../http/visualizers/RequestViewHTTPTest.java |  57 ++---
 .../java/config/gui/JavaConfigGui.java        |   3 -
 .../java/control/gui/JavaTestSamplerGui.java  |   3 -
 .../protocol/java/sampler/BSFSampler.java     |   2 +-
 .../protocol/java/sampler/JavaSampler.java    |   8 +-
 .../java/sampler/JavaSamplerContext.java      |   4 +-
 .../jmeter/protocol/java/test/JavaTest.java   |   4 +-
 .../jdbc/AbstractJDBCTestElement.java         |  96 +++-----
 .../jdbc/JDBCTestElementBeanInfoSupport.java  |  24 +-
 .../jdbc/config/DataSourceElement.java        |  14 +-
 .../config/DataSourceElementBeanInfo.java     |  44 ++--
 .../org/apache/jmeter/protocol/jms/Utils.java |  10 +-
 .../jms/client/InitialContextFactory.java     |   2 +-
 .../jms/client/ReceiveSubscriber.java         |   2 +-
 .../jms/control/gui/JMSPropertiesPanel.java   |  64 ++----
 .../jms/control/gui/JMSSamplerGui.java        |   6 +-
 .../protocol/jms/sampler/BaseJMSSampler.java  |   4 +-
 .../protocol/jms/sampler/JMSSampler.java      |   7 +-
 .../protocol/jms/sampler/MessageAdmin.java    |   6 +-
 .../jms/sampler/PublisherSampler.java         |  31 +--
 .../jms/sampler/SubscriberSampler.java        |  13 +-
 .../protocol/jms/sampler/render/FileKey.java  |   4 +-
 .../sampler/render/ObjectMessageRenderer.java |   2 +-
 .../render/BinaryMessageRendererTest.java     |   2 +-
 .../render/ObjectMessageRendererTest.java     |   4 +-
 .../main/java/test/DummyAnnotatedTest.java    |  14 +-
 .../java/control/gui/JUnitTestSamplerGui.java |  14 +-
 .../protocol/java/sampler/JUnitSampler.java   |  18 +-
 .../ldap/config/gui/LDAPArgumentsPanel.java   |   7 +-
 .../ldap/config/gui/LdapExtConfigGui.java     |   2 +-
 .../protocol/ldap/sampler/LDAPExtSampler.java |  26 +--
 .../protocol/ldap/sampler/LdapExtClient.java  |   4 +-
 .../mail/sampler/MailReaderSampler.java       |  22 +-
 .../sampler/gui/MailReaderSamplerGui.java     |   2 +-
 .../protocol/smtp/sampler/SmtpSampler.java    |   6 +-
 .../protocol/smtp/sampler/gui/SmtpPanel.java  |  25 +--
 .../smtp/sampler/gui/SmtpSamplerGui.java      |   4 +-
 .../sampler/protocol/SendMailCommand.java     |  10 +-
 .../mongodb/config/MongoSourceElement.java    |   4 +-
 .../config/MongoSourceElementBeanInfo.java    |  44 ++--
 .../mongodb/mongo/EvalResultHandler.java      |  16 +-
 .../mongodb/sampler/MongoScriptSampler.java   |   3 -
 .../sampler/MongoScriptSamplerBeanInfo.java   |  12 +-
 .../protocol/tcp/sampler/TCPSampler.java      |   8 +-
 xdocs/extending/notes_on_extending.txt        |  10 +-
 xdocs/usermanual/jmeter_tutorial.xml          |   8 +-
 496 files changed, 2263 insertions(+), 3748 deletions(-)

diff --git a/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java b/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
index 207009bd905..12b8928f357 100644
--- a/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
+++ b/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
@@ -90,7 +90,7 @@ private static class SockRead extends Thread {
 
         private final InputStream is;
 
-        public SockRead(InputStream _is) {
+        private SockRead(InputStream _is) {
             this.is=_is;
         }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
index 1e38d9c5010..401e9cb2c2d 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
@@ -31,13 +31,13 @@ public CompareAssertionBeanInfo() {
         createPropertyGroup("compareChoices", new String[] { "compareContent", "compareTime" }); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
         createPropertyGroup("comparison_filters", new String[]{"stringsToSkip"}); //$NON-NLS-1$ $NON-NLS-2$
         PropertyDescriptor p = property("compareContent"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, true);
+        p.setValue(NOT_EXPRESSION, true);
         p = property("compareTime"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, -1L);
-        p.setValue(NOT_EXPRESSION, Boolean.FALSE);
+        p.setValue(NOT_EXPRESSION, false);
         p = property("stringsToSkip"); //$NON-NLS-1$
         p.setPropertyEditorClass(TableEditor.class);
         p.setValue(TableEditor.CLASSNAME,SubstitutionElement.class.getName());
@@ -46,9 +46,9 @@ public CompareAssertionBeanInfo() {
                 JMeterUtils.getResString("comparison_regex_substitution")}); //$NON-NLS-1$
         p.setValue(TableEditor.OBJECT_PROPERTIES, // These are the names of the get/set methods
                 new String[]{SubstitutionElement.REGEX, SubstitutionElement.SUBSTITUTE});
-        p.setValue(NOT_UNDEFINED,Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED,true);
         p.setValue(DEFAULT, new ArrayList<>());
-        p.setValue(MULTILINE,Boolean.TRUE);
+        p.setValue(MULTILINE,true);
 
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index b1bcc913818..0c17f023a5e 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -100,9 +100,7 @@ private AssertionResult runTidy(SampleResult inResponse) {
             return result;
         }
 
-        /*
-         * Run tidy.
-         */
+        // Run tidy.
         try {
             log.debug("HTMLAssertions.getResult(): start parsing with tidy ...");
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index 3e15e915ddb..975a6c7658d 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -117,8 +117,7 @@ private void doAssert(String jsonString) {
         Object value = JsonPath.read(jsonString, getJsonPath());
 
         if (!isJsonValidationBool()) {
-            if (value instanceof JSONArray) {
-                JSONArray arrayValue = (JSONArray) value;
+            if (value instanceof JSONArray arrayValue) {
                 if (arrayValue.isEmpty() && !JsonPath.isPathDefinite(getJsonPath())) {
                     throw new IllegalStateException(String.format("JSONPath '%s' is indefinite and the extracted Value is an empty Array." +
                             " Please use an assertion value, to be sure to get a correct result. Expected value was '%s'", getJsonPath(), getExpectedValue()));
@@ -127,8 +126,8 @@ private void doAssert(String jsonString) {
             return;
         }
 
-        if (value instanceof JSONArray) {
-            if (arrayMatched((JSONArray) value)) {
+        if (value instanceof JSONArray objects) {
+            if (arrayMatched(objects)) {
                 return;
             }
         } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
index 24e7673045b..f7df66aaa2f 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java
@@ -463,30 +463,16 @@ private String getFailText(String stringPattern, String toCheck) {
             sb.append("URL");
         }
 
-        switch (getTestType()) {
-        case CONTAINS:
-        case SUBSTRING:
-            sb.append(" expected to contain ");
-            break;
-        case NOT | CONTAINS:
-        case NOT | SUBSTRING:
-            sb.append(" expected not to contain ");
-            break;
-        case MATCH:
-            sb.append(" expected to match ");
-            break;
-        case NOT | MATCH:
-            sb.append(" expected not to match ");
-            break;
-        case EQUALS:
-            sb.append(" expected to equal ");
-            break;
-        case NOT | EQUALS:
-            sb.append(" expected not to equal ");
-            break;
-        default:// should never happen...
-            sb.append(" expected something using ");
-        }
+        sb.append(switch (getTestType()) {
+            case CONTAINS, SUBSTRING -> " expected to contain ";
+            case NOT | CONTAINS, NOT | SUBSTRING -> " expected not to contain ";
+            case MATCH -> " expected to match ";
+            case NOT | MATCH -> " expected not to match ";
+            case EQUALS -> " expected to equal ";
+            case NOT | EQUALS -> " expected not to equal ";
+            default ->// should never happen...
+                    " expected something using ";
+        });
 
         sb.append("/");
 
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
index 5c08bbbe20d..4c9471c5dc5 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java
@@ -175,7 +175,7 @@ private static AssertionResult verifySignature(SMIMEAssertionTestElement testEle
                         checkSubject(testElement, res, cert, failureMessage);
                         checkIssuer(testElement, res, cert, failureMessage);
 
-                        if (failureMessage.length() > 0) {
+                        if (!failureMessage.isEmpty()) {
                             res.setFailureMessage(failureMessage.toString());
                         }
                     }
@@ -244,7 +244,7 @@ private static void checkSignerByFile(SMIMEAssertionTestElement testElement, Ass
     private static void checkIssuer(SMIMEAssertionTestElement testElement, AssertionResult res,
             X509CertificateHolder cert, StringBuilder failureMessage) {
         String issuer = testElement.getIssuerDn();
-        if (issuer.length() > 0) {
+        if (!issuer.isEmpty()) {
             String subject = testElement.getSignerDn();
             final X500Name issuerX500Name = cert.getIssuer();
             log.debug("IssuerDN from cert: {}", issuerX500Name);
@@ -262,7 +262,7 @@ private static void checkIssuer(SMIMEAssertionTestElement testElement, Assertion
     private static void checkSubject(SMIMEAssertionTestElement testElement, AssertionResult res,
             X509CertificateHolder cert, StringBuilder failureMessage) {
         String subject = testElement.getSignerDn();
-        if (subject.length() > 0) {
+        if (!subject.isEmpty()) {
             final X500Name certPrincipal = cert.getSubject();
             log.debug("DN from cert: {}", certPrincipal);
             X500Name principal = new X500Name(subject);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
index ac2ad0132b4..7b3e1ad5d24 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
@@ -74,21 +74,14 @@ public static ComparisonOperator fromValue(int value) {
         }
 
         public boolean evaluate(long actual, long expected) {
-            switch (this) {
-                case EQUAL:
-                    return actual == expected;
-                case NOTEQUAL:
-                    return actual != expected;
-                case GREATERTHAN:
-                    return actual > expected;
-                case LESSTHAN:
-                    return actual < expected;
-                case GREATERTHANEQUAL:
-                    return actual >= expected;
-                case LESSTHANEQUAL:
-                    return actual <= expected;
-            }
-            throw new IllegalStateException("Unexpected value: " + this);
+            return switch (this) {
+                case EQUAL -> actual == expected;
+                case NOTEQUAL -> actual != expected;
+                case GREATERTHAN -> actual > expected;
+                case LESSTHAN -> actual < expected;
+                case GREATERTHANEQUAL -> actual >= expected;
+                case LESSTHANEQUAL -> actual <= expected;
+            };
         }
     }
 
@@ -166,7 +159,7 @@ public AssertionResult getResult(SampleResult response) {
         }
         // is the Sample the correct size?
         final String msg = compareSize(resultSize);
-        if (msg.length() > 0) {
+        if (!msg.isEmpty()) {
             result.setFailure(true);
             Object[] arguments = {resultSize, msg, Long.valueOf(getAllowedSize()) };
             String message = MessageFormat.format(
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
index 6aa6d113ae9..468603a22df 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
@@ -70,7 +70,7 @@ public AssertionResult getResult(SampleResult response) {
         // no error as default
         AssertionResult result = new AssertionResult(getName());
         String resultData = response.getResponseDataAsString();
-        if (resultData.length() == 0) {
+        if (resultData.isEmpty()) {
             return result.setResultForNull();
         }
         result.setFailure(false);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
index 204675821b2..ed3b5544e3a 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java
@@ -59,7 +59,7 @@ public AssertionResult getResult(SampleResult response) {
         // Note: initialised with error = failure = false
 
         String resultData = response.getResponseDataAsString();
-        if (resultData.length() == 0) {
+        if (resultData.isEmpty()) {
             return result.setResultForNull();
         }
 
@@ -141,16 +141,13 @@ private static String errorDetails(SAXParseException spe) {
     private static class SAXErrorHandler implements ErrorHandler {
         private final AssertionResult result;
 
-        public SAXErrorHandler(AssertionResult result) {
+        private SAXErrorHandler(AssertionResult result) {
             this.result = result;
         }
 
-        /*
-         * Can be caused by: - failure to read XSD file - xml does not match XSD
-         */
         @Override
         public void error(SAXParseException exception) throws SAXParseException {
-
+            // Can be caused by: - failure to read XSD file - xml does not match XSD
             String msg = "error: " + errorDetails(exception);
             log.debug(msg);
             result.setFailureMessage(msg);
@@ -158,12 +155,9 @@ public void error(SAXParseException exception) throws SAXParseException {
             throw exception;
         }
 
-        /*
-         * Can be caused by: - premature end of file - non-whitespace content
-         * after trailer
-         */
         @Override
         public void fatalError(SAXParseException exception) throws SAXParseException {
+            // Can be caused by: - premature end of file - non-whitespace content after trailer
             String msg = "fatal: " + errorDetails(exception);
             log.debug(msg);
             result.setFailureMessage(msg);
@@ -171,11 +165,9 @@ public void fatalError(SAXParseException exception) throws SAXParseException {
             throw exception;
         }
 
-        /*
-         * Not clear what can cause this ? conflicting versions perhaps
-         */
         @Override
         public void warning(SAXParseException exception) throws SAXParseException {
+            // Not clear what can cause this ? conflicting versions perhaps
             String msg = "warning: " + errorDetails(exception);
             log.debug(msg);
             result.setFailureMessage(msg);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
index c4b252c0208..bc9262276a2 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
@@ -157,8 +157,7 @@ public TestElement createTestElement() {
     public void modifyTestElement(TestElement el) {
         GuiUtils.stopTableEditing(stringTable);
         configureTestElement(el);
-        if (el instanceof ResponseAssertion) {
-            ResponseAssertion ra = (ResponseAssertion) el;
+        if (el instanceof ResponseAssertion ra) {
             ra.setCustomFailureMessage(alternativeFailureMessage.getText());
             saveScopeSettings(ra);
 
@@ -294,7 +293,7 @@ public void configure(TestElement el) {
             tableModel.addRow(new Object[] { jMeterProperty.getStringValue() });
         }
 
-        boolean testStringsPresent = model.getTestStrings().size() != 0;
+        boolean testStringsPresent = !model.getTestStrings().isEmpty();
         deletePattern.setEnabled(testStringsPresent);
 
         tableModel.fireTableDataChanged();
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
index 93d3f87677a..0aeb0651168 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
@@ -68,8 +68,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement el) {
         configureTestElement(el);
-        if (el instanceof DurationAssertion) {
-            DurationAssertion assertion = (DurationAssertion) el;
+        if (el instanceof DurationAssertion assertion) {
             assertion.setProperty(DurationAssertion.DURATION_KEY,duration.getText());
             saveScopeSettings(assertion);
         }
@@ -88,8 +87,7 @@ public void clearGui() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof DurationAssertion){
-            DurationAssertion da = (DurationAssertion) el;
+        if (el instanceof DurationAssertion da){
             duration.setText(da.getPropertyAsString(DurationAssertion.DURATION_KEY));
             showScopeSettings(da);
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
index d482c7530b3..44c4857cc8c 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
@@ -130,8 +130,7 @@ public String getLabelResource() {
     @Override
     public void modifyTestElement(TestElement element) {
         super.configureTestElement(element);
-        if (element instanceof JSONPathAssertion) {
-            JSONPathAssertion jpAssertion = (JSONPathAssertion) element;
+        if (element instanceof JSONPathAssertion jpAssertion) {
             jpAssertion.setJsonPath(jsonPath.getText());
             jpAssertion.setExpectedValue(jsonValue.getText());
             jpAssertion.setJsonValidationBool(jsonValidation.isSelected());
@@ -144,8 +143,7 @@ public void modifyTestElement(TestElement element) {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof JSONPathAssertion) {
-            JSONPathAssertion jpAssertion = (JSONPathAssertion) element;
+        if (element instanceof JSONPathAssertion jpAssertion) {
             jsonPath.setText(jpAssertion.getJsonPath());
             jsonValue.setText(jpAssertion.getExpectedValue());
             jsonValidation.setSelected(jpAssertion.isJsonValidationBool());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
index 700fb51c86f..a0f65e7f55a 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
@@ -81,9 +81,6 @@ public String getLabelResource() {
         return "md5hex_assertion_title"; // $NON-NLS-1$
     }
 
-    /*
-     * @return
-     */
     @Override
     public TestElement createTestElement() {
 
@@ -93,9 +90,6 @@ public TestElement createTestElement() {
 
     }
 
-    /*
-     * @param element
-     */
     @Override
     public void modifyTestElement(TestElement element) {
         configureTestElement(element);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java
index 5f5e50a10b4..de16e1ccc8c 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java
@@ -101,8 +101,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
     @Override
     public void modifyTestElement(TestElement el) {
         super.configureTestElement(el);
-        if (el instanceof XPath2Assertion) {
-            XPath2Assertion assertion = (XPath2Assertion) el;
+        if (el instanceof XPath2Assertion assertion) {
             saveScopeSettings(assertion);
             assertion.setNegated(xpath.isNegated());
             assertion.setXPathString(xpath.getXPath());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
index 757e78fd575..ae8d813e134 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
@@ -109,8 +109,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
     @Override
     public void modifyTestElement(TestElement el) {
         super.configureTestElement(el);
-        if (el instanceof XPathAssertion) {
-            XPathAssertion assertion = (XPathAssertion) el;
+        if (el instanceof XPathAssertion assertion) {
             saveScopeSettings(assertion);
             assertion.setNegated(xpath.isNegated());
             assertion.setXPathString(xpath.getXPath());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
index c6b615dd652..74668c66d51 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java
@@ -224,9 +224,6 @@ public void testEnded(String host) {
         JMESPathCache.getInstance().cleanUp();
     }
 
-    /*
-     * ------------------------ GETTER/SETTER ------------------------
-     */
     public String getJmesPath() {
         return getPropertyAsString(JMESPATH);
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
index af8e52046e3..5108eb01ee5 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
@@ -113,8 +113,7 @@ public String getLabelResource() {
     @Override
     public void modifyTestElement(TestElement element) {
         super.configureTestElement(element);
-        if (element instanceof JMESPathAssertion) {
-            JMESPathAssertion jmesAssertion = (JMESPathAssertion) element;
+        if (element instanceof JMESPathAssertion jmesAssertion) {
             jmesAssertion.setJmesPath(jsonPath.getText());
             jmesAssertion.setExpectedValue(jsonValue.getText());
             jmesAssertion.setJsonValidationBool(jsonValidation.isSelected());
@@ -130,8 +129,7 @@ public void modifyTestElement(TestElement element) {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof JMESPathAssertion) {
-            JMESPathAssertion jmesAssertion = (JMESPathAssertion) element;
+        if (element instanceof JMESPathAssertion jmesAssertion) {
             jsonPath.setText(jmesAssertion.getJmesPath());
             jsonValue.setText(jmesAssertion.getExpectedValue());
             jsonValidation.setSelected(jmesAssertion.isJsonValidationBool());
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index 7e0f66068dc..ee3bf0f010a 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -121,7 +121,7 @@ private Object readResolve(){
      */
     @Override
     public void setProperty(JMeterProperty property) {
-        if (!(property instanceof StringProperty)) {
+        if (!(property instanceof StringProperty stringProperty)) {
             super.setProperty(property);
             return;
         }
@@ -142,7 +142,7 @@ public void setProperty(JMeterProperty property) {
                         if (log.isDebugEnabled()) {
                             log.debug("Converted {}={} to {} using Locale: {}", propName, propValue, resKey, rb.getLocale());
                         }
-                        ((StringProperty) property).setValue(resKey); // reset the value
+                        stringProperty.setValue(resKey); // reset the value
                         super.setProperty(property);
                         return;
                     }
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
index 2d3f5aeab03..5393963da78 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
@@ -61,48 +61,48 @@ public CSVDataSetBeanInfo() {
                         RECYCLE, STOPTHREAD, SHAREMODE });
 
         PropertyDescriptor p = property(FILENAME);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");        //$NON-NLS-1$
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
         p.setPropertyEditorClass(FileEditor.class);
 
         p = property(FILE_ENCODING, TypeEditor.ComboStringEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");        //$NON-NLS-1$
         p.setValue(TAGS, getListFileEncoding());
 
         p = property(VARIABLE_NAMES);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");        //$NON-NLS-1$
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
 
         p = property(IGNORE_FIRST_LINE);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
 
         p = property(DELIMITER);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ",");        //$NON-NLS-1$
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
 
         p = property(QUOTED_DATA);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
 
         p = property(RECYCLE);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, true);
 
         p = property(STOPTHREAD);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
 
         p = property(SHAREMODE, TypeEditor.ComboStringEditor);
         p.setValue(RESOURCE_BUNDLE, getBeanDescriptor().getValue(RESOURCE_BUNDLE));
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, SHARE_TAGS[SHARE_ALL]);
-        p.setValue(NOT_OTHER, Boolean.FALSE);
-        p.setValue(NOT_EXPRESSION, Boolean.FALSE);
+        p.setValue(NOT_OTHER, false);
+        p.setValue(NOT_EXPRESSION, false);
         p.setValue(TAGS, SHARE_TAGS);
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
index 32a5a6fd25b..271d54e9ed4 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
@@ -43,22 +43,22 @@ public KeystoreConfigBeanInfo() {
                 PRELOAD, CLIENT_CERT_ALIAS_VAR_NAME, ALIAS_START_INDEX, ALIAS_END_INDEX });
 
         PropertyDescriptor p = property(PRELOAD);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "True"); // $NON-NLS-1$
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
         p.setValue(TAGS, new String[]{"True", "False"}); // $NON-NLS-1$ $NON-NLS-2$
 
         p = property(CLIENT_CERT_ALIAS_VAR_NAME);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, JmeterKeyStore.DEFAULT_ALIAS_VAR_NAME); // $NON-NLS-1$
 
         p = property(ALIAS_START_INDEX);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "0"); // $NON-NLS-1$
 
         p = property(ALIAS_END_INDEX);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "-1"); // $NON-NLS-1$
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
index 0f81571dde8..43661d11cbd 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
@@ -41,10 +41,8 @@ public class RandomVariableConfig extends ConfigTestElement
 
     private static final long serialVersionUID = 235L;
 
-    /*
-     *  N.B. this class is shared between threads (NoThreadClone) so all access to variables
-     *  needs to be protected by a lock (either sync. or volatile) to ensure safe publication.
-     */
+    // N.B. this class is shared between threads (NoThreadClone) so all access to variables
+    // needs to be protected by a lock (either sync. or volatile) to ensure safe publication.
 
     private String minimumValue;
 
@@ -81,7 +79,7 @@ private Object readResolve(){
         return this;
     }
 
-    /*
+    /**
      * nextInt(n) returns values in the range [0,n),
      * so n must be set to max-min+1
      */
@@ -207,7 +205,7 @@ public synchronized String getRandomSeed() {
     }
 
     private Random createRandom() {
-        if (randomSeed.length()>0){
+        if (!randomSeed.isEmpty()){
             Long seed = getRandomSeedAsLong();
             if(seed != null) {
                 return new Random(seed);
diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java
index d09e2b9d0fa..b1b508a5ee4 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java
@@ -44,34 +44,34 @@ public    RandomVariableConfigBeanInfo() {
         createPropertyGroup(VARIABLE_GROUP, new String[] { VARIABLE_NAME, OUTPUT_FORMAT, });
 
         p = property(VARIABLE_NAME);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property(OUTPUT_FORMAT);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         createPropertyGroup(RANDOM_GROUP,
         new String[] { MINIMUM_VALUE, MAXIMUM_VALUE, RANDOM_SEED, });
 
         p = property(MINIMUM_VALUE);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "1"); // $NON-NLS-1$
 
         p = property(MAXIMUM_VALUE);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property(RANDOM_SEED);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         createPropertyGroup(OPTIONS_GROUP, new String[] { PER_THREAD, });
 
         p = property(PER_THREAD);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, false);
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
index d80b94f038c..27fccc42977 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
@@ -167,7 +167,7 @@ public boolean isDone() {
             variables.putObject(getReturnVal(), currentVariable);
             if (log.isDebugEnabled()) {
                 log.debug("{} : Found in vars:{}, isDone:{}",
-                        getName(), inputVariable, Boolean.FALSE);
+                        getName(), inputVariable, false);
 
             }
             return false;
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java
index 467d7a1adf4..a3af9fec831 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java
@@ -90,8 +90,7 @@ public CriticalSectionControllerGui(boolean displayName) {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof CriticalSectionController) {
-            CriticalSectionController controller = (CriticalSectionController) element;
+        if (element instanceof CriticalSectionController controller) {
             tfLockName.setText(controller.getLockName());
         }
 
@@ -113,8 +112,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement controller) {
         configureTestElement(controller);
-        if (controller instanceof CriticalSectionController) {
-            CriticalSectionController csController = (CriticalSectionController) controller;
+        if (controller instanceof CriticalSectionController csController) {
             csController.setLockName(tfLockName.getText());
         }
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
index 67cd2fad940..009e1a8f49d 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
@@ -132,8 +132,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement lc) {
         configureTestElement(lc);
-        if (lc instanceof ForeachController) {
-            ForeachController fec = (ForeachController) lc;
+        if (lc instanceof ForeachController fec) {
             fec.setInputVal(inputVal.getText());
             fec.setStartIndex(startIndex.getText());
             fec.setEndIndex(endIndex.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
index 0cf853e2ff7..54db597d846 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java
@@ -120,7 +120,7 @@ public ModuleControllerGui() {
 
             private static final long serialVersionUID = 4062816201792954617L;
 
-            private boolean isSelectedPathAllowed(DefaultMutableTreeNode lastSelected) {
+            private static boolean isSelectedPathAllowed(DefaultMutableTreeNode lastSelected) {
                 JMeterTreeNode tn = null;
                 if (lastSelected != null && lastSelected.getUserObject() instanceof JMeterTreeNode) {
                     tn = (JMeterTreeNode) lastSelected.getUserObject();
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index 6ae48f346da..ea3a017dd84 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -403,7 +403,7 @@ public boolean useRequestHeaders() {
 
     public boolean useBody() {
         String prop = getPropertyAsString(MATCH_AGAINST);
-        return prop.length() == 0 || USE_BODY.equalsIgnoreCase(prop);
+        return prop.isEmpty() || USE_BODY.equalsIgnoreCase(prop);
     }
 
     public boolean useUnescapedBody() {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java
index 14cf586ac2b..85f2c3b1e93 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java
@@ -29,28 +29,28 @@ public DebugPostProcessorBeanInfo() {
         PropertyDescriptor p;
 
         p = property("displaySamplerProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, true);
 
         p = property("displayJMeterVariables");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, true);
 
         p = property("displayJMeterProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, false);
 
         p = property("displaySystemProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, false);
     }
 
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
index 360f0666df0..6af386a8961 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java
@@ -87,7 +87,7 @@ public void process() {
         int matchNumber = getMatchNumber();
         final String defaultValue = getDefaultValue();
 
-        if (defaultValue.length() > 0  || isEmptyDefaultValue()) {
+        if (!defaultValue.isEmpty() || isEmptyDefaultValue()) {
             // Only replace default if it is provided or empty default value is explicitly requested
             vars.put(refName, defaultValue);
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 6c6f7077f2f..1199df9bb6b 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -436,8 +436,8 @@ private String generateResult(MatchResult match) {
             if(log.isDebugEnabled()) {
                 log.debug("RegexExtractor: Template piece {} ({})", obj, obj.getClass());
             }
-            if (obj instanceof Integer) {
-                result.append(match.group((Integer) obj));
+            if (obj instanceof Integer i) {
+                result.append(match.group(i));
             } else {
                 result.append(obj);
             }
@@ -452,8 +452,8 @@ private String generateResult(java.util.regex.MatchResult match) {
             if(log.isDebugEnabled()) {
                 log.debug("RegexExtractor: Template piece {} ({})", obj, obj.getClass());
             }
-            if (obj instanceof Integer) {
-                result.append(match.group((Integer) obj));
+            if (obj instanceof Integer i) {
+                result.append(match.group(i));
             } else {
                 result.append(obj);
             }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
index 1d51ad4e155..aaa672b0ab8 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java
@@ -115,7 +115,7 @@ public void process() {
             if (isScopeVariable()){
                 String inputString=vars.get(getVariableName());
                 if(inputString != null) {
-                    if(inputString.length()>0) {
+                    if(!inputString.isEmpty()) {
                         getValuesForXPath(getXPathQuery(), matches, matchNumber, inputString);
                     }
                 } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
index 170435f9265..dc910e70f66 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java
@@ -129,7 +129,7 @@ public void process() {
             if (isScopeVariable()){
                 String inputString=vars.get(getVariableName());
                 if(inputString != null) {
-                    if(inputString.length()>0) {
+                    if(!inputString.isEmpty()) {
                         Document d =  parseResponse(inputString);
                         getValuesForXPath(d,getXPathQuery(), matches, matchNumber);
                     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
index b3f1f041da3..6245ec523a8 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java
@@ -92,8 +92,7 @@ public String getLabelResource() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof BoundaryExtractor){
-            BoundaryExtractor boundary = (BoundaryExtractor) el;
+        if (el instanceof BoundaryExtractor boundary){
             showScopeSettings(boundary, true);
             useHeaders.setSelected(boundary.useHeaders());
             useRequestHeaders.setSelected(boundary.useRequestHeaders());
@@ -130,8 +129,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if (extractor instanceof BoundaryExtractor) {
-            BoundaryExtractor boundary = (BoundaryExtractor) extractor;
+        if (extractor instanceof BoundaryExtractor boundary) {
             saveScopeSettings(boundary);
             boundary.setUseField(group.getSelection().getActionCommand());
             boundary.setRefName(refNameField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
index 2dc6d69895b..0f6c62528bb 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
@@ -77,8 +77,7 @@ public String getLabelResource() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof HtmlExtractor){
-            HtmlExtractor htmlExtractor = (HtmlExtractor) el;
+        if (el instanceof HtmlExtractor htmlExtractor){
             showScopeSettings(htmlExtractor, true);
             expressionField.setText(htmlExtractor.getExpression());
             attributeField.setText(htmlExtractor.getAttribute());
@@ -108,8 +107,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if (extractor instanceof HtmlExtractor) {
-            HtmlExtractor htmlExtractor = (HtmlExtractor) extractor;
+        if (extractor instanceof HtmlExtractor htmlExtractor) {
             saveScopeSettings(htmlExtractor);
             htmlExtractor.setRefName(refNameField.getText());
             htmlExtractor.setExpression(expressionField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
index 02aeef2c005..de0ea981153 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
@@ -76,8 +76,7 @@ public String getLabelResource() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof RegexExtractor){
-            RegexExtractor re = (RegexExtractor) el;
+        if (el instanceof RegexExtractor re){
             showScopeSettings(re, true);
             useHeaders.setSelected(re.useHeaders());
             useRequestHeaders.setSelected(re.useRequestHeaders());
@@ -114,8 +113,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if (extractor instanceof RegexExtractor) {
-            RegexExtractor regex = (RegexExtractor) extractor;
+        if (extractor instanceof RegexExtractor regex) {
             saveScopeSettings(regex);
             regex.setUseField(group.getSelection().getActionCommand());
             regex.setRefName(refNameField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
index e6b2523ac49..7a178f63777 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
@@ -89,8 +89,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if (extractor instanceof XPath2Extractor) {
-            XPath2Extractor xpath = (XPath2Extractor) extractor;
+        if (extractor instanceof XPath2Extractor xpath) {
             saveScopeSettings(xpath);
             xpath.setDefaultValue(defaultField.getText());
             xpath.setRefName(refNameField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
index 03705316529..a7454b7f5ee 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
@@ -95,8 +95,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if ( extractor instanceof XPathExtractor){
-            XPathExtractor xpath = (XPathExtractor)extractor;
+        if (extractor instanceof XPathExtractor xpath){
             saveScopeSettings(xpath);
             xpath.setDefaultValue(defaultField.getText());
             xpath.setRefName(refNameField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCache.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCache.java
index 2693c5a6357..d5cd4f05994 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCache.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCache.java
@@ -34,7 +34,7 @@ public class JMESPathCache {
     private static final class JMESPathCacheLoader implements CacheLoader<String, Expression<JsonNode>> {
         final JmesPath<JsonNode> runtime;
 
-        public JMESPathCacheLoader() {
+        private JMESPathCacheLoader() {
             runtime = new JacksonRuntime(
                     new RuntimeConfiguration.Builder().withFunctionRegistry(FunctionRegistry.defaultRegistry()).build());
         }
@@ -57,7 +57,7 @@ private JMESPathCache() {
      * Initialization On Demand Holder pattern
      */
     private static class JMESPathCacheHolder {
-        public static final JMESPathCache INSTANCE = new JMESPathCache();
+        private static final JMESPathCache INSTANCE = new JMESPathCache();
     }
 
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
index 149bc656d4a..0961a178f7f 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/gui/JMESPathExtractorGui.java
@@ -88,8 +88,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement c) {
         super.configureTestElement(c);
-        if (c instanceof JMESPathExtractor) {
-            JMESPathExtractor config = (JMESPathExtractor) c;
+        if (c instanceof JMESPathExtractor config) {
             saveScopeSettings(config);
             config.setRefName(refNameField.getText());
             config.setJmesPathExpression(jmesPathExpressionField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
index 6d510318c4d..830561d7b4f 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
@@ -92,8 +92,8 @@ private static String stringifyJSONObject(Object obj) {
         if (obj instanceof Map) {
             return new JSONObject((Map<String, ?>) obj).toJSONString();
         }
-        if (obj instanceof JSONArray) {
-            return ((JSONArray)obj).toJSONString();
+        if (obj instanceof JSONArray objects) {
+            return objects.toJSONString();
         }
         return obj == null ? null : obj.toString();
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
index 2f005570cb1..0394249b9a3 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java
@@ -93,8 +93,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement c) {
         super.configureTestElement(c);
-        if (c instanceof JSONPostProcessor) {
-            JSONPostProcessor config = (JSONPostProcessor) c;
+        if (c instanceof JSONPostProcessor config) {
             saveScopeSettings(config);
             config.setRefNames(refNamesField.getText());
             config.setJsonPathExpressions(jsonPathExpressionsField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
index 549679ff57d..861009e7f9d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/AbstractRenderAsJsonRenderer.java
@@ -105,7 +105,7 @@ public void actionPerformed(ActionEvent e) {
      */
     protected void executeTester(String textToParse) {
         if (StringUtilities.isNotEmpty(textToParse)
-                && this.expressionField.getText().length() > 0) {
+                && !this.expressionField.getText().isEmpty()) {
             this.resultField.setText(process(textToParse));
             this.resultField.setCaretPosition(0); // go to first line
         }
@@ -202,8 +202,8 @@ public synchronized void setRightSide(JTabbedPane side) {
     /** {@inheritDoc} */
     @Override
     public synchronized void setSamplerResult(Object userObject) {
-        if (userObject instanceof SampleResult) {
-            sampleResult = (SampleResult) userObject;
+        if (userObject instanceof SampleResult result) {
+            sampleResult = result;
         }
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
index cc988f7d9f7..007d37ef73a 100644
--- a/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
+++ b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
@@ -87,7 +87,7 @@ public class ExportTransactionAndSamplerNames extends AbstractAction implements
      */
     private static class SamplerAndTransactionNameVisitor implements HashTreeTraverser {
         private final Set<String> listOfTransactions = new TreeSet<>();
-        public SamplerAndTransactionNameVisitor() {
+        private SamplerAndTransactionNameVisitor() {
             super();
         }
         @Override
@@ -113,10 +113,11 @@ public void subtractNode() {
         public void processPath() {
             // NOOP
         }
+
         /**
          * @return the listOfTransactions
          */
-        public Set<String> getListOfTransactions() {
+        private Set<String> getListOfTransactions() {
             return listOfTransactions;
         }
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java b/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
index 04a715a3602..581d4cb13ae 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java
@@ -116,10 +116,9 @@ private void createTask(final Sampler samp) {
         if (timeout <= 0) {
             return;
         }
-        if (!(samp instanceof Interruptible)) { // may be applied to a whole test
+        if (!(samp instanceof Interruptible sampler)) { // may be applied to a whole test
             return; // Cannot time out in this case
         }
-        final Interruptible sampler = (Interruptible) samp;
 
         Callable<Object> call = () -> {
             long start = System.nanoTime();
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java b/src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java
index 2bbfcdbc98f..4ae95284c9d 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java
@@ -118,7 +118,7 @@ public void setThreadLists(CollectionProperty threadLists) {
 
     private CollectionProperty getValues() {
         CollectionProperty threadValues = (CollectionProperty) getProperty(THREAD_VALUES);
-        if (threadValues.size() > 0) {
+        if (!threadValues.isEmpty()) {
             return (CollectionProperty) threadValues.get(getThreadContext().getThreadNum() % threadValues.size());
         }
         return new CollectionProperty("noname", new ArrayList<>());
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
index 4eb17e2a7ff..648d336702a 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
@@ -72,8 +72,7 @@ public TestElement createTestElement() {
      */
     @Override
     public void modifyTestElement(TestElement c) {
-        if (c instanceof CounterConfig) {
-            CounterConfig config = (CounterConfig) c;
+        if (c instanceof CounterConfig config) {
             config.setStart(startField.getText());
             config.setEnd(endField.getText());
             config.setIncrement(incrField.getText());
diff --git a/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java b/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
index 6666bac9fe9..1d905d64ff4 100644
--- a/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
+++ b/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java
@@ -345,19 +345,15 @@ public void sendMail(String from, List<String> vEmails, String subject,
         if(mailAuthType != MailAuthType.NONE) {
             props.put(MAIL_SMTP_AUTH, "true");
             switch (mailAuthType) {
-                case SSL:
+                case SSL -> {
                     props.put(MAIL_SMTP_SOCKETFACTORY_CLASS,
                             "javax.net.ssl.SSLSocketFactory");
                     props.put(MAIL_SMTP_CHECK_SERVER_IDENTITY, true);
-                    break;
-                case TLS:
-                    props.put(MAIL_SMTP_STARTTLS,
-                            "true");
-                    break;
-
-                default:
-                    break;
                 }
+                case TLS -> props.put(MAIL_SMTP_STARTTLS, "true");
+                default -> {
+                }
+            }
         }
 
         if (StringUtilities.isNotEmpty(user)) {
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java
index fe62566b215..a39355b0338 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java
@@ -27,21 +27,21 @@ public DebugSamplerBeanInfo() {
         PropertyDescriptor p;
 
         p = property("displayJMeterVariables");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, true);
 
         p = property("displayJMeterProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, false);
 
         p = property("displaySystemProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(DEFAULT, false);
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 448e0cc2683..9dc8d0baee0 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -134,10 +134,12 @@ public double getThroughput() {
         return getPropertyAsDouble(THROUGHPUT);
     }
 
+    @SuppressWarnings("EnumOrdinal")
     public int getCalcMode() {
         return getPropertyAsInt(CALC_MODE, DEFAULT_CALC_MODE.ordinal());
     }
 
+    @SuppressWarnings("EnumOrdinal")
     public void setCalcMode(int mode) {
         Mode resolved = Mode.CACHED_VALUES[mode];
         setProperty(new IntegerProperty(CALC_MODE, resolved.ordinal()));
@@ -152,10 +154,8 @@ public void setCalcMode(int mode) {
     public long delay() {
         long currentTime = System.currentTimeMillis();
 
-        /*
-         * If previous time is zero, then target will be in the past.
-         * This is what we want, so first sample is run without a delay.
-        */
+        // If previous time is zero, then target will be in the past.
+        // This is what we want, so first sample is run without a delay.
         long currentTarget = previousTime  + calculateDelay();
         if (currentTime > currentTarget) {
             // We're behind schedule -- try to catch up:
@@ -269,6 +269,7 @@ public String toString() {
      * so the conversion only needs to happen once.
      */
     @Override
+    @SuppressWarnings("EnumOrdinal")
     public void setProperty(JMeterProperty property) {
         if (property instanceof StringProperty) {
             final String pn = property.getName();
@@ -303,6 +304,7 @@ Mode getMode() {
     }
 
     // For access from test code
+    @SuppressWarnings("EnumOrdinal")
     void setMode(Mode newMode) {
         setCalcMode(newMode.ordinal());
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
index 63db360d1f2..0288460bb37 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
@@ -26,6 +26,7 @@
  */
 public class ConstantThroughputTimerBeanInfo extends BeanInfoSupport {
 
+    @SuppressWarnings("EnumOrdinal")
     public ConstantThroughputTimerBeanInfo() {
         super(ConstantThroughputTimer.class);
 
@@ -34,12 +35,12 @@ public ConstantThroughputTimerBeanInfo() {
                 ConstantThroughputTimer.CALC_MODE }); //$NON-NLS-1$
 
         PropertyDescriptor p = property(ConstantThroughputTimer.THROUGHPUT); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0.0);
 
         p = property(ConstantThroughputTimer.CALC_MODE, ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
         p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal());
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE); // must be defined
+        p.setValue(NOT_UNDEFINED, true); // must be defined
     }
 
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
index 624e9d64ddf..3943897f8de 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java
@@ -52,14 +52,14 @@ private static class BarrierWrapper implements Cloneable {
         /**
          *
          */
-        public BarrierWrapper() {
+        private BarrierWrapper() {
             this.barrier = null;
         }
 
         /**
          * @param parties Number of parties
          */
-        public BarrierWrapper(int parties) {
+        private BarrierWrapper(int parties) {
             this.barrier = new CyclicBarrier(parties);
         }
 
@@ -67,7 +67,7 @@ public BarrierWrapper(int parties) {
          * Synchronized is required to ensure CyclicBarrier is initialized only once per Thread Group
          * @param parties Number of parties
          */
-        public synchronized void setup(int parties) {
+        private synchronized void setup(int parties) {
             if(this.barrier== null) {
                 this.barrier = new CyclicBarrier(parties);
             }
@@ -87,7 +87,7 @@ public synchronized void setup(int parties) {
          * @see java.util.concurrent.CyclicBarrier#await()
          */
         @SuppressWarnings("UnusedMethod")
-        public int await() throws InterruptedException, BrokenBarrierException{
+        private int await() throws InterruptedException, BrokenBarrierException{
             return barrier.await();
         }
 
@@ -109,14 +109,14 @@ public int await() throws InterruptedException, BrokenBarrierException{
          *             if the specified time elapses
          * @see java.util.concurrent.CyclicBarrier#await()
          */
-        public int await(long timeout, TimeUnit timeUnit) throws InterruptedException, BrokenBarrierException, TimeoutException {
+        private int await(long timeout, TimeUnit timeUnit) throws InterruptedException, BrokenBarrierException, TimeoutException {
             return barrier.await(timeout, timeUnit);
         }
 
         /**
          * @see java.util.concurrent.CyclicBarrier#reset()
          */
-        public void reset() {
+        private void reset() {
             barrier.reset();
         }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
index a3ae14de62f..cb600bfdf12 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
@@ -29,11 +29,11 @@ public SyncTimerBeanInfo() {
         createPropertyGroup("grouping", new String[] { "groupSize", "timeoutInMs" });
 
         PropertyDescriptor p = property("groupSize");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
 
         p = property("timeoutInMs");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0L);
 
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
index 74100387837..ac633a132a7 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java
@@ -100,8 +100,8 @@ public void generateNext() {
             if (log.isInfoEnabled()) {
                 StringBuilder sb = new StringBuilder();
                 sb.append("Generated ").append(events.position()).append(" timings (");
-                if (this.durationProvider instanceof AbstractTestElement) {
-                    sb.append(((AbstractTestElement) this.durationProvider).getName());
+                if (this.durationProvider instanceof AbstractTestElement abstractTestElement) {
+                    sb.append(abstractTestElement.getName());
                 }
                 sb.append(" ").append(samples).append(" required, rate ").append(throughput)
                         .append(", duration ").append(duration)
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
index 46b7ddf3e14..9d4c82df020 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
@@ -38,15 +38,15 @@ public PreciseThroughputTimerBeanInfo() {
 
         PropertyDescriptor p;
         p = property("throughput"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 100d);
 
         p = property("throughputPeriod"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 3600);
 
         p = property("duration"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 3600L);
 
         createPropertyGroup(
@@ -58,21 +58,21 @@ public PreciseThroughputTimerBeanInfo() {
         );
 
         p = property("batchSize"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 1);
 
         p = property("batchThreadDelay"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
 
 
         p = property("exactLimit"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 10000);
         p.setHidden(true);
 
         p = property("allowedThroughputSurplus"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 1.0d);
         p.setHidden(true);
 
@@ -84,7 +84,7 @@ public PreciseThroughputTimerBeanInfo() {
         );
 
         p = property("randomSeed"); //$NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0L);
     }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java b/src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java
index ea7af9b1dd3..367be81af7b 100644
--- a/src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java
+++ b/src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java
@@ -46,8 +46,7 @@ public ComponentTreeClonerForValidation(boolean honourNoThreadClone) {
     @Override
     protected Object addNodeToTree(Object node) {
         Object clonedNode = super.addNodeToTree(node);
-        if (VALIDATION_TPC_FORCE_100_PERCENT && clonedNode instanceof ThroughputController) {
-            ThroughputController tc = (ThroughputController) clonedNode;
+        if (VALIDATION_TPC_FORCE_100_PERCENT && clonedNode instanceof ThroughputController tc) {
             if(tc.getStyle() == ThroughputController.BYPERCENT) {
                 tc.setPercentThroughput(100);
             }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java
index dedddbd54b5..53ce9fa3239 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java
@@ -141,8 +141,8 @@ public void valueChanged(TreeSelectionEvent e) {
                 AssertionResult[] results = sr.getAssertionResults();
                 CompareAssertionResult result = null;
                 for (AssertionResult r : results) {
-                    if (r instanceof CompareAssertionResult) {
-                        result = (CompareAssertionResult) r;
+                    if (r instanceof CompareAssertionResult compareAssertionResult) {
+                        result = compareAssertionResult;
                         break;
                     }
                 }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
index 474581ad698..8b141defd6a 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
@@ -431,8 +431,7 @@ private static void displayMessage(String message, boolean isError) {
      */
     @Override
     public void stateChanged(ChangeEvent e) {
-        if (e.getSource() instanceof MailerModel) {
-            MailerModel testModel = (MailerModel) e.getSource();
+        if (e.getSource() instanceof MailerModel testModel) {
             updateVisualizer(testModel);
         } else {
             super.stateChanged(e);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
index 77f701984e6..8acc6aca620 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
@@ -84,8 +84,8 @@ public void actionPerformed(ActionEvent e) {
      */
     private void executeAndShowBoundaryExtractorTester(String textToParse) {
         if (StringUtilities.isNotEmpty(textToParse)
-                && this.boundaryExtractorFieldLeft.getText().length() > 0
-                && this.boundaryExtractorFieldRight.getText().length() > 0) {
+                && !this.boundaryExtractorFieldLeft.getText().isEmpty()
+                && !this.boundaryExtractorFieldRight.getText().isEmpty()) {
             this.boundaryExtractorResultField.setText(process(textToParse));
             this.boundaryExtractorResultField.setCaretPosition(0); // go to first line
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
index 73958fc31f2..e635dd3a474 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
@@ -112,7 +112,7 @@ public void actionPerformed(ActionEvent e) {
      */
     private void executeAndShowCssJqueryTester(String textToParse) {
         if (StringUtilities.isNotEmpty(textToParse)
-                && this.cssJqueryField.getText().length() > 0) {
+                && !this.cssJqueryField.getText().isEmpty()) {
             this.cssJqueryResultField.setText(process(textToParse));
             this.cssJqueryResultField.setCaretPosition(0); // go to first line
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
index cd26262a158..34d92cbfaa4 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java
@@ -79,10 +79,8 @@ protected void showRenderedResponse(String response, SampleResult res, boolean e
 
         String html = response.substring(htmlIndex);
 
-        /*
-         * To disable downloading and rendering of images and frames, enable the
-         * editor-kit. The Stream property can then be
-         */
+        // To disable downloading and rendering of images and frames, enable the
+        // editor-kit. The Stream property can then be
         // Must be done before setContentType
         results.setEditorKitForContentType(TEXT_HTML, embedded ? defaultHtmlEditor : customisedEditor);
 
@@ -93,14 +91,12 @@ protected void showRenderedResponse(String response, SampleResult res, boolean e
             // Must be done after setContentType [Why?]
             results.getDocument().putProperty(Document.StreamDescriptionProperty, res.getURL());
         }
-        /*
-         * Get round problems parsing <META http-equiv='content-type'
-         * content='text/html; charset=utf-8'> See
-         * <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=23315">Bug 23315</a>
-         *
-         * Is this due to a bug in Java?
-         */
-        results.getDocument().putProperty("IgnoreCharsetDirective", Boolean.TRUE); // $NON-NLS-1$
+        // Get round problems parsing <META http-equiv='content-type'
+        // content='text/html; charset=utf-8'> See
+        // <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=23315">Bug 23315</a>
+        //
+        // Is this due to a bug in Java?
+        results.getDocument().putProperty("IgnoreCharsetDirective", true); // $NON-NLS-1$
 
         try {
             results.setText(html); // Bug can generate RTE
@@ -130,7 +126,7 @@ public ViewFactory getViewFactory() {
         }
 
         private static class LocalHTMLFactory extends javax.swing.text.html.HTMLEditorKit.HTMLFactory {
-            /*
+            /**
              * Provide dummy implementations to suppress download and display of
              * related resources: - FRAMEs - IMAGEs TODO create better dummy
              * displays TODO suppress LINK somehow
@@ -138,8 +134,7 @@ private static class LocalHTMLFactory extends javax.swing.text.html.HTMLEditorKi
             @Override
             public View create(Element elem) {
                 Object o = elem.getAttributes().getAttribute(StyleConstants.NameAttribute);
-                if (o instanceof HTML.Tag) {
-                    HTML.Tag kind = (HTML.Tag) o;
+                if (o instanceof HTML.Tag kind) {
                     if (kind == HTML.Tag.FRAME) {
                         return new ComponentView(elem);
                     } else if (kind == HTML.Tag.IMG) {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
index a94e4ee43a2..470ba982b15 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java
@@ -69,11 +69,11 @@ public static String prettyJSON(String json, String tabSeparator) {
         try {
             Object o = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE)
                     .parse(json);
-            if (o instanceof JSONObject) {
-                return ((JSONObject) o)
+            if (o instanceof JSONObject jsonObject) {
+                return jsonObject
                         .toJSONString(new PrettyJSONStyle(tabSeparator));
-            } else if (o instanceof JSONArray) {
-                return ((JSONArray) o)
+            } else if (o instanceof JSONArray objects) {
+                return objects
                         .toJSONString(new PrettyJSONStyle(tabSeparator));
             }
         } catch (ParseException e) {
@@ -92,7 +92,7 @@ private static class PrettyJSONStyle extends JSONStyle {
         private int level = 0;
         private final String indentString;
 
-        public PrettyJSONStyle(String indentString) {
+        private PrettyJSONStyle(String indentString) {
             this.indentString = indentString;
         }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
index 22ca4d8c8f3..a278369070d 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java
@@ -163,26 +163,23 @@ private static void applyToChildren(TreePath parent, Consumer<? super TreePath>
         }
     }
 
-    /*
-     *
+    /**
      * A Dom tree panel for to display response as tree view author <a
      * href="mailto:d.maung@mdl.com">Dave Maung</a>
      * TODO implement to find any nodes in the tree using TreePath.
-     *
      */
     private static class DOMTreePanel extends JPanel implements MouseListener {
 
         private static final long serialVersionUID = 6871690021183779153L;
 
-        private JTree domJTree;
         private ExpandPopupMenu popupMenu;
 
-        public DOMTreePanel(org.w3c.dom.Document document) {
+        private DOMTreePanel(org.w3c.dom.Document document) {
             super(new GridLayout(1, 0));
             try {
                 Node firstElement = getFirstElement(document);
                 DefaultMutableTreeNode top = new XMLDefaultMutableTreeNode(firstElement);
-                domJTree = new JTree(top);
+                JTree domJTree = new JTree(top);
                 domJTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
                 domJTree.setShowsRootHandles(true);
                 domJTree.addMouseListener(this);
@@ -252,7 +249,12 @@ private static String getHTML(String str, String separator, int maxChar) {
                     if (i % maxChar == 0 && i != 0) {
                         strBuf.append(separator);
                     }
-                    strBuf.append(encode(chars[i]));
+                    String encoded = encode(chars[i]);
+                    if (encoded != null) {
+                        strBuf.append(encoded);
+                    } else {
+                        strBuf.append(chars[i]);
+                    }
 
                 }
                 strBuf.append("</b></body></html>"); // $NON-NLS-1$
@@ -261,26 +263,13 @@ private static String getHTML(String str, String separator, int maxChar) {
             }
 
             private static String encode(char c) {
-                String toReturn = String.valueOf(c);
-                switch (c) {
-                    case '<': // $NON-NLS-1$
-                        toReturn = "&lt;"; // $NON-NLS-1$
-                        break;
-                    case '>': // $NON-NLS-1$
-                        toReturn = "&gt;"; // $NON-NLS-1$
-                        break;
-                    case '\'': // $NON-NLS-1$
-                        toReturn = "&apos;"; // $NON-NLS-1$
-                        break;
-                    case '\"': // $NON-NLS-1$
-                        toReturn = "&quot;"; // $NON-NLS-1$
-                        break;
-                    default:
-                        // ignored
-                        break;
-
-                }
-                return toReturn;
+                return switch (c) {
+                    case '<' -> "&lt;"; // $NON-NLS-1$
+                    case '>' -> "&gt;"; // $NON-NLS-1$
+                    case '\'' -> "&apos;"; // $NON-NLS-1$
+                    case '\"' -> "&quot;"; // $NON-NLS-1$
+                    default -> null;
+                };
             }
         }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
index 715e504d2cd..4fa0689a416 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java
@@ -127,7 +127,7 @@ public void actionPerformed(ActionEvent e) {
      */
     private void executeAndShowXPathTester(String textToParse, XPathExtractor extractor) {
         if (StringUtilities.isNotEmpty(textToParse)
-                && this.xpathExpressionField.getText().length() > 0) {
+                && !this.xpathExpressionField.getText().isEmpty()) {
             this.xpathResultField.setText(process(textToParse, extractor));
             this.xpathResultField.setCaretPosition(0); // go to first line
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
index 9d11aced478..432d70398ec 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java
@@ -122,7 +122,7 @@ else if (XPATH_NAMESPACES_COMMAND.equals(command)) {
      */
     private void executeAndShowXPathTester(String textToParse, XPath2Extractor extractor) {
         if (StringUtilities.isNotEmpty(textToParse)
-                && this.xpathExpressionField.getText().length() > 0) {
+                && !this.xpathExpressionField.getText().isEmpty()) {
             this.xpathResultField.setText(process(textToParse, extractor));
             this.xpathResultField.setCaretPosition(0); // go to first line
         }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
index 4f3d71cb7d5..2656051b3c6 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java
@@ -151,9 +151,6 @@ public String toString() {
         return JMeterUtils.getResString("view_results_render_browser"); // $NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.SamplerResultTab#clearData()
-     */
     @Override
     public void clearData() {
         super.clearData();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
index b0caf1d5629..6cdb3cfaa06 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java
@@ -48,9 +48,6 @@ public class RequestViewRaw implements RequestView {
 
     private JPanel paneRaw; /** request pane content */
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#init()
-     */
     @Override
     public void init() {
         paneRaw = new JPanel(new BorderLayout(0, 5));
@@ -78,22 +75,15 @@ public void init() {
 
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#clearData()
-     */
     @Override
     public void clearData() {
         sampleDataField.setInitialText(""); //$NON-NLS-1$
         headerData.setInitialText(""); //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#setSamplerResult(java.lang.Object)
-     */
     @Override
     public void setSamplerResult(Object objectResult) {
-        if (objectResult instanceof SampleResult) {
-            SampleResult sampleResult = (SampleResult) objectResult;
+        if (objectResult instanceof SampleResult sampleResult) {
             // Don't display Request headers label if rh is null or empty
             String rh = sampleResult.getRequestHeaders();
             if (StringUtilities.isNotEmpty(rh)) {
@@ -112,17 +102,11 @@ public void setSamplerResult(Object objectResult) {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#getPanel()
-     */
     @Override
     public JPanel getPanel() {
         return paneRaw;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#getLabel()
-     */
     @Override
     public String getLabel() {
         return JMeterUtils.getResString(KEY_LABEL);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
index fec8117dbd8..5ad6429bd0f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java
@@ -285,7 +285,7 @@ private void drawSample(String _title, String[] _xAxisLabels,
         double max = maxYAxisScale > 0 ? maxYAxisScale : getTopValue(findMax(_data), RoundingMode.UP); // define max scale y axis
         try {
             // if the title graph is empty, we can assume some default
-            if (_title.length() == 0 ) {
+            if (_title.isEmpty()) {
                 _title = JMeterUtils.getResString("graph_resp_time_title"); //$NON-NLS-1$
             }
             this.setPreferredSize(new Dimension(_width,_height));
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index e0d4cf91d08..bb0b23b3d77 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -348,16 +348,16 @@ public void makeGraph() {
         if (!dynamicGraphSize.isSelected()) {
             String wstr = graphWidth.getText();
             String hstr = graphHeight.getText();
-            if (wstr.length() != 0) {
+            if (!wstr.isEmpty()) {
                 width = Integer.parseInt(wstr);
             }
-            if (hstr.length() != 0) {
+            if (!hstr.isEmpty()) {
                 height = Integer.parseInt(hstr);
             }
         }
 
         String yAxisStr = maxValueYAxisLabel.getText();
-        int maxYAxisScale = yAxisStr.length() == 0 ? 0 : Integer.parseInt(yAxisStr);
+        int maxYAxisScale = yAxisStr.isEmpty() ? 0 : Integer.parseInt(yAxisStr);
 
         graphPanel.setData(this.getData());
         graphPanel.setTitle(graphTitle.getText());
@@ -538,7 +538,7 @@ public void actionPerformed(ActionEvent event) {
                 intervalValue = Integer.parseInt(intervalField.getText());
             }
             if (eventSource == applyFilterBtn && samplerSelection.isSelected() && samplerMatchLabel.getText() != null
-                    && samplerMatchLabel.getText().length() > 0) {
+                    && !samplerMatchLabel.getText().isEmpty()) {
                 pattern = createPattern(samplerMatchLabel.getText());
             } else if (forceReloadData) {
                 pattern = null;
@@ -742,7 +742,7 @@ private Color[] getLinesColors() {
     private int getIncrScaleYAxis() {
         int incrYAxisScale = 0;
         String iyas = incrScaleYAxis.getText();
-        if (iyas.length() != 0) {
+        if (!iyas.isEmpty()) {
             incrYAxisScale = Integer.parseInt(iyas);
         }
         return incrYAxisScale;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 90819ac6c45..edb81c9cdf8 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -251,8 +251,8 @@ public void setupTabPane() {
         this.clearData();
         StyledDocument statsDoc = stats.getStyledDocument();
         try {
-            if (userObject instanceof SampleResult) {
-                sampleResult = (SampleResult) userObject;
+            if (userObject instanceof SampleResult sampleResult1) {
+                sampleResult = sampleResult1;
                 // We are displaying a SampleResult
                 setupTabPaneForSampleResult();
                 requestPanel.setSamplerResult(sampleResult);
@@ -326,20 +326,12 @@ public void setupTabPane() {
                     }
                 }
 
-                Style style = null;
-                switch (responseLevel) {
-                case 3:
-                    style = statsDoc.getStyle(STYLE_REDIRECT);
-                    break;
-                case 4:
-                    style = statsDoc.getStyle(STYLE_CLIENT_ERROR);
-                    break;
-                case 5:
-                    style = statsDoc.getStyle(STYLE_SERVER_ERROR);
-                    break;
-                default: // quieten Findbugs
-                    break; // default - do nothing
-                }
+                Style style = switch (responseLevel) {
+                    case 3 -> statsDoc.getStyle(STYLE_REDIRECT);
+                    case 4 -> statsDoc.getStyle(STYLE_CLIENT_ERROR);
+                    case 5 -> statsDoc.getStyle(STYLE_SERVER_ERROR);
+                    default -> null;
+                };
 
                 statsBuff.append(JMeterUtils.getResString("view_results_response_code")).append(responseCode).append(NL); //$NON-NLS-1$
                 statsDoc.insertString(statsDoc.getLength(), statsBuff.toString(), style);
@@ -434,8 +426,8 @@ public void setupTabPane() {
                     searchTextExtension.resetTextToFind();
                 }
 
-            } else if (userObject instanceof AssertionResult) {
-                assertionResult = (AssertionResult) userObject;
+            } else if (userObject instanceof AssertionResult result) {
+                assertionResult = result;
 
                 // We are displaying an AssertionResult
                 setupTabPaneForAssertionResult();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
index ffaab0e89b8..702daa6b9f3 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
@@ -271,7 +271,7 @@ public void resetTextToFind() {
         @Override
         public boolean executeAndShowTextFind(Pattern pattern) {
             boolean found = false;
-            if (results != null && results.getText().length() > 0
+            if (results != null && !results.getText().isEmpty()
                     && pattern != null) {
 
                 log.debug("lastPosition={}", lastPosition);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
index 14e4c7dea03..70422194e0c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java
@@ -184,8 +184,8 @@ private static boolean searchInNode(Searcher searcher, SearchableTreeNode node)
 
         try {
             Searchable searchable;
-            if(userObject instanceof Searchable) {
-                searchable = (Searchable) userObject;
+            if(userObject instanceof Searchable searchable1) {
+                searchable = searchable1;
             } else {
                 return false;
             }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 32703f1517b..44aa4a038a7 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -590,20 +590,20 @@ public void makeGraph() {
         if (!dynamicGraphSize.isSelected()) {
             String wstr = graphWidth.getText();
             String hstr = graphHeight.getText();
-            if (wstr.length() != 0) {
+            if (!wstr.isEmpty()) {
                 width = Integer.parseInt(wstr);
             }
-            if (hstr.length() != 0) {
+            if (!hstr.isEmpty()) {
                 height = Integer.parseInt(hstr);
             }
         }
 
-        if (lstr.length() == 0) {
+        if (lstr.isEmpty()) {
             lstr = "20";//$NON-NLS-1$
         }
         int maxLength = Integer.parseInt(lstr);
         String yAxisStr = maxValueYAxisLabel.getText();
-        int maxYAxisScale = yAxisStr.length() == 0 ? 0 : Integer.parseInt(yAxisStr);
+        int maxYAxisScale = yAxisStr.isEmpty() ? 0 : Integer.parseInt(yAxisStr);
 
         graphPanel.setData(this.getData());
         graphPanel.setTitle(graphTitle.getText());
@@ -776,19 +776,18 @@ public void actionPerformed(ActionEvent event) {
         // Not 'else if' because forceReloadData
         if (eventSource == applyFilterBtn || forceReloadData) {
             if (columnSelection.isSelected() && columnMatchLabel.getText() != null
-                    && columnMatchLabel.getText().length() > 0) {
+                    && !columnMatchLabel.getText().isEmpty()) {
                 pattern = createPattern(columnMatchLabel.getText());
             } else if (forceReloadData) {
                 pattern = null;
             }
-            if (getFile() != null && getFile().length() > 0) {
+            if (getFile() != null && !getFile().isEmpty()) {
                 clearData();
                 FilePanel filePanel = (FilePanel) getFilePanel();
                 filePanel.actionPerformed(event);
             }
-        } else if (eventSource instanceof JButton) {
+        } else if (eventSource instanceof JButton btn) {
             // Changing color for column
-            JButton btn = (JButton) eventSource;
             if (btn.getName() != null) {
                 try {
                     BarGraph bar = eltList.get(Integer.parseInt(btn.getName()));
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
index 50dac1af032..eafeb9fd648 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java
@@ -122,9 +122,7 @@ public void add(final SampleResult res) {
                     return newRow;
                 });
         synchronized (row) {
-            /*
-             * Synch is needed because multiple threads can update the counts.
-             */
+            // Synch is needed because multiple threads can update the counts.
             row.addSample(res);
         }
         SamplingStatCalculator tot = tableRows.get(TOTAL_ROW_LABEL);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java
index c154e5d2c77..97569935c40 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java
@@ -57,9 +57,9 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
             boolean leaf, int row, boolean focus) {
         super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, focus);
         Object obj = ((DefaultMutableTreeNode) value).getUserObject();
-        if(obj instanceof SampleResult)
+        if(obj instanceof SampleResult sampleResult)
         {
-            if (!((SampleResult) obj).isSuccessful()) {
+            if (!sampleResult.isSuccessful()) {
                 this.setForeground(UIManager.getColor(JMeterUIDefaults.LABEL_ERROR_FOREGROUND));
                 this.setIcon(imageFailure);
             } else {
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 4c5f70aa28c..5f74df6b34d 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -394,8 +394,7 @@ private void valueChanged(TreeSelectionEvent e, boolean forceRendering) {
             resultsRender.setSamplerResult(userObject);
             resultsRender.setupTabPane(); // Processes Assertions
             // display a SampleResult
-            if (userObject instanceof SampleResult) {
-                SampleResult sampleResult = (SampleResult) userObject;
+            if (userObject instanceof SampleResult sampleResult) {
                 if (isTextDataType(sampleResult)){
                     resultsRender.renderResult(sampleResult);
                 } else {
@@ -457,7 +456,7 @@ private Component createComboRender() {
 
         // if no results render in jmeter.properties, load Standard (default)
         String defaultRenderer = expandToClassname(".RenderAsText"); // $NON-NLS-1$
-        if (VIEWERS_ORDER.length() > 0) {
+        if (!VIEWERS_ORDER.isEmpty()) {
             defaultRenderer = expandToClassname(VIEWERS_ORDER.split(",", 2)[0]);
         }
         ResultRenderer defaultObject = null;
@@ -475,7 +474,7 @@ private Component createComboRender() {
             renderer.setBackgroundColor(getBackground());
             map.put(renderer.getClass().getName(), renderer);
         }
-        if (VIEWERS_ORDER.length() > 0) {
+        if (!VIEWERS_ORDER.isEmpty()) {
             Arrays.stream(VIEWERS_ORDER.split(","))
                     .map(ViewResultsFullVisualizer::expandToClassname)
                     .forEach(key -> {
@@ -584,10 +583,9 @@ public Component getTreeCellRendererComponent(JTree tree, Object value,
             super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, focus);
             boolean failure = true;
             Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
-            if (userObject instanceof SampleResult) {
-                failure = !((SampleResult) userObject).isSuccessful();
-            } else if (userObject instanceof AssertionResult) {
-                AssertionResult assertion = (AssertionResult) userObject;
+            if (userObject instanceof SampleResult sampleResult) {
+                failure = !sampleResult.isSuccessful();
+            } else if (userObject instanceof AssertionResult assertion) {
                 failure = assertion.isError() || assertion.isFailure();
             }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
index 8858d3bb1e7..68509af072c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
@@ -89,25 +89,13 @@ private void initRoot(Node xmlRoot) throws SAXException {
     private static void initNode(Node node, XMLDefaultMutableTreeNode mTreeNode) throws SAXException {
 
         switch (node.getNodeType()) {
-        case Node.ELEMENT_NODE:
-            initElementNode(node, mTreeNode);
-            break;
-
-        case Node.TEXT_NODE:
-            initTextNode((Text) node, mTreeNode);
-            break;
-
-        case Node.CDATA_SECTION_NODE:
-            initCDATASectionNode((CDATASection) node, mTreeNode);
-            break;
-        case Node.COMMENT_NODE:
-            initCommentNode((Comment) node, mTreeNode);
-            break;
-
-        default:
+            case Node.ELEMENT_NODE -> initElementNode(node, mTreeNode);
+            case Node.TEXT_NODE -> initTextNode((Text) node, mTreeNode);
+            case Node.CDATA_SECTION_NODE -> initCDATASectionNode((CDATASection) node, mTreeNode);
+            case Node.COMMENT_NODE -> initCommentNode((Comment) node, mTreeNode);
+            default -> {
+            }
             // if other node type, we will just skip it
-            break;
-
         }
 
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java
index 4842f923ba2..fe6291c406f 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java
@@ -94,7 +94,7 @@ private static final class ListenerClientData {
     // Create unique object as marker for end of queue
     private static final transient SampleResult FINAL_SAMPLE_RESULT = new SampleResult();
 
-    /*
+    /**
      * This is needed for distributed testing where there is 1 instance
      * per server. But we need the total to be shared.
      */
@@ -111,7 +111,7 @@ public BackendListener() {
         setArguments(new Arguments());
     }
 
-    /*
+    /**
      * Ensure that the required class variables are cloned,
      * as this is not currently done by the super-implementation.
      */
@@ -205,7 +205,11 @@ public void run() {
                         }
                         // try to process as many as possible
                         // The == comparison is not a mistake
-                        while (!(endOfLoop = sampleResult == FINAL_SAMPLE_RESULT) && sampleResult != null) {
+                        while (sampleResult != null) {
+                            endOfLoop = sampleResult == FINAL_SAMPLE_RESULT;
+                            if (endOfLoop) {
+                                break;
+                            }
                             sampleResults.add(sampleResult);
                             if (isDebugEnabled) {
                                 log.debug("Thread: {} polling from queue: {}", Thread.currentThread().getName(),
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
index 0a7f3337ba2..32e0c2c95ae 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
@@ -296,9 +296,6 @@ public void modifyTestElement(TestElement config) {
         backendListener.setQueueSize(queueSize.getText());
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.AbstractJMeterGuiComponent#clearGui()
-     */
     @Override
     public void clearGui() {
         super.clearGui();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
index 9ae7694998e..a0ec17467d5 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
@@ -79,11 +79,10 @@ public String getResponseMessage() {
 
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ErrorMetric)) {
+        if (!(other instanceof ErrorMetric otherError)) {
             return false;
         }
 
-        ErrorMetric otherError = (ErrorMetric) other;
         return getResponseCode().equalsIgnoreCase(otherError.getResponseCode())
                 && getResponseMessage().equalsIgnoreCase(otherError.getResponseMessage());
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
index 99267ae9379..0069c885edd 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
@@ -92,13 +92,6 @@ List<MetricTuple> getMetrics() {
         return metrics;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#
-     * addMetric(long, java.lang.String, java.lang.String, java.lang.String)
-     */
     @Override
     public void addMetric(long timestamp, String contextName, String metricName, String metricValue) {
         String name = prefix + contextName + "." + metricName;
@@ -107,9 +100,6 @@ public void addMetric(long timestamp, String contextName, String metricName, Str
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#writeAndSendMetrics()
-     */
     @Override
     public void writeAndSendMetrics() {
         final List<MetricTuple> currentMetrics;
@@ -157,9 +147,6 @@ private void writeMetrics(List<MetricTuple> currentMetrics) {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#destroy()
-     */
     @Override
     public void destroy() {
         socketOutputStreamPool.close();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
index a653fe51d1e..362303067ca 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
@@ -76,9 +76,6 @@ List<MetricTuple> getMetrics() {
         return metrics;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#addMetric(long, java.lang.String, java.lang.String, java.lang.String)
-     */
     @Override
     public void addMetric(long timestamp, String contextName, String metricName, String metricValue) {
         String name = prefix + contextName + "." + metricName;
@@ -87,9 +84,6 @@ public void addMetric(long timestamp, String contextName, String metricName, Str
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#writeAndSendMetrics()
-     */
     @Override
     public void writeAndSendMetrics() {
         final List<MetricTuple> currentMetrics;
@@ -137,9 +131,6 @@ private void writeMetrics(List<MetricTuple> currentMetrics) {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#destroy()
-     */
     @Override
     public void destroy() {
         socketOutputStreamPool.close();
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
index 6e2c2e25d4b..3cd55edd3e4 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
@@ -197,12 +197,10 @@ private void writeAndSendMetrics(List<MetricTuple> copyMetrics) {
                 @Override
                 public void completed(final HttpResponse response) {
                     int code = response.getStatusLine().getStatusCode();
-                    /*
-                     * If your write request received HTTP
-                     * 204 No Content: it was a success!
-                     * 4xx: InfluxDB could not understand the request.
-                     * 5xx: The system is overloaded or significantly impaired.
-                     */
+                    // If your write request received HTTP
+                    // 204 No Content: it was a success!
+                    // 4xx: InfluxDB could not understand the request.
+                    // 5xx: The system is overloaded or significantly impaired.
                     if (MetricUtils.isSuccessCode(code)) {
                         if (log.isDebugEnabled()) {
                             log.debug("Success, number of metrics written: {}", copyMetrics.size());
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
index 28215b65d4a..6fcc2db9716 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java
@@ -37,7 +37,11 @@ public class SizeAssertionTest extends JMeterTestCase {
     private SampleResult sample0;
     private SampleResult sample1;
     private AssertionResult result;
-    private final String data1 = "response Data\n" + "line 2\n\nEOF";
+    private final String data1 = """
+            response Data
+            line 2
+
+            EOF""";
     private final int data1Len = data1.length();
 
     @BeforeEach
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
index 59e442aa68f..f39fe6d08d5 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java
@@ -319,19 +319,20 @@ void testGetResult_match_msg_problem() {
     @Test
     void testGetResult_match_msg_problem2() {
         SampleResult samplerResult = new SampleResult();
-        String str = "{\n" +
-                " \"code\":200,\n" +
-                " \"contact\":{\n" +
-                "   \"id\":28071,\n" +
-                "   \"description\":\"test description\",\n" +
-                "   \"info\":{\n" +
-                "       \"ngn_number\":[\n" +
-                "           \"2003\",\n" +
-                "           \"2004\"\n" +
-                "       ]\n" +
-                "   }\n" +
-                " }\n" +
-                "}";
+        String str = """
+                {
+                 "code":200,
+                 "contact":{
+                   "id":28071,
+                   "description":"test description",
+                   "info":{
+                       "ngn_number":[
+                           "2003",
+                           "2004"
+                       ]
+                   }
+                 }
+                }""";
         samplerResult.setResponseData(str.getBytes(Charset.defaultCharset()));
 
         JSONPathAssertion instance = new JSONPathAssertion();
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
index 62e60b56306..a3e6500d4f1 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
@@ -52,7 +52,7 @@ public void setUp() throws Exception {
         jmctx.setPreviousResult(result);
     }
 
-    private ByteArrayOutputStream readBA(String name) throws IOException {
+    private static ByteArrayOutputStream readBA(String name) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
         try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)))) {
             int len = 0;
@@ -64,7 +64,7 @@ private ByteArrayOutputStream readBA(String name) throws IOException {
         return baos;
     }
 
-    private byte[] readFile(String name) throws IOException {
+    private static byte[] readFile(String name) throws IOException {
         try (ByteArrayOutputStream baos = readBA(name)) {
             return baos.toByteArray();
         }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
index 14538a1281b..a33e4ba8f42 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
@@ -67,7 +67,7 @@ private void setAlternateResponseData(){
         result.setResponseData(data, null);
     }
 
-    private ByteArrayOutputStream readBA(String name) throws IOException {
+    private static ByteArrayOutputStream readBA(String name) throws IOException {
         BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
         int len = 0;
@@ -79,7 +79,7 @@ private ByteArrayOutputStream readBA(String name) throws IOException {
         return baos;
     }
 
-    private byte[] readFile(String name) throws IOException {
+    private static byte[] readFile(String name) throws IOException {
         return readBA(name).toByteArray();
     }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
index dfdd4664654..bc35a1c5058 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
@@ -40,8 +40,11 @@ public class XmlAssertionTest extends JMeterTestCase {
             + "Don't forget me this weekend!</body></note1>";
     private static final String VALID_XML = "<note><to>Tove</to><from>Jani</from><heading>Reminder</heading><body>Don't forget me this weekend!</body></note>";
     private static final String NO_XML = "response Data";
-    private static final String UNSECURE_XML = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" + "<!DOCTYPE foo [\n"
-            + "   <!ENTITY xxe SYSTEM \"file:///etc/passwd\" > ]>\n" + "<foo>&xxe;</foo>";
+    private static final String UNSECURE_XML = """
+            <?xml version="1.0" encoding="ISO-8859-1"?>
+            <!DOCTYPE foo [
+               <!ENTITY xxe SYSTEM "file:///etc/passwd" > ]>
+            <foo>&xxe;</foo>""";
 
     @BeforeEach
     public void setUp() {
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
index a5025d00191..0a87cccbdb6 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
@@ -125,11 +125,23 @@ private static Stream<Arguments> data() {
                         ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, "", ResultType.FAILURE,
                         AssertionResult.RESPONSE_WAS_NULL),
                 Arguments.of(InvertType.USE_NO_INVERT,
-                        "{\n" + "  \"reservations\": [\n" + "    {\n" + "      \"instances\": [\n"
-                                + "        {\"state\": \"running\"},\n" + "        {\"state\": \"stopped\"}\n"
-                                + "      ]\n" + "    },\n" + "    {\n" + "      \"instances\": [\n"
-                                + "        {\"state\": \"terminated\"},\n" + "        {\"state\": \"running\"}\n"
-                                + "      ]\n" + "    }\n" + "  ]\n" + "}",
+                        """
+                                {
+                                  "reservations": [
+                                    {
+                                      "instances": [
+                                        {"state": "running"},
+                                        {"state": "stopped"}
+                                      ]
+                                    },
+                                    {
+                                      "instances": [
+                                        {"state": "terminated"},
+                                        {"state": "running"}
+                                      ]
+                                    }
+                                  ]
+                                }""",
                         "reservations[*].instances[*].state", ValidationType.USE_VALIDATION,
                         ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL,
                         "[[\"running\",\"stopped\"],[\"terminated\",\"running\"]]", ResultType.SUCCESS, ""),
diff --git a/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java b/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
index 2edad0ab847..174a02aa50b 100644
--- a/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
+++ b/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java
@@ -208,7 +208,7 @@ public void testHeaderQuotes(){
         }
     }
 
-    private CSVDataSet initCSV(){
+    private static CSVDataSet initCSV(){
         CSVDataSet csv = new CSVDataSet();
         csv.setFilename(findTestPath("testfiles/unit/TestCVSDataSet.csv"));
         csv.setVariableNames("a,b,c");
diff --git a/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java b/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
index 2e1a877dca5..e630109f639 100644
--- a/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
+++ b/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java
@@ -50,7 +50,7 @@ private void setLastSampleStatus(boolean status) {
         jmvars.put(JMeterThread.LAST_SAMPLE_OK, Boolean.toString(status));
     }
 
-    private void setRunning(TestElement el) {
+    private static void setRunning(TestElement el) {
         PropertyIterator pi = el.propertyIterator();
         while (pi.hasNext()) {
             pi.next().setRunningVersion(true);
@@ -58,7 +58,7 @@ private void setRunning(TestElement el) {
     }
 
     // Get next sample and its name
-    private String nextName(GenericController c) {
+    private static String nextName(GenericController c) {
         Sampler s = c.next();
         if (s == null) {
             return null;
@@ -154,7 +154,7 @@ public void testBlankPrevFailed() throws Exception {
         assertNull(nextName(controller));
     }
 
-    /*
+    /**
      * Generic Controller
      * - before
      * - While Controller ${VAR}
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
index 4e39a7889e5..d04385f1a8e 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java
@@ -48,13 +48,14 @@ public void setUp() {
         extractor.setThreadContext(jmctx);
         extractor.setRefName("regVal");
         result = new SampleResult();
-        String data = "<company-xmlext-query-ret><row><value field=\"RetCode\">LIS_OK</value>\n" +
-                "<value field=\"RetCodeExtension\"></value><value field=\"alias\"></value>\n" +
-                "<value field=\"positioncount\"></value><value field=\"invalidpincount\">0</value>\n" +
-                "<value field=\"pinposition1\">1</value><value field=\"pinpositionvalue1\"></value>\n" +
-                "<value field=\"pinposition2\">5</value><value field=\"pinpositionvalue2\"></value>\n" +
-                "<value field=\"pinposition3\">6</value><value field=\"pinpositionvalue3\"></value>\n" +
-                "</row></company-xmlext-query-ret>";
+        String data = """
+                <company-xmlext-query-ret><row><value field="RetCode">LIS_OK</value>
+                <value field="RetCodeExtension"></value><value field="alias"></value>
+                <value field="positioncount"></value><value field="invalidpincount">0</value>
+                <value field="pinposition1">1</value><value field="pinpositionvalue1"></value>
+                <value field="pinposition2">5</value><value field="pinpositionvalue2"></value>
+                <value field="pinposition3">6</value><value field="pinpositionvalue3"></value>
+                </row></company-xmlext-query-ret>""";
         result.setResponseData(data, null);
         result.setResponseHeaders("Header1: Value1\nHeader2: Value2");
         result.setResponseCode("abcd");
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
index 9cf66000d5c..15ebb4ed259 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
@@ -317,7 +317,7 @@ public void testInvalidDocument() throws Exception {
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
 
-    private void assertContains(String value, String substring, String message) {
+    private static void assertContains(String value, String substring, String message) {
         assertTrue(value.contains(substring), () -> message + ": " + value + " should contain " + substring);
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
index 0cce79b990d..2a063f68344 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
@@ -72,10 +72,16 @@ private static Stream<Arguments> dataOneMatch() {
         return Stream.of(
             Arguments.of("[\"one\"]", "[*]", "one", "1"),
             Arguments.of("{\"a\": {\"b\": {\"c\": {\"d\": \"value\"}}}}", "a.b.c.d", "value", "1"),
-            Arguments.of("{\r\n" + "  \"people\": [\r\n" + "    {\"first\": \"James\", \"last\": \"d\"},\r\n"
-                    + "    {\"first\": \"Jacob\", \"last\": \"e\"},\r\n"
-                    + "    {\"first\": \"Jayden\", \"last\": \"f\"},\r\n" + "    {\"missing\": \"different\"}\r\n"
-                    + "  ],\r\n" + "  \"foo\": {\"bar\": \"baz\"}\r\n" + "}", "people[2]",
+            Arguments.of("""
+                            {\r
+                              "people": [\r
+                                {"first": "James", "last": "d"},\r
+                                {"first": "Jacob", "last": "e"},\r
+                                {"first": "Jayden", "last": "f"},\r
+                                {"missing": "different"}\r
+                              ],\r
+                              "foo": {"bar": "baz"}\r
+                            }""", "people[2]",
                     "{\"first\":\"Jayden\",\"last\":\"f\"}",
                     "1")
         );
@@ -93,7 +99,7 @@ void testOneFromSampleResult(String data, String jmesPath, String expectedResult
         testOneMatchOnAllExtractedValues(false, data, jmesPath, expectedResult, expectedMatchNumber);
     }
 
-    private void testOneMatchOnAllExtractedValues(boolean fromVars, String data, String jmesPath, String expectedResult, String expectedMatchNumber) {
+    private static void testOneMatchOnAllExtractedValues(boolean fromVars, String data, String jmesPath, String expectedResult, String expectedMatchNumber) {
         JMeterVariables vars = new JMeterVariables();
         SampleResult sampleResult = new SampleResult();
         JMESPathExtractor processor = setupProcessor(vars, sampleResult, data, fromVars, "-1");
@@ -112,10 +118,16 @@ private static Stream<Arguments> dataMultipleMatches() {
         return Stream.of(
             Arguments.of("[\"one\", \"two\"]", "[*]", new String[] {"one", "two"}, "2"),
             Arguments.of("[\"a\", \"b\", \"c\", \"d\", \"e\", \"f\"]", "[0:3]", new String[] {"a", "b","c"}, "3"),
-            Arguments.of("{\r\n" + "  \"people\": [\r\n" + "    {\"first\": \"James\", \"last\": \"d\"},\r\n"
-                    + "    {\"first\": \"Jacob\", \"last\": \"e\"},\r\n"
-                    + "    {\"first\": \"Jayden\", \"last\": \"f\"},\r\n" + "    {\"missing\": \"different\"}\r\n"
-                    + "  ],\r\n" + "  \"foo\": {\"bar\": \"baz\"}\r\n" + "}", "people[:2].first", new String[] {"James", "Jacob"}, "2")
+            Arguments.of("""
+                    {\r
+                      "people": [\r
+                        {"first": "James", "last": "d"},\r
+                        {"first": "Jacob", "last": "e"},\r
+                        {"first": "Jayden", "last": "f"},\r
+                        {"missing": "different"}\r
+                      ],\r
+                      "foo": {"bar": "baz"}\r
+                    }""", "people[:2].first", new String[] {"James", "Jacob"}, "2")
         );
     }
 
@@ -131,7 +143,7 @@ void testMultipleMatchesOnAllExtractedValuesFromSampleResult(String data, String
         testMultipleMatchesOnAllExtractedValues(false, data, jmesPath, expectedResults, expectedMatchNumber);
     }
 
-    private void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String data, String jmesPath, String[] expectedResults, String expectedMatchNumber) {
+    private static void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String data, String jmesPath, String[] expectedResults, String expectedMatchNumber) {
         SampleResult sampleResult = new SampleResult();
         JMeterVariables vars = new JMeterVariables();
         JMESPathExtractor processor = setupProcessor(vars, sampleResult, data, fromVars, "-1");
@@ -145,11 +157,16 @@ private void testMultipleMatchesOnAllExtractedValues(boolean fromVars, String da
         assertEquals(expectedMatchNumber, vars.get(REFERENCE_NAME_MATCH_NUMBER));
     }
 
-    private static final String TEST_DATA = "{\r\n" + "  \"people\": [\r\n" + "    {\"first\": \"James\", \"last\": \"d\", \"age\":10},\r\n"
-            + "    {\"first\": \"Jacob\", \"last\": \"e\", \"age\":20},\r\n"
-            + "    {\"first\": \"Jayden\", \"last\": \"f\", \"age\":30},\r\n"
-            + "    {\"missing\": \"different\"}\r\n" + "  ],\r\n" + "  \"foo\": {\"bar\": \"baz\"}\r\n"
-            + "}";
+    private static final String TEST_DATA = """
+            {\r
+              "people": [\r
+                {"first": "James", "last": "d", "age":10},\r
+                {"first": "Jacob", "last": "e", "age":20},\r
+                {"first": "Jayden", "last": "f", "age":30},\r
+                {"missing": "different"}\r
+              ],\r
+              "foo": {"bar": "baz"}\r
+            }""";
 
     private static Stream<Arguments> dataMatchNumberMoreThanZero() {
         return Stream.of(
@@ -175,8 +192,8 @@ void testFromSampleResult(String data, String jmesPath,
         testMatchNumberMoreThanZeroOn1ExtractedValue(false, data, jmesPath, matchNumber, expectedResult, expectedMatchNumber);
     }
 
-    private void testMatchNumberMoreThanZeroOn1ExtractedValue(boolean fromVars, String data, String jmesPath,
-            String matchNumber, String expectedResult, String expectedMatchNumber) {
+    private static void testMatchNumberMoreThanZeroOn1ExtractedValue(boolean fromVars, String data, String jmesPath,
+                                                                     String matchNumber, String expectedResult, String expectedMatchNumber) {
         SampleResult sampleResult = new SampleResult();
         JMeterVariables vars = new JMeterVariables();
         JMESPathExtractor processor = setupProcessor(vars, sampleResult, data, fromVars, "1");
@@ -239,7 +256,7 @@ void testRandomElementAllMatches(AccessMode accessMode, String path, String matc
     }
 
     private static Stream<Arguments> dataSourceVarOrResponse() {
-        return Stream.of(Arguments.of(Boolean.TRUE), Arguments.of(Boolean.FALSE));
+        return Stream.of(Arguments.of(true), Arguments.of(false));
     }
 
     @ParameterizedTest
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
index ceee196ba5c..88a4a01e6e2 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java
@@ -86,14 +86,14 @@ public void testTimerWithInvalidTimeout() {
             timer::delay);
     }
 
-    private long timeDelay(SyncTimer timer) {
+    private static long timeDelay(SyncTimer timer) {
         long start = System.currentTimeMillis();
         timer.delay();
         long duration = System.currentTimeMillis() - start;
         return duration;
     }
 
-    private void setupScheduledThread(long schedulerDuration) {
+    private static void setupScheduledThread(long schedulerDuration) {
         ListedHashTree hashTree = new ListedHashTree();
         hashTree.add(new LoopController());
         JMeterThread thread = new JMeterThread(hashTree, null, null);
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
index 9e4fb3b4b6f..c23950ca12d 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java
@@ -46,7 +46,7 @@ void testCompareTo(long thisCount, long otherCount, int compareResult) {
         assertEquals(compareResult, sample(thisCount).compareTo(sample(otherCount)));
     }
 
-    private Sample sample(long count) {
+    private static Sample sample(long count) {
         return new Sample("dummy", 0L, 0L, 0L, 0L, 0L, 0.0, 0L, true, count, 0L);
     }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
index 8fdac49e5e0..f174d2582b6 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
@@ -78,7 +78,7 @@ public void checkResetKoAndAllStats() throws Exception {
     }
 
     @Test
-    public void checkErrorsDetailStat() {
+    public static void checkErrorsDetailStat() {
         SamplerMetric metric = new SamplerMetric();
         metric.add(createSampleResult("400", "bad request"));
         metric.add(createSampleResult("400", "Bad Request "));
@@ -89,7 +89,7 @@ public void checkErrorsDetailStat() {
         assertEquals(1, metric.getErrors().get(error), 0.0, "Count for '500 - Internal Server Error' error ");
     }
 
-    private SampleResult createSampleResult(boolean success) {
+    private static SampleResult createSampleResult(boolean success) {
         SampleResult result = new SampleResult();
         result.setSuccessful(success);
         result.setSampleCount(1);
@@ -101,14 +101,14 @@ private SampleResult createSampleResult(boolean success) {
         return result;
     }
 
-    private SampleResult createSampleResult(String errorCode, String errorMessage) {
+    private static SampleResult createSampleResult(String errorCode, String errorMessage) {
         SampleResult result = createSampleResult(false);
         result.setResponseCode(errorCode);
         result.setResponseMessage(errorMessage);
         return result;
     }
 
-    private SampleResult createSampleResultWithSubresults(boolean success) {
+    private static SampleResult createSampleResultWithSubresults(boolean success) {
         SampleResult result = new SampleResult();
         result.sampleStart();
         result.setSampleCount(1);
@@ -124,10 +124,10 @@ private SampleResult createSampleResultWithSubresults(boolean success) {
     }
 
     @Test
-    public void checkAddCumulatedOk() throws Exception {
+    public static void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
-        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
+        assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA, "Before reset  ok.max");
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
@@ -145,10 +145,10 @@ public void checkAddCumulatedOk() throws Exception {
     }
 
     @Test
-    public void checkAddCumulatedKo() throws Exception {
+    public static void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
-        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
+        assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA, "Before reset  ko.max");
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
index 42c3835f7a5..3cb898f1f72 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
@@ -78,7 +78,7 @@ public void checkResetKoAndAllStats() throws Exception {
         assertEquals(0, metric.getReceivedBytes(), 0.0, "After reset received bytes");
     }
 
-    private SampleResult createSampleResult(boolean success) {
+    private static SampleResult createSampleResult(boolean success) {
         SampleResult result = new SampleResult();
         result.setSuccessful(success);
         result.setSampleCount(1);
@@ -90,7 +90,7 @@ private SampleResult createSampleResult(boolean success) {
         return result;
     }
 
-    private SampleResult createSampleResultWithSubresults(boolean success) {
+    private static SampleResult createSampleResultWithSubresults(boolean success) {
         SampleResult result = new SampleResult();
         result.sampleStart();
         result.setSampleCount(1);
@@ -106,10 +106,10 @@ private SampleResult createSampleResultWithSubresults(boolean success) {
     }
 
     @Test
-    public void checkAddCumulatedOk() throws Exception {
+    public static void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
-        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
+        assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getOkMaxTime(), ALLOWED_DELTA, "Before reset  ok.max");
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
@@ -127,10 +127,10 @@ public void checkAddCumulatedOk() throws Exception {
     }
 
     @Test
-    public void checkAddCumulatedKo() throws Exception {
+    public static void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
-        assertEquals(Boolean.TRUE, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
+        assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
         metric.addCumulated(sample);
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getKoMaxTime(), ALLOWED_DELTA, "Before reset  ko.max");
         assertEquals(DEFAULT_ELAPSED_TIME, metric.getAllMaxTime(), ALLOWED_DELTA, "Before reset all.max");
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
index d5ae6d951d1..6097da54568 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
@@ -45,7 +45,7 @@
 public class HttpMetricsSenderTest {
     private static final String API_URL = "/api/v2/write";
 
-    private MappingBuilder influxRequest(CountDownLatch latch) {
+    private static MappingBuilder influxRequest(CountDownLatch latch) {
         return WireMock.post(API_URL)
                 .willReturn(WireMock.aResponse().withStatus(HttpURLConnection.HTTP_NO_CONTENT))
                 .withServeEventListener(ServeEventListener.RequestPhase.AFTER_COMPLETE, "countdown", Parameters.one("latch", latch));
@@ -78,7 +78,7 @@ public void checkTokenPresentInHeader(WireMockServer server) throws Exception {
         assertAuthHeader(server, WireMock.equalTo("Token my-token"));
     }
 
-    private void setupSenderAndSendMetric(String influxdbUrl, String influxDBToken) throws Exception {
+    private static void setupSenderAndSendMetric(String influxdbUrl, String influxDBToken) throws Exception {
         HttpMetricsSender metricsSender = new HttpMetricsSender();
         metricsSender.setup(influxdbUrl, influxDBToken);
         metricsSender.addMetric("measurement", ",location=west", "size=10");
@@ -86,7 +86,7 @@ private void setupSenderAndSendMetric(String influxdbUrl, String influxDBToken)
         metricsSender.destroy();
     }
 
-    private void assertAuthHeader(WireMockServer server, StringValuePattern authHeader) {
+    private static void assertAuthHeader(WireMockServer server, StringValuePattern authHeader) {
         server.verify(1, RequestPatternBuilder
                 .newRequestPattern(RequestMethod.POST, WireMock.urlEqualTo(API_URL))
                 .withRequestBody(WireMock.matching("measurement,location=west size=10 \\d{19}\\s*"))
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 70d790b3c37..c4a7a8c1f7d 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -754,7 +754,7 @@ private void initializeProperties(CLArgsParser parser) {
 
         // Add local JMeter properties, if the file is found
         String userProp = JMeterUtils.getPropDefault("user.properties",""); //$NON-NLS-1$
-        if (userProp.length() > 0){ //$NON-NLS-1$
+        if (!userProp.isEmpty()) {
             File file = JMeterUtils.findFile(userProp);
             if (file.canRead()){
                 try (FileInputStream fis = new FileInputStream(file)){
@@ -770,7 +770,7 @@ private void initializeProperties(CLArgsParser parser) {
 
         // Add local system properties, if the file is found
         String sysProp = JMeterUtils.getPropDefault("system.properties",""); //$NON-NLS-1$
-        if (sysProp.length() > 0){
+        if (!sysProp.isEmpty()) {
             File file = JMeterUtils.findFile(sysProp);
             if (file.canRead()) {
                 try (FileInputStream fis = new FileInputStream(file)){
@@ -791,105 +791,99 @@ private void initializeProperties(CLArgsParser parser) {
             String value = option.getArgument(1);
 
             switch (option.getDescriptor().getId()) {
-
-            // Should not have any text arguments
-            case CLOption.TEXT_ARGUMENT:
-                throw new IllegalArgumentException("Unknown arg: " + option.getArgument());
-
-            case PROPFILE2_OPT: // Bug 33920 - allow multiple props
-                log.info("Loading additional properties from: {}", name);
-                try (FileInputStream fis = new FileInputStream(new File(name))){
-                    Properties tmp = new Properties();
-                    tmp.load(fis);
-                    jmeterProps.putAll(tmp);
-                } catch (FileNotFoundException e) { // NOSONAR
-                    log.warn("Can't find additional property file: {}", name, e);
-                } catch (IOException e) { // NOSONAR
-                    log.warn("Error loading additional property file: {}", name, e);
+                // Should not have any text arguments
+                case CLOption.TEXT_ARGUMENT ->
+                        throw new IllegalArgumentException("Unknown arg: " + option.getArgument());
+                case PROPFILE2_OPT -> {
+                    log.info("Loading additional properties from: {}", name);
+                    try (FileInputStream fis = new FileInputStream(name)) {
+                        Properties tmp = new Properties();
+                        tmp.load(fis);
+                        jmeterProps.putAll(tmp);
+                    } catch (FileNotFoundException e) { // NOSONAR
+                        log.warn("Can't find additional property file: {}", name, e);
+                    } catch (IOException e) { // NOSONAR
+                        log.warn("Error loading additional property file: {}", name, e);
+                    }
                 }
-                break;
-            case SYSTEM_PROPFILE:
-                log.info("Setting System properties from file: {}", name);
-                try (FileInputStream fis = new FileInputStream(new File(name))){
-                    System.getProperties().load(fis);
-                } catch (IOException e) { // NOSONAR
-                    if (log.isWarnEnabled()) {
-                        log.warn("Cannot find system property file. {}", e.getLocalizedMessage());
+                case SYSTEM_PROPFILE -> {
+                    log.info("Setting System properties from file: {}", name);
+                    try (FileInputStream fis = new FileInputStream(name)) {
+                        System.getProperties().load(fis);
+                    } catch (IOException e) { // NOSONAR
+                        if (log.isWarnEnabled()) {
+                            log.warn("Cannot find system property file. {}", e.getLocalizedMessage());
+                        }
                     }
                 }
-                break;
-            case SYSTEM_PROPERTY:
-                if (value.length() > 0) { // Set it
-                    log.info("Setting System property: {}={}", name, value);
-                    System.getProperties().setProperty(name, value);
-                } else { // Reset it
-                    log.warn("Removing System property: {}", name);
-                    System.getProperties().remove(name);
+                case SYSTEM_PROPERTY -> {
+                    if (!value.isEmpty()) { // Set it
+                        log.info("Setting System property: {}={}", name, value);
+                        System.getProperties().setProperty(name, value);
+                    } else { // Reset it
+                        log.warn("Removing System property: {}", name);
+                        System.getProperties().remove(name);
+                    }
                 }
-                break;
-            case JMETER_PROPERTY:
-                if (value.length() > 0) { // Set it
-                    log.info("Setting JMeter property: {}={}", name, value);
-                    jmeterProps.setProperty(name, value);
-                } else { // Reset it
-                    log.warn("Removing JMeter property: {}", name);
-                    jmeterProps.remove(name);
+                case JMETER_PROPERTY -> {
+                    if (!value.isEmpty()) { // Set it
+                        log.info("Setting JMeter property: {}={}", name, value);
+                        jmeterProps.setProperty(name, value);
+                    } else { // Reset it
+                        log.warn("Removing JMeter property: {}", name);
+                        jmeterProps.remove(name);
+                    }
                 }
-                break;
-            case JMETER_GLOBAL_PROP:
-                if (value.length() > 0) { // Set it
-                    log.info("Setting Global property: {}={}", name, value);
-                    remoteProps.setProperty(name, value);
-                } else {
-                    File propFile = new File(name);
-                    if (propFile.canRead()) {
-                        log.info("Setting Global properties from the file {}", name);
-                        try (FileInputStream fis = new FileInputStream(propFile)){
-                            remoteProps.load(fis);
-                        } catch (FileNotFoundException e) { // NOSONAR
-                            if (log.isWarnEnabled()) {
-                                log.warn("Could not find properties file: {}", e.getLocalizedMessage());
-                            }
-                        } catch (IOException e) { // NOSONAR
-                            if (log.isWarnEnabled()) {
-                                log.warn("Could not load properties file: {}", e.getLocalizedMessage());
+                case JMETER_GLOBAL_PROP -> {
+                    if (!value.isEmpty()) { // Set it
+                        log.info("Setting Global property: {}={}", name, value);
+                        remoteProps.setProperty(name, value);
+                    } else {
+                        File propFile = new File(name);
+                        if (propFile.canRead()) {
+                            log.info("Setting Global properties from the file {}", name);
+                            try (FileInputStream fis = new FileInputStream(propFile)) {
+                                remoteProps.load(fis);
+                            } catch (FileNotFoundException e) { // NOSONAR
+                                if (log.isWarnEnabled()) {
+                                    log.warn("Could not find properties file: {}", e.getLocalizedMessage());
+                                }
+                            } catch (IOException e) { // NOSONAR
+                                if (log.isWarnEnabled()) {
+                                    log.warn("Could not load properties file: {}", e.getLocalizedMessage());
+                                }
                             }
                         }
                     }
                 }
-                break;
-            case LOGLEVEL:
-                if (value.length() > 0) { // Set category
-                    log.info("LogLevel: {}={}", name, value);
-                    final Level logLevel = Level.getLevel(value);
-                    if (logLevel != null) {
-                        String loggerName = name;
-                        if (name.startsWith("jmeter") || name.startsWith("jorphan")) {
-                            loggerName = PACKAGE_PREFIX + name;
+                case LOGLEVEL -> {
+                    if (!value.isEmpty()) { // Set category
+                        log.info("LogLevel: {}={}", name, value);
+                        final Level logLevel = Level.getLevel(value);
+                        if (logLevel != null) {
+                            String loggerName = name;
+                            if (name.startsWith("jmeter") || name.startsWith("jorphan")) {
+                                loggerName = PACKAGE_PREFIX + name;
+                            }
+                            Configurator.setAllLevels(loggerName, logLevel);
+                        } else {
+                            log.warn("Invalid log level, '{}' for '{}'.", value, name);
+                        }
+                    } else { // Set root level
+                        log.warn("LogLevel: {}", name);
+                        final Level logLevel = Level.getLevel(name);
+                        if (logLevel != null) {
+                            Configurator.setRootLevel(logLevel);
+                        } else {
+                            log.warn("Invalid log level, '{}', for the root logger.", name);
                         }
-                        Configurator.setAllLevels(loggerName, logLevel);
-                    } else {
-                        log.warn("Invalid log level, '{}' for '{}'.", value, name);
-                    }
-                } else { // Set root level
-                    log.warn("LogLevel: {}", name);
-                    final Level logLevel = Level.getLevel(name);
-                    if (logLevel != null) {
-                        Configurator.setRootLevel(logLevel);
-                    } else {
-                        log.warn("Invalid log level, '{}', for the root logger.", name);
                     }
                 }
-                break;
-            case REMOTE_STOP:
-                remoteStop = true;
-                break;
-            case FORCE_DELETE_RESULT_FILE:
-                deleteResultFile = true;
-                break;
-            default:
+                case REMOTE_STOP -> remoteStop = true;
+                case FORCE_DELETE_RESULT_FILE -> deleteResultFile = true;
+                default -> {
+                }
                 // ignored
-                break;
             }
         }
 
@@ -900,7 +894,7 @@ private void initializeProperties(CLArgsParser parser) {
         jmeterProps.put("jmeter.version", JMeterUtils.getJMeterVersion());
     }
 
-    /*
+    /**
      * Checks for LAST or LASTsuffix.
      * Returns the LAST name with .JMX replaced by suffix.
      */
@@ -974,7 +968,7 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
 
             Summariser summariser = null;
             String summariserName = JMeterUtils.getPropDefault("summariser.name", "");//$NON-NLS-1$
-            if (summariserName.length() > 0) {
+            if (!summariserName.isEmpty()) {
                 log.info("Creating summariser <{}>", summariserName);
                 println("Creating summariser <" + summariserName + ">");
                 summariser = new Summariser(summariserName);
@@ -1108,8 +1102,7 @@ public static HashTree convertSubTree(HashTree tree, boolean cloneAtEnd) {
      */
     private static void pConvertSubTree(HashTree tree) {
         for (Object o : new ArrayList<>(tree.list())) {
-            if (o instanceof TestElement) {
-                TestElement item = (TestElement) o;
+            if (o instanceof TestElement item) {
                 if (item.isEnabled()) {
                     if (item instanceof ReplaceableController) {
                         ReplaceableController rc = ensureReplaceableControllerIsLoaded(item);
@@ -1179,7 +1172,7 @@ private static ReplaceableController ensureReplaceableControllerIsLoaded(
         return rc;
     }
 
-    /*
+    /**
      * Listen to test and handle tidyup after non-GUI test completes.
      * If running a remote test, then after waiting a few seconds for listeners to finish files,
      * it calls ClientJMeterEngine.tidyRMI() to deal with the Naming Timer Thread.
@@ -1206,13 +1199,13 @@ enum RunMode {
          * @param remoteStop
          * @param reportGenerator {@link ReportGenerator}
          */
-        public ListenToTest(RunMode runMode, boolean remoteStop, ReportGenerator reportGenerator) {
+        private ListenToTest(RunMode runMode, boolean remoteStop, ReportGenerator reportGenerator) {
             this.runMode = runMode;
             this.remoteStop = remoteStop;
             this.reportGenerator = reportGenerator;
         }
 
-        public void setStartedRemoteEngines(List<? extends JMeterEngine> engines) {
+        private void setStartedRemoteEngines(List<? extends JMeterEngine> engines) {
             if (runMode != RunMode.REMOTE) {
                 throw new IllegalArgumentException("This method should only be called in RunMode.REMOTE");
             }
@@ -1413,25 +1406,20 @@ private static void waitForSignals(final List<? extends JMeterEngine> engines, D
                     String command = new String(request.getData(), request.getOffset(), request.getLength(), StandardCharsets.US_ASCII);
                     System.out.println("Command: "+command+" received from "+address);//NOSONAR
                     log.info("Command: {} received from {}", command, address);
-                    switch(command) {
-                        case "StopTestNow" :
-                            for(JMeterEngine engine : engines) {
+                    switch (command) {
+                        case "StopTestNow" -> {
+                            for (JMeterEngine engine : engines) {
                                 engine.stopTest(true);
                             }
-                            break;
-                        case "Shutdown" :
-                            for(JMeterEngine engine : engines) {
+                        }
+                        case "Shutdown" -> {
+                            for (JMeterEngine engine : engines) {
                                 engine.stopTest(false);
                             }
-                            break;
-                        case "HeapDump" :
-                            HeapDumper.dumpHeap();
-                            break;
-                        case "ThreadDump" :
-                            ThreadDumper.threadDump();
-                            break;
-                        default:
-                            System.out.println("Command: "+command+" not recognised ");//NOSONAR
+                        }
+                        case "HeapDump" -> HeapDumper.dumpHeap();
+                        case "ThreadDump" -> ThreadDumper.threadDump();
+                        default -> System.out.println("Command: " + command + " not recognised ");//NOSONAR
                     }
                 }
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java b/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
index b4154e7dbad..8067a6b3e6e 100644
--- a/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
+++ b/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java
@@ -55,12 +55,9 @@ public ProxyAuthenticator(String userName, String password) {
      */
     @Override
     protected PasswordAuthentication getPasswordAuthentication() {
-        switch (getRequestorType()){
-            case PROXY:
-                return new PasswordAuthentication(userName, password);
-            case SERVER:
-                break;
-        }
-        return null;
+        return switch (getRequestorType()) {
+            case PROXY -> new PasswordAuthentication(userName, password);
+            case SERVER -> null;
+        };
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java b/src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java
index 2b986172476..f306ef9f93c 100644
--- a/src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java
@@ -63,11 +63,11 @@ private static class ResultHolder implements Serializable
         private String baseResult;
         private String secondaryResult;
 
-        public ResultHolder()
+        private ResultHolder()
         {
         }
 
-        public void addToBaseResult(String r)
+        private void addToBaseResult(String r)
         {
             if(baseResult == null)
             {
@@ -79,7 +79,7 @@ public void addToBaseResult(String r)
             }
         }
 
-        public void addToSecondaryResult(String r)
+        private void addToSecondaryResult(String r)
         {
             if(secondaryResult == null)
             {
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index 0c9fd32dba8..fc13ca9ec2a 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -293,8 +293,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement args) {
         GuiUtils.stopTableEditing(table);
-        if (args instanceof Arguments) {
-            Arguments arguments = (Arguments) args;
+        if (args instanceof Arguments arguments) {
             arguments.clear();
             @SuppressWarnings("unchecked") // only contains Argument (or HTTPArgument)
             Iterator<Argument> modelData = (Iterator<Argument>) tableModel.iterator();
@@ -321,9 +320,9 @@ public void modifyTestElement(TestElement args) {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof Arguments) {
+        if (el instanceof Arguments arguments) {
             tableModel.clearData();
-            for (JMeterProperty jMeterProperty : (Arguments) el) {
+            for (JMeterProperty jMeterProperty : arguments) {
                 Argument arg = (Argument) jMeterProperty.getObjectValue();
                 tableModel.addRow(arg);
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java b/src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java
index fef3c25a7e4..d24106daf9d 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java
@@ -184,8 +184,8 @@ private JComponent createComponentForRow(final int columnCount, final int linesP
         if (column > 0 || columnCount == 1) {
             if (tableModel.getColumnClass(column).equals(Boolean.class)) {
                 JCheckBox checkBox = new JCheckBox();
-                if (value instanceof Boolean) {
-                    checkBox.setSelected((Boolean) value);
+                if (value instanceof Boolean b) {
+                    checkBox.setSelected(b);
                 }
                 checkBox.addItemListener(this);
                 dataComponents.add(checkBox);
@@ -193,8 +193,8 @@ private JComponent createComponentForRow(final int columnCount, final int linesP
             } else {
                 JSyntaxTextArea dataArea = JSyntaxTextArea
                         .getInstance(linesPerTextArea, 80);
-                if (value instanceof String) {
-                    dataArea.setInitialText((String) value);
+                if (value instanceof String s) {
+                    dataArea.setInitialText(s);
                 }
                 dataArea.getDocument().addDocumentListener(this);
                 dataComponents.add(dataArea);
@@ -202,8 +202,8 @@ private JComponent createComponentForRow(final int columnCount, final int linesP
             }
         } else {
             final JTextField nameTF = new JTextField("");
-            if (value instanceof String) {
-                nameTF.setText((String) value);
+            if (value instanceof String s) {
+                nameTF.setText(s);
             }
             nameTF.getDocument().addDocumentListener(this);
             dataComponents.add(nameTF);
@@ -245,14 +245,13 @@ else if (action.equals(UPDATE)) {
     private void setValues(int selectedRow) {
         for (int i = 0; i < tableModel.getColumnCount(); i++) {
             final JComponent component = dataComponents.get(i);
-            if (component instanceof JTextComponent) {
-                JTextComponent dataArea = (JTextComponent) component;
+            if (component instanceof JTextComponent dataArea) {
                 dataArea.setText((String) tableModel.getValueAt(selectedRow, i));
                 if (dataArea instanceof JSyntaxTextArea) {
                     dataArea.setCaretPosition(0);
                 }
-            } else if (component instanceof JCheckBox) {
-                ((JCheckBox) component).setSelected((Boolean) tableModel.getValueAt(selectedRow, i));
+            } else if (component instanceof JCheckBox jCheckBox) {
+                jCheckBox.setSelected((Boolean) tableModel.getValueAt(selectedRow, i));
             }
         }
         textChanged = false;
@@ -265,10 +264,10 @@ private void setValues(int selectedRow) {
     protected void doUpdate(ActionEvent actionEvent) {
         for (int i = 0; i < tableModel.getColumnCount(); i++) {
             final JComponent component = dataComponents.get(i);
-            if (component instanceof JTextComponent) {
-                tableModel.setValueAt(((JTextComponent) component).getText(), selectedRow, i);
-            } else if (component instanceof JCheckBox) {
-                tableModel.setValueAt(((JCheckBox) component).isSelected(), selectedRow, i);
+            if (component instanceof JTextComponent jTextComponent) {
+                tableModel.setValueAt(jTextComponent.getText(), selectedRow, i);
+            } else if (component instanceof JCheckBox jCheckBox) {
+                tableModel.setValueAt(jCheckBox.isSelected(), selectedRow, i);
             }
         }
         // Change Cancel label to Close
diff --git a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
index ff88a79315d..b4efd777f59 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java
@@ -179,8 +179,8 @@ public Sampler next() {
             if (currentElement == null) {
                 returnValue = nextIsNull();
             } else {
-                if (currentElement instanceof Sampler) {
-                    returnValue = nextIsASampler((Sampler) currentElement);
+                if (currentElement instanceof Sampler sampler) {
+                    returnValue = nextIsASampler(sampler);
                 } else { // must be a controller
                     returnValue = nextIsAController((Controller) currentElement);
                 }
@@ -376,11 +376,9 @@ public final boolean addTestElementOnce(TestElement child){
 
     @Override
     public void addIterationListener(LoopIterationListener lis) {
-        /*
-         * A little hack - add each listener to the start of the list - this
-         * ensures that the thread running the show is the first listener and
-         * can modify certain values before other listeners are called.
-         */
+        // A little hack - add each listener to the start of the list - this
+        // ensures that the thread running the show is the first listener and
+        // can modify certain values before other listeners are called.
         iterationListeners.addFirst(lis);
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
index f19e2cdde13..0927303ffb5 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
@@ -122,7 +122,7 @@ public boolean evaluate(String testElementName, String condition) {
      * Initialization On Demand Holder pattern
      */
     private static class LazyHolder {
-        public static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
+        private static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
     }
 
     /**
@@ -189,17 +189,11 @@ private boolean evaluateCondition(String cond) {
      */
     private static boolean computeResultFromString(
             String condition, String resultStr) throws Exception {
-        boolean result;
-        switch(resultStr) {
-            case "false":
-                result = false;
-                break;
-            case "true":
-                result = true;
-                break;
-            default:
-                throw new Exception(" BAD CONDITION :: " + condition + " :: expected true or false");
-        }
+        boolean result = switch (resultStr) {
+            case "false" -> false;
+            case "true" -> true;
+            default -> throw new Exception(" BAD CONDITION :: " + condition + " :: expected true or false");
+        };
         log.debug("    >> evaluate Condition -  [{}] results is  [{}]", condition, result);
         return result;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/RunTime.java b/src/core/src/main/java/org/apache/jmeter/control/RunTime.java
index 399ebee4f98..c36a1138910 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/RunTime.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/RunTime.java
@@ -110,7 +110,7 @@ protected void resetLoopCount() {
         startTime = 0;
     }
 
-    /*
+    /**
      * This is needed for OnceOnly to work like other Loop Controllers
      */
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
index 467aaf2fa30..1f651e2d880 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
@@ -268,8 +268,7 @@ public void triggerEndOfLoop() {
             // in this case normal workflow doesn't happen, so we need
             // to notify the children of TransactionController and
             // update them with SubSamplerResult
-            if(subSampler instanceof TransactionSampler) {
-                TransactionSampler tc = (TransactionSampler) subSampler;
+            if(subSampler instanceof TransactionSampler tc) {
                 transactionSampler.addSubSamplerResult(tc.getTransactionResult());
             }
             transactionSampler.setTransactionDone();
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
index f4a38027275..1b94c963e7c 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
@@ -116,8 +116,7 @@ public IfControllerPanel(boolean displayName) {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof IfController) {
-            IfController ifController = (IfController) element;
+        if (element instanceof IfController ifController) {
             theCondition.setText(ifController.getCondition());
             evaluateAll.setSelected(ifController.isEvaluateAll());
             useExpression.setSelected(ifController.isUseExpression());
@@ -141,8 +140,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement controller) {
         configureTestElement(controller);
-        if (controller instanceof IfController) {
-            IfController ifController = (IfController) controller;
+        if (controller instanceof IfController ifController) {
             ifController.setCondition(theCondition.getText());
             ifController.setEvaluateAll(evaluateAll.isSelected());
             ifController.setUseExpression(useExpression.isSelected());
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java
index 8d2e3652ca9..c811a637344 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java
@@ -123,8 +123,8 @@ public JTextField getLoops() {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof LoopController) {
-            setState(((LoopController) element).getLoopString());
+        if (element instanceof LoopController loopController) {
+            setState(loopController.getLoopString());
         } else {
             setState(1);
         }
@@ -142,11 +142,11 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement lc) {
         configureTestElement(lc);
-        if (lc instanceof LoopController) {
-            if (loops.getText().length() > 0) {
-                ((LoopController) lc).setLoops(loops.getText());
+        if (lc instanceof LoopController loopController) {
+            if (!loops.getText().isEmpty()) {
+                loopController.setLoops(loops.getText());
             } else {
-                ((LoopController) lc).setLoops(LoopController.INFINITE_LOOP_COUNT);
+                loopController.setLoops(LoopController.INFINITE_LOOP_COUNT);
             }
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java
index 045aab27725..31b9dfcb346 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java
@@ -89,8 +89,8 @@ public RunTimeGui(boolean displayName) {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof RunTime) {
-            setState(((RunTime) element).getRuntimeString());
+        if (element instanceof RunTime runTime) {
+            setState(runTime.getRuntimeString());
         } else {
             setState(1);
         }
@@ -108,11 +108,11 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement lc) {
         configureTestElement(lc);
-        if (lc instanceof RunTime) {
-            if (seconds.getText().length() > 0) {
-                ((RunTime) lc).setRuntime(seconds.getText());
+        if (lc instanceof RunTime runTime) {
+            if (!seconds.getText().isEmpty()) {
+                runTime.setRuntime(seconds.getText());
             } else {
-                ((RunTime) lc).setRuntime(0);
+                runTime.setRuntime(0);
             }
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
index d962b5a0821..74b9b0f3fae 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java
@@ -141,8 +141,7 @@ public void assignDefaultValues(TestElement element) {
     @Override
     public void modifyTestElement(TestElement plan) {
         super.modifyTestElement(plan);
-        if (plan instanceof TestPlan) {
-            TestPlan tp = (TestPlan) plan;
+        if (plan instanceof TestPlan tp) {
             // TODO: set expression to TestPlan somehow
             tp.setUserDefinedVariables((Arguments) argsPanel.createTestElement());
             String[] files = browseJar.getFiles();
@@ -185,8 +184,7 @@ public Collection<String> getMenuCategories() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof TestPlan) {
-            TestPlan tp = (TestPlan) el;
+        if (el instanceof TestPlan tp) {
             final JMeterProperty udv = tp.getUserDefinedVariablesAsProperty();
             if (udv != null) {
                 argsPanel.configure((Arguments) udv.getObjectValue());
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
index 81a8ed2813c..0bcca3c2ef8 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
@@ -64,8 +64,8 @@ public WhileControllerGui() {
     @Override
     public void configure(TestElement element) {
         super.configure(element);
-        if (element instanceof WhileController) {
-            theCondition.setText(((WhileController) element).getCondition());
+        if (element instanceof WhileController whileController) {
+            theCondition.setText(whileController.getCondition());
         }
 
     }
@@ -86,11 +86,11 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement controller) {
         configureTestElement(controller);
-        if (controller instanceof WhileController) {
-            if (theCondition.getText().length() > 0) {
-                ((WhileController) controller).setCondition(theCondition.getText());
+        if (controller instanceof WhileController whileController) {
+            if (!theCondition.getText().isEmpty()) {
+                whileController.setCondition(theCondition.getText());
             } else {
-                ((WhileController) controller).setCondition(""); // $NON-NLS-1$
+                whileController.setCondition(""); // $NON-NLS-1$
             }
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
index 89b9adfef61..6ff14fd5ad6 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
@@ -95,8 +95,7 @@ public void modifyTestElement(TestElement wb) {
     @SuppressWarnings("deprecation")
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof org.apache.jmeter.testelement.WorkBench) {
-            org.apache.jmeter.testelement.WorkBench tp = (org.apache.jmeter.testelement.WorkBench) el;
+        if (el instanceof org.apache.jmeter.testelement.WorkBench tp) {
             saveWorkBench.setSelected(tp.getSaveWorkBench());
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
index 030be3b94e3..0d70116d03b 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java
@@ -70,10 +70,8 @@ private static RemoteJMeterEngine getEngine(String hostAndPort)
                port,
                RmiUtils.createClientSocketFactory());
         Remote remobj = registry.lookup(name);
-        if (remobj instanceof RemoteJMeterEngine){
-            final RemoteJMeterEngine rje = (RemoteJMeterEngine) remobj;
-            if (remobj instanceof RemoteObject){
-                RemoteObject robj = (RemoteObject) remobj;
+        if (remobj instanceof RemoteJMeterEngine rje){
+            if (remobj instanceof RemoteObject robj){
                 System.out.println("Using remote object: "+robj.getRef().remoteToString()); // NOSONAR
             }
             return rje;
@@ -140,11 +138,8 @@ public void runTest() throws JMeterEngineException {
         String methodName="unknown";
         try {
             JMeterContextService.startTest();
-            /*
-             * Add fix for Deadlocks, see:
-             *
-             * See https://bz.apache.org/bugzilla/show_bug.cgi?id=48350
-            */
+            // Add fix for Deadlocks, see:
+            // See https://bz.apache.org/bugzilla/show_bug.cgi?id=48350
             File baseDirRelative = FileServer.getFileServer().getBaseDirRelative();
             String scriptName = FileServer.getFileServer().getScriptName();
             synchronized(LOCK)
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java b/src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java
index a59372f030f..0cb2a0616d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java
@@ -53,8 +53,8 @@ public class ConvertListeners implements HashTreeTraverser {
     @Override
     public void addNode(Object node, HashTree subTree) {
         for (Object item : subTree.list()) {
-            if (item instanceof AbstractThreadGroup && log.isDebugEnabled()) {
-                log.debug("num threads = {}", ((AbstractThreadGroup) item).getNumThreads());
+            if (item instanceof AbstractThreadGroup abstractThreadGroup && log.isDebugEnabled()) {
+                log.debug("num threads = {}", abstractThreadGroup.getNumThreads());
             }
             if (item instanceof Remoteable) {
                 if (item instanceof RemoteThreadsListenerTestElement){
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java b/src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java
index 389dd3cc953..bae46ced747 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java
@@ -72,32 +72,32 @@ public void addNode(Object node, HashTree subTree) {
                 }
             }
 
-            if (node instanceof TestPlan) {
-                this.clientSideVariables = createVars((TestPlan)node);
+            if (node instanceof TestPlan testPlan) {
+                this.clientSideVariables = createVars(testPlan);
             }
 
-            if (node instanceof Arguments) {
+            if (node instanceof Arguments arguments) {
                 // Don't store User Defined Variables in the context for client side
-                Map<String, String> args = createArgumentsMap((Arguments) node);
+                Map<String, String> args = createArgumentsMap(arguments);
                 clientSideVariables.putAll(args);
             }
 
         } else {
-            if(node instanceof TestElement) {
+            if(node instanceof TestElement testElement) {
                 try {
-                    replacer.replaceValues((TestElement) node);
+                    replacer.replaceValues(testElement);
                 } catch (InvalidVariableException e) {
-                    log.error("invalid variables in node {}", ((TestElement)node).getName(), e);
+                    log.error("invalid variables in node {}", testElement.getName(), e);
                 }
             }
 
-            if (node instanceof TestPlan) {
-                JMeterVariables vars = createVars((TestPlan)node);
+            if (node instanceof TestPlan testPlan) {
+                JMeterVariables vars = createVars(testPlan);
                 JMeterContextService.getContext().setVariables(vars);
             }
 
-            if (node instanceof Arguments) {
-                Map<String, String> args = createArgumentsMap((Arguments) node);
+            if (node instanceof Arguments arguments) {
+                Map<String, String> args = createArgumentsMap(arguments);
                 JMeterContextService.getContext().getVariables().putAll(args);
             }
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
index 89feca75393..3dd632f9b9a 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
@@ -184,10 +184,6 @@ public void rstopTest(boolean now) throws RemoteException {
         log.info("... stopped");
     }
 
-    /*
-     * Called by:
-     * - ClientJMeterEngine.exe() which is called on remoteStop
-     */
     @Override
     public void rexit() throws RemoteException {
         log.info("Exiting");
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 59846b4d3b5..a1d302db33f 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -76,7 +76,7 @@ public class StandardJMeterEngine implements JMeterEngine, Runnable {
     // at any one time so it is not guaranteed to work ...
     private static volatile StandardJMeterEngine engine;
 
-    /*
+    /**
      * Allow functions etc to register for testStopped notification.
      * Only used by the function parser so far.
      * The list is merged with the testListeners and then cleared.
@@ -363,7 +363,7 @@ private int countStillActiveThreads() {
         /**
          * set the shared engine to null
          */
-        private void resetSingletonEngine() {
+        private static void resetSingletonEngine() {
             StandardJMeterEngine.engine = null; // NOSONAR We cannot make the method static here
         }
 
@@ -402,9 +402,7 @@ public void run() {
         log.info("Running the test!");
         running = true;
 
-        /*
-         * Ensure that the sample variables are correctly initialised for each run.
-         */
+        // Ensure that the sample variables are correctly initialised for each run.
         SampleEvent.initSampleVariables();
 
         JMeterContextService.startTest();
@@ -416,10 +414,8 @@ public void run() {
             JMeterUtils.reportErrorToUser("Error occurred compiling the tree: - see log file", e);
             return; // no point continuing
         }
-        /*
-         * Notification of test listeners needs to happen after function
-         * replacement, but before setting RunningVersion to true.
-         */
+        // Notification of test listeners needs to happen after function
+        // replacement, but before setting RunningVersion to true.
         var testListeners = new SearchByClass<>(TestStateListener.class); // TL - S&E
         test.traverse(testListeners);
 
@@ -479,11 +475,9 @@ public void run() {
 
         groups.clear(); // The groups have all completed now
 
-        /*
-         * Here's where the test really starts. Run a Full GC now: it's no harm
-         * at all (just delays test start by a tiny amount) and hitting one too
-         * early in the test can impair results for short tests.
-         */
+        // Here's where the test really starts. Run a Full GC now: it's no harm
+        // at all (just delays test start by a tiny amount) and hitting one too
+        // early in the test can impair results for short tests.
         JMeterUtils.helpGC();
 
         JMeterContextService.getContext().setSamplingStarted(true);
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java b/src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java
index fddc404ab1c..82918cf72c7 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java
@@ -69,11 +69,11 @@ public final void addNode(Object node, HashTree subTree) {
      * @return Object node (clone or not)
      */
     protected Object addNodeToTree(Object node) {
-        if ( (node instanceof TestElement) // Check can cast for clone
+        if ( (node instanceof TestElement testElement) // Check can cast for clone
            // Don't clone NoThreadClone unless honourNoThreadClone == false
           && !(honourNoThreadClone && node instanceof NoThreadClone)
         ) {
-            Object newNode = ((TestElement) node).clone();
+            Object newNode = testElement.clone();
             newTree.add(objects, newNode);
             return newNode;
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java b/src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java
index 7bf4b5d7f74..71127c13dba 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java
@@ -32,8 +32,8 @@ public class TurnElementsOn implements HashTreeTraverser {
      */
     @Override
     public void addNode(Object node, HashTree subTree) {
-        if (node instanceof TestElement && !(node instanceof TestPlan)) {
-            ((TestElement) node).setRunningVersion(true);
+        if (node instanceof TestElement testElement && !(node instanceof TestPlan)) {
+            testElement.setRunningVersion(true);
         }
 
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
index 5a9b9024579..15ceb30800d 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java
@@ -78,7 +78,7 @@ public class CompoundVariable implements Function {
                     new LogAndIgnoreServiceLoadExceptionHandler(log)
             )) {
                 String referenceKey = function.getReferenceKey();
-                if (referenceKey.length() > 0) { // ignore self
+                if (!referenceKey.isEmpty()) { // ignore self
                     functions.put(referenceKey, function.getClass());
                 }
             }
@@ -135,15 +135,15 @@ public String execute(SampleResult previousResult, Sampler currentSampler) {
 
         StringBuilder results = new StringBuilder();
         for (Object item : compiledComponents) {
-            if (item instanceof Function) {
+            if (item instanceof Function function) {
                 try {
-                    results.append(((Function) item).execute(previousResult, currentSampler));
+                    results.append(function.execute(previousResult, currentSampler));
                 } catch (InvalidVariableException e) {
                     // TODO should level be more than debug ?
                     log.debug("Invalid variable: {}", item, e);
                 }
-            } else if (item instanceof SimpleVariable) {
-                results.append(((SimpleVariable) item).toString());
+            } else if (item instanceof SimpleVariable simpleVariable) {
+                results.append(simpleVariable.toString());
             } else {
                 results.append(item);
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
index d4a00763d6b..9af0c9c7a5c 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java
@@ -72,7 +72,7 @@ ArrayList<Object> compileString(String value) throws InvalidVariableException {
                     buffer.append(current[0]);
                 } else if (current[0] == '{' && previous == '$') {// found "${"
                     buffer.deleteCharAt(buffer.length() - 1);
-                    if (buffer.length() > 0) {// save leading text
+                    if (!buffer.isEmpty()) {// save leading text
                         result.add(buffer.toString());
                         buffer.setLength(0);
                     }
@@ -84,7 +84,7 @@ ArrayList<Object> compileString(String value) throws InvalidVariableException {
                 }
             }
 
-            if (buffer.length() > 0) {
+            if (!buffer.isEmpty()) {
                 result.add(buffer.toString());
             }
         } catch (IOException e) {
@@ -127,8 +127,8 @@ Object makeFunction(StringReader reader) throws InvalidVariableException {
                 } else if (current[0] == '(' && previous != ' ') {
                     String funcName = buffer.toString();
                     function = CompoundVariable.getNamedFunction(funcName.trim());
-                    if (function instanceof Function) {
-                        ((Function) function).setParameters(parseParams(reader));
+                    if (function instanceof Function function1) {
+                        function1.setParameters(parseParams(reader));
                         if (firstNonSpace(reader, '#') != '}') {
                             reader.reset();// set to start of string
                             char []cb = new char[100];
@@ -136,8 +136,8 @@ Object makeFunction(StringReader reader) throws InvalidVariableException {
                             throw new InvalidVariableException("Expected } after "
                                     + funcName + " function call in " + new String(cb, 0, nbRead));
                         }
-                        if (function instanceof TestStateListener) {
-                            StandardJMeterEngine.register((TestStateListener) function);
+                        if (function instanceof TestStateListener testStateListener) {
+                            StandardJMeterEngine.register(testStateListener);
                         }
                         return function;
                     } else { // Function does not exist, so treat as per missing variable
@@ -145,8 +145,8 @@ Object makeFunction(StringReader reader) throws InvalidVariableException {
                     }
                 } else if (current[0] == '}') {// variable, or function with no parameter list
                     function = CompoundVariable.getNamedFunction(buffer.toString());
-                    if (function instanceof Function){// ensure that setParameters() is called.
-                        ((Function) function).setParameters(new ArrayList<>());
+                    if (function instanceof Function function1){// ensure that setParameters() is called.
+                        function1.setParameters(new ArrayList<>());
                     }
                     buffer.setLength(0);
                     return function;
@@ -211,7 +211,7 @@ ArrayList<CompoundVariable> parseParams(StringReader reader) throws InvalidVaria
                     result.add(param);
                 } else if (current[0] == ')' && functionRecursion == 0 && parenRecursion == 0) {
                     // Detect functionName() so this does not generate empty string as the parameter
-                    if (buffer.length() == 0 && result.isEmpty()){
+                    if (buffer.isEmpty() && result.isEmpty()){
                         return result;
                     }
                     // Normal exit occurs here
diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
index 42d37651f7c..5c9594effca 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java
@@ -171,8 +171,7 @@ private static Collection<JMeterProperty> replaceValues(PropertyIterator iter, P
             } else if (val instanceof NumberProperty) {
                 val = transform.transform(val);
                 log.debug("Replacement result: {}", val);
-            } else if (val instanceof MultiProperty) {
-                MultiProperty multiVal = (MultiProperty) val;
+            } else if (val instanceof MultiProperty multiVal) {
                 Collection<JMeterProperty> newValues = replaceValues(multiVal.iterator(), transform);
                 multiVal.clear();
                 for (JMeterProperty jmp : newValues) {
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
index eca5090967c..4e85d43f617 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
@@ -275,7 +275,7 @@ private static String variablesToString(JMeterVariables jMeterVariables) {
     static String buildFunctionCallString(String functionName, Arguments args) {
         StringBuilder functionCall = new StringBuilder("${");
         functionCall.append(functionName);
-        if (args.getArguments().size() > 0) {
+        if (!args.getArguments().isEmpty()) {
             functionCall.append("(");
             PropertyIterator iter = args.iterator();
             boolean first = true;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
index ddafba9c212..d3f5615bc5f 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
@@ -279,7 +279,7 @@ private void modifyTestElementEnabledAndComment(TestElement mc) {
         // JMeter removes disabled elements early from the tree, so configuration elements
         // with enabled=false (~HTTP Request Defaults) can't unexpectedly override the regular ones
         // like HTTP Request.
-        mc.set(TestElementSchema.INSTANCE.getEnabled(), enabled ? null : Boolean.FALSE);
+        mc.set(TestElementSchema.INSTANCE.getEnabled(), enabled ? null : false);
         // Note: we can't use editors for "comments" as getComments() is not a final method, so plugins might
         // override it and provide a different implementation.
         String comment = getComment();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
index 231270e6f0e..a08b0f5a9c6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java
@@ -571,12 +571,10 @@ public HashTree getCurrentSubTree() {
      *
      * @return the JMeter tree model
      */
-    /*
-     * TODO consider removing this method, and providing method wrappers instead.
-     * This would allow the Gui package to do any additional clearups if required,
-     * as has been done with clearTestPlan()
-    */
     public JMeterTreeModel getTreeModel() {
+        // TODO consider removing this method, and providing method wrappers instead.
+        //   This would allow the Gui package to do any additional clearups if required,
+        //   as has been done with clearTestPlan()
         return treeModel;
     }
 
@@ -909,9 +907,9 @@ private static int getTestElementCheckSum(TestElement el) {
         PropertyIterator it = el.propertyIterator();
         while (it.hasNext()) {
             JMeterProperty obj = it.next();
-            if (obj instanceof TestElementProperty) {
+            if (obj instanceof TestElementProperty jMeterProperties) {
                 ret ^= getTestElementCheckSum(
-                        ((TestElementProperty) obj).getElement());
+                        jMeterProperties.getElement());
             } else {
                 ret ^= obj.getName().hashCode();
                 String stringValue = obj.getStringValue();
@@ -985,8 +983,7 @@ public void endUndoTransaction() {
      * @return boolean
      */
     public boolean shouldSaveBeforeRunByPreference() {
-        return Boolean.TRUE.toString().
-                equalsIgnoreCase(PREFS.get(SBR_PREFS_KEY, null));
+        return "true".equalsIgnoreCase(PREFS.get(SBR_PREFS_KEY, null));
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
index 0c55e5efee3..5929e570a4d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java
@@ -159,7 +159,7 @@ private JPanel setupButtonPanel() {
     private class ReportGenerationWorker extends SwingWorker<List<String>, String> {
         private final JButton reportLaunchButton;
 
-        public ReportGenerationWorker(JButton reportLaunchButton) {
+        private ReportGenerationWorker(JButton reportLaunchButton) {
             this.reportLaunchButton = reportLaunchButton;
         }
         @Override
@@ -196,36 +196,32 @@ private void addTextToReport(String errorMessage) {
     @Override
     public void actionPerformed(ActionEvent e) {
         switch (e.getActionCommand()) {
-        case CREATE_REQUEST:
-            try {
-                reportArea.setText(GENERATING_REPORT_LABEL + "\n");
-                reportLaunchButton.setIcon(runningIcon);
-                new ReportGenerationWorker(reportLaunchButton).execute();
-            } catch (Exception exception) {
-                if (LOGGER.isErrorEnabled()) {
-                    LOGGER.error("Error during html report generation: {}", exception.getMessage(), exception);
+            case CREATE_REQUEST -> {
+                try {
+                    reportArea.setText(GENERATING_REPORT_LABEL + "\n");
+                    reportLaunchButton.setIcon(runningIcon);
+                    new ReportGenerationWorker(reportLaunchButton).execute();
+                } catch (Exception exception) {
+                    if (LOGGER.isErrorEnabled()) {
+                        LOGGER.error("Error during html report generation: {}", exception.getMessage(), exception);
+                    }
+                }
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.debug("CSV file path {}\nuser.properties file path: {}\nOutput directory file path: {}",
+                            csvFilePathTextField.getText(), userPropertiesFilePathTextField.getText(),
+                            outputDirectoryPathTextField.getText());
                 }
             }
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("CSV file path {}\nuser.properties file path: {}\nOutput directory file path: {}",
-                        csvFilePathTextField.getText(), userPropertiesFilePathTextField.getText(),
-                        outputDirectoryPathTextField.getText());
-            }
-            break;
-        case BROWSE_USER_PROPERTIES:
-            userPropertiesFilePathTextField.setText(showFileChooser(userPropertiesFileButton.getParent(),
-                    userPropertiesFilePathTextField, false, new String[] { ".properties" }));
-            break;
-        case BROWSE_CSV:
-            csvFilePathTextField.setText(showFileChooser(csvFileButton.getParent(), csvFilePathTextField, false,
-                    new String[] { ".jtl", ".csv" }));
-            break;
-        case BROWSE_OUTPUT:
-            outputDirectoryPathTextField.setText(
+            case BROWSE_USER_PROPERTIES ->
+                    userPropertiesFilePathTextField.setText(showFileChooser(userPropertiesFileButton.getParent(),
+                            userPropertiesFilePathTextField, false, new String[]{".properties"}));
+            case BROWSE_CSV ->
+                    csvFilePathTextField.setText(showFileChooser(csvFileButton.getParent(), csvFilePathTextField, false,
+                            new String[]{".jtl", ".csv"}));
+            case BROWSE_OUTPUT -> outputDirectoryPathTextField.setText(
                     showFileChooser(outputDirectoryButton.getParent(), outputDirectoryPathTextField, true, null));
-            break;
-        default:
-            break;
+            default -> {
+            }
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
index 6e380a7f8ce..d33b6c81d13 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
@@ -105,9 +105,6 @@ private JTextArea init() { // WARNING: called from ctor so must not be overridde
         return jTextArea;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.logging.GuiLogEventListener#processLogEvent(org.apache.jmeter.gui.logging.LogEventObject)
-     */
     @Override
     public void processLogEvent(final LogEventObject logEventObject) {
         if(!LOGGER_PANEL_RECEIVE_WHEN_CLOSED && !GuiPackage.getInstance().getMenuItemLoggerPanel().getModel().isSelected()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index bfc46e01f6c..bab760e6944 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -669,10 +669,10 @@ public String getToolTipText(MouseEvent event) {
                 TreePath path = this.getPathForLocation(event.getX(), event.getY());
                 if (path != null) {
                     Object treeNode = path.getLastPathComponent();
-                    if (treeNode instanceof DefaultMutableTreeNode) {
-                        Object testElement = ((DefaultMutableTreeNode) treeNode).getUserObject();
-                        if (testElement instanceof TestElement) {
-                            String comment = ((TestElement) testElement).getComment();
+                    if (treeNode instanceof DefaultMutableTreeNode defaultMutableTreeNode) {
+                        Object testElement = defaultMutableTreeNode.getUserObject();
+                        if (testElement instanceof TestElement element) {
+                            String comment = element.getComment();
                             if (StringUtilities.isNotBlank(comment)) {
                                 return comment.length() <= 80 ? comment : comment.substring(0, 77) + "...";
                             }
@@ -767,7 +767,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             }
         }
 
-        /*
+        /**
          * Bug 62336: On Windows CTRL+6 doesn't give us an actionCommand, so
          * we have to try harder and read the KeyEvent from the EventQueue
          */
@@ -777,8 +777,7 @@ private static String getCurrentKey(ActionEvent actionEvent) {
                 return actionCommand;
             }
             AWTEvent currentEvent = EventQueue.getCurrentEvent();
-            if (currentEvent instanceof KeyEvent) {
-                KeyEvent keyEvent = (KeyEvent) currentEvent;
+            if (currentEvent instanceof KeyEvent keyEvent) {
                 return KeyEvent.getKeyText(keyEvent.getKeyCode());
             }
             log.debug("No keycode could be found for this actionEvent {}", actionEvent);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java b/src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java
index d109c1c13ec..2651765d738 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java
@@ -80,15 +80,13 @@ public void clearGui() {
      */
     @Override
     public String getName() {
-        /*
-         * Null check is needed because some implementations of JPanel end up calling
-         * getName(). This is a bug, which has been reported as:
-         * http://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8175888
-         *
-         * See also
-         * https://www.securecoding.cert.org/confluence/display/java/MET05-J.+Ensure+that+constructors+do+not+call+overridable+methods
-         * https://dev.eclipse.org/sonar/coding_rules#rule_key=squid%3AS1699
-         */
+        // Null check is needed because some implementations of JPanel end up calling
+        // getName(). This is a bug, which has been reported as:
+        // http://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8175888
+        //
+        // See also
+        // https://www.securecoding.cert.org/confluence/display/java/MET05-J.+Ensure+that+constructors+do+not+call+overridable+methods
+        // https://dev.eclipse.org/sonar/coding_rules#rule_key=squid%3AS1699
         if (nameField != null) { // NOSONAR suppress warning as the null check is needed as per above
             return nameField.getText();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
index 05195624971..898dc054560 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
@@ -92,16 +92,15 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
             File f = new File(rc.getFilename());
             if (f.exists()) {
                 switch (actionOnFile) {
-                    case APPEND:
-                        break;
-                    case DELETE:
-                        if (f.delete()) {
-                            break;
-                        } else {
+                    case APPEND -> {
+                    }
+                    case DELETE -> {
+                        if (!f.delete()) {
                             log.error("Could not delete existing file {}", f.getAbsolutePath());
                             return false;
                         }
-                    case ASK:
+                    }
+                    case ASK -> {
                         String[] option = new String[]{JMeterUtils.getResString("concat_result"),
                                 JMeterUtils.getResString("dont_start"), JMeterUtils.getResString("replace_file")};
                         String question = MessageFormat.format(
@@ -133,7 +132,7 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
                                 // Exit without start the test
                                 return false;
                         }
-                        break;
+                    }
                 }
             }
         }
@@ -147,15 +146,13 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
     protected static JFrame getParentFrame(ActionEvent event) {
         JFrame parent = null;
         Object source = event.getSource();
-        if (source instanceof JMenuItem) {
-            JMenuItem item = (JMenuItem) source;
+        if (source instanceof JMenuItem item) {
             Component comp = item.getParent();
-            if (comp instanceof JPopupMenu) {
-                JPopupMenu popup = (JPopupMenu) comp;
+            if (comp instanceof JPopupMenu popup) {
                 comp = popup.getInvoker();
-                Window window = SwingUtilities.windowForComponent((Component) comp);
-                if (window instanceof JFrame) {
-                    parent = (JFrame) window;
+                Window window = SwingUtilities.windowForComponent(comp);
+                if (window instanceof JFrame jFrame) {
+                    parent = jFrame;
                 }
             }
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
index a3f3a3998b7..053b06f8bd8 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java
@@ -61,15 +61,14 @@ public void doAction(ActionEvent e) {
         final String actionCommand = e.getActionCommand();
         if (actionCommand.equals(ActionNames.CLEAR)) {
             JMeterGUIComponent guiComp = guiPackage.getCurrentGui();
-            if (guiComp instanceof Clearable){
-                ((Clearable) guiComp).clearData();
+            if (guiComp instanceof Clearable clearable){
+                clearable.clearData();
             }
         } else {
             guiPackage.getMainFrame().clearData();
             for (JMeterTreeNode node : guiPackage.getTreeModel().getNodesOfType(Clearable.class)) {
                 JMeterGUIComponent guiComp = guiPackage.getGui(node.getTestElement());
-                if (guiComp instanceof Clearable){
-                    Clearable item = (Clearable) guiComp;
+                if (guiComp instanceof Clearable item){
                     try {
                         item.clearData();
                     } catch (Exception ex) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
index 0c7b5995420..d25400924b7 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
@@ -58,7 +58,7 @@ public class CompileJSR223TestElements extends AbstractAction implements MenuCre
      */
     private static class JSR223TestElementCompilerVisitor implements HashTreeTraverser {
         private int elementsWithCompilationErrors = 0;
-        public JSR223TestElementCompilerVisitor() {
+        private JSR223TestElementCompilerVisitor() {
             super();
         }
         @Override
@@ -66,8 +66,7 @@ public void addNode(Object object, HashTree subTree) {
             JMeterTreeNode treeNode = (JMeterTreeNode) object;
             Object userObject = treeNode.getUserObject();
             treeNode.setMarkedBySearch(false);
-            if (treeNode.isEnabled() && (userObject instanceof JSR223TestElement)) {
-                JSR223TestElement element = (JSR223TestElement) userObject;
+            if (treeNode.isEnabled() && (userObject instanceof JSR223TestElement element)) {
                 TestBeanHelper.prepare(element);
                 try {
                     log.info("Compiling JSR223 element named: '{}'", element.getName());
@@ -92,10 +91,11 @@ public void subtractNode() {
         public void processPath() {
             // NOOP
         }
+
         /**
          * @return the elementsWithCompilationErrors
          */
-        public int getElementsWithCompilationErrors() {
+        private int getElementsWithCompilationErrors() {
             return elementsWithCompilationErrors;
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
index 3979512efe2..4e122198086 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java
@@ -52,9 +52,6 @@ public class Copy extends AbstractAction {
         commands.add(ActionNames.COPY);
     }
 
-    /*
-     * @see org.apache.jmeter.gui.action.Command#getActionNames()
-     */
     @Override
     public Set<String> getActionNames() {
         return commands;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
index 996cc149e8d..b2ed8d7048b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java
@@ -40,9 +40,6 @@ public class Duplicate extends AbstractAction {
         commands.add(ActionNames.DUPLICATE);
     }
 
-    /*
-     * @see org.apache.jmeter.gui.action.Command#getActionNames()
-     */
     @Override
     public Set<String> getActionNames() {
         return commands;
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
index 78f9767b5a8..375b66aeba1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
@@ -77,15 +77,12 @@ public void doAction(ActionEvent e) {
             JDialog dialog = initHelpWindow();
             dialog.setVisible(true); // set the window visible immediately
 
-            /*
-             * This means that a new page will be shown before rendering is complete,
-             * however the correct location will be displayed.
-             * Attempts to use a "page" PropertyChangeListener to detect when the page
-             * has been loaded failed to work any better.
-             */
+            // This means that a new page will be shown before rendering is complete,
+            // however the correct location will be displayed.
+            // Attempts to use a "page" PropertyChangeListener to detect when the page
+            // has been loaded failed to work any better.
             StringBuilder url=new StringBuilder();
-            if (e.getSource() instanceof String[]) {
-                String[] source = (String[]) e.getSource();
+            if (e.getSource() instanceof String[] source) {
                 url.append(source[0]).append('#').append(source[1]);
             } else {
                 url.append(HELP_COMPONENTS).append('#').append(GuiPackage.getInstance().getTreeListener().getCurrentNode().getDocAnchor());
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
index a75554ca6a1..127eb304cc1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
@@ -195,39 +195,18 @@ private static String getMenuItemDisplayName(File file) {
      * Get the KeyEvent to use as shortcut key for menu item
      */
     private static int getShortcutKey(int index) {
-        int shortKey = -1;
-        switch(index+1) {
-            case 1:
-                shortKey = KeyEvent.VK_1;
-                break;
-            case 2:
-                shortKey = KeyEvent.VK_2;
-                break;
-            case 3:
-                shortKey = KeyEvent.VK_3;
-                break;
-            case 4:
-                shortKey = KeyEvent.VK_4;
-                break;
-            case 5:
-                shortKey = KeyEvent.VK_5;
-                break;
-            case 6:
-                shortKey = KeyEvent.VK_6;
-                break;
-            case 7:
-                shortKey = KeyEvent.VK_7;
-                break;
-            case 8:
-                shortKey = KeyEvent.VK_8;
-                break;
-            case 9:
-                shortKey = KeyEvent.VK_9;
-                break;
-            default:
-                break;
-        }
-        return shortKey;
+        return switch (index + 1) {
+            case 1 -> KeyEvent.VK_1;
+            case 2 -> KeyEvent.VK_2;
+            case 3 -> KeyEvent.VK_3;
+            case 4 -> KeyEvent.VK_4;
+            case 5 -> KeyEvent.VK_5;
+            case 6 -> KeyEvent.VK_6;
+            case 7 -> KeyEvent.VK_7;
+            case 8 -> KeyEvent.VK_8;
+            case 9 -> KeyEvent.VK_9;
+            default -> -1;
+        };
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index 9572619b8fd..f31e20198df 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -468,7 +468,7 @@ private static class PrivatePatternFileFilter implements IOFileFilter {
 
         private final Pattern pattern;
 
-        public PrivatePatternFileFilter(Pattern pattern) {
+        private PrivatePatternFileFilter(Pattern pattern) {
             if(pattern == null) {
                 throw new IllegalArgumentException("pattern cannot be null !"); //$NON-NLS-1$
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
index c73cabefc3d..6fe65f06b17 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java
@@ -81,8 +81,8 @@ public void doAction(ActionEvent e) throws IllegalUserActionException {
         if (e.getActionCommand().equals(ActionNames.SAVE_GRAPHICS)) {
             JMeterGUIComponent component = GuiPackage.getInstance().getCurrentGui();
             // get the JComponent from the visualizer
-            if (component instanceof Printable) {
-                JComponent comp = ((Printable) component).getPrintableComponent();
+            if (component instanceof Printable printable) {
+                JComponent comp = printable.getPrintableComponent();
                 saveImage(comp);
             }
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
index dc54b002430..5146a7e40b4 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
@@ -471,8 +471,7 @@ private void doReplaceAll(ActionEvent e) {
     private static Map.Entry<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
             String regex, String replaceBy, boolean caseSensitiveReplacement) {
         try {
-            if (jMeterTreeNode.getUserObject() instanceof Replaceable) {
-                Replaceable replaceable = (Replaceable) jMeterTreeNode.getUserObject();
+            if (jMeterTreeNode.getUserObject() instanceof Replaceable replaceable) {
                 int numberOfReplacements = replaceable.replace(regex, replaceBy, caseSensitiveReplacement);
                 if (numberOfReplacements > 0) {
                     if (logger.isInfoEnabled()) {
@@ -488,9 +487,6 @@ private static Map.Entry<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMe
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see java.awt.Dialog#setVisible(boolean)
-     */
     @Override
     public void setVisible(boolean b) {
         super.setVisible(b);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
index b31d1f3d734..3c2771d6354 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java
@@ -279,18 +279,11 @@ private static boolean isInThreadGroups(TestElement item, AbstractThreadGroup[]
      * @return {@link TreeCloner}
      */
     private static ListedHashTree cloneTree(HashTree testTree, RunMode runMode) {
-        TreeCloner cloner = null;
-        switch (runMode) {
-            case VALIDATION:
-                cloner = createTreeClonerForValidation(false);
-                break;
-            case IGNORING_TIMERS:
-                cloner = new TreeClonerNoTimer(false);
-                break;
-            case AS_IS:
-                cloner = new TreeCloner(false);
-                break;
-        }
+        TreeCloner cloner = switch (runMode) {
+            case VALIDATION -> createTreeClonerForValidation(false);
+            case IGNORING_TIMERS -> new TreeClonerNoTimer(false);
+            case AS_IS -> new TreeCloner(false);
+        };
         testTree.traverse(cloner);
         return cloner.getClonedTree();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java b/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
index f4f5ff60a6e..007482f28bc 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java
@@ -47,25 +47,16 @@ public StopStoppables() {
         super();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.action.AbstractAction#getActionNames()
-     */
     @Override
     public Set<String> getActionNames() {
         return commands;
     }
 
-    /* (non-Javadoc)
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-     */
     @Override
     public void actionPerformed(ActionEvent e) {
 
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.action.AbstractAction#doAction(java.awt.event.ActionEvent)
-     */
     @Override
     public void doAction(ActionEvent e) {
         GuiPackage instance = GuiPackage.getInstance();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java b/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
index e2c797a7d99..8863b97ff64 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
@@ -79,16 +79,14 @@ protected Object addNodeToTree(Object node) {
             return node; // don't add timer or backend
         } else {
             Object clonedNode = super.addNodeToTree(node);
-            if(clonedNode instanceof org.apache.jmeter.threads.ThreadGroup) {
-                ThreadGroup tg = (ThreadGroup)clonedNode;
+            if(clonedNode instanceof ThreadGroup tg) {
                 tg.setNumThreads(VALIDATION_NUMBER_OF_THREADS);
                 tg.setScheduler(false);
                 tg.setProperty(ThreadGroup.DELAY, 0);
                 if(((AbstractThreadGroup)clonedNode).getSamplerController() instanceof LoopController) {
                     ((LoopController)((AbstractThreadGroup)clonedNode).getSamplerController()).setLoops(VALIDATION_ITERATIONS);
                 }
-            } else if (clonedNode instanceof OpenModelThreadGroup) {
-                OpenModelThreadGroup tg = (OpenModelThreadGroup) clonedNode;
+            } else if (clonedNode instanceof OpenModelThreadGroup tg) {
                 tg.setRandomSeedString("0");
                 // Launch all the iterations during the first second, and leave one hour for the threads to complete
                 tg.setScheduleString("rate(" + VALIDATION_ITERATIONS + " / sec) even_arrivals(1 sec) pause(1 hour)");
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
index 65c86be2893..248ccc6bd54 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java
@@ -39,8 +39,8 @@ public LogEventObject(Object source) {
 
     public LogEventObject(Object source, String seralizedString) {
         super(source);
-        if (source instanceof LogEvent) {
-            level = ((LogEvent) source).getLevel();
+        if (source instanceof LogEvent logEvent) {
+            level = logEvent.getLevel();
         }
         this.seralizedString = seralizedString;
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
index 7c39b898ed0..0f086fc0f68 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
@@ -77,7 +77,7 @@ public StaticJMeterGUIComponent(Class<?> c, TestElementMetadata metadata) {
 
     private static List<String> getGroups(Class<?> c, TestElementMetadata metadata) {
         String[] groups = metadata.actionGroups();
-        if (groups.length == 1 && groups[0].equals("")) {
+        if (groups.length == 1 && groups[0].isEmpty()) {
             // Annotations can't hold null values, so we use empty string instead
             return null;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
index c9ec94b808a..a2411135e77 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java
@@ -112,8 +112,7 @@ public JMeterTreeNode getNodeOf(TestElement userObject) {
     public HashTree addSubTree(HashTree subTree, JMeterTreeNode current) throws IllegalUserActionException {
         for (Object o : subTree.list()) {
             TestElement item = (TestElement) o;
-            if (item instanceof TestPlan) {
-                TestPlan tp = (TestPlan) item;
+            if (item instanceof TestPlan tp) {
                 current = (JMeterTreeNode) ((JMeterTreeNode) getRoot()).getChildAt(0);
                 final TestPlan userObject = (TestPlan) current.getUserObject();
                 userObject.addTestElement(item);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
index 31e6fcd896e..1d043b915b9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
@@ -280,7 +280,7 @@ private JMeterTreeNode[] getDraggedNodes(Transferable t) {
     private class NodesTransferable implements Transferable {
         private final JMeterTreeNode[] nodes;
 
-        public NodesTransferable(JMeterTreeNode[] nodes) {
+        private NodesTransferable(JMeterTreeNode[] nodes) {
             this.nodes = nodes;
         }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
index 41b8f7b0069..e2bdb873516 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java
@@ -253,7 +253,7 @@ public static JFileChooser promptToSaveFile(String filename) {
     public static JFileChooser promptToSaveFile(String filename, String[] extensions) {
         if (lastJFCDirectory == null) {
             String start = System.getProperty("user.dir", "");//$NON-NLS-1$//$NON-NLS-2$
-            if (start.length() > 0) {
+            if (!start.isEmpty()) {
                 jfc = new JFileChooser(new File(start));
             }
             lastJFCDirectory = jfc.getCurrentDirectory().getAbsolutePath();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
index 2678c8bdec6..7cf658a9880 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
@@ -52,8 +52,7 @@ public HeaderAsPropertyRendererWrapper(TableCellRenderer renderer) {
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
-        if(delegate instanceof DefaultTableCellRenderer) {
-            DefaultTableCellRenderer tr = (DefaultTableCellRenderer) delegate;
+        if(delegate instanceof DefaultTableCellRenderer tr) {
             if (table != null) {
                 JTableHeader header = table.getTableHeader();
                 if (header != null){
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java
index 145c31e7a20..2393c9982f5 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java
@@ -62,8 +62,8 @@ public Component add(Component c) {
             subPanel.add(Box.createHorizontalStrut(hgap));
         }
 
-        if (c instanceof JComponent) {
-            ((JComponent) c).setAlignmentY(verticalAlign);
+        if (c instanceof JComponent jComponent) {
+            jComponent.setAlignmentY(verticalAlign);
         }
         return subPanel.add(c);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
index 27b15538eae..b00de83db1b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java
@@ -46,7 +46,7 @@ public class JDateField extends JTextField {
     // Datefields are not thread-safe
     private final DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); // $NON-NLS-1$
 
-    /*
+    /**
      * The following array must agree with dateFormat
      *
      * It is used to translate the positions in the buffer to the values used by
@@ -122,7 +122,7 @@ public Date getDate() {
         }
     }
 
-    /*
+    /**
      * Convert position in buffer to Calendar type Assumes that pos >=0 (which
      * is true for getCaretPosition())
      */
@@ -147,7 +147,7 @@ private Calendar parseDate(String datetime) {
         return c;
     }
 
-    /*
+    /**
      * Update the current field. The addend is only expected to be +1/-1, but
      * other values will work. N.B. the roll() method only supports changes by a
      * single unit - up or down
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index 4f829e9d2ea..b5fed49b826 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -395,12 +395,10 @@ private static JMenu makeLanguageMenu() {
 
         LangMenuHelper langMenu = new LangMenuHelper(languageMenu);
 
-        /*
-         * Note: the item name is used by ChangeLanguage to create a Locale for
-         * that language, so need to ensure that the language strings are valid
-         * If they exist, use the Locale language constants.
-         * Also, need to ensure that the names are valid resource entries too.
-         */
+        // Note: the item name is used by ChangeLanguage to create a Locale for
+        // that language, so need to ensure that the language strings are valid
+        // If they exist, use the Locale language constants.
+        // Also, need to ensure that the names are valid resource entries too.
 
         Locale currentLocale = JMeterUtils.getLocale();
         String selectedLocale = currentLocale == null ? "" : currentLocale.toString();
@@ -705,8 +703,7 @@ private void updateMenuElement(MenuElement menu) {
                     return;
                 }
             }
-            if (component instanceof JMenu) {
-                final JMenu jMenu = (JMenu) component;
+            if (component instanceof JMenu jMenu) {
                 if (isResource(jMenu.getActionCommand())){
                     jMenu.setText(JMeterUtils.getResString(compName));
                 }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index 801f626ab11..759edae5af2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -95,9 +95,8 @@ public static JMeterToolBar createToolbar(boolean visible) {
     @Override
     protected void addImpl(Component comp, Object constraints, int index) {
         super.addImpl(comp, constraints, index);
-        if (comp instanceof JButton) {
+        if (comp instanceof JButton b) {
             // Ensure buttons added to the toolbar have the same style.
-            JButton b = (JButton) comp;
             b.setFocusable(false);
             if (b.isBorderPainted() && (b.getText() == null || b.getText().isEmpty())) {
                 b.setRolloverEnabled(true);
@@ -245,8 +244,7 @@ private Map<String, Boolean> getCurrentButtonsStates() {
         Component[] components = getComponents();
         Map<String, Boolean> buttonStates = new HashMap<>(components.length);
         for (Component component : components) {
-            if (component instanceof JButton) {
-                JButton button = (JButton) component;
+            if (component instanceof JButton button) {
                 buttonStates.put(button.getActionCommand(), button.isEnabled());
             }
         }
@@ -258,15 +256,15 @@ private Map<String, Boolean> getCurrentButtonsStates() {
      */
     public void initButtonsState() {
         Map<String, Boolean> buttonStates = new HashMap<>();
-        buttonStates.put(ActionNames.ACTION_START, Boolean.TRUE);
-        buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.TRUE);
-        buttonStates.put(ActionNames.ACTION_STOP, Boolean.FALSE);
-        buttonStates.put(ActionNames.ACTION_SHUTDOWN, Boolean.FALSE);
-        buttonStates.put(ActionNames.UNDO, Boolean.FALSE);
-        buttonStates.put(ActionNames.REDO, Boolean.FALSE);
-        buttonStates.put(ActionNames.REMOTE_START_ALL, Boolean.TRUE);
-        buttonStates.put(ActionNames.REMOTE_STOP_ALL, Boolean.FALSE);
-        buttonStates.put(ActionNames.REMOTE_SHUT_ALL, Boolean.FALSE);
+        buttonStates.put(ActionNames.ACTION_START, true);
+        buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, true);
+        buttonStates.put(ActionNames.ACTION_STOP, false);
+        buttonStates.put(ActionNames.ACTION_SHUTDOWN, false);
+        buttonStates.put(ActionNames.UNDO, false);
+        buttonStates.put(ActionNames.REDO, false);
+        buttonStates.put(ActionNames.REMOTE_START_ALL, true);
+        buttonStates.put(ActionNames.REMOTE_STOP_ALL, false);
+        buttonStates.put(ActionNames.REMOTE_SHUT_ALL, false);
         updateButtons(buttonStates);
     }
 
@@ -327,8 +325,7 @@ private void updateButtons(Map<String, Boolean> buttonStates) {
         boolean synchronous = false;
         JMeterUtils.runSafe(synchronous, () -> {
             for (Component component : getComponents()) {
-                if (component instanceof JButton) {
-                    JButton button = (JButton) component;
+                if (component instanceof JButton button) {
                     Boolean enabled = buttonStates.get(button.getActionCommand());
                     if (enabled != null) {
                         button.setEnabled(enabled);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java b/src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
index 847af66d240..f882b2f337b 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
@@ -39,10 +39,10 @@ public static NumberFieldErrorListener getNumberFieldErrorListener() {
     public void focusLost(FocusEvent e) {
         Component source = (Component) e.getSource();
         String text = "";
-        if (source instanceof JTextComponent) {
-            text = ((JTextComponent) source).getText();
-        } else if (source instanceof TextComponent) {
-            text = ((TextComponent) source).getText();
+        if (source instanceof JTextComponent jTextComponent) {
+            text = jTextComponent.getText();
+        } else if (source instanceof TextComponent textComponent) {
+            text = textComponent.getText();
         }
         try {
             Integer.parseInt(text);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
index b51d0a4768e..c5bd87013d9 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
@@ -40,7 +40,7 @@ public class PowerTableModel extends DefaultTableModel {
     private Class<?>[] columnClasses;
 
     private static final List<Object> DEFAULT_ARGS = Collections.unmodifiableList(Arrays.asList("", 0,
-            0L, Boolean.FALSE, 0F, 0D, ' ',
+            0L, false, 0F, 0D, ' ',
             Byte.MIN_VALUE, Short.MIN_VALUE));
 
     public PowerTableModel(String[] headers, Class<?>[] classes) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
index e4d3fdb07c9..b8058d2a8e1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
@@ -246,8 +246,8 @@ public void setValue(Object value) {
          * @see #shouldSelectCell
          */
         public boolean isCellEditable(EventObject anEvent) {
-            if (anEvent instanceof MouseEvent) {
-                return ((MouseEvent) anEvent).getClickCount() >= clickCountToStart;
+            if (anEvent instanceof MouseEvent mouseEvent) {
+                return mouseEvent.getClickCount() >= clickCountToStart;
             }
             return true;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
index 1698c9a0623..5153ee63c5e 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
@@ -181,10 +181,10 @@ private void iterateState() {
         // Fire ActionEvent
         int modifiers = 0;
         AWTEvent currentEvent = EventQueue.getCurrentEvent();
-        if (currentEvent instanceof InputEvent) {
-            modifiers = ((InputEvent) currentEvent).getModifiers();
-        } else if (currentEvent instanceof ActionEvent) {
-            modifiers = ((ActionEvent) currentEvent).getModifiers();
+        if (currentEvent instanceof InputEvent inputEvent) {
+            modifiers = inputEvent.getModifiers();
+        } else if (currentEvent instanceof ActionEvent actionEvent) {
+            modifiers = actionEvent.getModifiers();
         }
         fireActionPerformed(new ActionEvent(this,
                 ActionEvent.ACTION_PERFORMED, getText(),
@@ -204,7 +204,7 @@ private static class TristateButtonModel extends ToggleButtonModel {
         private final Icon icon;
         private final boolean original;
 
-        public TristateButtonModel(TristateState initial,
+        private TristateButtonModel(TristateState initial,
                 TristateCheckBox tristateCheckBox, boolean original) {
             setState(initial);
             this.tristateCheckBox = tristateCheckBox;
@@ -212,11 +212,11 @@ public TristateButtonModel(TristateState initial,
             this.original = original;
         }
 
-        public void setIndeterminate() {
+        private void setIndeterminate() {
             setState(TristateState.INDETERMINATE);
         }
 
-        public boolean isIndeterminate() {
+        private boolean isIndeterminate() {
             return state == TristateState.INDETERMINATE;
         }
 
@@ -286,7 +286,7 @@ private void displayState() {
 
         }
 
-        public TristateState getState() {
+        private TristateState getState() {
             return state;
         }
     }
@@ -301,7 +301,7 @@ private static class TristateCheckBoxIcon implements Icon, UIResource, Serializa
         private final int iconHeight;
         private final int iconWidth;
 
-        public TristateCheckBoxIcon() {
+        private TristateCheckBoxIcon() {
             // Assume that the UI has not changed since the checkbox was created
             UIDefaults defaults = UIManager.getLookAndFeelDefaults();
             Icon icon = defaults.getIcon("CheckBox.icon");
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
index 4d72f72ace3..4da731df6ae 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
@@ -62,8 +62,8 @@ public Component add(Component c) {
             subPanel.add(Box.createVerticalStrut(vgap));
         }
 
-        if (c instanceof JComponent) {
-            ((JComponent) c).setAlignmentX(horizontalAlign);
+        if (c instanceof JComponent jComponent) {
+            jComponent.setAlignmentX(horizontalAlign);
         }
 
         return subPanel.add(c);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
index c7922aff9f3..a26da107104 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
@@ -99,7 +99,7 @@ public class ReportGeneratorConfiguration {
     // Required graph properties
     // Exclude controllers
     public static final String GRAPH_KEY_EXCLUDE_CONTROLLERS = "exclude_controllers";
-    public static final Boolean GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT = Boolean.FALSE;
+    public static final Boolean GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT = false;
 
     // Title
     public static final String GRAPH_KEY_TITLE = "title";
@@ -108,7 +108,7 @@ public class ReportGeneratorConfiguration {
     // Required exporter properties
     // Filters only sample series ?
     public static final String EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES = "filters_only_sample_series";
-    public static final Boolean EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = Boolean.TRUE;
+    public static final Boolean EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = true;
 
     // Series filter
     public static final String EXPORTER_KEY_SERIES_FILTER = "series_filter";
@@ -116,7 +116,7 @@ public class ReportGeneratorConfiguration {
 
     // Show controllers only
     public static final String EXPORTER_KEY_SHOW_CONTROLLERS_ONLY = "show_controllers_only";
-    public static final Boolean EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT = Boolean.FALSE;
+    public static final Boolean EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT = false;
 
     // Optional exporter properties
     public static final String EXPORTER_KEY_GRAPH_EXTRA_OPTIONS = "graph_options";
@@ -645,7 +645,7 @@ public static ReportGeneratorConfiguration loadFromProperties(
         final boolean ignoreTCFromTop5ErrorsBySampler = getRequiredProperty(
                 props,
                 REPORT_GENERATOR_KEY_EXCLUDE_TC_FROM_TOP5_ERRORS_BY_SAMPLER,
-                Boolean.TRUE,
+                true,
                 Boolean.class);
         configuration.setIgnoreTCFromTop5ErrorsBySampler(ignoreTCFromTop5ErrorsBySampler);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java b/src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java
index 0d97eed5cc1..261084bcd53 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java
@@ -24,13 +24,6 @@
  * @since 3.0
  */
 public class ControllerSamplePredicate implements SamplePredicate {
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SamplePredicate#matches(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public boolean matches(Sample sample) {
         return sample.isController();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
index efa09ff3114..eeb0e137455 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java
@@ -131,11 +131,6 @@ public <T> T getData(Class<T> clazz, String name) {
         return getData(clazz, metadata.ensureIndexOf(name), name);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return String.join(String.valueOf(metadata.getSeparator()), data);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 2728cb1e8e4..9c689c58073 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -218,11 +218,6 @@ public int ensureIndexOf(String col) {
         return index;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return String.join(String.valueOf(separator), columns);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
index f52bf191d63..c141165e911 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
@@ -51,8 +51,7 @@ protected AbstractDataExporter() {
     protected static <T> T findValue(Class<T> clazz, String data, ResultData root) {
         T value = null;
         ResultData result = findData(data, root);
-        if (result instanceof ValueResultData) {
-            ValueResultData valueResult = (ValueResultData) result;
+        if (result instanceof ValueResultData valueResult) {
             Object object = valueResult.getValue();
             if (object != null && clazz.isAssignableFrom(object.getClass())) {
                 value = clazz.cast(object);
@@ -73,21 +72,20 @@ protected static <T> T findValue(Class<T> clazz, String data, ResultData root) {
      */
     protected static ResultData findData(String data, ResultData root) {
         String[] pathItems = data.split("\\.");
-        if (pathItems == null || !(root instanceof MapResultData)) {
+        if (pathItems == null || !(root instanceof MapResultData map)) {
             return null;
         }
 
         ResultData result = null;
         int count = pathItems.length;
         int index = 0;
-        MapResultData map = (MapResultData) root;
         while (index < count && result == null) {
             ResultData current = map.getResult(pathItems[index]);
             if (index == count - 1) {
                 result = current;
             } else {
-                if (current instanceof MapResultData) {
-                    map = (MapResultData) current;
+                if (current instanceof MapResultData mapResultData) {
+                    map = mapResultData;
                     index++;
                 }
             }
@@ -95,22 +93,11 @@ protected static ResultData findData(String data, ResultData root) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.dashboard.DataExporter#getName()
-     */
     @Override
     public String getName() {
         return name;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.dashboard.DataExporter#setName(java.lang.String)
-     */
     @Override
     public void setName(String name) {
         this.name = name;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index d36cc6a33f4..9e65efa8d87 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -94,8 +94,8 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
      * @param context {@link DataContext}
      */
     private static void addToContext(String key, Object value, DataContext context) {
-        if (value instanceof String) {
-            value = '"' + (String) value + '"';
+        if (value instanceof String s) {
+            value = '"' + s + '"';
         }
         context.put(key, value);
     }
@@ -118,17 +118,10 @@ private static class ExtraOptionsResultCustomizer implements ResultCustomizer {
          *
          * @param extraOptions to inject
          */
-        public final void setExtraOptions(SubConfiguration extraOptions) {
+        private void setExtraOptions(SubConfiguration extraOptions) {
             this.extraOptions = extraOptions;
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see org.apache.jmeter.report.dashboard.HtmlTemplateExporter.
-         * ResultCustomizer#customizeResult(org.apache.jmeter.report.processor.
-         * ResultData)
-         */
         @Override
         public ResultData customizeResult(ResultData result) {
             MapResultData customizedResult = new MapResultData();
@@ -162,11 +155,11 @@ private static class EmptyGraphChecker implements ResultChecker {
         private boolean excludesControllers;
         private String graphId;
 
-        public final void setExcludesControllers(boolean excludesControllers) {
+        private void setExcludesControllers(boolean excludesControllers) {
             this.excludesControllers = excludesControllers;
         }
 
-        public final void setGraphId(String graphId) {
+        private void setGraphId(String graphId) {
             this.graphId = graphId;
         }
 
@@ -177,7 +170,7 @@ public final void setGraphId(String graphId) {
          * @param showControllerSeriesOnly flag to control visibility of controller
          * @param filterPattern to use
          */
-        public EmptyGraphChecker(boolean filtersOnlySampleSeries,
+        private EmptyGraphChecker(boolean filtersOnlySampleSeries,
                 boolean showControllerSeriesOnly, Pattern filterPattern) {
             this.filtersOnlySampleSeries = filtersOnlySampleSeries;
             this.showControllerSeriesOnly = showControllerSeriesOnly;
@@ -208,19 +201,17 @@ public boolean checkResult(DataContext dataContext, ResultData result) {
 
             // Detect whether none series matches the series filter.
             ResultData seriesResult = findData(AbstractGraphConsumer.RESULT_SERIES, result);
-            if (!(seriesResult instanceof ListResultData)) {
+            if (!(seriesResult instanceof ListResultData seriesList)) {
                 return true;
             }
 
             // Try to find at least one pattern matching
-            ListResultData seriesList = (ListResultData) seriesResult;
             int count = seriesList.getSize();
             int index = 0;
             boolean matches = false;
             while (index < count && !matches) {
                 ResultData currentResult = seriesList.get(index);
-                if (currentResult instanceof MapResultData) {
-                    MapResultData seriesData = (MapResultData) currentResult;
+                if (currentResult instanceof MapResultData seriesData) {
                     String name = findValue(String.class,
                             AbstractGraphConsumer.RESULT_SERIES_NAME,
                             seriesData);
@@ -470,8 +461,7 @@ private static <T> void addResultToContext(
             String resultKey, Map<String, Object> storage, DataContext dataContext,
             ResultDataVisitor<T> visitor, ResultCustomizer customizer, ResultChecker checker) {
         Object data = storage.get(resultKey);
-        if (data instanceof ResultData) {
-            ResultData result = (ResultData) data;
+        if (data instanceof ResultData result) {
             if (checker != null) {
                 checker.checkResult(dataContext, result);
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index 2b05ed26102..81eb1cf6d6d 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -68,9 +68,8 @@ public JsonExporter() {
     public void export(SampleContext context, File file, ReportGeneratorConfiguration reportGeneratorConfiguration)
             throws ExportException {
         Object data = context.getData().get(ReportGenerator.STATISTICS_SUMMARY_CONSUMER_NAME);
-        if (data instanceof MapResultData) {
+        if (data instanceof MapResultData result) {
             LOGGER.info("Found data for consumer {} in context", ReportGenerator.STATISTICS_SUMMARY_CONSUMER_NAME);
-            MapResultData result = (MapResultData) data;
             Map<String, SamplingStatistic> statistics = new HashMap<>();
             MapResultData overallData = (MapResultData) result.getResult("overall");
             LOGGER.info("Creating statistics for overall");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java
index 89b723c4f28..c469c97fa30 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java
@@ -42,13 +42,6 @@ public class JsonizerVisitor implements ResultDataVisitor<String> {
     public JsonizerVisitor() {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultDataVisitor#visitListResult(
-     * org.apache.jmeter.report.processor.ListResultData)
-     */
     @Override
     public String visitListResult(ListResultData listResult) {
         String result = "";
@@ -63,13 +56,6 @@ public String visitListResult(ListResultData listResult) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultDataVisitor#visitMapResult(org
-     * .apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     public String visitMapResult(MapResultData mapResult) {
         String result = "";
@@ -83,13 +69,6 @@ public String visitMapResult(MapResultData mapResult) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultDataVisitor#visitValueResult
-     * (org.apache.jmeter.report.processor.ValueResultData)
-     */
     @Override
     public String visitValueResult(ValueResultData valueResult) {
         String result = "";
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index 1e8fa7a9664..55bfb3d01ee 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -75,12 +75,6 @@ public TemplateVisitor(Path source, Path target,
         this.data = data;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.nio.file.SimpleFileVisitor#preVisitDirectory(java.lang.Object,
-     * java.nio.file.attribute.BasicFileAttributes)
-     */
     @Override
     public FileVisitResult preVisitDirectory(Path file, BasicFileAttributes attrs)
             throws IOException {
@@ -99,12 +93,6 @@ public FileVisitResult preVisitDirectory(Path file, BasicFileAttributes attrs)
         return FileVisitResult.CONTINUE;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.nio.file.SimpleFileVisitor#visitFile(java.lang.Object,
-     * java.nio.file.attribute.BasicFileAttributes)
-     */
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
             throws IOException {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java
index 2d0778defd3..d7b37741cf7 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java
@@ -39,38 +39,18 @@ protected AbstractAggregatorFactory() {
 
     protected abstract Aggregator createAggregator();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregatorFactory#
-     * createValueAggregator(double)
-     */
     @Override
     public final Aggregator createValueAggregator() {
         return createAggregator();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.GraphAggregatorFactory#createKeyAggregator
-     * ()
-     */
     @Override
     public final Aggregator createKeyAggregator() {
         return createAggregator();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregatorFactory#
-     * createAggregatedKeyValueAggregator()
-     */
     @Override
     public final Aggregator createAggregatedKeyValueAggregator() {
         return createAggregator();
     }
-
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
index a0e40d31f47..0678721eed5 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
@@ -32,24 +32,11 @@ public class AbstractSampleProcessor implements SampleProcessor {
 
     private final ArrayList<ChannelContext> channelContexts = new ArrayList<>();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleProcessor#getSampleContext()
-     */
     @Override
     public SampleContext getSampleContext() {
         return sampleContext;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleProcessor#setSampleContext
-     * (org.apache.jmeter.report.csv.processor.SampleContext)
-     */
     @Override
     public void setSampleContext(SampleContext sampleContext) {
         this.sampleContext = sampleContext;
@@ -71,25 +58,11 @@ private ChannelContext getChannelContext(int channel) {
         return channelContexts.get(channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleProcessor#setChannelAttribute
-     * (int, java.lang.String, java.lang.Object)
-     */
     @Override
     public void setChannelAttribute(int channel, String key, Object value) {
         getChannelContext(channel).put(key, value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleProcessor#getChannelAttribute
-     * (int, java.lang.String)
-     */
     @Override
     public Object getChannelAttribute(int channel, String key) {
         return getChannelContext(channel).get(key);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java
index f8b38d680f8..54b7e85bfaf 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java
@@ -33,63 +33,25 @@ public abstract class AbstractSampleSource implements SampleSource {
     protected AbstractSampleSource() {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
-     */
     @Override
     public abstract void run();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleSource#getSampleContext()
-     */
     @Override
     public SampleContext getSampleContext() {
         return sampleContext;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleSource#setSampleContext(org.
-     * apache.jmeter.report.processor.SampleContext)
-     */
     @Override
     public void setSampleContext(SampleContext sampleContext) {
         this.sampleContext = sampleContext;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleSource#addSampleConsumers(java
-     * .util.List)
-     */
     @Override
     public abstract void setSampleConsumers(List<SampleConsumer> consumers);
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleSource#addSampleConsumer(org
-     * .apache.jmeter.report.processor.SampleConsumer)
-     */
     @Override
     public abstract void addSampleConsumer(SampleConsumer consumer);
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleSource#removeSampleConsumer(
-     * org.apache.jmeter.report.processor.SampleConsumer)
-     */
     @Override
     public abstract void removeSampleConsumer(SampleConsumer consumer);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
index b0beb8cd5f3..0a63891d933 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
@@ -202,11 +202,6 @@ private MapResultData createResultFromKey(String key) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#startConsuming()
-     */
     @Override
     public void startConsuming() {
 
@@ -218,13 +213,6 @@ public void startConsuming() {
         super.startProducing();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleConsumer#consume(org.apache.
-     * jmeter.report.core.Sample, int)
-     */
     @Override
     public void consume(Sample sample, int channel) {
         String key = getKeyFromSample(sample);
@@ -240,11 +228,6 @@ public void consume(Sample sample, int channel) {
         super.produce(sample, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#stopConsuming()
-     */
     @Override
     public void stopConsuming() {
         MapResultData result = new MapResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
index 8462583383a..7e9102be252 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
@@ -71,11 +71,6 @@ public AggregateConsumer(Aggregator aggregator,
         this.selector = selector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#startConsuming()
-     */
     @Override
     public void startConsuming() {
         // Broadcast metadata to consumes for each channel
@@ -87,24 +82,12 @@ public void startConsuming() {
         super.startProducing();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.SampleConsumer#consume(org.apache.
-     * jmeter.report.core.Sample, int)
-     */
     @Override
     public void consume(Sample sample, int channel) {
         aggregator.addValue(selector.select(sample));
         super.produce(sample, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#stopConsuming()
-     */
     @Override
     public void stopConsuming() {
         setDataToContext(getName(), new ValueResultData(aggregator.getResult()));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
index 72f1f703a38..1d4625c16a4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
@@ -66,26 +66,11 @@ protected ListResultData createDataResult(String key, ApdexSummaryData data) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#getKeyFromSample
-     * (org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected String getKeyFromSample(Sample sample) {
         return sample.getName();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#updateData
-     * (org.apache.jmeter.report.processor.AbstractSummaryConsumer.SummaryInfo,
-     * org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected void updateData(SummaryInfo info, Sample sample) {
         if(sample.isEmptyController()) {
@@ -144,13 +129,6 @@ private static double getApdex(ApdexSummaryData data) {
                 / data.getTotalCount();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createResultTitles
-     * ()
-     */
     @Override
     protected ListResultData createResultTitles() {
         ListResultData titles = new ListResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 0ccca5a3a0f..733591629ab 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -191,37 +191,16 @@ private void produce() {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSampleSource#addSampleConsumers
-     * (java.util.List)
-     */
     @Override
     public void setSampleConsumers(List<SampleConsumer> consumers) {
         producer.setSampleConsumers(consumers);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSampleSource#addSampleConsumer
-     * (org.apache.jmeter.report.processor.SampleConsumer)
-     */
     @Override
     public void addSampleConsumer(SampleConsumer consumer) {
         producer.addSampleConsumer(consumer);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSampleSource#removeSampleConsumer
-     * (org.apache.jmeter.report.processor.SampleConsumer)
-     */
     @Override
     public void removeSampleConsumer(SampleConsumer consumer) {
         producer.removeSampleConsumer(consumer);
@@ -248,20 +227,20 @@ private static class PrivateProducer extends AbstractSampleProcessor implements
          * @param consumers list of consumers for the samples (must not be
          *                  {@code null})
          */
-        public void setSampleConsumers(List<SampleConsumer> consumers) {
+        private void setSampleConsumers(List<SampleConsumer> consumers) {
             Objects.requireNonNull(consumers, "consumers must not be null");
 
             this.sampleConsumers = consumers;
         }
 
-        public void addSampleConsumer(SampleConsumer consumer) {
+        private void addSampleConsumer(SampleConsumer consumer) {
             if (consumer == null) {
                 return;
             }
             this.sampleConsumers.add(consumer);
         }
 
-        public void removeSampleConsumer(SampleConsumer consumer) {
+        private void removeSampleConsumer(SampleConsumer consumer) {
             if (consumer == null) {
                 return;
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index 139680380a3..ad3bcbc669a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -52,13 +52,6 @@ public ErrorsSummaryConsumer() {
         super(false);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createDataResult
-     * (java.lang.String)
-     */
     @Override
     protected ListResultData createDataResult(String key, Long data) {
         ListResultData result = new ListResultData();
@@ -71,13 +64,6 @@ protected ListResultData createDataResult(String key, Long data) {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#getKeyFromSample
-     * (org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected String getKeyFromSample(Sample sample) {
         return getErrorKey(sample);
@@ -114,14 +100,6 @@ private static String escapeJson(String responseMessage) {
         return new String(JsonStringEncoder.getInstance().quoteAsString(StringEscapeUtils.escapeHtml4(responseMessage)));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#updateData
-     * (org.apache.jmeter.report.processor.AbstractSummaryConsumer.SummaryInfo,
-     * org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected void updateData(SummaryInfo info, Sample sample) {
         // Initialize overall data if they don't exist
@@ -144,11 +122,6 @@ protected void updateData(SummaryInfo info, Sample sample) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#stopConsuming()
-     */
     @Override
     public void stopConsuming() {
         super.stopConsuming();
@@ -157,13 +130,6 @@ public void stopConsuming() {
         errorCount = 0L;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createResultTitles
-     * ()
-     */
     @Override
     protected ListResultData createResultTitles() {
         ListResultData titles = new ListResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
index da674ee0804..37de195ea29 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java
@@ -30,13 +30,6 @@ public class ListResultData implements ResultData, Iterable<ResultData> {
 
     private final List<ResultData> items = new ArrayList<>();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultData#accept(org.apache.jmeter
-     * .report.processor.ResultDataVisitor)
-     */
     @Override
     public <T> T accept(ResultDataVisitor<T> visitor) {
         return visitor.visitListResult(this);
@@ -81,19 +74,11 @@ public int getSize() {
         return items.size();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Iterable#iterator()
-     */
     @Override
     public Iterator<ResultData> iterator() {
         return items.iterator();
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return "ListResultData [items=" + items + "]";
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
index c52c89b3551..2984e8d36b1 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java
@@ -31,13 +31,6 @@ public class MapResultData implements ResultData {
 
     private final Map<String, ResultData> map = new HashMap<>();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultData#accept(org.apache.jmeter
-     * .report.processor.ResultDataVisitor)
-     */
     @Override
     public <T> T accept(ResultDataVisitor<T> visitor) {
         return visitor.visitMapResult(this);
@@ -87,9 +80,6 @@ public ResultData removeResult(String name) {
         return map.remove(name);
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return "MapResultData [map=" + map + "]";
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java
index 7ceb2e712cd..23c3de2f250 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java
@@ -27,42 +27,22 @@ public class MaxAggregator implements Aggregator {
     private long count = 0L;
     private double value = Double.MIN_VALUE;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return count;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return value;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(double value) {
         this.value = Math.max(this.value, value);
         count++;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         count = 0L;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java
index c839b822f2d..4f4643a9c9a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java
@@ -25,13 +25,6 @@
 public class MaxAggregatorFactory extends AbstractAggregatorFactory {
 
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         return new MaxAggregator();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
index 3258f946316..ac7d60dcf01 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java
@@ -28,41 +28,21 @@ public class MeanAggregator implements Aggregator {
 
     private final Mean mean = new Mean();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return mean.getN();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return mean.getResult();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(double value) {
         mean.increment(value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         mean.clear();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java
index 7b56904e7d7..96bffbbee79 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java
@@ -24,13 +24,6 @@
  */
 public class MeanAggregatorFactory extends AbstractAggregatorFactory {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         return new MeanAggregator();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java
index 4430c44f26b..36e66594195 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java
@@ -25,13 +25,6 @@
  */
 public class MedianAggregatorFactory extends AbstractAggregatorFactory {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         return new PercentileAggregator(50);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java
index d020c4099e0..ec7954e2165 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java
@@ -27,42 +27,22 @@ public class MinAggregator implements Aggregator {
     private long count = 0L;
     private double value = Double.MAX_VALUE;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return count;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return value;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(double value) {
         this.value = Math.min(this.value, value);
         count++;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         count = 0L;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java
index ca81b2ebf72..424d123f352 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java
@@ -54,41 +54,21 @@ public PercentileAggregator(PercentileAggregator lastAggregator) {
         this.percentileIndex = lastAggregator.percentileIndex;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return statistics.getN();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return statistics.getPercentile(percentileIndex);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(double value) {
         statistics.addValue(value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         statistics.clear();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java
index d79a62660cf..5fd35799ae7 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java
@@ -46,13 +46,6 @@ public void setPercentileIndex(double percentileIndex) {
         this.percentileIndex = percentileIndex;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         Aggregator newAggregator = null;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
index a925cab1160..9e991868fcc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
@@ -32,9 +32,6 @@ public class RequestsSummaryConsumer extends AbstractSampleConsumer {
     private long count;
     private long errorCount;
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.report.processor.SampleConsumer#startConsuming()
-     */
     @Override
     public void startConsuming() {
         count = 0L;
@@ -49,9 +46,6 @@ public void startConsuming() {
         super.startProducing();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.report.processor.SampleConsumer#consume(org.apache.jmeter.report.core.Sample, int)
-     */
     @Override
     public void consume(Sample sample, int channel) {
         if(!sample.isController()) {
@@ -63,11 +57,6 @@ public void consume(Sample sample, int channel) {
         super.produce(sample, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.SampleConsumer#stopConsuming()
-     */
     @Override
     public void stopConsuming() {
         MapResultData result = new MapResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
index 6125efa29ab..a790e910de5 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
@@ -94,14 +94,6 @@ private static void aggregateSample(Sample sample, StatisticsSummaryData data, b
         data.setEndTime(sample.getEndTime());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#updateData
-     * (org.apache.jmeter.report.processor.AbstractSummaryConsumer.SummaryInfo,
-     * org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected void updateData(SummaryInfo info, Sample sample) {
         SummaryInfo overallInfo = getOverallInfo();
@@ -125,13 +117,6 @@ protected void updateData(SummaryInfo info, Sample sample) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createDataResult
-     * (java.lang.String)
-     */
     @Override
     protected ListResultData createDataResult(String key,
             StatisticsSummaryData data) {
@@ -156,25 +141,11 @@ protected ListResultData createDataResult(String key,
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#getKeyFromSample
-     * (org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected String getKeyFromSample(Sample sample) {
         return sample.getName();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createResultTitles
-     * ()
-     */
     @Override
     protected ListResultData createResultTitles() {
         ListResultData titles = new ListResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java
index 3f5cf10f7bf..5db5d3d7330 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java
@@ -27,42 +27,22 @@ public class SumAggregator implements Aggregator {
     private long count = 0;
     private double sum = 0;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return count;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return sum;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(double value) {
         count++;
         sum += value;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         count = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java
index 3d74f00f160..4155fbf4f83 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java
@@ -24,13 +24,6 @@
  */
 public class SumAggregatorFactory extends AbstractAggregatorFactory {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         return new SumAggregator();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java
index aa090c1206d..ea4aeedb0b9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java
@@ -43,42 +43,22 @@ public final void setGranularity(long granularity) {
         this.granularity = granularity;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getCount()
-     */
     @Override
     public long getCount() {
         return count;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#getResult()
-     */
     @Override
     public double getResult() {
         return value * 1000 / granularity;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#addValue(double)
-     */
     @Override
     public void addValue(final double value) {
         this.count++;
         this.value += value;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.core.GraphAggregator#reset()
-     */
     @Override
     public void reset() {
         count = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
index 1a811680585..8f300d34638 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
@@ -45,13 +45,6 @@ public final void setGranularity(long granularity) {
         this.granularity = granularity;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.AbstractAggregatorFactory#createAggregator
-     * ()
-     */
     @Override
     protected Aggregator createAggregator() {
         TimeRateAggregator aggregator = new TimeRateAggregator();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
index b73efbeaf8b..8ffe7916666 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
@@ -76,13 +76,6 @@ protected void updateData(SummaryInfo info, Sample sample) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createDataResult
-     * (java.lang.String)
-     */
     @Override
     protected ListResultData createDataResult(String key, Top5ErrorsSummaryData data) {
         ListResultData result = new ListResultData();
@@ -110,25 +103,11 @@ protected ListResultData createDataResult(String key, Top5ErrorsSummaryData data
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#getKeyFromSample
-     * (org.apache.jmeter.report.core.Sample)
-     */
     @Override
     protected String getKeyFromSample(Sample sample) {
         return sample.getName();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSummaryConsumer#createResultTitles
-     * ()
-     */
     @Override
     protected ListResultData createResultTitles() {
         ListResultData titles = new ListResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java
index 5d81a326131..054ff0bbd31 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java
@@ -41,21 +41,11 @@ public final void setValue(Object value) {
         this.value = value;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.ResultData#accept(org.apache.jmeter
-     * .report.processor.ResultDataVisitor)
-     */
     @Override
     public <T> T accept(ResultDataVisitor<T> visitor) {
         return visitor.visitValueResult(this);
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return "ValueResultData [value=" + value + "]";
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
index 673722df7ec..7863913127b 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
@@ -314,7 +314,7 @@ private void addKeyData(MapResultData result, @SuppressWarnings("unused") String
                 for (Map.Entry<Double, Aggregator> entry : sortedInfo
                         .entrySet()) {
                     Double value = entry.getKey();
-                    percent += (double) 100 * entry.getValue().getCount()
+                    percent += 100.0 * entry.getValue().getCount()
                             / count;
                     double percentile = (double) rank / 10;
                     while (percentile < percent) {
@@ -334,7 +334,7 @@ private void addKeyData(MapResultData result, @SuppressWarnings("unused") String
                 for (Map.Entry<Double, Aggregator> entry : sortedInfo
                         .entrySet()) {
                     Double value = entry.getKey();
-                    percent += (double) 100 * entry.getValue().getCount()
+                    percent += 100.0 * entry.getValue().getCount()
                             / count;
                     double percentile = (double) rank / 10;
                     while (percentile < percent) {
@@ -439,12 +439,6 @@ private MapResultData createResult() {
      */
     protected abstract void initializeExtraResults(MapResultData parentResult);
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleConsumer#startConsuming()
-     */
     @Override
     public void startConsuming() {
 
@@ -457,13 +451,6 @@ public void startConsuming() {
         super.startProducing();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleConsumer#consume(org.apache
-     * .jmeter.report.csv.core.Sample, int)
-     */
     @Override
     public void consume(Sample sample, int channel) {
 
@@ -513,18 +500,6 @@ public void consume(Sample sample, int channel) {
         super.produce(sample, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleConsumer#stopConsuming()
-     */
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.graph.SampleConsumer#stopConsuming()
-     */
     @Override
     public void stopConsuming() {
         super.stopProducing();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
index a04d9358733..aedb0659e87 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
@@ -67,12 +67,6 @@ protected AbstractOverTimeGraphConsumer() {
      */
     protected abstract TimeStampKeysSelector createTimeStampKeysSelector();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         TimeStampKeysSelector keysSelector = createTimeStampKeysSelector();
@@ -80,21 +74,9 @@ protected final GraphKeysSelector createKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected abstract Map<String, GroupInfo> createGroupInfos();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
index ce812820f42..673a47c4dca 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
@@ -50,12 +50,6 @@ protected AbstractSeriesSelector(boolean allowsControllerDiscrimination) {
         this.allowsControllerDiscrimination = allowsControllerDiscrimination;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.GraphSeriesSelector#
-     * supportsControllersDiscrimination()
-     */
     @Override
     public final boolean allowsControllersDiscrimination() {
         return allowsControllerDiscrimination;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
index 59202d113d9..1b73441c022 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
@@ -82,13 +83,6 @@ public final void setGranularity(long granularity) {
     protected AbstractVersusRequestsGraphConsumer() {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#startConsuming
-     * ()
-     */
     @Override
     public void startConsuming() {
         embeddedConsumer.startConsuming();
@@ -105,13 +99,6 @@ private void startConsumingBase() {
         super.startConsuming();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.AbstractSampleConsumer#setConsumedMetadata
-     * (org.apache.jmeter.report.core.SampleMetadata, int)
-     */
     @Override
     public void setConsumedMetadata(SampleMetadata sampleMetadata, int channel) {
         embeddedConsumer.setConsumedMetadata(sampleMetadata, channel);
@@ -122,13 +109,6 @@ private void setConsumedMetadataBase(SampleMetadata sampleMetadata,
         super.setConsumedMetadata(sampleMetadata, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#consume
-     * (org.apache.jmeter.report.core.Sample, int)
-     */
     @Override
     public void consume(Sample sample, int channel) {
         embeddedConsumer.consume(sample, channel);
@@ -138,13 +118,6 @@ private void consumeBase(Sample sample, int channel) {
         super.consume(sample, channel);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#stopConsuming
-     * ()
-     */
     @Override
     public void stopConsuming() {
         embeddedConsumer.stopConsuming();
@@ -154,12 +127,6 @@ public void stopConsumingBase() {
         super.stopConsuming();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(
@@ -182,7 +149,7 @@ private static class FileInfo {
              * @param metadata
              *            the metadata
              */
-            public FileInfo(File file, SampleMetadata metadata) {
+            private FileInfo(File file, SampleMetadata metadata) {
                 this.file = file;
                 this.writer = new CsvSampleWriter(file, metadata);
             }
@@ -192,7 +159,7 @@ public FileInfo(File file, SampleMetadata metadata) {
              *
              * @return the file
              */
-            public File getFile() {
+            private File getFile() {
                 return file;
             }
 
@@ -201,19 +168,19 @@ public File getFile() {
              *
              * @return the sample writer
              */
-            public CsvSampleWriter getWriter() {
+            private CsvSampleWriter getWriter() {
                 return writer;
             }
         }
 
         // Collection of sample builders for channels
-        private final ArrayList<SampleBuilder> builders = new ArrayList<>();
-        private final ArrayList<FileInfo> fileInfos = new ArrayList<>();
+        private final List<SampleBuilder> builders = new ArrayList<>();
+        private final List<FileInfo> fileInfos = new ArrayList<>();
         private final Map<Long, Long> counts = new HashMap<>();
         boolean createdWorkDir = false;
         private final AbstractVersusRequestsGraphConsumer parent;
 
-        public TimeCountConsumer(AbstractVersusRequestsGraphConsumer parent) {
+        private TimeCountConsumer(AbstractVersusRequestsGraphConsumer parent) {
             this.parent = parent;
         }
 
@@ -299,13 +266,6 @@ public void startConsuming() {
             initProducedMetadata();
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * org.apache.jmeter.report.processor.SampleConsumer#consume(org.apache.
-         * jmeter.report.core.Sample, int)
-         */
         @Override
         public void consume(Sample sample, int channel) {
             // Count sample depending on time interval
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
index a959a3c37c4..c54a88c811d 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
@@ -27,13 +27,6 @@
  */
 public class CodeSeriesSelector extends AbstractSeriesSelector {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleSelector#select(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public Iterable<String> select(Sample sample) {
         return withDefaultIfEmpty(sample.getResponseCode(), "EMPTY_RES_CODE"); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
index 1057063752a..dcd27381203 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
@@ -35,13 +35,6 @@ public ConnectTimeValueSelector(boolean ignoreTransactionController) {
         super(ignoreTransactionController);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.GraphValueSelector#select(java
-     * .lang.String, java.lang.Object, org.apache.jmeter.report.csv.core.Sample)
-     */
     @Override
     public Double select(String series, Sample sample) {
         if(isIgnoreTransactionController()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
index 5299a3dceae..081c5425cd4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
@@ -36,11 +36,6 @@ public ElapsedTimeValueSelector(boolean ignoreTransactionController) {
         super(ignoreTransactionController);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see GraphValueSelector#select(String, Sample)
-     */
     @Override
     public Double select(String series, Sample sample) {
         if(isIgnoreTransactionController()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
index 21a8bb27b82..a82ee0f6148 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
@@ -42,13 +42,6 @@ public final List<String> getNames() {
         return names;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleSelector#select(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public Double select(Sample sample) {
         String name = sample.getName();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
index 75192b60a5e..a42c4908208 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
@@ -35,13 +35,6 @@ public LatencyValueSelector(boolean ignoreTransactionController) {
         super(ignoreTransactionController);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.GraphValueSelector#select(java
-     * .lang.String, java.lang.Object, org.apache.jmeter.report.csv.core.Sample)
-     */
     @Override
     public Double select(String series, Sample sample) {
         if(isIgnoreTransactionController()) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
index 490c95b6e25..b4cdce6e541 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
@@ -33,13 +33,6 @@ public NameSeriesSelector() {
         super(true);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleSelector#select(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public Iterable<String> select(Sample sample) {
         return withDefaultIfEmpty(sample.getName(), "EMPTY_SERIE_NAME"); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
index 0e6a6f48524..fc07ab127fe 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
@@ -47,13 +47,6 @@ public final void setSeriesName(String seriesName) {
         this.seriesName = seriesName;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleSelector#select(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public Iterable<String> select(Sample sample) {
         return withDefaultIfEmpty(seriesName, "EMPTY_SERIE_NAME"); //$NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
index ffd56f39c2c..bbd5957a291 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
@@ -70,13 +70,6 @@ public final void setSuccessLabel(String successLabel) {
         this.successLabel = successLabel;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.SampleSelector#select(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
     @Override
     public Iterable<String> select(Sample sample) {
         String label = sample.getSuccess() ? successLabel : failureLabel;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
index b3a2881580a..249c972612f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
@@ -70,13 +70,6 @@ public final void setSelectBeginTime(boolean selectBeginTime) {
         this.selectBeginTime = selectBeginTime;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.core.SampleSelector#select(org.apache.jmeter
-     * .report.core.Sample)
-     */
     @Override
     public Double select(Sample sample) {
         long time = selectBeginTime ? sample.getStartTime() : sample.getEndTime();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
index a62f86e3c6a..1596fc9c63f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
@@ -37,13 +37,6 @@
  */
 public class ActiveThreadsGraphConsumer extends AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -51,12 +44,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         AbstractSeriesSelector seriesSelector = new AbstractSeriesSelector() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
index 240d93cdbfa..6ae0ab58a81 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
@@ -41,13 +41,6 @@ public class BytesThroughputGraphConsumer extends AbstractOverTimeGraphConsumer
     private static final String RECEIVED_BYTES_SERIES_LABEL = "Bytes received per second";
     private static final String SENT_BYTES_SERIES_LABEL = "Bytes sent per second";
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -55,12 +48,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         AbstractSeriesSelector seriesSelector = new AbstractSeriesSelector() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
index 2e4f3a41020..ec76635c65f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
@@ -36,13 +36,6 @@
  */
 public class CodesPerSecondGraphConsumer extends AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -50,12 +43,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java
index 698d3a3b80d..71771e6d35c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java
@@ -39,13 +39,6 @@ public class ConnectTimeOverTimeGraphConsumer extends AbstractOverTimeGraphConsu
     private static final boolean CONNECT_TIME_SAVED =
             JMeterUtils.getPropDefault("jmeter.save.saveservice.connect_time", true); //$NON-NLS-1$
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -53,12 +46,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         if (!CONNECT_TIME_SAVED) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
index 72420a3585e..0585b1b5be9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
@@ -169,13 +169,6 @@ protected void initializeExtraResults(MapResultData parentResult) {
         parentResult.setResult(RESULT_CONTENT_MESSAGE, new ValueResultData(getContentMessage()));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -183,12 +176,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         AbstractSeriesSelector seriesSelector = new AbstractSeriesSelector() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
index 0d5828bd6d9..a4873bf7412 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
@@ -36,13 +36,6 @@
  */
 public class HitsPerSecondGraphConsumer extends AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -50,12 +43,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java
index 73c5bb23560..15b9f61a082 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java
@@ -36,13 +36,6 @@
  */
 public class LatencyOverTimeGraphConsumer extends AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -50,12 +43,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java
index 3adf21fb7a2..fc396c36985 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java
@@ -37,12 +37,6 @@
 public class LatencyVSRequestGraphConsumer extends
         AbstractVersusRequestsGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected GraphKeysSelector createKeysSelector() {
         return sample ->
@@ -51,12 +45,6 @@ protected GraphKeysSelector createKeysSelector() {
                         AbstractVersusRequestsGraphConsumer.TIME_INTERVAL_LABEL);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java
index 1bfdb83df8f..c6809fbb3db 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java
@@ -37,13 +37,6 @@
 public class ResponseCustomGraphGraphConsumer extends
         AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -51,12 +44,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
index 0d83696948d..3550213adf5 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
@@ -57,12 +57,6 @@ public final void setGranularity(long granularity) {
         this.granularity = granularity;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         return sample -> {
@@ -71,12 +65,6 @@ protected final GraphKeysSelector createKeysSelector() {
         };
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
@@ -87,12 +75,6 @@ protected Map<String, GroupInfo> createGroupInfos() {
                         new CountValueSelector(false), false, false));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         parentResult.setResult(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java
index b07741fe70b..1d94300c980 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java
@@ -37,13 +37,6 @@
 public class ResponseTimeOverTimeGraphConsumer extends
         AbstractOverTimeGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -51,12 +44,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
index 9872ccafb20..f0176e2a301 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
@@ -53,12 +53,6 @@ public void initialize() {
         setRevertKeysAndValues(true);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         return new IndexedNameSelector();
@@ -85,12 +79,6 @@ private static GroupInfo createGroupInfo(String propertyKey, int defaultValue) {
                 new ElapsedTimeValueSelector(false), false, false);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         HashMap<String, GroupInfo> groupInfos = new HashMap<>(6);
@@ -107,12 +95,6 @@ protected Map<String, GroupInfo> createGroupInfos() {
         return groupInfos;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         ListResultData samples = new ListResultData();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
index a25b5141a4f..f428df09320 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
@@ -48,23 +48,11 @@ public void initialize() {
         setRenderPercentiles(true);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         return sample -> (double) sample.getElapsedTime();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
@@ -75,12 +63,6 @@ protected Map<String, GroupInfo> createGroupInfos() {
                         new CountValueSelector(false), false, false));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         // do nothing
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java
index fe4277aebfd..35d80450012 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java
@@ -37,24 +37,12 @@
 public class ResponseTimeVSRequestGraphConsumer extends
         AbstractVersusRequestsGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected GraphKeysSelector createKeysSelector() {
         return sample -> sample.getData(
                 Double.class, AbstractVersusRequestsGraphConsumer.TIME_INTERVAL_LABEL);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
index 8058f950932..ff2547c971c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
@@ -80,19 +80,13 @@ public Iterable<String> select(Sample sample) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         return sample -> {
             if (sample.getSuccess()) {
                 long elapsedTime = sample.getElapsedTime();
                 if (elapsedTime <= satisfiedThreshold) {
-                    return (double) 0;
+                    return 0d;
                 } else if (elapsedTime <= toleratedThreshold) {
                     return 1d;
                 } else {
@@ -104,12 +98,6 @@ protected final GraphKeysSelector createKeysSelector() {
         };
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
index 19c932085d9..599af36b63a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
@@ -36,23 +36,11 @@
  */
 public class TimeVSThreadGraphConsumer extends AbstractGraphConsumer {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createKeysSelector()
-     */
     @Override
     protected final GraphKeysSelector createKeysSelector() {
         return sample -> (double) sample.getAllThreads();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         return Collections.singletonMap(
@@ -63,12 +51,6 @@ protected Map<String, GroupInfo> createGroupInfos() {
                         new ElapsedTimeValueSelector(false), false, true));
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.processor.graph.AbstractGraphConsumer#
-     * initializeExtraResults(org.apache.jmeter.report.processor.MapResultData)
-     */
     @Override
     protected void initializeExtraResults(MapResultData parentResult) {
         // do nothing
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
index 05f08e35b14..57a670dbb0c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
@@ -46,13 +46,6 @@ public class TotalTPSGraphConsumer extends AbstractOverTimeGraphConsumer {
     private static final String TRANSACTION_SUCCESS_LABEL = String.format(STATUS_SERIES_FORMAT, "Transaction", SUCCESS_SERIES_SUFFIX);
     private static final String TRANSACTION_FAILURE_LABEL = String.format(STATUS_SERIES_FORMAT, "Transaction", FAILURE_SERIES_SUFFIX);
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -60,12 +53,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         AbstractSeriesSelector seriesSelector = new AbstractSeriesSelector(true) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java
index 332cd4ec5b5..7e3eb49f1a4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java
@@ -41,13 +41,6 @@ public class TransactionsPerSecondGraphConsumer extends AbstractOverTimeGraphCon
     private static final String SUCCESS_SERIES_SUFFIX = "success";
     private static final String FAILURE_SERIES_SUFFIX = "failure";
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.jmeter.report.csv.processor.impl.AbstractOverTimeGraphConsumer
-     * #createTimeStampKeysSelector()
-     */
     @Override
     protected TimeStampKeysSelector createTimeStampKeysSelector() {
         TimeStampKeysSelector keysSelector = new TimeStampKeysSelector();
@@ -55,12 +48,6 @@ protected TimeStampKeysSelector createTimeStampKeysSelector() {
         return keysSelector;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.report.csv.processor.impl.AbstractGraphConsumer#
-     * createGroupInfos()
-     */
     @Override
     protected Map<String, GroupInfo> createGroupInfos() {
         AbstractSeriesSelector seriesSelector = new AbstractSeriesSelector(true) {
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
index 25a90d49ea8..9a6e66caeaa 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java
@@ -414,7 +414,7 @@ private static void writeFileStart(PrintWriter writer, SampleSaveConfiguration s
             // Write the EOL separately so we generate LF line ends on Unix and Windows
             writer.print("\n"); // $NON-NLS-1$
             String pi=saveConfig.getXmlPi();
-            if (pi.length() > 0) {
+            if (!pi.isEmpty()) {
                 writer.println(pi);
             }
             // Can't do it as a static initialisation, because SaveService
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
index fb81c3cb436..dc1d34d5fa2 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java
@@ -188,7 +188,7 @@ private void saveSample(SampleResult s, int num) {
         }
         s.setResultFileName(fileName);// Associate sample with file name
         String variable = getVariableName();
-        if (variable.length() > 0) {
+        if (!variable.isEmpty()) {
             if (num > 0) {
                 variable = variable + num;
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
index 6a3cf1674be..700e9087666 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
@@ -85,7 +85,7 @@ public class Summariser extends AbstractTestElement
                     "summariser.ignore_transaction_controller_sample_result", //$NON-NLS-1$
                     true);
 
-    /*
+    /**
      * Ensure that a report is not skipped if we are slightly late in checking
      * the time.
      */
@@ -96,14 +96,14 @@ public class Summariser extends AbstractTestElement
      */
     private static final Object LOCK = new Object();
 
-    /*
+    /**
      * This map allows summarisers with the same name to contribute to the same totals.
      */
     private static final Map<String, Totals> ACCUMULATORS = new ConcurrentHashMap<>();
 
     private static int instanceCount; // number of active tests
 
-    /*
+    /**
      * Cached copy of Totals for this instance.
      * The variables do not need to be synchronised,
      * as they are not shared between threads
@@ -114,7 +114,7 @@ public class Summariser extends AbstractTestElement
     // Name of the accumulator. Set up by testStarted().
     private transient String myName;
 
-    /*
+    /**
      * Constructor is initially called once for each occurrence in the test plan.
      * For GUI, several more instances are created.
      * Then clear is called at start of test.
@@ -140,9 +140,8 @@ public Summariser(String name) {
         setName(name);
     }
 
-    /*
+    /**
      * Contains the items needed to collect stats for a summariser
-     *
      */
     private static class Totals {
 
@@ -182,11 +181,9 @@ public void sampleOccurred(SampleEvent e) {
         SummariserRunningSample myTotal = null;
         boolean reportNow = false;
 
-        /*
-         * Have we reached the reporting boundary?
-         * Need to allow for a margin of error, otherwise can miss the slot.
-         * Also need to check we've not hit the window already
-         */
+        // Have we reached the reporting boundary?
+        // Need to allow for a margin of error, otherwise can miss the slot.
+        // Also need to check we've not hit the window already
 
         synchronized (myTotals) {
             if (s != null) {
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
index bd1337150c6..e856cc50750 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java
@@ -147,7 +147,11 @@ public void run() {
                     SampleEvent e = queue.take();
                     // try to process as many as possible
                     // The == comparison is not an error
-                    while (!(eof = e == FINAL_EVENT) && e != null) {
+                    while (e != null) {
+                        eof = e == FINAL_EVENT;
+                        if (eof) {
+                            break;
+                        }
                         l.add(e);
                         e = queue.poll(); // returns null if nothing on queue currently
                     }
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java
index eec4da61312..5ded67756cb 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java
@@ -90,9 +90,9 @@ public void testEnded(String host) {
                 ObjectInputStream ois = new ObjectInputStream(fis)){
             Object obj;
             while((obj = ois.readObject()) != null) {
-                if (obj instanceof SampleEvent) {
+                if (obj instanceof SampleEvent sampleEvent) {
                     try {
-                        listener.sampleOccurred((SampleEvent) obj);
+                        listener.sampleOccurred(sampleEvent);
                     } catch (RemoteException err) {
                         if (err.getCause() instanceof java.net.ConnectException){
                             throw new JMeterError("Could not return sample",err);
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
index b6e5c251317..2f7a44dfba1 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
@@ -41,13 +41,13 @@ public class RemoteSampleListenerImpl extends java.rmi.server.UnicastRemoteObjec
 
     public RemoteSampleListenerImpl(Object listener) throws RemoteException {
         super(DEFAULT_LOCAL_PORT, RmiUtils.createClientSocketFactory(),  RmiUtils.createServerSocketFactory());
-        if (listener instanceof TestStateListener) {
-            testListener = (TestStateListener) listener;
+        if (listener instanceof TestStateListener testStateListener) {
+            testListener = testStateListener;
         } else {
             testListener = null;
         }
-        if (listener instanceof SampleListener) {
-            sampleListener = (SampleListener) listener;
+        if (listener instanceof SampleListener sampleListener1) {
+            sampleListener = sampleListener1;
         } else {
             sampleListener = null;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index 4f69f05105c..4888d250fcb 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -641,7 +641,7 @@ public void addSubResult(SampleResult subResult, boolean renameSubResults) {
             return;
         }
         String tn = getThreadName();
-        if (tn.length()==0) {
+        if (tn.isEmpty()) {
             tn=Thread.currentThread().getName();
             this.setThreadName(tn);
         }
@@ -892,7 +892,7 @@ public void setEncodingAndType(String ct){
         }
     }
 
-    /*
+    /**
      * Determine if content-type is known to be binary, i.e. not displayable as text.
      *
      * @param ct content type
@@ -1137,7 +1137,7 @@ public long getStartTime() {
         return startTime;
     }
 
-    /*
+    /**
      * Helper methods N.B. setStartTime must be called before setEndTime
      *
      * setStartTime is used by HTTPSampleResult to clone the parent sampler and
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index 76907e81e78..5843ac98a74 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -177,7 +177,11 @@ public static void processSamples(String filename, Visualizer visualizer,
             // CSV output files should never contain empty lines, so probably
             // not
             // If so, then need to check whether the reader is at EOF
-            while ((parts = csvReadFile(dataReader, delim)).length != 0) {
+            while (true) {
+                parts = csvReadFile(dataReader, delim);
+                if (parts.length == 0) {
+                    break;
+                }
                 lineNumber++;
                 SampleEvent event = CSVSaveService.makeResultFromDelimitedString(parts, saveConfig, lineNumber);
                 if (event != null) {
@@ -541,7 +545,7 @@ public static SampleSaveConfiguration getSampleSaveConfiguration(
                 varCount++;
             } else {
                 Functor set = headerLabelMethods.get(label);
-                set.invoke(saveConfig, new Boolean[]{Boolean.TRUE});
+                set.invoke(saveConfig, new Boolean[]{true});
             }
         }
 
@@ -758,7 +762,7 @@ public static String resultToDelimitedString(SampleEvent event) {
                 .getDelimiter());
     }
 
-    /*
+    /**
      * Class to handle generating the delimited string. - adds the delimiter
      * if not the first call - quotes any strings that require it
      */
@@ -1053,50 +1057,50 @@ public static String[] csvReadFile(BufferedReader infile, char delim)
         while (-1 != (ch = infile.read())) {
             push = false;
             switch (state) {
-            case INITIAL:
-                if (ch == QUOTING_CHAR) {
-                    state = ParserState.QUOTED;
-                } else if (isDelimOrEOL(delim, ch)) {
-                    push = true;
-                } else {
-                    baos.write(ch);
-                    state = ParserState.PLAIN;
+                case INITIAL -> {
+                    if (ch == QUOTING_CHAR) {
+                        state = ParserState.QUOTED;
+                    } else if (isDelimOrEOL(delim, ch)) {
+                        push = true;
+                    } else {
+                        baos.write(ch);
+                        state = ParserState.PLAIN;
+                    }
                 }
-                break;
-            case PLAIN:
-                if (ch == QUOTING_CHAR) {
-                    baos.write(ch);
-                    throw new IOException(
-                            "Cannot have quote-char in plain field:["
-                                    + baos.toString() + "]");
-                } else if (isDelimOrEOL(delim, ch)) {
-                    push = true;
-                    state = ParserState.INITIAL;
-                } else {
-                    baos.write(ch);
+                case PLAIN -> {
+                    if (ch == QUOTING_CHAR) {
+                        baos.write(ch);
+                        throw new IOException(
+                                "Cannot have quote-char in plain field:["
+                                        + baos.toString() + "]");
+                    } else if (isDelimOrEOL(delim, ch)) {
+                        push = true;
+                        state = ParserState.INITIAL;
+                    } else {
+                        baos.write(ch);
+                    }
                 }
-                break;
-            case QUOTED:
-                if (ch == QUOTING_CHAR) {
-                    state = ParserState.EMBEDDEDQUOTE;
-                } else {
-                    baos.write(ch);
+                case QUOTED -> {
+                    if (ch == QUOTING_CHAR) {
+                        state = ParserState.EMBEDDEDQUOTE;
+                    } else {
+                        baos.write(ch);
+                    }
                 }
-                break;
-            case EMBEDDEDQUOTE:
-                if (ch == QUOTING_CHAR) {
-                    baos.write(QUOTING_CHAR); // doubled quote => quote
-                    state = ParserState.QUOTED;
-                } else if (isDelimOrEOL(delim, ch)) {
-                    push = true;
-                    state = ParserState.INITIAL;
-                } else {
-                    baos.write(QUOTING_CHAR);
-                    throw new IOException(
-                            "Cannot have single quote-char in quoted field:["
-                                    + baos.toString() + "]");
+                case EMBEDDEDQUOTE -> {
+                    if (ch == QUOTING_CHAR) {
+                        baos.write(QUOTING_CHAR); // doubled quote => quote
+                        state = ParserState.QUOTED;
+                    } else if (isDelimOrEOL(delim, ch)) {
+                        push = true;
+                        state = ParserState.INITIAL;
+                    } else {
+                        baos.write(QUOTING_CHAR);
+                        throw new IOException(
+                                "Cannot have single quote-char in quoted field:["
+                                        + baos.toString() + "]");
+                    }
                 }
-                break;
             } // switch(state)
             if (push) {
                 if (ch == '\r') {// Remove following \n if present
diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
index 6aba447dfb6..5a41d6ea0f3 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
@@ -180,7 +180,7 @@ private static void makeAlias(String aliasList, String clazz) {
 
     private static File getSaveServiceFile() {
         String saveServiceProps = JMeterUtils.getPropDefault(SAVESERVICE_PROPERTIES,SAVESERVICE_PROPERTIES_FILE); //$NON-NLS-1$
-        if (saveServiceProps.length() > 0){ //$NON-NLS-1$
+        if (!saveServiceProps.isEmpty()){ //$NON-NLS-1$
             return JMeterUtils.findFile(saveServiceProps);
         }
         throw new IllegalStateException("Could not find file configured in saveservice_properties property set to:"+saveServiceProps);
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java b/src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java
index ee3750edde8..445c0bafcdb 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java
@@ -56,7 +56,7 @@ public class ConversionHelp {
     private static final String ATT_TE_NAME      = "testname"; //$NON-NLS-1$
 
 
-    /*
+    /**
      * These must be set before reading/writing the XML. Rather a hack, but
      * saves changing all the method calls to include an extra variable.
      *
@@ -155,7 +155,7 @@ private static void mapentry(String prop, String att){
 
     private static void saveClass(TestElement el, HierarchicalStreamWriter writer, String prop){
         String clazz=el.getPropertyAsString(prop);
-        if (clazz.length()>0) {
+        if (!clazz.isEmpty()) {
             writer.addAttribute(propertyToAttribute.get(prop),SaveService.classToAlias(clazz));
         }
     }
@@ -175,7 +175,7 @@ private static void restoreClass(TestElement el, HierarchicalStreamReader reader
     private static void saveItem(TestElement el, HierarchicalStreamWriter writer, String prop,
             boolean encode){
         String item=el.getPropertyAsString(prop);
-        if (item.length() > 0) {
+        if (!item.isEmpty()) {
             if (encode) {
                 item=ConversionHelp.encode(item);
             }
@@ -250,7 +250,7 @@ public static String getUpgradePropertyName(String name, UnmarshallingContext co
         String testClass = (String) context.get(SaveService.TEST_CLASS_NAME);
         final String newName = NameUpdater.getCurrentName(name, testClass);
         // Delete any properties whose name converts to the empty string
-        if (name.length() != 0 && newName.length()==0) {
+        if (!name.isEmpty() && newName.isEmpty()) {
             return null;
         }
         return newName;
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
index 857bb3f959e..cbbc3887b4a 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
@@ -375,7 +375,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
 
         // If we have a file, but no data, then read the file
         String resultFileName = res.getResultFileName();
-        if (resultFileName.length()>0
+        if (!resultFileName.isEmpty()
         &&  res.getResponseData().length == 0) {
             readFile(resultFileName,res);
         }
@@ -393,17 +393,17 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
     protected boolean retrieveItem(HierarchicalStreamReader reader, UnmarshallingContext context, SampleResult res,
             Object subItem) {
         String nodeName = reader.getNodeName();
-        if (subItem instanceof AssertionResult) {
-            res.addAssertionResult((AssertionResult) subItem);
-        } else if (subItem instanceof SampleResult) {
-            res.storeSubResult((SampleResult) subItem, false);
+        if (subItem instanceof AssertionResult assertionResult) {
+            res.addAssertionResult(assertionResult);
+        } else if (subItem instanceof SampleResult sampleResult) {
+            res.storeSubResult(sampleResult, false);
         } else if (nodeName.equals(TAG_RESPONSE_HEADER)) {
             res.setResponseHeaders((String) subItem);
         } else if (nodeName.equals(TAG_REQUEST_HEADER)) {
             res.setRequestHeaders((String) subItem);
         } else if (nodeName.equals(TAG_RESPONSE_DATA)) {
             final String responseData = (String) subItem;
-            if (responseData.length() > 0) {
+            if (!responseData.isEmpty()) {
                 final String dataEncoding = res.getDataEncodingWithDefault();
                 try {
                     res.setResponseData(responseData.getBytes(dataEncoding));
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
index e7e521164d5..efd617f22de 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java
@@ -66,7 +66,7 @@ public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingCon
                 // Don't save empty comments - except for the TestPlan (to maintain compatibility)
                    if (!(
                            TestElement.COMMENTS.equals(jmp.getName())
-                           && jmp.getStringValue().length()==0
+                           && jmp.getStringValue().isEmpty()
                            && !el.getClass().equals(TestPlan.class)
                        ))
                    {
diff --git a/src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java b/src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java
index 1398aa4a65f..8640eda8394 100644
--- a/src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java
+++ b/src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java
@@ -41,7 +41,7 @@ public HtmlPane() {
             String ref = e.getURL().getRef();
             if (ref != null) {
                 log.debug("reference to scroll to = '{}'", ref);
-                if (ref.length() > 0) {
+                if (!ref.isEmpty()) {
                     scrollToReference(ref);
                 } else { // href="#"
                     scrollRectToVisible(new Rectangle(1,1,1,1));
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
index 8920f1fffce..132d90002d6 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java
@@ -25,7 +25,7 @@
 public class BooleanPropertyEditor extends PropertyEditorSupport {
 
     // These are the mixed-case values as returned by the RI JVM boolean property editor
-    // However, they are different from the lower-case values returned by e.g. Boolean.FALSE.toString()
+    // However, they are different from the lower-case values returned by e.g. false.toString()
     private static final String FALSE = "False"; // $NON-NLS-1$
     private static final String TRUE  = "True";  // $NON-NLS-1$
 
@@ -35,7 +35,7 @@ public class BooleanPropertyEditor extends PropertyEditorSupport {
     @Override
     public String getAsText() {
         Object value = getValue();
-        return value instanceof Boolean ?  toString((Boolean) value) : null;
+        return value instanceof Boolean aBoolean ?  toString(aBoolean) : null;
     }
 
     private static String toString(Boolean value) {
@@ -49,8 +49,8 @@ public void setAsText(String text) {
 
     @Override
     public void setValue(Object value){
-        if (value instanceof String) {
-            super.setValue(Boolean.valueOf((String) value));
+        if (value instanceof String string) {
+            super.setValue(Boolean.valueOf(string));
         } else if (value == null || value instanceof Boolean) {
             super.setValue(value); // not sure if null is passed in but no harm in setting it
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
index 4bf70be892b..11a2eb2ca33 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
@@ -65,7 +65,7 @@ class ComboStringEditor extends PropertyEditorSupport implements ItemListener, C
 
     private final DefaultComboBoxModel<Object> model;
 
-    /*
+    /**
      * Map of translations for tags; only created if there is at least
      * one tag and a ResourceBundle has been provided.
      */
@@ -293,8 +293,8 @@ public boolean equals(Object other) {
             if (this == other) {
                 return true;
             }
-            if (other instanceof UniqueObject) {
-                return propKey.equals(((UniqueObject) other).propKey);
+            if (other instanceof UniqueObject uniqueObject) {
+                return propKey.equals(uniqueObject.propKey);
             }
             return false;
         }
@@ -310,7 +310,7 @@ public void clearGui() {
         setAsText(initialEditValue);
     }
 
-    // Replace a string with its translation, if one exists
+    // Replace a string with its translation if one exists
     private String translate(String input) {
         if (validTranslations != null) {
             final String entry = validTranslations.get(input);
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
index d16890a4eec..62e1f79f501 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
@@ -51,8 +51,8 @@ public EnumEditor(final PropertyDescriptor descriptor, final Class<? extends Enu
             model.addElement((String) rb.getObject(e.toString()));
         }
         Object def = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
-        if (def instanceof Integer) {
-            defaultIndex = (Integer) def;
+        if (def instanceof Integer integer) {
+            defaultIndex = integer;
         } else {
             defaultIndex = 0;
         }
@@ -81,11 +81,12 @@ public String getAsText() {
     }
 
     @Override
+    @SuppressWarnings("EnumOrdinal")
     public void setValue(Object value) {
-        if (value instanceof Enum<?>){
-            combo.setSelectedIndex(((Enum<?>) value).ordinal());
-        } else if (value instanceof Integer) {
-            combo.setSelectedIndex((Integer) value);
+        if (value instanceof Enum<?> anEnum){
+            combo.setSelectedIndex(anEnum.ordinal());
+        } else if (value instanceof Integer integer) {
+            combo.setSelectedIndex(integer);
         } else {
             combo.setSelectedItem(value);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
index 7c329a93b3a..d0988fbdc50 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
@@ -77,8 +77,8 @@ public Object getValue() {
 
     @Override
     public void setValue(Object value) {
-        if (value instanceof String) {
-            setAsText((String) value);
+        if (value instanceof String string) {
+            setAsText(string);
         } else if (value == null) {
             setAsText(null);
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
index e053e9d2090..b2461021046 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
@@ -231,9 +231,9 @@ public GenericTestBeanCustomizer(){
 
             PropertyEditor propertyEditor;
             Object guiType = descriptor.getValue(GUITYPE);
-            if (guiType instanceof TypeEditor) {
-                propertyEditor = ((TypeEditor) guiType).getInstance(descriptor);
-            } else if (guiType instanceof Class && Enum.class.isAssignableFrom((Class<?>) guiType)) {
+            if (guiType instanceof TypeEditor typeEditor) {
+                propertyEditor = typeEditor.getInstance(descriptor);
+            } else if (guiType instanceof Class<?> aClass && Enum.class.isAssignableFrom(aClass)) {
                     @SuppressWarnings("unchecked") // we check the class type above
                     final Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) guiType;
                     propertyEditor = new EnumEditor(descriptor, enumClass, (ResourceBundle) descriptor.getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE));
@@ -271,9 +271,9 @@ public GenericTestBeanCustomizer(){
                 propertyEditor = createWrapperEditor(propertyEditor, descriptor);
                 log.debug("Editor for property {} is wrapped in {}", name, propertyEditor);
             }
-            if(propertyEditor instanceof TestBeanPropertyEditor)
+            if(propertyEditor instanceof TestBeanPropertyEditor testBeanPropertyEditor)
             {
-                ((TestBeanPropertyEditor)propertyEditor).setDescriptor(descriptor);
+                testBeanPropertyEditor.setDescriptor(descriptor);
             }
 
             if (propertyEditor instanceof TextAreaEditor) {
@@ -458,7 +458,7 @@ private static WrapperEditor createWrapperEditor(PropertyEditor typeEditor, Prop
      * Returns true if the property disallows constant values different from the provided tags.
      *
      * @param descriptor the property descriptor
-     * @return true if the attribute {@link #NOT_OTHER} is defined and equal to Boolean.TRUE;
+     * @return true if the attribute {@link #NOT_OTHER} is defined and equal to true;
      *  otherwise the default is false
      */
     static boolean notOther(PropertyDescriptor descriptor) {
@@ -469,7 +469,7 @@ static boolean notOther(PropertyDescriptor descriptor) {
      * Returns true if the property does not allow JMeter expressions.
      *
      * @param descriptor the property descriptor
-     * @return true if the attribute {@link #NOT_EXPRESSION} is defined and equal to Boolean.TRUE;
+     * @return true if the attribute {@link #NOT_EXPRESSION} is defined and equal to true;
      *  otherwise the default is false
      */
     static boolean notExpression(PropertyDescriptor descriptor) {
@@ -480,7 +480,7 @@ static boolean notExpression(PropertyDescriptor descriptor) {
      * Returns true if the property must be defined (i.e. is required);
      *
      * @param descriptor the property descriptor
-     * @return true if the attribute {@link #NOT_UNDEFINED} is defined and equal to Boolean.TRUE;
+     * @return true if the attribute {@link #NOT_UNDEFINED} is defined and equal to true;
      *  otherwise the default is false
      */
     static boolean notNull(PropertyDescriptor descriptor) {
@@ -491,7 +491,7 @@ static boolean notNull(PropertyDescriptor descriptor) {
      * Returns true if the property default value is not saved
      *
      * @param descriptor the property descriptor
-     * @return true if the attribute {@link #DEFAULT_NOT_SAVED} is defined and equal to Boolean.TRUE;
+     * @return true if the attribute {@link #DEFAULT_NOT_SAVED} is defined and equal to true;
      *  otherwise the default is false
      */
     static boolean noSaveDefault(PropertyDescriptor descriptor) {
@@ -704,7 +704,7 @@ private static class PropertyComparator implements Comparator<PropertyDescriptor
         private static final long serialVersionUID = 240L;
 
         private final BeanInfo beanInfo;
-        public PropertyComparator(BeanInfo beanInfo) {
+        private PropertyComparator(BeanInfo beanInfo) {
             this.beanInfo = beanInfo;
         }
 
@@ -790,10 +790,9 @@ void clearGuiFields() {
             PropertyEditor propertyEditor=editors[i]; // might be null (e.g. in testing)
             if (propertyEditor != null) {
                 try {
-                if (propertyEditor instanceof ClearGui) {
-                    ((ClearGui) propertyEditor).clearGui();
-                } else if (propertyEditor instanceof WrapperEditor){
-                    WrapperEditor we = (WrapperEditor) propertyEditor;
+                if (propertyEditor instanceof ClearGui clearGui) {
+                    clearGui.clearGui();
+                } else if (propertyEditor instanceof WrapperEditor we){
                     String[] tags = we.getTags();
                     if (tags != null && tags.length > 0) {
                         we.setAsText(tags[0]);
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java
index f4a521ef98a..8468357cc55 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java
@@ -32,8 +32,8 @@ public void setAsText(String text) {
 
     @Override
     public void setValue(Object value){
-        if (value instanceof String) {
-            super.setValue(Integer.decode((String) value)); // handles hex as well
+        if (value instanceof String string) {
+            super.setValue(Integer.decode(string)); // handles hex as well
         } else if (value == null || value instanceof Integer) {
             super.setValue(value); // not sure if null is passed in but no harm in setting it
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java
index 1bb551826df..e590327591b 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java
@@ -32,8 +32,8 @@ public void setAsText(String text) {
 
     @Override
     public void setValue(Object value){
-        if (value instanceof String) {
-            super.setValue(Long.decode((String) value)); // handles hex as well
+        if (value instanceof String string) {
+            super.setValue(Long.decode(string)); // handles hex as well
         } else if (value == null || value instanceof Long) {
             super.setValue(value); // not sure if null is passed in but no harm in setting it
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
index 7d2a15f4ef0..a5b3d98e551 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java
@@ -70,8 +70,8 @@ public Object getValue() {
 
     @Override
     public void setValue(Object value) {
-        if (value instanceof String) {
-            setAsText((String) value);
+        if (value instanceof String string) {
+            setAsText(string);
         } else {
             throw new IllegalArgumentException();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
index f5a5998120d..83b3abd2bea 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java
@@ -179,8 +179,8 @@ public void setValue(Object value) {
     private static Collection<Object> convertCollection(Collection<?> values) {
         List<Object> l = new ArrayList<>();
         for(Object obj : values) {
-            if(obj instanceof TestElementProperty) {
-                l.add(((TestElementProperty)obj).getElement());
+            if (obj instanceof TestElementProperty testElementProperty) {
+                l.add(testElementProperty.getElement());
             } else {
                 l.add(obj);
             }
@@ -215,23 +215,23 @@ public void setDescriptor(PropertyDescriptor descriptor) {
     void initializeModel()
     {
         Object hdrs = descriptor.getValue(HEADERS);
-        if (!(hdrs instanceof String[])) {
+        if (!(hdrs instanceof String[] headers)) {
             throw new RuntimeException("attribute HEADERS must be a String array");
         }
         if (clazz == String.class) {
-            model = new ObjectTableModel((String[]) hdrs, new Functor[0], new Functor[0], new Class[]{String.class});
+            model = new ObjectTableModel(headers, new Functor[0], new Functor[0], new Class[]{String.class});
         } else {
             Object value = descriptor.getValue(OBJECT_PROPERTIES);
-            if (!(value instanceof String[])) {
+            if (!(value instanceof String[] valueArray)) {
                 throw new RuntimeException("attribute OBJECT_PROPERTIES must be a String array");
             }
-            List<String> props = Arrays.stream((String[]) value)
+            List<String> props = Arrays.stream(valueArray)
                     .map(StringUtilities::capitalize)
                     .collect(Collectors.toList());
             Functor[] writers = createWriters(props);
             Functor[] readers = createReaders(clazz, props);
             Class<?>[] editors = getArgsForWriter(clazz, props);
-            model = new ObjectTableModel((String[]) hdrs, readers, writers, editors);
+            model = new ObjectTableModel(headers, readers, writers, editors);
         }
         model.addTableModelListener(this);
         table = new JTable(model);
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
index a9ba4405e4c..82285b60ea6 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
@@ -230,8 +230,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement element) {
         // Fetch data from screen fields
-        if (customizer instanceof GenericTestBeanCustomizer) {
-            GenericTestBeanCustomizer gtbc = (GenericTestBeanCustomizer) customizer;
+        if (customizer instanceof GenericTestBeanCustomizer gtbc) {
             gtbc.saveGuiFields();
         }
         configureTestElement(element);
@@ -454,8 +453,7 @@ public String getLabelResource() {
     @Override
     public void clearGui() {
         super.clearGui();
-        if (customizer instanceof GenericTestBeanCustomizer) {
-            GenericTestBeanCustomizer gtbc = (GenericTestBeanCustomizer) customizer;
+        if (customizer instanceof GenericTestBeanCustomizer gtbc) {
             gtbc.clearGuiFields();
         }
         propertyMap.clear();
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
index 76d2e9b2f45..c6726ca1f56 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
@@ -132,8 +132,7 @@ public boolean supportsCustomEditor() {
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         Object source = evt.getSource();
-        if (source instanceof ComboStringEditor) {
-            ComboStringEditor cse = (ComboStringEditor) source;
+        if (source instanceof ComboStringEditor cse) {
             String lang = cse.getAsText().toLowerCase(Locale.ROOT);
             textUI.setLanguage(lang);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
index 754979be12e..64fac96136b 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java
@@ -120,7 +120,7 @@ private void initialize() {
 
         resetValue();
 
-        if (guiEditor instanceof ComboStringEditor) {
+        if (guiEditor instanceof ComboStringEditor comboStringEditor) {
             String[] tags = guiEditor.getTags();
 
             // Provide an initial edit value if necessary -- this is a heuristic
@@ -139,7 +139,7 @@ private void initialize() {
                 v = getAsText();
             }
 
-            ((ComboStringEditor) guiEditor).setInitialEditValue(v);
+            comboStringEditor.setInitialEditValue(v);
         }
 
         guiEditor.addPropertyChangeListener(this);
@@ -260,7 +260,7 @@ private static boolean isExpression(String text) {
      * @return true if text is a String and isExpression(text).
      */
     private static boolean isExpression(Object text) {
-        return text instanceof String && isExpression((String) text);
+        return text instanceof String str && isExpression(str);
     }
 
     /**
@@ -294,7 +294,7 @@ public Object getValue() {
                     try {
                         typeEditor.setAsText(text);
                     } catch (NumberFormatException e) {
-                        if (text.length() == 0){
+                        if (text.isEmpty()){
                             text = "0";//$NON-NLS-1$
                             typeEditor.setAsText(text);
                         } else {
@@ -350,7 +350,7 @@ public final void setValue(Object value) { /// final because called from ctor
         guiEditor.setValue(text);
     }
 
-    /*
+    /**
      * Fix bug in JVMs that return true/false rather than True/False
      * from the type editor getAsText() method
      */
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 920cdfbb112..84527726b7b 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -340,10 +340,10 @@ protected void traverseProperty(TestElementTraverser traverser, JMeterProperty v
         traverser.startProperty(value);
         if (value instanceof TestElementProperty) {
             ((TestElement) value.getObjectValue()).traverse(traverser);
-        } else if (value instanceof CollectionProperty) {
-            traverseCollection((CollectionProperty) value, traverser);
-        } else if (value instanceof MapProperty) {
-            traverseMap((MapProperty) value, traverser);
+        } else if (value instanceof CollectionProperty collectionProperty) {
+            traverseCollection(collectionProperty, traverser);
+        } else if (value instanceof MapProperty mapProperty) {
+            traverseMap(mapProperty, traverser);
         }
         traverser.endProperty(value);
     }
@@ -742,10 +742,8 @@ private static boolean isMergingEnclosedProperties(JMeterProperty property) {
     @Override
     public JMeterContext getThreadContext() {
         if (threadContext == null) {
-            /*
-             * Only samplers have the thread context set up by JMeterThread at
-             * present, so suppress the warning for now
-             */
+            // Only samplers have the thread context set up by JMeterThread at
+            // present, so suppress the warning for now
             threadContext = JMeterContextService.getContext();
         }
         return threadContext;
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
index 4f9058ef5f4..a2efd88b112 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java
@@ -197,8 +197,8 @@ public void addParameter(String name, String value) {
     @Override
     public void addTestElement(TestElement tg) {
         super.addTestElement(tg);
-        if (tg instanceof AbstractThreadGroup && !isRunningVersion()) {
-            addThreadGroup((AbstractThreadGroup) tg);
+        if (tg instanceof AbstractThreadGroup abstractThreadGroup && !isRunningVersion()) {
+            addThreadGroup(abstractThreadGroup);
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
index ea6c5797bbb..9d13240210d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
@@ -39,8 +39,8 @@ public BooleanProperty() {
 
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof Boolean) {
-            value = (Boolean) v;
+        if (v instanceof Boolean b) {
+            value = b;
         } else {
             value = Boolean.parseBoolean(v.toString());
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
index 09d89c93648..752c98ed252 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java
@@ -95,8 +95,8 @@ public void remove(int index) {
      */
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof Collection<?>) {
-            setCollection((Collection<?>) v);
+        if (v instanceof Collection<?> objects) {
+            setCollection(objects);
         }
 
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
index 238ec0184f3..68853ccff43 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java
@@ -54,8 +54,8 @@ public FunctionProperty() {
 
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof CompoundVariable && !isRunningVersion()) {
-            function = (CompoundVariable) v;
+        if (v instanceof CompoundVariable compoundVariable && !isRunningVersion()) {
+            function = compoundVariable;
         } else {
             overrideValue = v.toString();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java
index ee73eb3adbe..0af7480ce88 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java
@@ -65,8 +65,8 @@ public int hashCode(){
     /** {@inheritDoc} */
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof Map<?, ?>) {
-            setMap((Map<?, ?>) v);
+        if (v instanceof Map<?, ?> map) {
+            setMap(map);
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java
index 3babeed20ec..bfd1397a82d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java
@@ -82,8 +82,8 @@ public void mergeIn(JMeterProperty prop) {
             return;
         }
         log.debug("merging in {}", prop.getClass());
-        if (prop instanceof MultiProperty) {
-            for (JMeterProperty item : (MultiProperty) prop) {
+        if (prop instanceof MultiProperty multiProperty) {
+            for (JMeterProperty item : multiProperty) {
                 addProperty(item);
             }
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java
index f2f4bac1dec..ff53399f60a 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java
@@ -48,8 +48,8 @@ protected NumberProperty(String name) {
 
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof Number) {
-            setNumberValue((Number) v);
+        if (v instanceof Number number) {
+            setNumberValue(number);
         } else {
             try {
                 setNumberValue(v.toString());
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java
index d1231b1bf3f..22fa0d62dc5 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java
@@ -72,8 +72,8 @@ public String getStringValue() {
      */
     @Override
     public void setObjectValue(Object v) {
-        if (v instanceof TestElement) {
-            value = (TestElement) v;
+        if (v instanceof TestElement testElement) {
+            value = testElement;
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java b/src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
index 6613e1b02c3..19ba1aea9c5 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
@@ -93,8 +93,8 @@ public List<Controller> getControllersToRoot() {
         Deque<TestElement> stackLocalCopy = new ArrayDeque<>(stack);
         while(!stackLocalCopy.isEmpty()) {
             TestElement te = stackLocalCopy.getLast();
-            if(te instanceof Controller) {
-                result.add((Controller)te);
+            if (te instanceof Controller controller) {
+                result.add(controller);
             }
             stackLocalCopy.removeLast();
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 01a74581881..35f94b26982 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -282,17 +282,14 @@ public void run() {
                             triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnThreadLoop);
                         } else {
                             switch (threadContext.getTestLogicalAction()) {
-                                case BREAK_CURRENT_LOOP:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::breakOnCurrentLoop);
-                                    break;
-                                case START_NEXT_ITERATION_OF_THREAD:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnThreadLoop);
-                                    break;
-                                case START_NEXT_ITERATION_OF_CURRENT_LOOP:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnCurrentLoop);
-                                    break;
-                                default:
-                                    break;
+                                case BREAK_CURRENT_LOOP ->
+                                        triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::breakOnCurrentLoop);
+                                case START_NEXT_ITERATION_OF_THREAD ->
+                                        triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnThreadLoop);
+                                case START_NEXT_ITERATION_OF_CURRENT_LOOP ->
+                                        triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnCurrentLoop);
+                                default -> {
+                                }
                             }
                         }
                         threadContext.setTestLogicalAction(TestLogicalAction.CONTINUE);
@@ -427,8 +424,7 @@ private static void breakOnCurrentLoop(FindTestElementsUpToRootTraverser pathToR
     private static void continueOnThreadLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
         List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
         for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
+            if (parentController instanceof AbstractThreadGroup tg) {
                 tg.startNextLoop();
             } else {
                 parentController.triggerEndOfLoop();
@@ -742,11 +738,9 @@ private IterationListener initRun(JMeterContext threadContext) {
         if (log.isInfoEnabled()) {
             log.info("Thread started: {}", Thread.currentThread().getName());
         }
-        /*
-         * Setting SamplingStarted before the controllers are initialised allows
-         * them to access the running values of functions and variables (however
-         * it does not seem to help with the listeners)
-         */
+        // Setting SamplingStarted before the controllers are initialised allows
+        // them to access the running values of functions and variables (however
+        // it does not seem to help with the listeners)
         threadContext.setSamplingStarted(true);
 
         threadGroupLoopController.initialize();
@@ -840,12 +834,12 @@ public boolean interrupt(){
         interruptLock.lock();
         try {
             Sampler samp = currentSamplerForInterruption; // fetch once; must be done under lock
-            if (samp instanceof Interruptible){ // (also protects against null)
+            if (samp instanceof Interruptible interruptible){ // (also protects against null)
                 if (log.isWarnEnabled()) {
                     log.warn("Interrupting: {} sampler: {}", threadName, samp.getName());
                 }
                 try {
-                    boolean found = ((Interruptible)samp).interrupt();
+                    boolean found = interruptible.interrupt();
                     if (!found) {
                         log.warn("No operation pending");
                     }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java
index 7f652380e77..c13f1878f7d 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java
@@ -136,8 +136,8 @@ public void putAll(JMeterVariables vars) {
      */
     public String get(String key) {
         Object o = variables.get(key);
-        if(o instanceof String) {
-            return (String) o;
+        if (o instanceof String string) {
+            return string;
         } else if (o != null) {
             return o.toString();
         } else {
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
index 058702827ae..8d4d75ee59a 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
@@ -86,9 +86,6 @@ public void threadStarted() {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.samplers.RemoteThreadsListener#threadFinished()
-     */
     @Override
     public void threadFinished() {
         JMeterContextService.decrNumberOfThreads();
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
index 626d3ce8581..14b537a0e19 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java
@@ -282,7 +282,7 @@ private static class ObjectPair
         private final TestElement child;
         private final TestElement parent;
 
-        public ObjectPair(TestElement child, TestElement parent) {
+        private ObjectPair(TestElement child, TestElement parent) {
             this.child = child;
             this.parent = parent;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index ac483d4bcea..9599fe0e1c4 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -522,7 +522,7 @@ public ThreadStarter(ListenerNotifier notifier, ListedHashTree threadGroupTree,
          * Pause ms milliseconds
          * @param ms long milliseconds
          */
-        private void pause(long ms){
+        private static void pause(long ms){
             try {
                 TimeUnit.MILLISECONDS.sleep(ms);
             } catch (InterruptedException e) {
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
index 468381563f4..3ddcd1f96ee 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -124,8 +124,8 @@ public void assignDefaultValues(TestElement element) {
     @Override
     public void modifyTestElement(TestElement tg) {
         super.modifyTestElement(tg);
-        if (tg instanceof AbstractThreadGroup) {
-            ((AbstractThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
+        if (tg instanceof AbstractThreadGroup abstractThreadGroup) {
+            abstractThreadGroup.setSamplerController((LoopController) loopPanel.createTestElement());
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/timers/TimerService.java b/src/core/src/main/java/org/apache/jmeter/timers/TimerService.java
index b0cc7524767..e20683e07b9 100644
--- a/src/core/src/main/java/org/apache/jmeter/timers/TimerService.java
+++ b/src/core/src/main/java/org/apache/jmeter/timers/TimerService.java
@@ -34,7 +34,7 @@ private TimerService() {
      * Initialization On Demand Holder pattern
      */
     private static class TimerServiceHolder {
-        public static final TimerService INSTANCE = new TimerService();
+        private static final TimerService INSTANCE = new TimerService();
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
index e1712fc4f8c..68704a40a0a 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
@@ -86,8 +86,8 @@ public Object call(Object object, String method, Object[] args)
 
             retval =
                 ((Function) fun).call(cx, global, global, args);
-            if (retval instanceof Wrapper) {
-                retval = ((Wrapper) retval).unwrap();
+            if (retval instanceof Wrapper wrapper) {
+                retval = wrapper.unwrap();
             }
         }
         catch (Throwable t) { //NOSONAR We handle correctly Error case in function
@@ -139,8 +139,8 @@ public Object eval(String source, int lineNo, int columnNo, Object oscript)
                                        source, lineNo,
                                        null);
 
-            if (retval instanceof NativeJavaObject) {
-                retval = ((NativeJavaObject) retval).unwrap();
+            if (retval instanceof NativeJavaObject nativeJavaObject) {
+                retval = nativeJavaObject.unwrap();
             }
 
         }
@@ -159,20 +159,20 @@ public Object eval(String source, int lineNo, int columnNo, Object oscript)
      */
     private static void handleError(Throwable t) throws BSFException {
         Throwable target = t;
-        if (t instanceof WrappedException) {
-            target = ((WrappedException) t).getWrappedException();
+        if (t instanceof WrappedException wrappedException) {
+            target = wrappedException.getWrappedException();
         }
 
         String message = null;
-        if (target instanceof JavaScriptException) {
+        if (target instanceof JavaScriptException javaScriptException) {
             message = target.getLocalizedMessage();
 
             // Is it an exception wrapped in a JavaScriptException?
-            Object value = ((JavaScriptException) target).getValue();
-            if (value instanceof Throwable) {
+            Object value = javaScriptException.getValue();
+            if (value instanceof Throwable throwable) {
                 // likely a wrapped exception from a LiveConnect call.
                 // Display its stack trace as a diagnostic
-                target = (Throwable) value;
+                target = throwable;
             }
         }
         else if (target instanceof EvaluatorException ||
@@ -190,12 +190,12 @@ else if (target instanceof StackOverflowError) {
             message = target.toString();
         }
 
-        if (target instanceof Error && !(target instanceof StackOverflowError)) {
+        if (target instanceof Error error && !(target instanceof StackOverflowError)) {
             // Re-throw Errors because we're supposed to let the JVM see it
             // Don't re-throw StackOverflows, because we know we've
             // corrected the situation by aborting the loop and
             // a long stacktrace would end up on the user's console
-            throw (Error) target;
+            throw error;
         }
         else {
             throw new BSFException(BSFException.REASON_OTHER_ERROR,
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
index 8b3a49f3ea3..6a2219ba075 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
@@ -94,7 +94,7 @@ protected void initManager(BSFManager mgr) throws BSFException{
     protected void processFileOrScript(BSFManager mgr) throws BSFException{
         BSFEngine bsfEngine = mgr.loadScriptingEngine(getScriptLanguage());
         final String scriptFile = getFilename();
-        if (scriptFile.length() == 0) {
+        if (scriptFile.isEmpty()) {
             bsfEngine.exec("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
@@ -112,7 +112,7 @@ protected void processFileOrScript(BSFManager mgr) throws BSFException{
     protected Object evalFileOrScript(BSFManager mgr) throws BSFException{
         BSFEngine bsfEngine = mgr.loadScriptingEngine(getScriptLanguage());
         final String scriptFile = getFilename();
-        if (scriptFile.length() == 0) {
+        if (scriptFile.isEmpty()) {
             return bsfEngine.eval("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
index 86bd865fafd..bb5aaccf533 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
@@ -34,28 +34,28 @@ protected BeanShellBeanInfoSupport(Class<? extends TestBean> beanClass) {
         PropertyDescriptor p;
 
         p = property("resetInterpreter");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
+        p.setValue(NOT_EXPRESSION, true);
+        p.setValue(NOT_OTHER, true);
 
         createPropertyGroup("resetGroup", new String[] { "resetInterpreter" });
 
         p = property("parameters");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         createPropertyGroup("parameterGroup", new String[] { "parameters" });
 
         p = property("filename");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p.setPropertyEditorClass(FileEditor.class);
 
         createPropertyGroup("filenameGroup", new String[] { "filename" });
 
         p = property("script");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p.setPropertyEditorClass(TextAreaEditor.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
index a45081ac40d..8d1344e3402 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
@@ -84,7 +84,7 @@ public void run() {
             setObj.invoke(instance, "t", this );//$NON-NLS-1$
             setInt.invoke(instance, "portnum", serverport);//$NON-NLS-1$
 
-            if (serverfile.length() > 0) {
+            if (!serverfile.isEmpty()) {
                 try {
                     source.invoke(instance, serverfile);
                 } catch (InvocationTargetException ite) {
@@ -93,8 +93,8 @@ public void run() {
                         log.warn("Could not source, {}. {}", serverfile,
                                 (cause != null) ? cause.toString() : ite.toString());
                     }
-                    if (cause instanceof Error) {
-                        throw (Error) cause;
+                    if (cause instanceof Error error) {
+                        throw error;
                     }
                 }
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
index 88b9bdd1bc2..f012f6cc30c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java
@@ -158,7 +158,7 @@ protected Object processFileOrScript(BeanShellInterpreter bsh, SampleResult samp
         bsh.set("bsh.args",//$NON-NLS-1$
                 JOrphanUtils.split(params, " "));//$NON-NLS-1$
 
-        if (fileName.length() == 0) {
+        if (fileName.isEmpty()) {
             String bshScript = getScript();
             if (sampleResult != null) {
                 sampleResult.setSamplerData(bshScript);
diff --git a/src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java b/src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java
index ca335f7f34a..d2ff0711986 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java
@@ -57,12 +57,14 @@ public void checkClientTrusted(X509Certificate[] certificates, String authType)
             for (int i = 0; i < certificates.length; i++) {
                 X509Certificate cert = certificates[i];
                 log.debug(
-                        " Client certificate {}:\n"
-                        + "  Subject DN: {}\n"
-                        + "  Signature Algorithm: {}\n"
-                        + "  Valid from: {}\n"
-                        + "  Valid until: {}\n"
-                        + "  Issuer: {}",
+                        """
+                        Client certificate {}:
+                          Subject DN: {}
+                          Signature Algorithm: {}
+                          Valid from: {}
+                          Valid until: {}
+                          Issuer: {}\
+                        """,
                         i + 1,
                         cert.getSubjectX500Principal(),
                         cert.getSigAlgName(),
@@ -83,12 +85,14 @@ public void checkServerTrusted(X509Certificate[] certificates,String authType) /
             for (int i = 0; i < certificates.length; i++) {
                 X509Certificate cert = certificates[i];
                 log.debug(
-                        " Server certificate {}:\n"
-                        + "  Subject DN: {}\n"
-                        + "  Signature Algorithm: {}\n"
-                        + "  Valid from: {}\n"
-                        + "  Valid until: {}\n"
-                        + "  Issuer: {}",
+                        """
+                        Server certificate {}:
+                          Subject DN: {}
+                          Signature Algorithm: {}
+                          Valid from: {}
+                          Valid until: {}
+                          Issuer: {}\
+                        """,
                         i + 1,
                         cert.getSubjectX500Principal(),
                         cert.getSigAlgName(),
diff --git a/src/core/src/main/java/org/apache/jmeter/util/Document.java b/src/core/src/main/java/org/apache/jmeter/util/Document.java
index e25bfd4cb14..7b0ca1059e0 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/Document.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/Document.java
@@ -75,7 +75,7 @@ public static String getTextFromDocument(byte[] document) {
             }
         }
 
-        if (response.length() == 0 && document.length > 0) {
+        if (response.isEmpty() && document.length > 0) {
             log.warn("Probably: {}", errMissingTika);// $NON-NLS-1$
             response = errMissingTika;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
index 5714e623602..b8e7bb90771 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
@@ -68,10 +68,9 @@ public HttpSSLProtocolSocketFactory(int cps) {
 
 
     private static void configureSocket(Socket socket){
-        if (!(socket instanceof SSLSocket)) {
+        if (!(socket instanceof SSLSocket sock)) {
             throw new IllegalArgumentException("Expected SSLSocket");
         }
-        SSLSocket sock = (SSLSocket) socket;
         if (!PROTOCOL_LIST.isEmpty()) {
             try {
                 sock.setEnabledProtocols(protocols);
@@ -115,7 +114,7 @@ private static SSLSocketFactory getSSLSocketFactory() throws IOException {
         }
     }
 
-    /*
+    /**
      * Wraps the socket in a slow SSL socket if necessary
      */
     private Socket wrapSocket(Socket sock){
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 47912cc3d1e..e5d22a318b1 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -99,7 +99,7 @@ private static class LazyPatternCacheHolder {
         private LazyPatternCacheHolder() {
             super();
         }
-        public static final PatternCacheLRU INSTANCE = new PatternCacheLRU(
+        private static final PatternCacheLRU INSTANCE = new PatternCacheLRU(
                 getPropDefault("oro.patterncache.size",1000), // $NON-NLS-1$
                 new Perl5Compiler());
     }
@@ -108,7 +108,7 @@ private static final class LazyJavaPatternCacheHolder {
         private LazyJavaPatternCacheHolder() {
             super();
         }
-        public static final LoadingCache<Map.Entry<String, Integer>, java.util.regex.Pattern> INSTANCE =
+        private static final LoadingCache<Map.Entry<String, Integer>, java.util.regex.Pattern> INSTANCE =
                 Caffeine
                         .newBuilder()
                         .maximumSize(getPropDefault("jmeter.regex.patterncache.size", 1000))
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index c41e9f755a5..5b042f33b61 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -89,10 +89,7 @@ public synchronized Throwable fillInStackTrace() {
      * Initialization On Demand Holder pattern
      */
     private static class LazyHolder {
-        private LazyHolder() {
-            super();
-        }
-        public static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
+        private static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
     }
 
     /**
@@ -256,13 +253,13 @@ private static <T extends ScriptCacheKey> CompiledScript getCompiledScript(
             return compiledScript;
         } catch (ScriptCompilationInvocationTargetException e) {
             Throwable cause = e.getCause();
-            if (cause instanceof IOException) {
+            if (cause instanceof IOException ioException) {
                 cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey));
-                throw (IOException) cause;
+                throw ioException;
             }
-            if (cause instanceof ScriptException) {
+            if (cause instanceof ScriptException scriptException) {
                 cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey));
-                throw (ScriptException) cause;
+                throw scriptException;
             }
             throw e;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
index f4ca272c598..b31af47d3a9 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
@@ -192,8 +192,7 @@ public void resetContext() {
         }
     }
 
-    /*
-     *
+    /**
      * Creates new SSL context
      *
      * @return SSL context
@@ -221,8 +220,7 @@ private SSLContext createContext() throws GeneralSecurityException {
 
         // Now wrap the default managers with our key manager
         for (int i = 0; i < managers.length; i++) {
-            if (managers[i] instanceof X509KeyManager) {
-                X509KeyManager manager = (X509KeyManager) managers[i];
+            if (managers[i] instanceof X509KeyManager manager) {
                 newManagers[i] = new WrappedX509KeyManager(manager, keys);
             } else {
                 newManagers[i] = managers[i];
@@ -291,7 +289,7 @@ private static class WrappedX509KeyManager extends X509ExtendedKeyManager {
          * @param ks
          *            The KeyStore we derive our client certs and keys from
          */
-        public WrappedX509KeyManager(X509KeyManager parent, JmeterKeyStore ks) {
+        private WrappedX509KeyManager(X509KeyManager parent, JmeterKeyStore ks) {
             this.manager = parent;
             this.store = ks;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index 0c4823ebf68..50bb83b8059 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -142,7 +142,7 @@ protected synchronized JmeterKeyStore getKeyStore() {
                  log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount());
               } else {
                  File initStore = new File(fileName);
-                 if (fileName.length() > 0 && initStore.exists()) {
+                 if (!fileName.isEmpty() && initStore.exists()) {
                      retryLoadKeys(initStore, true);
                      if (log.isInfoEnabled()) {
                          log.info("Total of {} aliases loaded OK from keystore {}",
diff --git a/src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
index e14b4e1249f..46a4fdb90af 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
@@ -37,8 +37,8 @@
  */
 public abstract class ScriptingBeanInfoSupport extends BeanInfoSupport {
 
-    static final String FALSE_AS_STRING = Boolean.FALSE.toString();
-    static final String TRUE_AS_STRING = Boolean.TRUE.toString();
+    static final String FALSE_AS_STRING = "false";
+    static final String TRUE_AS_STRING = "true";
 
     protected ScriptingBeanInfoSupport(Class<? extends TestBean> beanClass, String[] languageTags) {
         this(beanClass, languageTags, null);
@@ -49,7 +49,7 @@ protected ScriptingBeanInfoSupport(Class<? extends TestBean> beanClass, String[]
         PropertyDescriptor p;
 
         p = property("scriptLanguage"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         if (JSR223TestElement.class.isAssignableFrom(beanClass) ) {
             p.setValue(DEFAULT, "groovy"); // $NON-NLS-1$
         } else {
@@ -65,14 +65,14 @@ protected ScriptingBeanInfoSupport(Class<? extends TestBean> beanClass, String[]
                 new String[] { "scriptLanguage" }); // $NON-NLS-1$
 
         p = property("parameters"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         createPropertyGroup("parameterGroup", // $NON-NLS-1$
                 new String[] { "parameters" }); // $NON-NLS-1$
 
         p = property("filename"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
         p.setPropertyEditorClass(FileEditor.class);
 
@@ -104,8 +104,8 @@ protected ScriptingBeanInfoSupport(Class<? extends TestBean> beanClass, String[]
          */
         if (JSR223TestElement.class.isAssignableFrom(beanClass) ) {
             p = property("cacheKey"); // $NON-NLS-1$
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-            p.setValue(NOT_OTHER, Boolean.TRUE);
+            p.setValue(NOT_UNDEFINED, true);
+            p.setValue(NOT_OTHER, true);
             p.setValue(DEFAULT, TRUE_AS_STRING); // $NON-NLS-1$
             p.setPropertyEditorClass(JSR223ScriptCacheCheckboxEditor.class);
             p.setValue(TAGS, new String[]{TRUE_AS_STRING,FALSE_AS_STRING});
@@ -114,7 +114,7 @@ protected ScriptingBeanInfoSupport(Class<? extends TestBean> beanClass, String[]
         }
 
         p = property("script"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
         p.setPropertyEditorClass(TextAreaEditor.class);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
index 7a9865f7ca0..bfcf4dd151f 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
@@ -625,38 +625,38 @@ public static void computeAssertionResult(AssertionResult result,
         try {
             XObject xObject = XPathAPI.eval(doc, xPathExpression, getPrefixResolver(doc));
             switch (xObject.getType()) {
-            case XObject.CLASS_NODESET:
-                NodeList nodeList = xObject.nodelist();
-                final int len = (nodeList != null) ? nodeList.getLength() : 0;
-                log.debug("nodeList length {}", len);
-                // length == 0 means nodelist is null
-                if (len == 0) {
-                    log.debug("nodeList is null or empty. No match by xpath expression: {}", xPathExpression);
-                    result.setFailure(!isNegated);
-                    result.setFailureMessage("No Nodes Matched " + xPathExpression);
-                    return;
-                }
-                if (log.isDebugEnabled() && !isNegated) {
-                    for (int i = 0; i < len; i++) {
-                        log.debug("nodeList[{}]: {}", i, nodeList.item(i));
+                case XObject.CLASS_NODESET -> {
+                    NodeList nodeList = xObject.nodelist();
+                    final int len = (nodeList != null) ? nodeList.getLength() : 0;
+                    log.debug("nodeList length {}", len);
+                    // length == 0 means nodelist is null
+                    if (len == 0) {
+                        log.debug("nodeList is null or empty. No match by xpath expression: {}", xPathExpression);
+                        result.setFailure(!isNegated);
+                        result.setFailureMessage("No Nodes Matched " + xPathExpression);
+                        return;
+                    }
+                    if (log.isDebugEnabled() && !isNegated) {
+                        for (int i = 0; i < len; i++) {
+                            log.debug("nodeList[{}]: {}", i, nodeList.item(i));
+                        }
                     }
+                    result.setFailure(isNegated);
+                    if (isNegated) {
+                        result.setFailureMessage("Specified XPath was found... Turn off negate if this is not desired");
+                    }
+                }
+                case XObject.CLASS_BOOLEAN -> {
+                    boolean resultOfEval = xObject.bool();
+                    result.setFailure(isNegated ? resultOfEval : !resultOfEval);
+                    result.setFailureMessage(isNegated ?
+                            "Nodes Matched for " + xPathExpression
+                            : "No Nodes Matched for " + xPathExpression);
                 }
-                result.setFailure(isNegated);
-                if (isNegated) {
-                    result.setFailureMessage("Specified XPath was found... Turn off negate if this is not desired");
+                default -> {
+                    result.setFailure(true);
+                    result.setFailureMessage("Cannot understand: " + xPathExpression);
                 }
-                return;
-            case XObject.CLASS_BOOLEAN:
-                boolean resultOfEval = xObject.bool();
-                result.setFailure(isNegated ? resultOfEval : !resultOfEval);
-                result.setFailureMessage(isNegated ?
-                        "Nodes Matched for " + xPathExpression
-                        : "No Nodes Matched for " + xPathExpression);
-                return;
-            default:
-                result.setFailure(true);
-                result.setFailureMessage("Cannot understand: " + xPathExpression);
-                return;
             }
         } catch (TransformerException e) {
             result.setError(true);
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index 14212d0c5fa..40eaf0d17aa 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -149,9 +149,7 @@ public void load(InputStream is, String pword)
             }
         }
 
-        /*
-         * Note: if is == null and no pkcs11 store is configured, the arrays will be empty
-         */
+        // Note: if is == null and no pkcs11 store is configured, the arrays will be empty
         this.names = aliasesList.toArray(new String[aliasesList.size()]);
     }
 
@@ -229,8 +227,7 @@ private static String decodeSanList(Collection<? extends List<?>> subjectAlterna
         for (List<?> entry : subjectAlternativeNames) {
             Object indexData = entry.get(0);
             Object data = entry.get(1);
-            if (indexData instanceof Integer) {
-                Integer generalNameIndex = (Integer) indexData;
+            if (indexData instanceof Integer generalNameIndex) {
                 String description = sanGeneralNameIndexToName(generalNameIndex);
                 String valueString = sanDataToString(data);
                 decodedEntries.add(Map.entry(description, valueString));
@@ -242,8 +239,8 @@ private static String decodeSanList(Collection<? extends List<?>> subjectAlterna
     }
 
     private static String sanDataToString(Object data) {
-        if (data instanceof String) {
-            return (String) data;
+        if (data instanceof String s) {
+            return s;
         }
         return Hex.encodeHexString((byte[]) data);
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
index c3ce2d3ed21..1e7aea728d8 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java
@@ -180,8 +180,8 @@ public int compareTo(Sample otherSample) {
 
     @Override
     public boolean equals(Object o){
-        return (o instanceof Sample) &&
-                (this.compareTo((Sample) o) == 0);
+        return (o instanceof Sample sample) &&
+                (this.compareTo(sample) == 0);
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
index c8623157463..c248a8feaa4 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java
@@ -130,8 +130,8 @@ public int compareTo(TableSample o) {
 
     @Override
     public boolean equals(Object o){
-        return (o instanceof TableSample) &&
-                (this.compareTo((TableSample) o) == 0);
+        return (o instanceof TableSample tableSample) &&
+                (this.compareTo(tableSample) == 0);
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java b/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
index 68802c6723d..c44dd9d58ca 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
@@ -261,8 +261,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement c) {
         configureTestElement((AbstractListenerElement) c);
-        if (c instanceof ResultCollector) {
-            ResultCollector rc = (ResultCollector) c;
+        if (c instanceof ResultCollector rc) {
             rc.setErrorLogging(errorLogging.isSelected());
             rc.setSuccessOnlyLogging(successOnlyLogging.isSelected());
             rc.setFilename(getFile());
diff --git a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
index d4021dc1c98..25d76bd3d86 100644
--- a/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java
@@ -48,18 +48,21 @@ void testFailureWhenJmxDoesNotExist() {
     @Test
     void testSuccessWhenJmxExists() throws IOException, ConfigurationException {
         File temp = File.createTempFile("testPlan", ".jmx");
-        String testPlan = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                + "<jmeterTestPlan version=\"1.2\" properties=\"5.0\" jmeter=\"5.2-SNAPSHOT\">\n" + "  <hashTree>\n"
-                + "    <TestPlan guiclass=\"TestPlanGui\" testclass=\"TestPlan\" testname=\"Test Plan\" enabled=\"true\">\n"
-                + "      <stringProp name=\"TestPlan.comments\"></stringProp>\n"
-                + "      <boolProp name=\"TestPlan.functional_mode\">false</boolProp>\n"
-                + "      <boolProp name=\"TestPlan.tearDown_on_shutdown\">true</boolProp>\n"
-                + "      <boolProp name=\"TestPlan.serialize_threadgroups\">false</boolProp>\n"
-                + "      <elementProp name=\"TestPlan.user_defined_variables\" elementType=\"Arguments\" guiclass=\"ArgumentsPanel\" "
-                + "testclass=\"Arguments\" testname=\"User Defined Variables\" enabled=\"true\">\n"
-                + "        <collectionProp name=\"Arguments.arguments\"/>\n" + "      </elementProp>\n"
-                + "      <stringProp name=\"TestPlan.user_define_classpath\"></stringProp></TestPlan>"
-                + "    <hashTree/></hashTree></jmeterTestPlan>";
+        String testPlan = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <jmeterTestPlan version="1.2" properties="5.0" jmeter="5.2-SNAPSHOT">
+                  <hashTree>
+                    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+                      <stringProp name="TestPlan.comments"></stringProp>
+                      <boolProp name="TestPlan.functional_mode">false</boolProp>
+                      <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>
+                      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+                      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" \
+                testclass="Arguments" testname="User Defined Variables" enabled="true">
+                        <collectionProp name="Arguments.arguments"/>
+                      </elementProp>
+                      <stringProp name="TestPlan.user_define_classpath"></stringProp></TestPlan>\
+                    <hashTree/></hashTree></jmeterTestPlan>""";
         try (FileOutputStream os = new FileOutputStream(temp);
                 Writer fw = new OutputStreamWriter(os, StandardCharsets.UTF_8);
                 BufferedWriter out = new BufferedWriter(fw)) {
@@ -77,33 +80,38 @@ void testSuccessWhenJmxExists() throws IOException, ConfigurationException {
     @Test
     void testFailureWithMissingPlugin() throws IOException {
         File temp = File.createTempFile("testPlan", ".jmx");
-        String testPlan = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                + "<jmeterTestPlan version=\"1.2\" properties=\"5.0\" jmeter=\"5.2-SNAPSHOT.20190506\">\n"
-                + "  <hashTree>\n"
-                + "    <TestPlan guiclass=\"TestPlanGui\" testclass=\"TestPlan\" testname=\"Test Plan\" enabled=\"true\">\n"
-                + "      <stringProp name=\"TestPlan.comments\"></stringProp>\n"
-                + "      <boolProp name=\"TestPlan.functional_mode\">false</boolProp>\n"
-                + "      <boolProp name=\"TestPlan.tearDown_on_shutdown\">true</boolProp>\n"
-                + "      <boolProp name=\"TestPlan.serialize_threadgroups\">false</boolProp>\n"
-                + "      <elementProp name=\"TestPlan.user_defined_variables\" elementType=\"Arguments\" "
-                + "guiclass=\"ArgumentsPanel\" testclass=\"Arguments\" testname=\"User Defined Variables\" enabled=\"true\">\n"
-                + "        <collectionProp name=\"Arguments.arguments\"/>\n" + "      </elementProp>\n"
-                + "      <stringProp name=\"TestPlan.user_define_classpath\"></stringProp>\n" + "    </TestPlan>\n"
-                + "    <hashTree>\n" + "      <hashTree>\n"
-                + "        <kg.apc.jmeter.samplers.DummySampler guiclass=\"kg.apc.jmeter.samplers.DummySamplerGui\" "
-                + "testclass=\"kg.apc.jmeter.samplers.DummySampler\" testname=\"jp@gc - Dummy Sampler\" enabled=\"true\">\n"
-                + "          <boolProp name=\"WAITING\">true</boolProp>\n"
-                + "          <boolProp name=\"SUCCESFULL\">true</boolProp>\n"
-                + "          <stringProp name=\"RESPONSE_CODE\">200</stringProp>\n"
-                + "          <stringProp name=\"RESPONSE_MESSAGE\">OK</stringProp>\n"
-                + "          <stringProp name=\"REQUEST_DATA\">{&quot;email&quot;:&quot;user1&quot;, &quot;password&quot;:&quot;password1&quot;}；"
-                + "</stringProp>\n"
-                + "          <stringProp name=\"RESPONSE_DATA\">{&quot;successful&quot;: true, &quot;account_id&quot;:&quot;0123456789&quot;}</stringProp>\n"
-                + "          <stringProp name=\"RESPONSE_TIME\">${__Random(50,500)}</stringProp>\n"
-                + "          <stringProp name=\"LATENCY\">${__Random(1,50)}</stringProp>\n"
-                + "          <stringProp name=\"CONNECT\">${__Random(1,5)}</stringProp>\n"
-                + "        </kg.apc.jmeter.samplers.DummySampler></hashTree></hashTree>\n"
-                + "  </hashTree></jmeterTestPlan><hashTree/></hashTree>\n" + "</jmeterTestPlan>";
+        String testPlan = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <jmeterTestPlan version="1.2" properties="5.0" jmeter="5.2-SNAPSHOT.20190506">
+                  <hashTree>
+                    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+                      <stringProp name="TestPlan.comments"></stringProp>
+                      <boolProp name="TestPlan.functional_mode">false</boolProp>
+                      <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>
+                      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+                      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" \
+                guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+                        <collectionProp name="Arguments.arguments"/>
+                      </elementProp>
+                      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+                    </TestPlan>
+                    <hashTree>
+                      <hashTree>
+                        <kg.apc.jmeter.samplers.DummySampler guiclass="kg.apc.jmeter.samplers.DummySamplerGui" \
+                testclass="kg.apc.jmeter.samplers.DummySampler" testname="jp@gc - Dummy Sampler" enabled="true">
+                          <boolProp name="WAITING">true</boolProp>
+                          <boolProp name="SUCCESFULL">true</boolProp>
+                          <stringProp name="RESPONSE_CODE">200</stringProp>
+                          <stringProp name="RESPONSE_MESSAGE">OK</stringProp>
+                          <stringProp name="REQUEST_DATA">{&quot;email&quot;:&quot;user1&quot;, &quot;password&quot;:&quot;password1&quot;}；\
+                </stringProp>
+                          <stringProp name="RESPONSE_DATA">{&quot;successful&quot;: true, &quot;account_id&quot;:&quot;0123456789&quot;}</stringProp>
+                          <stringProp name="RESPONSE_TIME">${__Random(50,500)}</stringProp>
+                          <stringProp name="LATENCY">${__Random(1,50)}</stringProp>
+                          <stringProp name="CONNECT">${__Random(1,5)}</stringProp>
+                        </kg.apc.jmeter.samplers.DummySampler></hashTree></hashTree>
+                  </hashTree></jmeterTestPlan><hashTree/></hashTree>
+                </jmeterTestPlan>""";
         try (FileOutputStream os = new FileOutputStream(temp);
                 Writer fw = new OutputStreamWriter(os, StandardCharsets.UTF_8);
                 BufferedWriter out = new BufferedWriter(fw)) {
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
index cfab03df32b..7254b3730b6 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java
@@ -86,7 +86,7 @@ public void testFailure1() {
         obj.exit(hosts);
     }
 
-    private void initRunner(DistributedRunnerEmul runner, List<String> hosts) {
+    private static void initRunner(DistributedRunnerEmul runner, List<String> hosts) {
         PrintStream origSystemOut = System.out;
         ByteArrayOutputStream catchingOut = new ByteArrayOutputStream();
         System.setOut(new PrintStream(catchingOut));
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
index 956727f7651..b79a4c1da18 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java
@@ -41,7 +41,7 @@ public class LocalHostTest {
     public void testInterfaces() throws Exception {
         String interfaces = Collections
                 .list(NetworkInterface.getNetworkInterfaces()).stream()
-                .map(this::ifaceWithAddresses)
+                .map(LocalHostTest::ifaceWithAddresses)
                 .collect(Collectors.joining(", "));
         perr("Interfaces: {" + interfaces + "}");
         String externInterface = guessExternalIPv4Interface();
@@ -80,7 +80,7 @@ private SubnetInfo toSubnetInfo(InterfaceAddress addr) {
                         .getInfo();
     }
 
-    private String ifaceWithAddresses(NetworkInterface iface) {
+    private static String ifaceWithAddresses(NetworkInterface iface) {
         return iface + " => ["
                 + iface.getInterfaceAddresses().stream()
                         .map(InterfaceAddress::toString)
@@ -99,7 +99,7 @@ public void testLocalHost() throws Exception {
         }
     }
 
-    private InetAddress getLocalHost() throws UnknownHostException {
+    private static InetAddress getLocalHost() throws UnknownHostException {
         final String key = "java.rmi.server.hostname";
         String host = System.getProperties().getProperty(key); // $NON-NLS-1$
         perr(key + "=" + host);
diff --git a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
index 4a54e69a4ab..7b1713eb316 100644
--- a/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
+++ b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java
@@ -127,7 +127,7 @@ public void testCompleteWordMatchesWithParens() throws Exception {
         assertEquals("toto@${domainMatcher}", replaceWord("(005)", "toto@005"));
     }
 
-    private String replaceWord(String matchRegex, String testData) throws Exception {
+    private static String replaceWord(String matchRegex, String testData) throws Exception {
         TestPlan plan = new TestPlan();
         plan.addParameter("domainMatcher", matchRegex);
         ValueReplacer replacer = new ValueReplacer(plan);
@@ -160,7 +160,7 @@ public void testReplaceStringWithBackslash() throws Exception {
         assertEquals(input, element.getPropertyAsString("domain"));
     }
 
-    /*
+    /**
      * This test should be compared with the one above.
      * Here, the string contains a valid variable reference, so all
      * backslashes are also processed.
diff --git a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
index 246c44af34d..887f5aae001 100644
--- a/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
+++ b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
@@ -45,7 +45,7 @@ public class TestGuiLogEventAppender {
 
     private static List<String> log4j2LevelErrorMessages = Collections.synchronizedList(new ArrayList<>());
 
-    /*
+    /**
      * Configure logging with GuiLogEventAppender for root logger, and override the handler of GuiLogEventAppender
      * to see if there's any log4j2 AppenderControl level error (e.g, "Recursive call to appender gui-log-event").
      */
@@ -97,7 +97,7 @@ public void setUp() {
         log4j2LevelErrorMessages.clear();
     }
 
-    /*
+    /**
      * Make simple logs and see whether there's any log4j2 AppenderControl level error (e.g, "Recursive call to
      * appender gui-log-event").
      * For example, if GuiLogEventAppender meets an exception while accessing GuiPackage class due to static member
diff --git a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
index d2367717259..d0eb6e42b24 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
@@ -73,7 +73,7 @@ public void testErrorSampleCounter() {
         assertEquals(Long.valueOf(2), info.getData());
     }
 
-    private Sample createSample(boolean success) {
+    private static Sample createSample(boolean success) {
         SampleMetadata metadata = new SampleMetadata(',', CSVSaveService.SUCCESSFUL);
         return new Sample(0, metadata, String.valueOf(success));
     }
diff --git a/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
index 952574d3953..c594f1603d0 100644
--- a/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
@@ -160,7 +160,7 @@ public void testSelectMetric() {
     }
 
     // Create a static SampleMetadataObject
-    private SampleMetadata createTestMetaData() {
+    private static SampleMetadata createTestMetaData() {
         String columnsString = "timeStamp,elapsed,label,responseCode,responseMessage,threadName,success,failureMessage,bytes,sentBytes,"
                 + "grpThreads,allThreads,URL,Latency,IdleTime,Connect,\"stream\",\"aws_region\",\"bitrate\",\"ulp_buffer_fill\",\"ulp_lag_time\","
                 + "\"ulp_play_time\",\"ulp_lag_ratio\",\"lag_ratio_wo_bf\",\"ulp_dwn_time\",\"ulp_hits\",\"ulp_avg_chunk_time\","
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
index b14f85f273c..47fc2ec6d72 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
@@ -62,7 +62,7 @@ void testSampleOccurred(boolean successfulParent, String content, Boolean stripO
         assertEquals(nextSender.getResult(), sample);
     }
 
-    private void assertResultsHaveContent(String content, SampleResult sample) {
+    private static void assertResultsHaveContent(String content, SampleResult sample) {
         assertEquals(content, sample.getResponseDataAsString());
         for (SampleResult subResult : sample.getSubResults()) {
             assertResultsHaveContent(content, subResult);
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
index a551a5287f1..e18738b317c 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
@@ -102,8 +102,8 @@ void testPauseTrue() throws Exception {
     private LogRecordingDelegatingLogger recordLogger;
 
     private void divertLog() {// N.B. This needs to divert the log for SampleResult
-        if (SampleResult.log instanceof LogRecordingDelegatingLogger) {
-            recordLogger = (LogRecordingDelegatingLogger) SampleResult.log;
+        if (SampleResult.log instanceof LogRecordingDelegatingLogger logRecordingDelegatingLogger) {
+            recordLogger = logRecordingDelegatingLogger;
         } else {
             recordLogger = new LogRecordingDelegatingLogger(SampleResult.log);
             SampleResult.log = recordLogger;
@@ -193,11 +193,11 @@ public void xtestUntilFail() throws Exception {
         }
     }
 
-    private void testSubResults(boolean nanoTime, long pause) throws Exception {
+    private static void testSubResults(boolean nanoTime, long pause) throws Exception {
         testSubResults(nanoTime, 0L, pause); // Don't use nanoThread
     }
 
-    private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause) throws Exception {
+    private static void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause) throws Exception {
         // This test tries to emulate a http sample, with two
         // subsamples, representing images that are downloaded for the
         // page representing the first sample.
@@ -339,7 +339,7 @@ void testEncodingAndType() throws Exception {
 
     // sleep and return how long we actually slept
     // may be rather longer if the system is busy
-    private long sleep(long ms) throws InterruptedException {
+    private static long sleep(long ms) throws InterruptedException {
         long start = System.currentTimeMillis();
         Thread.sleep(ms);
         return System.currentTimeMillis() - start;
diff --git a/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java b/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
index cb9d959f172..2bcf146922a 100644
--- a/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
+++ b/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java
@@ -34,12 +34,12 @@
 
 public class TestCSVSaveService extends JMeterTestCase {
 
-    private void checkSplitString(String input, char delim, String[] expected) throws Exception {
+    private static void checkSplitString(String input, char delim, String[] expected) throws Exception {
         String[] out = CSVSaveService.csvSplitString(input, delim);
         checkStrings(expected, out);
     }
 
-    private void checkStrings(String[] expected, String[] out) {
+    private static void checkStrings(String[] expected, String[] out) {
         assertEquals(expected.length, out.length, "Incorrect number of strings returned");
         for(int i = 0; i < out.length; i++){
            assertEquals(expected[i], out[i], "Incorrect entry returned");
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
index ed4a10ffbe8..6409d3f473d 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java
@@ -33,7 +33,7 @@
  */
 public class TestBooleanPropertyEditor {
 
-     // N.B. These values are NOT the same as Boolean.FALSE|TRUE.toString()
+     // N.B. These values are NOT the same as false|TRUE.toString()
      // which returns lower-case only.
      // The getAsText() method converts the result to mixed case.
     private static final String FALSE = "False"; // $NON-NLS-1$
@@ -51,14 +51,14 @@ public void testBooleanPropertyEditor() {
         testBooleanEditor(propertyEditor);
     }
 
-    private void testBooleanEditor(PropertyEditor propertyEditor) {
+    private static void testBooleanEditor(PropertyEditor propertyEditor) {
         assertNotNull(propertyEditor, "Expected to find property editor");
         String[] tags = propertyEditor.getTags();
         assertEquals(2, tags.length);
         assertEquals(TRUE, tags[0]);
         assertEquals(FALSE, tags[1]);
 
-        propertyEditor.setValue(Boolean.FALSE);
+        propertyEditor.setValue(false);
         assertEquals(FALSE, propertyEditor.getAsText());
         propertyEditor.setAsText(FALSE);
         assertEquals(FALSE, propertyEditor.getAsText());
@@ -69,7 +69,7 @@ private void testBooleanEditor(PropertyEditor propertyEditor) {
         propertyEditor.setAsText("FALSE");
         assertEquals(FALSE, propertyEditor.getAsText());
 
-        propertyEditor.setValue(Boolean.TRUE);
+        propertyEditor.setValue(true);
         assertEquals(TRUE, propertyEditor.getAsText());
         propertyEditor.setAsText(TRUE);
         assertEquals(TRUE, propertyEditor.getAsText());
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
index c0aae9b63b7..f1d94eeef51 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java
@@ -24,12 +24,12 @@
 
 public class TestComboStringEditor {
 
-    private void testSetGet(ComboStringEditor e, Object value) throws Exception {
+    private static void testSetGet(ComboStringEditor e, Object value) throws Exception {
         e.setValue(value);
         assertEquals(value, e.getValue());
     }
 
-    private void testSetGetAsText(ComboStringEditor e, String text) throws Exception {
+    private static void testSetGetAsText(ComboStringEditor e, String text) throws Exception {
         e.setAsText(text);
         assertEquals(text, e.getAsText());
     }
diff --git a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
index 573de5b5ca4..b0ab172d068 100644
--- a/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
+++ b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java
@@ -23,12 +23,12 @@
 
 public class TestFieldStringEditor {
 
-    private void testSetGet(ComboStringEditor e, Object value) throws Exception {
+    private static void testSetGet(ComboStringEditor e, Object value) throws Exception {
         e.setValue(value);
         assertEquals(value, e.getValue());
     }
 
-    private void testSetGetAsText(ComboStringEditor e, String text) throws Exception {
+    private static void testSetGetAsText(ComboStringEditor e, String text) throws Exception {
         e.setAsText(text);
         assertEquals(text, e.getAsText());
     }
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java
index 3874051209b..4925006620f 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java
@@ -69,7 +69,7 @@ void testElementProperty() throws Exception {
         assertEquals("username=password", prop.getStringValue());
     }
 
-    private void checkEquals(JMeterProperty jp1, JMeterProperty jp2) {
+    private static void checkEquals(JMeterProperty jp1, JMeterProperty jp2) {
         assertEquals(jp1, jp2);
         assertEquals(jp2, jp1);
         assertEquals(jp1, jp1);
@@ -77,7 +77,7 @@ private void checkEquals(JMeterProperty jp1, JMeterProperty jp2) {
         assertEquals(jp1.hashCode(), jp2.hashCode());
     }
 
-    private void checkNotEquals(JMeterProperty jp1, JMeterProperty jp2) {
+    private static void checkNotEquals(JMeterProperty jp1, JMeterProperty jp2) {
         assertEquals(jp1, jp1);
         assertEquals(jp2, jp2);
         assertNotEquals(jp1, jp2);
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
index fcd3a5f6d26..4be76a44885 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java
@@ -168,20 +168,20 @@ void testBug63490EndTestWhenDelayIsTooLongForScheduler() {
         assertTrue(duration <= maxDuration, "Test plan should not run for longer than duration");
     }
 
-    private LoopController createLoopController() {
+    private static LoopController createLoopController() {
         LoopController result = new LoopController();
         result.setLoops(LoopController.INFINITE_LOOP_COUNT);
         result.setEnabled(true);
         return result;
     }
 
-    private DummySampler createSampler() {
+    private static DummySampler createSampler() {
         DummySampler result = new DummySampler();
         result.setName("Call me");
         return result;
     }
 
-    private Timer createConstantTimer(long delay) {
+    private static Timer createConstantTimer(long delay) {
         DummyTimer timer = new DummyTimer();
         timer.setEnabled(true);
         timer.setDelay(delay);
diff --git a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
index 4b04e6bd1ae..0ceb7ecb595 100644
--- a/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
+++ b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
@@ -108,7 +108,7 @@ public void testGetIteratorIsUnmodifable() {
         assertThrowsUnsupportedOperation(iterator::remove);
     }
 
-    private void assertThrowsUnsupportedOperation(Executable executable) {
+    private static void assertThrowsUnsupportedOperation(Executable executable) {
         assertThrows(
                 UnsupportedOperationException.class,
                 executable
@@ -120,7 +120,7 @@ public void testGetIterator() {
         assertEquals(iteratorToMap(vars.getIterator()), iteratorToMap(unmodifiables.getIterator()));
     }
 
-    private <K, V> Map<K, V> iteratorToMap(Iterator<Map.Entry<K, V>> it) {
+    private static <K, V> Map<K, V> iteratorToMap(Iterator<Map.Entry<K, V>> it) {
         Map<K, V> result = new HashMap<>();
         while (it.hasNext()) {
             Map.Entry<K, V> entry = it.next();
diff --git a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
index aef5a00de09..5f5451507ae 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
@@ -122,7 +122,7 @@ void addSecurityProviderWithPositionTest(int position) {
         assertEquals(provider, providersAfter[expectedInsertPosition(position, providersAfter)]);
     }
 
-    private int expectedInsertPosition(int position, Provider[] providersAfter) {
+    private static int expectedInsertPosition(int position, Provider[] providersAfter) {
         if (position == 0) {
             return providersAfter.length - 1;
         }
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
index 475b012a454..024aba096c4 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCase.java
@@ -99,7 +99,7 @@ private static void logprop(String prop) {
     // Helper method to find a file
     protected static File findTestFile(String file) {
         File f = new File(file);
-        if (filePrefix.length() > 0 && !f.isAbsolute()) {
+        if (!filePrefix.isEmpty() && !f.isAbsolute()) {
             f = new File(filePrefix, file);// Add the offset
         }
         return f;
@@ -108,7 +108,7 @@ protected static File findTestFile(String file) {
     // Helper method to find a test path
     protected static String findTestPath(String file) {
         File f = new File(file);
-        if (filePrefix.length() > 0 && !f.isAbsolute()) {
+        if (!filePrefix.isEmpty() && !f.isAbsolute()) {
             return filePrefix + file;// Add the offset
         }
         return file;
diff --git a/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
index f90cff518e9..525a412ab4e 100644
--- a/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
+++ b/src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
@@ -105,22 +105,18 @@ private void readRF(String res, String resourcePrefix, String lang, List<String>
                     int equ = s.indexOf('=');
                     String key = s.substring(0, equ);
                     if (resourcePrefix.equals(MESSAGES)){// Only relevant for messages
-                        /*
-                         * JMeterUtils.getResString() converts space to _ and lowercases
-                         * the key, so make sure all keys pass the test
-                         */
+                        // JMeterUtils.getResString() converts space to _ and lowercases
+                        // the key, so make sure all keys pass the test
                         if (key.contains(" ") || !key.toLowerCase(java.util.Locale.ENGLISH).equals(key)) {
                             failures.add("Invalid key for JMeterUtils " + key);
                         }
                     }
                     String val = s.substring(equ + 1);
                     l.add(key); // Store the key
-                    /*
-                     * Now check for invalid message format: if string contains {0}
-                     * and ' there may be a problem, so do a format with dummy
-                     * parameters and check if there is a { in the output. A bit
-                     * crude, but should be enough for now.
-                     */
+                    // Now check for invalid message format: if string contains {0}
+                    // and ' there may be a problem, so do a format with dummy
+                    // parameters and check if there is a { in the output. A bit
+                    // crude, but should be enough for now.
                     if (val.contains("{0}") && val.contains("'")) {
                         String m = java.text.MessageFormat.format(val, DUMMY_PARAMS);
                         if (m.contains("{")) {
@@ -141,7 +137,7 @@ private void readRF(String res, String resourcePrefix, String lang, List<String>
     }
 
     // Helper method to construct resource name
-    private String getResName(String lang, String resourcePrefix) {
+    private static String getResName(String lang, String resourcePrefix) {
         if (lang.isEmpty()) {
             return resourcePrefix+".properties";
         } else {
@@ -258,9 +254,9 @@ static void findFile(File file, Set<String> set,
         }
     }
 
-    /*
+    /**
      * Use a suite to ensure that the default is done first
-    */
+     */
     public static Collection<Arguments> languagesAndPrefixes() {
         Collection<Arguments> res = new ArrayList<>();
         String[] languages = JMeterMenuBar.getLanguages();
@@ -300,8 +296,8 @@ public void checkI18n(String lang) throws Exception {
         assertEquals(0, missingLabelsPerBundle.size(), missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle));
     }
 
-    private void checkMessagesForLanguage(Map<String, Map<String, String>> missingLabelsPerBundle,
-                                          Properties messages, String bundlePath, String language)
+    private static void checkMessagesForLanguage(Map<String, Map<String, String>> missingLabelsPerBundle,
+            Properties messages, String bundlePath, String language)
             throws IOException {
         Properties messagesFr = new Properties();
         String languageBundle = bundlePath+"_"+language+ ".properties";
@@ -340,7 +336,7 @@ private void checkMessagesForLanguage(Map<String, Map<String, String>> missingLa
         }
     }
 
-    private String printLabels(Map<String, Map<String, String>> missingLabelsPerBundle) {
+    private static String printLabels(Map<String, Map<String, String>> missingLabelsPerBundle) {
         StringBuilder builder = new StringBuilder();
         for (Map.Entry<String, Map<String, String>> entry : missingLabelsPerBundle.entrySet()) {
             builder.append("Missing labels in bundle:")
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java b/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
index 246c803f21c..63c30a56fe5 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java
@@ -38,7 +38,7 @@
 public class TestSwitchController extends JMeterTestCase {
 
     // Get next sample and its name
-    private String nextName(GenericController c) {
+    private static String nextName(GenericController c) {
         Sampler s = c.next();
         String n;
         if (s == null) {
@@ -89,12 +89,12 @@ public void testX() throws Exception {
         runSimpleTest2("X", "one", "Default"); // should match the default entry
     }
 
-    private void runSimpleTests(String cond, String exp) throws Exception {
+    private static void runSimpleTests(String cond, String exp) throws Exception {
         runSimpleTest(cond, exp);
         runSimpleTest2(cond, exp, "one");
     }
 
-    /*
+    /**
      *  Simple test with single Selection controller
      *  Generic Controller
      *  + Sampler "before"
@@ -105,7 +105,7 @@ private void runSimpleTests(String cond, String exp) throws Exception {
      *  + + Sampler "three"
      *  + Sampler "after"
      */
-    private void runSimpleTest(String cond, String exp) throws Exception {
+    private static void runSimpleTest(String cond, String exp) throws Exception {
         GenericController controller = new GenericController();
 
         SwitchController switch_cont = new SwitchController();
@@ -135,7 +135,7 @@ private void runSimpleTest(String cond, String exp) throws Exception {
 
     // Selection controller with two sub-controllers, but each has only 1
     // child
-    /*
+    /**
      * Controller
      * + Before
      * + Switch (cond)
@@ -147,7 +147,7 @@ private void runSimpleTest(String cond, String exp) throws Exception {
      * + + + three
      * + After
      */
-    private void runSimpleTest2(String cond, String exp, String sub1Name) throws Exception {
+    private static void runSimpleTest2(String cond, String exp, String sub1Name) throws Exception {
         GenericController controller = new GenericController();
         GenericController sub_1 = new GenericController();
         GenericController sub_2 = new GenericController();
@@ -193,7 +193,7 @@ public void testTest2() throws Exception {
         runTest2("2", new String[]{"three", "four"});
     }
 
-    /*
+    /**
      * Test:
      * Before
      * Selection Controller
@@ -211,7 +211,7 @@ public void testTest2() throws Exception {
      * cond  = Switch condition
      * exp[] = expected results
      */
-    private void runTest2(String cond, String[] exp) throws Exception {
+    private static void runTest2(String cond, String[] exp) throws Exception {
         int loops = 3;
         LoopController controller = new LoopController();
         controller.setLoops(loops);
@@ -252,7 +252,7 @@ private void runTest2(String cond, String[] exp) throws Exception {
         assertNull(nextName(controller), "Loops:" + loops);
     }
 
-    /*
+    /**
      * N.B. Requires ApacheJMeter_functions.jar to be on the classpath,
      * otherwise the function cannot be resolved.
      */
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
index ed3b56c694f..4b50aec8ff0 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
@@ -73,14 +73,14 @@ static class Holder {
         }
     }
 
-    /*
+    /**
      * Test Functions - create the suite of tests
      */
     static Collection<Function> functions() throws Throwable {
         return Holder.FUNCTIONS;
     }
 
-    private Element getBodyFromXMLDocument(InputStream stream)
+    private static Element getBodyFromXMLDocument(InputStream stream)
             throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setIgnoringElementContentWhitespace(true);
@@ -108,10 +108,10 @@ public void createFunctionSet() throws Exception {
                 for (int j = 0; j < components.getLength(); j++) {
                     org.w3c.dom.Element comp = (org.w3c.dom.Element)
                             components.item(j);
-                    funcTitles.put(comp.getAttribute("name"), Boolean.FALSE);
+                    funcTitles.put(comp.getAttribute("name"), false);
                     String tag = comp.getAttribute("tag");
                     if (StringUtilities.isNotEmpty(tag)){
-                        funcTitles.put(tag, Boolean.FALSE);
+                        funcTitles.put(tag, false);
                     }
                 }
             }
@@ -123,17 +123,17 @@ public void checkFunctionSet() throws Exception {
         Assertions.assertEquals("[]", JMeterTest.keysWithFalseValues(funcTitles).toString(), "Should not have any names left over in funcTitles");
     }
 
-    /*
+    /**
      * run the function test
      */
     @ParameterizedTest
     @MethodSource("functions")
     public void runFunction(Function funcItem) throws Exception {
-        if (funcTitles.size() > 0) {
+        if (!funcTitles.isEmpty()) {
             String title = funcItem.getReferenceKey();
             boolean ct = funcTitles.containsKey(title);
             if (ct) {
-                funcTitles.put(title, Boolean.TRUE);// For detecting extra entries
+                funcTitles.put(title, true);// For detecting extra entries
             }
             // Is this a work in progress ?
             if (!title.contains("(ALPHA") && !title.contains("(EXPERIMENTAL")) {
@@ -147,7 +147,7 @@ public void runFunction(Function funcItem) throws Exception {
         }
     }
 
-    /*
+    /**
      * Check that function descriptions are OK
      */
     @ParameterizedTest
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
index 63b6018ee47..78e6aac47ae 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
@@ -82,7 +82,7 @@ public void checkTestFile(String parent, File testFile) throws Exception{
         assertTree(tree, parent, testFile);
     }
 
-    private void assertTree(HashTree tree, String parent, File testFile) throws Exception {
+    private static void assertTree(HashTree tree, String parent, File testFile) throws Exception {
         assertNotNull(tree, parent+": "+ testFile.getName()+" caused null tree: ");
         final Object object = tree.getArray()[0];
         final String name = testFile.getName();
@@ -92,7 +92,7 @@ private void assertTree(HashTree tree, String parent, File testFile) throws Exce
         }
     }
 
-    private HashTree getTree(File f) throws Exception {
+    private static HashTree getTree(File f) throws Exception {
         HashTree tree = SaveService.loadTree(f);
         return tree;
     }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
index 4e64f94ba20..2aca34f3e1e 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
@@ -138,7 +138,7 @@ public static void resetLocale() {
         Locale.setDefault(DEFAULT_LOCALE);
     }
 
-    /*
+    /**
      * Extract titles from component_reference.xml
      */
     @BeforeAll
@@ -157,13 +157,13 @@ public static void createTitleSet() throws Exception {
                             components.item(j);
                     String nm = comp.getAttribute("name");
                     if (!nm.equals("SSL Manager")) {// Not a true GUI component
-                        guiTitles.put(nm.replace(' ', '_'), Boolean.FALSE);
+                        guiTitles.put(nm.replace(' ', '_'), false);
                     }
                 }
             }
         }
         // Add titles that don't need to be documented
-        guiTitles.put("Example Sampler", Boolean.FALSE);
+        guiTitles.put("Example Sampler", false);
     }
 
     /**
@@ -184,7 +184,7 @@ private static org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
         return body;
     }
 
-    /*
+    /**
      * Extract titles from component_reference.xml
      */
     @BeforeAll
@@ -204,7 +204,7 @@ public static void createTagSet() throws Exception {
                             components.item(j);
                     String tag = comp.getAttribute("tag");
                     if (StringUtilities.isNotEmpty(tag)){
-                        guiTags.put(tag, Boolean.FALSE);
+                        guiTags.put(tag, false);
                     }
                 }
             }
@@ -213,7 +213,7 @@ public static void createTagSet() throws Exception {
 
     public static<T> List<T> keysWithFalseValues(Map<? extends T, Boolean> map) {
         return map.entrySet().stream()
-                .filter(e -> !e.getValue().equals(Boolean.TRUE))
+                .filter(e -> !e.getValue().equals(true))
                 .map(Map.Entry::getKey)
                 .sorted()
                 .collect(Collectors.toList());
@@ -251,7 +251,7 @@ static Collection<GuiComponentHolder> customGuiComponents() throws Throwable {
         return components;
     }
 
-    /*
+    /**
      * Test GUI elements - create the suite of tests
      */
     static Collection<GuiComponentHolder> guiComponents() throws Throwable {
@@ -264,7 +264,7 @@ static Collection<GuiComponentHolder> guiComponents() throws Throwable {
         return components;
     }
 
-    /*
+    /**
      * Test GUI elements - run the test
      */
     @ParameterizedTest
@@ -275,7 +275,7 @@ public void runGUITitle(GuiComponentHolder componentHolder) throws Exception {
             String title = guiItem.getDocAnchor();
             boolean ct = guiTitles.containsKey(title);
             if (ct) {
-                guiTitles.put(title, Boolean.TRUE);// So we can detect extra entries
+                guiTitles.put(title, true);// So we can detect extra entries
             }
             String name = guiItem.getClass().getName();
             if (// Is this a work in progress or an internal GUI component?
@@ -295,7 +295,7 @@ public void runGUITitle(GuiComponentHolder componentHolder) throws Exception {
         }
     }
 
-    /*
+    /**
      * Test GUI elements - run for all components
      */
     @ParameterizedTest
@@ -321,7 +321,7 @@ public void GUIComponents1(GuiComponentHolder componentHolder) throws Exception
         checkElementAlias(guiItem);
     }
 
-    /*
+    /**
      * Test GUI elements - not run for TestBeanGui items
      */
     @ParameterizedTest
@@ -584,7 +584,7 @@ static Stream<Serializable> serializableObjects() throws Throwable {
                 .filter(o -> !o.getClass().getName().endsWith("_Stub"));
     }
 
-    /*
+    /**
      * Test serializable elements - test the object
      */
     @ParameterizedTest
@@ -616,7 +616,7 @@ public static void readAliases() throws Exception {
         assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
     }
 
-    private void checkElementAlias(Object item) {
+    private static void checkElementAlias(Object item) {
         String name=item.getClass().getName();
         boolean contains = nameMap.values().contains(name);
         if (!contains){
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 0f08f23de2f..58f88664558 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -113,7 +113,7 @@ public void testLoadAndSave() throws Exception {
         }
     }
 
-    private boolean loadAndSave(File testFile, String fileName, boolean checkSize, File savedFile) throws Exception {
+    private static boolean loadAndSave(File testFile, String fileName, boolean checkSize, File savedFile) throws Exception {
 
         boolean failed = false;
 
@@ -166,7 +166,7 @@ private boolean loadAndSave(File testFile, String fileName, boolean checkSize, F
         return failed;
     }
 
-    private FileStats getFileStats(File testFile) throws IOException,
+    private static FileStats getFileStats(File testFile) throws IOException,
             FileNotFoundException {
         if (testFile == null || !testFile.exists()) {
             return FileStats.NO_STATS;
@@ -183,7 +183,7 @@ private FileStats getFileStats(File testFile) throws IOException,
      * "jmeterTestPlan" element which may vary because of
      * different attributes/attribute lengths.
      */
-    private FileStats computeFileStats(BufferedReader br) throws IOException {
+    private static FileStats computeFileStats(BufferedReader br) throws IOException {
         int length = 0;
         int lines = 0;
         String line;
@@ -213,7 +213,7 @@ public void testLoad() throws Exception {
     @Test
     public void testClasses(){
         List<String> missingClasses = SaveService.checkClasses();
-        if (missingClasses.size() > 0) {
+        if (!missingClasses.isEmpty()) {
             fail("One or more classes not found:"+missingClasses);
         }
     }
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
index 41e40e5ef30..98ebc4a5aa2 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
@@ -38,9 +38,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class TestElementTest extends JMeterTestCase {
-    /*
-     * Test TestElements - create the suite
-     */
     public static Collection<Object> testElements() throws Throwable {
         return JMeterTest.getObjects(TestElement.class);
     }
@@ -77,7 +74,7 @@ private static void cloneTesting(TestElement item, TestElement clonedItem) {
         assertSame(item.getClass(), clonedItem.getClass(), "Cloned element should have the same class");
     }
 
-    private void checkElementAlias(Object item) throws IOException {
+    private static void checkElementAlias(Object item) throws IOException {
         //FIXME do it only once
         Properties nameMap = SaveService.loadProperties();
         assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/threads/ThreadGroupLoad.java b/src/dist-check/src/test/java/org/apache/jmeter/threads/ThreadGroupLoad.java
index bfb0f954354..3a0d1704f8c 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/threads/ThreadGroupLoad.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/threads/ThreadGroupLoad.java
@@ -40,41 +40,42 @@ public class ThreadGroupLoad {
 
     @Test
     public void readJmxSavedWithJMeter26() throws IOException {
-        String jmx26 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<jmeterTestPlan version=\"1.2\" properties=\"2.2\">\n" +
-                "  <hashTree>\n" +
-                "    <TestPlan guiclass=\"TestPlanGui\" testclass=\"TestPlan\" testname=\"Test Plan\" enabled=\"true\">\n" +
-                "      <stringProp name=\"TestPlan.comments\"></stringProp>\n" +
-                "      <boolProp name=\"TestPlan.functional_mode\">false</boolProp>\n" +
-                "      <boolProp name=\"TestPlan.serialize_threadgroups\">false</boolProp>\n" +
-                "      <elementProp name=\"TestPlan.user_defined_variables\" elementType=\"Arguments\"" +
-                " guiclass=\"ArgumentsPanel\" testclass=\"Arguments\" testname=\"User Defined Variables\n" +
-                "\" enabled=\"true\">\n" +
-                "        <collectionProp name=\"Arguments.arguments\"/>\n" +
-                "      </elementProp>\n" +
-                "      <stringProp name=\"TestPlan.user_define_classpath\"></stringProp>\n" +
-                "    </TestPlan>\n" +
-                "    <hashTree>\n" +
-                "      <ThreadGroup guiclass=\"ThreadGroupGui\" testclass=\"ThreadGroup\" testname=\"Thread Group\" enabled=\"true\">\n" +
-                "        <stringProp name=\"ThreadGroup.on_sample_error\">continue</stringProp>\n" +
-                "        <elementProp name=\"ThreadGroup.main_controller\" elementType=\"LoopController\"" +
-                " guiclass=\"LoopControlPanel\" testclass=\"LoopController\" testname=\"Loop Control\n" +
-                "ler\" enabled=\"true\">\n" +
-                "          <boolProp name=\"LoopController.continue_forever\">false</boolProp>\n" +
-                "          <stringProp name=\"LoopController.loops\">1</stringProp>\n" +
-                "        </elementProp>\n" +
-                "        <stringProp name=\"ThreadGroup.num_threads\">1</stringProp>\n" +
-                "        <stringProp name=\"ThreadGroup.ramp_time\">1</stringProp>\n" +
-                "        <longProp name=\"ThreadGroup.start_time\">1570221190000</longProp>\n" +
-                "        <longProp name=\"ThreadGroup.end_time\">1570221190000</longProp>\n" +
-                "        <boolProp name=\"ThreadGroup.scheduler\">false</boolProp>\n" +
-                "        <stringProp name=\"ThreadGroup.duration\"></stringProp>\n" +
-                "        <stringProp name=\"ThreadGroup.delay\"></stringProp>\n" +
-                "      </ThreadGroup>\n" +
-                "      <hashTree/>\n" +
-                "    </hashTree>\n" +
-                "  </hashTree>\n" +
-                "</jmeterTestPlan>";
+        String jmx26 = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <jmeterTestPlan version="1.2" properties="2.2">
+                  <hashTree>
+                    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+                      <stringProp name="TestPlan.comments"></stringProp>
+                      <boolProp name="TestPlan.functional_mode">false</boolProp>
+                      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+                      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments"\
+                 guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables
+                " enabled="true">
+                        <collectionProp name="Arguments.arguments"/>
+                      </elementProp>
+                      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+                    </TestPlan>
+                    <hashTree>
+                      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+                        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+                        <elementProp name="ThreadGroup.main_controller" elementType="LoopController"\
+                 guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Control
+                ler" enabled="true">
+                          <boolProp name="LoopController.continue_forever">false</boolProp>
+                          <stringProp name="LoopController.loops">1</stringProp>
+                        </elementProp>
+                        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+                        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+                        <longProp name="ThreadGroup.start_time">1570221190000</longProp>
+                        <longProp name="ThreadGroup.end_time">1570221190000</longProp>
+                        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+                        <stringProp name="ThreadGroup.duration"></stringProp>
+                        <stringProp name="ThreadGroup.delay"></stringProp>
+                      </ThreadGroup>
+                      <hashTree/>
+                    </hashTree>
+                  </hashTree>
+                </jmeterTestPlan>""";
 
         Path jmx = tmpDir.resolve("default_thread_group_2_6.xml");
 
@@ -91,10 +92,12 @@ public void readJmxSavedWithJMeter26() throws IOException {
                 "getScheduler: " + tg.getScheduler() + "\n" +
                 "isSameUserOnNextIteration: " + tg.isSameUserOnNextIteration() + "\n";
 
-        Assertions.assertEquals("getName: Thread Group\n" +
-                "getNumThreads: 1\n" +
-                "getRampUp: 1\n" +
-                "getScheduler: false\n" +
-                "isSameUserOnNextIteration: true\n", actual);
+        Assertions.assertEquals("""
+                getName: Thread Group
+                getNumThreads: 1
+                getRampUp: 1
+                getScheduler: false
+                isSameUserOnNextIteration: true
+                """, actual);
     }
 }
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
index 488b59da1ae..f87c1e7da23 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
@@ -34,7 +34,7 @@ public class TestClassFinder {
 
     private String[] libDirs;
 
-    private String getJMeterHome() throws Exception {
+    private static String getJMeterHome() throws Exception {
         JMeterTestUtils.setupJMeterHome();
         String path = JMeterUtils.getJMeterHome() + "/lib";
         return Paths.get(path).toRealPath().toString();
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c8a88732557..c91bb851480 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -55,7 +55,7 @@
 362793,datamodel-jvm-4.7.3.jar
 98115,dec-0.1.2.jar
 588267,dnsjava-3.6.3.jar
-16829,error_prone_annotations-2.24.0.jar
+20390,error_prone_annotations-2.43.0.jar
 1736381,freemarker-2.3.32.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8057697,groovy-5.0.2.jar
@@ -90,7 +90,7 @@
 337315,jodd-util-6.1.0.jar
 277582,json-path-2.8.0.jar
 122808,json-smart-2.6.0.jar
-473788,jsoup-1.17.1.jar
+500363,jsoup-1.21.2.jar
 723652,jsvg-2.0.0.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
diff --git a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
index 72dcef3784e..a4f395fa5b3 100644
--- a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
+++ b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
@@ -98,7 +98,7 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         add(createDataPanel(), BorderLayout.CENTER);
     }
 
-    /*
+    /**
      * Create a data input text field
      *
      * @return the panel for entering the data
diff --git a/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
index ed61301478f..f2b7f27d130 100644
--- a/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
+++ b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
@@ -26,22 +26,22 @@ public class Example3BeanInfo extends BeanInfoSupport {
 
     private PropertyDescriptor getprop(String name) {
         final PropertyDescriptor property = property(name);
-        property.setValue(NOT_UNDEFINED, Boolean.FALSE); // Ensure it is not flagged as 'unconfigured'
+        property.setValue(NOT_UNDEFINED, false); // Ensure it is not flagged as 'unconfigured'
         return property;
     }
 
     private PropertyDescriptor getprop(String name, Object deflt) {
         PropertyDescriptor p = property(name);
         p.setValue(DEFAULT, deflt);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         return p;
     }
 
     public Example3BeanInfo() {
         super(Example3.class);
-        getprop("mybool", Boolean.TRUE); // Must use defaults for primitive types
+        getprop("mybool", true); // Must use defaults for primitive types
         getprop("myBoolean1");
-        getprop("myBoolean2", Boolean.TRUE);
+        getprop("myBoolean2", true);
         getprop("myInt", 77); // Must use defaults for primitive types
         getprop("myInteger1");
         getprop("myInteger2", 123);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java b/src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java
index 90a97d08ab1..ea2d3049f8f 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java
@@ -45,10 +45,8 @@ protected AbstractHostIPName() {
     public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
-        /*
-         * boolean fullHostName = false; if (((CompoundFunction) values[0])
-         * .execute() .toLowerCase() .equals("true")) { fullHostName = true; }
-         */
+        // boolean fullHostName = false; if (((CompoundFunction) values[0])
+        // .execute() .toLowerCase() .equals("true")) { fullHostName = true; }
 
         String value = compute();
 
@@ -56,7 +54,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             JMeterVariables vars = getVariables();
             if (vars != null) {// May be null if function is used on TestPlan
                 String varName = ((CompoundVariable) values[0]).execute().trim();
-                if (varName.length() > 0) {
+                if (!varName.isEmpty()) {
                     vars.put(varName, value);
                 }
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
index 8a924904ec3..d485e7b8f69 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java
@@ -103,7 +103,7 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
             if (bshOut != null) {
                 resultStr = bshOut.toString();
             }
-            if (vars != null && varName.length() > 0) {// vars will be null on TestPlan
+            if (vars != null && !varName.isEmpty()) {// vars will be null on TestPlan
                 vars.put(varName, resultStr);
             }
         } catch (Exception ex) // Mainly for bsh.EvalError
@@ -115,9 +115,8 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
 
     }
 
-    /*
+    /**
      * Helper method for use by scripts
-     *
      */
     public void log_info(String s) {
         log.info(s);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
index 5f71500b708..19f13ab437c 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
@@ -114,7 +114,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             log.warn("Could not read file: {} {}", fileName, e.getMessage(), e);
         }
 
-        if (myName.length() > 0) {
+        if (!myName.isEmpty()) {
             JMeterVariables vars = getVariables();
             if (vars != null) {// Can be null if called from Config item testEnded() method
                 vars.put(myName, myValue);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
index 30710df41f6..c9c162aae06 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
@@ -69,8 +69,8 @@ private FileWrapper(FileRowColContainer fdc) {
     }
 
     private static String checkDefault(String file) {
-        if (file.length() == 0) {
-            if (fileContainers.size() == 1 && defaultFile.length() > 0) {
+        if (file.isEmpty()) {
+            if (fileContainers.size() == 1 && !defaultFile.isEmpty()) {
                 log.warn("Using default: {}", defaultFile);
                 file = defaultFile;
             } else {
@@ -86,7 +86,7 @@ private static String checkDefault(String file) {
     public static synchronized void open(String file, String alias) {
         log.info("Opening {} as {}", file, alias);
         file = checkDefault(file);
-        if (alias.length() == 0) {
+        if (alias.isEmpty()) {
             log.error("Alias cannot be empty");
             return;
         }
@@ -109,7 +109,7 @@ private static FileRowColContainer getFile(String file, String alias) throws Fil
             frcc = new FileRowColContainer(file);
             fileContainers.put(alias, frcc);
             log.info("Saved {} as {} delimiter=<{}>", file, alias, frcc.getDelimiter());
-            if (defaultFile.length() == 0) {
+            if (defaultFile.isEmpty()) {
                 defaultFile = file;// Save in case needed later
             }
         }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
index e8bd9e737b1..19237cca2bb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java
@@ -125,7 +125,7 @@ public synchronized String execute(SampleResult previousResult, Sampler currentS
                 resultStr = out.toString();
             }
 
-            if (varName.length() > 0 && vars != null) {// vars will be null on TestPlan
+            if (!varName.isEmpty() && vars != null) {// vars will be null on TestPlan
                 vars.put(varName, resultStr);
             }
         } catch (Exception ex) // Mainly for bsh.EvalError
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java b/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
index 99a2e9e1b7c..015e250c128 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java
@@ -58,7 +58,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             String variableValue = jMeterVariables.get(variableName);
             return Boolean.toString(variableValue != null);
         } else {
-            return Boolean.FALSE.toString();
+            return "false";
         }
     }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index 4742a9c560b..035eedea5cb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -77,7 +77,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         }
 
         // vars will be null on Test Plan
-        if (vars != null && varName.length() > 0) {
+        if (vars != null && !varName.isEmpty()) {
             vars.put(varName, counterString);
         }
         return counterString;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
index bc4729b6a2f..af3d0503913 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java
@@ -56,7 +56,7 @@ public class JavaScript extends AbstractFunction {
      * Initialization On Demand Holder pattern
      */
     private static class LazyHolder {
-        public static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
+        private static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
     }
 
     private final boolean useRhinoEngine =
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
index 1d90bca74ca..07c7620e519 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java
@@ -100,7 +100,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             {
                 str = o.toString();
             }
-            if (vars != null && varName.length() > 0) {// vars will be null on TestPlan
+            if (vars != null && !varName.isEmpty()) {// vars will be null on TestPlan
                 vars.put(varName, str);
             }
         } catch (Exception e)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
index 6c37bc92b09..69b86555c17 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
@@ -102,7 +102,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             {
                 str = o.toString();
             }
-            if (vars != null && varName.length() > 0) {// vars will be null on TestPlan
+            if (vars != null && !varName.isEmpty()) {// vars will be null on TestPlan
                 vars.put(varName, str);
             }
         } catch (Exception e) {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
index 754ed78fd9c..3f9d06a7d27 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java
@@ -86,7 +86,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         String priorityString;
         if (values.length > 1) { // We have a default
             priorityString = ((CompoundVariable) values[1]).execute();
-            if (priorityString.length() == 0) {
+            if (priorityString.isEmpty()) {
                 priorityString = DEFAULT_PRIORITY;
             }
         } else {
@@ -96,7 +96,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         Throwable t = null;
         if (values.length > 2) { // Throwable wanted
             String value = ((CompoundVariable) values[2]).execute();
-            if (value.length() > 0) {
+            if (!value.isEmpty()) {
                 t = new Throwable(value);
             }
         }
@@ -119,7 +119,7 @@ private static void printDetails(java.io.PrintStream ps, String s, Throwable t,
         StringBuilder sb = new StringBuilder(80);
         sb.append("Log: ");
         sb.append(tn);
-        if (c.length()>0) {
+        if (!c.isEmpty()) {
             sb.append(' ');
             sb.append(c);
         } else {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
index 23901d84508..42e235dde66 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java
@@ -79,7 +79,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         String priorityString;
         if (values.length > 1) { // We have a default
             priorityString = ((CompoundVariable) values[1]).execute();
-            if (priorityString.length() == 0) {
+            if (priorityString.isEmpty()) {
                 priorityString = DEFAULT_PRIORITY;
             }
         } else {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Property.java b/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
index db4be23411c..b3ae8fa8817 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Property.java
@@ -77,7 +77,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         String propertyValue = JMeterUtils.getPropDefault(propertyName, propertyDefault);
         if (values.length > 1) {
             String variableName = ((CompoundVariable) values[1]).execute();
-            if (variableName.length() > 0) {// Allow for empty name
+            if (!variableName.isEmpty()) {// Allow for empty name
                 final JMeterVariables variables = getVariables();
                 if (variables != null) {
                     variables.put(variableName, propertyValue);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Random.java b/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
index bfffeb7c7aa..d1572ae0803 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Random.java
@@ -73,7 +73,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         if (varName != null) {
             JMeterVariables vars = getVariables();
             final String varTrim = varName.execute().trim();
-            if (vars != null && varTrim.length() > 0){// vars will be null on TestPlan
+            if (vars != null && !varTrim.isEmpty()){// vars will be null on TestPlan
                 vars.put(varTrim, randString);
             }
         }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index 77480c94629..b252af9aef1 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -85,16 +85,16 @@ private static final class LocaleFormatObject {
         private final String format;
         private final Locale locale;
 
-        public LocaleFormatObject(String format, Locale locale) {
+        private LocaleFormatObject(String format, Locale locale) {
             this.format = format;
             this.locale = locale;
         }
 
-        public String getFormat() {
+        private String getFormat() {
             return format;
         }
 
-        public Locale getLocale() {
+        private Locale getLocale() {
             return locale;
         }
 
@@ -105,18 +105,14 @@ public int hashCode() {
 
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof LocaleFormatObject)) {
+            if (!(other instanceof LocaleFormatObject otherError)) {
                 return false;
             }
 
-            LocaleFormatObject otherError = (LocaleFormatObject) other;
             return format.equals(otherError.getFormat())
                     && locale.getDisplayName().equals(otherError.getLocale().getDisplayName());
         }
 
-        /**
-         * @see java.lang.Object#toString()
-         */
         @Override
         public String toString() {
             return "LocaleFormatObject [format=" + format + ", locale=" + locale + "]";
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
index 04949cec177..1781505dee7 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
@@ -96,7 +96,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             myValue = RandomStringUtils.insecure().next(length, charsToUse);
         }
 
-        if (myName.length() > 0) {
+        if (!myName.isEmpty()) {
             JMeterVariables vars = getVariables();
             if (vars != null) {// Can be null if called from Config item testEnded() method
                 vars.put(myName, myValue);
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java b/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
index fa624db65f9..7f05028e8c5 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java
@@ -58,7 +58,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             JMeterVariables vars = getVariables();
             if (vars != null) {// May be null if function is used on TestPlan
                 String varName = ((CompoundVariable) values[0]).execute().trim();
-                if (varName.length() > 0) {
+                if (!varName.isEmpty()) {
                     vars.put(varName, name);
                 }
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
index 825f0d8a629..aa2218d4e1e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java
@@ -91,7 +91,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
 
         if (values.length > 2) { // Split string provided
             String newSplitString = ((CompoundVariable) values[2]).execute();
-            splitString = newSplitString.length() > 0 ? newSplitString : splitString;
+            splitString = !newSplitString.isEmpty() ? newSplitString : splitString;
         }
         log.debug("Split {} using {} into {}", stringToSplit, splitString, varNamePrefix);
         String[] parts = JOrphanUtils.split(stringToSplit, splitString, "?");// $NON-NLS-1$
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index dea75e9ac04..611c5053548 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -90,16 +90,16 @@ private static final class LocaleFormatObject {
         private final String format;
         private final Locale locale;
 
-        public LocaleFormatObject(String format, Locale locale) {
+        private LocaleFormatObject(String format, Locale locale) {
             this.format = format;
             this.locale = locale;
         }
 
-        public String getFormat() {
+        private String getFormat() {
             return format;
         }
 
-        public Locale getLocale() {
+        private Locale getLocale() {
             return locale;
         }
 
@@ -110,11 +110,10 @@ public int hashCode() {
 
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof LocaleFormatObject)) {
+            if (!(other instanceof LocaleFormatObject otherError)) {
                 return false;
             }
 
-            LocaleFormatObject otherError = (LocaleFormatObject) other;
             return format.equals(otherError.getFormat())
                     && locale.getDisplayName().equals(otherError.getLocale().getDisplayName());
         }
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java
index aaacf04bf17..44d69eb55ce 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java
@@ -52,13 +52,13 @@ public static void prepareCsv(@TempDir Path dir) throws IOException {
         csvFilePath = path.toString();
     }
 
-    private CSVRead createCsvRead(String fileName, String column) throws Exception {
+    private static CSVRead createCsvRead(String fileName, String column) throws Exception {
         CSVRead cr = new CSVRead();
         cr.setParameters(FunctionTestHelper.makeParams(fileName, column));
         return cr;
     }
 
-    private void eq(CSVRead a, String expected) throws InvalidVariableException {
+    private static void eq(CSVRead a, String expected) throws InvalidVariableException {
         assertEquals(expected, a.execute(null, null));
     }
 
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
index 31178e14965..4fb182548a3 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java
@@ -87,7 +87,7 @@ public void randomStringTest1() throws Exception {
         assertEquals(s, varValue);
     }
 
-    private boolean stringOnlyContainsChars(String value, String allowedChars) {
+    private static boolean stringOnlyContainsChars(String value, String allowedChars) {
         Set<Character> allowedCharsAsSet = allowedChars.chars()
                 .mapToObj(i -> (char) i)
                 .collect(Collectors.toCollection(HashSet::new));
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
index 26e68c16163..92922cfa4c9 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java
@@ -139,12 +139,12 @@ public void SFFTest5() throws Exception {
         }
     }
 
-    private void closeFile(StringFromFile sff) {
+    private static void closeFile(StringFromFile sff) {
         sff.testEnded();
     }
 
     // Create the StringFromFile function and set its parameters.
-    private StringFromFile createSFF(Object... params) throws Exception {
+    private static StringFromFile createSFF(Object... params) throws Exception {
         StringFromFile sff = new StringFromFile();
         sff.setParameters(FunctionTestHelper.makeParams(params));
         return sff;
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
index fc5a2ee1627..941fc083b4d 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java
@@ -86,7 +86,7 @@ private void checkSum(AbstractFunction func, String value, String[] addends)  th
     }
 
     // Perform a sum and check the results
-    private void checkSumNoVar(AbstractFunction func, String value, String[] addends)  throws Exception {
+    private static void checkSumNoVar(AbstractFunction func, String value, String[] addends)  throws Exception {
         Collection<CompoundVariable> parms = Arrays.stream(addends)
                 .map(CompoundVariable::new)
                 .collect(Collectors.toCollection(ArrayList::new));
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java b/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
index 93a061444d2..ceb4e3aa598 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/Synchronizer.java
@@ -53,11 +53,11 @@ private void rethrow() {
         if (failure == null) {
             return;
         }
-        if (failure instanceof RuntimeException) {
-            throw (RuntimeException) failure;
+        if (failure instanceof RuntimeException runtimeException) {
+            throw runtimeException;
         }
-        if (failure instanceof Error) {
-            throw (Error) failure;
+        if (failure instanceof Error error) {
+            throw error;
         }
         throw new RuntimeException("wrap", failure) {
             @Override
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
index af0213f3bd0..0e711dd1b63 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
@@ -183,7 +183,7 @@ public void testAppend(@TempDir Path tempDir) throws Exception {
         assertEquals( "testtest", res);
     }
 
-    private Collection<CompoundVariable> functionParams(String... args) {
+    private static Collection<CompoundVariable> functionParams(String... args) {
         return Stream.of(args).map(CompoundVariable::new).collect(Collectors.toList());
     }
 
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
index b93829c13ed..6fec346ab01 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java
@@ -62,7 +62,7 @@ void setUp() {
         function = new TimeShift();
     }
 
-    private void assertDateEquals(LocalDateTime expected, LocalDateTime actual, Duration delta) {
+    private static void assertDateEquals(LocalDateTime expected, LocalDateTime actual, Duration delta) {
         Duration diff = Duration.between(expected, actual);
         if (diff.abs().compareTo(delta) > 0) {
             fail(expected + " should be within " + delta + " of " + actual + ", actual diff is " + diff);
diff --git a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java
index d962cf17b31..97f98fca586 100644
--- a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java
+++ b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java
@@ -149,7 +149,7 @@ public final String toString() {
         return sb.toString();
     }
 
-    /*
+    /**
      * Convert to a shorter String for test purposes
      *
      * @return the string value
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java
index 87dadfa019a..3a961f49b9c 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java
@@ -471,8 +471,8 @@ public String[] getColumn(String columnName) {
             int index = 0;
             for (Object o : temp) {
                 if (o != null) {
-                    if (o instanceof String) {
-                        returnValue[index++] = (String) o;
+                    if (o instanceof String s) {
+                        returnValue[index++] = s;
                     } else {
                         returnValue[index++] = o.toString();
                     }
@@ -555,7 +555,7 @@ public void setLine(String[] line) {
         String[] h = getHeaders();
         for (int count = 0; count < h.length; count++) {
             tempList = data.get(h[count]);
-            if (count < line.length && line[count].length() > 0) {
+            if (count < line.length && !line[count].isEmpty()) {
                 tempList.add(line[count]);
             } else {
                 tempList.add("N/A");
@@ -580,7 +580,7 @@ public void setLine(String[] line, String deflt) {
         String[] h = getHeaders();
         for (int count = 0; count < h.length; count++) {
             tempList = data.get(h[count]);
-            if (count < line.length && line[count].length() > 0) {
+            if (count < line.length && !line[count].isEmpty()) {
                 tempList.add(line[count]);
             } else {
                 tempList.add(deflt);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
index 37091f0d5b8..7cfa1e68395 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -921,13 +921,12 @@ public boolean equals(Object o) {
         if (!(o instanceof HashTree hashTree)) {
             return false;
         }
-        HashTree oo = (HashTree) o;
-        if (oo.size() != this.size()) {
+        if (hashTree.size() != this.size()) {
             return false;
         }
         // data.equals(oo.data); uses reference identity for keys
         for (Entry<Object, HashTree> entry : data.entrySet()) {
-            HashTree otherValue = oo.data.get(entry.getKey());
+            HashTree otherValue = hashTree.data.get(entry.getKey());
             if (!entry.getValue().equals(otherValue)) {
                 return false;
             }
@@ -1057,11 +1056,11 @@ private static class TreeSearcher implements HashTreeTraverser {
 
         private HashTree result;
 
-        public TreeSearcher(Object t) {
+        private TreeSearcher(Object t) {
             target = t;
         }
 
-        public HashTree getResult() {
+        private HashTree getResult() {
             return result;
         }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
index 1539b83acbb..e9670252fde 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java
@@ -207,10 +207,9 @@ public int hashCode() {
     /** {@inheritDoc} */
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof ListedHashTree)) {
+        if (!(o instanceof ListedHashTree lht)) {
             return false;
         }
-        ListedHashTree lht = (ListedHashTree) o;
         if (!super.equals(lht)) {
             return false;
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java
index 59e1022ab39..4eb697d285c 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java
@@ -178,8 +178,8 @@ public Object getChild(Object parent, int index) {
      *         otherwise
      */
     public boolean isLeaf(Object node) {
-        if (node instanceof TreeNode) {
-            return ((TreeNode)node).isLeaf();
+        if (node instanceof TreeNode treeNode) {
+            return treeNode.isLeaf();
         } else {
             return false;
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
index 41511488a79..3aada0ff296 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/DynamicStyle.java
@@ -158,8 +158,8 @@ public void updateComponentTreeUI(Component root) {
     private void updateComponentTreeUI(Component root, List<Component> components) {
         collectComponents(root, components);
         for (Component component : components) {
-            if (component instanceof JComponent) {
-                updateComponent((JComponent) component);
+            if (component instanceof JComponent jComponent) {
+                updateComponent(jComponent);
             }
             component.invalidate();
         }
@@ -190,8 +190,7 @@ private static void collectComponents(Component root, List<? super Component> co
             return;
         }
         components.add(root);
-        if (root instanceof JComponent) {
-            JComponent jc = (JComponent) root;
+        if (root instanceof JComponent jc) {
             // Note: updateUI might alter the component tree, so we should call it before
             // we try iterating over the children
             jc.updateUI();
@@ -203,13 +202,13 @@ private static void collectComponents(Component root, List<? super Component> co
             }
         }
         Component[] children = null;
-        if (root instanceof JMenu) {
+        if (root instanceof JMenu menu) {
             synchronized (root.getTreeLock()) {
-                children = ((JMenu) root).getMenuComponents();
+                children = menu.getMenuComponents();
             }
-        } else if (root instanceof Container) {
+        } else if (root instanceof Container container) {
             synchronized (root.getTreeLock()) {
-                children = ((Container) root).getComponents();
+                children = container.getComponents();
             }
         }
         if (children != null) {
@@ -217,8 +216,7 @@ private static void collectComponents(Component root, List<? super Component> co
                 collectComponents(child, components);
             }
         }
-        if (root instanceof JTabbedPane) {
-            JTabbedPane tabbedPane = (JTabbedPane) root;
+        if (root instanceof JTabbedPane tabbedPane) {
             int size = tabbedPane.getTabCount();
             for (int i = 0; i < size; i++) {
                 // This is the contents of the tab
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/FocusActions.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/FocusActions.java
index 04bb7b997c4..16214eaeead 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/FocusActions.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/FocusActions.java
@@ -56,7 +56,7 @@ static void bind(JComponent c, KeyStroke focusForward, KeyStroke focusBackward)
     }
 
     private static class TransferFocusAction extends AbstractAction {
-        public TransferFocusAction() {
+        private TransferFocusAction() {
             super("Transfer focus forward"); // $NON-NLS-1$
         }
 
@@ -70,7 +70,7 @@ public void actionPerformed(ActionEvent e) {
     }
 
     private static class TransferFocusBackwardAction extends AbstractAction {
-        public TransferFocusBackwardAction() {
+        private TransferFocusBackwardAction() {
             super("Transfer focus backward"); // $NON-NLS-1$
         }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
index f20ea95a00b..b51b0804c10 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java
@@ -609,7 +609,7 @@ private class MenuScrollTimer extends Timer {
 
         private static final long serialVersionUID = 1;
 
-        public MenuScrollTimer(final int increment, int interval) {
+        private MenuScrollTimer(final int increment, int interval) {
             // Replacing with lambda causes
             // ClassFormatError: Illegal field name "org.apache.jorphan.gui.MenuScroller$this"
             // in class org/apache/jorphan/gui/MenuScroller$MenuScrollTimer
@@ -631,14 +631,14 @@ private class MenuScrollItem extends JMenuItem implements ChangeListener {
 
         private final MenuScrollTimer timer;
 
-        public MenuScrollItem(MenuIcon icon, int increment) {
+        private MenuScrollItem(MenuIcon icon, int increment) {
             setIcon(icon);
             setDisabledIcon(icon);
             timer = new MenuScrollTimer(increment, interval);
             addChangeListener(this);
         }
 
-        public void setInterval(int interval) {
+        private void setInterval(int interval) {
             timer.setDelay(interval);
         }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java
index 7b79ee7e447..c17f52c2674 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java
@@ -36,8 +36,8 @@ public MinMaxLongRenderer(String format) {
 
     @Override
     public void setValue(Object value) {
-        if (value instanceof Long) {
-            long longValue = (Long) value;
+        if (value instanceof Long longVal) {
+            long longValue = longVal;
             if (!(longValue == Long.MAX_VALUE || longValue == Long.MIN_VALUE)) {
                 setText(formatter.format(longValue));
                 return;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
index 5bb09ff0ef1..20610ade4f7 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java
@@ -227,14 +227,9 @@ public int convertRowIndexToView(int index) {
     @Override
     public void setSortKeys(List<? extends SortKey> keys) {
         switch (keys.size()) {
-            case 0:
-                setSortKey(null);
-                break;
-            case 1:
-                setSortKey(keys.get(0));
-                break;
-            default:
-                throw new IllegalArgumentException("Only one column can be sorted");
+            case 0 -> setSortKey(null);
+            case 1 -> setSortKey(keys.get(0));
+            default -> throw new IllegalArgumentException("Only one column can be sorted");
         }
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java
index 5dbc9746b28..29088abec92 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java
@@ -39,12 +39,11 @@ public RateRenderer(String format) {
 
     @Override
     public void setValue(Object value) {
-        if (!(value instanceof Double)) {
+        if (!(value instanceof Double rate)) {
             setText("#N/A");
             return;
         }
-        double rate = (Double) value;
-        if (Double.compare(rate,Double.MAX_VALUE)==0){
+        if (Double.compare(rate, Double.MAX_VALUE) == 0) {
             setText("#N/A");
             return;
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java
index a414cae47d5..7fb4259febc 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/KerningOptimizer.java
@@ -130,8 +130,8 @@ public void installKerningListener(JTextComponent textComponent) {
     public void uninstallKerningListener(JTextComponent textComponent) {
         DisableKerningForLargeTexts kerningListener = null;
         for (PropertyChangeListener listener : textComponent.getPropertyChangeListeners("document")) {
-            if (listener instanceof DisableKerningForLargeTexts) {
-                kerningListener = (DisableKerningForLargeTexts) listener;
+            if (listener instanceof DisableKerningForLargeTexts disableKerningForLargeTexts) {
+                kerningListener = disableKerningForLargeTexts;
             }
         }
         if (kerningListener == null) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
index c7cca0bac5c..3f0700de572 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ui/TextComponentUI.java
@@ -109,9 +109,7 @@ public void actionPerformed(ActionEvent e) {
     public static void uninstallUndo(JTextComponent component) {
         List<PropertyChangeListener> listenersToRemove = new ArrayList<>();
         for (PropertyChangeListener listener : component.getPropertyChangeListeners("document")) {
-            if (listener instanceof AddUndoableEditListenerPropertyChangeListener) {
-                AddUndoableEditListenerPropertyChangeListener v =
-                        (AddUndoableEditListenerPropertyChangeListener) listener;
+            if (listener instanceof AddUndoableEditListenerPropertyChangeListener v) {
                 listenersToRemove.add(v);
 
                 UndoManager undoManager = v.getUndoManager();
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java b/src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java
index c5369dcf16e..2efde2a0b48 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java
@@ -157,10 +157,9 @@ public boolean equals(Object obj) {
         if (!super.equals(obj)) {
             return false;
         }
-        if (!(obj instanceof TextFile)) {
+        if (!(obj instanceof TextFile other)) {
             return false;
         }
-        TextFile other = (TextFile) obj;
         if (encoding == null) {
             return other.encoding == null;
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
index 2c0507f8c6e..b991ef1ab28 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java
@@ -68,7 +68,7 @@ private ClassFinder() {
 
     @API(status = API.Status.EXPERIMENTAL, since = "5.6")
     public static boolean getSkipJarsWithJmeterSkipClassScanningAttribute() {
-        return Objects.equals(SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE.get(), Boolean.TRUE);
+        return Objects.equals(SKIP_JARS_WITH_JMETER_SKIP_ATTRIBUTE.get(), true);
     }
 
     /**
@@ -209,9 +209,6 @@ private static boolean isChildOf(
             return false;
         }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#toString()
-         */
         @Override
         public String toString() {
             return "ExtendsClassFilter [parents=" +
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
index ebbff1bf8a2..42cfd7f4fb5 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/BooleanUtils.java
@@ -44,15 +44,15 @@ public static Boolean toBooleanObject(String s) {
 
         @SuppressWarnings("NullTernary")
         Boolean result = switch (firstChar) {
-            case 't', 'T' -> len == 1 || "true".equalsIgnoreCase(s) ? Boolean.TRUE : null;
-            case 'y', 'Y' -> len == 1 || "yes".equalsIgnoreCase(s) ? Boolean.TRUE : null;
-            case 'o', 'O' -> "on".equalsIgnoreCase(s) ? Boolean.TRUE : (
-                    "off".equalsIgnoreCase(s) ? Boolean.FALSE : null
+            case 't', 'T' -> len == 1 || "true".equalsIgnoreCase(s) ? true : null;
+            case 'y', 'Y' -> len == 1 || "yes".equalsIgnoreCase(s) ? true : null;
+            case 'o', 'O' -> "on".equalsIgnoreCase(s) ? true : (
+                    "off".equalsIgnoreCase(s) ? false : null
             );
-            case '1' -> len == 1 ? Boolean.TRUE : null;
-            case 'f', 'F' -> len == 1 || "false".equalsIgnoreCase(s) ? Boolean.FALSE : null;
-            case 'n', 'N' -> len == 1 || "no".equalsIgnoreCase(s) ? Boolean.FALSE : null;
-            case '0' -> len == 1 ? Boolean.FALSE : null;
+            case '1' -> len == 1 ? true : null;
+            case 'f', 'F' -> len == 1 || "false".equalsIgnoreCase(s) ? false : null;
+            case 'n', 'N' -> len == 1 || "no".equalsIgnoreCase(s) ? false : null;
+            case '0' -> len == 1 ? false : null;
             default -> null;
         };
         return result;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
index 60bc7f647fb..7cdb2ef2092 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
@@ -335,7 +335,7 @@ public static char getChar(Object o, char defaultValue) {
                 return (char) intValue.intValue();
             } else {
                 String s = o.toString();
-                if (s.length() > 0) {
+                if (!s.isEmpty()) {
                     return o.toString().charAt(0);
                 }
                 return defaultValue;
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
index e943f04d1fa..2ba4123eaa7 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
@@ -188,14 +188,14 @@ private void dumpHeap0(String fileName, boolean live) throws Exception {
             }
         } catch (RuntimeMBeanException e) {
             Throwable f = e.getCause();
-            if (f instanceof Exception){
-                throw (Exception) f;
+            if (f instanceof Exception ex){
+                throw ex;
             }
             throw e;
         } catch (MBeanException e) {
             Throwable f = e.getCause();
-            if (f instanceof Exception){
-                throw (Exception) f;
+            if (f instanceof Exception ex){
+                throw ex;
             }
             throw e;
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java b/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
index b36f66ad490..e3a5719c455 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/StringWrap.java
@@ -53,7 +53,7 @@ void setText(String text) {
             next = UNINITIALIZED;
         }
 
-        public int getPos() {
+        private int getPos() {
             return pos;
         }
 
@@ -63,7 +63,7 @@ public int getPos() {
          * @param endWrap the end index of the wrap to consider
          * @return true if the next break is detected within startWrap..endWrap boundaries
          */
-        public boolean advance(int startWrap, int endWrap) {
+        private boolean advance(int startWrap, int endWrap) {
             if (pos == BreakIterator.DONE || pos > endWrap) {
                 return false;
             }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java b/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java
index e3e5156ce20..991814d7ad4 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java
@@ -94,7 +94,7 @@ public XMLBuffer closeTag(String tagName) {
      * @return this
      */
     public XMLBuffer tag(String tagName, CharSequence content) {
-        if (content.length() == 0) {
+        if (content.isEmpty()) {
             emptyTag(tagName);
         } else {
             startTag(tagName);
diff --git a/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java b/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
index 3720bf1be91..1c061fb39b7 100644
--- a/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
+++ b/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java
@@ -924,7 +924,7 @@ public void testCombinations() throws Exception {
                              "-?=[A] -? [B] -?");
     }
 
-    private void check(String[] args, String canon){
+    private static void check(String[] args, String canon){
         final CLArgsParser parser = new CLArgsParser(args, OPTIONS);
 
         assertNull(parser.getErrorString(), parser.getErrorString());
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
index 22fb3d1cdbe..decf6d4f09c 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java
@@ -47,7 +47,7 @@ public static void setup(@TempDir Path keystoreDir) throws IOException {
         KeyToolUtils.generateProxyCA(keystore, password, validity);
     }
 
-    /*
+    /**
      * Check the assumption that a missing executable will generate
      * either an IOException or status which is neither 0 nor 1
      */
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
index 4f51f6f4854..45d3a6e9650 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java
@@ -131,7 +131,7 @@ public void customKeyOrder() {
         assertRowOrderAndIndexes(asList(a3(), c1(), b2(), d4()));
     }
 
-    private ObjectTableModel createTableModel(
+    private static ObjectTableModel createTableModel(
             final String name, final Class<?> klass) {
         return new ObjectTableModel(new String[]{name},
                 new Functor[]{null}, new Functor[]{null},
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestAlphaNumericKeyComparator.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestAlphaNumericKeyComparator.java
index 0b77c756e68..0d0945396bc 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestAlphaNumericKeyComparator.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestAlphaNumericKeyComparator.java
@@ -73,7 +73,7 @@ void testComparatorDifferentKeys(String higher, String lower) {
         assertEquals(1, compareHigherFirst);
     }
 
-    private Map.Entry<Object, Object> entry(final String key) {
+    private static Map.Entry<Object, Object> entry(final String key) {
         return new Map.Entry<Object, Object>() {
 
             @Override
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index 7c28ec55a12..6f278271150 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -89,10 +89,7 @@ public final class NewDriver {
         }
         JMETER_INSTALLATION_DIRECTORY=tmpDir;
 
-        /*
-         * Does the system support UNC paths? If so, may need to fix them up
-         * later
-         */
+        // Does the system support UNC paths? If so, may need to fix them up later
         boolean usesUNC = OS_NAME_LC.startsWith("windows");// $NON-NLS-1$
 
         // Add standard jar locations to initial classpath
@@ -280,7 +277,7 @@ private static String exceptionsToString(List<? extends Exception> exceptionsInI
         return builder.toString();
     }
 
-    /*
+    /**
      * Set logging related system properties.
      */
     private static void setLoggingProperties(String[] args) {
@@ -318,7 +315,8 @@ private static boolean shouldBeHeadless(String[] args) {
         }
         return false;
     }
-    /*
+
+    /**
      * Find command line argument option value by the id and name.
      */
     private static String getCommandLineArgument(String[] args, int id, String name) {
@@ -343,7 +341,7 @@ private static String getCommandLineArgument(String[] args, int id, String name)
         return value;
     }
 
-    /*
+    /**
      * If the fileName contains at least one set of paired single-quotes, reformat using DateFormat
      */
     private static String replaceDateFormatInFileName(String fileName) {
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElementBeanInfo.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElementBeanInfo.java
index 8087c99b8ea..c61149e2682 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElementBeanInfo.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElementBeanInfo.java
@@ -36,16 +36,16 @@ public BoltConnectionElementBeanInfo() {
         createPropertyGroup("connection", new String[] { "boltUri", "username", "password", "maxConnectionPoolSize" });
 
         PropertyDescriptor propertyDescriptor =  property("boltUri");
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, "bolt://localhost:7687");
         propertyDescriptor = property("username");
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, "neo4j");
         propertyDescriptor = property("password", TypeEditor.PasswordEditor);
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, "");
         propertyDescriptor = property("maxConnectionPoolSize");
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, 100);
 
         if(log.isDebugEnabled()) {
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
index 6a8d8af6136..3b000e39d54 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
@@ -127,8 +127,8 @@ private String execute(Driver driver, String cypher, Map<String, Object> params,
 
     private static SampleResult handleException(SampleResult res, Exception ex) {
         res.setResponseMessage(ex.toString());
-        if (ex instanceof Neo4jException) {
-            res.setResponseCode(((Neo4jException)ex).code());
+        if (ex instanceof Neo4jException neo4jException) {
+            res.setResponseCode(neo4jException.code());
         } else {
             res.setResponseCode("500");
         }
diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
index 13e5f570d69..3bb8be860ad 100644
--- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
+++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltTestElementBeanInfoSupport.java
@@ -38,20 +38,20 @@ protected BoltTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
         createPropertyGroup("options", new String[] { "accessMode","database", "txTimeout"});
 
         PropertyDescriptor propertyDescriptor = property("cypher", TypeEditor.TextAreaEditor);
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, "");
 
         propertyDescriptor = property("params", TypeEditor.TextAreaEditor);
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, "{\"paramName\":\"paramValue\"}");
 
         propertyDescriptor = property("recordQueryResults");
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        propertyDescriptor.setValue(DEFAULT, Boolean.FALSE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
+        propertyDescriptor.setValue(DEFAULT, false);
 
         propertyDescriptor = property("accessMode", TypeEditor.ComboStringEditor);
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        propertyDescriptor.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
+        propertyDescriptor.setValue(NOT_EXPRESSION, true);
         propertyDescriptor.setValue(DEFAULT, AccessMode.WRITE.toString());
         propertyDescriptor.setValue(TAGS, getListAccessModes());
 
@@ -59,7 +59,7 @@ protected BoltTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
         propertyDescriptor.setValue(DEFAULT, "neo4j");
 
         propertyDescriptor = property("txTimeout");
-        propertyDescriptor.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        propertyDescriptor.setValue(NOT_UNDEFINED, true);
         propertyDescriptor.setValue(DEFAULT, 60);
     }
 
diff --git a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
index 8042c45fe4b..fc80e11d0c4 100644
--- a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+++ b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
@@ -156,7 +156,7 @@ public String getLabel() {
         sb.append("ftp://");// $NON-NLS-1$
         sb.append(getServer());
         String port = getPort();
-        if (port.length() > 0){
+        if (!port.isEmpty()){
             sb.append(':');
             sb.append(port);
         }
@@ -206,7 +206,7 @@ public SampleResult sample(Entry e) {
                     boolean ftpOK=false;
                     if (isUpload()) {
                         String contents=getLocalFileContents();
-                        if (contents.length() > 0){
+                        if (!contents.isEmpty()){
                             @SuppressWarnings("DefaultCharset")
                             byte[] bytes = contents.getBytes(); // TODO - charset?
                             input = new ByteArrayInputStream(bytes);
@@ -228,7 +228,7 @@ public SampleResult sample(Entry e) {
                                 baos  = new ByteArrayOutputStream();
                                 target=baos;
                             }
-                            if (local.length()>0){
+                            if (!local.isEmpty()){
                                 output=new FileOutputStream(local); // NOSONAR False positive, the output is closed in finally and not overwritten
                                 if (target==null) {
                                     target=output;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
index f7b6589dce0..8b49bcbb4ec 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
@@ -280,6 +280,7 @@ private static JTextField addTextFieldWithLabel(JPanel panel, String labelText)
         return field;
     }
 
+    @SuppressWarnings("EnumOrdinal")
     protected JPanel createSourceAddrPanel() {
         final JPanel sourceAddrPanel = new HorizontalPanel();
         sourceAddrPanel.setBorder(BorderFactory.createTitledBorder(
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index 6b1c1d48b15..bed950ae157 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -109,12 +109,12 @@ public void setControlledByThread(boolean control) {
         setProperty(new BooleanProperty(CONTROLLED_BY_THREAD, control));
     }
 
-    /*
+    /**
      * Holder for storing cache details.
      * Perhaps add original response later?
      */
-    // package-protected to allow access by unit-test cases
     static class CacheEntry {
+        // The class is package-protected to allow access by unit-test cases
         private final String lastModified;
         private final String etag;
         private final Date expires;
@@ -165,9 +165,6 @@ public String getVaryHeader() {
             return varyHeader;
         }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#toString()
-         */
         @Override
         public String toString() {
             return "CacheEntry [lastModified=" + lastModified + ", etag=" + etag + ", expires=" + expires
@@ -367,7 +364,7 @@ private static String getHeader(HttpResponse method, String name) {
         return hdr != null ? hdr.getValue() : null;
     }
 
-    /*
+    /**
      * Is the sample result OK to cache?
      * i.e is it in the 2xx range or equal to 304, and is it a cacheable method?
      */
@@ -497,7 +494,7 @@ private static class HeaderAdapter implements Header {
 
         private final org.apache.jmeter.protocol.http.control.Header delegate;
 
-        public HeaderAdapter(org.apache.jmeter.protocol.http.control.Header delegate) {
+        private HeaderAdapter(org.apache.jmeter.protocol.http.control.Header delegate) {
             this.delegate = delegate;
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
index 75051b37de1..a810405de86 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java
@@ -240,7 +240,7 @@ public void addFile(String cookieFile) throws IOException {
                         throw new IOException("Expected "+_fields+" fields, found "+st.length+" in "+line);
                     }
 
-                    if (st[_path].length()==0) {
+                    if (st[_path].isEmpty()) {
                         st[_path] = "/"; //$NON-NLS-1$
                     }
                     boolean secure = Boolean.parseBoolean(st[_secure]);
@@ -294,7 +294,7 @@ public void add(Cookie c) {
         String cn = c.getName();
         removeMatchingCookies(c); // Can't have two matching cookies
 
-        if (DELETE_NULL_COOKIES && (null == cv || cv.length()==0)) {
+        if (DELETE_NULL_COOKIES && (null == cv || cv.isEmpty())) {
             if (log.isDebugEnabled()) {
                 log.debug("Dropping cookie with null value {}", c.toString());
             }
@@ -319,7 +319,7 @@ public void clear(){
         clearCookies(); // ensure data is set up OK initially
     }
 
-    /*
+    /**
      * Remove all the cookies.
      */
     private void clearCookies() {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java
index b7fc5a8a978..92b72a93a2c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java
@@ -40,8 +40,8 @@ protected byte[] generateGSSToken(
         final GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
 
         final GSSCredential gssCredential;
-        if (credentials instanceof KerberosCredentials) {
-            gssCredential = ((KerberosCredentials) credentials).getGSSCredential();
+        if (credentials instanceof KerberosCredentials kerberosCredentials) {
+            gssCredential = kerberosCredentials.getGSSCredential();
         } else {
             gssCredential = null;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java
index f06efb5b145..533cd674f5e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java
@@ -40,8 +40,8 @@ protected byte[] generateGSSToken(
         final GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
 
         final GSSCredential gssCredential;
-        if (credentials instanceof KerberosCredentials) {
-            gssCredential = ((KerberosCredentials) credentials).getGSSCredential();
+        if (credentials instanceof KerberosCredentials kerberosCredentials) {
+            gssCredential = kerberosCredentials.getGSSCredential();
         } else {
             gssCredential = null;
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
index 83979429a0d..50399b0b243 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
@@ -58,8 +58,8 @@ public AuthScheme create(final HttpContext context) {
     }
 
     private static boolean isEnabled(Object contextAttribute, boolean defaultValue) {
-        if (contextAttribute instanceof Boolean) {
-            return (Boolean) contextAttribute;
+        if (contextAttribute instanceof Boolean b) {
+            return b;
         }
         return defaultValue;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
index 3b40ad9bb49..2d2f7c304bc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
@@ -58,8 +58,8 @@ public AuthScheme create(final HttpContext context) {
     }
 
     private static boolean isEnabled(Object contextAttribute, boolean defaultValue) {
-        if (contextAttribute instanceof Boolean) {
-            return (Boolean) contextAttribute;
+        if (contextAttribute instanceof Boolean b) {
+            return b;
         }
         return defaultValue;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 7849b152d1a..8459b741de7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -285,14 +285,13 @@ public HeaderManager merge(TestElement element, boolean preferLocalValues) {
      *             {@link HeaderManager}
      */
     public HeaderManager merge(TestElement element) {
-        if (!(element instanceof HeaderManager)) {
+        if (!(element instanceof HeaderManager other)) {
             throw new IllegalArgumentException("Cannot merge type:" + this.getClass().getName() + " with type:" + element.getClass().getName());
         }
 
         // start off with a merged object as a copy of the local object
         HeaderManager merged = (HeaderManager)this.clone();
 
-        HeaderManager other = (HeaderManager)element;
         // iterate thru each of the other headers
         for (int i = 0; i < other.getHeaders().size(); i++) {
             Header otherHeader = other.get(i);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
index b8cef36fa73..a0a925980cb 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
@@ -83,7 +83,7 @@ public class HttpMirrorServer extends Thread implements Stoppable, NonTestElemen
 
     /** Initialization On Demand Holder pattern */
     private static class LazyHolder {
-        public static final Logger LOGGER = LoggerFactory.getLogger(HttpMirrorServer.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(HttpMirrorServer.class);
     }
 
     private volatile boolean isRunning;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java
index 74102563931..ec439de2c1e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java
@@ -107,11 +107,9 @@ public LoginCallbackHandler(final String username, final String password) {
         public void handle(Callback[] callbacks) throws IOException,
                 UnsupportedCallbackException {
             for (Callback callback : callbacks) {
-                if (callback instanceof NameCallback && username != null) {
-                    NameCallback nc = (NameCallback) callback;
+                if (callback instanceof NameCallback nc && username != null) {
                     nc.setName(username);
-                } else if (callback instanceof PasswordCallback) {
-                    PasswordCallback pc = (PasswordCallback) callback;
+                } else if (callback instanceof PasswordCallback pc) {
                     pc.setPassword(password.toCharArray());
                 } else {
                     throw new UnsupportedCallbackException( callback,
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
index 85616ed607c..e1a13e515e4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
@@ -93,8 +93,8 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement el) {
         configureTestElement(el);
-        if (el instanceof HttpMirrorControl) {
-            mirrorController = (HttpMirrorControl) el;
+        if (el instanceof HttpMirrorControl httpMirrorControl) {
+            mirrorController = httpMirrorControl;
             mirrorController.setPort(portField.getText());
             mirrorController.setMaxPoolSize(maxPoolSizeField.getText());
             mirrorController.setMaxQueueSize(maxQueueSizeField.getText());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index 72557cf02f8..77863a286bd 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -363,6 +363,7 @@ protected JPanel createOptionalTasksPanel() {
         return checkBoxPanel;
     }
 
+    @SuppressWarnings("EnumOrdinal")
     protected JPanel createSourceAddrPanel() {
         final JPanel sourceAddrPanel = new HorizontalPanel();
         sourceAddrPanel.setBorder(BorderFactory.createTitledBorder(
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 15fdd15f745..57bc98f4216 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -518,9 +518,6 @@ public void setCookies(String cookies) {
             this.cookies = cookies;
         }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#toString()
-         */
         @Override
         public String toString() {
             StringBuilder builder = new StringBuilder();
@@ -846,40 +843,40 @@ public static String[] translateCommandline(String toProcess) {
         while (tok.hasMoreTokens()) {
             String nextTok = tok.nextToken();
             switch (state) {
-            case inQuote:
-                if ("\'".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
+                case inQuote -> {
+                    if ("'".equals(nextTok)) {
+                        lastTokenHasBeenQuoted = true;
+                        state = normal;
+                    } else {
+                        current.append(nextTok);
+                    }
                 }
-                break;
-            case inDoubleQuote:
-                if ("\"".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
+                case inDoubleQuote -> {
+                    if ("\"".equals(nextTok)) {
+                        lastTokenHasBeenQuoted = true;
+                        state = normal;
+                    } else {
+                        current.append(nextTok);
+                    }
                 }
-                break;
-            default:
-                if ("\'".equals(nextTok)) {
-                    state = inQuote;
-                } else if ("\"".equals(nextTok)) {
-                    state = inDoubleQuote;
-                } else if (" ".equals(nextTok)) {
-                    if (lastTokenHasBeenQuoted || current.length() > 0) {
-                        result.add(current.toString());
-                        current.setLength(0);
+                default -> {
+                    if ("'".equals(nextTok)) {
+                        state = inQuote;
+                    } else if ("\"".equals(nextTok)) {
+                        state = inDoubleQuote;
+                    } else if (" ".equals(nextTok)) {
+                        if (lastTokenHasBeenQuoted || !current.isEmpty()) {
+                            result.add(current.toString());
+                            current.setLength(0);
+                        }
+                    } else {
+                        current.append(nextTok.replaceAll("^\\\\[\\r\\n]", ""));
                     }
-                } else {
-                    current.append(nextTok.replaceAll("^\\\\[\\r\\n]", ""));
+                    lastTokenHasBeenQuoted = false;
                 }
-                lastTokenHasBeenQuoted = false;
-                break;
             }
         }
-        if (lastTokenHasBeenQuoted || current.length() > 0) {
+        if (lastTokenHasBeenQuoted || !current.isEmpty()) {
             result.add(current.toString());
         }
         if (state == inQuote || state == inDoubleQuote) {
@@ -910,14 +907,10 @@ public void setAuthUserPasswd(String authentication, String url, Authorization a
     */
    private static void setAuthMechanism(String mechanism, Authorization authorization) {
        switch (mechanism.toLowerCase(Locale.ROOT)) {
-       case "basic":
-           authorization.setMechanism(Mechanism.BASIC);
-           break;
-       case "digest":
-           authorization.setMechanism(Mechanism.DIGEST);
-           break;
-       default:
-           break;
+           case "basic" -> authorization.setMechanism(Mechanism.BASIC);
+           case "digest" -> authorization.setMechanism(Mechanism.DIGEST);
+           default -> {
+           }
        }
    }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
index 7a8daa666ea..6c14e57cf54 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java
@@ -333,20 +333,20 @@ private static class InnerTableModel extends AbstractTableModel {
         private static final long serialVersionUID = 4638155137475747946L;
         final AuthManager manager;
 
-        public InnerTableModel() {
+        private InnerTableModel() {
             manager = new AuthManager();
         }
 
-        public void clearData() {
+        private void clearData() {
             manager.clear();
             fireTableDataChanged();
         }
 
-        public void removeRow(int row) {
+        private void removeRow(int row) {
             manager.remove(row);
         }
 
-        public void addNewRow() {
+        private void addNewRow() {
             manager.addAuth();
         }
 
@@ -392,49 +392,30 @@ public String getColumnName(int column) {
         public Object getValueAt(int row, int column) {
             Authorization auth = manager.getAuthObjectAt(row);
 
-            switch (column){
-                case AuthManager.COL_URL:
-                    return auth.getURL();
-                case AuthManager.COL_USERNAME:
-                    return auth.getUser();
-                case AuthManager.COL_PASSWORD:
-                    return auth.getPass();
-                case AuthManager.COL_DOMAIN:
-                    return auth.getDomain();
-                case AuthManager.COL_REALM:
-                    return auth.getRealm();
-                case AuthManager.COL_MECHANISM:
-                    return auth.getMechanism();
-                default:
-                    return null;
-            }
+            return switch (column) {
+                case AuthManager.COL_URL -> auth.getURL();
+                case AuthManager.COL_USERNAME -> auth.getUser();
+                case AuthManager.COL_PASSWORD -> auth.getPass();
+                case AuthManager.COL_DOMAIN -> auth.getDomain();
+                case AuthManager.COL_REALM -> auth.getRealm();
+                case AuthManager.COL_MECHANISM -> auth.getMechanism();
+                default -> null;
+            };
         }
 
         @Override
         public void setValueAt(Object value, int row, int column) {
             Authorization auth = manager.getAuthObjectAt(row);
             log.debug("Setting auth value: {}", value);
-            switch (column){
-                case AuthManager.COL_URL:
-                    auth.setURL((String) value);
-                    break;
-                case AuthManager.COL_USERNAME:
-                    auth.setUser((String) value);
-                    break;
-                case AuthManager.COL_PASSWORD:
-                    auth.setPass((String) value);
-                    break;
-                case AuthManager.COL_DOMAIN:
-                    auth.setDomain((String) value);
-                    break;
-                case AuthManager.COL_REALM:
-                    auth.setRealm((String) value);
-                    break;
-                case AuthManager.COL_MECHANISM:
-                    auth.setMechanism((Mechanism) value);
-                    break;
-                default:
-                    break;
+            switch (column) {
+                case AuthManager.COL_URL -> auth.setURL((String) value);
+                case AuthManager.COL_USERNAME -> auth.setUser((String) value);
+                case AuthManager.COL_PASSWORD -> auth.setPass((String) value);
+                case AuthManager.COL_DOMAIN -> auth.setDomain((String) value);
+                case AuthManager.COL_REALM -> auth.setRealm((String) value);
+                case AuthManager.COL_MECHANISM -> auth.setMechanism((Mechanism) value);
+                default -> {
+                }
             }
         }
     }
@@ -443,18 +424,17 @@ private static class MechanismCellEditor extends DefaultCellEditor {
 
         private static final long serialVersionUID = 6085773573067229265L;
 
-        public MechanismCellEditor() {
+        private MechanismCellEditor() {
             super(new JComboBox<>(Mechanism.values()));
         }
     }
 
     private static class PasswordCellRenderer extends JPasswordField implements TableCellRenderer {
         private static final long serialVersionUID = 5169856333827579927L;
-        private final Border myBorder;
 
-        public PasswordCellRenderer() {
+        private PasswordCellRenderer() {
             super();
-            myBorder = new EmptyBorder(1, 2, 1, 2);
+            Border myBorder = new EmptyBorder(1, 2, 1, 2);
             setOpaque(true);
             setBorder(myBorder);
         }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
index bb73d1c89c8..6bdda3ded30 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
@@ -203,8 +203,7 @@ public void modifyTestElement(TestElement cm) {
         GuiUtils.stopTableEditing(cookieTable);
         cm.clear();
         configureTestElement(cm);
-        if (cm instanceof CookieManager) {
-            CookieManager cookieManager = (CookieManager) cm;
+        if (cm instanceof CookieManager cookieManager) {
             for (int i = 0; i < tableModel.getRowCount(); i++) {
                 Cookie cookie = createCookie(tableModel.getRowData(i));
                 cookieManager.add(cookie);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index afa4bcae387..51211a2dc54 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -138,8 +138,7 @@ public void modifyTestElement(TestElement dnsRes) {
         GuiUtils.stopTableEditing(dnsServersTable);
         dnsRes.clear();
         configureTestElement(dnsRes);
-        if (dnsRes instanceof DNSCacheManager) {
-            DNSCacheManager dnsCacheManager = (DNSCacheManager) dnsRes;
+        if (dnsRes instanceof DNSCacheManager dnsCacheManager) {
             // Init servers list
             dnsCacheManager.getServers();
             for (int i = 0; i < dnsServersTableModel.getRowCount(); i++) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index 3b91976f1a9..d350dc26663 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -135,10 +135,10 @@ private Arguments getUnclonedParameters() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof Arguments) {
+        if (el instanceof Arguments arguments) {
             tableModel.clearData();
-            HTTPArgument.convertArgumentsToHTTP((Arguments) el);
-            for (JMeterProperty jMeterProperty : ((Arguments) el).getArguments()) {
+            HTTPArgument.convertArgumentsToHTTP(arguments);
+            for (JMeterProperty jMeterProperty : arguments.getArguments()) {
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                 tableModel.addRow(arg);
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
index 8c0b1b2e174..a64c4617c63 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
@@ -155,8 +155,7 @@ public static boolean testFunctors(){
      */
     public void modifyTestElement(TestElement testElement) {
         GuiUtils.stopTableEditing(table);
-        if (testElement instanceof HTTPSamplerBase) {
-            HTTPSamplerBase base = (HTTPSamplerBase) testElement;
+        if (testElement instanceof HTTPSamplerBase base) {
             int rows = tableModel.getRowCount();
             @SuppressWarnings("unchecked") // we only put HTTPFileArgs in it
             Iterator<HTTPFileArg> modelData = (Iterator<HTTPFileArg>) tableModel.iterator();
@@ -183,8 +182,7 @@ public boolean hasData() {
      * @param testElement the HTTPSamplerBase to be used to configure the GUI
      */
     public void configure(TestElement testElement) {
-        if (testElement instanceof HTTPSamplerBase) {
-            HTTPSamplerBase base = (HTTPSamplerBase) testElement;
+        if (testElement instanceof HTTPSamplerBase base) {
             tableModel.clearData();
             for(HTTPFileArg file : base.getHTTPFiles()){
                 tableModel.addRow(file);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
index f64744731ea..5ad2f09bccc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
@@ -315,20 +315,20 @@ private static class InnerTableModel extends AbstractTableModel {
 
         private final HeaderManager manager;
 
-        public InnerTableModel(HeaderManager man) {
+        private InnerTableModel(HeaderManager man) {
             manager = man;
         }
 
-        public void clearData() {
+        private void clearData() {
             manager.clear();
             fireTableDataChanged();
         }
 
-        public void removeRow(int row) {
+        private void removeRow(int row) {
             manager.remove(row);
         }
 
-        public void addNewRow() {
+        private void addNewRow() {
             manager.add();
         }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index bb15159c6b1..ec97d54685c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -587,23 +587,13 @@ private static void createProxyServer(Request request, HTTPSamplerProxy httpSamp
         for (Map.Entry<String, String> proxyPara : proxyServer.entrySet()) {
             String key = proxyPara.getKey();
             switch (key) {
-            case "servername":
-                httpSampler.setProxyHost(proxyPara.getValue());
-                break;
-            case "port":
-                httpSampler.setProxyPortInt(proxyPara.getValue());
-                break;
-            case "scheme":
-                httpSampler.setProxyScheme(proxyPara.getValue());
-                break;
-            case "username":
-                httpSampler.setProxyUser(proxyPara.getValue());
-                break;
-            case "password":
-                httpSampler.setProxyPass(proxyPara.getValue());
-                break;
-            default:
-                break;
+                case "servername" -> httpSampler.setProxyHost(proxyPara.getValue());
+                case "port" -> httpSampler.setProxyPortInt(proxyPara.getValue());
+                case "scheme" -> httpSampler.setProxyScheme(proxyPara.getValue());
+                case "username" -> httpSampler.setProxyUser(proxyPara.getValue());
+                case "password" -> httpSampler.setProxyPass(proxyPara.getValue());
+                default -> {
+                }
             }
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
index 40846bfaec2..7cf3b66c9f2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
@@ -63,12 +63,12 @@ public void process() {
         SampleResult res = context.getPreviousResult();
         HTTPSamplerBase sampler;
         HTTPSampleResult result;
-        if (!(sam instanceof HTTPSamplerBase) || !(res instanceof HTTPSampleResult)) {
+        if (!(sam instanceof HTTPSamplerBase httpSamplerBase) || !(res instanceof HTTPSampleResult httpSampleResult)) {
             log.info("Can't apply HTML Link Parser when the previous" + " sampler run is not an HTTP Request.");
             return;
         } else {
-            sampler = (HTTPSamplerBase) sam;
-            result = (HTTPSampleResult) res;
+            sampler = httpSamplerBase;
+            result = httpSampleResult;
         }
         List<HTTPSamplerBase> potentialLinks = new ArrayList<>();
         String responseText = result.getResponseDataAsString();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
index c092152dafe..98f146fb699 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
@@ -61,7 +61,7 @@ public void process() {
             log.debug("{} Running up named: {}", Thread.currentThread().getName(), getName());//$NON-NLS-1$
         }
         Sampler entry = getThreadContext().getCurrentSampler();
-        if (!(entry instanceof HTTPSamplerBase)) {
+        if (!(entry instanceof HTTPSamplerBase sampler)) {
             return;
         }
 
@@ -73,7 +73,6 @@ public void process() {
             return;
         }
 
-        HTTPSamplerBase sampler = (HTTPSamplerBase) entry;
         for (JMeterProperty jMeterProperty : sampler.getArguments()) {
             Argument arg = (Argument) jMeterProperty.getObjectValue();
             String oldValue = arg.getValue();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
index cb8f6defeec..b56ceb5641c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
@@ -72,7 +72,7 @@ public class URLRewritingModifier extends AbstractTestElement implements Seriali
     public void process() {
         JMeterContext ctx = getThreadContext();
         Sampler sampler = ctx.getCurrentSampler();
-        if (!(sampler instanceof HTTPSamplerBase)) {// Ignore non-HTTP samplers
+        if (!(sampler instanceof HTTPSamplerBase httpSamplerBase)) {// Ignore non-HTTP samplers
             return;
         }
         SampleResult responseText = ctx.getPreviousResult();
@@ -102,7 +102,7 @@ public void process() {
                 savedValue = value;
             }
         }
-        modify((HTTPSamplerBase) sampler, value);
+        modify(httpSamplerBase, value);
     }
 
     private void modify(HTTPSamplerBase sampler, String value) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
index 7ecb9c55712..581ac973f3d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java
@@ -63,8 +63,7 @@ public String getLabelResource() {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof RegExUserParameters){
-            RegExUserParameters re = (RegExUserParameters) el;
+        if (el instanceof RegExUserParameters re){
             paramNamesGrNrField.setText(re.getRegParamNamesGrNr());
             paramValuesGrNrField.setText(re.getRegExParamValuesGrNr());
             refRegExRefNameField.setText(re.getRegExRefName());
@@ -89,8 +88,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement extractor) {
         super.configureTestElement(extractor);
-        if (extractor instanceof RegExUserParameters) {
-            RegExUserParameters regExUserParams = (RegExUserParameters) extractor;
+        if (extractor instanceof RegExUserParameters regExUserParams) {
             regExUserParams.setRegExRefName(refRegExRefNameField.getText());
             regExUserParams.setRegExParamNamesGrNr(paramNamesGrNrField.getText());
             regExUserParams.setRegExParamValuesGrNr(paramValuesGrNrField.getText());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java
index 296aa7988fe..d387ec01f2d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java
@@ -63,8 +63,8 @@ public static LinkExtractorParser getParser(String parserClassName)
 
         try {
             Object clazz = Class.forName(parserClassName).getDeclaredConstructor().newInstance();
-            if (clazz instanceof LinkExtractorParser) {
-                parser = (LinkExtractorParser) clazz;
+            if (clazz instanceof LinkExtractorParser linkExtractorParser) {
+                parser = linkExtractorParser;
             } else {
                 throw new LinkExtractorParseException(new ClassCastException(parserClassName));
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
index a540fa65d55..597c607a163 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
@@ -85,122 +85,117 @@ private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws
         int type = node.getNodeType();
 
         switch (type) {
+            case Node.DOCUMENT_NODE -> scanNodes(((Document) node).getDocumentElement(), urls, baseUrl);
+            case Node.ELEMENT_NODE -> {
+                NamedNodeMap attrs = node.getAttributes();
+                if (name.equalsIgnoreCase(TAG_BASE)) {
+                    String tmp = getValue(attrs, ATT_HREF);
+                    if (tmp != null) {
+                        try {
+                            baseUrl = ConversionUtils.makeRelativeURL(baseUrl, tmp);
+                        } catch (MalformedURLException e) {
+                            throw new HTMLParseException(e);
+                        }
+                    }
+                    break;
+                }
 
-        case Node.DOCUMENT_NODE:
-            scanNodes(((Document) node).getDocumentElement(), urls, baseUrl);
-            break;
-
-        case Node.ELEMENT_NODE:
+                if (name.equalsIgnoreCase(TAG_IMAGE) || name.equalsIgnoreCase(TAG_EMBED)) {
+                    urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
+                    break;
+                }
 
-            NamedNodeMap attrs = node.getAttributes();
-            if (name.equalsIgnoreCase(TAG_BASE)) {
-                String tmp = getValue(attrs, ATT_HREF);
-                if (tmp != null) {
-                    try {
-                        baseUrl = ConversionUtils.makeRelativeURL(baseUrl, tmp);
-                    } catch (MalformedURLException e) {
-                        throw new HTMLParseException(e);
+                if (name.equalsIgnoreCase(TAG_APPLET)) {
+                    String codebase = getValue(attrs, ATT_CODEBASE);
+                    String code = getValue(attrs, ATT_ARCHIVE);
+                    if (StringUtilities.isBlank(code)) {
+                        code = getValue(attrs, ATT_CODE);
+                    }
+                    if (StringUtilities.isBlank(codebase)) {
+                        urls.addURL(code, baseUrl);
+                    } else {
+                        urls.addURL(codebase + "/" + code, baseUrl);
                     }
+                    break;
                 }
-                break;
-            }
 
-            if (name.equalsIgnoreCase(TAG_IMAGE) || name.equalsIgnoreCase(TAG_EMBED)) {
-                urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
-                break;
-            }
+                if (name.equalsIgnoreCase(TAG_OBJECT)) {
+                    String data = getValue(attrs, "codebase");
+                    if (StringUtilities.isNotEmpty(data)) {
+                        urls.addURL(data, baseUrl);
+                    }
 
-            if (name.equalsIgnoreCase(TAG_APPLET)) {
-                String codebase = getValue(attrs, ATT_CODEBASE);
-                String code = getValue(attrs, ATT_ARCHIVE);
-                if (StringUtilities.isBlank(code)) {
-                    code = getValue(attrs, ATT_CODE);
-                }
-                if (StringUtilities.isBlank(codebase)) {
-                    urls.addURL(code, baseUrl);
-                } else {
-                    urls.addURL(codebase + "/" + code, baseUrl);
+                    data = getValue(attrs, "data");
+                    if (StringUtilities.isNotEmpty(data)) {
+                        urls.addURL(data, baseUrl);
+                    }
+                    break;
                 }
-                break;
-            }
 
-            if (name.equalsIgnoreCase(TAG_OBJECT)) {
-                String data = getValue(attrs, "codebase");
-                if (StringUtilities.isNotEmpty(data)) {
-                    urls.addURL(data, baseUrl);
+                if (name.equalsIgnoreCase(TAG_INPUT)) {
+                    String src = getValue(attrs, ATT_SRC);
+                    String typ = getValue(attrs, ATT_TYPE);
+                    if ((src != null) && ATT_IS_IMAGE.equalsIgnoreCase(typ)) {
+                        urls.addURL(src, baseUrl);
+                    }
+                    break;
                 }
-
-                data = getValue(attrs, "data");
-                if (StringUtilities.isNotEmpty(data)) {
-                    urls.addURL(data, baseUrl);
+                if (TAG_LINK.equalsIgnoreCase(name) &&
+                        (STYLESHEET.equalsIgnoreCase(getValue(attrs, ATT_REL))
+                                || SHORTCUT_ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
+                                || ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
+                                || PRELOAD.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
+                    urls.addURL(getValue(attrs, ATT_HREF), baseUrl);
+                    break;
                 }
-                break;
-            }
-
-            if (name.equalsIgnoreCase(TAG_INPUT)) {
-                String src = getValue(attrs, ATT_SRC);
-                String typ = getValue(attrs, ATT_TYPE);
-                if ((src != null) && ATT_IS_IMAGE.equalsIgnoreCase(typ)) {
-                    urls.addURL(src, baseUrl);
+                if (name.equalsIgnoreCase(TAG_SCRIPT)) {
+                    urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
+                    break;
+                }
+                if (name.equalsIgnoreCase(TAG_FRAME)) {
+                    urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
+                    break;
+                }
+                if (name.equalsIgnoreCase(TAG_IFRAME)) {
+                    urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
+                    break;
+                }
+                String back = getValue(attrs, ATT_BACKGROUND);
+                if (back != null) {
+                    urls.addURL(back, baseUrl);
+                }
+                if (name.equalsIgnoreCase(TAG_BGSOUND)) {
+                    urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
+                    break;
                 }
-                break;
-            }
-            if (TAG_LINK.equalsIgnoreCase(name) &&
-                    (STYLESHEET.equalsIgnoreCase(getValue(attrs, ATT_REL))
-                            || SHORTCUT_ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
-                            || ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
-                            || PRELOAD.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
-                urls.addURL(getValue(attrs, ATT_HREF), baseUrl);
-                break;
-            }
-            if (name.equalsIgnoreCase(TAG_SCRIPT)) {
-                urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
-                break;
-            }
-            if (name.equalsIgnoreCase(TAG_FRAME)) {
-                urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
-                break;
-            }
-            if (name.equalsIgnoreCase(TAG_IFRAME)) {
-                urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
-                break;
-            }
-            String back = getValue(attrs, ATT_BACKGROUND);
-            if (back != null) {
-                urls.addURL(back, baseUrl);
-            }
-            if (name.equalsIgnoreCase(TAG_BGSOUND)) {
-                urls.addURL(getValue(attrs, ATT_SRC), baseUrl);
-                break;
-            }
 
-            String style = getValue(attrs, ATT_STYLE);
-            if (style != null) {
-                HtmlParsingUtils.extractStyleURLs(baseUrl, urls, style);
-            }
+                String style = getValue(attrs, ATT_STYLE);
+                if (style != null) {
+                    HtmlParsingUtils.extractStyleURLs(baseUrl, urls, style);
+                }
 
-            NodeList children = node.getChildNodes();
-            if (children != null) {
-                int len = children.getLength();
-                for (int i = 0; i < len; i++) {
-                    baseUrl = scanNodes(children.item(i), urls, baseUrl);
+                NodeList children = node.getChildNodes();
+                if (children != null) {
+                    int len = children.getLength();
+                    for (int i = 0; i < len; i++) {
+                        baseUrl = scanNodes(children.item(i), urls, baseUrl);
+                    }
                 }
             }
-
-            break;
-
-        default:
+            default -> {
+            }
             // ignored
-            break;
         }
 
         return baseUrl;
 
     }
 
-    /*
-     * Helper method to get an attribute value, if it exists @param attrs list
-     * of attributes @param attname attribute name @return
+    /**
+     * Helper method to get an attribute value, if it exists
+     * @param attrs list of attributes
+     * @param attname attribute name
+     * @return attribute value
      */
     private static String getValue(NamedNodeMap attrs, String attname) {
         String v = null;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
index 9e1ccb70531..ab09b1a03fd 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
@@ -38,7 +38,7 @@
  */
 public class JsoupBasedHtmlParser extends HTMLParser {
 
-    /*
+    /**
      * A dummy class to pass the pointer of URL.
      */
     private static class URLPointer {
@@ -57,7 +57,7 @@ private static final class JMeterNodeVisitor implements NodeVisitor {
          * @param baseUrl base url to extract possibly missing information from urls found in <code>urls</code>
          * @param urls collection of urls to consider
          */
-        public JMeterNodeVisitor(final URLPointer baseUrl, URLCollection urls) {
+        private JMeterNodeVisitor(final URLPointer baseUrl, URLCollection urls) {
             this.urls = urls;
             this.baseUrl = baseUrl;
         }
@@ -72,10 +72,9 @@ private void extractAttribute(Element tag, String attributeName) {
 
         @Override
         public void head(Node node, int depth) {
-            if (!(node instanceof Element)) {
+            if (!(node instanceof Element tag)) {
                 return;
             }
-            Element tag = (Element) node;
             String tagName = tag.tagName().toLowerCase(Locale.ROOT);
             if (tagName.equals(TAG_BODY)) {
                 extractAttribute(tag, ATT_BACKGROUND);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 2338e83f295..8f1e5c193e0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -46,7 +46,7 @@ public class LagartoBasedHtmlParser extends HTMLParser {
         LoggerFactory.setLoggerProvider(Slf4jLogger.PROVIDER);
     }
 
-    /*
+    /**
      * A dummy class to pass the pointer of URL.
      */
     private static class URLPointer {
@@ -64,7 +64,7 @@ private static final class JMeterTagVisitor extends EmptyTagVisitor {
          * @param baseUrl base url to add possibly missing information to urls found in <code>urls</code>
          * @param urls collection of urls to consider
          */
-        public JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls) {
+        private JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls) {
             this.urls = urls;
             this.baseUrl = baseUrl;
         }
@@ -77,97 +77,85 @@ private void extractAttribute(Tag tag, String attributeName) {
             }
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see jodd.lagarto.EmptyTagVisitor#script(jodd.lagarto.Tag,
-         * java.lang.CharSequence)
-         */
         @Override
         public void script(Tag tag, CharSequence body) {
             extractAttribute(tag, ATT_SRC);
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see jodd.lagarto.EmptyTagVisitor#tag(jodd.lagarto.Tag)
-         */
         @Override
         public void tag(Tag tag) {
             TagType tagType = tag.getType();
             switch (tagType) {
-            case START:
-            case SELF_CLOSING:
-                if (tag.nameEquals(TAG_BODY)) {
-                    extractAttribute(tag, ATT_BACKGROUND);
-                } else if (tag.nameEquals(TAG_BASE)) {
-                    CharSequence baseref = tag.getAttributeValue(ATT_HREF);
-                    try {
-                        if (StringUtilities.isNotEmpty(baseref))// Bugzilla 30713
-                        {
-                            baseUrl.url = ConversionUtils.makeRelativeURL(baseUrl.url, baseref.toString());
+                case START, SELF_CLOSING -> {
+                    if (tag.nameEquals(TAG_BODY)) {
+                        extractAttribute(tag, ATT_BACKGROUND);
+                    } else if (tag.nameEquals(TAG_BASE)) {
+                        CharSequence baseref = tag.getAttributeValue(ATT_HREF);
+                        try {
+                            if (StringUtilities.isNotEmpty(baseref))// Bugzilla 30713
+                            {
+                                baseUrl.url = ConversionUtils.makeRelativeURL(baseUrl.url, baseref.toString());
+                            }
+                        } catch (MalformedURLException e1) {
+                            throw new IllegalArgumentException("Error creating relative url from " + baseref, e1);
                         }
-                    } catch (MalformedURLException e1) {
-                        throw new IllegalArgumentException("Error creating relative url from " + baseref, e1);
-                    }
-                } else if (tag.nameEquals(TAG_IMAGE)) {
-                    extractAttribute(tag, ATT_SRC);
-                } else if (tag.nameEquals(TAG_APPLET)) {
-                    CharSequence codebase = tag.getAttributeValue(ATT_CODEBASE);
-                    CharSequence archive = tag.getAttributeValue(ATT_ARCHIVE);
-                    CharSequence code = tag.getAttributeValue(ATT_CODE);
-                    if (StringUtilities.isNotBlank(codebase)) {
-                        String result;
-                        if (StringUtilities.isNotBlank(archive)) {
-                            result = codebase + "/" + archive;
+                    } else if (tag.nameEquals(TAG_IMAGE)) {
+                        extractAttribute(tag, ATT_SRC);
+                    } else if (tag.nameEquals(TAG_APPLET)) {
+                        CharSequence codebase = tag.getAttributeValue(ATT_CODEBASE);
+                        CharSequence archive = tag.getAttributeValue(ATT_ARCHIVE);
+                        CharSequence code = tag.getAttributeValue(ATT_CODE);
+                        if (StringUtilities.isNotBlank(codebase)) {
+                            String result;
+                            if (StringUtilities.isNotBlank(archive)) {
+                                result = codebase + "/" + archive;
+                            } else {
+                                result = codebase + "/" + code;
+                            }
+                            urls.addURL(normalizeUrlValue(result), baseUrl.url);
                         } else {
-                            result = codebase + "/" + code;
+                            extractAttribute(tag, ATT_CODE);
                         }
-                        urls.addURL(normalizeUrlValue(result), baseUrl.url);
-                    } else {
-                        extractAttribute(tag, ATT_CODE);
-                    }
-                } else if (tag.nameEquals(TAG_OBJECT)) {
-                    extractAttribute(tag, ATT_CODEBASE);
-                    extractAttribute(tag, ATT_DATA);
-                } else if (tag.nameEquals(TAG_INPUT)) {
-                    // we check the input tag type for image
-                    CharSequence type = tag.getAttributeValue(ATT_TYPE);
-                    if (type != null && CharSequenceUtil.equalsIgnoreCase(ATT_IS_IMAGE, type)) {
-                        // then we need to download the binary
+                    } else if (tag.nameEquals(TAG_OBJECT)) {
+                        extractAttribute(tag, ATT_CODEBASE);
+                        extractAttribute(tag, ATT_DATA);
+                    } else if (tag.nameEquals(TAG_INPUT)) {
+                        // we check the input tag type for image
+                        CharSequence type = tag.getAttributeValue(ATT_TYPE);
+                        if (type != null && CharSequenceUtil.equalsIgnoreCase(ATT_IS_IMAGE, type)) {
+                            // then we need to download the binary
+                            extractAttribute(tag, ATT_SRC);
+                        }
+                    } else if (tag.nameEquals(TAG_SCRIPT)) {
+                        extractAttribute(tag, ATT_SRC);
+                        // Bug 51750
+                    } else if (tag.nameEquals(TAG_FRAME) || tag.nameEquals(TAG_IFRAME)) {
+                        extractAttribute(tag, ATT_SRC);
+                    } else if (tag.nameEquals(TAG_EMBED)) {
                         extractAttribute(tag, ATT_SRC);
+                    } else if (tag.nameEquals(TAG_BGSOUND)) {
+                        extractAttribute(tag, ATT_SRC);
+                    } else if (tag.nameEquals(TAG_LINK)) {
+                        CharSequence relAttribute = tag.getAttributeValue(ATT_REL);
+                        // Putting the string first means it works even if the attribute is null
+                        if (relAttribute != null &&
+                                (CharSequenceUtil.equalsIgnoreCase(STYLESHEET, relAttribute)
+                                        || CharSequenceUtil.equalsIgnoreCase(ICON, relAttribute)
+                                        || CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute)
+                                        || CharSequenceUtil.equalsIgnoreCase(PRELOAD, relAttribute))) {
+                            extractAttribute(tag, ATT_HREF);
+                        }
+                    } else {
+                        extractAttribute(tag, ATT_BACKGROUND);
                     }
-                } else if (tag.nameEquals(TAG_SCRIPT)) {
-                    extractAttribute(tag, ATT_SRC);
-                    // Bug 51750
-                } else if (tag.nameEquals(TAG_FRAME) || tag.nameEquals(TAG_IFRAME)) {
-                    extractAttribute(tag, ATT_SRC);
-                } else if (tag.nameEquals(TAG_EMBED)) {
-                    extractAttribute(tag, ATT_SRC);
-                } else if (tag.nameEquals(TAG_BGSOUND)){
-                    extractAttribute(tag, ATT_SRC);
-                } else if (tag.nameEquals(TAG_LINK)) {
-                    CharSequence relAttribute = tag.getAttributeValue(ATT_REL);
-                    // Putting the string first means it works even if the attribute is null
-                    if (relAttribute != null &&
-                            (CharSequenceUtil.equalsIgnoreCase(STYLESHEET,relAttribute)
-                                    || CharSequenceUtil.equalsIgnoreCase(ICON, relAttribute)
-                                    || CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute)
-                                    || CharSequenceUtil.equalsIgnoreCase(PRELOAD, relAttribute))) {
-                        extractAttribute(tag, ATT_HREF);
+                    // Now look for URLs in the STYLE attribute
+                    CharSequence styleTagStr = tag.getAttributeValue(ATT_STYLE);
+                    if (StringUtilities.isNotEmpty(styleTagStr)) {
+                        HtmlParsingUtils.extractStyleURLs(baseUrl.url, urls, styleTagStr.toString());
                     }
-                } else {
-                    extractAttribute(tag, ATT_BACKGROUND);
                 }
-                // Now look for URLs in the STYLE attribute
-                CharSequence styleTagStr = tag.getAttributeValue(ATT_STYLE);
-                if (StringUtilities.isNotEmpty(styleTagStr)) {
-                    HtmlParsingUtils.extractStyleURLs(baseUrl.url, urls, styleTagStr.toString());
+                case END -> {
                 }
-                break;
-            case END:
-                break;
             }
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index 02a1ad68231..6e344287d5d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -102,7 +102,7 @@ public Iterator<URL> iterator() {
         return new UrlIterator(coll.iterator());
     }
 
-    /*
+    /**
      * Private iterator used to unwrap the URL from the URLString class
      */
     private static class UrlIterator implements Iterator<URL> {
@@ -117,7 +117,7 @@ public boolean hasNext() {
             return iter.hasNext();
         }
 
-        /*
+        /**
          * Unwraps the URLString class to return the URL
          */
         @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
index 4befa30c1b4..1f969d0e34f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
@@ -52,7 +52,7 @@ public abstract class AbstractSamplerCreator implements SamplerCreator {
         JMeterUtils.getPropDefault("proxy.binary.directory",// $NON-NLS-1$
                 System.getProperty("user.dir")); // $NON-NLS-1$ proxy.binary.fileType=binary
 
-    /*
+    /**
      * Optionally number the requests
      */
     private static final boolean NUMBER_REQUESTS =
@@ -64,7 +64,7 @@ public abstract class AbstractSamplerCreator implements SamplerCreator {
     static {
         String binaries = JMeterUtils.getPropDefault("proxy.binary.types", // $NON-NLS-1$
                 "application/x-amf,application/x-java-serialized-object,binary/octet-stream"); // $NON-NLS-1$
-        if (binaries.length() > 0){
+        if (!binaries.isEmpty()){
             StringTokenizer s = new StringTokenizer(binaries,"|, ");// $NON-NLS-1$
             while (s.hasMoreTokens()){
                 BINARY_CONTENT_TYPES.add(s.nextToken());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 558c2f98938..7d4e986d272 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -138,7 +138,7 @@ public final void populateSampler(HTTPSamplerBase sampler,
             log.debug("sampler path = {}", sampler.getPath());
         }
         Arguments arguments = sampler.getArguments();
-        if(arguments.getArgumentCount() == 1 && arguments.getArgument(0).getName().length()==0) {
+        if(arguments.getArgumentCount() == 1 && arguments.getArgument(0).getName().isEmpty()) {
             sampler.setPostBodyRaw(true);
         }
 
@@ -259,7 +259,7 @@ protected void computeFromPostBody(HTTPSamplerBase sampler,
                 // We also assume this if no content type is present, to be most backwards compatible,
                 // but maybe we should only parse arguments if the content type is as expected
                 sampler.parseArguments(postData.trim(), contentEncoding); //standard name=value postData
-            } else if (postData.length() > 0) {
+            } else if (!postData.isEmpty()) {
                 if (isBinaryContent(contentType)) {
                     try {
                         File tempDir = new File(getBinaryDirectory());
@@ -321,20 +321,11 @@ private static boolean isPotentialXml(String postData) {
 
     private static final class ErrorDetectionHandler extends DefaultHandler {
         private boolean errorDetected = false;
-        public ErrorDetectionHandler() {
-            super();
-        }
-        /* (non-Javadoc)
-         * @see org.xml.sax.helpers.DefaultHandler#error(org.xml.sax.SAXParseException)
-         */
         @Override
         public void error(SAXParseException e) throws SAXException {
             this.errorDetected = true;
         }
 
-        /* (non-Javadoc)
-         * @see org.xml.sax.helpers.DefaultHandler#fatalError(org.xml.sax.SAXParseException)
-         */
         @Override
         public void fatalError(SAXParseException e) throws SAXException {
             this.errorDetected = true;
@@ -342,7 +333,7 @@ public void fatalError(SAXParseException e) throws SAXException {
         /**
          * @return the errorDetected
          */
-        public boolean isErrorDetected() {
+        private boolean isErrorDetected() {
             return errorDetected;
         }
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
index d14d0632df0..00c513a7319 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
@@ -53,7 +53,7 @@ public static String formOk(String contentType, long contentLength) {
         out.append("Server: ").append(HTTP_SERVER).append(CR);
         out.append("MIME-version: 1.0").append(CR);
 
-        if (0 < contentType.length()) {
+        if (!contentType.isEmpty()) {
             out.append("Content-Type: ").append(contentType).append(CR);
         } else {
             out.append("Content-Type: text/html").append(CR);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
index b3cdcd0f102..581c2e45152 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
@@ -249,7 +249,7 @@ private void parseFirstLine(String firstLine) {
         log.debug("First Line url: {}", url);
     }
 
-    /*
+    /**
      * Split line into name/value pairs and store in headers if relevant
      * If name = "content-length", then return value as int, else return 0
      */
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
index 6c16ba227a1..5568b40d338 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java
@@ -339,35 +339,30 @@ private SSLSocketFactory getSSLSocketFactory(String host) {
         }
         final String hashAlias;
         final String keyAlias;
-        switch(ProxyControl.KEYSTORE_MODE) {
-        case DYNAMIC_KEYSTORE:
-            try {
-                keyStore = target.getKeyStore(); // pick up any recent changes from other threads
-                String alias = getDomainMatch(keyStore, host);
-                if (alias == null) {
-                    hashAlias = host;
-                    keyAlias = host;
-                    keyStore = target.updateKeyStore(port, keyAlias);
-                } else if (alias.equals(host)) { // the host has a key already
-                    hashAlias = host;
-                    keyAlias = host;
-                } else { // the host matches a domain; use its key
-                    hashAlias = alias;
-                    keyAlias = alias;
+        switch (ProxyControl.KEYSTORE_MODE) {
+            case DYNAMIC_KEYSTORE -> {
+                try {
+                    keyStore = target.getKeyStore(); // pick up any recent changes from other threads
+                    String alias = getDomainMatch(keyStore, host);
+                    if (alias == null) {
+                        hashAlias = host;
+                        keyAlias = host;
+                        keyStore = target.updateKeyStore(port, keyAlias);
+                    } else if (alias.equals(host)) { // the host has a key already
+                        hashAlias = host;
+                        keyAlias = host;
+                    } else { // the host matches a domain; use its key
+                        hashAlias = alias;
+                        keyAlias = alias;
+                    }
+                } catch (IOException | GeneralSecurityException e) {
+                    log.error("{} Problem with keystore", port, e);
+                    return null;
                 }
-            } catch (IOException | GeneralSecurityException e) {
-                log.error("{} Problem with keystore", port, e);
-                return null;
             }
-            break;
-        case JMETER_KEYSTORE:
-            hashAlias = keyAlias = ProxyControl.JMETER_SERVER_ALIAS;
-            break;
-        case USER_KEYSTORE:
-            hashAlias = keyAlias = ProxyControl.CERT_ALIAS;
-            break;
-        default:
-            throw new IllegalStateException("Impossible case: " + ProxyControl.KEYSTORE_MODE);
+            case JMETER_KEYSTORE -> hashAlias = keyAlias = ProxyControl.JMETER_SERVER_ALIAS;
+            case USER_KEYSTORE -> hashAlias = keyAlias = ProxyControl.CERT_ALIAS;
+            default -> throw new IllegalStateException("Impossible case: " + ProxyControl.KEYSTORE_MODE);
         }
         synchronized (HOST2SSL_SOCK_FAC) {
             final SSLSocketFactory sslSocketFactory = HOST2SSL_SOCK_FAC.get(hashAlias);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 5fb176c28f3..b7b29c17087 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -616,8 +616,7 @@ public synchronized void deliverSampler(final HTTPSamplerBase sampler, final Tes
         if (sampler != null) {
             if (USE_REDIRECT_DISABLING
                     && (samplerRedirectAutomatically || samplerFollowRedirects)
-                    && result instanceof HTTPSampleResult) {
-                final HTTPSampleResult httpSampleResult = (HTTPSampleResult) result;
+                    && result instanceof HTTPSampleResult httpSampleResult) {
                 final String urlAsString = httpSampleResult.getUrlAsString();
                 if (urlAsString.equals(LAST_REDIRECT)) { // the url matches the last redirect
                     sampler.setEnabled(false);
@@ -689,9 +688,9 @@ private static Authorization createAuthorization(final TestElement[] testElement
         Authorization authorization = null;
         // Iterate over subconfig elements searching for HeaderManager
         for (TestElement te : testElements) {
-            if (te instanceof HeaderManager) {
+            if (te instanceof HeaderManager headerManager) {
                 @SuppressWarnings("unchecked") // headers should only contain the correct classes
-                List<TestElementProperty> headers = (ArrayList<TestElementProperty>) ((HeaderManager) te).getHeaders().getObjectValue();
+                List<TestElementProperty> headers = (ArrayList<TestElementProperty>) headerManager.getHeaders().getObjectValue();
                 for (Iterator<?> iterator = headers.iterator(); iterator.hasNext();) {
                     TestElementProperty tep = (TestElementProperty) iterator
                             .next();
@@ -708,18 +707,13 @@ private static Authorization createAuthorization(final TestElement[] testElement
                             // then set Mechanism.BASIC_DIGEST, otherwise Mechanism.KERBEROS
                             Mechanism mechanism;
                             switch (authType) {
-                                case BEARER_AUTH:
+                                case BEARER_AUTH -> {
                                     // This one will need to be correlated manually by user
                                     return null;
-                                case DIGEST_AUTH:
-                                    mechanism = Mechanism.DIGEST;
-                                    break;
-                                case BASIC_AUTH:
-                                    mechanism = Mechanism.BASIC;
-                                    break;
-                                default:
-                                    mechanism = Mechanism.KERBEROS;
-                                    break;
+                                }
+                                case DIGEST_AUTH -> mechanism = Mechanism.DIGEST;
+                                case BASIC_AUTH -> mechanism = Mechanism.BASIC;
+                                default -> mechanism = Mechanism.KERBEROS;
                             }
                             authCredentialsBase64 = authHeaderContent[1];
                             authorization=new Authorization();
@@ -1175,8 +1169,7 @@ private Collection<?> findApplicableElements(JMeterTreeNode myTarget, Class<? ex
                     }
 
                     // Special case for the TestPlan's Arguments sub-element:
-                    if (element instanceof TestPlan) {
-                        TestPlan tp = (TestPlan) element;
+                    if (element instanceof TestPlan tp) {
                         Arguments args = tp.getArguments();
                         if (myClass.isInstance(args)) {
                             if (ascending) {
@@ -1464,8 +1457,8 @@ private void notifySampleListeners(SampleEvent event) {
                 JMeterTreeNode subNode = (JMeterTreeNode)kids.nextElement();
                 if (subNode.isEnabled()) {
                     TestElement testElement = subNode.getTestElement();
-                    if (testElement instanceof SampleListener) {
-                        ((SampleListener) testElement).sampleOccurred(event);
+                    if (testElement instanceof SampleListener sampleListener) {
+                        sampleListener.sampleOccurred(event);
                     }
                 }
             }
@@ -1486,9 +1479,9 @@ private void notifyTestListenersOfStart() {
                 JMeterTreeNode subNode = (JMeterTreeNode)kids.nextElement();
                 if (subNode.isEnabled()) {
                     TestElement testElement = subNode.getTestElement();
-                    if (testElement instanceof TestStateListener) {
+                    if (testElement instanceof TestStateListener testStateListener) {
                         TestBeanHelper.prepare(testElement);
-                        ((TestStateListener) testElement).testStarted();
+                        testStateListener.testStarted();
                     }
                 }
             }
@@ -1509,8 +1502,8 @@ private void notifyTestListenersOfEnd() {
                 JMeterTreeNode subNode = (JMeterTreeNode) kids.nextElement();
                 if (subNode.isEnabled()) {
                     TestElement testElement = subNode.getTestElement();
-                    if (testElement instanceof TestStateListener) { // TL - TE
-                        ((TestStateListener) testElement).testEnded();
+                    if (testElement instanceof TestStateListener testStateListener) { // TL - TE
+                        testStateListener.testEnded();
                     }
                 }
             }
@@ -1524,24 +1517,23 @@ public boolean canRemove() {
 
     private void initKeyStore() throws IOException, GeneralSecurityException {
         switch (KEYSTORE_MODE) {
-        case DYNAMIC_KEYSTORE:
-            storePassword = getPassword();
-            keyPassword = getPassword();
-            initDynamicKeyStore();
-            break;
-        case JMETER_KEYSTORE:
-            storePassword = getPassword();
-            keyPassword = getPassword();
-            initJMeterKeyStore();
-            break;
-        case USER_KEYSTORE:
-            storePassword = JMeterUtils.getPropDefault("proxy.cert.keystorepass", DEFAULT_PASSWORD); // $NON-NLS-1$
-            keyPassword = JMeterUtils.getPropDefault("proxy.cert.keypassword", DEFAULT_PASSWORD); // $NON-NLS-1$
-            log.info("HTTP(S) Test Script Recorder will use the keystore '{}' with the alias: '{}'", CERT_PATH_ABS, CERT_ALIAS);
-            initUserKeyStore();
-            break;
-        case NONE:
-            throw new IOException("Cannot find keytool application and no keystore was provided");
+            case DYNAMIC_KEYSTORE -> {
+                storePassword = getPassword();
+                keyPassword = getPassword();
+                initDynamicKeyStore();
+            }
+            case JMETER_KEYSTORE -> {
+                storePassword = getPassword();
+                keyPassword = getPassword();
+                initJMeterKeyStore();
+            }
+            case USER_KEYSTORE -> {
+                storePassword = JMeterUtils.getPropDefault("proxy.cert.keystorepass", DEFAULT_PASSWORD); // $NON-NLS-1$
+                keyPassword = JMeterUtils.getPropDefault("proxy.cert.keypassword", DEFAULT_PASSWORD); // $NON-NLS-1$
+                log.info("HTTP(S) Test Script Recorder will use the keystore '{}' with the alias: '{}'", CERT_PATH_ABS, CERT_ALIAS);
+                initUserKeyStore();
+            }
+            case NONE -> throw new IOException("Cannot find keytool application and no keystore was provided");
         }
     }
 
@@ -1738,7 +1730,7 @@ private static class SamplerInfo implements Serializable {
         private final int groupingMode;
         private final long recordedAt;
 
-        public SamplerInfo(HTTPSamplerBase sampler, TestElement[] testElements, JMeterTreeNode target, String prefix, int groupingMode) {
+        private SamplerInfo(HTTPSamplerBase sampler, TestElement[] testElements, JMeterTreeNode target, String prefix, int groupingMode) {
             this.sampler = sampler;
             this.testElements = testElements;
             this.target = target;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index 4ad7feb4aa2..df3296ce881 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -155,7 +155,7 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
      */
     private JCheckBox detectGraphQLRequest;
 
-    /*
+    /**
      * Use regexes to match the source data
      */
     private JCheckBox regexMatch;
@@ -318,8 +318,8 @@ public void modifyTestElement(TestElement el) {
         GuiUtils.stopTableEditing(excludeTable);
         GuiUtils.stopTableEditing(includeTable);
         configureTestElement(el);
-        if (el instanceof ProxyControl) {
-            model = (ProxyControl) el;
+        if (el instanceof ProxyControl proxyControl) {
+            model = proxyControl;
             model.setPort(portField.getText());
             model.setSslDomains(sslDomains.getText());
             setIncludeListInProxyControl(model);
@@ -431,16 +431,15 @@ private static void populateTable(PowerTableModel pModel, PropertyIterator iter)
         pModel.fireTableDataChanged();
     }
 
-    /*
+    /**
      * Handles groupingMode. actionPerfomed is not suitable, as that seems to be
      * activated whenever the Proxy is selected in the Test Plan
      * Also handles samplerTypeName
+     * {@inheritDoc}
      */
-    /** {@inheritDoc} */
     @Override
     public void itemStateChanged(ItemEvent e) {
-        if (e.getSource() instanceof JComboBox) {
-            JComboBox<?> combo = (JComboBox<?>) e.getSource();
+        if (e.getSource() instanceof JComboBox<?> combo) {
             if (HTTP_SAMPLER_NAMING_MODE.equals(combo.getName())) {
                 model.setHTTPSampleNamingMode(httpSampleNamingMode.getSelectedIndex());
                 httpSampleNameFormat.setEnabled(httpSampleNamingMode.getSelectedIndex() == 3);
@@ -1062,8 +1061,8 @@ private void addTargetToPanel(JPanel destPanel) {
     private static JScrollPane findScrollPane(JPopupMenu popup) {
         Component[] components = popup.getComponents();
         for (Component component : components) {
-            if(component instanceof JScrollPane) {
-                return (JScrollPane) component;
+            if(component instanceof JScrollPane jScrollPane) {
+                return jScrollPane;
             }
         }
         return null;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java
index 5cf827ce608..40cab62a626 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java
@@ -186,9 +186,6 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         prefixHTTPSampleName.requestFocusInWindow();
     }
 
-    /* (non-Javadoc)
-     * @see java.awt.Dialog#setVisible(boolean)
-     */
     @Override
     public void setVisible(boolean b) {
         super.setVisible(b);
@@ -202,8 +199,7 @@ public void setVisible(boolean b) {
 
     @Override
     public void itemStateChanged(ItemEvent e) {
-        if (e.getSource() instanceof JComboBox) {
-            JComboBox<?> combo = (JComboBox<?>) e.getSource();
+        if (e.getSource() instanceof JComboBox<?> combo) {
             if(ProxyControlGui.HTTP_SAMPLER_NAMING_MODE.equals(combo.getName())){
                 recorderGui.setHTTPSampleNamingMode(httpSampleNamingMode.getSelectedIndex());
                 sampleNameFormat.setEnabled(httpSampleNamingMode.getSelectedIndex() == 3);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
index d63c38fddfe..6e4ed9188bf 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
@@ -370,11 +370,11 @@ public void testStarted() {
      */
     @Override
     public void threadFinished() {
-        if(parser instanceof ThreadListener) {
-            ((ThreadListener)parser).threadFinished();
+        if(parser instanceof ThreadListener listener) {
+            listener.threadFinished();
         }
-        if(filter instanceof ThreadListener) {
-            ((ThreadListener)filter).threadFinished();
+        if(filter instanceof ThreadListener threadListener) {
+            threadListener.threadFinished();
         }
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
index 24955272148..6e03637091f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
@@ -59,18 +59,18 @@ public AccessLogSamplerBeanInfo() {
         PropertyDescriptor p;
 
         p = property("parserClassName");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, AccessLogSampler.DEFAULT_CLASS);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_OTHER, true);
+        p.setValue(NOT_EXPRESSION, true);
 
         log.debug("found parsers: {}", LOG_PARSER_CLASSES);
         p.setValue(TAGS, LOG_PARSER_CLASSES.toArray(new String[0]));
 
         p = property("filterClassName"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, false);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
         String[] classes = JMeterUtils.loadServicesAndScanJars(
                         Filter.class,
                         ServiceLoader.load(Filter.class),
@@ -83,27 +83,27 @@ public AccessLogSamplerBeanInfo() {
         p.setValue(TAGS, classes);
 
         p = property("logFile"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p.setPropertyEditorClass(FileEditor.class);
 
         p = property("domain"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         p = property("protocol"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "http"); // $NON-NLS-1$
-        p.setValue(DEFAULT_NOT_SAVED, Boolean.TRUE);
+        p.setValue(DEFAULT_NOT_SAVED, true);
 
         p = property("portString"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("imageParsing"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
+        p.setValue(NOT_OTHER, true);
         log.debug("Got to end of access log sampler bean info init");
     }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
index cdcdd50abad..9c724a01727 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
@@ -230,23 +230,19 @@ protected String getIpSource() {
      * @throws UnknownHostException if the hostname/ip for {@link #getIpSource()} could not be resolved or not interface was found for it
      * @throws SocketException if an I/O error occurs
      */
+    @SuppressWarnings("EnumOrdinal")
     protected InetAddress getIpSourceAddress() throws UnknownHostException, SocketException {
         final String ipSource = getIpSource();
         if (!ipSource.isBlank()) {
             Class<? extends InetAddress> ipClass = null;
             final SourceType sourceType = HTTPSamplerBase.SourceType.values()[testElement.getIpSourceType()];
             switch (sourceType) {
-            case DEVICE:
-                ipClass = InetAddress.class;
-                break;
-            case DEVICE_IPV4:
-                ipClass = Inet4Address.class;
-                break;
-            case DEVICE_IPV6:
-                ipClass = Inet6Address.class;
-                break;
-            case HOSTNAME:
-                return InetAddress.getByName(ipSource);
+                case DEVICE -> ipClass = InetAddress.class;
+                case DEVICE_IPV4 -> ipClass = Inet4Address.class;
+                case DEVICE_IPV6 -> ipClass = Inet6Address.class;
+                case HOSTNAME -> {
+                    return InetAddress.getByName(ipSource);
+                }
             }
 
             NetworkInterface net = NetworkInterface.getByName(ipSource);
@@ -580,23 +576,23 @@ protected void notifySSLContextWasReset() {
      * @return HTTPSampleResult
      */
     protected HTTPSampleResult updateSampleResultForResourceInCache(HTTPSampleResult res) {
-        switch (CACHED_RESOURCE_MODE) {
-            case RETURN_NO_SAMPLE:
-                return null;
-            case RETURN_200_CACHE:
+        return switch (CACHED_RESOURCE_MODE) {
+            case RETURN_NO_SAMPLE -> null;
+            case RETURN_200_CACHE -> {
                 res.sampleEnd();
                 res.setResponseCodeOK();
                 res.setResponseMessage(RETURN_200_CACHE_MESSAGE);
                 res.setSuccessful(true);
-                return res;
-            case RETURN_CUSTOM_STATUS:
+                yield res;
+            }
+            case RETURN_CUSTOM_STATUS -> {
                 res.sampleEnd();
                 res.setResponseCode(RETURN_CUSTOM_STATUS_CODE);
                 res.setResponseMessage(RETURN_CUSTOM_STATUS_MESSAGE);
                 res.setSuccessful(true);
-                return res;
-        }
-        throw new IllegalStateException("Unknown CACHED_RESOURCE_MODE: " + CACHED_RESOURCE_MODE);
+                yield res;
+            }
+        };
     }
 
     protected final void configureSampleLabel(SampleResult res, URL url) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
index cd433a0010e..85b976c3f2a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
@@ -82,7 +82,7 @@ protected HTTPSampleResult sample(URL url, String method,
             StringBuilder ctb=new StringBuilder("text/html"); // $NON-NLS-1$
             // TODO can this be obtained from the file somehow?
             String contentEncoding = getContentEncoding();
-            if (contentEncoding.length() > 0) {
+            if (!contentEncoding.isEmpty()) {
                 ctb.append("; charset="); // $NON-NLS-1$
                 ctb.append(contentEncoding);
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 429bff5bef6..e9d21660a14 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -214,7 +214,7 @@ private static final class ManagedCredentialsProvider implements CredentialsProv
         private final Credentials proxyCredentials;
         private final AuthScope proxyAuthScope;
 
-        public ManagedCredentialsProvider(AuthManager authManager, AuthScope proxyAuthScope, Credentials proxyCredentials) {
+        private ManagedCredentialsProvider(AuthManager authManager, AuthScope proxyAuthScope, Credentials proxyCredentials) {
             this.authManager = authManager;
             this.proxyAuthScope = proxyAuthScope;
             this.proxyCredentials = proxyCredentials;
@@ -256,8 +256,7 @@ private Authorization getAuthorizationForAuthScope(AuthScope authScope) {
             }
             for (JMeterProperty authProp : authManager.getAuthObjects()) {
                 Object authObject = authProp.getObjectValue();
-                if (authObject instanceof Authorization) {
-                    Authorization auth = (Authorization) authObject;
+                if (authObject instanceof Authorization auth) {
                     if (!authScope.getRealm().equals(auth.getRealm())) {
                         continue;
                     }
@@ -308,8 +307,8 @@ public void process(HttpRequest request, HttpContext context) throws HttpExcepti
                 return;
             }
             URI requestURI = null;
-            if (request instanceof HttpUriRequest) {
-                requestURI = ((HttpUriRequest) request).getURI();
+            if (request instanceof HttpUriRequest httpUriRequest) {
+                requestURI = httpUriRequest.getURI();
             } else {
                 try {
                     requestURI = new URI(request.getRequestLine().getUri());
@@ -391,17 +390,11 @@ private static void fillAuthCache(HttpHost targetHost, Authorization authorizati
 
     private static final class JMeterDefaultHttpClientConnectionOperator extends DefaultHttpClientConnectionOperator {
 
-        public JMeterDefaultHttpClientConnectionOperator(Lookup<ConnectionSocketFactory> socketFactoryRegistry, SchemePortResolver schemePortResolver,
+        private JMeterDefaultHttpClientConnectionOperator(Lookup<ConnectionSocketFactory> socketFactoryRegistry, SchemePortResolver schemePortResolver,
                 DnsResolver dnsResolver) {
             super(socketFactoryRegistry, schemePortResolver, dnsResolver);
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.impl.conn.DefaultHttpClientConnectionOperator#connect(
-         *  org.apache.http.conn.ManagedHttpClientConnection, org.apache.http.HttpHost,
-         *      java.net.InetSocketAddress, int, org.apache.http.config.SocketConfig,
-         *      org.apache.http.protocol.HttpContext)
-         */
         @Override
         public void connect(ManagedHttpClientConnection conn, HttpHost host, InetSocketAddress localAddress,
                 int connectTimeout, SocketConfig socketConfig, HttpContext context) throws IOException {
@@ -886,8 +879,8 @@ private static void setupClientContextBeforeSample(JMeterVariables jMeterVariabl
     protected void handleMethod(String method, HTTPSampleResult result,
             HttpRequestBase httpRequest, HttpContext localContext) throws IOException {
         // Handle the various methods
-        if (httpRequest instanceof HttpEntityEnclosingRequestBase) {
-            String entityBody = setupHttpEntityEnclosingRequestData((HttpEntityEnclosingRequestBase)httpRequest);
+        if (httpRequest instanceof HttpEntityEnclosingRequestBase httpEntityEnclosingRequestBase) {
+            String entityBody = setupHttpEntityEnclosingRequestData(httpEntityEnclosingRequestBase);
             result.setQueryString(entityBody);
         }
     }
@@ -965,7 +958,7 @@ private static final class HttpClientKey {
          * @param proxyUser proxy user
          * @param proxyPass proxy password
          */
-        public HttpClientKey(URL url, boolean hasProxy, String proxyScheme, String proxyHost,
+        private HttpClientKey(URL url, boolean hasProxy, String proxyScheme, String proxyHost,
                 int proxyPort, String proxyUser, String proxyPass) {
             // N.B. need to separate protocol from authority otherwise http://server would match https://erver (<= sic, not typo error)
             // could use separate fields, but simpler to combine them
@@ -1005,10 +998,9 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof HttpClientKey)) {
+            if (!(obj instanceof HttpClientKey other)) {
                 return false;
             }
-            HttpClientKey other = (HttpClientKey) obj;
             if (!Objects.equals(authority, other.authority) ||
                     !Objects.equals(protocol, other.protocol) ||
                     hasProxy != other.hasProxy) {
@@ -1237,7 +1229,7 @@ private static void resetStateIfNeeded(
             }
             jMeterVariables.remove(JMETER_VARIABLE_USER_TOKEN);
             ((JsseSSLManager) SSLManager.getInstance()).resetContext();
-            resetStateOnThreadGroupIteration.set(Boolean.FALSE);
+            resetStateOnThreadGroupIteration.set(false);
         }
     }
 
@@ -1353,8 +1345,8 @@ private static String getResponseHeaders(HttpResponse response) {
      * @param header {@link Header}
      */
     private static void writeHeader(StringBuilder headerBuffer, Header header) {
-        if(header instanceof BufferedHeader) {
-            CharArrayBuffer buffer = ((BufferedHeader)header).getBuffer();
+        if(header instanceof BufferedHeader bufferedHeader) {
+            CharArrayBuffer buffer = bufferedHeader.getBuffer();
             headerBuffer.append(buffer.buffer(), 0, buffer.length()).append('\n'); // $NON-NLS-1$
         }
         else {
@@ -1506,7 +1498,7 @@ private static class ViewableFileBody extends FileBody {
                 "<actual file content, not shown here>".getBytes(StandardCharsets.UTF_8);
         private boolean hideFileData;
 
-        public ViewableFileBody(File file, ContentType contentType, Charset charset) {
+        private ViewableFileBody(File file, ContentType contentType, Charset charset) {
             // Note: HttpClient4 does not support encoding the file name, and it always encodes names in IS88
             // See https://issues.apache.org/jira/browse/HTTPCLIENT-293
             super(file, contentType, encodeFilename(file.getName(), charset));
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
index a703d39cf93..6bd8882703d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
@@ -49,7 +49,7 @@ public abstract class HTTPHCAbstractImpl extends HTTPAbstractImpl {
 
     protected static final int PROXY_PORT = Integer.parseInt(System.getProperty("http.proxyPort","0"));
 
-    protected static final boolean PROXY_DEFINED = PROXY_HOST.length() > 0 && PROXY_PORT > 0;
+    protected static final boolean PROXY_DEFINED = !PROXY_HOST.isEmpty() && PROXY_PORT > 0;
 
     protected static final String PROXY_USER = JMeterUtils.getPropDefault(JMeter.HTTP_PROXY_USER,"");
 
@@ -101,14 +101,14 @@ public abstract class HTTPHCAbstractImpl extends HTTPAbstractImpl {
      *  Shared state for any HC based implementation, because SSL contexts are the same
      */
     protected static final ThreadLocal<Boolean> resetStateOnThreadGroupIteration =
-            ThreadLocal.withInitial(() -> Boolean.FALSE);
+            ThreadLocal.withInitial(() -> false);
 
     static {
         if (!JMeterUtils.getPropDefault("httpclient.timeout", "").isEmpty()) { //$NON-NLS-1$
             log.warn("You're using property 'httpclient.timeout' that will soon be deprecated for HttpClient3.1, you should either set "
                     + "timeout in HTTP Request GUI, HTTP Request Defaults or set http.socket.timeout in httpclient.parameters");
         }
-        if (NONPROXY_HOSTS.length() > 0) {
+        if (!NONPROXY_HOSTS.isEmpty()) {
             StringTokenizer s = new StringTokenizer(NONPROXY_HOSTS,"|");// $NON-NLS-1$
             while (s.hasMoreTokens()) {
                 String t = s.nextToken();
@@ -124,7 +124,7 @@ public abstract class HTTPHCAbstractImpl extends HTTPAbstractImpl {
         InetAddress inet = null;
         String localHostOrIP =
             JMeterUtils.getPropDefault("httpclient.localaddress",""); // $NON-NLS-1$
-        if (localHostOrIP.length() > 0) {
+        if (!localHostOrIP.isEmpty()) {
             try {
                 inet = InetAddress.getByName(localHostOrIP);
                 log.info("Using localAddress {}", inet.getHostAddress());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 28714b250ae..69648673b48 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -146,7 +146,7 @@ protected HttpURLConnection setupConnection(URL u, String method, HTTPSampleResu
         final HttpURLConnection conn;
         final String proxyHost = getProxyHost();
         final int proxyPort = getProxyPortInt();
-        if (proxyHost.length() > 0 && proxyPort > 0){
+        if (!proxyHost.isEmpty() && proxyPort > 0){
             Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
             //TODO - how to define proxy authentication for a single connection?
             conn = (HttpURLConnection) u.openConnection(proxy);
@@ -257,8 +257,8 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
                 Throwable cause = e.getCause();
                 if (cause != null){
                     log.error("Cause: {}", cause.toString());
-                    if(cause instanceof Error) {
-                        throw (Error)cause;
+                    if(cause instanceof Error error) {
+                        throw error;
                     }
                 }
             }
@@ -287,8 +287,8 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
             Throwable cause = e.getCause();
             if (cause != null){
                 log.error("Cause: {}", cause.toString());
-                if(cause instanceof Error) {
-                    throw (Error)cause;
+                if(cause instanceof Error error) {
+                    throw error;
                 }
             }
             in = conn.getErrorStream();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
index 71251018fc0..dc7918c31ec 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
@@ -160,7 +160,7 @@ public String getSamplerData() {
                 sb.append(queryString);
                 sb.append('\n');
             }
-            if (cookies.length()>0){
+            if (!cookies.isEmpty()){
                 sb.append("\nCookie Data:\n");
                 sb.append(cookies);
             } else {
@@ -270,9 +270,6 @@ public void setResponseNoContent(){
         setResponseMessage(HTTP_NO_CONTENT_MSG);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.samplers.SampleResult#getSearchableTokens()
-     */
     @Override
     public List<String> getSearchableTokens() throws Exception {
         List<String> list = new ArrayList<>(super.getSearchableTokens());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index b078a020124..ccaf33d1e66 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -212,6 +212,7 @@ public abstract class HTTPSamplerBase extends AbstractSampler
     private static final boolean IGNORE_EMBEDDED_RESOURCES_DATA =
             JMeterUtils.getPropDefault("httpsampler.embedded_resources_use_md5", false); // $NON-NLS-1$ // default value: false
 
+    @SuppressWarnings("EnumOrdinal")
     public static final int SOURCE_TYPE_DEFAULT = HTTPSamplerBase.SourceType.HOSTNAME.ordinal();
 
     public static final String DEFAULT_METHOD = HTTPConstants.GET; // $NON-NLS-1$
@@ -731,18 +732,18 @@ public boolean hasArguments() {
 
     @Override
     public void addTestElement(TestElement el) {
-        if (el instanceof CookieManager) {
-            setCookieManager((CookieManager) el);
-        } else if (el instanceof CacheManager) {
-            setCacheManager((CacheManager) el);
-        } else if (el instanceof HeaderManager) {
-            setHeaderManager((HeaderManager) el);
-        } else if (el instanceof AuthManager) {
-            setAuthManager((AuthManager) el);
-        } else if (el instanceof DNSCacheManager) {
-            setDNSResolver((DNSCacheManager) el);
-        } else if (el instanceof KeystoreConfig) {
-            setKeystoreConfigProperty((KeystoreConfig) el);
+        if (el instanceof CookieManager cookieManager) {
+            setCookieManager(cookieManager);
+        } else if (el instanceof CacheManager cacheManager) {
+            setCacheManager(cacheManager);
+        } else if (el instanceof HeaderManager headerManager) {
+            setHeaderManager(headerManager);
+        } else if (el instanceof AuthManager authManager) {
+            setAuthManager(authManager);
+        } else if (el instanceof DNSCacheManager dnsCacheManager) {
+            setDNSResolver(dnsCacheManager);
+        } else if (el instanceof KeystoreConfig keystoreConfig) {
+            setKeystoreConfigProperty(keystoreConfig);
         }  else {
             super.addTestElement(el);
         }
@@ -1825,7 +1826,7 @@ protected static String encodeBackSlashes(String value) {
         return newValue.toString();
     }
 
-    /*
+    /**
      * Method to set files list to be uploaded.
      *
      * @param value
@@ -1835,7 +1836,7 @@ private void setHTTPFileArgs(HTTPFileArgs value) {
         set(getSchema().getFileArguments(), value.getHTTPFileArgCount() == 0 ? null : value);
     }
 
-    /*
+    /**
      * Method to get files list to be uploaded.
      */
     private @Nullable HTTPFileArgs getHTTPFileArgs() {
@@ -2003,12 +2004,12 @@ public byte[] readResponse(SampleResult sampleResult, InputStream in, long lengt
      * @return byte array
      */
     private static byte[] toByteArray(OutputStream w) {
-        if(w instanceof DirectAccessByteArrayOutputStream) {
-            return ((DirectAccessByteArrayOutputStream) w).toByteArray();
+        if(w instanceof DirectAccessByteArrayOutputStream directAccessByteArrayOutputStream) {
+            return directAccessByteArrayOutputStream.toByteArray();
         }
 
-        if(w instanceof org.apache.commons.io.output.ByteArrayOutputStream) {
-            return ((org.apache.commons.io.output.ByteArrayOutputStream) w).toByteArray();
+        if(w instanceof org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream) {
+            return byteArrayOutputStream.toByteArray();
         }
 
         log.warn("Unknown stream type {}", w.getClass());
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
index cfa9c0946fc..f7106e77032 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
@@ -84,9 +84,6 @@ public boolean interrupt() {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
-     */
     @Override
     public void testIterationStart(LoopIterationEvent event) {
         if (impl != null) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
index 737c63964cd..4d198e369e1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
@@ -45,8 +45,8 @@ private HttpClientDefaultParameters(){
 
     // Helper class (callback) for applying parameter definitions
     private static abstract class GenericHttpParams {
-        public abstract void setParameter(String name, Object value);
-        public abstract void setVersion(String name, String value) throws Exception;
+        abstract void setParameter(String name, Object value);
+        abstract void setVersion(String name, String value) throws Exception;
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
index cce2b856471..5a020662f77 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
@@ -62,7 +62,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
             hasPutBody = true;
             if(!hasContentTypeHeader) {
                 // Allow the mimetype of the file to control the content type
-                if(file.getMimeType().length() > 0) {
+                if(!file.getMimeType().isEmpty()) {
                     connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE, file.getMimeType());
                 }
             }
@@ -76,7 +76,7 @@ else if(sampler.getSendParameterValuesAsPostBody()) {
             // Allow the mimetype of the file to control the content type
             // This is not obvious in GUI if you are not uploading any files,
             // but just sending the content of nameless parameters
-            if(!hasContentTypeHeader && files.length == 1 && files[0].getMimeType().length() > 0) {
+            if(!hasContentTypeHeader && files.length == 1 && !files[0].getMimeType().isEmpty()) {
                 connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE, files[0].getMimeType());
             }
 
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java
index 938e10114f1..3155b738f3a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java
@@ -117,8 +117,7 @@ public void shrink() {
         if (!drainList.isEmpty()) {
             LOG.warn("the pool executor workqueue is not empty size={}", drainList.size());
             for (Runnable runnable : drainList) {
-                if (runnable instanceof Future<?>) {
-                    Future<?> f = (Future<?>) runnable;
+                if (runnable instanceof Future<?> f) {
                     f.cancel(true);
                 } else {
                     LOG.warn("Content of workqueue is not an instance of Future");
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
index 1cc8899d463..c506d40bdaf 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
@@ -44,9 +44,6 @@ public LaxDeflateInputStream(InputStream wrapped, boolean relax) throws IOExcept
         this.relax = relax;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.http.client.entity.DeflateInputStream#read(byte[], int, int)
-     */
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
         try {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
index 5938d34bd5a..9f0981cd53b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java
@@ -43,9 +43,6 @@ public LaxGZIPInputStream(InputStream wrapped, boolean relax) throws IOException
         this.relax = relax;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.http.client.entity.DeflateInputStream#read(byte[], int, int)
-     */
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
         try {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
index cccf09982d2..11ce89cf4e0 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java
@@ -316,7 +316,7 @@ public static String removeSlashDotDot(String url)
                 final String thisToken = tokens.get(i);
 
                 // Verify for a ".." component at next iteration
-                if (thisToken.length() > 0 && !thisToken.equals(DOTDOT) && tokens.get(i + 1).equals(DOTDOT)) {
+                if (!thisToken.isEmpty() && !thisToken.equals(DOTDOT) && tokens.get(i + 1).equals(DOTDOT)) {
                     tokens.remove(i);
                     tokens.remove(i);
                     i = i - 2; // CHECKSTYLE IGNORE ModifiedControlVariable
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
index 8875a532d72..305934be83f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
@@ -205,7 +205,7 @@ public static GraphQLRequestParams toGraphQLRequestParams(final Arguments argume
 
         for (JMeterProperty prop : arguments) {
             final Argument arg = (Argument) prop.getObjectValue();
-            if (!(arg instanceof HTTPArgument)) {
+            if (!(arg instanceof HTTPArgument httpArgument)) {
                 continue;
             }
 
@@ -214,7 +214,7 @@ public static GraphQLRequestParams toGraphQLRequestParams(final Arguments argume
             final String value = StringUtilities.trimToNull(arg.getValue());
 
             if ("=".equals(metadata) && value != null) {
-                final boolean alwaysEncoded = ((HTTPArgument) arg).isAlwaysEncoded();
+                final boolean alwaysEncoded = httpArgument.isAlwaysEncoded();
 
                 if (OPERATION_NAME_FIELD.equals(name)) {
                     operationName = encodedField(value, encoding, alwaysEncoded);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
index 2ef27c2f3ee..bf38e101cdc 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
@@ -266,9 +266,9 @@ public String toString() {
      * @return true if Path, name or mimetype fields are not the empty string
      */
     public boolean isNotEmpty() {
-        return getPath().length() > 0
-            || getParamName().length() > 0
-            || getMimeType().length() > 0; // TODO should we allow mimetype only?
+        return !getPath().isEmpty()
+            || !getParamName().isEmpty()
+            || !getMimeType().isEmpty(); // TODO should we allow mimetype only?
     }
 
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
index 80bea175937..0ec149170d2 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
@@ -100,7 +100,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
 
         // If we have a file, but no data, then read the file
         String resultFileName = res.getResultFileName();
-        if (resultFileName.length()>0
+        if (!resultFileName.isEmpty()
         &&  res.getResponseData().length == 0) {
             readFile(resultFileName,res);
         }
@@ -109,8 +109,8 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
 
     private static void retrieveHTTPItem(HierarchicalStreamReader reader,
             HTTPSampleResult res, Object subItem) {
-        if (subItem instanceof URL) {
-            res.setURL((URL) subItem);
+        if (subItem instanceof URL url) {
+            res.setURL(url);
         } else {
             String nodeName = reader.getNodeName();
             if (nodeName.equals(TAG_COOKIES)) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
index e7ed3b6d5ec..ebe04cbfffa 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
@@ -85,11 +85,6 @@ public SessionFilter(Map<String, CookieManager> cookieManagers, Set<CookieManage
         this.managersInUse = managersInUse;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.jmeter.protocol.http.util.accesslog.LogFilter#excPattern(java.lang.String)
-     */
     protected boolean hasExcPattern(String text) {
         return false;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
index d0702169561..5f280e55430 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
@@ -82,7 +82,7 @@ protected int parse(FileServer breader, TestElement el, int parseCount) {
             // BufferedReader
             line = breader.readLine(FILENAME);
             while (line != null) {
-                if (line.length() > 0) {
+                if (!line.isEmpty()) {
                     actualCount += this.parseLine(line, el);
                 }
                 // we check the count to see if we have exceeded
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
index b5ccf2e3496..7f8b8ac933b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
@@ -248,7 +248,7 @@ protected int parse(BufferedReader breader, TestElement el, int parseCount) {
             // BufferedReader
             line = breader.readLine();
             while (line != null) {
-                if (line.length() > 0) {
+                if (!line.isEmpty()) {
                     actualCount += this.parseLine(line, el);
                 }
                 // we check the count to see if we have exceeded
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index 743a80a6bfc..57fac44892f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -145,9 +145,6 @@ public RequestViewHTTP() {
                         String.class, String.class }, false);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#init()
-     */
     @Override
     public void init() {
         paneParsed = new JPanel(new BorderLayout(0, 5));
@@ -156,9 +153,6 @@ public void init() {
         paneParsed.add(searchTextExtension.getSearchToolBar(), BorderLayout.NORTH);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#clearData()
-     */
     @Override
     public void clearData() {
         requestModel.clearData();
@@ -166,15 +160,11 @@ public void clearData() {
         headersModel.clearData(); // clear results table before filling
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#setSamplerResult(java.lang.Object)
-     */
     @Override
     public void setSamplerResult(Object objectResult) {
 
         this.searchTextExtension.resetTextToFind();
-        if (objectResult instanceof HTTPSampleResult) {
-            HTTPSampleResult sampleResult = (HTTPSampleResult) objectResult;
+        if (objectResult instanceof HTTPSampleResult sampleResult) {
 
             // Display with same order HTTP protocol
             requestModel.addRow(new RowResult(
@@ -209,7 +199,7 @@ public void setSamplerResult(Object objectResult) {
                 // Concatenate query post if exists
                 String queryPost = sampleResult.getQueryString();
                 if (!isMultipart && StringUtilities.isNotBlank(queryPost)) {
-                    if (queryGet.length() > 0) {
+                    if (!queryGet.isEmpty()) {
                         queryGet += PARAM_CONCATENATE;
                     }
                     queryGet += queryPost;
@@ -415,9 +405,6 @@ private static void setFirstColumnPreferredAndMaxWidth(JTable table) {
         column.setPreferredWidth(160);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.visualizers.request.RequestView#getLabel()
-     */
     @Override
     public String getLabel() {
         return JMeterUtils.getResString(KEY_LABEL);
@@ -447,8 +434,8 @@ public boolean executeAndShowTextFind(Pattern pattern) {
                 for (int i = lastPosition+1; i < tableParams.getRowCount(); i++) {
                     for (int j = 0; j < COLUMNS_PARAMS.length; j++) {
                         Object o = tableParams.getModel().getValueAt(i, j);
-                        if(o instanceof String) {
-                            Matcher matcher = pattern.matcher((String) o);
+                        if(o instanceof String s) {
+                            Matcher matcher = pattern.matcher(s);
                             if (matcher.find()) {
                                 found =  true;
                                 tableParams.setRowSelectionInterval(i, i);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java
index 15b984c1832..b74123c8ea9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java
@@ -80,7 +80,7 @@ public void testCreateCommentText() {
         testCommentTextStartsWith("curl 'http://jmeter.apache.org/' --cacert '<CA certificate>'", "Please configure the SSL file with CA certificates");
     }
 
-    private void testCommentTextStartsWith(String cmdLine, String expectedComment) {
+    private static void testCommentTextStartsWith(String cmdLine, String expectedComment) {
         ParseCurlCommandAction p = new ParseCurlCommandAction();
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         Request request = basicCurlParser.parse(cmdLine);
@@ -88,7 +88,7 @@ private void testCommentTextStartsWith(String cmdLine, String expectedComment) {
         assertTrue(comment.trim().startsWith(expectedComment));
     }
 
-    private void testCommentText(String cmdLine, String expectedComment) {
+    private static void testCommentText(String cmdLine, String expectedComment) {
         ParseCurlCommandAction p = new ParseCurlCommandAction();
         BasicCurlParser basicCurlParser = new BasicCurlParser();
         Request request = basicCurlParser.parse(cmdLine);
@@ -123,7 +123,7 @@ public void testReadCurlCommandsFromFile(@TempDir Path tempDir) throws Exception
         assertEquals(2, commands.size());
     }
 
-    private String writeToTempFile(Path dir, String s) throws IOException {
+    private static String writeToTempFile(Path dir, String s) throws IOException {
         return Files.write(dir.resolve("test.txt"), s.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE_NEW)
                 .toAbsolutePath()
                 .toString();
@@ -161,7 +161,7 @@ public void testParseCommandsException() {
         assertThrowsIllegalArgument(() -> p.parseCommands(false, commands));
     }
 
-    private void assertThrowsIllegalArgument(Executable e) {
+    private static void assertThrowsIllegalArgument(Executable e) {
         assertThrows(IllegalArgumentException.class, e);
     }
 
@@ -533,7 +533,7 @@ public void testCanAddDnsResolverInHttpRequest() throws Exception {
                 "When the Dns servers aren't the same, should add the DnsCacheManager in Http Request");
     }
 
-    private Method getMethodFor(String name, Class<?>...paramsClasses) throws NoSuchMethodException, SecurityException {
+    private static Method getMethodFor(String name, Class<?>... paramsClasses) throws NoSuchMethodException, SecurityException {
         Class<ParseCurlCommandAction> parseCurlCommandAction = ParseCurlCommandAction.class;
         Method method = parseCurlCommandAction.getDeclaredMethod(name, paramsClasses);
         method.setAccessible(true);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
index 16f8e25822f..2f80f4f2cd2 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
@@ -50,31 +50,33 @@ void testConstructors() {
     @Test
     void testParseArgumentsLF() {
         String queryString
-            = "Content-Disposition: form-data; name=\"aa\"\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\n"
-            + "Content-Transfer-Encoding: 8bit\n"
-            + "\n"
-            + "bb\n"
-            + "--7d159c1302d0y0\n"
-            + "Content-Disposition: form-data; name=\"xx\"\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\n"
-            + "Content-Transfer-Encoding: 8bit\n"
-            + "\n"
-            + "yy\n"
-            + "--7d159c1302d0y0\n"
-            + "Content-Disposition: form-data; name=\"abc\"\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\n"
-            + "Content-Transfer-Encoding: 8bit\n"
-            + "\n"
-            + "xyz  \n"
-            + "xyz  \n"
-            + "--7d159c1302d0y0\n"
-            + "Content-Disposition: form-data; name=\"param1\"; filename=\"file1\"\n"
-            + "Content-Type: text/plain\n"
-            + "Content-Transfer-Encoding: binary\n"
-            + "\n"
-            + "file content\n"
-            + "\n";
+            = """
+                Content-Disposition: form-data; name="aa"
+                Content-Type: text/plain; charset=ISO-8859-1
+                Content-Transfer-Encoding: 8bit
+
+                bb
+                --7d159c1302d0y0
+                Content-Disposition: form-data; name="xx"
+                Content-Type: text/plain; charset=ISO-8859-1
+                Content-Transfer-Encoding: 8bit
+
+                yy
+                --7d159c1302d0y0
+                Content-Disposition: form-data; name="abc"
+                Content-Type: text/plain; charset=ISO-8859-1
+                Content-Transfer-Encoding: 8bit
+
+                xyz \s
+                xyz \s
+                --7d159c1302d0y0
+                Content-Disposition: form-data; name="param1"; filename="file1"
+                Content-Type: text/plain
+                Content-Transfer-Encoding: binary
+
+                file content
+
+                """;
         MultipartUrlConfig muc = new MultipartUrlConfig("7d159c1302d0y0");
         muc.parseArguments(queryString);
         HTTPFileArgs files = muc.getHTTPFileArgs();
@@ -99,31 +101,33 @@ void testParseArgumentsLF() {
     @Test
     void testParseArgumentsCRLF() {
         String queryString
-            = "Content-Disposition: form-data; name=\"aa\"\r\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\r\n"
-            + "Content-Transfer-Encoding: 8bit\r\n"
-            + "\r\n"
-            + "bb\r\n"
-            + "--7d159c1302d0y0\r\n"
-            + "Content-Disposition: form-data; name=\"xx\"\r\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\r\n"
-            + "Content-Transfer-Encoding: 8bit\r\n"
-            + "\r\n"
-            + "yy\r\n"
-            + "--7d159c1302d0y0\r\n"
-            + "Content-Disposition: form-data; name=\"abc\"\r\n"
-            + "Content-Type: text/plain; charset=ISO-8859-1\r\n"
-            + "Content-Transfer-Encoding: 8bit\r\n"
-            + "\r\n"
-            + "xyz  \r\n"
-            + "xyz  \r\n"
-            + "--7d159c1302d0y0\r\n"
-            + "Content-Disposition: form-data; name=\"param1\"; filename=\"file1\"\r\n"
-            + "Content-Type: text/plain\r\n"
-            + "Content-Transfer-Encoding: binary\r\n"
-            + "\r\n"
-            + "file content\r\n"
-            + "\r\n";
+            = """
+                Content-Disposition: form-data; name="aa"\r
+                Content-Type: text/plain; charset=ISO-8859-1\r
+                Content-Transfer-Encoding: 8bit\r
+                \r
+                bb\r
+                --7d159c1302d0y0\r
+                Content-Disposition: form-data; name="xx"\r
+                Content-Type: text/plain; charset=ISO-8859-1\r
+                Content-Transfer-Encoding: 8bit\r
+                \r
+                yy\r
+                --7d159c1302d0y0\r
+                Content-Disposition: form-data; name="abc"\r
+                Content-Type: text/plain; charset=ISO-8859-1\r
+                Content-Transfer-Encoding: 8bit\r
+                \r
+                xyz  \r
+                xyz  \r
+                --7d159c1302d0y0\r
+                Content-Disposition: form-data; name="param1"; filename="file1"\r
+                Content-Type: text/plain\r
+                Content-Transfer-Encoding: binary\r
+                \r
+                file content\r
+                \r
+                """;
         MultipartUrlConfig muc = new MultipartUrlConfig("7d159c1302d0y0");
         muc.parseArguments(queryString);
         HTTPFileArgs files = muc.getHTTPFileArgs();
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
index ba38114f8c8..156d3940253 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
@@ -201,7 +201,7 @@ public void testCacheMultipleMultiVaryHeaders() throws Exception {
                         new Header(varyHeaderOne, "another value") });
     }
 
-    private String asString(Header[] headers) {
+    private static String asString(Header[] headers) {
         StringBuilder result = new StringBuilder();
         for (Header header: headers) {
             result.append(header.getName()).append(": ").append(header.getValue()).append("\n");
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java
index 2870f3e214a..58887e5a220 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java
@@ -77,25 +77,16 @@ public HttpResponseStub(boolean cachingHeaders) {
             }
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.message.AbstractHttpMessage#getAllHeaders()
-         */
         @Override
         public org.apache.http.Header[] getAllHeaders() {
             return headers.toArray(new org.apache.http.Header[headers.size()]);
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.message.AbstractHttpMessage#addHeader(org.apache.http.Header)
-         */
         @Override
         public void addHeader(org.apache.http.Header header) {
             headers.add(header);
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.message.AbstractHttpMessage#getFirstHeader(java.lang.String)
-         */
         @Override
         public Header getFirstHeader(String headerName) {
             Header[] headers = getHeaders(headerName);
@@ -105,9 +96,6 @@ public Header getFirstHeader(String headerName) {
             return null;
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.message.AbstractHttpMessage#getLastHeader(java.lang.String)
-         */
         @Override
         public Header getLastHeader(String headerName) {
             Header[] headers = getHeaders(headerName);
@@ -117,9 +105,6 @@ public Header getLastHeader(String headerName) {
             return null;
         }
 
-        /* (non-Javadoc)
-         * @see org.apache.http.message.AbstractHttpMessage#getHeaders(java.lang.String)
-         */
         @Override
         public Header[] getHeaders(String headerName) {
             org.apache.http.Header header = null;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
index d2909b8c286..349fe143153 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java
@@ -85,33 +85,16 @@ public HttpResponseStub() {
             this.etagHeader = new BasicHeader(HTTPConstants.ETAG, EXPECTED_ETAG);
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see org.apache.http.message.AbstractHttpMessage#getAllHeaders()
-         */
         @Override
         public org.apache.http.Header[] getAllHeaders() {
             return headers.toArray(new org.apache.http.Header[headers.size()]);
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * org.apache.http.message.AbstractHttpMessage#addHeader(org.apache.http.Header)
-         */
         @Override
         public void addHeader(org.apache.http.Header header) {
             headers.add(header);
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * org.apache.http.message.AbstractHttpMessage#getFirstHeader(java.lang.String)
-         */
         @Override
         public Header getFirstHeader(String headerName) {
             Header[] headers = getHeaders(headerName);
@@ -121,12 +104,6 @@ public Header getFirstHeader(String headerName) {
             return null;
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * org.apache.http.message.AbstractHttpMessage#getLastHeader(java.lang.String)
-         */
         @Override
         public Header getLastHeader(String headerName) {
             Header[] headers = getHeaders(headerName);
@@ -136,11 +113,6 @@ public Header getLastHeader(String headerName) {
             return null;
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see org.apache.http.message.AbstractHttpMessage#getHeaders(java.lang.String)
-         */
         @Override
         public Header[] getHeaders(String headerName) {
             org.apache.http.Header header = null;
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java
index fb1c3bdb0ac..0e41be335e9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java
@@ -65,7 +65,7 @@ protected void addRequestHeader(String requestHeader, String value) {
         // no-op
     }
 
-    private org.apache.jmeter.protocol.http.control.Header[] asHeaders(Map<String, List<String>> headers) {
+    private static org.apache.jmeter.protocol.http.control.Header[] asHeaders(Map<String, List<String>> headers) {
         // Java Implementation returns a null header for URL
         return headers.entrySet().stream()
                 .filter(header -> header.getKey() != null)
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
index 920e7f68752..8a5e00d644b 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
@@ -365,7 +365,7 @@ public void testSleep() throws Exception {
     /**
      * Check that the two byte arrays have identical content
      */
-    private void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws UnsupportedEncodingException {
+    private static void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws UnsupportedEncodingException {
         if(expected != null && actual != null) {
             if(expected.length != actual.length) {
                 System.out.println(">>>>>>>>>>>>>>>>>>>> (expected) : length " + expected.length);
@@ -404,7 +404,7 @@ private void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws U
         }
     }
 
-    private byte[] getMirroredResponse(byte[] allResponse) {
+    private static byte[] getMirroredResponse(byte[] allResponse) {
         // The response includes the headers from the mirror server,
         // we want to skip those, to only keep the content mirrored.
         // Look for the first CRLFCRLF section
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
index d16801ba5ed..0a487058996 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
@@ -359,7 +359,7 @@ public void testSpecialCharParse() throws Exception {
     }
 
 
-    private HTTPSamplerBase makeContext(String url) throws MalformedURLException {
+    private static HTTPSamplerBase makeContext(String url) throws MalformedURLException {
         URL u = new URL(url);
         HTTPSamplerBase context = new HTTPNullSampler();
         context.setDomain(u.getHost());
@@ -370,7 +370,7 @@ private HTTPSamplerBase makeContext(String url) throws MalformedURLException {
         return context;
     }
 
-    private HTTPSamplerBase makeUrlConfig(String path) {
+    private static HTTPSamplerBase makeUrlConfig(String path) {
         HTTPSamplerBase config = new HTTPNullSampler();
         config.setDomain("www.apache.org");
         config.setMethod(HTTPConstants.GET);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
index 3b29a07d800..14ca3ca8345 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
@@ -86,7 +86,7 @@ public void testGrabSessionId2() throws Exception {
         assertEquals("jfdkjdkfjddkfdfjkdjfdf", ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
     }
 
-    private HTTPSamplerBase createSampler() {
+    private static HTTPSamplerBase createSampler() {
         HTTPSamplerBase sampler = new HTTPNullSampler();
         sampler.setDomain("server.com");
         sampler.setPath("index.html");
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
index c85bd547dc5..88c5e9dbf1c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java
@@ -70,7 +70,7 @@ private List<URL> extractUrls(String css) throws LinkExtractorParseException,
         return extractUrls(parser, css);
     }
 
-    private List<URL> extractUrls(CssParser parser, String css)
+    private static List<URL> extractUrls(CssParser parser, String css)
             throws LinkExtractorParseException, MalformedURLException {
         List<URL> result = new ArrayList<>();
         Iterator<URL> urlIterator = parser.getEmbeddedResourceURLs(
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 9f61d454c99..41d9c96e9f1 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -335,10 +335,8 @@ private static void filetest(HTMLParser p, String file, String url, String resul
             result = p.getEmbeddedResourceURLs(userAgent, buffer, new URL(url), c,System.getProperty("file.encoding"));
         }
         List<String> actual = Lists.newArrayList(Iterators.transform(result, Object::toString));
-        /*
-         * TODO: Exact ordering is only required for some tests; change the
-         * comparison to do a set compare where necessary.
-         */
+        // TODO: Exact ordering is only required for some tests; change the
+        //   comparison to do a set compare where necessary.
         List<String> expected = getFile(resultFile);
         if (!orderMatters) {
             Collections.sort(expected);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index c1a7cfda483..62479a957c1 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -196,19 +196,19 @@ public void testRepeatedArguments() throws Exception {
     }
 
     @Test
-    public void testEncodedArguments() throws Exception {
+    public static void testEncodedArguments() throws Exception {
         String url = "http://localhost/matrix.html";
         testEncodedArguments(url);
     }
 
 
     @Test
-    public void testEncodedArgumentsIPv6() throws Exception {
+    public static void testEncodedArgumentsIPv6() throws Exception {
         String url = "http://[::1]:8080/matrix.html";
         testEncodedArguments(url);
     }
 
-    private void testEncodedArguments(String url) throws Exception {
+    private static void testEncodedArguments(String url) throws Exception {
         // A HTTP GET request, with encoding not known
         String contentEncoding = "";
         String queryString = "abc%3FSPACE=a+b&space=a%20b&query=What%3F";
@@ -309,16 +309,16 @@ private void testEncodedArguments(String url) throws Exception {
     }
 
     @Test
-    public void testGetRequestEncodings() throws Exception {
+    public static void testGetRequestEncodings() throws Exception {
         testGetRequestEncodings("http://localhost/matrix.html");
     }
 
     @Test
-    public void testGetRequestEncodingsIPv6() throws Exception {
+    public static void testGetRequestEncodingsIPv6() throws Exception {
         testGetRequestEncodings("http://[::1]:8080/matrix.html");
     }
 
-    private void testGetRequestEncodings(String url) throws Exception {
+    private static void testGetRequestEncodings(String url) throws Exception {
         // A HTTP GET request, with encoding not known
         String contentEncoding = "";
         String param1Value = "yes";
@@ -595,7 +595,7 @@ public void testPostMultipartFileUpload() throws Exception {
         assertEquals(mimeType, hfa.getMimeType());
     }
 
-    private String createMultipartFormBody(String titleValue, String descriptionValue,
+    private static String createMultipartFormBody(String titleValue, String descriptionValue,
             String contentEncoding, boolean includeExtraHeaders,
             String boundary, String endOfLine) {
 
@@ -628,7 +628,7 @@ private String createMultipartFormBody(String titleValue, String descriptionValu
                     boundary, endOfLine);
     }
 
-    private String createMultipartFileUploadBody(String fileField, String fileName,
+    private static String createMultipartFileUploadBody(String fileField, String fileName,
             String fileMimeType, String fileContent, String boundary, String endOfLine) {
         // File upload multipart
         String postBody = "--" + boundary + endOfLine
@@ -641,7 +641,7 @@ private String createMultipartFileUploadBody(String fileField, String fileName,
         return postBody;
     }
 
-    private String createMultipartFormRequest(String url, String postBody, String contentEncoding, String boundary, String endOfLine)
+    private static String createMultipartFormRequest(String url, String postBody, String contentEncoding, String boundary, String endOfLine)
             throws IOException {
         String postRequest = "POST " + url + " HTTP/1.1" + endOfLine
             + "Content-type: "
@@ -653,7 +653,7 @@ private String createMultipartFormRequest(String url, String postBody, String co
         return postRequest;
     }
 
-    private HTTPSamplerBase getSamplerForRequest(String url, String request, String contentEncoding)
+    private static HTTPSamplerBase getSamplerForRequest(String url, String request, String contentEncoding)
             throws Exception {
         HttpRequestHdr req = new HttpRequestHdr();
         ByteArrayInputStream bis = null;
@@ -678,7 +678,7 @@ private HTTPSamplerBase getSamplerForRequest(String url, String request, String
         return sampler;
     }
 
-    private void checkArgument(
+    private static void checkArgument(
             HTTPArgument arg,
             String expectedName,
             String expectedValue,
@@ -697,7 +697,7 @@ private void checkArgument(
         assertPrimitiveEquals(expectedEncoded, arg.isAlwaysEncoded());
     }
 
-    private int getBodyLength(String postBody, String contentEncoding) throws IOException {
+    private static int getBodyLength(String postBody, String contentEncoding) throws IOException {
         if (StringUtilities.isNotEmpty(contentEncoding)) {
             return postBody.getBytes(contentEncoding).length;
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
index 1bf398301ba..40d587bba03 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java
@@ -46,9 +46,6 @@ protected HTTPSampleResult sample(java.net.URL u, String method,
         return hc.sample(u, method, areFollowingRedirect, depth);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
-     */
     @Override
     public void testIterationStart(LoopIterationEvent event) {
         hc.notifyFirstSampleAfterLoopRestart();
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
index 0353213826f..0a1793564e9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
@@ -33,7 +33,7 @@ public void testConfiguring() throws Exception {
         configure(sampler);
     }
 
-    private void configure(HTTPSamplerBase sampler) throws Exception {
+    private static void configure(HTTPSamplerBase sampler) throws Exception {
         sampler.addArgument("arg1", "val1");
         ConfigTestElement config = (ConfigTestElement) new HttpDefaultsGui().createTestElement();
         config.get(HTTPSamplerBaseSchema.INSTANCE.getArguments()).addArgument(new HTTPArgument(
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
index 2d9d1679224..995138f4b63 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
@@ -57,7 +57,7 @@
 @ExtendWith(JMeterContextExtension.class)
 public class ParallelResourcesAndIpSource {
 
-    private void configureStubs(WireMockServer server) {
+    private static void configureStubs(WireMockServer server) {
         server.stubFor(WireMock.get("/index.html")
                 .willReturn(WireMock.aResponse()
                         .withHeader("Content-Type", "text/html; encoding=utf-8")
@@ -201,26 +201,28 @@ public void test(String httpImplementation, String targetHost, InetAddress sourc
         }
 
         String expected =
-                "url: http://wiremock/index.html\n" +
-                        "response: OK\n" +
-                        "data.size: 85\n" +
-                        "data: <html><body><img src='image1.png'><img src='image2.png'><img src='image3.png'></body>\n" +
-                        "- url: http://wiremock/image1.png\n" +
-                        "  response: OK\n" +
-                        "  data.size: 8\n" +
-                        "  data: content1\n" +
-                        "- url: http://wiremock/image2.png\n" +
-                        "  response: OK\n" +
-                        "  data.size: 8\n" +
-                        "  data: content2\n" +
-                        "- url: http://wiremock/image3.png\n" +
-                        "  response: OK\n" +
-                        "  data.size: 8\n" +
-                        "  data: content3\n" +
-                        "- url: http://wiremock/index.html\n" +
-                        "  response: OK\n" +
-                        "  data.size: 85\n" +
-                        "  data: <html><body><img src='image1.png'><img src='image2.png'><img src='image3.png'></body>\n";
+                """
+                        url: http://wiremock/index.html
+                        response: OK
+                        data.size: 85
+                        data: <html><body><img src='image1.png'><img src='image2.png'><img src='image3.png'></body>
+                        - url: http://wiremock/image1.png
+                          response: OK
+                          data.size: 8
+                          data: content1
+                        - url: http://wiremock/image2.png
+                          response: OK
+                          data.size: 8
+                          data: content2
+                        - url: http://wiremock/image3.png
+                          response: OK
+                          data.size: 8
+                          data: content3
+                        - url: http://wiremock/index.html
+                          response: OK
+                          data.size: 85
+                          data: <html><body><img src='image1.png'><img src='image2.png'><img src='image3.png'></body>
+                        """;
         expected = expected.replace("http://wiremock", "http://" + targetHost + ":" + server.port());
         Assertions.assertEquals(
                 expected.replaceAll("\n", System.lineSeparator()),
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
index bd5b36bceb3..2babf84939a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
@@ -94,8 +94,8 @@ public void tearDown() throws Exception {
         }
     }
 
-    /*
-     * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
+    /**
+     * Test method for org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending a request which contains both formdata and file content
      */
     @Test
@@ -159,7 +159,7 @@ public void testSendPostData() throws IOException {
         connection.disconnect();
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending a HTTPSampler with form parameters, and only
      * the filename of a file.
@@ -204,7 +204,7 @@ public void testSendPostData_NoFilename() throws IOException {
         connection.disconnect();
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending file content as the only content of the post body
      */
@@ -258,7 +258,7 @@ public void testSendPostData_FileAsBody() throws IOException {
         checkArraysHaveSameContent(expectedUrl, connection.getOutputStreamContent());
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending only a file multipart.
      */
@@ -313,7 +313,7 @@ public void testSendFileData_Multipart() throws IOException {
         connection.disconnect();
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending only a formdata, as a multipart/form-data request.
      */
@@ -413,7 +413,7 @@ public void testSendFormData_Multipart() throws IOException {
         connection.disconnect();
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.sendPostData(URLConnection, HTTPSampler)'
      * This method test sending only a formdata, as urlencoded data
      */
@@ -594,7 +594,7 @@ public void testSendFormData_Urlencoded() throws IOException {
         connection.disconnect();
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.setHeaders(URLConnection, HTTPSampler)'
      */
     @Test
@@ -607,7 +607,7 @@ public void testSetHeaders() throws IOException {
         checkContentTypeMultipart(connection, PostWriter.BOUNDARY);
     }
 
-    /*
+    /**
      * Test method for 'org.apache.jmeter.protocol.http.sampler.postWriter.setHeaders(URLConnection, HTTPSampler)'
      */
     @Test
@@ -622,7 +622,7 @@ public void testSetHeaders_NoFilename() throws IOException {
     }
 
     /** setup commons parts of HTTPSampler with a no filename. */
-    private void setupNoFilename(HTTPSampler httpSampler) {
+    private static void setupNoFilename(HTTPSampler httpSampler) {
         setupFilepart(httpSampler, "upload", null, "application/octet-stream");
     }
 
@@ -630,20 +630,20 @@ private void setupFilepart(HTTPSampler httpSampler) {
         setupFilepart(httpSampler, "upload", temporaryFile, "text/plain");
     }
 
-    private void setupFilepart(HTTPSampler httpSampler, String fileField, File file, String mimeType) {
+    private static void setupFilepart(HTTPSampler httpSampler, String fileField, File file, String mimeType) {
         HTTPFileArg[] hfa = {new HTTPFileArg(file == null ? "" : file.getAbsolutePath(), fileField, mimeType)};
         httpSampler.setHTTPFiles(hfa);
     }
 
-    private void setupFormData(HTTPSampler httpSampler) {
+    private static void setupFormData(HTTPSampler httpSampler) {
         setupFormData(httpSampler, "mytitle", "mydescription");
     }
 
-    private void setupFormData(HTTPSampler httpSampler, String titleValue, String descriptionValue) {
+    private static void setupFormData(HTTPSampler httpSampler, String titleValue, String descriptionValue) {
         setupFormData(httpSampler, false, titleValue, descriptionValue);
     }
 
-    private void setupFormData(HTTPSampler httpSampler, boolean isEncoded, String titleValue, String descriptionValue) {
+    private static void setupFormData(HTTPSampler httpSampler, boolean isEncoded, String titleValue, String descriptionValue) {
         Arguments args = new Arguments();
         HTTPArgument argument1 = new HTTPArgument("title", titleValue, isEncoded);
         HTTPArgument argument2 = new HTTPArgument("description", descriptionValue, isEncoded);
@@ -709,7 +709,7 @@ private byte[] createExpectedOutput(
      *
      * @param lastMultipart true if this is the last multipart in the request
      */
-    private byte[] createExpectedFormdataOutput(
+    private static byte[] createExpectedFormdataOutput(
             String boundaryString,
             String contentEncoding,
             String titleField,
@@ -787,7 +787,7 @@ private byte[] createExpectedFormdataOutput(
      *
      * @param lastMultipart true if this is the last multipart in the request
      */
-    private byte[] createExpectedFilepartOutput(
+    private static byte[] createExpectedFilepartOutput(
             String boundaryString,
             String fileField,
             File file,
@@ -835,7 +835,7 @@ private byte[] createExpectedFilepartOutput(
     /**
      * Check that the two byte arrays have identical content
      */
-    private void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws UnsupportedEncodingException {
+    private static void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws UnsupportedEncodingException {
         if(expected != null && actual != null) {
             if(expected.length != actual.length) {
                 System.out.println(new String(expected,UTF_8));
@@ -864,7 +864,7 @@ private void checkArraysHaveSameContent(byte[] expected, byte[] actual) throws U
     /**
      * Check that the two byte arrays different content
      */
-    private void checkArraysHaveDifferentContent(byte[] expected, byte[] actual) {
+    private static void checkArraysHaveDifferentContent(byte[] expected, byte[] actual) {
         if(expected != null && actual != null) {
             if(expected.length == actual.length) {
                 boolean allSame = true;
@@ -884,15 +884,15 @@ private void checkArraysHaveDifferentContent(byte[] expected, byte[] actual) {
         }
     }
 
-    private void checkContentTypeMultipart(HttpURLConnection conn, String boundaryString) {
+    private static void checkContentTypeMultipart(HttpURLConnection conn, String boundaryString) {
         assertEquals("multipart/form-data; boundary=" + boundaryString, conn.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
     }
 
-    private void checkNoContentType(HttpURLConnection conn) {
+    private static void checkNoContentType(HttpURLConnection conn) {
         assertNull(conn.getRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE));
     }
 
-    private void checkContentLength(HttpURLConnection conn, int length) {
+    private static void checkContentLength(HttpURLConnection conn, int length) {
         assertEquals(Integer.toString(length), conn.getRequestProperty(HTTPConstants.HEADER_CONTENT_LENGTH));
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
index fb1c2fe798f..e3eea6efceb 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
@@ -68,7 +68,7 @@ void testBug63364(String implementation) {
      * @param implementation HTTP implementation
      * @return array of {@link SampleResult}
      */
-    private SampleResult[] doSample(String implementation) {
+    private static SampleResult[] doSample(String implementation) {
         HTTPSamplerProxy httpSamplerProxy = new HTTPSamplerProxy(implementation);
         httpSamplerProxy.setName(LABEL);
         httpSamplerProxy.setConnectTimeout("15000");
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
index 40b972ec553..e1a7ee17f68 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
@@ -114,7 +114,7 @@ public void mockServer(String httpImpl, ClientGzip clientGzip, ServerGzip server
         }
     }
 
-    private WireMockServer createServer(Consumer<WireMockConfiguration> config) {
+    private static WireMockServer createServer(Consumer<WireMockConfiguration> config) {
         WireMockConfiguration configuration =
                 WireMockConfiguration
                         .wireMockConfig()
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 4164c82c61c..2da7085c152 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -109,76 +109,76 @@ static void setup() throws IOException {
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
+    public static void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER, ISO_8859_1, item);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
+    public static void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER3, US_ASCII, item);
     }
 
     @Test
-    public void testPostRequest_FormMultipart_0() throws Exception {
+    public static void testPostRequest_FormMultipart_0() throws Exception {
         testPostRequest_FormMultipart(HTTP_SAMPLER);
     }
 
     @Test
-    public void testPostRequest_FormMultipart3() throws Exception {
+    public static void testPostRequest_FormMultipart3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FormMultipart(HTTP_SAMPLER3);
     }
 
     @Test
-    public void testPostRequest_FileUpload() throws Exception {
+    public static void testPostRequest_FileUpload() throws Exception {
         testPostRequest_FileUpload(HTTP_SAMPLER);
     }
 
     @Test
-    public void testPostRequest_FileUpload3() throws Exception {
+    public static void testPostRequest_FileUpload3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FileUpload(HTTP_SAMPLER3);
     }
 
     @Test
-    public void testPostRequest_BodyFromParameterValues() throws Exception {
+    public static void testPostRequest_BodyFromParameterValues() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER, ISO_8859_1);
     }
 
     @Test
-    public void testPostRequest_BodyFromParameterValues3() throws Exception {
+    public static void testPostRequest_BodyFromParameterValues3() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
 
     @Test
-    public void testGetRequest() throws Exception {
+    public static void testGetRequest() throws Exception {
         testGetRequest(HTTP_SAMPLER);
     }
 
     @Test
-    public void testGetRequest3() throws Exception {
+    public static void testGetRequest3() throws Exception {
         testGetRequest(HTTP_SAMPLER3);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public void itemised_testGetRequest_Parameters(int item) throws Exception {
+    public static void itemised_testGetRequest_Parameters(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER, item);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public void itemised_testGetRequest_Parameters3(int item) throws Exception {
+    public static void itemised_testGetRequest_Parameters3(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER3, item);
     }
 
     @Test
-    public void testPutRequest_BodyFromParameterValues3() throws Exception {
+    public static void testPutRequest_BodyFromParameterValues3() throws Exception {
         testPutRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
 
-    private void testPutRequest_BodyFromParameterValues(int samplerType, String samplerDefaultEncoding) throws Exception {
+    private static void testPutRequest_BodyFromParameterValues(int samplerType, String samplerDefaultEncoding) throws Exception {
 
         final String titleField = "titleKey"; // ensure only values are used
         String titleValue = "mytitle";
@@ -200,7 +200,7 @@ private void testPutRequest_BodyFromParameterValues(int samplerType, String samp
                 HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
     }
 
-    private void testPostRequest_UrlEncoded(int samplerType, String samplerDefaultEncoding, int test) throws Exception {
+    private static void testPostRequest_UrlEncoded(int samplerType, String samplerDefaultEncoding, int test) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -334,7 +334,7 @@ private void testPostRequest_UrlEncoded(int samplerType, String samplerDefaultEn
         }
     }
 
-    private void testPostRequest_FormMultipart(int samplerType) throws Exception {
+    private static void testPostRequest_FormMultipart(int samplerType) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -446,7 +446,7 @@ private void testPostRequest_FormMultipart(int samplerType) throws Exception {
                 descriptionField, expectedDescriptionValue);
     }
 
-    private void testPostRequest_FileUpload(int samplerType) throws Exception {
+    private static void testPostRequest_FileUpload(int samplerType) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -496,7 +496,7 @@ private void testPostRequest_FileUpload(int samplerType) throws Exception {
                 TEST_FILE_CONTENT);
     }
 
-    private void testPostRequest_BodyFromParameterValues(int samplerType, String samplerDefaultEncoding) throws Exception {
+    private static void testPostRequest_BodyFromParameterValues(int samplerType, String samplerDefaultEncoding) throws Exception {
         final String titleField = ""; // ensure only values are used
         String titleValue = "mytitle";
         final String descriptionField = ""; // ensure only values are used
@@ -647,7 +647,7 @@ private void testPostRequest_BodyFromParameterValues(int samplerType, String sam
         checkPostRequestBody(sampler, res, samplerDefaultEncoding, contentEncoding, expectedPostBody, CONTENT_TYPE_TEXT_PLAIN);
     }
 
-    private void testGetRequest(int samplerType) throws Exception {
+    private static void testGetRequest(int samplerType) throws Exception {
         // Test sending simple HTTP get
         // Test sending data with default encoding
         HTTPSamplerBase sampler = createHttpSampler(samplerType);
@@ -674,7 +674,7 @@ private void testGetRequest(int samplerType) throws Exception {
         checkGetRequest(sampler, res);
     }
 
-    private void testGetRequest_Parameters(int samplerType, int test) throws Exception {
+    private static void testGetRequest_Parameters(int samplerType, int test) throws Exception {
         String titleField = "title";
         String titleValue = "mytitle";
         String descriptionField = "description";
@@ -805,7 +805,7 @@ private void testGetRequest_Parameters(int samplerType, int test) throws Excepti
         }
     }
 
-    private HTTPSampleResult executeSampler(HTTPSamplerBase sampler) {
+    private static HTTPSampleResult executeSampler(HTTPSamplerBase sampler) {
         sampler.setRunningVersion(true);
         sampler.threadStarted();
         HTTPSampleResult res = (HTTPSampleResult) sampler.sample();
@@ -814,7 +814,7 @@ private HTTPSampleResult executeSampler(HTTPSamplerBase sampler) {
         return res;
     }
 
-    private void checkPostRequestUrlEncoded(
+    private static void checkPostRequestUrlEncoded(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
             String samplerDefaultEncoding,
@@ -847,7 +847,7 @@ private void checkPostRequestUrlEncoded(
                 HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
     }
 
-    private void checkPostRequestFormMultipart(
+    private static void checkPostRequestFormMultipart(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
             String contentEncoding,
@@ -891,7 +891,7 @@ private void checkPostRequestFormMultipart(
         checkMethodPathQuery(headersSent, sampler.getMethod(), sampler.getPath(), (String) null, res);
     }
 
-    private void checkPostRequestFileUpload(
+    private static void checkPostRequestFileUpload(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
             String contentEncoding,
@@ -936,7 +936,7 @@ private void checkPostRequestFileUpload(
         checkMethodPathQuery(headersSent, sampler.getMethod(), sampler.getPath(), (String) null, res);
     }
 
-    private void checkPostRequestBody(
+    private static void checkPostRequestBody(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
             String samplerDefaultEncoding,
@@ -985,7 +985,7 @@ private void checkPostRequestBody(
         checkMethodPathQuery(headersSent, sampler.getMethod(), sampler.getPath(), (String) null, res);
     }
 
-    private void checkGetRequest(
+    private static void checkGetRequest(
             HTTPSamplerBase sampler,
             HTTPSampleResult res
     ) throws IOException {
@@ -1014,7 +1014,7 @@ private void checkGetRequest(
         checkMethodPathQuery(headersSent, sampler.getMethod(), sampler.getPath(), (String) null, res);
     }
 
-    private void checkGetRequest_Parameters(
+    private static void checkGetRequest_Parameters(
             HTTPSamplerBase sampler,
             HTTPSampleResult res,
             String contentEncoding,
@@ -1061,7 +1061,7 @@ private void checkGetRequest_Parameters(
         checkMethodPathQuery(headersSent, sampler.getMethod(), sampler.getPath(), expectedQueryString, res);
     }
 
-    private void checkMethodPathQuery(
+    private static void checkMethodPathQuery(
             String headersSent,
             String expectedMethod,
             String expectedPath,
@@ -1111,7 +1111,7 @@ private void checkMethodPathQuery(
         }
     }
 
-    private String getHeadersSent(byte[] responseData) throws IOException {
+    private static String getHeadersSent(byte[] responseData) throws IOException {
         // Find the data sent to the mirror server, which the mirror server is sending back to us
         // We assume the headers are in ISO_8859_1, and the body can be in any content encoding.
         String dataSentToMirrorServer = new String(responseData, StandardCharsets.ISO_8859_1);
@@ -1123,7 +1123,7 @@ private String getHeadersSent(byte[] responseData) throws IOException {
         return headersSent;
     }
 
-    private byte[] getBodySent(byte[] responseData) throws IOException {
+    private static byte[] getBodySent(byte[] responseData) throws IOException {
         // Find the data sent to the mirror server, which the mirror server is sending back to us
         // We assume the headers are in ISO_8859_1, and the body can be in any content encoding.
         // Therefore we get the data sent in ISO_8859_1, to be able to determine the end of the
@@ -1148,13 +1148,13 @@ private byte[] getBodySent(byte[] responseData) throws IOException {
         return bodySent;
     }
 
-    private boolean isInRequestHeaders(String requestHeaders, String headerName, String headerValue) {
+    private static boolean isInRequestHeaders(String requestHeaders, String headerName, String headerValue) {
         return checkRegularExpression(requestHeaders, headerName + ": " + headerValue);
     }
 
     // Java 1.6.0_22+ no longer allows Content-Length to be set, so don't check it.
     // See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6996110
-    private void checkHeaderContentType(String requestHeaders, String contentType) {
+    private static void checkHeaderContentType(String requestHeaders, String contentType) {
         if (contentType == null) {
             boolean isPresent = checkRegularExpression(requestHeaders, HTTPConstants.HEADER_CONTENT_TYPE + ": .*");
             assertFalse(isPresent, "Expected no Content-Type in request headers:\n" + requestHeaders);
@@ -1164,14 +1164,14 @@ private void checkHeaderContentType(String requestHeaders, String contentType) {
         }
     }
 
-    private String getSentRequestHeaderValue(String requestHeaders, String headerName) {
+    private static String getSentRequestHeaderValue(String requestHeaders, String headerName) {
         if (USE_JAVA_REGEX) {
             return getSentRequestHeaderValueWithJavaRegex(requestHeaders, headerName);
         }
         return getSentRequestHeaderValueWithOroRegex(requestHeaders, headerName);
     }
 
-    private String getSentRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
+    private static String getSentRequestHeaderValueWithJavaRegex(String requestHeaders, String headerName) {
         String expression = ".*" + headerName + ": (\\d*).*";
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(expression,
                         java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.DOTALL);
@@ -1183,7 +1183,7 @@ private String getSentRequestHeaderValueWithJavaRegex(String requestHeaders, Str
         return null;
     }
 
-    private String getSentRequestHeaderValueWithOroRegex(String requestHeaders, String headerName) {
+    private static String getSentRequestHeaderValueWithOroRegex(String requestHeaders, String headerName) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         String expression = ".*" + headerName + ": (\\d*).*";
         Pattern pattern = JMeterUtils.getPattern(expression,
@@ -1197,20 +1197,20 @@ private String getSentRequestHeaderValueWithOroRegex(String requestHeaders, Stri
         return null;
     }
 
-    private boolean checkRegularExpression(String stringToCheck, String regularExpression) {
+    private static boolean checkRegularExpression(String stringToCheck, String regularExpression) {
         if (USE_JAVA_REGEX) {
             return checkRegularExpressionWithJavaRegex(stringToCheck, regularExpression);
         }
         return checkRegularExpressionWithOroRegex(stringToCheck, regularExpression);
     }
 
-    private boolean checkRegularExpressionWithJavaRegex(String stringToCheck, String regularExpression) {
+    private static boolean checkRegularExpressionWithJavaRegex(String stringToCheck, String regularExpression) {
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
                 java.util.regex.Pattern.CASE_INSENSITIVE);
         return pattern.matcher(stringToCheck).find();
     }
 
-    private boolean checkRegularExpressionWithOroRegex(String stringToCheck, String regularExpression) {
+    private static boolean checkRegularExpressionWithOroRegex(String stringToCheck, String regularExpression) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         Pattern pattern = JMeterUtils.getPattern(regularExpression,
                 Perl5Compiler.READ_ONLY_MASK
@@ -1219,14 +1219,14 @@ private boolean checkRegularExpressionWithOroRegex(String stringToCheck, String
         return localMatcher.contains(stringToCheck, pattern);
     }
 
-    private int getPositionOfBody(String stringToCheck) {
+    private static int getPositionOfBody(String stringToCheck) {
         if (USE_JAVA_REGEX) {
             return getPositionOfBodyWithJavaRegex(stringToCheck);
         }
         return getPositionOfBodyWithOroRegex(stringToCheck);
     }
 
-    private int getPositionOfBodyWithJavaRegex(String stringToCheck) {
+    private static int getPositionOfBodyWithJavaRegex(String stringToCheck) {
         // The headers and body are divided by a blank line
 
         Matcher localMatcher = EMPTY_LINE_PATTERN.matcher(stringToCheck);
@@ -1238,7 +1238,7 @@ private int getPositionOfBodyWithJavaRegex(String stringToCheck) {
         return -1;
     }
 
-    private int getPositionOfBodyWithOroRegex(String stringToCheck) {
+    private static int getPositionOfBodyWithOroRegex(String stringToCheck) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         // The headers and body are divided by a blank line
         String regularExpression = "^.$";
@@ -1256,14 +1256,14 @@ private int getPositionOfBodyWithOroRegex(String stringToCheck) {
         return -1;
     }
 
-    private String getBoundaryStringFromContentType(String requestHeaders) {
+    private static String getBoundaryStringFromContentType(String requestHeaders) {
         if (USE_JAVA_REGEX) {
             return getBoundaryStringFromContentTypeWithJavaRegex(requestHeaders);
         }
         return getBoundaryStringFromContentTypeWithOroRegex(requestHeaders);
     }
 
-    private String getBoundaryStringFromContentTypeWithJavaRegex(String requestHeaders) {
+    private static String getBoundaryStringFromContentTypeWithJavaRegex(String requestHeaders) {
         String regularExpression = "^" + HTTPConstants.HEADER_CONTENT_TYPE + ": multipart/form-data; boundary=(.+)$";
         java.util.regex.Pattern pattern = JMeterUtils.compilePattern(regularExpression,
                 java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
@@ -1282,7 +1282,7 @@ private String getBoundaryStringFromContentTypeWithJavaRegex(String requestHeade
         }
     }
 
-    private String getBoundaryStringFromContentTypeWithOroRegex(String requestHeaders) {
+    private static String getBoundaryStringFromContentTypeWithOroRegex(String requestHeaders) {
         Perl5Matcher localMatcher = JMeterUtils.getMatcher();
         String regularExpression = "^" + HTTPConstants.HEADER_CONTENT_TYPE + ": multipart/form-data; boundary=(.+)$";
         Pattern pattern = JMeterUtils.getPattern(regularExpression,
@@ -1304,7 +1304,7 @@ private String getBoundaryStringFromContentTypeWithOroRegex(String requestHeader
         }
     }
 
-    private void setupUrl(HTTPSamplerBase sampler, String contentEncoding) {
+    private static void setupUrl(HTTPSamplerBase sampler, String contentEncoding) {
         String protocol = "http";
         String domain = "localhost";
         String path = "/test/somescript.jsp";
@@ -1317,9 +1317,9 @@ private void setupUrl(HTTPSamplerBase sampler, String contentEncoding) {
     }
 
     /** Setup the form data with specified values */
-    private void setupFormData(HTTPSamplerBase httpSampler, boolean isEncoded,
-                               String titleField, String titleValue,
-                               String descriptionField, String descriptionValue) {
+    private static void setupFormData(HTTPSamplerBase httpSampler, boolean isEncoded,
+            String titleField, String titleValue,
+            String descriptionField, String descriptionValue) {
         if (isEncoded) {
             httpSampler.addEncodedArgument(titleField, titleValue);
             httpSampler.addEncodedArgument(descriptionField, descriptionValue);
@@ -1330,7 +1330,7 @@ private void setupFormData(HTTPSamplerBase httpSampler, boolean isEncoded,
     }
 
     /** Setup the form data with specified values, and file to upload */
-    private void setupFileUploadData(
+    private static void setupFileUploadData(
             HTTPSamplerBase httpSampler,
             boolean isEncoded,
             String titleField,
@@ -1349,8 +1349,8 @@ private void setupFileUploadData(
     }
 
     /** Check that the two byte arrays have identical content */
-    private void checkArraysHaveSameContent(byte[] expected, byte[] actual,
-                                            String encoding, HTTPSampleResult res)
+    private static void checkArraysHaveSameContent(byte[] expected, byte[] actual,
+            String encoding, HTTPSampleResult res)
             throws UnsupportedEncodingException {
         if (expected != null && actual != null) {
             if (expected.length != actual.length) {
@@ -1404,7 +1404,7 @@ private void checkArraysHaveSameContent(byte[] expected, byte[] actual,
      *
      * @param lastMultipart true if this is the last multipart in the request
      */
-    private byte[] createExpectedFormDataOutput(
+    private static byte[] createExpectedFormDataOutput(
             String boundaryString,
             String contentEncoding,
             String titleField,
@@ -1476,7 +1476,7 @@ private byte[] createExpectedFormDataOutput(
         return output.toByteArray();
     }
 
-    private byte[] createExpectedFilepartOutput(
+    private static byte[] createExpectedFilepartOutput(
             String boundaryString,
             String fileField,
             File file,
@@ -1514,7 +1514,7 @@ private byte[] createExpectedFilepartOutput(
      * Create the expected output post body for form data and file multi-parts
      * with specified values, when request is multipart
      */
-    private byte[] createExpectedFormAndUploadOutput(
+    private static byte[] createExpectedFormAndUploadOutput(
             String boundaryString,
             String contentEncoding,
             String titleField,
@@ -1543,14 +1543,11 @@ private byte[] createExpectedFormAndUploadOutput(
         return output.toByteArray();
     }
 
-    private HTTPSamplerBase createHttpSampler(int samplerType) {
-        switch (samplerType) {
-            case HTTP_SAMPLER:
-                return new HTTPSampler();
-            case HTTP_SAMPLER3:
-                return new HTTPSampler3();
-            default:
-                throw new IllegalArgumentException("Unexpected type: " + samplerType);
-        }
+    private static HTTPSamplerBase createHttpSampler(int samplerType) {
+        return switch (samplerType) {
+            case HTTP_SAMPLER -> new HTTPSampler();
+            case HTTP_SAMPLER3 -> new HTTPSampler3();
+            default -> throw new IllegalArgumentException("Unexpected type: " + samplerType);
+        };
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index 42e63d359bc..b3558d07af8 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -80,7 +80,7 @@ void testRedirect(String httpImpl, int redirectCode, boolean shouldRedirect, Str
         }
     }
 
-    private WireMockServer createServer() {
+    private static WireMockServer createServer() {
         WireMockConfiguration configuration = WireMockConfiguration.wireMockConfig().dynamicPort();
         return new WireMockServer(configuration);
     }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
index c2b91869059..fdf2e567b69 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java
@@ -116,8 +116,9 @@ public void testToString() throws Exception {
         files.addHTTPFileArg("file1");
         files.addHTTPFileArg("file2.jpg");
         files.addHTTPFileArg("file3.jar");
-        assertEquals("path:'file1'|param:''|mimetype:'application/octet-stream'\n"
-                    +"path:'file2.jpg'|param:''|mimetype:'image/jpeg'\n"
-                    +"path:'file3.jar'|param:''|mimetype:'application/java-archive'", files.toString());
+        assertEquals("""
+                path:'file1'|param:''|mimetype:'application/octet-stream'
+                path:'file2.jpg'|param:''|mimetype:'image/jpeg'
+                path:'file3.jar'|param:''|mimetype:'application/java-archive'""", files.toString());
     }
 }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
index 6688898f76e..fa86b3e3529 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java
@@ -162,34 +162,35 @@ void testGetQueryMapBug52491() {
 
     @Test
     void testGetQueryMapSoapHack() {
-        String query = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-                + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" +
-                "xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" +
-                "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
-                "    <SOAP-ENV:Header>\n" +
-                "        <m:Security\n" +
-                "xmlns:m=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\">\n" +
-                "            <UsernameToken>\n" +
-                "                <Username>hello</Username>\n" +
-                "                <Password>world</Password>\n" +
-                "            </UsernameToken>\n" +
-                "        </m:Security>\n" +
-                "    </SOAP-ENV:Header>\n" +
-                "    <SOAP-ENV:Body>     \n" +
-                "        <m:GeefPersoon xmlns:m=\"http://webservice.namespace\">\n" +
-                "            <Vraag>\n" +
-                "                <Context>\n" +
-                "                    <Naam>GeefPersoon</Naam>\n" +
-                "                    <Versie>01.00.0000</Versie>\n" +
-                "                </Context>\n" +
-                "                <Inhoud>\n" +
-                "                    <INSZ>650602505589</INSZ>\n" +
-                "                </Inhoud>\n" +
-                "            </Vraag>\n" +
-                "        </m:GeefPersoon>\n" +
-                "    </SOAP-ENV:Body>\n" +
-                "</SOAP-ENV:Envelope>";
+        String query = """
+                <?xml version="1.0" encoding="UTF-8"?>\
+                <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+                xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                    <SOAP-ENV:Header>
+                        <m:Security
+                xmlns:m="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+                            <UsernameToken>
+                                <Username>hello</Username>
+                                <Password>world</Password>
+                            </UsernameToken>
+                        </m:Security>
+                    </SOAP-ENV:Header>
+                    <SOAP-ENV:Body>    \s
+                        <m:GeefPersoon xmlns:m="http://webservice.namespace">
+                            <Vraag>
+                                <Context>
+                                    <Naam>GeefPersoon</Naam>
+                                    <Versie>01.00.0000</Versie>
+                                </Context>
+                                <Inhoud>
+                                    <INSZ>650602505589</INSZ>
+                                </Inhoud>
+                            </Vraag>
+                        </m:GeefPersoon>
+                    </SOAP-ENV:Body>
+                </SOAP-ENV:Envelope>""";
         Map<String, String[]> params = RequestViewHTTP.getQueryMap(query);
 
         Assertions.assertNotNull(params);
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
index 96e9fb150f5..e3b33a771a8 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
@@ -305,9 +305,6 @@ public void modifyTestElement(TestElement config) {
         ((JavaConfig) config).setClassname(classNameLabeledChoice.getText().trim());
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.AbstractJMeterGuiComponent#clearGui()
-     */
     @Override
     public void clearGui() {
         super.clearGui();
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
index 78a3b0502c5..2310db0ebf1 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
@@ -91,9 +91,6 @@ public void configure(TestElement el) {
         javaPanel.configure(el);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.gui.AbstractJMeterGuiComponent#clearGui()
-     */
     @Override
     public void clearGui() {
         super.clearGui();
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
index 16154997b3a..9a94bdf62b8 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
@@ -88,7 +88,7 @@ public SampleResult sample(Entry e)// Entry tends to be ignored ...
             bsfEngine = mgr.loadScriptingEngine(getScriptLanguage());
 
             Object bsfOut = null;
-            if (fileName.length()>0) {
+            if (!fileName.isEmpty()) {
                 res.setSamplerData("File: "+fileName);
                 try (FileInputStream fis = new FileInputStream(fileName);
                         BufferedInputStream is = new BufferedInputStream(fis)) {
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
index 630c28168f5..7c553a02453 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
@@ -103,7 +103,7 @@ public JavaSampler() {
         setArguments(new Arguments());
     }
 
-    /*
+    /**
      * Ensure that the required class variables are cloned,
      * as this is not currently done by the super-implementation.
      */
@@ -197,7 +197,7 @@ public SampleResult sample(Entry entry) {
         SampleResult result = javaClient.runTest(context);
 
         // Only set the default label if it has not been set
-        if (result != null && result.getSampleLabel().length() == 0) {
+        if (result != null && result.getSampleLabel().isEmpty()) {
             result.setSampleLabel(getName());
         }
 
@@ -348,8 +348,8 @@ public boolean applies(ConfigTestElement configElement) {
 
     @Override
     public boolean interrupt() {
-        if (javaClient instanceof Interruptible) {
-            return ((Interruptible) javaClient).interrupt();
+        if (javaClient instanceof Interruptible interruptible) {
+            return interruptible.interrupt();
 
         }
         return false;
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
index 1fabe5e1707..44e2241f742 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
@@ -239,7 +239,7 @@ public JMeterContext getJMeterContext() {
      * Returns {@link JMeterVariables} for the current thread.
      * @return {@link JMeterVariables} for the current thread.
      */
-    public final JMeterVariables getJMeterVariables() {
+    public static JMeterVariables getJMeterVariables() {
         return JMeterContextService.getContext().getVariables();
     }
 
@@ -247,7 +247,7 @@ public final JMeterVariables getJMeterVariables() {
      * Returns JMeter properties.
      * @return {@link Properties} JMeter properties
      */
-    public final Properties getJMeterProperties() {
+    public static Properties getJMeterProperties() {
         return JMeterUtils.getJMeterProperties();
     }
 
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
index 18deb724048..4820cfd48c9 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java
@@ -164,7 +164,7 @@ public JavaTest() {
         LOG.debug(whoAmI() + "\tConstruct");
     }
 
-    /*
+    /**
      * Utility method to set up all the values
      */
     private void setupValues(JavaSamplerContext context) {
@@ -179,7 +179,7 @@ private void setupValues(JavaSamplerContext context) {
         success = "OK".equalsIgnoreCase(context.getParameter(SUCCESS_NAME, SUCCESS_DEFAULT));
 
         label = context.getParameter(LABEL_NAME, "");
-        if (label.length() == 0) {
+        if (label.isEmpty()) {
             label = context.getParameter(TestElement.NAME); // default to name of element
         }
 
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index 2c808edad96..57521582185 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -270,9 +270,8 @@ private String resultSetsToString(PreparedStatement pstmt, boolean result, int[]
                 updateCount = pstmt.getUpdateCount();
             }
         } while (currentResult || (updateCount != -1));
-        if (out!=null && pstmt instanceof CallableStatement){
+        if (out!=null && pstmt instanceof CallableStatement cs){
             List<Object> outputValues = new ArrayList<>();
-            CallableStatement cs = (CallableStatement) pstmt;
             sb.append("Output variables by position:\n");
             for(int i=0; i < out.length; i++){
                 if (out[i]!=java.sql.Types.NULL){
@@ -282,8 +281,8 @@ private String resultSetsToString(PreparedStatement pstmt, boolean result, int[]
                     sb.append(i+1);
                     sb.append("] ");
                     sb.append(o);
-                    if( o instanceof java.sql.ResultSet && RS_COUNT_RECORDS.equals(resultSetHandler)) {
-                        sb.append(" ").append(countRows((ResultSet) o)).append(" rows");
+                    if( o instanceof ResultSet resultSet && RS_COUNT_RECORDS.equals(resultSetHandler)) {
+                        sb.append(" ").append(countRows(resultSet)).append(" rows");
                     }
                     sb.append("\n");
                 }
@@ -293,14 +292,14 @@ private String resultSetsToString(PreparedStatement pstmt, boolean result, int[]
             JMeterVariables jmvars = getThreadContext().getVariables();
                 for(int i = 0; i < varnames.length && i < outputValues.size(); i++) {
                     String name = varnames[i].trim();
-                    if (name.length()>0){ // Save the value in the variable if present
+                    if (!name.isEmpty()){ // Save the value in the variable if present
                         Object o = outputValues.get(i);
-                        if( o instanceof java.sql.ResultSet ) {
-                            putIntoVar(jmvars, name, (java.sql.ResultSet) o);
-                        } else if (o instanceof java.sql.Clob) {
-                            putIntoVar(jmvars, name, (java.sql.Clob) o);
-                        } else if (o instanceof java.sql.Blob) {
-                            putIntoVar(jmvars, name, (java.sql.Blob) o);
+                        if(o instanceof ResultSet resultSet) {
+                            putIntoVar(jmvars, name, resultSet);
+                        } else if (o instanceof Clob clob) {
+                            putIntoVar(jmvars, name, clob);
+                        } else if (o instanceof Blob blob) {
+                            putIntoVar(jmvars, name, blob);
                         }
                         else {
                             jmvars.put(name, o == null ? null : o.toString());
@@ -429,57 +428,22 @@ private int[] setArguments(PreparedStatement pstmt) throws SQLException, IOExcep
 
     private static void setArgument(PreparedStatement pstmt, String argument, int targetSqlType, int index) throws SQLException {
         switch (targetSqlType) {
-        case Types.INTEGER:
-            pstmt.setInt(index, Integer.parseInt(argument));
-            break;
-        case Types.DECIMAL:
-        case Types.NUMERIC:
-            pstmt.setBigDecimal(index, new BigDecimal(argument));
-            break;
-        case Types.DOUBLE:
-        case Types.FLOAT:
-            pstmt.setDouble(index, Double.parseDouble(argument));
-            break;
-        case Types.CHAR:
-        case Types.LONGVARCHAR:
-        case Types.VARCHAR:
-            pstmt.setString(index, argument);
-            break;
-        case Types.BIT:
-        case Types.BOOLEAN:
-            pstmt.setBoolean(index, Boolean.parseBoolean(argument));
-            break;
-        case Types.BIGINT:
-            pstmt.setLong(index, Long.parseLong(argument));
-            break;
-        case Types.DATE:
-            pstmt.setDate(index, Date.valueOf(argument));
-            break;
-        case Types.REAL:
-            pstmt.setFloat(index, Float.parseFloat(argument));
-            break;
-        case Types.TINYINT:
-            pstmt.setByte(index, Byte.parseByte(argument));
-            break;
-        case Types.SMALLINT:
-            pstmt.setShort(index, Short.parseShort(argument));
-            break;
-        case Types.TIMESTAMP:
-            pstmt.setTimestamp(index, Timestamp.valueOf(argument));
-            break;
-        case Types.TIME:
-            pstmt.setTime(index, Time.valueOf(argument));
-            break;
-        case Types.BINARY:
-        case Types.VARBINARY:
-        case Types.LONGVARBINARY:
-            pstmt.setBytes(index, argument.getBytes(StandardCharsets.UTF_8));
-            break;
-        case Types.NULL:
-            pstmt.setNull(index, targetSqlType);
-            break;
-        default:
-            pstmt.setObject(index, argument, targetSqlType);
+            case Types.INTEGER -> pstmt.setInt(index, Integer.parseInt(argument));
+            case Types.DECIMAL, Types.NUMERIC -> pstmt.setBigDecimal(index, new BigDecimal(argument));
+            case Types.DOUBLE, Types.FLOAT -> pstmt.setDouble(index, Double.parseDouble(argument));
+            case Types.CHAR, Types.LONGVARCHAR, Types.VARCHAR -> pstmt.setString(index, argument);
+            case Types.BIT, Types.BOOLEAN -> pstmt.setBoolean(index, Boolean.parseBoolean(argument));
+            case Types.BIGINT -> pstmt.setLong(index, Long.parseLong(argument));
+            case Types.DATE -> pstmt.setDate(index, Date.valueOf(argument));
+            case Types.REAL -> pstmt.setFloat(index, Float.parseFloat(argument));
+            case Types.TINYINT -> pstmt.setByte(index, Byte.parseByte(argument));
+            case Types.SMALLINT -> pstmt.setShort(index, Short.parseShort(argument));
+            case Types.TIMESTAMP -> pstmt.setTimestamp(index, Timestamp.valueOf(argument));
+            case Types.TIME -> pstmt.setTime(index, Time.valueOf(argument));
+            case Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY ->
+                    pstmt.setBytes(index, argument.getBytes(StandardCharsets.UTF_8));
+            case Types.NULL -> pstmt.setNull(index, targetSqlType);
+            default -> pstmt.setObject(index, argument, targetSqlType);
         }
     }
 
@@ -574,7 +538,7 @@ private String getStringFromResultSet(ResultSet rs) throws SQLException, Unsuppo
         // Remove any additional values from previous sample
         for (String varName : varNames) {
             String name = varName.trim();
-            if (name.length() > 0 && jmvars != null) {
+            if (!name.isEmpty() && jmvars != null) {
                 final String varCount = name + "_#"; // $NON-NLS-1$
                 // Get the previous count
                 String prevCount = jmvars.get(varCount);
@@ -605,8 +569,8 @@ private static int processRow(ResultSet rs, ResultSetMetaData meta, StringBuilde
                 }
                 row.put(meta.getColumnLabel(i), o);
             }
-            if (o instanceof byte[]) {
-                o = new String((byte[]) o, ENCODING);
+            if (o instanceof byte[] bytes) {
+                o = new String(bytes, ENCODING);
             }
             sb.append(o);
             if (i==numColumns){
@@ -616,7 +580,7 @@ private static int processRow(ResultSet rs, ResultSetMetaData meta, StringBuilde
             }
             if (i <= varNames.length) { // i starts at 1
                 String name = varNames[i - 1].trim();
-                if (name.length()>0){ // Save the value in the variable if present
+                if (!name.isEmpty()){ // Save the value in the variable if present
                     jmvars.put(name+UNDERSCORE+currentIterationIndex, o == null ? null : o.toString());
                 }
             }
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
index aa95fbf7635..ac4879220bd 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
@@ -48,25 +48,25 @@ protected JDBCTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
                 });
 
         PropertyDescriptor p = property("dataSource"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("queryArguments"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("queryArgumentsTypes"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("variableNames"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("resultSetHandler"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, AbstractJDBCTestElement.RS_STORE_AS_STRING);
-        p.setValue(NOT_OTHER, Boolean.TRUE);
+        p.setValue(NOT_OTHER, true);
         p.setValue(TAGS,new String[]{
                 AbstractJDBCTestElement.RS_STORE_AS_STRING,
                 AbstractJDBCTestElement.RS_STORE_AS_OBJECT,
@@ -74,21 +74,21 @@ protected JDBCTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
                 });
 
         p = property("resultVariable"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
 
         p = property("queryTimeout"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         p = property("resultSetMaxRows"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         p = property("queryType"); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, AbstractJDBCTestElement.SELECT);
-        p.setValue(NOT_OTHER,Boolean.TRUE);
+        p.setValue(NOT_OTHER,true);
         p.setValue(TAGS,new String[]{
                 AbstractJDBCTestElement.SELECT,
                 AbstractJDBCTestElement.UPDATE,
@@ -102,7 +102,7 @@ protected JDBCTestElementBeanInfoSupport(Class<? extends TestBean> beanClass) {
                 });
 
         p = property("query", TypeEditor.TextAreaEditor); // $NON-NLS-1$
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, ""); // $NON-NLS-1$
         p.setValue(TEXT_LANGUAGE, "sql");  // $NON-NLS-1$
 
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 838894a9777..c074c16027f 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -65,11 +65,11 @@ public class DataSourceElement extends AbstractTestElement
     private transient boolean autocommit;
     private transient boolean preinit;
 
-    /*
+    /**
      *  The datasource is set up by testStarted and cleared by testEnded.
      *  These are called from different threads, so access must be synchronized.
      *  The same instance is called in each case.
-    */
+     */
     private transient BasicDataSource dbcpDataSource;
 
     // Keep a record of the pre-thread pools so that they can be disposed of at the end of a test
@@ -204,10 +204,10 @@ public static Connection getConnection(String poolName) throws SQLException{
         }
     }
 
-    /*
+    /*/
      * Set up the DataSource - maxPool is a parameter, so the same code can
      * also be used for setting up the per-thread pools.
-    */
+     */
     private BasicDataSource initPool(String maxPool) {
         BasicDataSource dataSource = new BasicDataSource();
 
@@ -290,7 +290,7 @@ private BasicDataSource initPool(String maxPool) {
         dataSource.setDriverClassName(getDriver());
         dataSource.setUrl(getDbUrl());
 
-        if (_username.length() > 0){
+        if (!_username.isEmpty()){
             dataSource.setUsername(_username);
             dataSource.setPassword(getPassword());
         }
@@ -340,7 +340,7 @@ private class DataSourceComponentImpl {
         /**
          * @return String connection information
          */
-        public String getConnectionInfo() {
+        private String getConnectionInfo() {
             BasicDataSource dsc = getConfiguredDataSource();
             StringBuilder builder = new StringBuilder(100);
             builder.append("shared:").append(sharedDSC != null)
@@ -354,7 +354,7 @@ public String getConnectionInfo() {
          * @return Connection
          * @throws SQLException if database access error occurred
          */
-        public Connection getConnection() throws SQLException {
+        private Connection getConnection() throws SQLException {
             BasicDataSource dsc = getConfiguredDataSource();
             Connection conn=dsc.getConnection();
             int isolation = DataSourceElementBeanInfo.getTransactionIsolationMode(getTransactionIsolation());
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
index f7847a898b1..f628727ec0a 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
@@ -57,62 +57,62 @@ public DataSourceElementBeanInfo() {
         createPropertyGroup("database", new String[] { "dbUrl", "driver", "username", "password", "connectionProperties" });
 
         PropertyDescriptor p = property("dataSource");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("poolMax");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "0");
         p = property("timeout");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "10000");
         p = property("trimInterval");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "60000");
         p = property("autocommit");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, true);
         p = property("transactionIsolation");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "DEFAULT");
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
         Set<String> modesSet = TRANSACTION_ISOLATION_MAP.keySet();
         String[] modes = modesSet.toArray(new String[modesSet.size()]);
         p.setValue(TAGS, modes);
         p = property("poolPreparedStatements");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT_NOT_SAVED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT_NOT_SAVED, true);
         p.setValue(DEFAULT, "-1");
         p = property("preinit");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
         p = property("initQuery", TypeEditor.TextAreaEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("keepAlive");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, true);
         p = property("connectionAge");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "5000");
         p = property("checkQuery", TypeEditor.ComboStringEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p.setValue(TAGS, getListCheckQuery());
         p = property("dbUrl");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("driver", TypeEditor.ComboStringEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p.setValue(TAGS, getListJDBCDriverClass());
         p = property("username");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("password", TypeEditor.PasswordEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("connectionProperties");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
     }
 
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
index 2ae3eddb089..5168e061a31 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
@@ -146,8 +146,8 @@ public static StringBuilder requestHeaders(StringBuilder sb, Message msg){
      */
     public static Destination lookupDestination(Context context, String name) throws NamingException {
         Object o = context.lookup(name);
-        if (o instanceof Destination){
-            return (Destination) o;
+        if (o instanceof Destination destination) {
+            return destination;
         }
         throw new NamingException("Found: "+name+"; expected Destination, but was: "+(o!=null ? o.getClass().getName() : "null"));
     }
@@ -201,14 +201,14 @@ public static Connection getConnection(Context ctx, String factoryName) throws J
         } catch (NoClassDefFoundError e) {
             throw new NamingException("Lookup failed: "+e.toString());
         }
-        if (objfac instanceof javax.jms.ConnectionFactory) {
+        if (objfac instanceof javax.jms.ConnectionFactory connectionFactory) {
             String username = getFromEnvironment(ctx, Context.SECURITY_PRINCIPAL);
             if(username != null) {
                 String password = getFromEnvironment(ctx, Context.SECURITY_CREDENTIALS);
-                return ((javax.jms.ConnectionFactory) objfac).createConnection(username, password);
+                return connectionFactory.createConnection(username, password);
             }
             else {
-                return ((javax.jms.ConnectionFactory) objfac).createConnection();
+                return connectionFactory.createConnection();
             }
         }
         throw new NamingException("Expected javax.jms.ConnectionFactory, found "+(objfac != null ? objfac.getClass().getName(): "null"));
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
index d588fd719be..fad789f7de2 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
@@ -57,7 +57,7 @@ public static Context lookupContext(String initialContextFactory,
             props.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
             props.setProperty(Context.PROVIDER_URL, providerUrl);
             if (useAuth && securityPrincipal != null && securityCredentials != null
-                    && securityPrincipal.length() > 0 && securityCredentials.length() > 0) {
+                    && !securityPrincipal.isEmpty() && !securityCredentials.isEmpty()) {
                 props.setProperty(Context.SECURITY_PRINCIPAL, securityPrincipal);
                 props.setProperty(Context.SECURITY_CREDENTIALS, securityCredentials);
                 log.info("authentication properties set");
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
index f562e01b057..f4f177cce9c 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
@@ -56,7 +56,7 @@ public class ReceiveSubscriber implements Closeable, MessageListener {
 
     private final MessageConsumer subscriber;
 
-    /*
+    /**
      * We use a LinkedBlockingQueue (rather than a ConcurrentLinkedQueue) because it has a
      * poll-with-wait method that avoids the need to use a polling loop.
      */
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
index 773de7b1cc6..b756a8ff698 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
@@ -227,20 +227,20 @@ private static class InnerTableModel extends AbstractTableModel {
         private static final long serialVersionUID = 4638155137475747946L;
         final JMSProperties jmsProperties;
 
-        public InnerTableModel() {
+        private InnerTableModel() {
             jmsProperties = new JMSProperties();
         }
 
-        public void addNewRow() {
+        private void addNewRow() {
             jmsProperties.addJmsProperty(new JMSProperty("","",String.class.getName()));
         }
 
-        public void clearData() {
+        private void clearData() {
             jmsProperties.clear();
             fireTableDataChanged();
         }
 
-        public void removeRow(int row) {
+        private void removeRow(int row) {
             jmsProperties.removeJmsProperty(row);
         }
 
@@ -276,16 +276,12 @@ public int getColumnCount() {
          */
         @Override
         public String getColumnName(int column) {
-            switch(column) {
-                case COL_NAME:
-                    return "name";
-                case COL_VALUE:
-                    return "value";
-                case COL_TYPE:
-                    return "jms_properties_type";
-                default:
-                    return null;
-            }
+            return switch (column) {
+                case COL_NAME -> "name";
+                case COL_VALUE -> "value";
+                case COL_TYPE -> "jms_properties_type";
+                default -> null;
+            };
         }
 
         /**
@@ -295,46 +291,32 @@ public String getColumnName(int column) {
         public Object getValueAt(int row, int column) {
             JMSProperty property = jmsProperties.getJmsProperty(row);
 
-            switch (column){
-                case COL_NAME:
-                    return property.getName();
-                case COL_VALUE:
-                    return property.getValue();
-                case COL_TYPE:
-                    return property.getType();
-                default:
-                    return null;
-            }
+            return switch (column) {
+                case COL_NAME -> property.getName();
+                case COL_VALUE -> property.getValue();
+                case COL_TYPE -> property.getType();
+                default -> null;
+            };
         }
 
         @Override
         public void setValueAt(Object value, int row, int column) {
             JMSProperty property = jmsProperties.getJmsProperty(row);
             log.debug("Setting jms property value: {}", value);
-            switch (column){
-                case COL_NAME:
-                    property.setName((String)value);
-                    break;
-                case COL_VALUE:
-                    property.setValue((String) value);
-                    break;
-                case COL_TYPE:
-                    property.setType((String) value);
-                    break;
-                default:
-                    break;
+            switch (column) {
+                case COL_NAME -> property.setName((String) value);
+                case COL_VALUE -> property.setValue((String) value);
+                case COL_TYPE -> property.setType((String) value);
+                default -> {
+                }
             }
         }
     }
 
     private static class TypeCellEditor extends DefaultCellEditor {
-
-        /**
-         *
-         */
         private static final long serialVersionUID = 1L;
 
-        public TypeCellEditor() {
+        private TypeCellEditor() {
             super(new JComboBox<>(new Object[]{
                     Boolean.class.getName(),
                     Byte.class.getName(),
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
index 8927f6d35e3..b48897fa529 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
@@ -168,20 +168,18 @@ private void transfer(JMSSampler element) {
     @Override
     public void modifyTestElement(TestElement element) {
         super.configureTestElement(element);
-        if (!(element instanceof JMSSampler)) {
+        if (!(element instanceof JMSSampler sampler)) {
             return;
         }
-        JMSSampler sampler = (JMSSampler) element;
         transfer(sampler);
     }
 
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (!(el instanceof JMSSampler)) {
+        if (!(el instanceof JMSSampler sampler)) {
             return;
         }
-        JMSSampler sampler = (JMSSampler) el;
         queueConnectionFactory.setText(sampler.getQueueConnectionFactory());
         sendQueue.setText(sampler.getSendQueue());
         receiveQueue.setText(sampler.getReceiveQueue());
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
index 7bd0e473e7b..cefe77d4991 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
@@ -58,7 +58,7 @@ public abstract class BaseJMSSampler extends AbstractSampler {
 
     private static final String CREDENTIALS = "jms.security_credentials"; // $NON-NLS-1$
 
-    /*
+    /**
      * The number of samples to aggregate
      */
     private static final String ITERATIONS = "jms.iterations"; // $NON-NLS-1$
@@ -67,7 +67,7 @@ public abstract class BaseJMSSampler extends AbstractSampler {
 
     private static final String USE_PROPERTIES_FILE = "jms.jndi_properties"; // $NON-NLS-1$
 
-    /*
+    /**
      * If true, store the response in the sampleResponse
      * (N.B. do not change the value, as it is used in JMX files)
      */
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index f40cd204466..9a8e44088fd 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -634,13 +634,12 @@ public void threadStarted() {
         try {
             context = getInitialContext();
             Object obj = context.lookup(getQueueConnectionFactory());
-            if (!(obj instanceof QueueConnectionFactory)) {
+            if (!(obj instanceof QueueConnectionFactory factory)) {
                 String msg = "QueueConnectionFactory expected, but got "
                         + (obj != null ? obj.getClass().getName() : "null");
                 LOGGER.error(msg);
                 throw new IllegalStateException(msg);
             }
-            QueueConnectionFactory factory = (QueueConnectionFactory) obj;
             sendQueue = (Queue) context.lookup(getSendQueue());
 
             if (!useTemporyQueue()) {
@@ -779,7 +778,7 @@ public String getTimeout() {
 
     public String getExpiration() {
         String expiration = getPropertyAsString(JMS_EXPIRATION);
-        if (expiration.length() == 0) {
+        if (expiration.isEmpty()) {
             return Utils.DEFAULT_NO_EXPIRY;
         } else {
             return expiration;
@@ -788,7 +787,7 @@ public String getExpiration() {
 
     public String getPriority() {
         String priority = getPropertyAsString(JMS_PRIORITY);
-        if (priority.length() == 0) {
+        if (priority.isEmpty()) {
             return Utils.DEFAULT_PRIORITY_4;
         } else {
             return priority;
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
index b551227e9a1..5dea0c1ad38 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
@@ -48,12 +48,12 @@ void setReply(Object reply) {
             this.reply = reply;
         }
 
-        public Object getReply() {
+        private Object getReply() {
             return reply;
         }
 
         @SuppressWarnings("UnusedMethod")
-        public Object getRequest() {
+        private Object getRequest() {
             return request;
         }
 
@@ -69,7 +69,7 @@ public String toString() {
         /**
          * @return the latch
          */
-        public CountDownLatch getLatch() {
+        private CountDownLatch getLatch() {
             return latch;
         }
     }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
index dc02d8cc638..2f44ae58565 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
@@ -279,8 +279,7 @@ private void handleError(SampleResult result, Exception e, boolean checkForRecon
         result.setSuccessful(false);
         result.setResponseMessage(e.toString());
 
-        if (e instanceof JMSException) {
-            JMSException jms = (JMSException) e;
+        if (e instanceof JMSException jms) {
 
             String errorCode = Optional.ofNullable(jms.getErrorCode()).orElse("");
             if (checkForReconnect && publisher != null && getIsReconnectErrorCode().test(errorCode)) {
@@ -299,25 +298,19 @@ private void handleError(SampleResult result, Exception e, boolean checkForRecon
     protected static Cache<Object, Object> buildCache(String configChoice) {
         Caffeine<Object, Object> cacheBuilder = Caffeine.newBuilder();
         switch (configChoice) {
-        case JMSPublisherGui.USE_FILE_RSC:
-            cacheBuilder.maximumSize(1);
-            break;
-        default:
-            cacheBuilder.expireAfterWrite(0, TimeUnit.MILLISECONDS).maximumSize(0);
+            case JMSPublisherGui.USE_FILE_RSC -> cacheBuilder.maximumSize(1);
+            default -> cacheBuilder.expireAfterWrite(0, TimeUnit.MILLISECONDS).maximumSize(0);
         }
         return cacheBuilder.build();
     }
 
     /** Gets file path to use **/
     private String getFilePath(String... ext) {
-        switch (getConfigChoice()) {
-        case JMSPublisherGui.USE_FILE_RSC:
-            return getInputFile();
-        case JMSPublisherGui.USE_RANDOM_RSC:
-            return FSERVER.getRandomFile(getRandomPath(), ext).getAbsolutePath();
-        default:
-            throw new IllegalArgumentException("Type of input not handled:" + getConfigChoice());
-        }
+        return switch (getConfigChoice()) {
+            case JMSPublisherGui.USE_FILE_RSC -> getInputFile();
+            case JMSPublisherGui.USE_RANDOM_RSC -> FSERVER.getRandomFile(getRandomPath(), ext).getAbsolutePath();
+            default -> throw new IllegalArgumentException("Type of input not handled:" + getConfigChoice());
+        };
     }
 
     /**
@@ -457,7 +450,7 @@ public String getTextMessage() {
 
     public String getExpiration() {
         String expiration = getPropertyAsString(JMS_EXPIRATION);
-        if (expiration.length() == 0) {
+        if (expiration.isEmpty()) {
             return Utils.DEFAULT_NO_EXPIRY;
         } else {
             return expiration;
@@ -466,7 +459,7 @@ public String getExpiration() {
 
     public String getPriority() {
         String priority = getPropertyAsString(JMS_PRIORITY);
-        if (priority.length() == 0) {
+        if (priority.isEmpty()) {
             return Utils.DEFAULT_PRIORITY_4;
         } else {
             return priority;
@@ -511,8 +504,8 @@ public JMSProperties getJMSProperties() {
         Object o = getProperty(JMS_PROPERTIES).getObjectValue();
         JMSProperties jmsProperties = null;
         // Backward compatibility with versions <= 2.10
-        if (o instanceof Arguments) {
-            jmsProperties = Utils.convertArgumentsToJmsProperties((Arguments) o);
+        if (o instanceof Arguments arguments) {
+            jmsProperties = Utils.convertArgumentsToJmsProperties(arguments);
         } else {
             jmsProperties = (JMSProperties) o;
         }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
index a740a2bf8fe..37a1b7d2f83 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
@@ -279,20 +279,17 @@ private void extractContent(StringBuilder buffer, StringBuilder propBuffer,
             Message msg, boolean isLast) {
         if (msg != null) {
             try {
-                if (msg instanceof TextMessage){
-                    buffer.append(((TextMessage) msg).getText());
-                } else if (msg instanceof ObjectMessage){
-                    ObjectMessage objectMessage = (ObjectMessage) msg;
+                if (msg instanceof TextMessage textMessage){
+                    buffer.append(textMessage.getText());
+                } else if (msg instanceof ObjectMessage objectMessage){
                     if(objectMessage.getObject() != null) {
                         buffer.append(objectMessage.getObject().getClass());
                     } else {
                         buffer.append("object is null");
                     }
-                } else if (msg instanceof BytesMessage){
-                    BytesMessage bytesMessage = (BytesMessage) msg;
+                } else if (msg instanceof BytesMessage bytesMessage){
                     buffer.append(bytesMessage.getBodyLength() + " bytes received in BytesMessage");
-                } else if (msg instanceof MapMessage){
-                    MapMessage mapm = (MapMessage) msg;
+                } else if (msg instanceof MapMessage mapm){
                     @SuppressWarnings("unchecked") // MapNames are Strings
                     Enumeration<String> enumb = mapm.getMapNames();
                     while(enumb.hasMoreElements()){
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java
index 2ed8be09ce5..992fe71fcd3 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java
@@ -48,12 +48,10 @@ public boolean equals(Object obj) {
         if (obj == this) {
             return true;
         }
-        if (!(obj instanceof FileKey)) {
+        if (!(obj instanceof FileKey that)) {
             return false;
         }
 
-        FileKey that = (FileKey) obj;
-
         return Objects.equals(this.filename, that.filename);
 
     }
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java
index 9777cff8cfc..9d970c874b0 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java
@@ -91,7 +91,7 @@ protected Serializable getInterpretedContent(String filename, final String pEnco
     /** Try to determine encoding based on XML prolog, if none <code>null</code> is returned. **/
     protected String findEncoding(String filename) {
         XMLInputFactory factory = XMLInputFactory.newInstance();
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
         try (FileInputStream input = new FileInputStream(filename)) {
             XMLStreamReader reader = factory.createXMLStreamReader(input);
             return reader.getEncoding();
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
index bba2c621fbc..85dfc9584e3 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
@@ -116,7 +116,7 @@ public void getValueFromFile_inRawMode() throws IOException {
         assertCacheContentInBytes(text);
     }
 
-    private void assertContains(String value, String substring, String message) {
+    private static void assertContains(String value, String substring, String message) {
         assertTrue(value.contains(substring), () -> message + ": " + value + " should contain " + substring);
     }
 
diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
index 3d9ee49ce83..e4b1fd6d610 100644
--- a/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
+++ b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
@@ -48,7 +48,7 @@ public void getValueFromText() {
         assertObject(object, "Doe");
     }
 
-   private void assertObject(Serializable object, String name) {
+   private static void assertObject(Serializable object, String name) {
        assertNotNull(object, "object");
        assertEquals(Person.class, object.getClass(), "object.class");
        Person p = (Person) object;
@@ -99,7 +99,7 @@ public void getValueFromFile_withDefaultEncodingAndProlog() throws IOException {
         assertEquals(content, convertLineEndingsToSystem(firstCachedValue), "cache");
     }
 
-    private String convertLineEndingsToSystem(Object firstCachedValue) {
+    private static String convertLineEndingsToSystem(Object firstCachedValue) {
         return firstCachedValue.toString().replaceAll("[\r\n]+", "\n");
     }
 }
diff --git a/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java b/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
index 62bacb09cd7..70b92c108f9 100644
--- a/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
+++ b/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java
@@ -72,20 +72,14 @@ public void add() {
 
     //should always fail
     @Test(timeout = 1000)
-    public void timeOutFail() {
-        try {
-            TimeUnit.SECONDS.sleep(2);
-        } catch (InterruptedException ignored) {
-        }
+    public void timeOutFail() throws InterruptedException {
+        TimeUnit.SECONDS.sleep(2);
     }
 
     //should not fail
     @Test(timeout = 1000)
-    public void timeOutPass() {
-        try {
-            TimeUnit.MILLISECONDS.sleep(500);
-        } catch (InterruptedException ignored) {
-        }
+    public void timeOutPass() throws InterruptedException {
+        TimeUnit.MILLISECONDS.sleep(500);
     }
 
     @Test
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
index b2dc6e81759..987444c1953 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
@@ -74,7 +74,7 @@ public class JUnitTestSamplerGui extends AbstractSamplerGui
     private static final String ONETIMETEARDOWN = "oneTimeTearDown"; //$NON-NLS-1$
     private static final String SUITE = "suite"; //$NON-NLS-1$
 
-    private static final AtomicBoolean IS_INITILIAZED = new AtomicBoolean(Boolean.FALSE);
+    private static final AtomicBoolean IS_INITILIAZED = new AtomicBoolean(false);
     private static final String[] SPATHS;
 
     static {
@@ -332,32 +332,32 @@ public void configure(TestElement el)
         setupMethods();
         methodName.setSelectedItem(sampler.getMethod());
         constructorLabel.setText(sampler.getConstructorString());
-        if (sampler.getSuccessCode().length() > 0) {
+        if (!sampler.getSuccessCode().isEmpty()) {
             successCode.setText(sampler.getSuccessCode());
         } else {
             successCode.setText(JMeterUtils.getResString("junit_success_default_code")); //$NON-NLS-1$
         }
-        if (sampler.getSuccess().length() > 0) {
+        if (!sampler.getSuccess().isEmpty()) {
             successMsg.setText(sampler.getSuccess());
         } else {
             successMsg.setText(JMeterUtils.getResString("junit_success_default_msg")); //$NON-NLS-1$
         }
-        if (sampler.getFailureCode().length() > 0) {
+        if (!sampler.getFailureCode().isEmpty()) {
             failureCode.setText(sampler.getFailureCode());
         } else {
             failureCode.setText(JMeterUtils.getResString("junit_failure_default_code")); //$NON-NLS-1$
         }
-        if (sampler.getFailure().length() > 0) {
+        if (!sampler.getFailure().isEmpty()) {
             failureMsg.setText(sampler.getFailure());
         } else {
             failureMsg.setText(JMeterUtils.getResString("junit_failure_default_msg")); //$NON-NLS-1$
         }
-        if (sampler.getError().length() > 0) {
+        if (!sampler.getError().isEmpty()) {
             errorMsg.setText(sampler.getError());
         } else {
             errorMsg.setText(JMeterUtils.getResString("junit_error_default_msg")); //$NON-NLS-1$
         }
-        if (sampler.getErrorCode().length() > 0) {
+        if (!sampler.getErrorCode().isEmpty()) {
             errorCode.setText(sampler.getErrorCode());
         } else {
             errorCode.setText(JMeterUtils.getResString("junit_error_default_code")); //$NON-NLS-1$
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
index 14ba70b487f..2b881a2529f 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
@@ -402,8 +402,8 @@ public SampleResult sample(Entry entry) {
                 }
             } catch (InvocationTargetException e) {
                 Throwable cause = e.getCause();
-                if (cause instanceof AssertionFailedError){
-                    tr.addFailure(theClazz, (AssertionFailedError) cause);
+                if (cause instanceof AssertionFailedError assertionFailedError){
+                    tr.addFailure(theClazz, assertionFailedError);
                 } else if (cause instanceof AssertionError) {
                     // Convert JUnit4 failure to Junit3 style
                     AssertionFailedError afe = new AssertionFailedError(cause.toString());
@@ -575,7 +575,7 @@ private static Method getMethodWithAnnotation(Object clazz, Class<? extends Anno
         return null;
     }
 
-    /*
+    /**
      * Wrapper to convert a JUnit4 class into a TestCase
      *
      *  TODO - work out how to convert JUnit4 assertions so they are treated as failures rather than errors
@@ -584,7 +584,7 @@ private class AnnotatedTestCase extends TestCase {
         private final Method method;
         private final Class<? extends Throwable> expectedException;
         private final long timeout;
-        public AnnotatedTestCase(Method method, Class<? extends Throwable> expectedException2, long timeout) {
+        private AnnotatedTestCase(Method method, Class<? extends Throwable> expectedException2, long timeout) {
             this.method = method;
             this.expectedException = expectedException2;
             this.timeout = timeout;
@@ -654,7 +654,7 @@ public void threadStarted() {
      */
     private void initializeTestObject() {
         String rlabel = getConstructorString();
-        if (rlabel.length()== 0) {
+        if (rlabel.isEmpty()) {
             rlabel = JUnitSampler.class.getName();
         }
         this.testObject = getClassInstance(className, rlabel);
@@ -679,11 +679,9 @@ private void initializeTestObject() {
                     try {
                         m.invoke(theClazz, new Object[0]);
                     } catch (InvocationTargetException e) {
-                        /*
-                         * Calling a method via reflection results in wrapping any
-                         * Exceptions in ITE; unwrap these here so runProtected can
-                         * allocate them correctly.
-                         */
+                        // Calling a method via reflection results in wrapping any
+                        // Exceptions in ITE; unwrap these here so runProtected can
+                        // allocate them correctly.
                         Throwable t = e.getCause();
                         if (t != null) {
                             throw t;
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
index 0315e958674..21eca11bd97 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
@@ -129,8 +129,7 @@ public TestElement createTestElement() {
     @Override
     public void modifyTestElement(TestElement args) {
         GuiUtils.stopTableEditing(table);
-        if (args instanceof LDAPArguments) {
-            LDAPArguments arguments = (LDAPArguments) args;
+        if (args instanceof LDAPArguments arguments) {
             arguments.clear();
             @SuppressWarnings("unchecked") // Only contains LDAPArgument entries
             Iterator<LDAPArgument> modelData = (Iterator<LDAPArgument>) tableModel.iterator();
@@ -155,9 +154,9 @@ public void modifyTestElement(TestElement args) {
     @Override
     public void configure(TestElement el) {
         super.configure(el);
-        if (el instanceof LDAPArguments) {
+        if (el instanceof LDAPArguments ldapArguments) {
             tableModel.clearData();
-            PropertyIterator iter = ((LDAPArguments) el).iterator();
+            PropertyIterator iter = ldapArguments.iterator();
             while (iter.hasNext()) {
                 LDAPArgument arg = (LDAPArgument) iter.next().getObjectValue();
                 tableModel.addRow(arg);
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
index 5e0640309ff..826e7cf20b6 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
@@ -74,7 +74,7 @@ public class LdapExtConfigGui extends AbstractConfigGui implements ItemListener
 
     private final JTextField port = new JTextField(20);
 
-    /*
+    /**
      * N.B. These entry indexes MUST agree with the SearchControls SCOPE_LEVELS, i.e.
      *
      * javax.naming.directory.SearchControls.OBJECT_SCOPE, ONELEVEL_SCOPE, SUBTREE_SCOPE
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
index ace5e651a4f..8d02ea05d55 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
@@ -535,7 +535,7 @@ private ModificationItem[] getUserModAttributes() {
         while (iter.hasNext()) {
             BasicAttribute attr;
             LDAPArgument item = (LDAPArgument) iter.next().getObjectValue();
-            if (item.getValue().length() == 0) {
+            if (item.getValue().isEmpty()) {
                 attr = new BasicAttribute(item.getName());
             } else {
                 attr = getBasicAttribute(item.getName(), item.getValue());
@@ -567,7 +567,7 @@ private static String[] getRequestAttributes(String reqAttr) {
         int index;
         String[] mods;
         int count = 0;
-        if (reqAttr.length() == 0) {
+        if (reqAttr.isEmpty()) {
             return null; // NOSONAR null means all , empty array means nothing
         }
         if (!reqAttr.endsWith(SEMI_COLON)) {
@@ -575,7 +575,7 @@ private static String[] getRequestAttributes(String reqAttr) {
         }
         String attr = reqAttr;
 
-        while (attr.length() > 0) {
+        while (!attr.isEmpty()) {
             index = attr.indexOf(SEMI_COLON);
             count += 1;
             attr = attr.substring(index + 1);
@@ -584,7 +584,7 @@ private static String[] getRequestAttributes(String reqAttr) {
             mods = new String[count];
             attr = reqAttr;
             count = 0;
-            while (attr.length() > 0) {
+            while (!attr.isEmpty()) {
                 index = attr.indexOf(SEMI_COLON);
                 mods[count] = attr.substring(0, index);
                 count += 1;
@@ -873,7 +873,7 @@ scope, getCountlimAsLong(),
         return res;
     }
 
-    /*
+    /**
      *   Write out search results in a stable order (including order of all subelements which might
      * be reordered like attributes and their values) so that simple textual comparison can be done,
      * unless the number of results exceeds {@link #MAX_SORTED_RESULTS} in which case just stream
@@ -965,7 +965,7 @@ private static void sortAttributes(final List<? extends Attribute> sortedAttrs)
 
     private static void sortResults(final List<? extends SearchResult> sortedResults) {
         sortedResults.sort(new Comparator<SearchResult>() {
-            private int compareToReverse(final String s1, final String s2) {
+            private static int compareToReverse(final String s1, final String s2) {
                 int len1 = s1.length();
                 int len2 = s2.length();
                 int s1i = len1 - 1;
@@ -1003,13 +1003,13 @@ private static String normaliseSearchDN(final SearchResult sr, final String sear
         String srName = sr.getName();
 
         if (!srName.endsWith(searchBase)) {
-            if (srName.length() > 0) {
+            if (!srName.isEmpty()) {
                 srName = srName + ',';
             }
             srName = srName + searchBase;
         }
-        if ((rootDn.length() > 0) && !srName.endsWith(rootDn)) {
-            if (srName.length() > 0) {
+        if (!rootDn.isEmpty() && !srName.endsWith(rootDn)) {
+            if (!srName.isEmpty()) {
                 srName = srName + ',';
             }
             srName = srName + rootDn;
@@ -1019,12 +1019,12 @@ private static String normaliseSearchDN(final SearchResult sr, final String sear
     }
 
     private static String getWriteValue(final Object value) {
-        if (value instanceof String) {
+        if (value instanceof String s) {
             // assume it's sensitive data
-            return StringEscapeUtils.escapeXml10((String)value);
+            return StringEscapeUtils.escapeXml10(s);
         }
-        if (value instanceof byte[]) {
-            return StringEscapeUtils.escapeXml10(new String((byte[])value, StandardCharsets.UTF_8));
+        if (value instanceof byte[] bytes) {
+            return StringEscapeUtils.escapeXml10(new String(bytes, StandardCharsets.UTF_8));
         }
         return StringEscapeUtils.escapeXml10(value.toString());
     }
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
index a24b276e3b4..f8b196719da 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
@@ -99,7 +99,7 @@ public static DirContext connect(String host,
             sb.append("ldap://"); // $NON-NLS-1$
         }
         sb.append(host);
-        if (port.length()>0){
+        if (!port.isEmpty()){
             sb.append(":"); // $NON-NLS-1$
             sb.append(port);
         }
@@ -109,7 +109,7 @@ public static DirContext connect(String host,
         if(log.isInfoEnabled()) {
             log.info("prov_url= {}", env.get(Context.PROVIDER_URL)); // $NON-NLS-1$
         }
-        if (connTimeOut.length()> 0) {
+        if (!connTimeOut.isEmpty()) {
             env.put("com.sun.jndi.ldap.connect.timeout", connTimeOut); // $NON-NLS-1$
         }
         env.put(Context.REFERRAL, "throw"); // $NON-NLS-1$
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
index 7056d962818..20448236a0f 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
@@ -151,9 +151,7 @@ public SampleResult sample(Entry e) {
         String samplerString = toString();
         parent.setSamplerData(samplerString);
 
-        /*
-         * Perform the sampling
-         */
+        // Perform the sampling
         parent.sampleStart(); // Start timing
         try {
             // Create empty properties
@@ -353,10 +351,10 @@ private static void appendMessageData(SampleResult child, Message message)
 
         cdata.append(NEW_LINE);
         Object content = message.getContent();
-        if (content instanceof MimeMultipart) {
-            appendMultiPart(child, cdata, (MimeMultipart) content);
-        } else if (content instanceof InputStream){
-            child.setResponseData(IOUtils.toByteArray((InputStream) content));
+        if (content instanceof MimeMultipart mimeMultipart) {
+            appendMultiPart(child, cdata, mimeMultipart);
+        } else if (content instanceof InputStream inputStream){
+            child.setResponseData(IOUtils.toByteArray(inputStream));
         } else {
             cdata.append(content);
             child.setResponseData(cdata.toString(),child.getDataEncodingNoDefault());
@@ -381,10 +379,10 @@ private static void appendMultiPart(SampleResult child, StringBuilder cdata,
             sr.setDataEncoding(RFC_822_DEFAULT_ENCODING);
             sr.setEncodingAndType(contentType);
             sr.sampleStart();
-            if (bodyPartContent instanceof InputStream){
-                sr.setResponseData(IOUtils.toByteArray((InputStream) bodyPartContent));
-            } else if (bodyPartContent instanceof MimeMultipart){
-                appendMultiPart(sr, cdata, (MimeMultipart) bodyPartContent);
+            if (bodyPartContent instanceof InputStream inputStream){
+                sr.setResponseData(IOUtils.toByteArray(inputStream));
+            } else if (bodyPartContent instanceof MimeMultipart mimeMultipart){
+                appendMultiPart(sr, cdata, mimeMultipart);
             } else {
                 sr.setResponseData(bodyPartContent.toString(),sr.getDataEncodingNoDefault());
             }
@@ -562,7 +560,7 @@ public String toString(){
         sb.append(getServerType());
         sb.append("://");
         String name = getUserName();
-        if (name.length() > 0){
+        if (!name.isEmpty()){
             sb.append(name);
             sb.append("@");
         }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
index fbffafaff97..032b9034746 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
@@ -178,7 +178,7 @@ public void modifyTestElement(TestElement te) {
         securitySettingsPanel.modifyTestElement(te);
     }
 
-    /*
+    /**
      * Helper method to set up the GUI screen
      */
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index d896a5d5261..6bb7c9f1992 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -303,8 +303,7 @@ private static String getRequestHeaders(Message message) throws MessagingExcepti
     private static String getSamplerData(Message message) throws MessagingException, IOException {
         StringBuilder sb = new StringBuilder();
         Object content = message.getContent(); // throws ME
-        if (content instanceof Multipart) {
-            Multipart multipart = (Multipart) content;
+        if (content instanceof Multipart multipart) {
             String contentType = multipart.getContentType();
             ContentType ct = new ContentType(contentType);
             String boundary = ct.getParameter("boundary");
@@ -319,8 +318,7 @@ private static String getSamplerData(Message message) throws MessagingException,
             sb.append(boundary);
             sb.append("--");
             sb.append("\n");
-        } else if (content instanceof BodyPart) {
-            BodyPart bodyPart = (BodyPart) content;
+        } else if (content instanceof BodyPart bodyPart) {
             writeBodyPart(sb, bodyPart); // throws IOE, ME
         } else if (content instanceof String) {
             sb.append(content);
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
index e4d867fbfda..9f3eb25c93d 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
@@ -580,9 +580,7 @@ private void initComponents() {
         gridBagConstraints.anchor = GridBagConstraints.WEST;
         gridBagConstraints.weightx = 0.5;
 
-        /*
-         * Server Settings
-         */
+        // Server Settings
         JPanel panelServerSettings = new VerticalPanel();
         panelServerSettings.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("smtp_server_settings"))); // $NON-NLS-1$
@@ -620,9 +618,7 @@ private void initComponents() {
         gridBagConstraintsMain.gridy = 0;
         add(panelServerConfig, gridBagConstraintsMain);
 
-        /*
-         * E-Mail Settings
-         */
+        // E-Mail Settings
         JPanel panelMailSettings = new JPanel(new GridBagLayout());
         panelMailSettings.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("smtp_mail_settings"))); // $NON-NLS-1$
@@ -714,18 +710,13 @@ private void initComponents() {
         gridBagConstraintsMain.gridy = 2;
         add(panelAuthSettings, gridBagConstraintsMain);
 
-        /*
-         * Security Settings
-         */
+        // Security Settings
         securitySettingsPanel = new SecuritySettingsPanel();
 
         gridBagConstraintsMain.gridx = 0;
         gridBagConstraintsMain.gridy = 3;
         add(securitySettingsPanel, gridBagConstraintsMain);
 
-        /*
-         * (non-Javadoc) Message Settings
-         */
         JPanel panelMessageSettings = new JPanel(new GridBagLayout());
         panelMessageSettings.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("smtp_message_settings"))); // $NON-NLS-1$
@@ -843,9 +834,7 @@ private void initComponents() {
         gridBagConstraintsMain.gridy = 6;
         add(panelMessageSettings, gridBagConstraintsMain);
 
-        /*
-         * Additional Settings
-         */
+        // Additional Settings
         JPanel panelAdditionalSettings = new JPanel(new GridBagLayout());
         panelAdditionalSettings.setBorder(BorderFactory.createTitledBorder(
                 JMeterUtils.getResString("smtp_additional_settings"))); // $NON-NLS-1$
@@ -890,7 +879,7 @@ private void attachmentFolderFileChooserActionPerformed(ActionEvent evt) { // NO
             return;
         }
         final String attachments = tfAttachment.getText().trim();
-        if (attachments.length() > 0) {
+        if (!attachments.isEmpty()) {
             tfAttachment.setText(attachments
                             + SmtpSampler.FILENAME_SEPARATOR
                             + chosen.getAbsolutePath());
@@ -1042,7 +1031,7 @@ public void setSecuritySettingsPanel(SecuritySettingsPanel securitySettingsPanel
 
     private void removeHeaderActionPerformed(ActionEvent evt){ // NOSONAR This method is used through lambda
         final Object source = evt.getSource();
-        if(source instanceof JButton){
+        if(source instanceof JButton jButton){
             if(headerFields.size() == 1){
                 headerFieldName.setVisible(false);
                 headerFieldValue.setVisible(false);
@@ -1053,7 +1042,7 @@ private void removeHeaderActionPerformed(ActionEvent evt){ // NOSONAR This metho
 
             headerFieldsPanel.remove(nameTF);
             headerFieldsPanel.remove(valueTF);
-            headerFieldsPanel.remove((JButton)source);
+            headerFieldsPanel.remove(jButton);
             validate();
         }
     }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
index 412f02c89e9..41f37b77639 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
@@ -83,8 +83,8 @@ public void configure(TestElement element) {
         smtpPanel.setSuppressSubject(element.getPropertyAsBoolean(SmtpSampler.SUPPRESS_SUBJECT));
         smtpPanel.setIncludeTimestamp(element.getPropertyAsBoolean(SmtpSampler.INCLUDE_TIMESTAMP));
         JMeterProperty headers = element.getProperty(SmtpSampler.HEADER_FIELDS);
-        if (headers instanceof CollectionProperty) { // Might be NullProperty
-            smtpPanel.setHeaderFields((CollectionProperty)headers);
+        if (headers instanceof CollectionProperty jMeterProperties) { // Might be NullProperty
+            smtpPanel.setHeaderFields(jMeterProperties);
         } else {
             smtpPanel.setHeaderFields(new CollectionProperty());
         }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
index f19bbd3eb93..7c00f4fae2f 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
@@ -66,7 +66,7 @@ public class SendMailCommand {
 
     // Use the actual class so the name must be correct.
     private static final String TRUST_ALL_SOCKET_FACTORY = TrustAllSSLSocketFactory.class.getName();
-    private static final String FALSE = Boolean.FALSE.toString();
+    private static final String FALSE = "false";
 
     private boolean useSSL = false;
     private boolean useStartTLS = false;
@@ -182,7 +182,7 @@ private Message buildMessage() throws MessagingException, IOException {
             Multipart multipart = new MimeMultipart();
             final int attachmentCount = attachments.size();
             if (plainBody &&
-               (attachmentCount == 0 ||  (mailBody.length() == 0 && attachmentCount == 1))) {
+               (attachmentCount == 0 ||  (mailBody.isEmpty() && attachmentCount == 1))) {
                 if (attachmentCount == 1) { // i.e. mailBody is empty
                     File first = attachments.get(0);
                     try (FileInputStream fis = new FileInputStream(first);
@@ -758,7 +758,7 @@ private String getProtocol() {
      */
     private String getPort() {
         String port = smtpPort.trim();
-        if (port.length() > 0) { // OK, it has been supplied
+        if (!port.isEmpty()) { // OK, it has been supplied
             return port;
         }
         if (useSSL){
@@ -785,7 +785,7 @@ public void setTimeOut(String timeOut) {
      */
     public String getTimeout() {
         String timeout = timeOut.trim();
-        if (timeout.length() > 0) { // OK, it has been supplied
+        if (!timeout.isEmpty()) { // OK, it has been supplied
             return timeout;
         }
         return "0"; // Default is infinite timeout (value 0).
@@ -806,7 +806,7 @@ public void setConnectionTimeOut(String connectionTimeOut) {
      */
     public String getConnectionTimeout() {
         String connectionTimeout = connectionTimeOut.trim();
-        if (connectionTimeout.length() > 0) { // OK, it has been supplied
+        if (!connectionTimeout.isEmpty()) { // OK, it has been supplied
             return connectionTimeout;
         }
         return "0"; // Default is infinite timeout (value 0).
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
index c1bc55d1c9b..448b8c32162 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
@@ -89,8 +89,8 @@ public static MongoDB getMongoDB(String source) {
         if(mongoSource == null) {
             throw new IllegalStateException("mongoSource is null");
         } else {
-            if(mongoSource instanceof MongoDB) {
-                return (MongoDB)mongoSource;
+            if(mongoSource instanceof MongoDB mongoDB) {
+                return mongoDB;
             } else {
                 throw new IllegalStateException("Variable:"+ source +" is not a MongoDB instance, class:"+mongoSource.getClass());
             }
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
index 26069b29719..3da5ce1ae94 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
@@ -57,55 +57,55 @@ public MongoSourceElementBeanInfo() {
                 "continueOnInsertError"});
 
         PropertyDescriptor p = property("connection");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("source");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         p = property("autoConnectRetry");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
         p = property("connectionsPerHost");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 10);
         p = property("connectTimeout");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
         p = property("threadsAllowedToBlockForConnectionMultiplier");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 5);
         p = property("maxAutoConnectRetryTime");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0L);
         p = property("maxWaitTime");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 120000);
         p = property("socketTimeout");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
         p = property("socketKeepAlive");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
 
         p = property("fsync");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
         p = property("safe");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
         p = property("waitForJournaling");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
         p = property("writeOperationNumberOfServers");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
         p = property("writeOperationTimeout");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0);
         p = property("continueOnInsertError");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, true);
+        p.setValue(DEFAULT, false);
 
         if(log.isDebugEnabled()) {
             for (PropertyDescriptor pd : getPropertyDescriptors()) {
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
index 352b90b2bdc..c7df00859db 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
@@ -30,17 +30,17 @@ public String handle(Object o) {
             return "ok";
         }
 
-        if(o instanceof Double) {
-            return this.handle((Double)o);
+        if(o instanceof Double v) {
+            return this.handle(v);
         }
-        else if(o instanceof Integer) {
-            return this.handle((Integer)o);
+        else if(o instanceof Integer i) {
+            return this.handle(i);
         }
-        else if(o instanceof String) {
-            return this.handle((String)o);
+        else if(o instanceof String s) {
+            return this.handle(s);
         }
-        else if(o instanceof DBObject) {
-            return this.handle((DBObject)o);
+        else if(o instanceof DBObject dbObject) {
+            return this.handle(dbObject);
         }
         else {
             return "return type not handled";
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
index be355628f97..7cde4d0f71c 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
@@ -132,9 +132,6 @@ public void setSource(String source) {
         setProperty(SOURCE, source);
     }
 
-    /*
-    * Helper
-    */
     private void trace(String s) {
         if(log.isDebugEnabled()) {
             log.debug(Thread.currentThread().getName() + " (" + getTitle() + " " + s + " " + this.toString());
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
index 6001f1e86f1..00891bd5cce 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
@@ -45,22 +45,22 @@ public MongoScriptSamplerBeanInfo() {
                 "script"});
 
         PropertyDescriptor p = property("database");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("username");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("password", TypeEditor.PasswordEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
         p = property("source");
-        p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+        p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, "");
 
         p = property("script", TypeEditor.TextAreaEditor);
-        p.setValue(NOT_UNDEFINED, Boolean.FALSE);
+        p.setValue(NOT_UNDEFINED, false);
         p.setValue(DEFAULT, "");
-        p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+        p.setValue(NOT_EXPRESSION, true);
         p.setValue(TEXT_LANGUAGE, "javascript");  // $NON-NLS-1$
 
         if(log.isDebugEnabled()) {
diff --git a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
index 3822400e22f..82aa2622be8 100644
--- a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
+++ b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
@@ -111,7 +111,7 @@ public class TCPSampler extends AbstractSampler implements ThreadListener, Inter
         boolean hsp = false;
         log.debug("Status prefix={}, suffix={}, properties={}",
                 STATUS_PREFIX, STATUS_SUFFIX, STATUS_PROPERTIES); //$NON-NLS-1$
-        if (STATUS_PROPERTIES.length() > 0) {
+        if (!STATUS_PROPERTIES.isEmpty()) {
             File f = new File(STATUS_PROPERTIES);
             try (FileInputStream fis = new FileInputStream(f)){
                 STATUS_PROPS.load(fis);
@@ -161,7 +161,7 @@ private Socket getSocket(String socketKey) {
                 closeSocket(socketKey); // Bug 44910 - close previous socket (if any)
                 SocketAddress sockaddr = new InetSocketAddress(getServer(), getPort());
                 con = new Socket(); // NOSONAR socket is either cache in ThreadLocal for reuse and closed at end of thread or closed here
-                if (getPropertyAsString(SO_LINGER,"").length() > 0){
+                if (!getPropertyAsString(SO_LINGER, "").isEmpty()){
                     con.setSoLinger(true, getSoLinger());
                 }
                 con.connect(sockaddr, getConnectTimeout());
@@ -334,7 +334,7 @@ private TCPClient getProtocol() {
         }
         try {
             tcpClient = (TCPClient) javaClass.getDeclaredConstructor().newInstance();
-            if (getPropertyAsString(EOL_BYTE, "").length()>0){
+            if (!getPropertyAsString(EOL_BYTE, "").isEmpty()){
                 tcpClient.setEolByte(getEolByte());
                 log.info("Using eolByte={}", getEolByte());
             }
@@ -445,7 +445,7 @@ private static boolean setupSampleResult(SampleResult sampleResult,
         }
         boolean isSuccessful = exception == null;
         // Reset the status code if the message contains one
-        if (StringUtilities.isNotEmpty(readResponse) && STATUS_PREFIX.length() > 0) {
+        if (StringUtilities.isNotEmpty(readResponse) && !STATUS_PREFIX.isEmpty()) {
             int i = readResponse.indexOf(STATUS_PREFIX);
             int j = readResponse.indexOf(STATUS_SUFFIX, i + STATUS_PREFIX.length());
             if (i != -1 && j > i) {
diff --git a/xdocs/extending/notes_on_extending.txt b/xdocs/extending/notes_on_extending.txt
index bafc7717ecf..827fe6eae96 100644
--- a/xdocs/extending/notes_on_extending.txt
+++ b/xdocs/extending/notes_on_extending.txt
@@ -81,13 +81,13 @@ ConfigTestElement, and implement LoopIterationListener.
        properties we want these to be:
 
                p = property("filename");
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+            p.setValue(NOT_UNDEFINED, true);
             p.setValue(DEFAULT, "");
-            p.setValue(NOT_EXPRESSION,Boolean.TRUE);
+            p.setValue(NOT_EXPRESSION,true);
             p = property("variableNames");
-            p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+            p.setValue(NOT_UNDEFINED, true);
             p.setValue(DEFAULT, "");
-            p.setValue(NOT_EXPRESSION,Boolean.TRUE);
+            p.setValue(NOT_EXPRESSION,true);
 
        This essentially creates two properties whose value is not allowed to be null, and whose default
        values are "".  There are several such attributes that can be set for each property.  Here is a
@@ -119,4 +119,4 @@ ConfigTestElement, and implement LoopIterationListener.
            variableNames.displayName - a label for the variable name input element.
            variableNames.shortDescription - tool tip for the variableNames input element.
 
-8. Debug your component.
\ No newline at end of file
+8. Debug your component.
diff --git a/xdocs/usermanual/jmeter_tutorial.xml b/xdocs/usermanual/jmeter_tutorial.xml
index 814cf3004a0..fe330041172 100644
--- a/xdocs/usermanual/jmeter_tutorial.xml
+++ b/xdocs/usermanual/jmeter_tutorial.xml
@@ -854,14 +854,14 @@ createPropertyGroup("csv_data",
         Then, we need to define what kind of properties we want these to be:
 <source>
 p = property("filename");
-p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+p.setValue(NOT_UNDEFINED, true);
 p.setValue(DEFAULT, "");
-p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+p.setValue(NOT_EXPRESSION, true);
 
 p = property("variableNames");
-p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+p.setValue(NOT_UNDEFINED, true);
 p.setValue(DEFAULT, "");
-p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+p.setValue(NOT_EXPRESSION, true);
 </source>
         This essentially creates two properties whose value is not allowed to be <code>null</code>, and
         whose default values are <code>""</code>. There are several such attributes that can be set for each

From 0a30ab9d4a6a5289611b5e4464dcc25bf6f3fb5f Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 12:57:35 +0300
Subject: [PATCH 0919/1037] chore: bump org.hamcrest to 3.0

JMeter does not use hamcreset, however, ApacheJMeter_junit still uses junit4
which brings hamcrest as a transitive dependency.
---
 src/bom-testing/build.gradle.kts            |  6 ++---
 src/bom-thirdparty/build.gradle.kts         |  6 ++---
 src/dist/src/dist/expected_release_jars.csv |  4 +--
 src/licenses/build.gradle.kts               |  8 ------
 src/licenses/licenses/hamcrest/LICENSE      | 27 ---------------------
 5 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 src/licenses/licenses/hamcrest/LICENSE

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 7100ba77575..4b32cc4a8b5 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -50,9 +50,9 @@ dependencies {
         api("org.apache.ftpserver:ftplet-api:1.2.0")
         api("org.apache.ftpserver:ftpserver-core:1.2.0")
         api("org.apache.mina:mina-core:2.2.4")
-        api("org.hamcrest:hamcrest-core:2.2")
-        api("org.hamcrest:hamcrest-library:2.2")
-        api("org.hamcrest:hamcrest:2.2")
+        api("org.hamcrest:hamcrest-core:3.0")
+        api("org.hamcrest:hamcrest-library:3.0")
+        api("org.hamcrest:hamcrest:3.0")
         api("org.hsqldb:hsqldb:2.7.2")
         api("org.objenesis:objenesis:3.4")
         api("org.openjdk.jmh:jmh-core:1.37")
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4f607fa2d52..1b7f5d69403 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -75,13 +75,13 @@ dependencies {
             because("ApacheJMeter_junit depends on junit4")
         }
         api("org.checkerframework:checker-qual:3.51.1")
-        api("org.hamcrest:hamcrest-core:2.2") {
+        api("org.hamcrest:hamcrest-core:3.0") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.hamcrest:hamcrest-library:2.2") {
+        api("org.hamcrest:hamcrest-library:3.0") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.hamcrest:hamcrest:2.2") {
+        api("org.hamcrest:hamcrest:3.0") {
             because("ApacheJMeter_junit depends on junit4")
         }
         api("net.minidev:accessors-smart:2.6.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index c91bb851480..50bebde88f7 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -67,8 +67,8 @@
 86636,groovy-sql-5.0.2.jar
 98394,groovy-templates-5.0.2.jar
 223993,groovy-xml-5.0.2.jar
-123360,hamcrest-2.2.jar
-1499,hamcrest-core-2.2.jar
+126373,hamcrest-3.0.jar
+2403,hamcrest-core-3.0.jar
 181512,httpasyncclient-4.1.5.jar
 785639,httpclient-4.5.14.jar
 327891,httpcore-4.4.16.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index cad6668c4dd..7582d3f95b3 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -149,14 +149,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
         expectedLicense = SpdxLicense.Apache_2_0 and SpdxLicense.SAX_PD and SimpleLicense("The W3C License", uri("http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip"))
         effectiveLicense = SpdxLicense.Apache_2_0
     }
-    for (lib in listOf("hamcrest-core", "hamcrest")) {
-        overrideLicense("org.hamcrest:$lib:2.2") {
-            // https://github.com/hamcrest/JavaHamcrest/issues/264
-            // pom.xml lists "New BSD License", however it is BSD_3
-            expectedLicense = SpdxLicense.BSD_3_Clause
-            licenseFiles = "hamcrest"
-        }
-    }
     overrideLicense("net.sf.jtidy:jtidy:r938") {
         expectedLicense = SimpleLicense("Java HTML Tidy License", uri("http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95"))
         effectiveLicense = SpdxLicense.BSD_3_Clause
diff --git a/src/licenses/licenses/hamcrest/LICENSE b/src/licenses/licenses/hamcrest/LICENSE
deleted file mode 100644
index 4933bda5bac..00000000000
--- a/src/licenses/licenses/hamcrest/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-BSD License
-
-Copyright (c) 2000-2015 www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.

From d0334fdc4de45fda65a136ceb1afd30feb50d3f1 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:12:25 +0300
Subject: [PATCH 0920/1037] chore: bump xerces:xercesImpl to 2.12.2 for the
 buildscript dependencies

---
 build-logic/root-build/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 3262ff0e54c..6e74cadf0bb 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     constraints {
-        api("xerces:xercesImpl:2.12.1") {
+        api("xerces:xercesImpl:2.12.2") {
             because("Some of the plugins might depend on an older version, and we want using a more recent one")
         }
     }

From dfe7df7c7f13a50efe8bd64a442eccc5765b315a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:40:47 +0300
Subject: [PATCH 0921/1037] chore: bump rsyntaxtextarea to 3.6.0

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1b7f5d69403..1714b4aaffb 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fifesoft:rsyntaxtextarea:3.3.4")
+        api("com.fifesoft:rsyntaxtextarea:3.6.0")
         api("com.github.ben-manes.caffeine:caffeine:2.9.3")
         api("com.github.weisj:darklaf-core:3.1.1")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 50bebde88f7..7ccd045eadd 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -134,7 +134,7 @@
 1482543,plot-stem-jvm-4.7.3.jar
 11640,reactive-streams-1.0.4.jar
 1383644,rhino-1.7.14.jar
-1297525,rsyntaxtextarea-3.3.4.jar
+1330192,rsyntaxtextarea-3.6.0.jar
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 69908,slf4j-api-2.0.17.jar

From ccf32c10e090a31e959178ec3a09572d9f82a91a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:47:40 +0300
Subject: [PATCH 0922/1037] chore: bump org.hsqldb:hsqldb to 2.7.4

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 4b32cc4a8b5..1fd3987ccba 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
         api("org.hamcrest:hamcrest-core:3.0")
         api("org.hamcrest:hamcrest-library:3.0")
         api("org.hamcrest:hamcrest:3.0")
-        api("org.hsqldb:hsqldb:2.7.2")
+        api("org.hsqldb:hsqldb:2.7.4")
         api("org.objenesis:objenesis:3.4")
         api("org.openjdk.jmh:jmh-core:1.37")
         api("org.openjdk.jmh:jmh-generator-annprocess:1.37")

From 5ffa04cf3a693d3513ae1460e50f5d4680d75e28 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:48:45 +0300
Subject: [PATCH 0923/1037] chore: bump org.neo4j.driver:neo4j-java-driver to
 4.4.21

---
 gradle/verification-metadata.xml            | 5 +++++
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5f5cc7c2b42..661fcd9c44b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -823,6 +823,11 @@
             <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.testcontainers" name="testcontainers-bom" version="1.21.3">
+         <artifact name="testcontainers-bom-1.21.3.pom">
+            <sha256 value="2ce717226d1d67b5b1df9707ed98022a366ac892d9e496c5f0173f1ab78a0965" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="oro" name="oro" version="2.0.8">
          <artifact name="oro-2.0.8.jar">
             <sha256 value="e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 1714b4aaffb..02daf753ff8 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -132,7 +132,7 @@ dependencies {
         api("org.jsoup:jsoup:1.21.2")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")
-        api("org.neo4j.driver:neo4j-java-driver:4.4.13")
+        api("org.neo4j.driver:neo4j-java-driver:4.4.21")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 7ccd045eadd..28677e21289 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -112,7 +112,7 @@
 22576,miglayout-swing-5.3.jar
 613352,mongo-java-driver-2.14.3.jar
 29680,mxparser-1.2.2.jar
-5223562,neo4j-java-driver-4.4.13.jar
+5404219,neo4j-java-driver-4.4.21.jar
 65261,oro-2.0.8.jar
 41831,ph-annotations-12.0.4.jar
 508951,ph-base-12.0.4.jar

From 2e1b257c4388732937f37a2ca74d7fde40ebce72 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:49:28 +0300
Subject: [PATCH 0924/1037] chore: bump org.freemarker:freemarker to 2.3.34

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 02daf753ff8..0e198787903 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -120,7 +120,7 @@ dependencies {
         api("org.bouncycastle:bcpkix-jdk18on:1.82")
         api("org.bouncycastle:bcprov-jdk18on:1.82")
         api("org.brotli:dec:0.1.2")
-        api("org.freemarker:freemarker:2.3.32")
+        api("org.freemarker:freemarker:2.3.34")
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.7.3")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.11.2")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 28677e21289..575bb64470b 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -56,7 +56,7 @@
 98115,dec-0.1.2.jar
 588267,dnsjava-3.6.3.jar
 20390,error_prone_annotations-2.43.0.jar
-1736381,freemarker-2.3.32.jar
+1886604,freemarker-2.3.34.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8057697,groovy-5.0.2.jar
 20224,groovy-datetime-5.0.2.jar

From f9c68ecfe5690b2196c16bb662b204d92fcdbfef Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:50:29 +0300
Subject: [PATCH 0925/1037] chore: bump
 com.gradle.common-custom-user-data-gradle-plugin to 2.4.0

---
 gradle/verification-metadata.xml | 5 +++++
 settings.gradle.kts              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 661fcd9c44b..9a44627ea23 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -411,6 +411,11 @@
             <sha256 value="f6111fd512eabacff117c7a46d730033c6f7eb78cc05ce73fe97cb195cf330f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.4.0">
+         <artifact name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin-2.4.0.pom">
+            <sha256 value="db08ceb605f60635df767981e8a407a016d70e332619a6222b948ffce45ae99c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.gradle.develocity" name="com.gradle.develocity.gradle.plugin" version="3.18.2">
          <artifact name="com.gradle.develocity.gradle.plugin-3.18.2.pom">
             <sha256 value="0095b536e4c60a1325946ccdb1a9fbbb97249df276d89bb0eb1ba698a8a64f3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 772cf2a7488..7ca273729be 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,7 +23,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.develocity") version "4.2.2"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0"
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 

From b4803085108680f83e1744fa5213643d02a47a5c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 18:51:55 +0300
Subject: [PATCH 0926/1037] chore: bump org.apache.ftpserver to 1.2.1 (used in
 tests only)

---
 src/bom-testing/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 1fd3987ccba..22835124f2d 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -47,8 +47,8 @@ dependencies {
         api("org.apache.activemq:activemq-broker:5.16.8")
         api("org.apache.activemq:activemq-client:5.16.8")
         api("org.apache.activemq:activemq-spring:5.16.8")
-        api("org.apache.ftpserver:ftplet-api:1.2.0")
-        api("org.apache.ftpserver:ftpserver-core:1.2.0")
+        api("org.apache.ftpserver:ftplet-api:1.2.1")
+        api("org.apache.ftpserver:ftpserver-core:1.2.1")
         api("org.apache.mina:mina-core:2.2.4")
         api("org.hamcrest:hamcrest-core:3.0")
         api("org.hamcrest:hamcrest-library:3.0")

From 0e02ee7fef39ea65ec15bf75b7145648d694f674 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:00:32 +0300
Subject: [PATCH 0927/1037] chore: bump com.jayway.jsonpath:json-path to 2.10.0

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 0e198787903..4feb13b0510 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("com.google.errorprone:error_prone_annotations:2.43.0")
         api("com.helger.commons:ph-commons:12.0.4")
         api("com.helger:ph-css:8.0.1")
-        api("com.jayway.jsonpath:json-path:2.8.0")
+        api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:5.3")
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 575bb64470b..ff484f45439 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -88,7 +88,7 @@
 20311,jodd-log-5.1.6.jar
 25989,jodd-props-6.0.2.jar
 337315,jodd-util-6.1.0.jar
-277582,json-path-2.8.0.jar
+279148,json-path-2.10.0.jar
 122808,json-smart-2.6.0.jar
 500363,jsoup-1.21.2.jar
 723652,jsvg-2.0.0.jar

From 4626eba01599d4e5b61529178f2479f9f2f34d97 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:01:39 +0300
Subject: [PATCH 0928/1037] chore: bump
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to 1.10.2

---
 src/bom-thirdparty/build.gradle.kts         | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4feb13b0510..ae4d64fb85f 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.apache.groovy:groovy-bom:5.0.2"))
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
     api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
 
     constraints {
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ff484f45439..e588bcbe88a 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -96,10 +96,10 @@
 384581,junit-4.13.2.jar
 43729,kotlin-logging-jvm-2.1.23.jar
 1761445,kotlin-stdlib-2.2.21.jar
-963,kotlin-stdlib-jdk7-1.8.20.jar
-969,kotlin-stdlib-jdk8-1.8.20.jar
-1548360,kotlinx-coroutines-core-jvm-1.8.0.jar
-9846,kotlinx-coroutines-swing-1.8.0.jar
+963,kotlin-stdlib-jdk7-1.8.0.jar
+968,kotlin-stdlib-jdk8-1.8.0.jar
+1479317,kotlinx-coroutines-core-jvm-1.10.2.jar
+8890,kotlinx-coroutines-swing-1.10.2.jar
 675271,kotlinx-datetime-jvm-0.6.2.jar
 996,lets-plot-batik-4.7.3.jar
 996,lets-plot-common-4.7.3.jar

From 819930d5b20768ca05d7747d32e278acc1a44f36 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:02:47 +0300
Subject: [PATCH 0929/1037] chore: bump com.fasterxml.jackson to 2.20.1

---
 gradle/verification-metadata.xml            | 15 +++++++++++++++
 src/bom-thirdparty/build.gradle.kts         |  2 +-
 src/dist/src/dist/expected_release_jars.csv |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9a44627ea23..2784b828396 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -341,6 +341,11 @@
             <sha256 value="25eafd96dae242b6b5a7108f55b2c14015b828daa5abe234289fd6e774a1ce57" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="70">
+         <artifact name="oss-parent-70.pom">
+            <sha256 value="26ca8ed6f82c9d2ed7cd32298105bb65c0f9d899db61757a09741586fa93a639" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-bom" version="2.19.1">
          <artifact name="jackson-bom-2.19.1.pom">
             <sha256 value="ba6d68eeab3a1cc13a77a8ade2197ff9a32aa1cffeac72847d49badd82e1b9ce" origin="Generated by Gradle"/>
@@ -356,6 +361,11 @@
             <sha256 value="639a2b63dd05da4e381081303985caadfbb7ad9f85b1d2320638f6b11f208365" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.20">
+         <artifact name="jackson-parent-2.20.pom">
+            <sha256 value="b43b7f5c62e86b164fae70ae17d6911c5db60799af01057360afda82e4845be5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.formdev" name="svgSalamander" version="1.1.2.4">
          <artifact name="svgSalamander-1.1.2.4.pom">
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
@@ -772,6 +782,11 @@
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.13.4">
+         <artifact name="junit-bom-5.13.4.pom">
+            <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="4.11.0">
          <artifact name="mockito-bom-4.11.0.pom">
             <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index ae4d64fb85f..4110a8567ed 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -28,7 +28,7 @@ javaPlatform {
 dependencies {
     api(platform("org.apache.groovy:groovy-bom:5.0.2"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
-    api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
+    api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index e588bcbe88a..dff52008db4 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -75,8 +75,8 @@
 368896,httpcore-nio-4.4.16.jar
 41727,httpmime-4.5.14.jar
 79195,jackson-annotations-2.20.jar
-593063,jackson-core-2.20.0.jar
-1688471,jackson-databind-2.20.0.jar
+593176,jackson-core-2.20.1.jar
+1688480,jackson-databind-2.20.1.jar
 26378,jakarta.annotation-api-3.0.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar

From 0cac711afb6be1c0ff230cfa154c74f357c99fa2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:22:21 +0300
Subject: [PATCH 0930/1037] chore: bump org.mozilla:rhino to 1.8.0

---
 src/bom-thirdparty/build.gradle.kts                       | 2 +-
 .../java/org/apache/jmeter/util/BSFJavaScriptEngine.java  | 8 ++++----
 .../jmeter/testelement/schema/PropertyDescriptor.kt       | 1 +
 src/dist/src/dist/expected_release_jars.csv               | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4110a8567ed..6f0e2e86133 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -131,7 +131,7 @@ dependencies {
         api("org.jodd:jodd-props:6.0.2")
         api("org.jsoup:jsoup:1.21.2")
         api("org.mongodb:mongo-java-driver:2.14.3")
-        api("org.mozilla:rhino:1.7.14")
+        api("org.mozilla:rhino:1.8.0")
         api("org.neo4j.driver:neo4j-java-driver:4.4.21")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
index 68704a40a0a..bf36330dd3a 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java
@@ -78,10 +78,10 @@ public Object call(Object object, String method, Object[] args)
                                              " not found.", "none", 0);
             }
 
-            cx.setOptimizationLevel(-1);
+            cx.setInterpretedMode(true);
             cx.setGeneratingDebug(false);
             cx.setGeneratingSource(false);
-            cx.setOptimizationLevel(0);
+            cx.setInterpretedMode(false);
             cx.setDebugger(null, null);
 
             retval =
@@ -129,10 +129,10 @@ public Object eval(String source, int lineNo, int columnNo, Object oscript)
         try {
             cx = Context.enter();
 
-            cx.setOptimizationLevel(-1);
+            cx.setInterpretedMode(true);
             cx.setGeneratingDebug(false);
             cx.setGeneratingSource(false);
-            cx.setOptimizationLevel(0);
+            cx.setInterpretedMode(false);
             cx.setDebugger(null, null);
 
             retval = cx.evaluateString(global, scriptText,
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
index 68ac0560bca..6b3b487c8c0 100644
--- a/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
+++ b/src/core/src/main/kotlin/org/apache/jmeter/testelement/schema/PropertyDescriptor.kt
@@ -19,6 +19,7 @@ package org.apache.jmeter.testelement.schema
 
 import org.apache.jmeter.testelement.JMeterPropertySchemaUnchecked
 import org.apache.jmeter.testelement.TestElement
+import org.apache.jmeter.testelement.property.JMeterProperty
 import org.apiguardian.api.API
 import java.io.Serializable
 
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index dff52008db4..f65460f7358 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -133,7 +133,7 @@
 1471910,plot-builder-jvm-4.7.3.jar
 1482543,plot-stem-jvm-4.7.3.jar
 11640,reactive-streams-1.0.4.jar
-1383644,rhino-1.7.14.jar
+1262303,rhino-1.8.0.jar
 1330192,rsyntaxtextarea-3.6.0.jar
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar

From a97a7acebd0d0f4adbffb70229f4253559b3c254 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:25:09 +0300
Subject: [PATCH 0931/1037] chore: bump org.junit to 5.14.1

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 22835124f2d..72d7c8ad945 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.junit:junit-bom:5.14.0"))
+    api(platform("org.junit:junit-bom:5.14.1"))
     api(platform("org.springframework:spring-framework-bom:6.2.12"))
     api(platform("org.eclipse.jetty:jetty-bom:11.0.26"))
 

From b55b0b554412e575c77d2eb0776e2191924f9e45 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:28:46 +0300
Subject: [PATCH 0932/1037] chore: bump org.jetbrains.gradle.plugin.idea-ext to
 1.3

---
 build-logic/root-build/build.gradle.kts   |  2 +-
 build-logic/verification/build.gradle.kts |  2 +-
 gradle/verification-metadata.xml          | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 6e74cadf0bb..6f73f54ac17 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -31,6 +31,6 @@ dependencies {
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
-    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
 }
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 860c7b22137..a67bc8ffd80 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -29,6 +29,6 @@ dependencies {
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
     api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.60")
-    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.7")
+    api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 2784b828396..d03d1a66c8d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -500,6 +500,14 @@
             <sha256 value="f8f16eb8be341a1d29e15b715fb34d920ef5f9a6f15555c48c2c7f9825a5f83f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.3">
+         <artifact name="gradle-idea-ext-1.3.jar">
+            <sha256 value="a50ba79776c223679c878af380f7b7efac5d8b6e0865c8d3d6207450e0135a30" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-idea-ext-1.3.pom">
+            <sha256 value="d930f23a39107c8f18809dd732d2163e615e6e2a27ad9621c1b4f6e6703d4a11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="io.codearte.gradle.nexus" name="gradle-nexus-staging-plugin" version="0.21.2">
          <artifact name="gradle-nexus-staging-plugin-0.21.2.jar">
             <pgp value="1AB9BDF40ED49DEBB5CAADED5B30D3B10694F057"/>
@@ -742,6 +750,11 @@
             <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.3">
+         <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.3.pom">
+            <sha256 value="fc5e8d94d6bf5a22043c76354a3d5ca756501e50d5af42ad3d9d73f65dbafa37" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.21">
          <artifact name="kotlin-compiler-runner-2.2.21.pom">
             <sha256 value="1f103d8bde08ddd614bd983abdfcb7949139c606ac60cd8a68941fd0fb1ee124" origin="Generated by Gradle"/>

From 109552d67f463bead51fc50c5f47bc1c7833a675 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:36:53 +0300
Subject: [PATCH 0933/1037] chore: bump org.neo4j.driver to 6.0.1

---
 gradle/verification-metadata.xml            | 20 +++++++++++++++++++-
 src/bom-thirdparty/build.gradle.kts         |  2 +-
 src/dist/src/dist/expected_release_jars.csv | 15 ++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d03d1a66c8d..7af3a0a2d8f 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -29,7 +29,10 @@
          <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools"/>
          <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
          <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
-         <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="org.neo4j.driver"/>
+         <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31">
+            <trusting group="org.neo4j.bolt"/>
+            <trusting group="org.neo4j.driver"/>
+         </trusted-key>
          <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb"/>
          <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
          <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock" name="wiremock" version="3.13.1"/>
@@ -532,6 +535,11 @@
             <sha256 value="5a65e06a159d20d3b4800624a570c646dbee710b2b539b3449a268558c289e9c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-bom" version="4.2.6.Final">
+         <artifact name="netty-bom-4.2.6.Final.pom">
+            <sha256 value="f61dde0da283b983ba0dbb42c2f501f81fec2da7945f2933128f2a6e410afc81" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
          <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
             <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
@@ -800,6 +808,11 @@
             <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="6.0.0">
+         <artifact name="junit-bom-6.0.0.pom">
+            <sha256 value="b3d9832f5c11bbb6b0e62851b93aa29d278c39fb1a751eb771b46d004a216219" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="4.11.0">
          <artifact name="mockito-bom-4.11.0.pom">
             <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
@@ -828,6 +841,11 @@
             <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-bom" version="2.0.17">
+         <artifact name="slf4j-bom-2.0.17.pom">
+            <sha256 value="f78d27b642b4b886eb839fc102b5cd9fe7f30f37599ffe68185be4e1609031e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
          <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6f0e2e86133..cd0338a341e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -132,7 +132,7 @@ dependencies {
         api("org.jsoup:jsoup:1.21.2")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.8.0")
-        api("org.neo4j.driver:neo4j-java-driver:4.4.21")
+        api("org.neo4j.driver:neo4j-java-driver:6.0.1")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("oro:oro:2.0.8")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index f65460f7358..eef4c661d5d 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -112,7 +112,19 @@
 22576,miglayout-swing-5.3.jar
 613352,mongo-java-driver-2.14.3.jar
 29680,mxparser-1.2.2.jar
-5404219,neo4j-java-driver-4.4.21.jar
+99796,neo4j-bolt-connection-10.0.1.jar
+320488,neo4j-bolt-connection-netty-10.0.1.jar
+27442,neo4j-bolt-connection-pooled-10.0.1.jar
+64399,neo4j-bolt-connection-routed-10.0.1.jar
+592767,neo4j-java-driver-6.0.1.jar
+372929,netty-buffer-4.2.6.Final.jar
+152980,netty-codec-base-4.2.6.Final.jar
+774708,netty-common-4.2.6.Final.jar
+571539,netty-handler-4.2.6.Final.jar
+38440,netty-resolver-4.2.6.Final.jar
+37384,netty-tcnative-classes-2.0.73.Final.jar
+562314,netty-transport-4.2.6.Final.jar
+46774,netty-transport-native-unix-common-4.2.6.Final.jar
 65261,oro-2.0.8.jar
 41831,ph-annotations-12.0.4.jar
 508951,ph-base-12.0.4.jar
@@ -133,6 +145,7 @@
 1471910,plot-builder-jvm-4.7.3.jar
 1482543,plot-stem-jvm-4.7.3.jar
 11640,reactive-streams-1.0.4.jar
+1897725,reactor-core-3.7.11.jar
 1262303,rhino-1.8.0.jar
 1330192,rsyntaxtextarea-3.6.0.jar
 5783933,Saxon-HE-12.9.jar

From b86754e53663af161420c2f4e2deda3d77655ad0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 19:54:43 +0300
Subject: [PATCH 0934/1037] chore: remove mongodb plugin

---
 bin/jmeter.properties                         |   4 +-
 bin/saveservice.properties                    |   2 -
 bin/templates/mongodb.jmx                     | 194 ---------
 bin/templates/templates.xml                   |  23 --
 bin/testfiles/GenTest210.jmx                  |  26 --
 bin/testfiles/GenTest2_13.jmx                 |  27 --
 bin/testfiles/SavedGenTest210.jmx             |  26 --
 bin/testfiles/SavedGenTest2_13.jmx            |  27 --
 gradle/verification-keyring.keys              |  15 -
 gradle/verification-metadata.xml              |   1 -
 lib/aareadme.txt                              |   5 -
 settings.gradle.kts                           |   1 -
 src/bom-thirdparty/build.gradle.kts           |   1 -
 src/dist/build.gradle.kts                     |   1 -
 src/dist/src/dist/expected_release_jars.csv   |   1 -
 src/protocol/mongodb/build.gradle.kts         |  28 --
 .../mongodb/config/MongoDBHolder.java         |  55 ---
 .../mongodb/config/MongoSourceElement.java    | 376 ------------------
 .../config/MongoSourceElementBeanInfo.java    | 117 ------
 .../mongodb/mongo/EvalResultHandler.java      |  66 ---
 .../protocol/mongodb/mongo/MongoDB.java       |  76 ----
 .../protocol/mongodb/mongo/MongoUtils.java    |  53 ---
 .../mongodb/sampler/MongoScriptRunner.java    |  69 ----
 .../mongodb/sampler/MongoScriptSampler.java   | 140 -------
 .../sampler/MongoScriptSamplerBeanInfo.java   |  73 ----
 .../MongoSourceElementResources.properties    |  57 ---
 .../MongoSourceElementResources_fr.properties |  57 ---
 .../MongoSourceElementResources_ko.properties |  56 ---
 .../MongoScriptSamplerResources.properties    |  29 --
 .../MongoScriptSamplerResources_fr.properties |  29 --
 .../MongoScriptSamplerResources_ko.properties |  28 --
 .../ResourceKeyUsageTestMongodb.java          |  22 -
 xdocs/usermanual/component_reference.xml      | 120 ------
 xdocs/usermanual/properties_reference.xml     |   4 -
 34 files changed, 2 insertions(+), 1807 deletions(-)
 delete mode 100644 bin/templates/mongodb.jmx
 delete mode 100644 src/protocol/mongodb/build.gradle.kts
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
 delete mode 100644 src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_ko.properties
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties
 delete mode 100644 src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_ko.properties
 delete mode 100644 src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index bac04e85bc9..58c540cfd9c 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -202,9 +202,9 @@
 
 #Components to not display in JMeter GUI (GUI class name or static label)
 # These elements are deprecated and will be removed in next version:
-# MongoDB Script, MongoDB Source Config, Monitor Results
+# Monitor Results
 # BSF Elements
-not_in_menu=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler,org.apache.jmeter.protocol.mongodb.config.MongoSourceElement,\
+not_in_menu=\
     org.apache.jmeter.timers.BSFTimer,org.apache.jmeter.modifiers.BSFPreProcessor,org.apache.jmeter.extractor.BSFPostProcessor,org.apache.jmeter.assertions.BSFAssertion,\
     org.apache.jmeter.visualizers.BSFListener,org.apache.jmeter.protocol.java.sampler.BSFSampler,\
     org.apache.jmeter.protocol.http.control.gui.SoapSamplerGui
diff --git a/bin/saveservice.properties b/bin/saveservice.properties
index 60ccfbea37e..93ecf25ebc8 100644
--- a/bin/saveservice.properties
+++ b/bin/saveservice.properties
@@ -246,8 +246,6 @@ MD5HexAssertion=org.apache.jmeter.assertions.MD5HexAssertion
 MD5HexAssertionGUI=org.apache.jmeter.assertions.gui.MD5HexAssertionGUI
 ModuleController=org.apache.jmeter.control.ModuleController
 ModuleControllerGui=org.apache.jmeter.control.gui.ModuleControllerGui
-MongoScriptSampler=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler
-MongoSourceElement=org.apache.jmeter.protocol.mongodb.config.MongoSourceElement
 
 # removed in 3.2, class was deleted in r
 MonitorHealthVisualizer=org.apache.jmeter.visualizers.MonitorHealthVisualizer
diff --git a/bin/templates/mongodb.jmx b/bin/templates/mongodb.jmx
deleted file mode 100644
index bc52858c1d8..00000000000
--- a/bin/templates/mongodb.jmx
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.5" jmeter="2.10-SNAPSHOT.20130714">
-  <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="MongoDB Test Plan" enabled="true">
-      <stringProp name="TestPlan.comments">Shows how to setup a MongoDB Test</stringProp>
-      <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="TestPlan.user_define_classpath"></stringProp>
-    </TestPlan>
-    <hashTree>
-      <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB Source Config" enabled="true">
-        <stringProp name="connection">127.0.0.1</stringProp>
-        <stringProp name="source">db</stringProp>
-        <boolProp name="autoConnectRetry">false</boolProp>
-        <intProp name="connectionsPerHost">50</intProp>
-        <intProp name="connectTimeout">0</intProp>
-        <longProp name="maxAutoConnectRetryTime">0</longProp>
-        <intProp name="maxWaitTime">120000</intProp>
-        <intProp name="socketTimeout">0</intProp>
-        <boolProp name="socketKeepAlive">false</boolProp>
-        <intProp name="threadsAllowedToBlockForConnectionMultiplier">5</intProp>
-        <boolProp name="safe">false</boolProp>
-        <boolProp name="fsync">false</boolProp>
-        <boolProp name="waitForJournaling">false</boolProp>
-        <intProp name="writeOperationNumberOfServers">0</intProp>
-        <intProp name="writeOperationTimeout">0</intProp>
-        <boolProp name="continueOnInsertError">false</boolProp>
-        <stringProp name="TestPlan.comments">Configures connection to MongoDB</stringProp>
-      </MongoSourceElement>
-      <hashTree/>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <boolProp name="LoopController.continue_forever">false</boolProp>
-          <intProp name="LoopController.loops">-1</intProp>
-        </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">30</stringProp>
-        <longProp name="ThreadGroup.start_time">1367357168000</longProp>
-        <longProp name="ThreadGroup.end_time">1367357168000</longProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="ThreadGroup.duration">300</stringProp>
-        <stringProp name="ThreadGroup.delay">10</stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Insert into testCollection" enabled="true">
-          <stringProp name="scriptLanguage">groovy</stringProp>
-          <stringProp name="parameters"></stringProp>
-          <stringProp name="filename"></stringProp>
-          <stringProp name="cacheKey">insert1</stringProp>
-          <stringProp name="script">import com.mongodb.DB;
-import org.apache.jmeter.protocol.mongodb.config.MongoDBHolder;
-import com.mongodb.WriteResult;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteResult;
-
-// Get DB
-com.mongodb.DB db = org.apache.jmeter.protocol.mongodb.config.MongoDBHolder.getDBFromSource(&quot;db&quot;, &quot;test&quot;);
-
-// Get collection to insert
-DBCollection coll = db.getCollection(&quot;testCollection&quot;);
-BasicDBObject doc = new BasicDBObject(&quot;name&quot;, &quot;MongoDB&quot;).
-                              append(&quot;type&quot;, &quot;database&quot;).
-                              append(&quot;count&quot;, 1).
-                              append(&quot;info&quot;, new BasicDBObject(&quot;x&quot;, 203).append(&quot;y&quot;, 102));
-
-// Insert object
-WriteResult wr = coll.insert(doc, WriteConcern.ACKNOWLEDGED);
-
-// Set response data
-SampleResult.setResponseData(&quot;&quot;+wr.toString(),&quot;UTF-8&quot;);</stringProp>
-        </JSR223Sampler>
-        <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="-1358912096">&quot;err&quot; :  null</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">2</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Count from testCollection" enabled="true">
-          <stringProp name="scriptLanguage">groovy</stringProp>
-          <stringProp name="parameters"></stringProp>
-          <stringProp name="filename"></stringProp>
-          <stringProp name="cacheKey">count1</stringProp>
-          <stringProp name="script">import com.mongodb.DB;
-import org.apache.jmeter.protocol.mongodb.config.MongoDBHolder;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBCollection;
-
-DB db = MongoDBHolder.getDBFromSource(&quot;db&quot;, &quot;test&quot;);
-
-DBCollection coll = db.getCollection(&quot;testCollection&quot;);
-int size = coll.count();
-SampleResult.setResponseData(&quot;&quot;+size,&quot;UTF-8&quot;);</stringProp>
-        </JSR223Sampler>
-        <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="91555">\d+</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-      </hashTree>
-      <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
-        <boolProp name="ResultCollector.error_logging">false</boolProp>
-        <objProp>
-          <name>saveConfig</name>
-          <value class="SampleSaveConfiguration">
-            <time>true</time>
-            <latency>true</latency>
-            <timestamp>true</timestamp>
-            <success>true</success>
-            <label>true</label>
-            <code>true</code>
-            <message>true</message>
-            <threadName>true</threadName>
-            <dataType>false</dataType>
-            <encoding>false</encoding>
-            <assertions>true</assertions>
-            <subresults>false</subresults>
-            <responseData>false</responseData>
-            <samplerData>false</samplerData>
-            <xml>false</xml>
-            <fieldNames>true</fieldNames>
-            <responseHeaders>false</responseHeaders>
-            <requestHeaders>false</requestHeaders>
-            <responseDataOnError>true</responseDataOnError>
-            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
-            <assertionsResultsToSave>0</assertionsResultsToSave>
-            <bytes>true</bytes>
-            <hostname>true</hostname>
-            <threadCounts>true</threadCounts>
-            <sampleCount>true</sampleCount>
-          </value>
-        </objProp>
-        <stringProp name="filename"></stringProp>
-        <stringProp name="TestPlan.comments">Remove for Load Test</stringProp>
-      </ResultCollector>
-      <hashTree/>
-      <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
-        <boolProp name="ResultCollector.error_logging">false</boolProp>
-        <objProp>
-          <name>saveConfig</name>
-          <value class="SampleSaveConfiguration">
-            <time>true</time>
-            <latency>true</latency>
-            <timestamp>true</timestamp>
-            <success>true</success>
-            <label>true</label>
-            <code>true</code>
-            <message>true</message>
-            <threadName>true</threadName>
-            <dataType>false</dataType>
-            <encoding>false</encoding>
-            <assertions>true</assertions>
-            <subresults>false</subresults>
-            <responseData>false</responseData>
-            <samplerData>false</samplerData>
-            <xml>false</xml>
-            <fieldNames>true</fieldNames>
-            <responseHeaders>false</responseHeaders>
-            <requestHeaders>false</requestHeaders>
-            <responseDataOnError>true</responseDataOnError>
-            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
-            <assertionsResultsToSave>0</assertionsResultsToSave>
-            <bytes>true</bytes>
-            <hostname>true</hostname>
-            <threadCounts>true</threadCounts>
-            <sampleCount>true</sampleCount>
-          </value>
-        </objProp>
-        <stringProp name="filename"></stringProp>
-        <stringProp name="TestPlan.comments">Remove for Load Test</stringProp>
-      </ResultCollector>
-      <hashTree/>
-      <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-</jmeterTestPlan>
diff --git a/bin/templates/templates.xml b/bin/templates/templates.xml
index 65832fc67aa..f7c984de0eb 100644
--- a/bin/templates/templates.xml
+++ b/bin/templates/templates.xml
@@ -120,29 +120,6 @@
             </ul>
         ]]></description>
     </template>
-    <template isTestPlan="true">
-        <name>MongoDB Load Test</name>
-        <fileName>mongodb.jmx</fileName>
-        <description>
-        <![CDATA[<h1>Template showing how to Load Test MongoDB code using MongoDB Java Driver</h1>
-        <h2>JMeter Configuration</h2>
-            <ul>
-                <li>Configure the <b>Server address list</b>, and tune <b>MongoDB options</b> in MongoDB Source Config</li>
-                <li>Modify the JSR223 samples (<b>Insert into testCollection</b> and <b>Count from testCollection</b>) to match your needs</li>
-            </ul>
-        <h2>Mongo Java Driver</h2>
-        <p>
-            MongoDB Source Config configures the connection to MongoDB for you and stores in <b>MongoDB Source</b> the configuration.<br/>
-            You can then access it in any Scripting element using:<br/>
-            <i>com.mongodb.DB db = org.apache.jmeter.protocol.mongodb.config.MongoDBHolder.getDBFromSource("db", "test");<i>
-        </p>
-        <h2>Useful links</h2>
-            <ul>
-                <li><a href="http://docs.mongodb.org/ecosystem/tutorial/getting-started-with-java-driver/#getting-started-with-java-driver" >Getting Started with Java Driver (<i>Making a connection</i> part is already done by MongoDB Source Config)</a></li>
-                <li><a href="http://jmeter.apache.org/usermanual/component_reference.html#MongoDB_Source_Config" >http://jmeter.apache.org/usermanual/component_reference.html#MongoDB_Source_Config</a></li>
-            </ul>
-        ]]></description>
-    </template>
     <template isTestPlan="true">
         <name>Building a Web Test Plan</name>
         <fileName>/bin/templates/build-web-test-plan.jmx</fileName>
diff --git a/bin/testfiles/GenTest210.jmx b/bin/testfiles/GenTest210.jmx
index 125a230701f..315898124eb 100644
--- a/bin/testfiles/GenTest210.jmx
+++ b/bin/testfiles/GenTest210.jmx
@@ -282,24 +282,6 @@
             <stringProp name="ConfigTestElement.password"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB Source Config" enabled="true">
-            <boolProp name="autoConnectRetry">false</boolProp>
-            <stringProp name="connection"></stringProp>
-            <intProp name="connectionsPerHost">10</intProp>
-            <boolProp name="continueOnInsertError">false</boolProp>
-            <boolProp name="fsync">false</boolProp>
-            <longProp name="maxAutoConnectRetryTime">0</longProp>
-            <intProp name="maxWaitTime">120000</intProp>
-            <boolProp name="safe">false</boolProp>
-            <boolProp name="socketKeepAlive">false</boolProp>
-            <intProp name="socketTimeout">0</intProp>
-            <stringProp name="source"></stringProp>
-            <intProp name="threadsAllowedToBlockForConnectionMultiplier">5</intProp>
-            <boolProp name="waitForJournaling">false</boolProp>
-            <intProp name="writeOperationNumberOfServers">0</intProp>
-            <intProp name="writeOperationTimeout">0</intProp>
-          </MongoSourceElement>
-          <hashTree/>
           <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
             <stringProp name="maximumValue"></stringProp>
             <stringProp name="minimumValue">1</stringProp>
@@ -715,14 +697,6 @@
             <stringProp name="SMTPSampler.trustStoreToUse"></stringProp>
           </MailReaderSampler>
           <hashTree/>
-          <MongoScriptSampler guiclass="TestBeanGUI" testclass="MongoScriptSampler" testname="MongoDB Script (alpha)" enabled="true">
-            <stringProp name="database"></stringProp>
-            <stringProp name="password"></stringProp>
-            <stringProp name="source"></stringProp>
-            <stringProp name="username"></stringProp>
-            <stringProp name="script"></stringProp>
-          </MongoScriptSampler>
-          <hashTree/>
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
diff --git a/bin/testfiles/GenTest2_13.jmx b/bin/testfiles/GenTest2_13.jmx
index 46a314f3994..01ba6b907d5 100644
--- a/bin/testfiles/GenTest2_13.jmx
+++ b/bin/testfiles/GenTest2_13.jmx
@@ -279,25 +279,6 @@
             <stringProp name="ConfigTestElement.password"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB Source Config" enabled="true">
-            <boolProp name="autoConnectRetry">false</boolProp>
-            <intProp name="connectTimeout">0</intProp>
-            <stringProp name="connection"></stringProp>
-            <intProp name="connectionsPerHost">10</intProp>
-            <boolProp name="continueOnInsertError">false</boolProp>
-            <boolProp name="fsync">false</boolProp>
-            <longProp name="maxAutoConnectRetryTime">0</longProp>
-            <intProp name="maxWaitTime">120000</intProp>
-            <boolProp name="safe">false</boolProp>
-            <boolProp name="socketKeepAlive">false</boolProp>
-            <intProp name="socketTimeout">0</intProp>
-            <stringProp name="source"></stringProp>
-            <intProp name="threadsAllowedToBlockForConnectionMultiplier">5</intProp>
-            <boolProp name="waitForJournaling">false</boolProp>
-            <intProp name="writeOperationNumberOfServers">0</intProp>
-            <intProp name="writeOperationTimeout">0</intProp>
-          </MongoSourceElement>
-          <hashTree/>
           <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
             <stringProp name="maximumValue"></stringProp>
             <stringProp name="minimumValue">1</stringProp>
@@ -720,14 +701,6 @@
             <stringProp name="SMTPSampler.trustStoreToUse"></stringProp>
           </MailReaderSampler>
           <hashTree/>
-          <MongoScriptSampler guiclass="TestBeanGUI" testclass="MongoScriptSampler" testname="MongoDB Script" enabled="true">
-            <stringProp name="database"></stringProp>
-            <stringProp name="password"></stringProp>
-            <stringProp name="source"></stringProp>
-            <stringProp name="username"></stringProp>
-            <stringProp name="script"></stringProp>
-          </MongoScriptSampler>
-          <hashTree/>
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
diff --git a/bin/testfiles/SavedGenTest210.jmx b/bin/testfiles/SavedGenTest210.jmx
index 24afd960db8..34b73bf3dfb 100644
--- a/bin/testfiles/SavedGenTest210.jmx
+++ b/bin/testfiles/SavedGenTest210.jmx
@@ -282,24 +282,6 @@
             <stringProp name="ConfigTestElement.password"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB Source Config" enabled="true">
-            <boolProp name="autoConnectRetry">false</boolProp>
-            <stringProp name="connection"></stringProp>
-            <intProp name="connectionsPerHost">10</intProp>
-            <boolProp name="continueOnInsertError">false</boolProp>
-            <boolProp name="fsync">false</boolProp>
-            <longProp name="maxAutoConnectRetryTime">0</longProp>
-            <intProp name="maxWaitTime">120000</intProp>
-            <boolProp name="safe">false</boolProp>
-            <boolProp name="socketKeepAlive">false</boolProp>
-            <intProp name="socketTimeout">0</intProp>
-            <stringProp name="source"></stringProp>
-            <intProp name="threadsAllowedToBlockForConnectionMultiplier">5</intProp>
-            <boolProp name="waitForJournaling">false</boolProp>
-            <intProp name="writeOperationNumberOfServers">0</intProp>
-            <intProp name="writeOperationTimeout">0</intProp>
-          </MongoSourceElement>
-          <hashTree/>
           <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
             <stringProp name="maximumValue"></stringProp>
             <stringProp name="minimumValue">1</stringProp>
@@ -715,14 +697,6 @@
             <stringProp name="SMTPSampler.trustStoreToUse"></stringProp>
           </MailReaderSampler>
           <hashTree/>
-          <MongoScriptSampler guiclass="TestBeanGUI" testclass="MongoScriptSampler" testname="MongoDB Script (alpha)" enabled="true">
-            <stringProp name="database"></stringProp>
-            <stringProp name="password"></stringProp>
-            <stringProp name="source"></stringProp>
-            <stringProp name="username"></stringProp>
-            <stringProp name="script"></stringProp>
-          </MongoScriptSampler>
-          <hashTree/>
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
diff --git a/bin/testfiles/SavedGenTest2_13.jmx b/bin/testfiles/SavedGenTest2_13.jmx
index f814756b04a..0f9f4d0a511 100644
--- a/bin/testfiles/SavedGenTest2_13.jmx
+++ b/bin/testfiles/SavedGenTest2_13.jmx
@@ -279,25 +279,6 @@
             <stringProp name="ConfigTestElement.password"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB Source Config" enabled="true">
-            <boolProp name="autoConnectRetry">false</boolProp>
-            <intProp name="connectTimeout">0</intProp>
-            <stringProp name="connection"></stringProp>
-            <intProp name="connectionsPerHost">10</intProp>
-            <boolProp name="continueOnInsertError">false</boolProp>
-            <boolProp name="fsync">false</boolProp>
-            <longProp name="maxAutoConnectRetryTime">0</longProp>
-            <intProp name="maxWaitTime">120000</intProp>
-            <boolProp name="safe">false</boolProp>
-            <boolProp name="socketKeepAlive">false</boolProp>
-            <intProp name="socketTimeout">0</intProp>
-            <stringProp name="source"></stringProp>
-            <intProp name="threadsAllowedToBlockForConnectionMultiplier">5</intProp>
-            <boolProp name="waitForJournaling">false</boolProp>
-            <intProp name="writeOperationNumberOfServers">0</intProp>
-            <intProp name="writeOperationTimeout">0</intProp>
-          </MongoSourceElement>
-          <hashTree/>
           <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
             <stringProp name="maximumValue"></stringProp>
             <stringProp name="minimumValue">1</stringProp>
@@ -720,14 +701,6 @@
             <stringProp name="SMTPSampler.trustStoreToUse"></stringProp>
           </MailReaderSampler>
           <hashTree/>
-          <MongoScriptSampler guiclass="TestBeanGUI" testclass="MongoScriptSampler" testname="MongoDB Script" enabled="true">
-            <stringProp name="database"></stringProp>
-            <stringProp name="password"></stringProp>
-            <stringProp name="source"></stringProp>
-            <stringProp name="username"></stringProp>
-            <stringProp name="script"></stringProp>
-          </MongoScriptSampler>
-          <hashTree/>
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 1d206cb0bff..bffc6702e3a 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -1,18 +1,3 @@
-pub    82216A03CAA86C78
-uid    MongoDB - 10gen <noc-admin@10gen.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE5Kv/ABCAConhU6cL5eRQCAvVpHX8VUyflu2Lcb/X7IQXy/8BCk1Nhhp69U
-ul06/EG16A4UERZQiqZjbwsdow7CvsZiJBwr6Vf/OkM7cDqDA1nTxL8jPByUqI93
-tBtHL/8Zxr+BmdUWYDZhkRaL3HuD6Io3UpoxjQqAASYbuSelhvuVdVN5mG7VjGjq
-oB8xCFL47rdO/+yZLaGFVjoOUC5J/xsvFe7IZm+HusN+r0biRbwjdMg5ppHShzV2
-L1ETra81OQFjcohzHfATvYv00QbNG/1GUTJCIRZKzMI2qp/B0UEGa2kYiiNcQ5b8
-p5GPwjAZX/fqNuRD1pyv1zyb2oiqr5HMtXY3ABEBAAG0JU1vbmdvREIgLSAxMGdl
-biA8bm9jLWFkbWluQDEwZ2VuLmNvbT4=
-=0ybl
------END PGP PUBLIC KEY BLOCK-----
-
 pub    84E913A8E3A748C0
 uid    The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7af3a0a2d8f..4be1109f083 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -33,7 +33,6 @@
             <trusting group="org.neo4j.bolt"/>
             <trusting group="org.neo4j.driver"/>
          </trusted-key>
-         <trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78" group="org.mongodb"/>
          <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
          <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock" name="wiremock" version="3.13.1"/>
          <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index b2f886e2d0d..9531d6aaa12 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -217,11 +217,6 @@ http://hc.apache.org/
 - httpclient 4 implementation for HTTP sampler
 - httpasyncclient implementation for InfluxDB Backend Listener Client
 
-mongo-java-driver 2.11.3
-------------------------
-http://www.mongodb.org/
-- MongoDB sampler
-
 oro-2.0.8
 ---------
 http://jakarta.apache.org/site/downloads/downloads_oro.cgi
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ca273729be..d129bee88de 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -72,7 +72,6 @@ include(
     "src:protocol:junit-sample",
     "src:protocol:ldap",
     "src:protocol:mail",
-    "src:protocol:mongodb",
     "src:protocol:native",
     "src:protocol:tcp",
     "src:release",
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index cd0338a341e..c92d103e672 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -130,7 +130,6 @@ dependencies {
         api("org.jodd:jodd-log:5.1.6")
         api("org.jodd:jodd-props:6.0.2")
         api("org.jsoup:jsoup:1.21.2")
-        api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.8.0")
         api("org.neo4j.driver:neo4j-java-driver:6.0.1")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index e7b653aceec..20e5bc8f61a 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -47,7 +47,6 @@ var jars = arrayOf(
     ":src:protocol:junit",
     ":src:protocol:ldap",
     ":src:protocol:mail",
-    ":src:protocol:mongodb",
     ":src:protocol:native",
     ":src:protocol:tcp"
 )
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index eef4c661d5d..cd9b0d74d76 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -110,7 +110,6 @@
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
-613352,mongo-java-driver-2.14.3.jar
 29680,mxparser-1.2.2.jar
 99796,neo4j-bolt-connection-10.0.1.jar
 320488,neo4j-bolt-connection-netty-10.0.1.jar
diff --git a/src/protocol/mongodb/build.gradle.kts b/src/protocol/mongodb/build.gradle.kts
deleted file mode 100644
index 5ee76c19c0b..00000000000
--- a/src/protocol/mongodb/build.gradle.kts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("build-logic.jvm-published-library")
-}
-
-dependencies {
-    api(projects.src.core)
-
-    api("org.mongodb:mongo-java-driver")
-
-    testImplementation(testFixtures(projects.src.core))
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java
deleted file mode 100644
index fedaf6bdd03..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.config;
-
-import org.apache.jmeter.protocol.mongodb.mongo.MongoDB;
-import org.apache.jmeter.threads.JMeterContextService;
-
-import com.mongodb.DB;
-
-/**
- * Public API to access MongoDB {@link DB} object created by {@link MongoSourceElement}
- */
-public final class MongoDBHolder {
-
-    /**
-     * Get access to MongoDB object
-     * @param varName String MongoDB source
-     * @param dbName Mongo DB database name
-     * @return {@link DB}
-     */
-    public static DB getDBFromSource(String varName, String dbName) {
-        return getDBFromSource(varName, dbName, null, null);
-    }
-
-    /**
-     * Get access to MongoDB object
-     * @param varName String MongoDB source
-     * @param dbName Mongo DB database name
-     * @param login name to use for login
-     * @param password password to use for login
-     * @return {@link DB}
-     */
-    public static DB getDBFromSource(String varName, String dbName, String login, String password) {
-        MongoDB mongodb = (MongoDB) JMeterContextService.getContext().getVariables().getObject(varName);
-        if(mongodb==null) {
-            throw new IllegalStateException("You didn't define variable:"+varName +" using MongoDB Source Config (property:MongoDB Source)");
-        }
-        return mongodb.getDB(dbName, login, password);
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
deleted file mode 100644
index 448b8c32162..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.config;
-
-import java.net.UnknownHostException;
-
-import org.apache.jmeter.config.ConfigElement;
-import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.protocol.mongodb.mongo.MongoDB;
-import org.apache.jmeter.protocol.mongodb.mongo.MongoUtils;
-import org.apache.jmeter.testbeans.TestBean;
-import org.apache.jmeter.testelement.TestStateListener;
-import org.apache.jmeter.threads.JMeterContextService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.MongoClientOptions;
-import com.mongodb.WriteConcern;
-
-/**
- */
-public class MongoSourceElement
-    extends ConfigTestElement
-        implements TestStateListener, TestBean {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 2100L;
-
-    private static final Logger log = LoggerFactory.getLogger(MongoSourceElement.class);
-
-    private String connection;
-    private String source;
-    private boolean autoConnectRetry;
-    private int connectionsPerHost;
-    private int connectTimeout;
-    private long maxAutoConnectRetryTime;
-    private int maxWaitTime;
-    private int socketTimeout;
-    private boolean socketKeepAlive;
-    private int threadsAllowedToBlockForConnectionMultiplier;
-    private boolean fsync;
-    private boolean safe;
-    private boolean waitForJournaling;
-    private int writeOperationNumberOfServers;
-    private int writeOperationTimeout;
-    private boolean continueOnInsertError;
-
-    public String getTitle() {
-        return this.getName();
-    }
-
-    public String getConnection() {
-        return connection;
-    }
-
-    public void setConnection(String connection) {
-        this.connection = connection;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public static MongoDB getMongoDB(String source) {
-
-        Object mongoSource = JMeterContextService.getContext().getVariables().getObject(source);
-
-        if(mongoSource == null) {
-            throw new IllegalStateException("mongoSource is null");
-        } else {
-            if(mongoSource instanceof MongoDB mongoDB) {
-                return mongoDB;
-            } else {
-                throw new IllegalStateException("Variable:"+ source +" is not a MongoDB instance, class:"+mongoSource.getClass());
-            }
-        }
-    }
-
-    @Override
-    public void addConfigElement(ConfigElement configElement) {
-    }
-
-    @Override
-    public boolean expectsModification() {
-        return false;
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void testStarted() {
-        if(log.isDebugEnabled()) {
-            log.debug(getTitle() + " testStarted");
-        }
-
-        MongoClientOptions.Builder builder = MongoClientOptions.builder()
-                .autoConnectRetry(getAutoConnectRetry())
-                .connectTimeout(getConnectTimeout())
-                .connectionsPerHost(getConnectionsPerHost())
-                .maxAutoConnectRetryTime(getMaxAutoConnectRetryTime())
-                .maxWaitTime(getMaxWaitTime())
-                .socketKeepAlive(getSocketKeepAlive())
-                .socketTimeout(getSocketTimeout())
-                .threadsAllowedToBlockForConnectionMultiplier(
-                        getThreadsAllowedToBlockForConnectionMultiplier());
-
-        if(getSafe()) {
-            builder.writeConcern(WriteConcern.SAFE);
-        } else {
-            builder.writeConcern(new WriteConcern(
-                    getWriteOperationNumberOfServers(),
-                    getWriteOperationTimeout(),
-                    getFsync(),
-                    getWaitForJournaling(),
-                    getContinueOnInsertError()
-                    ));
-        }
-        MongoClientOptions mongoOptions = builder.build();
-
-        if(log.isDebugEnabled()) {
-            log.debug("options : " + mongoOptions.toString());
-        }
-
-        if(getThreadContext().getVariables().getObject(getSource()) != null) {
-            if(log.isWarnEnabled()) {
-                log.warn(getSource() + " has already been defined.");
-            }
-        }
-        else {
-            if(log.isDebugEnabled()) {
-                log.debug(getSource() + "  is being defined.");
-            }
-            try {
-                getThreadContext().getVariables().putObject(
-                        getSource(), new MongoDB(MongoUtils.toServerAddresses(getConnection()), mongoOptions));
-            } catch (UnknownHostException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void testStarted(String s) {
-        testStarted();
-    }
-
-    @Override
-    public void testEnded() {
-        if(log.isDebugEnabled()) {
-            log.debug(getTitle() + " testEnded");
-        }
-        ((MongoDB)getThreadContext().getVariables().getObject(getSource())).clear();
-    }
-
-    @Override
-    public void testEnded(String s) {
-        testEnded();
-    }
-
-    /**
-     * @return the autoConnectRetry
-     */
-    public boolean getAutoConnectRetry() {
-        return autoConnectRetry;
-    }
-
-    /**
-     * @param autoConnectRetry the autoConnectRetry to set
-     */
-    public void setAutoConnectRetry(boolean autoConnectRetry) {
-        this.autoConnectRetry = autoConnectRetry;
-    }
-
-    /**
-     * @return the connectionsPerHost
-     */
-    public int getConnectionsPerHost() {
-        return connectionsPerHost;
-    }
-
-    /**
-     * @param connectionsPerHost the connectionsPerHost to set
-     */
-    public void setConnectionsPerHost(int connectionsPerHost) {
-        this.connectionsPerHost = connectionsPerHost;
-    }
-
-    /**
-     * @return the connectTimeout
-     */
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
-
-    /**
-     * @param connectTimeout the connectTimeout to set
-     */
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
-
-    /**
-     * @return the maxAutoConnectRetryTime
-     */
-    public long getMaxAutoConnectRetryTime() {
-        return maxAutoConnectRetryTime;
-    }
-
-    /**
-     * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
-     */
-    public void setMaxAutoConnectRetryTime(long maxAutoConnectRetryTime) {
-        this.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
-    }
-
-    /**
-     * @return the maxWaitTime
-     */
-    public int getMaxWaitTime() {
-        return maxWaitTime;
-    }
-
-    /**
-     * @param maxWaitTime the maxWaitTime to set
-     */
-    public void setMaxWaitTime(int maxWaitTime) {
-        this.maxWaitTime = maxWaitTime;
-    }
-
-    /**
-     * @return the socketTimeout
-     */
-    public int getSocketTimeout() {
-        return socketTimeout;
-    }
-
-    /**
-     * @param socketTimeout the socketTimeout to set
-     */
-    public void setSocketTimeout(int socketTimeout) {
-        this.socketTimeout = socketTimeout;
-    }
-
-    /**
-     * @return the socketKeepAlive
-     */
-    public boolean getSocketKeepAlive() {
-        return socketKeepAlive;
-    }
-
-    /**
-     * @param socketKeepAlive the socketKeepAlive to set
-     */
-    public void setSocketKeepAlive(boolean socketKeepAlive) {
-        this.socketKeepAlive = socketKeepAlive;
-    }
-
-    /**
-     * @return the threadsAllowedToBlockForConnectionMultiplier
-     */
-    public int getThreadsAllowedToBlockForConnectionMultiplier() {
-        return threadsAllowedToBlockForConnectionMultiplier;
-    }
-
-    /**
-     * @param threadsAllowedToBlockForConnectionMultiplier the threadsAllowedToBlockForConnectionMultiplier to set
-     */
-    public void setThreadsAllowedToBlockForConnectionMultiplier(
-            int threadsAllowedToBlockForConnectionMultiplier) {
-        this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-    }
-
-    /**
-     * @return the fsync
-     */
-    public boolean getFsync() {
-        return fsync;
-    }
-
-    /**
-     * @param fsync the fsync to set
-     */
-    public void setFsync(boolean fsync) {
-        this.fsync = fsync;
-    }
-
-    /**
-     * @return the safe
-     */
-    public boolean getSafe() {
-        return safe;
-    }
-
-    /**
-     * @param safe the safe to set
-     */
-    public void setSafe(boolean safe) {
-        this.safe = safe;
-    }
-
-    /**
-     * @return the waitForJournaling
-     */
-    public boolean getWaitForJournaling() {
-        return waitForJournaling;
-    }
-
-    /**
-     * @param waitForJournaling the waitForJournaling to set
-     */
-    public void setWaitForJournaling(boolean waitForJournaling) {
-        this.waitForJournaling = waitForJournaling;
-    }
-
-    /**
-     * @return the writeOperationNumberOfServers
-     */
-    public int getWriteOperationNumberOfServers() {
-        return writeOperationNumberOfServers;
-    }
-
-    /**
-     * @param writeOperationNumberOfServers the writeOperationNumberOfServers to set
-     */
-    public void setWriteOperationNumberOfServers(int writeOperationNumberOfServers) {
-        this.writeOperationNumberOfServers = writeOperationNumberOfServers;
-    }
-
-    /**
-     * @return the writeOperationTimeout
-     */
-    public int getWriteOperationTimeout() {
-        return writeOperationTimeout;
-    }
-
-    /**
-     * @param writeOperationTimeout the writeOperationTimeout to set
-     */
-    public void setWriteOperationTimeout(int writeOperationTimeout) {
-        this.writeOperationTimeout = writeOperationTimeout;
-    }
-
-    /**
-     * @return the continueOnInsertError
-     */
-    public boolean getContinueOnInsertError() {
-        return continueOnInsertError;
-    }
-
-    /**
-     * @param continueOnInsertError the continueOnInsertError to set
-     */
-    public void setContinueOnInsertError(boolean continueOnInsertError) {
-        this.continueOnInsertError = continueOnInsertError;
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
deleted file mode 100644
index 3da5ce1ae94..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.config;
-
-import java.beans.PropertyDescriptor;
-
-import org.apache.jmeter.testbeans.BeanInfoSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MongoSourceElementBeanInfo
-        extends BeanInfoSupport {
-
-    private static final Logger log = LoggerFactory.getLogger(MongoSourceElementBeanInfo.class);
-
-    public MongoSourceElementBeanInfo() {
-        super(MongoSourceElement.class);
-
-        //http://api.mongodb.org/java/2.7.2/com/mongodb/Mongo.html
-        createPropertyGroup("mongodb", new String[] {
-                "connection",
-                "source"});
-
-        //http://api.mongodb.org/java/2.7.2/com/mongodb/MongoOptions.html/
-        createPropertyGroup("options", new String[]{
-                "autoConnectRetry",
-                "connectionsPerHost",
-                "connectTimeout",
-                "maxAutoConnectRetryTime",
-                "maxWaitTime",
-                "socketTimeout",
-                "socketKeepAlive",
-                "threadsAllowedToBlockForConnectionMultiplier"});
-
-        //http://api.mongodb.org/java/2.7.2/com/mongodb/MongoOptions.html/
-        createPropertyGroup("writeConcern", new String[] {
-                "safe",
-                "fsync",
-                "waitForJournaling",
-                "writeOperationNumberOfServers",
-                "writeOperationTimeout",
-                "continueOnInsertError"});
-
-        PropertyDescriptor p = property("connection");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-        p = property("source");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-
-        p = property("autoConnectRetry");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-        p = property("connectionsPerHost");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 10);
-        p = property("connectTimeout");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 0);
-        p = property("threadsAllowedToBlockForConnectionMultiplier");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 5);
-        p = property("maxAutoConnectRetryTime");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 0L);
-        p = property("maxWaitTime");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 120000);
-        p = property("socketTimeout");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 0);
-        p = property("socketKeepAlive");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-
-        p = property("fsync");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-        p = property("safe");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-        p = property("waitForJournaling");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-        p = property("writeOperationNumberOfServers");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 0);
-        p = property("writeOperationTimeout");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, 0);
-        p = property("continueOnInsertError");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, false);
-
-        if(log.isDebugEnabled()) {
-            for (PropertyDescriptor pd : getPropertyDescriptors()) {
-                log.debug(pd.getName());
-                log.debug(pd.getDisplayName());
-            }
-        }
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
deleted file mode 100644
index c7df00859db..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.mongo;
-
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-/**
- */
-public class EvalResultHandler {
-
-    //This can lead to code smell, meh! Do we care
-    public String handle(Object o) {
-        if(o == null) {
-            return "ok";
-        }
-
-        if(o instanceof Double v) {
-            return this.handle(v);
-        }
-        else if(o instanceof Integer i) {
-            return this.handle(i);
-        }
-        else if(o instanceof String s) {
-            return this.handle(s);
-        }
-        else if(o instanceof DBObject dbObject) {
-            return this.handle(dbObject);
-        }
-        else {
-            return "return type not handled";
-        }
-    }
-
-    public String handle(Integer o) {
-        return o.toString();
-    }
-
-    public String handle(String o) {
-        return o;
-    }
-
-    public String handle(Double o) {
-        return o.toString();
-    }
-
-
-    public String handle(DBObject o) {
-        return JSON.serialize(o);
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
deleted file mode 100644
index c869524815e..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.mongo;
-
-import java.util.List;
-
-import org.apache.jorphan.util.StringUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.ServerAddress;
-
-/**
- */
-public class MongoDB {
-
-    private static final Logger log = LoggerFactory.getLogger(MongoDB.class);
-
-    // Mongo is Thread Safe
-    private Mongo mongo = null;
-
-    public MongoDB(
-            List<ServerAddress> serverAddresses,
-            MongoClientOptions mongoOptions) {
-        mongo = new MongoClient(serverAddresses, mongoOptions);
-    }
-
-    @SuppressWarnings("deprecation")
-    public DB getDB(String database, String username, String password) {
-
-        if(log.isDebugEnabled()) {
-            log.debug("username: " + username+", password: " + password+", database: " + database);
-        }
-        DB db = mongo.getDB(database);
-        boolean authenticated = db.isAuthenticated();
-
-        if(!authenticated) {
-            if (StringUtilities.isNotEmpty(username) && StringUtilities.isNotEmpty(password)) {
-                authenticated = db.authenticate(username, password.toCharArray());
-            }
-        }
-        if(log.isDebugEnabled()) {
-            log.debug("authenticated: " + authenticated);
-        }
-        return db;
-    }
-
-    public void clear() {
-        if(log.isDebugEnabled()) {
-            log.debug("clearing");
-        }
-
-        mongo.close();
-        //there is no harm in trying to clear up
-        mongo = null;
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
deleted file mode 100644
index 29e068338f6..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.mongo;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.jorphan.util.StringUtilities;
-
-import com.mongodb.ServerAddress;
-
-/**
- */
-public class MongoUtils {
-    /**
-     * MongoDB default connection port
-     */
-    public static final int DEFAULT_PORT = 27017;
-
-    public static List<ServerAddress> toServerAddresses(String connections) throws UnknownHostException {
-
-        List<ServerAddress> addresses = new ArrayList<>();
-        for(String connection : Arrays.asList(connections.split(","))) {
-            int port = DEFAULT_PORT;
-            String[] hostPort = connection.split(":");
-            if(hostPort.length > 1) {
-                String portValue = hostPort[1];
-                if (StringUtilities.isNotEmpty(portValue)) {
-                    port = Integer.parseInt(portValue.trim());
-                }
-            }
-            addresses.add(new ServerAddress(hostPort[0], port));
-        }
-        return addresses;
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
deleted file mode 100644
index 73a730fca33..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.sampler;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.DB;
-
-/**
- */
-public class MongoScriptRunner {
-
-    private static final Logger log = LoggerFactory.getLogger(MongoScriptRunner.class);
-
-    public MongoScriptRunner() {
-        super();
-    }
-
-    /**
-     * Evaluate a script on the database
-     *
-     * @param db
-     *            database connection to use
-     * @param script
-     *            script to evaluate on the database
-     * @return result of evaluation on the database
-     * @throws Exception
-     *             when evaluation on the database fails
-     */
-    @SuppressWarnings("deprecation")
-    public Object evaluate(DB db, String script)
-        throws Exception {
-
-        if(log.isDebugEnabled()) {
-            log.debug("database: " + db.getName()+", script: " + script);
-        }
-
-        db.requestStart();
-        try {
-            db.requestEnsureConnection();
-
-            Object result = db.eval(script);
-
-            if(log.isDebugEnabled()) {
-                log.debug("Result : " + result);
-            }
-            return result;
-        } finally {
-            db.requestDone();
-        }
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
deleted file mode 100644
index 7cde4d0f71c..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.sampler;
-
-import org.apache.jmeter.protocol.mongodb.config.MongoSourceElement;
-import org.apache.jmeter.protocol.mongodb.mongo.EvalResultHandler;
-import org.apache.jmeter.protocol.mongodb.mongo.MongoDB;
-import org.apache.jmeter.samplers.AbstractSampler;
-import org.apache.jmeter.samplers.Entry;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testbeans.TestBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.DB;
-
-/**
- */
-public class MongoScriptSampler
-    extends AbstractSampler
-        implements TestBean {
-
-    private static final long serialVersionUID = -7789012234636439896L;
-
-    private static final Logger log = LoggerFactory.getLogger(MongoScriptSampler.class);
-
-    public final static String SOURCE = "MongoScriptSampler.source"; //$NON-NLS-1$
-
-    public final static String DATABASE = "MongoScriptSampler.database"; //$NON-NLS-1$
-    public final static String USERNAME = "MongoScriptSampler.username"; //$NON-NLS-1$
-    public final static String PASSWORD = "MongoScriptSampler.password"; //$NON-NLS-1$ NOSONAR It's not a password
-    public final static String SCRIPT = "MongoScriptSampler.script"; //$NON-NLS-1$
-
-
-    public MongoScriptSampler() {
-        trace("MongoScriptSampler()");
-    }
-
-    @Override
-    public SampleResult sample(Entry e) {
-        trace("sample()");
-
-        SampleResult res = new SampleResult();
-        String data = getScript();
-
-        res.setSampleLabel(getTitle());
-        res.setResponseCodeOK();
-        res.setResponseCode("200"); // $NON-NLS-1$
-        res.setSuccessful(true);
-        res.setResponseMessageOK();
-        res.setSamplerData(data);
-        res.setDataType(SampleResult.TEXT);
-        res.setContentType("text/plain"); // $NON-NLS-1$
-        res.sampleStart();
-
-        try {
-            MongoDB mongoDB = MongoSourceElement.getMongoDB(getSource());
-            MongoScriptRunner runner = new MongoScriptRunner();
-            DB db = mongoDB.getDB(getDatabase(), getUsername(), getPassword());
-            res.latencyEnd();
-            Object result = runner.evaluate(db, data);
-            EvalResultHandler handler = new EvalResultHandler();
-            String resultAsString = handler.handle(result);
-            res.setResponseData(resultAsString, res.getDataEncodingWithDefault());
-        } catch (Exception ex) {
-            res.setResponseCode("500"); // $NON-NLS-1$
-            res.setSuccessful(false);
-            res.setResponseMessage(ex.toString());
-            res.setResponseData(ex.getMessage(), res.getDataEncodingWithDefault());
-        } finally {
-            res.sampleEnd();
-        }
-        return res;
-    }
-
-    public String getTitle() {
-        return this.getName();
-    }
-
-    public String getScript() {
-        return getPropertyAsString(SCRIPT);
-    }
-
-    public void setScript(String script) {
-        setProperty(SCRIPT, script);
-    }
-
-    public String getDatabase() {
-        return getPropertyAsString(DATABASE);
-    }
-
-    public void setDatabase(String database) {
-        setProperty(DATABASE, database);
-    }
-
-    public String getUsername() {
-        return getPropertyAsString(USERNAME);
-    }
-
-    public void setUsername(String username) {
-        setProperty(USERNAME, username);
-    }
-
-    public String getPassword() {
-        return getPropertyAsString(PASSWORD);
-    }
-
-    public void setPassword(String password) {
-        setProperty(PASSWORD, password);
-    }
-
-    public String getSource() {
-        return getPropertyAsString(SOURCE);
-    }
-
-    public void setSource(String source) {
-        setProperty(SOURCE, source);
-    }
-
-    private void trace(String s) {
-        if(log.isDebugEnabled()) {
-            log.debug(Thread.currentThread().getName() + " (" + getTitle() + " " + s + " " + this.toString());
-        }
-    }
-}
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
deleted file mode 100644
index 00891bd5cce..00000000000
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.mongodb.sampler;
-
-import java.beans.PropertyDescriptor;
-
-import org.apache.jmeter.testbeans.BeanInfoSupport;
-import org.apache.jmeter.testbeans.gui.TypeEditor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
-  */
-public class MongoScriptSamplerBeanInfo
-    extends BeanInfoSupport {
-
-    private static final Logger log = LoggerFactory.getLogger(MongoScriptSamplerBeanInfo.class);
-
-    public MongoScriptSamplerBeanInfo() {
-        super(MongoScriptSampler.class);
-
-        //http://api.mongodb.org/java/2.7.2/com/mongodb/Mongo.html
-        createPropertyGroup("mongodb", new String[] {
-                "source",
-                "database",
-                "username",
-                "password" });
-
-        createPropertyGroup("sampler", new String[]{
-                "script"});
-
-        PropertyDescriptor p = property("database");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-        p = property("username");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-        p = property("password", TypeEditor.PasswordEditor);
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-        p = property("source");
-        p.setValue(NOT_UNDEFINED, true);
-        p.setValue(DEFAULT, "");
-
-        p = property("script", TypeEditor.TextAreaEditor);
-        p.setValue(NOT_UNDEFINED, false);
-        p.setValue(DEFAULT, "");
-        p.setValue(NOT_EXPRESSION, true);
-        p.setValue(TEXT_LANGUAGE, "javascript");  // $NON-NLS-1$
-
-        if(log.isDebugEnabled()) {
-            for (PropertyDescriptor pd : getPropertyDescriptors()) {
-                log.debug(pd.getName());
-                log.debug(pd.getDisplayName());
-            }
-        }
-    }
-}
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties
deleted file mode 100644
index 78bf9299597..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Stored by I18NEdit, may be edited!
-autoConnectRetry.displayName=Keep trying
-autoConnectRetry.shortDescription=If true, the driver will keep trying to connect to the same server in case that the socket cannot be established.<br><br>There is maximum amount of time to keep retrying, which is 15s by default.<br><br>This can be useful to avoid some exceptions being thrown when a server is down temporarily by blocking the operations.<br><br>It also can be useful to smooth the transition to a new master (so that a new master is elected within the retry time).<br><br>Note that when using this flag\:<br>- for a replica set, the driver will trying to connect to the old master for that time, instead of failing over to the new one right away -<br> this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application.<br><br>Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations. <br><br>Default is false.
-connectTimeout.displayName=Connection timeout
-connectTimeout.shortDescription=The connection timeout in milliseconds.<br><br>It is used solely when establishing a new connection Socket.connect(java.net.SocketAddress, int)<br><br>Default is 0 and means no timeout.
-connection.displayName=Server Address List
-connection.shortDescription=Server Address List
-connectionsPerHost.displayName=Maximum connections Per Host
-connectionsPerHost.shortDescription=The maximum number of connections allowed per host for this Mongo instance.<br><br>Those connections will be kept in a pool when idle.<br><br>Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.<br><br>Default is 10.
-continueOnInsertError.displayName=Continue on Error
-continueOnInsertError.shortDescription=If batch inserts should continue after the first error
-displayName=MongoDB Source Config (DEPRECATED)
-fsync.displayName=Fsync
-fsync.shortDescription=The fsync value of the global WriteConcern.<br><br>Default is false.
-maxAutoConnectRetryTime.displayName=Maximum retry time
-maxAutoConnectRetryTime.shortDescription=The maximum amount of time in MS to spend retrying to open connection to the same server.<br><br>Default is 0, which means to use the default 15s if autoConnectRetry is on.
-maxWaitTime.displayName=Maximum wait time
-maxWaitTime.shortDescription=The maximum wait time in ms that a thread may wait for a connection to become available.<br><br>Default is 120,000.
-mongodb.displayName=MongoDB Connection
-mongodb.shortDescription=Configure the connection
-options.displayName=MongoDB Options
-options.shortDescription=Various settings for the driver
-safe.displayName=Safe
-safe.shortDescription=If true the driver will use a WriteConcern of WriteConcern.SAFE for all operations.<br><br>If w, wtimeout, fsync or j are specified, this setting is ignored.<br><br>Default is false.
-socketKeepAlive.displayName=Socket keep alive
-socketKeepAlive.shortDescription=This flag controls the socket keep alive feature that keeps a connection alive through firewalls Socket.setKeepAlive(boolean)<br><br>Default is false.
-socketTimeout.displayName=Socket timeout
-socketTimeout.shortDescription=The socket timeout in milliseconds It is used for I/O socket read and write operations Socket.setSoTimeout(int)<br><br>Default is 0 and means no timeout.
-source.displayName=MongoDB Source
-source.shortDescription=Configure the Source
-threadsAllowedToBlockForConnectionMultiplier.displayName=Block Multiplier
-threadsAllowedToBlockForConnectionMultiplier.shortDescription=This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a connection to become available from the pool.<br><br>All further threads will get an exception right away.<br><br>For example if connectionsPerHost is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50 threads can wait for a connection.<br><br>Default is 5.
-waitForJournaling.displayName=Wait for Journal
-waitForJournaling.shortDescription=The j value of the global WriteConcern.<br><br>Default is false.
-writeConcern.displayName=Write Concern Options
-writeConcern.shortDescription=Various settings for the driver
-writeOperationNumberOfServers.displayName=Wait for Servers
-writeOperationNumberOfServers.shortDescription=The w value of the global WriteConcern.<br><br>Default is 0.
-writeOperationTimeout.displayName=Wait Timeout
-writeOperationTimeout.shortDescription=The wtimeout value of the global WriteConcern.<br><br>Default is 0.
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties
deleted file mode 100644
index d4fefdb0f8a..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Stored by I18NEdit, may be edited!
-autoConnectRetry.displayName=Essayer de garder la connexion
-autoConnectRetry.shortDescription=Si positionné à True, le gestionnaire continuera d'essayer de se reconnecter au même serveur dans le cas où la connexion socket ne peut être établie. <br> Le délai d'attente maximum pour ressayer est de 15 sec par défaut.<br> <br>Cela peut être utile pour éviter certaines exceptions levées quand un serveur est arrêté temporairement, bloquant ainsi les opérations.<br>Il peut également être utile pour adoucir la transition vers un nouveau maître (de sorte qu'un nouveau maître est élu au sein le nombre de tentatives de temps) <br><br>N.B. Lorsque vous utilisez cette option \:<br>- pour un jeu de réplica, le gestionnaire tente de se connecter à l'ancien maître de ce moment-là, au lieu de basculer vers le nouveau -<br>cela n'empêche pas l'exception d'être levée en lecture / écriture sur la socket, qui doit être traitée par l'application <br>Même si cet indicateur est False, le gestionnaire dispose déjà de mécanismes pour recréer automatiquement connexions interrompues et de réessayer les opérations de lecture.<br><br> La valeur par défaut est False.
-connectTimeout.displayName=Delai d'expiration de connexion
-connectTimeout.shortDescription=Le délai d'expiration de connexion, en millisecondes.<br> Il est utilisé uniquement lors de l'établissement d'une nouvelle connexion Socket.connect(java.net.SocketAddress, int)<br><br>La valeur par défaut est 0 et signifie aucun délai d'attente.
-connection.displayName=Liste adresse serveur
-connection.shortDescription=Liste adresse serveur
-connectionsPerHost.displayName=Maximum de connexions par hôte
-connectionsPerHost.shortDescription=Le nombre maximum de connexions autorisées par hôte for cette instance de Mongo.<br><br>Ces connexions seront gardées dans un pool quand elles seront disponibles.<br><br>Une fois que le pool est atteint, toute opération qui nécessite une connexion sera bloquée en attendant une connexion disponible.<br><br>La valeur par défaut est 10.
-continueOnInsertError.displayName=Continuer en cas d'erreur
-continueOnInsertError.shortDescription=Indique si les insertions en batch doivent se poursuivre après la première erreur
-displayName=Gestionnaire de connexion MongoDB (DEPRECATED)
-fsync.displayName=Fsync
-fsync.shortDescription=Valeur Fsync pour l'élément global WriteConcern.<br><br>La valeur par défaut est False.
-maxAutoConnectRetryTime.displayName=Temps de re-tentative maximum
-maxAutoConnectRetryTime.shortDescription=Le délai maximal de temps en milli-secondes pour tenter d'ouvrir une connexion au même serveur.<br><br>La valeur par défaut est 0, ce qui signifie que pour utiliser les 15 sec. par défaut si autoConnectRetry est activé.
-maxWaitTime.displayName=Temps d'attente maximum
-maxWaitTime.shortDescription=Le temps d'attente maximum in milli-secondes qu'une unité d'exécution peut attendre pour qu'une connexion devienne disponible.<br><br>La valeur par défaut est 120000.
-mongodb.displayName=Connexion MongoDB
-mongodb.shortDescription=Configurer la connexion
-options.displayName=Options MongoDB
-options.shortDescription=Divers paramètres pour le gestionnaire
-safe.displayName=Sûreté (Safe)
-safe.shortDescription=Si positionné à True, le gestionnaire utilisera un WriteConcern de WriteConcern.SAFE pour toutes les opérations.<br><br>Si w, wtimeout, fsync or j sont spécifiés, ce paramètre est ignoré.<br><br>La valeur par défaut est False.
-socketKeepAlive.displayName=Socket persistante
-socketKeepAlive.shortDescription=Cet indicateur contrôle la fonctionnalité de garder la socket persistante à travers un pare-feu Socket.setKeepAlive(boolean)<br><br>La valeur par défaut est false.
-socketTimeout.displayName=Délai d'expiration Socket
-socketTimeout.shortDescription=Le délai d'expiration de Socket en milli-secondes. Il est utilisé pour en E/S de socket pour les opérations de lecture et écriture Socket.setSoTimeout(int)<br><br>La valeur par défaut est 0 et signifie \: pas de délai.
-source.displayName=Source MongoDB
-source.shortDescription=Configurer la source
-threadsAllowedToBlockForConnectionMultiplier.displayName=Multiplicateur de blocage
-threadsAllowedToBlockForConnectionMultiplier.shortDescription=Ce multiplicateur, multiplié avec le paramètre connectionsPerHost, donne le nombre maximal d'unités qui peuvent être en attente qu'une connexion se libère du pool.<br>Au délà une exception sera levée immédiatement.<br><br>Par exemple, si connectionsPerHost est de 10 et threadsAllowedToBlockForConnectionMultiplier est de 5, Alors jusqu'à 50 threads peuvent attendre une connexion.<br>La valeur par défaut est 5.
-waitForJournaling.displayName=Attente du Journal
-waitForJournaling.shortDescription=La valeur j pour l'élément global WriteConcern.<br><br>La valeur par défaut est False.
-writeConcern.displayName=Options Write Concern
-writeConcern.shortDescription=Divers paramètres pour le gestionnaire
-writeOperationNumberOfServers.displayName=Attente des serveurs
-writeOperationNumberOfServers.shortDescription=La valeur w pour l'élément global WriteConcern.<br><br>La valeur par défaut est 0.
-writeOperationTimeout.displayName=Délai d'attente
-writeOperationTimeout.shortDescription=La valeur wtimeout pour l'élément global WriteConcern.<br><br>La valeur par défaut est 0.
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_ko.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_ko.properties
deleted file mode 100644
index 7f3ca4f6dc6..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_ko.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-autoConnectRetry.displayName=계속 시도
-autoConnectRetry.shortDescription=true로 설정되는 경우, 소켓이 확립되지 않으면 드라이버가 동일 서버에 계속 연결을 시도할 것입니다.<br><br>재시도 최대 시간은 기본 값으로 15초로 설정되어 있습니다.<br><br>서버가 일시적으로 다운되어 있을 때, 이는 해당 오퍼레이션들을 중단 시킴으로써 유용한 기능을 제공할 수 있습니다.<br><br>또한 새로운 마스터로 유연하게 이전하는 데에도 도움을 줄 수 있습니다. (재시도 대기 시간 동안 새로운 마스터가 선출될 수 있게 됩니다.)<br><br>이 플래그를 사용 시 주의점\:<br>- 레플리카 셋에서는, 이러한 경우 드라이버가 새로운 마스터로 곧바로 연결 시도하는 대신에, 다시 이전 마스터에 연결하려 할 것입니다.<br>이는 소켓에 대한 읽기/쓰기 오퍼레이션 시에 익셉션이 발생하게 만들 것인데, 이런 문제는 애플리케이션에 반드시 처리되어야 합니다.<br><br>이 플래그가 false로 설정되는 경우에도, 드라이버는 끊어진 연결들을 재생성하고 다시 읽기 오퍼레이션들을 시도하는 메커니즘은 이미 가지고 있습니다.<br><br>기본 값은 false.
-connectTimeout.displayName=연결 타임아웃
-connectTimeout.shortDescription=연결 타임아웃을 밀리초로 설정.<br><br>이 값은 오직 새로운 소켓 연결 시, 즉 Socket.connect(java.net.SocketAddress, int) 시에만 사용됩니다.<br><br>기본 값은 0인데 이는 타임아웃이 없음을 의미합니다.
-connection.displayName=서버 주소 목록
-connection.shortDescription=서버 주소 목록
-connectionsPerHost.displayName=호스트 당 최대 연결 갯수
-connectionsPerHost.shortDescription=이 Mongo 인스턴스를 위한 호스트 당 최대 허용 연결 갯수.<br><br>연결들은 유휴 시 연결 풀에 보관됩니다.<br><br>연결 풀 내의 모든 연결들이 사용되고 있는 경우, 연결을 얻고자 하는 어떤 오퍼레이션도 다음 가용한 연결을 얻을 때까지 중단, 대기하게 됩니다.<br><br>기본 값은 10.
-continueOnInsertError.displayName=오류 발생 시 계속
-continueOnInsertError.shortDescription=첫 오류 발생 후 배치 Insert 작업들이 계속되어야 하는지 여부
-displayName=MongoDB 원본 설정 (DEPRECATED)
-fsync.displayName=Fsync
-fsync.shortDescription=global WriteConcern의 Fsync 설정 값.<br><br>기본 값은 false.
-maxAutoConnectRetryTime.displayName=재시도 최대 시간
-maxAutoConnectRetryTime.shortDescription=동일 서버에 연결을 열기 위한 재시도 최대 시간을 밀리초로 설정합니다.<br><br>기본 값은 0 인데, 이는 autoConnectRetry 옵션이 활성화된 경우 기본 값인 15초를 사용함을 의미합니다.
-maxWaitTime.displayName=최대 대기 시간
-maxWaitTime.shortDescription=가용한 연결을 얻을 때까지 쓰레드가 기다릴 수 있는 최대 대기 시간을 밀리초로 설정합니다.<br><br>기본 값은 120,000.
-mongodb.displayName=MongoDB 연결
-mongodb.shortDescription=연결 설정
-options.displayName=MongoDB 옵션들
-options.shortDescription=드라이버에 대한 다양한 설정들
-safe.displayName=안전
-safe.shortDescription=이것이 설정되는 경우, 드라이버는 모든 오퍼레이션들에서 WriteConcern.SAFE 옵션을 사용할 것입니다.<br><br>만일 w, wtimeout, fsync 또는 j 가 지정되는 경우, 이 설정은 무시됩니다.<br><br>기본 값은 false.
-socketKeepAlive.displayName=소켓 Keep Alive 옵션
-socketKeepAlive.shortDescription=이 플래그는 소켓 Keep Alive 옵션을 제어합니다. 이는 내부적으로 Socket.setKeepAlive(boolean)를 사용하는데, 방화벽을 통과하여 게속 연결을 유지할 수 있는 옵션을 제공합니다.<br><br>기본 값은 false.
-socketTimeout.displayName=소켓 타임아웃
-socketTimeout.shortDescription=소켓 타임아웃을 밀리초로 설정. 내부적으로 Socket.setSoTimeout(int)으로 설정되며, 이는 I/O 소켓 읽기 및 쓰기 오퍼레이션에 적용됩니다.<br><br>기본 값은 0으로, 이는 타임아웃이 없음을 의미합니다.
-source.displayName=MongoDB 원본
-source.shortDescription=원본 설정
-threadsAllowedToBlockForConnectionMultiplier.displayName=Block 승수
-threadsAllowedToBlockForConnectionMultiplier.shortDescription=connectionsPerHost 설정 값과 곱해지는 이 승수는, (연결 풀에서 가용 연결을 얻기 위해 대기할 수 있는) 쓰레드들의 최대 갯수를 산출합니다.<br><br>그 갯수 이상의 쓰레드들은 즉시 익셉션을 받게 될 것입니다.<br><br>예를 들어 connectionsPerHost가 10이고 threadsAllowedToBlockForConnectionMultiplier이 5인 경우, 최대 50 개의 쓰레드들이 연결을 얻기 위해 대기할 수 있습니다.<br><br>기본 값은 5.
-waitForJournaling.displayName=저널 기다리기
-waitForJournaling.shortDescription=global WriteConcern의 j 설정 값.<br><br>기본 값은 false.
-writeConcern.displayName=Write Concern 옵션들
-writeConcern.shortDescription=드라이버를 위한 다양한 설정들
-writeOperationNumberOfServers.displayName=서버들을 기다리기
-writeOperationNumberOfServers.shortDescription=global WriteConcern의 w 설정 값.<br><br>기본 값은 0.
-writeOperationTimeout.displayName=대기 타임아웃
-writeOperationTimeout.shortDescription=global WriteConcern의 wtimeout 설정 값.<br><br>기본 값은 0.
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties
deleted file mode 100644
index 3b4dd894683..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Stored by I18NEdit, may be edited!
-database.displayName=Database Name
-displayName=MongoDB Script (DEPRECATED)
-mongodb.displayName=MongoDB Connection
-mongodb.shortDescription=Configure the connection
-password.displayName=Password
-sampler.displayName=Script
-script.displayName=The script to run
-script.shortDescription=Add your mongo shell script as you would via the mongo shell.
-source.displayName=MongoDB Source
-source.shortDescription=Configure the Source
-username.displayName=Username
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties
deleted file mode 100644
index 7b4357033e2..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Stored by I18NEdit, may be edited!
-database.displayName=Nom base de données
-displayName=Script MongoDB (DEPRECATED)
-mongodb.displayName=Connexion MongoDB
-mongodb.shortDescription=Configurer la connexion
-password.displayName=Mot de passe
-sampler.displayName=Script
-script.displayName=Le script à exécuter
-script.shortDescription=Ajouter votre script shell mongo comme vous le feriez dans le shell mongo.
-source.displayName=Source MongoDB
-source.shortDescription=Configurer la Source
-username.displayName=Utilisateur
diff --git a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_ko.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_ko.properties
deleted file mode 100644
index 2ccb1b19350..00000000000
--- a/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_ko.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-database.displayName=데이터베이스 이름
-displayName=MongoDB 스크립트 (DEPRECATED)
-mongodb.displayName=MongoDB 연결
-mongodb.shortDescription=연결 설정
-password.displayName=비밀번호
-sampler.displayName=스크립트
-script.displayName=실행할 스크립트
-script.shortDescription=Mongo 셸 스크립트 (Mongo 셸에서 실행할 수 있는 동일한 방식으로)
-source.displayName=MongoDB 원본
-source.shortDescription=원본 설정
-username.displayName=사용자명
diff --git a/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java b/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java
deleted file mode 100644
index e60217edd4e..00000000000
--- a/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.resources;
-
-public class ResourceKeyUsageTestMongodb extends ResourceKeyUsageTest {
-    // Test from the base class is used, so we just validate current module
-}
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 213a62758ed..063fed59a65 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -1930,39 +1930,6 @@ If the timeout expires before the command finishes, JMeter will attempt to kill
 </properties>
 </component>
 
-<component name="MongoDB Script (DEPRECATED)" index="&sect-num;.1.21" width="847" height="635" screenshot="mongodb-script.png">
-<description><p>This sampler lets you send a Request to a MongoDB.</p>
-<p>Before using this you need to set up a
-<complink name="MongoDB Source Config"/> Configuration element
-</p>
-<note>This Element currently uses <code>com.mongodb.DB#eval</code> which takes a global write lock causing a performance impact on the database, see <a href="http://docs.mongodb.org/manual/reference/method/db.eval/"><code>db.eval()</code></a>.
-So it is better to avoid using this element for load testing and use JSR223+Groovy scripting using <apilink href="org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.html">MongoDBHolder</apilink> instead.
-MongoDB Script is more suitable for functional testing or test setup (setup/teardown threads)</note>
-</description>
-
-<properties>
-        <property name="Name" required="No">Descriptive name for this sampler that is shown in the tree.</property>
-        <property name="MongoDB Source" required="Yes">
-        Name of the JMeter variable that the MongoDB connection is bound to.
-        This must agree with the '<code>MongoDB Source</code>' field of a MongoDB Source Config.
-        </property>
-        <property name="Database Name" required="Yes">Database Name, will be used in your script
-        </property>
-        <property name="Username" required="No">
-        </property>
-        <property name="Password" required="No">
-        </property>
-        <property name="Script" required="Yes">
-        Mongo script as it would be used in MongoDB shell
-        </property>
-</properties>
-
-<links>
-        <complink name="MongoDB Source Config"/>
-</links>
-<note>Ensure Variable Name is unique across Test Plan.</note>
-</component>
-
 <a href="#">^</a>
 
 
@@ -4441,93 +4408,6 @@ GUI that they can use while developing new JMeter components.</p>
 
 </component>
 
-
-<component name="MongoDB Source Config (DEPRECATED)" index="&sect-num;.4.20"
-                 width="1233" height="618" screenshot="mongodb-source-config.png">
-    <description>Creates a MongoDB connection (used by <complink name="MongoDB Script"/>Sampler)
-     from the supplied Connection settings. Each thread gets its own connection.
-     The connection configuration name is used by the JDBC Sampler to select the appropriate
-     connection.
-     <p>
-     You can then access <code>com.mongodb.DB</code> object in Beanshell or JSR223 Test Elements through the element <apilink href="org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.html">MongoDBHolder</apilink>
-     using this code</p>
-
-    <source>
-import com.mongodb.DB;
-import org.apache.jmeter.protocol.mongodb.config.MongoDBHolder;
-DB db = MongoDBHolder.getDBFromSource("value of property MongoDB Source",
-            "value of property Database Name");
-&hellip;
-    </source>
-    </description>
-    <properties>
-        <property name="Name" required="No">Descriptive name for the connection configuration that is shown in the tree.</property>
-        <property name="Server Address List" required="Yes">Mongo DB Servers</property>
-        <property name="MongoDB Source" required="Yes">The name of the variable the connection is tied to.
-        <note>Each name must be different. If there are two configuration elements using the same name, only one will be saved.</note>
-        </property>
-
-        <property name="Keep Trying" required="No">
-            If <code>true</code>, the driver will keep trying to connect to the same server in case that the socket cannot be established.<br/>
-            There is maximum amount of time to keep retrying, which is 15s by default.<br/>This can be useful to avoid some exceptions being thrown when a server is down temporarily by blocking the operations.
-            <br/>It can also be useful to smooth the transition to a new primary node (so that a new primary node is elected within the retry time).<br/>
-            <note>Note that when using this flag
-              <ul>
-                <li>for a replica set, the driver will try to connect to the old primary node for that time, instead of failing over to the new one right away </li>
-                <li>this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application.</li>
-              </ul>
-              Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations.
-            </note>
-            Default is <code>false</code>.
-        </property>
-        <property name="Maximum connections per host" required="No"></property>
-        <property name="Connection timeout" required="No">
-            The connection timeout in milliseconds.<br/>It is used solely when establishing a new connection <code>Socket.connect(java.net.SocketAddress, int)</code><br/>Default is <code>0</code> and means no timeout.
-        </property>
-        <property name="Maximum retry time" required="No">
-            The maximum amount of time in milliseconds to spend retrying to open connection to the same server.<br/>Default is <code>0</code>, which means to use the default 15s if <code>autoConnectRetry</code> is on.
-        </property>
-        <property name="Maximum wait time" required="No">
-            The maximum wait time in milliseconds that a thread may wait for a connection to become available.<br/>Default is <code>120,000</code>.
-        </property>
-        <property name="Socket timeout" required="No">
-            The socket timeout in milliseconds It is used for I/O socket read and write operations <code>Socket.setSoTimeout(int)</code><br/>Default is <code>0</code> and means no timeout.
-        </property>
-        <property name="Socket keep alive" required="No">
-            This flag controls the socket keep alive feature that keeps a connection alive through firewalls <code>Socket.setKeepAlive(boolean)</code><br/>
-            Default is <code>false</code>.
-        </property>
-        <property name="ThreadsAllowedToBlockForConnectionMultiplier" required="No">
-        This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a connection to become available from the pool.<br/>
-        All further threads will get an exception right away.<br/>
-        For example if <code>connectionsPerHost</code> is <code>10</code> and <code>threadsAllowedToBlockForConnectionMultiplier</code> is <code>5</code>, then up to 50 threads can wait for a connection.<br/>
-        Default is <code>5</code>.
-        </property>
-        <property name="Write Concern: Safe" required="No">
-            If <code>true</code> the driver will use a <code>WriteConcern</code> of <code>WriteConcern.SAFE</code> for all operations.<br/>
-            If <code>w</code>, <code>wtimeout</code>, <code>fsync</code> or <code>j</code> are specified, this setting is ignored.<br/>
-            Default is <code>false</code>.
-        </property>
-        <property name="Write Concern: Fsync" required="No">
-            The <code>fsync</code> value of the global <code>WriteConcern</code>.<br/>
-            Default is <code>false</code>.
-        </property>
-        <property name="Write Concern: Wait for Journal" required="No">
-            The <code>j</code> value of the global <code>WriteConcern</code>.<br/>
-            Default is <code>false</code>.
-        </property>
-        <property name="Write Concern: Wait for servers" required="No">
-            The <code>w</code> value of the global <code>WriteConcern</code>.<br/>Default is <code>0</code>.
-        </property>
-        <property name="Write Concern: Wait timeout" required="No">
-            The <code>wtimeout</code> value of the global <code>WriteConcern</code>.<br/>Default is <code>0</code>.
-        </property>
-        <property name="Write Concern: Continue on error" required="No">
-            If batch inserts should continue after the first error
-        </property>
-    </properties>
-</component>
-
 <a href="#">^</a>
 
 <component name="Bolt Connection Configuration" index="&sect-num;.4.21"
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index d74ece0613d..a40ae5027a6 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -246,10 +246,6 @@ Defaults to: <code>true</code>
 </property>
 <property name="not_in_menu">
     Components to not display in JMeter GUI (GUI class name or static label).<br/>
-    These elements are deprecated and will be removed in next version:
-    <source>MongoDB Script, MongoDB Source Config</source>
-    Defaults to:
-    <source>org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler, org.apache.jmeter.protocol.mongodb.config.MongoSourceElement</source>
 </property>
 <property name="undo.history.size">
     Number of items in undo history.<br/>

From da4bf49675ef0aa0d9412a5b71b9688dde1d7cdb Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 20:46:21 +0300
Subject: [PATCH 0935/1037] chore: drop xerces:xercesImpl dependency, avoid
 renovate bumping xml-apis to v2

xml-apis 2.0.2 is a mere relocation to 1.0.b2, so it makes no sense using v2
---
 lib/aareadme.txt                            | 6 ------
 renovate.json                               | 7 +++++++
 src/bom-thirdparty/build.gradle.kts         | 1 -
 src/core/build.gradle.kts                   | 3 ---
 src/dist/src/dist/expected_release_jars.csv | 1 -
 xdocs/usermanual/get-started.xml            | 3 +--
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 9531d6aaa12..96315b8a9e3 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -262,12 +262,6 @@ xalan_2.7.1
 http://www.apache.org/dyn/closer.cgi/xml/xalan-j
 +org.apache.xalan|xml|xpath
 
-xercesImpl-2.12.0
-----------------
-http://xerces.apache.org/xerces2-j/download.cgi
-+org.apache.html.dom|org.apache.wml|org.apache.xerces|org.apache.xml.serialize
-+org.w3c.dom.html|ls
-
 xml-apis-1.4.01
 --------------
 http://xerces.apache.org/xerces2-j/download.cgi
diff --git a/renovate.json b/renovate.json
index 602682c8953..e4d4e650fa0 100644
--- a/renovate.json
+++ b/renovate.json
@@ -175,6 +175,13 @@
         "org.slf4j{/,}**"
       ]
     },
+    {
+      "groupName": "xml-apis:xml-apis",
+      "allowedVersions": "< 2.0.0",
+      "matchPackageNames": [
+        "xml-apis:xml-apis{/,}**"
+      ]
+    },
     {
       "enabled": false,
       "matchPackageNames": [
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c92d103e672..3f98a163bd2 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -137,7 +137,6 @@ dependencies {
         api("oro:oro:2.0.8")
         api("xalan:serializer:2.7.3")
         api("xalan:xalan:2.7.3")
-        api("xerces:xercesImpl:2.12.2")
         api("xml-apis:xml-apis:1.4.01")
         api("xmlpull:xmlpull:1.1.3.1")
     }
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index d8bef3e9fcb..05d395e3979 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -121,9 +121,6 @@ dependencies {
     implementation("org.jodd:jodd-props")
     implementation("org.mozilla:rhino")
     implementation("org.slf4j:jcl-over-slf4j")
-    // TODO: JMeter bundles Xerces, however the reason is unknown
-    runtimeOnly("xerces:xercesImpl")
-    runtimeOnly("xml-apis:xml-apis")
 
     testImplementation("commons-net:commons-net")
     testImplementation("io.mockk:mockk")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index cd9b0d74d76..a3b57ebed51 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -154,7 +154,6 @@
 2539,swing-extensions-visual-padding-0.1.3.jar
 778543,tika-core-3.2.3.jar
 3455761,xalan-2.7.3.jar
-1446149,xercesImpl-2.12.2.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
 686441,xmlgraphics-commons-2.11.jar
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 015d8e6d32a..7f0242357e7 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -851,8 +851,7 @@ If set to <code>0</code> (default value), then JMeter does not print non-termina
     <property name="ssl.provider">You can specify the class for your SSL
     implementation if you don't want to use the built-in Java implementation.
     </property>
-    <property name="xml.parser">You can specify an implementation as your XML
-    parser. The default value is: <code>org.apache.xerces.parsers.SAXParser</code></property>
+    <property name="xml.parser">You can specify an implementation as your XML parser.</property>
   <property name="remote_hosts">Comma-delimited list of remote JMeter hosts (or <code>host:port</code> if required).
     If you are running JMeter in a distributed environment, list the machines where
   you have JMeter remote servers running.  This will allow you to control those

From 7a729c5cbe760051a841862c080c11949260617d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 20:46:51 +0300
Subject: [PATCH 0936/1037] chore: add PureJavaReflectionProvider to XStream
 constructor

It might help to prevent XStream Unsafe usage
---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index e5d22a318b1..816f2553f70 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -80,6 +80,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import com.thoughtworks.xstream.security.NoTypePermission;
 
@@ -1416,7 +1417,7 @@ public static String formatJMeterExportedVariableName(String elementName) {
      * @return {@link XStream} XStream instance following JMeter security policy
      */
     public static final XStream createXStream() {
-        XStream xstream = new XStream();
+        XStream xstream = new XStream(new PureJavaReflectionProvider());
         JMeterUtils.setupXStreamSecurityPolicy(xstream);
         return xstream;
     }

From 2c17f5d2b6b0fa7e0f69dbd56785386a785c8745 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 31 Oct 2025 20:47:15 +0300
Subject: [PATCH 0937/1037] test: JUnit5 does not execute static test methods,
 so revert static modifiers

---
 .../visualizers/backend/SamplerMetricFixedModeTest.java     | 6 +++---
 .../visualizers/backend/SamplerMetricTimedModeTest.java     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
index f174d2582b6..63dfa566d04 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java
@@ -78,7 +78,7 @@ public void checkResetKoAndAllStats() throws Exception {
     }
 
     @Test
-    public static void checkErrorsDetailStat() {
+    public void checkErrorsDetailStat() {
         SamplerMetric metric = new SamplerMetric();
         metric.add(createSampleResult("400", "bad request"));
         metric.add(createSampleResult("400", "Bad Request "));
@@ -124,7 +124,7 @@ private static SampleResult createSampleResultWithSubresults(boolean success) {
     }
 
     @Test
-    public static void checkAddCumulatedOk() throws Exception {
+    public void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
         assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
@@ -145,7 +145,7 @@ public static void checkAddCumulatedOk() throws Exception {
     }
 
     @Test
-    public static void checkAddCumulatedKo() throws Exception {
+    public void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
         assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
diff --git a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
index 3cb898f1f72..420bd6a9705 100644
--- a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java
@@ -106,7 +106,7 @@ private static SampleResult createSampleResultWithSubresults(boolean success) {
     }
 
     @Test
-    public static void checkAddCumulatedOk() throws Exception {
+    public void checkAddCumulatedOk() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(true);
         assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");
@@ -127,7 +127,7 @@ public static void checkAddCumulatedOk() throws Exception {
     }
 
     @Test
-    public static void checkAddCumulatedKo() throws Exception {
+    public void checkAddCumulatedKo() throws Exception {
         SamplerMetric metric = new SamplerMetric();
         SampleResult sample = createSampleResultWithSubresults(false);
         assertEquals(true, TransactionController.isFromTransactionController(sample), "We are recognized as a TransactionController made sample");

From 642a1e266d80af374106b3437431ac599819dcbe Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 27 Oct 2025 17:22:43 +0000
Subject: [PATCH 0938/1037] fix(deps): update dependency
 org.apache.commons:commons-jexl3 to v3.5.0

---
 gradle/verification-metadata.xml                             | 5 +++++
 src/bom-thirdparty/build.gradle.kts                          | 2 +-
 src/dist/src/dist/expected_release_jars.csv                  | 2 +-
 .../main/java/org/apache/jmeter/functions/Jexl3Function.java | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4be1109f083..b8880e8cd58 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -653,6 +653,11 @@
             <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="81">
+         <artifact name="commons-parent-81.pom">
+            <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
          <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
             <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 3f98a163bd2..f26a2b6d191 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -91,7 +91,7 @@ dependencies {
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.5.0")
         api("org.apache.commons:commons-dbcp2:2.9.0")
-        api("org.apache.commons:commons-jexl3:3.2.1")
+        api("org.apache.commons:commons-jexl3:3.5.0")
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.19.0") {
             because("User might still rely on commons-lang3")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index a3b57ebed51..f7115320585 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -30,7 +30,7 @@
 211301,commons-dbcp2-2.9.0.jar
 563971,commons-io-2.20.0.jar
 267634,commons-jexl-2.1.1.jar
-462124,commons-jexl3-3.2.1.jar
+558963,commons-jexl3-3.5.0.jar
 924068,commons-jvm-4.7.3.jar
 709075,commons-lang3-3.19.0.jar
 73737,commons-logging-1.3.5.jar
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
index 69b86555c17..132d70810dc 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java
@@ -26,6 +26,7 @@
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlScript;
 import org.apache.commons.jexl3.MapContext;
+import org.apache.commons.jexl3.introspection.JexlPermissions;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -116,6 +117,8 @@ private static JexlEngine createJexlEngine() {
                 .cache(512)
                 .silent(true)
                 .strict(true)
+                // TODO: allow customization for the permissions
+                .permissions(JexlPermissions.UNRESTRICTED)
                 // debug is true by default an impact negatively performances
                 // by a factory of 10
                 // Use JexlInfo if necessary

From df944af1e6dbee02b3c846844f73157619bead65 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Sat, 1 Nov 2025 19:22:26 +0300
Subject: [PATCH 0939/1037] chore: deliver fonts from Apache website rather
 than 3rd party CDN

Fixes https://github.com/apache/jmeter/issues/6552
---
 .gitignore                                    |  3 +
 .ratignore                                    |  4 +
 .../kotlin/build-logic.autostyle.gradle.kts   |  8 +-
 gradle/verification-metadata.xml              | 36 +++++++++
 settings.gradle.kts                           | 15 ++++
 .../assertions/XMLSchemaAssertionTest.java    |  7 +-
 .../jmeter/assertions/XPathAssertionTest.java |  3 +-
 .../jmeter/assertions/XmlAssertionTest.java   |  7 +-
 .../jmeter/extractor/TestXPathExtractor.java  | 22 ++----
 .../action/template/TestTemplateManager.java  |  4 +-
 .../assertions/AssertionResultExtensions.kt   | 34 +++++++++
 src/dist/build.gradle.kts                     | 75 +++++++++++++++++--
 xdocs/package-lock.json                       | 34 +++++++++
 xdocs/package.json                            | 10 +++
 xdocs/stylesheets/website-style.xsl           | 16 ++--
 xdocs/yarn.lock                               | 13 ++++
 16 files changed, 257 insertions(+), 34 deletions(-)
 create mode 100644 src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt
 create mode 100644 xdocs/package-lock.json
 create mode 100644 xdocs/package.json
 create mode 100644 xdocs/yarn.lock

diff --git a/.gitignore b/.gitignore
index 2400313e97b..13f89d12a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,6 @@ jmeter-fb.*
 hs_err_pid*
 # other jvm related files
 .attach_*
+
+# npm/node dependencies and generated web assets
+/xdocs/node_modules/
diff --git a/.ratignore b/.ratignore
index 904b2802f2c..8a99b773812 100644
--- a/.ratignore
+++ b/.ratignore
@@ -36,6 +36,10 @@ test/resources/**
 #**/*.log
 **/download_jmeter.cgi
 xdocs/extending/HTML_REPORT_README.TXT
+xdocs/node_modules/**
+xdocs/package.json
+xdocs/package-lock.json
+xdocs/yarn.lock
 # Rat should automatically detect below files as binary, however it fails
 **/*.sxi
 **/*.sxw
diff --git a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
index eb874732ff4..ffcf7b8888e 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -50,6 +50,8 @@ autostyle {
             include("**/*.xsd", "**/*.xsl", "**/*.xml")
             // Autostyle does not support gitignore yet https://github.com/autostyle/autostyle/issues/13
             exclude("out/**")
+            exclude(".gradle/**")
+            exclude("node_modules")
             if (project == rootProject) {
                 if (isActualPluginApplication) {
                     exclude(rootDir.resolve(".ratignore").readLines())
@@ -65,7 +67,11 @@ autostyle {
         license()
     }
     format("markdown") {
-        filter.include("**/*.md")
+        filter {
+            include("**/*.md")
+            exclude(".gradle/**")
+            exclude("node_modules")
+        }
         endWithNewline()
     }
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b8880e8cd58..d46bb6a739c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -373,6 +373,19 @@
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
          </artifact>
       </component>
+      <component group="com.github.node-gradle" name="gradle-node-plugin" version="7.1.0">
+         <artifact name="gradle-node-plugin-7.1.0.jar">
+            <sha256 value="9aa26c3b075f42eb801fc94cb32fc59c6968a78119efda9ce02356834a2d3198" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-node-plugin-7.1.0.module">
+            <sha256 value="6cf277b82986e413210de0e3e4fe9c109c7bdaa5169d48cfed526d06a1c3d0b0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.node-gradle.node" name="com.github.node-gradle.node.gradle.plugin" version="7.1.0">
+         <artifact name="com.github.node-gradle.node.gradle.plugin-7.1.0.pom">
+            <sha256 value="dc0e8e782ba0dac5c4d0d8678081c11380a5c793b3c46f2d0f8d242d1733b62b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
          <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -822,6 +835,29 @@
             <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.nodejs" name="node" version="25.1.0">
+         <artifact name="node-25.1.0-darwin-arm64.tar.gz">
+            <sha256 value="811dcf54580d9eef0abfed9f65457545d2aac8e24853b6e638194fcba0257168" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-darwin-x64.tar.gz">
+            <sha256 value="5c2d45214e70327e683df301eeb11d8fc9265ab22ad41ff6335e4a7befc07169" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-arm64.tar.gz">
+            <sha256 value="9cc83fc5dfdc36692aabec37ab1c6d070d11c44f02764b5e50777491552e8449" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-s390x.tar.gz">
+            <sha256 value="bdd93b9ce06a6e6bcdc0af9d838b9861cbcb4271481f5c5bd4e965601bc5b155" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-x64.tar.gz">
+            <sha256 value="0b8de924cd43546a2098c091b73002442cd61340622b2c1489df408755de21fc" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-win-arm64.zip">
+            <sha256 value="8063f6caa9f865cd1ddc30b7bccb6ddb457b7cac0d61e30e74ff85b97b32673b" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-win-x64.zip">
+            <sha256 value="abab8d2fff33dad361e51b51dfadd1f8aaef8677f88d21e3cccaf7b6e6f46339" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d129bee88de..97082d1e4d7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,6 +18,7 @@
 pluginManagement {
     plugins {
         id("com.github.vlsi.stage-vote-release") version "2.0.0"
+        id("com.github.node-gradle.node") version "7.1.0"
     }
 }
 
@@ -32,6 +33,20 @@ dependencyResolutionManagement {
     repositories {
         // TODO: support enableMavenLocal
         mavenCentral()
+        // Declare the Node.js download repository
+        ivy {
+            name = "Node.js"
+            setUrl("https://nodejs.org/dist/")
+            patternLayout {
+                artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
+            }
+            metadataSources {
+                artifact()
+            }
+            content {
+                includeModule("org.nodejs", "node")
+            }
+        }
     }
 }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
index a3e6500d4f1..4e290e833bb 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -99,7 +100,7 @@ public void testAssertionBadXSDFile() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Failed to read schema document") > 0);
+        assertEnFailureMessageContains(res, "Failed to read schema document");
         assertTrue(res.isError());// TODO - should this be a failure?
         assertFalse(res.isFailure());
     }
@@ -147,7 +148,7 @@ public void testAssertionBlankResult() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertEnFailureMessageContains(res, "Premature end of file");
         assertTrue(res.isError());
         assertFalse(res.isFailure());
     }
@@ -162,7 +163,7 @@ public void testXMLTrailingContent() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Content is not allowed in trailing section") > 0);
+        assertEnFailureMessageContains(res, "Content is not allowed in trailing section");
         assertTrue(res.isError());
         assertFalse(res.isFailure());
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
index a33e4ba8f42..f33e78fc16e 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -271,7 +272,7 @@ public void testAssertionBlankResult() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertEnFailureMessageContains(res, "Premature end of file");
         assertTrue(res.isError(), "Should be an error");
         assertFalse(res.isFailure(), "Should not be a failure");
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
index bc35a1c5058..9b839126430 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -62,8 +64,7 @@ public void testUnsecureX() throws Exception {
         result = assertion.getResult(sampleResult);
         assertTrue(result.isFailure());
         assertTrue(result.isError());
-        assertEquals("DOCTYPE is disallowed when the feature \"http://apache.org/xml/features/disallow-doctype-decl\" set to true.",
-                    result.getFailureMessage());
+        assertFailureMessageContains(result, "http://apache.org/xml/features/disallow-doctype-decl");
     }
 
     @Test
@@ -91,6 +92,6 @@ public void testNoXML() throws Exception {
         assertTrue(result.isFailure());
         assertTrue(result.isError());
         assertNotNull(result.getFailureMessage());
-        assertTrue(result.getFailureMessage().contains("Content is not allowed in prolog"));
+        assertEnFailureMessageContains(result, "Content is not allowed in prolog");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
index 15ebb4ed259..f6122326829 100644
--- a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
+++ b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.extractor;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -276,13 +277,7 @@ public void testInvalidXpath() throws Exception {
                 firstResult.getFailureMessage(),
                 "<",
                 "'<' is an invalid character in xpath, so it is expected to be present in the error message");
-        if (Locale.getDefault().getLanguage().startsWith(Locale.ENGLISH.getLanguage())) {
-            assertContains(
-                    firstResult.getFailureMessage(),
-                    "A location path was expected, but the following token was encountered",
-                    ""
-            );
-        }
+        assertEnFailureMessageContains(firstResult, "A location path was expected, but the following token was encountered");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
@@ -294,9 +289,9 @@ public void testNonXmlDocument() throws Exception {
         extractor.process();
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertContains(result.getAssertionResults()[0].getFailureMessage(),
-                "Content is not allowed in prolog",
-                "");
+        assertEnFailureMessageContains(
+            result.getAssertionResults()[0],
+            "Content is not allowed in prolog");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
@@ -309,10 +304,9 @@ public void testInvalidDocument() throws Exception {
 
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertContains(result.getAssertionResults()[0].getFailureMessage(),
-                "XML document structures must start and end within the same entity",
-                "");
-
+        assertEnFailureMessageContains(
+                result.getAssertionResults()[0],
+                "XML document structures must start and end within the same entity");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
index 92de5766f9a..cefbe7a2bc0 100644
--- a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
+++ b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
@@ -112,7 +112,9 @@ public void testInvalidTemplateXml() throws IOException, SAXException, ParserCon
             TemplateManager.getInstance().parseTemplateFile(templateFile);
         } catch (SAXParseException ex) {
             String message = ex.getMessage();
-            assertTrue(message.contains("Element type \"key\" must be declared."), "Exception did not contains expected message, got:" + message);
+            assertTrue(
+                    message.contains("\"key\""),
+                    "Exception did not contains expected message (e.g. Element type \"key\" must be declared.), got:" + message);
         }
     }
 
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt b/src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt
new file mode 100644
index 00000000000..6769ff65095
--- /dev/null
+++ b/src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.assertions
+
+import org.junit.jupiter.api.Assertions.assertTrue
+import java.util.Locale
+
+fun AssertionResult.assertEnFailureMessageContains(substring: String) {
+    if (Locale.getDefault().language.startsWith(Locale.ENGLISH.language)) {
+        assertFailureMessageContains(substring)
+    }
+}
+
+fun AssertionResult.assertFailureMessageContains(substring: String) {
+    val failureMessage = getFailureMessage()
+    assertTrue(failureMessage.contains(substring)) {
+        "expected failure message to contain <<$substring>> but got <<$failureMessage>>"
+    }
+}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 20e5bc8f61a..44bfe693e42 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import com.github.autostyle.gradle.AutostyleTask
+import com.github.gradle.node.yarn.task.YarnTask
 import com.github.vlsi.gradle.crlf.CrLfSpec
 import com.github.vlsi.gradle.crlf.LineEndings
 import com.github.vlsi.gradle.git.FindGitAttributes
@@ -28,6 +30,7 @@ plugins {
     id("com.github.vlsi.crlf")
     id("com.github.vlsi.stage-vote-release")
     id("build-logic.jvm-library")
+    id("com.github.node-gradle.node")
 }
 
 var jars = arrayOf(
@@ -98,6 +101,16 @@ dependencies {
     buildDocs("org.jdom:jdom")
 }
 
+node {
+    // Do not declare the repository
+    // See https://github.com/node-gradle/gradle-node-plugin/blob/master/docs/faq.md#is-this-plugin-compatible-with-centralized-repositories-declaration
+    distBaseUrl = null
+    download = true
+    version = "25.1.0"
+    yarnVersion = "1.22.22"
+    // nodeProjectDir = rootProject.layout.projectDirectory.dir("xdocs")
+}
+
 tasks.clean {
     // copyLibs uses Sync task, so it can't predict all the possible output files (e.g. from previous executions)
     // So we register patterns to remove explicitly
@@ -311,7 +324,7 @@ val gitProps by rootProject.tasks.existing(FindGitAttributes::class)
 
 fun createAnakiaTask(
     taskName: String,
-    baseDir: String,
+    baseDir: Directory,
     extension: String = ".html",
     style: String,
     velocityProperties: String,
@@ -336,7 +349,7 @@ fun createAnakiaTask(
                 p.load(it)
             }
             p["resource.loader"] = "file"
-            p["file.resource.loader.path"] = baseDir
+            p["file.resource.loader.path"] = baseDir.asFile.absolutePath
             p["file.resource.loader.class"] = "org.apache.velocity.runtime.resource.loader.FileResourceLoader"
             val specials = Regex("""([,\\])""")
             val lines = p.entries
@@ -392,7 +405,7 @@ fun createAnakiaTask(
     }
 }
 
-val xdocs = "$rootDir/xdocs"
+val xdocs = rootProject.layout.projectDirectory.dir("xdocs")
 
 fun CopySpec.docCssAndImages() {
     from(xdocs) {
@@ -420,12 +433,24 @@ fun CopySpec.printableDocumentation() {
     }
 }
 
+tasks.yarnSetup {
+    mustRunAfter(tasks.withType<AutostyleTask>())
+}
+
+val yarn_install = tasks.named<YarnTask>("yarn_install") {
+    workingDir = xdocs
+    mustRunAfter(":rat")
+    inputs.file(xdocs.file("package.json")).withPropertyName("package_json").withPathSensitivity(PathSensitivity.NONE)
+    outputs.file(xdocs.file("yarn.lock")).withPropertyName("yarn.lock")
+    outputs.dir(xdocs.dir("node_modules")).withPropertyName("node_modules")
+}
+
 val buildPrintableDoc = createAnakiaTask(
     "buildPrintableDoc", baseDir = xdocs,
     style = "stylesheets/site_printable.vsl",
     velocityProperties = "$xdocs/velocity.properties",
     projectFile = "stylesheets/printable_project.xml",
-    excludes = arrayOf("**/stylesheets/**", "extending.xml", "extending/*.xml"),
+    excludes = arrayOf("**/stylesheets/**", "extending.xml", "extending/*.xml", "node_modules", "package.json", "package-lock.json", "yarn.lock"),
     includes = arrayOf("**/*.xml")
 )
 
@@ -466,7 +491,14 @@ fun xslt(
 
 val processSiteXslt by tasks.registering {
     val outputDir = layout.buildDirectory.dir("siteXslt").get().asFile
-    inputs.files(xdocs).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
+    inputs.files(
+        fileTree(xdocs) {
+            exclude("node_modules")
+            exclude("package.json")
+            exclude("package-lock.json")
+            exclude("yarn.lock")
+        }
+    ).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
     inputs.property("year", lastEditYear)
     outputs.dir(outputDir)
     outputs.cacheIf { true }
@@ -490,10 +522,39 @@ fun CopySpec.siteLayout() {
     from(processSiteXslt)
     docCssAndImages()
     manuals()
+    into("fonts") {
+        from(
+            fileTree(xdocs.dir("node_modules/@fontsource/merriweather/files")) {
+                builtBy(yarn_install)
+            }
+        ) {
+            include("*400*normal*.woff2")
+        }
+        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/webfonts")) {
+            include("fa-brands*.woff2")
+        }
+    }
+    into("css") {
+        from(xdocs.dir("node_modules/@fontsource/merriweather")) {
+            include("400.css")
+            rename { "merriweather.css" }
+            filter {
+                it.replace("./files", "../fonts")
+            }
+        }
+        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/css")) {
+            include("fontawesome.min.css")
+            include("brands.min.css")
+            filter {
+                it.replace("../webfonts", "../fonts")
+            }
+        }
+    }
 }
 
 // See https://github.com/gradle/gradle/issues/10960
 val previewSiteDir = layout.buildDirectory.dir("site")
+
 val previewSite by tasks.registering(Sync::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Creates preview of a site to build/docs/site"
@@ -566,6 +627,10 @@ fun CrLfSpec.sourceLayout() = copySpec {
         from(rootDir) {
             gitignore(gitProps)
             excludeLicenseFromSourceRelease()
+            exclude("xdocs/node_modules")
+            exclude("xdocs/package.json")
+            exclude("xdocs/package-lock.json")
+            exclude("xdocs/yarn.lock")
         }
     }
 }
diff --git a/xdocs/package-lock.json b/xdocs/package-lock.json
new file mode 100644
index 00000000000..4c1ad3b2bd0
--- /dev/null
+++ b/xdocs/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "jmeter-docs",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "jmeter-docs",
+      "version": "1.0.0",
+      "dependencies": {
+        "@fontsource/merriweather": "^5.1.0",
+        "@fortawesome/fontawesome-free": "^6.5.0"
+      }
+    },
+    "node_modules/@fontsource/merriweather": {
+      "version": "5.2.11",
+      "resolved": "https://registry.npmjs.org/@fontsource/merriweather/-/merriweather-5.2.11.tgz",
+      "integrity": "sha512-ZiIMeUh5iT8d73o6xlSF8GKgjV5pgiFrufYc5jZTVAfExtWKqM2vQHnsqXSFMv4ELhAcjt6Vf+5T3oVGXhAizQ==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
+      "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/xdocs/package.json b/xdocs/package.json
new file mode 100644
index 00000000000..122ec167ccf
--- /dev/null
+++ b/xdocs/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "jmeter-docs",
+  "version": "1.0.0",
+  "description": "Web fonts for Apache JMeter documentation",
+  "private": true,
+  "dependencies": {
+    "@fontsource/merriweather": "^5.1.0",
+    "@fortawesome/fontawesome-free": "^6.5.0"
+  }
+}
diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index 9b8dbddae96..b94178d3121 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -67,11 +67,15 @@
         <!-- VIEWPORT -->
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link
-          href='https://fonts.googleapis.com/css?family=Merriweather:400normal'
+          href="{concat($cssdir, '/merriweather.css')}"
           rel='stylesheet' type='text/css'
         ></link>
         <link
-          href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"
+          href="{concat($cssdir, '/fontawesome.min.css')}"
+          rel="stylesheet" type='text/css'
+        ></link>
+        <link
+          href="{concat($cssdir, '/brands.min.css')}"
           rel="stylesheet" type='text/css'
         ></link>
         <link rel="stylesheet" type="text/css"
@@ -179,8 +183,8 @@
   <xsl:template name="social-media-links">
     <div class="social-media">
       <ul class="social-media-links">
-        <li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li>
-        <li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li>
+        <li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa-brands fa-twitter" aria-hidden="true"></i>Twitter</a></li>
+        <li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa-brands fa-github" aria-hidden="true"></i>github</a></li>
       </ul>
     </div>
   </xsl:template>
@@ -189,8 +193,8 @@
     <div class="share-links">
       Share this page:
       <ul>
-        <li class="fb"><a data-social-url="https://facebook.com/sharer/sharer.php?u=" title="Share on facebook"><i class="fa fa-facebook" aria-hidden="true"></i>share</a></li>
-        <li class="twitter"><a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a></li>
+        <li class="fb"><a data-social-url="https://facebook.com/sharer/sharer.php?u=" title="Share on facebook"><i class="fa-brands fa-facebook" aria-hidden="true"></i>share</a></li>
+        <li class="twitter"><a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa-brands fa-twitter" aria-hidden="true"></i>tweet</a></li>
       </ul>
     </div>
   </xsl:template>
diff --git a/xdocs/yarn.lock b/xdocs/yarn.lock
new file mode 100644
index 00000000000..b29c80ade6b
--- /dev/null
+++ b/xdocs/yarn.lock
@@ -0,0 +1,13 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@fontsource/merriweather@^5.1.0":
+  version "5.2.11"
+  resolved "https://registry.yarnpkg.com/@fontsource/merriweather/-/merriweather-5.2.11.tgz#e0bc5aef743145e3d662e8a542c3da799d26bf7e"
+  integrity sha512-ZiIMeUh5iT8d73o6xlSF8GKgjV5pgiFrufYc5jZTVAfExtWKqM2vQHnsqXSFMv4ELhAcjt6Vf+5T3oVGXhAizQ==
+
+"@fortawesome/fontawesome-free@^6.5.0":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==

From 64e4fcca20f6a5f1a60a6f148b9dd188b2233731 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 18 Mar 2024 15:52:09 +0300
Subject: [PATCH 0940/1037] issue#556: Avoid adding "; charset=" for
 multipart/form-data requests

Fixes https://github.com/apache/jmeter/issues/6250

See https://issues.apache.org/jira/browse/HTTPCLIENT-2325
See https://github.com/apache/httpcomponents-client/pull/556

Co-authored-by: dongfangtianyu <7629022+dongfangtianyu@users.noreply.github.com>
---
 .../entity/mime/MultipartEntityBuilder2.java  | 244 ++++++++++++++++++
 .../protocol/http/sampler/HTTPHC4Impl.java    |   4 +-
 .../http/sampler/TestHTTPHC4Impl.java         |  19 ++
 3 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java

diff --git a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
new file mode 100644
index 00000000000..d549d81a1b3
--- /dev/null
+++ b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
@@ -0,0 +1,244 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.entity.mime;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.content.ByteArrayBody;
+import org.apache.http.entity.mime.content.ContentBody;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.Args;
+import org.apiguardian.api.API;
+
+/**
+ * Builder for multipart {@link HttpEntity}s.
+ *
+ * Note: the code was taken from
+ * <a href="https://github.com/apache/httpcomponents-client/blob/54900db4653d7f207477e6ee40135b88e9bcf832/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java">MultipartEntityBuilder 4.5.14</a>
+ *
+ */
+@API(status = API.Status.INTERNAL, since = "5.6.4")
+public class MultipartEntityBuilder2 {
+
+    /**
+     * The pool of ASCII chars to be used for generating a multipart boundary.
+     */
+    private final static char[] MULTIPART_CHARS =
+            "-_1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                    .toCharArray();
+
+    private final static String DEFAULT_SUBTYPE = "form-data";
+
+    private ContentType contentType;
+    private HttpMultipartMode mode = HttpMultipartMode.STRICT;
+    private String boundary = null;
+    private Charset charset = null;
+    private List<FormBodyPart> bodyParts = null;
+
+    public static MultipartEntityBuilder2 create() {
+        return new MultipartEntityBuilder2();
+    }
+
+    MultipartEntityBuilder2() {
+    }
+
+    public MultipartEntityBuilder2 setMode(final HttpMultipartMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    public MultipartEntityBuilder2 setLaxMode() {
+        this.mode = HttpMultipartMode.BROWSER_COMPATIBLE;
+        return this;
+    }
+
+    public MultipartEntityBuilder2 setStrictMode() {
+        this.mode = HttpMultipartMode.STRICT;
+        return this;
+    }
+
+    public MultipartEntityBuilder2 setBoundary(final String boundary) {
+        this.boundary = boundary;
+        return this;
+    }
+
+    /**
+     * @since 4.4
+     */
+    public MultipartEntityBuilder2 setMimeSubtype(final String subType) {
+        Args.notBlank(subType, "MIME subtype");
+        this.contentType = ContentType.create("multipart/" + subType);
+        return this;
+    }
+
+    /**
+     * @since 4.4
+     *
+     * @deprecated (4.5) Use {@link #setContentType(org.apache.http.entity.ContentType)}.
+     */
+    @Deprecated
+    public MultipartEntityBuilder2 seContentType(final ContentType contentType) {
+        return setContentType(contentType);
+    }
+
+    /**
+     * @since 4.5
+     */
+    public MultipartEntityBuilder2 setContentType(final ContentType contentType) {
+        Args.notNull(contentType, "Content type");
+        this.contentType = contentType;
+        return this;
+    }
+
+    public MultipartEntityBuilder2 setCharset(final Charset charset) {
+        this.charset = charset;
+        return this;
+    }
+
+    /**
+     * @since 4.4
+     */
+    public MultipartEntityBuilder2 addPart(final FormBodyPart bodyPart) {
+        if (bodyPart == null) {
+            return this;
+        }
+        if (this.bodyParts == null) {
+            this.bodyParts = new ArrayList<FormBodyPart>();
+        }
+        this.bodyParts.add(bodyPart);
+        return this;
+    }
+
+    public MultipartEntityBuilder2 addPart(final String name, final ContentBody contentBody) {
+        Args.notNull(name, "Name");
+        Args.notNull(contentBody, "Content body");
+        return addPart(FormBodyPartBuilder.create(name, contentBody).build());
+    }
+
+    public MultipartEntityBuilder2 addTextBody(
+            final String name, final String text, final ContentType contentType) {
+        return addPart(name, new StringBody(text, contentType));
+    }
+
+    public MultipartEntityBuilder2 addTextBody(
+            final String name, final String text) {
+        return addTextBody(name, text, ContentType.DEFAULT_TEXT);
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(
+            final String name, final byte[] b, final ContentType contentType, final String filename) {
+        return addPart(name, new ByteArrayBody(b, contentType, filename));
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(
+            final String name, final byte[] b) {
+        return addBinaryBody(name, b, ContentType.DEFAULT_BINARY, null);
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(
+            final String name, final File file, final ContentType contentType, final String filename) {
+        return addPart(name, new FileBody(file, contentType, filename));
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(
+            final String name, final File file) {
+        return addBinaryBody(name, file, ContentType.DEFAULT_BINARY, file != null ? file.getName() : null);
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(
+            final String name, final InputStream stream, final ContentType contentType,
+            final String filename) {
+        return addPart(name, new InputStreamBody(stream, contentType, filename));
+    }
+
+    public MultipartEntityBuilder2 addBinaryBody(final String name, final InputStream stream) {
+        return addBinaryBody(name, stream, ContentType.DEFAULT_BINARY, null);
+    }
+
+    private static String generateBoundary() {
+        final StringBuilder buffer = new StringBuilder();
+        final Random rand = new Random();
+        final int count = rand.nextInt(11) + 30; // a random size from 30 to 40
+        for (int i = 0; i < count; i++) {
+            buffer.append(MULTIPART_CHARS[rand.nextInt(MULTIPART_CHARS.length)]);
+        }
+        return buffer.toString();
+    }
+
+    MultipartFormEntity buildEntity() {
+        String boundaryCopy = boundary;
+        if (boundaryCopy == null && contentType != null) {
+            boundaryCopy = contentType.getParameter("boundary");
+        }
+        if (boundaryCopy == null) {
+            boundaryCopy = generateBoundary();
+        }
+        Charset charsetCopy = charset;
+        if (charsetCopy == null && contentType != null) {
+            charsetCopy = contentType.getCharset();
+        }
+        // JMeter update: charset is no longer explicitly added
+        // See https://github.com/apache/httpcomponents-client/pull/556
+        final NameValuePair[] params = new NameValuePair[]{new BasicNameValuePair("boundary", boundaryCopy)};
+        final ContentType contentTypeCopy = contentType != null ?
+                contentType.withParameters(params) :
+                ContentType.create("multipart/" + DEFAULT_SUBTYPE, params);
+        final List<FormBodyPart> bodyPartsCopy = bodyParts != null ? new ArrayList<>(bodyParts) :
+                Collections.emptyList();
+        final HttpMultipartMode modeCopy = mode != null ? mode : HttpMultipartMode.STRICT;
+        final AbstractMultipartForm form;
+        switch (modeCopy) {
+            case BROWSER_COMPATIBLE:
+                form = new HttpBrowserCompatibleMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+                break;
+            case RFC6532:
+                form = new HttpRFC6532Multipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+                break;
+            default:
+                form = new HttpStrictMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+        }
+        return new MultipartFormEntity(form, contentTypeCopy, form.getTotalLength());
+    }
+
+    public HttpEntity build() {
+        return buildEntity();
+    }
+
+}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index e9d21660a14..2e68cb22261 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -102,7 +102,7 @@
 import org.apache.http.entity.mime.FormBodyPart;
 import org.apache.http.entity.mime.FormBodyPartBuilder;
 import org.apache.http.entity.mime.HttpMultipartMode;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.MultipartEntityBuilder2;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.auth.BasicScheme;
@@ -1552,7 +1552,7 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
                         doBrowserCompatibleMultipart, charset, haveContentEncoding);
             }
             // Write the request to our own stream
-            MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+            MultipartEntityBuilder2 multipartEntityBuilder = MultipartEntityBuilder2.create();
             multipartEntityBuilder.setCharset(charset);
             if (doBrowserCompatibleMultipart) {
                 multipartEntityBuilder.setLaxMode();
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
index 315806d1b87..0f6525e2bbb 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java
@@ -97,6 +97,25 @@ void testFileargWithMimeTypeWithCharset() throws Exception {
         Assertions.assertTrue(requestData.contains("charset=utf-8"));
     }
 
+    @Test
+    void testMultipartFormHeaderWithoutCharset() throws Exception {
+        HTTPSamplerBase sampler = (HTTPSamplerBase) new HttpTestSampleGui().createTestElement();
+        sampler.setThreadContext(jmctx);
+        sampler.setDoMultipart(true);
+        sampler.setDoBrowserCompatibleMultipart(true);
+        sampler.setHTTPFiles(new HTTPFileArg[] {new HTTPFileArg("filename", "file", "application/octect; charset=utf-8")});
+        sampler.getArguments().addArgument(new HTTPArgument("param", "value"));
+        HTTPHC4Impl hc = new HTTPHC4Impl(sampler);
+
+        HttpEntityEnclosingRequestBase post = new HttpPost();
+        hc.setupHttpEntityEnclosingRequestData(post);
+        String contentTypeWithEntity = post.getEntity().getContentType().getValue();
+        Assertions.assertFalse(
+                contentTypeWithEntity.contains("charset"),
+                () -> "multipart/form-data's Content-Type should not contain charset=.... Got " + contentTypeWithEntity
+        );
+    }
+
     @Test
     public void testNotifyFirstSampleAfterLoopRestartWhenThreadIterationIsSameUser() {
         jmvars.putObject(SAME_USER, true);

From 8fc7e8d92f961a09f20191426d87cb75c6b60e14 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 3 Nov 2025 22:29:52 +0300
Subject: [PATCH 0941/1037] style: refactor MultipartEntityBuilder2 to Java 17
 swich expression

---
 .../entity/mime/MultipartEntityBuilder2.java     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
index d549d81a1b3..f9e79ffb86c 100644
--- a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
+++ b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
@@ -223,17 +223,11 @@ MultipartFormEntity buildEntity() {
         final List<FormBodyPart> bodyPartsCopy = bodyParts != null ? new ArrayList<>(bodyParts) :
                 Collections.emptyList();
         final HttpMultipartMode modeCopy = mode != null ? mode : HttpMultipartMode.STRICT;
-        final AbstractMultipartForm form;
-        switch (modeCopy) {
-            case BROWSER_COMPATIBLE:
-                form = new HttpBrowserCompatibleMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
-                break;
-            case RFC6532:
-                form = new HttpRFC6532Multipart(charsetCopy, boundaryCopy, bodyPartsCopy);
-                break;
-            default:
-                form = new HttpStrictMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
-        }
+        final AbstractMultipartForm form = switch (modeCopy) {
+            case BROWSER_COMPATIBLE -> new HttpBrowserCompatibleMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+            case RFC6532 -> new HttpRFC6532Multipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+            default -> new HttpStrictMultipart(charsetCopy, boundaryCopy, bodyPartsCopy);
+        };
         return new MultipartFormEntity(form, contentTypeCopy, form.getTotalLength());
     }
 

From 3ade0a348f3405c52ebe16acca98faff2f7abd0b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 3 Nov 2025 23:18:44 +0300
Subject: [PATCH 0942/1037] style: fix style for MultipartEntityBuilder2

---
 .../entity/mime/MultipartEntityBuilder2.java  | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
index f9e79ffb86c..fa79d939554 100644
--- a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
+++ b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
@@ -1,28 +1,18 @@
 /*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.apache.http.entity.mime;
@@ -51,7 +41,8 @@
  * Builder for multipart {@link HttpEntity}s.
  *
  * Note: the code was taken from
- * <a href="https://github.com/apache/httpcomponents-client/blob/54900db4653d7f207477e6ee40135b88e9bcf832/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java">MultipartEntityBuilder 4.5.14</a>
+ * <a href="https://github.com/apache/httpcomponents-client/blob/54900db4653d7f207477e6ee40135b88e9bcf832/httpmime/src/
+ *   main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java">MultipartEntityBuilder 4.5.14</a>
  *
  */
 @API(status = API.Status.INTERNAL, since = "5.6.4")

From 975e51c87f1941016b49842c955c09601a9c9422 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 4 Nov 2025 13:40:09 +0300
Subject: [PATCH 0943/1037] style: shorten the URL in MultipartEntityBuilder2's
 javadoc

This makes both javadoc and checkstyle happy
---
 .../org/apache/http/entity/mime/MultipartEntityBuilder2.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
index fa79d939554..bbc127c0a7c 100644
--- a/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
+++ b/src/protocol/http/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder2.java
@@ -41,9 +41,8 @@
  * Builder for multipart {@link HttpEntity}s.
  *
  * Note: the code was taken from
- * <a href="https://github.com/apache/httpcomponents-client/blob/54900db4653d7f207477e6ee40135b88e9bcf832/httpmime/src/
- *   main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java">MultipartEntityBuilder 4.5.14</a>
- *
+ * <a href="https://github.com/apache/httpcomponents-client/blob/rel/v4.5.14/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java">
+ *     MultipartEntityBuilder 4.5.14</a>
  */
 @API(status = API.Status.INTERNAL, since = "5.6.4")
 public class MultipartEntityBuilder2 {

From 8cf1e4a1868199dcd1d1261866f22fa43be31767 Mon Sep 17 00:00:00 2001
From: pochopsp <pasquale.1996@gmail.com>
Date: Tue, 11 Jun 2024 23:55:33 +0200
Subject: [PATCH 0944/1037] feat: allow to enable/disable individual arguments
 in HTTP Sampler

This property is set by the user for each HTTP parameter by
clicking on the "Enable" column put on the very left of each
parameter row.

Fixes https://github.com/apache/jmeter/issues/5466

Co-authored-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
---
 .../org/apache/jmeter/config/Arguments.java   |  16 +-
 .../treebuilder/TreeBuilderExtensions.kt      |  34 ++++
 .../timers/ConstantThroughputTimerKtTest.kt   |  17 +-
 .../http/config/gui/UrlConfigGui.java         |   2 +-
 .../protocol/http/gui/HTTPArgumentsPanel.java |  12 +-
 .../protocol/http/sampler/AjpSampler.java     |   2 +-
 .../protocol/http/sampler/HTTPHC4Impl.java    |  10 +-
 .../http/sampler/HTTPSamplerBase.java         |  11 +-
 .../protocol/http/sampler/PostWriter.java     |   4 +-
 .../protocol/http/sampler/PutWriter.java      |   2 +-
 .../HttpSamplerDisableArgumentsTest.kt        | 174 ++++++++++++++++++
 .../protocol/http/sampler/HttpSamplerTest.kt  |  38 +---
 .../http/sampler/HttpSamplerTestingUtils.kt   |  40 ++++
 .../control/HttpRequestDefaultsExtensions.kt  |  53 ++++++
 14 files changed, 342 insertions(+), 73 deletions(-)
 create mode 100644 src/core/src/testFixtures/kotlin/org/apache/jmeter/treebuilder/TreeBuilderExtensions.kt
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerDisableArgumentsTest.kt
 create mode 100644 src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTestingUtils.kt
 create mode 100644 src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpRequestDefaultsExtensions.kt

diff --git a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
index e6a060dd7fb..0301eb58624 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
@@ -23,11 +23,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.collections4.iterators.FilterIterator;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
+import org.apiguardian.api.API;
 
 /**
  * A set of Argument objects.
@@ -100,7 +102,7 @@ public Map<String, String> getArgumentsAsMap() {
             // that this element's values prevail over defaults provided by
             // configuration
             // elements:
-            if (!argMap.containsKey(arg.getName())) {
+            if (!argMap.containsKey(arg.getName()) && arg.isEnabled()) {
                 argMap.put(arg.getName(), arg.getValue());
             }
         }
@@ -173,6 +175,18 @@ public PropertyIterator iterator() {
         return getArguments().iterator();
     }
 
+    /**
+     * Returns the list of enabled arguments.
+     * @return the list of enabled arguments
+     */
+    @API(since = "5.6", status = API.Status.EXPERIMENTAL)
+    public Iterable<JMeterProperty> getEnabledArguments() {
+        return () -> new FilterIterator<>(iterator(), property -> {
+            Object value = property.getObjectValue();
+            return value instanceof Argument argument && argument.isEnabled();
+        });
+    }
+
     /**
      * Create a string representation of the arguments.
      *
diff --git a/src/core/src/testFixtures/kotlin/org/apache/jmeter/treebuilder/TreeBuilderExtensions.kt b/src/core/src/testFixtures/kotlin/org/apache/jmeter/treebuilder/TreeBuilderExtensions.kt
new file mode 100644
index 00000000000..650456f4f1b
--- /dev/null
+++ b/src/core/src/testFixtures/kotlin/org/apache/jmeter/treebuilder/TreeBuilderExtensions.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.treebuilder
+
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.threads.ThreadGroup
+
+fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
+    ThreadGroup::class {
+        numThreads = 1
+        rampUp = 0
+        setSamplerController(
+            LoopController().apply {
+                loops = 1
+            }
+        )
+        body()
+    }
+}
diff --git a/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt b/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt
index 1a1dc805aeb..bcbc6cf0458 100644
--- a/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt
+++ b/src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt
@@ -17,30 +17,15 @@
 
 package org.apache.jmeter.timers
 
-import org.apache.jmeter.control.LoopController
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.sampler.DebugSampler
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
-import org.apache.jmeter.threads.ThreadGroup
-import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.oneRequest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.time.Duration.Companion.seconds
 
 class ConstantThroughputTimerKtTest : JMeterTestCase() {
-    fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
-        ThreadGroup::class {
-            numThreads = 1
-            rampUp = 0
-            setSamplerController(
-                LoopController().apply {
-                    loops = 1
-                }
-            )
-            body()
-        }
-    }
-
     @Test
     fun `throughput as variable`() {
         val events = executePlanAndCollectEvents(5.seconds) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index 593d54a782f..2cb82f654c8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -261,7 +261,7 @@ private static String computePostBody(Arguments arguments) {
      */
     private static String computePostBody(Arguments arguments, boolean crlfToLF) {
         StringBuilder postBody = new StringBuilder();
-        for (JMeterProperty argument : arguments) {
+        for (JMeterProperty argument : arguments.getEnabledArguments()) {
             HTTPArgument arg = (HTTPArgument) argument.getObjectValue();
             String value = arg.getValue();
             if (crlfToLF) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index d350dc26663..7e58144621e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -39,12 +39,15 @@
 /**
  * A GUI panel allowing the user to enter HTTP Parameters.
  * These have names and values, as well as check-boxes to determine whether or not to
- * include the "=" sign in the output and whether or not to encode the output.
+ * include the "=" sign in the output and whether or not to encode the output and
+ * whether or not to enable them.
  */
 public class HTTPArgumentsPanel extends ArgumentsPanel {
 
     private static final long serialVersionUID = 240L;
 
+    private static final String ENABLE = "enable"; //$NON-NLS-1$
+
     private static final String ENCODE_OR_NOT = "encode?"; //$NON-NLS-1$
 
     private static final String INCLUDE_EQUALS = "include_equals"; //$NON-NLS-1$
@@ -60,21 +63,23 @@ public class HTTPArgumentsPanel extends ArgumentsPanel {
     @Override
     protected void initializeTableModel() {
         tableModel = new ObjectTableModel(new String[] {
-                ArgumentsPanel.COLUMN_RESOURCE_NAMES_0, ArgumentsPanel.COLUMN_RESOURCE_NAMES_1, ENCODE_OR_NOT, CONTENT_TYPE, INCLUDE_EQUALS },
+                ENABLE, ArgumentsPanel.COLUMN_RESOURCE_NAMES_0, ArgumentsPanel.COLUMN_RESOURCE_NAMES_1, ENCODE_OR_NOT, CONTENT_TYPE, INCLUDE_EQUALS },
                 HTTPArgument.class,
                 new Functor[] {
+                new Functor("isEnabled"), //$NON-NLS-1$
                 new Functor("getName"), //$NON-NLS-1$
                 new Functor("getValue"), //$NON-NLS-1$
                 new Functor("isAlwaysEncoded"), //$NON-NLS-1$
                 new Functor("getContentType"), //$NON-NLS-1$
                 new Functor("isUseEquals") }, //$NON-NLS-1$
                 new Functor[] {
+                new Functor("setEnabled"), //$NON-NLS-1$
                 new Functor("setName"), //$NON-NLS-1$
                 new Functor("setValue"), //$NON-NLS-1$
                 new Functor("setAlwaysEncoded"), //$NON-NLS-1$
                 new Functor("setContentType"),
                 new Functor("setUseEquals")}, //$NON-NLS-1$
-                new Class[] {String.class, String.class, Boolean.class, String.class, Boolean.class });
+                new Class[] {Boolean.class, String.class, String.class, Boolean.class, String.class, Boolean.class });
     }
 
     public static boolean testFunctors(){
@@ -85,6 +90,7 @@ public static boolean testFunctors(){
 
     @Override
     protected void sizeColumns(JTable table) {
+        GuiUtils.fixSize(table.getColumn(ENABLE), table);
         GuiUtils.fixSize(table.getColumn(INCLUDE_EQUALS), table);
         GuiUtils.fixSize(table.getColumn(ENCODE_OR_NOT), table);
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
index d705ae726cb..2a5fe624bc7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
@@ -279,7 +279,7 @@ private String setConnectionHeaders(URL url, String host, String method)
                 setString(HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
                 StringBuilder sb = new StringBuilder();
                 boolean first = true;
-                for (JMeterProperty arg : getArguments()) {
+                for (JMeterProperty arg : getArguments().getEnabledArguments()) {
                     if (first) {
                         first = false;
                     } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index 2e68cb22261..569bb164b6a 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -158,7 +158,6 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
@@ -1562,7 +1561,7 @@ protected String setupHttpEntityEnclosingRequestData(HttpEntityEnclosingRequestB
             }
             // Create the parts
             // Add any parameters
-            for (JMeterProperty jMeterProperty : getArguments()) {
+            for (JMeterProperty jMeterProperty : getArguments().getEnabledArguments()) {
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                 String parameterName = arg.getName();
                 if (arg.isSkippable(parameterName)) {
@@ -1644,7 +1643,7 @@ else if(ADD_CONTENT_TYPE_TO_POST_IF_MISSING) {
 
                     // Just append all the parameter values, and use that as the post body
                     StringBuilder postBody = new StringBuilder();
-                    for (JMeterProperty jMeterProperty : getArguments()) {
+                    for (JMeterProperty jMeterProperty : getArguments().getEnabledArguments()) {
                         HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                         postBody.append(arg.getEncodedValue(contentEncoding));
                     }
@@ -1787,10 +1786,9 @@ else if(getSendParameterValuesAsPostBody()) {
     private UrlEncodedFormEntity createUrlEncodedFormEntity(final String urlContentEncoding) throws UnsupportedEncodingException {
         // It is a normal request, with parameter names and values
         // Add the parameters
-        PropertyIterator args = getArguments().iterator();
         List<NameValuePair> nvps = new ArrayList<>();
-        while (args.hasNext()) {
-            HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+        for (JMeterProperty jMeterProperty: getArguments().getEnabledArguments()) {
+            HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
             // The HTTPClient always urlencodes both name and value,
             // so if the argument is already encoded, we have to decode
             // it before adding it to the post request
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index ccaf33d1e66..45628aeed21 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -79,7 +79,6 @@
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.testelement.schema.PropertyDescriptor;
 import org.apache.jmeter.threads.JMeterContext;
@@ -410,7 +409,7 @@ public boolean getSendParameterValuesAsPostBody() {
             return true;
         } else {
             boolean hasArguments = false;
-            for (JMeterProperty jMeterProperty : getArguments()) {
+            for (JMeterProperty jMeterProperty : getArguments().getEnabledArguments()) {
                 hasArguments = true;
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                 if (arg.getName() != null && !arg.getName().isEmpty()) {
@@ -1156,9 +1155,10 @@ public String getQueryString() {
      */
     public String getQueryString(final String contentEncoding) {
 
-        CollectionProperty arguments = getArguments().getArguments();
+        Arguments args = getArguments();
+        Iterator<JMeterProperty> iter = args.getEnabledArguments().iterator();
         // Optimisation : avoid building useless objects if empty arguments
-        if(arguments.isEmpty()) {
+        if (!iter.hasNext()) {
             return "";
         }
         String lContentEncoding = contentEncoding;
@@ -1168,8 +1168,7 @@ public String getQueryString(final String contentEncoding) {
             lContentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
         }
 
-        StringBuilder buf = new StringBuilder(arguments.size() * 15);
-        PropertyIterator iter = arguments.iterator();
+        StringBuilder buf = new StringBuilder(args.getArgumentCount() * 15);
         boolean first = true;
         while (iter.hasNext()) {
             HTTPArgument item = null;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index c34d4308291..8cc29d8cdd6 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -191,7 +191,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             OutputStreamWriter osw = new OutputStreamWriter(bos, contentEncoding);
             // Add any parameters
-            for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+            for (JMeterProperty jMeterProperty : sampler.getArguments().getEnabledArguments()) {
                 HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                 String parameterName = arg.getName();
                 if (arg.isSkippable(parameterName)) {
@@ -300,7 +300,7 @@ public void setHeaders(URLConnection connection, HTTPSamplerBase sampler) throws
 
                     // Just append all the parameter values, and use that as the post body
                     StringBuilder postBodyBuffer = new StringBuilder();
-                    for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+                    for (JMeterProperty jMeterProperty : sampler.getArguments().getEnabledArguments()) {
                         HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                         postBodyBuffer.append(arg.getEncodedValue(contentEncoding));
                     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
index 5a020662f77..488495d44cd 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java
@@ -85,7 +85,7 @@ else if(sampler.getSendParameterValuesAsPostBody()) {
 
             // Just append all the parameter values, and use that as the put body
             StringBuilder putBodyBuffer = new StringBuilder();
-             for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+             for (JMeterProperty jMeterProperty : sampler.getArguments().getEnabledArguments()) {
                  HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
                  putBodyBuffer.append(arg.getEncodedValue(contentEncoding));
              }
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerDisableArgumentsTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerDisableArgumentsTest.kt
new file mode 100644
index 00000000000..80c54d0f2ae
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerDisableArgumentsTest.kt
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import com.github.tomakehurst.wiremock.client.WireMock.aMultipart
+import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.equalTo
+import com.github.tomakehurst.wiremock.client.WireMock.get
+import com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
+import com.github.tomakehurst.wiremock.client.WireMock.post
+import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
+import com.github.tomakehurst.wiremock.client.WireMock.put
+import com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor
+import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
+import com.github.tomakehurst.wiremock.junit5.WireMockTest
+import org.apache.jmeter.junit.JMeterTestCase
+import org.apache.jmeter.protocol.http.control.arguments
+import org.apache.jmeter.protocol.http.control.httpRequestDefaults
+import org.apache.jmeter.protocol.http.util.HTTPArgument
+import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.oneRequest
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import kotlin.time.Duration.Companion.seconds
+
+@WireMockTest
+class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
+
+    fun TreeBuilder.httpRequest(body: HTTPSamplerProxy.() -> Unit) {
+        HTTPSamplerProxy::class {
+            name = "Test disabled params"
+            method = "GET"
+            domain = "localhost"
+            path = "/test"
+            body()
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `GET disable param1 should send enabled param2`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            get("/test").willReturn(aResponse().withStatus(200))
+        )
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpRequest {
+                    method = "GET"
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("param1", "value1")
+                    arguments.getArgument(0).isEnabled = false
+                    addArgument("param2", "value2")
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            getRequestedFor(urlEqualTo("/test?param2=value2"))
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `PUT disable param2 should send enabled param1 and param3`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            put("/test").willReturn(aResponse().withStatus(200))
+        )
+
+        executePlanAndCollectEvents(1000.seconds) {
+            oneRequest {
+                httpRequest {
+                    method = "PUT"
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    postBodyRaw = true
+                    addArgument("param1", "value1")
+                    addArgument("param2", "value2")
+                    arguments.getArgument(1).isEnabled = false
+                    addArgument("param3", "value3")
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            putRequestedFor(urlEqualTo("/test"))
+                .withRequestBody(equalTo("value1value3"))
+        )
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["Java", "HttpClient4"])
+    fun `POST disable default and non-default param should send the only enabled non-default param`(httpImplementation: String, server: WireMockRuntimeInfo) {
+        server.wireMock.register(
+            post("/test").willReturn(aResponse().withStatus(200))
+        )
+
+        executePlanAndCollectEvents(10.seconds) {
+            oneRequest {
+                httpRequestDefaults {
+                    arguments {
+                        addArgument(
+                            HTTPArgument("param0", "value0").apply {
+                                isEnabled = false
+                            }
+                        )
+                        addArgument(
+                            HTTPArgument("param4", "value4")
+                        )
+                    }
+                }
+                httpRequest {
+                    method = "POST"
+                    doMultipart = true
+                    implementation = httpImplementation
+                    port = server.httpPort
+                    addArgument("param1", "value1")
+                    arguments.getArgument(0).isEnabled = false
+                    addArgument("param2", "value2")
+                }
+            }
+        }
+
+        server.wireMock.verifyThat(
+            1,
+            postRequestedFor(urlEqualTo("/test"))
+                .withRequestBodyPart(
+                    aMultipart("param2").withBody(equalTo("value2")).build()
+                )
+                .withRequestBodyPart(
+                    aMultipart("param4").withBody(equalTo("value4")).build()
+                )
+                .withRequestBody(
+                    httpImplementation,
+                    """
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="param2"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    value2
+                    -----------------------------7d159c1302d0y0
+                    Content-Disposition: form-data; name="param4"
+                    Content-Type: text/plain; charset=UTF-8
+                    Content-Transfer-Encoding: 8bit
+
+                    value4
+                    -----------------------------7d159c1302d0y0--
+
+                    """.trimIndent()
+                )
+        )
+    }
+}
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
index fb82fe4adf6..180bbb42b6a 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt
@@ -21,20 +21,17 @@ import com.github.tomakehurst.wiremock.client.WireMock.aMultipart
 import com.github.tomakehurst.wiremock.client.WireMock.aResponse
 import com.github.tomakehurst.wiremock.client.WireMock.containing
 import com.github.tomakehurst.wiremock.client.WireMock.equalTo
-import com.github.tomakehurst.wiremock.client.WireMock.matching
 import com.github.tomakehurst.wiremock.client.WireMock.post
 import com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
 import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
-import org.apache.jmeter.control.LoopController
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.protocol.http.control.Header
 import org.apache.jmeter.protocol.http.util.HTTPFileArg
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
-import org.apache.jmeter.threads.ThreadGroup
 import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.oneRequest
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
@@ -51,21 +48,8 @@ class HttpSamplerTest : JMeterTestCase() {
     @TempDir
     lateinit var dir: Path
 
-    fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
-        ThreadGroup::class {
-            numThreads = 1
-            rampUp = 0
-            setSamplerController(
-                LoopController().apply {
-                    loops = 1
-                }
-            )
-            body()
-        }
-    }
-
     fun TreeBuilder.httpPost(body: HTTPSamplerProxy.() -> Unit) {
-        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+        HTTPSamplerProxy::class {
             name = "Upload file"
             method = "POST"
             domain = "localhost"
@@ -137,24 +121,6 @@ class HttpSamplerTest : JMeterTestCase() {
         )
     }
 
-    fun RequestPatternBuilder.withRequestBody(
-        httpImplementation: String,
-        body: String
-    ) = apply {
-        // normalize line endings to CRLF
-        val normalizedBody = body.replace("\r\n", "\n").replace("\n", "\r\n")
-        withRequestBody(
-            if (httpImplementation == "Java") {
-                equalTo(normalizedBody)
-            } else {
-                matching(
-                    normalizedBody
-                        .replace(PostWriter.BOUNDARY, "[^ \\n\\r]{1,69}?")
-                )
-            }
-        )
-    }
-
     @ParameterizedTest
     @ValueSource(strings = ["Java", "HttpClient4"])
     fun `one parameter`(httpImplementation: String, server: WireMockRuntimeInfo) {
diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTestingUtils.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTestingUtils.kt
new file mode 100644
index 00000000000..bc9c8500d80
--- /dev/null
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTestingUtils.kt
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler
+
+import com.github.tomakehurst.wiremock.client.WireMock.equalTo
+import com.github.tomakehurst.wiremock.client.WireMock.matching
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
+
+fun RequestPatternBuilder.withRequestBody(
+    httpImplementation: String,
+    body: String
+) = apply {
+    // normalize line endings to CRLF
+    val normalizedBody = body.replace("\r\n", "\n").replace("\n", "\r\n")
+    withRequestBody(
+        if (httpImplementation == "Java") {
+            equalTo(normalizedBody)
+        } else {
+            matching(
+                normalizedBody
+                    .replace(PostWriter.BOUNDARY, "[^ \\n\\r]{1,69}?")
+            )
+        }
+    )
+}
diff --git a/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpRequestDefaultsExtensions.kt b/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpRequestDefaultsExtensions.kt
new file mode 100644
index 00000000000..b64fa9563ec
--- /dev/null
+++ b/src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpRequestDefaultsExtensions.kt
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.control
+
+import org.apache.jmeter.config.Arguments
+import org.apache.jmeter.config.ConfigTestElement
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema
+import org.apache.jmeter.testelement.property.TestElementProperty
+import org.apache.jmeter.treebuilder.Action
+import org.apache.jmeter.treebuilder.TreeBuilder
+
+fun TreeBuilder.httpRequestDefaults(configure: Action<ConfigTestElement> = Action {}) {
+    ConfigTestElement::class {
+        props {
+            it[name] = "HTTP Request Defaults"
+            it[guiClass] = "org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui"
+        }
+        setProperty(
+            TestElementProperty(
+                HTTPSamplerBaseSchema.arguments.name,
+                Arguments().apply {
+                    props {
+                        it[guiClass] = "org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel"
+                        it[testClass] = "org.apache.jmeter.config.Arguments"
+                    }
+                }
+            )
+        )
+        configure(this)
+    }
+}
+
+val ConfigTestElement.arguments: Arguments
+    get() = getProperty(HTTPSamplerBaseSchema.arguments.name) as Arguments
+
+fun ConfigTestElement.arguments(configure: Action<Arguments> = Action {}) {
+    configure((getProperty(HTTPSamplerBaseSchema.arguments.name) as TestElementProperty).element as Arguments)
+}

From 23fa6d53090e39f526a535510171e0677982b372 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 6 Nov 2025 23:19:57 +0300
Subject: [PATCH 0945/1037] chore: remove core -> org.apache.tika:tika-parsers
 dependency

---
 src/core/build.gradle.kts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 05d395e3979..de661927bd0 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -107,14 +107,9 @@ dependencies {
         because("Mean, DescriptiveStatistics")
     }
     implementation("org.apache.commons:commons-text")
-    // For some reason JMeter bundles just tika-core and tika-parsers without transitive
-    // dependencies. So we exclude those
     implementation("org.apache.tika:tika-core") {
         isTransitive = false
     }
-    runtimeOnly("org.apache.tika:tika-parsers") {
-        isTransitive = false
-    }
     implementation("org.apache.xmlgraphics:xmlgraphics-commons")
     implementation("org.freemarker:freemarker")
     implementation("org.jodd:jodd-core")

From 368401df7948044be6d31c18ad620dba4df9518c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 7 Nov 2025 13:15:30 +0300
Subject: [PATCH 0946/1037] chore: remove uses of commons-codec. Java 17 has
 both Base64 and HexFormat

---
 bin/testfiles/TCP_TESTS.jmx                   | 20 +++++++-------
 src/components/build.gradle.kts               |  1 -
 src/core/build.gradle.kts                     |  3 ---
 .../apache/jmeter/util/JSR223TestElement.java | 14 +++++++---
 .../apache/jmeter/util/ScriptCacheKey.java    | 22 ++++++++-------
 .../jmeter/util/keystore/JmeterKeyStore.java  |  4 +--
 src/dist/build.gradle.kts                     |  4 +++
 src/functions/build.gradle.kts                |  1 -
 .../functions/DigestEncodeFunction.java       | 27 +++++++------------
 .../org/apache/jorphan/util/JOrphanUtils.java | 26 +++++-------------
 .../protocol/http/proxy/ProxyControl.java     | 10 ++++---
 11 files changed, 60 insertions(+), 72 deletions(-)

diff --git a/bin/testfiles/TCP_TESTS.jmx b/bin/testfiles/TCP_TESTS.jmx
index 1bfd6e85cd3..d646bef3a0f 100644
--- a/bin/testfiles/TCP_TESTS.jmx
+++ b/bin/testfiles/TCP_TESTS.jmx
@@ -74,7 +74,7 @@ import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 class TimeServerHandler extends IoHandlerAdapter
 {
 	private static final String EOL = &quot;\n&quot;;
-    Logger log = LoggerFactory.getLogger(TimeServerHandler.class);	
+    Logger log = LoggerFactory.getLogger(TimeServerHandler.class);
     public void exceptionCaught( IoSession session, Throwable cause ) throws Exception
     {
     	   log.error(&quot;Exception occured&quot;, cause);
@@ -85,7 +85,7 @@ class TimeServerHandler extends IoHandlerAdapter
     {
         String str = message.trim().toString();
         log.info(&quot;Received {}&quot;, str);
-        
+
         String[] words = str.split(&quot; &quot;);
         if(words[0].equalsIgnoreCase(&quot;quit&quot;) ) {
             session.close();
@@ -269,10 +269,10 @@ vars.put(&quot;CR&quot;,URLDecoder.decode(&quot;%0A&quot;, &quot;ASCII&quot;));
             <stringProp name="cacheKey">e7ac0019-16aa-40b4-b30f-e254c0a75f27</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
-            <stringProp name="script">import org.apache.commons.codec.binary.Hex;
-Hex hex = new Hex();
-OUT.println(new String(hex.decode(prev.getResponseData())));
-vars.put(&quot;result_decoded&quot;, new String(hex.decode(prev.getResponseData())));</stringProp>
+            <stringProp name="script">import java.util.HexFormat;
+String decoded = new String(HexFormat.of().parseHex(prev.getResponseDataAsString()));
+OUT.println(decoded);
+vars.put(&quot;result_decoded&quot;, decoded);</stringProp>
             <stringProp name="scriptLanguage">groovy</stringProp>
           </JSR223PostProcessor>
           <hashTree/>
@@ -500,10 +500,10 @@ if (oldResponseMessage != null &amp;&amp; oldResponseMessage.contains(&quot;java
             <stringProp name="cacheKey">e7ac0019-16aa-40b4-b30f-e254c0a75f27</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
-            <stringProp name="script">import org.apache.commons.codec.binary.Hex;
-Hex hex = new Hex();
-OUT.println(new String(hex.decode(prev.getResponseData())));
-vars.put(&quot;result_decoded&quot;, new String(hex.decode(prev.getResponseData())));</stringProp>
+            <stringProp name="script">import java.util.HexFormat;
+String decoded = new String(HexFormat.of().parseHex(prev.getResponseDataAsString()));
+OUT.println(decoded);
+vars.put(&quot;result_decoded&quot;, decoded);</stringProp>
             <stringProp name="scriptLanguage">groovy</stringProp>
           </JSR223PostProcessor>
           <hashTree/>
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 111475b0906..f485e2bc692 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -51,7 +51,6 @@ dependencies {
     implementation("net.minidev:json-smart")
     implementation("net.minidev:accessors-smart")
     implementation("org.apache.commons:commons-pool2")
-    implementation("commons-codec:commons-codec")
     implementation("org.ow2.asm:asm")
     implementation("org.jodd:jodd-log") {
         exclude("ch.qos.logback")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index de661927bd0..ab84960a6a8 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -91,9 +91,6 @@ dependencies {
     implementation("com.github.weisj:darklaf-property-loader")
     implementation("com.github.weisj:darklaf-extensions-rsyntaxarea")
     implementation("com.miglayout:miglayout-swing")
-    implementation("commons-codec:commons-codec") {
-        because("DigestUtils")
-    }
     implementation("org.apache-extras.beanshell:bsh:2.0b6") {
         because("Direct dependency required from BeanShellInterpreter")
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
index 5b042f33b61..f6fe6716ab8 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
@@ -21,7 +21,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Properties;
 import java.util.function.Function;
 
@@ -32,7 +35,6 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.testelement.TestStateListener;
@@ -306,8 +308,14 @@ public boolean compile()
      */
     private void computeScriptMD5(String script) {
         // compute the md5 of the script if needed
-        if(scriptMd5 == null) {
-            scriptMd5 = ScriptCacheKey.ofString(DigestUtils.md5Hex(script));
+        if (scriptMd5 == null) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("MD5");
+                md.update(script.getBytes(StandardCharsets.UTF_8));
+                scriptMd5 = ScriptCacheKey.ofDigest(md.digest());
+            } catch (NoSuchAlgorithmException e) {
+                throw new RuntimeException("MessageDigest.getInstance(MD5) was not found", e);
+            }
         }
     }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java b/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java
index 6b7ea21c973..c006adf5bc1 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/ScriptCacheKey.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.util;
 
+import java.util.Arrays;
+import java.util.HexFormat;
 import java.util.Objects;
 
 interface ScriptCacheKey {
@@ -25,8 +27,8 @@ interface ScriptCacheKey {
      * @param key cache key
      * @return cache key
      */
-    static ScriptCacheKey ofString(String key) {
-        return new StringScriptCacheKey(key);
+    static ScriptCacheKey ofDigest(byte[] key) {
+        return new DigestScriptCacheKey(key);
     }
 
     /**
@@ -40,11 +42,11 @@ static ScriptCacheKey ofFile(String language, String absolutePath, long lastModi
         return new FileScriptCacheKey(language, absolutePath, lastModified);
     }
 
-    final class StringScriptCacheKey implements ScriptCacheKey {
-        final String contents;
+    final class DigestScriptCacheKey implements ScriptCacheKey {
+        final byte[] digest;
 
-        StringScriptCacheKey(String contents) {
-            this.contents = contents;
+        DigestScriptCacheKey(byte[] digest) {
+            this.digest = digest;
         }
 
         @Override
@@ -55,19 +57,19 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass()) {
                 return false;
             }
-            StringScriptCacheKey that = (StringScriptCacheKey) o;
-            return Objects.equals(contents, that.contents);
+            DigestScriptCacheKey that = (DigestScriptCacheKey) o;
+            return Arrays.equals(digest, that.digest);
         }
 
         @Override
         public int hashCode() {
-            return contents.hashCode();
+            return Arrays.hashCode(digest);
         }
 
         @Override
         public String toString() {
             return "StringScriptCacheKey{" +
-                    "contents='" + contents + '\'' +
+                    "contents='" + HexFormat.of().formatHex(digest) + '\'' +
                     '}';
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
index 40eaf0d17aa..2f0b69c01cf 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java
@@ -34,12 +34,12 @@
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.apache.commons.codec.binary.Hex;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
@@ -242,7 +242,7 @@ private static String sanDataToString(Object data) {
         if (data instanceof String s) {
             return s;
         }
-        return Hex.encodeHexString((byte[]) data);
+        return HexFormat.of().formatHex((byte[]) data);
     }
 
     private static String sanGeneralNameIndexToName(Integer index) {
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 44bfe693e42..26661caa010 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -89,6 +89,10 @@ dependencies {
         api(project(p))
     }
 
+    runtimeOnly("commons-codec:commons-codec") {
+        because("commons-codec was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
+
     binLicense(project(":src:licenses", "binLicense"))
     srcLicense(project(":src:licenses", "srcLicense"))
     generatorJar(project(":src:generator", "archives"))
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index b9482469624..773eb6b7dff 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     testImplementation(testFixtures(projects.src.core))
 
     implementation("org.mozilla:rhino")
-    implementation("commons-codec:commons-codec")
     implementation("org.apache.commons:commons-jexl")
     implementation("org.apache.commons:commons-jexl3")
     implementation("commons-io:commons-io") {
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
index b7325ad23a8..0d215dc2bdd 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java
@@ -22,10 +22,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HexFormat;
 import java.util.List;
-import java.util.Locale;
 
-import org.apache.commons.codec.binary.Hex;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -85,7 +84,14 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
                 md.update(salt.getBytes(StandardCharsets.UTF_8));
             }
             byte[] bytes = md.digest();
-            encodedString = uppercase(Hex.encodeHexString(bytes), values, 3);
+            HexFormat hexFormat = HexFormat.of();
+            if (values.length > 3) {
+                String shouldUpperCase = values[3].execute();
+                if (Boolean.parseBoolean(shouldUpperCase)) {
+                    hexFormat = hexFormat.withUpperCase();
+                }
+            }
+            encodedString = hexFormat.formatHex(bytes);
             addVariableValue(encodedString, values, 4);
         } catch (NoSuchAlgorithmException e) {
             log.error("Error calling {} function with value {}, digest algorithm {}, salt {}, ", KEY, stringToEncode,
@@ -94,21 +100,6 @@ public String execute(SampleResult previousResult, Sampler currentSampler) throw
         return encodedString;
     }
 
-    /**
-     * Upper case value if optional parameter value is true
-     *
-     * @param encodedString
-     * @param index
-     * @return
-     */
-    private static String uppercase(String encodedString, CompoundVariable[] values, int index) {
-        String shouldUpperCase = values.length > index ? values[index].execute() : null;
-        if (Boolean.parseBoolean(shouldUpperCase)) {
-            return encodedString.toUpperCase(Locale.ROOT);
-        }
-        return encodedString;
-    }
-
     @Override
     public void setParameters(Collection<CompoundVariable> parameters) throws InvalidVariableException {
         checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 1ca523bc6e9..794f8406a71 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -27,6 +27,7 @@
 import java.net.Socket;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -403,15 +404,7 @@ public static boolean isXML(byte[] target) {
      * @return hex representation of binary input
      */
     public static String baToHexString(byte[] ba) {
-        StringBuilder sb = new StringBuilder(ba.length * 2);
-        for (byte b : ba) {
-            int j = b & 0xff;
-            if (j < 16) {
-                sb.append('0'); // $NON-NLS-1$ add zero padding
-            }
-            sb.append(Integer.toHexString(j));
-        }
-        return sb.toString();
+        return baToHexString(ba, '\0');
     }
 
     /**
@@ -422,18 +415,11 @@ public static String baToHexString(byte[] ba) {
      * @return hex representation of binary input
      */
     public static String baToHexString(byte[] ba, char separator) {
-        StringBuilder sb = new StringBuilder(ba.length * 2);
-        for (int i = 0; i < ba.length; i++) {
-            if (i > 0 && separator != 0) {
-                sb.append(separator);
-            }
-            int j = ba[i] & 0xff;
-            if (j < 16) {
-                sb.append('0'); // $NON-NLS-1$ add zero padding
-            }
-            sb.append(Integer.toHexString(j));
+        HexFormat format = HexFormat.of();
+        if (separator != 0) {
+            format = format.withDelimiter(Character.toString(separator));
         }
-        return sb.toString();
+        return format.formatHex(ba);
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index b7b29c17087..826549a979f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -27,6 +27,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
+import java.security.MessageDigest;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
@@ -34,6 +35,7 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Deque;
@@ -49,8 +51,6 @@
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.jmeter.assertions.Assertion;
 import org.apache.jmeter.assertions.ResponseAssertion;
 import org.apache.jmeter.assertions.gui.AssertionGui;
@@ -720,7 +720,7 @@ private static Authorization createAuthorization(final TestElement[] testElement
                             authorization.setURL(computeAuthUrl(result.getUrlAsString()));
                             authorization.setMechanism(mechanism);
                             if(BASIC_AUTH.equals(authType)) {
-                                String authCred = new String(Base64.decodeBase64(authCredentialsBase64), StandardCharsets.UTF_8);
+                                String authCred = new String(Base64.getDecoder().decode(authCredentialsBase64), StandardCharsets.UTF_8);
                                 String[] loginPassword = authCred.split(":"); //$NON-NLS-1$
                                 if(loginPassword.length == 2) {
                                     authorization.setUser(loginPassword[0]);
@@ -785,10 +785,12 @@ public String[] getCertificateDetails() {
                 if (caCert == null) {
                     return new String[]{"Could not find certificate"};
                 }
+                MessageDigest md = MessageDigest.getInstance("SHA-1");
+                md.update(caCert.getEncoded());
                 return new String[]
                         {
                         caCert.getSubjectX500Principal().toString(),
-                        "Fingerprint(SHA1): " + JOrphanUtils.baToHexString(DigestUtils.sha1(caCert.getEncoded()), ' '),
+                        "Fingerprint(SHA1): " + JOrphanUtils.baToHexString(md.digest(), ' '),
                         "Created: "+ caCert.getNotBefore().toString()
                         };
             } catch (GeneralSecurityException e) {

From 22349fd7dcb577afa60d492c211cc9cec8509afc Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 7 Nov 2025 13:55:12 +0300
Subject: [PATCH 0947/1037] chore: fix nodeSetup vs AutostyleTask buildscript
 dependency issue

---
 src/dist/build.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 26661caa010..89879161445 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -441,6 +441,10 @@ tasks.yarnSetup {
     mustRunAfter(tasks.withType<AutostyleTask>())
 }
 
+tasks.nodeSetup {
+    mustRunAfter(tasks.withType<AutostyleTask>())
+}
+
 val yarn_install = tasks.named<YarnTask>("yarn_install") {
     workingDir = xdocs
     mustRunAfter(":rat")

From 032f71f7dbcac0e96962b9cf50ce1b018d168704 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 7 Nov 2025 20:44:45 +0300
Subject: [PATCH 0948/1037] chore: remove uses of commons-collect4

---
 src/components/build.gradle.kts               |   1 -
 .../ViewResultsFullVisualizer.java            |  14 +-
 src/core/build.gradle.kts                     |   1 -
 .../org/apache/jmeter/config/Arguments.java   |   2 +-
 .../org/apache/jmeter/gui/LoggerPanel.java    |  11 +-
 .../apache/jmeter/save/CSVSaveService.java    |  15 +-
 src/dist/build.gradle.kts                     |   3 +
 src/jorphan/build.gradle.kts                  |   1 -
 .../jorphan/collections/FilterIterator.kt     |  71 +++++++++
 .../jorphan/collections/FilterIteratorTest.kt | 150 ++++++++++++++++++
 src/protocol/http/build.gradle.kts            |   3 -
 11 files changed, 246 insertions(+), 26 deletions(-)
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/collections/FilterIterator.kt
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/collections/FilterIteratorTest.kt

diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index f485e2bc692..e33df038a1b 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -67,7 +67,6 @@ dependencies {
     implementation("org.apache.httpcomponents:httpcore-nio")
     implementation("org.jsoup:jsoup")
     implementation("net.sf.jtidy:jtidy")
-    implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3")
     implementation("commons-io:commons-io") {
         because("IOUtils")
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index 5f74df6b34d..dd65bc648c1 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -61,7 +61,6 @@
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import org.apache.commons.collections4.queue.CircularFifoQueue;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.assertions.AssertionResult;
 import org.apache.jmeter.gui.GUIMenuSortOrder;
@@ -139,7 +138,8 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer
     private Object resultsObject = null;
     private TreeSelectionEvent lastSelectionEvent;
     private JCheckBox autoScrollCB;
-    private final Queue<SampleResult> buffer;
+    private final Queue<SampleResult> buffer = new ArrayDeque<>();
+    private final int maxResults;
     private boolean dataChanged;
 
     /**
@@ -147,12 +147,7 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer
      */
     public ViewResultsFullVisualizer() {
         super();
-        final int maxResults = JMeterUtils.getPropDefault("view.results.tree.max_results", 500);
-        if (maxResults > 0) {
-            buffer = new CircularFifoQueue<>(maxResults);
-        } else {
-            buffer = new ArrayDeque<>();
-        }
+        this.maxResults = JMeterUtils.getPropDefault("view.results.tree.max_results", 500);
         init();
         new Timer(REFRESH_PERIOD, e -> updateGui()).start();
     }
@@ -161,6 +156,9 @@ public ViewResultsFullVisualizer() {
     @Override
     public void add(final SampleResult sample) {
         synchronized (buffer) {
+            if (maxResults > 0 && buffer.size() >= maxResults) {
+                buffer.remove();
+            }
             buffer.add(sample);
             dataChanged = true;
         }
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index ab84960a6a8..bc51c5d7245 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -99,7 +99,6 @@ dependencies {
     }
     implementation("org.jetbrains.lets-plot:lets-plot-batik")
     implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm")
-    implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3") {
         because("Mean, DescriptiveStatistics")
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
index 0301eb58624..7804b991e67 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java
@@ -23,12 +23,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.iterators.FilterIterator;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.testelement.schema.PropertiesAccessor;
+import org.apache.jorphan.collections.FilterIterator;
 import org.apiguardian.api.API;
 
 /**
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
index d33b6c81d13..fc88e57b426 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java
@@ -28,7 +28,6 @@
 import javax.swing.ScrollPaneConstants;
 import javax.swing.Timer;
 
-import org.apache.commons.collections4.queue.CircularFifoQueue;
 import org.apache.jmeter.gui.logging.GuiLogEventListener;
 import org.apache.jmeter.gui.logging.LogEventObject;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
@@ -57,7 +56,7 @@ public class LoggerPanel extends JPanel implements GuiLogEventListener {
     private static final int LOGGER_PANEL_REFRESH_PERIOD =
             JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
 
-    private final Queue<String> events;
+    private final Queue<String> events = new ArrayDeque<>();
 
     private volatile boolean logChanged = false;
 
@@ -65,11 +64,6 @@ public class LoggerPanel extends JPanel implements GuiLogEventListener {
      * Pane for display JMeter log file
      */
     public LoggerPanel() {
-        if (LOGGER_PANEL_MAX_LINES > 0) {
-            events = new CircularFifoQueue<>(LOGGER_PANEL_MAX_LINES);
-        } else {
-            events = new ArrayDeque<>();
-        }
         textArea = init();
     }
 
@@ -113,6 +107,9 @@ public void processLogEvent(final LogEventObject logEventObject) {
 
         String logMessage = logEventObject.toString();
         synchronized (events) {
+            if (LOGGER_PANEL_MAX_LINES > 0 && events.size() >= LOGGER_PANEL_MAX_LINES) {
+                events.remove();
+            }
             events.add(logMessage);
         }
 
diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
index 5843ac98a74..4d3eaa1ad60 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
@@ -36,12 +36,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 
 import javax.swing.table.DefaultTableModel;
 
-import org.apache.commons.collections4.map.LinkedMap;
 import org.apache.jmeter.reporters.ResultCollector;
 import org.apache.jmeter.samplers.SampleEvent;
 import org.apache.jmeter.samplers.SampleResult;
@@ -471,7 +473,8 @@ private static void appendFields(final boolean condition, StringBuilder textBuff
     }
 
     // Map header names to set() methods
-    private static final LinkedMap<String, Functor> headerLabelMethods = new LinkedMap<>();
+    private static final Map<String, Functor> headerLabelMethods = new LinkedHashMap<>();
+    private static final Map<String, Integer> headerLabelPositions = new HashMap<>();
 
     // These entries must be in the same order as columns are saved/restored.
 
@@ -505,6 +508,10 @@ private static void appendFields(final boolean condition, StringBuilder textBuff
         headerLabelMethods.put(CSV_HOSTNAME, new Functor("setHostname"));
         headerLabelMethods.put(CSV_IDLETIME, new Functor("setIdleTime"));
         headerLabelMethods.put(CSV_CONNECT_TIME, new Functor("setConnectTime"));
+        int pos = 0;
+        for (String key : headerLabelMethods.keySet()) {
+            headerLabelPositions.put(key, pos++);
+        }
     }
 
     /**
@@ -605,8 +612,8 @@ private static String[] splitHeader(String headerLine, String delim) {
                 previous = Integer.MAX_VALUE; // they are always last
                 continue;
             }
-            int current = headerLabelMethods.indexOf(label);
-            if (current == -1) {
+            Integer current = headerLabelPositions.get(label);
+            if (current == null) {
                 log.warn("Unknown column name {}", label);
                 return null; // unknown column name
             }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 89879161445..e2e52109fe9 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -92,6 +92,9 @@ dependencies {
     runtimeOnly("commons-codec:commons-codec") {
         because("commons-codec was a dependency in previous JMeter versions, so we keep it for compatibility")
     }
+    runtimeOnly("org.apache.commons:commons-collections4") {
+        because("commons-collections4 was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
 
     binLicense(project(":src:licenses", "binLicense"))
     srcLicense(project(":src:licenses", "srcLicense"))
diff --git a/src/jorphan/build.gradle.kts b/src/jorphan/build.gradle.kts
index 7f87d061936..29b94f1308f 100644
--- a/src/jorphan/build.gradle.kts
+++ b/src/jorphan/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     api("org.slf4j:slf4j-api")
 
     implementation("commons-io:commons-io")
-    implementation("org.apache.commons:commons-collections4")
     implementation("org.apache.commons:commons-math3")
     implementation("org.apache.commons:commons-text")
 
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/FilterIterator.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/FilterIterator.kt
new file mode 100644
index 00000000000..3241f8e5eee
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/collections/FilterIterator.kt
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.collections
+
+/**
+ * Iterator that filters elements from another iterator based on a predicate.
+ *
+ * This iterator lazily evaluates the predicate as elements are requested,
+ * only advancing through the source iterator when needed.
+ *
+ * @param Element the type of elements returned by this iterator
+ * @property iterator the source iterator to filter
+ * @property predicate the predicate that determines which elements to include
+ */
+public class FilterIterator<Element>(
+    private val iterator: Iterator<Element>,
+    private val predicate: (Element) -> Boolean
+) : Iterator<Element> {
+
+    private var nextElement: Element? = null
+    private var hasNextElement = false
+
+    override fun hasNext(): Boolean {
+        return hasNextElement || prepareNext()
+    }
+
+    /**
+     * Prepares the next element by advancing through the iterator
+     * until an element matching the predicate is found.
+     * This method is idempotent - calling it multiple times without
+     * consuming the element has no effect.
+     */
+    private fun prepareNext(): Boolean {
+        while (iterator.hasNext()) {
+            val element = iterator.next()
+            if (predicate(element)) {
+                nextElement = element
+                hasNextElement = true
+                return true
+            }
+        }
+        return false
+    }
+
+    override fun next(): Element {
+        if (!hasNextElement && !prepareNext()) {
+            throw NoSuchElementException("No more elements matching the predicate")
+        }
+
+        hasNextElement = false
+        @Suppress("UNCHECKED_CAST")
+        val result = nextElement as Element
+        nextElement = null
+        return result
+    }
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/FilterIteratorTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/FilterIteratorTest.kt
new file mode 100644
index 00000000000..a7538b141ce
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/collections/FilterIteratorTest.kt
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.collections
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+class FilterIteratorTest {
+
+    private fun <T> assertFilteredResults(collection: Collection<T>, predicate: (T) -> Boolean) {
+        assertEquals(
+            collection.filter(predicate).toList().toString(),
+            FilterIterator(collection.iterator(), predicate).asSequence().toList().toString(),
+        ) {
+            "input: ${collection.toList()}"
+        }
+    }
+
+    @Test
+    fun `filter even numbers from list`() {
+        val numbers = listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+
+        assertFilteredResults(numbers) { it % 2 == 0 }
+    }
+
+    @Test
+    fun `filter odd numbers from list`() {
+        val numbers = listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+
+        assertFilteredResults(numbers) { it % 2 != 0 }
+    }
+
+    @Test
+    fun `filter strings by length`() {
+        val words = listOf("a", "ab", "abc", "abcd", "abcde")
+        assertFilteredResults(words) { it.length > 2 }
+    }
+
+    @Test
+    fun `filter with no matches returns empty iterator`() {
+        val numbers = listOf(1, 3, 5, 7, 9)
+        assertFilteredResults(numbers) { it % 2 == 0 }
+    }
+
+    @Test
+    fun `filter with all matches returns all elements`() {
+        val numbers = listOf(2, 4, 6, 8, 10)
+        assertFilteredResults(numbers) { it % 2 == 0 }
+    }
+
+    @Test
+    fun `filter empty list returns empty iterator`() {
+        val empty = emptyList<Int>()
+        assertFilteredResults(empty) { it > 0 }
+    }
+
+    @Test
+    fun `filter with null values`() {
+        val items = listOf("a", null, "b", null, "c")
+        assertFilteredResults(items) { it != null }
+    }
+
+    @Test
+    fun `filter with always true predicate`() {
+        val numbers = listOf(1, 2, 3, 4, 5)
+        assertFilteredResults(numbers) { true }
+    }
+
+    @Test
+    fun `filter with always false predicate`() {
+        val numbers = listOf(1, 2, 3, 4, 5)
+        assertFilteredResults(numbers) { false }
+    }
+
+    @Test
+    fun `calling next without hasNext throws exception`() {
+        val numbers = listOf(1, 3, 5)
+        val filtered = FilterIterator(numbers.iterator()) { it % 2 == 0 }
+
+        assertThrows(NoSuchElementException::class.java) {
+            filtered.next()
+        }
+    }
+
+    @Test
+    fun `calling next after exhausted throws exception`() {
+        val numbers = listOf(2)
+        val filtered = FilterIterator(numbers.iterator()) { it % 2 == 0 }
+
+        assertTrue(filtered.hasNext())
+        assertEquals(2, filtered.next())
+        assertFalse(filtered.hasNext())
+
+        assertThrows(NoSuchElementException::class.java) {
+            filtered.next()
+        }
+    }
+
+    @Test
+    fun `multiple calls to hasNext are idempotent`() {
+        val numbers = listOf(1, 2, 3, 4, 5)
+        val filtered = FilterIterator(numbers.iterator()) { it % 2 == 0 }
+
+        assertTrue(filtered.hasNext())
+        assertTrue(filtered.hasNext())
+        assertTrue(filtered.hasNext())
+        assertEquals(2, filtered.next())
+    }
+
+    @Test
+    fun `filter chain with multiple predicates`() {
+        val numbers = listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+
+        // Filter even numbers, then filter those > 5
+        val filtered1 = FilterIterator(numbers.iterator()) { it % 2 == 0 }
+        val filtered2 = FilterIterator(filtered1) { it > 5 }
+
+        val result = filtered2.asSequence().toList()
+
+        assertEquals(listOf(6, 8, 10), result)
+    }
+
+    @Test
+    fun `filter with single element matching`() {
+        val numbers = listOf(1, 2, 3)
+        val filtered = FilterIterator(numbers.iterator()) { it == 2 }
+
+        assertTrue(filtered.hasNext())
+        assertEquals(2, filtered.next())
+        assertFalse(filtered.hasNext())
+    }
+}
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 36551cd9996..2bc10d4ed68 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -55,9 +55,6 @@ dependencies {
     }
     implementation("org.jsoup:jsoup")
     implementation("oro:oro")
-    runtimeOnly("org.apache.commons:commons-collections4") {
-        because("commons-collections4 was a dependency in previous JMeter versions, so we keep it for compatibility")
-    }
     implementation("commons-net:commons-net")
     implementation("com.helger.commons:ph-commons") {
         // We don't really need to use/distribute jsr305

From 1ebaf934adaf2ce42091342a9924b2bac2c2f756 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 7 Nov 2025 22:23:05 +0300
Subject: [PATCH 0949/1037] chore: remove core->commons-collections dependency

We still ship the jar in the distribution, however, we no longer depend on it in core
---
 src/core/build.gradle.kts | 3 ---
 src/dist/build.gradle.kts | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index bc51c5d7245..e9625195e7e 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -94,9 +94,6 @@ dependencies {
     implementation("org.apache-extras.beanshell:bsh:2.0b6") {
         because("Direct dependency required from BeanShellInterpreter")
     }
-    runtimeOnly("commons-collections:commons-collections") {
-        because("Compatibility for old plugins")
-    }
     implementation("org.jetbrains.lets-plot:lets-plot-batik")
     implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm")
     implementation("org.apache.commons:commons-math3") {
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index e2e52109fe9..a99c78e320c 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -92,6 +92,9 @@ dependencies {
     runtimeOnly("commons-codec:commons-codec") {
         because("commons-codec was a dependency in previous JMeter versions, so we keep it for compatibility")
     }
+    runtimeOnly("commons-collections:commons-collections") {
+        because("commons-collections was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
     runtimeOnly("org.apache.commons:commons-collections4") {
         because("commons-collections4 was a dependency in previous JMeter versions, so we keep it for compatibility")
     }

From 6027c3bf42f7b89ff35ac8a67d8b928b7da27d57 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 7 Nov 2025 23:43:40 +0300
Subject: [PATCH 0950/1037] test: remove excessive static modifiers from test
 methods

---
 .../http/proxy/TestHttpRequestHdr.java        | 10 +++----
 ...stHTTPSamplersAgainstHttpMirrorServer.java | 26 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index 62479a957c1..0fad025672c 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -196,19 +196,19 @@ public void testRepeatedArguments() throws Exception {
     }
 
     @Test
-    public static void testEncodedArguments() throws Exception {
+    public void testEncodedArguments() throws Exception {
         String url = "http://localhost/matrix.html";
         testEncodedArguments(url);
     }
 
 
     @Test
-    public static void testEncodedArgumentsIPv6() throws Exception {
+    public void testEncodedArgumentsIPv6() throws Exception {
         String url = "http://[::1]:8080/matrix.html";
         testEncodedArguments(url);
     }
 
-    private static void testEncodedArguments(String url) throws Exception {
+    private void testEncodedArguments(String url) throws Exception {
         // A HTTP GET request, with encoding not known
         String contentEncoding = "";
         String queryString = "abc%3FSPACE=a+b&space=a%20b&query=What%3F";
@@ -309,12 +309,12 @@ private static void testEncodedArguments(String url) throws Exception {
     }
 
     @Test
-    public static void testGetRequestEncodings() throws Exception {
+    public void testGetRequestEncodings() throws Exception {
         testGetRequestEncodings("http://localhost/matrix.html");
     }
 
     @Test
-    public static void testGetRequestEncodingsIPv6() throws Exception {
+    public void testGetRequestEncodingsIPv6() throws Exception {
         testGetRequestEncodings("http://[::1]:8080/matrix.html");
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
index 2da7085c152..c777afa2426 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
@@ -109,72 +109,72 @@ static void setup() throws IOException {
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public static void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
+    public void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER, ISO_8859_1, item);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public static void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
+    public void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
         testPostRequest_UrlEncoded(HTTP_SAMPLER3, US_ASCII, item);
     }
 
     @Test
-    public static void testPostRequest_FormMultipart_0() throws Exception {
+    public void testPostRequest_FormMultipart_0() throws Exception {
         testPostRequest_FormMultipart(HTTP_SAMPLER);
     }
 
     @Test
-    public static void testPostRequest_FormMultipart3() throws Exception {
+    public void testPostRequest_FormMultipart3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FormMultipart(HTTP_SAMPLER3);
     }
 
     @Test
-    public static void testPostRequest_FileUpload() throws Exception {
+    public void testPostRequest_FileUpload() throws Exception {
         testPostRequest_FileUpload(HTTP_SAMPLER);
     }
 
     @Test
-    public static void testPostRequest_FileUpload3() throws Exception {
+    public void testPostRequest_FileUpload3() throws Exception {
         // see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
         testPostRequest_FileUpload(HTTP_SAMPLER3);
     }
 
     @Test
-    public static void testPostRequest_BodyFromParameterValues() throws Exception {
+    public void testPostRequest_BodyFromParameterValues() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER, ISO_8859_1);
     }
 
     @Test
-    public static void testPostRequest_BodyFromParameterValues3() throws Exception {
+    public void testPostRequest_BodyFromParameterValues3() throws Exception {
         testPostRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
 
     @Test
-    public static void testGetRequest() throws Exception {
+    public void testGetRequest() throws Exception {
         testGetRequest(HTTP_SAMPLER);
     }
 
     @Test
-    public static void testGetRequest3() throws Exception {
+    public void testGetRequest3() throws Exception {
         testGetRequest(HTTP_SAMPLER3);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public static void itemised_testGetRequest_Parameters(int item) throws Exception {
+    public void itemised_testGetRequest_Parameters(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER, item);
     }
 
     @ParameterizedTest
     @ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-    public static void itemised_testGetRequest_Parameters3(int item) throws Exception {
+    public void itemised_testGetRequest_Parameters3(int item) throws Exception {
         testGetRequest_Parameters(HTTP_SAMPLER3, item);
     }
 
     @Test
-    public static void testPutRequest_BodyFromParameterValues3() throws Exception {
+    public void testPutRequest_BodyFromParameterValues3() throws Exception {
         testPutRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
     }
 

From f5518e348199cb362957d473c524b209e7d6a706 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 5 Nov 2025 09:28:08 +0300
Subject: [PATCH 0951/1037] chore: remove the use of commons-io and
 commons-text

We keep the jars in the distribution, however, we no longer depend
on commons-io and commons-text
---
 bin/testfiles/FTP_TESTS.jmx                   |   17 +-
 bin/testfiles/JMS_TESTS.jmx                   |   26 +-
 gradle/verification-keyring.keys              | 1612 +----------------
 gradle/verification-metadata.xml              |  535 ++----
 lib/aareadme.txt                              |    5 -
 src/bom-thirdparty/build.gradle.kts           |   13 +-
 .../apache/jmeter/util/BeanShellClient.java   |    4 +-
 src/components/build.gradle.kts               |    7 +-
 .../jmeter/assertions/HTMLAssertion.java      |    4 +-
 .../jmeter/extractor/BoundaryExtractor.java   |    4 +-
 .../jmeter/extractor/RegexExtractor.java      |    4 +-
 .../visualizers/StatGraphVisualizer.java      |    8 +-
 .../backend/influxdb/HttpMetricsSender.java   |    5 +-
 .../action/template/TestTemplateManager.java  |    4 +-
 src/core/build.gradle.kts                     |    2 +-
 .../main/java/org/apache/jmeter/JMeter.java   |   10 +-
 .../org/apache/jmeter/gui/action/Save.java    |  144 +-
 .../dashboard/HtmlTemplateExporter.java       |    7 +-
 .../jmeter/report/dashboard/JsonExporter.java |    3 +-
 .../report/dashboard/ReportGenerator.java     |    9 +-
 .../report/dashboard/TemplateVisitor.java     |   12 +-
 .../processor/ErrorsSummaryConsumer.java      |    4 +-
 .../AbstractVersusRequestsGraphConsumer.java  |    9 +-
 .../apache/jmeter/services/FileServer.java    |   23 +-
 .../jmeter/testbeans/gui/FileEditor.java      |    4 +-
 .../apache/jmeter/util/BSFTestElement.java    |    8 +-
 src/dist-check/build.gradle.kts               |    3 -
 .../jorphan/reflect/TestClassFinder.java      |    4 +-
 .../gui/action/HtmlReportGeneratorTest.kt     |    4 +-
 .../report/dashboard/ReportGeneratorTest.kt   |   13 +-
 src/dist/build.gradle.kts                     |    6 +
 src/dist/src/dist/expected_release_jars.csv   |    1 +
 src/functions/build.gradle.kts                |    7 +-
 .../apache/jmeter/functions/EscapeHtml.java   |    8 +-
 .../apache/jmeter/functions/EscapeXml.java    |    6 +-
 .../apache/jmeter/functions/FileToString.java |   10 +-
 .../apache/jmeter/functions/RandomDate.java   |    2 +-
 .../apache/jmeter/functions/RandomString.java |   16 +-
 .../jmeter/functions/StringFromFile.java      |   10 +-
 .../apache/jmeter/functions/StringToFile.java |   11 +-
 .../apache/jmeter/functions/TimeShift.java    |    2 +-
 .../org/apache/jmeter/functions/UnEscape.java |    6 +-
 .../apache/jmeter/functions/UnEscapeHtml.java |    6 +-
 .../jmeter/functions/TestStringtoFile.java    |    3 +-
 src/jorphan/build.gradle.kts                  |    2 -
 .../org/apache/jorphan/exec/KeyToolUtils.java |    9 +-
 .../org/apache/jorphan/exec/StreamCopier.java |    3 +-
 .../apache/jorphan/locale/LocaleUtils.java    |  176 ++
 .../org/apache/jorphan/util/JOrphanUtils.java |   17 +-
 .../apache/jorphan/util/StringUtilities.java  |   26 +
 .../org/apache/jorphan/io/BomInputStream.kt   |   93 +
 .../apache/jorphan/io/CountingInputStream.kt  |   83 +
 .../apache/jorphan/io/CountingOutputStream.kt |   50 +
 .../io/DirectAccessByteArrayOutputStream.kt   |  133 ++
 .../org/apache/jorphan/io/TeeOutputStream.kt  |  117 ++
 .../jorphan/text/RandomStringGenerator.kt     |  265 +++
 .../DirectAccessByteArrayOutputStreamTest.kt  |   76 +
 .../apache/jorphan/io/TeeOutputStreamTest.kt  |   50 +
 .../jorphan/text/RandomStringGeneratorTest.kt |  258 +++
 src/protocol/ftp/build.gradle.kts             |    3 -
 .../protocol/ftp/sampler/FTPSampler.java      |   19 +-
 src/protocol/http/build.gradle.kts            |    7 +-
 .../http/config/gui/GraphQLUrlConfigGui.java  |    8 +-
 .../protocol/http/curl/BasicCurlParser.java   |    4 +-
 .../gui/action/ParseCurlCommandAction.java    |    8 +-
 .../protocol/http/parser/CssParser.java       |    6 +-
 .../protocol/http/parser/URLCollection.java   |    4 +-
 .../http/proxy/DefaultSamplerCreator.java     |   12 +-
 .../protocol/http/sampler/HTTPFileImpl.java   |   33 +-
 .../protocol/http/sampler/HTTPJavaImpl.java   |    8 +-
 .../http/sampler/HTTPSamplerBase.java         |   38 +-
 .../protocol/http/sampler/PostWriter.java     |    3 +-
 .../DirectAccessByteArrayOutputStream.java    |   47 -
 .../jmeter/curl/BasicCurlParserTest.java      |   16 +-
 .../http/control/TestHTTPMirrorThread.java    |    3 +-
 .../protocol/http/parser/TestHTMLParser.java  |    3 +-
 src/protocol/java/build.gradle.kts            |    4 -
 .../protocol/java/sampler/BSFSampler.java     |   10 +-
 src/protocol/jdbc/build.gradle.kts            |    3 -
 .../jdbc/AbstractJDBCTestElement.java         |   23 +-
 src/protocol/jms/build.gradle.kts             |    3 -
 .../jms/sampler/PublisherSampler.java         |    9 +-
 .../jms/sampler/SubscriberSampler.java        |    4 +-
 .../sampler/render/BinaryMessageRenderer.java |    4 +-
 src/protocol/ldap/build.gradle.kts            |    4 +-
 .../protocol/ldap/sampler/LDAPExtSampler.java |   10 +-
 src/protocol/mail/build.gradle.kts            |    4 -
 .../mail/sampler/MailReaderSampler.java       |    5 +-
 .../protocol/smtp/sampler/SmtpSampler.java    |   11 +-
 .../sampler/protocol/SendMailCommand.java     |    8 +-
 src/protocol/tcp/build.gradle.kts             |    4 -
 .../jmeter/testkit/ResourceLocator.java       |    3 +-
 xdocs/package.json                            |    3 +
 93 files changed, 1864 insertions(+), 2429 deletions(-)
 create mode 100644 src/jorphan/src/main/java/org/apache/jorphan/locale/LocaleUtils.java
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/io/BomInputStream.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingInputStream.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingOutputStream.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStream.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/io/TeeOutputStream.kt
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/text/RandomStringGenerator.kt
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStreamTest.kt
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/io/TeeOutputStreamTest.kt
 create mode 100644 src/jorphan/src/test/kotlin/org/apache/jorphan/text/RandomStringGeneratorTest.kt
 delete mode 100644 src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java

diff --git a/bin/testfiles/FTP_TESTS.jmx b/bin/testfiles/FTP_TESTS.jmx
index 371a7d09c33..b8f6028bd3b 100644
--- a/bin/testfiles/FTP_TESTS.jmx
+++ b/bin/testfiles/FTP_TESTS.jmx
@@ -76,14 +76,17 @@ import org.apache.ftpserver.usermanager.impl.BaseUser;
 import org.apache.ftpserver.usermanager.impl.WritePermission;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.ftpserver.ftplet.Authority;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.ArrayList;
-import org.apache.commons.io.FileUtils;
 import org.apache.ftpserver.DataConnectionConfiguration;
 import org.apache.ftpserver.DataConnectionConfigurationFactory;
+import kotlin.io.path.PathsKt;
 
-FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;));
-new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;).mkdirs();
+Path ftpTestPath = Path.of(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;);
+PathsKt.deleteRecursively(ftpTestPath);
+Files.createDirectories(ftpTestPath);
 
 DataConnectionConfigurationFactory dataConnectionConfigurationFactory =
 	new DataConnectionConfigurationFactory();
@@ -244,11 +247,11 @@ props.put(&quot;FTP_SERVER&quot;, server);
           <stringProp name="cacheKey">d09f6f8d-0f86-4cae-b88c-0ad9bd587d31</stringProp>
           <stringProp name="script">import org.apache.ftpserver.FtpServer;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FileUtils;
+import java.nio.file.Path;
+import kotlin.io.path.PathsKt;
 
-
-FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;));
+Path ftpTestPath = Path.of(JMeterUtils.getJMeterHome(), &quot;bin/temp/ftp_test&quot;);
+PathsKt.deleteRecursively(ftpTestPath);
 
 FtpServer server = (FtpServer) props.get(&quot;FTP_SERVER&quot;);
 try {
diff --git a/bin/testfiles/JMS_TESTS.jmx b/bin/testfiles/JMS_TESTS.jmx
index ad50947eabe..d7a82d3e28e 100644
--- a/bin/testfiles/JMS_TESTS.jmx
+++ b/bin/testfiles/JMS_TESTS.jmx
@@ -33,12 +33,13 @@
           <stringProp name="script">import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.commons.io.FileUtils;
-import java.io.File;
+import java.nio.file.Path;
+import kotlin.io.path.PathsKt;
+
+Path activemqData = Path.of(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;);
+log.info(&quot;Deleting {}&quot;, activemqData);
+PathsKt.deleteRecursively(activemqData);
 
-File file = new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;);
-log.info(&quot;Deleting {}&quot;, file);
-FileUtils.deleteDirectory(file);
 log.info(&quot;Creating activemq config from {}&quot;, JMeterUtils.getJMeterHome()+ &quot;/bin/testfiles/activemq.xml&quot;);
 try {
 	String path = JMeterUtils.getJMeterHome()+ &quot;/bin/testfiles/activemq.xml&quot;;
@@ -120,10 +121,10 @@ import org.slf4j.LoggerFactory;
 import javax.naming.InitialContext;
 import javax.naming.Context;
 import java.util.Properties;
-def thread = Thread.start { 
+def thread = Thread.start {
 	Properties props = new Properties();
 	props.setProperty(Context.INITIAL_CONTEXT_FACTORY,		&quot;org.apache.activemq.jndi.ActiveMQInitialContextFactory&quot;);
-	props.setProperty(Context.PROVIDER_URL,&quot;tcp://127.0.0.1:61616&quot;);	
+	props.setProperty(Context.PROVIDER_URL,&quot;tcp://127.0.0.1:61616&quot;);
 	Context namingCtx = new InitialContext(props);
 	ConnectionFactory cf = (ConnectionFactory)namingCtx.lookup(&quot;ConnectionFactory&quot;);
 	Connection con = cf.createConnection();
@@ -131,7 +132,7 @@ def thread = Thread.start {
 	Destination dest = (Destination)namingCtx.lookup(Parameters);
 
 	try {
-		Session session = 
+		Session session =
 		      con.createSession(false, Session.AUTO_ACKNOWLEDGE);  // non-transacted session (more)
 		MessageConsumer consumer = session.createConsumer(dest);
 		consumer.setMessageListener(new MyMessageListener(session));
@@ -141,7 +142,7 @@ def thread = Thread.start {
 		session.close();
 		log.info(&quot;Closed session&quot;);
 	} finally {
-		con.close();                                             // free all resources (more)	
+		con.close();                                             // free all resources (more)
 	}
 }
 SampleResult.setResponseMessageOK();
@@ -400,7 +401,7 @@ Connection con = cf.createConnection();
 Destination dest = (Destination)namingCtx.lookup(&quot;dynamicQueues/requestQueue4&quot;);
 
 try {
-  Session session = 
+  Session session =
       con.createSession(false, Session.AUTO_ACKNOWLEDGE);  // non-transacted session (more)
 
   MessageConsumer consumer = session.createConsumer(dest);
@@ -1396,7 +1397,8 @@ propFloat	1.2</stringProp>
           <stringProp name="cacheKey">true</stringProp>
           <stringProp name="script">import org.apache.activemq.broker.BrokerService;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.commons.io.FileUtils;
+import java.nio.file.Path;
+import kotlin.io.path.PathsKt;
 
 BrokerService broker = props.get(&quot;ACTIVEMQ_BROKER&quot;);
 Thread.start {
@@ -1406,7 +1408,7 @@ Thread.start {
   // Otherwise &quot;The following non-daemon threads are still running&quot; is printed
   sleep(700)
   broker.stop()
-  FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;))
+  PathsKt.deleteRecursively(Path.of(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;))
 }
 </stringProp>
         </JSR223Sampler>
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index bffc6702e3a..fbff5b447d4 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -471,31 +471,6 @@ ydosffBt6EsCLeQgvxXGzeXk/jExbSwiPPHlO1k=
 =Lugx
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    8D7F1BEC1E2ECAE7
-sub    E98008460EB9BB34
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
-dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
-P1LhYsSxLkkjqZmgPWdef5EFu3ngIvfJe3wIXvrZBB8AbbmqBWuzy6RVPUawnzyz
-qZTlHfyQiiP41OMONOGdh/I7Tj6Ax9X1dMH3N5SkXgmuy4YHZoeFW2K3+6yIbP8U
-CMxrTNLm6QfOIPsvjDDnTBpkkvEZjS24raBiHW5P35ptpNj5F1oLlOxZ/NRCbP3C
-PlEejUkh1+7rOwrRkCrDnNFIQYmWF2Mt4KlzABEBAAG5AQ0EXyS45QEIANDsIlvC
-dMQp+rixXunm23AcZLsgzW781vawPkk8Dw3neQqTjrcd81W9p+iSjQAzvq0dW6PQ
-wtSy++nOtyIpU+J1cfAs1Jxi3sms40cvqqccSQkzjJUs97fzo1capzlf09NmNncH
-SCqqeAZU7J+WnUNSBd50yLLTffvo1lO7svLFcuvaO8ai+XoeYzTxm6paT4vyzcH+
-9hlew6nMafmMDjDsAkba4bjcXhpCkS9Jijc6973zDjFdzpf+YvKtvxktRWfDktLY
-MdTaVm+6MAfFubs+zZjOuMHc72XgiqI789z4BOeeD1HjzkGfLA9bfpcS2Gs0+63N
-iDXIY2rT0D71IucAEQEAAYkBPAQYAQgAJhYhBIoQeSmDAj1dFMk7SI1/G+weLsrn
-BQJfJLjlAhsMBQkDwmcAAAoJEI1/G+weLsrnbSgH/1+Wy3H0/v0mY/2qi2cod2+N
-PT2i6RBJ+LvkW8Wzp4oIr9rRjZ4jlZXTAtvdY5PVellIAztr5C65Qcwi+aRzDSTn
-a+FDzJoIMIqNPuaQUcKLGFrpUUFvng9eRnh773A868XDiLtHiqp1BGn3F7g6BZmN
-4fbpnL+XAaW5ogmZd9pVgctB7b568+C0E/d0U0j9ZfH1DeLLwrpsP/vGvIrt+tqy
-2YKDzJW08qgUWSc/nPWceQs6lhO/P1FFgdx7GINK+HG85taQ119Yz+CdLD/j4Aph
-YEfib2tDM60p8ZyAhgza4geUBMLQgu3uAZwBaYSPttcTPL0mqD1iKucdyuVgXSs=
-=FxWA
------END PGP PUBLIC KEY BLOCK-----
-
 pub    8EA48D105232855D
 uid    Edgar Espina <espina.edgar@gmail.com>
 
@@ -638,34 +613,6 @@ L8l1L/LHKR+bUdCxfPeG++GA/77XF9rmO4DyEmNyyFX3gFv9hVi0
 =0x1P
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    98FE03A974CE0A0B
-uid    Kotlin Release Key <support@jetbrains.com>
-
-sub    CC3328A2F49A80C8
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFhlXQUBCACoN2nTeSRVZnGoktKHyiCgeYQ/hEKKKDDAbWubnnQwonCTILaN
-Qw3GmIT6plmi9iy4rl+rJprSzDeQDZngQCx1KPYcXCrrc0pnjERDaogw9fC3c3z2
-B6+90qT6UJSTNmxMs5zbhgzKDWb3eaDmVDqVqzsM5xz9GxX6zo83o37fTFSbVbtA
-9+c100+KaAldVL/6uLeGoQsAIxtMH8GiOPiSjrw+XCQ5mbP6e+oYYBKxEyAgu1XW
-8jP4bF0rz2+1lkIGfWfYHZmMbmSutDxXqOXA9cZomhOayOSe+iczoxXkVXkQzMxq
-bG4ru5CHxPh+RSfpwA+9StLvzLeoFrBUlqW3ABEBAAG0KktvdGxpbiBSZWxlYXNl
-IEtleSA8c3VwcG9ydEBqZXRicmFpbnMuY29tPrkBDQRYZV0FAQgAo239WGQjltcz
-GgzZdgyH0w/PruwBqpz0SLFqf8441+3JxK05UcHRiF9D2Ww14shvqpC+96yS0jV7
-G/XzDFKk34ATCugwYNIN+LGGmBp44bOPyiZc5MFnsG/vcD7h0JV6hDUX+yzg6REr
-snHmMsztO5jsgbrhdJjLoPpC8w6gjEp2oHzV/olgPNXCzMW9RRsOpVAh+Fdy4IsB
-tjG0lVXMCV0YFZH/vZSrycTd6t555mMeeIANrBT5dHYSC/VowO8/zNSlaXaZHM4o
-D7VInJeEDnr3jfmzrTg9/E90RKUqcxiWKdZk28vmutFXXm9hhTa7n2iX+DbsM4XL
-fdQKsKBngQARAQABiQEfBBgBCAAJBQJYZV0FAhsMAAoJEJj+A6l0zgoLY3AIAJMK
-WFxboZuxFpEfNJ2dcM9Q2VZ/RQM/PRqY2nyZDCzKAv6NbRrC2t/HFKpu/7WbIxAH
-uDq0sUZxMf6Op+QOw3aulDb9yetRWa6cyOQKehLKGuqiVK/2jDQvsr4URGbGrlAa
-isT8bJrzugrfyi9dmYZSzv04ZK0B4SddeS1r50OVfefJMYznYcRpps8lG/94yivJ
-k+C/zpqFqMxTFtz0t2OR1WfCP7FrlTHplW48Yd6h2r4xZNm4oz/+pP25ds6yCIpY
-nUTdg/LginuRzid73nRYad3O787doGV2qzFSy1DRptle0BWPWPYij8mC+31u0T2L
-Syx8ZPwcJq0wXCx+L3w=
-=9nKv
------END PGP PUBLIC KEY BLOCK-----
-
 pub    991EFB94DB91127D
 uid    Antoine Mottier <gpg@mottier.xyz>
 
@@ -755,39 +702,6 @@ bZRG
 =N23Z
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    9987B20C8F6A3064
-sub    80CFA7C482552DC3
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
-aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
-BnwoRUe0OsTItUQA+vLH8K2Uywd9f3OV9KQnqItUFMptaFhUC144hZhj3c0xhITS
-k45zucoXLKO9yqA+tlqav7taAJMrWbhRcRWXizK1wOZLyhu8NdIMUSL4Ei0blR90
-uA9i62XlOhpyvfpaC7oRh+jXHOCFK9sXe2vnvnTtJ1yqdXH4EOCYLjoheQN1R0u4
-6f6XoAy9c3tOSOZM9vwE56iOZJwv0bca6ZENnhHnYwWhbQwrY0JMIon0sUpx9RB2
-w4E7AeU8/maQG9hdB7s7vrAJFarlFQvc7kJ5FMTKFmWPalUTcT6yXntIQ3+xiH9l
-Oq0jGlAmQWYUvzHJ0SFjz1xJGBDM3GH9KfHbeoS3Xz5Emmw8YwEDUe9gt9po8bmw
-8qnA85uMZY2puh0AEQEAAbkBjQRiRjMaAQwAtcqYEeHIX/zszjNyKDyLONoZphIy
-efYlWpbrbAFgwgJVEWiIWGo1Du0f5P6g3p29QD9wSJrZ2pz8TUwUIhwpCxA50ceT
-PzEXi523znqWlXmOwdBuV6XjD7Bi0ZELg+QrumZfSDlAGb7fU6O39To1mDqg3SI1
-jybBk6OOlPYfdfII72z+1smEaUikOpXeJbnXwqkAaB8jQBgGikciACVruP8jMRwE
-Op1JcMj1hTOMjsbNYYx6s3NY8OPJvg9RqWfWAC1V6fsEBESlYVnw3IU5sMJzw949
-h60btqFFjgg6GDjD9Xk6RJQjIZti9XQVsIOAswQ2tUHYj7KmjX/5h6U+xmZtFRYS
-kPXMAjj7q31t3+Lj7Vhcm4FZGidY0AwwZAQLP6tiR2rcEtJ2E1xXqmAM9nT15eyW
-wfOVh/VVuU/DDaOlbBQyqwlTuKYxCj4UyWGVVqgSwByFzYpaKkWw91RX008eT94j
-9sj+m3Vqe5Q8VT3lRwju+TBaQz0V6Z/kKgJjABEBAAGJAbwEGAEKACYWIQQYc2aj
-/+a/j5S5E2qZh7IMj2owZAUCYkYzGgIbDAUJA8JnAAAKCRCZh7IMj2owZFvQC/4/
-QrnLGg7CnW/MIxH5iUo0JFxK4guzw3f/NGiMzNcugU4IIsApMi/Jg6y9wxqGnto3
-A30NiVDNJHhtOZh+D0pNlAe+f2nSrpA5zZN34VHhA2kNrVFoQ97pY746r6yNmM8D
-Llhb76WjpE8Z0G3y0A10eYjZaGSeM2Of1xUu79K52D3UVJY8EVgLEZgiyQMyD1kS
-bxa+6xVv3DkbQE5cn+RJBnwl/maYBt8z5EtbApjjY8Udf4YgWvrGHzCUUGPgLwNI
-cgs/nwukuvE706DNS80m9BKrKDNp99GptlIVYy4RYafV49s4Z4OuzHXTkgb2+haz
-m5PJQyLzvk0igLmedB8wdxFqzrYZmKPWe5ai4T5fggOBzVXKr8N0X6ErxL386557
-JhlLF2NiCkH6o4Nl2ez/GG6uhT2STIIoLyTgrUxb88cP0FJID/12RNCrR6uZAnZH
-ZGyzQN+5ee//uhBiY5oeXtaKkQx4AH34Zr8jI8geGC+PG2G48BRGq/4ywkCY/w4=
-=utTz
------END PGP PUBLIC KEY BLOCK-----
-
 pub    9A259C7EE636C5ED
 uid    Liam Miller-Cushon <cushon@google.com>
 
@@ -832,31 +746,6 @@ cFYKw6eZhSnlf3dtLjLzKg==
 =hIWn
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    9A2C7A98E457C53D
-sub    92AECA6AC21DB816
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
-rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
-kMSzmn3nBbeacv5szjB8dzF0ZGPPgciGp28KYrjfPbxrZvnX0PgL6C5RqNkI3cTh
-oUZgYqXGUe/uj5gUiLr+eZvh5lajPqe2YF9fmxfRXklmX47TMYidFkcQKGwxIM47
-7AKa5mKCp9MPKmxA2TG5F74sOwtSe7PYfzraVgaK0GGDJhm0Xr537EdtJfOpDRJF
-GizM3hYSgOp3Yo1wjPrkFA82EfB4hCNZK6ipABEBAAG5AQ0EWM3psAEIAKi9vYsJ
-kKjFWAswJAWCTTsYsfU6WPtJnErx1q5ZZa3uYXibODcs9sd8LhmJD2u8iAQLtWuD
-l/SC6nln1ikCRYy7v1JbENmJw8gWQqIBLjmma9v5GPUe/Dg1QSJqrem6VEjNtgsz
-GJGr4+GDSCJN/AkNKlyMFgSdpRrMCBZkvpwnvSM2EFbhxonbtD/jvqSlx68OY32/
-2cesXPvS/Nj8RqQfj0RxcOK5AHGKFQGoMgK2NGXfAxdOhPOA3I2NwfQLnCNbAVbP
-OauNcV9tg9vbRg0l75CAbW0tmM1i/8Geh248QAlQL5NtApB3az11wbCEMAoFRh8m
-aFLFtTJYTnKgW1MAEQEAAYkBNgQYAQIACQUCWM3psAIbDAAhCRCaLHqY5FfFPRYh
-BOKssDeTPN6qt7931JosepjkV8U9qkQH/RGqpU96gvTUGK+UG1w7okbN+x71zYk0
-nIx4oKvGADv0aNV11ri7t7YgiVKqBQF5tLh9b6QdmfmNzBDAidukyNBAJAAWkCI5
-2sDWlXptqPqzzB50++P6/uN8xdru51G+lnoZCjdjNWx/yf1rxlv1tf9jBQ9+Fjh5
-b+1G7TZCPW6zglUKXHAmSpIQ4aOPaYYp8gsBPs3N3EdF8N3bskRnkIv9gZuGPod5
-KC2YzlimgvCVm7TLDIXA43s1/ymS42Xnn9wCQOtxnA/GIeWKL6a3+g8GphKgNawf
-cn2I1XohTuU8/BFl6RYzJti65RLrRyvoPBd3V/XFtQtHb4Ave6J48c4=
-=NIkz
------END PGP PUBLIC KEY BLOCK-----
-
 pub    9AE296FD02E9F65B
 uid    Luc Maisonobe <luc@orekit.org>
 
@@ -902,6 +791,8 @@ yfc=
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub    9B1FDA9F3C062231
+uid    Brian E Fox <brianf@apache.org>
+
 sub    458AF764D812A037
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -913,21 +804,22 @@ XWuRpZUO4d7LKq7QaKLKBQeAI1NqqZuB7gtdU6ILy7OjI2C38KTCpyu+8lj97CNQ
 gJqFh26lqhtFfMOUwKvNUUsEABDy+vnI+VCW32ZT/E1xjA+nVTSjGM9lyv4Gls7M
 8pd5A/wJ3rD8XDiriM3ZV1Sn7/pt9OBxc25YHhfbTinIQBYCBhTw3wbS3d+PLQOL
 /TmkeaZcuFA0KQW5hHEjTIY2YbOd2lPNa9ynq+/1OvJOGAseCWL8uorYAmk6ztkc
-Sy4UZuNbupNSPGOt0hZixQpSB3Tv49XlFyupd7rPnYi4F37nPLkCDQRFo6IbEAgA
-oPx5Bm4+wUuVea7pqi8NTs/CkhAdAWgNnsj6tS/YzyncXD6mjc9Sx12Y6DRCkzC+
-ZTvy89nt/IHOvbaCZ8etLuBonv9PyYXu6HmGNihqg8rBQzXUlbIPdZD/1GeVwH3k
-O2DaZ+Rt1EKjnloXlpwLGMnn2n9isWUCMWjyWSZbnNBca30tooXp+cWGBnClv+Ay
-ez3jvroWCe9vVbj8/AWM2Pn5pB6Ewzw9SLmC3kgcq15XXBTgeeEZohuTvrmsNOHG
-Nh9HFEp+Y56JD8ufPOsNayRHW3ex8btx4sZhLO2Ixj25cOjDfoKZ2aj8ByCsJAsN
-U1qgWeyn/QTrrHavOTLpmwADBQf+K5Fi7IcpD+doMksWWpu68+2F4sDiHybwi1sr
-kV9oy/R6vG0SkO4DuV2/k9rCquavHQSW7jXzfZuOoY/ErK/6/bd3GpLjZNR/K2ZN
-T2aOcHVFJoQTQgKf3GDlSmecNuskHpe1pUhbaY+zWKx+DMEjcwThchArABW2djcy
-Tk0YRygxQwqWBPGI8sjquxsrqKKrjallTVokbx9rr1VwCLcxg3HFI+GJjhHkjmYX
-JANSqzaPyIamcfR8wBQEV9+IiGx/EdRTvASx7uveg5119pPtwb0g0r95SlJpoYQe
-4wiTAagxkwwSb3qWktA06gWykX5NQkMX0VK6lsNvP0tAOvY134hgBBgRAgAJBQJF
-o6IbAhsMACEJEJsf2p88BiIxFiEEmYrw4rk1mW9c69Vrmx/anzwGIjEGagCgisY5
-6UkqfDICNqB4t69TDgy70noAoJ87koq0FkuxXdarqEIjnn6IDfnp
-=vRsa
+Sy4UZuNbupNSPGOt0hZixQpSB3Tv49XlFyupd7rPnYi4F37nPLQfQnJpYW4gRSBG
+b3ggPGJyaWFuZkBhcGFjaGUub3JnPrkCDQRFo6IbEAgAoPx5Bm4+wUuVea7pqi8N
+Ts/CkhAdAWgNnsj6tS/YzyncXD6mjc9Sx12Y6DRCkzC+ZTvy89nt/IHOvbaCZ8et
+LuBonv9PyYXu6HmGNihqg8rBQzXUlbIPdZD/1GeVwH3kO2DaZ+Rt1EKjnloXlpwL
+GMnn2n9isWUCMWjyWSZbnNBca30tooXp+cWGBnClv+Ayez3jvroWCe9vVbj8/AWM
+2Pn5pB6Ewzw9SLmC3kgcq15XXBTgeeEZohuTvrmsNOHGNh9HFEp+Y56JD8ufPOsN
+ayRHW3ex8btx4sZhLO2Ixj25cOjDfoKZ2aj8ByCsJAsNU1qgWeyn/QTrrHavOTLp
+mwADBQf+K5Fi7IcpD+doMksWWpu68+2F4sDiHybwi1srkV9oy/R6vG0SkO4DuV2/
+k9rCquavHQSW7jXzfZuOoY/ErK/6/bd3GpLjZNR/K2ZNT2aOcHVFJoQTQgKf3GDl
+SmecNuskHpe1pUhbaY+zWKx+DMEjcwThchArABW2djcyTk0YRygxQwqWBPGI8sjq
+uxsrqKKrjallTVokbx9rr1VwCLcxg3HFI+GJjhHkjmYXJANSqzaPyIamcfR8wBQE
+V9+IiGx/EdRTvASx7uveg5119pPtwb0g0r95SlJpoYQe4wiTAagxkwwSb3qWktA0
+6gWykX5NQkMX0VK6lsNvP0tAOvY134hJBBgRAgAJBQJFo6IbAhsMAAoJEJsf2p88
+BiIxBmoAoIrGOelJKnwyAjageLevUw4Mu9J6AKCfO5KKtBZLsV3Wq6hCI55+iA35
+6Q==
+=L7x9
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub    9C8C892F91F8E6D1
@@ -1157,38 +1049,6 @@ FaSYF1lb13TNIRT1q1My
 =MTP+
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    A50569C7CA7FA1F0
-uid    Atsuhiko Yamanaka (ymnk) <ymnk@jcraft.com>
-
-sub    CFA67E8582F7E9FB
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE01exkRBACp+Rd7U5kgVl97TOJLRhvI/GVgwZfZB9VwF7O4KKCj1c/Hkb+3
-4csI97hLhjfLBof88/JY6gLk6GMTDFm2rAwZRoodaE4YBRmtP5qUaUryIal0HTaf
-fCw91IHxn4XCyX6X18hpcHI5ZWbYN5Y6MMENcDVQG0m7Mq/d+cVJGnacIwCgsTKx
-+zWBMTcgtHifuZHM3E2bu50D/3yWuNeZOB+d21zSPgvyHL0tYyABPXNLZ45EzhLg
-5wKF4ywRdJZk4W0oV8GDqF7JYG4Q5bxp2JKMPLpto/2ZxZwH6xN5YB80GkxDBkDZ
-0Ton1OX7UI75Lijvw7okREVJ3gevMz31BSZf2e7uLfLpcei4bOCwcbE0WNKahRlC
-GBWBA/9rMCXgJelu+gRx2DkqGxI/EiiG8o4NZ+NpF0Xka818nyVFGcf8LjuVotDb
-AYeKnzduIHVSIxjLI114oASI4Pc4X9zqYPt1rnbGtVKGjUvA00xsgigfVgFy8ZzF
-9hxLnTaAdDuASrLtnhkzrCkFHgD4nq+Qsn9yn3+DMZj1p/WnnrQqQXRzdWhpa28g
-WWFtYW5ha2EgKHltbmspIDx5bW5rQGpjcmFmdC5jb20+uQINBE01exkQCAC7Q/en
-BX+UpUIZcdeDAmCtBIsVJ2soGJp4oRm4JgQARZcT2EvGfdPoxauKgfAHze9FdZTY
-0Ly2k6D8bEsjt/tXfMq2V4+ymaMIrlBxqicCQryfUFRpfCeIK7FrKKZHsiY9zfin
-X5/vukGlnadXRSzrICJEHOjYgAo2fdHQ3RNDLpAa8wKftNgVfm/K+b14TibgZSH8
-Lv35PLOBeadXfxaN3qsnqzAzgoZ+cQTMvbTZaDoSCeDTLgNud8Ykk/QfkBBlCdV5
-wscDNAyc+08iiLvFs0H07LV3afNUJSrG5fpj7UfKU6qyMoYp3mdLJ2M89B+IX05A
-h6vJLi4nSyOpTBlfAAMHB/98iH2O+5nl5WGflA206Hif/fMWqyxLFatgeCXB36E8
-STetHCPnKNtYb8axQkvyuFTumyAxjhS+tSahFXM0EENGrLdHfXvDrCaVnLrmghcS
-ngW1UVXWK5MRLi98itaqv8vgT0U3Zs+p3gw14ycdyc1hff9UfWKNi56ZI4Fv8M7h
-mIvurKau59CM5HZIqSeOleL9vFJWqv/tx4B8j26AwU/NwDOXu7kRaBAyu5E4OozD
-pg73zcBvICUHzq5H3YN6VH9KYE7U2BLFCxxIT4WgPIN0SD37lu6awlD7H+wW7oYz
-CIhIULY90zF+uK3reMfXbiKqL8bGNgE/UQCY0xxv8C/5iEkEGBECAAkFAk01exkC
-GwwACgkQpQVpx8p/ofDetQCfUsHcIqvYflC7YrORHkEwnkIkvfkAoKLiJqxgBmZE
-ZzI4yAQoJZJTc+YO
-=iGOw
------END PGP PUBLIC KEY BLOCK-----
-
 pub    A5DEF5A76F94A471
 sub    B15AD8EFBD28D3CB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -1777,75 +1637,6 @@ OLPHEQyNzJuTObrPhQ6r04WAyw==
 =Of1o
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    B341DDB020FCB6AB
-uid    The Legion of the Bouncy Castle (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
-
-sub    315693699F8D102F
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
-xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
-qvG+k3hKECLysQ2zoZpcC8c2ePiZQSVC2i5BRqgs0xZPz3kiT5U9WPozTwCgtasB
-TgHhkOGhZ0SOUuQ4dL54R9cEAIaDjdPcI7LxyOMvvGTuW/SaS9JyP21Kch+Vf6I4
-vKWWqXEaF0So8S088zHnBrcBKhu9D1sKIHS64EoYCrznfMUtoENPe4sf5QuJmZ9D
-+fBuFcudQIpkx8L73q+E3fmCK0uX+anqipJtS8mgpMeabKda4KkjDsZkiaNl7OBI
-0H09BACofK1HTNHNke2N0wXN1GyG7IAqprKl4lBbu5aRXvfKQ2tDj8s5webNQ+Se
-Om/Yg0Bi+CiONLgUjiwYe1wNls8zkk3LwYFeKIJ1AjAY3auBRWOI0/IFFzwTkV8J
-YPHa3Dl/kmYp8NMMwA5bgrblggM0Qhnp+k//xpb0FYbmwHMwUrRhVGhlIExlZ2lv
-biBvZiB0aGUgQm91bmN5IENhc3RsZSAoTWF2ZW4gUmVwb3NpdG9yeSBBcnRpZmFj
-dCBTaWduZXIpIDxiY21hdmVuc3luY0Bib3VuY3ljYXN0bGUub3JnPrkCDQRKMGw7
-EAgA5MMlt89bomqE0TSq63JnPaSeEKsAx6A1KaXaSg0LEI7fMebSQcAdVdAFBo4H
-aR+jNNGv5JGTvAObLrqxnn5mU/+qhdTw4WCf17R4ETEKc3iFN3xrpxz2Vew8ZWpw
-3PcEgCe27ZN02J6BgtEqhT9v9f0EkAgRHIkcaFCnxme1yPOFN+O0/n1A+59Ar8rm
-wcHGopSoZlGDEdEdqElx/shQjqq6Lx3bWYXS+fGzSAip+EAX/dh8S9mZuS6VCWjL
-x0Sta1tuouq9PdOz5/4W/z4dF36XbZd1UZHkw7DSAUXYXfwfHPmrBOrLx8L+3nLj
-NnF4SSBd14AfOhnBcTQtvLuVMwADBQf8DC9ZhtJqHB/aXsQSrJtmoHbUHuOB3Hd8
-486UbZR+BPnnXQndt3Lm2zaSY3plWM2njxL42kuPVrhddLu4fWmWGhn/djFhUehZ
-7hsrQw735eMPhWZQpFnXQBRX98ElZ4VVspszSBhybwlH39iCQBOv/IuR/tykWIxj
-PY7RH41EWcSOjJ1LJM2yrk/R+FidUyetedcwUApuDZHnH330Tl/1e+MYpmMzgdUG
-pU9vxZJHD9uzEbIxyTd2ky2y3R+n/6EkRt3AU9eI0IY1BqUh0wAuGv/Mq2aSDXXN
-YJ/pznXSQBjmy2tvJlqXn+wI1/ujRMHTTFUBySuMyZkC0PwUAAnWMYhJBBgRAgAJ
-BQJKMGw7AhsMAAoJELNB3bAg/Larfc0AnAmQbEg9XnLr/t0iUS7+V7FcL5KpAJ9k
-3LS5JI97g3GZQ2CHkQwJ3+WcPw==
-=DGI6
------END PGP PUBLIC KEY BLOCK-----
-
-pub    B460E7C4ED66826D
-uid    ethlo <maven@ethlo.com>
-
-sub    CF1DA7EADAD9F49D
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF6GGxUBDAC3c0QZ72oaErIkaF/xEzAId982m5FgtV3DpZAANZyPRK9csDci
-49QPkqpLM/QCmxGYn1ckZJQmXsGjrNuCFKDCEsKwFa4h0IsoHn2OlqCBNq3MxeFm
-sGtYAqZ1d/pChyKZIi2yk1UMHEufm78jSgLS/WX0DRe3xNn6j1/lVguulwHnM6GM
-HbSahVIlt6Eeh25VKpSJ0ACC3zFopeIwX91nmXmDwslU4HbQZvZ3TC2murj7x5Fs
-K7rU0lOHor0L4Y7lAjosKqUFMHKzreSEhvgGDSg8KpVdQXprd6vsWo+2Ys9+aA9J
-tbfO94px4B6dH0pwCFlw3YveAhxQV9ZGpch4dhb+38Ffm4o9eCyqYn4K4ZUWYyOU
-YzGemfADmX0DLFTo3OcLkwfCOQppGaL6x7Ym8VWXv31zH9esmsXizmlGK81964oo
-pT2HlpL9XIAFHd2Efh29soVsXSOfmHenGSpcpV6fmH7HjfInVl2aQsXzvcKNeOFV
-qrismNf06p18BAEAEQEAAbQXZXRobG8gPG1hdmVuQGV0aGxvLmNvbT65AY0EXoYb
-FQEMANanagx2CO3gBzIEHHhnwJj+jRQ7Sir9QrYMeeMMPkbWZ+mmUsjYopL90WXF
-VNj2kRA4cci10JIurUm7FtLUQ98szeMgmrdjbw44A1Mligyvhfgk2vgrhG5SOG4S
-OedQEnEeHKjQsM9cRfc30Fdl01eLWIJJdagywb/mpKhMItbUuu1DAww+bdbt2CWX
-rurCJu1L9Wr9/a/ws8Ydfk/mM2vRtbB8qGu6MQiCXJ/qk1dVAn2TutopT9ERTHVq
-j2rslpSzETUIy0Js+V7jygZVp8RPQciqtiHNt61YiV8K3kVh06wbYwACiF6HE+pQ
-m5fG7n5dMUXMN3ov+B3RUtCDIC1LVyg8jfT90gklF4hDSm7rmKGDoU1O9JOBrunX
-xzC+eYPxiKd0UUEGqBfn7PhB9tQT2IsvDxP59yF7oY6pnQszyv/SW0c5PlILbYWz
-63f0sb4q3RACKv+F55j4ZGbeNEdUYJk7eAP8Lv8c3uGgxJ+qtcsdcqAbHzSXwonz
-H3QlGwARAQABiQG8BBgBCgAmFiEEsoaEbDQbty0eX4XKtGDnxO1mgm0FAl6GGxUC
-GwwFCQPCZwAACgkQtGDnxO1mgm3mCAv/b8RjgGsVU4hFPqAsrCoOueiQgiJhrbq5
-gwVyCsB4TQTYwgd1I6EJKu7TxmoYtosjisxqoGq059UfNSO6vOX+8osMzfLBZYmH
-1qrTmsKCAz7aInRs3b5oZzg2jQP0AU1IVPxbfmqPtZBRh9pV4Q9whkbM3RYQX/4G
-T72kZWI0+SyhUyZ03LZAphh5iFo2eDnzYa6YSC5M/zyzJ8i3Rg8GoIuYYrC/eFVp
-Axl7QzlsuXamCWVp+bxUK9uzr2K2dZYnm/fqPv5foLjdsKoziOCVJIjtNk+CTLNe
-VnI0pCmL/oDCql5q70GRQiA1WWC/geCy+aSD2kNPiDtAoLiQgAWLR7V1/5llDQ26
-l94OGXKc0+w/qMZano87wau3p5ct2cAGf9N4BFHITEo/AgkhngOB3W/njg8sO9B/
-uEGefNSYlEWXseq+ucvUlrtStV0lKYVBKAgFibb0Wk8ayfSvIfDI/9Kd610n/IOI
-cZYUskQLV+tetMac6Lb3AOJ7HzGV3DSn
-=6FIP
------END PGP PUBLIC KEY BLOCK-----
-
 pub    B59D3D0F9F9C8684
 sub    813F15CDC1270665
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -1887,98 +1678,6 @@ Xc6vcyYE9hHSplUscjEGNlGF5EVJZ9+lOHD8ar7A9aYF2M0EPJ3lESM=
 =KK4E
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    B7C3B43D18EAA8B7
-uid    Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <kama@soebes.de>
-
-sub    02A4A6FB70018AD9
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQQNBFT3aMQBIACl/07e2aAdqLGTocp3J694BSGxjH1M4T8BevXH0UTRTXbge0l2
-3IONp63KF1tmHg0skzUu/1Ybau6Zw7k+jRFN+9VmslRprk4fjHjgxmT5U8p1ualk
-l7HuhiNPgXllV8xBw9X84j0UII2sT1jnrvhwjvr+i+31Pj5PB0KIriMw8BGRcCeW
-QpSNdGU5I8mei6tKMp6NJg1rGER+c6jhwQUiLWTHaZJ8HVRWL0/249bkqmIUL9wr
-9p3kCful0tIQ2aPMfM++snJU3rQJqV9BfP8NimuFqA88LXfG/qBC3Kt0HfVNGcOx
-O7/5HowRlLf3rIwHJhEbxYkUvYIHSYUvRBfEQ/mu5ZtnmH65ObsObO84vkFerfpw
-oAM8GIoyQ/zNoOcBz6HffQwaaIdGvl/udFz81oMgUqJDsYjWIR9sZMHYSg549C22
-JjnaL0izC/k82d5Ukx7wC+gev9NAT3N1QJHbXGJT4BG8VvLOvdAyvoJ7BvlW/+Al
-ee+jUPh5lAdQV8eEl8Z9z1U+TlgBxaJlNrooVDfIMlLO3uqCMvcX1NXAKw3tRZtE
-ACVJ2jB7aVHZH10qEBcCqxAkkgbs/mr+2p+VB4K6UP6YlVBUIHwkzYvlnFrdCHAD
-ZSDPldqvrv5hRBmHax6F7vXd8OeWuMTOP2c3HomnWUN8ExbRGexnxAQfMQYQAkyn
-qvdSqXB3J3ByKh2b7U97ObArYvP5jeTyPeltnznBFPiSDsuKSscem9OAk4wxmu5+
-lbnNl72bvKbB5bFJKEoukwFDu37fXY4s/C9Ib40nQSKvflcn4gSHF4c/Ahj9Qcna
-/v2QIhHeod+4VcNSuw7KFNjS1PPz//Wn3jBzMVAFqG0JpqhyPHwuDtqaJvekTkjv
-4G6kSW/GMlBOCba7riJJSal0yjuXNuv3OWU9+P3TV+nMo1+Ytls6r7SdfFDSj7We
-0WqbxI2bKJhZj5B54UbJpCdvHs1yd0NjNqM/ucuktw2hiqTzUY+ZwBN0FTgil/vc
-00RJaEY1Xp8WuBNp2O6RjBIYJpu5JauaoaSjWzoEk4aod1w9mzgO2cOh14rE1HRn
-7rwTw9XoJTKEK/VGtAXWDtE5rHQPJAsiThmE6SfiVdgznvoGZAjbhJsPO6M06gi2
-MgGYZ1/KfpU8X4mkC7/txdMIksH+jDs4FngUVUL1A8zRQ2iI3GTGww718pJlRibr
-g5gHk8iHYm7aXZshj460iykLZTlzQlxb0rVdtJ5iBx8MhRY9UBmnMqiFZnjMlgo7
-beeSNwaweeVpy66rmoDg/v47086tjk20FriyotafDbCPsq/oPwaiGQVksNjxEsaN
-sst27bTULiZl8nL1nJ6hq25eZA5KvDquTdE/ABEBAAG0TEthcmwgSGVpbnogTWFy
-YmFpc2UgKFNvZnR3YXJlRW50d2lja2x1bmcgQmVyYXR1bmcgU2NodWx1bmcpIDxr
-YW1hQHNvZWJlcy5kZT65BA0EVPdoxAEgAOZ8GzTczAM4fsFYdKfB7Ly1KuQZzeja
-KlOWWCuq879g617yHWVFx3xR7FRnA4j/yPAd8XDCfDudA9faT4B5u57zfRqHSCoQ
-iRpoQEqxEYjQ31sv8QNhaEZ3vuCByYurOPKHFgXyAR4/N00uFGjmKOlFejpA85hg
-PQpysEojSXTQkn1y4yqXvjrEpJ+7veiBxh8LvPVDkI27SATBx2TxA0YibA8xqo1U
-XZhHlp2XQlsagrtMkPIm1IiEDmz6LpdF98CCx/5Jzk8vONVBqfzjChS1IEC9g6Fc
-koHOX/paclAj1dfaxMZyqu4uxTDMNEWycpZfGgS+FDoKUaQb8HUmWOt5aTZYed2V
-HJAAwxSZp0d/AQFbo+ajf0RwEwXrxVW1uZ85jjzz6dohTD/nGig2maT8rPxwhYhU
-Dn1KES8kKJKmuAA5KX35pPBdSFlKEp58W3U1MbCu8d05Z/inH+ZX9kOxcbmAXQOG
-FNjq0RCakBdqYv4VofgZ+L1wMFIMlFHn0bxqcdgvue1eKkKyF37Ipb6V+PYs9tVY
-BqorH4D0a2P/EpfTNMKhGtPzb1f53cPWnQk7HpIRa5Q0w3psYXC54G5ewiGh7mN3
-YbwIoluQIN19gofgQ6TQ23Su8Ia8Q+LwSXsBoRI/m2EBqg7PET4Mz/sQkvEzB8/P
-US+zu+8wp9MUSpNeYoC7Qa+0PRhhJLK98IW6TI/LbdsB4vlwkdStx0XLjjJEgI7l
-z78/9uAXFRF7+azckio4C59+7Pd/9e2fSYaK72zeo2ELN7nm8w0cmVIdM0ILxrfH
-acWq5Hf3D3gmpC7Qcm5fxnrCoCPx/4xu5HEV2FInxhBMuK5E41jZ3rMSsG0FaBMO
-P8VSVeNaEs/1/uHgbKSu/Trt8wVrQHXWnlg2Ypus0+ldgRytHhYaKUKsO8zSiVUz
-f5jDESsvmHk61dhu6IlRs/u9dalEILldeXgCUuRjof4h8uf2fFwJj+Q/iKsB7/KG
-WQM0t6fR2KfTtl1qZ8tpnfmsPK6oE2rfOfowUIphKGiTCTjzdp+LgLVtH6Ib8288
-Gi2jqhIzvp1vQ/wh30vGwCpHOU29ABe5ZWt1gEdqxMAsKZeERBry5wlzHzOUhktV
-51onVksv1gUzhxsApYCpRZYm/HuNDL/NYGOKwbqqmZtwtoUltwW7vzW+EiYJe9rD
-ae+9QXtN53bbI86+72eDExeGPaxb6ju/tmP5hO44VvAtLdkmx1gMcTx/wOl6+frr
-l/XDX9ScK+OnFn8gJgGwtL5eWmN+1rqWdThCtlbjQEv3ObLRGId+R0zmyIDASW9v
-V7qwzqq+VpTtEKer11t7ScToaJXunkTsdtST3tUEzWrt1rl85qqLXJcAEQEAAYkE
-JQQYAQoADwUCVPdoxAIbDAUJA8JnAAAKCRC3w7Q9GOqotyRqH/4w62t1mcfeZOGX
-LsGdbRTAV9AXr35Pwr0ZlzMNGllu37rgL2yiiFgtFziBxV5xzCLgFP0Q9G5yU+D3
-IVVNGw2r1k7dVOgjb4uHRZnCYfkRmrKijrBCKmKOis6JjmbBRQKz1SxOaF67Mxfb
-AAVQS/Jqi7Dete262cdvUT/7kFVuEiJ0sz39EFpScVy7+tamNPOq/4CEa+GChJgU
-Qm4SfC2jZhgrmJWZFNlWpyvKPvq5YTQmPVS+EhjTCknzWu5FqwUslS2la1LxnNpG
-8FZYTXNTDXfJ3+uUQtXAnbbSOSgc00FsCXO4D00S1gLVfRVW+3ANNxmv0RbLuS/s
-bFZgvpGeCj6dtpuWY2tfvmsbZpucNgYaprt7ufEdiQSIeBYhj/TOdEUQHBzkIP1/
-JkZqWIh05iMTgGhxuB1lM6fducjxNHkq83c6037opxiluN/6eNpueiUaxp7Egnqc
-7vikLNv2PF/w6mZtBzFxeBYolq2cEUhQmOYgkGUCLu+ZgW+qlo64Z7r0nB/Mri2o
-OlU4/kbTmPD+GO4aVd54COVAAn1g9ePxiIZ06pLnXyQOYtjOtrmpkAdNSEAxvAFK
-hYo6BUHjbj/nYqLE7WVh/M93zkqCCxTJbvvoN/LB3hG+p6sNdIePgLqFwqWnxZrL
-+IONBCy9lkW4LCCnTO3tbXcYOZO/TefJ7InJBTivf2OB8+8CSLhP1jO/VTNGUpMd
-gPRkNLiETGpClwvyNyw2aYbzRFh8X3dLBLjpiK7nfK9cYdc0YyG0VeMA5yu+NfQK
-oGJ6in1E2fwdd5qnRqbPZcGDawbClSYjYw6yTabU5+gKSssJoq1rJErqLEBqjdmt
-KYbWw4lZuW/sV4hag3Ny6/tWspwvAMH6kjXcXl7RGYQYa5rbhNWwOkvnZbrpT9Wg
-xLq6jl/jzw25pxSNeCZmyKDTPw18dSzjFCF9pJqqVFw6kABE94mfMyQFPXvP2K60
-EwrmiOE6RnokNlvvnMldlRNacAVSE3Sxc7AncmtsL47li8Tm6Rk+P/8SVEK2DdC6
-iSAIhu6Zi3C7L578XvQZo8Qzz9FxZJ0pTD9/HWGzR6CQvatdPFXXqeEc7NKeVAXM
-Lo6GYeGXn6EY+U6thR+/7CSunNHllfZ4kQP6EEJqXRb8lvsOt9lUVe7M1TKSnY1Y
-EUSqwXc78bTOWIIsA4XY/6nYwbb7SPiCsX1AuC594t4jrskdzqGXsUcN0uzplzpg
-lhHZ4xQfuoXNEvGoVHPTOu12ZhzE60PseAZxALL4vSX84TmczfkaMSespONaWUgD
-pB14g5zRRBJQHvpg0paY1VlEORo61WrVENaBMf06xMHQYSM2kcHogpDcFph6wXxG
-hRjYldaB
-=uKqQ
------END PGP PUBLIC KEY BLOCK-----
-
-pub    B7E2662A7640A051
-uid    FormDev Software GmbH <info@formdev.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGAeuPoBCADxjHFyVx9TT2s1eAeER5qcIxQfh1sR8CFcDyPQ7FsoSA0Qt8di
-3o23mEv2aP4OfezmY0eNchW0TXp2wqyuA5V0cE8RrM24dJ5p3X4PcRyVcO5KdJFk
-KfN8a0U4xwLP3A9kMQCJr84CFGqWr+EewU3MckrSJdHfOpnfge8P0yglTtKsuq6x
-ECPovrrAjEpkQ4WacgtL/4RNXVBKOSWq1inFQBE6UjRuakVkPuye586VfBtAwoAi
-9rghZGvGuUaJ/qs0/WDX+DbLd1R/Kh0Hdh5uaAwLjcl2DOvaJApfR4vkRPsZ5ZPF
-jxPbVvBBrDCWjPOZlXwhrX7EwJJoLZYZt4K3ABEBAAG0KEZvcm1EZXYgU29mdHdh
-cmUgR21iSCA8aW5mb0Bmb3JtZGV2LmNvbT4=
-=hpLc
------END PGP PUBLIC KEY BLOCK-----
-
 pub    B95BBD3FA43C4492
 sub    520FC47ED23D6048
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -2008,21 +1707,6 @@ c10rQDgIwANvTjl9YNs8g0MAn0ogXquKO4yeSJdFddbpG503NQe2
 =GlPk
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    B9729775C0352D3A
-uid    Tom Akehurst <tom@wiremock.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF9ZHHkBCAC87FdE5p9fmsIG4sr88XsPIax9ZGtDADNjlgCZwg9FxjOQIzf7
-KAHWZOZ7EAE1VYQ1xHLN654t5n21kI8Qtnek16bYrfvBVsbD9OA87G1tSVURtORH
-jJAbmsH/Cbkfzghme98XnufB8f0WqkYqgAJNmJ2Q7UVy9unLDO1UWOCypwpwvfdc
-y/vFYJbhBi13M9UAPsqUi39Eu42kHDGGrBPZLkx30H8sghWlCDPK+Ed82gj5ZSi3
-LGEktGOrDCBA4rORuR5jzZxdK1WyDkU6p/v1aU1iSUHfnU3s4C8tp4Tjj4Zfrhop
-f0fvmo4c7t+kk6iNfXIJMeGwXCTAMrTcumCJABEBAAG0H1RvbSBBa2VodXJzdCA8
-dG9tQHdpcmVtb2NrLm9yZz4=
-=NFoD
------END PGP PUBLIC KEY BLOCK-----
-
 pub    BAC30622339994C4
 uid    Chris Povirk <cpovirk@google.com>
 
@@ -2335,57 +2019,6 @@ u8veAZEXwuJGYHE=
 =gx4v
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    C038787776A19D18
-uid    Lukas Krecan <lukas@krecan.net>
-
-sub    CFA2C539DE0E0D00
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEYg6Q3hYJKwYBBAHaRw8BAQdAmBUXcViWvUiXZezA2ukBqads/J5xG0Hzxa7b
-LfCaz6W0H0x1a2FzIEtyZWNhbiA8bHVrYXNAa3JlY2FuLm5ldD64OARiDpDeEgor
-BgEEAZdVAQUBAQdAnHuAssKZBLKrqg+cWduQ2B395Sbx+/2KAQZI8clMkmkDAQgH
-iH4EGBYKACYWIQQ/mZu2kEHPF+c7sc7AOHh3dqGdGAUCYg6Q3gIbDAUJA8JnAAAK
-CRDAOHh3dqGdGFbyAQDphxI7mTZ5jlDvl4IAekaufzJbKNXMb8dSRVF9nbd3kgD8
-DnFStGRCtew0cyP1qYnCucjUzMrXDYFuQLY75Ad4OwM=
-=dmjU
------END PGP PUBLIC KEY BLOCK-----
-
-pub    C1B12A5D99C0729D
-uid    Valentin Fondaratov <fondarat@gmail.com>
-
-sub    606CC6C4533E81A2
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
-lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
-3Kq6CSye+aLfdtY2yP60yZCtES/E8s3gIQWV+yFbVm8K8nhMTUnHRxYEcWfK7YI9
-FwjRkSVuOQHhOYJKYeSxRvmARd8i355MN8unPhkuY3stBuWoZYNjSuXXE8fs4DBL
-0yx0lkzH5jI5E1lagp98ChOjbLQuACvVLxLP326ktgQjeZjO5xqe+Rm5h9iV2ETw
-UUJhigrsOMhzl6lk+9JqqNxKiEaoNcsW2NL5O3Jd6ta/WPSQtQGrElKBcZnltf95
-0SAJBKa/+B9our/SuNSe8kwKAK284ecwVo4AwavdPd+s2UR9ECcytDXFDs/QGQD4
-TjZ7sGgpFrLaoXXu4OqR7w1085I4RNELrfR/p5kRBhpU41Ey/UXpE9KGMztQ/tA8
-W0JEQdCUVgc6MQEAEQEAAbQoVmFsZW50aW4gRm9uZGFyYXRvdiA8Zm9uZGFyYXRA
-Z21haWwuY29tPrkBjQRgInP+AQwA3Ec9GNzLiMlTBn0x6EJL/sxRo83VrlAQcR2W
-ulDV7e8zFeCVB/jiy1yFIdJ5VyCXeVzsSs/ceEBqjEnz4MvWX1lnzX9zqcRArx7a
-SaPfB4Hva8Z91f7sTcNQAbvwNw1kUBVJZU8UOfDGMt+fycVidWO7CQpvuq1ZvL3n
-dApXLXHD2YMvOqgVg1jtaFPlaVSOoWkXyMg09ECof3p+JECB3ZJ7lht0JA3MHOk8
-gObcdsDxwwb3A+dS/Zw5Q/8zopHqGVmldiF4tG1SYqzc/i3Az58EYNZ2Ul1C2OI+
-tfh4FS2UqkwuRPspfPCfc89NXoyO00ArJOe/87xY5HvVm6BK8azL9RaogEyFmCxi
-EuZo9yC5NZhWD1CEEO0J45ZsTpxitUhKwoGgGO86yRJqiFuCfYHzRtkGqgDBQGC1
-PIE1/thSwdVYwt8ym5Bn9iNvSctoXoVYfsCw0gcTpQFTgib7S/kK1Gryq/vyQLg/
-KNV99TstqIeuT4w/BmT1f1yQH0fbABEBAAGJAbwEGAEIACYWIQTmIjEzG8p+Hyks
-m4jBsSpdmcBynQUCYCJz/gIbDAUJA8JnAAAKCRDBsSpdmcBynQaPC/wIP9hArjec
-DiSx6omRgFBaAILsQG7eKPwXCjob4GE2jtnWQi1jobE32GuXoRO/Hj2gz9+Ipsvf
-vWKmyMzJ8noPkCNsvVehuGwp1FQyyk+c6MHww4vLa3abr2e61EEaqVUEyXQ99m6K
-h7+FQq8apyCp6L41AN4mb1/g4hWzrCv/18evLzxZ3sC0sTZfrx8ECc7iGhsOgkI4
-Ls+ME48vYt5c+8Vmq+Gae/IZgQQKupRTxCqRWGTqwDsXOfXIwxcJ4eW8cNWCa+V/
-MIVSBri7/6jRXufu3lYEby3rYjV7JHaWE9ZFQrpwvxk2riyNd/6OJdJg8mfuGVF0
-78KBRtMCorx0t3tGqjqhZz2fftFJ94VXrvjm7dvPhP69u2bVVFeA83B7pCNu+lXu
-30d8b5D319qJCx6c31wQvj4SvQuB9uBDDNePl6Bkn8QeKcudTJJUPB+dS/lTVpQO
-+b//JnTWDaGUkhM6IdLK+pJDxQwFRJBJfDHZj4y10zQANp5u2nyyg8Q=
-=T2sw
------END PGP PUBLIC KEY BLOCK-----
-
 pub    C212662E12F3E1DD
 uid    David Blevins <dblevins@apache.org>
 
@@ -2412,85 +2045,6 @@ VzAKyb1OZnKSBbzhAJ96natbmeiNkijIzk8vUpdCTH18IA==
 =2vOe
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    C6FC46EB51CF569C
-uid    Elliotte Rusty Harold <elharo@ibiblio.org>
-
-sub    92BF193AD552C6F4
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFwrYN4BCAComkN3DymSPvTeAV7G/vBEYFKEANL49MeQttSZRzHmGAIAF9Iq
-fUN9Iwp2Ii40sdUV1+03SVnprf5M2xdxO42AB1qgHdKcyQnbUM9oV/i+iwSWZOjU
-23HTSaKkEKgVGfQUQQbXibQiANTJpRmKtOtWQsz+zfyaiGKJEKEa8KZsm6guibp/
-2omOJ6xWrZNszFtQsq3fsdhTVbWTHTpaSMV8Wf4Ue/g11rMrR2CPqzMFrt2sOVVy
-Np7c6tzdDeLYzCDfS/4QS3aGRuyxnt7uNhH11hzm+IvJS16Jg2oVK4lKH5FLh/zl
-myX249Tb+ht1i+daMEn0zpPqiYlNtCTLPLMHABEBAAG0KkVsbGlvdHRlIFJ1c3R5
-IEhhcm9sZCA8ZWxoYXJvQGliaWJsaW8ub3JnPrkBDQRcK2DeAQgAzjzAehkE1xeU
-79tBMV6XzI3u/HNyrwe8CvqK4l/tg7HSuZsVnYCAniGqInHDHSQbKuBoloHGx5Ba
-eQ6abn8DiK8zlE8C7b81Bf7t6cVQJLvNIWDppI5Ucm9yzygsqsBiSjWQ4Nb6XPZ/
-3Wn0htEO14rN/IrvDoD+hXzM2s6mKVL16xWuhRtBYs9/+VT5IpCeGan7+Z/FINF/
-Q3j7t5t405NfrLK+HP4W+705ofsKqBOxKT2T2a5d4IJc1+GSrX+93HxoUWbcvtkt
-DSaNjCHQXP8zfAbS3pTV+w6QPs770ZKhoPO4XWIrw6W+EjT9skL21iUB0HUPVqD6
-8cIBeoNOEwARAQABiQE8BBgBCAAmAhsMFiEEykkXBNYTeA0r7gDyxvxG61HPVpwF
-AmMeHvoFCQq1JRwACgkQxvxG61HPVpxaNAf/d+B0mSE3BGn3nAn6dRG/3cmZjJ/1
-LUshQWGRImEeOXxdpEIgbtvozcmEzJc9iPIHbY5PzpbuUUPoFcKgwE7R9mrGxckX
-WonPflogxhiziMsD7wNdJ1eB3zpS8H/DgquhB7ZyXVp8V/laLkSm0TQFaBGoyYer
-6SrDb5UNGc1fQNvtvDwQfZdZ/6vUugi+TzM0uQGnQ03aR9rbDn+tUVyJU9KmCptI
-eTWR5grKXL1M+/7qIR41+nApuYe+Btu+gCRYCyp7JpfROCHnP7bSSqBMAt3PcywC
-+a/sh3U4uwmoU1U/sO3XXKxQzELQ129UyiyS4p3wEfjI3viF57wHab6iIokBPAQY
-AQgAJhYhBMpJFwTWE3gNK+4A8sb8RutRz1acBQJcK2DeAhsMBQkDwmcAAAoJEMb8
-RutRz1ac3K4H/RMOjjOC4ReAJrmvJOAEBSu06b2NjBgAQIPCS7w30ygXCMzyRsSg
-6dFfTeRQGndJ5/cytZN4Q5wMhL0yowa4DDrqvhaWLqImSE5J7IEaQznm2pauDZFa
-qQH5WAQ8jor1YlZ3KmV+s2SBbjCVZs062TGrloY+gPEiijE04UjHGURoLNwE+aLm
-JykYwcaaYdYJ+VkgoPwUaYOqenjVTmjncY7siEiqFENgBAVsdTzXikt6JoIZJqKu
-vopirIOpisWdQZoEMYEQ0ASAjHWbTaNm21gNpPi/dSpPzi5np24la3bu3OdZ6Egr
-PfP2wFRW9D1ZB46nQIwhEzJkDcBFn2JHCnU=
-=rXpr
------END PGP PUBLIC KEY BLOCK-----
-
-pub    C7CA19B7B620D787
-uid    Stephen Connolly <stephenc@apache.org>
-
-sub    7679164AA2590985
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-wRo6LpahA0hXIR/dwnekHH7Faw==
-=sl+a
------END PGP PUBLIC KEY BLOCK-----
-
 pub    C92C5FEC70161C62
 uid    Herve Boutemy <hboutemy@apache.org>
 
@@ -2621,40 +2175,10 @@ IrmBwf2qJdMOSJA2g/rDE+o0XelnKd+1IiIu4Yb+rQNKUdT+EoT4APB4OJL/CjRK
 XgjDXaWjVYD3TuQZOJ58LBhJ0/71YomiZUtvEkNjsp94sT/78EVdNNcfxDnPb5p1
 Iy4+MYTmpKtvPD+a/Y+ZCabsrNWpZSb4HAmiWKifXJX5in1XJEdH86on0t8Tnmcm
 VFYI2uwV5zirH0Qh6v4bP/QBlz7YebOIPSxzgM7WAtpdfQawpEyPeXk3aIKTOtnv
-L8lBi7vrutXfGY2hi0PeBqhZRRJu15D2OXeISQQYEQIACQUCQ72hXQIbDAAKCRDL
-rr45pGxMoXy3AJwPQn/Q6bq6yuoroy0ccdVCv0vbMwCfYZonPuhPnBjWcRU+sxTa
-Lh0RrLU=
-=dQue
------END PGP PUBLIC KEY BLOCK-----
-
-pub    CD3038FEF07D567E
-uid    Phil Steitz (For signing Apache distributions) <psteitz@apache.org>
-
-sub    A0FC00D356EEF1D4
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBEEn15ERBADm0iBZ/KwIiEYdLWxMIIZVzwF6My1eLRX+TLvPtOO4wf8zE9zV
-fAsnMI8uCK3as3OwgqTTsKy7KQSqRyG0zd/rvCmJUEET3zHX1e5e2nYq8p1TzJzk
-mR9lXe/amtRy6687fVn5hxERSlXNioh3CZdOVv1Mum5EHuzWFQGjA3CFywCgoXKg
-dLJ9QuE4Btzf9ozvZRDcWYcEAN41LTmy3NYv0SfwvPnR5rEc+xw4T5p28qhPc1OP
-h0jGnYgHYaM3xf0QGchvWLlwLsquxvD2K41ldIJpZm+Z4RqkV9wPrjmu1k2EUqWq
-UKD2gdyyQx9pN6RH9qIN4Mh8b9x1BUrm+/KoxlmCfMxg2efLJTaPwlFgqitswZaV
-aLi1A/4+Z7l1W/sMN09ZfOvTxEmznKOscCBNQPWwu/NBFYVzCAAv2pNVFvmjU1OV
-u85pXfY8/x0lkpUlexd4bL0x1IPmrJn+H4dTI2sVFXLuKVceug1HjXW+zN/LWhT2
-08bq6V/+a9+9oVjcdYMqJldoxEe5Tac7fwExQvqRFUvteL2LTbRDUGhpbCBTdGVp
-dHogKEZvciBzaWduaW5nIEFwYWNoZSBkaXN0cmlidXRpb25zKSA8cHN0ZWl0ekBh
-cGFjaGUub3JnPrkBDQRBJ9eUEAQAvAxg5za8Trgpvk3rx//r1H1u8F21mtMVC4Dn
-DWEUw9Ts+Ew/oy4xTENPTaA3wVtiDBxorHoQlxZquqWUNcUFnrqSSyJ7S5NDiAWK
-YL6ez0MgXd6lqwL8tA4rKQhDK3kPqnuF6RFUfC5aBrQxCbNOk5OZMS+W5/w2CiCq
-hjKtkHMAAwUD/04nzr26XFB0XHbbCF4bSbyiR3vQTWOBOmv1qkGnausQzbFpg34T
-1l5KYaje0C7n7+UZSlD2uWksYTbtR3JpAWmf486MuAbZ5ViTshy8K5ia56k2yI/Z
-aSErG7HZjMxa4G8ecWyK1guHT4LMEobWUA79cs/cwdwqvUV83S1la3AliEYEGBEC
-AAYFAkPJaW8ACgkQzTA4/vB9Vn6ABwCgkyd1L3p2o9Kp+A7OY3RqmzdKnvkAnRnh
-fXU0ijWlrXrpaEXqE1WcxMEMiEYEGBECAAYFAkOk2EIACgkQzTA4/vB9Vn6MMACe
-IY50naQyEbjh7VFpdIj/RpRkybQAn3frnpK3nov6td69QQDooDK/5xBZiEwEGBEC
-AAwFAkEn15QFCQPCZwAACgkQzTA4/vB9Vn7UAgCfVlQqtD3j4iWDPsptZtfWg4TL
-e7QAoIbyRlaNcTy+z1Jj0+cwvDVVoEoQ
-=/KOD
+L8lBi7vrutXfGY2hi0PeBqhZRRJu15D2OXeIYAQYEQIACQUCQ72hXQIbDAAhCRDL
+rr45pGxMoRYhBJBWtxDx4zJ4DeevNMuuvjmkbEyhfLcAnA9Cf9DpurrK6iujLRxx
+1UK/S9szAJ9hmic+6E+cGNZxFT6zFNouHRGstQ==
+=/a4O
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub    CE8B1D1D2530EDC5
@@ -3236,50 +2760,6 @@ LJrHciKHigbVRfiq0M/AqpYbytLWkOJE/Q==
 =pSwN
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    E6039456D5BBD4F8
-uid    FuseSource (CODE SIGNING KEY) <admin@fusesource.com>
-
-sub    4697DFC8F2696A57
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-3i1fFPTLkDPpOUpVEh9FB0MrCNxY+0pa
-=iicM
------END PGP PUBLIC KEY BLOCK-----
-
 pub    E91287822FDB81B1
 uid    Mark Struberg (Apache) <struberg@apache.org>
 
@@ -3603,34 +3083,6 @@ vaVIq2DY101GIP0AEQEAAQ==
 =YHos
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    F6BC09712C8DF6EC
-uid    Uriel Chemouni (dev) <uchemouni@gmail.com>
-
-sub    CF9F423A7D348254
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE3go9oBCADHAkyReHbL6qVMzoEGSF+eqLswZmJNBZylIgMd83964tzT7i3X
-aUIouf7nHL6n14AHNxDKhs1FFq+/EFYN9Jfdw+uFauoeUGIvXXRxaem4yCjzkyNm
-VrfUlVV5AT9hSeN3+/PtlI9BT1zkK2ISQVad2lrFvyOxkHEnPzyAouCsXBd9aPcG
-9hmQ+6hZeJjXd/uQVxYP1DHg/G78zuXS/4u/3QJi1gSEe5IQilz8cmbGYyioi1WI
-cZFXayLBk3XQCEY4cejtGygk7j4kHSefV2Sfq+KynXRoUkOiE00GhbQrYYvQAm/G
-HZZV1eq23dUXXJo+nb/yI5o60uEELh5l0OpTABEBAAG0KlVyaWVsIENoZW1vdW5p
-IChkZXYpIDx1Y2hlbW91bmlAZ21haWwuY29tPrkBDQRN4KPaAQgAz/Ri0imebgTb
-W1diYM2yrT/JouzXmp9TNDNrAT72y3DE+39xiUY3OYFqEGbdg8J6XX553zwUCyf6
-+m9fz0yyojtwTlP9RqkDvJFFh2cVW8Aw+w53ldeX9HDcIfRmRcCMkCbGA45cXUhI
-s1VQ5eMeS1avHHn6QNKTHD7Z1T/N448m1K2EIAzJ29zz2vCrJuTuUdeOrYft/60Q
-0s5Rf7eFbC6+t/jWkmgbWgo8/9xSqTRr75tujMrG+PVBWchDhUH2wOAb8VVEkwCo
-zuGB4UsOtmAbip5jOvOZhs1Z8EelpJ4fsrJTnFituEUFpwk+Y3XNkHq4CBczIwJx
-x6KNd8uRIQARAQABiQEfBBgBAgAJBQJN4KPaAhsMAAoJEPa8CXEsjfbsc1oH/3h4
-WabrJuYVX6IbshGOcuKGhbNxOpDrzrdWO1zQ0BKdqZvyuJJedxAyqi8klHT4thtG
-iI5Eqhf7eZ7nJDRrwvf9eB0yOpWHVuT2rxN2sYs6CNURa3nQU6uDPU0KvJ4vgu4J
-uq9x0qj9UruSUMTGKvCXjArjfffFSXTEtMvhmA/qw5qqQxeT1x4JgZ6hc2+gN9D8
-Odzoi8rg6LtfaQeLjvbMqR5O+fVPJU/M94c/t2J+nr2JrgFTUoUcMnEtvIXowHe+
-rAAJ3El6hkBBeZMyyjMw5UksU0+nvX0EeXyhoPeX74SyTn8DGooys1Ewy948VUfu
-ARPRkWTpvQ2tcYDP6AY=
-=SvbG
------END PGP PUBLIC KEY BLOCK-----
-
 pub    F6D4A1D411E9D1AE
 uid    Christopher Povirk <cpovirk@google.com>
 
@@ -3679,42 +3131,6 @@ tCdHcmFkbGVYIENvZGUgU2lnbmluZyA8dGVhbUBncmFkbGV4Lm9yZz4=
 =5N7Z
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    FEFE78456EDDC34A
-uid    Mattia Tommasone <mattia.tommasone@gmail.com>
-
-sub    C3720DDC2E713B7C
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y
-gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4
-g9Z+T6LbXKNAfZgPvTv4rr7UjD05N4XS4vckrS4taYLtBRJAmqT3pt43KxlyoTbh
-f4xcO2rWeXsPqgzTYIHH7M5mYPeqA2gc9NBAhkHjesFuYfWXqUfOVcOLvzULxrra
-pZDOyrINr83WikC8DkuDrAav4mIWjIhYmfBWzuNeYJsusVnFENeOxpEHV8RT+8uE
-v1gPjbjAKUPfZoa7egvz3EmDkshpNIIym0XxNGTj5ntJWR2SLT7mDrSYPeHrZKW6
-/aKuAcOxpGLpdVOMM+y4N5mTQfdlL81G9kbGQarMmwGaJb2a82PaF20wRwVgiVfO
-p/GWgwXr0XdJNLqx13LdM8BMM5vmLomOQOjnpQBOlJWRgrYUJQOReKAEAQqNMsxS
-IW9laXkrewJtblEAEQEAAbQtTWF0dGlhIFRvbW1hc29uZSA8bWF0dGlhLnRvbW1h
-c29uZUBnbWFpbC5jb20+uQGNBF+y5lsBDACv+jA4LF5tkxOOn1yhSwOMVpsmjBkf
-QX76+6HvdRj+/bP6+rC6Dz0AGOs9QhxwT3+3l1HISMG3QQPYoUzeaLr3ZCHJgTy5
-FpQpbPSRhow+7DRbtFNuWGFcSsGuivWbTSJs0MZJ/d8iv0Vnu7l6n9FMUMINpmCq
-1ZAZUP64ueoDkQd3BTKJ5YNKB5OFF10zeEpcHV6V3gkok/NDRfBcuC/wyZs5z1bm
-nFvVQsPjizXtIoOOUG1G+tJF2ATGB+kpTrccfQPqaf6Qk/TrqSdh126c3DsewqC/
-aY+51NUhBdgZvzEMuE/pRgmjB28kRszy+nW3938KAIxfJVUk6VNnB0loQITSfiAw
-naKENnypsOXzU5CFOJa+Cgo4UctPBmCbKEqm3fpG+ReSjLCqUo0ZplU2L0K3VfF+
-muPiyjMDkxx/wEBrFdX2xB9ksofs2EasXNz+vW/ZHftFhZ+Zgvv10mPXGytwQ3zb
-pxKjIuLr35c7G9t2jgp/KilHEQJN13o6qT8AEQEAAYkBvAQYAQgAJhYhBFmwYiT9
-iRLjZgO+ef7+eEVu3cNKBQJfsuZbAhsMBQkDwmcAAAoJEP7+eEVu3cNKJfwMAJOe
-VNi01GBqtS3gz85GUGBngKt04cvVL1JgG3ov6YCJ9fw4a4WSQIhQU6Q8w4EJ+Nr1
-64IIpv7N5G2mhLJSJVcUzlA8G8ZFXPiW6opYwQFh9HhrqMA92yrwdXYzxGKyhaXZ
-TMXZfGryjuHLs8YMQfSXX8giGZLtvJSMkfJsM5TWi4bjlMqpoJ3P8qgmTm9dni74
-tdAWWP0VpFiDl6nD7mz7IP4S1ntcsl8IGCD8bKmnYoL9IGIhXlBatKqPra+hyNrI
-iGZQciVA8vxmVFBGnuuR5oCCYDiwuH9/BMWjyj1sGlN+dk7HI7phL+kwwxVpyTYW
-Oyt20j/MShit+/cGsDEXkgHgnKi7sxKIgenBz/ECSGEjYiLioZcxnIdBYSfdfDG/
-LvFJeNoNu0g3HZeNNcvKRB2/mlJ/HeJssV41ctc0sL3F3ShOK9NlzY4nNn8yKtv7
-Shma5nGIB6R1N366OBlUvjTs0ggfYypbVA+6WqpzParu/r7S8VozcUwcNZt4Cw==
-=Ru9R
------END PGP PUBLIC KEY BLOCK-----
-
 pub    012579464D01C06A
 uid    Herve Boutemy <hboutemy@apache.org>
 
@@ -3804,63 +3220,6 @@ SQQYEQIACQUCSagpTwIbDAAKCRADdM8ujdG9/auQAKCCtFUmslioIPSjZkWVLJpo
 =YmFm
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    049FE94F2D5DAD9D
-uid    Eclipse Jakarta EE Platform <jakarta-platform-dev@eclipse.org>
-
-sub    953E02E4F573B46F
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFxlMc4BEADbWFmOqHBqUUAcO9nPRSqtrmIdjBCzqsRosPk80n3Nd+jWc44T
-/O5TObVbn4NxCmbLxklWpIU7eTEo3u5LnwhkgcsxMykWYdq6DqyzENO9PeE/McrN
-BLK2QibeKP2IWp3ptzze1ZsQMAzptw7J64AswxtWXZDw5P6vlTgJvSQZFJuaCwMQ
-SkcXg5FHowNEY7UtmEA3UX0R448gjR4oZOYvp2zRNPbK8rphma+FZrZE7kJwJPTv
-maGbRIh02KvfJ4KWpepqgQcEUIIzIqfIQRRf5vEJsY1kKBcyTeK0sJnzjyoV/pY7
-4Mylej1upHIQ/gC5nrWTmmcp4aYP27uUmLbehl0AFGDYJGhCakdjleant7ovhvwA
-BJpE4rYHdwL2Ps3ny0J9BllGhsZv4BJQOZuLgVWbppuv5PgAae2FPAGYsa9nyCwj
-dXVJtWXeLEza1XnWqjEx+1qbubDlWquFRz5bMZhX9OrTr66vZabnzepkxkDDI5HX
-Nt+gFSWR/ATMqRcTPIrztBvUJFDZ3FkZtgC+BsisbGEccprpvaV9IVjO34x6k9R/
-5L1XX6sftPKu3dcU/RzIIO+VeoSxOxnW2vHKK01jUuiEDy4Im2rK5MoyQseTv3te
-BgvnR2Lu7R2rOaeMYSG4aNrCkwxUXpveN2lL5fK7F3G33R4UwL9mUckR9wARAQAB
-tD5FY2xpcHNlIEpha2FydGEgRUUgUGxhdGZvcm0gPGpha2FydGEtcGxhdGZvcm0t
-ZGV2QGVjbGlwc2Uub3JnPrkCDQRcZTHaARAA14adEA/lwdzi+8kTvButgBa++ASH
-aUr0xc/r/HZwOYsfY2Ls9aKQZS8X4rY0qXvrJx4dwxFMkdXNHaKpU2EVxL08xCmR
-j+jrgTIr7pRWC+xTeWo0D3ouGre215f2wM0LMKWtStiGtOhqRRhROcBObdeXPKhL
-ffl5lOJc3fQVEfxT6s76UIbjVjfsuviO17BQ58QpWSYDP+jEWYwkZZsNXOOMN+hW
-g7HwtbV3ZWthCz9EwDvYm2UwBzBt2P99av+0Bx90X9hNpbuvOUAbqHx9bIJyIik+
-HfnjooQvswOTwmzJEJpjqSlsMZurgoW3ihy0c4pMqMKc9pXzhwHFdSO5VhqrkRNM
-W+98srAv4mwO/ltjj3D56EgdS3EQribI+MCtkw0fFgrp1kucUMDunTfprKbdqXJB
-iOzyx2/V6yLn1ZCtgByrVA4wLxf8Z/pxjodVW27YJRsPx/fCvp7omh+y1C/jCfrb
-N6996hLj2Gu1eDIPvOGy68lyFjm+Tia/NHkwsimm6c9YNSkoLWxxThXWeiMPPQjM
-8ukx3E3nKpeZIrUxSVVnqdk98n8uo/YExvQYDvoh8eItpM8YyzYrRhuE5bYAl9iP
-uskYIKDaOP1//suTsRqMBEe5lV3XUaiv0/iesbPPxf2ifL3GfeB3CFyHjyxCGPgA
-CIfdL5FDeH5PcE0AEQEAAYkEcgQYAQgAJhYhBHHFJGg+7HjMrW1VVASf6U8tXa2d
-BQJcZTHaAhsCBQkJZgGAAkAJEASf6U8tXa2dwXQgBBkBCAAdFiEEKzSCFBjPGc8f
-KoNSlT4C5PVztG8FAlxlMdoACgkQlT4C5PVztG8LTA//eE3J8Q4W/Hmf7AHRqbWA
-mMnnXuMufreGyc7GjSqGRs0JqfXz3dBj+zclvOS6yIDFXLKAl8hdnJdY6ep7+u05
-CzdhSTaKt5thQGgU5/bNHwD/1D3zUyUIksmjA02unRVJy2gHvL2GD2tukonIjDwF
-NeReqpnAxvPcquGttV9eqvw2Tl0jUsO0p4o7sBEPQVYiIwZjLdXXiFwlNZo/2GJI
-a3+UYuGlqn8l643KyuKtQG+ncIwwH7RZBCqIZjcc9MSWukiPbRm6Jf7mvlLwyuAJ
-9KU7AgiRvwdh4iX+rqntAKwJgkAHpz0FqnK6Woo6C+rRPLBKh6MrOtRBXePErg0W
-BM6kLVnu9En4l8yjo+daEVY6hvbzfB7QSJWCvnx2A3xt/FSRggto5Pm47oDhBXwH
-I/pEcTMz1IYseDGI5/kM/n0YJho6bGr9OIcrl5hbMCwXP9YTlxhbyAJQ9rgll8FH
-+RHQDQzylSkQiGh2yANGzIzE86gQK2pmxEikdjoYMUVlygXQy3iQbiPmew6GRsYX
-Y9XVDT7zflZp6U4UFhOmSpjG2+vrXl4eAsFuuOXF2Vyj3L6oZgijL6651wEq5kZB
-45iuzm9bhjjz9y26YsoB8bVKqDQWNCtV/h/HsgyCK6llv9cdwFugQhcSX5P1J0hv
-wz5Bjp0HdzQQzGomBGGKzjoP3Q//Wu2NA/CnFhN9pM16OeyWxNkHsZLKMYQLKhn8
-Q5OI2NBKNf4FWCFcd/k/sTPjlB5l4otl7DdbIucI1jYxhyBrPcM1ivf7EjSm7M/I
-gwbIbIisCa9aPrC77YlnTYk8exIxQCb0z24V4HZDmU+DbSsUEuRSsU9gAi4C3+mU
-KiB3HOyYkL9Lt4phx8KlW252Anm53mSZZdbY/N6dejQqxoqHxdAaTTL0roTw0Gru
-wxPAYxIs2dyG2XuLhF680Qx50j2dCLUNcXf+ZGqapHJDk5nrHXvJiGQkC2nD8QK6
-wIZu15xMNVEZSrmp11AZL8CHaIhcZbbkywabPml08xjZpXh2fmiRTheHZNTD1A1H
-6nr+UI1s7QNHPx6b35oBK/ogLQd69nWz7/keo1voghiWNwBiDrUUlwDLNPXmEVFj
-6/vFTIOsmHE0MspxUE/fcqMC9PrCDeTY+PUAnw6ET+PFvOgC3+a5GqCTYd3wgq+7
-GHgcULCYwDs3NkSxZj81tORFpKpcSulMwfiIDhVSqvk5DVzdbw36MLOwgXbZYVZh
-tPCY+Wfr5WiHj0bxooF/kXD9RsDff2pXSsbkyF4KR1wuh1neqXSxuxblEbMcyTJi
-16Xn6hBol38MMqp1RqPSzETNNUUkyRFp3C8wtm5ztT+STUZ8TF++vBnTckCpyOlE
-pKNG3IY=
-=QfmY
------END PGP PUBLIC KEY BLOCK-----
-
 pub    04C8C902FEFB1A01
 sub    741DB70D5BD02528
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -4132,114 +3491,6 @@ i6QmtRdrToqqt1n1jGq9Ka7lRjq0xJHAZak=
 =5JCQ
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    083891AD4774845A
-uid    Eclipse Project for JAXB <jaxb-dev@eclipse.org>
-
-sub    8118B3BCDB1A5000
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-mfMjMgP4QIPQl4W7IExkjfLxmiDnDUJ7XCfM
-=4S73
------END PGP PUBLIC KEY BLOCK-----
-
-pub    098A31F381819057
-uid    Marc Guillemot <mguillemot@yahoo.fr>
-
-sub    37DE9E37C5B67C30
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE45TdsBCACh3z0eYj5ZA/i3pmKi9FTZes5FygHvaFP+p6RAw+eLdng9HUvY
-95cRgofXgy6cdLl4TAuBRrCwOL1SevxuJyQMtXLBdcrP4G11DcdYP1tAJWKftodT
-Tfpr7JDOMlCkFe1y6cQuOXKa/n9l0B1WzysKYD3tO/3yd0I7T5U6uJAoLDyTYKme
-VSUJxGyrAZhC/fNg4gQn3OydzB6wFbvjki8VUo+sicDIjNIvRKGRyn64Oew7237r
-5X8oOn6MTrvoQGkpmu/I0Q23t0Uety8NjSRzfJE8Ad6XhpmdVuiedFpxMWRHgI7b
-1GeR4hkVrmrYU1TfO7xN6bWf5o/xMBWzBWLhABEBAAG0JE1hcmMgR3VpbGxlbW90
-IDxtZ3VpbGxlbW90QHlhaG9vLmZyPrkBDQROOU3bAQgApHFSdgwxy8CX4DNifdRQ
-oprGG96dpzKG7E1nNo9sLbbY9Nl3bAB7uPNc1gDVpxvgS4mm5k3F3H2KMes2XYvM
-q34n7PQ3r/le+gOM437YpWA4QAdQYZxVZoj5mVcII2jvD9BO8NULr1VyvBJuULTO
-N4sOKIOvqnGLLW0Pd5igukgKBxqFpjYGfJqadE3yrFiOJ1z+DkIfudiBlNqjOf0B
-zK+vL+08Nqae/bEAnPUwWdGx2QI+QHNVjIOlHRe0M7WO7naen3EdzTkfH5NUOCh/
-o8aLyfxwHSr9aJ5FCTsXdQkn/NtNE9igOyL+E539tSoQJKG4j3OFsgQiH/RX1Kas
-YwARAQABiQEfBBgBAgAJBQJOOU3bAhsMAAoJEAmKMfOBgZBXYewH/2mytdowDcKk
-nPDjiL5MwAvqs6sEk30MqCvZohhFnnC1arLU0pO1QaSZqQPtliHARCwIYdluIfvH
-IMrFX8wDvSCntzw/johbJ5Bgrgg9QW674S2PjqrC2foUnksSt1WtGWCQr2xx3NY0
-uy/hTefV+LFtCgpIHpiJ4jHad32+cIJWuKGetWhdnbTfnG4ArGZ+AVicgb0Ojh6X
-WW3pmvsSl3judWv7p/2hywYFhpMierlFSJvycQXp1svYS8UOiLT6qehkQVGQUmJC
-vpsFmyy5Jbro56q4JEosWCAi9uXVeW3SSBW4jbu3plJNMrnBvBgPM8TI8G3+5hEG
-f2vHkgXOGMk=
-=2bDb
------END PGP PUBLIC KEY BLOCK-----
-
 pub    0C0A9468268C79AE
 uid    JetBrains Markdown <markdown@jetbrains.com>
 
@@ -4513,61 +3764,6 @@ YauuFdKHKzn72X+iAJQgiVtlHt5xxm8DnCt8RGdK9ohuBCmE4xkiXw==
 =Kajw
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    10C01C5A2F6059E7
-uid    Mark E D Thomas <markt@apache.org>
-
-sub    A05557215E763BEC
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=MTrZ
------END PGP PUBLIC KEY BLOCK-----
-
 pub    1241BC872C5E4EC0
 uid    Henri Yandell (For signing ASF releases) <bayard@apache.org>
 
@@ -4600,6 +3796,34 @@ pXIm3TUM14sAn3V0cheXNRVmD2OhB5yqYpYd0Hn1
 =ezg4
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    152888E10EF880B3
+uid    Daniel Fernandez <dfernandez@users.sourceforge.net>
+
+sub    1CB037909F7E059F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEtnRE8BCACzVmIkAALxSHQAbp5HCXCLqL16UnxJcrcUIcnRQSXiwjAcNsjS
+S1mRwr0WrmaquTQYDk1W8owUdmAXdTfSHgtJKFRKdJ20IymeXx1VrmUiiCNY9Jf1
+xYhaJAopMTeEp65q8enAZcxjyqVxk7wOPgKD6uakQDdwiJtWHsug7zlmUtzZ6Phk
+iCxhrJSasatOqQoJon+RMlsFYWLulDFv7CmDJq/GLS6bMDajKt+SXBsnKL/gUWZ4
+hT0sL4Ux6lkshyey1BSbmDbMnHmzR2Ng8oIzKziA900FFaAWsyg3S6vi6I4P/x4N
+PfOR2BiUwcPi7lA6Tp0lwPM0IdiUep9Nl13vABEBAAG0M0RhbmllbCBGZXJuYW5k
+ZXogPGRmZXJuYW5kZXpAdXNlcnMuc291cmNlZm9yZ2UubmV0PrkBDQRLZ0RPAQgA
+rznjhUDrXc+Rj3JK5c9Kz7rIkRmjfvXAz/fWjgPGE75brZPcicuSY/DIMXglvYg4
+Nn2ELpfcdpA/2NbI9IbvBRvMm7lzun9mYlq4Id6kvpBhQbCg3ksyy6aailNB3oLN
+9Z3DFw2CnndDE9YuAkLHtSwR80ylM1Ain0OhHh+cPU9eoQSTZiPI4nmNFoLlIUmL
+HIqmGIndEsdkWg+BczFsc7ARKLn41xHVg7/o1TBleyxUrLVp2LatNWZZdqD4pZfe
+AalrrmgTJHP89X++Qgtdt1baMWiomMUusUjxM+WuUSzPmYt8C2LG1dp8Dfvwr8DD
+98MrHwf1AkNfGGNSTWTWbQARAQABiQEfBBgBAgAJBQJLZ0RPAhsMAAoJEBUoiOEO
++ICzSdEIAIkL3iyzDsl8s76qY5EIJPodAYBeN85uA4V0tFdmnObUzas4Qkl8btGi
+YScQaeTBH+MepUqJiae59yOES2Yhy6bf9t1+WNkYUbPqvazSQgK1rujjlpvK33sz
+MwaAr4OsiCXgLXjiiyUihNTu9yOn/kaV+ry1D1dVd05NgH/kHsGcXC7+bX9DrVYM
+zZd8vIDTK1cYEFSk/4f/ej5TkD1bVyuZpWG381vO/zchFeEFO68wd7KmVuUpfemZ
+x4vaG6u/wA9DCulCVIhScBIXmLdwUWihEmfbGu3sZ3xuqmInxEJa8pPgjoTHTQ1K
+cUx8QDUSXg0Ne49z1DnRbB0ieTIVdqA=
+=7bzB
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    164779204E106A76
 uid    Shigeru Chiba (Javassist Developer) <chiba@javassist.org>
 
@@ -4645,42 +3869,6 @@ YM0/Z4ojbX/WFQ==
 =AKY2
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    1669C4BB543E0445
-uid    Emily Johnston <epmjohnston@google.com>
-
-sub    5F6BA89D4B0869B9
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
-P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
-ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
-fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
-C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
-itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
-wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
-wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
-J4hfzYUTFMsJBp0AEQEAAbQnRW1pbHkgSm9obnN0b24gPGVwbWpvaG5zdG9uQGdv
-b2dsZS5jb20+uQGNBF3TQCcBDADJ17PQ4z5UVGBVUefEkTXeVlGX4oc+vUOVn8Z9
-B34sQkFmgsORuwm+/1rGthrMatro1Jka4UXSxYFMCt6XBz4/OdJbquxs6D85iuda
-Id9aozCOJypkfprp+ez2PK7pWeOq6DQ/lqqNGyoHxA703wshI38sNcKRcypn/vf1
-VJlO3ZjfLCVDQw4+yNrdWiwklb4QS0xwjK9Bw9m8g6HiQGil8V/kL9Avpa76rGqa
-P9YnkTo7NQG0cwEbpcxNUrkO7fFKjTOMTmfPkh5pHAHVS+FsrCsxhRs6Eb6u/qes
-tHjpYj6qtMJ5V7oXeUI3OZ9nAPctSxoNVn6f0otsaatoBwcJNNhO/6ZIFH7NlgYQ
-NN3a5Pz6NrU13+zMGbsxYzlL4/nVwhdn/kHPQ2tl4e2R79da7ModAjeafimikA3n
-GZj1Zvo1iXKLfguM+U90kTrPKSxcJqwgV4QvrO9Z9llRTzhdBmrFePFhlxN3JdpS
-KYXFInq6JwncmOAeIDhNYYcVXhcAEQEAAYkBvAQYAQoAJhYhBHYVrVYUTfI3b0nZ
-ixZpxLtUPgRFBQJd00AnAhsMBQkDwmcAAAoJEBZpxLtUPgRF32gMAJoI+6dvnT7G
-OJB4S0HAB2qhizmQ5MWiO7QE1HKQ6ShylihJfAIMnAMlLPhorr1ITZXaNMFO+rWN
-O76BdsBxAkd0rKIIjMTU5r1HuS+XCGFzitffkJ2TgQ2K4vKnSgEpCsBilgCJzdJe
-vrYoCAudkZAaeBcT0fsTtQDnWHUJSkyWro0ovaaPF5tJzMkFZQBlaNyb+DmWPyNt
-5TP6iORnmeLNE0OajrUawFUcLUITdutn2t/PRE9LBDSlewE9Gabv79z8ZGAw7jPK
-x/p+ePpIj6J05TM0BR9KLrk3avMIK+eKwcvm+nCyYA1jKr7c9E4bg+6sRbc6igvV
-L4QeKzjeGll3vjifmghVXVKVBOW1fk10cMNKaTEkGng8OfLhJDQDXuNz4m8/pMA/
-wyGfH3HBGSx+F3GZUb00kU0HbxV2Vt0QlyjwT9vJfVGQ4Y+GhnMF6qErtdX8cBIW
-FJXLEW77wWHN+QpRD6BShYZDvUA2mtO0zlB8reU+VCxgnFfm66DkUg==
-=jYDe
------END PGP PUBLIC KEY BLOCK-----
-
 pub    16FBB6B6E3120829
 uid    Igor Alshannikov <igor.alshan@gmail.com>
 
@@ -4802,96 +3990,6 @@ T7dK1Uyb
 =9sp3
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    1A2A1C94BDE89688
-uid    Michael Osipov <michaelo@apache.org>
-
-sub    A3F393B5D034A0A3
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBEzxj6sBCADGV4szLvjBwrAOKYWw3efASDI2yo5Aq4oevm9cUB4G9G/D/fuR
-XhodLaG2smZLd8sNafWTSbPHswsZtMAjHGzka9Uj4Ow0etl3+kTh0DE6Loezkj7s
-nut/6JJ8RGmLf+NqJJhxS6kCCAND8GnNIu1gGY+nZ0rVO7ZkPwtUR1H/MnoZ3cC1
-6Ual63UOjgsNhmmaiCFyedzxitUVdGqeYktPt/rp/NqJ5zPs1SLX9vbFNTQ5iVKw
-EszDiYSOTBSZ2kVlygGD2JZGIa+uQ2yGqVJthXXlcG8sineNJAPnkNyW8Ie2uYeS
-VFgXoFPJDWXYsFC4APNIAdV2x6+OZybsrOzNABEBAAG0JE1pY2hhZWwgT3NpcG92
-IDxtaWNoYWVsb0BhcGFjaGUub3JnPrkBDQRM8Y+rAQgAvSKl7ZKtn58HID2sKpOF
-WSQMu6+vE8ce3avBmIpyOGmftXyneVo/phWjEmpcSPdYaazoeNXwFlr1NOEdpDI0
-5mxtyy0jELUltV4jxr2l2mqO0G0on5yDw+IhWL94ddmiZxfywrpUDdQu9XINU6w1
-ZAzLOYQpATelBdQ4ukg5/MT++U0SeDakYafFcdKkGfUUwYESU4iNxM5rNcjl6RVn
-7NlxnqQIZm+dhAobfSMVrKbKbFxHD5KYh0fcOzxr5JsqSLqQ7II0+A2lGErvz0hW
-m77bJyDpQcqj6QC9iU9ID9+1u8ybLP4j0bjHZlRMHQOxqUjXjCSLTgYbQ6Qmyyli
-hQARAQABiQE8BBgBCAAmAhsMFiEEaoFLH4acK76rfLcnGioclL3ologFAmZgeL0F
-CR0xUBIACgkQGioclL3oloiR0Af/WysDYljLY8sWPKipeGeFKVco0cPtLg4uKKFM
-caYj+BNK5p/82BAQ3prgxb5qTwD1ojiFERfRDyTbFHIdqhW5iizphvXACHMt+WrH
-tBQ0Aq3cgqSak1/CvLtAhgN2z94U8qqhP/vTygNZnbMz2LdG1djvuciWH0ZjOnhW
-jR65xGNhIZ3WyzeAVlMGi8nVRvpJvADJiosKFqjqxXf3ltLMs/sqyuCMxAXD+Lj4
-J40HFogDg+MmGIkuMHb3wodeIEZBPcLEwE4LdSF4EV1at6hRO5w/RnY4H/miyHzY
-c0hJjOWbMfM2U3kun3wmLazfdH2BUb8QhwO1ZfDGPZ3GNjp8lokBPAQYAQgAJgIb
-DBYhBGqBSx+GnCu+q3y3JxoqHJS96JaIBQJinGm6BQkZbUEPAAoJEBoqHJS96JaI
-yioIAIk3qs9E6vOhEZicQdbw5VDJ/0YBJ2Wp5qQUqV4P3pK22AP53GiRQE4gMOrO
-kUGGn3gDUGHB3Y0jWJKScYO78xSLfQCWfRjfVqDIZP8Eq/T8+klbw+CbWDQfBpOx
-BO9GYV1tQMe1YuWJRQqFpMdTYYiUmEXnRv+rYtA39dbpUcBVHen7S+wHn+1Iy+OJ
-+ug0g0RAunlXbnL3JLTstIIz37HDUbtpf4usUxh3V/mevYeY1UbNWPVXZVQtomAV
-zEHRFF4THi8PBQRDDB9bp+HWW97wDWlrdEMis1kUG1qLHtO0qUi3WpJB6uyPuCxS
-6xdEoXWEx5a94ARTKMocpZrfYlGJASUEGAECAA8CGwwFAmC33FQFCRWngCkACgkQ
-GioclL3ologplQf+ORhN2Uys7Iaa2it3v+aB+xqb17noTXxzhnkE41/jXCwMnKbJ
-/79qFq93McdHxDDCjTyz+UZuaDg1hCoILNuNDWS0PtBzlk1yaPuJPkEUpHGTpSkN
-rrlgeTUi6YbbimBVB2ngvAO91X7TDJQ0GerdKbKOpNjicPOoYKRXBcy4Trfq8Fxf
-SAZSZC5tmlHLzmEYYEHbNsuh3aVjVmwVtS3BRfBI2Zn9gX2CWUuMI48tLAYVt+Jy
-kA6buIcvfG1DjAsQOj0sw1/fCc3zppIHe6F8bWcV3m7gqeTQ4Gdjkt7glF3kiLxa
-moAYFrLMPPO5QX+/xcfbNcuIBk3lld5wKLWrdYkBJQQYAQIADwIbDAUCXtFnAgUJ
-E8EK1wAKCRAaKhyUveiWiM1QB/9qugzb8U1BW8NYaz7May9qs4B8PLXfHPsVtjJB
-hDGTs3ZxXt9+BTfQTRmtdNTMER68iPDRLdtCzTBfNZvb8NmpeFIkL/E9j5O6UK4s
-40x23lqJ0eiSDUHQHZeWq7m4S+J2VALA30jeDXRoHYgtbkrIWxoNH7mC+5/kEQMF
-Dj/Kbh2n/4nSQzd0T8+v2OmPikBPrZ33uAt+aZx8NKck502BVwezC5YOXaIgZvIV
-++4zfiApCXJ+wx4lHItFRuTUIGgmwO1bjjMWTDSiMI/6pHCzD8fQUCZ/7GezvatI
-MR+3PpQiE1Tr7ToVORYPY9neaT6myy4PbUs1rN1j9/RMmj5uiQElBBgBAgAPAhsM
-BQJc772HBQkR2MncAAoJEBoqHJS96JaIC6oH/jnXBsqqk7x1MzYY5LM0N33TOVWJ
-/mECxufILyi3YU++bbp72hyGbvbwwVrJfEj5OBGpW2vl+ldowRn3ohx6+ccIL3t0
-ZxNU0nszs2FPCENmq3tQCEPX+Dqyr3NjGxzm2n6b8YHPMDtsOxH15OZRASPCBbFY
-A/U+M8U7rqqFptH3YXsWrf6o9FZG02ZiWX6EnjvjxcxTCzC106YRirFsjzKzksRD
-lA3A1zG5m86FcWtpgaEop8fP0Cdmzdeb36px2RMPMB9jhntdWYw0YDXjU+QCCQrN
-UnqcpFFTU0MLcpoN7FQoESKxzqiq5JPaeGRFCLe4YoavLIhFgpz+BuR5z0GJASUE
-GAECAA8CGwwFAlsF2O8FCQ/1fMQACgkQGioclL3oloi2pAgAim45ptLM+0l91EEL
-YkD1WbBo6LpBlWu985BYloRSdpA1eDWQxQTzBy+LfyUCfoNBtUSqt4yDl9WQ2XeJ
-1ly/F9/oC9BmBjxFi2pQwcEb8YFenzfmPiTTgx8j6ewqYnnhPbyCBycp3gKcqo4j
-Q6RjAvtMtSJtuRvniPLXiKzjNYx6/v2W8Q2rS2reqGy3WGrz9AjaoCD4nwCsqgQO
-4i2BBKvgMxnFxYiNi0UU9HpxZGFL3EhwK4x8U1uwXvIw2v8ffI8oEy4G5oV70dS0
-gNoyaI2CadFqTrExOUqq4M2qwZCbudV9a8uyn9iGF/FT44orzTU22/559YQ9Bb9k
-RR9RqokBJQQYAQIADwIbDAUCWRNm1wUJDgMKrAAKCRAaKhyUveiWiJ6QCAC7qDzE
-dv4jphwiQHB1ryHxtu0BMh4kNX+mIim4v1yWiBHDsJlSnxaABrdii56LNdBTOQTj
-7biT0Frwa4dQpG3tclS7l4bhKWXcO6fL7E4Z7qj8xwlHN1QQEFZ+xzKCzLA+LN0B
-3qJ/NVgpC7S+JqiBl36Wtp0znVZxe6PKXwQ06epVnkquspwQLKLBa3sI3u8DrekY
-FWn2B9cJ4yCTZYgGj8Xb3fkMdxyFt/edkimcJCWm6/QRSWC3JDBtQND5DQtC8NCr
-Q2dENvpd7z9jVBgRwRN+NmGZLPZNYN2ioi0JMu0rTkW549935mL0ixFE/cNZWwXt
-U0jiRl5Alo8HyltfiQElBBgBAgAPAhsMBQJXNwevBQkMIBQEAAoJEBoqHJS96JaI
-asgH/jxCg3JtOU12aBJKtZAmo5UHcTPsBUkCfB49cvwpwwCk36+txqSZhLQmwUmM
-QP0Yvulm7k+YhWyAtYK9JHFUt7tTxQCaKNL9Hv3g7vLLVEXI6i/NBztonilJb9El
-zBY3uWwtjRvb7LtQtF9BqfYhGxZ017kv1JbaV7+8kHbi5+Zd7RYQfdMYSLTKpY0J
-1gDzCPi321uIHIcOsGbYaU/ZA8Uiqb6EYxLPS3UcyBOoU133f8cv1hscLtNjqzO2
-CVzRjgqBGP1Zx9rLYPgD9yzvln0ZlM39OvbEoUPILPDGIpZwGnFkLwoHOJEgUT4/
-nhWiUL9FEk6WUJW8iyVK2d5xAamJASUEGAECAA8CGwwFAlNc+ZEFCQot0OIACgkQ
-GioclL3oloicoAgAw1z+LdwSxXt+LTQM09e3slTmLZZuy2qNGNqC4RQrL5iEZ2x/
-U1pLhxhxplH8VxP8Rm6LpsGcQ9IxzFrz+IXQpeGRNzxW+5o8ERXvDzXuEfMc2uXB
-95h5N12HhhxxG16z49Z2fHq7P2jFlHzQ2BVHfrQrB2b0yYTfqe1nAI8dpphA2ZWx
-ncKK6ISG3hfLsVbgzfw3Q8TK8cvjZarPrBLT3aR/MBCniV7/oKnOoCrs7WMiJPmY
-YpFFTBVtQE9adq8yMi4NUYD5ClnrBtpAScmjzQFS276RCbLKK4xvcIR0iJ1vFHwf
-dYIWJtT908OOYgKULmMmxxOOk+fmF+pTKT9Nw4kBJQQYAQIADwIbDAUCUNy4NAUJ
-BcxcBgAKCRAaKhyUveiWiMDtB/42zg1rFFwYC7GxCXjg5B6F5BCY0jYAhGZ5esWM
-z9B8kNBEXU06qZ/iMmTobWDvg/OBsVn9JuOdA14ZHQquvA5+9REgB12v6EGZvSB2
-M0LQt50aeqMMkJPrbEKUtVbHlsCJGCp8ABMt4Gmkp6kfAS3OKcWHxF+FINO6C/xK
-+6LYQfdZ38SmG+yv41OE0D3TvncbhvhULByJ0GEHoQ73R84eFi5Fr5pTyzwmaD8M
-z7IffYE/sxpSF3c3l3bstpi9VWTYgnqvcAVkzADNe8sxQTPWqcykQJbZuO53LVL+
-TaxNJz1qvtTaSf9ZDIRhajFnlPSUvNax1GdbHK42O7H2ULmriQElBBgBAgAPBQJM
-8Y+rAhsMBQkBmLEAAAoJEBoqHJS96JaI0Z0H/RrPB0/oetTbeHKMqwkZqfl8T3vo
-qInt/dShli2BOp7X/UL0NLQHCFYz1pkjDlDLMhpN4kTI6/7OK2l8ha0WeI5hgNlA
-nFQcuRbgwrjerDMlWXAW10tHAPptBJdvv3y3+I6jDj2nMGsOSG0f8+z55mrvBIVY
-FD1oraEEzCrfmGnubsVbsy8vbvxpR8Uo6x3R+TIMjtJ74fXczC+gAUBdn1aLYLve
-l6J+kF1873OKfFaIzxvi1I44gbfxWy0Hd6wTX4LEQ0JrxbaOIIpb0RO2xP4w51lW
-nTkUyTmIOtAfpcNxqIzJjYoir41vgaegw20EnoHgJiCD5OB6Xzn03h+rTXI=
-=MeIR
------END PGP PUBLIC KEY BLOCK-----
-
 pub    1D0690E353BE126D
 uid    uriel chemouni <uriel.chemouni@gmail.com>
 
@@ -5263,50 +4361,6 @@ HNxbCoy/IvFaO8SNXK5wbsiF3xpD4nuPSO2h+v3Fqx691Gc=
 =xySD
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    21939FF0CA2A6567
-uid    Alex Herbert (CODE SIGNING KEY) <aherbert@apache.org>
-
-sub    A98BD25BE464EA45
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-NblrOf6LII4Pqx0ip7s95q54JSpekQZ65g==
-=3q/e
------END PGP PUBLIC KEY BLOCK-----
-
 pub    21A24B3F8B0F594A
 uid    Karl Heinz Marbaise (Apache Software Foundation) <khmarbaise@apache.org>
 
@@ -5412,34 +4466,6 @@ RFIsPREvvu5tme8fWkkMMbd+hZ1007zBuNCNPm4=
 =05pd
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    29579F18FA8FD93B
-uid    Tom Ball <tball724@gmail.com>
-
-sub    9DF7F2349731D55B
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
-h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
-XD+/p51SWLMvgrLxoenmoE04EuQqQiXd4DbU+HGPseiNx+mN0cxPssaZMBBsmi2r
-RjwcQrFTaC1iffzh8FKLQvoTDzci//b5bWcxCLbsY9dYcUaDCbBAkL8HzyZUKNE9
-XwXh/Rq8wDakI/VEg/905a9c4xq6Rss6Yn5E4V2SAo2+B3hYmvHFsefaM9kkqvXk
-MQ6zjx83LAtzavOzmthjhhPIgCAfoQ5Q5oDzABEBAAG0HVRvbSBCYWxsIDx0YmFs
-bDcyNEBnbWFpbC5jb20+uQENBFYFiMABCACdvSlhh2hLe4F1fBMHiZK2HdNp8I3N
-S8o1E9k0cBM2fTfalIlan6ZIJ2Z+JqRwk6MRaKpB2or/0A34+3KfI22SWtsI2lJA
-2x9qWaiwRidLFFAWdSjTzNroYVkcwJ5hf2yKN/mH5YRiDSzaqHr5GKKPXHXpT94X
-qXn+Pj1Lj5ipnqPOerpJ5mlkPPSz8C5Ve6I+sIqjGKdtrB6kxgIF3kf30izCu3dL
-0j5vuey2XneRAqETHqmBVMEjFeuEY0zJCj7LxQRr0YaaSfrlkIjIxRbhatgxXjQV
-bbnh0nYAh8dUz/YvsfuyZmLJhRZkcJxHW8Tt0xxV2oBUBq+IpmvqDoy3ABEBAAGJ
-AR8EGAECAAkFAlYFiMACGwwACgkQKVefGPqP2TvmWQgAi9Q5WlckTYzccwvt9F+s
-RspD8AncDERdwkY6HiInLLNqQSUWiHU2BaYN2wmSiSeSgwurPtN85nd3XZyhKtXx
-H0XKC2fTzQWBdyBEh5zT5UevES9nIzIKurHoG4TsWr9d2XDiDp8q1s4G1cNGYDfD
-97wpZRbYn8L7hedL07ISEWNdRvBpbrvhme7X0pD8MBKPqUXfLHHaJetmlFKOmu9a
-wzjINlz1C89JdocSln3lLJLE+RGNN7HmXdwmKjmnC0fo2h8jnOTYekdTM3Ec+uWE
-8M1WyqZV7WYzoITIfq0uHgyIxCpaOOejOLKShQW031G/kEvZApAVPHLFM8BdJ5P6
-Dw==
-=INDk
------END PGP PUBLIC KEY BLOCK-----
-
 pub    2A742740E08E7F8D
 sub    74C249541619FF0B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -5724,97 +4750,6 @@ EfbsFU4kymcgABRT9CyDsNAmI/lxRNEB+pxiNp1/DA==
 =GoMW
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    3449EC3AC2EFE8AA
-uid    Ingo Bauersachs <ingo@jitsi.org>
-
-sub    4F89F83C363D30E8
-sub    A5C8DBB8A1599BD4
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=LVlw
------END PGP PUBLIC KEY BLOCK-----
-
 pub    3684155E9365C30E
 uid    kalle stenflo (gpg) <kalle.stenflo@gmail.com>
 
@@ -6056,86 +4991,6 @@ s/hCm73XnJYkQp1urhsElETAZIeXis2lkUB20kDO2uxtTqpXG+MLw601ga2gORWi
 =pwKc
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    3A1959EEF8726006
-uid    Eclipse Project for JAF <jaf-dev@eclipse.org>
-
-sub    D908A43FB7EC07AC
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-x8rPAFrvagaS2grj0z9tIo3Ki5HXDlWO9Q==
-=rPkh
------END PGP PUBLIC KEY BLOCK-----
-
 pub    3D12CA2AC19F3181
 uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>
 
@@ -6279,74 +5134,6 @@ bCSvsEa2cBXwSbD+0JRfuRvpa8CC4KDFkbU3Nb26dEvWPz+jpC3BnVI=
 =t3XY
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    3FF95B4331B1F3B7
-uid    Kevin Wittek <kevin@wittek.dev>
-
-sub    B62C7B23EDD13DD9
-sub    B3DE72E647D35161
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGFtXEEBEAC5zhWNCSAVmtbCQKqYwcR/7hVifekBu0YXLpQKEgvS2GEhEnUI
-KU42HvXLBkcyWv9gBGdkWHThNiU2LmGQFTpTwal1kBBJqwGNjxPi5DKGXQGwsnLt
-dmj0WUqbo6rhFr9dLwgm9biEiYi3IvCk60ONJ5HbYZ0SMQLNQ+DGkwbggThInpZp
-ud/hpXxWZXpwsIk0yQWZIW/tbhFIPMDNz5N/m+qXTs9+AhUkH7fEt1oC7+IsIYfs
-w16SsxbVUaq7a10Vmuqf4TFHyjqTZyOVDrM7PEakQSacqCORx+Jl18t3ui1gT4AG
-j31AE8K8uRPNPa+9M+bIiW4ArlzlgaSVxrrHvnsAoYlb0u84A64F9IeQ1Ko4Xqzu
-j+9UqxmFUwZKZeyla0j8TMU81H4KTdkheoymSbvSDzjnC08WPX2zI2htyEA5wmBy
-T5LmK8TW75P+MmTpT9NIv250JODwlU0WMgCPIZLXqv/vUoVd/0jZQi+h1Net0iOZ
-u7uoRi+VU5Rja5JutSz9bK1YZg6rY1pFnjxz59paZWnMvmpmLmz7j+d2KAXjLraM
-9lkQAKc1k6H0z4BaS4bVfTcvgZzyM4qLmLh1qn0Y24ChACSZijRRPxv83+fMpKva
-dAl1R2E5838eCrgUoejOCqpVDEq5VsVTGkXnXMN9HXkliZ0FYpGmztNT5QARAQAB
-tB9LZXZpbiBXaXR0ZWsgPGtldmluQHdpdHRlay5kZXY+uQENBGFtXEEBCACtDY1n
-HnCQ9XtxuMS4TfEu8E0bpk7rvp8tEQoykdnjOLc8nuPZHIPuc6Hq3acGh6T8lQOA
-J3DSX6xxYi9hiogJrP4ZfLIZJRy1bjTSWBx3HwzkLIu0tRdYq2rcilsGFZ9PBdgk
-W3B923i4Qiw1ecOlQpNe0QOicPuucoYEuQchQ+yQvao0DGZCSPtPnIS8YHXq9eZl
-hOcstysTHKjewAN8Ucj8EiP6gBQ6/RN93w85jYzgt+DndIp1zKclxWAJHlxk5TMQ
-/wzMQLOVucqSEI9t5uAie9xK2lR1CDZAOkhO6lXjPsgJgwkenK7T6DAP5sEvRLT2
-jTwcUlR4eQTG7XarABEBAAGJA0QEGAEKAA8FAmFtXEEFCQ8JnAACGwwBKQkQP/lb
-QzGx87fAXSAEGQEKAAYFAmFtXEEACgkQtix7I+3RPdltDwf/Zo9wOzu9sJZKp0Tb
-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
-=Hiph
------END PGP PUBLIC KEY BLOCK-----
-
 pub    411063A3A0FFD119
 uid    Stian Soiland-Reyes <s.soilandreyes@uva.nl>
 
@@ -6577,35 +5364,6 @@ NDiSxLQ=
 =VAJO
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    41321490758AAD6F
-uid    Groovy Operator (Groovy Language Continuous Integration Server) <ci@groovy-lang.org>
-
-sub    01F3A913FB698736
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
-Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
-+oLOMT7+159maGVlTbp+CarWjp9HWguCVYYAgmP96EZVILG+U7iFzLveEDHmWHyP
-QgZeJPbiiZPEPVDYll821zajCsPj6qse050IIiKfsyveCk4j/eEm2EtBDbQeI8Ul
-Y47TRSBvrtUaUUFe9P6uNoNQmbasyFdD/2yKCoZHCMhAdP4QydflybQdDrF9p7UF
-kCRk+uVIyxXDSn/XMHNhYG09+sy2CoQynF43ABEBAAG0VEdyb292eSBPcGVyYXRv
-ciAoR3Jvb3Z5IExhbmd1YWdlIENvbnRpbnVvdXMgSW50ZWdyYXRpb24gU2VydmVy
-KSA8Y2lAZ3Jvb3Z5LWxhbmcub3JnPrkBDQRS5ljtAQgA0Wh7L36Agn5UEoNg5kgr
-m3uzQnd+aBhqwG3647Jytn9SZl+PcjnTaLidhW2PB1YlkWnQsuHgb4Fru4s11NgS
-JI4SjCNzHIGva29yT3zAMYIqQuSJ6yuDQhQznpkYGpS9z6FqV75sqhNXf4fBZ+Hw
-i76lE8eU1FQaktOcDBq1B/Xewm6R9EPy9cp2Ph6b0K0yNtNuxUEt0lc09HNlXvnN
-8fUM4YdPG8dgoNGxUpSYxmfgkT6Annnl0hjHKCNigHpXmhBUjLqG53f12GGqY94J
-ANjVtS7hUlAFUlmHpYzn7Waq5zpI60n0JYnjM6TuFRtay1qU6SeKkDMggxcPjXX4
-+wARAQABiQEfBBgBAgAJBQJS5ljtAhsMAAoJEEEyFJB1iq1vAZYIAIzyvdma+vU9
-m8vrfZ7M2D8a4Udzl3hLYmgQR5Z6DypMsBOc650vi60EMazVlDQXZtsvE70N+efk
-O7HMEKHg5Sa1C7tBbNKpkIB3osIXaFVT/0XLs1PAA70kppNipKRS9xraBEV7n1P9
-thithugcgqgneBNDS9N7nGrrJjYkAj7C8TxuKHB0Y3AliUZ0UU97OSyW+oDFlh7I
-VuTNPh4eYCwsobBmX1lNZWmC319HR/ASDOEt8DZSdJtuWrwtRVmdorBnuAjkcT7u
-RakpdpESTALYfjjTLQlMpT/rfU7yor59oU96nLptJ96PrnnIk10Ps4EOOB/8ssA/
-jfDQGVY4ZIY=
-=iMij
------END PGP PUBLIC KEY BLOCK-----
-
 pub    461A804F2609FD89
 uid    Stanley Shyiko <stanley.shyiko@gmail.com>
 
@@ -6813,50 +5571,6 @@ Dw==
 =QOGP
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    4E066E0459CD109B
-uid    Henri Biestro (CODE SIGNING KEY) <henrib@apache.org>
-
-sub    CCFB05B8CCBC1F4E
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=gC7I
------END PGP PUBLIC KEY BLOCK-----
-
 pub    528DC75AA68F0923
 uid    Mark Collin <mark.collin@lazeryattack.com>
 
@@ -6891,19 +5605,6 @@ pyYELsj5uHzDtLodBkqdZR6WuQ==
 =JAXb
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    55C7E5E701832382
-uid    Andrey Somov (SnakeYAML) <public.somov@gmail.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mI0EVdDLQQEEAJMtYCaTA56YsP5RzQzPvqVTaR2nZ27qRk36blHB9WmXK+NHpGeH
-PHgq59mLPVueo2/M5k/fFrCe36jHePP31gYpFtueeYDfsofHwod0WhsHyC7JfG8d
-jEnSczTCmOHRZ3ed9ef6SeWUozYCQAX/tAbpoCthe0lTDYhFhkzVCe/FABEBAAG0
-MUFuZHJleSBTb21vdiAoU25ha2VZQU1MKSA8cHVibGljLnNvbW92QGdtYWlsLmNv
-bT4=
-=MKAK
------END PGP PUBLIC KEY BLOCK-----
-
 pub    56028DF552BA32E2
 uid    Dokka Release <dokka@jetbrains.com>
 
@@ -7082,27 +5783,6 @@ ZS5vcmc+
 =DAIw
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    571A5291E827E1C7
-uid    Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) <central@sonatype.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
-3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
-RSCCRr7A8m6y83npkTVDW6m2oFN2cjFwPLm/vxg1gu5pO+NCwz5iBRHdewCg1idO
-Gl6gBAZVNteCRMVnGnX4EhMD/RaYBO2j511h7gR+p+6BBeJTEIA1+tsi+GhTBkS9
-mUMGuD9Z8PyvwL7quGQyXJ/kTe3eB6iyDFn0oemB1w736FQe3vcIX6eePOEiDZs5
-1Uepv7bXI4wn1i3Z3kzynXNKcjCd5ZxAmML5VlQ0zWeE0W18reCjt1P5q5xxBFjw
-0L8WA/9aPi4d5VPakzuDvxfKK29BogScTLn2C3fpEnqWsTfpoWSkNXkRsoB4jUU4
-oIqRFMTxwsjUmjVUPOG+YqoeAaVpj+RBpp+V+CqgfNWpnH4caxzODE9f+6RYRCGm
-LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA7SfQ2VudHJhbCBS
-ZXBvc2l0b3J5IHN5bmMgd2l0aCBtYXZlbi5qYXZhLm5ldCAoVXNlZCBmb3Igc2ln
-bmluZyBhcnRpZmFjdHMgdGhhdCBzdXBwb3J0IHN5bmNpbmcgbWF2ZW4uamF2YS5u
-ZXQgd2l0aCB0aGUgQ2VudHJhbCBSZXBvc2l0b3J5KSA8Y2VudHJhbEBzb25hdHlw
-ZS5jb20+
-=2jV3
------END PGP PUBLIC KEY BLOCK-----
-
 pub    5796E91EE6619C69
 uid    Eclipse EE4J Project <ee4j-dev@eclipse.org>
 
@@ -7356,42 +6036,6 @@ PkI/x/6eZl9fUTo/AMP2tP59T7RHV4AiQRkT7RR9agHBud6LX1eqnDHpUfnHya1+
 =GkZV
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    5E975CB00C643DBF
-uid    Xiaoming Jia <xiaoming.m.jia@gmail.com>
-
-sub    91A4BA316974A467
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
-dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
-Am1Q6qWxTcJBUtVjjlTMoWcCRwFNP1229ICL6XdfM5djqxOuIcCMIHC55YTldrDK
-5WWgcXC2NZgUbRn7/8dpaCn8iFAyhYjYKAk1lS8kSxCDvQNU9DtdAWtaCosoWBZ7
-mWWIeWp21erk4jgC145GujHYeqynf7VmdIB80u5OeIV6CwJx2ap8AgrKcOCON3Kp
-kYa7fsDGxq6Lbzbc0rzaIfK1wyGo56dMySDK1eZuOY9Es/wzaYfpzx88gn3rrcaw
-HwTKBoug+9z09m/rWy1DThW1gruYMUrxjeyhcdXlEeVrv9EdNCbbfKcg6MbrZ1mu
-Wc9DIAfSQ40Lv2sKxTyubZXxvoyEhD5LTqSKC0tRt9xKjHWWWSG+cyhXu/2hYmp1
-Dq7XvS1p8NKjD6cAEQEAAbQnWGlhb21pbmcgSmlhIDx4aWFvbWluZy5tLmppYUBn
-bWFpbC5jb20+uQGNBGHvIbQBDADNSRxyLYyzfkdxF55RktDmgSKq9tskfR1QcrQg
-Wvi96fJekLYL/a2hmJnbfUbqaILnkyUmIf7zONlCFv10U81prG9wxfXUTMuabpp+
-eXUFdbCZMc7R9JGXw5iaRWje+jh/GaeB8xY3cPbtfHkXZ7nWkQaq7b8DutJrAqo3
-9NuprRaaujfU9PXj93tunJExqi2w++fjT1aQ36PaplXRZ2qWiRxAkaIUGxjVgLuO
-Y1FWZJjWX2XMypMesUSfUCV9IwlKCc8+55m4jfbtblPQHkbe5zvstxxfHdYQkGng
-p1rNWLHHSCT+Tf4Y4aR2J/E3mp6wSBVxgfguS3u9h1mY9fEfe2vSHWkWmYNm4iDA
-msPn8KTuccbZlB/cKIFS3AET8ZHwHqHuCb4TvUy8febp4yo5ZRniTVQSf2aA/izu
-wmKSmq0bX0hjGRBVdGR2jlD2ND73lkJXU7+3sIwY1ebNVzvl75Y7slmJNHsij24f
-keZtcSmRQ7BL7ZpZ3fYiyi1/MxsAEQEAAYkBvAQYAQoAJhYhBNX0a8C4avXcVt9Y
-8F6XXLAMZD2/BQJh7yG0AhsMBQkDwmcAAAoJEF6XXLAMZD2/kY4MAKDX+NsPosjH
-t95895Z2H8A6JXOEt2F/LqUZ6XOqW1AAeLj+cGMWBDDQYNp/IkizV4iMynmlHlzg
-YivT+52xrUvEzOqMRUrDNTPrbkLUjc/Wm+TA2J2ZGUSjZZUmP1sBTqSIa1NCqWl1
-VRWZcmbckCHz5oyoeXKM0EKGnPwOZP0lf8M7f6QDUJY5DS/5RTIp+6BxHhtRi5uZ
-BN5QLcamhIADwR9fIlfoFfXEwEAQl5Z2YTnyMf/6/5FWVgAS1PPFqvI9H0HiWPx+
-XSfgJV6K10GwRTtdhT12M4teNFsFUNhngsvO8WCZKsxz4CV+Ai8bSMmWpNsYk72C
-bRMoEHMrHuVXKKaKv70eFd+BaGTuLPd8hZgsDuKxU83OpS+LGOYV7Lb3sZNEeqWa
-sWMqjeQC/CzEAE+Qfj0RuucswEZGZ2NWvwouGJcTvLAKaUelMr5IuWTkTZYmXww7
-ffu+Fps7qSMnU+mxOl6TkfoQw/cNRpZdMqwI/7119TnFeK5/AORupA==
-=YL2l
------END PGP PUBLIC KEY BLOCK-----
-
 pub    5F69AD087600B22C
 uid    Eric Bruneton <ebruneton@free.fr>
 
@@ -7588,50 +6232,6 @@ uAngfd6DOtCKYtNKP7xqDu/2bMU23cxGaRj2ToH4RfCClg1B
 =rv9Q
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    67631BC0568801C3
-uid    Ohad Shai <ohadshai@gmail.com>
-
-sub    BB9CC415C9C063CD
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-GMk=
-=zGhj
------END PGP PUBLIC KEY BLOCK-----
-
 pub    689CBE64F4BC997F
 uid    Szczepan Faber <szczepiq@gmail.com>
 
@@ -7668,34 +6268,6 @@ SvFHnyijywCZB1jblPtxo2UqRO/qhPfqSkoVcpWmxgiPUFOr
 =E7F7
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    694DB6F419C8D1FD
-uid    Stewart Bissett <stewart@exparity.com>
-
-sub    11CD01355C5BCF5B
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF2IYVABCADlkNxFiE7AUD+BirOireAA0LceQl5HMo3EThWHzrhKTq5MqTmu
-HBjOdKQjutFRfRQ6xM6VitVc70TuBKCNwsbCQqSScZ44f9pOEu+f1z2CaI2J+ojY
-YuL8MBh3yMz9nvREGfmIzKRu0VZ8kZvxa4GCiWAvUSgEj0DE/HI2zaXssPiPbPB2
-9Y8eud+gzyuUEJv+/fYgNq23mXVPZWVE1OzvYvOakzWtym8YDRmPvZLI+EnN39dB
-Xw21AKYIaie2kvWYmVloyTff/cBDSjqiU97wfx0ufUSAZUg0BytFNpLmlT0mUXER
-LNL4qNNmtLg3xmJgg1uHk6I3bCCGnKsdvztHABEBAAG0JlN0ZXdhcnQgQmlzc2V0
-dCA8c3Rld2FydEBleHBhcml0eS5jb20+uQENBF2IYVABCACk/h5sEYL11eU21vJX
-2HwVxsNlD7XBt/hufX3jKbOQcDIerwj3ztwSkAprdzBXSFRzK73MileJ7fmYFTmb
-025f93lk0I8gxRzo2952GvH6lEmpbzQUz7uqxILBnq/xz9GjA57jZQNp6anx1TZy
-Rf9xvYgZDfDzZ+bRxaNs//UulByD2aJ4nuDxUaVt8bW+p2sPxaua+pvA0qfBjy+y
-DawkmoPtywchmme/SGBaZ0K7Qaehni2e9W+p+discQFsOcYhZyFm/JVPXPyQzr4i
-j6iFnTZ0L9f4LswJjWFTrk1vozuF7jdEu7EDbJfUOBVQE0UbeJSt2913TRmKRNEa
-5akLABEBAAGJAR8EGAECAAkFAl2IYVACGwwACgkQaU229BnI0f0afAf8D65ZIupv
-c89CsoMkaOo5ev/wIB8Dat39y8vv3WOWnYr5u61bSPi32YycanuyYFliLoTWlucM
-77/ZxRwZ7NvwEbbMKyaA0THK7cm/RgC7lFYRn1ELuPUcfg0ogQzOusQgfikWBw35
-1OCwLa5WcLGh6/CwAvPt6OxnbegTgYYiEiZLPdpy7tyF91LyI15jo+H08iKdfdvw
-homGHgWbx+AKptUAAjJ2ICx2sczPR3Oud87MELx2nKX2cc+hAZjrmBMLW9e27gmS
-LLkzT0Yvxv8YlEC/kksBSQfdS4wtMY2lw9Pt3IvcQ/WKxEo+rhavZR3jhuD5aFAf
-IcgqzRrqKKVJhg==
-=YISB
------END PGP PUBLIC KEY BLOCK-----
-
 pub    6A65176A0FB1CD0B
 sub    EA8543C570FAF804
 sub    CA890A5FA09CFD80
@@ -7763,34 +6335,6 @@ fYlYx9aDC9B+YtR+
 =hPt8
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    6CCC36CC6C69FC17
-uid    Gregory Kick <gak@google.com>
-
-sub    C694465FAACEE66F
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBEtrDFABCADLXGAhjPxdh+naC6XU5kficZYEVAURNRa8MTnaMKr+31v2zcAk
-nyqyjihcXGQBCeaNsz2mQkc/MrKdnFNVSwp715JcmcqDJGfR9aIDMUs9PvoNkkqv
-IDtx9Tn73piqbplT2xQxd7HjFvaVuy7oXI68gwcyAGDvQZeiFUodcbAsKrVwFT+R
-94JU6UODFqE/Ihq15Za8Sc8WhWitm8XTQsCsLeh8abGhkvNEmRLi56fh8/Bz8LHv
-8T7r8zkROoQFlUEYaOR2wH5bbipww9+HEg64hrcak2w5smNt0NJUXZ2O1l00u3sF
-Qdu54hM9nZ51xxcqvo+tGft9kIr2AfTrJ28ZABEBAAG0HUdyZWdvcnkgS2ljayA8
-Z2FrQGdvb2dsZS5jb20+uQENBEtrDFABCADqp4wT0RY1+OwMZRfTSYczlBAidkGq
-HszDnCkO0U5w4Tog4v085dDFyaKO5LZHkgDJTyF5WyvwtqqzNoU+tjv+RkkctXTx
-K02ced5jSFk7E9MI0AoMXogLP/uW6nHmoUTuDxEtCye1UfsIglD99wiCvxGtnOjg
-wfezkpctP0WPe41mzNccCrs3hx+R9ECkyZMtQiHYPmr3X3nhwQxKQotwWQOeSYgC
-jLhTWJfkOMn/xaGCNGaihYSMCtDkC2PrpyD5V/qj8gek5DyI/bXCv3Hm6Td1XBbz
-c1ZHKmF3ccFFPRtBsswtwXuN+6Ms5t0iVsNQ0XdhY8BXoi9H1jo8HH75ABEBAAGJ
-AR8EGAECAAkFAktrDFACGwwACgkQbMw2zGxp/BdCxAf/TvMMBA7kY4nbH5WU6KTL
-Nnaykv0zfxAf5XgRbDqrcO9dvnWEjYTPyyVWXIVkvMtESx0DAHeml/PaKCab5pIo
-ybyYQfWLbh8Jhn0+NLnKOwE6m6OrWFv2gNa3zrPRwIy29VFkLxLC/velrIkES8CK
-F+gGinmxupi2IpIiio4uCyUaeR1XV6U8UWl/50j0i2mrutle1yiV2lYBb0k8uMZ9
-nqYeHkVQAispv6bDZF20co9Zmn+GtbHat1jHYg0R0p960SrFBlb+x8ROOb0e1u4a
-jdAZ2uFczoDRKHEQijvaQxIjpl7Cl1LwyQTq703XSVR19/5ufOR2XWtXa7UoBL90
-bA==
-=d1Fs
------END PGP PUBLIC KEY BLOCK-----
-
 pub    6E97418B04B11DCB
 uid    Francois Papon (CODE SIGNING KEY) <fpapon@apache.org>
 
@@ -7959,62 +6503,6 @@ HGDKY5kh24ddfVf4rOVFlNe+/i1IWchDSZZjXJKI4lAlLZYAFXAWkVzysQKbp40=
 =UiVm
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub    79E193516BE7998F
-uid    Filip Jirs?k <filip@jirsak.org>
-
-sub    9F7335D63326E7F9
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFWdcSoBCADK8j+0eVZKUGctZo/VaJ/K2Wppx4jEFgih8xiIWREQ9B3QEugJ
-mJMWZHhrnHB+sjVx5No482ch6sVhYmC+VMyTdzepItZ8beYa0pnNGJnrFT+HcTOS
-g21Ef5e6BRORNho2j9YTvxvjof29XxU4SJFVgffs48jGeJzN1EDmOz4OlZupKGU+
-98o+kMKCiFjcf6Vu03asuml97b2fMOJ09n+UQVlZbBR/Yo407ZLkL2Elx47Fz+82
-iO+M8w2qNnxT4PA/TLgaVzkVHaR/JIDlQQ4DfuyloQI1hBpMB8f60oukVr5dBGuS
-1dPZ1H7td975sLegWoj7CCOFZXrDzYUXwwXPABEBAAG0IEZpbGlwIEppcnPDoWsg
-PGZpbGlwQGppcnNhay5vcmc+uQENBFWdcSoBCACidgjpeAycovmOPWf/eRXEoD7i
-bTOdKgy60rcHYPeB6pPMVaUMhZQQ4QTTRTaYEw9SJtD2itu7khittctHq3RA5EmI
-e50/cvF22MipcJqB3MJ7AnQp+92lH9rrl2xQsu7j6/xHsoEf6UFWzRo3TPx7nf1l
-qgY8JVpaWLJtsfByvLi04y73DIF0+W3SmSpDvL5h6teAc76Fz26tBVj3MdUFF7Un
-a+rMU42K0WUPkGhPfzqnPy0GLRbfYnjqdOBF66TMlYtu1Xnd/FgAVSugDth3LbFg
-pDbJWoGr02tpQ2pt22USElENLdZ5CziK22D6jIy6Yh02NJtSVsNfQ7sQ/XopABEB
-AAGJAR8EGAEIAAkFAlWdcSoCGwwACgkQeeGTUWvnmY8ABQf+K0Uy8ar+uLVqVFeE
-tuHHz8ebAEGSBLzAK7+ggg8RnhaNEHwR8RgAxuaq2ZsYVz+UvZBLG+oByxQYWVWp
-F75TH0uKVDH/zjO8Ppob3R5PN8Wk1QeSAE5LumhFsOCBVoJK4NgqLJNzTuEc2XiJ
-k43dVKI5pd//ivNsjO/SfSzBzSzTQ3UhzAj+k/7vi362Z8fg9SNnBQLpxccwdJ+8
-iYA7aE8wBt3esn9k79lXCM2hyNHl9CP8xI6CXmGJcSS4F2iqgPSVMkxgLA+DA8Y1
-wGvbF5c4rF4iVtgbCH+PcCwrQ6m6pQl9nnC8ANt2Zyj7o+JqefWrRa+F+ZFqJ7sg
-8ba0HQ==
-=DwAM
------END PGP PUBLIC KEY BLOCK-----
-
-pub    7A01B0F236E5430F
-uid    Inderjeet Singh <inder@alumni.stanford.edu>
-
-sub    C3E640F38D845FA2
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
-mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
-4PxvvzC/s7xF8wmxDo4A+mRyoSF0NF/fQTZAr3ri5l0G/vntH7w8AbiiyerpLobW
-/TqQn1tpMh7XfZZ+XqQKANVRECUiCYT4iJKWMqcBpLZW8aa+iYW8yCQ1xfmNXjrx
-jpTqFCiQjvwCw4dDffNe/A1Dbq0wE6mw3YHW3OC1fnLiP+TEM9P9v02bZyem6uW2
-+krrToLTTHSqIGF9wUUF6S3Ikrw2EtJiRQtnABEBAAG0K0luZGVyamVldCBTaW5n
-aCA8aW5kZXJAYWx1bW5pLnN0YW5mb3JkLmVkdT65AQ0EVlSyJAEIAL0+8UoJuUsC
-3jDE60tmrApu/hK+dCbe5UJnR8z93aQ/1AfEX6So6JZzBlxID/HCOvRjJbauL6Lr
-vw2xgSnrnOzRLf1StvBPASfJk1Zdo9LZon6Xofzg34qCLUQLkDyntgXQaYF3Yw/x
-fiqqTC/yav29VTzKnf0Nri8aXGsHOycJ8nTO7I0p4xuRirFu7Bkvd7bK99/tDxtt
-YkvUnG3BUGlr85UX4uODh3EcVcgVQteawYbmsf4F00IBoTAycutCOdbP2RAgP6kg
-FxLcGz4zVqu93QjSjEdTegF1SUXcGpzvDR8T8zRsQbBCZ32A/UJqmx+EIPPFHNkL
-ijDp+f5mkJcAEQEAAYkBHwQYAQIACQUCVlSyJAIbDAAKCRB6AbDyNuVDD2xjCACq
-L670xI/26dWsz66ZyHQ2yJI7DNQxoiU3OZs2bfrRZxLpGP9Q6YWCehb+iucvmFFv
-LZBoGGWzffmVBisD2Yz3mHtF3wLx+2zJXHt1Xz7H6W89M54T3qUhQTTV6pl5f5/J
-CXK1DP9iC0y453ORY5B60byrGIUvBAv+qWXBPn3ECZ/3oEkErb5ZGof+gJjffqvW
-RAN3Li0WBRj0ldXpJoP/YE8naDJ7UdPfzcnh3tnOTfUDvFer1Nh00ilMmf6EYznR
-waN9whc9W/1HwvDeXrijrc6/1U7Hp1r5b1DddTtx6aHxpWrcwYw1yXGcm82fjXnR
-domz6nBt2DF400YubAZR
-=RPJ7
------END PGP PUBLIC KEY BLOCK-----
-
 pub    7A8860944FAD5F62
 uid    Sebastian Bazley (ASF CODE SIGNING KEY) <sebb@apache.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d46bb6a739c..184efb35c76 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -16,94 +16,61 @@
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah"/>
          <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
-         <trusted-key id="042B29E928995B9DB963C636C7CA19B7B620D787" group="com.github.stephenc.jcip"/>
-         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
-            <trusting group="com.sun.xml.bind"/>
-            <trusting group="org.glassfish.jaxb"/>
-         </trusted-key>
+         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5" group="org.glassfish.jaxb"/>
          <trusted-key id="050A37A2E0577F4BAA095B52602EC18D20C4661C">
             <trusting group="com.thoughtworks.xstream"/>
             <trusting group="io.github.x-stream"/>
          </trusted-key>
          <trusted-key id="066C167DC7BA919F2E168DFA2E2A3AECF13B25AC" group="com.github.weisj"/>
          <trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758" group="com.puppycrawl.tools"/>
-         <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
+         <trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0" group="org.apache.logging.log4j"/>
          <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
-         <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31">
-            <trusting group="org.neo4j.bolt"/>
-            <trusting group="org.neo4j.driver"/>
-         </trusted-key>
-         <trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
-         <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock" name="wiremock" version="3.13.1"/>
-         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
-            <trusting group="commons-collections"/>
-            <trusting group="commons-logging"/>
-         </trusted-key>
-         <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache"/>
+         <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="^org[.]neo4j($|([.].*))" regex="true"/>
+         <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock"/>
+         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
-         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2"/>
-         <trusted-key id="120D6F34E627ED3A772EBBFE55C7E5E701832382" group="org.yaml" name="snakeyaml" version="2.2"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
-         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito"/>
          <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
-         <trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064" group="com.google.protobuf"/>
-         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
-         <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain" name="jetty-jakarta-servlet-api" version="5.0.2"/>
+         <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain"/>
          <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
          <trusted-key id="1A6090D3223DCA95BFD25C0E38F47D3E410C47B1" group="com.github.vlsi.gradle"/>
          <trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76" group="org.apache.activemq"/>
          <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="^org[.]gradle($|([.].*))" regex="true"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte"/>
          <trusted-key id="1D04A424F505394DBED15D451D0690E353BE126D" group="net.minidev"/>
-         <trusted-key id="1DEF9646901A1652E5B3E5EA694DB6F419C8D1FD" group="org.exparity"/>
          <trusted-key id="1FCFFE916B6670868FA0EA0391AE1504568EC4DD" group="org.jodd"/>
          <trusted-key id="223D3A74B068ECA354DC385CE126833F9CF64915" group="org.apache.xbean"/>
          <trusted-key id="2655176F748FD83725B4805FF2A01147D830C125" group="org.testcontainers"/>
          <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
-         <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
-         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD">
-            <trusting group="net.java"/>
-            <trusting group="org.sonatype.oss"/>
-         </trusted-key>
          <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier"/>
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
             <trusting group="commons-beanutils"/>
             <trusting group="commons-codec"/>
-            <trusting group="commons-fileupload" name="commons-fileupload" version="1.6.0"/>
+            <trusting group="commons-fileupload"/>
             <trusting group="commons-io"/>
             <trusting group="commons-logging"/>
             <trusting group="commons-net"/>
-            <trusting group="org.apache.bcel"/>
             <trusting group="org.apache.commons"/>
             <trusting group="xalan"/>
             <trusting group="xml-apis"/>
          </trusted-key>
          <trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains"/>
          <trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
-         <trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC" group="net.minidev"/>
-         <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC" group="org.yaml" name="snakeyaml"/>
+         <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC" group="org.yaml"/>
          <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains"/>
-         <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B">
-            <trusting group="org.apache.groovy"/>
-            <trusting group="org.codehaus.groovy"/>
-         </trusted-key>
-         <trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0" group="com.jcraft"/>
-         <trusted-key id="3692C12C7E3D336A452BEB254E066E0459CD109B" group="org.apache.commons"/>
+         <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.apache.groovy"/>
          <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
-         <trusted-key id="3CAC6E7DC43343FF75ECBAC27E6EB7BB6A7712DC" group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.22"/>
-         <trusted-key id="3E1AC64F4E34E290503C90323449EC3AC2EFE8AA" group="dnsjava"/>
+         <trusted-key id="3CAC6E7DC43343FF75ECBAC27E6EB7BB6A7712DC" group="net.sourceforge.nekohtml"/>
          <trusted-key id="3F05DDA9F317301E927136D417A27CE7A60FF5F0" group="io.opentelemetry"/>
          <trusted-key id="3F2A008A91D11A7FAC4A0786F13D3E721D56BD54" group="org.reflections"/>
-         <trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18" group="net.javacrumbs.json-unit"/>
          <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons"/>
          <trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify"/>
          <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath"/>
-         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
          <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.microutils"/>
          <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
@@ -111,196 +78,113 @@
             <trusting group="io.projectreactor"/>
             <trusting group="org.springframework"/>
          </trusted-key>
-         <trusted-key id="4AC55A85D30C3499A3219500B7E2662A7640A051" group="com.formdev"/>
          <trusted-key id="4BDE772C338BA540E1057D0C8EA48D105232855D" group="com.github.jknack"/>
          <trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
             <trusting group="net.sf.saxon"/>
             <trusting group="org.xmlresolver"/>
          </trusted-key>
-         <trusted-key id="4D2DB2916149BAA9D0C92F3731474E5E7C6B7034">
-            <trusting group="org.apache.ftpserver"/>
-            <trusting group="org.apache.mina"/>
-         </trusted-key>
-         <trusted-key id="4E2DDD47E19863BB87211544CD3038FEF07D567E" group="org.apache.commons"/>
+         <trusted-key id="4D2DB2916149BAA9D0C92F3731474E5E7C6B7034" group="^org[.]apache($|([.].*))" regex="true"/>
          <trusted-key id="4F752A9878E937049EF3FBA7D4012DDA1F1F0F82" group="net.sf.jtidy"/>
          <trusted-key id="4F7E32D440EF90A83011A8FC6425559C47CC79C4">
             <trusting group="javax.activation"/>
             <trusting group="javax.mail"/>
-            <trusting group="javax.servlet"/>
             <trusting group="^com[.]sun($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="50A628FFAF58480736B1079FD1031D14464180E0" group="org.reactivestreams"/>
          <trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple"/>
          <trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D" group="org.antlr"/>
          <trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB" group="com.fifesoft"/>
-         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4">
-            <trusting group="org.eclipse.jetty"/>
-            <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
-         </trusted-key>
-         <trusted-key id="59A8E169739301FD48139CA00E325BECB6962A24" group="jakarta.annotation" name="jakarta.annotation-api" version="3.0.0"/>
-         <trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
+         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
+         <trusted-key id="59A8E169739301FD48139CA00E325BECB6962A24" group="jakarta.annotation"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
-         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994">
-            <trusting group="com.fasterxml"/>
-            <trusting group="org.codehaus.woodstox"/>
-         </trusted-key>
+         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994" group="org.codehaus.woodstox"/>
          <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine"/>
          <trusted-key id="636DE9055C4C75C7BD9830771241BC872C5E4EC0" group="commons-lang"/>
          <trusted-key id="66D7CBFF956830FE9F5A723AFE6C7D77A1CE15A6" group="org.gradlex"/>
          <trusted-key id="670BE7D076A0C89F5F07625AE57428DA9E879E7D" group="^com[.]helger($|([.].*))" regex="true"/>
          <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="com.google.guava"/>
-         <trusted-key id="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688" group="org.apache.httpcomponents"/>
          <trusted-key id="6A93161EB1990E8346E7BA2B23738DFD7C40DE43" group="org.xmlunit"/>
          <trusted-key id="6BFAB2E3C6490B421B25C76C9C8C892F91F8E6D1" group="org.apache.rat"/>
          <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces"/>
-         <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC">
-            <trusting group="com.sun.activation"/>
-            <trusting group="jakarta.activation"/>
-         </trusted-key>
          <trusted-key id="6E13156C0EE653F0B984663AB95BBD3FA43C4492" group="org.apache"/>
          <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
          <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop"/>
-         <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
          <trusted-key id="7B121B76A7ED6CE6E60AD51784E913A8E3A748C0" group="org.bouncycastle"/>
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
          <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
-         <trusted-key id="7FAA0F2206DE228F0DB01AD741321490758AAD6F" group="org.codehaus.groovy"/>
-         <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons"/>
          <trusted-key id="817EA1255546D6070A23AA00DB45D3A62A183CE2" group="com.miglayout"/>
          <trusted-key id="82D8419BA697F0E7FB85916EE91287822FDB81B1" group="org.apache.geronimo.genesis"/>
+         <trusted-key id="839323A4780D5BF9A6978970152888E10EF880B3" group="org.unbescape"/>
          <trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache"/>
          <trusted-key id="8756C4F765C9AC3CB6B85D62379CE192D401AB61">
             <trusting group="info.picocli"/>
-            <trusting group="org.springframework"/>
-            <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
+            <trusting group="org.jetbrains.intellij.deps"/>
          </trusted-key>
-         <trusted-key id="8A10792983023D5D14C93B488D7F1BEC1E2ECAE7" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="8A9352189AECCFB4AE1F3BC616FBB6B6E3120829" group="org.jetbrains.lets-plot"/>
          <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx"/>
-         <trusted-key id="8F9A3C6D105B9F57844A721D79E193516BE7998F" group="org.dom4j"/>
          <trusted-key id="9056B710F1E332780DE7AF34CBAEBE39A46C4CA1" group="org.apache.geronimo.genesis.config"/>
          <trusted-key id="98465301A4939C0279F2E847D89D05374952262B" group="org.jetbrains.dokka"/>
-         <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471">
-            <trusting group="com.github.spotbugs"/>
-            <trusting group="com.github.spotbugs.snom"/>
-         </trusted-key>
-         <trusted-key id="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231" group="org.apache"/>
+         <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="^com[.]github[.]spotbugs($|([.].*))" regex="true"/>
          <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom"/>
-         <trusted-key id="A1885C07A3204611FB184EF7098A31F381819057" group="net.sourceforge.nekohtml"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
-         <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8"/>
          <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
          <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern"/>
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
-         <trusted-key id="A9C5DF4D22E99998D9875A5110C01C5A2F6059E7" group="commons-fileupload" name="commons-fileupload" version="1.5"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
-         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
          <trusted-key id="AA782B04ABD9E36CF3096037B59D3D0F9F9C8684" group="org.apache.cxf"/>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
-         <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/>
-         <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt" name="json-schema-validator" version="1.5.7"/>
+         <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt"/>
          <trusted-key id="AF7512AF66FE4004D84DEC8A04C8C902FEFB1A01" group="io.mockk"/>
-         <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C" group="org.codehaus.plexus"/>
          <trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176" group="com.github.weisj"/>
-         <trusted-key id="B18679A17A21DE79FF9DE8B0636D10E7975B6E6F" group="com.ethlo.time" name="itu" version="1.10.3"/>
-         <trusted-key id="B286846C341BB72D1E5F85CAB460E7C4ED66826D" group="com.ethlo.time" name="itu" version="1.7.0"/>
+         <trusted-key id="B18679A17A21DE79FF9DE8B0636D10E7975B6E6F" group="com.ethlo.time"/>
          <trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923" group="jcharts"/>
          <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
-            <trusting group="commons-beanutils"/>
             <trusting group="commons-cli"/>
-            <trusting group="commons-fileupload"/>
-            <trusting group="org.apache.commons"/>
-         </trusted-key>
-         <trusted-key id="B7574789F5018690043E6DD9C212662E12F3E1DD" group="org.apache.geronimo.genesis"/>
-         <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc"/>
-         <trusted-key id="B920D295BF0E61CB4CF0896C33CD6733AF5EC452">
-            <trusting group="commons-logging"/>
             <trusting group="org.apache.commons"/>
          </trusted-key>
-         <trusted-key id="BA926F64CA647B6D853A38672E2010F8A7FF4A41" group="org.apache"/>
-         <trusted-key id="BAE5C184E3B70CB15617700598FE03A974CE0A0B" group="org.jetbrains.kotlin"/>
-         <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec"/>
-         <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE">
-            <trusting group="com.google.guava"/>
-            <trusting group="com.google.j2objc"/>
-         </trusted-key>
-         <trusted-key id="C3259D20DAEC4ACE6D57CC83340B090F727518D8" group="com.google.j2objc" name="j2objc-annotations" version="3.1"/>
+         <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="^com[.]google($|([.].*))" regex="true"/>
+         <trusted-key id="C3259D20DAEC4ACE6D57CC83340B090F727518D8" group="com.google.j2objc"/>
          <trusted-key id="C62C0CE2E5C346B2D9BF2D8BB2CA0DFE9ED21C6E" group="io.burt"/>
-         <trusted-key id="C668130C58722C9DC1C0FC633F1EB974E7AB9B37" group="biz.aQute.bnd" name="biz.aQute.bnd.annotation" version="7.1.0"/>
+         <trusted-key id="C668130C58722C9DC1C0FC633F1EB974E7AB9B37" group="biz.aQute.bnd"/>
          <trusted-key id="C758F9CC982AC877E7B295DD6E97418B04B11DCB" group="org.apache.xbean"/>
          <trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7">
             <trusting group="com.google.code.gson"/>
             <trusting group="^com[.]google[.]auto($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="CA491704D613780D2BEE00F2C6FC46EB51CF569C" group="jaxen"/>
-         <trusted-key id="CE8075A251547BEE249BC151A2115AE15F6B8B72">
-            <trusting group="org.apache.commons"/>
-            <trusting group="org.xmlunit"/>
-         </trusted-key>
+         <trusted-key id="CE8075A251547BEE249BC151A2115AE15F6B8B72" group="org.apache.commons"/>
          <trusted-key id="CFBE6E7934FB211224EE1C2B0C0A9468268C79AE" group="org.jetbrains"/>
-         <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
-         <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
-            <trusting group="com.github.autostyle"/>
-            <trusting group="^com[.]github[.]vlsi($|([.].*))" regex="true"/>
-         </trusted-key>
-         <trusted-key id="D196A5E3E70732EEB2E5007F1861C322C56014B2">
-            <trusting group="commons-beanutils"/>
-            <trusting group="commons-collections"/>
-            <trusting group="commons-lang"/>
-            <trusting group="org.apache.commons"/>
-         </trusted-key>
+         <trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E" group="com.github.autostyle"/>
+         <trusted-key id="D196A5E3E70732EEB2E5007F1861C322C56014B2" group="commons-lang"/>
          <trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
-         <trusted-key id="D5F46BC0B86AF5DC56DF58F05E975CB00C643DBF" group="com.google.inject"/>
-         <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="^org[.]apache($|([.].*))" regex="true"/>
+         <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="org.apache.commons"/>
          <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb"/>
-         <trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C" group="org.apache"/>
          <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell"/>
-         <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A">
-            <trusting group="com.github.tomakehurst"/>
-            <trusting group="org.wiremock" name="wiremock" version="3.0.1"/>
-         </trusted-key>
-         <trusted-key id="E06A36F67D8C1BD13F1F278D0CA7139CBC7026F9" group="dnsjava" name="dnsjava" version="3.6.3"/>
+         <trusted-key id="E06A36F67D8C1BD13F1F278D0CA7139CBC7026F9" group="dnsjava"/>
          <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections"/>
-         <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D" group="org.springframework"/>
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
-         <trusted-key id="E52567D2589415BD74EB4C2867631BC0568801C3" group="io.github.microutils"/>
          <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
          <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist"/>
-         <trusted-key id="E62231331BCA7E1F292C9B88C1B12A5D99C0729D" group="org.jetbrains"/>
-         <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws"/>
-         <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="^com[.]google($|([.].*))" regex="true"/>
+         <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="com.google.errorprone"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
-         <trusted-key id="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7" group="net.java"/>
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
          <trusted-key id="E9AF5293C334C7C0B583227D2F45F85CDF082E68" group="org.mozilla"/>
          <trusted-key id="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94" group="org.apache.geronimo.specs"/>
          <trusted-key id="EAFC1F3B2FCED6AFD046C7D5734AEF3D43509290" group="org.osgi"/>
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
-         <trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17" group="com.google"/>
-         <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320">
-            <trusting group="com.google.errorprone"/>
-            <trusting group="com.google.googlejavaformat"/>
-         </trusted-key>
+         <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
-         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
-            <trusting group="org.apache"/>
-            <trusting group="org.codehaus.mojo"/>
-            <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
-         </trusted-key>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
          <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB" group="org.infinispan"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
-            <trusting group="org.apache"/>
             <trusting group="org.codehaus.plexus"/>
-            <trusting group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
+            <trusting group="^org[.]apache($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
          <trusted-key id="FEABFB0DBD7A754822D35DD9BE6397E958AB7594" group="org.jetbrains.lets-plot"/>
          <trusted-key id="FEB9209F2F2F3F4664841E55AC107B386692DADD">
             <trusting group="com.amazonaws"/>
@@ -317,14 +201,6 @@
       </trusted-keys>
    </configuration>
    <components>
-      <component group="aopalliance" name="aopalliance" version="1.0">
-         <artifact name="aopalliance-1.0.jar">
-            <sha256 value="0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="aopalliance-1.0.pom">
-            <sha256 value="26e82330157d6b844b67a8064945e206581e772977183e3e31fec6058aa9a59b" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="bsf" name="bsf" version="2.4.0">
          <artifact name="bsf-2.4.0.jar">
             <sha256 value="f873773deb91c1a1c12150f6cdb13b8a2e1b496a75ac903c4bbfa103b363a7c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -333,44 +209,9 @@
             <sha256 value="239f3397b79f91a866e6067cf04974146d7e864feb2aa34a9943831c9f6daeab" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.fasterxml" name="oss-parent" version="56">
-         <artifact name="oss-parent-56.pom">
-            <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml" name="oss-parent" version="68">
-         <artifact name="oss-parent-68.pom">
-            <sha256 value="25eafd96dae242b6b5a7108f55b2c14015b828daa5abe234289fd6e774a1ce57" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml" name="oss-parent" version="70">
-         <artifact name="oss-parent-70.pom">
-            <sha256 value="26ca8ed6f82c9d2ed7cd32298105bb65c0f9d899db61757a09741586fa93a639" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.19.1">
-         <artifact name="jackson-bom-2.19.1.pom">
-            <sha256 value="ba6d68eeab3a1cc13a77a8ade2197ff9a32aa1cffeac72847d49badd82e1b9ce" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
-         <artifact name="jackson-parent-2.16.pom">
-            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.19.2">
-         <artifact name="jackson-parent-2.19.2.pom">
-            <sha256 value="639a2b63dd05da4e381081303985caadfbb7ad9f85b1d2320638f6b11f208365" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.20">
-         <artifact name="jackson-parent-2.20.pom">
-            <sha256 value="b43b7f5c62e86b164fae70ae17d6911c5db60799af01057360afda82e4845be5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.formdev" name="svgSalamander" version="1.1.2.4">
-         <artifact name="svgSalamander-1.1.2.4.pom">
-            <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
+      <component group="com.fasterxml" name="oss-parent" version="38">
+         <artifact name="oss-parent-38.pom">
+            <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
          </artifact>
       </component>
       <component group="com.github.node-gradle" name="gradle-node-plugin" version="7.1.0">
@@ -391,49 +232,29 @@
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="1.90">
-         <artifact name="com.github.vlsi.crlf.gradle.plugin-1.90.pom">
-            <sha256 value="f54318e1908eb9a6371bc8e5c397f65a23537bf007deeb66d5b06b72565778c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="2.0.0">
          <artifact name="com.github.vlsi.crlf.gradle.plugin-2.0.0.pom">
             <sha256 value="fdd676d789d97e249bb312568659343e40bb68ab2cc7bb355e5f925a71a2e67d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="1.90">
-         <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-1.90.pom">
-            <sha256 value="ba427413f70704d470c3e5d477a1c447b392d54b82abb2bcedf06cff89745759" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="2.0.0">
          <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-2.0.0.pom">
             <sha256 value="d251352a0a25549bd0bbb14526ea68acbda303c9b91295d0618adac1339e162f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="1.90">
-         <artifact name="com.github.vlsi.ide.gradle.plugin-1.90.pom">
-            <sha256 value="e27deb8959eb60b3dcc88083fe0a96af47bc27560d221c83da1867e2d2f6a72f" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="2.0.0">
          <artifact name="com.github.vlsi.ide.gradle.plugin-2.0.0.pom">
             <sha256 value="87b8dabfd24a97e80ac73a79be56df6b5d8270c254f558145c01c8458d088463" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="1.90">
-         <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-1.90.pom">
-            <sha256 value="37656ed0e5626bf87a0b5f59dab729becbf8dbe5dbf77a533145acf567163add" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="2.0.0">
          <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-2.0.0.pom">
             <sha256 value="f3f33cd3e4c01914c9f353dd2649cc9710173b7ca7cabcd5718468c413c9626e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.0.2">
-         <artifact name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin-2.0.2.pom">
-            <sha256 value="f6111fd512eabacff117c7a46d730033c6f7eb78cc05ce73fe97cb195cf330f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1">
+         <artifact name="concurrent-trees-2.6.1.pom">
+            <pgp value="A9789342F598AD5B1175EF357EB97D110DFADD60"/>
          </artifact>
       </component>
       <component group="com.gradle.common-custom-user-data-gradle-plugin" name="com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin" version="2.4.0">
@@ -441,19 +262,29 @@
             <sha256 value="db08ceb605f60635df767981e8a407a016d70e332619a6222b948ffce45ae99c" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.gradle.develocity" name="com.gradle.develocity.gradle.plugin" version="3.18.2">
-         <artifact name="com.gradle.develocity.gradle.plugin-3.18.2.pom">
-            <sha256 value="0095b536e4c60a1325946ccdb1a9fbbb97249df276d89bb0eb1ba698a8a64f3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.gradle.develocity" name="com.gradle.develocity.gradle.plugin" version="4.2.2">
          <artifact name="com.gradle.develocity.gradle.plugin-4.2.2.pom">
             <sha256 value="85a8106475e7ca345c4e604a659345794516056c7f974ce9f8c72011a13f11d5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="commons-logging" name="commons-logging" version="1.0.4">
-         <artifact name="commons-logging-1.0.4.pom">
-            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.sun.xml.bind" name="jaxb-bom-ext" version="4.0.6">
+         <artifact name="jaxb-bom-ext-4.0.6.pom">
+            <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
+         </artifact>
+      </component>
+      <component group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3">
+         <artifact name="jaxws-ri-bom-4.0.3.pom">
+            <pgp value="E725C3877939E8FFEA7E3C44B6D3FC494798E478"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.1.1">
+         <artifact name="commons-logging-1.1.1.pom">
+            <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.2">
+         <artifact name="commons-logging-1.2.pom">
+            <pgp value="0CC641C3A62453AB390066C4A41F13C999945293"/>
          </artifact>
       </component>
       <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
@@ -475,46 +306,11 @@
             <sha256 value="df4e17c848ebc8dd4d7b5df3a24168fd259b123733a3e6472e42d8a1cc188a01" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="de.thetaphi" name="forbiddenapis" version="3.6">
-         <artifact name="forbiddenapis-3.6.jar">
-            <ignored-keys>
-               <ignored-key id="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="8c0606b1444f1d456abce555d2de5cb3f374c92ca9658007ab5f06e33eac4351" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
-         </artifact>
-         <artifact name="forbiddenapis-3.6.pom">
-            <ignored-keys>
-               <ignored-key id="0186F8B24C5BC02C94A0E0E486F75E83E1EE085F" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="6231f560501df4c42863ef2e81134cccf04c3d3d8b9631a55f85041913c4a81b" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
-         </artifact>
-      </component>
       <component group="de.thetaphi.forbiddenapis" name="de.thetaphi.forbiddenapis.gradle.plugin" version="3.10">
          <artifact name="de.thetaphi.forbiddenapis.gradle.plugin-3.10.pom">
             <sha256 value="872532f826dc5ba71082362b2e71e634e5f7562573c21ca96329179787b3460b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="de.thetaphi.forbiddenapis" name="de.thetaphi.forbiddenapis.gradle.plugin" version="3.6">
-         <artifact name="de.thetaphi.forbiddenapis.gradle.plugin-3.6.pom">
-            <sha256 value="563093977165b0c40643a0f7dbde12d473569468d97911acaf75eaba82dc86f3" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.10">
-         <artifact name="gradle-idea-ext-1.1.10.jar">
-            <sha256 value="fea76e0c13f9e96c2516d0176e649be44d979f4ec80319f3c8628a6e7947512d" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="gradle-idea-ext-1.1.10.pom">
-            <sha256 value="97bd2047b9b581d3a1baddcc8bc332c0a527142175f3e19d187d704abeb5b2bb" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.7">
-         <artifact name="gradle-idea-ext-1.1.7.jar">
-            <sha256 value="f7a9e1519b8d9c597e5a2ce0d67fdfeef4063fc227d14efaa12c200f37d14390" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="gradle-idea-ext-1.1.7.pom">
-            <sha256 value="f8f16eb8be341a1d29e15b715fb34d920ef5f9a6f15555c48c2c7f9825a5f83f" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.3">
          <artifact name="gradle-idea-ext-1.3.jar">
             <sha256 value="a50ba79776c223679c878af380f7b7efac5d8b6e0865c8d3d6207450e0135a30" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -542,26 +338,6 @@
             <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-bom" version="4.1.104.Final">
-         <artifact name="netty-bom-4.1.104.Final.pom">
-            <sha256 value="5a65e06a159d20d3b4800624a570c646dbee710b2b539b3449a268558c289e9c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.netty" name="netty-bom" version="4.2.6.Final">
-         <artifact name="netty-bom-4.2.6.Final.pom">
-            <sha256 value="f61dde0da283b983ba0dbb42c2f501f81fec2da7945f2933128f2a6e410afc81" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
-         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
-            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
-         <artifact name="jakartaee-api-parent-9.1.0.pom">
-            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -583,9 +359,9 @@
             <sha256 value="d516226b3b114e4b32d42544d1d2796c732c5465d5dae7cc846be6b23bed8d1d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="3.1.0">
-         <artifact name="net.ltgt.errorprone.gradle.plugin-3.1.0.pom">
-            <sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="net.java" name="jvnet-parent" version="1">
+         <artifact name="jvnet-parent-1.pom">
+            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
          </artifact>
       </component>
       <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
@@ -593,14 +369,6 @@
             <sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
-         <artifact name="gradle-errorprone-plugin-3.1.0.jar">
-            <sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="gradle-errorprone-plugin-3.1.0.module">
-            <sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
          <artifact name="gradle-errorprone-plugin-4.3.0.jar">
             <sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -625,14 +393,6 @@
             <sha256 value="e119846ac53eca6bcff05cc4fd5151617663895c7e7ca82bd8ce91f9f9e8ea83" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="net.sourceforge.nekohtml" name="nekohtml" version="1.9.22">
-         <artifact name="nekohtml-1.9.22.jar">
-            <sha256 value="452978e8b6667c7b8357fd3f0a2f2f405e4560a7148143a69181735da5d19045" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="nekohtml-1.9.22.pom">
-            <sha256 value="2871c7442b83dd0eec56ebd75461e671bec32dcfe4161eb359266e6794ca5ab5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
       <component group="org.ajoberstar.grgit" name="grgit-gradle" version="4.1.1">
          <artifact name="grgit-gradle-4.1.1.pom">
             <ignored-keys>
@@ -641,42 +401,64 @@
             <sha256 value="62a7b33ccc3fc9e4327f1babd32ff3769cd47fc117c60593400cb60acac0d06a" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
          </artifact>
       </component>
-      <component group="org.apache" name="apache" version="23">
-         <artifact name="apache-23.pom">
-            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="13">
+         <artifact name="apache-13.pom">
+            <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
          </artifact>
       </component>
-      <component group="org.apache" name="apache" version="31">
-         <artifact name="apache-31.pom">
-            <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="16">
+         <artifact name="apache-16.pom">
+            <pgp value="0CDE80149711EB46DFF17AE421A24B3F8B0F594A"/>
          </artifact>
       </component>
-      <component group="org.apache" name="apache" version="33">
-         <artifact name="apache-33.pom">
-            <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="17">
+         <artifact name="apache-17.pom">
+            <pgp value="AE9E53FC28FF2AB1012273D0BF1518E0160788A2"/>
          </artifact>
       </component>
-      <component group="org.apache.commons" name="commons-parent" version="52">
-         <artifact name="commons-parent-52.pom">
-            <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="18">
+         <artifact name="apache-18.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
          </artifact>
       </component>
-      <component group="org.apache.commons" name="commons-parent" version="79">
-         <artifact name="commons-parent-79.pom">
-            <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="6">
+         <artifact name="apache-6.pom">
+            <pgp value="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231"/>
          </artifact>
       </component>
-      <component group="org.apache.commons" name="commons-parent" version="81">
-         <artifact name="commons-parent-81.pom">
-            <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
+      <component group="org.apache" name="apache" version="7">
+         <artifact name="apache-7.pom">
+            <pgp value="BA926F64CA647B6D853A38672E2010F8A7FF4A41"/>
          </artifact>
       </component>
-      <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.37">
-         <artifact name="checkerframework-gradle-plugin-0.6.37.jar">
-            <sha256 value="f6c3f7c2d2fd68cead661b5b3a4ee3b27a337165c0f9634876d42aeb9e67bf32" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="org.apache" name="apache" version="9">
+         <artifact name="apache-9.pom">
+            <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
          </artifact>
-         <artifact name="checkerframework-gradle-plugin-0.6.37.module">
-            <sha256 value="daa3999ad4a9c4ceb9eb8c928602ba755ad8fbe7836c5072fb416f20f8f693ae" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="39">
+         <artifact name="commons-parent-39.pom">
+            <pgp value="808D78B17A5A2D7C3668E31FBFFC9B54721244AD"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="42">
+         <artifact name="commons-parent-42.pom">
+            <pgp value="CE8075A251547BEE249BC151A2115AE15F6B8B72"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="5">
+         <artifact name="commons-parent-5.pom">
+            <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="9">
+         <artifact name="commons-parent-9.pom">
+            <pgp value="D196A5E3E70732EEB2E5007F1861C322C56014B2"/>
+         </artifact>
+      </component>
+      <component group="org.apache.geronimo.genesis" name="genesis" version="1.2">
+         <artifact name="genesis-1.2.pom">
+            <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
          </artifact>
       </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.60">
@@ -687,11 +469,6 @@
             <sha256 value="6981196fd608bc0b32a41cd6658f9b6f9020b3c2e6feb9904ee79d91500690f6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.37">
-         <artifact name="org.checkerframework.gradle.plugin-0.6.37.pom">
-            <sha256 value="5d14cf67298d07b980d44e4dbdf42cd4fb0aa99d9dc326db8d824b83216561ed" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.60">
          <artifact name="org.checkerframework.gradle.plugin-0.6.60.pom">
             <sha256 value="09ccbaa275aa7e7b31fb3dcede8c13653aaf481d0718f990b9a752c86eddcd18" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -705,19 +482,9 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
-         <artifact name="project-1.0.7.pom">
-            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.eclipse.ee4j" name="project" version="1.0.9">
          <artifact name="project-1.0.9.pom">
-            <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
-         <artifact name="jetty-bom-9.4.53.v20231009.pom">
-            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
+            <pgp value="AA70C7C433D501636392EC02153E7A3C2B4E5118"/>
          </artifact>
       </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
@@ -725,11 +492,6 @@
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.glassfish.jaxb" name="jaxb-bom" version="4.0.5">
-         <artifact name="jaxb-bom-4.0.5.pom">
-            <sha256 value="ec97ec42d937d3c89519797e44246f80de0850819ac7a7ae675c4497b7075c39" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-5.2.0.pom">
             <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -755,39 +517,19 @@
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
-         <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
-            <sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.1.0">
          <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.1.0.pom">
             <sha256 value="de9bdcea93102c43427c70128943625131530cbb0e38ec6bbbad9bda6141a2c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.10">
-         <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.10.pom">
-            <sha256 value="3fc9468d71b90b3f98afa8a2978cbf9065ae3606a0a153a2e5acd7afec92c512" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
-         <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.7.pom">
-            <sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.3">
          <artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.3.pom">
             <sha256 value="fc5e8d94d6bf5a22043c76354a3d5ca756501e50d5af42ad3d9d73f65dbafa37" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.21">
-         <artifact name="kotlin-compiler-runner-2.2.21.pom">
-            <sha256 value="1f103d8bde08ddd614bd983abdfcb7949139c606ac60cd8a68941fd0fb1ee124" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.20">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.20.pom">
-            <sha256 value="4eb87defec3e7c2fece0e1a1ecdf22a70cdd61898262555b1d92e7c7b3f3b95d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20200330">
+         <artifact name="trove4j-1.0.20200330.pom">
+            <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.21">
@@ -795,46 +537,11 @@
             <sha256 value="5c3bde6e7f1dc0fa44e14c85a1ba6a03aaff86cabb19700830f4d2dd1de13dc4" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.20">
-         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.20.pom">
-            <sha256 value="a7555d7d4625a985c9739a7f73a2b07f3bc5a7ba2c935e9b5d68e843999ae354" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.2.21">
          <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.2.21.pom">
             <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.junit" name="junit-bom" version="5.10.1">
-         <artifact name="junit-bom-5.10.1.pom">
-            <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.10.2">
-         <artifact name="junit-bom-5.10.2.pom">
-            <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.11.4">
-         <artifact name="junit-bom-5.11.4.pom">
-            <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.13.4">
-         <artifact name="junit-bom-5.13.4.pom">
-            <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="6.0.0">
-         <artifact name="junit-bom-6.0.0.pom">
-            <sha256 value="b3d9832f5c11bbb6b0e62851b93aa29d278c39fb1a751eb771b46d004a216219" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.mockito" name="mockito-bom" version="4.11.0">
-         <artifact name="mockito-bom-4.11.0.pom">
-            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.nodejs" name="node" version="25.1.0">
          <artifact name="node-25.1.0-darwin-arm64.tar.gz">
             <sha256 value="811dcf54580d9eef0abfed9f65457545d2aac8e24853b6e638194fcba0257168" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
@@ -858,6 +565,11 @@
             <sha256 value="abab8d2fff33dad361e51b51dfadd1f8aaef8677f88d21e3cccaf7b6e6f46339" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="5.20.0">
+         <artifact name="mockito-bom-5.20.0.pom">
+            <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -871,19 +583,9 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.ow2" name="ow2" version="1.5">
-         <artifact name="ow2-1.5.pom">
-            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="org.ow2" name="ow2" version="1.5.1">
          <artifact name="ow2-1.5.1.pom">
-            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.slf4j" name="slf4j-bom" version="2.0.17">
-         <artifact name="slf4j-bom-2.0.17.pom">
-            <sha256 value="f78d27b642b4b886eb839fc102b5cd9fe7f30f37599ffe68185be4e1609031e9" origin="Generated by Gradle"/>
+            <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
          </artifact>
       </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
@@ -899,9 +601,9 @@
             <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="6">
-         <artifact name="oss-parent-6.pom">
-            <sha256 value="b4306d13e8f5392458a1b30866f1cff161b3d2e6999a88d059eea3932c8a8499" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="org.sonatype.oss" name="oss-parent" version="5">
+         <artifact name="oss-parent-5.pom">
+            <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>
          </artifact>
       </component>
       <component group="org.sonatype.oss" name="oss-parent" version="7">
@@ -911,12 +613,7 @@
       </component>
       <component group="org.sonatype.oss" name="oss-parent" version="9">
          <artifact name="oss-parent-9.pom">
-            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.testcontainers" name="testcontainers-bom" version="1.21.3">
-         <artifact name="testcontainers-bom-1.21.3.pom">
-            <sha256 value="2ce717226d1d67b5b1df9707ed98022a366ac892d9e496c5f0173f1ab78a0965" origin="Generated by Gradle"/>
+            <pgp value="44FBDBBC1A00FE414F1C1873586654072EAD6677"/>
          </artifact>
       </component>
       <component group="oro" name="oro" version="2.0.8">
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 96315b8a9e3..80c49aa0318 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -87,11 +87,6 @@ commons-pool2-2.7.0
 http://commons.apache.org/proper/commons-pool/download_pool.cgi
 - BackendListener
 
-commons-text-1.8
------------------
-https://commons.apache.org/proper/commons-text/
-- Random Strings
-
 darcula
 -----------------
 https://github.com/bulenkov/Darcula/
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f26a2b6d191..9a8e1e683ae 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -61,8 +61,12 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.19.0")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.20.0")
-        api("commons-lang:commons-lang:2.6")
+        api("commons-io:commons-io:2.20.0") {
+            because("User might still rely on commons-io")
+        }
+        api("commons-lang:commons-lang:2.6") {
+            because("User might still rely on commons-lang")
+        }
         api("commons-logging:commons-logging:1.3.5")
         api("commons-net:commons-net:3.12.0")
         api("dnsjava:dnsjava:3.6.3")
@@ -98,7 +102,9 @@ dependencies {
         }
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.commons:commons-pool2:2.12.1")
-        api("org.apache.commons:commons-text:1.14.0")
+        api("org.apache.commons:commons-text:1.14.0") {
+            because("User might still rely on commons-text")
+        }
         api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.5.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
@@ -134,6 +140,7 @@ dependencies {
         api("org.neo4j.driver:neo4j-java-driver:6.0.1")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
+        api("org.unbescape:unbescape:1.1.6.RELEASE")
         api("oro:oro:2.0.8")
         api("xalan:serializer:2.7.3")
         api("xalan:xalan:2.7.3")
diff --git a/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java b/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
index 12b8928f357..b214886d54b 100644
--- a/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
+++ b/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java
@@ -24,7 +24,7 @@
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 // N.B. Do not call any JMeter methods; the jar is standalone
 
@@ -67,7 +67,7 @@ public static void main(String [] args) throws Exception{
             sendLine("};", os);
 
             int b;
-            try (BufferedReader fis = Files.newBufferedReader(Paths.get(file))) {
+            try (BufferedReader fis = Files.newBufferedReader(Path.of(file))) {
                 while ((b = fis.read()) != -1) {
                     os.write(b);
                 }
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index e33df038a1b..5653af3c135 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -68,12 +68,7 @@ dependencies {
     implementation("org.jsoup:jsoup")
     implementation("net.sf.jtidy:jtidy")
     implementation("org.apache.commons:commons-math3")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
-    implementation("org.apache.commons:commons-text") {
-        because("StringEscapeUtils")
-    }
+    implementation("org.unbescape:unbescape")
     implementation("com.miglayout:miglayout-swing")
     // we use bcmail for compilation only, and bcmail is not shipped in the release
     compileOnly("org.bouncycastle:bcmail-jdk18on")
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index 0c17f023a5e..9045ba51027 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -26,7 +26,7 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 
 import org.apache.jmeter.samplers.SampleResult;
@@ -191,7 +191,7 @@ private void writeOutput(String inOutput) {
 
         // check if filename defined
         if (StringUtilities.isNotBlank(filename)) {
-            try (Writer writer = Files.newBufferedWriter(Paths.get(filename))) {
+            try (Writer writer = Files.newBufferedWriter(Path.of(filename))) {
                 // write to file
                 writer.write(inOutput);
                 log.debug("writeOutput() -> output successfully written to file: {}", filename);
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index ea3a017dd84..f3ccc3d90f7 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -24,7 +24,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -37,6 +36,7 @@
 import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
 
 /**
  * Extracts Strings from a text response between a start and end boundary.
@@ -229,7 +229,7 @@ private String chosenInput(SampleResult result) {
             return result.getResponseMessage(); // Bug 43451
         }
         if (useUnescapedBody()) {
-            return StringEscapeUtils.unescapeHtml4(result.getResponseDataAsString());
+            return HtmlEscape.unescapeHtml(result.getResponseDataAsString());
         }
         if (useBodyAsDocument()) {
             return Document.getTextFromDocument(result.getResponseData());
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
index 1199df9bb6b..283f7d92b25 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java
@@ -24,7 +24,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.processor.PostProcessor;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -42,6 +41,7 @@
 import org.apache.oro.text.regex.Perl5Matcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
 
 public class RegexExtractor extends AbstractScopedTestElement implements PostProcessor, Serializable {
 
@@ -240,7 +240,7 @@ private String getInputString(SampleResult result) {
                 : useRequestHeaders() ? result.getRequestHeaders()
                 : useCode() ? result.getResponseCode() // Bug 43451
                 : useMessage() ? result.getResponseMessage() // Bug 43451
-                : useUnescapedBody() ? StringEscapeUtils.unescapeHtml4(result.getResponseDataAsString())
+                : useUnescapedBody() ? HtmlEscape.unescapeHtml(result.getResponseDataAsString())
                 : useBodyAsDocument() ? Document.getTextFromDocument(result.getResponseData())
                 : result.getResponseDataAsString() // Bug 36898
                 ;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 44aa4a038a7..eb1c22bb7b4 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -24,10 +24,9 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
+import java.io.Writer;
+import java.nio.file.Files;
 import java.text.DecimalFormat;
 import java.text.Format;
 import java.text.MessageFormat;
@@ -731,8 +730,7 @@ public void actionPerformed(ActionEvent event) {
             if (chooser == null) {
                 return;
             }
-            try (FileOutputStream fo = new FileOutputStream(chooser.getSelectedFile());
-                    OutputStreamWriter writer = new OutputStreamWriter(fo, Charset.forName("UTF-8"))){
+            try (Writer writer = Files.newBufferedWriter(chooser.getSelectedFile().toPath())){
                 CSVSaveService.saveCSVStats(getAllTableData(model, getFormatters()),
                         writer,
                         saveHeaders.isSelected() ? getLabels(COLUMNS, getColumnsMsgParameters()) : null);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
index 3cd55edd3e4..5be9bf60a72 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
@@ -42,6 +41,7 @@
 import org.apache.http.util.EntityUtils;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -242,7 +242,6 @@ private static String getBody(final HttpResponse response) {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void destroy() {
         // Give some time to send last metrics before shutting down
         log.info("Destroying ");
@@ -254,7 +253,7 @@ public void destroy() {
         if (httpRequest != null) {
             httpRequest.abort();
         }
-        IOUtils.closeQuietly(httpClient, null);
+        JOrphanUtils.closeQuietly(httpClient);
     }
 
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
index cefbe7a2bc0..1bd1ce50792 100644
--- a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
+++ b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
@@ -28,7 +28,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Map;
 
@@ -64,7 +64,7 @@ private Map<String, Template> readTemplateFromFile() {
 
     private File getFileFromResource(String resourceName) {
         try {
-            return Paths.get(this.getClass().getResource(resourceName).toURI()).toFile();
+            return Path.of(this.getClass().getResource(resourceName).toURI()).toFile();
         } catch (URISyntaxException e) {
             throw new RuntimeException("Can't read resource " + resourceName, e);
         }
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index e9625195e7e..ca9597a8645 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -99,7 +99,7 @@ dependencies {
     implementation("org.apache.commons:commons-math3") {
         because("Mean, DescriptiveStatistics")
     }
-    implementation("org.apache.commons:commons-text")
+    implementation("org.unbescape:unbescape")
     implementation("org.apache.tika:tika-core") {
         isTransitive = false
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index c4a7a8c1f7d..763b67e9b0c 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -58,8 +58,6 @@
 import org.apache.commons.cli.avalon.CLOption;
 import org.apache.commons.cli.avalon.CLOptionDescriptor;
 import org.apache.commons.cli.avalon.CLUtil;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.control.ReplaceableController;
 import org.apache.jmeter.engine.ClientJMeterEngine;
 import org.apache.jmeter.engine.DistributedRunner;
@@ -104,6 +102,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import kotlin.io.FilesKt;
+
 /**
  * Main JMeter class; processes options and starts the GUI, non-GUI or server as appropriate.
  */
@@ -551,8 +551,8 @@ private static void extractAndSetReportOutputFolder(CLArgsParser parser, boolean
      */
     private static void displayAsciiArt() {
         try (InputStream inputStream = JMeter.class.getResourceAsStream("jmeter_as_ascii_art.txt")) {
-            if(inputStream != null) {
-                String text = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+            if (inputStream != null) {
+                String text = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
                 System.out.println(text);//NOSONAR
             }
         } catch (Exception e1) { //NOSONAR No logging here
@@ -645,7 +645,7 @@ static void runInitScripts() {
             log.info("Running JSR-223 init script in file: {}", jsr223Init);
             File file = new File(jsr223Init);
             if(file.exists() && file.canRead()) {
-                String ext = FilenameUtils.getExtension(jsr223Init);
+                String ext = FilesKt.getExtension(file);
                 String extension = StringUtilities.isBlank(ext) ? "Groovy" : ext;
                 try (Reader reader = Files.newBufferedReader(file.toPath())) {
                     ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index f31e20198df..225a1d297af 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -21,24 +21,26 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.comparator.LastModifiedFileComparator;
-import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.jmeter.control.gui.TestFragmentControllerGui;
 import org.apache.jmeter.engine.TreeCloner;
 import org.apache.jmeter.exceptions.IllegalUserActionException;
@@ -58,6 +60,9 @@
 
 import com.google.auto.service.AutoService;
 
+import kotlin.io.FilesKt;
+import kotlin.io.path.PathsKt;
+
 /**
  * Save the current test plan; implements:
  * Save
@@ -68,8 +73,6 @@
 public class Save extends AbstractAction {
     private static final Logger log = LoggerFactory.getLogger(Save.class);
 
-    private static final List<File> EMPTY_FILE_LIST = Collections.emptyList();
-
     private static final String JMX_BACKUP_ON_SAVE = "jmeter.gui.action.save.backup_on_save"; // $NON-NLS-1$
 
     private static final String JMX_BACKUP_DIRECTORY = "jmeter.gui.action.save.backup_directory"; // $NON-NLS-1$
@@ -207,9 +210,10 @@ private static String computeFileName() {
         if (chooser == null) {
             return null;
         }
-        String updateFile = chooser.getSelectedFile().getAbsolutePath();
+        File selectedFile = chooser.getSelectedFile();
+        String updateFile = selectedFile.getAbsolutePath();
         // Make sure the file ends with proper extension
-        if(FilenameUtils.getExtension(updateFile).isEmpty()) {
+        if (FilesKt.getExtension(selectedFile).isEmpty()) {
             updateFile = updateFile + JMX_FILE_EXTENSION;
         }
         // Check if the user is trying to save to an existing file
@@ -239,9 +243,9 @@ private static String computeFileName() {
     void backupAndSave(ActionEvent e, HashTree subTree, boolean fullSave, String newFile)
             throws IllegalUserActionException {
         //
-        List<File> expiredBackupFiles = EMPTY_FILE_LIST;
+        List<Path> expiredBackupFiles = Collections.emptyList();
         if (GuiPackage.getInstance().isDirty()) {
-            File fileToBackup = new File(newFile);
+            Path fileToBackup = Path.of(newFile);
             log.debug("Test plan has changed, make backup of {}", fileToBackup);
             try {
                 expiredBackupFiles = createBackupFile(fileToBackup);
@@ -268,7 +272,28 @@ void backupAndSave(ActionEvent e, HashTree subTree, boolean fullSave, String new
 
             // delete expired backups : here everything went right so we can
             // proceed to deletion
-            expiredBackupFiles.forEach(FileUtils::deleteQuietly);
+            for (Path backupFile : expiredBackupFiles) {
+                try {
+                    PathsKt.deleteRecursively(backupFile);
+                    //noinspection ConstantValue
+                    if (false) {
+                        throw new IOException("Make javac happy as deleteRecursively can throw IOException");
+                    }
+                } catch (IOException ioe) {
+                    if (log.isDebugEnabled()) {
+                        log.info(
+                                "Failed to delete backup file: {}. It is not an error as the backup is not needed after a successful save",
+                                backupFile.toAbsolutePath().toString(),
+                                ioe
+                        );
+                    } else {
+                        log.info(
+                                "Failed to delete backup file: {}. It is not an error as the backup is not needed after a successful save",
+                                backupFile.toAbsolutePath().toString()
+                        );
+                    }
+                }
+            }
         } catch (RuntimeException ex) {
             throw ex;
         } catch (Exception ex) {
@@ -337,12 +362,12 @@ void backupAndSave(ActionEvent e, HashTree subTree, boolean fullSave, String new
      *         properties and that should be deleted after the save operation
      *         has performed successfully
      */
-    private static List<File> createBackupFile(File fileToBackup) {
-        if (!BACKUP_ENABLED || !fileToBackup.exists()) {
-            return EMPTY_FILE_LIST;
+    private static List<Path> createBackupFile(Path fileToBackup) {
+        if (!BACKUP_ENABLED || !Files.exists(fileToBackup)) {
+            return Collections.emptyList();
         }
         char versionSeparator = '-'; //$NON-NLS-1$
-        String baseName = fileToBackup.getName();
+        String baseName = fileToBackup.getFileName().toString();
         // remove .jmx extension if any
         baseName = baseName.endsWith(JMX_FILE_EXTENSION)
                 ? baseName.substring(0, baseName.length() - JMX_FILE_EXTENSION.length())
@@ -354,7 +379,7 @@ private static List<File> createBackupFile(File fileToBackup) {
             log.error(
                     "Could not backup file! Backup directory does not exist, is not a directory or could not be created ! <{}>", //$NON-NLS-1$
                     backupDir.getAbsolutePath());
-            return EMPTY_FILE_LIST;
+            return Collections.emptyList();
         }
 
         // select files matching:
@@ -365,10 +390,23 @@ private static List<File> createBackupFile(File fileToBackup) {
                 + Pattern.quote(JMX_FILE_EXTENSION);
         Pattern backupPattern = Pattern.compile(backupPatternRegex);
         // get all backup files in the backup directory
-        List<File> backupFiles = new ArrayList<>(FileUtils.listFiles(
-                backupDir, new PrivatePatternFileFilter(backupPattern), null));
-        // oldest to newest
-        backupFiles.sort(LastModifiedFileComparator.LASTMODIFIED_COMPARATOR);
+        List<Path> backupFiles;
+        try (Stream<Path> paths = Files.list(backupDir.toPath())) {
+            backupFiles = paths
+                    .filter(Files::isRegularFile)
+                    .filter(path -> backupPattern.matcher(path.getFileName().toString()).matches())
+                    .sorted(Comparator.comparing(p -> {
+                        try {
+                            return Files.getLastModifiedTime(p);
+                        } catch (IOException e) {
+                            return FileTime.fromMillis(0);
+                        }
+                    }))
+                    .collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
         // this should be the most recent backup
         int lastVersionNumber = getHighestVersionNumber(backupPattern, backupFiles);
 
@@ -381,13 +419,13 @@ private static List<File> createBackupFile(File fileToBackup) {
         File backupFile = new File(backupDir, backupName);
         // create file backup
         try {
-            FileUtils.copyFile(fileToBackup, backupFile);
+            Files.copy(fileToBackup, backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         } catch (IOException e) {
-            log.error("Failed to backup file: {}", fileToBackup.getAbsolutePath(), e); //$NON-NLS-1$
-            return EMPTY_FILE_LIST;
+            log.error("Failed to backup file: {}", fileToBackup.toAbsolutePath().toString(), e); //$NON-NLS-1$
+            return Collections.emptyList();
         }
         // add the new backup file (list is still sorted here)
-        backupFiles.add(backupFile);
+        backupFiles.add(backupFile.toPath());
 
         return backupFilesToDelete(backupFiles);
     }
@@ -400,10 +438,13 @@ private static List<File> createBackupFile(File fileToBackup) {
      * @param backupFiles
      *            {@link List} of {@link File}
      */
-    private static int getHighestVersionNumber(Pattern backupPattern, List<? extends File> backupFiles) {
-        return backupFiles.stream().map(backupFile -> backupPattern.matcher(backupFile.getName()))
+    private static int getHighestVersionNumber(Pattern backupPattern, List<? extends Path> backupFiles) {
+        return backupFiles.stream()
+                .map(backupFile -> backupPattern.matcher(backupFile.getFileName().toString()))
                 .filter(matcher -> matcher.find() && matcher.groupCount() > 0)
-                .mapToInt(matcher -> Integer.parseInt(matcher.group(1))).max().orElse(0);
+                .mapToInt(matcher -> Integer.parseInt(matcher.group(1)))
+                .max()
+                .orElse(0);
     }
 
     /**
@@ -412,10 +453,10 @@ private static int getHighestVersionNumber(Pattern backupPattern, List<? extends
      * @param backupFiles
      *            list of all backup files
      * @return list of files to be deleted based upon properties described
-     *         {@link #createBackupFile(File)}
+     *         {@link #createBackupFile(Path)}
      */
-    private static List<File> backupFilesToDelete(List<? extends File> backupFiles) {
-        List<File> filesToDelete = new ArrayList<>();
+    private static List<Path> backupFilesToDelete(List<? extends Path> backupFiles) {
+        List<Path> filesToDelete = new ArrayList<>();
         if (BACKUP_MAX_HOURS > 0) {
             filesToDelete.addAll(expiredBackupFiles(backupFiles));
         }
@@ -431,15 +472,25 @@ private static List<File> backupFilesToDelete(List<? extends File> backupFiles)
 
 
     /**
-     * @param backupFiles {@link List} of {@link File} to filter
-     * @return {@link List} of {@link File} that are expired
+     * @param backupFiles {@link List} of {@link Path} to filter
+     * @return {@link Path} of {@link File} that are expired
      */
-    private static List<File> expiredBackupFiles(List<? extends File> backupFiles) {
+    private static List<Path> expiredBackupFiles(List<? extends Path> backupFiles) {
         if (BACKUP_MAX_HOURS > 0) {
             final long expiryMillis = System.currentTimeMillis() - (1L * BACKUP_MAX_HOURS * MS_PER_HOUR);
-            return backupFiles.stream().filter(file -> file.lastModified() < expiryMillis).collect(Collectors.toList());
+            FileTime expiryFileTime = FileTime.fromMillis(expiryMillis);
+            return backupFiles.stream()
+                    .filter(path -> {
+                        try {
+                            return Files.getLastModifiedTime(path).compareTo(expiryFileTime) < 0;
+                        } catch (IOException e) {
+                            log.warn("Can't get last modified time for {}", path.toAbsolutePath(), e);
+                            return false;
+                        }
+                    })
+                    .collect(Collectors.toList());
         } else {
-            return EMPTY_FILE_LIST;
+            return Collections.emptyList();
         }
     }
 
@@ -463,27 +514,4 @@ void convertSubTree(HashTree tree) {
             tree.replaceKey(item, testElement);
         }
     }
-
-    private static class PrivatePatternFileFilter implements IOFileFilter {
-
-        private final Pattern pattern;
-
-        private PrivatePatternFileFilter(Pattern pattern) {
-            if(pattern == null) {
-                throw new IllegalArgumentException("pattern cannot be null !"); //$NON-NLS-1$
-            }
-            this.pattern = pattern;
-        }
-
-        @Override
-        public boolean accept(File dir, String fileName) {
-            return pattern.matcher(fileName).matches();
-        }
-
-        @Override
-        public boolean accept(File file) {
-            return accept(file.getParentFile(), file.getName());
-        }
-    }
-
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 9e65efa8d87..e5cb885a097 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -27,8 +27,6 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.report.config.ExporterConfiguration;
 import org.apache.jmeter.report.config.GraphConfiguration;
@@ -48,6 +46,7 @@
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
 
 import freemarker.template.Configuration;
 import freemarker.template.TemplateExceptionHandler;
@@ -420,7 +419,7 @@ public void export(SampleContext context, File file,
 
         // Add report title to the context
         if (StringUtilities.isNotEmpty(configuration.getReportTitle())) {
-            dataContext.put(DATA_CTX_REPORT_TITLE, StringEscapeUtils.escapeHtml4(configuration.getReportTitle()));
+            dataContext.put(DATA_CTX_REPORT_TITLE, HtmlEscape.escapeHtml5(configuration.getReportTitle()));
         }
 
         // Add the test file name to the context
@@ -437,7 +436,7 @@ public void export(SampleContext context, File file,
             if (log.isInfoEnabled()) {
                 log.info("Report will be generated in: {}, creating folder structure", outputDir.getAbsolutePath());
             }
-            FileUtils.forceMkdir(outputDir);
+            Files.createDirectories(outputDir.toPath());
             TemplateVisitor visitor = new TemplateVisitor(
                     templateDirectory.toPath(),
                     outputDir.toPath(),
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
index 81eb1cf6d6d..07a0d21952e 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.JMeter;
 import org.apache.jmeter.report.config.ExporterConfiguration;
 import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
@@ -112,7 +111,7 @@ private File checkAndGetOutputFolder(ReportGeneratorConfiguration reportGenerato
 
         JOrphanUtils.canSafelyWriteToFolder(outputDir, JSON_FILE_FILTER);
         try {
-            FileUtils.forceMkdir(outputDir);
+            Files.createDirectories(outputDir.toPath());
         } catch (IOException ex) {
             throw new ExportException("Error creating output folder "+outputDir.getAbsolutePath(), ex);
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index 8c3f9f42e76..742250c73a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -28,7 +28,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.report.config.ConfigurationException;
 import org.apache.jmeter.report.config.ExporterConfiguration;
 import org.apache.jmeter.report.config.GraphConfiguration;
@@ -62,6 +61,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import kotlin.io.path.PathsKt;
+
 /**
  * The class ReportGenerator provides a way to generate all the templated files
  * of the plugin.
@@ -300,7 +301,11 @@ private FilterConsumer createFilterByDateRange() {
     private static void removeTempDir(File tmpDir, boolean tmpDirCreated) {
         if (tmpDirCreated) {
             try {
-                FileUtils.deleteDirectory(tmpDir);
+                PathsKt.deleteRecursively(tmpDir.toPath());
+                //noinspection ConstantValue
+                if (false) {
+                    throw new IOException("Make javac happy as deleteRecursively can throw IOException");
+                }
             } catch (IOException ex) {
                 log.warn("Cannot delete created temporary directory, '{}'.", tmpDir, ex);
             }
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index 55bfb3d01ee..d64205f5e69 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -31,7 +31,6 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.jmeter.report.core.DataContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +38,7 @@
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import kotlin.io.path.PathsKt;
 
 /**
  * The class TemplateVisitor visits files in a template directory to copy
@@ -98,13 +98,13 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
             throws IOException {
 
         // Depending on file extension, copy or process file
-        String extension = FilenameUtils.getExtension(file.toString());
+        String extension = PathsKt.getExtension(file);
+        Path relativePath = source.relativize(file);
         if (TEMPLATED_FILE_EXT.equalsIgnoreCase(extension)) {
             // Process template file
-            String templatePath = source.relativize(file).toString();
+            String templatePath = relativePath.toString();
             Template template = configuration.getTemplate(templatePath);
-            Path newPath = target.resolve(FilenameUtils
-                    .removeExtension(templatePath));
+            Path newPath = target.resolve(PathsKt.getNameWithoutExtension(relativePath));
             try (FileOutputStream stream = new FileOutputStream(newPath.toString());
                     Writer writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
                     BufferedWriter bufferedWriter = new BufferedWriter(writer)){
@@ -115,7 +115,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
 
         } else {
             // Copy regular file
-            Path newFile = target.resolve(source.relativize(file));
+            Path newFile = target.resolve(relativePath);
             Files.copy(file, newFile, StandardCopyOption.REPLACE_EXISTING);
         }
         return FileVisitResult.CONTINUE;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index ad3bcbc669a..d30023d8f35 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -17,12 +17,12 @@
 
 package org.apache.jmeter.report.processor;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.utils.MetricUtils;
 import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.StringUtilities;
+import org.unbescape.html.HtmlEscape;
 
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 
@@ -97,7 +97,7 @@ static String getErrorKey(Sample sample) {
     }
 
     private static String escapeJson(String responseMessage) {
-        return new String(JsonStringEncoder.getInstance().quoteAsString(StringEscapeUtils.escapeHtml4(responseMessage)));
+        return new String(JsonStringEncoder.getInstance().quoteAsString(HtmlEscape.escapeHtml5(responseMessage)));
     }
 
     @Override
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
index 1b73441c022..0f7074fc6a6 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.report.core.CsvSampleReader;
 import org.apache.jmeter.report.core.CsvSampleWriter;
 import org.apache.jmeter.report.core.Sample;
@@ -37,6 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import kotlin.io.path.PathsKt;
+
 /**
  * The class AbstractOverTimeGraphConsumer provides a base class for over time
  * graphs.
@@ -316,7 +317,11 @@ public void stopConsuming() {
             if (createdWorkDir) {
                 File workingDir = parent.getWorkingDirectory();
                 try {
-                    FileUtils.deleteDirectory(workingDir);
+                    PathsKt.deleteRecursively(workingDir.toPath());
+                    //noinspection ConstantValue
+                    if (false) {
+                        throw new IOException("Make javac happy as deleteRecursively can throw IOException");
+                    }
                 } catch (IOException e) {
                     log.warn("Cannot delete created temporary directory, '{}'", workingDir, e);
                 }
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index 05e383e6790..9f224a85359 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -17,27 +17,29 @@
 
 package org.apache.jmeter.services;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
-import org.apache.commons.io.input.BOMInputStream;
 import org.apache.jmeter.gui.JMeterFileFilter;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.io.BomInputStream;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -424,20 +426,17 @@ private static BufferedReader createBufferedReader(FileEntry fileEntry) throws I
             throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
         }
 
-        BOMInputStream fis = BOMInputStream.builder().setFile(fileEntry.file).get();
-        InputStreamReader isr = null;
         // If file encoding is specified, read using that encoding, otherwise use default platform encoding
         String charsetName = fileEntry.charSetEncoding;
+        Path filePath = fileEntry.file.toPath();
         if (StringUtilities.isNotBlank(charsetName)) {
-            isr = new InputStreamReader(fis, charsetName);
-        } else if (fis.hasBOM()) {
-            isr = new InputStreamReader(fis, fis.getBOM().getCharsetName());
-        } else {
-            @SuppressWarnings("DefaultCharset")
-            final InputStreamReader withPlatformEncoding = new InputStreamReader(fis);
-            isr = withPlatformEncoding;
+            return Files.newBufferedReader(filePath, Charset.forName(charsetName));
         }
-        return new BufferedReader(isr);
+        // InputStreamReader does not buffer reads, so we need to buffer file reads
+        BufferedInputStream fis = new BufferedInputStream(Files.newInputStream(filePath));
+        // Detect BOM
+        Reader reader = BomInputStream.reader(fis);
+        return new BufferedReader(reader);
     }
 
     public synchronized void write(String filename, String value) throws IOException {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
index bf057e189a2..a43e4fdb8ac 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java
@@ -34,7 +34,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.jmeter.gui.util.FileDialoger;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -122,7 +121,8 @@ public void actionPerformed(ActionEvent e) {
 
     private static String toUnix(final File selectedFile) {
         if (File.separatorChar == '\\') {
-            return FilenameUtils.separatorsToUnix(selectedFile.getPath());
+            // TODO: is this normalization really useful?
+            return selectedFile.getPath().replace('\\', '/');
         }
         return selectedFile.getPath();
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
index 6a2219ba075..cb7cdaeef2f 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java
@@ -17,17 +17,17 @@
 
 package org.apache.jmeter.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Serializable;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Properties;
 
 import org.apache.bsf.BSFEngine;
 import org.apache.bsf.BSFException;
 import org.apache.bsf.BSFManager;
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterContext;
@@ -98,7 +98,7 @@ protected void processFileOrScript(BSFManager mgr) throws BSFException{
             bsfEngine.exec("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
-                String script=FileUtils.readFileToString(new File(scriptFile), Charset.defaultCharset());
+                String script = Files.readString(Path.of(scriptFile), Charset.defaultCharset());
                 bsfEngine.exec(scriptFile,0,0,script);
             } catch (IOException e) {
                 if (log.isWarnEnabled()) {
@@ -116,7 +116,7 @@ protected Object evalFileOrScript(BSFManager mgr) throws BSFException{
             return bsfEngine.eval("[script]",0,0,getScript());
         } else {// we have a file, read and process it
             try {
-                String script=FileUtils.readFileToString(new File(scriptFile), Charset.defaultCharset());
+                String script = Files.readString(Path.of(scriptFile), Charset.defaultCharset());
                 return bsfEngine.eval(scriptFile,0,0,script);
             } catch (IOException e) {
                 if (log.isWarnEnabled()) {
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index 00d5edb3961..adbbd9faf6c 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -35,9 +35,6 @@ dependencies {
 
     testImplementation(testFixtures(projects.src.core))
     testImplementation(testFixtures(projects.src.components))
-    testImplementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
     testImplementation("com.fasterxml.jackson.core:jackson-databind") {
         because("It is used in ReportGeneratorSpec and HtmlReportGeneratorSpec")
     }
diff --git a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
index f87c1e7da23..8a3844404c5 100644
--- a/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
+++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java
@@ -21,7 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.List;
 
 import org.apache.jmeter.junit.JMeterTestUtils;
@@ -37,7 +37,7 @@ public class TestClassFinder {
     private static String getJMeterHome() throws Exception {
         JMeterTestUtils.setupJMeterHome();
         String path = JMeterUtils.getJMeterHome() + "/lib";
-        return Paths.get(path).toRealPath().toString();
+        return Path.of(path).toRealPath().toString();
     }
 
     @BeforeEach
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
index 77ed5decec4..f0740bb0efe 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.io.File
-import java.nio.file.Paths
+import java.nio.file.Path
 import java.text.MessageFormat
 
 class HtmlReportGeneratorTest : JMeterTestCase() {
@@ -45,7 +45,7 @@ class HtmlReportGeneratorTest : JMeterTestCase() {
          * @return combined path as string
          */
         fun combine(vararg paths: String) =
-            Paths.get(JMeterUtils.getJMeterBinDir(), *paths).toString()
+            Path.of(JMeterUtils.getJMeterBinDir(), *paths).toString()
 
         @JvmStatic
         fun checkArgumentsCases() = listOf(
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
index 0c72affaac8..41e8311d9ec 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/report/dashboard/ReportGeneratorTest.kt
@@ -18,7 +18,6 @@
 package org.apache.jmeter.report.dashboard
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.apache.commons.io.FileUtils
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.util.JMeterUtils
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -29,8 +28,9 @@ import org.junit.jupiter.api.parallel.Isolated
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
-import java.nio.file.Paths
+import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.absolutePathString
+import kotlin.io.path.copyToRecursively
 
 @Isolated("modifies shared properties")
 class ReportGeneratorTest : JMeterTestCase() {
@@ -45,12 +45,17 @@ class ReportGeneratorTest : JMeterTestCase() {
      * @return combined path as string
      */
     fun combine(vararg paths: String) =
-        Paths.get(JMeterUtils.getJMeterBinDir(), *paths).toString()
+        Path.of(JMeterUtils.getJMeterBinDir(), *paths).toString()
 
     @Test
+    @OptIn(ExperimentalPathApi::class)
     fun `check that report generation succeeds from read-only templates`() {
         val roTemplate = Files.createTempDirectory("report-template-ro")
-        FileUtils.copyDirectoryToDirectory(Path.of(combine("report-template")).toFile(), roTemplate.toFile())
+        Path.of(combine("report-template")).copyToRecursively(
+            roTemplate,
+            followLinks = false,
+            overwrite = true,
+        )
         Files.walk(roTemplate).forEach { p -> p.toFile().setReadOnly() }
         JMeterUtils.setProperty("jmeter.reportgenerator.exporter.html.property.template_dir", roTemplate.absolutePathString())
         val roReport = Files.createTempDirectory("report-from-ro-template")
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index a99c78e320c..6d87535def2 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -92,6 +92,12 @@ dependencies {
     runtimeOnly("commons-codec:commons-codec") {
         because("commons-codec was a dependency in previous JMeter versions, so we keep it for compatibility")
     }
+    runtimeOnly("commons-io:commons-io") {
+        because("commons-io was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
+    runtimeOnly("org.apache.commons:commons-text") {
+        because("commons-text was a dependency in previous JMeter versions, so we keep it for compatibility")
+    }
     runtimeOnly("commons-collections:commons-collections") {
         because("commons-collections was a dependency in previous JMeter versions, so we keep it for compatibility")
     }
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index f7115320585..86ad358bad9 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -153,6 +153,7 @@
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
 778543,tika-core-3.2.3.jar
+173935,unbescape-1.1.6.RELEASE.jar
 3455761,xalan-2.7.3.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 773eb6b7dff..6bded0c89d9 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -26,12 +26,7 @@ dependencies {
     implementation("org.mozilla:rhino")
     implementation("org.apache.commons:commons-jexl")
     implementation("org.apache.commons:commons-jexl3")
-    implementation("commons-io:commons-io") {
-        because("FileUtils")
-    }
-    implementation("org.apache.commons:commons-text") {
-        because("StringEscapeUtils")
-    }
+    implementation("org.unbescape:unbescape")
     implementation("com.github.ben-manes.caffeine:caffeine")
     implementation("oro:oro")
 }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
index 8606779ad07..d3359682743 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java
@@ -21,11 +21,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.unbescape.html.HtmlEscape;
 
 import com.google.auto.service.AutoService;
 
@@ -41,11 +41,11 @@
  * <code>&amp;quot;bread&amp;quot; &amp;amp; &amp;quot;butter&amp;quot;</code>.
  * </p>
  *
- * <p>Supports all known HTML 4.0 entities.
+ * <p>Supports all known HTML 5.0 entities.
  * Note that the commonly used apostrophe escape character (&amp;apos;)
  * is not a legal entity and so is not supported). </p>
  *
- * @see StringEscapeUtils#escapeHtml4(String) (Commons Lang)
+ * @see HtmlEscape#escapeHtml5(String)
  * @since 2.3.3
  */
 @AutoService(Function.class)
@@ -70,7 +70,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
         String rawString = ((CompoundVariable) values[0]).execute();
-        return StringEscapeUtils.escapeHtml4(rawString);
+        return HtmlEscape.escapeHtml5(rawString);
 
     }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
index ac83b05b777..dd530164375 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java
@@ -21,11 +21,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.unbescape.xml.XmlEscape;
 
 import com.google.auto.service.AutoService;
 
@@ -42,7 +42,7 @@
  * </p>
  *
  *
- * @see StringEscapeUtils#escapeXml10(String) (Commons Lang)
+ * @see XmlEscape#escapeXml10(String)
  * @since 3.2
  */
 @AutoService(Function.class)
@@ -67,7 +67,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
         String rawString = ((CompoundVariable) values[0]).execute();
-        return StringEscapeUtils.escapeXml10(rawString);
+        return XmlEscape.escapeXml10(rawString);
 
     }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
index 19f13ab437c..6e5d1a5522e 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java
@@ -19,11 +19,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -104,9 +106,9 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
         String myValue = ERR_IND;
 
         try {
-            File file = new File(fileName);
-            if(file.exists() && file.canRead()) {
-                myValue = FileUtils.readFileToString(new File(fileName), encoding);
+            Path path = Path.of(fileName);
+            if (Files.exists(path) && Files.isReadable(path)) {
+                myValue = Files.readString(path, encoding == null ? Charset.defaultCharset() : Charset.forName(encoding));
             } else {
                 log.warn("Could not read open: {} ", fileName);
             }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
index b252af9aef1..fcf90aa9dea 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java
@@ -30,11 +30,11 @@
 import java.util.Locale;
 import java.util.concurrent.ThreadLocalRandom;
 
-import org.apache.commons.lang3.LocaleUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.locale.LocaleUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
index 1781505dee7..546ff90ff22 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java
@@ -20,13 +20,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.text.RandomStringGenerator;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,12 +90,13 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             myName = values[PARAM_NAME - 1].execute().trim();
         }
 
-        String myValue;
-        if (StringUtilities.isEmpty(charsToUse)) {
-            myValue = RandomStringUtils.insecure().next(length);
-        } else {
-            myValue = RandomStringUtils.insecure().next(length, charsToUse);
-        }
+        String myValue =
+                new RandomStringGenerator(
+                        ThreadLocalRandom.current(),
+                        StringUtilities.isEmpty(charsToUse)
+                                ? RandomStringGenerator.CharSource.AnyUnicode.INSTANCE
+                                : new RandomStringGenerator.CharSource.Chars(charsToUse.toCharArray())
+                ).generate(length);
 
         if (!myName.isEmpty()) {
             JMeterVariables vars = getVariables();
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
index bd33c7ab244..4284143b823 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java
@@ -20,13 +20,12 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -34,6 +33,7 @@
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JMeterStopThreadException;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -212,10 +212,10 @@ private synchronized void openFile() {
 
         log.info("{} opening file {}", tn, fileName);//$NON-NLS-1$
         try {
-            myBread = Files.newBufferedReader(Paths.get(fileName));
+            myBread = Files.newBufferedReader(Path.of(fileName));
         } catch (Exception e) {
-            log.error("openFile() error: {}", e.toString());//$NON-NLS-1$
-            IOUtils.closeQuietly(myBread, null);
+            log.error("openFile() error", e);//$NON-NLS-1$
+            JOrphanUtils.closeQuietly(myBread);
             myBread = null;
         }
     }
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
index cca45cc4bc6..10679daca57 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
@@ -23,6 +23,8 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -32,7 +34,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
@@ -112,7 +113,13 @@ private boolean writeToFile() throws IOException {
             File fileParent = file.getParentFile();
             if (fileParent == null || (fileParent.exists() && fileParent.isDirectory() && fileParent.canWrite())) {
                 try {
-                    FileUtils.writeStringToFile(file, content, charset, append);
+                    Files.writeString(
+                            file.toPath(),
+                            content,
+                            charset,
+                            StandardOpenOption.CREATE,
+                            append ? StandardOpenOption.APPEND : StandardOpenOption.TRUNCATE_EXISTING
+                    );
                 } catch (IllegalArgumentException e) {
                     log.error("The file {} can't be written to", file, e);
                     return false;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index 611c5053548..91b0833d7c7 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -31,12 +31,12 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.lang3.LocaleUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.locale.LocaleUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
index 933af1421e5..67e70f117ba 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java
@@ -22,11 +22,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.unbescape.java.JavaEscape;
 
 import com.google.auto.service.AutoService;
 
@@ -35,7 +35,7 @@
  * For example, it will turn a sequence of '\' and 'n' into a newline character,
  * unless the '\' is preceded by another '\'.
  *
- * @see StringEscapeUtils#unescapeJava(String)
+ * @see JavaEscape#unescapeJava(String)
  * @since 2.3.3
  */
 @AutoService(Function.class)
@@ -60,7 +60,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
         String rawString = ((CompoundVariable) values[0]).execute();
-        return StringEscapeUtils.unescapeJava(rawString);
+        return JavaEscape.unescapeJava(rawString);
 
     }
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
index 85f57bbe731..588b8d19feb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java
@@ -22,11 +22,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.util.JMeterUtils;
+import org.unbescape.html.HtmlEscape;
 
 import com.google.auto.service.AutoService;
 
@@ -41,7 +41,7 @@
  * If an entity is unrecognized, it is left alone, and inserted verbatim into the result string.
  * e.g. "&amp;gt;&amp;zzzz;x" will become "&gt;&amp;zzzz;x".
  * </p>
- * @see StringEscapeUtils#unescapeHtml4(String)
+ * @see HtmlEscape#unescapeHtml(String)
  * @since 2.3.3
  */
 @AutoService(Function.class)
@@ -66,7 +66,7 @@ public String execute(SampleResult previousResult, Sampler currentSampler)
             throws InvalidVariableException {
 
         String escapedString = ((CompoundVariable) values[0]).execute();
-        return StringEscapeUtils.unescapeHtml4(escapedString);
+        return HtmlEscape.unescapeHtml(escapedString);
 
     }
 
diff --git a/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
index 0e711dd1b63..fbd62df0a57 100644
--- a/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
+++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java
@@ -25,7 +25,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -75,7 +74,7 @@ public void testWriteToFile(@TempDir Path tempDir) throws Exception {
 
     @Test
     public void testWriteToFileWhenDirectoryDoesntExist() throws Exception {
-        String pathname = Paths.get("/does/not.exist", FILENAME).toString();
+        String pathname = Path.of("/does/not.exist", FILENAME).toString();
         function.setParameters(functionParams(pathname, STRING_TO_WRITE, "true", ENCODING));
         String returnValue = function.execute(result, null);
         assertFalse(Boolean.parseBoolean(returnValue),
diff --git a/src/jorphan/build.gradle.kts b/src/jorphan/build.gradle.kts
index 29b94f1308f..2a631b5656b 100644
--- a/src/jorphan/build.gradle.kts
+++ b/src/jorphan/build.gradle.kts
@@ -24,9 +24,7 @@ dependencies {
     api("org.apiguardian:apiguardian-api")
     api("org.slf4j:slf4j-api")
 
-    implementation("commons-io:commons-io")
     implementation("org.apache.commons:commons-math3")
-    implementation("org.apache.commons:commons-text")
 
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
 }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index ac7b3fadf15..cdc4ca48b26 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -23,12 +23,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -258,10 +259,10 @@ public static void generateProxyCA(File keystore, String password, int validity)
         // Export the Root CA for Firefox/Chrome/IE
         KeyToolUtils.keytool("-exportcert", keystore, password, ROOTCA_ALIAS, null, null, "-rfc", "-file", ROOT_CACERT_CRT);
         // Copy for Opera
-        if(caCertCrt.exists() && caCertCrt.canRead()) {
-            FileUtils.copyFile(caCertCrt, caCertUsr);
+        if (caCertCrt.exists() && caCertCrt.canRead()) {
+            Files.copy(caCertCrt.toPath(), caCertUsr.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         } else {
-            log.warn("Failed creating "+caCertCrt.getAbsolutePath()+", check 'keytool' utility in path is available and points to a JDK >= 7");
+            log.warn("Failed creating {}, check 'keytool' utility in path is available and points to a JDK >= 7", caCertCrt.getAbsolutePath());
         }
     }
 
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java
index 6852ce25833..537c1e8ee9f 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java
@@ -21,7 +21,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +53,7 @@ public void run() {
         final boolean isSystemOutput = os.equals(System.out) || os.equals(System.err);
         try (OutputStream ignored = isSystemOutput ? null : os;
              InputStream ignored1 = is) {
-            IOUtils.copyLarge(is, os);
+            is.transferTo(os);
         } catch (IOException e) {
             log.warn("Error writing stream", e);
         }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/locale/LocaleUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/locale/LocaleUtils.java
new file mode 100644
index 00000000000..c53bfe843a8
--- /dev/null
+++ b/src/jorphan/src/main/java/org/apache/jorphan/locale/LocaleUtils.java
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.locale;
+
+import java.util.Locale;
+
+import org.apache.jorphan.util.StringUtilities;
+
+/**
+ * Code was copied from commons-lang3:3.19.0. Deprecated {@code new Locale(...)} have been
+ * refactored to {@code new Locale.Builder()...build()} calls
+ */
+public class LocaleUtils {
+    /** The underscore character {@code '}{@value}{@code '}. */
+    private static final char UNDERSCORE = '_';
+
+    /** The dash character {@code '}{@value}{@code '}. */
+    private static final char DASH = '-';
+
+    private LocaleUtils() {}
+
+    /**
+     * Tests whether the given String is a ISO 639 compliant language code.
+     *
+     * @param str the String to check.
+     * @return true, if the given String is a ISO 639 compliant language code.
+     */
+    private static boolean isISO639LanguageCode(final String str) {
+        return StringUtilities.isAllLowerCase(str) && (str.length() == 2 || str.length() == 3);
+    }
+
+    /**
+     * Tests whether the given String is a ISO 3166 alpha-2 country code.
+     *
+     * @param str the String to check
+     * @return true, is the given String is a ISO 3166 compliant country code.
+     */
+    private static boolean isISO3166CountryCode(final String str) {
+        return str.length() == 2 && StringUtilities.isAllUpperCase(str);
+    }
+
+    /**
+     * TestsNo whether the given String is a UN M.49 numeric area code.
+     *
+     * @param str the String to check
+     * @return true, is the given String is a UN M.49 numeric area code.
+     */
+    private static boolean isNumericAreaCode(final String str) {
+        return str.length() == 3 && StringUtilities.isNumeric(str);
+    }
+
+    /**
+     * Tries to parse a Locale from the given String.
+     *
+     * <p>See {@link Locale} for the format.
+     *
+     * @param str the String to parse as a Locale.
+     * @return a Locale parsed from the given String.
+     * @throws IllegalArgumentException if the given String cannot be parsed.
+     * @see Locale
+     */
+    private static Locale parseLocale(final String str) {
+        if (isISO639LanguageCode(str)) {
+            return new Locale.Builder().setLanguage(str).build();
+        }
+        final int limit = 3;
+        final char separator = str.indexOf(UNDERSCORE) != -1 ? UNDERSCORE : DASH;
+        final String[] segments = str.split(String.valueOf(separator), 3);
+        final String language = segments[0];
+        if (segments.length == 2) {
+            final String country = segments[1];
+            if ((isISO639LanguageCode(language) && isISO3166CountryCode(country))
+                    || isNumericAreaCode(country)) {
+                return new Locale.Builder().setLanguage(language).setRegion(country).build();
+            }
+        } else if (segments.length == limit) {
+            final String country = segments[1];
+            final String variant = segments[2];
+            if (isISO639LanguageCode(language)
+                    && (country.isEmpty() || isISO3166CountryCode(country) || isNumericAreaCode(country))
+                    && !variant.isEmpty()) {
+                return new Locale.Builder()
+                        .setLanguage(language)
+                        .setRegion(country)
+                        .setVariant(variant)
+                        .build();
+            }
+        }
+        throw new IllegalArgumentException("Invalid locale format: " + str);
+    }
+
+    /**
+     * Converts a String to a Locale.
+     *
+     * <p>This method takes the string format of a locale and creates the locale object from it.
+     *
+     * <pre>
+     *   LocaleUtils.toLocale("")           = new Locale("", "")
+     *   LocaleUtils.toLocale("en")         = new Locale("en", "")
+     *   LocaleUtils.toLocale("en_GB")      = new Locale("en", "GB")
+     *   LocaleUtils.toLocale("en-GB")      = new Locale("en", "GB")
+     *   LocaleUtils.toLocale("en_001")     = new Locale("en", "001")
+     *   LocaleUtils.toLocale("en_GB_xxx")  = new Locale("en", "GB", "xxx")   (#)
+     * </pre>
+     *
+     * <p>(#) The behavior of the JDK variant constructor changed between JDK1.3 and JDK1.4. In
+     * JDK1.3, the constructor upper cases the variant, in JDK1.4, it doesn't. Thus, the result from
+     * getVariant() may vary depending on your JDK.
+     *
+     * <p>This method validates the input strictly. The language code must be lowercase. The country
+     * code must be uppercase. The separator must be an underscore or a dash. The length must be
+     * correct.
+     *
+     * @param str the locale String to convert, null returns null
+     * @return a Locale, null if null input
+     * @throws IllegalArgumentException if the string is an invalid format
+     * @see Locale#forLanguageTag(String)
+     */
+    public static Locale toLocale(final String str) {
+        if (str == null) {
+            // TODO Should this return the default locale?
+            return null;
+        }
+        if (str.isEmpty()) {
+            return Locale.ROOT;
+        }
+        if (str.contains("#")) { // LANG-879 - Cannot handle Java 7 script & extensions
+            throw new IllegalArgumentException("Invalid locale format: " + str);
+        }
+        final int len = str.length();
+        if (len < 2) {
+            throw new IllegalArgumentException("Invalid locale format: " + str);
+        }
+        final char ch0 = str.charAt(0);
+        if (ch0 == UNDERSCORE || ch0 == DASH) {
+            if (len < 3) {
+                throw new IllegalArgumentException("Invalid locale format: " + str);
+            }
+            final char ch1 = str.charAt(1);
+            final char ch2 = str.charAt(2);
+            if (!Character.isUpperCase(ch1) || !Character.isUpperCase(ch2)) {
+                throw new IllegalArgumentException("Invalid locale format: " + str);
+            }
+            if (len == 3) {
+                return new Locale.Builder().setRegion(str.substring(1, 3)).build();
+            }
+            if (len < 5) {
+                throw new IllegalArgumentException("Invalid locale format: " + str);
+            }
+            if (str.charAt(3) != ch0) {
+                throw new IllegalArgumentException("Invalid locale format: " + str);
+            }
+            return new Locale.Builder()
+                    .setRegion(str.substring(1, 3))
+                    .setVariant(str.substring(4))
+                    .build();
+        }
+
+        return parseLocale(str);
+    }
+}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 794f8406a71..e80a6181382 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -34,10 +34,11 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.text.RandomStringGenerator;
+import org.apache.jorphan.text.RandomStringGenerator;
 import org.apiguardian.api.API;
 
+import kotlin.io.path.PathsKt;
+
 /**
  * This class contains frequently-used static utility methods.
  */
@@ -636,7 +637,11 @@ public static void canSafelyWriteToFolder(File folder, boolean deleteFolderIfExi
                 if (listedFiles != null && listedFiles.length > 0) {
                     if (deleteFolderIfExists) {
                         try {
-                            FileUtils.deleteDirectory(folder);
+                            PathsKt.deleteRecursively(folder.toPath());
+                            //noinspection ConstantValue
+                            if (false) {
+                                throw new IOException("Make javac happy as deleteRecursively can throw IOException");
+                            }
                         } catch (IOException ex) {
                             throw new IllegalArgumentException("Cannot write to '" + folder.getAbsolutePath()
                                     + "' as folder is not empty and cleanup failed with error:" + ex.getMessage(), ex);
@@ -745,11 +750,7 @@ public static String unsplit(Object[] splittee, Object splitChar) {
      * @return String random password
      */
     public static String generateRandomAlphanumericPassword(int length) {
-        char[][] pairs = {{'a', 'z'}, {'A', 'Z'}, {'0', '9'}};
-        RandomStringGenerator pwdGenerator = new RandomStringGenerator.Builder()
-                .usingRandom(LazySecureRandom.INSTANCE::nextInt)
-                .withinRange(pairs)
-                .get();
+        RandomStringGenerator pwdGenerator = RandomStringGenerator.alphanumeric(LazySecureRandom.INSTANCE);
         return pwdGenerator.generate(length);
     }
 }
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
index f247cb3b03c..f084df3fe91 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/StringUtilities.java
@@ -224,4 +224,30 @@ public static boolean isNumeric(String str) {
         }
         return true;
     }
+
+    public static boolean isAllLowerCase(CharSequence string) {
+        if (string == null || string.isEmpty()) {
+            return false;
+        }
+        int length = string.length();
+        for (int i = 0; i < length; i++) {
+            if (!Character.isLowerCase(string.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean isAllUpperCase(CharSequence string) {
+        if (string == null || string.isEmpty()) {
+            return false;
+        }
+        int length = string.length();
+        for (int i = 0; i < length; i++) {
+            if (!Character.isUpperCase(string.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/io/BomInputStream.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/BomInputStream.kt
new file mode 100644
index 00000000000..34c576e5f60
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/BomInputStream.kt
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("BomInputStream")
+package org.apache.jorphan.io
+
+import java.io.InputStream
+import java.io.Reader
+import java.util.Arrays
+
+/**
+ * Represents a Byte Order Mark (BOM) used for identifying the encoding of text files.
+ * A BOM is a sequence of bytes at the start of a file that indicates the encoding used.
+ *
+ * This enum defines multiple predefined BOMs for various character encodings,
+ * each associated with its respective encoding name and byte sequence.
+ *
+ * @property charsetName The name of the character set associated with the BOM.
+ * @property bytes The byte sequence representing the BOM.
+ */
+private enum class ByteOrderMark(val charsetName: String, val bytes: ByteArray) {
+    // See https://en.wikipedia.org/wiki/Byte_order_mark#Byte-order_marks_by_encoding
+    // 4-byte BOMs
+    GB18030("GB18030", byteArrayOf(0x84.toByte(), 0x31, 0x95.toByte(), 0x33)),
+    UTF_32_BE("UTF-32BE", byteArrayOf(0x00, 0x00, 0xFE.toByte(), 0xFF.toByte())),
+    UTF_32_LE("UTF-32LE", byteArrayOf(0xFF.toByte(), 0xFE.toByte(), 0x00, 0x00)),
+    // UTF_EBCDIC("UTF-EBCDIC", byteArrayOf(0xDD.toByte(), 0x73, 0x66, 0x73)),
+
+    // 3-byte BOMs
+    // BOCU_1("BOCU-1", byteArrayOf(0xFB.toByte(), 0xEE.toByte(), 0x28)),
+    // SCSU("SCSU", byteArrayOf(0x0E, 0xFE.toByte(), 0xFF.toByte())),
+    // UTF_1("UTF-1", byteArrayOf(0xF7.toByte(), 0x64, 0x4C)),
+    // UTF_7("UTF-7", byteArrayOf(0x2B, 0x2F, 0x76)),
+    UTF_8("UTF-8", byteArrayOf(0xEF.toByte(), 0xBB.toByte(), 0xBF.toByte())),
+
+    // 2-byte BOMs
+    UTF_16_BE("UTF-16BE", byteArrayOf(0xFE.toByte(), 0xFF.toByte())),
+    UTF_16_LE("UTF-16LE", byteArrayOf(0xFF.toByte(), 0xFE.toByte()));
+
+    companion object {
+        fun detect(buffer: ByteArray): ByteOrderMark? {
+            for (bom in entries) {
+                val bomBytes = bom.bytes
+                if (buffer.size >= bomBytes.size &&
+                    Arrays.equals(buffer, 0, bomBytes.size, bomBytes, 0, bomBytes.size)
+                ) {
+                    return bom
+                }
+            }
+            return null
+        }
+    }
+}
+
+/**
+ * Creates a [Reader] for the given [InputStream], detecting and handling any byte order mark (BOM) that may be present.
+ * If the input stream contains a BOM, the corresponding charset is used for the reader, and the BOM bytes are skipped.
+ * If no BOM is found, the default character set of the platform is used.
+ *
+ * @param inputStream the input stream to be wrapped as a reader, potentially with BOM handling
+ * @return a reader that reads from the input stream, using the appropriate character set based on any BOM detected
+ */
+public fun reader(inputStream: InputStream): Reader {
+    val input = if (inputStream.markSupported()) inputStream else inputStream.buffered(4)
+    val bom: ByteOrderMark?
+    input.mark(4)
+    try {
+        val buffer = input.readNBytes(4)
+        bom = ByteOrderMark.detect(buffer)
+    } finally {
+        input.reset()
+    }
+    if (bom == null) {
+        return input.reader()
+    }
+    // skip BOM
+    input.skip(bom.bytes.size.toLong())
+    return input.reader(charset(bom.charsetName))
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingInputStream.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingInputStream.kt
new file mode 100644
index 00000000000..4767bfd1d8a
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingInputStream.kt
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import java.io.InputStream
+
+/**
+ * A specialized InputStream that counts the number of bytes read.
+ *
+ * This class wraps an existing InputStream and tracks the total number of bytes
+ * that have been read from the wrapped stream. The byte count is updated for all
+ * read operations including single-byte reads, bulk reads into a byte array, and
+ * skipped bytes. The byte count can be accessed through the `bytesRead` property.
+ *
+ * The behavior and functionality of the original InputStream are preserved, while
+ * adding the additional feature of byte counting.
+ *
+ * @constructor Creates a CountingInputStream wrapping the provided InputStream.
+ * @param input The InputStream to be wrapped and monitored for byte counting.
+ */
+public class CountingInputStream(private val input: InputStream) : InputStream() {
+    public var bytesRead: Long = 0
+        private set
+
+    override fun read(): Int {
+        val result = input.read()
+        if (result != -1) {
+            bytesRead++
+        }
+        return result
+    }
+
+    override fun read(b: ByteArray): Int {
+        val result = input.read(b)
+        if (result > 0) {
+            bytesRead += result
+        }
+        return result
+    }
+
+    override fun read(b: ByteArray, off: Int, len: Int): Int {
+        val result = input.read(b, off, len)
+        if (result > 0) {
+            bytesRead += result
+        }
+        return result
+    }
+
+    override fun skip(n: Long): Long {
+        val result = input.skip(n)
+        if (result > 0) {
+            bytesRead += result
+        }
+        return result
+    }
+
+    override fun available(): Int = input.available()
+
+    override fun close(): Unit = input.close()
+
+    override fun markSupported(): Boolean = input.markSupported()
+
+    override fun mark(readlimit: Int): Unit = input.mark(readlimit)
+
+    override fun reset() {
+        input.reset()
+    }
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingOutputStream.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingOutputStream.kt
new file mode 100644
index 00000000000..4b175b42d65
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/CountingOutputStream.kt
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import java.io.OutputStream
+
+/**
+ * A decorator for an [OutputStream] that counts the number of bytes written to it.
+ *
+ * This class wraps an existing [OutputStream] and intercepts write operations to
+ * count the total number of bytes written. The byte count can be accessed through
+ * the [bytesWritten] property. The original [OutputStream]'s functionality
+ * (such as writing, flushing, and closing) is preserved.
+ *
+ * The byte count is incremented only for the `write` operations that accept a byte array.
+ */
+public class CountingOutputStream(private val output: OutputStream) : OutputStream() {
+    public var bytesWritten: Long = 0
+        private set
+
+    override fun write(b: Int) {
+        output.write(b)
+    }
+
+    override fun write(b: ByteArray, off: Int, len: Int) {
+        output.write(b, off, len)
+        bytesWritten += len
+    }
+
+    override fun flush() {
+        output.flush()
+    }
+
+    override fun close(): Unit = output.close()
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStream.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStream.kt
new file mode 100644
index 00000000000..7d754982db5
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStream.kt
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import java.io.OutputStream
+import java.nio.charset.Charset
+
+/**
+ * Non thread-safe byte array output stream that uses multiple buffers
+ * to avoid copying when growing.
+ *
+ * This implementation maintains a list of buffers and only allocates new
+ * buffers when the current one is full, avoiding the copy overhead of
+ * the standard ByteArrayOutputStream.
+ *
+ * @since 3.1
+ */
+public class DirectAccessByteArrayOutputStream(initialSize: Int = 32) : OutputStream() {
+    private val buffers = mutableListOf<ByteArray>()
+    private var currentBuffer: ByteArray
+    private var currentBufferIndex = 0
+    private var currentBufferPos = 0
+    private var totalSize = 0
+
+    init {
+        currentBuffer = ByteArray(initialSize.coerceAtLeast(1))
+        buffers.add(currentBuffer)
+    }
+
+    override fun write(b: Int) {
+        if (currentBufferPos >= currentBuffer.size) {
+            allocateNewBuffer(1)
+        }
+        currentBuffer[currentBufferPos++] = b.toByte()
+        totalSize++
+    }
+
+    override fun write(b: ByteArray, off: Int, len: Int) {
+        if (off < 0 || len < 0 || off + len > b.size) {
+            throw IndexOutOfBoundsException()
+        }
+
+        var remaining = len
+        var offset = off
+
+        while (remaining > 0) {
+            var available = currentBuffer.size - currentBufferPos
+            if (available == 0) {
+                allocateNewBuffer(remaining)
+                available = currentBuffer.size
+            }
+
+            val toWrite = minOf(remaining, available)
+            System.arraycopy(b, offset, currentBuffer, currentBufferPos, toWrite)
+            currentBufferPos += toWrite
+            offset += toWrite
+            remaining -= toWrite
+            totalSize += toWrite
+        }
+    }
+
+    private fun allocateNewBuffer(minSize: Int) {
+        val newBufferIndex = ++currentBufferIndex
+        currentBufferPos = 0
+        if (newBufferIndex < buffers.size) {
+            currentBuffer = buffers[newBufferIndex]
+        } else {
+            // Double the size of the last buffer, but at least minSize
+            val newSize = maxOf(currentBuffer.size * 2, minSize)
+            currentBuffer = ByteArray(newSize)
+            buffers.add(currentBuffer)
+        }
+    }
+
+    public fun toByteArray(): ByteArray {
+        // Optimization: if we only have one buffer and it's exactly the right size
+        if (currentBufferIndex == 0 && totalSize == currentBuffer.size) {
+            return currentBuffer
+        }
+
+        // Combine all buffers
+        val result = ByteArray(totalSize)
+        var destPos = 0
+
+        // Copy all complete buffers (all except the last)
+        for (i in 0 until currentBufferIndex) {
+            val buffer = buffers[i]
+            System.arraycopy(buffer, 0, result, destPos, buffer.size)
+            destPos += buffer.size
+        }
+
+        // Copy the current (last) buffer - only the used portion
+        System.arraycopy(currentBuffer, 0, result, destPos, currentBufferPos)
+
+        return result
+    }
+
+    public fun size(): Int = totalSize
+
+    public fun reset() {
+        currentBufferIndex = 0
+        currentBufferPos = 0
+        currentBuffer = buffers[0]
+        totalSize = 0
+    }
+
+    override fun toString(): String {
+        return String(toByteArray())
+    }
+
+    public fun toString(charset: Charset): String {
+        return String(toByteArray(), charset)
+    }
+
+    public fun toString(charsetName: String): String {
+        return String(toByteArray(), Charset.forName(charsetName))
+    }
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/io/TeeOutputStream.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/TeeOutputStream.kt
new file mode 100644
index 00000000000..c10e9196e74
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/io/TeeOutputStream.kt
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * `TeeOutputStream` is an implementation of `OutputStream` that writes data to two underlying output streams.
+ * It is useful when data needs to be written to multiple destinations simultaneously.
+ *
+ * This stream ensures that data written to it is forwarded to both the `first` and `second` output streams.
+ * If an exception occurs while writing to one stream, it will still attempt to write to the other stream,
+ * collecting suppressed exceptions as necessary. The same behavior applies to `flush` and `close` operations.
+ *
+ * @constructor Creates a `TeeOutputStream` that writes to the specified `first` and `second` output streams.
+ * @param first The primary output stream to which data will be written.
+ * @param second The secondary output stream to which data will be written.
+ */
+public class TeeOutputStream(
+    private val first: OutputStream,
+    private val second: OutputStream
+) : OutputStream() {
+    @Volatile
+    private var closed: Boolean = false
+
+    @Synchronized
+    override fun write(b: Int) {
+        var exception: IOException? = null
+        try {
+            first.write(b)
+        } catch (e: IOException) {
+            exception = e
+        }
+        try {
+            second.write(b)
+        } catch (e: IOException) {
+            exception?.addSuppressed(e) ?: run { exception = e }
+        }
+        exception?.let { throw it }
+    }
+
+    override fun write(b: ByteArray) {
+        write(b, 0, b.size)
+    }
+
+    @Synchronized
+    override fun write(b: ByteArray, off: Int, len: Int) {
+        var exception: IOException? = null
+        try {
+            first.write(b, off, len)
+        } catch (e: IOException) {
+            exception = e
+        }
+        try {
+            second.write(b, off, len)
+        } catch (e: IOException) {
+            exception?.addSuppressed(e) ?: run { exception = e }
+        }
+        exception?.let { throw it }
+    }
+
+    @Synchronized
+    override fun flush() {
+        var exception: IOException? = null
+        try {
+            first.flush()
+        } catch (e: IOException) {
+            exception = e
+        }
+        try {
+            second.flush()
+        } catch (e: IOException) {
+            exception?.addSuppressed(e) ?: run { exception = e }
+        }
+        exception?.let { throw it }
+    }
+
+    override fun close() {
+        if (closed) {
+            return
+        }
+        synchronized(this) {
+            if (closed) {
+                return
+            }
+            closed = true
+        }
+        var exception: IOException? = null
+        try {
+            first.close()
+        } catch (e: IOException) {
+            exception = e
+        }
+        try {
+            second.close()
+        } catch (e: IOException) {
+            exception?.addSuppressed(e) ?: run { exception = e }
+        }
+        exception?.let { throw it }
+    }
+}
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/text/RandomStringGenerator.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/text/RandomStringGenerator.kt
new file mode 100644
index 00000000000..13f7e92392a
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/text/RandomStringGenerator.kt
@@ -0,0 +1,265 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.text
+
+import java.util.Random
+
+/**
+ * Random string generator with configurable character sets and proper Unicode support.
+ *
+ * @property random The random number generator to use
+ * @property charSource The source of characters to use for generation
+ */
+public class RandomStringGenerator(
+    private val random: Random,
+    private val charSource: CharSource = CharSource.Alphanumeric
+) {
+    /**
+     * Defines the source of characters for string generation
+     */
+    public sealed interface CharSource {
+        /**
+         * Generate from specific character ranges
+         */
+        public data class Ranges(val ranges: List<CharRange>) : CharSource
+
+        /**
+         * Generate from specific characters
+         */
+        public data class Chars(val chars: CharArray) : CharSource {
+            override fun equals(other: Any?): Boolean {
+                if (this === other) return true
+                if (other !is Chars) return false
+                return chars.contentEquals(other.chars)
+            }
+
+            override fun hashCode(): Int = chars.contentHashCode()
+        }
+
+        /**
+         * Generate any valid Unicode character (excluding surrogates when used alone)
+         */
+        public object AnyUnicode : CharSource
+
+        /**
+         * Generate alphanumeric characters (a-z, A-Z, 0-9)
+         */
+        public object Alphanumeric : CharSource
+
+        /**
+         * Generate ASCII printable characters (32-126)
+         */
+        public object AsciiPrintable : CharSource
+    }
+
+    /**
+     * Generate a random string with the specified number of characters.
+     *
+     * For Unicode generation with surrogate pairs:
+     * - When a high surrogate is generated, it's automatically paired with a low surrogate
+     * - The pair counts as 2 chars in Java's String representation
+     *
+     * @param chars The number of Java chars to generate (not code points)
+     * @return A random string of the specified length
+     */
+    public fun generate(chars: Int): String {
+        if (chars < 0) {
+            throw IllegalArgumentException("Number of chars must be non-negative, got: $chars")
+        }
+        if (chars == 0) {
+            return ""
+        }
+
+        return when (charSource) {
+            is CharSource.Ranges -> generateFromRanges(chars, charSource.ranges)
+            is CharSource.Chars -> generateFromChars(chars, charSource.chars)
+            is CharSource.AnyUnicode -> generateUnicode(chars)
+            is CharSource.Alphanumeric -> generateFromRanges(chars, ALPHANUMERIC_RANGES)
+            is CharSource.AsciiPrintable -> generateFromRange(chars, ' '..'~')
+        }
+    }
+
+    private fun generateFromRanges(length: Int, ranges: List<CharRange>): String {
+        if (ranges.isEmpty()) {
+            throw IllegalStateException("No character ranges provided")
+        }
+
+        val allChars = ranges.flatMap { range -> range.toList() }
+        if (allChars.isEmpty()) {
+            throw IllegalStateException("Character ranges are empty")
+        }
+
+        return buildString(length) {
+            repeat(length) {
+                append(allChars[random.nextInt(allChars.size)])
+            }
+        }
+    }
+
+    private fun generateFromRange(length: Int, range: CharRange): String {
+        val chars = range.toList()
+        return buildString(length) {
+            repeat(length) {
+                append(chars[random.nextInt(chars.size)])
+            }
+        }
+    }
+
+    private fun generateFromChars(length: Int, chars: CharArray): String {
+        if (chars.isEmpty()) {
+            throw IllegalStateException("Character array is empty")
+        }
+
+        return buildString(length) {
+            repeat(length) {
+                append(chars[random.nextInt(chars.size)])
+            }
+        }
+    }
+
+    private fun generateUnicode(targetLength: Int): String {
+        val result = StringBuilder(targetLength)
+        var currentLength = 0
+
+        while (currentLength < targetLength) {
+            // Generate a random code point from the entire Unicode range
+            // We'll generate from all valid Unicode code points
+            val codePoint = generateValidUnicodeCodePoint()
+
+            // Check if we have enough space for this code point
+            val charCount = Character.charCount(codePoint)
+            if (currentLength + charCount > targetLength) {
+                // Not enough space for a surrogate pair, generate a BMP character instead
+                val bmpCodePoint = generateBMPCodePoint()
+                result.appendCodePoint(bmpCodePoint)
+                currentLength++
+            } else {
+                result.appendCodePoint(codePoint)
+                currentLength += charCount
+            }
+        }
+
+        return result.toString()
+    }
+
+    /**
+     * Generate a valid Unicode code point, including those requiring surrogate pairs
+     */
+    private fun generateValidUnicodeCodePoint(): Int {
+        // Unicode code points range from 0x0000 to 0x10FFFF
+        // But we need to exclude:
+        // - Surrogate range: 0xD800 to 0xDFFF (these are not valid code points)
+        // - Non-characters and undefined code points
+
+        while (true) {
+            val codePoint = when (random.nextInt(3)) {
+                0 -> {
+                    // Basic Multilingual Plane (0x0000 - 0xFFFF, excluding surrogates)
+                    // More likely to generate BMP characters
+                    val cp = random.nextInt(0xD800) // 0x0000 to 0xD7FF
+                    if (Character.isDefined(cp)) cp else continue
+                }
+                1 -> {
+                    // BMP after surrogates (0xE000 - 0xFFFF)
+                    val cp = 0xE000 + random.nextInt(0x10000 - 0xE000)
+                    if (Character.isDefined(cp)) cp else continue
+                }
+                else -> {
+                    // Supplementary planes (0x10000 - 0x10FFFF)
+                    // These require surrogate pairs
+                    val cp = 0x10000 + random.nextInt(0x110000 - 0x10000)
+                    if (Character.isDefined(cp)) cp else continue
+                }
+            }
+
+            // Ensure it's a valid, defined code point
+            if (Character.isValidCodePoint(codePoint) && Character.isDefined(codePoint)) {
+                return codePoint
+            }
+        }
+    }
+
+    /**
+     * Generate a Basic Multilingual Plane code point (no surrogate pair needed)
+     */
+    private fun generateBMPCodePoint(): Int {
+        while (true) {
+            val codePoint = if (random.nextBoolean()) {
+                // Before surrogate range
+                random.nextInt(0xD800)
+            } else {
+                // After surrogate range
+                0xE000 + random.nextInt(0x10000 - 0xE000)
+            }
+
+            if (Character.isDefined(codePoint)) {
+                return codePoint
+            }
+        }
+    }
+
+    public companion object {
+        private val ALPHANUMERIC_RANGES = listOf(
+            'a'..'z',
+            'A'..'Z',
+            '0'..'9'
+        )
+
+        /**
+         * Create a generator for alphanumeric strings
+         */
+        @JvmStatic
+        public fun alphanumeric(random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.Alphanumeric)
+
+        /**
+         * Create a generator for ASCII printable strings
+         */
+        @JvmStatic
+        public fun asciiPrintable(random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.AsciiPrintable)
+
+        /**
+         * Create a generator for any Unicode strings (with proper surrogate pair handling)
+         */
+        @JvmStatic
+        public fun unicode(random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.AnyUnicode)
+
+        /**
+         * Create a generator from character ranges
+         */
+        @JvmStatic
+        public fun fromRanges(vararg ranges: CharRange, random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.Ranges(ranges.toList()))
+
+        /**
+         * Create a generator from specific characters
+         */
+        @JvmStatic
+        public fun fromChars(chars: CharArray, random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.Chars(chars))
+
+        /**
+         * Create a generator from a string of characters
+         */
+        @JvmStatic
+        public fun fromChars(chars: String, random: Random = Random()): RandomStringGenerator =
+            RandomStringGenerator(random, CharSource.Chars(chars.toCharArray()))
+    }
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStreamTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStreamTest.kt
new file mode 100644
index 00000000000..2745a611194
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/DirectAccessByteArrayOutputStreamTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class DirectAccessByteArrayOutputStreamTest {
+    @Test
+    fun testWriteSingleByte() {
+        val stream = DirectAccessByteArrayOutputStream()
+        stream.write(65) // ASCII for 'A'
+        val result = stream.toByteArray()
+        assertArrayEquals(byteArrayOf(65), result)
+    }
+
+    @Test
+    fun testWriteMultipleBytes() {
+        val stream = DirectAccessByteArrayOutputStream()
+        val data = byteArrayOf(65, 66, 67) // 'A', 'B', 'C'
+        stream.write(data, 0, data.size)
+        val result = stream.toByteArray()
+        assertArrayEquals(data, result)
+    }
+
+    @Test
+    fun testResizeBuffer() {
+        val stream = DirectAccessByteArrayOutputStream(2)
+        val data = ByteArray(10) { (it + 65).toByte() } // 'A', 'B', ..., 'J'
+        stream.write(data, 0, data.size)
+        val result = stream.toByteArray()
+        assertArrayEquals(data, result)
+    }
+
+    @Test
+    fun testReset() {
+        val stream = DirectAccessByteArrayOutputStream()
+        stream.write(65) // Write 'A'
+        stream.reset()
+        assertEquals(0, stream.size())
+        assertArrayEquals(byteArrayOf(), stream.toByteArray())
+    }
+
+    @Test
+    fun testToStringMethods() {
+        val stream = DirectAccessByteArrayOutputStream()
+        val data = "Hello, World!"
+        stream.write(data.toByteArray(Charsets.UTF_8))
+        assertEquals(data, stream.toString(Charsets.UTF_8))
+        assertEquals(data, stream.toString("UTF-8"))
+    }
+
+    @Test
+    fun testSize() {
+        val stream = DirectAccessByteArrayOutputStream()
+        stream.write(65) // Write 'A'
+        stream.write(66) // Write 'B'
+        assertEquals(2, stream.size())
+    }
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TeeOutputStreamTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TeeOutputStreamTest.kt
new file mode 100644
index 00000000000..6b05d2f0a79
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/io/TeeOutputStreamTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.io
+
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
+import java.io.ByteArrayOutputStream
+
+class TeeOutputStreamTest {
+    @Test
+    fun writeByte() {
+        val first = ByteArrayOutputStream()
+        val second = ByteArrayOutputStream()
+        val tee = TeeOutputStream(first, second)
+        tee.write(42)
+        assertAll(
+            { assertArrayEquals(byteArrayOf(42), first.toByteArray()) },
+            { assertArrayEquals(byteArrayOf(42), second.toByteArray()) },
+        )
+    }
+
+    @Test
+    fun writeArray() {
+        val first = ByteArrayOutputStream()
+        val second = ByteArrayOutputStream()
+        val tee = TeeOutputStream(first, second)
+        tee.write(byteArrayOf(42, 43))
+        tee.write(byteArrayOf(44))
+        assertAll(
+            { assertArrayEquals(byteArrayOf(42, 43, 44), first.toByteArray()) },
+            { assertArrayEquals(byteArrayOf(42, 43, 44), second.toByteArray()) },
+        )
+    }
+}
diff --git a/src/jorphan/src/test/kotlin/org/apache/jorphan/text/RandomStringGeneratorTest.kt b/src/jorphan/src/test/kotlin/org/apache/jorphan/text/RandomStringGeneratorTest.kt
new file mode 100644
index 00000000000..051f34915fc
--- /dev/null
+++ b/src/jorphan/src/test/kotlin/org/apache/jorphan/text/RandomStringGeneratorTest.kt
@@ -0,0 +1,258 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jorphan.text
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import java.util.Random
+
+class RandomStringGeneratorTest {
+
+    @Test
+    fun `alphanumeric generates only alphanumeric characters`() {
+        val generator = RandomStringGenerator.alphanumeric(Random(42))
+        val result = generator.generate(100)
+
+        assertEquals(100, result.length)
+        assertTrue(result.all { it.isLetterOrDigit() }) {
+            "String should contain only alphanumeric characters, but got: $result"
+        }
+    }
+
+    @Test
+    fun `alphanumeric with seed produces reproducible results`() {
+        val generator1 = RandomStringGenerator.alphanumeric(Random(12345))
+        val generator2 = RandomStringGenerator.alphanumeric(Random(12345))
+
+        val result1 = generator1.generate(50)
+        val result2 = generator2.generate(50)
+
+        assertEquals(result1, result2, "Same seed should produce same results")
+    }
+
+    @Test
+    fun `ascii printable generates only printable ASCII characters`() {
+        val generator = RandomStringGenerator.asciiPrintable(Random(42))
+        val result = generator.generate(100)
+
+        assertEquals(100, result.length)
+        assertTrue(result.all { it in ' '..'~' }) {
+            "String should contain only printable ASCII characters (32-126)"
+        }
+    }
+
+    @Test
+    fun `custom ranges generates only specified characters`() {
+        val generator = RandomStringGenerator.fromRanges('0'..'9', 'a'..'f', random = Random(42))
+        val result = generator.generate(100)
+
+        assertEquals(100, result.length)
+        assertTrue(result.all { it in '0'..'9' || it in 'a'..'f' }) {
+            "String should contain only hex digits (0-9, a-f)"
+        }
+    }
+
+    @Test
+    fun `custom chars generates only specified characters`() {
+        val vowels = "aeiouAEIOU"
+        val generator = RandomStringGenerator.fromChars(vowels, Random(42))
+        val result = generator.generate(100)
+
+        assertEquals(100, result.length)
+        assertTrue(result.all { it in vowels }) {
+            "String should contain only vowels"
+        }
+    }
+
+    @Test
+    fun `custom chars from array generates only specified characters`() {
+        val chars = charArrayOf('X', 'Y', 'Z')
+        val generator = RandomStringGenerator.fromChars(chars, Random(42))
+        val result = generator.generate(50)
+
+        assertEquals(50, result.length)
+        assertTrue(result.all { it in chars }) {
+            "String should contain only X, Y, or Z"
+        }
+    }
+
+    @Test
+    fun `unicode generation has correct character length`() {
+        val generator = RandomStringGenerator.unicode(Random(100))
+
+        listOf(5, 10, 20, 50, 100).forEach { targetLength ->
+            val result = generator.generate(targetLength)
+            assertEquals(targetLength, result.length) {
+                "Generated string should have exactly $targetLength chars"
+            }
+        }
+    }
+
+    @Test
+    fun `unicode generation has no orphaned surrogates`() {
+        val generator = RandomStringGenerator.unicode(Random(42))
+
+        repeat(10) {
+            val result = generator.generate(100)
+            assertNoOrphanedSurrogates(result)
+        }
+    }
+
+    @Test
+    fun `unicode generation eventually produces surrogate pairs`() {
+        val generator = RandomStringGenerator.unicode(Random(42))
+        var foundSurrogatePair = false
+
+        // Generate enough strings to likely encounter a surrogate pair
+        repeat(50) {
+            val result = generator.generate(50)
+            if (containsSurrogatePair(result)) {
+                foundSurrogatePair = true
+                return@repeat
+            }
+        }
+
+        assertTrue(foundSurrogatePair) {
+            "Should generate at least one surrogate pair in 50 attempts with 50 chars each"
+        }
+    }
+
+    @Test
+    fun `empty string generation`() {
+        val generator = RandomStringGenerator.alphanumeric(Random(42))
+        val result = generator.generate(0)
+
+        assertEquals("", result)
+        assertEquals(0, result.length)
+    }
+
+    @Test
+    fun `single character generation`() {
+        val generator = RandomStringGenerator.alphanumeric(Random(42))
+        val result = generator.generate(1)
+
+        assertEquals(1, result.length)
+        assertTrue(result[0].isLetterOrDigit())
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = [1, 5, 10, 50, 100, 500])
+    fun `various lengths produce correct size strings`(length: Int) {
+        val generator = RandomStringGenerator.alphanumeric(Random(42))
+        val result = generator.generate(length)
+
+        assertEquals(length, result.length)
+    }
+
+    @Test
+    fun `negative length throws exception`() {
+        val generator = RandomStringGenerator.alphanumeric(Random(42))
+
+        assertThrows(IllegalArgumentException::class.java) {
+            generator.generate(-1)
+        }
+    }
+
+    @Test
+    fun `empty character array throws exception`() {
+        val generator = RandomStringGenerator.fromChars(charArrayOf(), Random(42))
+
+        assertThrows(IllegalStateException::class.java) {
+            generator.generate(10)
+        }
+    }
+
+    @Test
+    fun `empty character ranges throws exception`() {
+        val generator = RandomStringGenerator.fromRanges(random = Random(42))
+
+        assertThrows(IllegalStateException::class.java) {
+            generator.generate(10)
+        }
+    }
+
+    @Test
+    fun `unicode with odd length near end handles surrogate pairs correctly`() {
+        val generator = RandomStringGenerator.unicode(Random(999))
+
+        // Test odd lengths to ensure we handle the case where we might not have
+        // enough space for a surrogate pair at the end
+        listOf(1, 3, 5, 7, 9, 11, 13, 15).forEach { length ->
+            val result = generator.generate(length)
+            assertEquals(length, result.length) {
+                "Generated string should have exactly $length chars"
+            }
+            assertNoOrphanedSurrogates(result)
+        }
+    }
+
+    @Test
+    fun `different random instances produce different results`() {
+        val generator1 = RandomStringGenerator.alphanumeric(Random(111))
+        val generator2 = RandomStringGenerator.alphanumeric(Random(222))
+
+        val result1 = generator1.generate(50)
+        val result2 = generator2.generate(50)
+
+        assertFalse(result1 == result2) {
+            "Different seeds should produce different results (unlikely but possible collision)"
+        }
+    }
+
+    // Helper functions
+
+    private fun assertNoOrphanedSurrogates(str: String) {
+        var idx = 0
+        while (idx < str.length) {
+            val ch = str[idx]
+            if (Character.isHighSurrogate(ch)) {
+                assertTrue(idx + 1 < str.length) {
+                    "High surrogate at index $idx must have a following character"
+                }
+                assertTrue(Character.isLowSurrogate(str[idx + 1])) {
+                    "High surrogate at index $idx must be followed by low surrogate"
+                }
+                idx += 2
+            } else {
+                assertFalse(Character.isLowSurrogate(ch)) {
+                    "Found orphaned low surrogate at index $idx"
+                }
+                idx++
+            }
+        }
+    }
+
+    private fun containsSurrogatePair(str: String): Boolean {
+        var idx = 0
+        while (idx < str.length) {
+            if (Character.isHighSurrogate(str[idx]) &&
+                idx + 1 < str.length &&
+                Character.isLowSurrogate(str[idx + 1])
+            ) {
+                return true
+            }
+            idx++
+        }
+        return false
+    }
+}
diff --git a/src/protocol/ftp/build.gradle.kts b/src/protocol/ftp/build.gradle.kts
index 18abceccede..cbf153e8c13 100644
--- a/src/protocol/ftp/build.gradle.kts
+++ b/src/protocol/ftp/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     implementation("commons-net:commons-net")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
 
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
index fc80e11d0c4..62825a8f6ec 100644
--- a/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+++ b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
@@ -32,9 +32,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.NullOutputStream;
-import org.apache.commons.io.output.TeeOutputStream;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
@@ -44,6 +41,8 @@
 import org.apache.jmeter.samplers.Interruptible;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.io.TeeOutputStream;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -233,18 +232,18 @@ public SampleResult sample(Entry e) {
                                 if (target==null) {
                                     target=output;
                                 } else {
-                                    target = new TeeOutputStream(output,baos);
+                                    target = new TeeOutputStream(output, baos);
                                 }
                             }
                             if (target == null){
-                                target = NullOutputStream.INSTANCE;
+                                target = OutputStream.nullOutputStream();
                             }
                             input = ftp.retrieveFileStream(remote);
                             if (input == null){// Could not access file or other error
                                 res.setResponseCode(Integer.toString(ftp.getReplyCode()));
                                 res.setResponseMessage(ftp.getReplyString());
                             } else {
-                                long bytes = IOUtils.copy(input,target);
+                                long bytes = input.transferTo(target);
                                 ftpOK = bytes > 0;
                                 if (saveResponse) {
                                     saveResponse(res, binaryTransfer, baos);
@@ -253,8 +252,8 @@ public SampleResult sample(Entry e) {
                                 }
                             }
                         } finally {
-                            IOUtils.closeQuietly(target, null);
-                            IOUtils.closeQuietly(output, null);
+                            JOrphanUtils.closeQuietly(target);
+                            JOrphanUtils.closeQuietly(output);
                         }
                     }
 
@@ -297,8 +296,8 @@ public SampleResult sample(Entry e) {
                     // NOOP
                 }
             }
-            IOUtils.closeQuietly(input, null);
-            IOUtils.closeQuietly(fileIS, null);
+            JOrphanUtils.closeQuietly(input);
+            JOrphanUtils.closeQuietly(fileIS);
         }
 
         res.sampleEnd();
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 2bc10d4ed68..20961567e4a 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -36,12 +36,7 @@ dependencies {
     }
 
     implementation("com.github.ben-manes.caffeine:caffeine")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
-    implementation("org.apache.commons:commons-text") {
-        because("StringEscapeUtils")
-    }
+    implementation("org.unbescape:unbescape")
     implementation("org.jodd:jodd-lagarto") {
         exclude("ch.qos.logback")
         exclude("commons-logging")
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
index 0038839b760..78f34c281d6 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/GraphQLUrlConfigGui.java
@@ -17,8 +17,6 @@
 
 package org.apache.jmeter.protocol.http.config.gui;
 
-import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
-
 import java.awt.Component;
 
 import javax.swing.BorderFactory;
@@ -96,10 +94,10 @@ public void modifyTestElement(TestElement element) {
                 queryContent.getText(), variablesContent.getText());
 
         String operationName = params.getOperationName();
-        element.setProperty(OPERATION_NAME, defaultIfEmpty(operationName, null));
-        element.setProperty(QUERY, defaultIfEmpty(params.getQuery(), null));
+        element.setProperty(OPERATION_NAME, StringUtilities.trimToNull(operationName));
+        element.setProperty(QUERY, StringUtilities.trimToNull(params.getQuery()));
         String variables = params.getVariables();
-        element.setProperty(VARIABLES, defaultIfEmpty(variables, null));
+        element.setProperty(VARIABLES, StringUtilities.trimToNull(variables));
         element.setProperty(HTTPSamplerBase.POST_BODY_RAW, !HTTPConstants.GET.equals(method));
 
         final Arguments args;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 57bc98f4216..d01bb6bcd82 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,7 +45,6 @@
 import org.apache.commons.cli.avalon.CLArgsParser;
 import org.apache.commons.cli.avalon.CLOption;
 import org.apache.commons.cli.avalon.CLOptionDescriptor;
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.protocol.http.control.AuthManager.Mechanism;
 import org.apache.jmeter.protocol.http.control.Authorization;
 import org.apache.jmeter.protocol.http.control.Cookie;
@@ -1038,7 +1038,7 @@ private static String readFromFile(String filePath) {
        File file = new File(filePath.trim());
        if (file.isFile() && file.exists()) {
            try {
-               return FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());
+               return Files.readString(file.toPath());
            } catch (IOException e) {
                LOGGER.error("Failed to read from File {}", filePath, e);
                throw new IllegalArgumentException("Failed to read from File " + filePath);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index ec97d54685c..5e78a1a0c59 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -28,7 +28,8 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -49,7 +50,6 @@
 import javax.swing.UIManager;
 import javax.swing.tree.TreePath;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.KeystoreConfig;
 import org.apache.jmeter.control.Controller;
@@ -805,9 +805,7 @@ public void localeChanged() {
     }
 
     public List<String> readFromFile(String pathname) throws IOException {
-        String encoding = StandardCharsets.UTF_8.name();
-        File file = new File(pathname);
-        return FileUtils.readLines(file, encoding);
+        return Files.readAllLines(Path.of(pathname));
     }
 
     public List<String> readFromTextPanel(String commands) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
index 30a6c9b8356..7a4baab3b4f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java
@@ -23,8 +23,8 @@
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
-import org.apache.commons.lang3.stream.Streams;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,7 +84,9 @@ public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[] data,
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Parsed: {}, got: {}", baseUrl,
-                        Streams.of(urlCollection).map(String::valueOf).collect(Collectors.joining(",")));
+                        StreamSupport.stream(urlCollection.spliterator(), false)
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(",")));
             }
 
             return urlCollection.iterator();
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
index 6e344287d5d..ccd93992d36 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java
@@ -23,11 +23,11 @@
 import java.util.Iterator;
 import java.util.Objects;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.unbescape.xml.XmlEscape;
 
 /**
  * Collection class designed for handling URLs
@@ -80,7 +80,7 @@ public boolean addURL(String url, URL baseUrl) {
         if (StringUtilities.isEmpty(url)) {
             return false;
         }
-        url=StringEscapeUtils.unescapeXml(url);
+        url=XmlEscape.unescapeXml(url);
         boolean b;
         try {
             b = this.add(ConversionUtils.makeRelativeURL(baseUrl, url));
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 7d4e986d272..e46fc9676b9 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -17,13 +17,12 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
-import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
@@ -35,7 +34,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.GraphQLRequestParams;
 import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
@@ -176,9 +174,9 @@ private static void detectAndModifySamplerOnGraphQLRequest(final HTTPSamplerBase
 
         if (params != null) {
             sampler.setProperty(TestElement.GUI_CLASS, GraphQLHTTPSamplerGui.class.getName());
-            sampler.setProperty(GraphQLUrlConfigGui.OPERATION_NAME, defaultIfEmpty(params.getOperationName(), null));
-            sampler.setProperty(GraphQLUrlConfigGui.QUERY, defaultIfEmpty(params.getQuery(), null));
-            sampler.setProperty(GraphQLUrlConfigGui.VARIABLES, defaultIfEmpty(params.getVariables(), null));
+            sampler.setProperty(GraphQLUrlConfigGui.OPERATION_NAME, StringUtilities.trimToNull(params.getOperationName()));
+            sampler.setProperty(GraphQLUrlConfigGui.QUERY, StringUtilities.trimToNull(params.getQuery()));
+            sampler.setProperty(GraphQLUrlConfigGui.VARIABLES, StringUtilities.trimToNull(params.getVariables()));
         }
     }
 
@@ -264,7 +262,7 @@ protected void computeFromPostBody(HTTPSamplerBase sampler,
                     try {
                         File tempDir = new File(getBinaryDirectory());
                         File out = File.createTempFile(request.getMethod(), getBinaryFileSuffix(), tempDir);
-                        FileUtils.writeByteArrayToFile(out,request.getRawPostData());
+                        Files.write(out.toPath(), request.getRawPostData());
                         HTTPFileArg [] files = {new HTTPFileArg(out.getPath(),"",contentType)};
                         sampler.setHTTPFiles(files);
                     } catch (IOException e) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
index 85b976c3f2a..7029c5519c4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java
@@ -22,9 +22,9 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.io.DirectAccessByteArrayOutputStream;
 
 /**
  * HTTP Sampler which can read from file: URLs
@@ -50,27 +50,27 @@ protected HTTPSampleResult sample(URL url, String method,
         res.setHTTPMethod(HTTPConstants.GET); // Dummy
         res.setURL(url);
         res.setSampleLabel(url.toString());
-        InputStream is = null;
         res.sampleStart();
         int bufferSize = 4096;
-        try ( org.apache.commons.io.output.ByteArrayOutputStream bos = new org.apache.commons.io.output.ByteArrayOutputStream(bufferSize) ) {
+        try (DirectAccessByteArrayOutputStream bos = new DirectAccessByteArrayOutputStream(bufferSize) ) {
             byte[] responseData;
             URLConnection conn = url.openConnection();
-            is = conn.getInputStream();
-            byte[] readBuffer = new byte[bufferSize];
-            int bytesReadInBuffer = 0;
             long totalBytes = 0;
-            boolean storeInBOS = true;
-            while ((bytesReadInBuffer = is.read(readBuffer)) > -1) {
-                if(storeInBOS) {
-                    if(totalBytes+bytesReadInBuffer<=MAX_BYTES_TO_STORE_PER_REQUEST) {
-                        bos.write(readBuffer, 0, bytesReadInBuffer);
-                    } else {
-                        bos.write(readBuffer, 0, (int)(MAX_BYTES_TO_STORE_PER_REQUEST-totalBytes));
-                        storeInBOS = false;
+            try (InputStream is = conn.getInputStream()){
+                byte[] readBuffer = new byte[bufferSize];
+                int bytesReadInBuffer = 0;
+                boolean storeInBOS = true;
+                while ((bytesReadInBuffer = is.read(readBuffer)) > -1) {
+                    if (storeInBOS) {
+                        if (totalBytes + bytesReadInBuffer <= MAX_BYTES_TO_STORE_PER_REQUEST) {
+                            bos.write(readBuffer, 0, bytesReadInBuffer);
+                        } else {
+                            bos.write(readBuffer, 0, (int) (MAX_BYTES_TO_STORE_PER_REQUEST - totalBytes));
+                            storeInBOS = false;
+                        }
                     }
+                    totalBytes += bytesReadInBuffer;
                 }
-                totalBytes += bytesReadInBuffer;
             }
             responseData = bos.toByteArray();
             res.sampleEnd();
@@ -95,9 +95,6 @@ protected HTTPSampleResult sample(URL url, String method,
             return res;
         } catch (IOException e) {
             return errorResult(e, res);
-        } finally {
-            IOUtils.closeQuietly(is, null);
         }
-
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
index 69648673b48..527ed485aad 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
@@ -33,7 +33,6 @@
 import java.util.function.Predicate;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.commons.io.input.BoundedInputStream;
 import org.apache.jmeter.protocol.http.control.AuthManager;
 import org.apache.jmeter.protocol.http.control.Authorization;
 import org.apache.jmeter.protocol.http.control.CacheManager;
@@ -46,6 +45,7 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.SSLManager;
+import org.apache.jorphan.io.CountingInputStream;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -242,9 +242,9 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
         // works OK even if ContentEncoding is null
         boolean gzipped = HTTPConstants.ENCODING_GZIP.equals(conn.getContentEncoding());
 
-        BoundedInputStream instream = null;
+        CountingInputStream instream = null;
         try {
-            instream = BoundedInputStream.builder().setInputStream(conn.getInputStream()).get();
+            instream = new CountingInputStream(conn.getInputStream());
             if (gzipped) {
                 in = new GZIPInputStream(instream);
             } else {
@@ -296,7 +296,7 @@ protected byte[] readResponse(HttpURLConnection conn, SampleResult res) throws I
         // N.B. this closes 'in'
         byte[] responseData = readResponse(res, in, contentLength);
         if (instream != null) {
-            res.setBodySize(instream.getCount());
+            res.setBodySize(instream.getBytesRead());
             instream.close();
         }
         return responseData;
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 45628aeed21..6c3ef08bdd3 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -20,7 +20,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -44,7 +43,6 @@
 import java.util.function.Predicate;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -62,7 +60,6 @@
 import org.apache.jmeter.protocol.http.parser.LinkExtractorParser;
 import org.apache.jmeter.protocol.http.sampler.ResourcesDownloader.AsynSamplerResultHolder;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jmeter.protocol.http.util.DirectAccessByteArrayOutputStream;
 import org.apache.jmeter.protocol.http.util.EncoderCache;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -84,6 +81,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.io.DirectAccessByteArrayOutputStream;
 import org.apache.jorphan.util.ExceptionUtils;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
@@ -1921,7 +1919,7 @@ public void testIterationStart(LoopIterationEvent event) {
      */
     public byte[] readResponse(SampleResult sampleResult, InputStream in, long length) throws IOException {
 
-        OutputStream w = null;
+        DirectAccessByteArrayOutputStream w = null;
         try (Closeable ignore = in) { // NOSONAR No try with resource as performance is critical here
             byte[] readBuffer = new byte[8192]; // 8kB is the (max) size to have the latency ('the first packet')
             int bufferSize = 32;// Enough for MD5
@@ -1951,13 +1949,8 @@ public byte[] readResponse(SampleResult sampleResult, InputStream in, long lengt
                 if (first) {
                     sampleResult.latencyEnd();
                     first = false;
-                    if(md == null) {
-                        if(!knownResponseLength) {
-                            w = new org.apache.commons.io.output.ByteArrayOutputStream(bufferSize);
-                        }
-                        else {
-                            w = new DirectAccessByteArrayOutputStream(bufferSize);
-                        }
+                    if (md == null) {
+                        w = new DirectAccessByteArrayOutputStream(knownResponseLength ? bufferSize : 8192);
                     }
                 }
 
@@ -1985,7 +1978,7 @@ public byte[] readResponse(SampleResult sampleResult, InputStream in, long lengt
             }
 
             if (md == null) {
-                return toByteArray(w);
+                return w.toByteArray();
             } else {
                 byte[] md5Result = md.digest();
                 sampleResult.setBytes(totalBytes);
@@ -1993,27 +1986,8 @@ public byte[] readResponse(SampleResult sampleResult, InputStream in, long lengt
             }
 
         } finally {
-            IOUtils.closeQuietly(w, null);
-        }
-    }
-
-    /**
-     * Optimized method to get byte array from {@link OutputStream}
-     * @param w {@link OutputStream}
-     * @return byte array
-     */
-    private static byte[] toByteArray(OutputStream w) {
-        if(w instanceof DirectAccessByteArrayOutputStream directAccessByteArrayOutputStream) {
-            return directAccessByteArrayOutputStream.toByteArray();
-        }
-
-        if(w instanceof org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream) {
-            return byteArrayOutputStream.toByteArray();
+            JOrphanUtils.closeQuietly(w);
         }
-
-        log.warn("Unknown stream type {}", w.getClass());
-
-        return null;
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
index 8cc29d8cdd6..21a413ec768 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java
@@ -28,6 +28,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
@@ -376,7 +377,7 @@ private static void writeFileToStream(String filename, OutputStream out) throws
         // uploads were being done. Could be fixed by increasing the evacuation
         // ratio in bin/jmeter[.bat], but this is better.
         int read;
-        try (InputStream in = Files.newInputStream(Paths.get(filename))) {
+        try (InputStream in = Files.newInputStream(Path.of(filename))) {
             while ((read = in.read(buf)) > 0) {
                 out.write(buf, 0, read);
             }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java
deleted file mode 100644
index 5f4fd604687..00000000000
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.http.util;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Arrays;
-
-/**
- * this is a non thread-safe specialization of java {@link ByteArrayOutputStream}
- * it returns the internal buffer if its size matches the byte count
- *
- * @since 3.1
- */
-public class DirectAccessByteArrayOutputStream extends ByteArrayOutputStream {
-
-    public DirectAccessByteArrayOutputStream(int initialSize) {
-        super(initialSize);
-    }
-
-    @Override
-    @SuppressWarnings({"sync-override", "UnsynchronizedOverridesSynchronized"})
-    public byte[] toByteArray() {
-        // no need to copy the buffer if it has the right size
-        // avoid an unneeded memory allocation
-        if(this.count == this.buf.length) {
-            return this.buf;
-        }
-
-        return Arrays.copyOf(buf, count);
-    }
-
-}
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
index d7be1f145e9..0efc161cd3a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java
@@ -24,14 +24,14 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.jmeter.protocol.http.control.Cookie;
 import org.apache.jmeter.protocol.http.curl.ArgumentHolder;
 import org.apache.jmeter.protocol.http.curl.BasicCurlParser;
@@ -367,8 +367,7 @@ public void testDuplicatedKeyInData() {
 
     @Test
     public void testDataReadFromFile() throws IOException {
-        String encoding = StandardCharsets.UTF_8.name();
-        FileUtils.writeStringToFile(tempFile, "name=test" + System.lineSeparator(), encoding, true);
+        Files.writeString(tempFile.toPath(), "name=test" + System.lineSeparator(), StandardOpenOption.CREATE, StandardOpenOption.APPEND);
         String pathname = tempFile.getAbsolutePath();
         String cmdLine = "curl 'https://www.w3schools.com/html/tryit.asp?filename=tryhtml_form_submit/action_page.php' "
                 + "-H 'cache-control: no-cache' --data '@" + pathname + "' ";
@@ -421,8 +420,7 @@ public void testDataUrlEncodeMoreThanOneParameters() {
 
     @Test
     public void testDataUrlEncodeFromFile() throws IOException {
-        String encoding = StandardCharsets.UTF_8.name();
-        FileUtils.writeStringToFile(tempFile, "test", encoding, true);
+        Files.writeString(tempFile.toPath(), "test", StandardOpenOption.CREATE, StandardOpenOption.APPEND);
         String pathname = tempFile.getAbsolutePath();
         String cmdLine = "curl 'https://www.w3schools.com/html/tryit.asp?filename=tryhtml_form_submit/action_page.php' "
                 + "-H 'cache-control: no-cache' --data-urlencode 'name@" + pathname + "' ";
@@ -434,8 +432,7 @@ public void testDataUrlEncodeFromFile() throws IOException {
 
     @Test
     public void testDataUrlEncodeWith2AtSymbol() throws IOException {
-        String encoding = StandardCharsets.UTF_8.name();
-        FileUtils.writeStringToFile(tempFile, "test@", encoding, true);
+        Files.writeString(tempFile.toPath(), "test@", StandardOpenOption.CREATE, StandardOpenOption.APPEND);
         String pathname = tempFile.getAbsolutePath();
         String cmdLine = "curl 'https://www.w3schools.com/html/tryit.asp?filename=tryhtml_form_submit/action_page.php' "
                 + "-H 'cache-control: no-cache' --data-urlencode 'name@" + pathname + "' ";
@@ -447,8 +444,7 @@ public void testDataUrlEncodeWith2AtSymbol() throws IOException {
 
     @Test
     public void testDataBinaryReadFromFile() throws IOException {
-        String encoding = StandardCharsets.UTF_8.name();
-        FileUtils.writeStringToFile(tempFile, "name=test" + System.lineSeparator(), encoding, true);
+        Files.writeString(tempFile.toPath(), "name=test" + System.lineSeparator(), StandardOpenOption.CREATE, StandardOpenOption.APPEND);
         String pathname = tempFile.getAbsolutePath();
         String cmdLine = "curl 'https://www.w3schools.com/html/tryit.asp?filename=tryhtml_form_submit/action_page.php' "
                 + "-H 'cache-control: no-cache' --data-binary '@" + pathname + "' ";
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
index 8a5e00d644b..dad2b77db0a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
@@ -30,7 +30,6 @@
 import java.net.URI;
 import java.net.URL;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -333,7 +332,7 @@ public void testResponseLength() throws Exception {
         conn.addRequestProperty("X-ResponseLength", "10");
         conn.connect();
         final InputStream inputStream = conn.getInputStream();
-        assertEquals(10, IOUtils.toByteArray(inputStream).length);
+        assertEquals(10, inputStream.readAllBytes().length);
         inputStream.close();
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index 41d9c96e9f1..254bd633cdb 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -41,7 +41,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.StringUtilities;
@@ -327,7 +326,7 @@ private static void filetest(HTMLParser p, String file, String url, String resul
         String parserName = p.getClass().getName().substring("org.apache.jmeter.protocol.http.parser.".length());
         String fname = file.substring(file.indexOf('/')+1);
         log.debug("file   {}", file);
-        byte[] buffer = IOUtils.toByteArray(getInputStream(file));
+        byte[] buffer = getInputStream(file).readAllBytes();
         Iterator<URL> result;
         if (c == null) {
             result = p.getEmbeddedResourceURLs(userAgent, buffer, new URL(url), System.getProperty("file.encoding"));
diff --git a/src/protocol/java/build.gradle.kts b/src/protocol/java/build.gradle.kts
index bd0f3484421..3ba61c6c644 100644
--- a/src/protocol/java/build.gradle.kts
+++ b/src/protocol/java/build.gradle.kts
@@ -22,10 +22,6 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
-
     testImplementation(testFixtures(projects.src.core))
     testImplementation(projects.src.functions) {
         because("We need __counter function for tests")
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
index 9a94bdf62b8..53a35070d4c 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
@@ -17,9 +17,9 @@
 
 package org.apache.jmeter.protocol.java.sampler;
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -27,7 +27,6 @@
 import org.apache.bsf.BSFEngine;
 import org.apache.bsf.BSFException;
 import org.apache.bsf.BSFManager;
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.util.ConfigMergabilityIndicator;
 import org.apache.jmeter.samplers.Entry;
@@ -90,10 +89,7 @@ public SampleResult sample(Entry e)// Entry tends to be ignored ...
             Object bsfOut = null;
             if (!fileName.isEmpty()) {
                 res.setSamplerData("File: "+fileName);
-                try (FileInputStream fis = new FileInputStream(fileName);
-                        BufferedInputStream is = new BufferedInputStream(fis)) {
-                    bsfOut = bsfEngine.eval(fileName, 0, 0, IOUtils.toString(is, Charset.defaultCharset()));
-                }
+                bsfOut = bsfEngine.eval(fileName, 0, 0, Files.readString(Path.of(fileName), Charset.defaultCharset()));
             } else {
                 res.setSamplerData(request);
                 bsfOut = bsfEngine.eval("script", 0, 0, request);
diff --git a/src/protocol/jdbc/build.gradle.kts b/src/protocol/jdbc/build.gradle.kts
index 2b5521c6ca9..01fd7f8b4c2 100644
--- a/src/protocol/jdbc/build.gradle.kts
+++ b/src/protocol/jdbc/build.gradle.kts
@@ -23,9 +23,6 @@ dependencies {
     api(projects.src.core)
 
     implementation("org.apache.commons:commons-dbcp2")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
 
     testImplementation(testFixtures(projects.src.core))
     testImplementation("io.mockk:mockk")
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index 57521582185..1b7d5b0743e 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
@@ -42,7 +43,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testelement.AbstractTestElement;
@@ -52,6 +52,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import kotlin.io.TextStreamsKt;
+
 /**
  * A base class for all JDBC test elements handling the basics of a SQL request.
  *
@@ -330,12 +332,12 @@ private static void putIntoVar(final JMeterVariables jmvars, final String name,
                 try (Reader reader = clob.getCharacterStream(0,MAX_RETAIN_SIZE)) {
                     jmvars.put(
                             name,
-                            IOUtils.toString(reader)
+                            TextStreamsKt.readText(reader)
                             + "<result cut off, it is too big>");
                 }
             } else {
                 try (Reader reader = clob.getCharacterStream()) {
-                    jmvars.put(name, IOUtils.toString(reader));
+                    jmvars.put(name, TextStreamsKt.readText(reader));
                 }
             }
         } catch (IOException e) {
@@ -346,20 +348,17 @@ private static void putIntoVar(final JMeterVariables jmvars, final String name,
     private void putIntoVar(final JMeterVariables jmvars, final String name,
             final Blob blob) throws SQLException {
         if (RS_STORE_AS_OBJECT.equals(resultSetHandler)) {
-            try {
-                long length = Math.max(blob.length(), MAX_RETAIN_SIZE);
-                jmvars.putObject(name,
-                        IOUtils.toByteArray(blob.getBinaryStream(0, length)));
-            } catch (IOException e) {
-                log.warn("Could not read BLOB into {} as object.", name, e);
-            }
+            long length = Math.max(blob.length(), MAX_RETAIN_SIZE);
+            jmvars.putObject(name,
+                    blob.getBytes(0, Math.toIntExact(length)));
         } else if (RS_COUNT_RECORDS.equals(resultSetHandler)) {
             jmvars.put(name, blob.length() + " bytes");
         } else {
             try {
                 long length = Math.max(blob.length(), MAX_RETAIN_SIZE);
-                try (InputStream is = blob.getBinaryStream(0, length)) {
-                    jmvars.put(name, IOUtils.toString(is, ENCODING));
+                try (InputStream is = blob.getBinaryStream(0, length);
+                     InputStreamReader reader = new InputStreamReader(is, ENCODING)) {
+                    jmvars.put(name, TextStreamsKt.readText(reader));
                 }
             } catch (IOException e) {
                 log.warn("Can't convert BLOB to String using {}", ENCODING, e);
diff --git a/src/protocol/jms/build.gradle.kts b/src/protocol/jms/build.gradle.kts
index b65f2764f75..e3318dce21e 100644
--- a/src/protocol/jms/build.gradle.kts
+++ b/src/protocol/jms/build.gradle.kts
@@ -28,9 +28,6 @@ dependencies {
     // TODO: technically speaking, jms_1.1_spec should be compileOnly
     // since we either include a JMS implementation or we can't use JMS at all
     implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
     implementation("com.miglayout:miglayout-swing")
 
     testImplementation(testFixtures(projects.src.core))
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
index 2f44ae58565..2193e5c79b0 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
@@ -17,9 +17,7 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import java.io.PrintWriter;
 import java.io.Serializable;
-import java.io.StringWriter;
 import java.lang.reflect.Modifier;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -37,7 +35,6 @@
 import javax.jms.Message;
 import javax.naming.NamingException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jmeter.protocol.jms.client.ClientPool;
@@ -52,6 +49,7 @@
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.ExceptionUtils;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -282,10 +280,11 @@ private void handleError(SampleResult result, Exception e, boolean checkForRecon
         if (e instanceof JMSException jms) {
 
             String errorCode = Optional.ofNullable(jms.getErrorCode()).orElse("");
+            Publisher publisher = this.publisher;
             if (checkForReconnect && publisher != null && getIsReconnectErrorCode().test(errorCode)) {
                 ClientPool.removeClient(publisher);
-                IOUtils.closeQuietly(publisher, null);
-                publisher = null;
+                JOrphanUtils.closeQuietly(this.publisher);
+                this.publisher = null;
             }
 
             result.setResponseCode(errorCode);
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
index 37a1b7d2f83..af350c8c217 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
@@ -28,7 +28,6 @@
 import javax.jms.TextMessage;
 import javax.naming.NamingException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jmeter.protocol.jms.client.InitialContextFactory;
 import org.apache.jmeter.protocol.jms.client.ReceiveSubscriber;
@@ -38,6 +37,7 @@
 import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -256,7 +256,7 @@ private void handleErrorAndAddTemporize(boolean reconnect) {
      *
      */
     private void cleanup() {
-        IOUtils.closeQuietly(SUBSCRIBER, null);
+        JOrphanUtils.closeQuietly(SUBSCRIBER);
     }
 
     /**
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
index 23db838eba2..c388afa34e3 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui;
 
@@ -61,7 +61,7 @@ public byte[] getValueFromFile(String filename, String encoding, boolean hasVari
 
     byte[] getContent(String filename) {
         try {
-            return Files.readAllBytes(Paths.get(filename));
+            return Files.readAllBytes(Path.of(filename));
         } catch (IOException e) {
             throw new RuntimeException(format("Can't read content of %s", filename), e);
         }
diff --git a/src/protocol/ldap/build.gradle.kts b/src/protocol/ldap/build.gradle.kts
index f1a1e0c15aa..aefb6fe89a4 100644
--- a/src/protocol/ldap/build.gradle.kts
+++ b/src/protocol/ldap/build.gradle.kts
@@ -22,9 +22,7 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("org.apache.commons:commons-text") {
-        because("StringEscapeUtils")
-    }
+    implementation("org.unbescape:unbescape")
 
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
index 8d02ea05d55..58e85c61949 100644
--- a/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
+++ b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
@@ -38,7 +38,6 @@
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchResult;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -57,6 +56,7 @@
 import org.apache.jorphan.util.XMLBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.unbescape.xml.XmlEscape;
 
 /*******************************************************************************
  * Ldap Sampler class is main class for the LDAP test. This will control all the
@@ -809,7 +809,7 @@ public SampleResult sample(Entry e) {
                 final String countLimit = getCountlim();
 
                 res.setSamplerData("Search with filter " + searchFilter);
-                xmlBuffer.tag("searchfilter", StringEscapeUtils.escapeXml10(searchFilter)); // $NON-NLS-1$
+                xmlBuffer.tag("searchfilter", XmlEscape.escapeXml10(searchFilter)); // $NON-NLS-1$
                 xmlBuffer.tag("baseobj",getRootdn()); // $NON-NLS-1$
                 xmlBuffer.tag("searchbase",searchBase);// $NON-NLS-1$
                 xmlBuffer.tag("scope" , scopeStr); // $NON-NLS-1$
@@ -1021,12 +1021,12 @@ private static String normaliseSearchDN(final SearchResult sr, final String sear
     private static String getWriteValue(final Object value) {
         if (value instanceof String s) {
             // assume it's sensitive data
-            return StringEscapeUtils.escapeXml10(s);
+            return XmlEscape.escapeXml10(s);
         }
         if (value instanceof byte[] bytes) {
-            return StringEscapeUtils.escapeXml10(new String(bytes, StandardCharsets.UTF_8));
+            return XmlEscape.escapeXml10(new String(bytes, StandardCharsets.UTF_8));
         }
-        return StringEscapeUtils.escapeXml10(value.toString());
+        return XmlEscape.escapeXml10(value.toString());
     }
 
     @Override
diff --git a/src/protocol/mail/build.gradle.kts b/src/protocol/mail/build.gradle.kts
index 6128add8a84..204f331e2d0 100644
--- a/src/protocol/mail/build.gradle.kts
+++ b/src/protocol/mail/build.gradle.kts
@@ -30,9 +30,5 @@ dependencies {
     // This is an API-only jar. javax.activation is present in Java 8,
     // however it is not there in Java 9
     compileOnly("javax.activation:javax.activation-api")
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
-
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
index 20448236a0f..a953677a136 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
@@ -40,7 +40,6 @@
 import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.MimeUtility;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.protocol.smtp.sampler.gui.SecuritySettingsPanel;
 import org.apache.jmeter.protocol.smtp.sampler.protocol.LocalTrustStoreSSLSocketFactory;
@@ -354,7 +353,7 @@ private static void appendMessageData(SampleResult child, Message message)
         if (content instanceof MimeMultipart mimeMultipart) {
             appendMultiPart(child, cdata, mimeMultipart);
         } else if (content instanceof InputStream inputStream){
-            child.setResponseData(IOUtils.toByteArray(inputStream));
+            child.setResponseData(inputStream.readAllBytes());
         } else {
             cdata.append(content);
             child.setResponseData(cdata.toString(),child.getDataEncodingNoDefault());
@@ -380,7 +379,7 @@ private static void appendMultiPart(SampleResult child, StringBuilder cdata,
             sr.setEncodingAndType(contentType);
             sr.sampleStart();
             if (bodyPartContent instanceof InputStream inputStream){
-                sr.setResponseData(IOUtils.toByteArray(inputStream));
+                sr.setResponseData(inputStream.readAllBytes());
             } else if (bodyPartContent instanceof MimeMultipart mimeMultipart){
                 appendMultiPart(sr, cdata, mimeMultipart);
             } else {
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
index 6bb7c9f1992..8f5d63dd6ec 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,9 +42,6 @@
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeUtility;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.CountingOutputStream;
-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.protocol.smtp.sampler.gui.SecuritySettingsPanel;
 import org.apache.jmeter.protocol.smtp.sampler.protocol.SendMailCommand;
@@ -53,6 +51,7 @@
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.apache.jorphan.io.CountingOutputStream;
 import org.apache.jorphan.util.CharUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -190,9 +189,9 @@ private static boolean executeMessage(SampleResult result, SendMailCommand sendM
     private long calculateMessageSize(Message message) throws IOException, MessagingException {
         if (getPropertyAsBoolean(MESSAGE_SIZE_STATS)) {
             // calculate message size
-            CountingOutputStream cs = new CountingOutputStream(NullOutputStream.INSTANCE);
+            CountingOutputStream cs = new CountingOutputStream(OutputStream.nullOutputStream());
             message.writeTo(cs);
-            return cs.getByteCount();
+            return cs.getBytesWritten();
         } else {
             return -1L;
         }
@@ -201,7 +200,7 @@ private long calculateMessageSize(Message message) throws IOException, Messaging
     private static byte[] processSampler(Message message) throws IOException, MessagingException {
         // process the sampler result
         try (InputStream is = message.getInputStream()) {
-            return IOUtils.toByteArray(is);
+            return is.readAllBytes();
         }
     }
 
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
index 7c00f4fae2f..36331e713c4 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
@@ -22,8 +22,8 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -43,7 +43,6 @@
 import javax.mail.internet.MimeMultipart;
 import javax.net.ssl.SSLContext;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.property.CollectionProperty;
@@ -185,10 +184,7 @@ private Message buildMessage() throws MessagingException, IOException {
                (attachmentCount == 0 ||  (mailBody.isEmpty() && attachmentCount == 1))) {
                 if (attachmentCount == 1) { // i.e. mailBody is empty
                     File first = attachments.get(0);
-                    try (FileInputStream fis = new FileInputStream(first);
-                            InputStream is = new BufferedInputStream(fis)){
-                        message.setText(IOUtils.toString(is, Charset.defaultCharset()));
-                    }
+                    message.setText(Files.readString(first.toPath(), Charset.defaultCharset()));
                 } else {
                     message.setText(mailBody);
                 }
diff --git a/src/protocol/tcp/build.gradle.kts b/src/protocol/tcp/build.gradle.kts
index 49ccaad424b..0ea60237494 100644
--- a/src/protocol/tcp/build.gradle.kts
+++ b/src/protocol/tcp/build.gradle.kts
@@ -22,9 +22,5 @@ plugins {
 dependencies {
     api(projects.src.core)
 
-    implementation("commons-io:commons-io") {
-        because("IOUtils")
-    }
-
     testImplementation(testFixtures(projects.src.core))
 }
diff --git a/src/testkit/src/main/java/org/apache/jmeter/testkit/ResourceLocator.java b/src/testkit/src/main/java/org/apache/jmeter/testkit/ResourceLocator.java
index 8c5682769bc..56d1958d98b 100644
--- a/src/testkit/src/main/java/org/apache/jmeter/testkit/ResourceLocator.java
+++ b/src/testkit/src/main/java/org/apache/jmeter/testkit/ResourceLocator.java
@@ -20,7 +20,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 public interface ResourceLocator {
     default String getResource(String path) {
@@ -54,7 +53,7 @@ static Path getResourcePath(Class<?> basetype, String path) {
         }
         Path nioPath;
         try {
-            nioPath = Paths.get(url.toURI());
+            nioPath = Path.of(url.toURI());
         } catch (URISyntaxException e) {
             throw new IllegalStateException(e);
         }
diff --git a/xdocs/package.json b/xdocs/package.json
index 122ec167ccf..9c5d7c1712c 100644
--- a/xdocs/package.json
+++ b/xdocs/package.json
@@ -3,6 +3,9 @@
   "version": "1.0.0",
   "description": "Web fonts for Apache JMeter documentation",
   "private": true,
+  "scripts": {
+    "convert:properties": "node tools/convert-properties.js"
+  },
   "dependencies": {
     "@fontsource/merriweather": "^5.1.0",
     "@fortawesome/fontawesome-free": "^6.5.0"

From aea29bd56bf4c6f00484f5cf16806211c9e9368d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 7 Nov 2025 21:09:42 +0000
Subject: [PATCH 0952/1037] fix(deps): update com.google.errorprone to v2.44.0

---
 .../kotlin/build-logic.errorprone.gradle.kts   |  2 +-
 gradle/verification-metadata.xml               | 18 +++++++++++++-----
 src/bom-thirdparty/build.gradle.kts            |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 9ba1fa07a92..990049cc60c 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -30,7 +30,7 @@ if (buildParameters.enableErrorprone) {
 
     dependencies {
         "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.0"))
-        "errorprone"("com.google.errorprone:error_prone_core:2.43.0")
+        "errorprone"("com.google.errorprone:error_prone_core:2.44.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 184efb35c76..352f4396d06 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -32,6 +32,7 @@
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
+         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito" name="mockito-bom"/>
          <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
@@ -47,6 +48,7 @@
          <trusted-key id="2655176F748FD83725B4805FF2A01147D830C125" group="org.testcontainers"/>
          <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
+         <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
          <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier"/>
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
             <trusting group="commons-beanutils"/>
@@ -136,6 +138,7 @@
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
+         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
          <trusted-key id="AA782B04ABD9E36CF3096037B59D3D0F9F9C8684" group="org.apache.cxf"/>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt"/>
@@ -542,6 +545,11 @@
             <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="5.20.0">
+         <artifact name="mockito-bom-5.20.0.pom">
+            <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
+         </artifact>
+      </component>
       <component group="org.nodejs" name="node" version="25.1.0">
          <artifact name="node-25.1.0-darwin-arm64.tar.gz">
             <sha256 value="811dcf54580d9eef0abfed9f65457545d2aac8e24853b6e638194fcba0257168" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
@@ -565,11 +573,6 @@
             <sha256 value="abab8d2fff33dad361e51b51dfadd1f8aaef8677f88d21e3cccaf7b6e6f46339" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-bom" version="5.20.0">
-         <artifact name="mockito-bom-5.20.0.pom">
-            <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
-         </artifact>
-      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -583,6 +586,11 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.ow2" name="ow2" version="1.5.1">
          <artifact name="ow2-1.5.1.pom">
             <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 9a8e1e683ae..7eaf9a20e29 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
         api("com.github.weisj:darklaf-theme:3.1.1")
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
-        api("com.google.errorprone:error_prone_annotations:2.43.0")
+        api("com.google.errorprone:error_prone_annotations:2.44.0")
         api("com.helger.commons:ph-commons:12.0.4")
         api("com.helger:ph-css:8.0.1")
         api("com.jayway.jsonpath:json-path:2.10.0")

From 53f9be8ea1a4cf2aa2d8b4703449fa8fc673a5a1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 7 Nov 2025 21:55:05 +0000
Subject: [PATCH 0953/1037] fix(deps): update dependency
 com.helger.commons:ph-commons to v12.1.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 7eaf9a20e29..d14de776d41 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.44.0")
-        api("com.helger.commons:ph-commons:12.0.4")
+        api("com.helger.commons:ph-commons:12.1.0")
         api("com.helger:ph-css:8.0.1")
         api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:5.3")

From 5b1dfc6ba3156e19bd12f557fa719404d2a221c9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 7 Nov 2025 21:58:03 +0000
Subject: [PATCH 0954/1037] fix(deps): update dependency
 commons-codec:commons-codec to v1.20.0

---
 gradle/verification-metadata.xml    | 39 ++++++++++++++++++++++++++++-
 src/bom-thirdparty/build.gradle.kts |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 352f4396d06..3fe759aaec8 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -16,7 +16,10 @@
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah"/>
          <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
-         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5" group="org.glassfish.jaxb"/>
+         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
+            <trusting group="com.sun.xml.bind" name="jaxb-bom-ext" version="4.0.6"/>
+            <trusting group="org.glassfish.jaxb"/>
+         </trusted-key>
          <trusted-key id="050A37A2E0577F4BAA095B52602EC18D20C4661C">
             <trusting group="com.thoughtworks.xstream"/>
             <trusting group="io.github.x-stream"/>
@@ -173,6 +176,7 @@
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
          <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
          <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist"/>
+         <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3"/>
          <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="com.google.errorprone"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
@@ -270,14 +274,26 @@
             <sha256 value="85a8106475e7ca345c4e604a659345794516056c7f974ce9f8c72011a13f11d5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.helger" name="parent-pom" version="3.0.2">
+         <artifact name="parent-pom-3.0.2.pom">
+            <sha256 value="68bacfbecc3bd9943ac4b6fab7ccd2d7513b6656ae535eb557be34e8d3c05af0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.helger.commons" name="ph-commons-parent-pom" version="12.0.4">
+         <artifact name="ph-commons-parent-pom-12.0.4.pom">
+            <sha256 value="8679629eafd467ab734778030dedee825d5880aaec42c7559f476a183cb454ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.sun.xml.bind" name="jaxb-bom-ext" version="4.0.6">
          <artifact name="jaxb-bom-ext-4.0.6.pom">
             <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
+            <sha256 value="ce15e856443960ad2c213b99a8e07ef5d40049ff1f3f0eb883848dddce250c13" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3">
          <artifact name="jaxws-ri-bom-4.0.3.pom">
             <pgp value="E725C3877939E8FFEA7E3C44B6D3FC494798E478"/>
+            <sha256 value="9e6e73f7f766a710a55e9603953cb2099563e75595dcbed4fc0829eb2c13ea7c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="commons-logging" name="commons-logging" version="1.1.1">
@@ -424,6 +440,11 @@
             <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="35">
+         <artifact name="apache-35.pom">
+            <sha256 value="ea297dcd114136e8b8e8b630230d52a76c2fc69f6c5db25d672b1857000728b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="6">
          <artifact name="apache-6.pom">
             <pgp value="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231"/>
@@ -488,6 +509,7 @@
       <component group="org.eclipse.ee4j" name="project" version="1.0.9">
          <artifact name="project-1.0.9.pom">
             <pgp value="AA70C7C433D501636392EC02153E7A3C2B4E5118"/>
+            <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
@@ -495,6 +517,16 @@
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.glassfish.jaxb" name="jaxb-bom" version="4.0.5">
+         <artifact name="jaxb-bom-4.0.5.pom">
+            <sha256 value="ec97ec42d937d3c89519797e44246f80de0850819ac7a7ae675c4497b7075c39" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish.jaxb" name="jaxb-bom" version="4.0.6">
+         <artifact name="jaxb-bom-4.0.6.pom">
+            <sha256 value="7eb7cd83b92b7c2fd0a8ae66bcb3506354f166a13f82d2a66c1d96259732d2a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-5.2.0.pom">
             <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -545,6 +577,11 @@
             <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.13.4">
+         <artifact name="junit-bom-5.13.4.pom">
+            <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="5.20.0">
          <artifact name="mockito-bom-5.20.0.pom">
             <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d14de776d41..b4f45de5afd 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
         api("com.miglayout:miglayout-swing:5.3")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.21")
-        api("commons-codec:commons-codec:1.19.0")
+        api("commons-codec:commons-codec:1.20.0")
         api("commons-collections:commons-collections:3.2.2")
         api("commons-io:commons-io:2.20.0") {
             because("User might still rely on commons-io")

From c167c9e9290b2a3496fd9a042f61e0c25bb72faf Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 7 Nov 2025 21:32:03 +0000
Subject: [PATCH 0955/1037] fix(deps): update dependency
 org.neo4j.driver:neo4j-java-driver to v6.0.2

---
 gradle/verification-metadata.xml    | 5 +++++
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3fe759aaec8..409546f8ef0 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -357,6 +357,11 @@
             <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-bom" version="4.2.7.Final">
+         <artifact name="netty-bom-4.2.7.Final.pom">
+            <pgp value="7E22D50A7EBD9D2CD269B2D4056ACA74D46000BF"/>
+         </artifact>
+      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b4f45de5afd..099d4d95d87 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -137,7 +137,7 @@ dependencies {
         api("org.jodd:jodd-props:6.0.2")
         api("org.jsoup:jsoup:1.21.2")
         api("org.mozilla:rhino:1.8.0")
-        api("org.neo4j.driver:neo4j-java-driver:6.0.1")
+        api("org.neo4j.driver:neo4j-java-driver:6.0.2")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
         api("org.unbescape:unbescape:1.1.6.RELEASE")

From 94775fcee1517af28d08bc576a20b10eabdb2de5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 8 Nov 2025 09:44:31 +0000
Subject: [PATCH 0956/1037] fix(deps): update dependency
 org.jetbrains.lets-plot:lets-plot-batik to v4.8.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 099d4d95d87..5700e573a3c 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -128,7 +128,7 @@ dependencies {
         api("org.brotli:dec:0.1.2")
         api("org.freemarker:freemarker:2.3.34")
         api("org.jdom:jdom:1.1.3")
-        api("org.jetbrains.lets-plot:lets-plot-batik:4.7.3")
+        api("org.jetbrains.lets-plot:lets-plot-batik:4.8.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.11.2")
         api("org.jetbrains:annotations:26.0.2-1")
         api("org.jodd:jodd-core:5.3.0")

From cd4c55ca29fc3b974f541c26c5b5483ef31b0e21 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 8 Nov 2025 17:45:02 +0000
Subject: [PATCH 0957/1037] fix(deps): update dependency commons-io:commons-io
 to v2.21.0

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 5700e573a3c..aa8209445c9 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
         api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.20.0")
         api("commons-collections:commons-collections:3.2.2")
-        api("commons-io:commons-io:2.20.0") {
+        api("commons-io:commons-io:2.21.0") {
             because("User might still rely on commons-io")
         }
         api("commons-lang:commons-lang:2.6") {

From 841ffb67f147d7483297ae83def73ac025d8d502 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 8 Nov 2025 18:20:52 +0000
Subject: [PATCH 0958/1037] fix(deps): update org.checkerframework

---
 build-logic/verification/build.gradle.kts           |  2 +-
 .../kotlin/build-logic.checkerframework.gradle.kts  |  2 +-
 gradle/verification-metadata.xml                    | 13 +++++++++++++
 src/bom-thirdparty/build.gradle.kts                 |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index a67bc8ffd80..bbb4fd062de 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.60")
+    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.61")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
index c377cacd173..ca364483d97 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
                 "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
             }
         } ?: run {
-        val checkerframeworkVersion = "3.51.1"
+        val checkerframeworkVersion = "3.52.0"
         "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
         if (buildParameters.buildJdkVersion == 8) {
             // only needed for JDK 8
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 409546f8ef0..c4b699c9c50 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -498,11 +498,24 @@
             <sha256 value="6981196fd608bc0b32a41cd6658f9b6f9020b3c2e6feb9904ee79d91500690f6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.61">
+         <artifact name="checkerframework-gradle-plugin-0.6.61.jar">
+            <sha256 value="44ed049aae0abf82f3e2f33403e66d42d9a3108b714c9bc90356630ddc7216c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="checkerframework-gradle-plugin-0.6.61.module">
+            <sha256 value="c54e54f3a24794a1824d494a1f1ef15ca06ce088449453ecf7c90c97b72d4ac0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.60">
          <artifact name="org.checkerframework.gradle.plugin-0.6.60.pom">
             <sha256 value="09ccbaa275aa7e7b31fb3dcede8c13653aaf481d0718f990b9a752c86eddcd18" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="org.checkerframework.gradle.plugin" version="0.6.61">
+         <artifact name="org.checkerframework.gradle.plugin-0.6.61.pom">
+            <sha256 value="50df110ca624708bb20ab98ee68b2f02539b9fc1911ca8c6a1afe38ef9845985" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy.modules.http-builder" name="http-builder" version="0.7.1">
          <artifact name="http-builder-0.7.1.jar">
             <sha256 value="17ae791dd0f09b54b7c5496ac3e0d028e97130c6503932cb077f9d3ee395a448" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index aa8209445c9..273c7078fb6 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -78,7 +78,7 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.51.1")
+        api("org.checkerframework:checker-qual:3.52.0")
         api("org.hamcrest:hamcrest-core:3.0") {
             because("ApacheJMeter_junit depends on junit4")
         }

From 420d134d025aa374ff77e4a47a53f7d9e5bf6306 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 8 Nov 2025 18:21:08 +0000
Subject: [PATCH 0959/1037] fix(deps): update dependency
 @fortawesome/fontawesome-free to v7

---
 xdocs/package-lock.json |  8 ++++----
 xdocs/package.json      |  2 +-
 xdocs/yarn.lock         | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/xdocs/package-lock.json b/xdocs/package-lock.json
index 4c1ad3b2bd0..7128f20c931 100644
--- a/xdocs/package-lock.json
+++ b/xdocs/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@fontsource/merriweather": "^5.1.0",
-        "@fortawesome/fontawesome-free": "^6.5.0"
+        "@fortawesome/fontawesome-free": "^7.0.0"
       }
     },
     "node_modules/@fontsource/merriweather": {
@@ -22,9 +22,9 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
-      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz",
+      "integrity": "sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==",
       "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
       "engines": {
         "node": ">=6"
diff --git a/xdocs/package.json b/xdocs/package.json
index 9c5d7c1712c..82c6be4a1e2 100644
--- a/xdocs/package.json
+++ b/xdocs/package.json
@@ -8,6 +8,6 @@
   },
   "dependencies": {
     "@fontsource/merriweather": "^5.1.0",
-    "@fortawesome/fontawesome-free": "^6.5.0"
+    "@fortawesome/fontawesome-free": "^7.0.0"
   }
 }
diff --git a/xdocs/yarn.lock b/xdocs/yarn.lock
index b29c80ade6b..bbfca76439b 100644
--- a/xdocs/yarn.lock
+++ b/xdocs/yarn.lock
@@ -4,10 +4,10 @@
 
 "@fontsource/merriweather@^5.1.0":
   version "5.2.11"
-  resolved "https://registry.yarnpkg.com/@fontsource/merriweather/-/merriweather-5.2.11.tgz#e0bc5aef743145e3d662e8a542c3da799d26bf7e"
+  resolved "https://registry.npmjs.org/@fontsource/merriweather/-/merriweather-5.2.11.tgz"
   integrity sha512-ZiIMeUh5iT8d73o6xlSF8GKgjV5pgiFrufYc5jZTVAfExtWKqM2vQHnsqXSFMv4ELhAcjt6Vf+5T3oVGXhAizQ==
 
-"@fortawesome/fontawesome-free@^6.5.0":
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
-  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
+"@fortawesome/fontawesome-free@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz"
+  integrity sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==

From 02e5f5958170addedc1f007b8ee793e531af31b7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 10 Nov 2025 06:19:33 +0000
Subject: [PATCH 0960/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v4.2.2

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 72d7c8ad945..92f213267f5 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
         api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.14.6")
         api("net.bytebuddy:byte-buddy:1.17.8")
-        api("nl.jqno.equalsverifier:equalsverifier:4.2.1")
+        api("nl.jqno.equalsverifier:equalsverifier:4.2.2")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:5.16.8")
         api("org.apache.activemq:activemq-client:5.16.8")

From 2562f0c6394d1880144a4f9ab5a3e471209f85ca Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 11 Nov 2025 18:31:18 +0000
Subject: [PATCH 0961/1037] Fix Bug 6456: Handle malformed percent-encoded URLs
 gracefully

When recording HTTP traffic via the HTTP(S) Test Script Recorder, JMeter
would crash with IllegalArgumentException when encountering malformed
percent-encoded parameters (e.g., "%u2", "%ZZ", "text%") from real-world
web applications.

Changes:
- HTTPArgument constructor now catches IllegalArgumentException from
  URLDecoder.decode() in addition to UnsupportedEncodingException
- When malformed encoding is detected, the original encoded value is
  preserved and a warning is logged instead of crashing
- Added comprehensive test cases covering various malformed encoding
  scenarios: incomplete hex sequences, invalid hex characters, truncated
  percent signs, and mixed valid/invalid encoding

This allows JMeter to successfully record and test applications with
encoding bugs, which is a legitimate use case for a testing tool.
---
 .../protocol/http/util/HTTPArgument.java      |  7 ++++
 .../protocol/http/util/TestHTTPArgument.java  | 33 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
index be534a3b23e..9fc3a2be5b8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java
@@ -161,6 +161,13 @@ public HTTPArgument(String name, String value, boolean alreadyEncoded, String co
             } catch (UnsupportedEncodingException e) {
                 log.error("{} encoding not supported!", contentEncoding);
                 throw new Error(e.toString(), e);
+            } catch (IllegalArgumentException e) {
+                // Handle malformed percent-encoded strings (e.g., "%u2", "%ZZ", "text%")
+                // This can occur when recording real-world web traffic with encoding bugs
+                // See Bug 6456
+                log.warn("Malformed percent-encoded parameter detected - using original value. " +
+                        "Name: '{}', Value: '{}', Error: {}", name, value, e.getMessage());
+                // Keep the original encoded values as-is
             }
         }
         setName(name);
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
index 1c944e8f8d0..7a999cf7393 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java
@@ -93,4 +93,37 @@ public void testEncoding() throws Exception {
         assertEquals("", arg.getEncodedName());
         assertEquals("\00\01\07", arg.getEncodedValue());
     }
+
+    @Test
+    public void testMalformedPercentEncoding() throws Exception {
+        // Test case for Bug 6456: Handle malformed percent-encoded strings gracefully
+        // These are real-world cases that can occur when recording web application traffic
+
+        // Case 1: Incomplete hex sequence "%u2" - reported in the issue
+        HTTPArgument arg1 = new HTTPArgument("param", "value%u2", true);
+        // Should preserve the original malformed value instead of throwing IllegalArgumentException
+        assertEquals("param", arg1.getName());
+        assertEquals("value%u2", arg1.getValue());
+
+        // Case 2: Invalid hex character in encoding
+        HTTPArgument arg2 = new HTTPArgument("name", "test%ZZ", true);
+        assertEquals("name", arg2.getName());
+        assertEquals("test%ZZ", arg2.getValue());
+
+        // Case 3: Truncated percent at end of string
+        HTTPArgument arg3 = new HTTPArgument("data", "some%", true);
+        assertEquals("data", arg3.getName());
+        assertEquals("some%", arg3.getValue());
+
+        // Case 4: Percent followed by single hex digit
+        HTTPArgument arg4 = new HTTPArgument("field", "text%2", true);
+        assertEquals("field", arg4.getName());
+        assertEquals("text%2", arg4.getValue());
+
+        // Case 5: Mix of valid and invalid encoding
+        HTTPArgument arg5 = new HTTPArgument("mixed", "hello%20world%u2", true);
+        assertEquals("mixed", arg5.getName());
+        // Valid %20 should decode to space, but %u2 is malformed
+        assertEquals("hello%20world%u2", arg5.getValue());
+    }
 }

From d70ffa128823a30d786feac24b84e7622c86c3a9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 12 Nov 2025 08:12:23 +0000
Subject: [PATCH 0962/1037] fix(deps): update dependency spotbugs to v4.9.8

---
 .../kotlin/build-logic.spotbugs.gradle.kts    |   2 +-
 gradle/verification-metadata.xml              | 258 +++++++++++++++++-
 2 files changed, 257 insertions(+), 3 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
index 413fdb7df63..83726b7ea95 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 
 spotbugs {
     // Below statement is for Renovate Bot since it does not support toolVersion.set("..") pattern yet
-    val toolVersion = "4.8.3"
+    val toolVersion = "4.9.8"
     this.toolVersion.set(toolVersion)
 
     providers.gradleProperty("spotbugs.version")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c4b699c9c50..095bd3b74a3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -30,7 +30,11 @@
          <trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
          <trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31" group="^org[.]neo4j($|([.].*))" regex="true"/>
          <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock"/>
-         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
+         <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
+            <trusting group="commons-collections"/>
+            <trusting group="commons-logging" name="commons-logging" version="1.2"/>
+         </trusted-key>
+         <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache" name="apache" version="16"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
@@ -103,7 +107,10 @@
          <trusted-key id="59A8E169739301FD48139CA00E325BECB6962A24" group="jakarta.annotation"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
-         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994" group="org.codehaus.woodstox"/>
+         <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994">
+            <trusting group="com.fasterxml" name="oss-parent" version="38"/>
+            <trusting group="org.codehaus.woodstox"/>
+         </trusted-key>
          <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine"/>
          <trusted-key id="636DE9055C4C75C7BD9830771241BC872C5E4EC0" group="commons-lang"/>
          <trusted-key id="66D7CBFF956830FE9F5A723AFE6C7D77A1CE15A6" group="org.gradlex"/>
@@ -120,6 +127,7 @@
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
          <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
+         <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons" name="commons-parent" version="39"/>
          <trusted-key id="817EA1255546D6070A23AA00DB45D3A62A183CE2" group="com.miglayout"/>
          <trusted-key id="82D8419BA697F0E7FB85916EE91287822FDB81B1" group="org.apache.geronimo.genesis"/>
          <trusted-key id="839323A4780D5BF9A6978970152888E10EF880B3" group="org.unbescape"/>
@@ -186,6 +194,7 @@
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
+         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146" group="org.apache" name="apache" version="13"/>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
          <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB" group="org.infinispan"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
@@ -219,6 +228,52 @@
       <component group="com.fasterxml" name="oss-parent" version="38">
          <artifact name="oss-parent-38.pom">
             <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
+            <sha256 value="c83f8f45dfdca8d0b6b3661c60b3f84780f671b12e06f91ad5d1c1a1d1f966e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="50">
+         <artifact name="oss-parent-50.pom">
+            <sha256 value="f5da55dd7b88fb170c46801d17774a652fb2f4581fb5b1d0a5fc86aa182b8577" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.15.3">
+         <artifact name="jackson-bom-2.15.3.pom">
+            <sha256 value="66fc9945c16716bc202f4b9d7e6d969df3f509feffbe1acf1a31511b753d5c9d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.15">
+         <artifact name="jackson-parent-2.15.pom">
+            <sha256 value="6cdf97bc66f389f63e36850d2f552d1216688f8e5a58727d3f6a98edf8675cde" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.15.3">
+         <artifact name="jackson-annotations-2.15.3.module">
+            <sha256 value="6410c94b393e494d53d569dc4193a79187848ddb6ee3c2ee1f392477a21059cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.15.3">
+         <artifact name="jackson-core-2.15.3.module">
+            <sha256 value="138029bcb32b0bfa7010d3f646632bde5c98c187e2f1aa120a1cd413f23a6c28" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.15.3">
+         <artifact name="jackson-databind-2.15.3.module">
+            <sha256 value="51ba8d71f5a04ae768e84c91d4edf09a1fc8bc1244b03bd4f9b060b8fb395615" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.15.3">
+         <artifact name="jackson-dataformat-xml-2.15.3.module">
+            <sha256 value="30ad1786f48af58048353d9be1374fc022610ceab921ebea6f62e5080b345bf2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-module-kotlin" version="2.15.3">
+         <artifact name="jackson-module-kotlin-2.15.3.module">
+            <sha256 value="0dee29c18a90700a3a0457be88f7c41f67571947e6633d84a22433a4fb5d792c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.woodstox" name="woodstox-core" version="6.5.1">
+         <artifact name="woodstox-core-6.5.1.pom">
+            <sha256 value="4839654e16b1714e74f51abcb378d8356814ab8f4d5273d1dd2f1ce8a390addc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.github.node-gradle" name="gradle-node-plugin" version="7.1.0">
@@ -296,6 +351,16 @@
             <sha256 value="9e6e73f7f766a710a55e9603953cb2099563e75595dcbed4fc0829eb2c13ea7c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-beanutils" name="commons-beanutils" version="1.11.0">
+         <artifact name="commons-beanutils-1.11.0.pom">
+            <sha256 value="cff9eab1d751264bd775b6e3ebed1650794cac9cd8be1c416b48e3a5c6139d93" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-collections" name="commons-collections" version="3.2.2">
+         <artifact name="commons-collections-3.2.2.pom">
+            <sha256 value="d5d81fcc288c0d8c711c302007cada4aa9a226ed1a112d4baa64cb1d6322170b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="commons-logging" name="commons-logging" version="1.1.1">
          <artifact name="commons-logging-1.1.1.pom">
             <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
@@ -304,6 +369,12 @@
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.pom">
             <pgp value="0CC641C3A62453AB390066C4A41F13C999945293"/>
+            <sha256 value="c91ab5aa570d86f6fd07cc158ec6bc2c50080402972ee9179fe24100739fbb20" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.3.5">
+         <artifact name="commons-logging-1.3.5.pom">
+            <sha256 value="ccf4a30346f5027b9496abd56290ac26d159abf2be64df1265611dc9400b9d68" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
@@ -409,6 +480,11 @@
             <sha256 value="f943e454c4c6d349ff00a1fd6c7eaf391501d20de3770d1f8d22cbe11ac080dd" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="net.sf.jopt-simple" name="jopt-simple" version="5.0.4">
+         <artifact name="jopt-simple-5.0.4.pom">
+            <sha256 value="6a67763b76afcd9c80b95e5c5e24782d18cc1b0e3d9b454ad3f8754c76b76815" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.sf.json-lib" name="json-lib" version="2.3">
          <artifact name="json-lib-2.3-jdk15.jar">
             <sha256 value="1e58cc49a02f2ae22049c73de69d03a6aa44f197533c42106a302e03c95c40ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -428,11 +504,13 @@
       <component group="org.apache" name="apache" version="13">
          <artifact name="apache-13.pom">
             <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
+            <sha256 value="ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="16">
          <artifact name="apache-16.pom">
             <pgp value="0CDE80149711EB46DFF17AE421A24B3F8B0F594A"/>
+            <sha256 value="9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="17">
@@ -445,11 +523,41 @@
             <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="21">
+         <artifact name="apache-21.pom">
+            <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="3">
+         <artifact name="apache-3.pom">
+            <sha256 value="393c50afb4b7aa6eb57e5377a55a1a0610b19f75b52ece01308db04a1187a20e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="31">
+         <artifact name="apache-31.pom">
+            <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="33">
+         <artifact name="apache-33.pom">
+            <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="34">
+         <artifact name="apache-34.pom">
+            <sha256 value="3671ae9d4d062ae3bb985731c76088bb2f6f7d7254e2d304ee9f690b97651328" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="35">
          <artifact name="apache-35.pom">
             <sha256 value="ea297dcd114136e8b8e8b630230d52a76c2fc69f6c5db25d672b1857000728b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="4">
+         <artifact name="apache-4.pom">
+            <sha256 value="9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="6">
          <artifact name="apache-6.pom">
             <pgp value="998AF0E2B935996F5CEBD56B9B1FDA9F3C062231"/>
@@ -465,9 +573,20 @@
             <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-math3" version="3.6.1">
+         <artifact name="commons-math3-3.6.1.pom">
+            <sha256 value="fad72336ea7d7dd06da103144e3740db508fa4b17d9c54d7847737edc24a7e60" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="34">
+         <artifact name="commons-parent-34.pom">
+            <sha256 value="3a2e69d06d641d1f3b293126dc9e2e4ea6563bf8c36c87e0ab6fa4292d04b79c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="39">
          <artifact name="commons-parent-39.pom">
             <pgp value="808D78B17A5A2D7C3668E31FBFFC9B54721244AD"/>
+            <sha256 value="87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.commons" name="commons-parent" version="42">
@@ -480,6 +599,21 @@
             <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="79">
+         <artifact name="commons-parent-79.pom">
+            <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="81">
+         <artifact name="commons-parent-81.pom">
+            <sha256 value="348d4e7c131be6114c854a719ce7a44307a7c39bd366084977b24fd29ad0edb4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="84">
+         <artifact name="commons-parent-84.pom">
+            <sha256 value="9239fb97101db27070e4983d10d33a0e91cf676cad91bf53815422c3561ef9b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="9">
          <artifact name="commons-parent-9.pom">
             <pgp value="D196A5E3E70732EEB2E5007F1861C322C56014B2"/>
@@ -490,6 +624,31 @@
             <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
+         <artifact name="httpclient-4.5.14.pom">
+            <sha256 value="f18355af4cf80a8a4ef04ebd742a47e90a7eaf080c725b2095dbc4fc5dbdefb7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-client" version="4.5.14">
+         <artifact name="httpcomponents-client-4.5.14.pom">
+            <sha256 value="5bad1de4f101447659f89d089868ccbad64a68cc503d2d65410b51f6904aa061" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-core" version="4.4.16">
+         <artifact name="httpcomponents-core-4.4.16.pom">
+            <sha256 value="f2d75a2c2d423ad18539bf21656d56f88a4091944a662fcaf159d5ae283db7f7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="11">
+         <artifact name="httpcomponents-parent-11.pom">
+            <sha256 value="a901f87b115c55070c7ee43efff63e20e7b02d30af2443ae292bf1f4e532d3aa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcore" version="4.4.16">
+         <artifact name="httpcore-4.4.16.pom">
+            <sha256 value="3cbad849b35dacfe6cec31adada2c623c026c3261141b0d26eec7e399c6cd7fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checkerframework-gradle-plugin" version="0.6.60">
          <artifact name="checkerframework-gradle-plugin-0.6.60.jar">
             <sha256 value="3e992ff19fda07a4f2b2f05f5df412ba63af091a130512641aae12392b0c78ba" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -524,6 +683,11 @@
             <sha256 value="30f03aba17e3925d171ac44f076e8bd254eec34221816d041123b72be97a2e49" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.codehaus.woodstox" name="stax2-api" version="4.2.1">
+         <artifact name="stax2-api-4.2.1.pom">
+            <sha256 value="79da410c8c0f46a3f8e8adb30d6c24ccd6065b6ef6bfde87bd97e9881ea0a2e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.ee4j" name="project" version="1.0.9">
          <artifact name="project-1.0.9.pom">
             <pgp value="AA70C7C433D501636392EC02153E7A3C2B4E5118"/>
@@ -570,6 +734,16 @@
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains" name="annotations" version="13.0">
+         <artifact name="annotations-13.0.pom">
+            <sha256 value="965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-core" version="2.1.0">
+         <artifact name="dokka-core-2.1.0.module">
+            <sha256 value="3ef0ebba4e9d8ca855f1e778de1d1a5010637f72a831c84680ef2e7c30246ed9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.1.0">
          <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.1.0.pom">
             <sha256 value="de9bdcea93102c43427c70128943625131530cbb0e38ec6bbbad9bda6141a2c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -585,6 +759,31 @@
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.2.21">
+         <artifact name="abi-tools-api-2.2.21.pom">
+            <sha256 value="92490acca0f450581d56ce057961d8ffa9835587e69f66e96d0a7175bacecd85" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.2.21">
+         <artifact name="kotlin-build-tools-api-2.2.21.pom">
+            <sha256 value="63fdcf1ded2ab45ad77c049979faa44f190f7bb8eeac4f81f9877e9dfa9fd9f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.21">
+         <artifact name="kotlin-compiler-runner-2.2.21.pom">
+            <sha256 value="1f103d8bde08ddd614bd983abdfcb7949139c606ac60cd8a68941fd0fb1ee124" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.2.21">
+         <artifact name="kotlin-daemon-client-2.2.21.pom">
+            <sha256 value="4f6fddbc10d9b2167899e34fa113fc9ad75cc4d6ce58ab84f9614b63c05f8da3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
+         <artifact name="kotlin-stdlib-2.0.21.module">
+            <sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="2.2.21">
          <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-2.2.21.pom">
             <sha256 value="5c3bde6e7f1dc0fa44e14c85a1ba6a03aaff86cabb19700830f4d2dd1de13dc4" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -595,6 +794,36 @@
             <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.8.0">
+         <artifact name="kotlinx-coroutines-bom-1.8.0.pom">
+            <sha256 value="1239e9dbe1397cd5971342956b2511bc3ace7b641842e4372a088dcfa8b9ad55" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.7.3">
+         <artifact name="kotlinx-coroutines-core-1.7.3.module">
+            <sha256 value="7fb162396594ec28e1b6a4411b457949a7670f5e12019176774e1fd6b9471bbf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.8.0">
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.0.module">
+            <sha256 value="ff6a22da40040938751db0ae21177e76517dbf126a76796f5426727bf76c1228" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.10.2">
+         <artifact name="junit-bom-5.10.2.pom">
+            <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.11.4">
+         <artifact name="junit-bom-5.11.4.pom">
+            <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.12.2">
+         <artifact name="junit-bom-5.12.2.pom">
+            <sha256 value="cef80fec86454f6806bfb0df24669b5c6f32e2cb728539ea859f47dfdc9bbc17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.13.4">
          <artifact name="junit-bom-5.13.4.pom">
             <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
@@ -641,6 +870,16 @@
             <sha256 value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.openjdk.jmh" name="jmh-core" version="1.37">
+         <artifact name="jmh-core-1.37.pom">
+            <sha256 value="04453be006f06f86d7c43f3c492f7b4eb3362680cae4f1ee80ba65db23373f5a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-parent" version="1.37">
+         <artifact name="jmh-parent-1.37.pom">
+            <sha256 value="0c24f216f3637dde7639114f70273a697f8546f7a4c6d5acd4cc6daee9bef4c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2" name="ow2" version="1.5">
          <artifact name="ow2-1.5.pom">
             <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -651,6 +890,16 @@
             <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-api" version="1.7.36">
+         <artifact name="slf4j-api-1.7.36.pom">
+            <sha256 value="fb046a9c229437928bb11c2d27c8b5d773eb8a25e60cbd253d985210dedc2684" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-parent" version="1.7.36">
+         <artifact name="slf4j-parent-1.7.36.pom">
+            <sha256 value="bb388d37fbcdd3cde64c3cede21838693218dc451f04040c5df360a78ed7e812" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
          <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -687,6 +936,11 @@
             <sha256 value="9aa9dfeb2e85e1d5e7932c87140697cecc2b0fadd933d679fd420a2e43831a82" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="xml-apis" name="xml-apis" version="1.4.01">
+         <artifact name="xml-apis-1.4.01.pom">
+            <sha256 value="09a82ff150ac86bfa31145e0a6afd89a02e4504785f5da112e4fae1425020e92" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="xml-apis" name="xml-apis-ext" version="1.3.04">
          <artifact name="xml-apis-ext-1.3.04.jar">
             <sha256 value="d0b4887dc34d57de49074a58affad439a013d0baffa1a8034f8ef2a5ea191646" origin="Generated by Gradle" reason="Artifact is not signed"/>

From d7f1e81350672f361df510b66f19e77795025dc7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sun, 16 Nov 2025 15:19:02 +0000
Subject: [PATCH 0963/1037] fix(deps): update dependency com.helger:ph-css to
 v8.1.0

---
 gradle/verification-keyring.keys            | 83 +++++++++++++++++++++
 gradle/verification-metadata.xml            | 50 +++++++++++++
 src/bom-thirdparty/build.gradle.kts         |  2 +-
 src/dist/src/dist/expected_release_jars.csv | 80 ++++++++++----------
 4 files changed, 174 insertions(+), 41 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index fbff5b447d4..24d023a47fa 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -3220,6 +3220,63 @@ SQQYEQIACQUCSagpTwIbDAAKCRADdM8ujdG9/auQAKCCtFUmslioIPSjZkWVLJpo
 =YmFm
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    049FE94F2D5DAD9D
+uid    Eclipse Jakarta EE Platform <jakarta-platform-dev@eclipse.org>
+
+sub    953E02E4F573B46F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+pKNG3IY=
+=QfmY
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    04C8C902FEFB1A01
 sub    741DB70D5BD02528
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -3232,6 +3289,32 @@ xF+S3TSFWPLVVVoo+gD9FGYeKnDDga+F1O3zW0ghkiaYxdpuD21/ySNA0+W3/gc=
 =LFrf
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    056ACA74D46000BF
+uid    Norman Maurer <norman@apache.org>
+
+sub    DECB4AA7ECD68C0E
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEoo3BYRBACXE2oGRA58Ml6s+kvfk6n/AJ+5OFeRT/Xelco/cpdxOVF5LkRk
+yd+vR2+F9ldBlH7CSTCmrdZIN3M3zrcWndrk/OQkCxNWVnE/a1li7L3G9nYr011k
+MwMM8MLkdf1Wr+FBunf1qpxPYuydfjWGFL749hYr4uQ8RbFDRQcmWLYCRwCgl+ur
+E28AmiICPcje59DNKHZZxd8D/Rk1LcZojARyMPjEsPOVSOh6kOaJQ/FOKN0j97k7
+ZqA+4C+OnIONSy22uMia9xO5g8oMLyHaRiA4S7JSIypYfX7JMCmwQCSLM/oQ5zct
+tsY7tGzCRBA7UVmW8uCDDZGmmzYIGQ7h1vcabgOFQ8wsteMHW3F0tU1K6oQut71x
+5KowA/9LeDjhl3tKizJn5hKf+NR8kTMcFFVMk8tf9/ZdqCG2gVTuB0EFimH47j1+
+YFWftvKg2IwF0qRnYuhpXn3kAtkzSwDr2T4r5CpDjttq+oBwhJ+N6lcPRoU26ijr
+nQ61Ek0jFFE5vfU7UODSLYXYbjf8McM6BtksY1SWfFBU5cVzgrQhTm9ybWFuIE1h
+dXJlciA8bm9ybWFuQGFwYWNoZS5vcmc+uQENBEoo3BYQBACSBgW1YDdTu911T6Bp
+WXaj3fZ+UDoyMvXBeoeRgVxFA8t0/olYdWpOjqp9YN1ndL9l4EONIClnv/DtzBYV
+pCWyxDSoRsnPXSyKVw7fViCn1dzzW25SPxZhGBaniQzWVH2n/xdy9y8NGdmBNX9C
+q9yeuMbsSQAlIwM15LLBKlVEOwADBgP/U32vKyQ9OmqRd7ttqnewzWqOlJVHqESH
+ZbgqR32UNdJxA05xc+cDcxwZWQw6GpHrVGeSGO9oUSjHCzFkSOTGpLUG/V7xac4Y
+hqZbBRp8wgSPfQKk7Mct5uOQHVcW3Fcti33ofYM0vmZy+puPV3+5kLqkCWrSF5ls
+qZX7clnN1w2ISQQYEQIACQUCSijcFgIbDAAKCRAFasp01GAAv6p0AKCP/EDLrjxq
+74ryg0wpNrQOtMOdYACfW68zcmywrNR2KD7Y2Pe5zhMtLZs=
+=fr01
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    0729A0AFF8999A87
 uid    Kotlin Release <kt-a@jetbrains.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 095bd3b74a3..f586815a667 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -36,6 +36,7 @@
          </trusted-key>
          <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache" name="apache" version="16"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
+         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
@@ -80,6 +81,7 @@
          <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons"/>
          <trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify"/>
          <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath"/>
+         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
          <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.microutils"/>
          <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
@@ -528,11 +530,21 @@
             <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="25">
+         <artifact name="apache-25.pom">
+            <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="3">
          <artifact name="apache-3.pom">
             <sha256 value="393c50afb4b7aa6eb57e5377a55a1a0610b19f75b52ece01308db04a1187a20e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="30">
+         <artifact name="apache-30.pom">
+            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="31">
          <artifact name="apache-31.pom">
             <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
@@ -573,6 +585,11 @@
             <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
          </artifact>
       </component>
+      <component group="org.apache.activemq" name="activemq-parent" version="5.16.8">
+         <artifact name="activemq-parent-5.16.8.pom">
+            <sha256 value="089827a4d9f06cb23fc56f17718c90792e06642f89d73a72f7d4e0a1d4ea4a14" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-math3" version="3.6.1">
          <artifact name="commons-math3-3.6.1.pom">
             <sha256 value="fad72336ea7d7dd06da103144e3740db508fa4b17d9c54d7847737edc24a7e60" origin="Generated by Gradle"/>
@@ -694,6 +711,11 @@
             <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
+         <artifact name="jetty-bom-9.4.53.v20231009.pom">
+            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -729,6 +751,11 @@
             <sha256 value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.build" version="0.8.13">
+         <artifact name="org.jacoco.build-0.8.13.pom">
+            <sha256 value="994c3ae1cfca6765968fe3ede4f379986aeb2e7eb51a2014caa4a09d71a8f4a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jboss" name="jboss-parent" version="36">
          <artifact name="jboss-parent-36.pom">
             <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -829,9 +856,15 @@
             <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="6.0.0">
+         <artifact name="junit-bom-6.0.0.pom">
+            <sha256 value="b3d9832f5c11bbb6b0e62851b93aa29d278c39fb1a751eb771b46d004a216219" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="5.20.0">
          <artifact name="mockito-bom-5.20.0.pom">
             <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
+            <sha256 value="626bc0f79f389d2c41543d16d8d9db0b53ad0848cc37a6e0b4ce771a4fe0bc49" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.nodejs" name="node" version="25.1.0">
@@ -888,6 +921,12 @@
       <component group="org.ow2" name="ow2" version="1.5.1">
          <artifact name="ow2-1.5.1.pom">
             <pgp value="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"/>
+            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-bom" version="9.8">
+         <artifact name="asm-bom-9.8.pom">
+            <sha256 value="0da1dcb226e6cdfdadb4dac591916bb917b57374674d91bd2f13003137b41520" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="slf4j-api" version="1.7.36">
@@ -895,6 +934,11 @@
             <sha256 value="fb046a9c229437928bb11c2d27c8b5d773eb8a25e60cbd253d985210dedc2684" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-bom" version="2.0.17">
+         <artifact name="slf4j-bom-2.0.17.pom">
+            <sha256 value="f78d27b642b4b886eb839fc102b5cd9fe7f30f37599ffe68185be4e1609031e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="slf4j-parent" version="1.7.36">
          <artifact name="slf4j-parent-1.7.36.pom">
             <sha256 value="bb388d37fbcdd3cde64c3cede21838693218dc451f04040c5df360a78ed7e812" origin="Generated by Gradle"/>
@@ -926,6 +970,12 @@
       <component group="org.sonatype.oss" name="oss-parent" version="9">
          <artifact name="oss-parent-9.pom">
             <pgp value="44FBDBBC1A00FE414F1C1873586654072EAD6677"/>
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.testcontainers" name="testcontainers-bom" version="1.21.3">
+         <artifact name="testcontainers-bom-1.21.3.pom">
+            <sha256 value="2ce717226d1d67b5b1df9707ed98022a366ac892d9e496c5f0173f1ab78a0965" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="oro" name="oro" version="2.0.8">
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 273c7078fb6..b3d31587b78 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
         api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.44.0")
         api("com.helger.commons:ph-commons:12.1.0")
-        api("com.helger:ph-css:8.0.1")
+        api("com.helger:ph-css:8.1.0")
         api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:5.3")
         api("com.miglayout:miglayout-swing:5.3")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 86ad358bad9..812195318c4 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -23,15 +23,15 @@
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
 912143,caffeine-2.9.3.jar
-241630,checker-qual-3.51.1.jar
-374716,commons-codec-1.19.0.jar
+241628,checker-qual-3.52.0.jar
+401021,commons-codec-1.20.0.jar
 588337,commons-collections-3.2.2.jar
 898652,commons-collections4-4.5.0.jar
 211301,commons-dbcp2-2.9.0.jar
-563971,commons-io-2.20.0.jar
+585274,commons-io-2.21.0.jar
 267634,commons-jexl-2.1.1.jar
 558963,commons-jexl3-3.5.0.jar
-924068,commons-jvm-4.7.3.jar
+931901,commons-jvm-4.8.0.jar
 709075,commons-lang3-3.19.0.jar
 73737,commons-logging-1.3.5.jar
 2213560,commons-math3-3.6.1.jar
@@ -52,10 +52,10 @@
 14750,darklaf-theme-spec-3.1.1.jar
 62869,darklaf-utils-3.1.1.jar
 232074,darklaf-windows-3.1.1.jar
-362793,datamodel-jvm-4.7.3.jar
+363049,datamodel-jvm-4.8.0.jar
 98115,dec-0.1.2.jar
 588267,dnsjava-3.6.3.jar
-20390,error_prone_annotations-2.43.0.jar
+20388,error_prone_annotations-2.44.0.jar
 1886604,freemarker-2.3.34.jar
 32359,geronimo-jms_1.1_spec-1.1.1.jar
 8057697,groovy-5.0.2.jar
@@ -77,7 +77,6 @@
 79195,jackson-annotations-2.20.jar
 593176,jackson-core-2.20.1.jar
 1688480,jackson-databind-2.20.1.jar
-26378,jakarta.annotation-api-3.0.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
@@ -91,6 +90,7 @@
 279148,json-path-2.10.0.jar
 122808,json-smart-2.6.0.jar
 500363,jsoup-1.21.2.jar
+3819,jspecify-1.0.0.jar
 723652,jsvg-2.0.0.jar
 249924,jtidy-r938.jar
 384581,junit-4.13.2.jar
@@ -101,8 +101,8 @@
 1479317,kotlinx-coroutines-core-jvm-1.10.2.jar
 8890,kotlinx-coroutines-swing-1.10.2.jar
 675271,kotlinx-datetime-jvm-0.6.2.jar
-996,lets-plot-batik-4.7.3.jar
-996,lets-plot-common-4.7.3.jar
+996,lets-plot-batik-4.8.0.jar
+996,lets-plot-common-4.8.0.jar
 358528,log4j-1.2-api-2.25.2.jar
 349595,log4j-api-2.25.2.jar
 2018265,log4j-core-2.25.2.jar
@@ -111,40 +111,40 @@
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
 29680,mxparser-1.2.2.jar
-99796,neo4j-bolt-connection-10.0.1.jar
-320488,neo4j-bolt-connection-netty-10.0.1.jar
-27442,neo4j-bolt-connection-pooled-10.0.1.jar
-64399,neo4j-bolt-connection-routed-10.0.1.jar
-592767,neo4j-java-driver-6.0.1.jar
-372929,netty-buffer-4.2.6.Final.jar
-152980,netty-codec-base-4.2.6.Final.jar
-774708,netty-common-4.2.6.Final.jar
-571539,netty-handler-4.2.6.Final.jar
-38440,netty-resolver-4.2.6.Final.jar
-37384,netty-tcnative-classes-2.0.73.Final.jar
-562314,netty-transport-4.2.6.Final.jar
-46774,netty-transport-native-unix-common-4.2.6.Final.jar
+99796,neo4j-bolt-connection-10.1.0.jar
+320489,neo4j-bolt-connection-netty-10.1.0.jar
+27442,neo4j-bolt-connection-pooled-10.1.0.jar
+64399,neo4j-bolt-connection-routed-10.1.0.jar
+592773,neo4j-java-driver-6.0.2.jar
+373323,netty-buffer-4.2.7.Final.jar
+152980,netty-codec-base-4.2.7.Final.jar
+789111,netty-common-4.2.7.Final.jar
+581349,netty-handler-4.2.7.Final.jar
+38454,netty-resolver-4.2.7.Final.jar
+37388,netty-tcnative-classes-2.0.74.Final.jar
+562559,netty-transport-4.2.7.Final.jar
+46861,netty-transport-native-unix-common-4.2.7.Final.jar
 65261,oro-2.0.8.jar
-41831,ph-annotations-12.0.4.jar
-508951,ph-base-12.0.4.jar
-31368,ph-cache-12.0.4.jar
-196187,ph-collection-12.0.4.jar
-122576,ph-commons-12.0.4.jar
-525513,ph-css-8.0.1.jar
-119770,ph-datetime-12.0.4.jar
-148153,ph-io-12.0.4.jar
-40268,ph-mime-12.0.4.jar
-41515,ph-statistics-12.0.4.jar
-158210,ph-text-12.0.4.jar
-83971,ph-typeconvert-12.0.4.jar
-182088,platf-awt-4.7.3.jar
-88933,platf-batik-4.7.3.jar
+41851,ph-annotations-12.1.0.jar
+513224,ph-base-12.1.0.jar
+31500,ph-cache-12.1.0.jar
+198190,ph-collection-12.1.0.jar
+110619,ph-commons-12.1.0.jar
+529008,ph-css-8.1.0.jar
+120046,ph-datetime-12.1.0.jar
+148945,ph-io-12.1.0.jar
+40499,ph-mime-12.1.0.jar
+41716,ph-statistics-12.1.0.jar
+158832,ph-text-12.1.0.jar
+84194,ph-typeconvert-12.1.0.jar
+215381,platf-awt-4.8.0.jar
+89002,platf-batik-4.8.0.jar
 1525466,plot-api-jvm-4.11.2.jar
-2039714,plot-base-jvm-4.7.3.jar
-1471910,plot-builder-jvm-4.7.3.jar
-1482543,plot-stem-jvm-4.7.3.jar
+2126238,plot-base-jvm-4.8.0.jar
+1489396,plot-builder-jvm-4.8.0.jar
+1498253,plot-stem-jvm-4.8.0.jar
 11640,reactive-streams-1.0.4.jar
-1897725,reactor-core-3.7.11.jar
+1897776,reactor-core-3.7.12.jar
 1262303,rhino-1.8.0.jar
 1330192,rsyntaxtextarea-3.6.0.jar
 5783933,Saxon-HE-12.9.jar

From 80118e0bad12bed3c3f75d33900e4117bcc06e01 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 17 Nov 2025 08:48:25 +0300
Subject: [PATCH 0964/1037] chore: remove old "restrict library X to Y because
 it requires Java 11" renovate configs

---
 renovate.json | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/renovate.json b/renovate.json
index e4d4e650fa0..41bf5135fba 100644
--- a/renovate.json
+++ b/renovate.json
@@ -16,13 +16,6 @@
         "com.fasterxml.jackson.core{/,}**"
       ]
     },
-    {
-      "description": "TODO: Caffeine 3.0 requires Java 11",
-      "allowedVersions": "< 3.0",
-      "matchPackageNames": [
-        "com.github.ben-manes.caffeine{/,}**"
-      ]
-    },
     {
       "groupName": "com.github.vlsi",
       "matchPackageNames": [
@@ -75,29 +68,6 @@
         "net.minidev:json-smart{/,}**"
       ]
     },
-    {
-      "groupName": "com.miglayout",
-      "allowedVersions": "< 11.0",
-      "matchPackageNames": [
-        "com.miglayout{/,}**"
-      ]
-    },
-    {
-      "groupName": "org.ajoberstar.grgit",
-      "description": "TODO: grgit 5.0 requires Java 11",
-      "allowedVersions": "< 5.0",
-      "matchPackageNames": [
-        "org.ajoberstar.grgit{/,}**"
-      ]
-    },
-    {
-      "groupName": "org.apache.activemq",
-      "description": "TODO: activemq 5.17.0 requires Java 11",
-      "allowedVersions": "< 5.17.0",
-      "matchPackageNames": [
-        "org.apache.activemq{/,}**"
-      ]
-    },
     {
       "groupName": "org.apache.ftpserver",
       "matchPackageNames": [
@@ -134,14 +104,6 @@
         "org.checkerframework{/,}**"
       ]
     },
-    {
-      "groupName": "org.eclipse.jetty",
-      "description": "wiremock uses jetty 11",
-      "allowedVersions": "< 12.0",
-      "matchPackageNames": [
-        "org.eclipse.jetty{/,}**"
-      ]
-    },
     {
       "groupName": "org.jdom",
       "description": "Velocity Anakia uses JDOM 1.0",

From e1c975b43eabd10972f226634dd0ca170d101007 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 17 Nov 2025 09:04:26 +0300
Subject: [PATCH 0965/1037] chore: group caffeine, miglayout, grgit, activemq,
 jetty depenency updates

---
 renovate.json | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/renovate.json b/renovate.json
index 41bf5135fba..cadad96d66c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -16,6 +16,12 @@
         "com.fasterxml.jackson.core{/,}**"
       ]
     },
+    {
+      "groupName": "com.github.ben-manes.caffeine",
+      "matchPackageNames": [
+        "com.github.ben-manes.caffeine{/,}**"
+      ]
+    },
     {
       "groupName": "com.github.vlsi",
       "matchPackageNames": [
@@ -68,6 +74,24 @@
         "net.minidev:json-smart{/,}**"
       ]
     },
+    {
+      "groupName": "com.miglayout",
+      "matchPackageNames": [
+        "com.miglayout{/,}**"
+      ]
+    },
+    {
+      "groupName": "org.ajoberstar.grgit",
+      "matchPackageNames": [
+        "org.ajoberstar.grgit{/,}**"
+      ]
+    },
+    {
+      "groupName": "org.apache.activemq",
+      "matchPackageNames": [
+        "org.apache.activemq{/,}**"
+      ]
+    },
     {
       "groupName": "org.apache.ftpserver",
       "matchPackageNames": [
@@ -104,6 +128,12 @@
         "org.checkerframework{/,}**"
       ]
     },
+    {
+      "groupName": "org.eclipse.jetty",
+      "matchPackageNames": [
+        "org.eclipse.jetty{/,}**"
+      ]
+    },
     {
       "groupName": "org.jdom",
       "description": "Velocity Anakia uses JDOM 1.0",

From 776c52dd56151da7425cb419aaa102cc3aaa77e6 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 17 Nov 2025 06:26:16 +0000
Subject: [PATCH 0966/1037] fix(deps): update dependency
 com.github.ben-manes.caffeine:caffeine to v3

---
 src/bom-thirdparty/build.gradle.kts           |  2 +-
 .../testelement/AbstractTestElement.java      |  5 ++---
 src/dist/src/dist/expected_release_jars.csv   |  3 +--
 .../protocol/http/control/CacheManager.java   | 20 +++++++------------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index b3d31587b78..20d277858bf 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -44,7 +44,7 @@ dependencies {
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
         api("com.fifesoft:rsyntaxtextarea:3.6.0")
-        api("com.github.ben-manes.caffeine:caffeine:2.9.3")
+        api("com.github.ben-manes.caffeine:caffeine:3.2.3")
         api("com.github.weisj:darklaf-core:3.1.1")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")
         api("com.github.weisj:darklaf-property-loader:3.1.1")
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
index 84527726b7b..71823d6a24d 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
@@ -47,7 +47,6 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apiguardian.api.API;
-import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -113,7 +112,7 @@ static ResourceLock releaseWrite(ReentrantReadWriteLock lock) {
      * however, when element in not shared, then adds overhead as every lock and unlock allocates memory.
      * So in case of cloned-per-thread elements, we use {@link Collections#synchronizedMap(Map)} instead.
      */
-    @GuardedBy("lock")
+    // @GuardedBy("lock")
     private final Map<String, JMeterProperty> propMap =
             lock != null
                     ? new LinkedHashMap<>()
@@ -138,7 +137,7 @@ static ResourceLock releaseWrite(ReentrantReadWriteLock lock) {
     /**
      * Holds properties added when isRunningVersion is true
      */
-    @GuardedBy("lock")
+    // @GuardedBy("lock")
     private transient Set<JMeterProperty> temporaryProperties;
 
     private transient boolean runningVersion = false;
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 812195318c4..48fe46e7a04 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -22,8 +22,7 @@
 33826,batik-xml-1.17.jar
 113369,bsf-2.4.0.jar
 389033,bsh-2.0b6.jar
-912143,caffeine-2.9.3.jar
-241628,checker-qual-3.52.0.jar
+1020615,caffeine-3.2.3.jar
 401021,commons-codec-1.20.0.jar
 588337,commons-collections-3.2.2.jar
 898652,commons-collections4-4.5.0.jar
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
index bed950ae157..8852f6332e4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
@@ -269,25 +269,19 @@ private void setCache(String lastModified, String cacheControl, String expires,
                 // else expiresDate computed in (expires!=null) condition is used
             }
         }
+        Cache<String, CacheEntry> cache = getCache();
         if (varyHeader != null) {
             if (log.isDebugEnabled()) {
                 log.debug("Set entry into cache for url {} and vary {} ({})", url,
                         varyHeader,
                         varyUrl(url, varyHeader.getKey(), varyHeader.getValue()));
             }
-            getCache().put(url, new CacheEntry(lastModified, expiresDate, etag, varyHeader.getKey()));
-            getCache().put(varyUrl(url, varyHeader.getKey(), varyHeader.getValue()), new CacheEntry(lastModified, expiresDate, etag, null));
-        } else {
-            // Makes expiresDate effectively-final
-            Date entryExpiresDate = expiresDate;
-            getCache().get(
-                    url,
-                    key -> {
-                        CacheEntry cacheEntry = new CacheEntry(lastModified, entryExpiresDate, etag, null);
-                        log.debug("Set entry {} into cache for url {}", url, cacheEntry);
-                        return cacheEntry;
-                    }
-            );
+            cache.put(url, new CacheEntry(lastModified, expiresDate, etag, varyHeader.getKey()));
+            cache.put(varyUrl(url, varyHeader.getKey(), varyHeader.getValue()), new CacheEntry(lastModified, expiresDate, etag, null));
+        } else if (cache.getIfPresent(url) == null) {
+            CacheEntry cacheEntry = new CacheEntry(lastModified, expiresDate, etag, null);
+            log.debug("Set entry {} into cache for url {}", url, cacheEntry);
+            cache.put(url, cacheEntry);
         }
     }
 

From 7ef2ca03b458c523f7c3c3ef15a0ef681a56d3dd Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 17 Nov 2025 06:33:01 +0000
Subject: [PATCH 0967/1037] fix(deps): update org.apache.activemq to v6

---
 bin/testfiles/JMS_TESTS.jmx                   |   4 +-
 gradle/verification-keyring.keys              | 124 ++++++++++++++++++
 gradle/verification-metadata.xml              |  29 ++++
 src/bom-testing/build.gradle.kts              |   6 +-
 src/bom-thirdparty/build.gradle.kts           |   2 +-
 src/dist/src/dist/expected_release_jars.csv   |   2 +-
 src/protocol/jms/build.gradle.kts             |   4 +-
 .../org/apache/jmeter/protocol/jms/Utils.java |  23 ++--
 .../jmeter/protocol/jms/client/Publisher.java |  21 +--
 .../jms/client/ReceiveSubscriber.java         |  17 +--
 .../protocol/jms/sampler/BaseJMSSampler.java  |  10 +-
 .../jms/sampler/FixedQueueExecutor.java       |   8 +-
 .../protocol/jms/sampler/JMSSampler.java      |  31 ++---
 .../protocol/jms/sampler/MessageAdmin.java    |   4 +-
 .../jms/sampler/PublisherSampler.java         |   7 +-
 .../protocol/jms/sampler/QueueExecutor.java   |   4 +-
 .../jmeter/protocol/jms/sampler/Receiver.java |  16 +--
 .../jms/sampler/SubscriberSampler.java        |  13 +-
 .../jms/sampler/TemporaryQueueExecutor.java   |  12 +-
 .../sampler/TimeoutEnabledQueueRequestor.java |  18 +--
 20 files changed, 256 insertions(+), 99 deletions(-)

diff --git a/bin/testfiles/JMS_TESTS.jmx b/bin/testfiles/JMS_TESTS.jmx
index d7a82d3e28e..f56b7bc7918 100644
--- a/bin/testfiles/JMS_TESTS.jmx
+++ b/bin/testfiles/JMS_TESTS.jmx
@@ -114,7 +114,7 @@ try {
           <stringProp name="filename"></stringProp>
           <stringProp name="parameters">dynamicQueues/requestQueue0-tmp</stringProp>
           <stringProp name="script">import org.apache.activemq.ActiveMQConnectionFactory;
-import javax.jms.*;
+import jakarta.jms.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -387,7 +387,7 @@ class MyMessageListener implements MessageListener {
           <stringProp name="filename"></stringProp>
           <stringProp name="parameters"></stringProp>
           <stringProp name="script">import org.apache.activemq.ActiveMQConnectionFactory;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.naming.InitialContext;
 import javax.naming.Context;
 import java.util.Properties;
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 24d023a47fa..568bda026e0 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -866,6 +866,50 @@ z74Y+1/XQhaVY3fqNg==
 =SM1h
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    9D5BEFFA5942C049
+uid    Gregor Zurowski <gzurowski@apache.org>
+
+sub    D8B8EDD1A48CCE10
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qU1ldqm7EtpwNw==
+=KlOH
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    9E31AB27445478DB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -4549,6 +4593,86 @@ RFIsPREvvu5tme8fWkkMMbd+hZ1007zBuNCNPm4=
 =05pd
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    2591BA36FD00E56A
+uid    Eclipse Project for JMS <jms-dev@eclipse.org>
+
+sub    590C2310CEE1C9BE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qk+yyfD2O8NsRi+Yo8AhJRreh6d2UCmzag==
+=Cf5Y
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    2A742740E08E7F8D
 sub    74C249541619FF0B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index f586815a667..9d224669119 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -43,6 +43,7 @@
          <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito" name="mockito-bom"/>
          <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
+         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain"/>
          <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
@@ -109,6 +110,7 @@
          <trusted-key id="59A8E169739301FD48139CA00E325BECB6962A24" group="jakarta.annotation"/>
          <trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA" group="org.apache.xmlgraphics"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
+         <trusted-key id="60ECEF24611FE832714F86AA9D5BEFFA5942C049" group="org.apache.camel"/>
          <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994">
             <trusting group="com.fasterxml" name="oss-parent" version="38"/>
             <trusting group="org.codehaus.woodstox"/>
@@ -144,6 +146,7 @@
          <trusted-key id="98465301A4939C0279F2E847D89D05374952262B" group="org.jetbrains.dokka"/>
          <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="^com[.]github[.]spotbugs($|([.].*))" regex="true"/>
          <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom"/>
+         <trusted-key id="A1483F88BA771993AB609C43590C2310CEE1C9BE" group="jakarta.jms" name="jakarta.jms-api" version="3.1.0"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
          <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
          <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern"/>
@@ -523,6 +526,7 @@
       <component group="org.apache" name="apache" version="18">
          <artifact name="apache-18.pom">
             <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+            <sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache" name="apache" version="21">
@@ -641,6 +645,21 @@
             <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
          </artifact>
       </component>
+      <component group="org.apache.geronimo.genesis" name="genesis" version="2.3">
+         <artifact name="genesis-2.3.pom">
+            <sha256 value="e7cf305a857c1fb5819f0ed1d90b982aa9ebe550e018bd503bd115d736c75aa1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.geronimo.genesis" name="genesis-default-flava" version="2.3">
+         <artifact name="genesis-default-flava-2.3.pom">
+            <sha256 value="1779f7a7e150ac199fed9f619053803d2bca1a6844b779f54164d4f9a8a8fb12" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.geronimo.genesis" name="genesis-java8-flava" version="2.3">
+         <artifact name="genesis-java8-flava-2.3.pom">
+            <sha256 value="cd53ce80636f9c0a4e84a9b78044042d4c2c5887339a0d9f977f701582002c8a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
          <artifact name="httpclient-4.5.14.pom">
             <sha256 value="f18355af4cf80a8a4ef04ebd742a47e90a7eaf080c725b2095dbc4fc5dbdefb7" origin="Generated by Gradle"/>
@@ -705,12 +724,22 @@
             <sha256 value="79da410c8c0f46a3f8e8adb30d6c24ccd6065b6ef6bfde87bd97e9881ea0a2e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
+         <artifact name="project-1.0.7.pom">
+            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.ee4j" name="project" version="1.0.9">
          <artifact name="project-1.0.9.pom">
             <pgp value="AA70C7C433D501636392EC02153E7A3C2B4E5118"/>
             <sha256 value="825379934a1cf29249f349f2d18adaf79a7b2cb2dbe231518974e1ee70941c17" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="11.0.26">
+         <artifact name="jetty-bom-11.0.26.pom">
+            <sha256 value="232a9fd682e5c5bc82c1a463ef434c806240e62f5c1f9a167c0ad69d15d9fd64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
          <artifact name="jetty-bom-9.4.53.v20231009.pom">
             <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 92f213267f5..8bc7bc71f3f 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -44,9 +44,9 @@ dependencies {
         api("net.bytebuddy:byte-buddy:1.17.8")
         api("nl.jqno.equalsverifier:equalsverifier:4.2.2")
         // activemq-all should not be used as it provides secondary slf4j binding
-        api("org.apache.activemq:activemq-broker:5.16.8")
-        api("org.apache.activemq:activemq-client:5.16.8")
-        api("org.apache.activemq:activemq-spring:5.16.8")
+        api("org.apache.activemq:activemq-broker:6.2.0")
+        api("org.apache.activemq:activemq-client:6.2.0")
+        api("org.apache.activemq:activemq-spring:6.2.0")
         api("org.apache.ftpserver:ftplet-api:1.2.1")
         api("org.apache.ftpserver:ftpserver-core:1.2.1")
         api("org.apache.mina:mina-core:2.2.4")
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 20d277858bf..588ddd89666 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -72,6 +72,7 @@ dependencies {
         api("dnsjava:dnsjava:3.6.3")
         api("io.burt:jmespath-core:0.6.0")
         api("io.burt:jmespath-jackson:0.6.0")
+        api("jakarta.jms:jakarta.jms-api:3.1.0")
         api("javax.activation:javax.activation-api:1.2.0")
         api("javax.mail:mail:1.5.0-b01")
         api("jcharts:jcharts:0.7.5")
@@ -105,7 +106,6 @@ dependencies {
         api("org.apache.commons:commons-text:1.14.0") {
             because("User might still rely on commons-text")
         }
-        api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
         api("org.apache.httpcomponents.client5:httpclient5:5.5.1")
         api("org.apache.httpcomponents:httpasyncclient:4.1.5")
         api("org.apache.httpcomponents:httpclient:4.5.14")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 48fe46e7a04..4ce36f05ec3 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -56,7 +56,6 @@
 588267,dnsjava-3.6.3.jar
 20388,error_prone_annotations-2.44.0.jar
 1886604,freemarker-2.3.34.jar
-32359,geronimo-jms_1.1_spec-1.1.1.jar
 8057697,groovy-5.0.2.jar
 20224,groovy-datetime-5.0.2.jar
 12371,groovy-dateutil-5.0.2.jar
@@ -76,6 +75,7 @@
 79195,jackson-annotations-2.20.jar
 593176,jackson-core-2.20.1.jar
 1688480,jackson-databind-2.20.1.jar
+58964,jakarta.jms-api-3.1.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
 16555,jcl-over-slf4j-1.7.36.jar
diff --git a/src/protocol/jms/build.gradle.kts b/src/protocol/jms/build.gradle.kts
index e3318dce21e..dd6356f9aa9 100644
--- a/src/protocol/jms/build.gradle.kts
+++ b/src/protocol/jms/build.gradle.kts
@@ -25,9 +25,7 @@ dependencies {
     api("com.github.ben-manes.caffeine:caffeine") {
         because("MessageRenderer#getValueFromFile(..., caffeine.cache.Cache)")
     }
-    // TODO: technically speaking, jms_1.1_spec should be compileOnly
-    // since we either include a JMS implementation or we can't use JMS at all
-    implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
+    api("jakarta.jms:jakarta.jms-api")
     implementation("com.miglayout:miglayout-swing")
 
     testImplementation(testFixtures(projects.src.core))
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
index 5168e061a31..adbd7356d2f 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
@@ -21,13 +21,6 @@
 import java.util.Hashtable;
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
@@ -36,6 +29,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+
 /**
  * Utility methods for JMS protocol.
  * WARNING - the API for this class is likely to change!
@@ -195,13 +196,13 @@ public static String getFromEnvironment(Context context, String key) throws Nami
      *             when lookup in context fails
      */
     public static Connection getConnection(Context ctx, String factoryName) throws JMSException, NamingException {
-        Object objfac = null;
+        Object objfac;
         try {
             objfac = ctx.lookup(factoryName);
         } catch (NoClassDefFoundError e) {
-            throw new NamingException("Lookup failed: "+e.toString());
+            throw new NamingException("Lookup failed: " + e);
         }
-        if (objfac instanceof javax.jms.ConnectionFactory connectionFactory) {
+        if (objfac instanceof jakarta.jms.ConnectionFactory connectionFactory) {
             String username = getFromEnvironment(ctx, Context.SECURITY_PRINCIPAL);
             if(username != null) {
                 String password = getFromEnvironment(ctx, Context.SECURITY_CREDENTIALS);
@@ -211,7 +212,7 @@ public static Connection getConnection(Context ctx, String factoryName) throws J
                 return connectionFactory.createConnection();
             }
         }
-        throw new NamingException("Expected javax.jms.ConnectionFactory, found "+(objfac != null ? objfac.getClass().getName(): "null"));
+        throw new NamingException("Expected jakarta.jms.ConnectionFactory, found "+(objfac != null ? objfac.getClass().getName(): "null"));
     }
 
     /**
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java
index ddf08a88962..0222fa59a9f 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java
@@ -21,16 +21,6 @@
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
@@ -38,6 +28,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.BytesMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+
 public class Publisher implements Closeable {
 
     private static final Logger log = LoggerFactory.getLogger(Publisher.class);
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
index f4f177cce9c..8d88ed87112 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
@@ -21,14 +21,6 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-import javax.jms.Topic;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
@@ -37,6 +29,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+
 /**
  * Generic MessageConsumer class, which has two possible strategies.
  * <ul>
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
index cefe77d4991..1b1b0ec6fe9 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
@@ -21,11 +21,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-
 import org.apache.jmeter.samplers.AbstractSampler;
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;
@@ -33,6 +28,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+
 /**
  *
  * BaseJMSSampler is an abstract class which provides implementation for common
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
index 49dde949f57..bf37fa3acc0 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
@@ -20,13 +20,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+
 /**
  * Request/reply executor with a fixed reply queue. <br>
  *
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
index 9a8e44088fd..0f6acb054f2 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
@@ -27,21 +27,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -64,6 +49,22 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.BytesMessage;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+
 /**
  * This class implements the JMS Point-to-Point sampler
  *
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
index 5dea0c1ad38..9dc839d16d8 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
@@ -21,11 +21,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 
-import javax.jms.Message;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.Message;
+
 
 /**
  * Administration of messages.
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
index 2193e5c79b0..d6edc7b358b 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
@@ -30,9 +30,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Message;
 import javax.naming.NamingException;
 
 import org.apache.jmeter.config.Arguments;
@@ -56,6 +53,10 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+
 /**
  * This class implements the JMS Publisher sampler.
  */
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java
index 44afec6c8af..59c267195cf 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java
@@ -17,8 +17,8 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 /**
  * Executor for (pseudo) synchronous communication. <br>
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
index 40fc740ec0f..dc095c408dc 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java
@@ -17,19 +17,19 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
-
 import org.apache.jmeter.protocol.jms.Utils;
 import org.apache.jorphan.util.StringUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
+
 /**
  * Receiver of pseudo-synchronous reply messages.
  *
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
index af350c8c217..dfe3764c139 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
@@ -20,12 +20,6 @@
 import java.util.Enumeration;
 import java.util.Optional;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
 import javax.naming.NamingException;
 
 import org.apache.jmeter.protocol.jms.Utils;
@@ -42,6 +36,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.TextMessage;
+
 /**
  * This class implements the JMS Subscriber sampler.
  * It supports both receive and onMessage strategies via the ReceiveSubscriber class.
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
index 33718a9ae5c..0002d9453b8 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
@@ -17,15 +17,15 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueRequestor;
-import javax.jms.QueueSession;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueRequestor;
+import jakarta.jms.QueueSession;
+
 /**
  * Request/reply executor with a temporary reply queue. <br>
  *
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
index a08590270cd..eb3de10c6a6 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
@@ -17,18 +17,18 @@
 
 package org.apache.jmeter.protocol.jms.sampler;
 
-import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.jms.InvalidDestinationException;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.TemporaryQueue;
+
 /**
  * The <code>TimeoutEnabledQueueRequestor</code> helper class simplifies making
  * service requests using the request/reply pattern.

From 455fc7b500ffc99f47a8e82f952be6f76efca16a Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 17 Nov 2025 13:41:37 +0300
Subject: [PATCH 0968/1037] chore: remove Checkerframework buildscript
 configuration

---
 build-logic/build-parameters/build.gradle.kts |  4 --
 build-logic/verification/build.gradle.kts     |  1 -
 .../build-logic.checkerframework.gradle.kts   | 61 -------------------
 .../main/kotlin/build-logic.style.gradle.kts  |  3 -
 renovate.json                                 |  6 --
 src/bom-thirdparty/build.gradle.kts           |  1 -
 6 files changed, 76 deletions(-)
 delete mode 100644 build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 945caebbc55..64fee6d0a2e 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -74,10 +74,6 @@ buildParameters {
         defaultValue.set(false)
         description.set("Ignore SpotBugs failures")
     }
-    bool("enableCheckerframework") {
-        defaultValue.set(false)
-        description.set("Run CheckerFramework (nullness) verifications")
-    }
     bool("skipAutostyle") {
         defaultValue.set(false)
         description.set("Skip AutoStyle verifications")
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index bbb4fd062de..2963cab63cb 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
-    api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.61")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
     api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
 }
diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
deleted file mode 100644
index ca364483d97..00000000000
--- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.gradle.kotlin.dsl.dependencies
-
-plugins {
-    id("build-logic.build-params")
-    id("org.checkerframework")
-}
-
-dependencies {
-    providers.gradleProperty("checkerframework.version")
-        .takeIf { it.isPresent }
-        ?.let {
-            val checkerframeworkVersion = it.get()
-            "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
-            if (buildParameters.buildJdkVersion == 8) {
-                // only needed for JDK 8
-                "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
-            }
-        } ?: run {
-        val checkerframeworkVersion = "3.52.0"
-        "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
-        if (buildParameters.buildJdkVersion == 8) {
-            // only needed for JDK 8
-            "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
-        }
-    }
-}
-
-checkerFramework {
-    skipVersionCheck = true
-    excludeTests = true
-    // See https://checkerframework.org/manual/#introduction
-    checkers.add("org.checkerframework.checker.nullness.NullnessChecker")
-    checkers.add("org.checkerframework.checker.optional.OptionalChecker")
-    // checkers.add("org.checkerframework.checker.index.IndexChecker")
-    checkers.add("org.checkerframework.checker.regex.RegexChecker")
-    extraJavacArgs.add(
-        "-Astubs=" +
-            fileTree("$rootDir/config/checkerframework") {
-                include("*.astub")
-            }.asPath
-    )
-    // The below produces too many warnings :(
-    // extraJavacArgs.add("-Alint=redundantNullComparison")
-}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
index fa56eaa38f4..34248aa07b8 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -39,9 +39,6 @@ plugins.withId("java-base") {
     if (!buildParameters.skipForbiddenApis) {
         apply(plugin = "build-logic.forbidden-apis")
     }
-    if (buildParameters.enableCheckerframework) {
-        apply(plugin = "build-logic.checkerframework")
-    }
     if (buildParameters.enableErrorprone) {
         apply(plugin = "build-logic.errorprone")
     }
diff --git a/renovate.json b/renovate.json
index cadad96d66c..9b90c00d5d6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -122,12 +122,6 @@
         "org.apache.tika{/,}**"
       ]
     },
-    {
-      "groupName": "org.checkerframework",
-      "matchPackageNames": [
-        "org.checkerframework{/,}**"
-      ]
-    },
     {
       "groupName": "org.eclipse.jetty",
       "matchPackageNames": [
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 588ddd89666..10ac56b290b 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -79,7 +79,6 @@ dependencies {
         api("junit:junit:4.13.2") {
             because("ApacheJMeter_junit depends on junit4")
         }
-        api("org.checkerframework:checker-qual:3.52.0")
         api("org.hamcrest:hamcrest-core:3.0") {
             because("ApacheJMeter_junit depends on junit4")
         }

From 9996b5713dc9e70563e12afeb00942880c475836 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 17 Nov 2025 06:30:07 +0000
Subject: [PATCH 0969/1037] fix(deps): update dependency
 org.ajoberstar.grgit:grgit-gradle to v5

---
 build-logic/batchtest/build.gradle.kts |   2 +-
 gradle/verification-keyring.keys       | 140 +++++++++++++++++++++++++
 gradle/verification-metadata.xml       |   1 +
 3 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/build-logic/batchtest/build.gradle.kts b/build-logic/batchtest/build.gradle.kts
index 99396e12129..2c2ce47d5f8 100644
--- a/build-logic/batchtest/build.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -20,6 +20,6 @@ plugins {
 }
 
 dependencies {
-    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.3")
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r")
 }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 568bda026e0..e0759d1d6cd 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -2848,6 +2848,146 @@ JtchwdNBzxrmkygs1IMB6Q==
 =7xse
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    EAFFBC7AC6CF8B64
+uid    Andrew Oberstar <ajoberstar@gmail.com>
+
+sub    EEBCAE0AE5C05560
+sub    11904DDC7A76DE10
+sub    63B22CF3ABA61D86
+sub    9B3F29CF997676BA
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+oBovhBrq21skIw==
+=mxLY
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    ECDFEA3CB4493B94
 uid    Guillaume Nodet <gnodet@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9d224669119..d04e302d20d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -75,6 +75,7 @@
          <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC" group="org.yaml"/>
          <trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains"/>
          <trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.apache.groovy"/>
+         <trusted-key id="3493E5AF251AA07A41742D3363B22CF3ABA61D86" group="org.ajoberstar.grgit"/>
          <trusted-key id="3A4D86C56CA99373B6D8953DBE84D764623A3644" group="org.brotli"/>
          <trusted-key id="3CAC6E7DC43343FF75ECBAC27E6EB7BB6A7712DC" group="net.sourceforge.nekohtml"/>
          <trusted-key id="3F05DDA9F317301E927136D417A27CE7A60FF5F0" group="io.opentelemetry"/>

From 93fe0dda2b9c9e6fbecef3555e08d342e78afaa4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 17 Nov 2025 14:05:40 +0300
Subject: [PATCH 0970/1037] chore: remove use of deprecated
 build.isCurrentBuild

---
 src/dist/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 6d87535def2..c5533b68195 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -214,7 +214,7 @@ val verifyReleaseDependencies by tasks.registering {
         val libs = deps.asSequence()
             .filter {
                 val compId = it.id.componentIdentifier
-                compId !is ProjectComponentIdentifier || !compId.build.isCurrentBuild
+                compId !is ProjectComponentIdentifier
             }
             .map { it.file.name to it.file.length() }
             .sortedWith(compareBy(caseInsensitive) { it.first })

From cb1f10816c4d9983e1e31963823fd6f113abb35e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 19 Nov 2025 12:13:14 +0300
Subject: [PATCH 0971/1037] chore: remove SpotBugs verifications

SpotBugs is slow, it is problematic, it requires dependency updates,
it fails like in https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1508
---
 build-logic/build-parameters/build.gradle.kts |  8 ---
 build-logic/verification/build.gradle.kts     |  1 -
 ...build-logic.sonarqube-aggregate.gradle.kts | 24 -------
 .../kotlin/build-logic.spotbugs.gradle.kts    | 71 -------------------
 .../main/kotlin/build-logic.style.gradle.kts  |  3 -
 gradle/verification-metadata.xml              |  5 --
 6 files changed, 112 deletions(-)
 delete mode 100644 build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 64fee6d0a2e..62c02c9a71f 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -62,18 +62,10 @@ buildParameters {
     string("jdkTestImplementation") {
         description.set("Vendor-specific virtual machine implementation to use testing JMeter (see https://docs.gradle.org/8.0/userguide/toolchains.html#selecting_toolchains_by_virtual_machine_implementation)")
     }
-    bool("spotbugs") {
-        defaultValue.set(false)
-        description.set("Run SpotBugs verifications")
-    }
     bool("sonarqube") {
         defaultValue.set(false)
         description.set("Report verification results to Sonarqube")
     }
-    bool("ignoreSpotBugsFailures") {
-        defaultValue.set(false)
-        description.set("Ignore SpotBugs failures")
-    }
     bool("skipAutostyle") {
         defaultValue.set(false)
         description.set("Skip AutoStyle verifications")
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 2963cab63cb..76ee5908f1d 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,7 +23,6 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:4.0")
-    api("com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.0.4")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
diff --git a/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
index 9b610ebe678..66fc57247bc 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.sonarqube-aggregate.gradle.kts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import com.github.spotbugs.snom.SpotBugsTask
 import jacoco.JacocoAggregateReportSpec
 
 plugins {
@@ -68,26 +67,3 @@ plugins.withId("build-params.jacoco-aggregation") {
         }
     }
 }
-
-subprojects {
-    plugins.withId("com.github.spotbugs") {
-        val spotBugTasks = tasks.withType<SpotBugsTask>().matching {
-            // We don't send spotbugs for test classes
-            !it.name.endsWith("Test")
-        }
-        sonarTask {
-            dependsOn(spotBugTasks)
-        }
-        sonar {
-            properties {
-                property(
-                    "sonar.java.spotbugs.reportPaths",
-                    spotBugTasks.asSequence()
-                        .map {
-                            it.reports.named("XML").get().outputLocation.asFile.get()
-                        }
-                )
-            }
-        }
-    }
-}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
deleted file mode 100644
index 83726b7ea95..00000000000
--- a/build-logic/verification/src/main/kotlin/build-logic.spotbugs.gradle.kts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import com.github.spotbugs.snom.Confidence
-import com.github.spotbugs.snom.SpotBugsTask
-import com.github.vlsi.gradle.dsl.configureEach
-import org.gradle.language.base.plugins.LifecycleBasePlugin
-
-plugins {
-    id("com.github.spotbugs")
-    id("build-logic.build-params")
-}
-
-spotbugs {
-    // Below statement is for Renovate Bot since it does not support toolVersion.set("..") pattern yet
-    val toolVersion = "4.9.8"
-    this.toolVersion.set(toolVersion)
-
-    providers.gradleProperty("spotbugs.version")
-        .takeIf { it.isPresent }
-        ?.let { this.toolVersion.set(it) }
-    reportLevel.set(Confidence.HIGH)
-    ignoreFailures.set(buildParameters.ignoreSpotBugsFailures)
-}
-
-dependencies {
-    constraints {
-        providers.gradleProperty("asm.version")
-            .takeIf { it.isPresent }
-            ?.let {
-                val asmVersion = it.get()
-                spotbugs("org.ow2.asm:asm:$asmVersion")
-                spotbugs("org.ow2.asm:asm-all:$asmVersion")
-                spotbugs("org.ow2.asm:asm-analysis:$asmVersion")
-                spotbugs("org.ow2.asm:asm-commons:$asmVersion")
-                spotbugs("org.ow2.asm:asm-tree:$asmVersion")
-                spotbugs("org.ow2.asm:asm-util:$asmVersion")
-            }
-    }
-}
-
-fun reportsForHumans() = System.getenv()["CI"]?.toBoolean() != true
-
-tasks.configureEach<SpotBugsTask> {
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
-    if (!buildParameters.spotbugs) {
-        description = "$description (skipped by default, to enable it add -Pspotbugs)"
-    }
-    reports {
-        // xml goes for SonarQube, so we always create it just in case
-        create("xml")
-        if (reportsForHumans()) {
-            create("html")
-        }
-    }
-    enabled = buildParameters.spotbugs
-}
diff --git a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
index 34248aa07b8..4ecf9ca094d 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -42,9 +42,6 @@ plugins.withId("java-base") {
     if (buildParameters.enableErrorprone) {
         apply(plugin = "build-logic.errorprone")
     }
-    if (buildParameters.spotbugs) {
-        apply(plugin = "build-logic.spotbugs")
-    }
     if (buildParameters.coverage) {
         apply(plugin = "build-logic.jacoco")
     }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d04e302d20d..d42e6152449 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -295,11 +295,6 @@
             <sha256 value="dc0e8e782ba0dac5c4d0d8678081c11380a5c793b3c46f2d0f8d242d1733b62b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
-         <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
-            <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="2.0.0">
          <artifact name="com.github.vlsi.crlf.gradle.plugin-2.0.0.pom">
             <sha256 value="fdd676d789d97e249bb312568659343e40bb68ab2cc7bb355e5f925a71a2e67d" origin="Generated by Gradle" reason="Artifact is not signed"/>

From c1ae95831ae64c7411ccbd076638274d428139ff Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 10:37:13 +0300
Subject: [PATCH 0972/1037] chore: make BatchTest() task abstract to make it
 compatible with further Gradle versions

---
 .../kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index 45291f1eb75..d1cada728d4 100644
--- a/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/build-logic/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -40,7 +40,7 @@ import java.net.InetAddress
 import java.net.ServerSocket
 import javax.inject.Inject
 
-open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
+abstract class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
     companion object {
         const val BATCH_TESTS_GROUP_NAME = "Batch test"
     }

From 0d5aff009e6870483676ff9bbd6c29c1b539ed31 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 17 Nov 2025 11:25:24 +0000
Subject: [PATCH 0973/1037] fix(deps): update dependency
 org.springframework:spring-framework-bom to v7

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 8bc7bc71f3f..3c41ee30254 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -27,7 +27,7 @@ javaPlatform {
 
 dependencies {
     api(platform("org.junit:junit-bom:5.14.1"))
-    api(platform("org.springframework:spring-framework-bom:6.2.12"))
+    api(platform("org.springframework:spring-framework-bom:7.0.0"))
     api(platform("org.eclipse.jetty:jetty-bom:11.0.26"))
 
     constraints {

From 14c87df76f78a4e975ddf34d4c6e0ca6d5f265c5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 13:15:20 +0300
Subject: [PATCH 0974/1037] chore: bump com.github.vlsi. Gradle plugins to
 3.0.1

---
 build-logic/jvm/build.gradle.kts        |  4 ++--
 build-logic/root-build/build.gradle.kts |  6 ++---
 gradle/verification-metadata.xml        | 32 +++++++++++++++----------
 settings.gradle.kts                     |  2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 17101499029..ec1429c55b0 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     api(projects.buildParameters)
     api(projects.verification)
     api("me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.3")
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:2.0.0")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:3.0.1")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:3.0.1")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
     api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.2.21")
     api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.1.0")
diff --git a/build-logic/root-build/build.gradle.kts b/build-logic/root-build/build.gradle.kts
index 6f73f54ac17..17ba8c75f64 100644
--- a/build-logic/root-build/build.gradle.kts
+++ b/build-logic/root-build/build.gradle.kts
@@ -27,9 +27,9 @@ dependencies {
     }
     api(projects.buildParameters)
     api(projects.verification)
-    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:2.0.0")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
+    api("com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin:3.0.1")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:3.0.1")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:3.0.1")
     api("org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:0.8.1")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
     api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d42e6152449..bc4e449eac6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -295,24 +295,24 @@
             <sha256 value="dc0e8e782ba0dac5c4d0d8678081c11380a5c793b3c46f2d0f8d242d1733b62b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="2.0.0">
-         <artifact name="com.github.vlsi.crlf.gradle.plugin-2.0.0.pom">
-            <sha256 value="fdd676d789d97e249bb312568659343e40bb68ab2cc7bb355e5f925a71a2e67d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.github.vlsi.crlf" name="com.github.vlsi.crlf.gradle.plugin" version="3.0.1">
+         <artifact name="com.github.vlsi.crlf.gradle.plugin-3.0.1.pom">
+            <sha256 value="b869cee159d958e0275909d5093f325d75a03164daa8e99c7ec3693f37f0bbe5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="2.0.0">
-         <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-2.0.0.pom">
-            <sha256 value="d251352a0a25549bd0bbb14526ea68acbda303c9b91295d0618adac1339e162f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.github.vlsi.gradle-extensions" name="com.github.vlsi.gradle-extensions.gradle.plugin" version="3.0.1">
+         <artifact name="com.github.vlsi.gradle-extensions.gradle.plugin-3.0.1.pom">
+            <sha256 value="52d5652d98bda6fadef8693adf297079839886fb8215c024600965ea6ad53dad" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="2.0.0">
-         <artifact name="com.github.vlsi.ide.gradle.plugin-2.0.0.pom">
-            <sha256 value="87b8dabfd24a97e80ac73a79be56df6b5d8270c254f558145c01c8458d088463" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.github.vlsi.ide" name="com.github.vlsi.ide.gradle.plugin" version="3.0.1">
+         <artifact name="com.github.vlsi.ide.gradle.plugin-3.0.1.pom">
+            <sha256 value="7fd908c3a3bc633412341bb531f3200cb7e8d17e8ce670736165b5e1cae0e009" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="2.0.0">
-         <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-2.0.0.pom">
-            <sha256 value="f3f33cd3e4c01914c9f353dd2649cc9710173b7ca7cabcd5718468c413c9626e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.github.vlsi.stage-vote-release" name="com.github.vlsi.stage-vote-release.gradle.plugin" version="3.0.1">
+         <artifact name="com.github.vlsi.stage-vote-release.gradle.plugin-3.0.1.pom">
+            <sha256 value="4d8cecdd10dae32aa288affee0b3679d412bf707d62e8ed4ed632ff313bb7623" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1">
@@ -429,6 +429,14 @@
             <sha256 value="c343542d7115b9bafc2e85fa2884cfabbc98edbecb1c757b79275f3f2c9f6ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="io.github.gradle-nexus" name="publish-plugin" version="2.0.0">
+         <artifact name="publish-plugin-2.0.0.jar">
+            <sha256 value="942c1a16d161f64631901b4e2dad541d2fcbfe51cf0323955dabe02e2a9ef2aa" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="publish-plugin-2.0.0.module">
+            <sha256 value="e13ff4d6e10f283b6287103c982f076bd619e2a461fb39c16d44d1d15d71e8f7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-bom" version="4.2.7.Final">
          <artifact name="netty-bom-4.2.7.Final.pom">
             <pgp value="7E22D50A7EBD9D2CD269B2D4056ACA74D46000BF"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 97082d1e4d7..3135067cea7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,7 @@
 
 pluginManagement {
     plugins {
-        id("com.github.vlsi.stage-vote-release") version "2.0.0"
+        id("com.github.vlsi.stage-vote-release") version "3.0.1"
         id("com.github.node-gradle.node") version "7.1.0"
     }
 }

From 7a895a26eca43b0aa8656c93feb1b416c025e9b0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 15:03:43 +0300
Subject: [PATCH 0975/1037] chore: bump com.github.vlsi.gradle-extensions to
 3.0.1

---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 build-logic/verification/build.gradle.kts     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index 62c02c9a71f..aa2c7d695f7 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -17,7 +17,7 @@
 
 plugins {
     id("org.gradlex.build-parameters") version "1.4.4"
-    id("com.github.vlsi.gradle-extensions") version "2.0.0"
+    id("com.github.vlsi.gradle-extensions") version "3.0.1"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
 
diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 76ee5908f1d..d36798501db 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     api(projects.basics)
     api(projects.buildParameters)
     api("com.github.autostyle:com.github.autostyle.gradle.plugin:4.0")
-    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:2.0.0")
-    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
+    api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:3.0.1")
+    api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:3.0.1")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")

From 0c359c3951418274ff57f8f965b5a53d8411f6a4 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 12:10:11 +0300
Subject: [PATCH 0976/1037] chore: bump Gradle to 9.2.1

---
 gradle/verification-metadata.xml         |  15 +++++++++++++++
 gradle/wrapper/gradle-wrapper.jar        | Bin 43504 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   9 ++++-----
 gradlew.bat                              |   4 ++--
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bc4e449eac6..af62086157c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -769,11 +769,21 @@
             <sha256 value="e3695b46e359a1ac10551acd0228ede5aef4ae1142fd2528ca035c17d03baae0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="6.4.1">
+         <artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-6.4.1.pom">
+            <sha256 value="60a500b734056a0473a82129ac7e666e92b9748f3a57587797a1057696ea5a06" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="5.2.0">
          <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom">
             <sha256 value="a57bb439ba4260a256f2d608471d7081189077a0a4ddfb028dd1817be5bc1237" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="6.4.1">
+         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-6.4.1.pom">
+            <sha256 value="f4585d516297ed5b44c80d27abcdbf5ca034682c7507813ef140072e10d8b6ce" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.gradle.toolchains.foojay-resolver-convention" name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin" version="1.0.0">
          <artifact name="org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-1.0.0.pom">
             <sha256 value="f133249a18754ae6a1d2701d00d849b1afba7b0683ddb5fc1b18a70071cec2fa" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -839,6 +849,11 @@
             <sha256 value="4f6fddbc10d9b2167899e34fa113fc9ad75cc4d6ce58ab84f9614b63c05f8da3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.2.20">
+         <artifact name="kotlin-gradle-plugins-bom-2.2.20.pom">
+            <sha256 value="3c6d469e915fbb3096ac4cb8c2f46c79d027c3c590e658a10688a1571eb578d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
          <artifact name="kotlin-stdlib-2.0.21.module">
             <sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 35074
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
YQR&Hk)5Is=TFJvDzzfVWb3tVZ04py{c>n+a

delta 34964
zcmXVXV_cp8|NoX2PS(k*W!qS`-LmbLJ4+|?WLwM2u9I7~ZDVoOf1mH~f9JY&-MAjt
z`-P|8ck?h;voN)GXiB$=zsD5hnV6?h<(cRweoy{VW1ZvJ+Q0eDG%P!=IL;u;_!0R8
zY@V`Lq(|3+PgSy4L?41rg@;pwckO!Z`tgH`{3k?*I$@!&A3l5#`2e{VAckO|OMx01
zs~QdASV-N}R?pQ=O{yqlrqz|1yp(^<a&nI_k2qrX3x_*x%U*54KC0|6((=Q?ZchI7
z59kDa=pi`c@LG1X8o@R~Y?VsAVM~?YIAs6T%3Uy(9%Y|GaZQRE`Gc}rB76^dpFfHF
z>RK)Bhkwq`;Yh)md4RrtR%sNbw?F7+wVN@9oT5^KvyxHCChVwDz29-_(~6`YI}kOI
zb^sOR2x~T#ZdIJ>Rf@`fWMMck8Z~Fk7!ymA-q=^Hp5eZ$X)}%69EWv#a)HMQBo+#f
z36F86&q=PH!h1hfL>Ol{cXt`zy7GFq%Eq79O{IA-u!cH*(wj1wN}D2M4WT6o(qxrW
zEB}r}@-+r4&wIr;xO0(AI@=cYWb?m21~K;0A^-T{gEQnxfCN&@N(#Zq#RXZY87O0m
z;t0Wp7M~;I&<5qU1T+?pjfUy<Jc|AOT)v<K)BDK2PSOOsx^C$y&nfj5_V&?eJ{(Rl
zdh!ho6z1cZ-xQMC%HcU7bU2azayr>e_TixR_f>$?rT1}+*6u;9Gn0cXM{`4grB6(W
zyBDpHwv$&%UIz<tFRW;)2Px>t(jZMh^e3jZ{I@kE301olpI{yj0+;ZWogmFjno1+v
zMW;sMFf7sR(_fhVjl~QhEC!kN?S1GnQ8&fuPw9z{5eDbyAAsT&CyjpUf=RK)X*YhW
zwf>HLeXJxlm0mFjo>lB@ni;CUkg)*JRligsG*5>@wN*UJvb<c;Yg3R!53646$0`;6
zK{L|1pA?i|G%i-Fz|PRdMa9I?BmqVSG<2AtA|}kVu4r$dR2#-Ts}G`RV$)?~1`&HD
z$K58R8gL0Qu9mN340h)0o|wuUtN95OqlSn7Qsh;^0B=TT&Q@UhVTAJ8ImM**OWTF4
zd@rTAsl)9uEbd`~(hi82xlBf~U07d@%}aw<^87opw)pmK#uprG04zIyXwD>S&X^}x
zn@^UJmJ90QY)d4OLkji-vg;l*>VWz+eRS?0G0Bg!HhZc?2Wz}S3kMg^_@+65nA?uo
zkBwh=aDQVGH8X<kFWeo9>VK>zh<aKp*kfv~kYx#7$4=nWXjy}B*yICfIp2`XDU57}
zD4;uKJAeTNbD{y#QGiL>0u{gJbev&iTnS1h3p(pF$?`aC^rhJj2lK`5&HHV#_?kJb
zGMSi_SJ(*5xg|k>>Dvgt0#5hN#b8)>x5&pj4Wy_c7=p-XQ=>p*vRykohWoq+vj1uk
znu?X~2=n2?uaB_*+Lr;+&434q#3lhbD9@_k1Te#nwy}MM^TTHt=B7p23Hvw*C##@<
z$6AnfJ+Ri~X^`J(;3$v;d?J5C5U~zQwBA9#k|t1Y#>7ZrY#I@2J`|kfQ=Sxhc*rH|
z{varkusu6HJ$Ca6x^v$ZA6sX;#AVi73(ebp61*3)LCF6yToc0LMM<l3m|z214DBT2
z3Le&}auLBok%Dr;Zm@PzhSh43@-48NXg(zw**y#M74Y+<Vuia4(S_U;$#1~sQ&dR4
z-R#_$F1z;!Ub`Shi*BN2j^a%U8nLG3yUJJZ#IndWT_$t)ecqZWS1G~QmlPYXTr|yZ
zB8<3_5f_1qDa)<e4+-KCA`pPs?+HSB%k*WYf&>m{D%k+S_eJ<3CTZgjVEpgE=i5mX
z0o|kFlPT7$0gM?NfN_Wk=T=zCXFhtz_fJrXuKFQ#uaUzUCWj%}$pz$g05t#ar{-1o
z#ZYh6o&A&s>>NA5>#m&gf?X>M)bj>Q7YY}AR8nPC<0CJ`QolY!M*@PhNF4%4$5nFf
z4{VxA-;8{~$A&>%Yo@~y4|O}IqYemSgP7Sy?d}}+e`ng%{?_hDUhCm`I`hP=rda|n
zVWx~(i&}Q|fj^k+l$Y30zv6ME&AX7HTjy~frLaX)QgCMmQq3_qKEcRyY7nk_fa}Z$
ztrwMjNeJ|A@3=y7o^6LMBj@LkTyHm7pK(Vxq%M=uXr;M7{wWsrG~I1ki5OQ6#92<r
zO{>I<W8;5s@(MaN(&IvDKua8NIN9tOM=M_{&tTAsaEbQ4-DG<>h%Quj|8Z|qUzyy6
zUf%s*-I*73e%AX}cTI5r+ZsgVR1jr6I*<x50PS<AUQ(1-cXTA6DH%zf_&3oO6Xp~z
z6#;d|uZvnuAKeu+PAL#LBH;d$b%80RVORQNVYJgCfoS~A0F&L~q2Q%&&V%d5+vC$Q
z$`92wW3NAdpR&)?8;Ac;nWWAkX&Py$S6t|5Lif71mooN~;I^w-;UD0bv|37!aY6Yk
z-dtnqG<dDY5lMPXc6c?mQd{CULz7971UqfZoA*&%vy?qQogFCimMoxneOzbk`D1;5
ztXcYgLDRP@wXnucesQxR@LkU78|ZT=^s*kb?7J`TQ>hnu%*rSWqzs(T0KD7A4U}76
z)lH{eBF=pRy0q*o<*iM4@ojv65`y{#TKm=!5+7PwC>z)to^he4BI9`z60IYcFC8XC
zZ<65C;OV<=0*{u4*i@nn?J4m6_p_jauY-;RSof^%yxer|uPQvyzOCP1x_-}6H;)~6
zkQH$^6A(lu&B^q)5vwSypjGu5P`Y#UdzM%Uhuh>vlisoS7c?a}|1hah-vo_i`e5;!
z93hb``au;ow+t;(wB3-=ww(pgb`ZrEODvFvfEi<bRzMw=JFV-4DSx?HYMEZ7esf~!
z%_e@RpbW2UMT-qT!^0WXs&1Y5nwc>QvXaSX6+A0ooWdEx3u-oBf9<z-=w^Wsk0&IE
zQtf<BlrVUyLM(x_fXLea6cqADaZKjNg!0X16U4FA5^1&jSqDD`Czjp)%>V((3iwRO
z7r|AqsNjl$(oTUVvOf^E%G%WX=xJnm>@^c!%RBGy7j<>%w26$G5`?s89=$6leu-z;
zm&Y<XyfvdFH8~E#@k-qGxC1OZ-!(BP55Fi=<)pBMG60xnIj@eRK?r-T8Jaj328NvQ
zQq}>ocPl2@2EDw6AVuSU&r>cR{&34@7`cLYzqnX)TU_5wibwZ+NC5dMyxz3f!>0(Y
zJDdZUg*VS5udu>$bd~P>Zq^r)bO{ndzlaMiO5{7vEWb3Jf#FOpb7ZDmmnP?5x?`TX
z@_zlHn)+{T;BtNeJ1Kdp2+u!?dDx4`{9omcB_-%HYs2n5W-t74WV76()dbBN+P)HN
zEpCJy82#5rQM+vTjIbX*7<~F)AB_<xfNVT*EbsyhXYv!3A}A|O5(+S7_}6W8=i)zS
zNJtb3i1I_0e#jS}DwgK8Ra8|dg(EY!Otf5<{i4m}*bP!hap5ftxCu5Adj53x8$HcU
za7cN_|7RNn><GA)*Z$*w*?H-f+dj|J{r3>%L*_LL*fW-7b@ATWT1AoUpajnr9aJ19
zmY}jSdf+bZ;V~9%$rJ-wJ3!DTQ3``rU@M~E-kH$kdWfBiS8QL&(56OM&g*O73qNi(
zRjq8{%`~n?-iv!fKL>JDO7S4!aujA}t+u6;A0sxCv_<VXRDIK1Eg&RABB}alhDcr2
zk$vEKgkaUOT+dM#U1f_9SBxsO0CKSSRZ%`LGHW>hy~Y2Pbe53I*A1qHMYgSCj0z6O
zJ!z}o>nI#-@4ZvRP|M!GqkTNYb7Y)$DPWBF3NCjNU-395FoDOuM6T+OSEwNQn3C`D
z-I}Tw$^1)2!XX+o@sZp^B4*!UJ=|lZi63u~M4Q%rQE`2}*SW$b)?||O1ay`#&Xjc!
z0RB3AaS%X&szV$SLIsGT@24^$5Z8p%ECKsnE92`h{xp^i(i3o%;W{mjAQmWf(6O8A
zf7uXY$J^4o{w}0hV)1<?-7h7RSzH@3nU|lDt`it^&{`s%9>am8s1awoz0g%hOx4-7
zx8o@8k%dNJ(lA#*fC+}@0ENA#RLfdZB|fY9dXBb;(hk%{m~8J)QQ7CO5zQ4|)Jo4g
z67cMld~VvYe6F!2OjfYz?+gy}S~<7gU@;?FfiET@6~z&q*ec+5vd;KI!tU4``&reW
zL3}KkDT;2%n{ph5*uxMj0bNmy2YRohzP+3!P=Z6JA*Crjvb+#p4RTQ=sJAbk@>dP^
zV+h!#Ct4IB`es)P;U!P5lzZCHBH#Q(kD*pgWrlx&qj1p`4K<zjvS_6VXYMCxayR-I
zSD?G5sxYRh|A$pu!;PO>Y(+c*Kf7$j5nW^lOB#@PafVap`&1;j9^+4;EDO%G9G4gK
zB<?%FC--Im42euhfVxgvoo#+b0zU;E4GF<<LDvN|txD2&gcdG`<Jl|Pp^<~x4OPA~
z-<9=)VF6>zrL7D#M1;*$YefD2I-+LH{qgzvY8#|K=-X`LN578mTYqDhU}$>9W&VOs
z*wW$@o<G<aNo3)oKEO@@W_CxPW^yC!!~(FjA==?tKB>?Vfqr4R0v4Yo_zlb?HKOFS
zU@WY7^A8Y{P)qU9gAz52zB8JHL`Ef!)aK7P)8dct2GxC*y2eQV4gSRoLzW*ovb>hR
zb0w+7w?v6Q5x1@S@t%$TP0Wiu2czDS*s8^HFl3HOkm{zwCL7#4wWP6AyUGp_WB8t8
zon>`pPm(j}2I7<<c_nAwRW@a39=dJhjno`SIMsb#J)i=UM09MQa3YtUuBb}2j@S6y
zcZlH@wy$X!j9KdFRRS+l*5Uai{}LMFt8C;UGmE5N;jxJtIhj%q^9K5RcoAKy5K|*D
z*FcYPI>SUzI=fltEbSR`iSoE1*F3pH4`ax^yEo<-pi;O<!U_Z@I@L(#Yr{1SD`)QT
z)oXGWr`t*{G50rd#(4Ed8n)x8h7Hpj;d|`o2;Ne7?4uH8`3eJ75}~KF&&@A$qQPd^
z4yX~r&OcRIn)o{BqYN&DY#_eME4v$z`>s;iXcNrWfCGP^Jmp935cN;!T8bve@Qljm
z>3ySDAULgN1!F~X7`sAjokd_;kB<qtphM4K&?{Sgj`ZZ~wo4_6^qnAg?%+a-Y(w@}
ze_k#nCF(kVW31-v_8-+aHdV{mk1USL13&vlzyf-2G3_PskM(`JPS?>L99gBC2yjO+
zEqO##8mjsq`|9xpkae&q&F=J#A}#1%b%i3jK-lptc_O$uVki1KJ?Y=ulf*D$sa)HC
z=vNki?1aP~%#3<Hq9;O5C5x+zdvxI{gfqV5P!<;y`qa(%o82?X9?Wv++OF}$oK~|+
zk~#6FmEqMrAQDzwC?oL8Ji%PZH-0K{e&?Mjzdxx_T?ATJ=15rPQQ=0EXmKJ?yYT96
zf#|X*+7<^!{D`%JDt+|^6XFzhwriX@lM!dThYEMSZruL5kRo)f8Z8OO;vd)D1oqH1
z;B9er_#xa*nkt57b?E($Kz|$e8awn#RrTePIy$cb7@63iw?;>1<#s+6US0>wX5}nI
zhec(KhqxFhhq%8hS?5p|OZ02EJsNPTf!r5KKQB>C#3||j4cr3JZ%iiKUXDCHr!!{g
z=xPxc@U28V8&DpX-UCYz*k~2e)q?lRg<{o%1r;+U)q^{v&abJ9&nc6a32ft(Yk}`j
ztiQP@yEKf@Nu3F;yo9O})Roh9P08j7@%ftn7U1y;`mard4<Ag?KKzp-VBv5ej{>+5
zB62wp<bNDy=smT!Er!A@GF;gj{+x7lkDR~PI>g$Py_YvQ!PE2HpuC}3el-F3g{*&a
z3q{eLy6Xz|F+aMrn8R8IW2NZu{tgsyc(>*TdV79@?V$jG(O+Iz2rnDBc|1cK8gR$Y
zthvVTI;(eYhOdjapHe=9KI`|2i;{VIfvnR6`qof=4a=(BTZkev78+6GJW**Z!|yvS
zes)T%<gtZc-sz_jZ=><xnMO2_&`E5`WOn#cAkyJK5#7q)qC&BJS6+yL;`#dzFzSLX
z`n}FW=x1#t&SSV9vmPg>U573<ToHF!pYjncbNNhUhQ}TCp9^~&B?YmN!34HLph40!
zPKvSkKiJ4n*W0C~;E*uHpE#h+1f{zl+tmStU%jJDbU=C=YN|i<egv`M^6lLMdwIpD
zcb!&)ibNaI7x>C~Hm`&XJzE=2t7tFIZM`!^r^&z;W?dOj-N+a10^>wV(l~2naa?s;
zTxU{z;Go|Ve!vUjUrZ$B#mWH)NSdxi;dWa-@w)-$wBOpo`<IvP4*F`-k{=8$B|8+%
z1BwekDgV~(v0kSdlKFW^vFvD(&6&5D6uqM<^MrR4_m}bjj3*sE0D;i*qX$11V7Jb<
z@UT(xDzVuh5Prokbb=WwA&AmInD6ni@UC)Z6^9*2A)x1-{RHNiub~Yvkn&TUGLVzx
zpp1}|Yjm%UJB~xDk(y-GO{py>DEG<;C#W||W}&@z>C`*j9V|`ai)z*2PG`TZt6T{a
zj!#m3`Vz5R9wJkNMsJ1`fSCS2<wl&wuR!4+Yf1e-*0TCV3q&5B`J+rll&6W^akK?7
z9S#)<4Mrl!Xjs>mHnizWDT!G0Ukp$%*_^X1=k=%mm<j=HDwQ21XZFy4<FGTU`Sta1
zh~-0Jn%SeDUq{Ak8D2{ljlOuc+8+n5suM}8&H7d+T!V2s!XRfl`(7c@L6Qrb=h&%-
zj>O$^_0_d|kc8ek4_DZwomL(>GGtfEB)Wy&cfZ@9-T|hAq&fx;XR$$_yl6iogcR{u
zm9g)axS6=_IL4=wQXf|EkzO68$Ms4*JXAt8gFxLCibt^C#C|I|v|U{%A;+NaBX-Yn
z`HAmP*x5Ux@@Wkpxest$F~K8v0wlb9$3gHoPU(RMt+!BfjH?`8>KMK|!{28+fAk%6
zWdfyaD;Dr~`aJHn0}HIf^Y9*keGvm6!t?o%;je)wm`Dm$fN?YtdPI7S=Y23+15L{J
zr;n3MYg`<50nW^`BM$&M(+PQ7@p7Lvn(kE`cmoNS7UkQmfvXQBs_unhdfM){k`Ho!
zHL0#a6}Uzs=(bu;jnBAu>}%LzU3+{sDa6~)q_|pW1~*Is5J(~!lWvX(NpK_$=3Rbn
zej|)%uR0imC;D5qF7p}kdg(-e{8#o!D_}?Fa<&{!5#8^b(dQl40ES%O_S(k8Z$?Hs
z;~ee=^2*5S#A*gzEJgBkXyn*|;BBH97OOmvaZ>&U&RfU0P(?jgLPyFzybR2)7wG`d
zkkwi<Gkdk9Y#;U($D9D+;<x#JM3f1Ar0f(@=;5)tl{K=$Q=&SCYc{?;=0#z-`casA
zuor8{S2w{lbulsHy-k_P)VqaXR&sOFwKaw80y_8DlsmeWF7lQgYw01XTQ-~dsfr>)
zJ^sn7D-;I;%VS+>JLjS6a2bmm<Oqblx88B=hHT@{9^kn_q>L^z^IZTokqBEWpG=9{
zZ@<^lIYqt3hPZgAFLVv6uGt}XhW&^JN!ZUQ|IO5fq;G|b|H@nr{(q!`hDI8ss7%C$
zL2}q02v(8fb2+LAD>BvnEL8L(UXN0um^QCuG@s}4!hCn@Pqn>MNXS;$oza~}dDz>J
zx3WkVLJ22a;m4TGOz)iZO;Era%n#Tl)2s7~3%B<{6mR!X`g^oa>z#8i)szD<R|fX|
zQr+l&yQE>%MBe?uxDud2It3SKV>?7XSimsnk#5p|TaeZ7of*wH>E{djABdP7#qXq-
z7iLK+F>>2{EYrg>)K^JAP;>L@gIShuGpaElqp)%cGY2UGfX1E;7jaP6|2dI@cYG%4
zr`K1dRDGg3CuY~h+s&b2*C>xNR_n>ftWSwQDO(V&fXn=Iz`58^tosm<XzMIVjTmeW
zS3a5|Lh?lEMGKN9elxqI@Cw@XO28CSaHo>z)h73w%~rVOFitWa9sSsrnbp<O_;4FM
zvCwi|a-PuP!F00JW7}gmy<0>|iY8z20EdnnHIxEX6||k-KWax<iFPsfqqY2aqiB(z
z{7Yrm>qmyo?2Yd?Cu$q4)Qn8~hf0=Lw#TAuOs(*CwL08<e10E^Q2dU)M(Jk_f^LNV
zJ2{VUJ|YGGq-B3df;b5TRS^9@K`)UK0b)kS2nt8XjYdy=ln4nAOv2}A7g$F-)3$8(
zXS)%(Lw~G5N|L|^{SX=TYG%4F<bwR(;B%Wy_nq7z6X_24bOl6!4$aOkj(fI^RAFzg
zK9@K){%LcBH>5Qn9qZxg=)ntN*hVHrYCF3cuI2CJk7zS2a%yTNifAL{2M>vhQxo?2
zfu8%hd1$q{Sf0+SPq8pOTIzC&9%Ju9Rc1U9&yjGazlHEDaxY|nnS7rATYCW_NA&U?
zN!7-zF#DXu0}k4pjN05yu#>x8o#Jx7|Fk=%OR((ti%UVKWQNH>+JhH#ziW1hD=rk*
zD#1j?WuG<adw>xd-8VqG@n_Lqj^i=VBOg@GLePo0oHX9P*e7qBzIs1lzyp;}L3tP1
zl5;OiHG&-flQ;rYznH%~hz>fuJ!n*H#O)3NM3`3Z9H|VFfS-_xHRCuLjoIS9wT!F0
zJ-kV3w>7EguDzoBPxW>Rra0#+Y?;Woi7qJ1kpxTad?O?^=1cG@GeNtRZRi8_l-1CS
z`(#oF<;VYR(l(gHIYH$y2=rj5m3QL{HQgbW9O!TU*jGj!bFazIL?MYnJEvELf}=I5
zTA6EhkHVTa<y+V<R73}p(a3=#zb|~@*VD(t*l6n{zmIZcm3F?XN|vll8@IKRdu6r5
zK4&vI<=LVZ?5fuNKbr<`5%!oE6%xl_3L2AxWy9&LYn-=j?9yf?)^C_`xvDEe*QZ4m
zQ?1+SGq61PPB>0U#laMQ6!wT;4Tm4_gN$lp?l~w37UJeMInp}P>2%3b^Pv_E1wcwh
zI$`G-I~h!*k^k!)PO<a^j^7bwL_I&5=oEv_Nrgf=ei%=AEibfJaV7%Ws(r*F2&7p`
z(#q!4-sh9o-AM3ERK(R-b2}cJlq93KX7CFO7b(;_B$9Sj5~9L1x~RpYW#<@fa2Nmw
z3>FjjRQMq+MiE@Woq$h3Dt8A%*8xj1q#x?x%D+o3`s*)JOj2oD7-R4Z*QKknE3S9x
z8yA8NsVl&>T`a;qPP9b7l{gF&2x9t5iVUdV-yOC12zJnqe5#5wx0so2I)@8xb$uPG
zNmv=X)TjpHG(H!$6Xp>)*S}r538R99Y{Pofv}pAFlUK;xi{E43^->z1srWR=J$8N!
z4jRu;EAiLG9R$5#{gR){5?o^W^!t140^f=vCVSs@vK7#`-fv`P*WV|>nX610pK08<
z>r#{r)fR?2pNG}8o)?uvX#UJI)YM5CG@0E8s1lEV`rom|kBmf={%h!o|26a=lNJbX
z6gkBS7e{-p$-Vubn$(l_IbwS02j;+6h2Q5F7P?Du2N!r;Ql$M>S7Frf*r3M`!bvWU
zbTgl2p}E<<RtH&p9KZev^10m~ew%>*fv?`N8=B71Dk03J=K@EEQ^|GY*NoHaB~(}_
zx`Su{onY@5(Owc#f`!=H`+_#I<0#PTT9kxp4Ig;Y4*Zi>!ehJ3AiGpwSGd<{Q7Ddh
z8jZ(NQ*Nsz5Mu_F_~rtIK$YnxRsOcP-XzNZ)r|)zZYfkLFE8jK)LV-oH{?#)EM%gW
zV^<y0H3{1;rohq?9g^ikat6QsVq8^HME0^^MjFML2yi3WKHOqvE28i)rv+*9V>O7T
z0<rY@0kFviU6YD&pJH1{f5y_y*=3s&-2M8kNZKBg`#F`gEs#jW6r=T>Kmc1`!7m_~
zJl!{Cb80G#fuJa1K3>!bT@5&ww_VSVYIh_R#~;If$43z`T4-@R=a1Px7r@*tdBOTw
zj-VzI{klG5NP!tNEo#~KLk(n`6CMgiinc1-i79z$SlM+eaorY!WDll+m6%i+5_6Mc
zf#5j#MYBbY)Z#rd21gtgo3y@c(zQVYaIYKI%y2oVzbPWm;IE#Cw$8O$fV}v}S%QDA
zkwxW{fa#Goh1O|+=CF3h3DWNw+L^ly?BNQ7DY~Eca}5nt^>p#3cc9s3iDub0nh`Wy
z?oH|dW8-HG@d5E@U>NWPjnhTjr7C${Iwj#;F2G@++N=Y2tjV;z57RNgE|kXQC)1h-
zx8ODU>kk};J8KiSUx5jSsA_XPou1OH8=R~q9{`r>VnHkU6A=!zNOH8IGJoO!+bQys
zDS2-H(7+Jfe+&zf#;OSV=83I|^M;0`Kv*#4%%O7x>@BgGMU*@ajUvY>cYw^`*jm@+
z{LZ2lr{OTMoQXn2XUsK-l72oysi9vgV4Sux^1GsW6zTV;?p#J06EvSVyUq5$f4kq<
z{Chq5Z?I%ZW}6&uL+f&0uCW#^LyL!Ac2*QRII5TDGfZ43YpXyS^9%6HBqqog$Sal3
zJjI$J+@}ja9Xp)Bnbk+pi=*ZAHN}8q@g$$g<6_4?ej&R<tCJF0gyueVE6RR)q7;l+
zljIS88sgLo3SVVyPi<v6e7EaQ<g8%l-fDr27R$6C(Z+1owln8-9Gh{@8Qpfh{S;w^
z9I4h_WNFd(?Jbaj@X$YXee~GxxOz$u{soA(FFo|>w)I%w(%jgGlS5dTHN`9(^<}Hg
zD$PbZX+X>;$v4NjGJxMDvVBiIam$cP-;h0YqQ{YgxYn-g&!}lHgaG3^B=>Z!D*7tp
zu19e;r`u*+@4h41Da&NZv$qy-i6#DdI)EVvmKO*PvIKz-9E5R*k#|`$zJza8QJ)Q{
zf~Vl+I=8oaq)K!lL7Et5ycH;m&LKIvC|z4FH5bo|>#<t~4IwVXG!%$t-R{eyQ;BJ9
zfB$Hl2Mjix%zuKM{+zqZHupumWFuY;rG~%cppE&S4^xZ<B_ii)Id<Ai-a%B_4Q5r!
zX9~i|FbA=oODG5HgKr~7vOCT<U{S#l53d;x-fOjM<aNW&=58u6u}7&2MN?EGit38$
z<XKP3yPS^dQ;H-<K5N%&NYJ15*Nu2sPtS;CVJ>Kg5z+Jy*8Ifai}5A<Pyu+C8fHet
zv#%pEyBMl7QNpsa?`T;yK{)#Q-Geb(^^8YUexN>#%@)TgPRaC4f>Qk&<S`<hsSxGZ
zAO-+L*HO2r)YU+n$o!{6={k3EJALy4V}`!oK|$MS@#wf-sJiylZ`%r~W9OKPqZx$?
zhjQ+Bw)F+vK27@V=yMf6K&QYISF1QzQz1nQSedGL(UW{VH*2zQ*fc!<5@boq7Qi>}
z4WciN&V(T~u^xBgH=iP(#nd;_@L&`7FUF>Qm-;hOljv(!74f&if;fz2Mg=b%^8$^C
zna!2I&iCz&9I5ckX-5mVoAwz~)_&b#&k$e+pp=U2q-OjkS@yZ8ly1$2Vh?}yF0={P
zPd3O@g{0L=eT-Dm9?imeUP(!As&DJ_D=5lwQ=3)XWXg)12CoB=-g-HX9RSXgL;yo0
z?$7z8Sy9w?DvA^u`Fnl7r_J&_jJ7claq*2l9E~#iJIWAPXuAHfmF3-4YjFYhOXkNJ
zVz8BS_4KCUe68n{cPOTTuD<#H&?*|ayPR2-eJ2U0j$#P!>fhd(LXM>b_0^Gm27$;s
ze#JTrkdpb*ws{iJ1jprw#ta&Lz6OjSJhJgmwIaVo!K}znCdX>y!=@@V_=VLZlF&@t
z!{_emFt$Xar#gSZi_S5Sn#7tBp`eSwPf73&Dsh52J3bXLqWA`QLoVjU35Q3S4%|Zl
zR2x4wGu^K--%q2y=+yDfT*Ktnh#24Sm86n`1p@vJRT|!$B3zs6OWxGN9<}T-XX>1;
zxAt4#T(-D3XwskNhJZ6Gvd?3raBu$`W+c(+$2E{_E_;yghgs~U1&XO6$%47BLJF4O
zXKZLVTr6kc$Ee0WUBU0cw+uAe!djN=dvD*scic%<zE6C_f)w9Vyl;wZf>t)0Jp*1&
zhjKqEK+U~w9<SH;w70V=&RyiuC&L>3c<~m_Oh;HX{|zgz=>@(45=Ynh{k#3xlfg!k
z>hsq90wPe(<j;~Zvu!nULk)Qs@wu(mR$U<;aUGiF-;=3|5SWWt!dxtjpT;^_0$|O&
zBVkYd6Upnnz2D~S)wi!#iy!~FjAp4MF`KLk6BzZ`Vg*}eZ6nwjHk21-v15NU+jTUU
zge3n^J`%)UR=n8uX;g`sax{-|DT|Ro+1e==T(m)?7J}2s+Y%KBjK1LXmhv_Mo5qG7
zRvp)tF(#*9XqO=tEi}exEGsYiAb6rZbRlVj@5uWU7V5?=R8Gq-bJBEB+;smau!Ywm
zP$|Z<T+k)1mq*w|xt9$v5|3dHJV{gUlO=#6(j(?|lXdd02NsxOO$_rgsIVizohZV~
zt%H1{?oZfrLgJ&ND0Wc+$ZM;BkI>!NljYbnuL6s`Z!wQSL8|(A*@M8K>`nPJ<9Hb^
zB6o?#^9zP>3hp0>JAi<nc*4t->te*3N?Rm>nJ1Lpq4)eqSe8KM_f(0DB?k8DNN6(3
zU#>-{0}3~vYJ7iIwC?Zbh@aJ8kfIvY%RveZltThMN73#Ew}jOwVw+|vU5u-wMoo9C
zO(tv#&5`DOhlzunPV?M~qlM|K74x4cBC_AC?2GNw_-Uv&QtPOj(7L4NtVh$`J%xci
zioGVvj5s|GY886)(}g`4WS3_%%PrF(O|s-n&-SdfbssL`!Gi7Hrz_r$IO@*$1fYbQ
zgdp6?(IUaNPaH7}0%U|9X8HFonsJRrVwfmf*o1;k0+PwV^i%f7U{LAayu`!x*FmhN
za(#a^@Idw9)jN)K!=sFC(G)ZNaYY169<t&du#d?e^A>*IJ_ouY9>W8tC>S&MEp$+7
zy)NFumpuE>=7T@`j}8pa)MGpJaZoG(Ex3AzzH>gUU^eyWp*N2Fx+9*4k~BU;lQ1PG
zj4)_JlelzJ==t*7=n2(}B4^^bqqcKF<hFf9koq(ktJ;9>cJ7yVzbH_CWK<tI1ayqC
zTYiM1!0s1D<yt~uXxbF{bJ-pKlGHTt1JO1A)=`{HN1#r|1DWw&w8;1HeNa`YG$;W5
zdXXh$E{#zh@;qGfMYGakk)dVV$S?34;8>?{eXdpKm);4|o{aM=M&`E$=_~PVi2>>L
zKTN_x&qA)@ak=v=0Hl5H6~?LOfO@1+fu5(sB|VWID)w?%{m+n#7bLaszEJ#;$HMdt
z9qP0gk)hIYvE1!jseA^FGTyK=i4eTPjTL$R;6FywMBZBPlh2ar9!8wlj1sinLF-1g
zR5}hLq>pb1|AC-WcF!38e*kFv|9n<$etuB=xE%B=PUs}iVFl>m;BiWUqRIxYh<XhE
z49|my1K+#P*{V3Cl*kUjk+>7}L&2w@{SS-t(zUp`wLWAyO=PEE=Ekvn@YS*K@($=i
zBkTMaH<&cAk${idNy0KZ8xh}u;eAl*tstdM8DYnM5N;<zsLHuuQPEjQo|^H!10=gs
z>bDa`AB+(8>DqX+mj17R2xBp45UES|H*#GHb_%Nc{xWs7l{0pqmiBI<XEw#oQhs2t
z8zhy!z>Pe@<cqd!JT0j_G6h`_LpA3>r=X%Y-h<-Ceo<R}j5l~eDEH>;4I>isrw1Hd
zZd*VjT`H9gxbf{b3krEKNAaV$k>SzK(gzv}>;byq##WEhzTN^@B4+VJvW>y|U}}AQ
z4^Bdz9%QKBWCy+h$I?L@ffl{fLLL41Tx|M+NjjRf(`KjHG4^<SlxIWJ=2QT@WrM{D
zapnI!ZN2sH4jPa%0W*-D+pH9h5K*QKo8!li`Ao&MI|&l~SQysX()q@Hv(Pa?@K9=F
zM+&@8+PcS#Lg^FPA9U;P@6Wv!qaQY(Q~}ziX&+ECrcc*=Cxtv8&N7?dJ7Ju$6v5kr
zgXhmqN|~ROC0AVVvhz-V^NFV16{eli%G=2<V1~$JqEy4d`|5+{gK`jaDntvi2AJcL
z)7+j-n6_W_lH9`Y`^uGkb6hQ6#r-`ohTzIbYqE#cXISMz<5dZ<+USc43_}(>y=x3l
z!!-{*v7_^6MiJOC@C$WV=hz9J^Y^lK9#tzs6}-<p>Gn4F+B~IivciU9^t0j-Mgao3
zSDF_?f~c=V=QJRSDTG0SibzjML$_?2eqZ;J*7Sv$*0SQ|ck$fX&LMyXFj}UH(!X;;
zB_rKmM-taavzEk&gLSiCiBQajx$z%gBZY2MWvC{Hu6xguR`}SPCYt=dRq%rvBj{Fm
zC((mn$ribN^qcyB1<JsxvigO+@<AVpc3li#VCQE_@Id}QYd3F|Rp)NYpybb2w+&z5
z#pFuM{}e>%X3(k|%E_DUER~AaFfd`ka)HnDr+6$D@YQOxx6KM*(1%3K(cN)g#u>Nj
zSe+9sTUSkMGjfMgDtJR@vD1d)`pbS<Hc^`g+c&k+kXbp^(P+-q#ZNZMR4f)WK&t4l
z#{d(SC!l0rJo3275$E`DjherN;Q@{gu>W-0<1e-=u}RsMD+k{l0hwcY_*KZ6iTiEY
zvhB)Rb+_>O`_G{!9hoB`cHmH^`y16;w=svR7eT_-3lxcF;^GA1TX?&*pZ^>PO=rAR
zf>Bg{MSwttyH_=OVpF`QmjK>AoqcfNU(>W7vLGI)=JN~Wip|HV<;xk6!nw-e%NfZ|
zzTG*4uw&~&^A}>E>0cIw_Jv-|Eb<hCQ|FHp?F-W|E(UfbUrY3(%FzA>%GzD<Dg6!3
zmC~sXU^ZP{>o(dt3%-#DqGwPwTVxB|6EnQ;jGl@ua``AFlDZP;dPLtPI}=%iz-tv8
z0Wsw+|0e=GQ7YrS|6^cT|7SaRiKzV3V^_ao_<zGv5L1(}dHQ$(PZ2#ZL=LY}F19bB
z*(h_@VW^x%b?VVzC!JUEH~uX!hcDlCYdDZh)5AW{=ZMsj^Rm;MLm&=xaq;oY)L`rI
z&!5HV2i62zIc`*RF)p-bG0i;=2lH|iqJ2rZXaROgAvV4QVKr<ub)$V@L7+Tn*M=d>
zLY3Jnp<0O6yE&KIx6-5V@Xf^n02@G2n5}2Z;SiD4L{RAFnq$Q#yt1)MDoHmEC6mX1
zS^rhw8mZJk9tiETa5*ryrCn&Ev?`7mQWz*vQE!SAF{D@b7IGpKrj^_PC2Cpj!8E{W
zvFzy&O4Z-Exr$Z*YH4e|imE`&n<$L-_Bju=Axiik+hBtA4XNDik(G_;6^mQ3bT)Y%
z6x=a+LKFZbjyb;`MR<GU1Dh(wNVTSQ2ayqA?A}whJZ!X#_<AzFo~9{>k~Dbxyc&L;
z8*}!9&j0wewMM#O`c#7HJ|+Gh5%3~W10b6sdmCg3G_v+@H>n*c5H`f+7%{T<!+(SM
zZ#Q^1dX9$u(`aD-r_p$dDuJA4S#g9c*V)@X1Xu08m~9samwX%)*TG~Fmyr?A(}evq
zE$gW66pPKLWQ6fT{x?#{0}J9Mxg$-U<pIkXUu&-W@R;R$QP=(cc!S%6UCHjZvAKyR
z;)5CYAVakQ#z*gr#Xr;~r{tl~4oIOfcTr6AlD&8Bmlq*b?a<cJJq9@dS{ciCam#bB
z`|v%`BXfil3p~c=x61=`WNiXn`(KB+B#Xr`ZSvKkVr5eo#&%3RJBgl=Vmg&?jRE5U
zhR11!NU{Kv>e<ipf(bYpQo~<q#r0eW{H8i+Wx8>Srzt8<dOaJ~ekY&X)1eUpqT2m_
z!;WYYcEo(A<3>9GYJqm>j-!*dReeu&KHubhzjSy_c~BJcbaFtZWAB}~KP3%*u{zHi
zVSUi2H8EsuSb3l7_T1hP!$xTtb{3|ZZNAJ{&Ko;#>^^43b7`eE;`87q81Jp;dZfC<
z$BD`h-*j=%uT<dDCb)PPnY#YEm}$L@0IeKx0K7P!bBG$O^~s%QxQFG}*>pG8Me6dF
zrH%)Bw-a0}S41ILo*k2zn6P@?USXtC>pX*tzce7A^JD7^^p7K5kh-HO&2haDTL%2^
zSWQb2B6}e*;x?eKq?CdG7F=wHVY)Lb(kQu1R#1Fx|3?>_%cjNM-xJlAg9kr`!>&;E
zTYmHhqHh&qbfO`~w<y?D{H*Zx>3V;BM(q(_Q-5^!esaBI&QbZ^%N-ZDYft#FTS;%{
zKzlSwZIS%zDi#%DMK>`_vmE^krJL5@PmpT2m26Q`O)VRAL>){MN45|7GTk=q^zLpF
zjS(O<Qk$?O_RX@?f&45nJJql+4naCtHSv}`U^7U~I__ua*kd|(<<w981iV;R=<zpc
zk8x(9pA}od`Z<uM-LK5GzO2!;)wNuuRK;NXgs!yTd?=XQxcAzX)iczyYRl$PG-C25
zw-HVJS@e}458oPo>s=`#On$XI#$A5ewac9Ma}mDxSu^5{#jHC+24a2GbfBJ&Zn8W=
zm=l7VE0g^z$3ikyU#ysh8b-PH(&-yZL$JV-of-ZM@~N^#DbQ3Ltlq*5@>WzSNxrRK
zYl2VS8r;TT`wLfD_O0dhX9vR#S8rMOuUCRkWZE#OjRi$l*#C7}mgGzZ<cFjeh}q_3
z!A)L{h*l$hzK{_~QJjt;Kky@ixE#{yTwZ|;WGTjfx5eY^Y(*&nqvI?lOz0X0{c4zF
zMvtDlH;3EiMR|6Di<Q5B%6{Z<&8^$F%WdNDWypxd5QaCV21vTz-mKMX*3{BS=eMfQ
zUe&~BrzhHc=p*O~+dYSBFX}=E68z`!XOfVnRL0hFLtBV4<Q*<TO&8AiikUBy^^?UL
zCbH|kp@bwSHy^In9jbmlyPD|;dW=0qAvf5}w>BD%Z=p3z|CaVM$$pyW5-pJJDCToY
zO3R5)P(Gnd>6wh9Z$Sr@cMXmClU(h-@5kmiBTNTU-|5vq&Fs!ah|o47kW?SO8uWv>
zW$=Ud@@|*9p@Rb=!wl;%>k)kH7fPtcD=gd}^IxN^=Cg>zq^jij!f=1PlT|9jh3K9g
zF~Z)B;kb^a0hLmJvON8Ho)foq-oC)&E)b|a^|b}6n!8&AIaousO^VnYzYfuijuEo5
z7IcUMbYD=vec4eZX7;p31NB+T9BOMJp9ZI9$dH1kJ<ZxC3S+^A67&1bxD8qibAY|8
z@>sJpEtf@}tL4)_*PxgdOge9_EaR!?wWtBx%*f$I<UbE=ny}tD?tZZp(Czm#T_~fX
zw4@*Xi$;JlsjU=uKYHC2lj^#>GoR>f3Qf2<ngt0}7DeLU8)=nN5Uy?D_OL*|-kG$c
zwx9nhmXHSvr(Z8?YjX$@34uKoone%#)({0f<?$Lu3V`@uRN9^QUw}W$CD_%$Lz#cZ
z*EszG8T!U=5aYDtC_hX@Pj+yeB{f>aT0%+fq=1xVEqRl;UaA2Ncs4B1M1#foI2bj4
znX}t7;-FCLK&;>ZGP}{GxK67$Kz&pO%%J>DBMP_zZsLOmdpD<l9})OI2V4ZO29}TK
zsx^N%xiF<J^lj!JAGj0OK;%hR6cKGrQ-p{lC|>UDp&f8=L>(Kcj+S^jA5dco4-7XN
z)h;m#54CEy9)Ch-E7<x}5z<*coUs@Hb!Ow~3`UtOo21L)`ihO8j2Iyl^)tetSI?B_
zPBUej9al(>gHP@a@TXl=_%&|iUlIrQzn=LqONBu9FCn`3f8aqvRu=RrJ_RH1^Uf=t
z%Ir*({+wEeC??C+u!hCi<5m`RsRO6ti7YaEtY0|U)-QfNsdN{=83K_}m$0Z=ElWyt
znvo5=%f<;|hNnL-r#v5ab&S2*yK>~a7m(My$cfd*tff?=?7-j3^|&9H7G*W`)m8M7
zzd0+b)c@`bQN<fXsnG&mHz*{m=7ihLs}=P9L}EB1M^=YengrFdcYZUfT;_)FU{{WY
z$0#-D6O$REQ+1b=iEE+FQBtCuMN+S{cIq<*jEXl?qp~?I2az9-s#Q?7+C<G&?9Eri
zm-Bhf*BLm*GRi*8uPBVOpbRwwF51~c(7^eJexaqr+ogK0*#Hox)A+4qD1AA^2`Mh$
z$pyvemPx=PSG$yezeX>1-^dC$_04tK0{mU5tx_zo;&TWou8F(H_J?O+Y)VLXzmU^>
zvL!5+1H?opj`?lAktaOu%N#k4;X;UX5LuO`4UCVO$t+kZBYu`1&6IV@J>0}x1ecuH
zlD9U=_lk1TIRMm6DeY2;BJJEE%b0z<yG9X8IG`4CMdLz`;gKQg@H@mgC0_uT=I+1f
z>;UdvH_a3%o)Z^wM&<$zhQpv90@0c+t?W`9kolKUklpX5M&Qw06u=>GPCr5Imvh*%
zfI`tI-eneDRQo?m*zD1i;!B>*z4Xioa_-S=cbv-<At0oB`18=grQw&nD}7)9_N9`{
z0G0m5AZ7K`Z#~UW)`6*ZCbLC4lX!t)+kfiL`;Zj*THeUBW7F^b=p?_GeDOHp@rtzG
z${;{J=ZMhYEob}r={ICYQ$tA+grMMd@qOLrJT@t6^l9Y~Rj{D4vcp|vUgm=D9k;}#
zgS)or6A1M#Hb80*Ht46wQA4n<^rw|$W-||fe}9B0?cj|^RypKdn7kfINaWcbcA6gx
zmQL>k_#Wg=)b$0@{SK>Mr!_T?H`S-?j;3$4)ITn$`g;J$^TppD)^pRz#^l?XgZ2CW
z3g5G^iF*GZYQ}{B|H-fqh=_>)E~=3y3Zg=i75G5E)*a>R9bn~cNW{h5&P(vQ6!WHv
zw1-89smtY~JnCQS(=9zM)6>UAi%G-r^LA9_HF0Vp3%JF2P%+E&^afy61yxnAyU;Z{
z$~H5X6?sMoUuOT_tU7i5i%5HI{^@#Hx<wZT7z<6X6Z3i1mR^4y_<==opjTN?PQkCE
zYJ>@zhtP55>r_<3LwusK*SC<W)3Wfwa5#V@JJTi{*_;d+2+1KMrwnS>#%i+gn&iRg
z_8UN=rLVp*gT(K~{0X0f_=?~bBbfB`=XrTFn3U!)9n*@Uj$-mr^9PNi<22UJKAK&D
z|1@Ck3(Ub;>68;)gIn_Zu{uoVRMhAkIqgBS(v2b2{gf?0xd(<Xa^hmsJE)6jXNRit
zVo2h$VsS&QqJK%?;oO&^#{09_?^=2le~EK3RU?5JP}uf3wH$YY<@inZuP*q`#ESTo
zHf8n5rR4Xiq3|S4F*fpwobL2=D-9aE3uTUghYH#1QYM6jL1z<<#bE|5ubdxkCxRfP
zL%a;To8fjGw_!{}?l{_BW#(3~c?~-haTgE8ZuGIbz9<V?D;-0brjRJ0p#HDuYgQWA
zv5MPd%<|>1sJfY`56mVy>~^w!wmX_kj<hLC%uKlht0~2h4+Jdw(fD~my&@n3F{)sR
z^u>W8#?_Nk{}zB9ULo>4fO(vnWfC+pG4>%*KZ?JuCdXu%aZ}q7pC%E50@U9+KQZL5
z!*I`SOtNf$Y$CsRsNaf~yyw^>#X_mC<QvgxBwN&q&f*HknV3L_`Frr>iF&*gr=cBb
zoPu7PwX(+Wvl~i(XH|)jj@Cu+rzpJMn4kVvCJ~ReCf08viF$q9;CYnv-96k{G?pf_
zQglN`JiS#vok)~^Z2>41#7LPFgd_xrqNO%DQI|!Qs|nWt`co#BwY$&Wm^6#~)`_1k
zpwiR~&z#mtSDuYm(=NoLv$%Y}bTjog$RJ8$j1(s})=}su0b?o8i28-|xu58ipFBml
z2`4qZ$BbY5>(i2%wmh!+C}$97?X3<K2vT)0nuusZ(Lz^j6`I`nih<N$Q%5{VDS@{5
zO>LgTQ_{(SaFZvq9YC<sIhP2+w#&HM;0?}(Ot#~2y;^<}qEGG!D*A8T^*%=>n@BNz
z&h#;4h?<HUT9UIsc~)opH#Wt#5K~gftO_US(6zLuKVqdpbUn<IAO4;hp_#-L{en94
zF~%lC5~zhUO5Db>5#`&_0()uJ;_<MMQ{7aZ?V2kqw{Otdxn6$`^8Wt8Jo~~}ciLQ&
z!#jyEg*f}Vl{Qm{JI>rR(Q^eY*=&vu)#EeMeaN1puPv5+iQFg1EC(`_99_5v<1r4D
zt<e`&hG+df-L0TQ@16DH&kn7ym<1(Z5%mxCsw4Wv7Z5Ma&DJi3=Ou2epcI#@l8RkW
z5c4)fBW=%s=rj)+-b=%JIym;NU|8_SuHjmo0{1Vm0vWNQD5sU9UL^LW&xIkM%4txn
zmL<Ry?}>c(+-eVWf_np;q$M*H49#{R)eIWCI%R&6F34;h9eNG(XNO5ao2MI8;j}y%
zZeA>zX{#$;muhtY{<x6#e)P)h9;4%z&gJW#;7K-|bDM-Kos?hken>_|;bkk~!U~Ih
z2QUO}hk~o?sn;#|Mt$0}4=+BRa703n6>fBm(cesk8Cmugg_wi|BWj}V-VuU9jNH+o
zgNYGSKPm>qR&nI(2Gu*})A<JYx+T>OBfXf0J~CC50C!3KXu6-qZAG!V<e9=VjL?(G
zd8*FtWDLB=z1IUNvb*C-J0D2{dYr|p#iMNLRCG!NEA+%saH?%bGaN@O`I8GWvzhq{
zVrJFFx=Oks$d}Tsx>MZbmnqL6HWG>o$^sjoSLbQxra@WyKV$+_Qe}t7d)c`bpJG++
zw|9D3>XUH^Wplo~MN%WK18n3HeXoe*jKwVRK!=R<QtrdSBH_AF;e)bIpaPm6J@hw)
z2kGQx6^qe%P0L@eMv#Z&UL(3f1dlJ}I&SP0U*GVD%hLJoogUj|qCr#m#OrbqOdGU!
z+^2FhpIW9FF1#xXy%h=|Y3h`qF^Y3Y3u~~ZdP`D%p(8REz|(}oAC5q&fE?>MtIr1v
z;Py~7;eZl&=^UyumN&CecrGBEa<sTUO#dpijT8MlZ6C{|Yhfqbs-mS!wA}8Ar9DqF
zwD7!ZojrIj<GW7zeV%lP>t}4?mtZ>@`wPjVK@Z)FZ;05^9kztq;qmbxQIJ4kXTk))
zaVfD^K2x7SB6E!Zz@0p|Fkge*0(0?ogmTX8d=?n{2x)}K2$`bjDmcLg3#wU)i)by?
zW^G8rRQKBwjke5zHScinRlE|wo0XyhBc9R52IsKWf4-@=l!yO&+l=K`-7Ib9U~hPy
z!cH>H)e6$;m&w^0d`axGqDwBgu`B+L4a`xr#5g%b=0?c41`|lx0O9fiIVaFAsO$Ol
zayhm4C9X%hzUf&ctylV$%ntuA$(yo*X`gaVX0$|x{#!YK^cvLmNWPZaTd3&xP7ny%
zkn}2AdJkpAgmsh}Q$tY3(2RtO;%R*~8r#ZbSbMR4LaL9Sb6O&Ce(GlO${jtl&`n|D
z9;zUQPXCHqTm&t^lk9RlZiiquSY_og^?kgVruz%myd95<zUxS|5&UA$D;j`#rE1$O
z371=BNV}!(wE~{p(k0@5V<`>Fr!V<SU(kcM%h#gAHa&W!ZvPwMk+tJ{{Tg$<V$1s>
z-$OIXSt?(pxN-M{NjA)j1KKIp(&c2RVjd_<biJ5#8$}qaySe<|_uDV+zsoO?08-)f
zP3X4Jd~Kn{R36)E<-%tmW))YM_urbDY_E9vkN?XF1L0}`7DyjH&}02CK&jz_51A}Q
zfH-S$fMRyUB~63Ww(=2X^{{g@jxWx?9|u@`ZwCK&ix$N!Nb3KG@T{YEf>}7+CbQfw
zTRjg}A0~}Ht_?-@wD0bI-;LQwT?mKywmDZ7*j4>4pR6@UVU3mb?-cbQt~aIG&RBjl
zs-4UNt<tN`Cb0}liHDFYz(@+5xu5q21%3Js3T~~qmKTu`iVO6jjqxR*a$fr((;5gp
zO4In=2y~j`IYEV%)V*m1W6*l^Y3Meb`cT#q(hs>OH3+dAF%U=={qB@qijh4J6K?Et
zPLlfPlv<+i>ty5rh;Q>iGFoaq4LyBIZl3L{KGUmqPL~ZCosOl;7w2SxcE}pvK;5|6
zly3JjUsvk|d7L3bFs&;q@_|p?vdU_UzhrS$Fw-_NoEdoIT#-0hKC37!>-i6FaO(es
zY97)m4YO<|eqGMrYejC&-IFmc{=P7>qFWX;)}q!&e9-F59o>V+`X>J}%Te0$|A>0W
z;L5tL4L2R5W81bmwr$&1$K0`P+fF*RZKGrE*v9GS{Z5_pW7VuRs>Z*u)~uoHj<m^`
z7rR=j&WlwagpW<UNv2`ac(=GE|0_R{Jc({eh2ezI3UR0K+HgOKhxQT#Gc)6!loX0G
z(Y14AiLT-UiqUI$yeu)LUX@qx7<j&%)s-#y?ay-^5J5M3j`myNe^pr_XH1wRdrchx
zj1TTn3c$f-%CcHF6`w>n&@oXwmOcx7tY8<(Kq`AoKHMbmH`2($8b$(}xC9DVNXRdU
z4YPodh0w;WRD#mvRN4f1hG1o!*aczgEzlB<No6m3`V#sk)9;;VQ=JyPg`MLxQ}LbW
z?e}e8pZlqIL;-2h$zuJ|&AP7N=M$5Fs*dI{eLn0OSamV4O6w{T@j?NNRTgGaY)LF7
z{Bvr)S{p0;EMIMIB;X>c_u{%}2hCd1@S>NU8o+_5;1S9=Fm${7?85R{%U`aBZui;r
zz=^K-y{S+6N8&{cxho&K%#*QeUas^3U3FbGPnEqHQRQ{jTfOj9u^Z01s;B_~GwNIx
zE=JYC*FidJ<nis3x~A7aVY!Y2VBhN3Y|~II>sFePX8GRq)|Prvv-8(Cf?#~?(6o`V
zewJ;smzAw$Cj(iwy0*vPYGlpYSy!gaOgV$M+sj;LV$2^})0UYINA1fxN?be6RHb1`
z@KZE>+5Yz;Tgrqb_u>cY-~<~W$qEO-I<%24B11mQWoV5dJS|D0L`$`w&4Pw1!<;oG
zz;-M=eI(czRy4`0w8zE<I`}wVqeSIYmE!pYKSSQ+w`p{3ja|~*hX1cTc?~Oq*U0$|
z(@NvtdsFf+lAy+_Xo{mYn{seg3DR(<BK6XU(N*!iW7ZhivNGw}ZzWoQ7c7+$0k-+-
zsw(%kid0aVWkq~jGba?*Gl=OodhJp~ao(hH$k1JZFJod@mY6Uoo5@qUl+=ZF*`uUq
zGi`)ame8YwBCj9enm?YTwbjIFsWj(g{3J@9Gfekni1tg_Q(sO3R@xg(>He4pdKBpc
zOU12~D*`g<o9*Y7y;u$arRqZY0V`UfJWat@rSK~_7e{~9+#^!8%jYOK1@!<Ef{v!f
zUfKn2Hz^D62bs{7syNzOTKj)dvXfc%%{NHc0Q`&lNu<V+i`40V&AGbBV-@4G81mJO
zEqIa~bn_+lncG}Q3doCyi+>UoKPJl>VJ$n%Z&oZIY(Sjb+_p6UdTHA^tS%JnuP_l1
z>x?|c#F|DS(xYyxGz#q3rb!6K0@d?pCHuY$=Q8IV#Kt2Nu}Rq2HCC+VBoQBB?ce07
zf*|M@$?HQ>&!#Ez1MR>*Z_2a^V5p(V4w4<`^+9!fDuh3wCuIIG^A#z=($d5B2b%!{
zT*MW?gA33%M%lIiWJ%LQ`;P^hIP2FS!DmaX{BUz=&*4Av<_{(xfITsoP46FGdJZ{^
zbBS0;o$wI>zS_K18mrVU*z)0LKuMa^RRvFKi?%?1x|gm-q|swwOhxi9f2<EoOAQ$~
z{d5d;t5&430^?Mn8=SXrX^lk*%JT)6z*Ekci3esXhv)$SB>fhYlUWCX)>fl+hgF|3
zdMpY}sO{>T)8A1b>VVXjD+;mg<bwlJpDMJjbu56lby}R)p4=I!J;GicDE{V7QP;~B
zee|cb(uL1gd8u%YtoEKLPZ_BF#<qBe2pbwA=M|UGIMB|znX{7ybSr)QLglOp>GmQS
zB0D;MZ5IKQ%+3MO5(}+5TcUFpI>dgzD^QSA_?bl~$6I#=Zrq(K&Yl2gSl;k_3j|9n
z4N4h_vkJOT=MYV&Zp2R!7WB*>%-&$nL>F`!YAHRhofb8K1V5hHOE(ag(jHHzEU_K^
z7(dtx;9bsNawcqNygkNEf4W_jL8*4c5tt@|{s;lYGC}a)w2crzr_V~Tz(;^^YUKzN
zFEH`_tN{n*VYFV;E1KiDAuTXd)LpdqQgu`jkx;@}Sif@F?xy{;BmeWr0d)HDNpGr8
zszr7gn?(16kg8J5G274Sq7|5~xSk|C`Q_=8kt_ad@(=AtAu|Nb>_Z+n<FKwzSgsln
z`;7rm{yHn8aq_sX*eY6ZlE0wIQc1Y>7mP9JZsYHRub0s28Pq`9W~uTCBE%S=K#Dyv
z=9O(`Np-^cOUvG%Fb$%$E?+SHFRZzozJb`2c6bNT1lQjR@>GmlOxHz)8kA?&;xk@x
z!&bo;u>t|MS1UThmQrPsUB8kAn?jdVv1n5OWQ?U(68~=Ls+fo?=_leMHL94^#K^vq
z65!u$9|ZCeBkd5mGDQ7$O=fMGU;LsHA5h#|CIF4{9rcmGTrJ1(sl>+Ou#jg+_W&&!
z1@YJcoOMZ?o8l>5DH!=`%N4r5(U|N4fKfV4VPx>L0{Y^w=XXL<zJ6fGn1&@>!~F%g
z=vuz;LkqFWaYHyaQ54yyiYhn}Zbs@T|8beP7;|SRl3N}MWNP`dG0j3t!?R9~1}m25
z&9co*jT_yJc_FU0Yb8s_&4rg?K|~x(fp+K<&>dmX?m>};iF0BMl0mCli`Jfri^gvj
znN4LJ!YsJN1PQH-B@$F4z|&AORR#o5Px>h_oV-TQ?~9LEDk(`<v6u`w?#GXK;Dwm_
zK%l4KWh7zVk)&WUl|}(Ssrle%u`i)0F#t-ATNfwR|2jHOBGkcwS=0UdUI^hI@%C~L
z7Lb2+5x)<lM`Vo@Mi~~jx_%;rhWw#8+L~Wzik?MAO2?Ha)Zm^+da!n4-PHjgiavBT
ztFufuYd#hry`ijoP(WfnYt=~P3<#xYMELXYA)>QCG%;G4g7hdnTaEvKLyLz$ohZXg
z?~I4~m46M7J+f`vJB1~B+|*QSa{+6&`Nz-3M5f$TLBryFg%9^vYimb4at(gnQR)0h
zyFA;BtNFnc{YrF3>nw=weX%kCB)KPcHEL}Qq!D#i)q~XbXQS8eyett6BJ(t@*Za{J
zwyq4TfL@QES;h~$_soVj>ZRo5XePtY=~;GyM8gSZ9$Bt1OiqBiish0w=^p>qs=vdS
zh2(Tj)?=ra=wTN~B^F`BM+_<MclOM$1cG=2$j{-$t9|JPmD2HJ27XNdf;m#Hd2uHW
z9|N+iVe)1cW(h5eGa3o3$61)?>xhC846_m#3HB_e^<?uB@~eY%xYKlt<5WTGeohRI
zrt+!V1qQ9i%BfSCQWNDJhvFyuC~_AOGIV=qX90sV<Dhx-Tu}XIp~&&nidzL@8!0$5
z&Z^&m%pCOhX^9(+^Jgf4HoMe21ZWqJuL|<`%|zf&NR<pm##|HF_kDiB<Rj5mpe>=e
zWg6RNc~S<Ye#u=*bb<9V3^soNv$Q?NZK41WC#7yTE+08!L^NnUr&)Uhh<X+DLIjXa
zKhnmk(BC^xKx67P->B}Hn9i$@1TUo(w;y05FKZ^~rbRc&6c`3HPf-E0Ud#&&f2u9A
zh?`hA>*(|-?dnY1pp6ij**I`X>?!nvML7&^Ji2I~FY6e0cTib{RhydOkW<^Qr^@G4
zOD}>5<n8gO_T(_badouRz*VbiMhg&avc)5Bb9ACj=g8TA@$OJ3`zM}FJxL_I3ibE?
zky5Q@yiJ3c?iU73i^T0{?4X_7$(Xya3K@d_7MDX1EoB<_O}R$qO!v(G`jzza!nJO~
z{oc1Q%uBb6j|hkQFfij_dbPMjsXaEl+TIbNWv$Wmeq`m?4i-_tpUt7_#R%><czoLM
z8~ueub+bebJKPns&1F_N_@^LQuH5KThDK{l0<`K{EqMVzY{+iVV<$?ePgOZeN5j^M
zv=Q^H(jf;0|Lq$?U@uU`FALaI0cO9aoWbl|ERQ8SoU2YlcDE#bl`<8Yik_?fO6@mt
z2YXKf#a?XbIK6Xq^XEe^#q^6HS{pO&LhZ#<leK{((r9~{QPY!9MN;c$w;$|haDp)E
zorn#7(P#z01g+IP3Hxx|X?jQ|JvlSRme=|hbV4#h-2Gz~hkcJ_KxW;j<ZJMT?*IsY
z2(!x+$ZE`%6>0ADX{wn4dmY9rB~33~2O@a|IebFO^e^wCEWk`J68c*j0t&#Kt)>~d
z_eIm_$-kquFcSx6GV$1#%A_k^`5pbMdBPz)vl<ql_GmR;9LwSq3ix|uJESd_^=mRn
z(6#qy2WDx9b()8`d@7ycP}Z6VoLa0SBeH1?YD?fQPt`AK$6WjK`$i>$xoC>T0VDH3
zTwB0EcVif8q!CP>gJTH9;#UpesJG$+)34R?Y;6VVPl3x9egz5s>Z2d>CoaUxyN~V>
zKr$U*c!BIuu9FB2+@&5@zllt|8%H_D<oaeGr5{gsAuB8Hi@nusC8?nLAm{BKXJV0r
z)$V;6FrL}R(n_01)JZ9gxY&;*wFoEOJy{+`PFq3|=E7D|bdztROEZ^b-BVwv9w^TE
zelmoVfL4RGPUhWLUQ7GNK>jWBXZSf1A`uH9NfE5_V=#)0d!s&P6FKd7lJVRID5G=9
zqAF0;DmP2JrgbrdjwebWO*X&|vfCw;MoltZuC%~Doam1&$L+*~_HY1PiP(TYmNL!a
z{vsmYg<xs;mdd9}9_4F^bwF%_89$wRnnUz~_AhLph_n6U>wtcwDlHxOln;gW!w-0X
z7e9xTt8(`om^r>e#Ji)GcB$bmYp-<Ec?LgNVlBOp=Ly-w!K^fpZ{NIWyU<@`HX*f2
zm7<2Kqm?Q&u|!QWvEh*4gb`(~5+&$(33E!UD5FW6TO%b9MVwqhbf{2=TLD}&q$#z+
zmCki!_?dO9i@J5`jJABewZW;1F_jKL7sr^>GaR)Lb&dw3l7z~I0pSZ;NB*D^xH`~8
z)+||LNl@%c1^Mcy`FERk0rIw@eh7WJjR(Vuv;)KnRizuT2dby2=Tn;wjEMC;ZpAv!
z+?>f^gegi0X^GjHOROLB8mno-r=f|_#@AS>_}=LuJ(a2cNeB~b%6CPLEchBQRPDMy
zDHa^m&>IhiEUHJvyZ|BF{CakVi~Cp&OTNVY>nW2I1!2IWxfHt{K}Jb7rb3ji;+<q*
z>rJUomic~ss#Qtm)l2zbPnWsSi^G&w(>kneoa={8C%8=~9KCsu%_*Lwc@vn4n#P98
z%U_#?QzqFwhk5T6>~+(n4)-KL(?CiT3@ZXxpe+OcZXslpOm?hop^kzbD(@WjA<;Tr
zT{xHWO&od7*dxOBM0oQ0Q7qo{n37rS@$qT2Bb7wdWR<fjK+><-JblJ9T%9!pvcl&b
znmu^a=691@xVE*3j5TcU>cP&)oua2iYzu;tMl3_qSE#t9gvV-aEb#`wPCz*G0J#z-
z%<d>b-n)G}qe#<p8kq&QD$SUkUcD7ly-{<WQGMVD41})t16q$=7E0oD!*PyZcr^?x
z3>b>H#Uk1YKVN|SCd+vW?QtpcupV|AB`Z|6`iitQ?Ghg6iNF7OE*lr%qBt|ZC-OmF
zr<;pvyikpd16eDGkIf7CqFW&xpEn5`gJZ*<@EoAM9-mj?defg{_V^&U5OBC!jrh!f
z=kjuD2dM@>jiZ~B4*N8|zl^~9)FiruT2PQB%M)yj3-B^K!CFg&Iz4G!!~^+W0Cz)B
zUWe|+ASnFi#{t113W6<uqT%v7KvIL&-tX?)oD$4+n<LNHrC0(;bj2cjv0k`dQh#3}
zeKJTm9G%)VJfj8A%o`vilo6E=kGv~*-yUq`4>sslsCFr?zPtAThR(}XFEHVxXwg-c
z@{JSKBFD6+x^Th6HDCh!c5jR7lhmg!I`@;ul6{VTWP*#wYIQL_Z}g*WhG|`572x*2
zBBiBRIP-oodH)9RdQWXEship$&W_*yz4?8FkV$^(>7gGxyT<SF0Z~UCsnMcFBaE}|
z=d`_a{1l|`%}Erit4o0FwGZ4xbdJ$1=Ml}(=QI?VQzGd1;yh*Z)U@sue+hm(uzklo
zMcZ?GF`K-FWeO_CCi4x}2;uAU3ZLb(?yg0yLv*}%Lu>^gIOEQ6i>Ht@5ha3g>Qf$;
z`G;}9JCCAuvQD8xm50y$3?81vL3F_0pD{uZfo#}yMXR})afC9Z>qVPajYnW~74cDu
zZ5C;vl;A``SdG02yg`x(YkOw8wj<mF?*nTN<ARs@dH=;H;<FBIfNU>u7;}?C1T4qi
zuL2YKQ0fDO@gUs02J+WH3=({K#5zDTrd=b&@@<`0H@Ps_p6ubmdDECCLRn?5T2&>>
zO@a>)u}-xfzO>};?<pYOTMP=NVb<kM-eNlYtU~X=3p6rn{Qh{9hTz>2a5jo1WZRM%
znH_XwaN_Q69{v3%pYEaz@0b`V(0ZCT-wR)8mFO=3oE9+x9hk%}q|sO9p%<tuh{Qd$
zgH=LKB7zho55c}_#E*ke31Q7pM@m+#3O9tY>ZQki0L`Z_OZ9z*SK^r-7jvVs7mu0f
zb=j;4bpQR4oe?s4Ng~fM6&6RmBc3$$EYZ+_e>HX+)w;OgUr#AFcpzaeeH(K#X%wK-
zIXVasz$h3Mpx^zxpmKLaGJ2|l^`qb0TSc^{#luVPzDrt4G03@Wdqmh^8gK}ne)0N)
zf%ic%3Shzq&hEuhTJe+MvuzLVXgw_T8%01#Z5^iYKzjaCR)xCo{^*ely11JdJuS)1
zHVu0hgiD0OI=;Q;3w7E-X&xa>fe8pkT5blEBB?c#E;Kp5$Fp_+qD%?fjGLd@khshv
zZC+`q_KnB;tM47%5+jMer$;QPdR)wP`6OYfzox#)MK?Vw)kAF6U*Cj98RSJoNk43_
z#c6skY2oTs{HLJ@g_cD<)rG~cW<56v=Ni+CHH~B48f2x*R8yN#^;d-F6{q$bbMyfq
zVMF$yD>q4)ph84*U9I?zJRq<|e7@_9Ag*axI*P#R9P5J0-v-uS4s?LjPKSlePJlc1
zK-&?I!I4)eF(<?o6+0ahzXaCh=OTKm3-feI$YEN?<?}||*sPS&d;MqntIx_;qz5-`
zwsQ_tc(zQo%=8JY#hg#AQ!Q)WdA1#3hM!ktX8PDU>z?F({qlk}PlE?>Le7K0W!rRM
zXTM91_lTl>%f~)}XWAm|uMIzALLIWg12f-CUF@%n?rEAtOSpAQsC6lcSyWO=`272J
zSiafmQ`al96h(O;?P006CC--2B9JRnh;dF<-3lX3rTu~ZP7+Zi#3h-gWYh}KVn>i;
zd_Rx3NpiPQ2~^$uooQoJx@fConOhTgyqW0IaanZuM^D0H%}-FR#oaPsOC0W!g}!k%
zA8~!ss$omP&zoLtbGDTH30>91p;-Gp1g-wMl-oP_>=Ftn`;KW<;Txa2eqHkCqHb>e
z$^8`X-Ma~o^ci+kSQ`jEM>DFHf#%XQZ#`<xy_%2@Im)knfR%rbmsi>x>s>LgB_ub4
zzI4$Qqn+KVQgv^pO<7m=cn9Ak<d?f~s9{y~@yjJ70sk#=><RGSunK$i#|9xf2*@1u
z{|e_A_RIh{A00FFZ-7*mw|5rbM(x%@cZYpYt=$Hn=K26ubgWcKa)W(xy-~ZI{bDD1
zJNdKumLL*3GBP;wlHHh0abdZ?o;H;UuW6s6BP>-oLO(HVd3YcR%j|1nwN={m<Fm{x
z-_Ai-&;94@>yzKd?jQ(8q#EcZW2fzOqD*Dy!yJHul%N(tHLRoRyh=p9dNuki)@t~Z
znbvmBV;~%-!*0$r&i-A5PuwyoCwhH3z@E<<_i?!!86bQ8m_;{us_iA*W`kTKM>l?T
zEiYcgX83&i1<^%Dz<dyzz;u9&vt>(WyC8NTgM-0NcN-Qny_{Bw1ghPcA{!j7X1;`!
zZVn(PiAe}1h{cKVh3Rfxm1JufvXh7tKcQ1pBw}(Z>d|tDKD(7XSl7dii7)CSWzvhK
zz-QgSYTPd{B{3Sx88P1|br*w&pt1W~EpZ}R6Hmamb0KGgyF=5Op-y^F34?Z@S#QNd
zI~^>jl`502Cl$NYA^I>^+P245tFtJaB@OVvwz~X9IvyNd-q*Fl8|zYR<$R^QaqZ+K
z>pkQ1n}4S?`nk(K1Dhk~2s9#d-tFX|@fct3ka?5yT9;8;Q9D>T*}I@1y_dp!PY&?f
zg%x)D!M+>?lRjp!2=SM_tL`T&J5@OfRsNjH2gUM~4Ze5iVGhSC41_cIh}chy<{1D~
z27gV&dW@DrHz&fVO?nhgz&I(%CjLzOVxl>lEg9O9b-BqSY=q6C$%rQ0!lYC>Av|4m
z0?9OUco@V7dl)0HkApaRgr<K;wH-3oj-j1$gQlQs^#cu~yeWjMCJ7VIHB9URi3p})
z5GSKt7E2<i8F|Y@U+(qrxaQ2CvUosy>9lf}W&#1XoFOPzXW?W^q132m4G*7wwXC;$
zhu~3yif}*Wsqk4rypf9dOj&mH5*~ZdS01LsIxnS27Pcjo8~sahD63;>-|c9dRKJ#~
zo!1_=dNioxFG^Ef^|-)@r<xX%A++j(F>IKQ)uXT}eK~b*)2f2evA||cjbMOVwv2n1
z4oA^=uoK3xP@LjK^07?%J(8*2399lTa=9TGxgH~;C=Bw%eF+NwUD;g49;mM5C>8~X
z+gMcX19K>q=P6cJQHNbpq>>aZ)HpcUmQN?iYf$Pn3oX-lx~{6t^*knny|uzf*V+()
z9r%`V&8D&9uWZG*zNs!?W(WZ5i3A}Eu`aEPsU_ZaGfH#=j-}fNJUgq#GI=4rX#+M9
zR7|{jb$vschiXI%@kpA06zaWRY|vbB1yjr_csXe(G1K#W)VQDgh3&kP%^OE~B2rX1
zZ6Do7eDEk5%$^UAz!?u4X<z4&%O`hLPl$_Y0|P>1!81Kp$f$`bf(9V2wV8-b$x}O!
z7I`bCD~Ev3U$=`R4O>}fH-a%5RcGkQTs!Ov9_z$)qc(LMfJ+stM2o^KIltuNUalse
z*n;b%f(-F>e)uRYPbghg>4-s7sp^wtRGegF(dmC3o{08WHi0-r|L?$LZ-@@{J}@}B
zx!zP3*0I`t6yN7`hXQajGfm0ZGq`L>dNon#MWKS`lcu=Upx(sM+GHwp>m4oQe(;W_
zbcQ^2RYP0T<FT|bIGq70YUq?(<xKbT3ic6y`HpPn%;MLuzBw`cExGP9#=PM{cy$sZ
zAdeZt=65B#nNipPsk4oRE;2;+Q+RzE9C=xy7JWTye>e!soEm_b(5h8aM&8*O6O62H
za@wfRCwr2dV-xXA!RnZp<42}*&H{Ntr*xy48<ZGwNQpx*iV7NXzEXR~sB~K_csVwJ
zhb=)TreNcN=8YYOU?-E6obg=|y7hvshn$FFUotZrb;4=ddF!l<8>#&(<|8mGVC#jv
zea)7<Xs@#ENEP79I;J|Gb6P<%SCH)+kjSr4YK|(>Uq^M-vTau_gOoa5jtwSZV)BKe
zzj9;qVJ^!xtN&J%dcSiw{hH%%sd!7nCBd+%&MPS1lRAvu?rf(pa3<553E0gv<;+;v
z8^*;80ec}`w_S&KIulg=h>+&CP#+)}#RF|Uh^?3>N&;*TY~n1JyEmdU#3*F16~EPi
z*1BGXRjSS4UHV`G7zcK4wof;xj%Z#eu@5zC)Ctw#yuhNdl4(inga~&HaJEN#$GiDi
z30mH4(Z35Ml|(L1&9nQwtZN;n`Me6Z+Ni9CM68fr8TpStp{T9(%z2%UEAzwplN0pN
zsO+U0`2abN&eD%_og(NV!8()-`qi)@cn7~LMr+!no+fN)BTY9+*&r_-CC2RbmPG@w
zBv>k1B{_BRe(OzB35?THghzBW2HUS2Ek;ruAf1-}iJSy`w4~QpVxVDTmXa;C7A`%~
zW$hT^+Ooa+yob#zKa^9EKxaY0S;P;^$*YaPZUp4z+RVmO1@`c6{Z=>B%4O3A3}qA2
zr?Y89t&{0Y89~U1AHf`P=-G(jDS+g9>Xn3zxGe&e64@1&tP91Ll&}jB!ry95>kiQU
zKtXWqh+eRNfNVNeM$?N^0dL?d3u%#A?fmFBenPvf5BaFe1mYJ>pC)zJYEo^&3DvkA
zg#(`0$J<Osq8D3(qxIJ>!iO_0_ZK+$q6oy>Xj(PZT$9)q1h3RpGk&eBh|O}b>WV!I
z&#;%1#4i(riKE6m1WwI2*rK5w%F@jOf9lN4WN@Y!+L%hn{Nfkqw19WLg_wS5EH%&F
zYof<KXF;*y5)PILS$a@1RpM+2-Z24DasY%b=*TL2MMz0Aa)2;s8-z+d?CVSE(qBF!
z<tX9)t?$>UM@4t#VJ`8br1|7wp4MnXWrbuu=f5$4sbuEqu5*L}k^!&It;3i(*0g#2
zsi~)M#r5i2oRJ<AbMgjYO5`3GLrQ`)fB8?K$!~=YyHc|`h=5&I<QteVg{X;G!UJ;I
z{hb5tymx`_adn-9_++NOuwJlxu^WbtU^S)aDjSeY^ooL;pdn!C$Ui;KR8E0df^_+9
zS*i*u2?o*{lgoB<XP-TRXbgAgrMtEgw@3^K<)4;DUyX)>zKJgQKBHv_2X}^oxI-3%
z_B3uBo|D~2!|sNq3iQtmKOsk?iU3i*nQ=Wmb50=|4}?C;We}=)Zy-H%@n3EFhPW8F
ztE=Dy1@Yi)jo-L<NO>z-9d<}OW795l%58Sg?r#4)GB56b<_m;)fAE_@KQ|hI9f}L+
zUsEyO{f#~GnMhjGVbp*Ci$p7P^jE<;Jmrs1X`{_Ykg4HcE_-GDS2wN82IT!ooCyGB
ziQejm?>d;@Wg?)2gK8*ys1V|14YyEP!&Fr9*e-)i_G@zLi}c~G@8nN^lmycGCh+16
z&{AJ8etr_SHr`uX0M8c=I1uF`{FUd5Q!(2ae*Qw=A^|-*dy3;}q!#S8QeNZZiXdXk
zMSz5T@t67L4etFL2PnQV0stkb5n9R!870%;KFtQi{32S6l#m`S2HyMg>*`rg8BlYd
z0$B=LFn@U}7q<OfT<516DHEkOlarQRhs-*d8&QI$;>XEUe^aFlxxmg7cEZBQ)(bMG
z5OXG^Ukk#?E0djqEr;mL2L}_g&s&h6XONC)cS)^ldNd*Vq|usl0z4?~5u!X&&r1ps
z$v?6_UiZ@(2>p@{$uTqTPai6;tC5L7<v#p`LFFo&23*%$!rqx-p;2BPUq8&JMwI-%
z{$g=bKDM<YfCB;@lQ<Q!WozEI61PQS7#Dx=5&=z?9+<bHEXaMa-^qR9p~!rbHlRug
zl`qMq+0~O=@KP8{0V&3*#mmMO#gtL(i6f$Q9%|Vn3@92>Ud?Ul3+KZKQVtj*iTq?w
zQXLAsj0hnAIN*tgh~cg29kotdrv#MhlG<dMdOW(V(z(?4t?gIIyeh}<dSHnb6Ce5K
zLgTDvere~(|Bf%_Rn-5CDzzG9v&pZYwH*H)t$Nph{~WK|`Q!gN3b<hYd%L|tafi51
zL{aef<PJCyS4Fvj&6WcB`-5Yp$UpZZ<YDGvR~mE=H-Dc2bU7|R0-cH?{xK4IBm!%s
zGu0%}hMuB>K`??gSXl$ytX773yc_c93Qlnk!KkqlO670XuCtDEoDOLB`~UI*j(g}J
z_(M1lkZ<(=canzp|L{ej-<r+Zqt@Mae`5mGc@Xq59s_ZO(9nd095ZIJ<%=@l#+w*K
z35Qx8i38yX`@&FWRmDUR4zur1cmTq8U$<|NhG5R1afpZ~(>$%@LAcVw?xXM<_Ji;X
zoGRMKG;&>>@DZ*enZ@MW7n0`?_^|f294%M!I@U7q9Dt}UP4iqD-ty*d^p;;4?9+L#
zZW=Ziwh~_F5Q(BR#4I!snwJR;J{afI&C|`Ln98%=gaJt9y2W~^a|H`z^~srIanV27
zUt7h^v9Z578`_t=Zg~jNFlkK`4ezv{itEf!UM*^DVDDH$*RO3psAAUZycR4}&oI9_
z>6%Iw^Z+7drZv&&>D;fb?PF1!EbLunC@I%)badbBFNmv*5Ym&6GEfMW=*i4`hTug-
zSi;jn5GG>m^h_Rob-}Lo6CbQ#<^S+O&4GJ#oOsdq+>=|p(s+GC6U)nR6dHNV%N`?B
zsB;oBzEKO5|7B#A;7QWf|CZZM{yqOcUz5~_@n2%5a^flgC6(%fjJSzKLJ(o>7*9TV
zjLeiCy!4BV86(aZT8)T!b)nf;sAIMJ8P>6J&YpC0!~T4u6wwm5(KhN2{pAE?ql)%g
z)p)AwWryo!?$(Ow)=GEB)u$xz+b1#FcCvW$<#w@s=Q-!v=Y;13K#*tfIa5}LJWnyh
z4AA5Be%fuJ)DC@^k{X<7acMOT)!EQtar2v+0_IxjjCbX*GhJhGiMYel#h%%-uv(kS
zcZ76pF7Q>K=oWRG*^*_fjwY6lF@?75<lt}o)VI(v`*tKw8w}>Dq~w5&VmH<f-AiAA
zHdnxojrzmXTVvup+G4uGxqN3Do-T#k1b~wtY1^5?mZi0`D0Uv2|HD;u-&7PAgDr2-
zd*tQCfJr8>xPbab-OXC2Lz?p*CXa>9DCsKe%H?f3<e08rVtt`dF^n%;Q0==hvF?>>
zB}YG^cVt#y%Qj>B8)B8W<l*dJqkVO&N~eSSX!~rs^awk)<b*q{e=Xw=E2Y!k3}EZt
zKJ2E$TXyonjfD@TGo+_=seWbu#}@9TlOCx+^59cTSh`O`OV~hDda5;AF=Q$JH)40t
zQt>>CHMB}P#<GfkY8bWX<DIKcI-53?0qvf=-lcY{(I8}LLMA31kBfvf*J2aTQT?4{
zyW1S<(uHN`@Ug4e1|<{vPArzb0YKheue4NCCxwo^om94U5#Kn3N~P^>ji|Ygcm#X#
zQP-?KY_KU-n_XMRotd3>CD7uS`~5-}!2>LGi)c9gEaoGfBX@wmbYvnTQsvmuFdGG@
zS&2u}IXz*}QCOt<@^s2OtRjf}h<B|DSei^QI-l}FWVc}Xr_G@Nc*TNG1u)_{FxpUF
z_)Xii^2guBnU0-@({0SIW!`OlXS&IwG*+l1jM}oJ^N7S~L#hT2sNWF>Y=BB0FVbS-
zI#v{7z}MS3tBo_a8;sFz!JJ-8Ez43@Z5`=XUl?cm8+&@iYJ!EeUTz@~Cijn>GINT}
z$U(5hInA++T$qbppnK;Y4|v;+G};_LuLnM@=?dc2I1RSz8g0lu+cZTH7;1m>kx)r~
z%G#JXL`tH|gW+5jpe60F6LO$gz700TJw?4D5LKSA8?0M1M4L$5e`{>w4<!h8dUW;L
z)rt+cgd;@JB!c`tRt(>!;0)-oV~?J<*(6w68hsLO5K?fDM_;k~30P2yiG?}dFy9zj
zxKG64m11Id{3y?M$+nu!B9)9?#cw}jOD$w~+w0+8{GE*G?9r9@^)}HQVI>2f+|`cy
z<GmlsJ29)p79JU|O}e2?ymU8x+v7yPn9;OL?>L-Th$XNus2yFq`sW(Q3g@4TuniVN
zoFsWmHfhQXbyb^H2S5xuZ#dI~PyAgXzB!G-KvqqHm`Tcoe>3)`V*JO8FeLO)>=P^+
zAC2YV0=1}$5nYw{99MYBmmjiw=!jU-Xn*ebdM$G4b<*4JLXzPujW02hRwak*b-p|7
z^|MA(ZHJRX|CCt?%}2iY2{;uz2iKdDw(9T;ar(?3LbjRYC%}}@g-hQTbhk_qVX3<e
zwZzVDOej#os(0un&PY1nc+aoO#Mjw94Lu<Kc|jqZ;o3xc=DNVs%}>ycKZa$09bGSN
z*t+tK_^tlNPqcDm6Yey6z(t7Vg5j+k3yCioD$B1cIXllt8}#DgXS-YNF1B*P;6t^f
zri{Qi?^}G|24JfE7o9cYDy;u$Jp!5OwQaL@4I6h!Ca<S2FLz}gOQA@pkr*Fe+?+T8
zmz`G;evNvb9ekEN|5?l#fnW6L+u3wb5jUt&eY^o7zO$|E!$?v1h!a;;GF{@4>AaG@
zL}R4%DiXUMcpYg5Ob8LJPGJYw@`Mp=P{qN-X3=154nQK=TfRSq?xeD(PJ{ttOU*ZH
zP`;LD<E%wH#UrltA~8mKanZAJp~$W3FDUbTZZuThlos^7LP1$4a5@NLlJy?41K&jU
z5E5u%jy{JC0}w7c0YaeNC3-6b+XSBtLT6=LLuHoPe8`@5N#-Gq0$5}PBn0XT^xn_{
z>kawr0VFNg<yzkM#{t;g&~7gLwy`O1X_Gj52^UCgbP8wCDyHH*jhi%w@Ddq_+_DSF
zH@$2k`sgz8wV;1IKrWi`P26Y3L}-Y<w5$;LMOKmKQk_O<8K)2ufv^vg53~bcRbzjh
zo3`QEM}r>D=dcPI5FyBA8D%7WV)cbiXEqC^0XKNRT|6aEOA6_!k2&UN+u!P8=@W)s
zR-e&66z^J3?{T`Nd+8~QqADlzL{o<K0A*;M2EqdsoCU2+ymZLTy}N2=+dC#5H5+oQ
z8UTZ$x^M#$4nCb}#n2T(%YP$LA`j-3L$Y-&t|Q9LavJSZQ{4XVAIzT-ZBGh&DcVqw
z0N^Z0>mro`(~E&5`it{h#|JNUXZ$BSgcwY-Zn|HBpA^!Y#_8hQg)l>vb&GL$=&1u4
z7zx3La*xP^yKFS~Ct}-q*K7unugnIrH<|2Cs>d7Un}z9SkcXqRYS^g(?UCH;>0G%<
z-bxtw_BX<?Vb*UU_(cG$>Q~TLRR`V`pbqx%`-gy+Brg>_BP+Lop;qXs=Zj%4Y_%8?
z0K{|hPTFCvq@hJC2mWf*ADj_M7o<2KmYGeO7y-nmvocXHJm{3d{?;DuH=iM+2j4}y
zZ0o4G6{|DWaR}au=7HEB>5Z;#2Q{e!az_-#8eaDamY~1Tk9_Yp{i@4iGEvlcfVSu?
zcKiJ!*4C0hA6%lyL&oMI8or=-MT^Vcc1S5&&y*2l{TMX=6REnZ%#2*n${#2W)M+~x
z^t8`83Rol|4ktWAC>}lRpm`a>2zJv(tBzjcM9fq4f)J^z1FtMus*A+-HDvi*!a-dG
zg}Q@0;WV+iCxYz{d*e(FGF(+m07u+W_E;y-(twY}7Uw&p$Vfdw{lhON%Jw1xZr4Kf
z-R!&hMZB-{CX=oNj)>^#_=4p5KW4E^4%GC->^0%jxc6Oh9xa0zq-Q@7pXF1uskQ?!
zV56R=JZy-Ye*V~(2O*rU?CW7;=gCMj-y3grj2n4&V*Hg}``{L<f+g|_54dMAm9D-(
zi2u-$4o;dQjpl?__cX#;$rebPiVb(|j5g|yzo$6>`_ppp;kQldhL`^O9Q9q3PjoFd
zUDZV40rY@qbwI;pS3T*ni1RQJAe{3c>_yM8?Re&_=~TKuuHg~pEuY7I0Cgb|g$Q|p
zX2~eZ6%V^$Dl2KJGiw5a2Q0S>u?rCMLoTK0bX=8d{B~u-*q12ju9?Tvka#dbnfHKy
zy|dQ|XO+Fx5pm^?O0|Z^oy!VKKq(V3o)br}F}yQJF*}q4<mHI5=q9qzn-~xam~w`R
zqS=Y6K@V*5TgUf)?^X$Yy%kxeV+26{2pVnz=eh?MKkvVW(nD7u1Y{MDR5j7@F-c9|
z(l(Jeg^*loST2)8<aue!*+^%-{IIP6(@PJ>1kR9(X#)b9sHG8P=X@hb>|_zUgk4cN
zdeD2Nvlc6)I^H+rchmuY0Mq}5*S0TqlCKcZD$aSWBB1%*@VHJ+B5>=-A@>>Qb<$^4
zmcF%MOQC!&gJQaG0n}cOyEK<lWt{v{-jt_<yP%*Sm{seLC-pJIzKrt;5T~vy#(s9(
zIguQtlt3dY?_6UT*RPz2Di>KaAMk_Gg^DyQsr}4vtxAQLUvlwz1{M6qmNUpvOGGnR
zWc(1Q%y~l&cu%!KF^F@ZyfZ#7up?fK)gM32DGfhYchejO0ofdV8VcAGsWIANuD5?N
zHw=isOGfsnCoVgs)jKxx(u-R;=t^dTJHU{8H7{JeY_?dJ(xbtBrd`Fnj6qjQ5!qJh
z+o;UHwORHV7uHEWL7wskzofh-TG{9DB=x;xxf7=Yrr})<F3`Fuw_>IRV&55}U()QU
z7T)6oc}w{{0EfCD2(QYWV_bRL8pUxrVbT#U2@C`4vn7GX$qx<oy^Q>)3O^w?pw1J6
zVg&GS)94<2aGqY*&!wZz>jhbBis{?dt&=SZ>|VB5?COShq5Jf&gSz#H-MgE1%v_#~
zhoL&yYd=!JUm=_pxp%s&P}`=hZ*6%SyioCY#L^fP0e#Q=?GSUHu8#UX4L^0+WXy0K
z=p{y-HGtCG-I&%GQ4d!ATdw_ETs|K-U@Unu*Qn!6zKxQ-%wh(LeXskT+9YXjTcrQu
zfKy0fGf4wDIq;g&<YAuJg99VGK!^^s+4_R~rUUpUr>cHDZVbgZP%N5JcE^6Ba%^)U
zjY`!43>+924D=K8&chYqZ#Sywnq=qE(bSqkw9#Yc)x}yD<;C0=3B**I4CaGeWamv>
z@K(qdtTgA98qw+JywOq&_PhmrMduR@*j~WahR#3_V;xj&!`t&Gu%J*bRUTH;7T))P
zlW54r<gpxn&WT?b&_6<Pz6k^_kN!=3Am*zAiUHJrDB?K2vW!2kfhp&lQM-BErViuk
zJ3_(bsF)!6iR~}Hy?JYdJ&BY|4S=GCon!TfP+4uYWYX<t`w4eKm!nyn!AYeaP6@a)
z+|?VD$KuDvd2LCZpMUWc>1dJA_Lr~n+t5K?D?O4|p*N5<?gZ$a`rR=+^-y<QyT&d7
zX`Uhp*Xq4`VpmrPY(u*r-C{lNRlPm5syiiOpqH=^Mxx~$!@goY-=KUgx;g~b2m-Fv
zw8idwDx;$;enbY}52Mswx;9S&j}H*q3AzkP;u@zcWlYVww0HfI^;@fWkn#WO^egC@
zZMPSKWNVjsM6I%&bqlya3Vycnu)2S6qJBvt&kREA{nouV^fh9{P!!`z&MD7_F>=#u
zday>h3&_r2x1{w{D4-l{w@yA3%jjX5oH~szK8X^w8Zv$v!l2K8kb8alY3oMoRD#7%
z!4VrOPK$2ra%ajL6tVLPC_V5;gf&b)5WMtbLMC1y-hy%9Qf?`MiT{oU(K@B*e@3&n
zuK$dyKwN7&)e(pMAIS}h(d(n|Eb6Kwmw!t}gw3+|%2IMm+AP7}c3`XdrQtZm_-72K
zXk_S#cHDpbm*5KUS6Gz)6OY)y{a=N_If?;b^Pdo7=nnF!Ftu<y3<lb&j*g~!A7Tm)
z>f%svv62bAc#m9b*yVu!gg(>A7~-Br`F!R}KjCg1OKyRf<VNV$#l=;|GuL%Sc7^}|
z@CjKDqq6&Ocqj)<(ob6<euekdX?=QR--7K*J(yU7@fn1}8M=+vO+>ymRS^$eCIg%^
zNq0%^Y^T|a+IUU=;$3IKO9?ttAmBLDsfL$1`S9ECzzfe@SW`sVaq}shyS0lYP{C@z
z9F;lOIVUd?8htxaf(~$@mlTfD=VXAPgDkMyD6nla^@BF65-a$(7M>*xKM1M<b*GtG
z`(Ssk_UT`(DI#t7MDmsm(@T8LU<JTJ$KsO4i-Z`;6+Ejr;JIZD*!$2o(lDelSeqsa
zI=8Y+pCXF6WsWAAWVJVhn>wn(^t5Tvme6uavo80IHojw<Vn!vqU|ki;?(>;`OQ%lM
z=L*8r#2VzqfG~f9W;+CLN`-CngPcs4Gl6MsGxco23y?^&sbDkHEGi2AN0gfgvF;sC
zgP5v{&n3~wr`_oU%>rA`$q5L>)e!NeBcz%P`}^W!W_TR(?d*$!rWUAnWgX&P&}W*$
zu{AkVrShV_x3-&Wjf8bTS(Q0;VjSGdn!Y=~+v}-&fGdf)^F5?`1y$NBtfw_)*itp_
z%APcQoz5@zhHGEj;`FZD7AV7`XH-Bt<raK^zt`<P%!r4kdBQyGP%mlp+_^>*`U+{z
zy%s!>nz}jm94KO8XjE@d8`G>GjrgNz!u^!+znIc{YIflHw|Y+Sf6Rq?Cd8yXP3R=N
zSY|*?SW_fXAf=GfsqdeRe@myoj5unb8W8t&JWzQ5$A?4a<Al4v{d~&Odb&UV1Ot&b
zjO(8?cP8Y!)f^+w3|45*zW<RXrcXmpqn1v@h(czsROBd`mf;vMrO2>F<L<+axv}S;
zW)&aBqWFjqO<5+zTUs6Sb$miw1Jfo84k+R_RyISbVWFO9*OqWVjtf07LL+NCp5<qP
z%n36#BiE;m`56nF6<UEFF>*5>*(i#;9YNFSf^e@{WG52T|0P^4RvscXxakqlXe|;Y
zbgql7rpLs2vGoD2ioBvT`_=gs9k6;n+p#NB24=TrG}l(h*aw|ydT#9EvsT(8LvZE4
zL~2LSEA;%xp%_Ge)APS?@QgZ%pX^_O$@)J<)E`Vq37Qy4DxS_RW_F6d9URSmyI7ey
zCsoB^1OCSyj+NtaLTPGB7Dj{lVPpS~I}A_n@gwSAuK`{WiqV6GODa^}ym3ZWTT`#`
z1NWg{L*Fx#Zc6)ZHw&@n754*k#aDTw6f@1dW@_s7$@khJZ|D2#NCPBo&T!4=&a}NP
zq0-Stt!;V9Wumg=j(XCj#WoD8<pf8rjs_Z#Hh}yWlg!p}rygfO`*BlFfL-q(mhrAa
zearGL)rgj`@b}U0W)`uI#x@fJ8y<uoenGgHDUmv@dc?(-D=>Pf3uT(Yn3QD{QQ~UV
zC4SL?%%^5`^z=@PZr~y-Nsq#Mca@~D=ZUS_!Wa{ApMq=-GI0n2^dDSTiJI2oOg{wx
zhc;cij;;EdmAq)``9|SJO$>oS>OW5w@A>RDY0C{+GcHYd>T?G0o^j#2*asaykjjND
zusW<e-ENo%1-YFWV>x4i;d}6*9=!_igT>bGo5S&EpPb@Ml?R;iOxbJB-Dzo|N!%kT
zWw(9`<gLpH69H&l6?<$Yu1v4`C=Nh?<gQ(4_`xmBU<F?Z|9kEg4`<Z?88#&S=)D*o
zwVE*K3H6@ZZ5tgZdT}o$`1H^%14Z(l_s`L%2sTr!LN_8ZMBZ`7-+6XGba{l|W25mQ
z{Y<|#YYY1Fk#{hLi-=;QuwwRnbqgbPLCei}^xws0`56zuN}h?$kUUh$oi6eLSHGk?
z#B}Eij53LjuYVh}L{`18{i&%9ps0TTkrvQv4AsPE0vzODRuvew;O6gl4PE_o8wR8d
zXm+@mBIKE<TkRC<^E6>jFeenDjp9j5-;n2=TZ5tk2agEW13c-<8|V^=;WG<7g7>~%
zTyYJk85mi~o{A^!IO?;EpAyIc+GmM#juv4Bz9o7NoAPQk`+VAUTGV_Qx(?7B6{nK>
zrZ#EE<2VgZ+GqyfGBVySJ#{7!JBmq5`<<ee2Lc-njBqqZJU(^0yo!i89#7$tzGFF|
z4=bK#?pZY4R|AFTCja)f-p<NGV*lo6G5kgd8lrqG+9Q<)gmUM6^&v?C{HJX(nVoxr
zI7FiDjG3OhqMR0WPj^)@VVs#A($^7Yf;lnwg~K2IVL1Oz^z@+(s>m*mO8h)F4$nxi
zA-3n;dYjC@-qQ?coB~RQ>j*e}X7J#Tqjrb}A|0hz==2`t&I*Vm*TXS(w%NEf7@HGD
zr{nwJ?uQ}qt_nSpAEoutVOJN0{z*UWri|~0G|Lg{ao_G!=x(jF_s^{}+Wp_JZ{>iz
zI`bcHMjrD2TYc@Tgi88OVg(fV9|^@%rhpGO1qQ^&+jVvm=w4@b+DNh834Q$RnHw4z
z!t?_XNOo#*FDv1*P5LLt^6lW}ZvMP_O(^igke~&|r=w%SoIl)CyUoyANf#N8+)13y
zGNrOwQDtSxRE(A-do^RAyq`(4RJ>8qJOr*top~q)MeXM=QuPwk5OqKj%WVJMB;2qM
zPP5m@o(#KKKTMHqlCy51bmK%iLlw%*N{0QeHfLUj+^l(`m^!Awn?KUcNmHi2;jCE*
za=3Lza-xg2s^*z;*)q+d$~9eQO$E7DC2*S0yI+LJL;jqtL{Uu||8Q2T|3R4XM*$UX
zDZ`14t^`s2j%vk}EIz>eSv|oz#$hi2CiwZ=Y$C&F^s<9vi4GOZK4&5Y__42Ct4_S@
z%cxN!`}a@N58YekMaJz3^wMQnP}8_R$sC&B37NKK<nsl!h7ZAl*O}E5$J_x|njez>
z#8^*3nDz(i`lcN2Pwuk_&YkOj(xB?xe3@wc3GE++5TlV#-K7D;&lWGcwIG4$U5tW#
zcLdN(hMt8WLeNgv1t3OPhufr}V34ftwJ8i}o%%dI)PxUCzJY!DE_x2=hEy2tw8!~-
z6a=xZ)&~+f6*ZA9C-vqMn@xaC62V^AZMMj0Tv3nDcmb!46Ao=C^&#z%Sj`|LasAe2
zOz%*51neAS1zSKIq4m##qO6TLHhq8Q0|69;i{P?b+XI^*F5Wau1I`|zZIlP-UPL+C
zwU(WhADakk7+E__YhF!44>zTI?r;)TQ_^$dsH3B0WjjV>K4m`=Zn`0(ogD(blL{>B
zf2ia_iuQtjhY&$J@d#mc+#t?nrQ7#4q2>h?<0BRv!97@$^#~nC;pc`V;}SUCjMl!i
z1<ke}93b#tM>2B06!P@!?#k4@1P2K?jZ)(A9z-f|zcljj19xfb&jJ;ETLx`zn!w@=
z-SK?zf9c+o2MGkpas0KX+m`uo6Z$_b<zr;<@vDEgzT*FdK3f_G;PrnOR<0h3uqMs~
z0#4D~FF71HxPSUEbJ83*7%IWsa{qKXlQKA2t>B=qU?bn9htVOFR29?JY3_nfZh`>G
zqwnU46jmyTCx?eK-q(KauUFpB-GHy|M@)bCwrM7}Hy4Nd@jibv!hLI!dU_-UNa29C
z)S0nJ(}_$Rc^d$X{5`iuo2jEVUUIafPyA?DwCx78t&DVJzes>AO?E1ak=EKSm<|Uy
z<gdiq?d(y?Kas+yBl&3hjH*k?)xT>ets~9D+U?^RGac+V)|T+(Z}$4AIk18#E6pA`
zcSvcoiSvOKlG14?uyN6+$`pf-W5g0y1V^{k6+i}67CHbg1-uNhn6gU3Re%YveTSl4
zDNBcVX6Y1sC^>$M{7Q0)<m}RiTj(nU{V32!LS==-SQcm5NltEpIy5wP{lMyvYh%ZB
z0Z8*$r7i!2qK1KWoev&76gJHnE`k>`AsnA$L1_H*>2!z~!BXJ}9OLn{5PGV|-U!}p
z^AsH7aU`G){pa>Rr>>@$(4Epc6a1!Y9_I7G4@C7r1w5+EWUAm3F%URj(<9<gPwq67
zPUun_D3_3emY#wlLBJ9k`u5c@PBpqeH)wI&Iw??>9p4Z0_=l%>m!+U0r@g5q!^HZr
zq`F*fRbt}o-zPdmQ?dQSyzu;PQ5uHeiZLe(PB}n?k={B9nnZS#)RFn2paah^T0b{p
zW__+vK)(zf%hFPsbySDl5QS36bh2TgWP8d?JZ>Blopg#eGMv6GI@_`_?x3zv(%_5J
zeu1BP_#a5U2_HB&=wqvMdKU8zQ%&8GCdpl=3$%hJd6|3(7O1T?cGe#ayTb&O0hH!m
z&MSaT{3?Zn9pkEbA*;b-`gz-p7=%!>MOlR!ulb|3Yx6ZPh2)3nfpPwRDaLjdbJyk_
zm`9MDWYpgj($gV4%RHjp!6X++tn%~5^0K~cc4%?}2fJ}-d-!*6Wj6?vi9v+v13Zf`
zPzvOg#Fq^Av6gRheq7Vd)mDV_Zj8!UXxso65i{S;bj$wuvFIm{n15M8a(NRCTfhWU
zHPIv#xtP2pMV^~<*WB=HT?nzGZy|9L5p6Ug>P$NNiDgon5+3FaYOx-bkb^oqb>>!)
zQ?66y^8L?(U-VUEAC=~BVnw$n9a+6|k)Kj}GVkXrSgvyR*$luNc_lrMgf|W4#YI4(
zmY)OORk|N-vH&CF0Xm}oK-JIw?;WFeC|5gCocyP~2jD6nX9$Po0j6r?0`FvfQ`<>X
zRYtXxczd$jUX3u~cq`fH@g_m`AkUK8<Q57;mxL+Yh$SKBu2`xaE#a;R;`XS->zK5f
z?n`h1O|7Nzq#p%CmV#4mrfy+Vr9HrBroKhDiVD!vgT&Bly0%{O8b(e&`AOQybxOED
zdP(yZ^D}NzDueQ)QM+Y(NT_Gq;Qtx7S{YZ_{-vuubZ=hHt2zE)lWmE*t8uoz^aa%z
zG1tG16?$v7U5=e36n?ay=UvYd=@60PX>A_vueIvFJy8GS)GDL5|10oLwg*qE&#C^Y
zS9AKYSEVJ)cX7ICZvX5ns&52}j5oJ9win0<%SHTX_PX!pudNlzz884t^Gn8c@5OHm
zzJA%W>qTRDqg3I?%i+B{zU6xQGfmPHm>A*ke=<XHBCA&BxA(^qk_|+9dJmg--ilb0
zEz_N!^wL*nf9F&&Ih+3OhY1#DpWSy{V3FGvP=7yD(Ph50PR>Wu%L&yh?jK4PyH&G0
z^GizJmh0C&7taf*Z*5)C+PrUhW`)J}iYwoBdLQi!ymZKrJCpl-q=9Zvghi#~YAfKu
zXknGo>mtHkldpVts$g2*daUr-xl%9PhOn4}vooBx>sA*WndWYo;?1g_Qz?|5Q#tKl
zD@&m0iOKa%0)at}MK@K>9kr5nK3KR%deeuEts7sf9Dg_AUd*L9mK#SdF{`(~aW#FX
zyi>J;`E;$gPED!!y#?=?Rxim}-+3Z4@##G+!MZhz50xuMN%s8Om$^jdSm8%LMah3l
z>iHvAE_{D<+mdXX^!xL>&-kvnt+rg?s><9=mrW;J&Qr=2?5)?|aq0Wtdz>+x-?%TZ
z)a{LWl(}xNs*L|lqZ_YV_D(#0Z&u%0rJSw3cc&kgTTm!^QnsnpO-XUv+E03`riaII
z-*pXraqE>~$i|mBB|)aSMoyPc3anhatYF66U$rZK@Pm4qf{}?Yf`Qjx9_0Z|&oeTK
zFo?j8Ib+zcee#33uAI3W?Q9)@=bqV5)|=-fGdZCuLJ`>2Dga_b2H+VbaIl+ia^QTK
z$$I<>ll$ij$Q+(7G&2uan{5U*=G0IWx(I+33d~oPMqK00z+jA`h<|dxe193l_0$Xu
zHYoC!MS+GW122770o#Urji)V&!Xinq!Vi+FV1<Y)7|~5UssL8#pa?M$afuxR1FDHF
z${>Z4RKNzZfUZoNT)0q->AV_5m~HZ=g<7m)*Fo21JzOZt^gsh9o~$Vfa)UJdQYK*V
z7@;^ed~)I<KN;j3bL>&%({;gae7DG48hjH4@I?7!;F)x&;Ttg7VX>1e;>3A$`504%
z$p=jhKu(bbpOp@b$~8c&gJRWZOOPtX$+AmSWf2ERqes&!Ylg`JHnt$MSU~3(Pu{RZ
zj9J(oBq%j`s=XoDzu=Q_ffg(V`qvJ{5~0cVOQU2#$FlYT<>i3#`Y7@q&J2?`I$MIB
zia3apfx!_)m5nP%mB?g+W$v=br}mkksJiO`Q^h$s#ZwV%CgPwS;JJP%s&#!}syQZ0
zFPCQlpVnfxT#WfuC`1BsAdf8A7{s;%;F&!r#;8ZYR2#^ee}=6^Vqj20QMEi5YS{`6
zS>y#Xx+toiRKiqoOfIgH2HT7nePm!zKvBJ^8m5|k@|P9zvWPJy1_pT)l^eStD!aPD
z$x{|SngWax)Rg7a3sEW4Cj+(}(OF|)FhDW$a35HuDEcUjM`B(|&g8_!imc$)?qq{i
lqRdAoK}?18^B^W8mrEKbCW}pjsn+5W;$>hsF$Yuv0RW12%8CF0

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2b9acbeca2e..9da79b5658f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b1..23d15a93670 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a21834d..db3a6ac207e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 448f5ce7f7cdf312ca786576131543927991d0b5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 17:02:40 +0300
Subject: [PATCH 0977/1037] chore: bump org.sonarqube Gradle plugin to
 7.1.0.6387

---
 build-logic/verification/build.gradle.kts |  2 +-
 gradle/verification-keyring.keys          | 61 +++++++++++++++++++++++
 gradle/verification-metadata.xml          | 37 ++++++++++++++
 3 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index d36798501db..71cc992b683 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,5 +28,5 @@ dependencies {
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
     api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
     api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
-    api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
+    api("org.sonarqube:org.sonarqube.gradle.plugin:7.1.0.6387")
 }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index e0759d1d6cd..59307a1ab01 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -790,6 +790,47 @@ yfc=
 =h3vZ
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    9AEE152CDCCEBFCB
+sub    49A09601D2948101
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBF0LJ4UBEADDviIvloIaEtjAac3EHGGQtHtqKlp4uXXIgEWh1vNulzVSRpBE
+LDqDcrTowNU+CYQ3elTKa8cDrZviR7bMBju7esbVWxZu3ueMTG3IrvbDZUPYQ9Zt
+DQQr4/kDaSn/JpNiOyC815QHC5eQD9CjIRntZnxiigpIerb2PStd2v7DcziA9oK9
+8ByIVvEAWjxawI/E/Nkt1kuasoQCvdcZrhoGhPvLzI4OdCpgow8IB8kpRlO7vZGF
+ncQXuyluA2FXO0t1FHOGaPN5F+PZ0JuBH/84VWacepSO0lztopMpUtzS3eNzxUDq
+t01Q35RPgzp/DAh4lAB03XA6vo2BDzMG61CxieH8Qd+7lqXglO6y376gtuQ3H0Hk
+HoXLRn/0mExcYRxAR5li+Loib65da9nRGclIhYz5Ksy9waqzkSIU16UX/xmxo0S7
+T7OFhKexoRPsJkNPSFRgdj/Kro03WL7qqPMemJ5tjAcfbIDcI1HJH3uTmK6tlDfG
+L62Rz8LskiVjHXhLShq5KgGRB+Z6o2aW8tjy3RqBGJDRmh1pqOok3VgvfohiYukN
+VgK7oEJflq44v2ZW2T+/06iPX073TpcxGmpUKBkh4EybO6v1Crucb4+6L6c32xS0
++DDz0tw4xm320iPthut6xlaAjaUvP0BKxwrzwifImTeZUx2p/5ewydMElQARAQAB
+zsFNBF0LJ4UBEAC3xtcTGbPk/TdM6wuyJ6Swo9jdmgSAEaEnMiWMDT4y6UJ5Pphr
+BLE9JW9UO58iUYx3ay4SXCjXnawUNEaOaNdyM4m8A8ot47tEU7AWbH+yFrSP4L9d
+lo5lN2N/w3iMsk1qfRmLpP4PH1BQVAhGZq6CoKHqZ35oTqkG0NUUviN2Wu/sJMua
+MpsSzxdonyL8ezr2Fuhia8wtl6CUlS2z5z9dYCnaA/SwqIZDuyFh8IQvhncS7fku
+P4sPF3/twYPNICkv3KbKvYWelr1RlRcIAtO4pFsZAL7oMocn1DgQoys6QkHzdwfb
+xtFLY83h+Al89hQ79K6ksBmLRjoGz7UGJ/aPb1/EDIbx6CVPtjye5ZtTwigbmgpD
+DHK8ajtU15ZRNGD+66Jty8Yl5AZYeI9+J2vJD6RPGa45J9SLu0FW6BE58YjdjZJh
+PZ2smCWHnFNAaNHZFTYTR8Zz8QR1UrmkFuT7EB5lEiJxrCh/WHkIkkViV/BDIfR/
+Vi16trswbkilz53Rqx/8uu8dQW2zfW6uzEioUa6kNUV9q0y1cJd6bkTe3IMaNT/t
+E6xe3YMo78x4bmlJdb2Y5vajesTksANHHRxYY1m3Eo11j1BYW0WypUN+/8PYilIj
+py/2eagEDaeDPDHlI2g9Y4g1G/ZHrcVG7eN4hx1YQK7uJ7CopTGDH8qeQQARAQAB
+wsF2BBgBCAAgFiEE5ROKjp8ufkLTixTZmu4VLNzOv8sFAl0LJ4UCGwwACgkQmu4V
+LNzOv8vnCRAAk2t2oPuL1XcZKEJUpl6sZmyYShTHF7xcZdOVUGJgbyL8priZvZYI
+AK+pZ9vEWYNMVx0ErdVFd20MkIyhGHRlls2KHs/uZf1aHvc73bGsgFUw8J3rG1fX
+PArWvXbs59lL1TyFeqJDT/hkqah9fh0kknAWXJm9cLgdlIBN9dJpiRDC2NDa4Los
+3Lb44bkHQZhYx/5pR4AeWxBGz45AX/XtwN4ctPlBpm++s7X/tNFDZgLrRyXRtQ7C
+2JRhFOuL6DOTjS5cY1xcEwU+c3UvGQdHmhj6vj/ey84I/Dqt1XTQTjRTFGs19SLT
+PdoWybvxdNEwdaJ0ienORF1z80VWxdpZl6fz/4HEQa6Yt1cZreBlE8UJyJpFMz5n
+yeXuzFPTIlqaKnKmgTfq7tIBngNGwtYn2xEDPLkhJZf1aZKeJeFwGuKB6+FaFa3J
+9ExowrUKC2ZHfe1H+wbFEU10MPBYxswcUYI2uwfBQboCmqFmUE8MnziEvOM2+DQm
+zpPIW8LWbkY0mnRbBDnkcF2Z1/uojY4iTM50W75rPNJgXrhQ+DeKDLTEqxPXRAqU
+SSDFSyhnsFnaY17/JBYw1ZJWpJquDtmAjmf7pPcL69qkgB9OIZ0UKO5B62kb2N6k
+T9iIop+nAN3KWP3sU8JbS1GHsL+XXZcbLwKz5MsSqbS9kwQOgeAnvFA=
+=fK5H
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    9B1FDA9F3C062231
 uid    Brian E Fox <brianf@apache.org>
 
@@ -6559,6 +6600,26 @@ vRhDrRcIBFsQ/NINWFPloDK/ZPtGH1f8Fw2yDy6HXNSfTgp8Kq8yZ8WYkTtKv8TO
 =tRDN
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    66B50994442D2D40
+uid    Square Clippy <opensource@squareup.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0
+OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe
+0qGWlnAzINuQaEuZwNw+pjZqPraMlwc/hwzJB8yFNHCv25pCFohK7KXvFGr5Fc6y
+NHBp6pM3pnDQ1kbkloDr32YZY2LdrfdkRqwa9STNMcZtM724aaInValFpVGEHolF
+dklo9MIsMI6mVHlxi6UwFSSLltUfTXGYY+rt2Q2sLNnEKzK1GvVhK996vrNWCvpr
+cdtbTzGE3WK4f2knhqzlaX99OLmkM1ah+p2EkK7HgWM9oEO7SYpNxKe/F/QfRNRS
+4W0aokPsEtfKCD7vQ3cRWQXdqFwvksilv+b6pcSrwfAsaCzVuhB3lcIra4MevJcH
+ZEbPrfGMi5/MIVtLayglLHSPoZtjQBhlqo8w3nuADR/aFlIUZ6NGOwaz5yXIGVEs
+6E1wiuILRAd7ecJ3Zyr/URHjawfHfKMM2tNCJKl48cScBMY61FJ1EmYzwhDw+at5
+D4pCk75eM5/t6VdYQ1cDWm7J3LGXEANMU5aSZMqgVnb4SQEmRxkW7oq3Z+GIkQQf
+Sj4OK6Oi4cUpM7b0m7Cbcsoqb6nD27VKD3J5KTYEq3e+78h0VRjhoi0Z+QARAQAB
+tCdTcXVhcmUgQ2xpcHB5IDxvcGVuc291cmNlQHNxdWFyZXVwLmNvbT4=
+=cBgo
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    66D68DAA073BE985
 uid    Ceki Gulcu <ceki@qos.ch>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index af62086157c..df901f52d76 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -184,10 +184,12 @@
          <trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
          <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="org.apache.commons"/>
          <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb"/>
+         <trusted-key id="DBD744ACE7ADE6AA50DD591F66B50994442D2D40" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell"/>
          <trusted-key id="E06A36F67D8C1BD13F1F278D0CA7139CBC7026F9" group="dnsjava"/>
          <trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34" group="org.pcollections"/>
          <trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
+         <trusted-key id="E5138A8E9F2E7E42D38B14D99AEE152CDCCEBFCB" group="io.github.hakky54"/>
          <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
          <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist"/>
          <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3"/>
@@ -558,6 +560,11 @@
             <sha256 value="555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="32">
+         <artifact name="apache-32.pom">
+            <sha256 value="cfd872c0ec27f53ae68f43dbc0fecded8add773079a53afbd390e407b42ce72f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="33">
          <artifact name="apache-33.pom">
             <sha256 value="d78bd8524c5f8380a190a6525686629a95dfe512df21111383a6d8c0923a4415" origin="Generated by Gradle"/>
@@ -624,6 +631,11 @@
             <pgp value="B920D295BF0E61CB4CF0896C33CD6733AF5EC452"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="69">
+         <artifact name="commons-parent-69.pom">
+            <sha256 value="d50da9c39bdca823d618d1b4a03b73f196497fcb8616fd0da727c8623592a9bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="79">
          <artifact name="commons-parent-79.pom">
             <sha256 value="628df30148acd3c491cfcb6b73c7ae4b5989e5526ab13a2f428dea5d4ad10d7a" origin="Generated by Gradle"/>
@@ -889,6 +901,16 @@
             <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.11.0-M2">
+         <artifact name="junit-bom-5.11.0-M2.pom">
+            <sha256 value="4a3ffc4a4edcfec2cb5d619922706a9407161798571939f854dfda73e4e17cc8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.11.3">
+         <artifact name="junit-bom-5.11.3.pom">
+            <sha256 value="f13df2e4caf1febce567667e7c378101a0331d53d1324d6e2dfe3aecfb1f7774" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.11.4">
          <artifact name="junit-bom-5.11.4.pom">
             <sha256 value="19d4b747b204805325b6334553296f986562277a4ac1cb5e593a5e4c4f5e4115" origin="Generated by Gradle"/>
@@ -997,6 +1019,16 @@
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="7.1.0.6387">
+         <artifact name="org.sonarqube.gradle.plugin-7.1.0.6387.pom">
+            <sha256 value="d83640228e9b588473e789f8f55c7747be64c742aa348ec634a844322114b09e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.parent" name="parent" version="83.0.0.2369">
+         <artifact name="parent-83.0.0.2369.pom">
+            <sha256 value="d351a6587192b3c37ef3c5525b8319fef13833b630099081c027e21d63337efd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="4.4.1.3373">
          <artifact name="sonarqube-gradle-plugin-4.4.1.3373.jar">
             <sha256 value="39c349b63a650e5bb48a499304b2faf385410cf8613c875a22398f14b9bfb831" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1005,6 +1037,11 @@
             <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.sonarsource.scanner.lib" name="sonar-scanner-java-library-parent" version="3.3.1.450">
+         <artifact name="sonar-scanner-java-library-parent-3.3.1.450.pom">
+            <sha256 value="7d73eda3f20a591a479b656e4c6d5623a37405672ac3e2cbf50b1a0feb374c49" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="5">
          <artifact name="oss-parent-5.pom">
             <pgp value="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD"/>

From a4ca5a09e046c0059d18661dcfc5648caf5fb4be Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 18 Nov 2025 23:16:32 +0000
Subject: [PATCH 0978/1037] fix(deps): update dependency org.junit:junit-bom to
 v6

---
 .../kotlin/build-logic.jacoco-aggregate.gradle.kts   |  1 -
 gradle/verification-metadata.xml                     |  5 +++++
 src/bom-testing/build.gradle.kts                     |  2 +-
 .../apache/jmeter/util/JSR223TestElementTest.java    | 12 ------------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
index 16a09618455..cf11a81cc6f 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
@@ -26,7 +26,6 @@ plugins {
 
 val jacocoAggregation by configurations.creating {
     description = "Collects project dependencies for JaCoCo coverage report aggregation"
-    isVisible = false
     isTransitive = true
     isCanBeResolved = false
     isCanBeConsumed = false
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index df901f52d76..37515ad0fda 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -931,6 +931,11 @@
             <sha256 value="b3d9832f5c11bbb6b0e62851b93aa29d278c39fb1a751eb771b46d004a216219" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="6.0.1">
+         <artifact name="junit-bom-6.0.1.pom">
+            <sha256 value="e315c5ccbb087216dce04ae70c32bf1762be2a0b8a43ef81e3ba78317a4cd5c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="5.20.0">
          <artifact name="mockito-bom-5.20.0.pom">
             <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 3c41ee30254..ca8b4d5ae4f 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.junit:junit-bom:5.14.1"))
+    api(platform("org.junit:junit-bom:6.0.1"))
     api(platform("org.springframework:spring-framework-bom:7.0.0"))
     api(platform("org.eclipse.jetty:jetty-bom:11.0.26"))
 
diff --git a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
index 1a3ca4da8f3..0dec4942990 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
@@ -18,11 +18,8 @@
 package org.apache.jmeter.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 
 public class JSR223TestElementTest {
 
@@ -30,15 +27,6 @@ public class JSR223TestElementTest {
     private JSR223TestElement element = new JSR223TestElement() {
     };
 
-    @Test
-    @DisabledForJreRange(min = JRE.JAVA_15, max = JRE.OTHER, disabledReason = "The default JavaScript engine has been removed in Java 15+")
-    public void testGetScriptEngineJS() throws Exception {
-        element.setScriptLanguage("JavaScript");
-        String languageName = element.getScriptEngine().getFactory().getLanguageName();
-        assertTrue(languageName.contains("Script"),
-                () -> "getFactory().getLanguageName() should contain Script, got " + languageName);
-    }
-
     @Test
     public void testGetScriptEngineDefault() throws Exception {
         element.setScriptLanguage("");

From 824e1c3008eba5dc85ca28d8959c651388eef1c2 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Thu, 20 Nov 2025 17:16:02 +0300
Subject: [PATCH 0979/1037] chore: bump com.miglayout to 11.4.2

---
 gradle/verification-keyring.keys            | 45 +++++++++++++++++++++
 gradle/verification-metadata.xml            |  1 +
 src/bom-thirdparty/build.gradle.kts         |  4 +-
 src/dist/src/dist/expected_release_jars.csv |  4 +-
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 59307a1ab01..90d623d73ad 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -1604,6 +1604,51 @@ vvzB6IAo6+u3AQDURXWfVKKr73oZFosnOt63VHnW6BV9mMqjj3wenu9FlQ==
 =Kqmv
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    AEF385ED6CA815AE
+uid    Tom Eugelink <tbee@tbee.org>
+
+sub    39F8A1784230E2D9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=AgJT
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    AFBD3AF8EAFA72DA
 uid    Stefan Bodewig <bodewig@apache.org>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 37515ad0fda..cd9371bb776 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -128,6 +128,7 @@
          <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
          <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
+         <trusted-key id="764BE739DDAE10F4473FECF0AEF385ED6CA815AE" group="com.miglayout"/>
          <trusted-key id="7B121B76A7ED6CE6E60AD51784E913A8E3A748C0" group="org.bouncycastle"/>
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
          <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 10ac56b290b..fb4c59294cb 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -55,8 +55,8 @@ dependencies {
         api("com.helger.commons:ph-commons:12.1.0")
         api("com.helger:ph-css:8.1.0")
         api("com.jayway.jsonpath:json-path:2.10.0")
-        api("com.miglayout:miglayout-core:5.3")
-        api("com.miglayout:miglayout-swing:5.3")
+        api("com.miglayout:miglayout-core:11.4.2")
+        api("com.miglayout:miglayout-swing:11.4.2")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.20.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 4ce36f05ec3..e50e7030322 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -107,8 +107,8 @@
 2018265,log4j-core-2.25.2.jar
 30232,log4j-slf4j2-impl-2.25.2.jar
 519087,mail-1.5.0-b01.jar
-106949,miglayout-core-5.3.jar
-22576,miglayout-swing-5.3.jar
+120438,miglayout-core-11.4.2.jar
+23287,miglayout-swing-11.4.2.jar
 29680,mxparser-1.2.2.jar
 99796,neo4j-bolt-connection-10.1.0.jar
 320489,neo4j-bolt-connection-netty-10.1.0.jar

From 920fa60dc2ebd1d8644fc9c09478ca757c9931dc Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 10 Nov 2025 10:10:39 +0300
Subject: [PATCH 0980/1037] chore: replace xmlpull with Woodstox

xmlpull is unsupported, so let's move to a modern library
---
 bin/testfiles/BatchTestLocal.xml              | 980 +++++++++---------
 bin/testfiles/Bug52968.xml                    |  36 +-
 bin/testfiles/HTMLParserTestFile_2.xml        | 120 +--
 gradle/verification-keyring.keys              |  28 +
 gradle/verification-metadata.xml              |  38 +-
 lib/aareadme.txt                              | 280 -----
 src/bom-thirdparty/build.gradle.kts           |   3 +-
 src/core/build.gradle.kts                     |   6 +
 .../org/apache/jmeter/save/SaveService.java   |  60 +-
 .../converters/SampleResultConverter.java     |  14 +-
 .../converters/StringPropertyConverter.java   |   5 +-
 .../org/apache/jmeter/util/JMeterUtils.java   |   6 +-
 .../apache/jmeter/save/JMeterStaxDriver.kt    |  29 +
 .../jmeter/save/XMLOutputFactoryDelegate.kt   | 110 ++
 .../jmeter/save/XMLStreamWriterSkipHeader.kt  |  39 +
 src/dist-check/build.gradle.kts               |   6 +
 .../apache/jmeter/save/TestSaveService.java   | 246 ++---
 src/dist/src/dist/expected_release_jars.csv   |   5 +-
 src/protocol/http/build.gradle.kts            |   1 +
 19 files changed, 975 insertions(+), 1037 deletions(-)
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/save/JMeterStaxDriver.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/save/XMLOutputFactoryDelegate.kt
 create mode 100644 src/core/src/main/kotlin/org/apache/jmeter/save/XMLStreamWriterSkipHeader.kt

diff --git a/bin/testfiles/BatchTestLocal.xml b/bin/testfiles/BatchTestLocal.xml
index 9dc72df5304..c307c944cd8 100644
--- a/bin/testfiles/BatchTestLocal.xml
+++ b/bin/testfiles/BatchTestLocal.xml
@@ -1,782 +1,782 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testResults version="1.2">
 <sample s="true" lb="Setup 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=1 C3=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=2 C3=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=4 C3=4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=5 C3=5" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=2 C3=7" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=3 C3=8" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=5 C3=10" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=1 C3=11" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=3 C3=13" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=4 C3=14" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=1 C3=16" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=2 C3=17" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="If Test C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=4 C3=19" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Loop5 C1=2 C2=5 C3=20" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseData class="java.lang.String"></responseData>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseData class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="1 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="2 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="3 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="0 4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG OO = 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="CSV_VAR=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="CSV_VAR=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 <sample s="true" lb="BSH Counter: 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
-  <samplerData class="java.lang.String">SampleResult.setSampleLabel(&quot;BSH Counter: 1&quot;);</samplerData>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
+  <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 1");</samplerData>
 </sample>
 <sample s="true" lb="BSH Counter: 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
-  <samplerData class="java.lang.String">SampleResult.setSampleLabel(&quot;BSH Counter: 2&quot;);</samplerData>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
+  <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 2");</samplerData>
 </sample>
 <sample s="true" lb="BSH Counter: 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
-  <samplerData class="java.lang.String">SampleResult.setSampleLabel(&quot;BSH Counter: 3&quot;);</samplerData>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
+  <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 3");</samplerData>
 </sample>
 <sample s="true" lb="BSF Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">12*12</samplerData>
 </sample>
 <sample s="true" lb="JSR223 Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">11*11</samplerData>
 </sample>
 <sample s="true" lb="Post 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
 </sample>
 
 </testResults>
diff --git a/bin/testfiles/Bug52968.xml b/bin/testfiles/Bug52968.xml
index 097e304c8b3..4a32d6b13e5 100644
--- a/bin/testfiles/Bug52968.xml
+++ b/bin/testfiles/Bug52968.xml
@@ -10,61 +10,61 @@
 <sample s="true" lb="TC-NOPARENT-1" rc="200" rm="Number of samples in transaction : 1, number of failing samples : 0" dt="" sc="1" ec="0" ng="1" na="1"/>
 <sample s="true" lb="JR-MUSTEXECUTE" rc="" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF-JR0-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING0" rc="" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TNPF-JR0-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING0" rc="" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TNPF-JR0-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING0" rc="" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF-JR0-0" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF-JR1-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING1" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF-JR0-1" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF-JR1-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING1" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF-JR0-2" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF-JR1-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING1" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF2-JR1-0" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF2-JR2-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING2" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF2-JR1-1" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF2-JR2-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING2" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="true" lb="TNPF2-JR1-2" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TNPF2-JR2-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-  <responseData class="java.lang.String"></responseData>
+  <responseData class="java.lang.String"/>
 </sample>
 <sample s="false" lb="TC-NOPARENT-FAILING2" rc="" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
@@ -92,61 +92,61 @@
 <sample s="true" lb="JR-MUSTEXECUTE" rc="" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="false" lb="TPF-JR0-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="false" lb="TPF-JR0-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 1, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="false" lb="TPF-JR0-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TP-JR0-0" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TP-JR1-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TP-JR0-1" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TP-JR1-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING1" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TP-JR0-2" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TP-JR1-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING2" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TPF-JR1-0" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TPF-JR2-0" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING2" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TPF-JR1-1" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TPF-JR2-1" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
 <sample s="false" lb="TC-PARENT-FAILING2" rc="500" rm="Number of samples in transaction : 2, number of failing samples : 1" dt="" sc="1" ec="1" ng="1" na="1">
   <sample s="true" lb="TPF-JR1-2" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
   <sample s="false" lb="TPF-JR2-2" rc="500" rm="" dt="text" sc="1" ec="1" ng="1" na="1">
-    <responseData class="java.lang.String"></responseData>
+    <responseData class="java.lang.String"/>
   </sample>
   <responseData class="java.lang.String">Non-TEXT response data, cannot record: ()</responseData>
 </sample>
diff --git a/bin/testfiles/HTMLParserTestFile_2.xml b/bin/testfiles/HTMLParserTestFile_2.xml
index 36dc54f77f4..e893245e920 100644
--- a/bin/testfiles/HTMLParserTestFile_2.xml
+++ b/bin/testfiles/HTMLParserTestFile_2.xml
@@ -2,110 +2,110 @@
 <testResults version="1.2">
 <httpSample s="true" lb="Download embedded" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="76146" sc="1" ec="0" ng="1" na="1">
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-0" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="40176" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2.html</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="1321" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/style.css</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-2" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="5819" sc="1" ec="0" ng="1" na="1">
     <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-0" rc="200" rm="OK" tn="" dt="text" de="UTF-8" by="398" sc="1" ec="0" ng="0" na="0">
-      <responseHeader class="java.lang.String"></responseHeader>
-      <requestHeader class="java.lang.String"></requestHeader>
-      <responseFile class="java.lang.String"></responseFile>
-      <cookies class="java.lang.String"></cookies>
+      <responseHeader class="java.lang.String"/>
+      <requestHeader class="java.lang.String"/>
+      <responseFile class="java.lang.String"/>
+      <cookies class="java.lang.String"/>
       <method class="java.lang.String">GET</method>
-      <queryString class="java.lang.String"></queryString>
+      <queryString class="java.lang.String"/>
       <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL>
     </httpSample>
     <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="5421" sc="1" ec="0" ng="0" na="0">
-      <responseHeader class="java.lang.String"></responseHeader>
-      <requestHeader class="java.lang.String"></requestHeader>
-      <responseFile class="java.lang.String"></responseFile>
-      <cookies class="java.lang.String"></cookies>
+      <responseHeader class="java.lang.String"/>
+      <requestHeader class="java.lang.String"/>
+      <responseFile class="java.lang.String"/>
+      <cookies class="java.lang.String"/>
       <method class="java.lang.String">GET</method>
-      <queryString class="java.lang.String"></queryString>
+      <queryString class="java.lang.String"/>
       <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner_data/2011-na-234x60.png</java.net.URL>
     </httpSample>
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-3" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="8584" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/jakarta-logo.gif</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-4" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="8886" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/logo.jpg</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-5" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="3064" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/http-config-example.png</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-6" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="2395" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping1.png</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-7" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="2641" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping2.png</java.net.URL>
   </httpSample>
   <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-8" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="3260" sc="1" ec="0" ng="1" na="1">
-    <responseHeader class="java.lang.String"></responseHeader>
-    <requestHeader class="java.lang.String"></requestHeader>
-    <responseFile class="java.lang.String"></responseFile>
-    <cookies class="java.lang.String"></cookies>
+    <responseHeader class="java.lang.String"/>
+    <requestHeader class="java.lang.String"/>
+    <responseFile class="java.lang.String"/>
+    <cookies class="java.lang.String"/>
     <method class="java.lang.String">GET</method>
-    <queryString class="java.lang.String"></queryString>
+    <queryString class="java.lang.String"/>
     <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping3.png</java.net.URL>
   </httpSample>
-  <responseHeader class="java.lang.String"></responseHeader>
-  <requestHeader class="java.lang.String"></requestHeader>
-  <responseFile class="java.lang.String"></responseFile>
-  <cookies class="java.lang.String"></cookies>
+  <responseHeader class="java.lang.String"/>
+  <requestHeader class="java.lang.String"/>
+  <responseFile class="java.lang.String"/>
+  <cookies class="java.lang.String"/>
   <method class="java.lang.String">GET</method>
-  <queryString class="java.lang.String"></queryString>
+  <queryString class="java.lang.String"/>
   <java.net.URL>file:testfiles/HTMLParserTestFile_2.html</java.net.URL>
 </httpSample>
 
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 90d623d73ad..7d1d5a63925 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -6685,6 +6685,34 @@ uAngfd6DOtCKYtNKP7xqDu/2bMU23cxGaRj2ToH4RfCClg1B
 =rv9Q
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    67BF80B10AD53983
+uid    Colm O hEigeartaigh <coheigea@apache.org>
+
+sub    26107AC31C6209E9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBE1T+3UBCAC7mTa5TEQoI1M1oftvc2SSvt1OyzwWkqxP8+uTnz41aGI9t9h8
+WVKtVk331NTMYhdPCRLLEILaaePmCmVbLCBERGkm/L8SFWQKIjpI++AEiuJxvPWQ
+aB+2iA1HC7XA9ItW8082TnE3wz4e59FMgurns6HT9V/NTVlmNJqYEyDnRzwvFW0n
+rVDxIy3PP1QTWcydTWuulOz3J1TMt98jeTznzz6EY0vqM6F7F94o5GTPo4z05iiW
+Nh3OTs7afvB4z2nErvmedIHtbbOMWphLL9nZXfDO/7s/AY7hmXpABcJgX0NdVnD3
+NZ7mBYVnH6SounCOMAV0QuF03c4f50pbXKeNABEBAAG0KUNvbG0gTyBoRWlnZWFy
+dGFpZ2ggPGNvaGVpZ2VhQGFwYWNoZS5vcmc+zsBNBE1T+3UBCADdCjZJEPqzc9nG
+ru9MvRoJr3jqAiLOrfGpQRPKzX2Vzbpdm2loUIjP91iVinG+H48L+D7IaIlO42Iu
+RMX6fms+jDd19D/sWOeNx6dhmKyDUT0/Qs7bpIyE9PBaWs1DHMRfLtBfr4rLObwV
+6IPeODWM3yaMXyVhTf2AyLtWjNhAJoeh7g9ffZ18xdEmMoL0j/qfc87PW1Ts8fpg
+7t9QgzDqjLA3k8NLkPUT4z68ux7sDjM09oBS5O4CrGfY8xJflmpGqZusjA2WIA1G
+zb48KCdz2ljcuji8HNc/PZtTblxiJdB04aGUzK+Ify0fUsEERZWPlQxuAuPHyf/K
+RoXYKE9LABEBAAHCwF8EGAECAAkFAk1T+3UCGwwACgkQZ7+AsQrVOYNd0Af/VOFw
+E0Eo/XaPdposnBF0E0NyOla1XACz/FV66zXYSv6jC5dvyPIe1TzIuTpSm7WPFPYl
+1eIdvDXtfpJ9f9GDp8n4gw7wv9nvYBCiQvl4fmmY9kTfm55LuTUf/lynAVd8EHO3
+d9gVoLKMRhittXX7utyfUjRT2GO0iOIxHoKWmHEfZ7Vm2QIeyNgVQCi6559DTUib
+Jbop7ir7WDLrKgBetgG6zpfiXgOIDlK0dtbkEqyHuGfi9Bis7Y8O4Rnn8jxkhSmC
+1VrA3Xo6NklFA2DKKHNlOcw6tjgkriv99prqvPjzihylO8L/fnoYfgjAHs6vjhtq
+Q2HLF8bidnMgrMeWFA==
+=81ZR
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    689CBE64F4BC997F
 uid    Szczepan Faber <szczepiq@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index cd9371bb776..e142e946cff 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -17,7 +17,8 @@
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah"/>
          <trusted-key id="019082BC00E0324E2AEF4CF00D3B328562A119A7" group="org.openjdk.jmh"/>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
-            <trusting group="com.sun.xml.bind" name="jaxb-bom-ext" version="4.0.6"/>
+            <trusting group="com.sun.xml.bind"/>
+            <trusting group="com.sun.xml.bind.mvn"/>
             <trusting group="org.glassfish.jaxb"/>
          </trusted-key>
          <trusted-key id="050A37A2E0577F4BAA095B52602EC18D20C4661C">
@@ -32,18 +33,18 @@
          <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15" group="org.wiremock"/>
          <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
             <trusting group="commons-collections"/>
-            <trusting group="commons-logging" name="commons-logging" version="1.2"/>
+            <trusting group="commons-logging"/>
          </trusted-key>
-         <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache" name="apache" version="16"/>
+         <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
-         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
+         <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2"/>
          <trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D" group="org.ajoberstar.grgit"/>
          <trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B" group="org.apache.commons"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker"/>
-         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito" name="mockito-bom"/>
+         <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F" group="org.mockito"/>
          <trusted-key id="160A7A9CF46221A56B06AD64461A804F2609FD89" group="com.github.shyiko.klob"/>
          <trusted-key id="184454FAD8697760F3E00D2E4A51A45B944FFD51" group="org.apache.tika"/>
-         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
+         <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C" group="org.eclipse.jetty.toolchain"/>
          <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
@@ -55,7 +56,10 @@
          <trusted-key id="1FCFFE916B6670868FA0EA0391AE1504568EC4DD" group="org.jodd"/>
          <trusted-key id="223D3A74B068ECA354DC385CE126833F9CF64915" group="org.apache.xbean"/>
          <trusted-key id="2655176F748FD83725B4805FF2A01147D830C125" group="org.testcontainers"/>
-         <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
+         <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181">
+            <trusting group="org.codehaus.woodstox"/>
+            <trusting group="^com[.]fasterxml($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="2B1042677FD8190C7B9FC0DC2161D72E7DCD4258" group="^org[.]sonarsource($|([.].*))" regex="true"/>
          <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
          <trusted-key id="2C1708EA05ADF6966C32D6454A1BAC7F1E3B89B3" group="nl.jqno.equalsverifier"/>
@@ -83,7 +87,7 @@
          <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE" group="org.apache.commons"/>
          <trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify"/>
          <trusted-key id="41D266DB4427983A1A4AFB0C3684155E9365C30E" group="com.jayway.jsonpath"/>
-         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
+         <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
          <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.microutils"/>
          <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425">
@@ -113,7 +117,7 @@
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
          <trusted-key id="60ECEF24611FE832714F86AA9D5BEFFA5942C049" group="org.apache.camel"/>
          <trusted-key id="6214760097DC5CFAD0175AC2C9FBAA83A8753994">
-            <trusting group="com.fasterxml" name="oss-parent" version="38"/>
+            <trusting group="com.fasterxml"/>
             <trusting group="org.codehaus.woodstox"/>
          </trusted-key>
          <trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine"/>
@@ -133,7 +137,7 @@
          <trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
          <trusted-key id="7B9751FC3F01F134F476464CD0EB627D4885CED1" group="org.apache.velocity"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
-         <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons" name="commons-parent" version="39"/>
+         <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons"/>
          <trusted-key id="817EA1255546D6070A23AA00DB45D3A62A183CE2" group="com.miglayout"/>
          <trusted-key id="82D8419BA697F0E7FB85916EE91287822FDB81B1" group="org.apache.geronimo.genesis"/>
          <trusted-key id="839323A4780D5BF9A6978970152888E10EF880B3" group="org.unbescape"/>
@@ -148,7 +152,7 @@
          <trusted-key id="98465301A4939C0279F2E847D89D05374952262B" group="org.jetbrains.dokka"/>
          <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="^com[.]github[.]spotbugs($|([.].*))" regex="true"/>
          <trusted-key id="9A4555C237785CA8A6DC1FE58799AF90C06EFBBD" group="org.jdom"/>
-         <trusted-key id="A1483F88BA771993AB609C43590C2310CEE1C9BE" group="jakarta.jms" name="jakarta.jms-api" version="3.1.0"/>
+         <trusted-key id="A1483F88BA771993AB609C43590C2310CEE1C9BE" group="jakarta.jms"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
          <trusted-key id="A48FADE54FA56B93FE66EC17A05EBEE656F3E01B" group="org.apache.geronimo.genesis"/>
          <trusted-key id="A4FD709CC4B0515F2E6AF04E218FA0F6A941A037" group="com.github.kevinstern"/>
@@ -156,7 +160,7 @@
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
          <trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60" group="com.googlecode.concurrent-trees"/>
          <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/>
-         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
+         <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/>
          <trusted-key id="AA782B04ABD9E36CF3096037B59D3D0F9F9C8684" group="org.apache.cxf"/>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/>
          <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt"/>
@@ -185,6 +189,7 @@
          <trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
          <trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="org.apache.commons"/>
          <trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF" group="org.hsqldb"/>
+         <trusted-key id="DB45ECD19B97514F727105AE67BF80B10AD53983" group="org.apache.santuario" name="xmlsec" version="4.0.4"/>
          <trusted-key id="DBD744ACE7ADE6AA50DD591F66B50994442D2D40" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119" group="org.apache-extras.beanshell"/>
          <trusted-key id="E06A36F67D8C1BD13F1F278D0CA7139CBC7026F9" group="dnsjava"/>
@@ -193,7 +198,7 @@
          <trusted-key id="E5138A8E9F2E7E42D38B14D99AEE152CDCCEBFCB" group="io.github.hakky54"/>
          <trusted-key id="E5B8247AF8A619A28F90FDFC9FF25980F5BA7E4F" group="org.fusesource.hawtbuf"/>
          <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist"/>
-         <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3"/>
+         <trusted-key id="E725C3877939E8FFEA7E3C44B6D3FC494798E478" group="com.sun.xml.ws"/>
          <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="com.google.errorprone"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
          <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
@@ -203,7 +208,7 @@
          <trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
-         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146" group="org.apache" name="apache" version="13"/>
+         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146" group="org.apache"/>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
          <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB" group="org.infinispan"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
@@ -349,6 +354,11 @@
             <sha256 value="ce15e856443960ad2c213b99a8e07ef5d40049ff1f3f0eb883848dddce250c13" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.sun.xml.bind.mvn" name="jaxb-parent" version="4.0.6">
+         <artifact name="jaxb-parent-4.0.6.pom">
+            <sha256 value="ce83ef2301bba73fd97db192cff49aa82b2d49a03724ced7c8a66c75a0c597db" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.sun.xml.ws" name="jaxws-ri-bom" version="4.0.3">
          <artifact name="jaxws-ri-bom-4.0.3.pom">
             <pgp value="E725C3877939E8FFEA7E3C44B6D3FC494798E478"/>
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 80c49aa0318..3dc0a5bf844 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -8,283 +8,3 @@ lib/junit - test jar for JUnit sampler
 lib/opt - Directory where Optional 3rd party libraries live
 lib/src - storage area for source and javadoc jars, e.g. for use in IDEs
           Excluded from SVN, not included in classpath
-
-Which jars are used by which modules?
-====================================
-[not exhaustive]
-
-asm-7.1 (org.ow2.asm)
-----------------------
-- JSON Path extractor
-
-accessors-smart-1.2 (net.minidev)
-----------------------
-- JSON Path extractor
-
-bsf-2.4.0.jar (org.apache.bsf)
--------------
-http://jakarta.apache.org/site/downloads/downloads_bsf.cgi
-- BSF test elements (sampler etc.)
-
-bsh-2.0b6.jar (org.bsh)
--------------
-- BeanShell test elements
-
-dec-0.1.2 (org.brotli.dec)
------------------
-https://github.com/google/brotli/tree/master/java/org/brotli
-- Used by HTTP4 HC Impl for brotli decoding
-
-caffeine 2.8.0
------------------
-https://github.com/ben-manes/caffeine/
-- Used by CssParser
-- Used by JMS Publisher Sampler
-
-commons-codec-1.13
------------------
-http://commons.apache.org/downloads/download_codec.cgi
-- Used by ProxyControl and JSR223Test Element for Base64 and md5
-
-commons-collections-3.2.2
--------------------------
-http://commons.apache.org/downloads/download_collections.cgi
-- ListenerNotifier
-- Anakia
-
-commons-io-2.6
---------------
-http://commons.apache.org/downloads/download_io.cgi
-- FTPSampler
-
-commons-jexl-2.1.1, commons-jexl3-3.1
-----------------
-http://commons.apache.org/downloads/download_jexl.cgi
-- Jexl function and BSF test elements
-
-commons-lang-2.6
-----------------
-http://commons.apache.org/downloads/download_lang.cgi
-- velocity (Anakia)
-
-commons-lang3-3.9
-----------------
-http://commons.apache.org/downloads/download_lang.cgi
-- URLCollection (unescapeXml)
-
-commons-math3-3.6.1
------------------
-http://commons.apache.org/proper/commons-math/download_math.cgi
-- BackendListener
-
-commons-net-3.6
------------------
-http://commons.apache.org/downloads/download_net.cgi
-- FTPSampler
-
-commons-pool2-2.7.0
------------------
-http://commons.apache.org/proper/commons-pool/download_pool.cgi
-- BackendListener
-
-darcula
------------------
-https://github.com/bulenkov/Darcula/
-- Look and Feel
-
-dnsjava-2.1.9
------------------
-https://github.com/dnsjava/dnsjava
-- DNSCacheManager
-
-groovy-3.0.3
-----------------------
-Advised scripting language for JSR223 Test Elements
-
-freemarker-2.3.29.jar
-----------------------
-- used by Report/Dashboard feature
-
-javax.activation-api-1.2.0.jar
-----------------------
-- used by SMTP Sampler
-
-javax.activation-1.2.0.jar
-----------------------
-- used by SMTP Sampler
-
-jackson-annotations-2.9.9 (com.fasterxml.jackson)
-----------------------
-
-Used by JsonExporter in report generator (com.fasterxml.jackson)
-----------------------
-jackson-annotations-2.9.9 (https://github.com/FasterXML/jackson-annotations)
-jackson-core-2.9.9 (https://github.com/FasterXML/jackson-core)
-jackson-databind-2.9.9 (https://github.com/FasterXML/jackson-databind)
-
-jCharts-0.7.5 (org.jCharts)
--------------
-http://jcharts.sourceforge.net/downloads.html
-- AxisGraph,LineGraph,LineChart
-
-jdom-1.1.3
---------
-http://www.jdom.org/downloads/index.html
-- Anakia
-
-jodd-core-5.0.13
---------
-http://www.jodd.org/
-- CSS/JQuery like extractor dependency
-
-jodd-lagarto-5.0.6
---------
-http://jodd.org/doc/csselly/
-- CSS/JQuery like extractor
-
-jodd-log-5.0.6
---------
-http://www.jodd.org/
-- CSS/JQuery like extractor dependency
-
-jodd-props-5.0.6
---------
-http://www.jodd.org/
-- used by Report/Dashboard feature properties management
-
-json-path-2.4.0
---------
-https://github.com/jayway/JsonPath
-- JSON Path Extractor
-- JSON Path Renderer
-
-json-smart-2.3 (net.minidev)
---------
-https://github.com/netplex/json-smart-v2
-- JSON Path Extractor
-- JSON Path Renderer
-
-jsoup-1.12.1
---------
-http://www.jsoup.org/
-- CSS/JQuery like extractor
-
-log4j2-2.12.1
---------
-https://logging.apache.org/log4j/2.x/
-- Logging framework
-
-ph-css-6.2.0
---------
-https://github.com/phax/ph-css
-- CssParser
-
-ph-commons-9.3.7
---------
-https://github.com/phax/ph-commons
-- CssParser
-
-rhino-1.7.11
---------
-https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/Download_Rhino
-- javascript function
-- IfController
-- WhileController
-- BSF (Javascript)
-
-jTidy-r938
-----
-- http: various modules for parsing html
-- org.xml.sax - various
-- XPathUtil (XPath assertion)
-
-junit 4.12
------------
-- unit tests, JUnit sampler
-
-HttpComponents
-- HttpComponents Core 4.4.12
-- HttpComponents Client 4.5.10
-- HttpComponents AsyncClient 4.1.4
-- HttpComponents Core NIO 4.4.12
------------
-http://hc.apache.org/
-- httpclient 4 implementation for HTTP sampler
-- httpasyncclient implementation for InfluxDB Backend Listener Client
-
-oro-2.0.8
----------
-http://jakarta.apache.org/site/downloads/downloads_oro.cgi
-- regular expressions: various
-
-rsyntaxtextarea-3.0.4
----------------------
-http://fifesoft.com/rsyntaxtextarea/
-- syntax coloration
-
-serialiser-2.7.1
-----------------
-http://www.apache.org/dyn/closer.cgi/xml/xalan-j
-- xalan
-
-slf4j-api-1.7.28
-----------------
-http://www.slf4j.org/
-- jodd-core
-- json-path
-- jmeter internal logging
-
-tika-1.21
---------------
-http://tika.apache.org/
-- Regular Expression Extractor
-
-commons-dbcp2-2.5.0 (org.apache.commons.dbcp2)
---------------------------
-- DataSourceElement (JDBC)
-
-Saxon-HE-9.9.1-5 (net.sf.saxon)
---------------------------
-- XPath2Extractor (XML)
-
-velocity-1.7
---------------
-http://velocity.apache.org/download.cgi
-- Anakia (create documentation) Not used by JMeter runtime
-
-xalan_2.7.1
------------
-http://www.apache.org/dyn/closer.cgi/xml/xalan-j
-+org.apache.xalan|xml|xpath
-
-xml-apis-1.4.01
---------------
-http://xerces.apache.org/xerces2-j/download.cgi
-+javax.xml
-+org.w3c.dom
-+org.xml.sax
-
-The x* jars above are used for XML handling
-
-xmlgraphics-commons-2.6 (org.apache.xmlgraphics.image.codec)
-------------------
-http://xmlgraphics.apache.org/commons/download.html
-- SaveGraphicsService
-
-xmlpull-1.1.3.1
----------------
-http://www.xmlpull.org/impls.shtml
-- xstream
-
-
-xpp3_min-1.1.4c
----------------
-http://x-stream.github.io/download.html
-or
-http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
-- xstream
-
-xstream-1.4.11
--------------
-http://x-stream.github.io/download.html
-- SaveService
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index fb4c59294cb..e3d88db3a14 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
         api("com.google.errorprone:error_prone_annotations:2.44.0")
         api("com.helger.commons:ph-commons:12.1.0")
         api("com.helger:ph-css:8.1.0")
+        api("com.fasterxml.woodstox:woodstox-core:7.1.0")
         api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:11.4.2")
         api("com.miglayout:miglayout-swing:11.4.2")
@@ -126,6 +127,7 @@ dependencies {
         api("org.bouncycastle:bcprov-jdk18on:1.82")
         api("org.brotli:dec:0.1.2")
         api("org.freemarker:freemarker:2.3.34")
+        api("org.glassfish.jaxb:txw2:4.0.6")
         api("org.jdom:jdom:1.1.3")
         api("org.jetbrains.lets-plot:lets-plot-batik:4.8.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.11.2")
@@ -144,6 +146,5 @@ dependencies {
         api("xalan:serializer:2.7.3")
         api("xalan:xalan:2.7.3")
         api("xml-apis:xml-apis:1.4.01")
-        api("xmlpull:xmlpull:1.1.3.1")
     }
 }
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index ca9597a8645..30be9b34c99 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -40,6 +40,8 @@ dependencies {
     }
     api("com.thoughtworks.xstream:xstream") {
         because("XStream in used in public API")
+        // We use StaXDriver, so we exclude xmlpull, see https://x-stream.github.io/download.html#optional-deps
+        exclude("io.github.x-stream", "mxparser")
     }
     api("org.apache.logging.log4j:log4j-1.2-api")
     api("org.apache.logging.log4j:log4j-api")
@@ -80,6 +82,10 @@ dependencies {
         }
     }
 
+    implementation("org.glassfish.jaxb:txw2") {
+        because("IndentingXMLStreamWriter is needed to indent the generated XML")
+    }
+    implementation("com.fasterxml.woodstox:woodstox-core")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing")
     implementation("com.fasterxml.jackson.core:jackson-annotations")
diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
index 5a41d6ea0f3..86c16fc626d 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java
@@ -56,7 +56,8 @@
 import com.thoughtworks.xstream.converters.DataHolder;
 import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
 import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.io.xml.XppDriver;
+import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.mapper.CannotResolveClassException;
 import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
@@ -78,8 +79,8 @@ public class SaveService {
     public static final String TEST_CLASS_NAME = "TestClassName"; // $NON-NLS-1$
 
     private static final class XStreamWrapper extends XStream {
-        private XStreamWrapper(ReflectionProvider reflectionProvider) {
-            super(reflectionProvider);
+        private XStreamWrapper(ReflectionProvider reflectionProvider, HierarchicalStreamDriver hierarchicalStreamDriver) {
+            super(reflectionProvider, hierarchicalStreamDriver);
         }
 
         // Override wrapMapper in order to insert the Wrapper in the chain
@@ -110,17 +111,16 @@ public String serializedClass(@SuppressWarnings("rawtypes") // superclass does n
         }
     }
 
-    private static final XStream JMXSAVER = new XStreamWrapper(new PureJavaReflectionProvider());
-    private static final XStream JTLSAVER = new XStreamWrapper(new PureJavaReflectionProvider());
+    private static final JMeterStaxDriver STAXDRIVER_WITH_HEADER = new JMeterStaxDriver();
+    private static final JMeterStaxDriver STAXDRIVER_SKIP_HEADER = new JMeterStaxDriver(false, true);
+    private static final XStream JMXSAVER = new XStreamWrapper(new PureJavaReflectionProvider(), STAXDRIVER_WITH_HEADER);
+    private static final XStream JTLSAVER = new XStreamWrapper(new PureJavaReflectionProvider(), STAXDRIVER_WITH_HEADER);
     static {
         JTLSAVER.setMode(XStream.NO_REFERENCES); // This is needed to stop XStream keeping copies of each class
         JMeterUtils.setupXStreamSecurityPolicy(JMXSAVER);
         JMeterUtils.setupXStreamSecurityPolicy(JTLSAVER);
     }
 
-    // The XML header, with placeholder for encoding, since that is controlled by property
-    private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"<ph>\"?>"; // $NON-NLS-1$
-
     // Default file name
     private static final String SAVESERVICE_PROPERTIES_FILE = "saveservice.properties"; // $NON-NLS-1$
 
@@ -299,25 +299,31 @@ public static String classToAlias(String s){
 
     // Called by Save function
     public static void saveTree(HashTree tree, OutputStream out) throws IOException {
-        // Get the OutputWriter to use
-        OutputStreamWriter outputStreamWriter = getOutputStreamWriter(out);
-        writeXmlHeader(outputStreamWriter);
-        // Use deprecated method, to avoid duplicating code
         ScriptWrapper wrapper = new ScriptWrapper();
         wrapper.testPlan = tree;
-        JMXSAVER.toXML(wrapper, outputStreamWriter);
-        outputStreamWriter.write('\n');// Ensure terminated properly
-        outputStreamWriter.close();
+
+        if (fileEncoding == null || fileEncoding.isEmpty()) {
+            JMXSAVER.toXML(wrapper, out);
+        } else {
+            // Get the OutputWriter to use
+            try (OutputStreamWriter outputStreamWriter = getOutputStreamWriter(out)) {
+                // Use deprecated method, to avoid duplicating code
+                JMXSAVER.toXML(wrapper, outputStreamWriter);
+                outputStreamWriter.write('\n');// Ensure terminated properly
+            }
+        }
     }
 
     // Used by Test code
     public static void saveElement(Object el, OutputStream out) throws IOException {
         // Get the OutputWriter to use
-        OutputStreamWriter outputStreamWriter = getOutputStreamWriter(out);
-        writeXmlHeader(outputStreamWriter);
-        // Use deprecated method, to avoid duplicating code
-        JMXSAVER.toXML(el, outputStreamWriter);
-        outputStreamWriter.close();
+        if (fileEncoding == null || fileEncoding.isEmpty()) {
+            JMXSAVER.toXML(el, out);
+        } else {
+            try (OutputStreamWriter outputStreamWriter = getOutputStreamWriter(out)) {
+                JMXSAVER.toXML(el, outputStreamWriter);
+            }
+        }
     }
 
     // Used by Test code
@@ -344,7 +350,7 @@ public static synchronized void saveSampleResult(SampleEvent evt, Writer writer)
         // This is effectively the same as saver.toXML(Object, Writer) except we get to provide the DataHolder
         // Don't know why there is no method for this in the XStream class
         try {
-            JTLSAVER.marshal(evt.getResult(), new XppDriver().createWriter(writer), dh);
+            JTLSAVER.marshal(evt.getResult(), STAXDRIVER_SKIP_HEADER.createWriter(writer), dh);
         } catch(RuntimeException e) {
             throw new IllegalArgumentException("Failed marshalling:"+(evt.getResult() != null ? showDebuggingInfo(evt.getResult()) : "null"), e);
         }
@@ -411,7 +417,7 @@ public static void loadTestResults(InputStream reader, ResultCollectorHelper res
         dh.put(RESULTCOLLECTOR_HELPER_OBJECT, resultCollectorHelper); // Allow TestResultWrapper to feed back the samples
         // This is effectively the same as saver.fromXML(InputStream) except we get to provide the DataHolder
         // Don't know why there is no method for this in the XStream class
-        JTLSAVER.unmarshal(new XppDriver().createReader(reader), null, dh);
+        JTLSAVER.unmarshal(STAXDRIVER_SKIP_HEADER.createReader(reader), null, dh);
         inputStreamReader.close();
     }
 
@@ -504,16 +510,6 @@ private static Charset getFileEncodingCharset() {
         }
     }
 
-    private static void writeXmlHeader(OutputStreamWriter writer) throws IOException {
-        // Write XML header if we have the charset to use for encoding
-        Charset charset = getFileEncodingCharset();
-        // We do not use getEncoding method of Writer, since that returns
-        // the historical name
-        String header = XML_HEADER.replaceAll("<ph>", charset.name());
-        writer.write(header);
-        writer.write('\n');
-    }
-
 //  Normal output
 //  ---- Debugging information ----
 //  required-type       : org.apache.jorphan.collections.ListedHashTree
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
index cbbc3887b4a..9ff73f4c8c3 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
@@ -165,7 +165,10 @@ protected void saveResponseData(HierarchicalStreamWriter writer, MarshallingCont
             writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
             try {
                 if (SampleResult.TEXT.equals(res.getDataType())){
-                    writer.setValue(new String(res.getResponseData(), res.getDataEncodingWithDefault()));
+                    byte[] responseData = res.getResponseData();
+                    if (responseData != null && responseData.length > 0) {
+                        writer.setValue(new String(responseData, res.getDataEncodingWithDefault()));
+                    }
                 } else {
                     writer.setValue("Non-TEXT response data, cannot record: (" + res.getDataType() + ")");
                 }
@@ -176,10 +179,7 @@ protected void saveResponseData(HierarchicalStreamWriter writer, MarshallingCont
             writer.endNode();
         }
         if (save.saveFileName()){
-            writer.startNode(TAG_RESPONSE_FILE);
-            writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
-            writer.setValue(res.getResultFileName());
-            writer.endNode();
+            writeString(writer, TAG_RESPONSE_FILE, res.getResultFileName());
         }
     }
 
@@ -356,7 +356,9 @@ protected void writeString(HierarchicalStreamWriter writer, String tag, String v
         if (value != null) {
             writer.startNode(tag);
             writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
-            writer.setValue(value);
+            if (!value.isEmpty()) {
+                writer.setValue(value);
+            }
             writer.endNode();
         }
     }
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java
index aafbebdf8af..2ff4059a723 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java
@@ -48,7 +48,10 @@ public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // supercl
     public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
         StringProperty prop = (StringProperty) obj;
         writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
-        writer.setValue(ConversionHelp.encode(prop.getStringValue()));
+        String encoded = ConversionHelp.encode(prop.getStringValue());
+        if (encoded != null && !encoded.isEmpty()) {
+            writer.setValue(encoded);
+        }
     }
 
     /** {@inheritDoc} */
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 816f2553f70..2a7c5b9c990 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -59,6 +59,7 @@
 import javax.swing.SwingUtilities;
 
 import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.save.JMeterStaxDriver;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.gui.JFactory;
 import org.apache.jorphan.gui.JMeterUIDefaults;
@@ -81,6 +82,7 @@
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import com.thoughtworks.xstream.security.NoTypePermission;
 
@@ -1416,8 +1418,8 @@ public static String formatJMeterExportedVariableName(String elementName) {
     /**
      * @return {@link XStream} XStream instance following JMeter security policy
      */
-    public static final XStream createXStream() {
-        XStream xstream = new XStream(new PureJavaReflectionProvider());
+    public static XStream createXStream() {
+        XStream xstream = new XStream(new PureJavaReflectionProvider(), new JMeterStaxDriver());
         JMeterUtils.setupXStreamSecurityPolicy(xstream);
         return xstream;
     }
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/save/JMeterStaxDriver.kt b/src/core/src/main/kotlin/org/apache/jmeter/save/JMeterStaxDriver.kt
new file mode 100644
index 00000000000..fef5c9383a8
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/save/JMeterStaxDriver.kt
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.save
+
+import com.thoughtworks.xstream.io.xml.StaxDriver
+import javax.xml.stream.XMLOutputFactory
+
+public class JMeterStaxDriver(
+    public val xmlHeader: Boolean = true,
+    public val indent: Boolean = true,
+) : StaxDriver() {
+    override fun createOutputFactory(): XMLOutputFactory =
+        XMLOutputFactoryDelegate(super.createOutputFactory(), xmlHeader = xmlHeader, indent = indent)
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/save/XMLOutputFactoryDelegate.kt b/src/core/src/main/kotlin/org/apache/jmeter/save/XMLOutputFactoryDelegate.kt
new file mode 100644
index 00000000000..d2283a47cc3
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/save/XMLOutputFactoryDelegate.kt
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.save
+
+import com.sun.xml.txw2.output.IndentingXMLStreamWriter
+import java.io.OutputStream
+import java.io.Writer
+import javax.xml.stream.XMLEventWriter
+import javax.xml.stream.XMLOutputFactory
+import javax.xml.stream.XMLStreamWriter
+import javax.xml.transform.Result
+
+/**
+ * A custom implementation of `XMLOutputFactory` that delegates operations to another `XMLOutputFactory`
+ * with additional configurations such as optional XML header skipping and indentation.
+ *
+ * This class enhances the behavior of the specified `XMLOutputFactory` by allowing the output
+ * to be customized based on the provided configuration (e.g., whether to include the XML declaration header
+ * or enable indentation for formatted output).
+ *
+ * @constructor Creates an instance of `XMLOutputFactoryDelegate`.
+ * @param delegate The underlying `XMLOutputFactory` to which most operations are delegated.
+ * @param xmlHeader A flag indicating whether to include the XML declaration header in the output.
+ * @param indent A flag indicating whether to enable formatted (indented) output.
+ */
+public class XMLOutputFactoryDelegate(
+    private val delegate: XMLOutputFactory,
+    private val xmlHeader: Boolean,
+    private val indent: Boolean
+) : XMLOutputFactory() {
+    // Methods that wrap with XMLStreamWriterSkipHeader
+
+    private fun XMLStreamWriter.applyXmlStreamWriterConfiguration(): XMLStreamWriter {
+        var result = this
+        if (indent) {
+            result = IndentingXMLStreamWriter(this)
+        }
+        if (!xmlHeader) {
+            result = XMLStreamWriterSkipHeader(result)
+        }
+        return result
+    }
+
+    override fun createXMLStreamWriter(stream: Writer): XMLStreamWriter {
+        return delegate.createXMLStreamWriter(stream).applyXmlStreamWriterConfiguration()
+    }
+
+    override fun createXMLStreamWriter(stream: OutputStream): XMLStreamWriter {
+        return delegate.createXMLStreamWriter(stream).applyXmlStreamWriterConfiguration()
+    }
+
+    override fun createXMLStreamWriter(
+        stream: OutputStream,
+        encoding: String?
+    ): XMLStreamWriter {
+        return delegate.createXMLStreamWriter(stream, encoding).applyXmlStreamWriterConfiguration()
+    }
+
+    override fun createXMLStreamWriter(result: Result): XMLStreamWriter {
+        return delegate.createXMLStreamWriter(result).applyXmlStreamWriterConfiguration()
+    }
+
+    // Pure delegate methods below
+
+    override fun createXMLEventWriter(result: Result): XMLEventWriter {
+        return delegate.createXMLEventWriter(result)
+    }
+
+    override fun createXMLEventWriter(stream: OutputStream): XMLEventWriter {
+        return delegate.createXMLEventWriter(stream)
+    }
+
+    override fun createXMLEventWriter(
+        stream: OutputStream,
+        encoding: String?
+    ): XMLEventWriter {
+        return delegate.createXMLEventWriter(stream, encoding)
+    }
+
+    override fun createXMLEventWriter(stream: Writer): XMLEventWriter {
+        return delegate.createXMLEventWriter(stream)
+    }
+
+    override fun setProperty(name: String, value: Any?) {
+        return delegate.setProperty(name, value)
+    }
+
+    override fun getProperty(name: String): Any {
+        return delegate.getProperty(name)
+    }
+
+    override fun isPropertySupported(name: String): Boolean {
+        return delegate.isPropertySupported(name)
+    }
+}
diff --git a/src/core/src/main/kotlin/org/apache/jmeter/save/XMLStreamWriterSkipHeader.kt b/src/core/src/main/kotlin/org/apache/jmeter/save/XMLStreamWriterSkipHeader.kt
new file mode 100644
index 00000000000..ec91f003eef
--- /dev/null
+++ b/src/core/src/main/kotlin/org/apache/jmeter/save/XMLStreamWriterSkipHeader.kt
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.save
+
+import javax.xml.stream.XMLStreamWriter
+
+/**
+ * A custom implementation of `XMLStreamWriter` that skips writing the XML declaration header.
+ *
+ * @constructor Creates an instance of `XMLStreamWriterSkipHeader` that wraps the given [delegate] XMLStreamWriter.
+ * @param delegate The underlying `XMLStreamWriter` to which operations, except writing the XML header, are delegated.
+ */
+public class XMLStreamWriterSkipHeader(
+    private val delegate: XMLStreamWriter
+) : XMLStreamWriter by delegate {
+    override fun writeStartDocument() {
+    }
+
+    override fun writeStartDocument(version: String?) {
+    }
+
+    override fun writeStartDocument(encoding: String?, version: String?) {
+    }
+}
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index adbbd9faf6c..c83b94cf7ad 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -38,6 +38,12 @@ dependencies {
     testImplementation("com.fasterxml.jackson.core:jackson-databind") {
         because("It is used in ReportGeneratorSpec and HtmlReportGeneratorSpec")
     }
+    testImplementation("org.apache.santuario:xmlsec:4.0.4") {
+        because("XML canonicalization for comparing XML in tests")
+    }
+    testImplementation("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r") {
+        because("Histogram diff for readable XML comparison output in tests")
+    }
 
     extraTestDependencies(platform(projects.src.bomThirdparty))
     extraTestDependencies(platform(projects.src.bomTesting))
diff --git a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
index 58f88664558..97ced70855e 100644
--- a/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
+++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
@@ -22,23 +22,29 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
+import org.apache.xml.security.Init;
+import org.apache.xml.security.c14n.Canonicalizer;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.EditList;
+import org.eclipse.jgit.diff.HistogramDiff;
+import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.diff.RawTextComparator;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.FieldSource;
 
 public class TestSaveService extends JMeterTestCase {
 
@@ -83,6 +89,10 @@ public class TestSaveService extends JMeterTestCase {
 
     private static final boolean saveOut = JMeterUtils.getPropDefault("testsaveservice.saveout", false);
 
+    @BeforeAll
+    static void initXmlSecurity() {
+        Init.init();
+    }
 
     @Test
     public void testPROPVERSION() {
@@ -93,120 +103,66 @@ public void testPROPVERSION() {
         );
     }
 
-    @Test
-    public void testLoadAndSave() throws Exception {
-        boolean failed = false; // Did a test fail?
-
-        for (final String fileName : FILES) {
-            final File testFile = findTestFile("testfiles/" + fileName);
-            final File savedFile = findTestFile("testfiles/Saved" + fileName);
-            failed |= loadAndSave(testFile, fileName, true, savedFile);
-        }
-        for (final String fileName : FILES_LINES) {
-            final File testFile = findTestFile("testfiles/" + fileName);
-            final File savedFile = findTestFile("testfiles/Saved" + fileName);
-            failed |= loadAndSave(testFile, fileName, false, savedFile);
-        }
-        if (failed) // TODO make these separate tests?
-        {
-            fail("One or more failures detected");
-        }
-    }
-
-    private static boolean loadAndSave(File testFile, String fileName, boolean checkSize, File savedFile) throws Exception {
-
-        boolean failed = false;
-
-        final FileStats origStats = getFileStats(testFile);
-        final FileStats savedStats = getFileStats(savedFile);
-
+    @ParameterizedTest
+    @FieldSource({"FILES", "FILES_LINES"})
+    void loadAndSave(String fileName) throws Exception {
+        File testFile = findTestFile("testfiles/" + fileName);
         ByteArrayOutputStream out = new ByteArrayOutputStream(Math.toIntExact(testFile.length()));
-        try {
+        try (out) {
             HashTree tree = SaveService.loadTree(testFile);
             SaveService.saveTree(tree, out);
-        } finally {
-            out.close(); // Make sure all the data is flushed out
         }
+        byte[] resavedXml = out.toByteArray();
+        // Make sure all the data is flushed out
+
+        // Compare XML content using normalized form for better diff output
+        Path testFilePath = testFile.toPath();
+        Path expectedOutput = testFilePath.resolveSibling(testFilePath.getFileName().toString().replace(".jmx", ".expected.jmx"));
+        Path expectedFilePath = Files.exists(expectedOutput) ? expectedOutput : testFilePath;
+
+        String expectedXml = normalizeXml(
+                Files.readAllBytes(
+                        expectedFilePath
+                )
+        );
+        String actualXml = normalizeXml(resavedXml);
 
-        final FileStats compareStats = savedStats == FileStats.NO_STATS ? origStats : savedStats;
-
-        final FileStats outputStats;
-        try (ByteArrayInputStream ins = new ByteArrayInputStream(out.toByteArray());
-             Reader insReader = new InputStreamReader(ins, Charset.defaultCharset());
-             BufferedReader bufferedReader = new BufferedReader(insReader)) {
-            outputStats = computeFileStats(bufferedReader);
-        }
-        // We only check the length of the result. Comparing the
-        // actual result (out.toByteArray==original) will usually
-        // fail, because the order of the properties within each
-        // test element may change. Comparing the lengths should be
-        // enough to detect most problem cases...
-        if (checkSize && !compareStats.isSameSize(outputStats) || !compareStats.hasSameLinesCount(outputStats)) {
-            failed = true;
-            System.out.println();
-            System.out.println("Loading file testfiles/" + fileName + " and "
-                    + "saving it back changes its size from " + compareStats.size + " to " + outputStats.size + ".");
-            if (!origStats.hasSameLinesCount(outputStats)) {
-                System.out.println("Number of lines changes from " + compareStats.lines + " to " + outputStats.lines);
-            }
-            if (saveOut) {
-                final File outFile = findTestFile("testfiles/" + fileName + ".out");
-                System.out.println("Write " + outFile);
-                try (FileOutputStream outf = new FileOutputStream(outFile)) {
-                    outf.write(out.toByteArray());
-                }
-                System.out.println("Wrote " + outFile);
+        if (saveOut) {
+            if (!expectedXml.equals(actualXml)) {
+                Files.write(expectedOutput, resavedXml);
             }
+            return;
         }
-
-        // Note this test will fail if a property is added or
-        // removed to any of the components used in the test
-        // files. The way to solve this is to appropriately change
-        // the test file.
-        return failed;
-    }
-
-    private static FileStats getFileStats(File testFile) throws IOException,
-            FileNotFoundException {
-        if (testFile == null || !testFile.exists()) {
-            return FileStats.NO_STATS;
-        }
-        try (FileInputStream fis = new FileInputStream(testFile);
-             InputStreamReader fileReader = new InputStreamReader(fis, Charset.defaultCharset());
-                BufferedReader bufferedReader = new BufferedReader(fileReader)) {
-            return computeFileStats(bufferedReader);
-        }
-    }
-
-    /**
-     * Calculate size and line count ignoring EOL and
-     * "jmeterTestPlan" element which may vary because of
-     * different attributes/attribute lengths.
-     */
-    private static FileStats computeFileStats(BufferedReader br) throws IOException {
-        int length = 0;
-        int lines = 0;
-        String line;
-        while ((line = br.readLine()) != null) {
-            lines++;
-            if (!line.startsWith("<jmeterTestPlan")) {
-                length += line.length();
-            }
-        }
-        return new FileStats(length, lines);
+        assertEquals(
+                expectedXml,
+                actualXml,
+                () -> {
+                    String diff = computeHistogramDiff(expectedXml, actualXml);
+                    StringBuilder message = new StringBuilder();
+                    message.append("JMX file should be the same after load and save. ");
+                    message.append("Comparing with ").append(expectedFilePath).append(". ");
+                    message.append(" (diff is ").append(diff.length()).append(" chars, ")
+                            .append(Math.round(diff.length() * 100.0 / expectedXml.length())).append("% of original)");
+
+                    // Omit diff it is too large
+                    if (diff.length() < expectedXml.length() * 0.8) {
+                        message.append("\nDiff:\n").append(diff);
+                    }
+                    return message.toString();
+                }
+        );
     }
 
-    @Test
-    public void testLoad() throws Exception {
-        for (String fileName : FILES_LOAD_ONLY) {
-            File file = findTestFile("testfiles/" + fileName);
-            try {
-                HashTree tree = SaveService.loadTree(file);
-                assertNotNull(tree);
-            } catch (IllegalArgumentException ex) {
-                ex.addSuppressed(new Throwable("fileName=" + file.getAbsolutePath()));
-                throw ex;
-            }
+    @ParameterizedTest
+    @FieldSource("FILES_LOAD_ONLY")
+    public void testLoad(String fileName) throws Exception {
+        File file = findTestFile("testfiles/" + fileName);
+        try {
+            HashTree tree = SaveService.loadTree(file);
+            assertNotNull(tree);
+        } catch (IllegalArgumentException ex) {
+            ex.addSuppressed(new Throwable("fileName=" + file.getAbsolutePath()));
+            throw ex;
         }
     }
 
@@ -218,29 +174,57 @@ public void testClasses(){
         }
     }
 
-    private static class FileStats {
-        int size;
-        int lines;
+    /**
+     * Pattern to match the jmeterTestPlan root element with all its attributes.
+     * These attributes (jmeter version, properties version) change between JMeter versions
+     * and should be ignored when comparing XML content.
+     */
+    private static final Pattern JMETER_TEST_PLAN_PATTERN = Pattern.compile(
+            "<jmeterTestPlan[^>]*>"
+    );
 
-        final static FileStats NO_STATS = new FileStats(-1, -1);
+    /**
+     * Normalizes XML for comparison using W3C Canonical XML (C14N).
+     * This sorts attributes alphabetically and normalizes whitespace.
+     * Also normalizes the jmeterTestPlan root element to ignore version differences.
+     */
+    private static String normalizeXml(byte[] xmlBytes) throws Exception {
+        Canonicalizer c14n = Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        c14n.canonicalize(xmlBytes, out, true);
 
-        public FileStats(int size, int lines) {
-            this.size = size;
-            this.lines = lines;
-        }
+        // Normalize the jmeterTestPlan element to ignore version-specific attributes
+        String xml = out.toString(StandardCharsets.UTF_8);
+        xml = JMETER_TEST_PLAN_PATTERN.matcher(xml).replaceFirst("<jmeterTestPlan>");
 
-        public boolean isSameSize(FileStats other) {
-            if (other == null) {
-                return false;
-            }
-            return size == other.size;
-        }
+        return xml;
+    }
+
+
+    private static String computeHistogramDiff(String expected, String actual) {
+        return computeHistogramDiff(
+                expected.getBytes(StandardCharsets.UTF_8),
+                actual.getBytes(StandardCharsets.UTF_8)
+        );
+    }
+
+    /**
+     * Computes a histogram diff between expected and actual text, similar to git diff.
+     */
+    private static String computeHistogramDiff(byte[] expected, byte[] actual) {
+        try {
+            RawText expectedText = new RawText(expected);
+            RawText actualText = new RawText(actual);
+
+            EditList edits = new HistogramDiff().diff(RawTextComparator.DEFAULT, expectedText, actualText);
 
-        public boolean hasSameLinesCount(FileStats other) {
-            if (other == null) {
-                return false;
+            ByteArrayOutputStream diffOutput = new ByteArrayOutputStream();
+            try (DiffFormatter formatter = new DiffFormatter(diffOutput)) {
+                formatter.format(edits, expectedText, actualText);
             }
-            return lines == other.lines;
+            return diffOutput.toString(StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            return "Failed to compute diff: " + e.getMessage();
         }
     }
 }
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index e50e7030322..931e086ec42 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -109,7 +109,6 @@
 519087,mail-1.5.0-b01.jar
 120438,miglayout-core-11.4.2.jar
 23287,miglayout-swing-11.4.2.jar
-29680,mxparser-1.2.2.jar
 99796,neo4j-bolt-connection-10.1.0.jar
 320489,neo4j-bolt-connection-netty-10.1.0.jar
 27442,neo4j-bolt-connection-pooled-10.1.0.jar
@@ -149,15 +148,17 @@
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 69908,slf4j-api-2.0.17.jar
+195922,stax2-api-4.2.2.jar
 10192,swing-extensions-laf-support-0.1.3.jar
 2539,swing-extensions-visual-padding-0.1.3.jar
 778543,tika-core-3.2.3.jar
+73265,txw2-4.0.6.jar
 173935,unbescape-1.1.6.RELEASE.jar
+1608803,woodstox-core-7.1.0.jar
 3455761,xalan-2.7.3.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar
 686441,xmlgraphics-commons-2.11.jar
-7188,xmlpull-1.1.3.1.jar
 1033122,xmlresolver-5.3.3-data.jar
 167889,xmlresolver-5.3.3.jar
 646504,xstream-1.4.21.jar
diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts
index 20961567e4a..af6b3482f5d 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
 
     api("com.thoughtworks.xstream:xstream") {
         because("HTTPResultConverter uses XStream in public API")
+        exclude("io.github.x-stream", "mxparser")
     }
 
     compileOnly("javax.activation:javax.activation-api") {

From 5fefa6ee6433aa95b6f4fda90e75c676411be16d Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 21 Nov 2025 20:11:00 +0300
Subject: [PATCH 0981/1037] feat: fallback to English locale when loading test
 plan with string value in enum property

Previously only the current locale was considered, and now we fallback to English.

It helps for cases like loading sample test plans (saved years ago) when
JMeter runs with non-English locale.
---
 .../org/apache/jmeter/config/CSVDataSet.java  |  41 ++-----
 .../jmeter/config/CSVDataSetBeanInfo.java     |  24 +++-
 .../timers/ConstantThroughputTimer.java       |  34 +-----
 src/core/build.gradle.kts                     |   1 +
 .../testbeans/gui/ComboStringEditor.java      |  10 +-
 .../jmeter/testbeans/gui/EnumEditor.java      |  66 +++++++----
 .../gui/GenericTestBeanCustomizer.java        | 109 ++++++++++++++++++
 .../org/apache/jorphan/util/EnumUtils.kt      |  72 ++++++++++++
 8 files changed, 267 insertions(+), 90 deletions(-)
 create mode 100644 src/jorphan/src/main/kotlin/org/apache/jorphan/util/EnumUtils.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index ee3bf0f010a..d641edc2e8e 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -17,11 +17,7 @@
 
 package org.apache.jmeter.config;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
 import java.io.IOException;
-import java.util.ResourceBundle;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
@@ -121,38 +117,15 @@ private Object readResolve(){
      */
     @Override
     public void setProperty(JMeterProperty property) {
-        if (!(property instanceof StringProperty stringProperty)) {
-            super.setProperty(property);
-            return;
-        }
-
-        final String propName = property.getName();
-        if (!"shareMode".equals(propName)) {
-            super.setProperty(property);
-            return;
-        }
-
-        final String propValue = property.getStringValue();
-        if (propValue.contains(" ")) { // variables are unlikely to contain spaces, so most likely a translation
-            try {
-                final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass());
-                final ResourceBundle rb = (ResourceBundle) beanInfo.getBeanDescriptor().getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE);
-                for (String resKey : CSVDataSetBeanInfo.getShareTags()) {
-                    if (propValue.equals(rb.getString(resKey))) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("Converted {}={} to {} using Locale: {}", propName, propValue, resKey, rb.getLocale());
-                        }
-                        stringProperty.setValue(resKey); // reset the value
-                        super.setProperty(property);
-                        return;
-                    }
-                }
-                // This could perhaps be a variable name
-                log.warn("Could not translate {}={} using Locale: {}", propName, propValue, rb.getLocale());
-            } catch (IntrospectionException e) {
-                log.error("Could not find BeanInfo; cannot translate shareMode entries", e);
+        String propName = property.getName();
+        if ("shareMode".equals(propName)) {
+            String enumLabel = GenericTestBeanCustomizer.normalizeEnumStringValue(getClass(), CSVDataSetBeanInfo.ShareMode.class, property);
+            if (enumLabel != null && (!(property instanceof StringProperty) || !enumLabel.equals(property.getStringValue()))) {
+                super.setProperty(propName, enumLabel);
+                return;
             }
         }
+
         super.setProperty(property);
     }
 
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
index 5393963da78..cdd0dccc049 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
@@ -40,6 +40,22 @@ public class CSVDataSetBeanInfo extends BeanInfoSupport {
     private static final String SHAREMODE = "shareMode";             //$NON-NLS-1$
 
     // Access needed from CSVDataSet
+    enum ShareMode {
+        ALL("shareMode.all"),
+        GROUP("shareMode.group"),
+        THREAD("shareMode.thread");
+
+        private final String value;
+
+        ShareMode(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
     private static final String[] SHARE_TAGS = new String[3];
     static final int SHARE_ALL    = 0;
     static final int SHARE_GROUP  = 1;
@@ -47,9 +63,11 @@ public class CSVDataSetBeanInfo extends BeanInfoSupport {
 
     // Store the resource keys
     static {
-        SHARE_TAGS[SHARE_ALL]    = "shareMode.all"; //$NON-NLS-1$
-        SHARE_TAGS[SHARE_GROUP]  = "shareMode.group"; //$NON-NLS-1$
-        SHARE_TAGS[SHARE_THREAD] = "shareMode.thread"; //$NON-NLS-1$
+        for (ShareMode value : ShareMode.values()) {
+            @SuppressWarnings("EnumOrdinal")
+            int index = value.ordinal();
+            SHARE_TAGS[index] = value.toString();
+        }
     }
 
     public CSVDataSetBeanInfo() {
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 9dc8d0baee0..2834eebc46e 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -17,10 +17,6 @@
 
 package org.apache.jmeter.timers;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
@@ -38,8 +34,6 @@
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.IdentityKey;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class implements a constant throughput timer. A Constant Throughput
@@ -59,7 +53,6 @@ private static class ThroughputInfo{
         final Object MUTEX = new Object();
         long lastScheduledTime = 0;
     }
-    private static final Logger log = LoggerFactory.getLogger(ConstantThroughputTimer.class);
     private static final AtomicLong PREV_TEST_STARTED = new AtomicLong(0L);
 
     private static final double MILLISEC_PER_MIN = 60000.0;
@@ -271,27 +264,12 @@ public String toString() {
     @Override
     @SuppressWarnings("EnumOrdinal")
     public void setProperty(JMeterProperty property) {
-        if (property instanceof StringProperty) {
-            final String pn = property.getName();
-            if (pn.equals("calcMode")) {
-                final Object objectValue = property.getObjectValue();
-                try {
-                    final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass());
-                    final ResourceBundle rb = (ResourceBundle) beanInfo.getBeanDescriptor().getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE);
-                    for(Enum<Mode> e : Mode.CACHED_VALUES) {
-                        final String propName = e.toString();
-                        if (objectValue.equals(rb.getObject(propName))) {
-                            final int tmpMode = e.ordinal();
-                            log.debug("Converted {}={} to mode={} using Locale: {}", pn, objectValue, tmpMode,
-                                    rb.getLocale());
-                            super.setProperty(pn, tmpMode);
-                            return;
-                        }
-                    }
-                    log.warn("Could not convert {}={} using Locale: {}", pn, objectValue, rb.getLocale());
-                } catch (IntrospectionException e) {
-                    log.error("Could not find BeanInfo", e);
-                }
+        String propertyName = property.getName();
+        if (propertyName.equals("calcMode")) {
+            String enumLabel = GenericTestBeanCustomizer.normalizeEnumStringValue(getClass(), Mode.class, property);
+            if (enumLabel != null && (!(property instanceof StringProperty) || !enumLabel.equals(property.getStringValue()))) {
+                super.setProperty(propertyName, enumLabel);
+                return;
             }
         }
         super.setProperty(property);
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 30be9b34c99..e654f4d8343 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
         // We use StaXDriver, so we exclude xmlpull, see https://x-stream.github.io/download.html#optional-deps
         exclude("io.github.x-stream", "mxparser")
     }
+    api("org.jspecify:jspecify")
     api("org.apache.logging.log4j:log4j-1.2-api")
     api("org.apache.logging.log4j:log4j-api")
     api("org.apache.logging.log4j:log4j-core") {
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
index 11a2eb2ca33..065dd7fecfc 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
@@ -191,7 +191,15 @@ public String getAsText() {
      */
     @Override
     public void setValue(Object value) {
-        setAsText((String) value);
+        if (value == null) {
+            setAsText(null);
+            return;
+        }
+        if (value instanceof String literal) {
+            setAsText(literal);
+            return;
+        }
+        throw new IllegalArgumentException("Expected String but got " + value.getClass() + ", value=" + value);
     }
 
     /**
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
index 62e1f79f501..7c241aa4255 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
@@ -20,12 +20,18 @@
 import java.awt.Component;
 import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditorSupport;
+import java.util.List;
 import java.util.ResourceBundle;
 
+import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListCellRenderer;
 import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
 
 import org.apache.jmeter.gui.ClearGui;
+import org.apache.jorphan.util.EnumUtils;
 
 /**
  * This class implements a property editor for String properties based on an enum
@@ -37,26 +43,38 @@
  */
 class EnumEditor extends PropertyEditorSupport implements ClearGui {
 
-    private final JComboBox<String> combo;
+    private final JComboBox<Enum<?>> combo;
 
-    private final DefaultComboBoxModel<String> model;
-
-    private final int defaultIndex;
+    private final Enum<?> defaultValue;
 
     public EnumEditor(final PropertyDescriptor descriptor, final Class<? extends Enum<?>> enumClazz, final ResourceBundle rb) {
-        model = new DefaultComboBoxModel<>();
+        DefaultComboBoxModel<Enum<?>> model = new DefaultComboBoxModel<>();
         combo = new JComboBox<>(model);
         combo.setEditable(false);
-        for(Enum<?> e : enumClazz.getEnumConstants()) {
-            model.addElement((String) rb.getObject(e.toString()));
+        combo.setRenderer(
+                new DefaultListCellRenderer() {
+                    @Override
+                    public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                        JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                        Enum<?> enumValue = (Enum<?>) value;
+                        label.setText(rb.getString(EnumUtils.getStringValue(enumValue)));
+                        return label;
+                    }
+                }
+        );
+        List<? extends Enum<?>> values = EnumUtils.values(enumClazz);
+        for(Enum<?> e : values) {
+            model.addElement(e);
         }
         Object def = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
-        if (def instanceof Integer integer) {
-            defaultIndex = integer;
+        if (def instanceof Enum<?> enumValue) {
+            defaultValue = enumValue;
+        } else if (def instanceof Integer index) {
+            defaultValue = values.get(index);
         } else {
-            defaultIndex = 0;
+            defaultValue = values.get(0);
         }
-        combo.setSelectedIndex(defaultIndex);
+        combo.setSelectedItem(defaultValue);
     }
 
     @Override
@@ -71,35 +89,35 @@ public Component getCustomEditor() {
 
     @Override
     public Object getValue() {
-        return combo.getSelectedIndex();
+        return combo.getSelectedItem();
     }
 
     @Override
-    public String getAsText() {
-        Object value = combo.getSelectedItem();
-        return (String) value;
-    }
-
-    @Override
-    @SuppressWarnings("EnumOrdinal")
     public void setValue(Object value) {
         if (value instanceof Enum<?> anEnum){
-            combo.setSelectedIndex(anEnum.ordinal());
+            combo.setSelectedItem(anEnum);
         } else if (value instanceof Integer integer) {
             combo.setSelectedIndex(integer);
-        } else {
-            combo.setSelectedItem(value);
+        } else if (value instanceof String string) {
+            ComboBoxModel<Enum<?>> model = combo.getModel();
+            for (int i = 0; i < model.getSize(); i++) {
+                Enum<?> element = model.getElementAt(i);
+                if (EnumUtils.getStringValue(element).equals(string)) {
+                    combo.setSelectedItem(element);
+                    return;
+                }
+            }
         }
     }
 
     @Override
     public void setAsText(String value) {
-        combo.setSelectedItem(value);
+        throw new UnsupportedOperationException("Not supported yet. Use enum value rather than text, got " + value);
     }
 
     @Override
     public void clearGui() {
-        combo.setSelectedIndex(defaultIndex);
+        combo.setSelectedItem(defaultValue);
     }
 
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
index b2461021046..9f25190d335 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
@@ -22,6 +22,8 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
@@ -29,6 +31,8 @@
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -39,9 +43,17 @@
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
 
+import org.apache.jmeter.JMeter;
 import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.testbeans.TestBeanHelper;
+import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.property.LongProperty;
+import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.EnumUtils;
+import org.apiguardian.api.API;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -309,6 +321,103 @@ public GenericTestBeanCustomizer(){
         init();
     }
 
+    /**
+     * Normalizes an enum-valued {@link JMeterProperty} based on the specified class and enum type.
+     *
+     * <p>
+     * The method interprets the property value as an enum value using different strategies
+     * depending on the type of the property (e.g., {@link IntegerProperty}, {@link LongProperty}, {@link StringProperty}).
+     * If the property is valid and maps to an enum value, the method returns a new {@link StringProperty}
+     * representing the normalized enum value. If the property is invalid or cannot be mapped, the method
+     * returns {@code null}.
+     *
+     * @param <T> the type of the enum
+     * @param klass the class containing the enum
+     * @param enumKlass the enum class type
+     * @param property the JMeterProperty to be normalized
+     * @return a StringProperty containing the normalized enum value, or null if the property is invalid or unrecognized
+     */
+    @API(status = API.Status.INTERNAL, since = "6.0.0")
+    public static <T extends Enum<?>> @Nullable JMeterProperty normalizeEnumProperty(
+            Class<?> klass, Class<T> enumKlass, JMeterProperty property) {
+        List<T> values = EnumUtils.values(enumKlass);
+        T value;
+        if (property instanceof IntegerProperty intProperty) {
+            int index = intProperty.getIntValue();
+            if (index >= 0 && index <= values.size()) {
+                value = values.get(index);
+            } else {
+                return null;
+            }
+        } else if (property instanceof LongProperty longProperty) {
+            long index = longProperty.getLongValue();
+            if (index >= 0 && index <= values.size()) {
+                value = values.get((int) index);
+            } else {
+                return null;
+            }
+        } else if (property instanceof StringProperty stringProperty) {
+            String stringValue = stringProperty.getStringValue();
+            if (stringValue == null) {
+                return null;
+            }
+            value = normalizeEnumStringValue(stringValue, klass, enumKlass);
+            if (stringValue.equals(EnumUtils.getStringValue(value))) {
+                // If the input property was good enough, keep it
+                return property;
+            }
+        } else {
+            return null;
+        }
+        return new StringProperty(property.getName(), EnumUtils.getStringValue(value));
+    }
+
+    @API(status = API.Status.INTERNAL, since = "6.0.0")
+    public static <T extends Enum<?>> T normalizeEnumStringValue(String value, Class<?> klass, Class<T> enumKlass) {
+        T enumValue = EnumUtils.valueOf(enumKlass, value);
+        if (enumValue != null) {
+            return enumValue;
+        }
+        return normalizeEnumStringValue(value, klass, EnumUtils.values(enumKlass));
+    }
+
+    private static <T extends Enum<?>> T normalizeEnumStringValue(String value, Class<?> klass, List<T> values) {
+        // Fallback: the value might be localized, thus check the current and root locales
+        String bundleName = null;
+        try {
+            BeanInfo beanInfo = Introspector.getBeanInfo(klass);
+            ResourceBundle rb = (ResourceBundle) beanInfo.getBeanDescriptor().getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE);
+            bundleName = rb.getBaseBundleName();
+            T enumValue = findEnumValue(value, rb, values);
+            if (enumValue != null) {
+                return enumValue;
+            }
+            String language = rb.getLocale().getLanguage();
+            log.warn("Could not convert {} using Locale: {}", value, rb.getLocale());
+            if (language.isEmpty()) {
+                return null;
+            }
+        } catch (IntrospectionException e) {
+            log.error("Could not find BeanInfo", e);
+        }
+        // Try again with the Root locale
+        if (bundleName == null) {
+            bundleName = klass.getName() + "Resources";
+        }
+        ResourceBundle rootBundle = ResourceBundle.getBundle(bundleName, Locale.ROOT, klass.getClassLoader());
+        return findEnumValue(value, rootBundle, values);
+    }
+
+    private static <T extends Enum<?>> @Nullable T findEnumValue(String stringValue, ResourceBundle rb, List<T> values) {
+        for (T enumValue : values) {
+            if (stringValue.equals(rb.getObject(enumValue.toString()))) {
+                log.debug("Converted {} to {} using Locale: {}", stringValue, enumValue, rb.getLocale());
+                return enumValue;
+            }
+        }
+        return null;
+    }
+
     /**
      * Validate the descriptor attributes.
      *
diff --git a/src/jorphan/src/main/kotlin/org/apache/jorphan/util/EnumUtils.kt b/src/jorphan/src/main/kotlin/org/apache/jorphan/util/EnumUtils.kt
new file mode 100644
index 00000000000..ecee2105e5d
--- /dev/null
+++ b/src/jorphan/src/main/kotlin/org/apache/jorphan/util/EnumUtils.kt
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("EnumUtils")
+package org.apache.jorphan.util
+
+import org.apiguardian.api.API
+import java.util.Collections.unmodifiableList
+import java.util.Collections.unmodifiableMap
+
+private val VALUES = object : ClassValue<List<Enum<*>>>() {
+    override fun computeValue(type: Class<*>): List<Enum<*>> {
+        require(type.isEnum) {
+            "Class $type is not an enum"
+        }
+        @Suppress("UNCHECKED_CAST")
+        type as Class<Enum<*>>
+        val enumConstants = type.getEnumConstants()
+        return unmodifiableList(listOf(*enumConstants))
+    }
+}
+
+private val VALUE_MAP = object : ClassValue<Map<String, Enum<*>>>() {
+    override fun computeValue(type: Class<*>): Map<String, Enum<*>> {
+        require(type.isEnum) {
+            "Class $type is not an enum"
+        }
+        @Suppress("UNCHECKED_CAST")
+        type as Class<Enum<*>>
+        return unmodifiableMap(
+            VALUES.get(type).associateBy { it.stringValue }
+        )
+    }
+}
+
+@Suppress("UNCHECKED_CAST")
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public fun <T : Enum<*>> values(klass: Class<out T>): List<T> =
+    VALUES.get(klass) as List<T>
+
+@Suppress("UNCHECKED_CAST")
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public fun <T : Enum<*>> valueMap(klass: Class<out T>): List<T> =
+    VALUES.get(klass) as List<T>
+
+@Suppress("UNCHECKED_CAST")
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public inline fun <reified T : Enum<*>> valueOf(value: String): T? =
+    valueOf(T::class.java, value)
+
+@Suppress("UNCHECKED_CAST")
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public fun <T : Enum<*>> valueOf(klass: Class<T>, value: String): T? =
+    VALUE_MAP.get(klass)[value] as T?
+
+@get:API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public val Enum<*>.stringValue: String
+    get() = toString()

From 681db6b79f6f09ee1cf43e3cd3c8ea395f7b92b9 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Fri, 21 Nov 2025 16:02:38 +0300
Subject: [PATCH 0982/1037] test: add expected files for TestSaveService

It enables tolerating small changes like "different order of xml tags"
while still detecting save service issues.
---
 bin/testfiles/GenTest210.expected.jmx         | 1479 ++++++++++++++++
 bin/testfiles/GenTest25.expected.jmx          | 1396 +++++++++++++++
 bin/testfiles/GenTest251.expected.jmx         | 1394 +++++++++++++++
 bin/testfiles/GenTest26.expected.jmx          | 1431 ++++++++++++++++
 bin/testfiles/GenTest27.expected.jmx          | 1393 +++++++++++++++
 bin/testfiles/GenTest27_original.expected.jmx | 1415 ++++++++++++++++
 bin/testfiles/GenTest2_13.expected.jmx        | 1495 +++++++++++++++++
 bin/testfiles/GenTest3_0.expected.jmx         | 1453 ++++++++++++++++
 bin/testfiles/GuiTest.expected.jmx            |  794 +++++++++
 bin/testfiles/GuiTest231.expected.jmx         | 1153 +++++++++++++
 .../GuiTest231_original.expected.jmx          | 1222 ++++++++++++++
 .../ProxyServerTestPlan.expected.jmx          |   44 +
 12 files changed, 14669 insertions(+)
 create mode 100644 bin/testfiles/GenTest210.expected.jmx
 create mode 100644 bin/testfiles/GenTest25.expected.jmx
 create mode 100644 bin/testfiles/GenTest251.expected.jmx
 create mode 100644 bin/testfiles/GenTest26.expected.jmx
 create mode 100644 bin/testfiles/GenTest27.expected.jmx
 create mode 100644 bin/testfiles/GenTest27_original.expected.jmx
 create mode 100644 bin/testfiles/GenTest2_13.expected.jmx
 create mode 100644 bin/testfiles/GenTest3_0.expected.jmx
 create mode 100644 bin/testfiles/GuiTest.expected.jmx
 create mode 100644 bin/testfiles/GuiTest231.expected.jmx
 create mode 100644 bin/testfiles/GuiTest231_original.expected.jmx
 create mode 100644 bin/testfiles/ProxyServerTestPlan.expected.jmx

diff --git a/bin/testfiles/GenTest210.expected.jmx b/bin/testfiles/GenTest210.expected.jmx
new file mode 100644
index 00000000000..e19dd7be0af
--- /dev/null
+++ b/bin/testfiles/GenTest210.expected.jmx
@@ -0,0 +1,1479 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GuiTest 2.10" enabled="true">
+      <stringProp name="TestPlan.comments">Test Plan including all test elements in JMeter 2.19</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352661000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352661000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337300621000</longProp>
+        <longProp name="ThreadGroup.end_time">1337300621000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Logic Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+            <stringProp name="queryTimeout"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <RegExUserParameters guiclass="RegExUserParametersGui" testclass="RegExUserParameters" testname="RegEx User Parameters" enabled="true">
+            <stringProp name="RegExUserParameters.regex_ref_name"/>
+            <stringProp name="RegExUserParameters.param_names_gr_nr"/>
+            <stringProp name="RegExUserParameters.param_values_gr_nr"/>
+          </RegExUserParameters>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+            <stringProp name="queryTimeout"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
+            <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
+            <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
+            <stringProp name="SystemSampler.command"/>
+            <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SystemSampler.directory"/>
+          </SystemSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <HtmlExtractor guiclass="HtmlExtractorGui" testclass="HtmlExtractor" testname="CSS/JQuery Extractor" enabled="true">
+            <stringProp name="HtmlExtractor.refname"/>
+            <stringProp name="HtmlExtractor.expr"/>
+            <stringProp name="HtmlExtractor.attribute"/>
+            <stringProp name="HtmlExtractor.default"/>
+            <stringProp name="HtmlExtractor.match_number"/>
+            <stringProp name="HtmlExtractor.extractor_impl"/>
+          </HtmlExtractor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+            <stringProp name="queryTimeout"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+            <stringProp name="cacheKey"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352666000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352666000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+    <WorkBench guiclass="WorkBenchGui" testclass="WorkBench" testname="WorkBench" enabled="true">
+      <boolProp name="WorkBench.save">true</boolProp>
+    </WorkBench>
+    <hashTree>
+      <HttpMirrorControl guiclass="HttpMirrorControlGui" testclass="HttpMirrorControl" testname="HTTP Mirror Server" enabled="true">
+        <stringProp name="HttpMirrorControlGui.port">8081</stringProp>
+        <stringProp name="HttpMirrorControlGui.maxPoolSize">0</stringProp>
+        <stringProp name="HttpMirrorControlGui.maxQueueSize">25</stringProp>
+      </HttpMirrorControl>
+      <hashTree/>
+      <ProxyControl guiclass="ProxyControlGui" testclass="ProxyControl" testname="HTTP(S) Test Script Recorder" enabled="true">
+        <stringProp name="ProxyControlGui.port">8080</stringProp>
+        <collectionProp name="ProxyControlGui.exclude_list"/>
+        <collectionProp name="ProxyControlGui.include_list"/>
+        <boolProp name="ProxyControlGui.capture_http_headers">true</boolProp>
+        <intProp name="ProxyControlGui.grouping_mode">0</intProp>
+        <boolProp name="ProxyControlGui.add_assertion">false</boolProp>
+        <stringProp name="ProxyControlGui.sampler_type_name"/>
+        <boolProp name="ProxyControlGui.sampler_redirect_automatically">false</boolProp>
+        <boolProp name="ProxyControlGui.sampler_follow_redirects">true</boolProp>
+        <boolProp name="ProxyControlGui.use_keepalive">true</boolProp>
+        <boolProp name="ProxyControlGui.sampler_download_images">false</boolProp>
+        <boolProp name="ProxyControlGui.regex_match">false</boolProp>
+        <stringProp name="ProxyControlGui.content_type_include"/>
+        <stringProp name="ProxyControlGui.content_type_exclude"/>
+      </ProxyControl>
+      <hashTree/>
+      <ConfigTestElement guiclass="PropertyControlGui" testclass="ConfigTestElement" testname="Property Display" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest25.expected.jmx b/bin/testfiles/GenTest25.expected.jmx
new file mode 100644
index 00000000000..19c50aa1989
--- /dev/null
+++ b/bin/testfiles/GenTest25.expected.jmx
@@ -0,0 +1,1396 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan for 2.5" enabled="true">
+      <stringProp name="TestPlan.comments"/>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360672000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360672000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360420000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360420000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="scriptLanguage">beanbasic</stringProp>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+          </BSFSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="WebService(SOAP) Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="WebserviceSampler.wsdl_url"/>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="Soap.Action"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="WebServiceSampler.xml_data_file"/>
+            <stringProp name="WebServiceSampler.xml_path_loc"/>
+            <stringProp name="WebserviceSampler.timeout"/>
+            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
+            <stringProp name="WebServiceSampler.read_response">false</stringProp>
+            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
+            <stringProp name="WebServiceSampler.proxy_host"/>
+            <stringProp name="WebServiceSampler.proxy_port"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true"/>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Graph Full Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360665000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360665000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest251.expected.jmx b/bin/testfiles/GenTest251.expected.jmx
new file mode 100644
index 00000000000..63062f12368
--- /dev/null
+++ b/bin/testfiles/GenTest251.expected.jmx
@@ -0,0 +1,1394 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan for 2.5.1" enabled="true">
+      <stringProp name="TestPlan.comments"/>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360547000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360547000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360522000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360522000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="scriptLanguage">beanbasic</stringProp>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+          </BSFSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="WebService(SOAP) Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="WebserviceSampler.wsdl_url"/>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="Soap.Action"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="WebServiceSampler.xml_data_file"/>
+            <stringProp name="WebServiceSampler.xml_path_loc"/>
+            <stringProp name="WebserviceSampler.timeout"/>
+            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
+            <stringProp name="WebServiceSampler.read_response">false</stringProp>
+            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
+            <stringProp name="WebServiceSampler.proxy_host"/>
+            <stringProp name="WebServiceSampler.proxy_port"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true"/>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Graph Full Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337360555000</longProp>
+        <longProp name="ThreadGroup.end_time">1337360555000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest26.expected.jmx b/bin/testfiles/GenTest26.expected.jmx
new file mode 100644
index 00000000000..766d398d0e2
--- /dev/null
+++ b/bin/testfiles/GenTest26.expected.jmx
@@ -0,0 +1,1431 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan for 2.6" enabled="true">
+      <stringProp name="TestPlan.comments"/>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337361781000</longProp>
+        <longProp name="ThreadGroup.end_time">1337361781000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337361769000</longProp>
+        <longProp name="ThreadGroup.end_time">1337361769000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="WebService(SOAP) Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="WebserviceSampler.wsdl_url"/>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="Soap.Action"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="WebServiceSampler.xml_data_file"/>
+            <stringProp name="WebServiceSampler.xml_path_loc"/>
+            <stringProp name="WebserviceSampler.timeout"/>
+            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
+            <stringProp name="WebServiceSampler.read_response">false</stringProp>
+            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
+            <stringProp name="WebServiceSampler.proxy_host"/>
+            <stringProp name="WebServiceSampler.proxy_port"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Graph Full Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337361784000</longProp>
+        <longProp name="ThreadGroup.end_time">1337361784000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest27.expected.jmx b/bin/testfiles/GenTest27.expected.jmx
new file mode 100644
index 00000000000..ccce46a57b8
--- /dev/null
+++ b/bin/testfiles/GenTest27.expected.jmx
@@ -0,0 +1,1393 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GuiTest 2.7" enabled="true">
+      <stringProp name="TestPlan.comments">Test Plan including all test elements in JMeter 2.7</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352661000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352661000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337300621000</longProp>
+        <longProp name="ThreadGroup.end_time">1337300621000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Logic Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
+            <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
+            <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
+            <stringProp name="SystemSampler.command"/>
+            <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SystemSampler.directory"/>
+          </SystemSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352666000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352666000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest27_original.expected.jmx b/bin/testfiles/GenTest27_original.expected.jmx
new file mode 100644
index 00000000000..5ca9fed3f85
--- /dev/null
+++ b/bin/testfiles/GenTest27_original.expected.jmx
@@ -0,0 +1,1415 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GuiTest 2.7" enabled="true">
+      <stringProp name="TestPlan.comments">Test Plan including all test elements in JMeter 2.7</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352661000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352661000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </SetupThreadGroup>
+      <hashTree/>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337300621000</longProp>
+        <longProp name="ThreadGroup.end_time">1337300621000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Logic Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <elementProp name="jms.jmsProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
+            <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
+            <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
+            <stringProp name="SystemSampler.command"/>
+            <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SystemSampler.directory"/>
+          </SystemSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="WebService(SOAP) Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="WebserviceSampler.wsdl_url"/>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="Soap.Action"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="WebServiceSampler.xml_data_file"/>
+            <stringProp name="WebServiceSampler.xml_path_loc"/>
+            <stringProp name="WebserviceSampler.timeout"/>
+            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
+            <stringProp name="WebServiceSampler.read_response">false</stringProp>
+            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
+            <stringProp name="WebServiceSampler.proxy_host"/>
+            <stringProp name="WebServiceSampler.proxy_port"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1337352666000</longProp>
+        <longProp name="ThreadGroup.end_time">1337352666000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </PostThreadGroup>
+      <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest2_13.expected.jmx b/bin/testfiles/GenTest2_13.expected.jmx
new file mode 100644
index 00000000000..a7e34b2ca20
--- /dev/null
+++ b/bin/testfiles/GenTest2_13.expected.jmx
@@ -0,0 +1,1495 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Generator2.13" enabled="true">
+      <stringProp name="TestPlan.comments"/>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1457798199000</longProp>
+        <longProp name="ThreadGroup.end_time">1457798199000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Critical Section Controller" enabled="true">
+            <stringProp name="CriticalSectionController.lockName">global_lock</stringProp>
+          </CriticalSectionController>
+          <hashTree/>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.includeTimers">false</boolProp>
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <DNSCacheManager guiclass="DNSCachePanel" testclass="DNSCacheManager" testname="DNS Cache Manager" enabled="true">
+            <collectionProp name="DNSCacheManager.servers"/>
+            <boolProp name="DNSCacheManager.clearEachIteration">false</boolProp>
+            <boolProp name="DNSCacheManager.isCustomResolver">false</boolProp>
+          </DNSCacheManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="clientCertAliasVarName"/>
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <boolProp name="TCPSampler.closeConnection">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+            <longProp name="timeoutInMs">0</longProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+            <boolProp name="encode">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <RegExUserParameters guiclass="RegExUserParametersGui" testclass="RegExUserParameters" testname="RegEx User Parameters" enabled="true">
+            <stringProp name="RegExUserParameters.regex_ref_name"/>
+            <stringProp name="RegExUserParameters.param_names_gr_nr"/>
+            <stringProp name="RegExUserParameters.param_values_gr_nr"/>
+          </RegExUserParameters>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="JMSProperties">
+              <collectionProp name="JMSProperties.properties"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.expiration"/>
+            <stringProp name="jms.priority"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <elementProp name="jms.jmsProperties" elementType="JMSProperties">
+              <collectionProp name="JMSProperties.properties"/>
+            </elementProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
+            <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
+            <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
+            <stringProp name="SystemSampler.command"/>
+            <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SystemSampler.directory"/>
+          </SystemSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <boolProp name="TCPSampler.closeConnection">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <HtmlExtractor guiclass="HtmlExtractorGui" testclass="HtmlExtractor" testname="CSS/JQuery Extractor" enabled="true">
+            <stringProp name="HtmlExtractor.refname"/>
+            <stringProp name="HtmlExtractor.expr"/>
+            <stringProp name="HtmlExtractor.attribute"/>
+            <stringProp name="HtmlExtractor.default"/>
+            <stringProp name="HtmlExtractor.match_number"/>
+            <stringProp name="HtmlExtractor.extractor_impl"/>
+          </HtmlExtractor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BackendListener guiclass="BackendListenerGui" testclass="BackendListener" testname="Backend Listener" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="graphiteMetricsSender" elementType="Argument">
+                  <stringProp name="Argument.name">graphiteMetricsSender</stringProp>
+                  <stringProp name="Argument.value">org.apache.jmeter.visualizers.backend.graphite.TextGraphiteMetricsSender</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="graphiteHost" elementType="Argument">
+                  <stringProp name="Argument.name">graphiteHost</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="graphitePort" elementType="Argument">
+                  <stringProp name="Argument.name">graphitePort</stringProp>
+                  <stringProp name="Argument.value">2003</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="rootMetricsPrefix" elementType="Argument">
+                  <stringProp name="Argument.name">rootMetricsPrefix</stringProp>
+                  <stringProp name="Argument.value">jmeter.</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="summaryOnly" elementType="Argument">
+                  <stringProp name="Argument.name">summaryOnly</stringProp>
+                  <stringProp name="Argument.value">true</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="samplersList" elementType="Argument">
+                  <stringProp name="Argument.name">samplersList</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="percentiles" elementType="Argument">
+                  <stringProp name="Argument.name">percentiles</stringProp>
+                  <stringProp name="Argument.value">90;95;99</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.visualizers.backend.graphite.GraphiteBackendListenerClient</stringProp>
+          </BackendListener>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GenTest3_0.expected.jmx b/bin/testfiles/GenTest3_0.expected.jmx
new file mode 100644
index 00000000000..57ee9986bfb
--- /dev/null
+++ b/bin/testfiles/GenTest3_0.expected.jmx
@@ -0,0 +1,1453 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GenTest3_0" enabled="true">
+      <stringProp name="TestPlan.comments"/>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1459605029000</longProp>
+        <longProp name="ThreadGroup.end_time">1459605029000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Critical Section Controller" enabled="true">
+            <stringProp name="CriticalSectionController.lockName">global_lock</stringProp>
+          </CriticalSectionController>
+          <hashTree/>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal"/>
+            <stringProp name="ForeachController.returnVal"/>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition"/>
+            <boolProp name="IfController.evaluateAll">false</boolProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true"/>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">1</stringProp>
+          </RunTime>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <stringProp name="SwitchController.value"/>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.includeTimers">false</boolProp>
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition"/>
+          </WhileController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config Elements" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start"/>
+            <stringProp name="CounterConfig.end"/>
+            <stringProp name="CounterConfig.incr"/>
+            <stringProp name="CounterConfig.name"/>
+            <stringProp name="CounterConfig.format"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding"/>
+            <stringProp name="filename"/>
+            <boolProp name="quotedData">false</boolProp>
+            <boolProp name="recycle">true</boolProp>
+            <stringProp name="shareMode">shareMode.all</stringProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames"/>
+          </CSVDataSet>
+          <hashTree/>
+          <DNSCacheManager guiclass="DNSCachePanel" testclass="DNSCacheManager" testname="DNS Cache Manager" enabled="true">
+            <collectionProp name="DNSCacheManager.servers"/>
+            <boolProp name="DNSCacheManager.clearEachIteration">false</boolProp>
+            <boolProp name="DNSCacheManager.isCustomResolver">false</boolProp>
+          </DNSCacheManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CacheManager guiclass="CacheManagerGui" testclass="CacheManager" testname="HTTP Cache Manager" enabled="true">
+            <boolProp name="clearEachIteration">false</boolProp>
+            <boolProp name="useExpires">false</boolProp>
+          </CacheManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+            <stringProp name="CookieManager.policy">standard</stringProp>
+            <stringProp name="CookieManager.implementation">org.apache.jmeter.protocol.http.control.HC4CookieHandler</stringProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.concurrentPool">6</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="dbUrl"/>
+            <stringProp name="driver"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password"/>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="transactionIsolation">DEFAULT</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username"/>
+          </JDBCDataSource>
+          <hashTree/>
+          <KeystoreConfig guiclass="TestBeanGUI" testclass="KeystoreConfig" testname="Keystore Configuration" enabled="true">
+            <stringProp name="clientCertAliasVarName"/>
+            <stringProp name="endIndex"/>
+            <stringProp name="preload">True</stringProp>
+            <stringProp name="startIndex"/>
+          </KeystoreConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <RandomVariableConfig guiclass="TestBeanGUI" testclass="RandomVariableConfig" testname="Random Variable" enabled="true">
+            <stringProp name="maximumValue"/>
+            <stringProp name="minimumValue">1</stringProp>
+            <stringProp name="outputFormat"/>
+            <boolProp name="perThread">false</boolProp>
+            <stringProp name="randomSeed"/>
+            <stringProp name="variableName"/>
+          </RandomVariableConfig>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <boolProp name="TCPSampler.closeConnection">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </Arguments>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellTimer>
+          <hashTree/>
+          <BSFTimer guiclass="TestBeanGUI" testclass="BSFTimer" testname="BSF Timer" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>0.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <JSR223Timer guiclass="TestBeanGUI" testclass="JSR223Timer" testname="JSR223 Timer" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Timer>
+          <hashTree/>
+          <PoissonRandomTimer guiclass="PoissonRandomTimerGui" testclass="PoissonRandomTimer" testname="Poisson Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100</stringProp>
+          </PoissonRandomTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">0</intProp>
+            <longProp name="timeoutInMs">0</longProp>
+          </SyncTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">0</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <BSFPreProcessor guiclass="TestBeanGUI" testclass="BSFPreProcessor" testname="BSF PreProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPreProcessor>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">false</boolProp>
+            <boolProp name="encode">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <JDBCPreProcessor guiclass="TestBeanGUI" testclass="JDBCPreProcessor" testname="JDBC PreProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPreProcessor>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PreProcessor>
+          <hashTree/>
+          <RegExUserParameters guiclass="RegExUserParametersGui" testclass="RegExUserParameters" testname="RegEx User Parameters" enabled="true">
+            <stringProp name="RegExUserParameters.regex_ref_name"/>
+            <stringProp name="RegExUserParameters.param_names_gr_nr"/>
+            <stringProp name="RegExUserParameters.param_values_gr_nr"/>
+          </RegExUserParameters>
+          <hashTree/>
+          <SampleTimeout guiclass="SampleTimeoutGui" testclass="SampleTimeout" testname="Sample Timeout" enabled="true">
+            <stringProp name="InterruptTimer.timeout">10000</stringProp>
+          </SampleTimeout>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names"/>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="1"/>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain"/>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile"/>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+          </AccessLogSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </AjpSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query"/>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.port"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="FTPSampler.localfilename"/>
+            <stringProp name="FTPSampler.inputdata"/>
+            <boolProp name="FTPSampler.binarymode">false</boolProp>
+            <boolProp name="FTPSampler.saveresponse">false</boolProp>
+            <boolProp name="FTPSampler.upload">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCSampler>
+          <hashTree/>
+          <JMSSampler guiclass="JMSSamplerGui" testclass="JMSSampler" testname="JMS Point-to-Point" enabled="true">
+            <stringProp name="JMSSampler.queueconnectionfactory"/>
+            <stringProp name="JMSSampler.SendQueue"/>
+            <stringProp name="JMSSampler.ReceiveQueue"/>
+            <boolProp name="JMSSampler.isFireAndForget">true</boolProp>
+            <boolProp name="JMSSampler.isNonPersistent">false</boolProp>
+            <boolProp name="JMSSampler.useReqMsgIdAsCorrelId">false</boolProp>
+            <stringProp name="JMSSampler.timeout"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="JMSSampler.initialContextFactory"/>
+            <stringProp name="JMSSampler.contextProviderUrl"/>
+            <elementProp name="JMSSampler.jndiProperties" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="arguments" elementType="JMSProperties">
+              <collectionProp name="JMSProperties.properties"/>
+            </elementProp>
+          </JMSSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.expiration"/>
+            <stringProp name="jms.priority"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <stringProp name="jms.text_message"/>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">jms_use_text</stringProp>
+            <stringProp name="jms.config_msg_type">jms_text_message</stringProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <elementProp name="jms.jmsProperties" elementType="JMSProperties">
+              <collectionProp name="JMSProperties.properties"/>
+            </elementProp>
+          </PublisherSampler>
+          <hashTree/>
+          <SubscriberSampler guiclass="JMSSubscriberGui" testclass="SubscriberSampler" testname="JMS Subscriber" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory"/>
+            <stringProp name="jms.provider_url"/>
+            <stringProp name="jms.connection_factory"/>
+            <stringProp name="jms.topic"/>
+            <stringProp name="jms.security_principle"/>
+            <stringProp name="jms.security_credentials"/>
+            <boolProp name="jms.authenticate">false</boolProp>
+            <stringProp name="jms.iterations">1</stringProp>
+            <stringProp name="jms.read_response">true</stringProp>
+            <stringProp name="jms.client_choice">jms_subscriber_receive</stringProp>
+          </SubscriberSampler>
+          <hashTree/>
+          <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="JSR223 Sampler" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Sampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">test.RerunTest</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.method">testRerun</stringProp>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.error">An unexpected error occured</stringProp>
+            <stringProp name="junitsampler.error.code">9999</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="test">add</stringProp>
+            <stringProp name="base_entry_dn"/>
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">pop3</stringProp>
+            <stringProp name="folder">INBOX</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host"/>
+            <stringProp name="username"/>
+            <stringProp name="password"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+          </MailReaderSampler>
+          <hashTree/>
+          <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="OS Process Sampler" enabled="true">
+            <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
+            <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
+            <stringProp name="SystemSampler.command"/>
+            <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <elementProp name="SystemSampler.environment" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SystemSampler.directory"/>
+          </SystemSampler>
+          <hashTree/>
+          <SmtpSampler guiclass="SmtpSamplerGui" testclass="SmtpSampler" testname="SMTP Sampler" enabled="true">
+            <stringProp name="SMTPSampler.server"/>
+            <stringProp name="SMTPSampler.serverPort"/>
+            <stringProp name="SMTPSampler.mailFrom"/>
+            <stringProp name="SMTPSampler.replyTo"/>
+            <stringProp name="SMTPSampler.receiverTo"/>
+            <stringProp name="SMTPSampler.receiverCC"/>
+            <stringProp name="SMTPSampler.receiverBCC"/>
+            <stringProp name="SMTPSampler.subject"/>
+            <stringProp name="SMTPSampler.suppressSubject">false</stringProp>
+            <stringProp name="SMTPSampler.include_timestamp">false</stringProp>
+            <stringProp name="SMTPSampler.message"/>
+            <stringProp name="SMTPSampler.plainBody">false</stringProp>
+            <stringProp name="SMTPSampler.attachFile"/>
+            <stringProp name="SMTPSampler.useSSL">false</stringProp>
+            <stringProp name="SMTPSampler.useStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.trustAllCerts">false</stringProp>
+            <stringProp name="SMTPSampler.enforceStartTLS">false</stringProp>
+            <stringProp name="SMTPSampler.useLocalTrustStore">false</stringProp>
+            <stringProp name="SMTPSampler.trustStoreToUse"/>
+            <boolProp name="SMTPSampler.use_eml">false</boolProp>
+            <stringProp name="SMTPSampler.emlMessageToSend"/>
+            <stringProp name="SMTPSampler.useAuth">false</stringProp>
+            <stringProp name="SMTPSampler.password"/>
+            <stringProp name="SMTPSampler.username"/>
+            <stringProp name="SMTPSampler.messageSizeStatistics">false</stringProp>
+            <stringProp name="SMTPSampler.enableDebug">false</stringProp>
+            <collectionProp name="SMTPSampler.headerFields"/>
+          </SmtpSampler>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.xml_data_file"/>
+            <stringProp name="SoapSampler.SOAP_ACTION"/>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server"/>
+            <boolProp name="TCPSampler.reUseConnection">true</boolProp>
+            <stringProp name="TCPSampler.port"/>
+            <boolProp name="TCPSampler.nodelay">false</boolProp>
+            <stringProp name="TCPSampler.timeout"/>
+            <stringProp name="TCPSampler.request"/>
+            <boolProp name="TCPSampler.closeConnection">false</boolProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </TCPSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration"/>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <BSFPostProcessor guiclass="TestBeanGUI" testclass="BSFPostProcessor" testname="BSF PostProcessor" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFPostProcessor>
+          <hashTree/>
+          <HtmlExtractor guiclass="HtmlExtractorGui" testclass="HtmlExtractor" testname="CSS/JQuery Extractor" enabled="true">
+            <stringProp name="HtmlExtractor.refname"/>
+            <stringProp name="HtmlExtractor.expr"/>
+            <stringProp name="HtmlExtractor.attribute"/>
+            <stringProp name="HtmlExtractor.default"/>
+            <stringProp name="HtmlExtractor.match_number"/>
+            <stringProp name="HtmlExtractor.extractor_impl"/>
+          </HtmlExtractor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySamplerProperties">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugPostProcessor>
+          <hashTree/>
+          <JDBCPostProcessor guiclass="TestBeanGUI" testclass="JDBCPostProcessor" testname="JDBC PostProcessor" enabled="true">
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="queryArguments"/>
+            <stringProp name="queryArgumentsTypes"/>
+            <stringProp name="queryTimeout"/>
+            <stringProp name="queryType">Select Statement</stringProp>
+            <stringProp name="resultSetHandler">Store as String</stringProp>
+            <stringProp name="resultVariable"/>
+            <stringProp name="variableNames"/>
+          </JDBCPostProcessor>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Path PostProcessor" enabled="true">
+            <stringProp name="JSONPostProcessor.referenceNames"/>
+            <stringProp name="JSONPostProcessor.jsonPathExprs"/>
+            <stringProp name="JSONPostProcessor.match_numbers"/>
+          </JSONPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number"/>
+          </RegexExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">0</intProp>
+          </ResultAction>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default"/>
+            <stringProp name="XPathExtractor.refname"/>
+            <stringProp name="XPathExtractor.xpathQuery"/>
+            <boolProp name="XPathExtractor.validate">false</boolProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">false</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query"/>
+            <stringProp name="BeanShellAssertion.filename"/>
+            <stringProp name="BeanShellAssertion.parameters"/>
+            <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <BSFAssertion guiclass="TestBeanGUI" testclass="BSFAssertion" testname="BSF Assertion" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFAssertion>
+          <hashTree/>
+          <CompareAssertion guiclass="TestBeanGUI" testclass="CompareAssertion" testname="Compare Assertion" enabled="true">
+            <boolProp name="compareContent">true</boolProp>
+            <longProp name="compareTime">-1</longProp>
+            <collectionProp name="stringsToSkip"/>
+          </CompareAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration"/>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename"/>
+          </HTMLAssertion>
+          <hashTree/>
+          <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="JSR223 Assertion" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Assertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size"/>
+          </MD5HexAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <stringProp name="Assertion.test_field">SizeAssertion.response_network_size</stringProp>
+            <stringProp name="SizeAssertion.size"/>
+            <intProp name="SizeAssertion.operator">1</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <SMIMEAssertion guiclass="SMIMEAssertionGui" testclass="SMIMEAssertion" testname="SMIME Assertion" enabled="true">
+            <boolProp name="SMIMEAssert.verifySignature">false</boolProp>
+            <boolProp name="SMIMEAssert.notSigned">false</boolProp>
+            <stringProp name="SMIMEAssert.issuerDn"/>
+            <stringProp name="SMIMEAssert.signerDn"/>
+            <stringProp name="SMIMEAssert.signerSerial"/>
+            <stringProp name="SMIMEAssert.signerEmail"/>
+            <stringProp name="SMIMEAssert.signerCertFile"/>
+            <boolProp name="SMIMEAssert.signerNoCheck">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckConstraints">false</boolProp>
+            <boolProp name="SMIMEAssert.signerCheckByFile">false</boolProp>
+            <stringProp name="SMIMEAssert.messagePosition"/>
+          </SMIMEAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename"/>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/</stringProp>
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listeners" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BackendListener guiclass="BackendListenerGui" testclass="BackendListener" testname="Backend Listener" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="graphiteMetricsSender" elementType="Argument">
+                  <stringProp name="Argument.name">graphiteMetricsSender</stringProp>
+                  <stringProp name="Argument.value">org.apache.jmeter.visualizers.backend.graphite.TextGraphiteMetricsSender</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="graphiteHost" elementType="Argument">
+                  <stringProp name="Argument.name">graphiteHost</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="graphitePort" elementType="Argument">
+                  <stringProp name="Argument.name">graphitePort</stringProp>
+                  <stringProp name="Argument.value">2003</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="rootMetricsPrefix" elementType="Argument">
+                  <stringProp name="Argument.name">rootMetricsPrefix</stringProp>
+                  <stringProp name="Argument.value">jmeter.</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="summaryOnly" elementType="Argument">
+                  <stringProp name="Argument.name">summaryOnly</stringProp>
+                  <stringProp name="Argument.value">true</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="samplersList" elementType="Argument">
+                  <stringProp name="Argument.name">samplersList</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="percentiles" elementType="Argument">
+                  <stringProp name="Argument.name">percentiles</stringProp>
+                  <stringProp name="Argument.value">90;95;99</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.visualizers.backend.graphite.GraphiteBackendListenerClient</stringProp>
+          </BackendListener>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <boolProp name="resetInterpreter">false</boolProp>
+            <stringProp name="script"/>
+          </BeanShellListener>
+          <hashTree/>
+          <BSFListener guiclass="TestBeanGUI" testclass="BSFListener" testname="BSF Listener" enabled="true">
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </BSFListener>
+          <hashTree/>
+          <ResultCollector guiclass="ComparisonVisualizer" testclass="ResultCollector" testname="Comparison Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <JSR223Listener guiclass="TestBeanGUI" testclass="JSR223Listener" testname="JSR223 Listener" enabled="true">
+            <stringProp name="cacheKey"/>
+            <stringProp name="filename"/>
+            <stringProp name="parameters"/>
+            <stringProp name="script"/>
+            <stringProp name="scriptLanguage"/>
+          </JSR223Listener>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject"/>
+              <stringProp name="MailerModel.fromAddress"/>
+              <stringProp name="MailerModel.smtpHost"/>
+              <stringProp name="MailerModel.successSubject"/>
+              <stringProp name="MailerModel.addressie"/>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename"/>
+            <boolProp name="FileSaver.errorsonly">false</boolProp>
+            <boolProp name="FileSaver.skipautonumber">false</boolProp>
+            <boolProp name="FileSaver.skipsuffix">false</boolProp>
+            <boolProp name="FileSaver.successonly">false</boolProp>
+          </ResultSaver>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>false</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+                <threadCounts>true</threadCounts>
+                <idleTime>true</idleTime>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GuiTest.expected.jmx b/bin/testfiles/GuiTest.expected.jmx
new file mode 100644
index 00000000000..8f922083361
--- /dev/null
+++ b/bin/testfiles/GuiTest.expected.jmx
@@ -0,0 +1,794 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT b5fdea2">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <collectionProp name="TestPlan.thread_groups"/>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="server" elementType="Argument">
+            <stringProp name="Argument.metadata">=</stringProp>
+            <stringProp name="Argument.value">jakarta.apache.org</stringProp>
+            <stringProp name="Argument.name">server</stringProp>
+          </elementProp>
+          <elementProp name="server" elementType="Argument">
+            <stringProp name="Argument.metadata">=</stringProp>
+            <stringProp name="Argument.value">jakarta.apache.org</stringProp>
+            <stringProp name="Argument.name">server</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <stringProp name="TestPlan.comments"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Components" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertions" enabled="true"/>
+        <hashTree>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+              <stringProp name="0"/>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <stringProp name="Assertion.assume_success">false</stringProp>
+            <intProp name="Assertion.test_type">2</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <longProp name="DurationAssertion.duration">0</longProp>
+          </DurationAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <intProp name="SizeAssertion.operator">1</intProp>
+            <longProp name="SizeAssertion.size">0</longProp>
+          </SizeAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="ModuleController" enabled="true">
+            <collectionProp name="ModuleController.node_path">
+              <stringProp name="-1227702913">WorkBench</stringProp>
+              <stringProp name="764597751">Test Plan</stringProp>
+              <stringProp name="1546018614">Components</stringProp>
+              <stringProp name="-209934895">Assertions</stringProp>
+              <stringProp name="-209934895">Assertions</stringProp>
+            </collectionProp>
+          </ModuleController>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">1</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition">${__threadNum()} == 3</stringProp>
+          </IfController>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
+        <hashTree>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.regex"/>
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.match_number"/>
+            <stringProp name="RegexExtractor.template"/>
+            <stringProp name="RegexExtractor.refname"/>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter Config" enabled="true">
+            <stringProp name="CounterConfig.start">0</stringProp>
+            <stringProp name="CounterConfig.incr">0</stringProp>
+            <stringProp name="CounterConfig.name"/>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+            <stringProp name="CounterConfig.end">0</stringProp>
+          </CounterConfig>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names">
+              <stringProp name="username">username</stringProp>
+              <stringProp name="password">password</stringProp>
+              <stringProp name="category">category</stringProp>
+              <stringProp name="color">color</stringProp>
+            </collectionProp>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="-1599762143">
+                <stringProp name="user1">user1</stringProp>
+                <stringProp name="pass1">pass1</stringProp>
+                <stringProp name="cat1">cat1</stringProp>
+                <stringProp name="red">red</stringProp>
+              </collectionProp>
+              <collectionProp name="2144649063">
+                <stringProp name="user2">user2</stringProp>
+                <stringProp name="pass2">pass2</stringProp>
+                <stringProp name="cat2">cat2</stringProp>
+                <stringProp name="green">green</stringProp>
+              </collectionProp>
+              <collectionProp name="-1601708465">
+                <stringProp name="user3">user3</stringProp>
+                <stringProp name="pass3">pass3</stringProp>
+                <stringProp name="cat3">cat3</stringProp>
+                <stringProp name=""/>
+              </collectionProp>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">true</boolProp>
+          </UserParameters>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timers" enabled="true"/>
+        <hashTree>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="throughput">60</stringProp>
+            <boolProp name="legacyMode">false</boolProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">300</stringProp>
+            <stringProp name="RandomTimer.range">100.0</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Visualizers" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="StatVisualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="Table Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Full Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>false</threadName>
+                <dataType>true</dataType>
+                <encoding>true</encoding>
+                <assertions>false</assertions>
+                <subresults>false</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>true</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Core" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="variableNames"/>
+            <stringProp name="filename"/>
+          </CSVDataSet>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">1</stringProp>
+          </LoopController>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Protocol: FTP" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Config" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.filename"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Test Sampler" enabled="true">
+            <stringProp name="FTPSampler.server"/>
+            <stringProp name="FTPSampler.filename"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="ConfigTestElement.password"/>
+          </FTPSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Protocol: HTTP" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.protocol"/>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="Argument List" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.port"/>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="GUI" enabled="true"/>
+        <hashTree>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="AuthPanel" enabled="true">
+            <collectionProp name="AuthManager.auth_list"/>
+          </AuthManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="Cookie Panel" enabled="true">
+            <collectionProp name="CookieManager.cookies"/>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Header Panel" enabled="true">
+            <collectionProp name="HeaderManager.headers"/>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre Processors" enabled="true"/>
+        <hashTree>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="Anchor Modifier" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="URL Rewriting Modifier" enabled="true">
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <stringProp name="argument_name"/>
+            <boolProp name="path_extension_no_equals">false</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Test Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="Argument List" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <stringProp name="HTTPSampler.protocol"/>
+            <boolProp name="HTTPSampler.image_parser">false</boolProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <stringProp name="HTTPSampler.implementation">Java</stringProp>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.path">/</stringProp>
+            <stringProp name="HTTPSampler.encoded_path">/</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <intProp name="HTTPSampler.port">-1</intProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSamper.xml_data"/>
+            <stringProp name="SoapSampler.URL_DATA"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Tomcat Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString"/>
+            <stringProp name="logFile"/>
+            <stringProp name="domain"/>
+            <stringProp name="AccessLogSampler.generator_class_name">org.apache.jmeter.protocol.http.util.accesslog.StandardGenerator</stringProp>
+            <boolProp name="imageParsing">false</boolProp>
+          </AccessLogSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Protocol: Java" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Config" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="SleepTime" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">1000</stringProp>
+                  <stringProp name="Argument.name">SleepTime</stringProp>
+                </elementProp>
+                <elementProp name="SleepMask" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">0x3FF</stringProp>
+                  <stringProp name="Argument.name">SleepMask</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.SleepTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java SleepTest" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="SleepTime" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">1000</stringProp>
+                  <stringProp name="Argument.name">SleepTime</stringProp>
+                </elementProp>
+                <elementProp name="SleepMask" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">0x3FF</stringProp>
+                  <stringProp name="Argument.name">SleepMask</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.SleepTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="JavaTest" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">100</stringProp>
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">JavaTest</stringProp>
+                  <stringProp name="Argument.name">Label</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">200 (or any other number)</stringProp>
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">OK (or any other text)</stringProp>
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.name">Status</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">SamplerData goes here</stringProp>
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <stringProp name="Argument.value">ResultData goes here</stringProp>
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.query">ResponseCode=12;
+ResponseMessage="Buckle my shoe";
+IsSuccess=false;
+Label="Sticky";
+// FileName is the Script file name
+// bsh.args[1] == "quick"
+return "This will go into the Response Data field";</stringProp>
+            <stringProp name="BeanShellSampler.parameters">the quick brown fox</stringProp>
+          </BeanShellSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Protocol: JDBC" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <stringProp name="password"/>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="driver"/>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="username"/>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="dbUrl"/>
+          </JDBCDataSource>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Control" enabled="true"/>
+        <hashTree>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Test Sample" enabled="true">
+            <stringProp name="JDBCSampler.url"/>
+            <stringProp name="JDBCSampler.connections">1</stringProp>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="JDBCSampler.maxuse">50</stringProp>
+            <stringProp name="dataSource"/>
+            <stringProp name="query"/>
+            <stringProp name="JDBCSampler.driver"/>
+            <stringProp name="JDBCSampler.connPoolClass">org.apache.jmeter.protocol.jdbc.util.JMeter19ConnectionPool</stringProp>
+            <stringProp name="ConfigTestElement.password"/>
+          </JDBCSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="LDAP" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Config" enabled="true"/>
+        <hashTree>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="rootdn"/>
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <boolProp name="user_defined">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Samplers" enabled="true"/>
+        <hashTree>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="rootdn"/>
+            <stringProp name="servername"/>
+            <stringProp name="ConfigTestElement.username"/>
+            <stringProp name="port"/>
+            <stringProp name="ConfigTestElement.password"/>
+            <boolProp name="user_defined">false</boolProp>
+          </LDAPSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GuiTest231.expected.jmx b/bin/testfiles/GuiTest231.expected.jmx
new file mode 100644
index 00000000000..71a836aa17b
--- /dev/null
+++ b/bin/testfiles/GuiTest231.expected.jmx
@@ -0,0 +1,1153 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GUI231" enabled="true">
+      <stringProp name="TestPlan.comments">All GUI test elements in JMeter 2.3.1</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1210207165000</longProp>
+        <longProp name="ThreadGroup.end_time">1210207165000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal">Input</stringProp>
+            <stringProp name="ForeachController.returnVal">Output</stringProp>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition">If condition</stringProp>
+            <stringProp name="IfController.evaluateAll">false</stringProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">123</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true">
+            <collectionProp name="ModuleController.node_path">
+              <stringProp name="-1227702913">WorkBench</stringProp>
+              <stringProp name="2113393429">GUI231</stringProp>
+              <stringProp name="-1948168983">Thread Group</stringProp>
+              <stringProp name="-46680009">Controllers</stringProp>
+              <stringProp name="-1591803190">Simple Controller</stringProp>
+            </collectionProp>
+          </ModuleController>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">321</stringProp>
+          </RunTime>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+            <stringProp name="SwitchController.value">7</stringProp>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">111</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition">Condition</stringProp>
+          </WhileController>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Configuration" enabled="true"/>
+        <hashTree>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding">encoding</stringProp>
+            <stringProp name="filename">filename</stringProp>
+            <boolProp name="recycle">true</boolProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames">a,b,c,d</stringProp>
+          </CSVDataSet>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="NAME" elementType="Argument">
+                <stringProp name="Argument.name">NAME</stringProp>
+                <stringProp name="Argument.value">VALUE</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </Arguments>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username">USER</stringProp>
+            <stringProp name="ConfigTestElement.password">PASS</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server">server</stringProp>
+            <stringProp name="FTPSampler.filename">remote</stringProp>
+            <stringProp name="FTPSampler.localfilename">local</stringProp>
+            <stringProp name="FTPSampler.binarymode">true</stringProp>
+            <stringProp name="FTPSampler.saveresponse">true</stringProp>
+            <stringProp name="FTPSampler.upload">true</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                  <stringProp name="Argument.value">Value</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">Name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">localhost</stringProp>
+            <stringProp name="HTTPSampler.port">8080</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">utf8</stringProp>
+            <stringProp name="HTTPSampler.path">/path</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list">
+              <elementProp name="" elementType="Authorization">
+                <stringProp name="Authorization.url">base</stringProp>
+                <stringProp name="Authorization.username">user</stringProp>
+                <stringProp name="Authorization.password">pass</stringProp>
+                <stringProp name="Authorization.domain">domain</stringProp>
+                <stringProp name="Authorization.realm">realm</stringProp>
+              </elementProp>
+            </collectionProp>
+          </AuthManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies">
+              <elementProp name="name" elementType="Cookie" testname="name">
+                <stringProp name="Cookie.value">value</stringProp>
+                <stringProp name="Cookie.domain">domain</stringProp>
+                <stringProp name="Cookie.path">path</stringProp>
+                <boolProp name="Cookie.secure">false</boolProp>
+                <longProp name="Cookie.expires">0</longProp>
+                <stringProp name="Cookie.path_specified">true</stringProp>
+                <stringProp name="Cookie.domain_specified">true</stringProp>
+              </elementProp>
+            </collectionProp>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Browser</stringProp>
+                <stringProp name="Header.value">JMeter</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource">variable</stringProp>
+            <stringProp name="dbUrl">url</stringProp>
+            <stringProp name="driver">driver</stringProp>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password">pass</stringProp>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username">user</stringProp>
+          </JDBCDataSource>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername">server</stringProp>
+            <stringProp name="port">port</stringProp>
+            <stringProp name="rootdn">DN</stringProp>
+            <boolProp name="user_defined">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server">server</stringProp>
+            <stringProp name="TCPSampler.reUseConnection">true</stringProp>
+            <stringProp name="TCPSampler.port">port</stringProp>
+            <stringProp name="TCPSampler.nodelay">false</stringProp>
+            <stringProp name="TCPSampler.timeout">1234</stringProp>
+            <stringProp name="TCPSampler.request">text</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timer" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>11.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">12</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">3001</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">3001</stringProp>
+            <stringProp name="RandomTimer.range">100.01</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">01</stringProp>
+            <stringProp name="RandomTimer.range">100.01</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre-Processor" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start">11</stringProp>
+            <stringProp name="CounterConfig.end">33</stringProp>
+            <stringProp name="CounterConfig.incr">22</stringProp>
+            <stringProp name="CounterConfig.name">REF</stringProp>
+            <stringProp name="CounterConfig.format">##</stringProp>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names">
+              <stringProp name="2420395">Name</stringProp>
+            </collectionProp>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="-442416642">
+                <stringProp name="111578566">user1</stringProp>
+              </collectionProp>
+              <collectionProp name="-442416604">
+                <stringProp name="111578567">user2</stringProp>
+              </collectionProp>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name">JSESSION</stringProp>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">true</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">true</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Sampler" enabled="true">
+          <stringProp name="TestPlan.comments">JMS Sub and JMS P-P not available (JavaMail) </stringProp>
+        </GenericController>
+        <hashTree>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server">server</stringProp>
+            <stringProp name="FTPSampler.filename">remote</stringProp>
+            <stringProp name="FTPSampler.localfilename">local</stringProp>
+            <stringProp name="FTPSampler.binarymode">true</stringProp>
+            <stringProp name="FTPSampler.saveresponse">true</stringProp>
+            <stringProp name="FTPSampler.upload">false</stringProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </FTPSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                  <stringProp name="Argument.value">Value</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">Name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">server</stringProp>
+            <stringProp name="HTTPSampler.port">port</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">encoding</stringProp>
+            <stringProp name="HTTPSampler.path">/path</stringProp>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re">match</stringProp>
+            <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+              <collectionProp name="HTTPFileArgs.files">
+                <elementProp name="path" elementType="HTTPFileArg">
+                  <stringProp name="File.path">path</stringProp>
+                  <stringProp name="File.mimetype">mime</stringProp>
+                  <stringProp name="File.paramname">name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+          </AjpSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">server</stringProp>
+            <stringProp name="HTTPSampler.port">port</stringProp>
+            <stringProp name="HTTPSampler.protocol">https</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">utf8</stringProp>
+            <stringProp name="HTTPSampler.path">/delete</stringProp>
+            <stringProp name="HTTPSampler.method">DELETE</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="HTTPSampler.implementation">Java</stringProp>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request HTTPClient" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">localhost</stringProp>
+            <stringProp name="HTTPSampler.port">xxx</stringProp>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="HTTPSampler.implementation">HttpClient3.1</stringProp>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA">URL</stringProp>
+            <stringProp name="HTTPSamper.xml_data">Data</stringProp>
+            <stringProp name="SoapSampler.xml_data_file">filename</stringProp>
+            <stringProp name="SoapSampler.SOAP_ACTION">Action</stringProp>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain">server</stringProp>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile">log</stringProp>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString">port</stringProp>
+            <stringProp name="filterClassName">org.apache.jmeter.protocol.http.util.accesslog.LogFilter</stringProp>
+          </AccessLogSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename">scriptfile</stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+            <stringProp name="parameters">params</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BSFSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query">script</stringProp>
+            <stringProp name="BeanShellSampler.filename">file</stringProp>
+            <stringProp name="BeanShellSampler.parameters">a,b,c</stringProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">woolfel.DummyTestCase</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+            <stringProp name="junitsampler.method">testMethodPass</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource">POOL</stringProp>
+            <stringProp name="query">query</stringProp>
+            <stringProp name="queryArguments">v</stringProp>
+            <stringProp name="queryArgumentsTypes">t</stringProp>
+            <stringProp name="queryType">Select Statement</stringProp>
+          </JDBCSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory">factory</stringProp>
+            <stringProp name="jms.provider_url">url</stringProp>
+            <stringProp name="jms.connection_factory">conn</stringProp>
+            <stringProp name="jms.topic">topic</stringProp>
+            <stringProp name="jms.security_principle">user</stringProp>
+            <stringProp name="jms.security_credentials">pass</stringProp>
+            <stringProp name="jms.text_message">message</stringProp>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">Textarea</stringProp>
+            <stringProp name="jms.config_msg_type">Object Message</stringProp>
+            <stringProp name="jms.iterations">count</stringProp>
+            <stringProp name="jms.authenticate">Not Required</stringProp>
+          </PublisherSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername">server</stringProp>
+            <stringProp name="port">port</stringProp>
+            <stringProp name="rootdn">dn</stringProp>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">imap</stringProp>
+            <stringProp name="folder">Trash</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host">server</stringProp>
+            <stringProp name="username">user</stringProp>
+            <stringProp name="password">pass</stringProp>
+          </MailReaderSampler>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server">server</stringProp>
+            <stringProp name="TCPSampler.reUseConnection">true</stringProp>
+            <stringProp name="TCPSampler.port">port</stringProp>
+            <stringProp name="TCPSampler.nodelay">false</stringProp>
+            <stringProp name="TCPSampler.timeout">1000</stringProp>
+            <stringProp name="TCPSampler.request">text</stringProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </TCPSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration">1234</stringProp>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertion" enabled="true"/>
+        <hashTree>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-1513171730">must match</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <stringProp name="Assertion.assume_success">false</stringProp>
+            <intProp name="Assertion.test_type">1</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query">script</stringProp>
+            <stringProp name="BeanShellAssertion.filename">file</stringProp>
+            <stringProp name="BeanShellAssertion.parameters">a,b,c</stringProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration">111</stringProp>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename">sadaasd</stringProp>
+          </HTMLAssertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size">abcd</stringProp>
+          </MD5HexAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <longProp name="SizeAssertion.size">44</longProp>
+            <intProp name="SizeAssertion.operator">4</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename">schema</stringProp>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/xpath</stringProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post-Processor" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true"/>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">ref</stringProp>
+            <stringProp name="RegexExtractor.regex">exp</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default">DEF</stringProp>
+            <stringProp name="RegexExtractor.match_number">12</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default">def</stringProp>
+            <stringProp name="XPathExtractor.refname">ref</stringProp>
+            <stringProp name="XPathExtractor.xpathQuery">/abc</stringProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">true</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">1</intProp>
+          </ResultAction>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename">prefix</stringProp>
+            <stringProp name="FileSaver.errorsonly">false</stringProp>
+          </ResultSaver>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listener" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename">b</stringProp>
+            <stringProp name="parameters">a</stringProp>
+            <stringProp name="script">c</stringProp>
+          </BeanShellListener>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject">failed</stringProp>
+              <stringProp name="MailerModel.fromAddress">from</stringProp>
+              <stringProp name="MailerModel.smtpHost">server</stringProp>
+              <stringProp name="MailerModel.successSubject">ok</stringProp>
+              <stringProp name="MailerModel.addressie">to</stringProp>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/GuiTest231_original.expected.jmx b/bin/testfiles/GuiTest231_original.expected.jmx
new file mode 100644
index 00000000000..19f3d6a1599
--- /dev/null
+++ b/bin/testfiles/GuiTest231_original.expected.jmx
@@ -0,0 +1,1222 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT a782287">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="GUI231" enabled="true">
+      <stringProp name="TestPlan.comments">All GUI test elements in JMeter 2.3.1</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <stringProp name="LoopController.loops">1</stringProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1210207165000</longProp>
+        <longProp name="ThreadGroup.end_time">1210207165000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.delay"/>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Controllers" enabled="true"/>
+        <hashTree>
+          <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller" enabled="true">
+            <stringProp name="ForeachController.inputVal">Input</stringProp>
+            <stringProp name="ForeachController.returnVal">Output</stringProp>
+            <boolProp name="ForeachController.useSeparator">true</boolProp>
+          </ForeachController>
+          <hashTree/>
+          <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+            <stringProp name="IfController.condition">If condition</stringProp>
+            <stringProp name="IfController.evaluateAll">false</stringProp>
+          </IfController>
+          <hashTree/>
+          <IncludeController guiclass="IncludeControllerGui" testclass="IncludeController" testname="Include Controller" enabled="true">
+            <stringProp name="IncludeController.includepath"/>
+          </IncludeController>
+          <hashTree/>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </InterleaveControl>
+          <hashTree/>
+          <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
+          <hashTree/>
+          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+            <boolProp name="LoopController.continue_forever">true</boolProp>
+            <stringProp name="LoopController.loops">123</stringProp>
+          </LoopController>
+          <hashTree/>
+          <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Module Controller" enabled="true">
+            <collectionProp name="ModuleController.node_path">
+              <stringProp name="-1227702913">WorkBench</stringProp>
+              <stringProp name="2113393429">GUI231</stringProp>
+              <stringProp name="-1948168983">Thread Group</stringProp>
+              <stringProp name="-46680009">Controllers</stringProp>
+              <stringProp name="-1591803190">Simple Controller</stringProp>
+            </collectionProp>
+          </ModuleController>
+          <hashTree/>
+          <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
+          <hashTree/>
+          <RandomController guiclass="RandomControlGui" testclass="RandomController" testname="Random Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+          </RandomController>
+          <hashTree/>
+          <RandomOrderController guiclass="RandomOrderControllerGui" testclass="RandomOrderController" testname="Random Order Controller" enabled="true"/>
+          <hashTree/>
+          <RunTime guiclass="RunTimeGui" testclass="RunTime" testname="Runtime Controller" enabled="true">
+            <stringProp name="RunTime.seconds">321</stringProp>
+          </RunTime>
+          <hashTree/>
+          <SwitchController guiclass="SwitchControllerGui" testclass="SwitchController" testname="Switch Controller" enabled="true">
+            <intProp name="InterleaveControl.style">1</intProp>
+            <stringProp name="SwitchController.value">7</stringProp>
+          </SwitchController>
+          <hashTree/>
+          <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Throughput Controller" enabled="true">
+            <intProp name="ThroughputController.style">0</intProp>
+            <boolProp name="ThroughputController.perThread">true</boolProp>
+            <intProp name="ThroughputController.maxThroughput">111</intProp>
+            <FloatProperty>
+              <name>ThroughputController.percentThroughput</name>
+              <value>100.0</value>
+              <savedValue>0.0</savedValue>
+            </FloatProperty>
+          </ThroughputController>
+          <hashTree/>
+          <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Transaction Controller" enabled="true">
+            <boolProp name="TransactionController.parent">false</boolProp>
+          </TransactionController>
+          <hashTree/>
+          <WhileController guiclass="WhileControllerGui" testclass="WhileController" testname="While Controller" enabled="true">
+            <stringProp name="WhileController.condition">Condition</stringProp>
+          </WhileController>
+          <hashTree/>
+          <RecordingController guiclass="RecordController" testclass="RecordingController" testname="Recording Controller" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Configuration" enabled="true"/>
+        <hashTree>
+          <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
+            <stringProp name="delimiter">,</stringProp>
+            <stringProp name="fileEncoding">encoding</stringProp>
+            <stringProp name="filename">filename</stringProp>
+            <boolProp name="recycle">true</boolProp>
+            <boolProp name="stopThread">false</boolProp>
+            <stringProp name="variableNames">a,b,c,d</stringProp>
+          </CSVDataSet>
+          <hashTree/>
+          <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="NAME" elementType="Argument">
+                <stringProp name="Argument.name">NAME</stringProp>
+                <stringProp name="Argument.value">VALUE</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </Arguments>
+          <hashTree/>
+          <ConfigTestElement guiclass="LoginConfigGui" testclass="ConfigTestElement" testname="Login Config Element" enabled="true">
+            <stringProp name="ConfigTestElement.username">USER</stringProp>
+            <stringProp name="ConfigTestElement.password">PASS</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="SimpleConfigGui" testclass="ConfigTestElement" testname="Simple Config Element" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+            <stringProp name="FTPSampler.server">server</stringProp>
+            <stringProp name="FTPSampler.filename">remote</stringProp>
+            <stringProp name="FTPSampler.localfilename">local</stringProp>
+            <stringProp name="FTPSampler.binarymode">true</stringProp>
+            <stringProp name="FTPSampler.saveresponse">true</stringProp>
+            <stringProp name="FTPSampler.upload">true</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                  <stringProp name="Argument.value">Value</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">Name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">localhost</stringProp>
+            <stringProp name="HTTPSampler.port">8080</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">utf8</stringProp>
+            <stringProp name="HTTPSampler.path">/path</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
+            <collectionProp name="AuthManager.auth_list">
+              <elementProp name="" elementType="Authorization">
+                <stringProp name="Authorization.url">base</stringProp>
+                <stringProp name="Authorization.username">user</stringProp>
+                <stringProp name="Authorization.password">pass</stringProp>
+                <stringProp name="Authorization.domain">domain</stringProp>
+                <stringProp name="Authorization.realm">realm</stringProp>
+              </elementProp>
+            </collectionProp>
+          </AuthManager>
+          <hashTree/>
+          <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+            <collectionProp name="CookieManager.cookies">
+              <elementProp name="name" elementType="Cookie" testname="name">
+                <stringProp name="Cookie.value">value</stringProp>
+                <stringProp name="Cookie.domain">domain</stringProp>
+                <stringProp name="Cookie.path">path</stringProp>
+                <boolProp name="Cookie.secure">false</boolProp>
+                <longProp name="Cookie.expires">0</longProp>
+                <stringProp name="Cookie.path_specified">true</stringProp>
+                <stringProp name="Cookie.domain_specified">true</stringProp>
+              </elementProp>
+            </collectionProp>
+            <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+          </CookieManager>
+          <hashTree/>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Browser</stringProp>
+                <stringProp name="Header.value">JMeter</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaConfig>
+          <hashTree/>
+          <JDBCDataSource guiclass="TestBeanGUI" testclass="JDBCDataSource" testname="JDBC Connection Configuration" enabled="true">
+            <boolProp name="autocommit">true</boolProp>
+            <stringProp name="checkQuery">Select 1</stringProp>
+            <stringProp name="connectionAge">5000</stringProp>
+            <stringProp name="dataSource">variable</stringProp>
+            <stringProp name="dbUrl">url</stringProp>
+            <stringProp name="driver">driver</stringProp>
+            <boolProp name="keepAlive">true</boolProp>
+            <stringProp name="password">pass</stringProp>
+            <stringProp name="poolMax">10</stringProp>
+            <stringProp name="timeout">10000</stringProp>
+            <stringProp name="trimInterval">60000</stringProp>
+            <stringProp name="username">user</stringProp>
+          </JDBCDataSource>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapConfigGui" testclass="ConfigTestElement" testname="LDAP Request Defaults" enabled="true">
+            <stringProp name="servername">server</stringProp>
+            <stringProp name="port">port</stringProp>
+            <stringProp name="rootdn">DN</stringProp>
+            <boolProp name="user_defined">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="LdapExtConfigGui" testclass="ConfigTestElement" testname="LDAP Extended Request Defaults" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="TCPConfigGui" testclass="ConfigTestElement" testname="TCP Sampler Config" enabled="true">
+            <stringProp name="TCPSampler.server">server</stringProp>
+            <stringProp name="TCPSampler.reUseConnection">true</stringProp>
+            <stringProp name="TCPSampler.port">port</stringProp>
+            <stringProp name="TCPSampler.nodelay">false</stringProp>
+            <stringProp name="TCPSampler.timeout">1234</stringProp>
+            <stringProp name="TCPSampler.request">text</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Timer" enabled="true"/>
+        <hashTree>
+          <BeanShellTimer guiclass="TestBeanGUI" testclass="BeanShellTimer" testname="BeanShell Timer" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellTimer>
+          <hashTree/>
+          <ConstantThroughputTimer guiclass="TestBeanGUI" testclass="ConstantThroughputTimer" testname="Constant Throughput Timer" enabled="true">
+            <stringProp name="calcMode">calcMode.1</stringProp>
+            <doubleProp>
+              <name>throughput</name>
+              <value>11.0</value>
+              <savedValue>0.0</savedValue>
+            </doubleProp>
+          </ConstantThroughputTimer>
+          <hashTree/>
+          <SyncTimer guiclass="TestBeanGUI" testclass="SyncTimer" testname="Synchronizing Timer" enabled="true">
+            <intProp name="groupSize">12</intProp>
+          </SyncTimer>
+          <hashTree/>
+          <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">3001</stringProp>
+          </ConstantTimer>
+          <hashTree/>
+          <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">3001</stringProp>
+            <stringProp name="RandomTimer.range">100.01</stringProp>
+          </GaussianRandomTimer>
+          <hashTree/>
+          <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Uniform Random Timer" enabled="true">
+            <stringProp name="ConstantTimer.delay">01</stringProp>
+            <stringProp name="RandomTimer.range">100.01</stringProp>
+          </UniformRandomTimer>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Pre-Processor" enabled="true"/>
+        <hashTree>
+          <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellPreProcessor>
+          <hashTree/>
+          <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+            <stringProp name="CounterConfig.start">11</stringProp>
+            <stringProp name="CounterConfig.end">33</stringProp>
+            <stringProp name="CounterConfig.incr">22</stringProp>
+            <stringProp name="CounterConfig.name">REF</stringProp>
+            <stringProp name="CounterConfig.format">##</stringProp>
+            <boolProp name="CounterConfig.per_user">false</boolProp>
+          </CounterConfig>
+          <hashTree/>
+          <UserParameters guiclass="UserParametersGui" testclass="UserParameters" testname="User Parameters" enabled="true">
+            <collectionProp name="UserParameters.names">
+              <stringProp name="2420395">Name</stringProp>
+            </collectionProp>
+            <collectionProp name="UserParameters.thread_values">
+              <collectionProp name="-442416642">
+                <stringProp name="111578566">user1</stringProp>
+              </collectionProp>
+              <collectionProp name="-442416604">
+                <stringProp name="111578567">user2</stringProp>
+              </collectionProp>
+            </collectionProp>
+            <boolProp name="UserParameters.per_iteration">false</boolProp>
+          </UserParameters>
+          <hashTree/>
+          <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="HTML Parameter Mask" enabled="true">
+            <elementProp name="ParamModifier.mask" elementType="ConfigTestElement">
+              <stringProp name="ParamModifier.field_name">name</stringProp>
+              <stringProp name="ParamModifier.prefix">prefix</stringProp>
+              <longProp name="ParamModifier.lower_bound">11</longProp>
+              <longProp name="ParamModifier.upper_bound">100</longProp>
+              <longProp name="ParamModifier.increment">12</longProp>
+              <stringProp name="ParamModifier.suffix">suffix</stringProp>
+            </elementProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
+            <stringProp name="argument_name">JSESSION</stringProp>
+            <boolProp name="path_extension">false</boolProp>
+            <boolProp name="path_extension_no_equals">true</boolProp>
+            <boolProp name="path_extension_no_questionmark">false</boolProp>
+            <boolProp name="cache_value">true</boolProp>
+          </URLRewritingModifier>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="HTTP User Parameter Modifier" enabled="true">
+            <stringProp name="UserParameterModifier.xmluri">users.xml</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Sampler" enabled="true">
+          <stringProp name="TestPlan.comments">JMS Sub and JMS P-P not available (JavaMail)	</stringProp>
+        </GenericController>
+        <hashTree>
+          <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request" enabled="true">
+            <stringProp name="FTPSampler.server">server</stringProp>
+            <stringProp name="FTPSampler.filename">remote</stringProp>
+            <stringProp name="FTPSampler.localfilename">local</stringProp>
+            <stringProp name="FTPSampler.binarymode">true</stringProp>
+            <stringProp name="FTPSampler.saveresponse">true</stringProp>
+            <stringProp name="FTPSampler.upload">false</stringProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </FTPSampler>
+          <hashTree/>
+          <AjpSampler guiclass="AjpSamplerGui" testclass="AjpSampler" testname="AJP/1.3 Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                  <stringProp name="Argument.value">Value</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">Name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">server</stringProp>
+            <stringProp name="HTTPSampler.port">port</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">encoding</stringProp>
+            <stringProp name="HTTPSampler.path">/path</stringProp>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re">match</stringProp>
+            <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+              <collectionProp name="HTTPFileArgs.files">
+                <elementProp name="path" elementType="HTTPFileArg">
+                  <stringProp name="File.path">path</stringProp>
+                  <stringProp name="File.mimetype">mime</stringProp>
+                  <stringProp name="File.paramname">name</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+          </AjpSampler>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">server</stringProp>
+            <stringProp name="HTTPSampler.port">port</stringProp>
+            <stringProp name="HTTPSampler.protocol">https</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding">utf8</stringProp>
+            <stringProp name="HTTPSampler.path">/delete</stringProp>
+            <stringProp name="HTTPSampler.method">DELETE</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="HTTPSampler.implementation">Java</stringProp>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request HTTPClient" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">localhost</stringProp>
+            <stringProp name="HTTPSampler.port">xxx</stringProp>
+            <stringProp name="HTTPSampler.protocol"/>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path"/>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="HTTPSampler.implementation">HttpClient3.1</stringProp>
+          </HTTPSamplerProxy>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="SoapSampler.URL_DATA">URL</stringProp>
+            <stringProp name="HTTPSamper.xml_data">Data</stringProp>
+            <stringProp name="SoapSampler.xml_data_file">filename</stringProp>
+            <stringProp name="SoapSampler.SOAP_ACTION">Action</stringProp>
+            <stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
+            <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="WebService(SOAP) Request" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain">server</stringProp>
+            <stringProp name="HTTPSampler.port">port</stringProp>
+            <stringProp name="HTTPSampler.protocol">http</stringProp>
+            <stringProp name="HTTPSampler.path">path</stringProp>
+            <stringProp name="WebserviceSampler.wsdl_url">wsdl</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <stringProp name="Soap.Action">action</stringProp>
+            <stringProp name="HTTPSamper.xml_data">Data</stringProp>
+            <stringProp name="WebServiceSampler.xml_data_file">File</stringProp>
+            <stringProp name="WebServiceSampler.xml_path_loc">Folder</stringProp>
+            <stringProp name="WebserviceSampler.timeout">timeout</stringProp>
+            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
+            <stringProp name="WebServiceSampler.read_response">false</stringProp>
+            <stringProp name="WebServiceSampler.use_proxy">true</stringProp>
+            <stringProp name="WebServiceSampler.proxy_host">Host</stringProp>
+            <stringProp name="WebServiceSampler.proxy_port">9999</stringProp>
+          </ConfigTestElement>
+          <hashTree/>
+          <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+              <collectionProp name="Arguments.arguments"/>
+            </elementProp>
+            <stringProp name="domain">server</stringProp>
+            <boolProp name="imageParsing">false</boolProp>
+            <stringProp name="logFile">log</stringProp>
+            <stringProp name="parserClassName">org.apache.jmeter.protocol.http.util.accesslog.TCLogParser</stringProp>
+            <stringProp name="portString">port</stringProp>
+            <stringProp name="filterClassName">org.apache.jmeter.protocol.http.util.accesslog.LogFilter</stringProp>
+          </AccessLogSampler>
+          <hashTree/>
+          <BSFSampler guiclass="TestBeanGUI" testclass="BSFSampler" testname="BSF Sampler" enabled="true">
+            <stringProp name="filename">scriptfile</stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+            <stringProp name="parameters">params</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BSFSampler>
+          <hashTree/>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler" enabled="true">
+            <stringProp name="BeanShellSampler.query">script</stringProp>
+            <stringProp name="BeanShellSampler.filename">file</stringProp>
+            <stringProp name="BeanShellSampler.parameters">a,b,c</stringProp>
+          </BeanShellSampler>
+          <hashTree/>
+          <JUnitSampler guiclass="JUnitTestSamplerGui" testclass="JUnitSampler" testname="JUnit Request" enabled="true">
+            <stringProp name="junitSampler.classname">woolfel.DummyTestCase</stringProp>
+            <stringProp name="junitsampler.constructorstring"/>
+            <stringProp name="junitsampler.pkg.filter"/>
+            <stringProp name="junitsampler.success">Test successful</stringProp>
+            <stringProp name="junitsampler.success.code">1000</stringProp>
+            <stringProp name="junitsampler.failure">Test failed</stringProp>
+            <stringProp name="junitsampler.failure.code">0001</stringProp>
+            <stringProp name="junitsampler.exec.setup">false</stringProp>
+            <stringProp name="junitsampler.append.error">false</stringProp>
+            <stringProp name="junitsampler.append.exception">false</stringProp>
+            <stringProp name="junitsampler.method">testMethodPass</stringProp>
+          </JUnitSampler>
+          <hashTree/>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Java Request" enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">5</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0x03</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"/>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+          <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
+            <stringProp name="dataSource">POOL</stringProp>
+            <stringProp name="query">query</stringProp>
+            <stringProp name="queryArguments">v</stringProp>
+            <stringProp name="queryArgumentsTypes">t</stringProp>
+            <stringProp name="queryType">Select Statement</stringProp>
+          </JDBCSampler>
+          <hashTree/>
+          <PublisherSampler guiclass="JMSPublisherGui" testclass="PublisherSampler" testname="JMS Publisher" enabled="true">
+            <stringProp name="jms.jndi_properties">false</stringProp>
+            <stringProp name="jms.initial_context_factory">factory</stringProp>
+            <stringProp name="jms.provider_url">url</stringProp>
+            <stringProp name="jms.connection_factory">conn</stringProp>
+            <stringProp name="jms.topic">topic</stringProp>
+            <stringProp name="jms.security_principle">user</stringProp>
+            <stringProp name="jms.security_credentials">pass</stringProp>
+            <stringProp name="jms.text_message">message</stringProp>
+            <stringProp name="jms.input_file"/>
+            <stringProp name="jms.random_path"/>
+            <stringProp name="jms.config_choice">Textarea</stringProp>
+            <stringProp name="jms.config_msg_type">Object Message</stringProp>
+            <stringProp name="jms.iterations">count</stringProp>
+            <stringProp name="jms.authenticate">Not Required</stringProp>
+          </PublisherSampler>
+          <hashTree/>
+          <LDAPExtSampler guiclass="LdapExtTestSamplerGui" testclass="LDAPExtSampler" testname="LDAP Extended Request" enabled="true">
+            <stringProp name="servername"/>
+            <stringProp name="port"/>
+            <stringProp name="rootdn"/>
+            <stringProp name="scope">2</stringProp>
+            <stringProp name="countlimit"/>
+            <stringProp name="timelimit"/>
+            <stringProp name="attributes"/>
+            <stringProp name="return_object">false</stringProp>
+            <stringProp name="deref_aliases">false</stringProp>
+            <stringProp name="connection_timeout"/>
+            <stringProp name="parseflag">false</stringProp>
+            <stringProp name="secure">false</stringProp>
+            <stringProp name="user_dn"/>
+            <stringProp name="user_pw"/>
+            <stringProp name="comparedn"/>
+            <stringProp name="comparefilt"/>
+            <stringProp name="modddn"/>
+            <stringProp name="newdn"/>
+          </LDAPExtSampler>
+          <hashTree/>
+          <LDAPSampler guiclass="LdapTestSamplerGui" testclass="LDAPSampler" testname="LDAP Request" enabled="true">
+            <stringProp name="servername">server</stringProp>
+            <stringProp name="port">port</stringProp>
+            <stringProp name="rootdn">dn</stringProp>
+            <boolProp name="user_defined">false</boolProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </LDAPSampler>
+          <hashTree/>
+          <MailReaderSampler guiclass="MailReaderSamplerGui" testclass="MailReaderSampler" testname="Mail Reader Sampler" enabled="true">
+            <stringProp name="host_type">imap</stringProp>
+            <stringProp name="folder">Trash</stringProp>
+            <intProp name="num_messages">-1</intProp>
+            <boolProp name="delete">false</boolProp>
+            <stringProp name="host">server</stringProp>
+            <stringProp name="username">user</stringProp>
+            <stringProp name="password">pass</stringProp>
+          </MailReaderSampler>
+          <hashTree/>
+          <TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
+            <stringProp name="TCPSampler.server">server</stringProp>
+            <stringProp name="TCPSampler.reUseConnection">true</stringProp>
+            <stringProp name="TCPSampler.port">port</stringProp>
+            <stringProp name="TCPSampler.nodelay">false</stringProp>
+            <stringProp name="TCPSampler.timeout">1000</stringProp>
+            <stringProp name="TCPSampler.request">text</stringProp>
+            <stringProp name="ConfigTestElement.username">user</stringProp>
+            <stringProp name="ConfigTestElement.password">pass</stringProp>
+          </TCPSampler>
+          <hashTree/>
+          <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+            <boolProp name="displayJMeterProperties">false</boolProp>
+            <boolProp name="displayJMeterVariables">true</boolProp>
+            <boolProp name="displaySystemProperties">false</boolProp>
+          </DebugSampler>
+          <hashTree/>
+          <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Test Action" enabled="true">
+            <intProp name="ActionProcessor.action">1</intProp>
+            <intProp name="ActionProcessor.target">0</intProp>
+            <stringProp name="ActionProcessor.duration">1234</stringProp>
+          </TestAction>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Assertion" enabled="true"/>
+        <hashTree>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-1513171730">must match</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <stringProp name="Assertion.assume_success">false</stringProp>
+            <intProp name="Assertion.test_type">1</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+            <stringProp name="BeanShellAssertion.query">script</stringProp>
+            <stringProp name="BeanShellAssertion.filename">file</stringProp>
+            <stringProp name="BeanShellAssertion.parameters">a,b,c</stringProp>
+          </BeanShellAssertion>
+          <hashTree/>
+          <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+            <stringProp name="DurationAssertion.duration">111</stringProp>
+          </DurationAssertion>
+          <hashTree/>
+          <HTMLAssertion guiclass="HTMLAssertionGui" testclass="HTMLAssertion" testname="HTML Assertion" enabled="true">
+            <longProp name="html_assertion_error_threshold">0</longProp>
+            <longProp name="html_assertion_warning_threshold">0</longProp>
+            <stringProp name="html_assertion_doctype">omit</stringProp>
+            <boolProp name="html_assertion_errorsonly">false</boolProp>
+            <longProp name="html_assertion_format">0</longProp>
+            <stringProp name="html_assertion_filename">sadaasd</stringProp>
+          </HTMLAssertion>
+          <hashTree/>
+          <MD5HexAssertion guiclass="MD5HexAssertionGUI" testclass="MD5HexAssertion" testname="MD5Hex Assertion" enabled="true">
+            <stringProp name="MD5HexAssertion.size">abcd</stringProp>
+          </MD5HexAssertion>
+          <hashTree/>
+          <SizeAssertion guiclass="SizeAssertionGui" testclass="SizeAssertion" testname="Size Assertion" enabled="true">
+            <longProp name="SizeAssertion.size">44</longProp>
+            <intProp name="SizeAssertion.operator">4</intProp>
+          </SizeAssertion>
+          <hashTree/>
+          <XMLAssertion guiclass="XMLAssertionGui" testclass="XMLAssertion" testname="XML Assertion" enabled="true"/>
+          <hashTree/>
+          <XMLSchemaAssertion guiclass="XMLSchemaAssertionGUI" testclass="XMLSchemaAssertion" testname="XML Schema Assertion" enabled="true">
+            <stringProp name="xmlschema_assertion_filename">schema</stringProp>
+          </XMLSchemaAssertion>
+          <hashTree/>
+          <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true">
+            <boolProp name="XPath.validate">false</boolProp>
+            <boolProp name="XPath.whitespace">false</boolProp>
+            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.namespace">false</boolProp>
+            <boolProp name="XPath.negate">false</boolProp>
+            <stringProp name="XPath.xpath">/xpath</stringProp>
+          </XPathAssertion>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post-Processor" enabled="true"/>
+        <hashTree>
+          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+            <stringProp name="filename">file</stringProp>
+            <stringProp name="parameters">p1</stringProp>
+            <stringProp name="script">script</stringProp>
+          </BeanShellPostProcessor>
+          <hashTree/>
+          <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="true"/>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">ref</stringProp>
+            <stringProp name="RegexExtractor.regex">exp</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default">DEF</stringProp>
+            <stringProp name="RegexExtractor.match_number">12</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true">
+            <stringProp name="XPathExtractor.default">def</stringProp>
+            <stringProp name="XPathExtractor.refname">ref</stringProp>
+            <stringProp name="XPathExtractor.xpathQuery">/abc</stringProp>
+            <boolProp name="XPathExtractor.tolerant">false</boolProp>
+            <boolProp name="XPathExtractor.namespace">true</boolProp>
+          </XPathExtractor>
+          <hashTree/>
+          <ResultAction guiclass="ResultActionGui" testclass="ResultAction" testname="Result Status Action Handler" enabled="true">
+            <intProp name="OnError.action">1</intProp>
+          </ResultAction>
+          <hashTree/>
+          <ResultSaver guiclass="ResultSaverGui" testclass="ResultSaver" testname="Save Responses to a file" enabled="true">
+            <stringProp name="FileSaver.filename">prefix</stringProp>
+            <stringProp name="FileSaver.errorsonly">false</stringProp>
+          </ResultSaver>
+          <hashTree/>
+          <Summariser guiclass="SummariserGui" testclass="Summariser" testname="Generate Summary Results" enabled="true"/>
+          <hashTree/>
+        </hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Listener" enabled="true"/>
+        <hashTree>
+          <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <BeanShellListener guiclass="TestBeanGUI" testclass="BeanShellListener" testname="BeanShell Listener" enabled="true">
+            <stringProp name="filename">b</stringProp>
+            <stringProp name="parameters">a</stringProp>
+            <stringProp name="script">c</stringProp>
+          </BeanShellListener>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Graph Full Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <MailerResultCollector guiclass="MailerVisualizer" testclass="MailerResultCollector" testname="Mailer Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <elementProp name="MailerResultCollector.mailer_model" elementType="MailerModel">
+              <stringProp name="MailerModel.successLimit">2</stringProp>
+              <stringProp name="MailerModel.failureLimit">2</stringProp>
+              <stringProp name="MailerModel.failureSubject">failed</stringProp>
+              <stringProp name="MailerModel.fromAddress">from</stringProp>
+              <stringProp name="MailerModel.smtpHost">server</stringProp>
+              <stringProp name="MailerModel.successSubject">ok</stringProp>
+              <stringProp name="MailerModel.addressie">to</stringProp>
+            </elementProp>
+            <stringProp name="filename"/>
+          </MailerResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Monitor Results" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ObsoleteGui" testclass="ResultCollector" testname="Spline Visualizer" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+          <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+            <boolProp name="ResultCollector.error_logging">false</boolProp>
+            <objProp>
+              <name>saveConfig</name>
+              <value class="SampleSaveConfiguration">
+                <time>true</time>
+                <latency>true</latency>
+                <timestamp>true</timestamp>
+                <success>true</success>
+                <label>true</label>
+                <code>true</code>
+                <message>true</message>
+                <threadName>true</threadName>
+                <dataType>true</dataType>
+                <encoding>false</encoding>
+                <assertions>true</assertions>
+                <subresults>true</subresults>
+                <responseData>false</responseData>
+                <samplerData>false</samplerData>
+                <xml>true</xml>
+                <fieldNames>false</fieldNames>
+                <responseHeaders>false</responseHeaders>
+                <requestHeaders>false</requestHeaders>
+                <responseDataOnError>false</responseDataOnError>
+                <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+                <assertionsResultsToSave>0</assertionsResultsToSave>
+                <bytes>true</bytes>
+              </value>
+            </objProp>
+            <stringProp name="filename"/>
+          </ResultCollector>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/bin/testfiles/ProxyServerTestPlan.expected.jmx b/bin/testfiles/ProxyServerTestPlan.expected.jmx
new file mode 100644
index 00000000000..e805747220e
--- /dev/null
+++ b/bin/testfiles/ProxyServerTestPlan.expected.jmx
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="6.0.0-SNAPSHOT b5fdea2">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <collectionProp name="TestPlan.thread_groups"/>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <stringProp name="TestPlan.comments"/>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <longProp name="ThreadGroup.start_time">0</longProp>
+        <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="ThreadGroup.duration"/>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">1</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">0</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <ProxyControl guiclass="ProxyControlGui" testclass="ProxyControl" testname="HTTP Proxy Server" enabled="true">
+          <stringProp name="ProxyControlGui.port">8080</stringProp>
+          <collectionProp name="ProxyControlGui.exclude_list"/>
+          <collectionProp name="ProxyControlGui.include_list">
+            <stringProp name="58624487">&lt;html</stringProp>
+          </collectionProp>
+          <boolProp name="ProxyControlGui.capture_http_headers">true</boolProp>
+          <intProp name="ProxyControlGui.grouping_mode">0</intProp>
+          <boolProp name="ProxyControlGui.use_keepalive">true</boolProp>
+          <boolProp name="ProxyControlGui.add_assertion">false</boolProp>
+        </ProxyControl>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>

From bf02362adca5d75f66525fde6fde4c98a05b2d2b Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 24 Nov 2025 11:02:16 +0500
Subject: [PATCH 0983/1037] feat: add ConstantThroughputTimerSchema and use it
 in ConstantThroughputTimer

---
 .../org/apache/jmeter/config/CSVDataSet.java  | 52 ++++++++++---
 .../jmeter/config/CSVDataSetBeanInfo.java     | 21 +----
 .../timers/ConstantThroughputTimer.java       | 76 ++++++++++++-------
 .../ConstantThroughputTimerBeanInfo.java      | 10 ++-
 .../timers/ConstantThroughputTimerSchema.kt   | 39 ++++++++++
 ...onstantThroughputTimerResources.properties |  2 +-
 ...tantThroughputTimerResources_de.properties |  2 +-
 ...tantThroughputTimerResources_es.properties |  2 +-
 ...tantThroughputTimerResources_fr.properties |  2 +-
 ...tantThroughputTimerResources_ko.properties |  2 +-
 ...tThroughputTimerResources_pt_BR.properties |  2 +-
 ...tantThroughputTimerResources_tr.properties |  2 +-
 ...tThroughputTimerResources_zh_CN.properties |  2 +-
 .../timers/ConstantThroughputTimerTest.java   | 14 +++-
 14 files changed, 156 insertions(+), 72 deletions(-)
 create mode 100644 src/components/src/main/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerSchema.kt

diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
index d641edc2e8e..05f5f8f6f05 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java
@@ -29,13 +29,14 @@
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.EnumUtils;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.jorphan.util.StringUtilities;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,6 +69,24 @@
 @TestElementMetadata(labelResource = "displayName")
 public class CSVDataSet extends ConfigTestElement
     implements TestBean, LoopIterationListener, NoConfigMerge {
+
+    public enum ShareMode {
+        ALL("shareMode.all"),
+        GROUP("shareMode.group"),
+        THREAD("shareMode.thread");
+
+        private final String value;
+
+        ShareMode(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
+
     private static final Logger log = LoggerFactory.getLogger(CSVDataSet.class);
 
     private static final long serialVersionUID = 233L;
@@ -119,9 +138,10 @@ private Object readResolve(){
     public void setProperty(JMeterProperty property) {
         String propName = property.getName();
         if ("shareMode".equals(propName)) {
-            String enumLabel = GenericTestBeanCustomizer.normalizeEnumStringValue(getClass(), CSVDataSetBeanInfo.ShareMode.class, property);
-            if (enumLabel != null && (!(property instanceof StringProperty) || !enumLabel.equals(property.getStringValue()))) {
-                super.setProperty(propName, enumLabel);
+            JMeterProperty shareMode =
+                    GenericTestBeanCustomizer.normalizeEnumProperty(getClass(), ShareMode.class, property);
+            if (shareMode != null) {
+                super.setProperty(shareMode);
                 return;
             }
         }
@@ -193,13 +213,15 @@ private void initVars(FileServer server, final JMeterContext context, String del
     }
 
     private void setAlias(final JMeterContext context, String alias) {
-        String mode = getShareMode();
-        int modeInt = CSVDataSetBeanInfo.getShareModeAsInt(mode);
-        this.alias = switch(modeInt){
-            case CSVDataSetBeanInfo.SHARE_ALL -> alias;
-            case CSVDataSetBeanInfo.SHARE_GROUP -> alias + "@" + System.identityHashCode(context.getThreadGroup());
-            case CSVDataSetBeanInfo.SHARE_THREAD -> alias + "@" + System.identityHashCode(context.getThread());
-            default -> alias + "@" + mode; // user-specified key
+        ShareMode modeEnum = getShareModeAsEnum();
+        if (modeEnum == null) {
+            this.alias = alias + "@" + getShareMode(); // user-specified key
+            return;
+        }
+        this.alias = switch (modeEnum) {
+            case ALL -> alias;
+            case GROUP -> alias + "@" + System.identityHashCode(context.getThreadGroup());
+            case THREAD -> alias + "@" + System.identityHashCode(context.getThread());
         };
     }
 
@@ -294,6 +316,14 @@ public String getShareMode() {
         return shareMode;
     }
 
+    @Nullable ShareMode getShareModeAsEnum() {
+        String shareMode = getShareMode();
+        if (shareMode == null) {
+            return null;
+        }
+        return GenericTestBeanCustomizer.normalizeEnumStringValue(shareMode, getClass(), ShareMode.class);
+    }
+
     public void setShareMode(String value) {
         this.shareMode = value;
     }
diff --git a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
index cdd0dccc049..15c27b60b43 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java
@@ -39,31 +39,12 @@ public class CSVDataSetBeanInfo extends BeanInfoSupport {
     private static final String QUOTED_DATA = "quotedData";          //$NON-NLS-1$
     private static final String SHAREMODE = "shareMode";             //$NON-NLS-1$
 
-    // Access needed from CSVDataSet
-    enum ShareMode {
-        ALL("shareMode.all"),
-        GROUP("shareMode.group"),
-        THREAD("shareMode.thread");
-
-        private final String value;
-
-        ShareMode(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
     private static final String[] SHARE_TAGS = new String[3];
     static final int SHARE_ALL    = 0;
-    static final int SHARE_GROUP  = 1;
-    static final int SHARE_THREAD = 2;
 
     // Store the resource keys
     static {
-        for (ShareMode value : ShareMode.values()) {
+        for (CSVDataSet.ShareMode value : CSVDataSet.ShareMode.values()) {
             @SuppressWarnings("EnumOrdinal")
             int index = value.ordinal();
             SHARE_TAGS[index] = value.toString();
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
index 2834eebc46e..21a6edb7aea 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java
@@ -26,23 +26,26 @@
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.property.DoubleProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.testelement.schema.PropertiesAccessor;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.IdentityKey;
+import org.apache.jorphan.util.EnumUtils;
+import org.apiguardian.api.API;
 
 /**
  * This class implements a constant throughput timer. A Constant Throughput
  * Timer paces the samplers under its influence so that the total number of
  * samples per unit of time approaches a given constant as much as possible.
  *
+ * <p>
  * There are two different ways of pacing the requests:
- * - delay each thread according to when it last ran
- * - delay each thread according to when any thread last ran
+ * <ul>
+ * <li>delay each thread according to when it last ran</li>
+ * <li>delay each thread according to when any thread last ran</li>
+ * </ul>
  */
 @GUIMenuSortOrder(4)
 @TestElementMetadata(labelResource = "displayName")
@@ -62,6 +65,8 @@ private static class ThroughputInfo{
     // TODO: most props use class simpleName as prefix but that would break backward compatiblity here
     public static final String THROUGHPUT = "throughput";
     public static final String CALC_MODE = "calcMode";
+    @API(status = API.Status.INTERNAL, since = "6.0.0")
+    public static final String MODE = "mode";
 
     /**
      * This enum defines the calculation modes used by the ConstantThroughputTimer.
@@ -75,8 +80,6 @@ public enum Mode {
         ;
 
         private final String propertyName; // The property name to be used to look up the display string
-        // Enum#values() clones the array, and we don't want to pay that cost as we know we don't modify the array
-        private static final Mode[] CACHED_VALUES = values();
 
         Mode(String name) {
             this.propertyName = name;
@@ -108,6 +111,16 @@ public String toString() {
     public ConstantThroughputTimer() {
     }
 
+    @Override
+    public ConstantThroughputTimerSchema getSchema() {
+        return ConstantThroughputTimerSchema.INSTANCE;
+    }
+
+    @Override
+    public PropertiesAccessor<? extends ConstantThroughputTimer, ? extends ConstantThroughputTimerSchema> getProps() {
+        return new PropertiesAccessor<>(this, getSchema());
+    }
+
     /**
      * Sets the desired throughput.
      *
@@ -115,7 +128,7 @@ public ConstantThroughputTimer() {
      *            Desired sampling rate, in samples per minute.
      */
     public void setThroughput(double throughput) {
-        setProperty(new DoubleProperty(THROUGHPUT, throughput));
+        getSchema().getThroughput().set(this, throughput);
     }
 
     /**
@@ -124,18 +137,39 @@ public void setThroughput(double throughput) {
      * @return the rate at which samples should occur, in samples per minute.
      */
     public double getThroughput() {
-        return getPropertyAsDouble(THROUGHPUT);
+        return getSchema().getThroughput().get(this);
     }
 
+    @Deprecated
     @SuppressWarnings("EnumOrdinal")
     public int getCalcMode() {
-        return getPropertyAsInt(CALC_MODE, DEFAULT_CALC_MODE.ordinal());
+        Mode mode = getMode();
+        if (mode == null) {
+            mode = DEFAULT_CALC_MODE;
+        }
+        return mode.ordinal();
+    }
+
+    @API(status = API.Status.MAINTAINED, since = "6.0.0")
+    public Mode getMode() {
+        String value = getSchema().getCalcMode().get(this);
+        Mode enumValue = EnumUtils.valueOf(Mode.class, value);
+        if (enumValue != null) {
+            return enumValue;
+        }
+        return DEFAULT_CALC_MODE;
     }
 
+    @Deprecated
     @SuppressWarnings("EnumOrdinal")
     public void setCalcMode(int mode) {
-        Mode resolved = Mode.CACHED_VALUES[mode];
-        setProperty(new IntegerProperty(CALC_MODE, resolved.ordinal()));
+        setMode(EnumUtils.values(Mode.class).get(mode));
+    }
+
+    @SuppressWarnings("EnumOrdinal")
+    @API(status = API.Status.MAINTAINED, since = "6.0.0")
+    public void setMode(Mode newMode) {
+        getSchema().getCalcMode().set(this, newMode.toString());
     }
 
     /**
@@ -266,24 +300,12 @@ public String toString() {
     public void setProperty(JMeterProperty property) {
         String propertyName = property.getName();
         if (propertyName.equals("calcMode")) {
-            String enumLabel = GenericTestBeanCustomizer.normalizeEnumStringValue(getClass(), Mode.class, property);
-            if (enumLabel != null && (!(property instanceof StringProperty) || !enumLabel.equals(property.getStringValue()))) {
-                super.setProperty(propertyName, enumLabel);
+            JMeterProperty mode = GenericTestBeanCustomizer.normalizeEnumProperty(getClass(), Mode.class, property);
+            if (mode != null) {
+                super.setProperty(mode);
                 return;
             }
         }
         super.setProperty(property);
     }
-
-    // For access from test code
-    Mode getMode() {
-        int mode = getCalcMode();
-        return Mode.CACHED_VALUES[mode];
-    }
-
-    // For access from test code
-    @SuppressWarnings("EnumOrdinal")
-    void setMode(Mode newMode) {
-        setCalcMode(newMode.ordinal());
-    }
 }
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
index 0288460bb37..4f75ceaa707 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
@@ -32,14 +32,18 @@ public ConstantThroughputTimerBeanInfo() {
 
         createPropertyGroup("delay",  //$NON-NLS-1$
                 new String[] { ConstantThroughputTimer.THROUGHPUT, //$NON-NLS-1$
-                ConstantThroughputTimer.CALC_MODE }); //$NON-NLS-1$
+                ConstantThroughputTimer.MODE }); //$NON-NLS-1$
 
         PropertyDescriptor p = property(ConstantThroughputTimer.THROUGHPUT); //$NON-NLS-1$
         p.setValue(NOT_UNDEFINED, true);
         p.setValue(DEFAULT, 0.0);
 
-        p = property(ConstantThroughputTimer.CALC_MODE, ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
-        p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal());
+        // Hide old parameter that used index (setCalcMode(int); int getCalcMode())
+        p = property(ConstantThroughputTimer.CALC_MODE);
+        p.setHidden(true);
+
+        p = property(ConstantThroughputTimer.MODE, ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
+        p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly);
         p.setValue(NOT_UNDEFINED, true); // must be defined
     }
 
diff --git a/src/components/src/main/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerSchema.kt b/src/components/src/main/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerSchema.kt
new file mode 100644
index 00000000000..865e1b21b72
--- /dev/null
+++ b/src/components/src/main/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerSchema.kt
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.timers
+
+import org.apache.jmeter.testelement.TestElementSchema
+import org.apache.jmeter.testelement.schema.DoublePropertyDescriptor
+import org.apache.jmeter.testelement.schema.StringPropertyDescriptor
+import org.apiguardian.api.API
+
+/**
+ * Lists properties of a [ConstantThroughputTimer].
+ * @see ConstantThroughputTimer
+ * @since 6.0
+ */
+@API(status = API.Status.EXPERIMENTAL, since = "6.0.0")
+public abstract class ConstantThroughputTimerSchema : TestElementSchema() {
+    public companion object INSTANCE : ConstantThroughputTimerSchema()
+
+    public val throughput: DoublePropertyDescriptor<ConstantThroughputTimerSchema>
+        by double("throughput")
+
+    public val calcMode: StringPropertyDescriptor<ConstantThroughputTimerSchema>
+        by string("calcMode")
+}
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties
index 13851ae9e7b..eb9a4e34390 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties
@@ -20,7 +20,7 @@ calcMode.2=all active threads
 calcMode.3=all active threads in current thread group
 calcMode.4=all active threads (shared)
 calcMode.5=all active threads in current thread group (shared)
-calcMode.displayName=Calculate Throughput based on
+mode.displayName=Calculate Throughput based on
 calcMode.shortDescription=The Constant Throughput Timer used to delay each thread as though it was the only thread in the test.  Now, it calculates the delay taking into account the number of active threads in the test or the thread group.
 delay.displayName=Delay before each affected sampler
 displayName=Constant Throughput Timer
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties
index 314e49a21d2..feef94cda32 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties
@@ -20,7 +20,7 @@ calcMode.2=Alle aktiven Threads
 calcMode.3=Alle aktiven Threads in der aktuellen Thread-Gruppe
 calcMode.4=Alle aktiven Threads (Gemeinsam)
 calcMode.5=Alle aktiven Threads in der aktuellen Thread-Gruppe (gemeinsam)
-calcMode.displayName=Berechne Durchsatz basierend auf
+mode.displayName=Berechne Durchsatz basierend auf
 calcMode.shortDescription=Es war der einzige Thread im Test. Nun wird die Pause unter Berücksichtigung der aktiven Threads oder der Thread-Gruppe berechnet.
 delay.displayName=Pause bevor eine Probe genommen wird
 displayName=Konstanter Durchsatz-Timer (Zeitgeber)
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties
index e565d811f35..62dde978fd7 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties
@@ -19,7 +19,7 @@
 calcMode.1=solamente este hilo
 calcMode.2=todos los hilos activos
 calcMode.3=todos los hilos activos en el grupo de hilos actual
-calcMode.displayName=Calcular el rendimiento basado en
+mode.displayName=Calcular el rendimiento basado en
 calcMode.shortDescription=El Temporizador para Rendimiento Constante introducía un retardo como si este fuera el unico hilo en la prueba. Ahora calcula el retardo teniendo en cuenta el número de hilos activos en la prueba o el grupo de hilos.
 delay.displayName=Retardo antes de cada muestreador afectado
 displayName=Temporizador de Rendimiento Constante
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties
index 4cf3190c061..c122320e3e2 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties
@@ -20,7 +20,7 @@ calcMode.2=toutes les unités actives
 calcMode.3=toutes les unités actives dans le groupe d'unités courant
 calcMode.4=toutes les unités actives (partagé)
 calcMode.5=toutes les unités actives dans le groupe d'unités courant (partagé)
-calcMode.displayName=Calculer le débit sur la base de
+mode.displayName=Calculer le débit sur la base de
 calcMode.shortDescription=Compteur de temps utilisé par le Compteur de débit constant pour décaler chaque thread comme s'il était le seul dans le test.  Maintenant, le délai est calculé en prenant en compte le nombre de threads actifs dans le test ou le groupe d'unités.
 delay.displayName=Délai avant chaque échantillon affecté
 displayName=Compteur de débit constant
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ko.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ko.properties
index 17ad6bcd8c6..04728f16392 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ko.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ko.properties
@@ -20,7 +20,7 @@ calcMode.2=모든 활성화된 쓰레드들
 calcMode.3=현 쓰레드 그룹 내의 모든 활성화된 쓰레드들
 calcMode.4=모드 활성화된 쓰레드들 (공유)
 calcMode.5=현 쓰레드 그룹 내의 모든 활성화된 쓰레드들 (공유)
-calcMode.displayName=처리량을 다음에 기반하여\:
+mode.displayName=처리량을 다음에 기반하여\:
 calcMode.shortDescription=상수 처리량 타이머는, 마치 테스트에 단 하나의 쓰레드만 있는 것마냥, 각 쓰레드를 지연시키기 위해 사용됩니다. 단 실제 계산 시에는 전체 테스트 또는 쓰레드 그룹에 존재하는 활성화된 쓰레드들의 갯수를 고려하여 계산합니다.
 delay.displayName=영향을 받는 각 표본추출기 직전에 지연
 displayName=상수 처리량 타이머
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties
index a3d0b2d90e3..6a9d12b97ce 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties
@@ -20,7 +20,7 @@ calcMode.2=todos usuários virtuais (threads) ativos
 calcMode.3=todos usuários virtuais ativos no grupo de usuários corrente
 calcMode.4=todos usuários virtuais ativos (compartilhado)
 calcMode.5=todos usuários virtuais no grupo de usuários atual (compartillhado)
-calcMode.displayName=Calcular Vazão baseada em
+mode.displayName=Calcular Vazão baseada em
 calcMode.shortDescription=O Temporizador de Vazão Constante era usado para atrasar cada usuário virtual como se ele fosse o único usuário virtual no teste. Agora, ele calcula o atraso levando em consideração o número de usuários virtuais ativos no teste ou no grupo de usuários.
 delay.displayName=Atraso antes de cada testador afetado
 displayName=Temporizador de Vazão Constante
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties
index 7b230d2d266..4ee091bae33 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties
@@ -21,7 +21,7 @@ calcMode.2=bütün aktif iş parçacıkları
 calcMode.3=bu iş parçacığı grubundaki tüm aktif iş parçacıkları
 calcMode.4=tüm iş parçacıkları (paylaşımlı)
 calcMode.5=bu iş paçacığı grubundaki tüm aktif iş parçacıkları (paylaşımlı)
-calcMode.displayName=transfer oranı hesabının yapılacağı temel
+mode.displayName=transfer oranı hesabının yapılacağı temel
 calcMode.shortDescription=Sabit Transfer Oranı Zamanlayıcı eskiden her bir iş parçacığı için, testteki tek iş parçacığıymışcasına gecikirken; şimdi gecikme hesabı testteki veya iş parçacığı grubundaki aktif iş parçacığı sayısına göre yapılmakta.
 delay.displayName=Etkilenen her örnekleyiciden önce gecikme
 displayName=Sabit Transfer Oranı Zamanlayıcı
diff --git a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties
index e541a0a3a35..4da2ad95094 100644
--- a/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties
+++ b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties
@@ -21,7 +21,7 @@ calcMode.2=所有活动线程
 calcMode.3=当前线程组中的所有活动线程
 calcMode.4=所有活动线程（共享）
 calcMode.5=当前线程组中的所有活动线程（共享）
-calcMode.displayName=基于计算吞吐量
+mode.displayName=基于计算吞吐量
 calcMode.shortDescription=用于延迟每个线程的恒定吞吐量定时器，就好像它是测试中唯一的线程一样。现在，它根据测试或线程组的活动线程的数量计算延迟。
 delay.displayName=在每个受影响的采样器之前延迟
 displayName=常数吞吐量定时器
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
index 38e6e511fc8..640e6fa9f53 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java
@@ -34,7 +34,10 @@ class ConstantThroughputTimerTest {
     @Test
     void testTimer1() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        assertEquals(0, timer.getCalcMode());// Assume this thread only
+        @SuppressWarnings("deprecation")
+        int calcMode = timer.getCalcMode();
+        assertEquals(0, calcMode);// Assume this thread only
+        assertEquals(ConstantThroughputTimer.Mode.ThisThreadOnly, timer.getMode());// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
         long start = System.currentTimeMillis();
         long delay = timer.delay(); // Initialise
@@ -64,7 +67,9 @@ private static void assertAlmostEquals(long expected, long actual, long delta) {
     @Test
     void testTimer2() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
-        assertEquals(0, timer.getCalcMode());// Assume this thread only
+        @SuppressWarnings("deprecation")
+        int calcMode = timer.getCalcMode();
+        assertEquals(0, calcMode);// Assume this thread only
         timer.setThroughput(60.0);// 1 per second
         assertEquals(1000, timer.calculateCurrentTarget(0)); // Should delay for 1 second
         timer.setThroughput(60000.0);// 1 per milli-second
@@ -75,7 +80,10 @@ void testTimer2() throws Exception {
     void testTimer3() throws Exception {
         ConstantThroughputTimer timer = new ConstantThroughputTimer();
         timer.setMode(ConstantThroughputTimer.Mode.AllActiveThreads); //$NON-NLS-1$ - all threads
-        assertEquals(1, timer.getCalcMode());// All threads
+        @SuppressWarnings("deprecation")
+        int calcMode = timer.getCalcMode();
+        assertEquals(1, calcMode);// All threads
+        assertEquals(ConstantThroughputTimer.Mode.AllActiveThreads, timer.getMode());// All threads
         for(int i=1; i<=10; i++){
             TestJMeterContextService.incrNumberOfThreads();
         }

From 1f17592604e816b9fb7af0cd89e46d425efb31ca Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 26 Nov 2025 03:31:14 +0500
Subject: [PATCH 0984/1037] fix: pass default value for required TestBean
 properties when they are not initialized

---
 .../java/org/apache/jmeter/testbeans/TestBeanHelper.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
index 0148e2a7327..7abffe197de 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java
@@ -186,12 +186,9 @@ private static Object unwrapProperty(PropertyDescriptor desc, JMeterProperty jpr
         else if(jprop instanceof MultiProperty multiProperty)
         {
             value = unwrapCollection(multiProperty,(String)desc.getValue(TableEditor.CLASSNAME));
-        }
-        // value was not provided, and this is allowed
-        else if (jprop instanceof NullProperty &&
-                // use negative condition so missing (null) value is treated as FALSE
-                ! Boolean.TRUE.equals(desc.getValue(GenericTestBeanCustomizer.NOT_UNDEFINED))) {
-            value=null;
+        } else if (jprop instanceof NullProperty) {
+            value = Boolean.TRUE.equals(desc.getValue(GenericTestBeanCustomizer.NOT_UNDEFINED))
+                    ? desc.getValue(GenericTestBeanCustomizer.DEFAULT) : null;
         } else {
             value = Converter.convert(jprop.getStringValue(), type);
         }

From 957aeaccc706319e11b51df6a3175442d6a9ff85 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 26 Nov 2025 17:27:13 +0500
Subject: [PATCH 0985/1037] fix: report generation used wrong paths for the
 output files

The regression was introduced in
  f5518e348199cb362957d473c524b209e7d6a706
  "chore: remove the use of commons-io and commons-text"

getNameWithoutExtension returns the file name without the parent path.
---
 .../report/dashboard/TemplateVisitor.java     |  9 ++-
 .../gui/action/HtmlReportGeneratorTest.kt     | 56 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index d64205f5e69..bc1c646e1e8 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -104,7 +104,14 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
             // Process template file
             String templatePath = relativePath.toString();
             Template template = configuration.getTemplate(templatePath);
-            Path newPath = target.resolve(PathsKt.getNameWithoutExtension(relativePath));
+            Path newPath = target;
+            // getNameWithoutExtension returns the file name without the parent folder,
+            // so we resolve the parent first and then add the file name without extension
+            Path newRelativeParent = relativePath.getParent();
+            if (newRelativeParent != null) {
+                newPath = newPath.resolve(newRelativeParent);
+            }
+            newPath = newPath.resolve(PathsKt.getNameWithoutExtension(relativePath));
             try (FileOutputStream stream = new FileOutputStream(newPath.toString());
                     Writer writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
                     BufferedWriter bufferedWriter = new BufferedWriter(writer)){
diff --git a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
index f0740bb0efe..6f65c555dd7 100644
--- a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
+++ b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
@@ -21,6 +21,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.util.JMeterUtils
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.fail
 import org.junit.jupiter.api.io.TempDir
@@ -36,6 +38,22 @@ class HtmlReportGeneratorTest : JMeterTestCase() {
 
     data class CheckArgumentsCase(val csvPath: String, val userPropertiesPath: String, val outputDirectoryPath: String, val expected: List<String>)
 
+    /**
+     * Assert that a file exists at the given path relative to a base directory
+     */
+    private fun assertFileExists(baseDir: File, relativePath: String, message: String? = null) {
+        val file = File(baseDir, relativePath)
+        assertTrue(file.exists()) { message ?: "$relativePath should exist" }
+    }
+
+    /**
+     * Assert that a file does NOT exist at the given path relative to a base directory
+     */
+    private fun assertFileNotExists(baseDir: File, relativePath: String, message: String? = null) {
+        val file = File(baseDir, relativePath)
+        assertFalse(file.exists()) { message ?: "$relativePath should NOT exist" }
+    }
+
     companion object {
         /**
          * Combine the given path parts to one path with the correct path separator of the current platform.
@@ -141,4 +159,42 @@ class HtmlReportGeneratorTest : JMeterTestCase() {
             fail("First result message should contain '$expectedError', but was '$firstMessage'")
         }
     }
+
+    @Test
+    fun `report generation creates correct directory structure for HTML and JS files`() {
+        val htmlReportGenerator = HtmlReportGenerator(
+            combine("testfiles", "HTMLReportTestFile.csv"),
+            combine("user.properties"),
+            testDirectory.toString()
+        )
+        htmlReportGenerator.run()
+
+        // Verify directory structure exists
+        assertFileExists(testDirectory, "content")
+        assertFileExists(testDirectory, "content/pages")
+        assertFileExists(testDirectory, "content/js")
+
+        // Verify HTML pages are in correct location (content/pages/)
+        assertFileExists(testDirectory, "content/pages/OverTime.html")
+        assertFileExists(testDirectory, "content/pages/ResponseTimes.html")
+        assertFileExists(testDirectory, "content/pages/Throughput.html")
+        assertFileExists(testDirectory, "content/pages/CustomsGraphs.html")
+
+        // Verify JavaScript files are in correct location (content/js/)
+        assertFileExists(testDirectory, "content/js/dashboard.js")
+        assertFileExists(testDirectory, "content/js/graph.js")
+        assertFileExists(testDirectory, "content/js/dashboard-commons.js")
+        assertFileExists(testDirectory, "content/js/customGraph.js")
+
+        // Verify files are NOT at root level (catches the bug!)
+        assertFileNotExists(testDirectory, "OverTime.html", "OverTime.html should NOT be at root level")
+        assertFileNotExists(testDirectory, "ResponseTimes.html", "ResponseTimes.html should NOT be at root level")
+        assertFileNotExists(testDirectory, "Throughput.html", "Throughput.html should NOT be at root level")
+        assertFileNotExists(testDirectory, "CustomsGraphs.html", "CustomsGraphs.html should NOT be at root level")
+        assertFileNotExists(testDirectory, "dashboard.js", "dashboard.js should NOT be at root level")
+        assertFileNotExists(testDirectory, "graph.js", "graph.js should NOT be at root level")
+
+        // Verify index.html is at root (this should be correct)
+        assertFileExists(testDirectory, "index.html", "index.html should exist at root level")
+    }
 }

From 03c47c37a2c45152abeac833128d2701e059b108 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 1 Dec 2025 01:16:49 +0000
Subject: [PATCH 0986/1037] fix(deps): update dependency
 com.fasterxml.woodstox:woodstox-core to v7.1.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index e3d88db3a14..9a517f33e5d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
         api("com.google.errorprone:error_prone_annotations:2.44.0")
         api("com.helger.commons:ph-commons:12.1.0")
         api("com.helger:ph-css:8.1.0")
-        api("com.fasterxml.woodstox:woodstox-core:7.1.0")
+        api("com.fasterxml.woodstox:woodstox-core:7.1.1")
         api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:11.4.2")
         api("com.miglayout:miglayout-swing:11.4.2")

From ab81931c5fad78c0599f5c72c9b87ecb9a77cd2e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 1 Dec 2025 01:04:13 +0000
Subject: [PATCH 0987/1037] chore(deps): update actions/checkout digest to
 93cb6ef

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index 4eff276b4e6..e7586ea9478 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -18,7 +18,7 @@ jobs:
       contents: write
     steps:
     - name: Checkout sources
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
       with:
         persist-credentials: false
     - name: Set up JDK 21

From 90df2c50a70ba1c0b1a502c0763325c2ad94f36d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 1 Dec 2025 05:43:43 +0000
Subject: [PATCH 0988/1037] fix(deps): update dependency
 com.google.protobuf:protobuf-bom to v4.33.1

---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 990049cc60c..645f83a7b5a 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.0"))
+        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.1"))
         "errorprone"("com.google.errorprone:error_prone_core:2.44.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }

From f7b4fb1a16976abb7ba72008ed5c1397d461b9c9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 1 Dec 2025 05:46:36 +0000
Subject: [PATCH 0989/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v4.2.4

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index ca8b4d5ae4f..2232a66cd72 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
         api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.14.6")
         api("net.bytebuddy:byte-buddy:1.17.8")
-        api("nl.jqno.equalsverifier:equalsverifier:4.2.2")
+        api("nl.jqno.equalsverifier:equalsverifier:4.2.4")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:6.2.0")
         api("org.apache.activemq:activemq-client:6.2.0")

From eaa9497dd7634eb91d4b37d9f8be9f0654b86af8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 12 Jan 2026 07:07:10 +0000
Subject: [PATCH 0990/1037] fix(deps): update dependency
 nl.jqno.equalsverifier:equalsverifier to v4.3

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 2232a66cd72..1f699bfb3b4 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
         api("org.wiremock:wiremock:3.13.1")
         api("io.mockk:mockk:1.14.6")
         api("net.bytebuddy:byte-buddy:1.17.8")
-        api("nl.jqno.equalsverifier:equalsverifier:4.2.4")
+        api("nl.jqno.equalsverifier:equalsverifier:4.3")
         // activemq-all should not be used as it provides secondary slf4j binding
         api("org.apache.activemq:activemq-broker:6.2.0")
         api("org.apache.activemq:activemq-client:6.2.0")

From b21e7955d257e5fc81ede9e42617ac519d861db9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 29 Dec 2025 05:25:38 +0000
Subject: [PATCH 0991/1037] fix(deps): update dependency
 com.fifesoft:rsyntaxtextarea to v3.6.1

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 9a517f33e5d..4ebfc057bab 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fifesoft:rsyntaxtextarea:3.6.0")
+        api("com.fifesoft:rsyntaxtextarea:3.6.1")
         api("com.github.ben-manes.caffeine:caffeine:3.2.3")
         api("com.github.weisj:darklaf-core:3.1.1")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")

From bc4f9ffa23fa38f29b53254be6422fd13ce78937 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 22 Dec 2025 00:35:53 +0000
Subject: [PATCH 0992/1037] chore(deps): update actions/setup-java digest to
 f2beeb2

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index e7586ea9478..a264cf94d1f 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -22,7 +22,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Set up JDK 21
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
       with:
         distribution: zulu
         java-version: 21

From dcc0d48c48fd135a2ee4f8c18ff3b86bead8bc78 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 29 Dec 2025 01:27:36 +0000
Subject: [PATCH 0993/1037] fix(deps): update dependency io.mockk:mockk to
 v1.14.7

---
 gradle/verification-metadata.xml | 5 +++++
 src/bom-testing/build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e142e946cff..c943a2eef79 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -892,6 +892,11 @@
             <sha256 value="7f622d6052d0496556009103a87d8cbf47148b52b1b0d56da4001d36c6569cb2" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.10.1">
+         <artifact name="kotlinx-coroutines-bom-1.10.1.pom">
+            <sha256 value="9cbd04ba63e7399856745713e312d2f2161a1d44eda506ded47c8d56daf8461f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.8.0">
          <artifact name="kotlinx-coroutines-bom-1.8.0.pom">
             <sha256 value="1239e9dbe1397cd5971342956b2511bc3ace7b641842e4372a088dcfa8b9ad55" origin="Generated by Gradle"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 1f699bfb3b4..9969999e360 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("org.wiremock:wiremock:3.13.1")
-        api("io.mockk:mockk:1.14.6")
+        api("io.mockk:mockk:1.14.7")
         api("net.bytebuddy:byte-buddy:1.17.8")
         api("nl.jqno.equalsverifier:equalsverifier:4.3")
         // activemq-all should not be used as it provides secondary slf4j binding

From b1843c2a0aa0bc8292cc504e2a0cea53ca373234 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 12 Jan 2026 07:01:07 +0000
Subject: [PATCH 0994/1037] fix(deps): update dependency
 com.google.protobuf:protobuf-bom to v4.33.3

---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 645f83a7b5a..1f0cad3ee5e 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.1"))
+        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.3"))
         "errorprone"("com.google.errorprone:error_prone_core:2.44.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }

From 8305ff6ae86d51db837d8ada69cf53569367a3fe Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 9 Feb 2026 00:26:10 +0000
Subject: [PATCH 0995/1037] chore(deps): update gradle/actions digest to
 f29f5a9

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index a264cf94d1f..48d5f20512b 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -28,4 +28,4 @@ jobs:
         java-version: 21
         server-id: central
     - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5
+      uses: gradle/actions/dependency-submission@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5

From df57c7e80abff3a575e3ae75dc3be9ba9c8e8479 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 9 Feb 2026 05:36:02 +0000
Subject: [PATCH 0996/1037] chore(deps): update release-drafter/release-drafter
 digest to 6db134d

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 664c65d35ac..29c94025058 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -40,7 +40,7 @@ jobs:
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
-        uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6
+        uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6
         id: prepare_release
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:

From 33793523d0b076474534581f3adcdedfc1df0c13 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 20 Jan 2026 20:23:39 +0000
Subject: [PATCH 0997/1037] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v7

---
 build-logic/batchtest/build.gradle.kts |  2 +-
 gradle/verification-metadata.xml       | 25 +++++++++++++++++++++++++
 settings.gradle.kts                    |  2 +-
 src/dist-check/build.gradle.kts        |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/build-logic/batchtest/build.gradle.kts b/build-logic/batchtest/build.gradle.kts
index 2c2ce47d5f8..43503976c93 100644
--- a/build-logic/batchtest/build.gradle.kts
+++ b/build-logic/batchtest/build.gradle.kts
@@ -21,5 +21,5 @@ plugins {
 
 dependencies {
     implementation("org.ajoberstar.grgit:grgit-gradle:5.3.3")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c943a2eef79..55caae86a41 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -551,6 +551,11 @@
             <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="23">
+         <artifact name="apache-23.pom">
+            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="25">
          <artifact name="apache-25.pom">
             <sha256 value="e68fc19a48cec582a6732fd0b10dbfe9feca25060963def89e547f8a3759d379" origin="Generated by Gradle"/>
@@ -772,6 +777,16 @@
             <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit" version="7.5.0.202512021534-r">
+         <artifact name="org.eclipse.jgit-7.5.0.202512021534-r.pom">
+            <sha256 value="6c954dfc10f1c301bdba25d3d6309f77479804363cf7556e51e8bb3714555c64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="7.5.0.202512021534-r">
+         <artifact name="org.eclipse.jgit-parent-7.5.0.202512021534-r.pom">
+            <sha256 value="7e38806a853691a49db16eac836fe6b626276943b108b67754a3d5c740fbbc0e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.fusesource" name="fusesource-pom" version="1.10">
          <artifact name="fusesource-pom-1.10.pom">
             <sha256 value="4797b2420a47ceae6c139a4a46f9c11f0802bce1b5d430931c438887cb635335" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1025,6 +1040,11 @@
             <sha256 value="fb046a9c229437928bb11c2d27c8b5d773eb8a25e60cbd253d985210dedc2684" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-api" version="2.0.17">
+         <artifact name="slf4j-api-2.0.17.pom">
+            <sha256 value="150c40287f7cecdc21b9380caac98e928c4f33c023db6b348df1c5ac977026bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="slf4j-bom" version="2.0.17">
          <artifact name="slf4j-bom-2.0.17.pom">
             <sha256 value="f78d27b642b4b886eb839fc102b5cd9fe7f30f37599ffe68185be4e1609031e9" origin="Generated by Gradle"/>
@@ -1035,6 +1055,11 @@
             <sha256 value="bb388d37fbcdd3cde64c3cede21838693218dc451f04040c5df360a78ed7e812" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-parent" version="2.0.17">
+         <artifact name="slf4j-parent-2.0.17.pom">
+            <sha256 value="95cd71e852dfdb29126e58b7b939d57ec2b2e6024391852e0b545dee082bbf3b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="4.4.1.3373">
          <artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3135067cea7..6fa785e3b2f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -141,7 +141,7 @@ develocity {
 buildscript {
     dependencies {
         // Remove when Autostyle updates jgit dependency
-        classpath("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
     }
     repositories {
         gradlePluginPortal()
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index c83b94cf7ad..fcbff9fde98 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     testImplementation("org.apache.santuario:xmlsec:4.0.4") {
         because("XML canonicalization for comparing XML in tests")
     }
-    testImplementation("org.eclipse.jgit:org.eclipse.jgit:6.10.1.202505221210-r") {
+    testImplementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r") {
         because("Histogram diff for readable XML comparison output in tests")
     }
 

From 3be29ef83bce8c348ca88a60eac4760c671ed06b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 9 Feb 2026 05:50:14 +0000
Subject: [PATCH 0998/1037] chore(deps): update plugin
 org.gradlex.build-parameters to v1.4.5

---
 build-logic/build-parameters/build.gradle.kts | 2 +-
 gradle/verification-metadata.xml              | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build-logic/build-parameters/build.gradle.kts b/build-logic/build-parameters/build.gradle.kts
index aa2c7d695f7..a7cb17d8bfc 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id("org.gradlex.build-parameters") version "1.4.4"
+    id("org.gradlex.build-parameters") version "1.4.5"
     id("com.github.vlsi.gradle-extensions") version "3.0.1"
     id("build-logic.kotlin-dsl-gradle-plugin")
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 55caae86a41..87da88d94b7 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -832,6 +832,11 @@
             <sha256 value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.gradlex.build-parameters" name="org.gradlex.build-parameters.gradle.plugin" version="1.4.5">
+         <artifact name="org.gradlex.build-parameters.gradle.plugin-1.4.5.pom">
+            <sha256 value="298f5942e35b55a477b5aa143091649de02668713d099b898dd6414e74d85119" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.build" version="0.8.13">
          <artifact name="org.jacoco.build-0.8.13.pom">
             <sha256 value="994c3ae1cfca6765968fe3ede4f379986aeb2e7eb51a2014caa4a09d71a8f4a3" origin="Generated by Gradle"/>

From 73e5350ea671c91fa576b98b4673cc608f13f50c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 9 Feb 2026 00:26:06 +0000
Subject: [PATCH 0999/1037] chore(deps): update actions/setup-java digest to
 be666c2

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index 48d5f20512b..24ff38d7091 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -22,7 +22,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Set up JDK 21
-      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         distribution: zulu
         java-version: 21

From cfdc1b35e7c3a5d10eaf5220b975f5c908f47826 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 9 Feb 2026 00:38:56 +0000
Subject: [PATCH 1000/1037] fix(deps): update dependency
 com.google.protobuf:protobuf-bom to v4.33.5

---
 .../src/main/kotlin/build-logic.errorprone.gradle.kts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
index 1f0cad3ee5e..3ee4253d0ae 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts
@@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) {
     apply(plugin = "net.ltgt.errorprone")
 
     dependencies {
-        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.3"))
+        "errorprone"(platform("com.google.protobuf:protobuf-bom:4.33.5"))
         "errorprone"("com.google.errorprone:error_prone_core:2.44.0")
         "annotationProcessor"("com.google.guava:guava-beta-checker:1.0")
     }

From 98c22c000ac9ce8e7dd8d286300a1521beabc66e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 2 Mar 2026 02:16:58 +0000
Subject: [PATCH 1001/1037] fix(deps): update com.miglayout to v11.4.3

---
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 4ebfc057bab..c89a6b3163e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -56,8 +56,8 @@ dependencies {
         api("com.helger:ph-css:8.1.0")
         api("com.fasterxml.woodstox:woodstox-core:7.1.1")
         api("com.jayway.jsonpath:json-path:2.10.0")
-        api("com.miglayout:miglayout-core:11.4.2")
-        api("com.miglayout:miglayout-swing:11.4.2")
+        api("com.miglayout:miglayout-core:11.4.3")
+        api("com.miglayout:miglayout-swing:11.4.3")
         api("com.sun.activation:javax.activation:1.2.0")
         api("com.thoughtworks.xstream:xstream:1.4.21")
         api("commons-codec:commons-codec:1.20.0")

From bc0d8eba07c796d88a95ade4b8e1527c17ee5e2d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sun, 1 Mar 2026 13:20:14 +0000
Subject: [PATCH 1002/1037] fix(deps): update org.apache.logging.log4j to
 v2.25.3

---
 gradle/verification-metadata.xml    | 30 +++++++++++++++++++++++++++++
 src/bom-thirdparty/build.gradle.kts |  8 ++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 87da88d94b7..fc0b6d2286f 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -250,16 +250,31 @@
             <sha256 value="f5da55dd7b88fb170c46801d17774a652fb2f4581fb5b1d0a5fc86aa182b8577" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="68">
+         <artifact name="oss-parent-68.pom">
+            <sha256 value="25eafd96dae242b6b5a7108f55b2c14015b828daa5abe234289fd6e774a1ce57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-bom" version="2.15.3">
          <artifact name="jackson-bom-2.15.3.pom">
             <sha256 value="66fc9945c16716bc202f4b9d7e6d969df3f509feffbe1acf1a31511b753d5c9d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.19.1">
+         <artifact name="jackson-bom-2.19.1.pom">
+            <sha256 value="ba6d68eeab3a1cc13a77a8ade2197ff9a32aa1cffeac72847d49badd82e1b9ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-parent" version="2.15">
          <artifact name="jackson-parent-2.15.pom">
             <sha256 value="6cdf97bc66f389f63e36850d2f552d1216688f8e5a58727d3f6a98edf8675cde" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.19.2">
+         <artifact name="jackson-parent-2.19.2.pom">
+            <sha256 value="639a2b63dd05da4e381081303985caadfbb7ad9f85b1d2320638f6b11f208365" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.15.3">
          <artifact name="jackson-annotations-2.15.3.module">
             <sha256 value="6410c94b393e494d53d569dc4193a79187848ddb6ee3c2ee1f392477a21059cb" origin="Generated by Gradle"/>
@@ -455,6 +470,16 @@
             <pgp value="7E22D50A7EBD9D2CD269B2D4056ACA74D46000BF"/>
          </artifact>
       </component>
+      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
+         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
+            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
+         <artifact name="jakartaee-api-parent-9.1.0.pom">
+            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="javax.inject" name="javax.inject" version="1">
          <artifact name="javax.inject-1.jar">
             <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -972,6 +997,11 @@
             <sha256 value="e315c5ccbb087216dce04ae70c32bf1762be2a0b8a43ef81e3ba78317a4cd5c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="4.11.0">
+         <artifact name="mockito-bom-4.11.0.pom">
+            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-bom" version="5.20.0">
          <artifact name="mockito-bom-5.20.0.pom">
             <pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index c89a6b3163e..6e63c52328d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -112,10 +112,10 @@ dependencies {
         api("org.apache.httpcomponents:httpcore-nio:4.4.16")
         api("org.apache.httpcomponents:httpcore:4.4.16")
         api("org.apache.httpcomponents:httpmime:4.5.14")
-        api("org.apache.logging.log4j:log4j-1.2-api:2.25.2")
-        api("org.apache.logging.log4j:log4j-api:2.25.2")
-        api("org.apache.logging.log4j:log4j-core:2.25.2")
-        api("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2")
+        api("org.apache.logging.log4j:log4j-1.2-api:2.25.3")
+        api("org.apache.logging.log4j:log4j-api:2.25.3")
+        api("org.apache.logging.log4j:log4j-core:2.25.3")
+        api("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3")
         api("org.apache.rat:apache-rat:0.17")
         api("org.apache.tika:tika-core:3.2.3")
         api("org.apache.tika:tika-parsers:3.2.3")

From 374fffbede3d42af9accad78c6d18f39f0d51ce9 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 11 Mar 2026 19:44:08 +0100
Subject: [PATCH 1003/1037] Replace the feather with the new oak leaf in our
 logo

---
 xdocs/images/apple-touch-icon.png | Bin 1537 -> 1956 bytes
 xdocs/images/asf-logo.png         | Bin 9268 -> 6766 bytes
 xdocs/images/asf-logo.svg         | 487 ++-----------------
 xdocs/images/favicon.png          | Bin 4944 -> 5326 bytes
 xdocs/images/jmeter.png           | Bin 8580 -> 9086 bytes
 xdocs/images/jmeter_square.png    | Bin 6614 -> 7027 bytes
 xdocs/images/jmeter_square.svg    | 723 +++++-----------------------
 xdocs/images/logo.svg             | 759 +++++++-----------------------
 xdocs/images/mstile-144x144.png   | Bin 2964 -> 3412 bytes
 9 files changed, 319 insertions(+), 1650 deletions(-)

diff --git a/xdocs/images/apple-touch-icon.png b/xdocs/images/apple-touch-icon.png
index 38e3b378e71a8e782f7125e2838f9c73737388a3..18fcd568a8ee721e4257e9363955e6951216cc0f 100644
GIT binary patch
literal 1956
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

delta 1519
zcmV<L1rYkA4}lDjB!2{FK}|sb0I`n?{9y$E0004VQb$4nuFf3k00093P)t-s0002W
zAUDb(Hq0V5{qXDa@Ab<eHu&%J@a^>M?D4)JL%|?F#~?ZBcqYvwHM}52xgbcxAU*e*
zBex(*wIEEfAW-(1BeNh*tsqpZAXcd$S%4>cgC}^pAV$9+LVv^{JmO+1<Y+0+GDZB`
zu-#ED+e|L6AX11WbcH5&#vnV$AUNY?DdK~W;b1D}a3|+-C*WNx_~z>7Z7Ac6m-Le)
z-&!l^btd<lDEFZ=-Bc{zRxHgWH`qik);%!UM=yOSe8)mx-kPlL$<x(canpH}-g=43
zCOhhbH|1(5+J9tn^O!dF+1m4wB+Mv1+-rI5nrZi_MfR8@^_C;|n<ed#Oy`e!-dHTv
zK|b70E!j&q*Fi7ZNiMP=Pry%i+@iRzDqYQcoX)Jw;kC%^-RaSz!locxzK64jJBZ!P
z;*&mx)w|cakiD;kx7)<q%BszuVxQO5;ggcEsHVSue1D*|w8^@v%#@C?*wW*meYnC$
zY}tO1xh_|}D^J;ppWv6L&r)gYy~nvJQ^-kY=BTvy(6q%VM)SCj-GPzPV0PVggXW~K
z@34;LaW2n3RQ&De{PN}RsfzZ?x#)*!<#|p0>D2J2apP$?^{Zy(nxyN)(eAs#<#amo
zkSg}Pf`8<1Kk%l0_Nh|RJWunTMDv|K@x8C+ep=|Br}v*P-d#N0RXpl`G4`4z?weP{
zPI2spJ@U1I<gdWmTw?jxzU7F2^2yBTdNT5)So6fP?WB(T>fh8zSLct5*;iuCEI;X+
zp6Qv3?X|tvPfO>PjQ8E&)jKiy<mJ{#Lf>g)=zoxZ+gVc7JV4%YZ|Rzv-ep|RD>lw2
zG_8!j)rX?ZbCbYSdcA+D(XPwez}Dc#+w9rpmr9PTZKJOsQ;jTmmN<UFiL<##c8WED
z*R{~y$KAhen5-gLy;g$7tIy}h*wT}-vr~qyK6I~Ah@L})rCF8n=<%&;pvRiOq<OQI
zLw|_x=<(OM)8NqKxP`Li(&U<3o6xk<f-QdS;_kA3u%&LPgf@kzb*zfPfuR5Z019+c
zPE!E?|Np8Y|3qep^hWZ>0007sNkl<ZNXNa_<yX^D7{Kx0HvOT@&9Sjg24kB8l@JD_
zLj*xWkWiY@VYgy;cXxMpcX!Y3?(S#*fq&0^;q(4;zW3a7&%KwT{$*T~=1rnV#<g{_
zZ`@cS$mgfT&nAE?MSTC1_yuUV!CxdY^OJpNVd3@_TSVrie7<iSR;F^+n3G_+3#TIC
z+{R7()~-s8;czD7;CL4o@5If19GF2UIA)5*G&9i~x||qXazeAFp5sg|Ex-;z!GA?=
z0fCDrdTPLqs)K<J%XJxU+uA@^V;YG{ZVU=(o3<<<5bPWj+_XM8D|4?-=LT!uijq4l
z`wtz+gsv_l4F#95Si91924`gjg&b>%l3EsvwI}_^@zY07o;Zbp9yCpBJuECPmwWci
zVFdJQ&ZKFd-OvTw3X_axFqm2&=zjuDIEYFz7z`gRbZOeM50e~fY|toS8g!ZT{MZ?o
zb2nIRG)9kR*oPU5N%m#4ozx?s3lg<GRG6cRJuK2m4K{K(21Y0wIyw%7E?A=nMn>_J
z%CMf$wOiE5>m}gv!h1tkrDE4&;B>LGbN_H2&%S0=Ka4ytY$uNDArRQ@0DsiZX4{0q
zb<nlj2$Xy%kzBk0U9f#n@QF++&B?X73x(p<xJ$O^nJhO)Dv{XSv%OGPB~|>=n)gU1
zlS=Y%#p1#@`WFROtL#p}wM!`Z`hA)H)zjw>itgRMRfvmzHW=QP84P;;&8x^4vr4Y`
zs8A>jH?AOI`IqlCKjm`y-DvBVk@Cma(CXizq4JV^B>YraQ}XRsMgD#CALau^{VA;=
z`l(S>)l@l|taP9V=N&05eM~CP)g_hPNny7xq_S&0QrU?Vw(m$PJJctYovHsYe*tA%
Vs4%}sHv9kp002ovPDHLkV1oEAE{FgC

diff --git a/xdocs/images/asf-logo.png b/xdocs/images/asf-logo.png
index b8259798ec920b08215566cc8b23869502ff3a32..82674f7eaf7d578a82d3c1b852f8510c17db9078 100644
GIT binary patch
literal 6766
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

literal 9268
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
KDOSl_h5dgTEaj{K

diff --git a/xdocs/images/asf-logo.svg b/xdocs/images/asf-logo.svg
index 782b8c18e69..f1084dfb369 100644
--- a/xdocs/images/asf-logo.svg
+++ b/xdocs/images/asf-logo.svg
@@ -1,446 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 525">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #7c297d;
+      }
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_2"
-   x="0px"
-   y="0px"
-   viewBox="0 0 7127.6 2890.0081"
-   enable-background="new 0 0 7127.6 2890"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="asf-logo.svg"
-   width="7127.6001"
-   height="2890.0081"><metadata
-     id="metadata4570"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs4568" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3200"
-     inkscape:window-height="1671"
-     id="namedview4566"
-     showgrid="false"
-     inkscape:zoom="0.33924462"
-     inkscape:cx="3563.8"
-     inkscape:cy="1445"
-     inkscape:window-x="0"
-     inkscape:window-y="55"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_2"
-     inkscape:showpageshadow="true"
-     showborder="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><path
-     d="m 7104.7,847.80813 c 15.3,15.3 22.9,33.7 22.9,55.2 0,21.5 -7.6,39.9 -22.9,55.4 -15.3,15.4 -33.8,23.1 -55.6,23.1 -21.8,0 -40.2,-7.6 -55.4,-22.9 -15.1,-15.3 -22.7,-33.7 -22.7,-55.2 0,-21.5 7.6,-39.9 22.9,-55.4 15.3,-15.4 33.7,-23.1 55.4,-23.1 21.6,0 40.1,7.6 55.4,22.9 z m -6.6,104.1 c 13.3,-13.6 20,-29.8 20,-48.7 0,-18.9 -6.6,-35 -19.8,-48.5 -13.2,-13.4 -29.4,-20.1 -48.6,-20.1 -19.2,0 -35.4,6.7 -48.7,20.2 -13.3,13.5 -19.9,29.7 -19.9,48.7 0,19 6.6,35.2 19.7,48.6 13.1,13.4 29.3,20.1 48.5,20.1 19.2,0 35.4,-6.8 48.8,-20.3 z m -11,-63.8 c 0,14 -6.1,22.8 -18.4,26.4 l 22.5,30.5 -18.2,0 -20.3,-28.3 -18.6,0 0,28.3 -14.7,0 0,-84.6 31.8,0 c 12.8,0 22,2.2 27.6,6.6 5.6,4.4 8.3,11.4 8.3,21.1 z m -18.9,11.9 c 3,-2.4 4.4,-6.5 4.4,-12 0,-5.5 -1.5,-9.4 -4.5,-11.6 -3,-2.2 -8.4,-3.2 -16,-3.2 l -18,0 0,30.5 17.5,0 c 8.1,-0.1 13.7,-1.3 16.6,-3.7 z"
-     id="path4374"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 1803.6,499.80813 0,155.4 -20,0 0,-155.4 -56.8,0 0,-19.2 133.9,0 0,19.2 -57.1,0 z"
-     id="path4376"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 2082.2,655.20813 0,-76.9 -105.2,0 0,76.9 -20,0 0,-174.7 20,0 0,78.9 105.2,0 0,-78.9 20,0 0,174.7 -20,0 z"
-     id="path4378"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 2241.4,499.80813 0,57.4 88.1,0 0,19.2 -88.1,0 0,59.8 101.8,0 0,19 -121.8,0 0,-174.7 118.6,0 0,19.2 -98.6,0 z"
-     id="path4380"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 1574.5,1852.4081 417.3,-997.59997 80.1,0 417.3,997.59997 -105.4,0 -129.3,-311.9 -448.2,0 -127.9,311.9 -103.9,0 z m 458.1,-882.39997 -205.1,493.19997 404.7,0 -199.6,-493.19997 z"
-     id="path4382"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 2596.9,1852.4081 0,-997.59997 413.1,0 c 171.4,0 295.1,158.79997 295.1,313.29997 0,163 -115.2,316.1 -286.6,316.1 l -324.6,0 0,368.1 -97,0 z m 97,-455.3 318.9,0 c 118,0 193.9,-108.2 193.9,-229 0,-125.1 -92.7,-226.19997 -202.3,-226.19997 l -310.5,0 0,455.19997 z"
-     id="path4384"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 3250.5,1852.4081 417.3,-997.59997 80.1,0 417.3,997.59997 -105.4,0 -129.3,-311.9 -448.2,0 -127.9,311.9 -103.9,0 z m 458.1,-882.39997 -205.1,493.19997 404.7,0 -199.6,-493.19997 z"
-     id="path4386"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 4637.3,849.10813 c 177,0 306.3,89.9 368.1,217.79997 l -78.7,47.8 c -63.2,-132.09997 -186.9,-176.99997 -295.1,-176.99997 -238.9,0 -369.5,213.59997 -369.5,414.49997 0,220.6 161.6,420.1 373.7,420.1 112.4,0 244.5,-56.2 307.7,-185.5 l 81.5,42.1 c -64.6,148.9 -241.7,231.8 -394.8,231.8 -274,0 -466.5,-261.3 -466.5,-514.2 0.1,-240.2 172.9,-497.39997 473.6,-497.39997 z"
-     id="path4388"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 5949.1,854.80813 0,997.59997 -98.4,0 0,-466.5 -591.5,0 0,466.5 -96.9,0 0,-997.59997 96.9,0 0,443.99997 591.5,0 0,-443.99997 98.4,0 z"
-     id="path4390"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 6844.6,1765.2081 0,87.1 -670.2,0 0,-997.49997 657.6,0 0,87.1 -560.6,0 0,359.69997 489,0 0,82.9 -489,0 0,380.8 573.2,0 z"
-     id="path4392"
-     inkscape:connector-curvature="0"
-     style="fill:#d22128" /><path
-     d="m 1667.6,2063.6081 c 11.8,3.5 22.2,8.3 31,14.2 l -10.3,22.6 c -9,-6 -18.6,-10.4 -28.9,-13.4 -10.2,-2.9 -20,-4.4 -29.2,-4.4 -13.6,0 -24.5,2.4 -32.6,7.3 -8.1,4.9 -12.2,11.8 -12.2,20.7 0,7.6 2.3,14 6.8,19 4.5,5 10.2,8.9 17,11.7 6.8,2.8 16.1,6 28,9.6 14.4,4.6 26,8.9 34.7,12.9 8.8,4 16.3,9.9 22.5,17.8 6.2,7.8 9.3,18.2 9.3,31 0,11.7 -3.2,21.8 -9.5,30.6 -6.3,8.7 -15.3,15.5 -26.8,20.3 -11.6,4.8 -24.9,7.2 -40,7.2 -15.1,0 -29.7,-2.9 -43.9,-8.7 -14.2,-5.8 -26.4,-13.6 -36.6,-23.4 l 10.7,-21.6 c 9.6,9.4 20.7,16.7 33.3,21.9 12.6,5.2 24.8,7.8 36.8,7.8 15.3,0 27.3,-3 36.1,-8.9 8.8,-5.9 13.2,-13.9 13.2,-23.9 0,-7.8 -2.3,-14.3 -6.9,-19.4 -4.6,-5.1 -10.3,-9 -17.1,-11.9 -6.8,-2.8 -16.1,-6 -28,-9.6 -14.2,-4.2 -25.7,-8.3 -34.6,-12.2 -8.9,-3.9 -16.4,-9.7 -22.5,-17.5 -6.1,-7.7 -9.2,-17.9 -9.2,-30.6 0,-10.9 3,-20.4 9,-28.6 6,-8.2 14.6,-14.6 25.6,-19.1 11.1,-4.5 23.8,-6.8 38.2,-6.8 12.3,0.1 24.2,1.9 36.1,5.4 z"
-     id="path4394"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 1980.1,2072.8081 c 16.8,9.4 30.2,22.3 40,38.4 9.8,16.2 14.8,33.9 14.8,53.3 0,19.5 -4.9,37.4 -14.8,53.6 -9.8,16.3 -23.2,29.1 -40,38.6 -16.8,9.5 -35.3,14.3 -55.2,14.3 -20.3,0 -38.8,-4.7 -55.7,-14.3 -16.8,-9.5 -30.2,-22.4 -40,-38.6 -9.8,-16.3 -14.8,-34.1 -14.8,-53.6 0,-19.5 4.9,-37.3 14.8,-53.5 9.8,-16.2 23.2,-29 40,-38.3 16.8,-9.4 35.4,-14 55.7,-14 19.9,-0.1 38.3,4.6 55.2,14.1 z m -98.2,19.9 c -13.1,7.4 -23.6,17.5 -31.4,30.1 -7.8,12.6 -11.8,26.5 -11.8,41.7 0,15.3 3.9,29.3 11.8,42 7.8,12.7 18.3,22.8 31.4,30.2 13.1,7.4 27.4,11.1 42.9,11.1 15.5,0 29.7,-3.7 42.7,-11.1 13,-7.4 23.3,-17.4 31.1,-30.2 7.7,-12.7 11.6,-26.7 11.6,-42 0,-15.3 -3.9,-29.2 -11.6,-41.8 -7.7,-12.6 -18.1,-22.6 -31.1,-30 -13,-7.4 -27.2,-11.2 -42.6,-11.2 -15.5,0 -29.8,3.7 -43,11.2 z"
-     id="path4396"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 2186.5,2082.4081 0,74 98.4,0 0,23.2 -98.4,0 0,90.2 -24.1,0 0,-210.6 133.8,0 0,23.2 -109.7,0 z"
-     id="path4398"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 2491.6,2082.4081 0,187.4 -24.1,0 0,-187.4 -68.4,0 0,-23.2 161.4,0 0,23.2 -68.9,0 z"
-     id="path4400"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 2871.8,2269.8081 -56.8,-177.4 -57.6,177.4 -24.5,0 -70.5,-210.6 25.9,0 57.9,182.7 57.1,-182.4 24.1,-0.3 57.7,182.7 57.1,-182.7 25,0 -70.6,210.6 -24.8,0 z"
-     id="path4402"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 3087.3,2216.6081 -23.5,53.2 -25.6,0 94.4,-210.6 25,0 94.1,210.6 -26.1,0 -23.5,-53.2 -114.8,0 z m 57.2,-130 -46.9,106.8 94.4,0 -47.5,-106.8 z"
-     id="path4404"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 3461.1,2202.7081 c -6,0.4 -10.7,0.6 -14.1,0.6 l -56,0 0,66.5 -24,0 0,-210.6 80,0 c 26.2,0 46.6,6.2 61.2,18.5 14.5,12.3 21.8,29.8 21.8,52.3 0,17.2 -4.1,31.7 -12.2,43.3 -8.1,11.6 -19.8,20 -35,25 l 49.2,71.5 -27.3,0 -43.6,-67.1 z m 30.2,-35.1 c 10.3,-8.4 15.5,-20.8 15.5,-37 0,-15.9 -5.2,-27.9 -15.5,-36 -10.3,-8.1 -25.1,-12.2 -44.3,-12.2 l -56,0 0,97.8 56,0 c 19.2,0 34,-4.2 44.3,-12.6 z"
-     id="path4406"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 3688.3,2082.4081 0,69.2 106.2,0 0,23.2 -106.2,0 0,72.1 122.8,0 0,22.9 -146.9,0 0,-210.6 142.9,0 0,23.2 -118.8,0 z"
-     id="path4408"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 4147,2082.4081 0,74 98.4,0 0,23.2 -98.4,0 0,90.2 -24.1,0 0,-210.6 133.8,0 0,23.2 -109.7,0 z"
-     id="path4410"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 4523.3,2072.8081 c 16.8,9.4 30.2,22.3 40,38.4 9.8,16.2 14.8,33.9 14.8,53.3 0,19.5 -4.9,37.4 -14.8,53.6 -9.8,16.3 -23.2,29.1 -40,38.6 -16.8,9.5 -35.3,14.3 -55.2,14.3 -20.3,0 -38.8,-4.7 -55.7,-14.3 -16.8,-9.5 -30.2,-22.4 -40,-38.6 -9.8,-16.3 -14.8,-34.1 -14.8,-53.6 0,-19.5 4.9,-37.3 14.8,-53.5 9.8,-16.2 23.2,-29 40,-38.3 16.8,-9.4 35.4,-14 55.7,-14 20,-0.1 38.4,4.6 55.2,14.1 z m -98.1,19.9 c -13.1,7.4 -23.6,17.5 -31.4,30.1 -7.8,12.6 -11.8,26.5 -11.8,41.7 0,15.3 3.9,29.3 11.8,42 7.8,12.7 18.3,22.8 31.4,30.2 13.1,7.4 27.4,11.1 42.9,11.1 15.5,0 29.7,-3.7 42.7,-11.1 13,-7.4 23.3,-17.4 31.1,-30.2 7.7,-12.7 11.6,-26.7 11.6,-42 0,-15.3 -3.9,-29.2 -11.6,-41.8 -7.7,-12.6 -18.1,-22.6 -31.1,-30 -13,-7.4 -27.2,-11.2 -42.6,-11.2 -15.6,0 -29.9,3.7 -43,11.2 z"
-     id="path4412"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 4854.7,2247.7081 c -15.7,15.5 -37.3,23.3 -64.8,23.3 -27.7,0 -49.4,-7.8 -65.1,-23.3 -15.7,-15.5 -23.6,-37 -23.6,-64.6 l 0,-124 24.1,0 0,124 c 0,20.3 5.8,36.1 17.3,47.5 11.6,11.4 27.3,17.1 47.3,17.1 20.1,0 35.8,-5.7 47.1,-17 11.4,-11.3 17,-27.2 17,-47.7 l 0,-124 24.1,0 0,124 c 0.1,27.7 -7.7,49.2 -23.4,64.7 z"
-     id="path4414"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 5169.5,2269.8081 -126.3,-169.1 0,169.1 -24.1,0 0,-210.6 25,0 126.3,169.3 0,-169.3 23.8,0 0,210.6 -24.7,0 z"
-     id="path4416"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 5478.4,2073.1081 c 16.4,9.3 29.4,21.9 38.9,37.9 9.6,16 14.3,33.9 14.3,53.5 0,19.6 -4.8,37.6 -14.3,53.6 -9.5,16.1 -22.6,28.7 -39.3,37.9 -16.6,9.2 -35.2,13.8 -55.5,13.8 l -84.3,0 0,-210.6 85.2,0 c 20.3,0 38.6,4.6 55,13.9 z m -116.1,173.8 61.4,0 c 15.5,0 29.6,-3.5 42.3,-10.6 12.7,-7.1 22.8,-16.9 30.2,-29.5 7.4,-12.5 11.1,-26.5 11.1,-42 0,-15.5 -3.8,-29.4 -11.3,-41.9 -7.5,-12.5 -17.7,-22.3 -30.6,-29.6 -12.8,-7.2 -27,-10.9 -42.6,-10.9 l -60.5,0 0,164.5 z"
-     id="path4418"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 5668.6,2216.6081 -23.5,53.2 -25.6,0 94.4,-210.6 25,0 94.1,210.6 -26,0 -23.5,-53.2 -114.9,0 z m 57.2,-130 -46.9,106.8 94.4,0 -47.5,-106.8 z"
-     id="path4420"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 5991,2082.4081 0,187.4 -24,0 0,-187.4 -68.4,0 0,-23.2 161.4,0 0,23.2 -69,0 z"
-     id="path4422"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 6175.9,2269.8081 0,-210.6 24.1,0 0,210.6 -24.1,0 z"
-     id="path4424"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 6493.7,2072.8081 c 16.8,9.4 30.2,22.3 40,38.4 9.8,16.2 14.8,33.9 14.8,53.3 0,19.5 -4.9,37.4 -14.8,53.6 -9.8,16.3 -23.2,29.1 -40,38.6 -16.8,9.5 -35.3,14.3 -55.2,14.3 -20.3,0 -38.8,-4.7 -55.7,-14.3 -16.8,-9.5 -30.2,-22.4 -40,-38.6 -9.8,-16.3 -14.8,-34.1 -14.8,-53.6 0,-19.5 4.9,-37.3 14.8,-53.5 9.8,-16.2 23.2,-29 40,-38.3 16.8,-9.4 35.4,-14 55.7,-14 20,-0.1 38.4,4.6 55.2,14.1 z m -98.1,19.9 c -13.1,7.4 -23.6,17.5 -31.4,30.1 -7.8,12.6 -11.8,26.5 -11.8,41.7 0,15.3 3.9,29.3 11.8,42 7.8,12.7 18.3,22.8 31.4,30.2 13.1,7.4 27.4,11.1 42.9,11.1 15.5,0 29.7,-3.7 42.7,-11.1 13,-7.4 23.3,-17.4 31.1,-30.2 7.7,-12.7 11.6,-26.7 11.6,-42 0,-15.3 -3.9,-29.2 -11.6,-41.8 -7.7,-12.6 -18.1,-22.6 -31.1,-30 -13,-7.4 -27.2,-11.2 -42.6,-11.2 -15.6,0 -29.8,3.7 -43,11.2 z"
-     id="path4426"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><path
-     d="m 6826.5,2269.8081 -126.3,-169.1 0,169.1 -24.1,0 0,-210.6 25,0 126.3,169.3 0,-169.3 23.8,0 0,210.6 -24.7,0 z"
-     id="path4428"
-     inkscape:connector-curvature="0"
-     style="fill:#6d6e71" /><linearGradient
-     id="SVGID_1_"
-     gradientUnits="userSpaceOnUse"
-     x1="-4516.6152"
-     y1="-2338.7222"
-     x2="-4108.4111"
-     y2="-1861.3982"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0"
-       style="stop-color:#F69923"
-       id="stop4431" /><stop
-       offset="0.3123"
-       style="stop-color:#F79A23"
-       id="stop4433" /><stop
-       offset="0.8383"
-       style="stop-color:#E97826"
-       id="stop4435" /></linearGradient><path
-     d="m 1230.1,13.708128 c -45.3,26.8 -120.6,102.500002 -210.5,212.300002 l 82.6,155.9 c 58,-82.9 116.9,-157.5 176.3,-221.2 4.6,-5.1 7,-7.5 7,-7.5 -2.3,2.5 -4.6,5 -7,7.5 -19.2,21.2 -77.5,89.2 -165.5,224.4 84.7,-4.2 214.9,-21.6 321.1,-39.7 31.6,-177 -31,-258.000002 -31,-258.000002 0,0 -79.7,-128.8 -173,-73.7 z"
-     id="path4437"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_1_)" /><path
-     d="m 1090.2,903.10813 c 0.6,-0.1 1.2,-0.2 1.8,-0.3 l -11.9,1.3 c -0.7,0.3 -1.4,0.7 -2.1,1 4.1,-0.7 8.2,-1.4 12.2,-2 z"
-     id="path4439"
-     inkscape:connector-curvature="0"
-     style="fill:none" /><path
-     d="m 1005.9,1182.3081 c -6.7,1.5 -13.7,2.7 -20.7,3.7 7.1,-1 14,-2.2 20.7,-3.7 z"
-     id="path4441"
-     inkscape:connector-curvature="0"
-     style="fill:none" /><path
-     d="m 432.9,1808.8081 c 0.9,-2.3 1.8,-4.7 2.6,-7 18.2,-48 36.2,-94.7 54,-140.1 20,-51 39.8,-100.4 59.3,-148.3 20.6,-50.4 40.9,-99.2 60.9,-146.3 21,-49.4 41.7,-97 62,-142.8 16.5,-37.3 32.8,-73.4 48.9,-108.3 5.4,-11.7 10.7,-23.2 16,-34.6 10.5,-22.7 21,-44.8 31.3,-66.5 9.5,-19.99997 19,-39.59997 28.3,-58.79997 3.1,-6.4 6.2,-12.8 9.3,-19.1 0.5,-1 1,-2 1.5,-3.1 l -10.2,1.1 -8,-15.9 c -0.8,1.6 -1.6,3.1 -2.4,4.6 -14.5,28.8 -28.9,57.9 -43.1,87.19997 -8.2,16.9 -16.4,34 -24.6,51 -22.6,47.4 -44.8,95.2 -66.6,143.3 -22.1,48.6 -43.7,97.5 -64.9,146.5 -20.8,48.1 -41.3,96.2 -61.2,144.2 -20,48 -39.5,95.7 -58.5,143.2 -19.9,49.5 -39.2,98.7 -58,147.2 -4.2,10.9 -8.5,21.9 -12.7,32.8 -15,39.2 -29.7,77.8 -44,116 l 12.7,25.1 11.4,-1.2 c 0.4,-1.1 0.8,-2.3 1.3,-3.4 18.5,-50.2 36.7,-99.2 54.7,-146.8 z"
-     id="path4443"
-     inkscape:connector-curvature="0"
-     style="fill:none" /><path
-     d="m 980,1186.8081 0,0 c 0.1,0 0.1,0 0.1,-0.1 0,0.1 0,0.1 -0.1,0.1 z"
-     id="path4445"
-     inkscape:connector-curvature="0"
-     style="fill:none" /><path
-     d="m 952.6,1323.0081 c -10.6,1.9 -21.4,3.8 -32.5,5.7 -0.1,0 -0.1,0.1 -0.2,0.1 5.6,-0.8 11.2,-1.7 16.6,-2.6 5.5,-1 10.8,-2.1 16.1,-3.2 z"
-     id="path4447"
-     inkscape:connector-curvature="0"
-     style="fill:#be202e" /><path
-     d="m 952.6,1323.0081 c -10.6,1.9 -21.4,3.8 -32.5,5.7 -0.1,0 -0.1,0.1 -0.2,0.1 5.6,-0.8 11.2,-1.7 16.6,-2.6 5.5,-1 10.8,-2.1 16.1,-3.2 z"
-     id="path4449"
-     inkscape:connector-curvature="0"
-     style="opacity:0.35;fill:#be202e" /><path
-     d="m 980.3,1186.7081 c -0.1,0 -0.1,0 0,0 -0.1,0.1 -0.2,0.1 -0.2,0.1 1.8,-0.2 3.5,-0.5 5.2,-0.8 7,-1 13.9,-2.2 20.7,-3.7 -8.5,1.5 -17,2.9 -25.7,4.4 l 0,0 0,0 z"
-     id="path4451"
-     inkscape:connector-curvature="0"
-     style="fill:#be202e" /><path
-     d="m 980.3,1186.7081 c -0.1,0 -0.1,0 0,0 -0.1,0.1 -0.2,0.1 -0.2,0.1 1.8,-0.2 3.5,-0.5 5.2,-0.8 7,-1 13.9,-2.2 20.7,-3.7 -8.5,1.5 -17,2.9 -25.7,4.4 l 0,0 0,0 z"
-     id="path4453"
-     inkscape:connector-curvature="0"
-     style="opacity:0.35;fill:#be202e" /><linearGradient
-     id="SVGID_2_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7537.7339"
-     y1="-2391.4075"
-     x2="-4625.4141"
-     y2="-2391.4075"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4456" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4458" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4460" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4462" /></linearGradient><path
-     d="m 858.6,784.70813 c 25.1,-46.9 50.5,-92.8 76.2,-137.4 26.7,-46.4 53.7,-91.3 80.9,-134.7 1.6,-2.6 3.2,-5.2 4.8,-7.7 27,-42.7 54.2,-83.7 81.6,-122.9 l -82.6,-156 c -6.2,7.6 -12.5,15.3 -18.8,23.2 -23.8,29.7 -48.6,61.6 -73.9,95.5 -28.6,38.2 -58,78.9 -87.8,121.7 -27.6,39.5 -55.5,80.9 -83.5,123.7 -23.8,36.5 -47.7,74 -71.4,112.5 -0.9,1.4 -1.8,2.9 -2.6,4.3 l 107.5,212.3 c 22.8,-45.6 46.1,-90.5 69.6,-134.5 z"
-     id="path4464"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_2_)" /><linearGradient
-     id="SVGID_3_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7186.1777"
-     y1="-2099.3059"
-     x2="-5450.7183"
-     y2="-2099.3059"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0"
-       style="stop-color:#282662"
-       id="stop4467" /><stop
-       offset="9.548390e-02"
-       style="stop-color:#662E8D"
-       id="stop4469" /><stop
-       offset="0.7882"
-       style="stop-color:#9F2064"
-       id="stop4471" /><stop
-       offset="0.9487"
-       style="stop-color:#CD2032"
-       id="stop4473" /></linearGradient><path
-     d="m 369,1981.0081 c -14.2,39.1 -28.5,78.9 -42.9,119.6 -0.2,0.6 -0.4,1.2 -0.6,1.8 -2,5.7 -4.1,11.5 -6.1,17.2 -9.7,27.4 -18,52.1 -37.3,108.2 31.7,14.5 57.1,52.5 81.1,95.6 -2.6,-44.7 -21,-86.6 -56.2,-119.1 156.1,7 290.6,-32.4 360.1,-146.6 6.2,-10.2 11.9,-20.9 17,-32.2 -31.6,40.1 -70.8,57.1 -144.5,53 -0.2,0.1 -0.3,0.1 -0.5,0.2 0.2,-0.1 0.3,-0.1 0.5,-0.2 108.6,-48.6 163.1,-95.3 211.2,-172.6 11.4,-18.3 22.5,-38.4 33.8,-60.6 -94.9,97.5 -205,125.3 -320.9,104.2 l -86.9,9.5 c -2.4,7.3 -5.1,14.6 -7.8,22 z"
-     id="path4475"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_3_)" /><linearGradient
-     id="SVGID_4_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7374.1626"
-     y1="-2418.5454"
-     x2="-4461.8428"
-     y2="-2418.5454"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4478" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4480" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4482" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4484" /></linearGradient><path
-     d="m 409.6,1786.3081 c 18.8,-48.5 38.1,-97.7 58,-147.2 19,-47.4 38.5,-95.2 58.5,-143.2 20,-48 40.4,-96.1 61.2,-144.2 21.2,-49 42.9,-97.8 64.9,-146.5 21.8,-48.1 44,-95.9 66.6,-143.3 8.1,-17.1 16.3,-34.1 24.6,-51 14.2,-29.29997 28.6,-58.39997 43.1,-87.19997 0.8,-1.6 1.6,-3.1 2.4,-4.6 l -107.5,-212.3 c -1.8,2.9 -3.5,5.8 -5.3,8.6 -25.1,40.9 -50,82.7 -74.4,125.4 -24.7,43.1 -49,87.1 -72.7,131.7 -20,37.59997 -39.6,75.59997 -58.6,113.89997 -3.8,7.8 -7.6,15.5 -11.3,23.2 -23.4,48.2 -44.6,94.8 -63.7,139.5 -21.7,50.7 -40.7,99.2 -57.5,145.1 -11,30.2 -21,59.4 -30.1,87.4 -7.5,24 -14.7,47.9 -21.5,71.8 -16,56.3 -29.9,112.4 -41.2,168.3 l 107.9,213.4 c 14.3,-38.1 28.9,-76.8 44,-116 4.1,-10.9 8.4,-21.8 12.6,-32.8 z"
-     id="path4486"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_4_)" /><linearGradient
-     id="SVGID_5_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7161.7642"
-     y1="-2379.1431"
-     x2="-5631.2524"
-     y2="-2379.1431"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0"
-       style="stop-color:#282662"
-       id="stop4489" /><stop
-       offset="9.548390e-02"
-       style="stop-color:#662E8D"
-       id="stop4491" /><stop
-       offset="0.7882"
-       style="stop-color:#9F2064"
-       id="stop4493" /><stop
-       offset="0.9487"
-       style="stop-color:#CD2032"
-       id="stop4495" /></linearGradient><path
-     d="m 243.5,1729.4081 c -13.6,68.2 -23.2,136.2 -28,203.8 -0.2,2.4 -0.4,4.7 -0.5,7.1 -33.7,-54 -124,-106.8 -123.8,-106.2 64.6,93.7 113.7,186.7 120.9,278 -34.6,7.1 -82,-3.2 -136.8,-23.3 57.1,52.5 100,67 116.7,70.9 -52.5,3.3 -107.1,39.3 -162.1,80.8 80.5,-32.8 145.5,-45.8 192.1,-35.3 -73.9,209 -147.9,439.8 -222,684.8 22.7,-6.7 36.2,-21.9 43.9,-42.6 13.2,-44.4 100.8,-335.6 238,-718.2 3.9,-10.9 7.8,-21.8 11.8,-32.9 1.1,-3 2.2,-6.1 3.3,-9.2 14.5,-40.1 29.5,-81.1 45.1,-122.9 3.5,-9.5 7.1,-19 10.7,-28.6 0.1,-0.2 0.1,-0.4 0.2,-0.6 l -107.9,-213.2 c -0.5,2.6 -1.1,5.1 -1.6,7.6 z"
-     id="path4497"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_5_)" /><linearGradient
-     id="SVGID_6_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7374.1626"
-     y1="-2117.1309"
-     x2="-4461.8428"
-     y2="-2117.1309"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4500" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4502" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4504" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4506" /></linearGradient><path
-     d="m 805.6,937.00813 c -3.1,6.3 -6.2,12.7 -9.3,19.1 -9.3,19.2 -18.8,38.8 -28.3,58.79997 -10.3,21.7 -20.7,43.9 -31.3,66.5 -5.3,11.4 -10.6,22.9 -16,34.6 -16.1,35 -32.4,71.1 -48.9,108.3 -20.3,45.8 -41,93.4 -62,142.8 -20,47.1 -40.3,95.9 -60.9,146.3 -19.5,47.9 -39.3,97.3 -59.3,148.3 -17.8,45.4 -35.9,92.1 -54,140.1 -0.9,2.3 -1.8,4.7 -2.6,7 -18,47.6 -36.2,96.6 -54.6,146.8 -0.4,1.1 -0.8,2.3 -1.3,3.4 l 86.9,-9.5 c -1.7,-0.3 -3.5,-0.5 -5.2,-0.9 103.9,-13 242.1,-90.6 331.4,-186.5 41.1,-44.2 78.5,-96.3 113,-157.3 25.7,-45.4 49.8,-95.8 72.8,-151.5 20.1,-48.7 39.4,-101.4 58,-158.6 -23.9,12.6 -51.2,21.8 -81.4,28.2 -5.3,1.1 -10.7,2.2 -16.1,3.1 -5.5,1 -11,1.8 -16.6,2.6 l 0,0 0,0 c 0.1,0 0.1,-0.1 0.2,-0.1 96.9,-37.3 158,-109.2 202.4,-197.4 -25.5,17.4 -66.9,40.1 -116.6,51.1 -6.7,1.5 -13.7,2.7 -20.7,3.7 -1.7,0.3 -3.5,0.6 -5.2,0.8 l 0,0 0,0 c 0.1,0 0.1,0 0.1,-0.1 0,0 0.1,0 0.1,0 l 0,0 c 33.6,-14.1 62,-29.8 86.6,-48.4 5.3,-4 10.4,-8.1 15.3,-12.3 7.5,-6.5 14.7,-13.3 21.5,-20.5 4.4,-4.6 8.6,-9.3 12.7,-14.2 9.6,-11.5 18.7,-23.9 27.1,-37.3 2.6,-4.1 5.1,-8.3 7.6,-12.6 3.2,-6.2 6.3,-12.3 9.3,-18.3 13.5,-27.19997 24.4,-51.49997 33,-72.79997 4.3,-10.6 8.1,-20.5 11.3,-29.7 1.3,-3.7 2.5,-7.2 3.7,-10.6 3.4,-10.2 6.2,-19.3 8.4,-27.3 3.3,-12 5.3,-21.5 6.4,-28.4 l 0,0 0,0 c -3.3,2.6 -7.1,5.2 -11.3,7.7 -29.3,17.5 -79.5,33.4 -119.9,40.8 l 79.8,-8.8 -79.8,8.8 c -0.6,0.1 -1.2,0.2 -1.8,0.3 -4,0.7 -8.1,1.3 -12.2,2 0.7,-0.3 1.4,-0.7 2.1,-1 l -273,29.9 c -0.4,1.1 -0.9,2.1 -1.4,3.1 z"
-     id="path4508"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_6_)" /><linearGradient
-     id="SVGID_7_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7554.8232"
-     y1="-2132.0981"
-     x2="-4642.5034"
-     y2="-2132.0981"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4511" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4513" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4515" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4517" /></linearGradient><path
-     d="m 1112.9,385.10813 c -24.3,37.3 -50.8,79.6 -79.4,127.5 -1.5,2.5 -3,5.1 -4.5,7.6 -24.6,41.5 -50.8,87.1 -78.3,137 -23.8,43.1 -48.5,89.3 -74.3,139 -22.4,43.3 -45.6,89.2 -69.4,137.8 l 273,-29.9 c 79.5,-36.6 115.1,-69.7 149.6,-117.6 9.2,-13.2 18.4,-27 27.5,-41.3 28,-43.8 55.6,-92 80.1,-139.9 23.7,-46.3 44.7,-92.2 60.7,-133.5 10.2,-26.3 18.4,-50.8 24.1,-72.3 5,-19 8.9,-36.9 11.9,-54.1 -106,18.1 -236.3,35.5 -321,39.7 z"
-     id="path4519"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_7_)" /><path
-     d="m 936.5,1326.1081 c -5.5,1 -11,1.8 -16.6,2.6 l 0,0 c 5.6,-0.7 11.1,-1.6 16.6,-2.6 z"
-     id="path4521"
-     inkscape:connector-curvature="0"
-     style="fill:#be202e" /><path
-     d="m 936.5,1326.1081 c -5.5,1 -11,1.8 -16.6,2.6 l 0,0 c 5.6,-0.7 11.1,-1.6 16.6,-2.6 z"
-     id="path4523"
-     inkscape:connector-curvature="0"
-     style="opacity:0.35;fill:#be202e" /><linearGradient
-     id="SVGID_8_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7374.1626"
-     y1="-2027.484"
-     x2="-4461.8433"
-     y2="-2027.484"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4526" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4528" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4530" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4532" /></linearGradient><path
-     d="m 936.5,1326.1081 c -5.5,1 -11,1.8 -16.6,2.6 l 0,0 c 5.6,-0.7 11.1,-1.6 16.6,-2.6 z"
-     id="path4534"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_8_)" /><path
-     d="m 980,1186.8081 c 1.8,-0.2 3.5,-0.5 5.2,-0.8 -1.7,0.3 -3.4,0.6 -5.2,0.8 l 0,0 z"
-     id="path4536"
-     inkscape:connector-curvature="0"
-     style="fill:#be202e" /><path
-     d="m 980,1186.8081 c 1.8,-0.2 3.5,-0.5 5.2,-0.8 -1.7,0.3 -3.4,0.6 -5.2,0.8 l 0,0 z"
-     id="path4538"
-     inkscape:connector-curvature="0"
-     style="opacity:0.35;fill:#be202e" /><linearGradient
-     id="SVGID_9_"
-     gradientUnits="userSpaceOnUse"
-     x1="-7374.1626"
-     y1="-2037.7417"
-     x2="-4461.8433"
-     y2="-2037.7417"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4541" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4543" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4545" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4547" /></linearGradient><path
-     d="m 980,1186.8081 c 1.8,-0.2 3.5,-0.5 5.2,-0.8 -1.7,0.3 -3.4,0.6 -5.2,0.8 l 0,0 z"
-     id="path4549"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_9_)" /><path
-     d="m 980.2,1186.7081 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-     id="path4551"
-     inkscape:connector-curvature="0"
-     style="fill:#be202e" /><path
-     d="m 980.2,1186.7081 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-     id="path4553"
-     inkscape:connector-curvature="0"
-     style="opacity:0.35;fill:#be202e" /><linearGradient
-     id="SVGID_10_"
-     gradientUnits="userSpaceOnUse"
-     x1="-5738.0635"
-     y1="-2039.799"
-     x2="-5094.3457"
-     y2="-2039.799"
-     gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,5117.8774,-2859.9262)"><stop
-       offset="0.3233"
-       style="stop-color:#9E2064"
-       id="stop4556" /><stop
-       offset="0.6302"
-       style="stop-color:#C92037"
-       id="stop4558" /><stop
-       offset="0.7514"
-       style="stop-color:#CD2335"
-       id="stop4560" /><stop
-       offset="1"
-       style="stop-color:#E97826"
-       id="stop4562" /></linearGradient><path
-     d="m 980.2,1186.7081 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-     id="path4564"
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_10_)" /></svg>
\ No newline at end of file
+      .cls-2 {
+        fill: #f79a23;
+      }
+
+      .cls-3 {
+        fill: #dd552c;
+      }
+
+      .cls-4 {
+        fill: #d22128;
+      }
+    </style>
+  </defs>
+  <g>
+    <g>
+      <path class="cls-1" d="M458.8041825,181.7454822h49.0451573l87.4128103,220.0939304h-53.4548455l-14.7775045-38.0445002h-87.4060779l-15.0939249,38.0445002h-53.1384251l87.4128103-220.0939304ZM514.4537735,324.4914631l-31.1236462-80.4919562-30.8139581,80.4919562h61.9376043Z"/>
+      <path class="cls-1" d="M622.7166664,331.7220052h48.7354693c.3164204,21.0655178,16.0364536,33.3318564,40.2459781,33.3318564,20.7490974,0,33.9579648-8.4894912,33.9579648-23.2669957,0-15.4103452-14.1513961-24.5259448-45.2750423-31.4467989-51.5697879-10.6909691-76.0957328-32.0661749-76.0957328-68.2256176,0-39.9295577,31.7564869-64.7719229,82.3837461-64.7719229,52.189164,0,85.5210204,28.2960599,85.5210204,72.6285734h-48.1093609c0-19.8065687-13.8349757-31.7564869-36.7855511-31.7564869-21.0655178,0-33.9579648,8.8059116-33.9579648,23.2669957,0,13.5252877,11.6334979,22.0147789,45.2750423,29.8714294,54.7137946,12.892447,77.6643699,33.6415444,77.6643699,68.542038,0,41.5049272-32.0729073,66.3472924-84.2620713,66.3472924-55.339903,0-89.2978678-28.9289006-89.2978678-74.5203633Z"/>
+      <path class="cls-1" d="M852.9091193,181.7454822h137.7169167v45.2750423h-87.7224983v55.0234826h79.8591155v44.0228255h-79.8591155v75.7725801h-49.9944184v-220.0939304Z"/>
+    </g>
+    <g>
+      <path class="cls-3" d="M141.1077177,209.8881008c13.1869872-32.608129,27.9005344-65.1523006,43.6878912-93.9970469-23.5665852-17.5041056-46.1956909-55.2490163-55.4930639-71.9721694-3.3392448,3.7936783-5.5070609,8.1629723-6.4899838,11.7176522-8.7587851,31.6252061,22.4204029,69.8144518-2.6929393,55.86166-20.9241385-11.6267655-68.040478-37.0885068-86.0124818-11.7816095,20.1280383,25.862316,72.7733189,90.9304622,107.0005776,110.1715137Z"/>
+      <path class="cls-2" d="M184.7956089,115.8910539c15.2975784-27.9493439,31.5999598-52.4281623,48.5015202-70.0635487,0,0-16.8578001,24.4013964-40.9360438,73.180626,14.5822664,4.0158458,56.1124399,12.2562401,113.9601427-2.686207,1.4222086-10.5125619-5.645074-22.0753701-40.8636711-25.9464703-22.9926525-2.5246306,27.5975787-54.9023003-9.0516423-79.6739759-1.1832102-.8011494-2.3462234-1.508046-3.4856733-2.1408868-1.2286536-.4409688-2.5263137-.8449097-3.9114944-1.2050903-42.8025874-11.1689658-48.7354693,61.409115-65.8154369,45.8068978-27.6009449-25.2126444-45.0225792-19.3218396-53.890765-9.2435142,9.297373,16.7231532,31.9264787,54.4680639,55.4930639,71.9721694Z"/>
+      <path class="cls-4" d="M106.6818547,303.8380213c9.6626029-28.9457315,21.2860022-61.4663399,34.425863-93.9499204-34.2272587-19.2410514-86.8725393-84.3091977-107.0005776-110.1715137-3.5933909,5.0559936-6.0490149,12.1081284-6.8669953,21.7522173-4.3894911,51.802054,49.0518897,90.152876,38.3979485,97.1578844-14.0924881,9.2670774-42.1411341-22.2605096-53.19565-2.2284073,16.0229889,20.5841549,48.6614135,57.7770131,94.2394114,87.4397396Z"/>
+      <path class="cls-3" d="M254.7564893,192.1180675c-27.0589909-9.6508213,28.2758628-35.5333343,46.2445004-62.9912168,2.2990969-3.5109196,4.6756159-8.0485224,5.3202382-12.8049265-57.8477027,14.942447-99.3778763,6.7020527-113.9601427,2.686207-12.4649429,25.2564046-26.8587035,57.0835812-41.8701571,95.4579665,15.6341958,6.6852219,79.4703224,31.3794754,169.6366631,31.50739,15.1595653-39.4852227-39.6905594-44.6994265-65.3711019-53.8554202Z"/>
+      <path class="cls-4" d="M117.1371916,309.0488589c15.9001236,4.9550083,68.5841152,19.7560761,124.5366618,17.5276688,7.5166669-20.3518889-20.585838-22.3379316-22.8748364-38.6605101-1.7722907-12.6298854,73.9565291,10.6135471,98.3225807-35.3111668,1.2320197-2.3226602,2.1930625-4.5140395,3.0059935-6.6313631-90.1663407-.1279146-154.0024672-24.8221682-169.6366631-31.50739-10.9703615,28.0435968-22.2554604,59.5173251-33.3537365,94.5827612Z"/>
+      <path class="cls-1" d="M117.1371916,309.0488589c-7.1447046,22.5701977-14.1934733,46.6821031-21.0352222,72.1640414-2.4270116,9.0348114-4.8254106,18.2379315-7.190148,27.6430221,53.1064464,17.531035,102.0085414.0403941,103.6663821-21.6377674.0134647-.1716749-.018514-.2995895-.0084154-.464532,1.2639984-22.9606739-33.150083-10.2331694-32.3354689-24.0378496.8179803-13.9056654,60.0811593-.0807882,78.4082944-29.8949926,1.4053777-2.2856322,2.3209771-4.3154353,3.0312398-6.244253-55.9525467,2.2284073-108.6365383-12.5726604-124.5366618-17.5276688Z"/>
+      <path class="cls-1" d="M12.4424433,216.3982816c-.7742201,1.4036946-1.4727012,3.0261906-2.068514,4.9651069-10.2920775,33.4496725,62.4846076,78.3847312,52.5830064,88.180298-8.9254108,8.8261086-20.5572255-11.3440069-34.9004936-3.0127259-1.5720033.9155994-3.1675699,2.0701971-4.8052136,3.749918-16.2215932,16.6188018-.2541461,64.4958967,45.7698699,90.0518908-10.7397786,36.0618236-21.4324308,76.351562-31.8995493,118.4859638,3.7970444-1.3296388,8.3413795-2.6626438,9.4724141-6.244253,1.6982349-6.9814452,12.1939658-49.4625629,29.2352225-107.0948305,0,0,3.1103449-11.8051727,8.8042285-31.254927,5.2646964-17.9854685,12.7460184-42.5147795,22.0484407-70.3867014-45.577998-29.6627266-78.2164225-66.8555847-94.2394114-87.4397396Z"/>
+    </g>
+  </g>
+  <g>
+    <polygon class="cls-1" points="404.1671788 144.7351535 413.43089 144.7351535 413.43089 82.5349876 436.7786739 82.5349876 436.7786739 73.4732468 380.8193949 73.4732468 380.8193949 82.5349876 404.1671788 82.5349876 404.1671788 144.7351535"/>
+    <polygon class="cls-1" points="464.8525663 112.9584696 501.321697 112.9584696 501.321697 144.7351535 510.6796611 144.7351535 510.6796611 73.4732468 501.321697 73.4732468 501.321697 103.8899964 464.8525663 103.8899964 464.8525663 73.4732468 455.5955874 73.4732468 455.5955874 144.7351535 464.8525663 144.7351535 464.8525663 112.9584696"/>
+    <polygon class="cls-1" points="581.40298 135.9629037 546.2331925 135.9629037 546.2331925 112.8574844 577.8213707 112.8574844 577.8213707 104.0852345 546.2331925 104.0852345 546.2331925 82.1512438 580.3392689 82.1512438 580.3392689 73.4732468 536.9762136 73.4732468 536.9762136 144.7351535 581.40298 144.7351535 581.40298 135.9629037"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/xdocs/images/favicon.png b/xdocs/images/favicon.png
index f45168b5290ecf4a348dcc94a3ecd3d38bd86530..5ebdeec9c761ac6a3f62d5f0c8148640b0f2b881 100644
GIT binary patch
literal 5326
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
ISk)%{fA?v{6951J

literal 4944
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
O0000<MNUMnLSTY61MUX^

diff --git a/xdocs/images/jmeter.png b/xdocs/images/jmeter.png
index d30a4a9ee64e46c32f761884c44d20822de20164..d670c7ddf047c0fc93711281f03b36d9de532fda 100644
GIT binary patch
literal 9086
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

literal 8580
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

diff --git a/xdocs/images/jmeter_square.png b/xdocs/images/jmeter_square.png
index 6813f8458ec6c1fc89923ca24df30fdb483eaedb..4b5d0c36a97cd9a54f2ec337527bcb3fd6c84965 100644
GIT binary patch
literal 7027
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

literal 6614
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

diff --git a/xdocs/images/jmeter_square.svg b/xdocs/images/jmeter_square.svg
index f7612ad9e23..25fe443be0b 100644
--- a/xdocs/images/jmeter_square.svg
+++ b/xdocs/images/jmeter_square.svg
@@ -2,23 +2,25 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="511.23999"
    height="511.23999"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="jmeter_square.svg">
-  <defs
-     id="defs4">
-    <linearGradient
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="jmeter_square.svg"
+   xml:space="preserve"
+   inkscape:export-filename="jmeter_square.png"
+   inkscape:export-xdpi="48.071358"
+   inkscape:export-ydpi="48.071358"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs4"><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9387"
@@ -26,8 +28,7 @@
        y1="215.96693"
        x2="634.46875"
        y2="215.96693"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9389"
@@ -35,8 +36,7 @@
        y1="216.75172"
        x2="574.69977"
        y2="216.75172"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9391"
@@ -44,8 +44,7 @@
        y1="208.23689"
        x2="491.82263"
        y2="208.23689"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9393"
@@ -53,8 +52,7 @@
        y1="216.75172"
        x2="430.60532"
        y2="216.75172"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9395"
@@ -62,8 +60,7 @@
        y1="203.29279"
        x2="344.31088"
        y2="203.29279"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_1_"
        id="linearGradient3611"
@@ -72,8 +69,7 @@
        x1="-7708.7969"
        y1="-803.36011"
        x2="-7633.1528"
-       y2="-714.90741" />
-    <linearGradient
+       y2="-714.90741" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_2_"
        id="linearGradient3613"
@@ -82,8 +78,7 @@
        x1="-8268.6387"
        y1="-813.12323"
        x2="-7728.9585"
-       y2="-813.12323" />
-    <linearGradient
+       y2="-813.12323" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_3_"
        id="linearGradient3615"
@@ -92,8 +87,7 @@
        x1="-8203.4922"
        y1="-758.99402"
        x2="-7881.895"
-       y2="-758.99402" />
-    <linearGradient
+       y2="-758.99402" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_4_"
        id="linearGradient3617"
@@ -102,8 +96,7 @@
        x1="-8238.3281"
        y1="-818.15222"
        x2="-7698.647"
-       y2="-818.15222" />
-    <linearGradient
+       y2="-818.15222" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient3619"
@@ -112,8 +105,7 @@
        x1="-8198.9678"
        y1="-810.85059"
        x2="-7915.3501"
-       y2="-810.85059" />
-    <linearGradient
+       y2="-810.85059" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_6_"
        id="linearGradient3621"
@@ -122,8 +114,7 @@
        x1="-8238.3281"
        y1="-762.29712"
        x2="-7698.647"
-       y2="-762.29712" />
-    <linearGradient
+       y2="-762.29712" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_7_"
        id="linearGradient3623"
@@ -132,8 +123,7 @@
        x1="-8271.8057"
        y1="-765.07068"
        x2="-7732.125"
-       y2="-765.07068" />
-    <linearGradient
+       y2="-765.07068" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_8_"
        id="linearGradient3625"
@@ -142,8 +132,7 @@
        x1="-8238.3281"
        y1="-745.68481"
        x2="-7698.647"
-       y2="-745.68481" />
-    <linearGradient
+       y2="-745.68481" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_9_"
        id="linearGradient3627"
@@ -152,8 +141,7 @@
        x1="-8238.3281"
        y1="-747.58557"
        x2="-7698.647"
-       y2="-747.58557" />
-    <linearGradient
+       y2="-747.58557" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_10_"
        id="linearGradient3629"
@@ -162,638 +150,165 @@
        x1="-7935.1431"
        y1="-747.9668"
        x2="-7815.856"
-       y2="-747.9668" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_1_"
-       id="linearGradient3739"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-7708.7969"
-       y1="-803.36011"
-       x2="-7633.1528"
-       y2="-714.90741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_2_"
-       id="linearGradient3741"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8268.6387"
-       y1="-813.12323"
-       x2="-7728.9585"
-       y2="-813.12323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_3_"
-       id="linearGradient3743"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8203.4922"
-       y1="-758.99402"
-       x2="-7881.895"
-       y2="-758.99402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_4_"
-       id="linearGradient3745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-818.15222"
-       x2="-7698.647"
-       y2="-818.15222" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_5_"
-       id="linearGradient3747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8198.9678"
-       y1="-810.85059"
-       x2="-7915.3501"
-       y2="-810.85059" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_6_"
-       id="linearGradient3749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-762.29712"
-       x2="-7698.647"
-       y2="-762.29712" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_7_"
-       id="linearGradient3751"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8271.8057"
-       y1="-765.07068"
-       x2="-7732.125"
-       y2="-765.07068" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_8_"
-       id="linearGradient3753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-745.68481"
-       x2="-7698.647"
-       y2="-745.68481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_9_"
-       id="linearGradient3755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-747.58557"
-       x2="-7698.647"
-       y2="-747.58557" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_10_"
-       id="linearGradient3757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-7935.1431"
-       y1="-747.9668"
-       x2="-7815.856"
-       y2="-747.9668" />
-  </defs>
-  <sodipodi:namedview
+       y2="-747.9668" /><style
+       id="style1">
+      .cls-1 {
+        fill: #7c297d;
+      }
+
+      .cls-2 {
+        fill: #f79a23;
+      }
+
+      .cls-3 {
+        fill: #dd552c;
+      }
+
+      .cls-4 {
+        fill: #d22128;
+      }
+    </style></defs><sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="535.73925"
-     inkscape:cy="71.922574"
+     inkscape:zoom="0.91180547"
+     inkscape:cx="202.34579"
+     inkscape:cy="201.24907"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1124"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" /><metadata
+     id="metadata7"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(647.23187,288.06562)">
-    <g
+     transform="translate(647.23187,288.06562)"><g
        id="g3347"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3349"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3351"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3353"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3355"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3357"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <text
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><text
        xml:space="preserve"
-       style="font-size:48px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Sans Bold"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="175.76654"
        y="103.82894"
-       id="text3762"
-       sodipodi:linespacing="125%"><tspan
+       id="text3762"><tspan
          sodipodi:role="line"
          id="tspan3764"
          x="175.76654"
          y="103.82894"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold" /></text>
-    <g
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:1.25;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold'"> </tspan></text><g
        id="g8326"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8328"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8330"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8332"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8334"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8336"
-       transform="translate(132.42046,222.12974)" />
-    <path
+       transform="translate(132.42046,222.12974)" /><path
        id="path3343"
        d="m -645.36121,64.332075 v 2.94229 h -0.82752 v -2.94229 h -1.04206 v -0.70493 h 2.88099 v 0.70493 h -1.01141 z"
        inkscape:connector-curvature="0"
-       style="fill:#b0afb0" />
-    <path
+       style="fill:#b0afb0" /><path
        id="path3345"
        d="m -640.48803,64.975705 -0.98077,1.99217 h -0.49038 l -0.98077,-1.99217 v 2.29866 h -0.79687 v -3.64722 h 1.10336 l 0.95012,1.99218 0.95012,-1.99218 h 1.10336 v 3.64722 h -0.79687 v -2.29866 z"
        inkscape:connector-curvature="0"
-       style="fill:#b0afb0" />
-    <path
+       style="fill:#b0afb0" /><path
        inkscape:connector-curvature="0"
        id="path3718"
        style="font-size:160.72227478px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d22128;fill-opacity:1;stroke:#d22128;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
-       d="m -611.92187,207.08073 c -3.4007,-3e-5 -6.38284,-0.18315 -8.94645,-0.54934 -2.5636,-0.31394 -4.73481,-0.70633 -6.51365,-1.17717 l 0,-20.24724 c 1.93579,0.41854 3.97621,0.78477 6.12126,1.09869 2.09274,0.3139 4.39475,0.47085 6.90603,0.47087 2.40665,-2e-5 4.63018,-0.26161 6.6706,-0.78478 2.09274,-0.5232 3.89772,-1.43877 5.41496,-2.74672 1.56955,-1.25565 2.77287,-2.956 3.60998,-5.10105 0.8894,-2.14506 1.3341,-4.83945 1.33412,-8.0832 l 0,-111.359825 24.32808,0 0,110.575055 c -4e-5,6.59212 -0.96793,12.26866 -2.90368,17.02965 -1.8835,4.76096 -4.55173,8.68484 -8.00472,11.77165 -3.40072,3.13908 -7.48156,5.44109 -12.24252,6.90604 -4.76099,1.46488 -10.01899,2.19734 -15.77401,2.19737" />
-    <path
+       d="m -611.92187,207.08073 c -3.4007,-3e-5 -6.38284,-0.18315 -8.94645,-0.54934 -2.5636,-0.31394 -4.73481,-0.70633 -6.51365,-1.17717 l 0,-20.24724 c 1.93579,0.41854 3.97621,0.78477 6.12126,1.09869 2.09274,0.3139 4.39475,0.47085 6.90603,0.47087 2.40665,-2e-5 4.63018,-0.26161 6.6706,-0.78478 2.09274,-0.5232 3.89772,-1.43877 5.41496,-2.74672 1.56955,-1.25565 2.77287,-2.956 3.60998,-5.10105 0.8894,-2.14506 1.3341,-4.83945 1.33412,-8.0832 l 0,-111.359825 24.32808,0 0,110.575055 c -4e-5,6.59212 -0.96793,12.26866 -2.90368,17.02965 -1.8835,4.76096 -4.55173,8.68484 -8.00472,11.77165 -3.40072,3.13908 -7.48156,5.44109 -12.24252,6.90604 -4.76099,1.46488 -10.01899,2.19734 -15.77401,2.19737" /><path
        style="font-size:160.72227478px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
        d="m -559.96009,58.612855 0,114.718755 21.75,0 0,-53.375 c -10e-5,-1.46487 -0.0414,-3.1063 -0.0937,-4.9375 -3e-5,-1.83108 -0.0516,-3.73059 -0.15625,-5.71875 -0.0524,-1.98803 -0.11415,-3.99076 -0.21875,-6.03125 -0.0524,-2.04035 -0.1454,-4.032902 -0.25,-5.968752 -0.20931,-4.49931 -0.46738,-9.15537 -0.78125,-13.968753 l 0.71875,0 25.1875,90.000005 22.34375,0 27.15625,-89.843755 0.625,0 c -0.15707,4.761063 -0.32209,9.324083 -0.53125,13.718753 -0.0524,1.88354 -0.14547,3.824472 -0.25,5.812502 -0.0524,1.98817 -0.10405,3.93929 -0.15625,5.875 -0.0524,1.93585 -0.10405,3.77355 -0.15625,5.5 -1.1e-4,1.72657 -1.1e-4,3.26478 0,4.625 l 0,54.3125 22.6875,0 0,-114.718755 -33.125,0 -26.375,87.718755 -0.46875,0 -24.78125,-87.718755 -33.125,0 z m 227.78125,8.3125 -6.90625,18.500003 -13.15625,8.03125 0,10.125002 11.4375,0 0,42.28125 c -1e-5,5.65041 0.67095,10.35809 2.03125,14.125 1.41258,3.71462 3.34333,6.68782 5.75,8.9375 2.40662,2.19738 5.26641,3.76683 8.5625,4.65625 3.29602,0.88941 6.83696,1.3125 10.65625,1.3125 3.92384,0 7.54764,-0.37147 10.84375,-1.15625 3.34832,-0.73246 6.12525,-1.69275 8.375,-2.84375 l 0,-17.8125 c -2.19743,0.7848 -4.355,1.44558 -6.5,1.96875 -2.09279,0.5232 -4.33322,0.78127 -6.6875,0.78125 -2.7206,2e-5 -4.91961,-0.81561 -6.59375,-2.4375 -1.67423,-1.62185 -2.50004,-4.13053 -2.5,-7.53125 l 0,-42.28125 21.34375,0 0,-17.968752 -21.34375,0 0,-18.687503 -15.3125,0 z m -61.4375,17.03125 c -5.96434,9e-5 -11.3946,0.97055 -16.3125,2.906253 -4.86564,1.93586 -9.05719,4.81602 -12.5625,8.6875 -3.45304,3.81932 -6.15798,8.620042 -8.09375,14.375002 -1.9358,5.75509 -2.90626,12.46548 -2.90625,20.15625 -1e-5,7.58621 1.0635,14.22463 3.15625,19.875 2.14504,5.59809 5.11824,10.25416 8.9375,13.96875 3.81923,3.6623 8.37206,6.38761 13.65625,8.21875 5.28412,1.83114 11.0655,2.75 17.34375,2.75 3.24369,0 6.21688,-0.11341 8.9375,-0.375 2.7205,-0.20928 5.27061,-0.57057 7.625,-1.09375 2.35426,-0.52318 4.56344,-1.17379 6.65625,-1.90625 2.14498,-0.78478 4.28218,-1.71381 6.375,-2.8125 l 0,-18.53125 c -2.30209,1.15103 -4.5527,2.17311 -6.75,3.0625 -2.19745,0.83711 -4.43788,1.54951 -6.6875,2.125 -2.24976,0.57552 -4.56216,1.02985 -6.96875,1.34375 -2.35439,0.26161 -4.86307,0.37502 -7.53125,0.375 -3.19148,2e-5 -6.05126,-0.47468 -8.5625,-1.46875 -2.45901,-0.99403 -4.59621,-2.41883 -6.375,-4.25 -1.72655,-1.88344 -3.06849,-4.17549 -4.0625,-6.84375 -0.94177,-2.72053 -1.4579,-5.74534 -1.5625,-9.09375 l 53.5,0 0,-11.625 c -9e-5,-6.38279 -0.87751,-12.0195 -2.65625,-16.9375 -1.72659,-4.97018 -4.23527,-9.161732 -7.53125,-12.562502 -3.24381,-3.40062 -7.2289,-5.9609 -11.9375,-7.6875 -4.6564,-1.778733 -9.88021,-2.656163 -15.6875,-2.656253 z m 144.09375,0 c -5.96434,9e-5 -11.39461,0.97055 -16.3125,2.906253 -4.86565,1.93586 -9.05719,4.81602 -12.5625,8.6875 -3.45303,3.81932 -6.15798,8.620042 -8.09375,14.375002 -1.93579,5.75509 -2.90625,12.46548 -2.90625,20.15625 0,7.58621 1.0635,14.22463 3.15625,19.875 2.14504,5.59809 5.11823,10.25416 8.9375,13.96875 3.81922,3.6623 8.37206,6.38761 13.65625,8.21875 5.28413,1.83114 11.06549,2.75 17.34375,2.75 3.24369,0 6.21688,-0.11341 8.9375,-0.375 2.7205,-0.20928 5.2706,-0.57057 7.625,-1.09375 2.35426,-0.52318 4.56344,-1.17379 6.65625,-1.90625 2.14498,-0.78478 4.28218,-1.71381 6.375,-2.8125 l 0,-18.53125 c -2.30209,1.15103 -4.5527,2.17311 -6.75,3.0625 -2.19745,0.83711 -4.43788,1.54951 -6.6875,2.125 -2.24976,0.57552 -4.56216,1.02985 -6.96875,1.34375 -2.35438,0.26161 -4.86307,0.37502 -7.53125,0.375 -3.19148,2e-5 -6.05126,-0.47468 -8.5625,-1.46875 -2.45901,-0.99403 -4.56496,-2.41883 -6.34375,-4.25 -1.72654,-1.88344 -3.09973,-4.17549 -4.09375,-6.84375 -0.94176,-2.72053 -1.4579,-5.74534 -1.5625,-9.09375 l 53.5,0 0,-11.625 c -9e-5,-6.38279 -0.87751,-12.0195 -2.65625,-16.9375 -1.72659,-4.97018 -4.23526,-9.161732 -7.53125,-12.562502 -3.24381,-3.40062 -7.22891,-5.9609 -11.9375,-7.6875 -4.6564,-1.778733 -9.8802,-2.656163 -15.6875,-2.656253 z m 89.96875,0 c -2.92989,9e-5 -5.5418,0.36138 -7.84375,1.09375 -2.24975,0.680233 -4.2939,1.660883 -6.125,2.968753 -1.77887,1.25573 -3.37887,2.82518 -4.84375,4.65625 -1.46495,1.83122 -2.83814,3.84414 -4.09375,6.09375 l -1.1875,0 -3.53125,-13.15625 -18.125,0 0,87.718752 23.9375,0 0,-44.65625 c -4e-5,-4.13311 0.50592,-7.61225 1.5,-10.4375 1.04633,-2.87746 2.48131,-5.17968 4.3125,-6.90625 1.88342,-1.77876 4.12385,-3.05891 6.6875,-3.84375 2.61587,-0.78471 5.4444,-1.18743 8.53125,-1.1875 0.52312,1e-4 1.18391,0.0414 1.96875,0.0937 0.78471,6e-5 1.55891,0.0517 2.34375,0.15625 0.83703,0.0524 1.64248,0.14543 2.375,0.25 0.73239,0.1047 1.30013,0.20793 1.71875,0.3125 l 0,-22.468755 c -0.31398,-0.10455 -0.7785,-0.16635 -1.40625,-0.21875 -0.57557,-0.10455 -1.23636,-0.1976 -1.96875,-0.25 -0.68021,-0.10456 -1.40278,-0.15616 -2.1875,-0.15625 -0.73252,-0.0522 -1.43474,-0.0624 -2.0625,-0.0625 z m -233.90625,17.031255 c 2.51123,7e-5 4.71023,0.46459 6.59375,1.40625 1.88341,0.9418 3.46305,2.23213 4.71875,3.90625 1.25558,1.62194 2.18461,3.56287 2.8125,5.8125 0.62776,2.24975 0.97885,4.70681 1.03125,7.375 l -30.53125,0 c 0.41852,-6.38279 2.00834,-11.04904 4.78125,-14.03125 2.82516,-2.98208 6.35591,-4.46868 10.59375,-4.46875 z m 144.09375,0 c 2.51123,7e-5 4.71024,0.46459 6.59375,1.40625 1.88341,0.9418 3.46305,2.23213 4.71875,3.90625 1.25558,1.62194 2.18462,3.56287 2.8125,5.8125 0.62776,2.24975 0.97885,4.70681 1.03125,7.375 l -30.53125,0 c 0.41852,-6.38279 2.00834,-11.04904 4.78125,-14.03125 2.82516,-2.98208 6.35591,-4.46868 10.59375,-4.46875 z"
        id="path3720"
-       inkscape:connector-curvature="0" />
-    <g
-       style="font-size:35.26461411px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Sans Bold"
+       inkscape:connector-curvature="0" /><g
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:35.2646px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
        id="text3756"
-       transform="matrix(0.66101965,0,0,0.66101965,-594.78493,-41.604628)">
-      <path
-         d="m 658.02758,171.06244 -5.32069,0 0,-20.73174 -6.31939,0 0,-4.44251 17.94225,0 0,4.44251 -6.30217,0 0,20.73174"
-         style="fill:#4d4d4d;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+       transform="matrix(0.66101965,0,0,0.66101965,-598.78493,-41.604628)"><path
+         d="m 658.02758,171.06244 h -5.32069 V 150.3307 h -6.31939 v -4.44251 h 17.94225 v 4.44251 h -6.30217 v 20.73174"
+         style="font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#4d4d4d"
          id="path3879"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 678.32884,171.06244 -5.52732,-19.75025 -0.15497,0 c 0.0689,1.05612 0.12627,2.07778 0.17219,3.06499 0.0229,0.42475 0.0402,0.86097 0.0517,1.30865 0.023,0.44771 0.0402,0.88966 0.0517,1.32586 0.023,0.43623 0.0344,0.85523 0.0344,1.25699 0.0115,0.4018 0.0172,0.76339 0.0172,1.08481 l 0,11.70895 -4.76967,0 0,-25.17425 7.26643,0 5.44122,19.2509 0.10332,0 5.7856,-19.2509 7.26644,0 0,25.17425 -4.97631,0 0,-11.91558 c -2e-5,-0.29845 -2e-5,-0.6371 0,-1.01593 0.0115,-0.3788 0.0229,-0.78058 0.0344,-1.20533 0.0115,-0.42472 0.0229,-0.8552 0.0344,-1.29143 0.0229,-0.4362 0.0401,-0.86094 0.0517,-1.27421 0.0459,-0.96425 0.0861,-1.96869 0.12053,-3.01333 l -0.13775,0 -5.95779,19.71581 -4.90743,0"
-         style="fill:#4d4d4d;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+         inkscape:connector-curvature="0" /><path
+         d="m 678.32884,171.06244 -5.52732,-19.75025 h -0.15497 c 0.0689,1.05612 0.12627,2.07778 0.17219,3.06499 0.0229,0.42475 0.0402,0.86097 0.0517,1.30865 0.023,0.44771 0.0402,0.88966 0.0517,1.32586 0.023,0.43623 0.0344,0.85523 0.0344,1.25699 0.0115,0.4018 0.0172,0.76339 0.0172,1.08481 v 11.70895 h -4.76967 v -25.17425 h 7.26643 l 5.44122,19.2509 h 0.10332 l 5.7856,-19.2509 h 7.26644 v 25.17425 h -4.97631 v -11.91558 c -2e-5,-0.29845 -2e-5,-0.6371 0,-1.01593 0.0115,-0.3788 0.0229,-0.78058 0.0344,-1.20533 0.0115,-0.42472 0.0229,-0.8552 0.0344,-1.29143 0.0229,-0.4362 0.0401,-0.86094 0.0517,-1.27421 0.0459,-0.96425 0.0861,-1.96869 0.12053,-3.01333 h -0.13775 l -5.95779,19.71581 h -4.90743"
+         style="font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#4d4d4d"
          id="path3881"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
+         inkscape:connector-curvature="0" /></g><g
        id="g8126"
-       transform="matrix(0.34856159,0,0,0.34856159,-678.72925,-55.700873)">
-      <g
-         id="g8128">
-        <path
+       transform="matrix(0.34856159,0,0,0.34856159,-678.72925,-55.700873)"><g
+         id="g8128"><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 232.6,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 328.3 L 313,240.5 h -53 l -15.1,36.8 h -12.3 z m 54.1,-104.2 -24.2,58.2 h 47.8 l -23.6,-58.2 z"
-           id="path8130" />
-        <path
+           id="path8130" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="M 353.3,277.3 V 159.5 h 48.8 c 20.2,0 34.8,18.7 34.8,37 0,19.2 -13.6,37.3 -33.8,37.3 h -38.3 v 43.5 h -11.5 z m 11.5,-53.8 h 37.7 c 13.9,0 22.9,-12.8 22.9,-27 0,-14.8 -10.9,-26.7 -23.9,-26.7 h -36.7 v 53.7 z"
-           id="path8132" />
-        <path
+           id="path8132" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 430.5,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 526 l -15.3,-36.8 h -52.9 l -15.1,36.8 h -12.2 z m 54.1,-104.2 -24.2,58.2 h 47.8 l -23.6,-58.2 z"
-           id="path8134" />
-        <path
+           id="path8134" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 594.2,158.8 c 20.9,0 36.2,10.6 43.5,25.7 l -9.3,5.6 c -7.5,-15.6 -22.1,-20.9 -34.8,-20.9 -28.2,0 -43.6,25.2 -43.6,48.9 0,26 19.1,49.6 44.1,49.6 13.3,0 28.9,-6.6 36.3,-21.9 l 9.6,5 c -7.6,17.6 -28.5,27.4 -46.6,27.4 -32.3,0 -55.1,-30.9 -55.1,-60.7 0,-28.3 20.4,-58.7 55.9,-58.7 z"
-           id="path8136" />
-        <path
+           id="path8136" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 749.1,159.5 v 117.8 h -11.6 v -55.1 h -69.8 v 55.1 H 656.3 V 159.5 h 11.4 v 52.4 h 69.8 v -52.4 h 11.6 z"
-           id="path8138" />
-        <path
+           id="path8138" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 854.8,267 v 10.3 H 775.7 V 159.5 h 77.6 v 10.3 h -66.2 v 42.5 h 57.7 v 9.8 H 787.1 V 267 h 67.7 z"
-           id="path8140" />
-      </g>
-    </g>
-    <g
-       id="g3203"
-       transform="matrix(0.65116247,0,0,0.65116247,-385.65397,-284.55663)">
-      <linearGradient
-         id="SVGID_1_"
-         gradientUnits="userSpaceOnUse"
-         x1="-7708.7969"
-         y1="-803.36011"
-         x2="-7633.1528"
-         y2="-714.90741"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#F69923"
-           id="stop3206" />
-        <stop
-           offset="0.3123"
-           style="stop-color:#F79A23"
-           id="stop3208" />
-        <stop
-           offset="0.8383"
-           style="stop-color:#E97826"
-           id="stop3210" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3739)"
-         inkscape:connector-curvature="0"
-         d="m 267.1,19.6 c -8.4,5 -22.4,19 -39,39.3 l 15.3,28.9 c 10.7,-15.4 21.7,-29.2 32.7,-41 0.8,-0.9 1.3,-1.4 1.3,-1.4 -0.4,0.5 -0.9,0.9 -1.3,1.4 -3.6,3.9 -14.4,16.5 -30.7,41.6 15.7,-0.8 39.8,-4 59.5,-7.4 5.9,-32.8 -5.7,-47.8 -5.7,-47.8 0,0 -14.8,-23.9 -32.1,-13.6 z"
-         id="path3212" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 241.1,184.4 c 0.1,0 0.2,0 0.3,-0.1 l -2.2,0.2 c -0.1,0.1 -0.3,0.1 -0.4,0.2 0.8,-0.1 1.6,-0.2 2.3,-0.3 z"
-         id="path3214" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 225.5,236.1 c -1.2,0.3 -2.5,0.5 -3.8,0.7 1.3,-0.2 2.6,-0.4 3.8,-0.7 z"
-         id="path3216" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 119.3,352.2 c 0.2,-0.4 0.3,-0.9 0.5,-1.3 3.4,-8.9 6.7,-17.5 10,-26 3.7,-9.4 7.4,-18.6 11,-27.5 3.8,-9.3 7.6,-18.4 11.3,-27.1 3.9,-9.2 7.7,-18 11.5,-26.5 3.1,-6.9 6.1,-13.6 9.1,-20.1 1,-2.2 2,-4.3 3,-6.4 2,-4.2 3.9,-8.3 5.8,-12.3 1.8,-3.7 3.5,-7.3 5.2,-10.9 0.6,-1.2 1.2,-2.4 1.7,-3.5 0.1,-0.2 0.2,-0.4 0.3,-0.6 l -1.9,0.2 -1.5,-2.9 c -0.1,0.3 -0.3,0.6 -0.4,0.9 -2.7,5.3 -5.4,10.7 -8,16.2 -1.5,3.1 -3,6.3 -4.6,9.5 -4.2,8.8 -8.3,17.6 -12.3,26.6 -4.1,9 -8.1,18.1 -12,27.1 -3.9,8.9 -7.6,17.8 -11.3,26.7 -3.7,8.9 -7.3,17.7 -10.8,26.5 -3.7,9.2 -7.3,18.3 -10.7,27.3 -0.8,2 -1.6,4.1 -2.3,6.1 -2.8,7.3 -5.5,14.4 -8.1,21.5 l 2.4,4.7 2.1,-0.2 c 0.1,-0.2 0.2,-0.4 0.2,-0.6 3.1,-9.5 6.5,-18.6 9.8,-27.4 z"
-         id="path3218" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 0,0 c 0,0 0,0 0,0 0,0 0,0 0,0 z"
-         id="path3220" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 215.6,262.2 c -2,0.4 -4,0.7 -6,1 0,0 0,0 0,0 1,-0.1 2.1,-0.3 3.1,-0.5 1,-0.1 2,-0.3 2.9,-0.5 z"
-         id="path3222" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 215.6,262.2 c -2,0.4 -4,0.7 -6,1 0,0 0,0 0,0 1,-0.1 2.1,-0.3 3.1,-0.5 1,-0.1 2,-0.3 2.9,-0.5 z"
-         id="path3224" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 -0.1,0 -0.1,0 0,0 0.3,0 0.6,-0.1 0.9,-0.1 1.3,-0.2 2.6,-0.4 3.8,-0.7 -1.5,0.3 -3.1,0.5 -4.7,0.8 l 0,0 0,0 z"
-         id="path3226" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 -0.1,0 -0.1,0 0,0 0.3,0 0.6,-0.1 0.9,-0.1 1.3,-0.2 2.6,-0.4 3.8,-0.7 -1.5,0.3 -3.1,0.5 -4.7,0.8 l 0,0 0,0 z"
-         id="path3228" />
-      <linearGradient
-         id="SVGID_2_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8268.6387"
-         y1="-813.12323"
-         x2="-7728.9585"
-         y2="-813.12323"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3231" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3233" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3235" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3237" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3741)"
-         inkscape:connector-curvature="0"
-         d="m 198.2,162.4 c 4.7,-8.7 9.4,-17.2 14.1,-25.5 4.9,-8.6 9.9,-16.9 15,-25 0.3,-0.5 0.6,-1 0.9,-1.4 5,-7.9 10,-15.5 15.1,-22.8 L 228,58.9 c -1.1,1.4 -2.3,2.8 -3.5,4.3 -4.4,5.5 -9,11.4 -13.7,17.7 -5.3,7.1 -10.7,14.6 -16.3,22.5 -5.1,7.3 -10.3,15 -15.5,22.9 -4.4,6.8 -8.8,13.7 -13.2,20.8 -0.2,0.3 -0.3,0.5 -0.5,0.8 l 19.9,39.3 c 4.4,-8.3 8.7,-16.6 13,-24.8 z"
-         id="path3239" />
-      <linearGradient
-         id="SVGID_3_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8203.4922"
-         y1="-758.99402"
-         x2="-7881.895"
-         y2="-758.99402"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#282662"
-           id="stop3242" />
-        <stop
-           offset="9.548390e-02"
-           style="stop-color:#662E8D"
-           id="stop3244" />
-        <stop
-           offset="0.7882"
-           style="stop-color:#9F2064"
-           id="stop3246" />
-        <stop
-           offset="0.9487"
-           style="stop-color:#CD2032"
-           id="stop3248" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3743)"
-         inkscape:connector-curvature="0"
-         d="m 107.5,384.1 c -2.6,7.2 -5.3,14.6 -7.9,22.2 0,0.1 -0.1,0.2 -0.1,0.3 -0.4,1.1 -0.8,2.1 -1.1,3.2 -1.8,5.1 -3.3,9.7 -6.9,20.1 5.9,2.7 10.6,9.7 15,17.7 -0.5,-8.3 -3.9,-16.1 -10.4,-22.1 28.9,1.3 53.9,-6 66.7,-27.2 1.1,-1.9 2.2,-3.9 3.2,-6 -5.9,7.4 -13.1,10.6 -26.8,9.8 0,0 -0.1,0 -0.1,0 0,0 0.1,0 0.1,0 20.1,-9 30.2,-17.7 39.1,-32 2.1,-3.4 4.2,-7.1 6.3,-11.2 -17.6,18.1 -38,23.2 -59.5,19.3 L 109,380 c -0.5,1.4 -1,2.7 -1.5,4.1 z"
-         id="path3250" />
-      <linearGradient
-         id="SVGID_4_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-818.15222"
-         x2="-7698.647"
-         y2="-818.15222"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3253" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3255" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3257" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3259" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3745)"
-         inkscape:connector-curvature="0"
-         d="m 115,348 c 3.5,-9 7.1,-18.1 10.7,-27.3 3.5,-8.8 7.1,-17.6 10.8,-26.5 3.7,-8.9 7.5,-17.8 11.3,-26.7 3.9,-9.1 7.9,-18.1 12,-27.1 4,-8.9 8.2,-17.8 12.3,-26.6 1.5,-3.2 3,-6.3 4.6,-9.5 2.6,-5.4 5.3,-10.8 8,-16.2 0.1,-0.3 0.3,-0.6 0.4,-0.9 L 165.4,148 c -0.3,0.5 -0.6,1.1 -1,1.6 -4.6,7.6 -9.3,15.3 -13.8,23.2 -4.6,8 -9.1,16.1 -13.5,24.4 -3.7,7 -7.3,14 -10.9,21.1 -0.7,1.4 -1.4,2.9 -2.1,4.3 -4.3,8.9 -8.3,17.6 -11.8,25.9 -4,9.4 -7.5,18.4 -10.6,26.9 -2,5.6 -3.9,11 -5.6,16.2 -1.4,4.4 -2.7,8.9 -4,13.3 -3,10.4 -5.5,20.8 -7.6,31.2 l 20,39.5 c 2.6,-7.1 5.4,-14.2 8.1,-21.5 0.8,-2 1.6,-4 2.4,-6.1 z"
-         id="path3261" />
-      <linearGradient
-         id="SVGID_5_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8198.9678"
-         y1="-810.85059"
-         x2="-7915.3501"
-         y2="-810.85059"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#282662"
-           id="stop3264" />
-        <stop
-           offset="9.548390e-02"
-           style="stop-color:#662E8D"
-           id="stop3266" />
-        <stop
-           offset="0.7882"
-           style="stop-color:#9F2064"
-           id="stop3268" />
-        <stop
-           offset="0.9487"
-           style="stop-color:#CD2032"
-           id="stop3270" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3747)"
-         inkscape:connector-curvature="0"
-         d="m 84.2,337.5 c -2.5,12.6 -4.3,25.2 -5.2,37.8 0,0.4 -0.1,0.9 -0.1,1.3 -6.2,-10 -23,-19.8 -22.9,-19.7 12,17.4 21.1,34.6 22.4,51.5 -6.4,1.3 -15.2,-0.6 -25.3,-4.3 10.6,9.7 18.5,12.4 21.6,13.1 -9.7,0.6 -19.8,7.3 -30,15 14.9,-6.1 27,-8.5 35.6,-6.5 -13.7,38.7 -27.4,81.5 -41.1,126.9 4.2,-1.2 6.7,-4.1 8.1,-7.9 2.4,-8.2 18.7,-62.2 44.1,-133.1 0.7,-2 1.5,-4 2.2,-6.1 0.2,-0.6 0.4,-1.1 0.6,-1.7 2.7,-7.4 5.5,-15 8.4,-22.8 0.7,-1.8 1.3,-3.5 2,-5.3 0,0 0,-0.1 0,-0.1 l -20,-39.5 c -0.2,0.5 -0.3,0.9 -0.4,1.4 z"
-         id="path3272" />
-      <linearGradient
-         id="SVGID_6_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-762.29712"
-         x2="-7698.647"
-         y2="-762.29712"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3275" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3277" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3279" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3281" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3749)"
-         inkscape:connector-curvature="0"
-         d="m 188.4,190.6 c -0.6,1.2 -1.1,2.3 -1.7,3.5 -1.7,3.6 -3.5,7.2 -5.2,10.9 -1.9,4 -3.8,8.1 -5.8,12.3 -1,2.1 -2,4.2 -3,6.4 -3,6.5 -6,13.2 -9.1,20.1 -3.8,8.5 -7.6,17.3 -11.5,26.5 -3.7,8.7 -7.5,17.8 -11.3,27.1 -3.6,8.9 -7.3,18 -11,27.5 -3.3,8.4 -6.6,17.1 -10,26 -0.2,0.4 -0.3,0.9 -0.5,1.3 -3.3,8.8 -6.7,17.9 -10.1,27.2 -0.1,0.2 -0.2,0.4 -0.2,0.6 l 16.1,-1.8 c -0.3,-0.1 -0.6,-0.1 -1,-0.2 19.3,-2.4 44.9,-16.8 61.4,-34.6 7.6,-8.2 14.5,-17.8 20.9,-29.1 4.8,-8.4 9.2,-17.7 13.5,-28.1 3.7,-9 7.3,-18.8 10.7,-29.4 -4.4,2.3 -9.5,4 -15.1,5.2 -1,0.2 -2,0.4 -3,0.6 -1,0.2 -2,0.3 -3.1,0.5 l 0,0 0,0 c 0,0 0,0 0,0 18,-6.9 29.3,-20.2 37.5,-36.6 -4.7,3.2 -12.4,7.4 -21.6,9.5 -1.2,0.3 -2.5,0.5 -3.8,0.7 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 0,0 c 0,0 0,0 0,0 0,0 0,0 0,0 l 0,0 c 6.2,-2.6 11.5,-5.5 16.1,-9 1,-0.7 1.9,-1.5 2.8,-2.3 1.4,-1.2 2.7,-2.5 4,-3.8 0.8,-0.9 1.6,-1.7 2.4,-2.6 1.8,-2.1 3.5,-4.4 5,-6.9 0.5,-0.8 1,-1.5 1.4,-2.3 0.6,-1.2 1.2,-2.3 1.7,-3.4 2.5,-5 4.5,-9.5 6.1,-13.5 0.8,-2 1.5,-3.8 2.1,-5.5 0.2,-0.7 0.5,-1.3 0.7,-2 0.6,-1.9 1.2,-3.6 1.6,-5.1 0.6,-2.2 1,-4 1.2,-5.3 l 0,0 0,0 c -0.6,0.5 -1.3,1 -2.1,1.4 -5.4,3.2 -14.7,6.2 -22.2,7.6 l 14.8,-1.6 -14.8,1.6 c -0.1,0 -0.2,0 -0.3,0.1 -0.7,0.1 -1.5,0.2 -2.3,0.4 0.1,-0.1 0.3,-0.1 0.4,-0.2 l -50.6,5.5 c 0.1,0.4 0,0.6 -0.1,0.7 z"
-         id="path3283" />
-      <linearGradient
-         id="SVGID_7_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8271.8057"
-         y1="-765.07068"
-         x2="-7732.125"
-         y2="-765.07068"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3286" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3288" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3290" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3292" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3751)"
-         inkscape:connector-curvature="0"
-         d="m 245.4,88.4 c -4.5,6.9 -9.4,14.8 -14.7,23.6 -0.3,0.5 -0.6,0.9 -0.8,1.4 -4.6,7.7 -9.4,16.1 -14.5,25.4 -4.4,8 -9,16.5 -13.8,25.8 -4.2,8 -8.4,16.5 -12.9,25.5 l 50.6,-5.5 c 14.7,-6.8 21.3,-12.9 27.7,-21.8 1.7,-2.4 3.4,-5 5.1,-7.7 5.2,-8.1 10.3,-17 14.8,-25.9 4.4,-8.6 8.3,-17.1 11.2,-24.7 1.9,-4.9 3.4,-9.4 4.5,-13.4 0.9,-3.5 1.6,-6.8 2.2,-10 -19.6,3.3 -43.7,6.5 -59.4,7.3 z"
-         id="path3294" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3296" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3298" />
-      <linearGradient
-         id="SVGID_8_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-745.68481"
-         x2="-7698.647"
-         y2="-745.68481"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3301" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3303" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3305" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3307" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3753)"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3309" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3311" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3313" />
-      <linearGradient
-         id="SVGID_9_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-747.58557"
-         x2="-7698.647"
-         y2="-747.58557"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3316" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3318" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3320" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3322" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3755)"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3324" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3326" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3328" />
-      <linearGradient
-         id="SVGID_10_"
-         gradientUnits="userSpaceOnUse"
-         x1="-7935.1431"
-         y1="-747.9668"
-         x2="-7815.856"
-         y2="-747.9668"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3331" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3333" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3335" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3337" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3757)"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3339" />
-    </g>
-  </g>
-</svg>
+           id="path8140" /></g></g><g
+       id="g1"
+       transform="matrix(0.35255596,0,0,0.35255596,-381.78056,-277.17779)"><path
+         class="cls-3"
+         d="M 276.70929,398.15158 C 302.23724,335.02733 330.72037,272.0269 361.28223,216.18798 315.661,182.30276 271.85458,109.23451 253.85632,76.861096 247.39206,84.205064 243.19551,92.663335 241.29273,99.544641 224.33709,160.7661 284.69512,234.69452 236.07962,207.68409 195.57375,185.17649 104.36388,135.88653 69.572883,184.87673 108.53762,234.94214 210.45066,360.90391 276.70929,398.15158 Z"
+         id="path1" /><path
+         class="cls-2"
+         d="m 361.28223,216.18798 c 29.61372,-54.10557 61.17258,-101.49274 93.89136,-135.632093 0,0 -32.63406,47.237293 -79.24578,141.666263 28.22899,7.77405 108.62492,23.72617 220.60904,-5.20008 2.75317,-20.35067 -10.92799,-42.73447 -79.10569,-50.22831 -44.51018,-4.88729 53.4246,-106.28228 -17.52257,-154.236376 -2.29051,-1.5509 -4.54192,-2.9193413 -6.74771,-4.1444221 C 490.78239,7.5593151 488.27033,6.7773486 485.58883,6.0800952 402.72971,-15.541278 391.24458,124.95855 358.18043,94.755096 304.74931,45.947354 271.02374,57.351032 253.85632,76.861096 271.85458,109.23451 315.661,182.30276 361.28223,216.18798 Z"
+         id="path2" /><path
+         class="cls-4"
+         d="M 210.0662,580.02395 C 228.77149,523.98954 251.27257,461.03472 276.70929,398.15158 210.45066,360.90391 108.53762,234.94214 69.572883,184.87673 62.61664,194.66435 57.862935,208.31618 56.279453,226.98563 47.782084,327.26632 151.23625,401.50752 130.61188,415.06812 103.33103,433.00774 49.03323,371.97525 27.633414,410.75427 58.651418,450.60198 121.83431,522.60155 210.0662,580.02395 Z"
+         id="path3" /><path
+         class="cls-3"
+         d="m 496.71556,363.75157 c -52.38198,-18.68248 54.73766,-68.78699 89.52214,-121.94116 4.45069,-6.79659 9.05126,-15.58068 10.29915,-24.78834 -111.98412,28.92625 -192.38005,12.97413 -220.60904,5.20008 -24.13019,48.89246 -51.99426,110.5049 -81.05409,184.79172 30.26536,12.94154 153.84213,60.74576 328.39009,60.99338 29.34655,-76.43722 -76.83473,-86.53111 -126.54825,-104.25568 z"
+         id="path4" /><path
+         class="cls-4"
+         d="m 230.3061,590.11132 c 30.78015,9.59212 132.76813,38.24468 241.08353,33.93083 14.55109,-39.39808 -39.85097,-43.24275 -44.28212,-74.84071 -3.43087,-24.44949 143.16829,20.54617 190.33717,-68.3569 2.38499,-4.49631 4.24542,-8.73848 5.81913,-12.83729 -174.54796,-0.24762 -298.12473,-48.05184 -328.39009,-60.99338 -21.23691,54.28802 -43.08309,115.21624 -64.56762,183.09745 z"
+         id="path5" /><path
+         class="cls-1"
+         d="m 230.3061,590.11132 c -13.83104,43.69238 -27.47635,90.36926 -40.72091,139.69832 -4.69831,17.48998 -9.34124,35.30578 -13.919,53.51257 102.80578,33.93735 197.4726,0.0782 200.68192,-41.88734 0.0261,-0.33233 -0.0358,-0.57996 -0.0163,-0.89926 2.44691,-44.44828 -64.17338,-19.80982 -62.59641,-46.53352 1.58348,-26.9192 116.30774,-0.1564 151.78621,-57.87204 2.72059,-4.42463 4.49305,-8.35401 5.86801,-12.0879 C 363.07423,628.356 261.08625,599.70344 230.3061,590.11132 Z"
+         id="path6" /><path
+         class="cls-1"
+         d="m 27.633414,410.75427 c -1.49877,2.71734 -2.85092,5.85824 -4.004321,9.61167 -19.9238542,64.75335 120.960447,151.7406 101.792487,170.70329 -17.2782,17.08597 -39.795576,-21.96023 -67.561903,-5.83217 -3.043153,1.77246 -6.131921,4.00758 -9.302143,7.25926 -31.402472,32.1714 -0.491988,124.85398 88.603316,174.3264 -20.79053,69.81006 -41.489835,147.8047 -61.752542,229.37032 7.350485,-2.57397 16.147608,-5.15446 18.337114,-12.0879 3.287518,-13.51499 23.605618,-95.7518 56.594828,-207.31887 0,0 6.02114,-22.85297 17.04361,-60.50465 10.19163,-34.81706 24.6743,-82.30198 42.68234,-136.25767 C 121.83431,522.60155 58.651418,450.60198 27.633414,410.75427 Z"
+         id="path7" /></g></g></svg>
diff --git a/xdocs/images/logo.svg b/xdocs/images/logo.svg
index e5e502d79e1..fa757baabfc 100644
--- a/xdocs/images/logo.svg
+++ b/xdocs/images/logo.svg
@@ -2,135 +2,84 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="260.47894"
-   height="88.297905"
+   width="264.67535"
+   height="87.734856"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="logo.svg">
-  <title
-     id="title3100">JMeter Logo</title>
-  <defs id="colors">
-    <linearGradient id="Label.foreground" fallback="textText">
-      <stop offset="0" stop-color="#000000"/>
-      <stop offset="1" stop-color="#000000"/>
-    </linearGradient>
-    <linearGradient id="Label.disabledForeground" fallback="textInactiveText Button.disabledText">
-      <stop offset="0" stop-color="#4d4d4d"/>
-      <stop offset="1" stop-color="#4d4d4d"/>
-    </linearGradient>
-  </defs>
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_1_"
-       id="linearGradient3736"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-7708.7969"
-       y1="-803.36011"
-       x2="-7633.1528"
-       y2="-714.90741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_2_"
-       id="linearGradient3738"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8268.6387"
-       y1="-813.12323"
-       x2="-7728.9585"
-       y2="-813.12323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_3_"
-       id="linearGradient3740"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8203.4922"
-       y1="-758.99402"
-       x2="-7881.895"
-       y2="-758.99402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_4_"
-       id="linearGradient3742"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-818.15222"
-       x2="-7698.647"
-       y2="-818.15222" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_5_"
-       id="linearGradient3744"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8198.9678"
-       y1="-810.85059"
-       x2="-7915.3501"
-       y2="-810.85059" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_6_"
-       id="linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-762.29712"
-       x2="-7698.647"
-       y2="-762.29712" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_7_"
-       id="linearGradient3748"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8271.8057"
-       y1="-765.07068"
-       x2="-7732.125"
-       y2="-765.07068" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_8_"
-       id="linearGradient3750"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-745.68481"
-       x2="-7698.647"
-       y2="-745.68481" />
-    <linearGradient
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="logo.svg"
+   xml:space="preserve"
+   inkscape:export-filename="jmeter.png"
+   inkscape:export-xdpi="193.67"
+   inkscape:export-ydpi="193.67"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><title
+     id="title3100">JMeter Logo</title><defs
+     id="colors"><linearGradient
+       id="Label.foreground"
+       fallback="textText"
+       gradientTransform="matrix(1.8370004,0,0,0.53870212,4.4674143,0)"
+       x1="270.27343"
+       y1="438.78119"
+       x2="360.96591"
+       y2="438.78119"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#000000"
+         id="stop1" /><stop
+         offset="1"
+         stop-color="#000000"
+         id="stop2" /></linearGradient><linearGradient
+       id="Label.disabledForeground"
+       fallback="textInactiveText Button.disabledText"><stop
+         offset="0"
+         stop-color="#4d4d4d"
+         id="stop3" /><stop
+         offset="1"
+         stop-color="#4d4d4d"
+         id="stop4" /></linearGradient><style
+       id="style1">
+      .cls-1 {
+        fill: #7c297d;
+      }
+
+      .cls-2 {
+        fill: #f79a23;
+      }
+
+      .cls-3 {
+        fill: #dd552c;
+      }
+
+      .cls-4 {
+        fill: #d22128;
+      }
+    </style><linearGradient
        inkscape:collect="always"
-       xlink:href="#SVGID_9_"
-       id="linearGradient3752"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-8238.3281"
-       y1="-747.58557"
-       x2="-7698.647"
-       y2="-747.58557" />
-    <linearGradient
+       xlink:href="#Label.disabledForeground"
+       id="linearGradient4"
+       gradientTransform="scale(0.84422883,1.184513)"
+       x1="765.65437"
+       y1="123.16302"
+       x2="786.9072"
+       y2="123.16302"
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
-       xlink:href="#SVGID_10_"
-       id="linearGradient3754"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)"
-       x1="-7935.1431"
-       y1="-747.9668"
-       x2="-7815.856"
-       y2="-747.9668" />
-    <linearGradient
+       xlink:href="#Label.disabledForeground"
+       id="linearGradient5"
+       gradientTransform="scale(1.0135875,0.98659461)"
+       x1="659.24653"
+       y1="147.87045"
+       x2="684.76284"
+       y2="147.87045"
+       gradientUnits="userSpaceOnUse" /></defs><defs
+     id="defs4"><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9387"
@@ -138,8 +87,7 @@
        y1="215.96693"
        x2="634.46875"
        y2="215.96693"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9389"
@@ -147,8 +95,7 @@
        y1="216.75172"
        x2="574.69977"
        y2="216.75172"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9391"
@@ -156,8 +103,7 @@
        y1="208.23689"
        x2="491.82263"
        y2="208.23689"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9393"
@@ -165,8 +111,7 @@
        y1="216.75172"
        x2="430.60532"
        y2="216.75172"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#SVGID_5_"
        id="linearGradient9395"
@@ -174,530 +119,142 @@
        y1="203.29279"
        x2="344.31088"
        y2="203.29279"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="-887.52247"
-     inkscape:cy="148.89888"
+     inkscape:zoom="2.8976098"
+     inkscape:cx="156.16319"
+     inkscape:cy="28.12663"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1124"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>JMeter Logo</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" /><metadata
+     id="metadata7"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>JMeter Logo</dc:title></cc:Work></rdf:RDF></metadata><g
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-433.58814,-211.85279)">
-    <g
+     transform="translate(-429.39173,-212.32802)"><g
        id="g3347"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3349"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3351"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3353"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3355"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><g
        id="g3357"
-       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" />
-    <g
-       id="g3203"
-       transform="matrix(0.16486497,0,0,0.16486497,427.12543,209.04631)">
-      <linearGradient
-         id="SVGID_1_"
-         gradientUnits="userSpaceOnUse"
-         x1="-7708.7969"
-         y1="-803.36011"
-         x2="-7633.1528"
-         y2="-714.90741"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#F69923"
-           id="stop3206" />
-        <stop
-           offset="0.3123"
-           style="stop-color:#F79A23"
-           id="stop3208" />
-        <stop
-           offset="0.8383"
-           style="stop-color:#E97826"
-           id="stop3210" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3736)"
-         inkscape:connector-curvature="0"
-         d="m 267.1,19.6 c -8.4,5 -22.4,19 -39,39.3 l 15.3,28.9 c 10.7,-15.4 21.7,-29.2 32.7,-41 0.8,-0.9 1.3,-1.4 1.3,-1.4 -0.4,0.5 -0.9,0.9 -1.3,1.4 -3.6,3.9 -14.4,16.5 -30.7,41.6 15.7,-0.8 39.8,-4 59.5,-7.4 5.9,-32.8 -5.7,-47.8 -5.7,-47.8 0,0 -14.8,-23.9 -32.1,-13.6 z"
-         id="path3212" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 241.1,184.4 c 0.1,0 0.2,0 0.3,-0.1 l -2.2,0.2 c -0.1,0.1 -0.3,0.1 -0.4,0.2 0.8,-0.1 1.6,-0.2 2.3,-0.3 z"
-         id="path3214" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 225.5,236.1 c -1.2,0.3 -2.5,0.5 -3.8,0.7 1.3,-0.2 2.6,-0.4 3.8,-0.7 z"
-         id="path3216" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 119.3,352.2 c 0.2,-0.4 0.3,-0.9 0.5,-1.3 3.4,-8.9 6.7,-17.5 10,-26 3.7,-9.4 7.4,-18.6 11,-27.5 3.8,-9.3 7.6,-18.4 11.3,-27.1 3.9,-9.2 7.7,-18 11.5,-26.5 3.1,-6.9 6.1,-13.6 9.1,-20.1 1,-2.2 2,-4.3 3,-6.4 2,-4.2 3.9,-8.3 5.8,-12.3 1.8,-3.7 3.5,-7.3 5.2,-10.9 0.6,-1.2 1.2,-2.4 1.7,-3.5 0.1,-0.2 0.2,-0.4 0.3,-0.6 l -1.9,0.2 -1.5,-2.9 c -0.1,0.3 -0.3,0.6 -0.4,0.9 -2.7,5.3 -5.4,10.7 -8,16.2 -1.5,3.1 -3,6.3 -4.6,9.5 -4.2,8.8 -8.3,17.6 -12.3,26.6 -4.1,9 -8.1,18.1 -12,27.1 -3.9,8.9 -7.6,17.8 -11.3,26.7 -3.7,8.9 -7.3,17.7 -10.8,26.5 -3.7,9.2 -7.3,18.3 -10.7,27.3 -0.8,2 -1.6,4.1 -2.3,6.1 -2.8,7.3 -5.5,14.4 -8.1,21.5 l 2.4,4.7 2.1,-0.2 c 0.1,-0.2 0.2,-0.4 0.2,-0.6 3.1,-9.5 6.5,-18.6 9.8,-27.4 z"
-         id="path3218" />
-      <path
-         style="fill:none"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 0,0 c 0,0 0,0 0,0 0,0 0,0 0,0 z"
-         id="path3220" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 215.6,262.2 c -2,0.4 -4,0.7 -6,1 0,0 0,0 0,0 1,-0.1 2.1,-0.3 3.1,-0.5 1,-0.1 2,-0.3 2.9,-0.5 z"
-         id="path3222" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 215.6,262.2 c -2,0.4 -4,0.7 -6,1 0,0 0,0 0,0 1,-0.1 2.1,-0.3 3.1,-0.5 1,-0.1 2,-0.3 2.9,-0.5 z"
-         id="path3224" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 -0.1,0 -0.1,0 0,0 0.3,0 0.6,-0.1 0.9,-0.1 1.3,-0.2 2.6,-0.4 3.8,-0.7 -1.5,0.3 -3.1,0.5 -4.7,0.8 l 0,0 0,0 z"
-         id="path3226" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 -0.1,0 -0.1,0 0,0 0.3,0 0.6,-0.1 0.9,-0.1 1.3,-0.2 2.6,-0.4 3.8,-0.7 -1.5,0.3 -3.1,0.5 -4.7,0.8 l 0,0 0,0 z"
-         id="path3228" />
-      <linearGradient
-         id="SVGID_2_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8268.6387"
-         y1="-813.12323"
-         x2="-7728.9585"
-         y2="-813.12323"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3231" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3233" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3235" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3237" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3738)"
-         inkscape:connector-curvature="0"
-         d="m 198.2,162.4 c 4.7,-8.7 9.4,-17.2 14.1,-25.5 4.9,-8.6 9.9,-16.9 15,-25 0.3,-0.5 0.6,-1 0.9,-1.4 5,-7.9 10,-15.5 15.1,-22.8 L 228,58.9 c -1.1,1.4 -2.3,2.8 -3.5,4.3 -4.4,5.5 -9,11.4 -13.7,17.7 -5.3,7.1 -10.7,14.6 -16.3,22.5 -5.1,7.3 -10.3,15 -15.5,22.9 -4.4,6.8 -8.8,13.7 -13.2,20.8 -0.2,0.3 -0.3,0.5 -0.5,0.8 l 19.9,39.3 c 4.4,-8.3 8.7,-16.6 13,-24.8 z"
-         id="path3239" />
-      <linearGradient
-         id="SVGID_3_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8203.4922"
-         y1="-758.99402"
-         x2="-7881.895"
-         y2="-758.99402"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#282662"
-           id="stop3242" />
-        <stop
-           offset="9.548390e-02"
-           style="stop-color:#662E8D"
-           id="stop3244" />
-        <stop
-           offset="0.7882"
-           style="stop-color:#9F2064"
-           id="stop3246" />
-        <stop
-           offset="0.9487"
-           style="stop-color:#CD2032"
-           id="stop3248" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3740)"
-         inkscape:connector-curvature="0"
-         d="m 107.5,384.1 c -2.6,7.2 -5.3,14.6 -7.9,22.2 0,0.1 -0.1,0.2 -0.1,0.3 -0.4,1.1 -0.8,2.1 -1.1,3.2 -1.8,5.1 -3.3,9.7 -6.9,20.1 5.9,2.7 10.6,9.7 15,17.7 -0.5,-8.3 -3.9,-16.1 -10.4,-22.1 28.9,1.3 53.9,-6 66.7,-27.2 1.1,-1.9 2.2,-3.9 3.2,-6 -5.9,7.4 -13.1,10.6 -26.8,9.8 0,0 -0.1,0 -0.1,0 0,0 0.1,0 0.1,0 20.1,-9 30.2,-17.7 39.1,-32 2.1,-3.4 4.2,-7.1 6.3,-11.2 -17.6,18.1 -38,23.2 -59.5,19.3 L 109,380 c -0.5,1.4 -1,2.7 -1.5,4.1 z"
-         id="path3250" />
-      <linearGradient
-         id="SVGID_4_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-818.15222"
-         x2="-7698.647"
-         y2="-818.15222"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3253" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3255" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3257" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3259" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3742)"
-         inkscape:connector-curvature="0"
-         d="m 115,348 c 3.5,-9 7.1,-18.1 10.7,-27.3 3.5,-8.8 7.1,-17.6 10.8,-26.5 3.7,-8.9 7.5,-17.8 11.3,-26.7 3.9,-9.1 7.9,-18.1 12,-27.1 4,-8.9 8.2,-17.8 12.3,-26.6 1.5,-3.2 3,-6.3 4.6,-9.5 2.6,-5.4 5.3,-10.8 8,-16.2 0.1,-0.3 0.3,-0.6 0.4,-0.9 L 165.4,148 c -0.3,0.5 -0.6,1.1 -1,1.6 -4.6,7.6 -9.3,15.3 -13.8,23.2 -4.6,8 -9.1,16.1 -13.5,24.4 -3.7,7 -7.3,14 -10.9,21.1 -0.7,1.4 -1.4,2.9 -2.1,4.3 -4.3,8.9 -8.3,17.6 -11.8,25.9 -4,9.4 -7.5,18.4 -10.6,26.9 -2,5.6 -3.9,11 -5.6,16.2 -1.4,4.4 -2.7,8.9 -4,13.3 -3,10.4 -5.5,20.8 -7.6,31.2 l 20,39.5 c 2.6,-7.1 5.4,-14.2 8.1,-21.5 0.8,-2 1.6,-4 2.4,-6.1 z"
-         id="path3261" />
-      <linearGradient
-         id="SVGID_5_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8198.9678"
-         y1="-810.85059"
-         x2="-7915.3501"
-         y2="-810.85059"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0"
-           style="stop-color:#282662"
-           id="stop3264" />
-        <stop
-           offset="9.548390e-02"
-           style="stop-color:#662E8D"
-           id="stop3266" />
-        <stop
-           offset="0.7882"
-           style="stop-color:#9F2064"
-           id="stop3268" />
-        <stop
-           offset="0.9487"
-           style="stop-color:#CD2032"
-           id="stop3270" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3744)"
-         inkscape:connector-curvature="0"
-         d="m 84.2,337.5 c -2.5,12.6 -4.3,25.2 -5.2,37.8 0,0.4 -0.1,0.9 -0.1,1.3 -6.2,-10 -23,-19.8 -22.9,-19.7 12,17.4 21.1,34.6 22.4,51.5 -6.4,1.3 -15.2,-0.6 -25.3,-4.3 10.6,9.7 18.5,12.4 21.6,13.1 -9.7,0.6 -19.8,7.3 -30,15 14.9,-6.1 27,-8.5 35.6,-6.5 -13.7,38.7 -27.4,81.5 -41.1,126.9 4.2,-1.2 6.7,-4.1 8.1,-7.9 2.4,-8.2 18.7,-62.2 44.1,-133.1 0.7,-2 1.5,-4 2.2,-6.1 0.2,-0.6 0.4,-1.1 0.6,-1.7 2.7,-7.4 5.5,-15 8.4,-22.8 0.7,-1.8 1.3,-3.5 2,-5.3 0,0 0,-0.1 0,-0.1 l -20,-39.5 c -0.2,0.5 -0.3,0.9 -0.4,1.4 z"
-         id="path3272" />
-      <linearGradient
-         id="SVGID_6_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-762.29712"
-         x2="-7698.647"
-         y2="-762.29712"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3275" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3277" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3279" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3281" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3746)"
-         inkscape:connector-curvature="0"
-         d="m 188.4,190.6 c -0.6,1.2 -1.1,2.3 -1.7,3.5 -1.7,3.6 -3.5,7.2 -5.2,10.9 -1.9,4 -3.8,8.1 -5.8,12.3 -1,2.1 -2,4.2 -3,6.4 -3,6.5 -6,13.2 -9.1,20.1 -3.8,8.5 -7.6,17.3 -11.5,26.5 -3.7,8.7 -7.5,17.8 -11.3,27.1 -3.6,8.9 -7.3,18 -11,27.5 -3.3,8.4 -6.6,17.1 -10,26 -0.2,0.4 -0.3,0.9 -0.5,1.3 -3.3,8.8 -6.7,17.9 -10.1,27.2 -0.1,0.2 -0.2,0.4 -0.2,0.6 l 16.1,-1.8 c -0.3,-0.1 -0.6,-0.1 -1,-0.2 19.3,-2.4 44.9,-16.8 61.4,-34.6 7.6,-8.2 14.5,-17.8 20.9,-29.1 4.8,-8.4 9.2,-17.7 13.5,-28.1 3.7,-9 7.3,-18.8 10.7,-29.4 -4.4,2.3 -9.5,4 -15.1,5.2 -1,0.2 -2,0.4 -3,0.6 -1,0.2 -2,0.3 -3.1,0.5 l 0,0 0,0 c 0,0 0,0 0,0 18,-6.9 29.3,-20.2 37.5,-36.6 -4.7,3.2 -12.4,7.4 -21.6,9.5 -1.2,0.3 -2.5,0.5 -3.8,0.7 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 0,0 c 0,0 0,0 0,0 0,0 0,0 0,0 l 0,0 c 6.2,-2.6 11.5,-5.5 16.1,-9 1,-0.7 1.9,-1.5 2.8,-2.3 1.4,-1.2 2.7,-2.5 4,-3.8 0.8,-0.9 1.6,-1.7 2.4,-2.6 1.8,-2.1 3.5,-4.4 5,-6.9 0.5,-0.8 1,-1.5 1.4,-2.3 0.6,-1.2 1.2,-2.3 1.7,-3.4 2.5,-5 4.5,-9.5 6.1,-13.5 0.8,-2 1.5,-3.8 2.1,-5.5 0.2,-0.7 0.5,-1.3 0.7,-2 0.6,-1.9 1.2,-3.6 1.6,-5.1 0.6,-2.2 1,-4 1.2,-5.3 l 0,0 0,0 c -0.6,0.5 -1.3,1 -2.1,1.4 -5.4,3.2 -14.7,6.2 -22.2,7.6 l 14.8,-1.6 -14.8,1.6 c -0.1,0 -0.2,0 -0.3,0.1 -0.7,0.1 -1.5,0.2 -2.3,0.4 0.1,-0.1 0.3,-0.1 0.4,-0.2 l -50.6,5.5 c 0.1,0.4 0,0.6 -0.1,0.7 z"
-         id="path3283" />
-      <linearGradient
-         id="SVGID_7_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8271.8057"
-         y1="-765.07068"
-         x2="-7732.125"
-         y2="-765.07068"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3286" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3288" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3290" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3292" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3748)"
-         inkscape:connector-curvature="0"
-         d="m 245.4,88.4 c -4.5,6.9 -9.4,14.8 -14.7,23.6 -0.3,0.5 -0.6,0.9 -0.8,1.4 -4.6,7.7 -9.4,16.1 -14.5,25.4 -4.4,8 -9,16.5 -13.8,25.8 -4.2,8 -8.4,16.5 -12.9,25.5 l 50.6,-5.5 c 14.7,-6.8 21.3,-12.9 27.7,-21.8 1.7,-2.4 3.4,-5 5.1,-7.7 5.2,-8.1 10.3,-17 14.8,-25.9 4.4,-8.6 8.3,-17.1 11.2,-24.7 1.9,-4.9 3.4,-9.4 4.5,-13.4 0.9,-3.5 1.6,-6.8 2.2,-10 -19.6,3.3 -43.7,6.5 -59.4,7.3 z"
-         id="path3294" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3296" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3298" />
-      <linearGradient
-         id="SVGID_8_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-745.68481"
-         x2="-7698.647"
-         y2="-745.68481"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3301" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3303" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3305" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3307" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3750)"
-         inkscape:connector-curvature="0"
-         d="m 212.7,262.8 c -1,0.2 -2,0.3 -3.1,0.5 l 0,0 c 1,-0.2 2,-0.4 3.1,-0.5 z"
-         id="path3309" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3311" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3313" />
-      <linearGradient
-         id="SVGID_9_"
-         gradientUnits="userSpaceOnUse"
-         x1="-8238.3281"
-         y1="-747.58557"
-         x2="-7698.647"
-         y2="-747.58557"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3316" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3318" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3320" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3322" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3752)"
-         inkscape:connector-curvature="0"
-         d="m 220.7,236.9 c 0.3,0 0.6,-0.1 1,-0.1 -0.3,0 -0.6,0.1 -1,0.1 l 0,0 z"
-         id="path3324" />
-      <path
-         style="fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3326" />
-      <path
-         style="opacity:0.35;fill:#be202e"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3328" />
-      <linearGradient
-         id="SVGID_10_"
-         gradientUnits="userSpaceOnUse"
-         x1="-7935.1431"
-         y1="-747.9668"
-         x2="-7815.856"
-         y2="-747.9668"
-         gradientTransform="matrix(0.4226,-0.9063,0.9063,0.4226,4226.9761,-6584.5938)">
-        <stop
-           offset="0.3233"
-           style="stop-color:#9E2064"
-           id="stop3331" />
-        <stop
-           offset="0.6302"
-           style="stop-color:#C92037"
-           id="stop3333" />
-        <stop
-           offset="0.7514"
-           style="stop-color:#CD2335"
-           id="stop3335" />
-        <stop
-           offset="1"
-           style="stop-color:#E97826"
-           id="stop3337" />
-      </linearGradient>
-      <path
-         style="fill:url(#linearGradient3754)"
-         inkscape:connector-curvature="0"
-         d="m 220.8,236.9 c 0,0 0,0 0,0 l 0,0 0,0 0,0 c 0,0 0,0 0,0 z"
-         id="path3339" />
-    </g>
-    <path
+       transform="matrix(0.61056696,0,0,0.61056696,-671.81995,122.75139)" /><path
        id="path3343"
-       d="m 467.34728,239.32927 v 1.20513 h -0.33894 v -1.20513 h -0.42681 v -0.28873 h 1.18002 v 0.28873 h -0.41427 z"
+       d="m 467.14932,239.32927 v 1.20513 h -0.33717 v -1.20513 h -0.42459 v -0.28873 h 1.17387 v 0.28873 z"
        inkscape:connector-curvature="0"
-       style="fill:#b0afb0" />
-    <path
+       style="fill:#b0afb0;stroke-width:0.997389" /><path
        id="path3345"
-       d="m 469.34328,239.59289 -0.40171,0.81597 h -0.20085 l -0.40172,-0.81597 v 0.94151 h -0.32638 v -1.49386 h 0.45192 l 0.38916,0.81597 0.38916,-0.81597 h 0.45192 v 1.49386 h -0.32639 v -0.94151 z"
+       d="m 469.13491,239.59289 -0.39962,0.81597 h -0.1998 l -0.39962,-0.81597 v 0.94151 h -0.32468 v -1.49386 h 0.44956 l 0.38713,0.81597 0.38713,-0.81597 h 0.44956 v 1.49386 h -0.32468 v -0.94151 z"
        inkscape:connector-curvature="0"
-       style="fill:#b0afb0" />
-    <path
+       style="fill:#b0afb0;stroke-width:0.997389" /><path
        inkscape:connector-curvature="0"
        id="path3718"
-       style="font-size:160.72227478px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d22128;fill-opacity:1;stroke:#d22128;stroke-width:1.22876537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
-       d="m 481.04365,297.79747 c -1.39288,-10e-6 -2.61433,-0.075 -3.66436,-0.225 -1.05002,-0.12859 -1.93932,-0.28931 -2.66792,-0.48216 l 0,-8.29303 c 0.79288,0.17143 1.62861,0.32143 2.5072,0.45001 0.85716,0.12857 1.80004,0.19285 2.82863,0.19286 0.98574,-1e-5 1.89647,-0.10715 2.7322,-0.32144 0.85717,-0.21429 1.59646,-0.5893 2.21791,-1.12502 0.64287,-0.5143 1.13573,-1.21074 1.4786,-2.08933 0.36429,-0.87859 0.54644,-1.98218 0.54644,-3.31079 l 0,-45.6117 9.96451,0 0,45.29027 c -2e-5,2.70006 -0.39646,5.0251 -1.18932,6.97515 -0.77146,1.95003 -1.86433,3.55721 -3.27864,4.82153 -1.39289,1.28573 -3.06436,2.22861 -5.01439,2.82864 -1.95005,0.59999 -4.10367,0.9 -6.46086,0.90001" />
-    <path
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:160.722px;line-height:125%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#d22128;fill-opacity:1;stroke:#d22128;stroke-width:1.22556;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 480.77425,297.79747 c -1.38561,-10e-6 -2.60069,-0.075 -3.64525,-0.225 -1.04454,-0.12859 -1.9292,-0.28931 -2.654,-0.48216 v -8.29303 c 0.78874,0.17143 1.62012,0.32143 2.49412,0.45001 0.85269,0.12857 1.79065,0.19285 2.81388,0.19286 0.9806,-1e-5 1.88658,-0.10715 2.71795,-0.32144 0.8527,-0.21429 1.58813,-0.5893 2.20634,-1.12502 0.63952,-0.5143 1.12981,-1.21074 1.47089,-2.08933 0.36239,-0.87859 0.54359,-1.98218 0.54359,-3.31079 v -45.6117 h 9.91254 v 45.29027 c -2e-5,2.70006 -0.39439,5.0251 -1.18312,6.97515 -0.76743,1.95003 -1.8546,3.55721 -3.26154,4.82153 -1.38562,1.28573 -3.04838,2.22861 -4.98823,2.82864 -1.93988,0.59999 -4.08227,0.9 -6.42717,0.90001" /><path
        fill="url(#Label.foreground)"
        stroke="url(#Label.foreground)"
-       style="font-size:160.72227478px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill-opacity:1;stroke-width:1.22876537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
-       d="m 502.3266,236.98674 0,46.98748 8.90855,0 0,-21.86178 c -4e-5,-0.6 -0.017,-1.27231 -0.0384,-2.02235 -1e-5,-0.74999 -0.0211,-1.528 -0.064,-2.34233 -0.0215,-0.81427 -0.0467,-1.63457 -0.0896,-2.47033 -0.0215,-0.8357 -0.0596,-1.65183 -0.10239,-2.44473 -0.0857,-1.84287 -0.19144,-3.74994 -0.31999,-5.72144 l 0.29439,0 10.31651,36.86296 9.15174,0 11.12289,-36.79896 0.25599,0 c -0.0643,1.95007 -0.13192,3.81903 -0.21759,5.61904 -0.0215,0.77148 -0.0596,1.56646 -0.1024,2.38073 -0.0215,0.81433 -0.0426,1.61349 -0.064,2.40633 -0.0215,0.79291 -0.0426,1.54561 -0.064,2.25274 -4e-5,0.70718 -4e-5,1.33722 0,1.89435 l 0,22.24577 9.29254,0 0,-46.98748 -13.56762,0 -10.80289,35.92859 -0.192,0 -10.15011,-35.92859 -13.56762,0 z m 93.29657,3.40471 -2.82872,7.57739 -5.38864,3.2895 0,4.14709 4.68466,0 0,17.31791 c 0,2.31434 0.27482,4.24255 0.83198,5.78544 0.57858,1.52146 1.36939,2.73925 2.35513,3.66069 0.98573,0.90002 2.15706,1.54285 3.50711,1.90715 1.35001,0.36429 2.80034,0.53758 4.36467,0.53758 1.60716,0 3.09143,-0.15215 4.44148,-0.47358 1.37143,-0.30001 2.50883,-0.69333 3.4303,-1.16477 l 0,-7.29579 c -0.90004,0.32144 -1.78376,0.59209 -2.66232,0.80637 -0.85719,0.2143 -1.77484,0.32 -2.73913,0.31999 -1.11432,10e-6 -2.01501,-0.33406 -2.70072,-0.99837 -0.68575,-0.66429 -1.02399,-1.69182 -1.02397,-3.08471 l 0,-17.31791 8.74215,0 0,-7.3598 -8.74215,0 0,-7.65418 -6.27183,0 z m -25.16409,6.9758 c -2.44292,4e-5 -4.66709,0.39753 -6.68141,1.19037 -1.99291,0.7929 -3.70972,1.97258 -5.14546,3.5583 -1.41432,1.56435 -2.52223,3.53067 -3.3151,5.88783 -0.79288,2.35722 -1.19037,5.10572 -1.19037,8.25577 0,3.10722 0.4356,5.82624 1.29277,8.14057 0.87858,2.29291 2.09637,4.19999 3.66069,5.72144 1.56431,1.50004 3.4291,2.61629 5.59344,3.36631 2.16432,0.75001 4.53231,1.12636 7.1038,1.12636 1.32858,0 2.54637,-0.0464 3.6607,-0.15359 1.11429,-0.0857 2.15878,-0.2337 3.12311,-0.44799 0.96428,-0.21429 1.86914,-0.48077 2.72633,-0.78078 0.87856,-0.32143 1.75393,-0.70195 2.61112,-1.15196 l 0,-7.59019 c -0.94291,0.47145 -1.86473,0.89008 -2.76472,1.25436 -0.90005,0.34287 -1.8177,0.63467 -2.73912,0.87038 -0.92148,0.23573 -1.86861,0.42181 -2.85432,0.55038 -0.96433,0.10716 -1.99186,0.15361 -3.08471,0.1536 -1.3072,1e-5 -2.47853,-0.19442 -3.50711,-0.60158 -1.00718,-0.40715 -1.88255,-0.99073 -2.61112,-1.74075 -0.70718,-0.77144 -1.25682,-1.71024 -1.66396,-2.80313 -0.38573,-1.11429 -0.59713,-2.35322 -0.63998,-3.72469 l 21.91299,0 0,-4.76147 c -4e-5,-2.61431 -0.35942,-4.92305 -1.08797,-6.9374 -0.70719,-2.03573 -1.73472,-3.75254 -3.08472,-5.14546 -1.32862,-1.39285 -2.96087,-2.44151 -4.88946,-3.14871 -1.90721,-0.72855 -4.04682,-1.08793 -6.42542,-1.08797 z m 59.01914,0 c -2.44292,4e-5 -4.6671,0.39753 -6.68141,1.19037 -1.99291,0.7929 -3.70972,1.97258 -5.14546,3.5583 -1.41432,1.56435 -2.52223,3.53067 -3.3151,5.88783 -0.79288,2.35722 -1.19037,5.10572 -1.19037,8.25577 0,3.10722 0.4356,5.82624 1.29276,8.14057 0.87859,2.29291 2.09637,4.19999 3.6607,5.72144 1.56431,1.50004 3.4291,2.61629 5.59344,3.36631 2.16432,0.75001 4.5323,1.12636 7.1038,1.12636 1.32858,0 2.54637,-0.0464 3.6607,-0.15359 1.11429,-0.0857 2.15878,-0.2337 3.12311,-0.44799 0.96428,-0.21429 1.86914,-0.48077 2.72633,-0.78078 0.87856,-0.32143 1.75393,-0.70195 2.61112,-1.15196 l 0,-7.59019 c -0.94291,0.47145 -1.86473,0.89008 -2.76472,1.25436 -0.90005,0.34287 -1.8177,0.63467 -2.73912,0.87038 -0.92148,0.23573 -1.86861,0.42181 -2.85432,0.55038 -0.96433,0.10716 -1.99186,0.15361 -3.08471,0.1536 -1.3072,1e-5 -2.47853,-0.19442 -3.50711,-0.60158 -1.00718,-0.40715 -1.86975,-0.99073 -2.59832,-1.74075 -0.70717,-0.77144 -1.26962,-1.71024 -1.67676,-2.80313 -0.38573,-1.11429 -0.59713,-2.35322 -0.63998,-3.72469 l 21.91299,0 0,-4.76147 c -4e-5,-2.61431 -0.35942,-4.92305 -1.08797,-6.9374 -0.7072,-2.03573 -1.73472,-3.75254 -3.08472,-5.14546 -1.32862,-1.39285 -2.96088,-2.44151 -4.88946,-3.14871 -1.90721,-0.72855 -4.04682,-1.08793 -6.42542,-1.08797 z m 36.85016,0 c -1.20004,4e-5 -2.26985,0.14802 -3.21271,0.44799 -0.92147,0.27861 -1.75873,0.68028 -2.50872,1.21597 -0.72861,0.51433 -1.38395,1.15716 -1.98395,1.90714 -0.60003,0.75005 -1.16247,1.57452 -1.67675,2.49593 l -0.48639,0 -1.44636,-5.38865 -7.42379,0 0,35.92859 9.80453,0 0,-18.29068 c -2e-5,-1.69288 0.20721,-3.11789 0.61438,-4.27508 0.42856,-1.17858 1.01631,-2.12154 1.76635,-2.82872 0.77143,-0.72856 1.68908,-1.2529 2.73912,-1.57436 1.07143,-0.32141 2.22997,-0.48636 3.4943,-0.48639 0.21427,5e-5 0.48492,0.017 0.80638,0.0384 0.32141,3e-5 0.63851,0.0212 0.95997,0.064 0.34284,0.0215 0.67274,0.0596 0.97278,0.1024 0.29997,0.0429 0.53251,0.0852 0.70398,0.12799 l 0,-9.20294 c -0.12861,-0.0428 -0.31887,-0.0681 -0.57599,-0.0896 -0.23574,-0.0428 -0.5064,-0.0809 -0.80637,-0.1024 -0.27861,-0.0428 -0.57457,-0.064 -0.89598,-0.064 -0.30003,-0.0214 -0.58765,-0.0256 -0.84478,-0.0256 z m -95.8053,6.97581 c 1.02857,2e-5 1.92926,0.19029 2.70072,0.57598 0.77143,0.38575 1.41843,0.91425 1.93275,1.59995 0.51427,0.66433 0.89479,1.45932 1.15197,2.38074 0.25712,0.92147 0.40092,1.92785 0.42239,3.02071 l -12.50525,0 c 0.17142,-2.61431 0.82259,-4.52556 1.95834,-5.74704 1.15716,-1.22142 2.60331,-1.83032 4.33908,-1.83034 z m 59.01914,0 c 1.02857,2e-5 1.92926,0.19029 2.70072,0.57598 0.77143,0.38575 1.41843,0.91425 1.93275,1.59995 0.51427,0.66433 0.89479,1.45932 1.15197,2.38074 0.25712,0.92147 0.40092,1.92785 0.42238,3.02071 l -12.50524,0 c 0.17142,-2.61431 0.82259,-4.52556 1.95834,-5.74704 1.15715,-1.22142 2.60331,-1.83032 4.33908,-1.83034 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:160.722px;line-height:125%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';letter-spacing:0px;word-spacing:0px;fill:url(#Label.foreground);fill-opacity:1;stroke:url(#Label.foreground);stroke-width:1.22556;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 501.9462,236.98674 v 46.98748 h 8.86209 v -21.86178 c -4e-5,-0.6 -0.0169,-1.27231 -0.0382,-2.02235 -10e-6,-0.74999 -0.021,-1.528 -0.0637,-2.34233 -0.0214,-0.81427 -0.0465,-1.63457 -0.0891,-2.47033 -0.0214,-0.8357 -0.0593,-1.65183 -0.10186,-2.44473 -0.0852,-1.84287 -0.19044,-3.74994 -0.31832,-5.72144 h 0.29285 l 10.26271,36.86296 h 9.104 l 11.06488,-36.79896 h 0.25466 c -0.064,1.95007 -0.13123,3.81903 -0.21646,5.61904 -0.0214,0.77148 -0.0593,1.56646 -0.10186,2.38073 -0.0214,0.81433 -0.0424,1.61349 -0.0637,2.40633 -0.0214,0.79291 -0.0424,1.54561 -0.0637,2.25274 -4e-5,0.70718 -4e-5,1.33722 0,1.89435 v 22.24577 h 9.24408 v -46.98748 h -13.49686 l -10.74655,35.92859 h -0.19099 L 515.443,236.98674 Z m 92.80997,3.40471 -2.81397,7.57739 -5.36053,3.2895 v 4.14709 h 4.66022 v 17.31791 c 0,2.31434 0.27339,4.24255 0.82764,5.78544 0.57557,1.52146 1.36225,2.73925 2.34285,3.66069 0.98059,0.90002 2.14581,1.54285 3.48882,1.90715 1.34297,0.36429 2.78573,0.53758 4.3419,0.53758 1.59878,0 3.07531,-0.15215 4.41832,-0.47358 1.36428,-0.30001 2.49574,-0.69333 3.41241,-1.16477 v -7.29579 c -0.89535,0.32144 -1.77446,0.59209 -2.64844,0.80637 -0.85271,0.2143 -1.76558,0.32 -2.72484,0.31999 -1.10851,10e-6 -2.0045,-0.33406 -2.68663,-0.99837 -0.68218,-0.66429 -1.01865,-1.69182 -1.01863,-3.08471 v -17.31791 h 8.69655 v -7.3598 h -8.69655 v -7.65418 z m -25.03284,6.9758 c -2.43018,4e-5 -4.64275,0.39753 -6.64657,1.19037 -1.98251,0.7929 -3.69037,1.97258 -5.11862,3.5583 -1.40694,1.56435 -2.50908,3.53067 -3.29781,5.88783 -0.78874,2.35722 -1.18416,5.10572 -1.18416,8.25577 0,3.10722 0.43333,5.82624 1.28603,8.14057 0.87399,2.29291 2.08543,4.19999 3.64159,5.72144 1.55615,1.50004 3.41122,2.61629 5.56427,3.36631 2.15303,0.75001 4.50867,1.12636 7.06675,1.12636 1.32165,0 2.53309,-0.0464 3.64161,-0.15359 1.10847,-0.0857 2.14752,-0.2337 3.10682,-0.44799 0.95925,-0.21429 1.85939,-0.48077 2.71211,-0.78078 0.87398,-0.32143 1.74478,-0.70195 2.5975,-1.15196 v -7.59019 c -0.93799,0.47145 -1.85501,0.89008 -2.7503,1.25436 -0.89536,0.34287 -1.80822,0.63467 -2.72483,0.87038 -0.91668,0.23573 -1.85887,0.42181 -2.83944,0.55038 -0.9593,0.10716 -1.98147,0.15361 -3.06862,0.1536 -1.30038,1e-5 -2.4656,-0.19442 -3.48882,-0.60158 -1.00192,-0.40715 -1.87273,-0.99073 -2.5975,-1.74075 -0.70349,-0.77144 -1.25026,-1.71024 -1.65528,-2.80313 -0.38372,-1.11429 -0.59402,-2.35322 -0.63664,-3.72469 h 21.7987 v -4.76147 c -4e-5,-2.61431 -0.35755,-4.92305 -1.0823,-6.9374 -0.7035,-2.03573 -1.72567,-3.75254 -3.06863,-5.14546 -1.32169,-1.39285 -2.94543,-2.44151 -4.86396,-3.14871 -1.89726,-0.72855 -4.02571,-1.08793 -6.3919,-1.08797 z m 58.71131,0 c -2.43018,4e-5 -4.64275,0.39753 -6.64656,1.19037 -1.98251,0.7929 -3.69037,1.97258 -5.11862,3.5583 -1.40695,1.56435 -2.50908,3.53067 -3.29781,5.88783 -0.78875,2.35722 -1.18416,5.10572 -1.18416,8.25577 0,3.10722 0.43332,5.82624 1.28601,8.14057 0.87401,2.29291 2.08544,4.19999 3.64161,5.72144 1.55615,1.50004 3.41122,2.61629 5.56427,3.36631 2.15303,0.75001 4.50866,1.12636 7.06675,1.12636 1.32165,0 2.53309,-0.0464 3.6416,-0.15359 1.10848,-0.0857 2.14753,-0.2337 3.10683,-0.44799 0.95925,-0.21429 1.85939,-0.48077 2.71211,-0.78078 0.87397,-0.32143 1.74478,-0.70195 2.5975,-1.15196 v -7.59019 c -0.93799,0.47145 -1.85501,0.89008 -2.7503,1.25436 -0.89536,0.34287 -1.80822,0.63467 -2.72484,0.87038 -0.91667,0.23573 -1.85886,0.42181 -2.83943,0.55038 -0.9593,0.10716 -1.98147,0.15361 -3.06862,0.1536 -1.30038,1e-5 -2.4656,-0.19442 -3.48882,-0.60158 -1.00193,-0.40715 -1.86,-0.99073 -2.58477,-1.74075 -0.70348,-0.77144 -1.263,-1.71024 -1.66801,-2.80313 -0.38372,-1.11429 -0.59402,-2.35322 -0.63664,-3.72469 h 21.7987 v -4.76147 c -4e-5,-2.61431 -0.35755,-4.92305 -1.0823,-6.9374 -0.70351,-2.03573 -1.72567,-3.75254 -3.06863,-5.14546 -1.32169,-1.39285 -2.94544,-2.44151 -4.86396,-3.14871 -1.89726,-0.72855 -4.02571,-1.08793 -6.39191,-1.08797 z m 36.65797,0 c -1.19378,4e-5 -2.25801,0.14802 -3.19596,0.44799 -0.91666,0.27861 -1.74955,0.68028 -2.49563,1.21597 -0.72481,0.51433 -1.37673,1.15716 -1.9736,1.90714 -0.59691,0.75005 -1.15641,1.57452 -1.66801,2.49593 h -0.48385 l -1.43882,-5.38865 h -7.38507 v 35.92859 h 9.75339 v -18.29068 c -2e-5,-1.69288 0.20613,-3.11789 0.61118,-4.27508 0.42632,-1.17858 1.01101,-2.12154 1.75714,-2.82872 0.7674,-0.72856 1.68027,-1.2529 2.72483,-1.57436 1.06584,-0.32141 2.21834,-0.48636 3.47608,-0.48639 0.21315,5e-5 0.48239,0.017 0.80217,0.0384 0.31973,3e-5 0.63518,0.0212 0.95496,0.064 0.34105,0.0215 0.66923,0.0596 0.96771,0.1024 0.2984,0.0429 0.52973,0.0852 0.70031,0.12799 v -9.20294 c -0.12794,-0.0428 -0.31721,-0.0681 -0.57299,-0.0896 -0.23451,-0.0428 -0.50376,-0.0809 -0.80216,-0.1024 -0.27716,-0.0428 -0.57158,-0.064 -0.89131,-0.064 -0.29846,-0.0214 -0.58458,-0.0256 -0.84037,-0.0256 z m -95.30562,6.97581 c 1.02321,2e-5 1.9192,0.19029 2.68664,0.57598 0.7674,0.38575 1.41103,0.91425 1.92266,1.59995 0.51159,0.66433 0.89013,1.45932 1.14597,2.38074 0.25578,0.92147 0.39883,1.92785 0.42018,3.02071 h -12.44002 c 0.17052,-2.61431 0.8183,-4.52556 1.94812,-5.74704 1.15113,-1.22142 2.58973,-1.83032 4.31645,-1.83034 z m 58.71132,0 c 1.0232,2e-5 1.9192,0.19029 2.68663,0.57598 0.76741,0.38575 1.41104,0.91425 1.92267,1.59995 0.51159,0.66433 0.89013,1.45932 1.14596,2.38074 0.25578,0.92147 0.39883,1.92785 0.42018,3.02071 h -12.44002 c 0.17053,-2.61431 0.8183,-4.52556 1.94813,-5.74704 1.15112,-1.22142 2.58973,-1.83032 4.31645,-1.83034 z"
        id="path3720"
-       inkscape:connector-curvature="0" />
-    <g
-       style="font-size:35.26461411px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none;font-family:sans-serif;-inkscape-font-specification:Sans Bold"
+       inkscape:connector-curvature="0" /><g
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:35.2646px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
        id="text3756"
-       transform="matrix(0.40958848,0,0,0.40958848,409.7852,177.21243)">
-      <path
-         d="m 658.02758,171.06244 -5.32069,0 0,-20.73174 -6.31939,0 0,-4.44251 17.94225,0 0,4.44251 -6.30217,0 0,20.73174"
+       transform="matrix(0.40745222,0,0,0.40958848,409.88746,177.21243)"><path
+         d="m 658.02758,171.06244 h -5.32069 V 150.3307 h -6.31939 v -4.44251 h 17.94225 v 4.44251 h -6.30217 v 20.73174"
          fill="url(#Label.disabledForeground)"
-         style="font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+         style="font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:url(#linearGradient4)"
          id="path3879"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 678.32884,171.06244 -5.52732,-19.75025 -0.15497,0 c 0.0689,1.05612 0.12627,2.07778 0.17219,3.06499 0.0229,0.42475 0.0402,0.86097 0.0517,1.30865 0.023,0.44771 0.0402,0.88966 0.0517,1.32586 0.023,0.43623 0.0344,0.85523 0.0344,1.25699 0.0115,0.4018 0.0172,0.76339 0.0172,1.08481 l 0,11.70895 -4.76967,0 0,-25.17425 7.26643,0 5.44122,19.2509 0.10332,0 5.7856,-19.2509 7.26644,0 0,25.17425 -4.97631,0 0,-11.91558 c -2e-5,-0.29845 -2e-5,-0.6371 0,-1.01593 0.0115,-0.3788 0.0229,-0.78058 0.0344,-1.20533 0.0115,-0.42472 0.0229,-0.8552 0.0344,-1.29143 0.0229,-0.4362 0.0401,-0.86094 0.0517,-1.27421 0.0459,-0.96425 0.0861,-1.96869 0.12053,-3.01333 l -0.13775,0 -5.95779,19.71581 -4.90743,0"
+         inkscape:connector-curvature="0" /><path
+         d="m 678.32884,171.06244 -5.52732,-19.75025 h -0.15497 c 0.0689,1.05612 0.12627,2.07778 0.17219,3.06499 0.0229,0.42475 0.0402,0.86097 0.0517,1.30865 0.023,0.44771 0.0402,0.88966 0.0517,1.32586 0.023,0.43623 0.0344,0.85523 0.0344,1.25699 0.0115,0.4018 0.0172,0.76339 0.0172,1.08481 v 11.70895 h -4.76967 v -25.17425 h 7.26643 l 5.44122,19.2509 h 0.10332 l 5.7856,-19.2509 h 7.26644 v 25.17425 h -4.97631 v -11.91558 c -2e-5,-0.29845 -2e-5,-0.6371 0,-1.01593 0.0115,-0.3788 0.0229,-0.78058 0.0344,-1.20533 0.0115,-0.42472 0.0229,-0.8552 0.0344,-1.29143 0.0229,-0.4362 0.0401,-0.86094 0.0517,-1.27421 0.0459,-0.96425 0.0861,-1.96869 0.12053,-3.01333 h -0.13775 l -5.95779,19.71581 h -4.90743"
          fill="url(#Label.disabledForeground)"
-         style="font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+         style="font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:url(#linearGradient5)"
          id="path3881"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
+         inkscape:connector-curvature="0" /></g><g
        id="g8126"
-       transform="matrix(0.14276681,0,0,0.14276681,453.68012,190.16516)">
-      <g
-         id="g8128">
-        <path
+       transform="matrix(0.14202219,0,0,0.14276681,453.55344,190.16516)"><g
+         id="g8128"><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
-           d="m 232.6,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 328.3 L 313,240.5 h -53 l -15.1,36.8 h -12.3 z m 54.1,-104.2 -24.2,58.2 h 47.8 l -23.6,-58.2 z"
-           id="path8130" />
-        <path
+           d="m 232.6,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 328.3 L 313,240.5 h -53 l -15.1,36.8 z m 54.1,-104.2 -24.2,58.2 h 47.8 z"
+           id="path8130" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
-           d="M 353.3,277.3 V 159.5 h 48.8 c 20.2,0 34.8,18.7 34.8,37 0,19.2 -13.6,37.3 -33.8,37.3 h -38.3 v 43.5 h -11.5 z m 11.5,-53.8 h 37.7 c 13.9,0 22.9,-12.8 22.9,-27 0,-14.8 -10.9,-26.7 -23.9,-26.7 h -36.7 v 53.7 z"
-           id="path8132" />
-        <path
+           d="M 353.3,277.3 V 159.5 h 48.8 c 20.2,0 34.8,18.7 34.8,37 0,19.2 -13.6,37.3 -33.8,37.3 h -38.3 v 43.5 z m 11.5,-53.8 h 37.7 c 13.9,0 22.9,-12.8 22.9,-27 0,-14.8 -10.9,-26.7 -23.9,-26.7 h -36.7 z"
+           id="path8132" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
-           d="m 430.5,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 526 l -15.3,-36.8 h -52.9 l -15.1,36.8 h -12.2 z m 54.1,-104.2 -24.2,58.2 h 47.8 l -23.6,-58.2 z"
-           id="path8134" />
-        <path
+           d="m 430.5,277.3 49.3,-117.8 h 9.5 l 49.3,117.8 H 526 l -15.3,-36.8 h -52.9 l -15.1,36.8 z m 54.1,-104.2 -24.2,58.2 h 47.8 z"
+           id="path8134" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
            d="m 594.2,158.8 c 20.9,0 36.2,10.6 43.5,25.7 l -9.3,5.6 c -7.5,-15.6 -22.1,-20.9 -34.8,-20.9 -28.2,0 -43.6,25.2 -43.6,48.9 0,26 19.1,49.6 44.1,49.6 13.3,0 28.9,-6.6 36.3,-21.9 l 9.6,5 c -7.6,17.6 -28.5,27.4 -46.6,27.4 -32.3,0 -55.1,-30.9 -55.1,-60.7 0,-28.3 20.4,-58.7 55.9,-58.7 z"
-           id="path8136" />
-        <path
+           id="path8136" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
-           d="m 749.1,159.5 v 117.8 h -11.6 v -55.1 h -69.8 v 55.1 H 656.3 V 159.5 h 11.4 v 52.4 h 69.8 v -52.4 h 11.6 z"
-           id="path8138" />
-        <path
+           d="m 749.1,159.5 v 117.8 h -11.6 v -55.1 h -69.8 v 55.1 H 656.3 V 159.5 h 11.4 v 52.4 h 69.8 v -52.4 z"
+           id="path8138" /><path
            style="fill:#d22128"
            inkscape:connector-curvature="0"
-           d="m 854.8,267 v 10.3 H 775.7 V 159.5 h 77.6 v 10.3 h -66.2 v 42.5 h 57.7 v 9.8 H 787.1 V 267 h 67.7 z"
-           id="path8140" />
-      </g>
-    </g>
-    <g
+           d="m 854.8,267 v 10.3 H 775.7 V 159.5 h 77.6 v 10.3 h -66.2 v 42.5 h 57.7 v 9.8 H 787.1 V 267 Z"
+           id="path8140" /></g></g><g
        id="g8326"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8328"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8330"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8332"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8334"
-       transform="translate(132.42046,222.12974)" />
-    <g
+       transform="translate(132.42046,222.12974)" /><g
        id="g8336"
-       transform="translate(132.42046,222.12974)" />
-  </g>
-</svg>
+       transform="translate(132.42046,222.12974)" /><g
+       id="g4"
+       transform="matrix(0.08794689,0,0,0.08840799,427.48387,211.99145)"><path
+         class="cls-3"
+         d="M 276.70929,398.15158 C 302.23724,335.02733 330.72037,272.0269 361.28223,216.18798 315.661,182.30276 271.85458,109.23451 253.85632,76.861096 247.39206,84.205064 243.19551,92.663335 241.29273,99.544641 224.33709,160.7661 284.69512,234.69452 236.07962,207.68409 195.57375,185.17649 104.36388,135.88653 69.572883,184.87673 108.53762,234.94214 210.45066,360.90391 276.70929,398.15158 Z"
+         id="path1" /><path
+         class="cls-2"
+         d="m 361.28223,216.18798 c 29.61372,-54.10557 61.17258,-101.49274 93.89136,-135.632093 0,0 -32.63406,47.237293 -79.24578,141.666263 28.22899,7.77405 108.62492,23.72617 220.60904,-5.20008 2.75317,-20.35067 -10.92799,-42.73447 -79.10569,-50.22831 -44.51018,-4.88729 53.4246,-106.28228 -17.52257,-154.236376 -2.29051,-1.5509 -4.54192,-2.9193413 -6.74771,-4.1444221 C 490.78239,7.5593151 488.27033,6.7773486 485.58883,6.0800952 402.72971,-15.541278 391.24458,124.95855 358.18043,94.755096 304.74931,45.947354 271.02374,57.351032 253.85632,76.861096 271.85458,109.23451 315.661,182.30276 361.28223,216.18798 Z"
+         id="path2" /><path
+         class="cls-4"
+         d="M 210.0662,580.02395 C 228.77149,523.98954 251.27257,461.03472 276.70929,398.15158 210.45066,360.90391 108.53762,234.94214 69.572883,184.87673 62.61664,194.66435 57.862935,208.31618 56.279453,226.98563 47.782084,327.26632 151.23625,401.50752 130.61188,415.06812 103.33103,433.00774 49.03323,371.97525 27.633414,410.75427 58.651418,450.60198 121.83431,522.60155 210.0662,580.02395 Z"
+         id="path3" /><path
+         class="cls-3"
+         d="m 496.71556,363.75157 c -52.38198,-18.68248 54.73766,-68.78699 89.52214,-121.94116 4.45069,-6.79659 9.05126,-15.58068 10.29915,-24.78834 -111.98412,28.92625 -192.38005,12.97413 -220.60904,5.20008 -24.13019,48.89246 -51.99426,110.5049 -81.05409,184.79172 30.26536,12.94154 153.84213,60.74576 328.39009,60.99338 29.34655,-76.43722 -76.83473,-86.53111 -126.54825,-104.25568 z"
+         id="path4" /><path
+         class="cls-4"
+         d="m 230.3061,590.11132 c 30.78015,9.59212 132.76813,38.24468 241.08353,33.93083 14.55109,-39.39808 -39.85097,-43.24275 -44.28212,-74.84071 -3.43087,-24.44949 143.16829,20.54617 190.33717,-68.3569 2.38499,-4.49631 4.24542,-8.73848 5.81913,-12.83729 -174.54796,-0.24762 -298.12473,-48.05184 -328.39009,-60.99338 -21.23691,54.28802 -43.08309,115.21624 -64.56762,183.09745 z"
+         id="path5" /><path
+         class="cls-1"
+         d="m 230.3061,590.11132 c -13.83104,43.69238 -27.47635,90.36926 -40.72091,139.69832 -4.69831,17.48998 -9.34124,35.30578 -13.919,53.51257 102.80578,33.93735 197.4726,0.0782 200.68192,-41.88734 0.0261,-0.33233 -0.0358,-0.57996 -0.0163,-0.89926 2.44691,-44.44828 -64.17338,-19.80982 -62.59641,-46.53352 1.58348,-26.9192 116.30774,-0.1564 151.78621,-57.87204 2.72059,-4.42463 4.49305,-8.35401 5.86801,-12.0879 C 363.07423,628.356 261.08625,599.70344 230.3061,590.11132 Z"
+         id="path6" /><path
+         class="cls-1"
+         d="m 27.633414,410.75427 c -1.49877,2.71734 -2.85092,5.85824 -4.004321,9.61167 -19.9238542,64.75335 120.960447,151.7406 101.792487,170.70329 -17.2782,17.08597 -39.795576,-21.96023 -67.561903,-5.83217 -3.043153,1.77246 -6.131921,4.00758 -9.302143,7.25926 -31.402472,32.1714 -0.491988,124.85398 88.603316,174.3264 -20.79053,69.81006 -41.489835,147.8047 -61.752542,229.37032 7.350485,-2.57397 16.147608,-5.15446 18.337114,-12.0879 3.287518,-13.51499 23.605618,-95.7518 56.594828,-207.31887 0,0 6.02114,-22.85297 17.04361,-60.50465 10.19163,-34.81706 24.6743,-82.30198 42.68234,-136.25767 C 121.83431,522.60155 58.651418,450.60198 27.633414,410.75427 Z"
+         id="path7" /></g></g></svg>
diff --git a/xdocs/images/mstile-144x144.png b/xdocs/images/mstile-144x144.png
index e5968aebe38d7f9b7de2b42c4f46f7c9cd5f26c0..bfa3f83b3cdfc777997537810b86df3c3f0aabb8 100644
GIT binary patch
literal 3412
zcmX9=2RvK*7Z0&pYWDr{su77Kf>wo=+NAc5Jz7-J+O@@eszTAK8nLNSTH~p{KCAXt
zBVv!LRjbP?HU2-|=X3A5=bn4M-*e9Q+~jjf272nOEPN~w2!vHrL(K?WpPrsfP+$ks
zIAg(u*9ULzW9)Iy$KTG|5#sOfFYe<0;Gu(^r=z%sw^PPfIX;lY?5Sb#5CWlvot`us
zra%255Gcezhk#f2)EO2;ulk^gn2;G0(ODBwa0`53d$c4&&_v)<R3!GuLLlNI=yH}L
z)**-k@o-2u5hS2PfDeut6Ra-;0vwQhl!gjM2mePkYl00C4hg~pfk(qIKpuLQEDC@D
z*nmAU{DcHaK{-sQV25ESfTbYOz=oW04hdoa$$vZ`2q2@v!bA)xdRjO5v=*GIh(0-i
zfX+bzIDj)I4NxeGAZjl|2-Kp$(UdciPz>>m4Hbeu9T32QbJ`C&gd!+BV~7P<5Ck*+
zC&dgwY?g2u1h;^B!Qcw;_sMV)+H+I_Ga`l_zbUep0iQO)<_KE^iG%|MKyTA}SdcuS
zC~^YSK%G`>hRcA4gF$r|2Fw+T2^|r{o<%}NL@*<lF%%dI%nsnc$U?!WV4%{XGiKUU
zbcYO|C4kbvVo!TW7dpv16{iqM0Lh8y2NW0@5WYefezq5Rg!Tba55q+2;0kjlVxSW$
z8XbfQ>lM5bfd)E*4Wfo%s3Aer@Tsb(aRrfCQ&FJIsYEdJuS`T3It(<hK@<kHLPbM&
z$#8%IIWq*&ou>%!2*hUy*dHX}IV<e6Hg+!qvEq)Nvp$`7D*^c)q4FA`H>H6Es_v47
zk`bnh_b?PRdQ=<(u-{Vz0DRg63uu8RXZ@h75SrUbh;KPC3K9hd0pg!-3hWDpo-zY(
zNGO1SLFP<FfdT-y{Twl8iJh|$ozlbt60o>4PSI~s$VqK1^(rPu*y@wb>B>&|;pi-+
z6__pr8!~zmGiQ3L;rD1Hu&3Cw7nK%iIt6|phdxGn#*o9-<Ku(=qhtDo1L*M_G?Zt7
zN-MiQ``wJjDxHOYx5k0{LcX0{_+cN*C)&o|y4Aiz)!nUqTw!-7Yl+k|ov&Opd(*bt
z&CfnxTAA8hn)oX=Zp7fP_Imi{yUg;XO|}OGa{A1p*p8-_R=J-I5}ps1Bf4mXZKf57
zehHWP{5{)5TD2w1S<9OE{};Fu{dtt3uBE=25YyJ$mnJ>}bLzlsQue>73oGSz%ybiq
zgy0%&UoQGOBwBYoX!jl6n0fr6huA*YPUU^dNbPP);Ly^Lu4xMF{=z<3nd0i5CM4S9
zg4H$Y9UPl%D(g4=kY3py)sY|IJb4ALKJX#<Tx1vo!ql&+rc4N!>?iwMbDObuGRg#{
zCZOT?b~d;OZGJeXA%PpN;u<c-7u-G@eBCd;VXu4$rz=V#yW=EM(%QCX-`(}7a0{&S
z_w-0TI$GMC?c7`H@AFue2mdt#@-qHwdb)$LUx}aal9qoSXA65y#@l;s_n;}X`ZwHC
z%%)aK1)RD2P0FH8`XzDMjB1zP*k_Y@i2^}-JkUqy0=_Vmir@D0X|l6Tn*PB_+g@g_
zm+l%swpDNq9MS4h4Sv<Ju%F@5e<@WrI}`IcFQb%UTiZ%6|GeX6F`VM0-K*f5fP?h}
zFUh6M<B2~d??AUQ{6}a-5I(){^O!3p23<*RGBwglNCCx5%GN6{2*z9G8(r3}-7Yl;
z>tc~Z891Z#ht503Uy$;HWx9rP^UxcY^-Ad%%NXIMf&nQZEvo{yrM|!MqU>I#ZPo8L
z5H|E2e>F0|yax5e7JqTcYf0r=F~AH5m%mS~8&Jcg`6K9FjQZK}dI(sS+ddGJrgi+m
zkZW8SIcD)fCV==OWHEgzH1aXNNUYY~OF0N%S8&MG_?y{}T-jyR+M*o?r?gwV(HE+=
zyP_aUR{Sh!TK}9>y{pZ_9GA&5@Sc<u0}HKu{|WNe->JTe{g1&!y4&rIMdL5XIjc|H
zldJ0IuUV?xyfv>`Y%$wFrxrzFfDXHSEU0)Af5a^I=0YWVKO%$5#mQlzeQ>qHor^Y~
z2iBnM8tL#UT_tG|rt<m^@nj|0J>}okK1AO8kxSA%`oAMOB$Ud3v#Ygv%{A5!)Sk51
z1wt)ge5zHx4&hxf9!&hnON=Xb?|i;uYV}x<w7eS8wP7m_*^jhZrR;YqT&yM%e~cd%
zThRT$M*kU<L$88-hb}v4;#HO23=5e#94oB~ayzaa`|uI&6I~Hy54mp-fiqgs*Fx+H
zf6o27c3y~mqM1eCi&^enl0%~B_@FJ<Q&orkr32c`)T2mo?l?n#DVk@b)WsC5HHM=l
z((M*X_h=gE;n`1q0=iByEx^238nc4$-bqMp63RNS-=N`2d3^oxm+0p{BxOb3?A^Ta
zfb*tq!#-Ir8O1!4s!ERkw^EG|Xa9TPZ{hwde3Zz{6W>VrCLxtcLsQvbj+#HYcbjh-
zb$$=Gehf>IbCWeMc-zdn_2k=fKZ<hzzS9W#$G))F#yhU-BD`0emdT`XTE;))BQc*z
z&@imKJntMmGI<d;UNCeh%y!kvTg~X!rG2HB&@0udNZqP&UBTQ%S3wR`b!t%L?O@!X
zNc&eFzkgXsqM>iQi2leVibH!$l(NGujRk}CMMl;=ZSr8LhN5G5`4TCH%o`M@7#?<a
zC1I<vTAl|sIj*9XEIDkxg*RO}3C#<s<kIB?O6lA`IaisR&FX|GHpv_NP8+{(s-vd&
zjR!N<L8m&MM8B)DA+sI&kCgD0^!aeuPjQ-o!l*Yrmi9Rk@eXkf4?AZfxj58wpocSY
zl{Rw|)tY0`>3qcJX?Hs=WpOBJ_SsF%Q-<`Uxi<f4Ww`&IcvqsO9!g@$mJ9a@+4pS>
zq?+dE_ds=v$cd;W-^-t}f8^LOTz}`5bI**g1d0Fm1H5<P>Z9xPezUT7Uy7w7Ud#!`
zPR^>ZISUvExBSgtKfprx(6ho0Rb%yeK|@B~K=RgXb>wyo7ygqstYjz<lusR&yD8sX
z9Y?@5c%0|+=J6e|q1#1p6xbyx*`)v5rZxKQ(C46^O_lF<5Qn-^tN9=DPZzXE?bf`l
za%z($G2$|T{qC+avPY=k;~=MNNOjzEiC(6^^J_iyzr~!pN3yoPbv!1K&y~d5qxY^X
zqcA{&3n{!_v5zga@Z0^(ksQJFY$BK@+y4z(U%jp~mjLCUGVN6Bm7)h`CH$cD(^4GF
zeg%?}lQ+!Hch+DN=4Hj_G;mi{ZZMl%wGRyb-dFB>7_T-JnB}KWFO+hfZE9j6iqw@Q
z8GkqNl~S8!--ax7g?Jk~uEA}eK3*%q@mzA*)x*hYMOb(F(%KD|{#zUBhu;1|&$NXY
zdp8d15PGREC30VP_+8^PTxTUEL%lg3njTmDFZyv>%=C3${sx^k>*vWR@+al=)()L#
zItiiZ=PI+SJzTm4eUl2ayst;hKf1RoB_Pf_g?+ndFsCwdcwwK9!oM%>=$W4_bInCk
zDwaasmW5xIkWT!HX*NcUIV-(lEPiAjuqIhyS#dJa^GfU%O>PRe5f^W@&xqOd8kSlZ
z!C8D~C2)$K^)2h2xCsUZwqPuWE{^S{0V^(1ajR5%FGBl!)2%BWS_FlATtiCoG|STJ
zau>R7KGY8NU@yDz-Oi%k+E9`oQfj4PGa9Axh3V<z#ku?HSKYEYC1?~4E-Y%z&=4bE
zLw(J1*B%I(vCuKS{YaToXLi_De?5YM+<7CFnQQJSt8O!rC{EMkSZ<}B_t7%Jvjf+0
z^-`f7d8H!j6EyZ!d_eP!aC5pCb$8|MNe<>E7JcO@H7f%DqlqH*KuAdeVSdtz9iPLp
zhUu}n<6i?Yih62nLKn$=m`hcs+IGcQig5n8>1wmAsZct6uC{o;1j>D}-{!_6Qhr;q
z+7d&ls!zP+Z#w!e--FzLOS$m9{s*`h!(A(qlvt@W{pMk%s#3>Y+`{Gxb5T|ou1aa=
zzSxq!@ldDM)-T2q^CK@``EeJ^HRqQeP7%4K!j*!|>xhXJ%E*!(8(#3qj{MWl-E&3P
zE~pv1ZJU3wC^>GvS`$bcdEVs6&sAG_zV6rFpKNQ`N8WOFjcK~$!}7I$%Il*wQ#u0A
z*y&C3Nv=Z=H1=JK#}bx<3?j(1vKsXJ&MYO@sYX_q#gBeLn_p<AR;6CP(z4zgFQAR*
z3CSFdRfuQtqHr6C_?m$nefbgY0cQ21itD(Sd>hoVqJs{nNm`boAm`ZPOmEUKx54Yt
z=yqp3_;})zAI7yyru<AR!{k0DG`@rHK54i+n9vegLZ?e}gb!?UVR7a&$$i6JoAF!8
gN-09bcI4<np~=C^4liF`@PP->#OtY*tK5nFKk-67bpQYW

delta 2958
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
Ef;a-p?EnA(


From fc4f3f35efdc47f5e7ea381f21049d7bd158858e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 18 Mar 2026 17:47:01 +0100
Subject: [PATCH 1004/1037] CI: update to newest version of gradle wrapper
 validation

The v3 version is quite old and seems not to work anymore. We get ETIMEDOUT errors when using it.
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 5d924bd25c5..eac1b389aa6 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/wrapper-validation-action@v5

From ed177e950796c8f9937345685ed4a5470659edf7 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 18 Mar 2026 17:51:30 +0100
Subject: [PATCH 1005/1037] Revert "CI: update to newest version of gradle
 wrapper validation"

This reverts commit fc4f3f35efdc47f5e7ea381f21049d7bd158858e.

That version seems to be wrong. v5 was not found.
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index eac1b389aa6..5d924bd25c5 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: gradle/wrapper-validation-action@v5
+      - uses: gradle/wrapper-validation-action@v3

From 9754b043a67b5ea6940694fb198a8df4c2be6391 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 18 Mar 2026 17:54:44 +0100
Subject: [PATCH 1006/1037] CI: Try to fix gradle wrapper validation error

Use v5 and use another subpath to get rid of the ETIMEDOUT errors
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 5d924bd25c5..48c2aaedb3e 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v5

From 7784e18020846602a93b3917a2b2488e64287b5d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix@internetallee.de>
Date: Thu, 19 Mar 2026 08:36:20 +0100
Subject: [PATCH 1007/1037] CI: some CI workers are slow, so use bigger margin
 for test duration

---
 bin/testfiles/TestSchedulerWithTimer.jmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/testfiles/TestSchedulerWithTimer.jmx b/bin/testfiles/TestSchedulerWithTimer.jmx
index 191a3275107..4e09069e1d3 100644
--- a/bin/testfiles/TestSchedulerWithTimer.jmx
+++ b/bin/testfiles/TestSchedulerWithTimer.jmx
@@ -2,7 +2,7 @@
 <jmeterTestPlan version="1.2" properties="3.2" jmeter="3.2-SNAPSHOT.20170410">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
-      <stringProp name="TestPlan.comments">Each Thread Group should initially end after 20s but since scheduler is set to 5s, we check it ends within 6s. Tests for Bugs 60797 and 60049</stringProp>
+      <stringProp name="TestPlan.comments">Each Thread Group should initially end after 20s but since scheduler is set to 5s, we check it ends within 7s (some CI workers are slow). Tests for Bugs 60797 and 60049</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
       <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
@@ -170,7 +170,7 @@
           <stringProp name="cacheKey">7b043ed3-cbc5-4b9c-8427-8c70e6791c07</stringProp>
           <stringProp name="script">long start = Long.parseLong(props.get(&quot;TEST_START&quot;));
 long duration = System.currentTimeMillis() - start;
-long maxDurationPlusMargin = vars[&quot;MaxDuration&quot;].toInteger()*1000+1000;
+long maxDurationPlusMargin = vars[&quot;MaxDuration&quot;].toInteger()*1000+2000;
 if(duration&gt; maxDurationPlusMargin) {
 	SampleResult.setSuccessful(false);
 	SampleResult.setResponseData(&quot;Duration &quot;+duration+&quot; exceeded expected duration of &quot;+maxDurationPlusMargin);

From ea1e59a9ecd920fcceb387ca335e957dfaf90473 Mon Sep 17 00:00:00 2001
From: LeeJiWon <dlwldnjs1009@gmail.com>
Date: Tue, 17 Mar 2026 10:25:09 +0900
Subject: [PATCH 1008/1037] fix: preserve HTTP method on 307 and 308 redirects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, 307 Temporary Redirect was only recognized as a redirect
for GET and HEAD requests, and 308 Permanent Redirect converted all
methods to GET. Both violate the method preservation requirement of
RFC 9110 §15.4.8 (307) and RFC 7538 §3 (308).

- HTTPSampleResult.isRedirect(): recognize 307 as redirect for all
  HTTP methods, removing the GET/HEAD restriction
- HTTPSamplerBase.computeMethodForRedirect(): accept response code
  parameter; preserve original method for 307 and 308
- HTTPSamplerBase.followRedirects(): pass current hop's response code
  (lastRes, not res) to support mixed redirect chains (e.g. 307->301)

This is a behavior change: POST/PUT requests receiving 307 or 308 will
now be redirected with the original method preserved, whereas previously
307 POST was not followed and 308 POST was converted to GET.

Fixes #6080
---
 .../http/sampler/HTTPSampleResult.java        |  22 +---
 .../http/sampler/HTTPSamplerBase.java         |  26 +++--
 .../protocol/http/sampler/TestRedirects.java  | 101 +++++++++++++++++-
 3 files changed, 123 insertions(+), 26 deletions(-)

diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
index dc7918c31ec..9d12e749c16 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
@@ -105,25 +105,17 @@ public String getRedirectLocation() {
      * Determine whether this result is a redirect.
      *
      * <p>
-     * If status is {@code 307}, the request has to be a HTTP method of {@code GET} or
-     * {@code HEAD}, to be considered a redirect. For all other status codes, the
-     * HTTP method will not be checked.
+     * Returns true for status codes: 301, 302, 303, 307 and 308.
+     * 307 and 308 preserve the original request method when followed.
      * </p>
-     * Returns true for: 301, 302, 303, 307 (GET or HEAD) and 308
      *
      * @return true iff res is an HTTP redirect response
      */
     public boolean isRedirect() {
-        /*
-         * Don't redirect the following:
-         * 300 = Multiple choice
-         * 304 = Not Modified
-         * 305 = Use Proxy
-         * 306 = (Unused)
-         */
         final String[] redirectCodes = { HTTPConstants.SC_MOVED_PERMANENTLY,
                 HTTPConstants.SC_MOVED_TEMPORARILY,
                 HTTPConstants.SC_SEE_OTHER,
+                HTTPConstants.SC_TEMPORARY_REDIRECT,
                 HTTPConstants.SC_PERMANENT_REDIRECT };
         String code = getResponseCode();
         for (String redirectCode : redirectCodes) {
@@ -131,13 +123,7 @@ public boolean isRedirect() {
                 return true;
             }
         }
-        // http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-        // If the 307 status code is received in response to a request other than GET or HEAD,
-        // the user agent MUST NOT automatically redirect the request unless it can be confirmed by the user,
-        // since this might change the conditions under which the request was issued.
-        // See Bug 54119
-        return HTTPConstants.SC_TEMPORARY_REDIRECT.equals(code) &&
-                (HTTPConstants.GET.equals(getHTTPMethod()) || HTTPConstants.HEAD.equals(getHTTPMethod()));
+        return false;
     }
 
     /**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 6c3ef08bdd3..3105d0cf1ec 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -1669,9 +1669,9 @@ protected HTTPSampleResult followRedirects(HTTPSampleResult res, int frameDepth)
             // this behaviour.
             location = encodeSpaces(location);
             log.debug("Location after /. and space transforms: {}", location);
-            // Change all but HEAD into GET (Bug 55450)
+            // Compute method based on redirect status code (Bug 55450, RFC 9110)
             String method = lastRes.getHTTPMethod();
-            method = computeMethodForRedirect(method);
+            method = computeMethodForRedirect(method, lastRes.getResponseCode());
 
             try {
                 URL url = ConversionUtils.makeRelativeURL(lastRes.getURL(), location);
@@ -1735,13 +1735,25 @@ protected HTTPSampleResult followRedirects(HTTPSampleResult res, int frameDepth)
     }
 
     /**
-     * See <a href="http://tools.ietf.org/html/rfc2616#section-10.3">RFC2616#section-10.3</a>
-     * JMeter conforms currently to HttpClient 4.5.2 supported RFC
-     * TODO Update when migrating to HttpClient 5.X using response code
+     * Compute the HTTP method to use for a redirect response.
+     *
+     * <ul>
+     *   <li>307/308: preserve method</li>
+     *   <li>301/302/303: HEAD stays HEAD, others become GET</li>
+     * </ul>
+     *
      * @param initialMethod the initial HTTP Method
-     * @return the new HTTP Method as per RFC
+     * @param responseCode the current redirect response code
+     * @return the HTTP Method to use for the redirected request
      */
-    private static String computeMethodForRedirect(String initialMethod) {
+    private static String computeMethodForRedirect(String initialMethod, String responseCode) {
+        // 307: RFC 9110 §15.4.8, 308: RFC 7538 §3 / RFC 9110 Errata 7109
+        // 307/308: preserve original method
+        if (HTTPConstants.SC_TEMPORARY_REDIRECT.equals(responseCode)
+                || HTTPConstants.SC_PERMANENT_REDIRECT.equals(responseCode)) {
+            return initialMethod;
+        }
+        // 301/302/303: HEAD stays HEAD, others become GET (Bug 55450)
         if (!HTTPConstants.HEAD.equalsIgnoreCase(initialMethod)) {
             return HTTPConstants.GET;
         }
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index b3558d07af8..0a1a0e8f836 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -33,7 +34,10 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.http.RequestMethod;
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 
 class TestRedirects {
 
@@ -44,7 +48,7 @@ public static List<Arguments> redirectionParams() {
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
                 for (String method : httpMethods) {
-                    boolean shouldRedirect = statusCode != 307 || ("GET".equals(method) || "HEAD".equals(method));
+                    boolean shouldRedirect = true;
                     res.add(Arguments.of(httpImpl, statusCode, shouldRedirect, method));
                 }
             }
@@ -80,6 +84,101 @@ void testRedirect(String httpImpl, int redirectCode, boolean shouldRedirect, Str
         }
     }
 
+    public static List<Arguments> methodPreservationParams() {
+        List<Arguments> res = new ArrayList<>();
+        // Nested for depth is 2 (max allowed is 1). [NestedForDepth]
+        List<String> httpMethods = Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE");
+        Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
+            for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
+                for (String method : httpMethods) {
+                    String expectedMethod;
+                    if (statusCode == 307 || statusCode == 308) {
+                        expectedMethod = method;
+                    } else if ("HEAD".equals(method)) {
+                        expectedMethod = "HEAD";
+                    } else {
+                        expectedMethod = "GET";
+                    }
+                    res.add(Arguments.of(httpImpl, statusCode, method, expectedMethod));
+                }
+            }
+        });
+        return res;
+    }
+
+    @ParameterizedTest
+    @MethodSource("methodPreservationParams")
+    void testMethodPreservationOnRedirect(String httpImpl, int redirectCode,
+            String originalMethod, String expectedMethod) throws MalformedURLException {
+        WireMockServer server = createServer();
+        server.start();
+        try {
+            HTTPSamplerBase http = HTTPSamplerFactory.newInstance(httpImpl);
+            http.setAutoRedirects(false);
+            http.setFollowRedirects(true);
+
+            server.stubFor(any(urlPathEqualTo("/original")).willReturn(
+                    aResponse().withHeader("Location", server.url("/target"))
+                               .withStatus(redirectCode)));
+            server.stubFor(WireMock.request(expectedMethod, urlPathEqualTo("/target"))
+                    .atPriority(1)
+                    .willReturn(aResponse().withStatus(200)));
+            server.stubFor(any(urlPathEqualTo("/target"))
+                    .atPriority(10)
+                    .willReturn(aResponse().withStatus(405)));
+
+            HTTPSampleResult res = http.sample(new URL(server.url("/original")),
+                    originalMethod, false, 1);
+
+            Assertions.assertEquals("200", res.getResponseCode(),
+                    String.format("[%s] %s %d: expected final 200", httpImpl, originalMethod, redirectCode));
+            Assertions.assertEquals(expectedMethod, res.getHTTPMethod(),
+                    String.format("[%s] %s %d: expected method %s", httpImpl, originalMethod, redirectCode, expectedMethod));
+
+            server.verify(1, new RequestPatternBuilder(
+                    RequestMethod.fromString(expectedMethod), urlPathEqualTo("/target")));
+        } finally {
+            server.stop();
+        }
+    }
+
+    public static List<Arguments> redirectChainParams() {
+        return Arrays.stream(HTTPSamplerFactory.getImplementations())
+                .map(Arguments::of)
+                .collect(Collectors.toList());
+    }
+
+    @ParameterizedTest
+    @MethodSource("redirectChainParams")
+    void testRedirectChain307Then301(String httpImpl) throws MalformedURLException {
+        WireMockServer server = createServer();
+        server.start();
+        try {
+            HTTPSamplerBase http = HTTPSamplerFactory.newInstance(httpImpl);
+            http.setAutoRedirects(false);
+            http.setFollowRedirects(true);
+
+            // POST /a -> 307 -> POST /b -> 301 -> GET /c
+            server.stubFor(any(urlPathEqualTo("/a")).willReturn(
+                    aResponse().withHeader("Location", server.url("/b")).withStatus(307)));
+            server.stubFor(any(urlPathEqualTo("/b")).willReturn(
+                    aResponse().withHeader("Location", server.url("/c")).withStatus(301)));
+            server.stubFor(any(urlPathEqualTo("/c")).willReturn(
+                    aResponse().withStatus(200)));
+
+            HTTPSampleResult res = http.sample(new URL(server.url("/a")), "POST", false, 1);
+
+            Assertions.assertEquals("200", res.getResponseCode());
+            Assertions.assertEquals("GET", res.getHTTPMethod());
+
+            // /b should receive POST (307 preserves method), /c should receive GET (301 converts)
+            server.verify(1, new RequestPatternBuilder(RequestMethod.POST, urlPathEqualTo("/b")));
+            server.verify(1, new RequestPatternBuilder(RequestMethod.GET, urlPathEqualTo("/c")));
+        } finally {
+            server.stop();
+        }
+    }
+
     private static WireMockServer createServer() {
         WireMockConfiguration configuration = WireMockConfiguration.wireMockConfig().dynamicPort();
         return new WireMockServer(configuration);

From b59236106e685793b5a75714957c2d67509b741d Mon Sep 17 00:00:00 2001
From: LeeJiWon <dlwldnjs1009@gmail.com>
Date: Wed, 18 Mar 2026 09:18:25 +0900
Subject: [PATCH 1009/1037] refactor: address review feedback in TestRedirects

- Inline shouldRedirect variable directly into Arguments.of()
- Use Java 17 switch expression for expectedMethod computation
---
 .../protocol/http/sampler/TestRedirects.java      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index 0a1a0e8f836..d95cf042e47 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -48,8 +48,7 @@ public static List<Arguments> redirectionParams() {
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
                 for (String method : httpMethods) {
-                    boolean shouldRedirect = true;
-                    res.add(Arguments.of(httpImpl, statusCode, shouldRedirect, method));
+                    res.add(Arguments.of(httpImpl, statusCode, true, method));
                 }
             }
             for (int statusCode : Arrays.asList(300, 304, 305, 306)) {
@@ -91,14 +90,10 @@ public static List<Arguments> methodPreservationParams() {
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
                 for (String method : httpMethods) {
-                    String expectedMethod;
-                    if (statusCode == 307 || statusCode == 308) {
-                        expectedMethod = method;
-                    } else if ("HEAD".equals(method)) {
-                        expectedMethod = "HEAD";
-                    } else {
-                        expectedMethod = "GET";
-                    }
+                    String expectedMethod = switch (statusCode) {
+                        case 307, 308 -> method;
+                        default -> "HEAD".equals(method) ? "HEAD" : "GET";
+                    };
                     res.add(Arguments.of(httpImpl, statusCode, method, expectedMethod));
                 }
             }

From 32f1af6cd2dbf3b134469be913bf796c570ce46d Mon Sep 17 00:00:00 2001
From: LeeJiWon <dlwldnjs1009@gmail.com>
Date: Wed, 18 Mar 2026 14:35:34 +0900
Subject: [PATCH 1010/1037] Remove stale NestedForDepth comments from
 TestRedirects

---
 .../org/apache/jmeter/protocol/http/sampler/TestRedirects.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index d95cf042e47..af5272d9844 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -43,7 +43,6 @@ class TestRedirects {
 
     public static List<Arguments> redirectionParams() {
         List<Arguments> res = new ArrayList<>();
-        // Nested for depth is 2 (max allowed is 1). [NestedForDepth]
         List<String> httpMethods = Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE");
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
@@ -85,7 +84,6 @@ void testRedirect(String httpImpl, int redirectCode, boolean shouldRedirect, Str
 
     public static List<Arguments> methodPreservationParams() {
         List<Arguments> res = new ArrayList<>();
-        // Nested for depth is 2 (max allowed is 1). [NestedForDepth]
         List<String> httpMethods = Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE");
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {

From 2482ac5fd0fe1c40c3cf7305d982ae4387dd4940 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 2 Mar 2026 08:52:09 +0000
Subject: [PATCH 1011/1037] fix(deps): update dependency
 org.apache.groovy:groovy-bom to v5.0.4

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 6e63c52328d..080c77863bf 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
 }
 
 dependencies {
-    api(platform("org.apache.groovy:groovy-bom:5.0.2"))
+    api(platform("org.apache.groovy:groovy-bom:5.0.4"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
     api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
 

From 972e9cb13dba36b1d025ece25ce017572d419f65 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 14 Mar 2026 13:42:50 +0000
Subject: [PATCH 1012/1037] fix(deps): update dependency io.mockk:mockk to
 v1.14.9

---
 gradle/verification-metadata.xml | 5 +++++
 src/bom-testing/build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index fc0b6d2286f..1e3e15d6b68 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -942,6 +942,11 @@
             <sha256 value="9cbd04ba63e7399856745713e312d2f2161a1d44eda506ded47c8d56daf8461f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.10.2">
+         <artifact name="kotlinx-coroutines-bom-1.10.2.pom">
+            <sha256 value="faf0c6538e53ddc0499a63664d8e763c216580b2e18e722ccbdf1b431a6afe26" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.8.0">
          <artifact name="kotlinx-coroutines-bom-1.8.0.pom">
             <sha256 value="1239e9dbe1397cd5971342956b2511bc3ace7b641842e4372a088dcfa8b9ad55" origin="Generated by Gradle"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 9969999e360..2318ff77694 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
         // then it should be declared as "api" here since we use useCompileClasspathVersions
         // to make runtime classpath consistent with the compile one.
         api("org.wiremock:wiremock:3.13.1")
-        api("io.mockk:mockk:1.14.7")
+        api("io.mockk:mockk:1.14.9")
         api("net.bytebuddy:byte-buddy:1.17.8")
         api("nl.jqno.equalsverifier:equalsverifier:4.3")
         // activemq-all should not be used as it provides secondary slf4j binding

From faa8516cc3909ea1985e019d969319562279aae1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sun, 8 Mar 2026 09:41:31 +0000
Subject: [PATCH 1013/1037] chore(deps): update gradle/actions digest to
 0723195

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index 24ff38d7091..65abd687fed 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -28,4 +28,4 @@ jobs:
         java-version: 21
         server-id: central
     - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+      uses: gradle/actions/dependency-submission@0723195856401067f7a2779048b490ace7a47d7c # v5

From 7c8346017576a2cf959a4040dc169b2d5640e991 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 19 Mar 2026 17:11:17 +0000
Subject: [PATCH 1014/1037] chore(deps): update actions/checkout action to v6

---
 .github/workflows/gradle-dependency-submit.yaml | 2 +-
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/main.yml                      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle-dependency-submit.yaml b/.github/workflows/gradle-dependency-submit.yaml
index 65abd687fed..45ff462e8bd 100644
--- a/.github/workflows/gradle-dependency-submit.yaml
+++ b/.github/workflows/gradle-dependency-submit.yaml
@@ -18,7 +18,7 @@ jobs:
       contents: write
     steps:
     - name: Checkout sources
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       with:
         persist-credentials: false
     - name: Set up JDK 21
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 48c2aaedb3e..a93f81b3a83 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: gradle/actions/wrapper-validation@v5
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b645c63dae8..14164ac0797 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
       # Number of jobs to generate in matrix.js
       MATRIX_JOBS: 4
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - id: set-matrix
         run: |
           node .github/workflows/matrix.js
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       # max-parallel: 4
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
@@ -92,7 +92,7 @@ jobs:
     name: 'Error Prone (JDK 21)'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: 'Set up JDK 21'
       uses: actions/setup-java@v5
       with:

From f8bf9693f0a04da16b855d5f275153e0ca68c122 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix@internetallee.de>
Date: Thu, 19 Mar 2026 11:37:18 +0100
Subject: [PATCH 1015/1037] CI: fix slow workers taking long time to start
 threads

The test breaks on slow workers with result.time almost 500ms. I think the long connectTime (more than 200ms) is responsible for the "early" interrupt.
---
 .../org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
index 90e25213d2e..6899de84b0c 100644
--- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
+++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/HttpRequestInterruptTest.kt
@@ -65,7 +65,7 @@ class HttpRequestInterruptTest : JMeterTestCase() {
         }
 
         assertEquals(5, events.size) { "5 events expected, got $events" }
-        if (events.any { it.result.isSuccessful || it.result.isResponseCodeOK || it.result.time < 500 }) {
+        if (events.any { it.result.isSuccessful || it.result.isResponseCodeOK || (it.result.time + it.result.connectTime) < 500 }) {
             fail(
                 "All events should be failing, and they should take more than 500ms since the requests " +
                     "should have been cancelled after 1sec. Results are: $events"

From 09d8744e36a0227de2e0486b3219dee90ae8777c Mon Sep 17 00:00:00 2001
From: LeeJiWon <dlwldnjs1009@gmail.com>
Date: Fri, 20 Mar 2026 15:12:05 +0900
Subject: [PATCH 1016/1037] Remove NestedForDepth Checkstyle rule

The rule has led to patterns like `stream().forEach()` in test parameter
generation where plain nested loops would be clearer. Remove the rule
and drop the stale `NestedForDepth` comment in `TestDecompression`.

Fixes #6665
---
 config/checkstyle/checkstyle.xml                                | 2 +-
 .../apache/jmeter/protocol/http/sampler/TestDecompression.java  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index a4c84bd516a..3dc8be0c251 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -118,7 +118,7 @@
     <module name="IllegalThrows"/>
     <module name="ModifiedControlVariable"/>
     <module name="MultipleVariableDeclarations"/>
-    <module name="NestedForDepth"/>
+
     <module name="NestedIfDepth">
       <!-- TODO: reduce this number -->
       <property name="max" value="4"/>
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
index e1a7ee17f68..eb46e6352d9 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
@@ -53,7 +53,6 @@ enum ServerGzip {
 
     public static List<Arguments> mockServerParams() {
         List<Arguments> res = new ArrayList<>();
-        // Nested for depth is 2 (max allowed is 1). [NestedForDepth]
         Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
             for (ClientGzip clientGzip : ClientGzip.values()) {
                 for (ServerGzip serverGzip : ServerGzip.values()) {

From a36a26458f1e4c4de6163ea3f630fb58140e2e37 Mon Sep 17 00:00:00 2001
From: LeeJiWon <dlwldnjs1009@gmail.com>
Date: Fri, 20 Mar 2026 16:37:43 +0900
Subject: [PATCH 1017/1037] Replace stream().forEach() wrappers with plain for
 loops

Convert the stream().forEach() wrappers in TestDecompression and
TestRedirects to enhanced for loops now that NestedForDepth is gone.
Remove the unused Arrays import from TestDecompression.
---
 .../jmeter/protocol/http/sampler/TestDecompression.java   | 5 ++---
 .../jmeter/protocol/http/sampler/TestRedirects.java       | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
index eb46e6352d9..82d22bda273 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestDecompression.java
@@ -24,7 +24,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -53,13 +52,13 @@ enum ServerGzip {
 
     public static List<Arguments> mockServerParams() {
         List<Arguments> res = new ArrayList<>();
-        Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
+        for (String httpImpl : HTTPSamplerFactory.getImplementations()) {
             for (ClientGzip clientGzip : ClientGzip.values()) {
                 for (ServerGzip serverGzip : ServerGzip.values()) {
                     res.add(Arguments.of(httpImpl, clientGzip, serverGzip));
                 }
             }
-        });
+        }
         return res;
     }
 
diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
index af5272d9844..43b286bb13a 100644
--- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
+++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestRedirects.java
@@ -44,7 +44,7 @@ class TestRedirects {
     public static List<Arguments> redirectionParams() {
         List<Arguments> res = new ArrayList<>();
         List<String> httpMethods = Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE");
-        Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
+        for (String httpImpl : HTTPSamplerFactory.getImplementations()) {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
                 for (String method : httpMethods) {
                     res.add(Arguments.of(httpImpl, statusCode, true, method));
@@ -55,7 +55,7 @@ public static List<Arguments> redirectionParams() {
                     res.add(Arguments.of(httpImpl, statusCode, false, method));
                 }
             }
-        });
+        }
         return res;
     }
 
@@ -85,7 +85,7 @@ void testRedirect(String httpImpl, int redirectCode, boolean shouldRedirect, Str
     public static List<Arguments> methodPreservationParams() {
         List<Arguments> res = new ArrayList<>();
         List<String> httpMethods = Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE");
-        Arrays.stream(HTTPSamplerFactory.getImplementations()).forEach(httpImpl -> {
+        for (String httpImpl : HTTPSamplerFactory.getImplementations()) {
             for (int statusCode : Arrays.asList(301, 302, 303, 307, 308)) {
                 for (String method : httpMethods) {
                     String expectedMethod = switch (statusCode) {
@@ -95,7 +95,7 @@ public static List<Arguments> methodPreservationParams() {
                     res.add(Arguments.of(httpImpl, statusCode, method, expectedMethod));
                 }
             }
-        });
+        }
         return res;
     }
 

From 18d8cb35c90271cda6e950cce0a3ddc225a660df Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix@internetallee.de>
Date: Fri, 20 Mar 2026 09:19:38 +0100
Subject: [PATCH 1018/1037] docs: fix buildbot nightly url

it changed at some point in the past
---
 xdocs/nightly.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/nightly.xml b/xdocs/nightly.xml
index 925198d3a8f..4c053ed3e8a 100644
--- a/xdocs/nightly.xml
+++ b/xdocs/nightly.xml
@@ -46,7 +46,7 @@
     <p>These are located at:
     <ul>
     <li><a href="https://ci-builds.apache.org/job/JMeter/job/JMeter-trunk/lastSuccessfulBuild/artifact/src/dist/build/distributions/">Last Successful Jenkins build for JMeter-trunk</a></li>
-    <li><a href="http://ci.apache.org/projects/jmeter/nightlies/">Buildbot nightly builds for JMeter-trunk</a></li>
+    <li><a href="https://nightlies.apache.org/jmeter/nightlies/">Buildbot nightly builds for JMeter-trunk</a></li>
     <li><a href="https://repository.apache.org/content/repositories/snapshots/org/apache/jmeter/">Maven Snapshots (Buildbot nightly builds)</a></li>
     </ul>
     </p>

From 471a9ff99576bf1fe8288d1530513ba1e9cfd6a5 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Wed, 11 Mar 2026 16:58:44 +0100
Subject: [PATCH 1019/1037] Skip checking empty filenames for result collectors

On Java 25 the semantic of checking existance for empty filenames has been changed.
See https://bugs.openjdk.org/browse/JDK-8024695
The old behaviour was used in JMeter to skip empty filenames in result collectors.
This patch should resolve the bug while maintaining backwards compatibility.

This should fix #6611.
---
 .../java/org/apache/jmeter/gui/action/AbstractAction.java   | 4 ++++
 xdocs/changes.xml                                           | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
index 898dc054560..eec6bd108b1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java
@@ -89,6 +89,10 @@ protected boolean popupCheckExistingFileListener(HashTree tree) {
         SearchByClass<ResultCollector> resultListeners = new SearchByClass<>(ResultCollector.class);
         tree.traverse(resultListeners);
         for (ResultCollector rc : resultListeners.getSearchResults()) {
+            if ("".equals(rc.getFilename())) {
+                log.debug("Skip result collector ({}) as it has empty filename", rc.getName());
+                continue;
+            }
             File f = new File(rc.getFilename());
             if (f.exists()) {
                 switch (actionOnFile) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 17d8185c337..ae1bf095044 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -58,6 +58,7 @@ Summary
 </p>
 <ul>
 <li><a href="#Changes">Changes</a></li>
+<li><a href="#Bug fixes">Bug fixes</a></li>
 </ul>
 
   <ch_section>Changes</ch_section>
@@ -76,6 +77,11 @@ Summary
     <li><pr>5891</pr>Skip Internet Explorer 6-9 conditional comment processing when fetching resource links</li>
   </ul>
 
+  <ch_section>Bug fixes</ch_section>
+  <h3>General</h3>
+  <ul>
+    <li><pr>6654</pr><issue>6611</issue>Support JDK 25 and above for result collectors with empty file names</li>
+  </ul>
  <!--  =================== Thanks =================== -->
 
 <ch_section>Thanks</ch_section>

From 4b324bc2eb3ac0ea06fe77f4241d8f3e261a69d0 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix@internetallee.de>
Date: Fri, 20 Mar 2026 10:58:26 +0100
Subject: [PATCH 1020/1037] docs: fix maven badge

the old link doesn't work anymore
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8d4fb5ead0..a13d234ab98 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ By The Apache Software Foundation
 [![codecov](https://codecov.io/gh/apache/jmeter/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/jmeter)
 [![License](https://img.shields.io/:license-apache-brightgreen.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Stack Overflow](https://img.shields.io/:stack%20overflow-jmeter-brightgreen.svg)](https://stackoverflow.com/questions/tagged/jmeter)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.jmeter/ApacheJMeter/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.jmeter/ApacheJMeter)
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.jmeter/ApacheJMeter.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.jmeter/ApacheJMeter)
 [![Javadocs](https://www.javadoc.io/badge/org.apache.jmeter/ApacheJMeter_core.svg)](https://www.javadoc.io/doc/org.apache.jmeter/ApacheJMeter_core)
 [![Twitter](https://img.shields.io/twitter/url/https/github.com/apache/jmeter.svg?style=social)](https://twitter.com/intent/tweet?text=Powerful%20load%20testing%20with%20Apache%20JMeter:&url=https://jmeter.apache.org)
 

From 68bfe725dfb1172edaccce30155106b8ff2313b9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sun, 8 Mar 2026 10:08:07 +0000
Subject: [PATCH 1021/1037] fix(deps): update dependency
 com.github.autostyle:com.github.autostyle.gradle.plugin to v4.0.1

---
 build-logic/verification/build.gradle.kts | 2 +-
 gradle/verification-metadata.xml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts
index 71cc992b683..a45a686547f 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     api(projects.basics)
     api(projects.buildParameters)
-    api("com.github.autostyle:com.github.autostyle.gradle.plugin:4.0")
+    api("com.github.autostyle:com.github.autostyle.gradle.plugin:4.0.1")
     api("com.github.vlsi.ide:com.github.vlsi.ide.gradle.plugin:3.0.1")
     api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:3.0.1")
     api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1e3e15d6b68..3becf3e87b3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -130,6 +130,7 @@
          <trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD" group="xerces"/>
          <trusted-key id="6E13156C0EE653F0B984663AB95BBD3FA43C4492" group="org.apache"/>
          <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="6FF955169D698CC09BA7403AC99BFE8CD562EAC1" group="com.github.autostyle"/>
          <trusted-key id="7186BBF993566D8C2F4F7ED7D945E643368FEF62" group="io.github.eisop"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
          <trusted-key id="764BE739DDAE10F4473FECF0AEF385ED6CA815AE" group="com.miglayout"/>

From 286f14ecf15089a76d17976c15d781ed41df48c9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 2 Mar 2026 06:30:21 +0000
Subject: [PATCH 1022/1037] fix(deps): update dependency dnsjava:dnsjava to
 v3.6.4

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 src/licenses/build.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 080c77863bf..d0c594660f4 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -70,7 +70,7 @@ dependencies {
         }
         api("commons-logging:commons-logging:1.3.5")
         api("commons-net:commons-net:3.12.0")
-        api("dnsjava:dnsjava:3.6.3")
+        api("dnsjava:dnsjava:3.6.4")
         api("io.burt:jmespath-core:0.6.0")
         api("io.burt:jmespath-jackson:0.6.0")
         api("jakarta.jms:jakarta.jms-api:3.1.0")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 7582d3f95b3..557d6779860 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -104,7 +104,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
     // That enables to have "version-independent" MIT license in licenses/slf4j-api, and
     // it would be copied provided the detected license for slf4j-api is MIT.
 
-    overrideLicense("dnsjava:dnsjava:3.6.3") {
+    overrideLicense("dnsjava:dnsjava:3.6.4") {
         expectedLicense = SpdxLicense.BSD_2_Clause
     }
 

From b75d56109ee2f6db53619b5cf10277069543d71f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 17 Mar 2026 01:51:56 +0000
Subject: [PATCH 1023/1037] fix(deps): update com.helger

---
 src/bom-thirdparty/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index d0c594660f4..9a454143129 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -52,8 +52,8 @@ dependencies {
         api("com.google.auto.service:auto-service-annotations:1.1.1")
         api("com.google.auto.service:auto-service:1.1.1")
         api("com.google.errorprone:error_prone_annotations:2.44.0")
-        api("com.helger.commons:ph-commons:12.1.0")
-        api("com.helger:ph-css:8.1.0")
+        api("com.helger.commons:ph-commons:12.1.5")
+        api("com.helger:ph-css:8.1.1")
         api("com.fasterxml.woodstox:woodstox-core:7.1.1")
         api("com.jayway.jsonpath:json-path:2.10.0")
         api("com.miglayout:miglayout-core:11.4.3")

From 50d05590c8a18fc993bbbf64cc9c7338c1d5ab3e Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Sat, 21 Mar 2026 09:23:25 +0100
Subject: [PATCH 1024/1037] chore: use hash to pin action

ASF allows only pinned external actions anymore.
See more at https://infra.apache.org/github-actions-policy.html
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index a93f81b3a83..78ee9d201e9 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: gradle/actions/wrapper-validation@v5
+      - uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2

From 0687cbef0a63fc79cfe926621d83344dfcf74ee1 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 20 Mar 2026 20:32:52 +0100
Subject: [PATCH 1025/1037] chore: remove deprecated packages keyword from
 log4j configs

The original packages keyword in our real config file was removed quite a while ago
---
 bin/testfiles/log4j2-batch.xml                 | 2 +-
 src/core/src/testFixtures/resources/log4j2.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/testfiles/log4j2-batch.xml b/bin/testfiles/log4j2-batch.xml
index 65595d2a43e..689c8ba6ed7 100644
--- a/bin/testfiles/log4j2-batch.xml
+++ b/bin/testfiles/log4j2-batch.xml
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<Configuration status="WARN" packages="org.apache.jmeter.gui.logging">
+<Configuration status="WARN">
 
   <Appenders>
 
diff --git a/src/core/src/testFixtures/resources/log4j2.xml b/src/core/src/testFixtures/resources/log4j2.xml
index e0a1adbac9c..5bb3670c344 100644
--- a/src/core/src/testFixtures/resources/log4j2.xml
+++ b/src/core/src/testFixtures/resources/log4j2.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="WARN" packages="org.apache.jmeter.gui.logging">
+<Configuration status="WARN">
 
   <Appenders>
 

From d2c1302cd6ab5343dc69d7d10ad1e497d32e0081 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 20 Mar 2026 20:36:17 +0100
Subject: [PATCH 1026/1037] chore: update expected checksums of currently used
 jars

---
 src/dist/src/dist/expected_release_jars.csv | 58 ++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 931e086ec42..8a081ba6985 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -53,18 +53,18 @@
 232074,darklaf-windows-3.1.1.jar
 363049,datamodel-jvm-4.8.0.jar
 98115,dec-0.1.2.jar
-588267,dnsjava-3.6.3.jar
+600322,dnsjava-3.6.4.jar
 20388,error_prone_annotations-2.44.0.jar
 1886604,freemarker-2.3.34.jar
-8057697,groovy-5.0.2.jar
-20224,groovy-datetime-5.0.2.jar
-12371,groovy-dateutil-5.0.2.jar
-116723,groovy-jmx-5.0.2.jar
-138755,groovy-json-5.0.2.jar
-21460,groovy-jsr223-5.0.2.jar
-86636,groovy-sql-5.0.2.jar
-98394,groovy-templates-5.0.2.jar
-223993,groovy-xml-5.0.2.jar
+8059981,groovy-5.0.4.jar
+20226,groovy-datetime-5.0.4.jar
+12374,groovy-dateutil-5.0.4.jar
+116725,groovy-jmx-5.0.4.jar
+138775,groovy-json-5.0.4.jar
+21463,groovy-jsr223-5.0.4.jar
+86639,groovy-sql-5.0.4.jar
+98397,groovy-templates-5.0.4.jar
+223994,groovy-xml-5.0.4.jar
 126373,hamcrest-3.0.jar
 2403,hamcrest-core-3.0.jar
 181512,httpasyncclient-4.1.5.jar
@@ -102,13 +102,13 @@
 675271,kotlinx-datetime-jvm-0.6.2.jar
 996,lets-plot-batik-4.8.0.jar
 996,lets-plot-common-4.8.0.jar
-358528,log4j-1.2-api-2.25.2.jar
-349595,log4j-api-2.25.2.jar
-2018265,log4j-core-2.25.2.jar
-30232,log4j-slf4j2-impl-2.25.2.jar
+359213,log4j-1.2-api-2.25.3.jar
+350610,log4j-api-2.25.3.jar
+2018402,log4j-core-2.25.3.jar
+30213,log4j-slf4j2-impl-2.25.3.jar
 519087,mail-1.5.0-b01.jar
-120438,miglayout-core-11.4.2.jar
-23287,miglayout-swing-11.4.2.jar
+120556,miglayout-core-11.4.3.jar
+23361,miglayout-swing-11.4.3.jar
 99796,neo4j-bolt-connection-10.1.0.jar
 320489,neo4j-bolt-connection-netty-10.1.0.jar
 27442,neo4j-bolt-connection-pooled-10.1.0.jar
@@ -123,18 +123,18 @@
 562559,netty-transport-4.2.7.Final.jar
 46861,netty-transport-native-unix-common-4.2.7.Final.jar
 65261,oro-2.0.8.jar
-41851,ph-annotations-12.1.0.jar
-513224,ph-base-12.1.0.jar
-31500,ph-cache-12.1.0.jar
-198190,ph-collection-12.1.0.jar
-110619,ph-commons-12.1.0.jar
-529008,ph-css-8.1.0.jar
-120046,ph-datetime-12.1.0.jar
-148945,ph-io-12.1.0.jar
+41904,ph-annotations-12.1.5.jar
+517081,ph-base-12.1.5.jar
+31676,ph-cache-12.1.5.jar
+198490,ph-collection-12.1.5.jar
+110792,ph-commons-12.1.5.jar
+529490,ph-css-8.1.1.jar
+120336,ph-datetime-12.1.5.jar
+150324,ph-io-12.1.5.jar
 40499,ph-mime-12.1.0.jar
-41716,ph-statistics-12.1.0.jar
-158832,ph-text-12.1.0.jar
-84194,ph-typeconvert-12.1.0.jar
+41774,ph-statistics-12.1.5.jar
+159687,ph-text-12.1.5.jar
+84241,ph-typeconvert-12.1.5.jar
 215381,platf-awt-4.8.0.jar
 89002,platf-batik-4.8.0.jar
 1525466,plot-api-jvm-4.11.2.jar
@@ -144,7 +144,7 @@
 11640,reactive-streams-1.0.4.jar
 1897776,reactor-core-3.7.12.jar
 1262303,rhino-1.8.0.jar
-1330192,rsyntaxtextarea-3.6.0.jar
+1330468,rsyntaxtextarea-3.6.1.jar
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 69908,slf4j-api-2.0.17.jar
@@ -154,7 +154,7 @@
 778543,tika-core-3.2.3.jar
 73265,txw2-4.0.6.jar
 173935,unbescape-1.1.6.RELEASE.jar
-1608803,woodstox-core-7.1.0.jar
+1612256,woodstox-core-7.1.1.jar
 3455761,xalan-2.7.3.jar
 220536,xml-apis-1.4.01.jar
 85686,xml-apis-ext-1.3.04.jar

From f857b8e2da1f25fcaf6ea16cbccf4f03b94b19b3 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 14 Mar 2026 13:40:20 +0000
Subject: [PATCH 1027/1037] fix(deps): update dependency
 com.fifesoft:rsyntaxtextarea to v3.6.2

---
 gradle/verification-metadata.xml    | 5 +++++
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3becf3e87b3..c8151a6e3fd 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -364,6 +364,11 @@
             <sha256 value="8679629eafd467ab734778030dedee825d5880aaec42c7559f476a183cb454ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.helger.commons" name="ph-commons-parent-pom" version="12.1.0">
+         <artifact name="ph-commons-parent-pom-12.1.0.pom">
+            <sha256 value="d6262a47e6520243f095558a032798e8f05a9958f44b779bcc349a6037045174" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.sun.xml.bind" name="jaxb-bom-ext" version="4.0.6">
          <artifact name="jaxb-bom-ext-4.0.6.pom">
             <pgp value="04543577D6A9CC626239C50C7ECBD740FF06AEB5"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 9a454143129..f1bb20da6c1 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 
         api("bsf:bsf:2.4.0")
         api("cglib:cglib-nodep:3.3.0")
-        api("com.fifesoft:rsyntaxtextarea:3.6.1")
+        api("com.fifesoft:rsyntaxtextarea:3.6.2")
         api("com.github.ben-manes.caffeine:caffeine:3.2.3")
         api("com.github.weisj:darklaf-core:3.1.1")
         api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")

From cf49c4a80baeff5540817fecb33864fdb9c00623 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 24 Mar 2026 19:34:25 +0300
Subject: [PATCH 1028/1037] chore: replace Anakia printable docs with CSS
 @media print
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The printable documentation was generated by a separate Anakia/Velocity
pipeline, but its only differences from the regular site (no sidebar,
no social widgets, no ¶ anchors, full-width content) are trivially
achieved with @media print CSS rules that already existed in
new-style.css. Remove the Anakia infrastructure and its dependencies
so the project has a single XSLT-based doc pipeline instead of two.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: GPT 5.4 <codex@openai.com>
---
 .gitignore                                    |   1 +
 .ratignore                                    |   1 -
 README.md                                     |   4 +-
 bin/jmeter.properties                         |   2 +-
 renovate.json                                 |   8 -
 .../org/apache/jmeter/gui/action/Help.java    |   2 +-
 src/dist/build.gradle.kts                     | 180 +----
 xdocs/css/new-style.css                       |   2 +-
 xdocs/css/style.css                           |  50 --
 xdocs/stylesheets/printable_project.xml       |  27 -
 xdocs/stylesheets/site.vsl                    | 607 ---------------
 xdocs/stylesheets/site.xsl                    | 272 -------
 xdocs/stylesheets/site_printable.vsl          | 688 ------------------
 xdocs/stylesheets/website-style.xsl           |   7 +-
 xdocs/usermanual/get-started.xml              |   2 +-
 xdocs/velocity.properties                     |  21 -
 16 files changed, 47 insertions(+), 1827 deletions(-)
 delete mode 100644 xdocs/css/style.css
 delete mode 100644 xdocs/stylesheets/printable_project.xml
 delete mode 100644 xdocs/stylesheets/site.vsl
 delete mode 100644 xdocs/stylesheets/site.xsl
 delete mode 100644 xdocs/stylesheets/site_printable.vsl
 delete mode 100644 xdocs/velocity.properties

diff --git a/.gitignore b/.gitignore
index 13f89d12a06..b4714dd560d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 /dist/
 /docs/
 /local/
+# We no longer use printable_docs folder, however, keep it here so everybody else do not acidentally commit it
 /printable_docs/
 /reports/
 /site/
diff --git a/.ratignore b/.ratignore
index 8a99b773812..cb5de4b3768 100644
--- a/.ratignore
+++ b/.ratignore
@@ -26,7 +26,6 @@ lib/aareadme.txt
 lib/opt/README.txt
 src/licenses/licenses/*/CC0-1.0.txt
 #local/**
-#printable_docs/**
 #reports/**
 src/launcher/src/main/resources/org/apache/jmeter/jmeter_as_ascii_art.txt
 src/core/src/main/resources/org/apache/jmeter/help.txt
diff --git a/README.md b/README.md
index a13d234ab98..f844e232837 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,8 @@ a JMX file onto:
 ## Documentation
 
 The documentation available as of the date of this release is
-also included, in HTML format, in the [printable_docs](printable_docs) directory,
-and it may be browsed starting from the file called [index.html](printable_docs/index.html).
+also included, in HTML format, in the [docs](docs) directory,
+and it may be browsed starting from the file called [index.html](docs/index.html).
 
 ## Reporting a bug/enhancement
 
diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 58c540cfd9c..dd4dd7eaacd 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -33,7 +33,7 @@
 # JMeter properties are described in the file
 # http://jmeter.apache.org/usermanual/properties_reference.html
 # A local copy can be found in
-# printable_docs/usermanual/properties_reference.html
+# docs/usermanual/properties_reference.html
 
 #Preferred GUI language. Comment out to use the JVM default locale's language.
 #language=en
diff --git a/renovate.json b/renovate.json
index 9b90c00d5d6..7401e8a2ac2 100644
--- a/renovate.json
+++ b/renovate.json
@@ -128,14 +128,6 @@
         "org.eclipse.jetty{/,}**"
       ]
     },
-    {
-      "groupName": "org.jdom",
-      "description": "Velocity Anakia uses JDOM 1.0",
-      "allowedVersions": "< 2.0",
-      "matchPackageNames": [
-        "org.jdom{/,}**"
-      ]
-    },
     {
       "groupName": "org.jetbrains.lets-plot",
       "matchPackageNames": [
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
index 375b66aeba1..e189119db94 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java
@@ -49,7 +49,7 @@ public class Help extends AbstractAction {
 
     private static final String HELP_DOCS = "file:///"  // $NON-NLS-1$
         + JMeterUtils.getJMeterHome()
-        + "/printable_docs/usermanual/"; // $NON-NLS-1$
+        + "/docs/usermanual/"; // $NON-NLS-1$
 
     private static final String HELP_COMPONENTS = HELP_DOCS + "component_reference.html"; // $NON-NLS-1$
 
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index c5533b68195..00e47f7a194 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -59,9 +59,6 @@ inline fun <reified T : Named> AttributeContainer.attribute(attr: Attribute<T>,
     attribute(attr, objects.named<T>(value))
 
 // isCanBeConsumed = false ==> other modules must not use the configuration as a dependency
-val buildDocs by configurations.creating {
-    isCanBeConsumed = false
-}
 val generatorJar by configurations.creating {
     isCanBeConsumed = false
 }
@@ -109,12 +106,6 @@ dependencies {
     srcLicense(project(":src:licenses", "srcLicense"))
     generatorJar(project(":src:generator", "archives"))
     junitSampleJar(project(":src:protocol:junit-sample"))
-
-    buildDocs(platform(projects.src.bomThirdparty))
-    buildDocs("org.apache.velocity:velocity")
-    buildDocs("commons-lang:commons-lang")
-    buildDocs("org.apache.commons:commons-collections4")
-    buildDocs("org.jdom:jdom")
 }
 
 node {
@@ -338,89 +329,6 @@ val createDist by tasks.registering {
 // source/binary artifacts with the appropriate eol/executable file flags
 val gitProps by rootProject.tasks.existing(FindGitAttributes::class)
 
-fun createAnakiaTask(
-    taskName: String,
-    baseDir: Directory,
-    extension: String = ".html",
-    style: String,
-    velocityProperties: String,
-    projectFile: String,
-    excludes: Array<String>,
-    includes: Array<String>
-): TaskProvider<Task> {
-    val outputDir = layout.buildDirectory.dir("docs/$taskName").get().asFile
-
-    val prepareProps = tasks.register("prepareProperties$taskName") {
-        // AnakiaTask can't use relative paths, and it forbids ../, so we create a dedicated
-        // velocity.properties file that contains absolute path
-        inputs.file(velocityProperties)
-        val outputProps = layout.buildDirectory.file("docProps/$taskName/velocity.properties").get().asFile
-        outputs.file(outputProps)
-        doLast {
-            // Unfortunately, Velocity does not use Java properties format.
-            // For instance, Properties escape : as \:, however Velocity does not understand that.
-            // Thus it tries to use c\:\path\to\workspace which does not work
-            val p = `java.util`.Properties()
-            file(velocityProperties).reader().use {
-                p.load(it)
-            }
-            p["resource.loader"] = "file"
-            p["file.resource.loader.path"] = baseDir.asFile.absolutePath
-            p["file.resource.loader.class"] = "org.apache.velocity.runtime.resource.loader.FileResourceLoader"
-            val specials = Regex("""([,\\])""")
-            val lines = p.entries
-                .map { (it.key as String) + "=" + ((it.value as String).replace(specials, """\\$1""")) }
-                .sorted()
-            file(outputProps).apply {
-                parentFile.run { isDirectory || mkdirs() } || throw IllegalStateException("Unable to create directory $parentFile")
-
-                writer().use {
-                    it.appendLine("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
-                    for (line in lines) {
-                        it.appendLine(line)
-                    }
-                }
-            }
-        }
-    }
-
-    return tasks.register(taskName) {
-        inputs.file("$baseDir/$style").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("styleDir")
-        inputs.file("$baseDir/$projectFile").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("projectDir")
-        inputs.files(
-            fileTree(baseDir) {
-                include(*includes)
-                exclude(*excludes)
-            }
-        ).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("baseDir")
-        inputs.property("extension", extension)
-        outputs.dir(outputDir)
-        outputs.cacheIf { true }
-        dependsOn(prepareProps)
-
-        doLast {
-            ant.withGroovyBuilder {
-                "taskdef"(
-                    "name" to "anakia",
-                    "classname" to "org.apache.velocity.anakia.AnakiaTask",
-                    "classpath" to buildDocs.asPath
-                )
-                "anakia"(
-                    "basedir" to baseDir,
-                    "destdir" to outputDir,
-                    "extension" to extension,
-                    "style" to style,
-                    "projectFile" to projectFile,
-                    "excludes" to excludes.joinToString(" "),
-                    "includes" to includes.joinToString(" "),
-                    "lastModifiedCheck" to "true",
-                    "velocityPropertiesFile" to prepareProps.get().outputs.files.singleFile
-                )
-            }
-        }
-    }
-}
-
 val xdocs = rootProject.layout.projectDirectory.dir("xdocs")
 
 fun CopySpec.docCssAndImages() {
@@ -439,13 +347,34 @@ fun CopySpec.manuals() {
     }
 }
 
-fun CopySpec.printableDocumentation() {
-    into("docs") {
-        docCssAndImages()
+fun CopySpec.docFontsAndCss() {
+    into("fonts") {
+        from(
+            fileTree(xdocs.dir("node_modules/@fontsource/merriweather/files")) {
+                builtBy(yarn_install)
+            }
+        ) {
+            include("*400*normal*.woff2")
+        }
+        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/webfonts")) {
+            include("fa-brands*.woff2")
+        }
     }
-    into("printable_docs") {
-        from(buildPrintableDoc)
-        manuals()
+    into("css") {
+        from(xdocs.dir("node_modules/@fontsource/merriweather")) {
+            include("400.css")
+            rename { "merriweather.css" }
+            filter {
+                it.replace("./files", "../fonts")
+            }
+        }
+        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/css")) {
+            include("fontawesome.min.css")
+            include("brands.min.css")
+            filter {
+                it.replace("../webfonts", "../fonts")
+            }
+        }
     }
 }
 
@@ -465,25 +394,6 @@ val yarn_install = tasks.named<YarnTask>("yarn_install") {
     outputs.dir(xdocs.dir("node_modules")).withPropertyName("node_modules")
 }
 
-val buildPrintableDoc = createAnakiaTask(
-    "buildPrintableDoc", baseDir = xdocs,
-    style = "stylesheets/site_printable.vsl",
-    velocityProperties = "$xdocs/velocity.properties",
-    projectFile = "stylesheets/printable_project.xml",
-    excludes = arrayOf("**/stylesheets/**", "extending.xml", "extending/*.xml", "node_modules", "package.json", "package-lock.json", "yarn.lock"),
-    includes = arrayOf("**/*.xml")
-)
-
-val previewPrintableDocs by tasks.registering(Copy::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    description = "Creates preview of a printable documentation to build/docs/printable_preview"
-    into(layout.buildDirectory.dir("docs/printable_preview"))
-    CrLfSpec().run {
-        gitattributes(gitProps)
-        printableDocumentation()
-    }
-}
-
 val lastEditYear: String by rootProject.extra
 
 fun xslt(
@@ -542,34 +452,7 @@ fun CopySpec.siteLayout() {
     from(processSiteXslt)
     docCssAndImages()
     manuals()
-    into("fonts") {
-        from(
-            fileTree(xdocs.dir("node_modules/@fontsource/merriweather/files")) {
-                builtBy(yarn_install)
-            }
-        ) {
-            include("*400*normal*.woff2")
-        }
-        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/webfonts")) {
-            include("fa-brands*.woff2")
-        }
-    }
-    into("css") {
-        from(xdocs.dir("node_modules/@fontsource/merriweather")) {
-            include("400.css")
-            rename { "merriweather.css" }
-            filter {
-                it.replace("./files", "../fonts")
-            }
-        }
-        from(xdocs.dir("node_modules/@fortawesome/fontawesome-free/css")) {
-            include("fontawesome.min.css")
-            include("brands.min.css")
-            filter {
-                it.replace("../webfonts", "../fonts")
-            }
-        }
-    }
+    docFontsAndCss()
 }
 
 // See https://github.com/gradle/gradle/issues/10960
@@ -628,7 +511,12 @@ fun CrLfSpec.binaryLayout() = copySpec {
                 with(libsExt)
             }
         }
-        printableDocumentation()
+        into("docs") {
+            from(processSiteXslt)
+            docCssAndImages()
+            manuals()
+            docFontsAndCss()
+        }
         into("docs/api") {
             javadocs()
         }
diff --git a/xdocs/css/new-style.css b/xdocs/css/new-style.css
index ee03c4e9e30..a5eea9b825a 100644
--- a/xdocs/css/new-style.css
+++ b/xdocs/css/new-style.css
@@ -619,7 +619,7 @@ table {
 }
 
 @media print {
-  .nav, .header, .footer, .pagelinks, .go-top, .social-media, .share-links {
+  .nav, .header, .footer, .pagelinks, .go-top, .social-media, .share-links, .sectionlink {
     display: none;
   }
 
diff --git a/xdocs/css/style.css b/xdocs/css/style.css
deleted file mode 100644
index 9bc97e13107..00000000000
--- a/xdocs/css/style.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-/*Shows the value of the name attribute when hovered*/
-/* Disabled
-a[name]:hover:after{
-    content: " #" attr(name);
-    font-size: 90%;
-    text-decoration: none;
-}
-*/
-
-/*
- * Hide class="sectionlink", except when an enclosing heading
- * has the :hover property.
- * Used to hide the &para; marker for generating internal links
- */
-.sectionlink {
-  display: none;
-}
-:hover > .sectionlink {
-  display: inline;
-  /* Green so shows up on section headings too */
-  color: rgb(0,255,0);
-}
-
-.keysym {
-  background-color: #f0f0f0;
-  border: 1px solid #aaa;
-  padding-left: 0.2em;
-  padding-right: 0.2em;
-}
-
-.guimenuitem {
-  font-style: italic;
-}
diff --git a/xdocs/stylesheets/printable_project.xml b/xdocs/stylesheets/printable_project.xml
deleted file mode 100644
index 5d10ce8757b..00000000000
--- a/xdocs/stylesheets/printable_project.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to you under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project name="Apache JMeter"
-          href="http://jmeter.apache.org/">
-
-     <title>Apache JMeter</title>
-     <logo width="259" height="88" href="../docs/images/jmeter.png">Apache JMeter</logo>
-     <body>
-
-     </body>
-</project>
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
deleted file mode 100644
index b582610ce66..00000000000
--- a/xdocs/stylesheets/site.vsl
+++ /dev/null
@@ -1,607 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!-- Content Stylesheet for Site -->
-
-## Defined variables
-#set ($bodybg = "#ffffff")
-#set ($bodyfg = "#000000")
-#set ($bodylink = "#525D76")
-#set ($bannerbg = "#525D76")
-#set ($bannerfg = "#ffffff")
-#set ($subbannerbg = "#828DA6")
-#set ($subbannerfg = "#ffffff")
-#set ($tablethbg = "#039acc")
-#set ($tabletdbg = "#a0ddf0")
-#set ($notebackground = "#bbbb00")
-#set ($space = " ")
-#set ($space = $space.charAt(0))
-#set ($udsc = "_")
-#set ($udsc = $udsc.charAt(0))
-#set ($year = $date.getYear()+1900)
-##
-## Website settings
-#set ($imgdir = "$relativePath/images")
-#set ($sshotdir = "$imgdir/screenshots" )
-#set ($cssdir = "$relativePath/css")
-
-<!-- start the processing -->
-#document()
-<!-- end the processing -->
-
-## This is where the macros live
-
-#macro ( sectionlink $anchor)
-#if($anchor)<a class="sectionlink" href="#$anchor.replace($space,$udsc)" title="Link to here">&para;</a>#end
-#end
-
-#macro ( table $table)
-<table>
-#foreach ( $items in $table.getChildren() )
-#if ($items.getName().equals("tr"))
-#tr ($items)
-#end
-#end
-</table>
-#end
-
-#macro ( tr $tr)
-<tr>
-#foreach ( $items in $tr.getChildren() )
-#if ($items.getName().equals("td"))
-#td ($items)
-#elseif ($items.getName().equals("th"))
-#th ($items)
-#end
-#end
-</tr>
-#end
-
-#macro ( td $value)
-#if ($value.getAttributeValue("colspan"))
-#set ($colspan = $value.getAttributeValue("colspan"))
-#end
-#if ($value.getAttributeValue("rowspan"))
-#set ($rowspan = $value.getAttributeValue("rowspan"))
-#end
-<td bgcolor="$tabletdbg" #if ($colspan)colspan="$colspan"#end #if ($rowspan)rowspan="$rowspan"#end valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.getChildren().size() > 0)
-$value.content
-#else
-&nbsp;
-#end
-</font>
-</td>
-#end
-
-#macro ( th $value)
-#set ($colspan = $value.getAttributeValue("colspan"))
-#set ($rowspan = $value.getAttributeValue("rowspan"))
-<td bgcolor="$tablethbg" #if ($colspan)colspan="$colspan"#end #if ($rowspan)rowspan="$rowspan"#end valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.getChildren().size() > 0)
-$value.content
-#else
-&nbsp;
-#end
-</font>
-</td>
-#end
-
-#macro ( projectanchor $name $value )
-#if ($value.startsWith("http://"))
-<a href="$value">$name</a>
-#elseif ($value.startsWith("/site"))
-<a href="http://jakarta.apache.org$value">$name</a>
-#else
-<a href="$relativePath$value">$name</a>
-#end
-#end
-
-#macro ( metaauthor $author $email )
-<meta name="author" value="$author">
-<meta name="email" value="$email">
-#end
-
-#macro ( image $value )
-#if ($value.getAttributeValue("width"))
-#set ($width=$value.getAttributeValue("width"))
-#end
-#if ($value.getAttributeValue("height"))
-#set ($height=$value.getAttributeValue("height"))
-#end
-#if ($value.getAttributeValue("align"))
-#set ($align=$value.getAttributeValue("align"))
-#end
-<img src="$relativePath$value.getAttributeValue("src")" width="$!width" height="$!height" align="$!align"/>
-#end
-
-#macro ( source $value)
-<div align="left">
-<table cellspacing="4" cellpadding="0" border="0">
-<tr>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-<tr>
-<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
-<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-<tr>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-</table>
-</div>
-#end
-
-#macro (properties $properties)
-<p>
-<b>Parameters</b>
-#if ($properties.getParent().getName() == 'component')
-#set ($name = $properties.getParent().getAttributeValue("name").replace($space,$udsc))
-#set ($suff = "_parms")
-<a name="$name$suff"/>
-#sectionlink ("$name$suff")
-#end
-<table border="1" cellspacing="0" cellpadding="2">
-<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
-#foreach ($items in $properties.getChildren("property"))
-<tr>
-<td>$items.getAttributeValue("name")</td>
-<td>#runloop($items)</td>
-<td>
-#if("$!items.getAttributeValue('required')" != "")
-$items.getAttributeValue("required")
-#else
-No
-#end
-</td>
-</tr>
-#end
-</table>
-</p>
-#end
-
-#macro (seeAlso $seeAlso)
-<p><b>See Also:</b>
-<ul>
-#foreach ($items in $seeAlso.getChildren())
-#if($items.getName() == "link")
-<li><a href="$items.getAttributeValue("href")">$xmlout.outputString($items,true)</a></li>
-#elseif($items.getName() == "complink")
-<li>#complink($items)</li>
-#end
-#end
-</ul>
-</p>
-#end
-
-#macro (figure $figure)
-#set ($width = "")
-#set ($width = $figure.getAttributeValue('width') )
-#set ($height = "")
-#set ($height = $figure.getAttributeValue('height') )
-#set ($dim= "")
-#if  ("$!width" != "")
-#set ($dim = "width='$width' height='$height'")
-#end
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img $dim src="$sshotdir/$figure.getAttributeValue("image")"/><br>
-<font size="-1">#runloop($figure)</font></td></tr></table></p>
-#end
-
-#macro (example $example)
-<a name="$example.getAttributeValue("anchor")"/>
-#sectionlink ($example.getAttributeValue("anchor"))
-<p><b>$example.getAttributeValue("title")</b></p>
-#runloop($example)
-#end
-
-#macro (note $note)
-<p>
-<table border="1" bgcolor="$notebackground" width="50%" cellspacing="0" cellpadding="2">
-<tr><td>#runloop($note)</td></tr>
-</table>
-</p>
-#end
-
-#macro (scope $scope)
-#if ($scope.getText() == "")
-<a href="test_plan.html#scoping_rules">scope</a>
-#else
-<a href="test_plan.html#scoping_rules">$scope.getText()</a>
-#end
-#end
-##
-#macro ( bugzilla $id)
-<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=$id.getText()">Bug $id.getText()</a>
-#end
-
-## Shorthand - automatically adds " - " before remaining text
-#macro ( bug $id)
-#bugzilla($id) - ##
-#end
-
-#macro ( contributor $id)
-Contributed by $id.getAttributeValue("name") &lt;$id.getAttributeValue("mail")&gt;
-#end
-
-#macro ( ch_section $section)
-<br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="$bodylink" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="$section.getText()">$section.getText()</a></big></big></b></font></td></tr></table><br/>
-#end
-
-#macro ( ch_category $category)
-<br/><br/><table width="90%" cellpadding="2" cellspacing="2" bgcolor="$subbannerbg" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big>$category.getText()</big></b></font></td></tr></table><br/>
-#end
-
-#macro ( ch_title $title)
-<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="$subbannerbg" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif">$title.getText()</font></td></tr></table>
-#end
-
-#macro (unknown $node)
-#if($node.getName() == "note")
-#note($node)
-#elseif($node.getName() == "br")
-<br>
-#elseif($node.getName() == "complink")
-#complink($node)
-#elseif($node.getName() == "figure")
-#figure($node)
-#elseif ($node.getName() == "links")
-#seeAlso ($node)
-#elseif ($node.getName() == "properties")
-#properties ($node)
-#elseif ($node.getName() == "example")
-#example ($node)
-#elseif ($node.getName().equals("source"))
-#source ($node)
-#elseif ($node.getName().equals("table"))
-#table ($node)
-#elseif ($node.getName().equals("component"))
-#component($node)
-#elseif ($node.getName().equals("subsection"))
-#subsection ($node)
-#elseif ($node.getName().equals("scope"))
-#scope ($node)
-#elseif ($node.getName().equals("bugzilla"))
-#bugzilla ($node)
-#elseif ($node.getName().equals("bug"))
-#bug ($node)
-#elseif ($node.getName().equals("contributor"))
-#contributor ($node)
-#elseif ($node.getName().equals("ch_section"))
-#ch_section ($node)
-#elseif ($node.getName().equals("ch_category"))
-#ch_category ($node)
-#elseif ($node.getName().equals("ch_title"))
-#ch_title ($node)
-#else
-#outputTag($node)
-#runloop($node)
-#outputEndTag($node)
-#end
-#end
-
-#macro (complink $complink)
-<a href="$relativePath/usermanual/component_reference.html#$complink.getAttributeValue("name").replace($space,$udsc)">$complink.getAttributeValue("name")</a>
-#end
-
-#macro (outputTag $tag)
-<$tag.getName()#getAtts($tag)>
-#end
-
-#macro (getAtts $tag)
-#foreach ($att in $tag.getAttributes()) $att.getName()="$att.getValue()"#end
-#end
-
-#macro (outputEndTag $tag)
-</$tag.getName()>
-#end
-
-#macro (runloop $itemToLoop)
-#foreach ($node in $itemToLoop.getContent())
-#if($node.getClass().getName().indexOf("Element") > -1)
-#unknown($node)
-#else
-$node.getText()
-#end
-#end
-#end
-
-#macro ( component $component)
-#set ($width = "")
-#set ($width = $component.getAttributeValue('width') )
-#set ($height = "")
-#set ($height = $component.getAttributeValue('height') )
-#set ($dim= "")
-#if  ("$!width" != "")
-#set ($dim = "width='$width' height='$height'")
-#end
-#set ($screenshot = "")
-#set ($screenshot = $component.getAttributeValue('screenshot') )
-<table border="0" cellspacing="0" cellpadding="2">
-<tr><td>
-<font face="arial,helvetica,sanserif">
-#set ($was = "")
-#set ($was = $component.getAttributeValue("was"))
-#if ("$!was" != "")
-<a name="$was.replace($space,$udsc)"></a>
-#set ($was = " (was: $was)")
-#end
-<h3>
-<a name="$component.getAttributeValue("name").replace($space,$udsc)">$!component.getAttributeValue("index") $component.getAttributeValue("name")$!was</a>
-#sectionlink ($component.getAttributeValue("name"))
-</h3>
-</font>
-</td></tr>
-#if($component.getAttribute("useinstead"))
-<tr><td bgcolor="#bbbb00"><div align="center"><b>*** This element is deprecated.  Use <a href="$relativePath/usermanual/component_reference.html#$component.getAttributeValue("useinstead").replace($space,$udsc)">$component.getAttributeValue("useinstead")</a> instead ***</b></div></td></tr>
-#end
-<tr><td>
-#foreach ( $items in $component.getChildren() )
-#if ($items.getName().equals("description"))
-#runloop($items)
-#if ("$!screenshot" != "")
-<p><b>Control Panel</b></p>
-<div align="center"><img $dim src="$sshotdir/$screenshot"/></div>
-#end
-#else
-#unknown($items)
-#end
-#end
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-<hr>
-#end
-
-#macro ( subsection $subsection)
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr><td bgcolor="$subbannerbg">
-<font color="$subbannerfg" face="arial,helvetica,sanserif">
-<a name="$subsection.getAttributeValue("anchor")"><strong>$subsection.getAttributeValue("name")</strong></a>
-#sectionlink ($subsection.getAttributeValue("anchor"))
-</font>
-</td></tr>
-<tr><td>
-<blockquote>
-#foreach ( $items in $subsection.getChildren() )
-#if ($items.getName().equals("img"))
-#image ($items)
-#else
-#unknown($items)
-#end
-#end
-</blockquote>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-#end
-
-#macro (pagelinks)
-#if (("$!next" != "") || ("$!prev" != ""))
-<table>
-<tr>
-<td bgcolor="$bannerbg">
-<div align="right"><a href="index.html"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Index</font></a></div>
-</td>
-#if ("$!next" != "")
-<td bgcolor="$bannerbg">
-<div align="right"><a href="$next"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Next</font></a></div>
-</td>
-#end
-#if ("$!prev" != "")
-<td bgcolor="$bannerbg">
-<div align="right"><a href="$prev"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Prev</font></a></div>
-</td>
-#end
-</tr>
-</table>
-#end
-#end
-
-#macro ( section $section)
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr><td bgcolor="$bannerbg">
-<font color="$bannerfg" face="arial,helvetica,sanserif">
-#set ($anchor = $section.getAttributeValue("anchor")) 
-#if($anchor)<a name="$anchor">#end<strong>$section.getAttributeValue("name")</strong>#if($anchor)</a>#sectionlink ($anchor)#end
-</font>
-</td></tr>
-<tr><td>
-<blockquote>
-#foreach ( $items in $section.getChildren() )
-#if ($items.getName().equals("img"))
-#image ($items)
-#else
-#unknown($items)
-#end
-#end
-</blockquote>
-</p>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-#end
-
-#macro ( makeProject )
-<table border="0" width="100%" cellspacing="0">
-<tr><td>
-#set ($menus = $project.getChild("body").getChildren("menu"))
-#foreach ( $menu in $menus )
-<p><strong>$menu.getAttributeValue("name")</strong></p>
-<ul>
-#foreach ( $item in $menu.getChildren() )
-#set ($icon = $item.getAttributeValue("icon"))
-#set ($name = $item.getAttributeValue("name"))
-<li>#projectanchor($name $item.getAttributeValue("href"))#if($icon)<img src="$imgdir/$icon" align="top"/>#end</li>
-#end
-</ul>
-#end
-</td></tr>
-<tr><td>
-<iframe src="http://www.apache.org/ads/button.html" style="border-width:0; float: left;" frameborder="0" scrolling="no"></iframe>
-</td></tr>
-</table>
-#end
-
-#macro (makeIndex $subsections)
-<ul>
-#foreach ($sect in $subsections)
-<li><a href="#$sect.getAttributeValue("anchor")">$sect.getAttributeValue("name")</a></li>
-<ul>
-#foreach ($comp in $sect.getChildren("component"))
-#set ($was = $comp.getAttributeValue("was"))
-#if ("$!was" != "")
-#set ($was = " (was: $was)")
-#end
-<li><a href="#$comp.getAttributeValue("name").replace($space,$udsc)">$comp.getAttributeValue("name")$!was</a></li>
-#end
-</ul>
-#end
-</ul>
-#end
-
-#macro (getProjectImage)
-#if ($project.getChild("logo"))
-#set ( $logoString = $project.getChild("logo").getAttributeValue("href") )
-#set ( $logoHeight = $project.getChild("logo").getAttributeValue("height") )
-#set ( $logoWidth  = $project.getChild("logo").getAttributeValue("width") )
-<td width="10%">
-<a href="http://www.apache.org"><img title="Apache Software Foundation" width="290" height="75" src="$imgdir/asf-logo.svg" border="0"/></a>
-</td>
-<td align="left" width="40%">
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#if ( $logoString.startsWith("/") )
-<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
-#else
-<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath/$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
-#end
-</td>
-#else
-<td colspan="2">
-<a href="http://www.apache.org"><img title="Apache Software Foundation" width="290" height="75" src="$imgdir/asf-logo.svg" border="0"/></a>
-</td>
-#end
-#end
-
-#macro (document)
-## ======================================================================
-## Main Page Section -->
-## ======================================================================
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-#set ($authors = $root.getChild("properties").getChildren("author"))
-#foreach ( $au in $authors )
-#metaauthor ( $au.getText() $au.getAttributeValue("email") )
-#end
-#set ($next = "")
-#set ($next = $root.getAttributeValue("next"))
-#set ($prev = "")
-#set ($prev = $root.getAttributeValue("prev"))
-#set ($id = "")
-#set ($id = $root.getAttributeValue("id"))
-
-<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
-</head>
-
-<body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
-<table width="100%" cellspacing="0" border="0">
-<tr>
-<td width="90%" align="left">
-<table border="0" cellspacing="0">
-##<!-- TOP IMAGE -->
-<tr>
-#getProjectImage()
-</tr>
-</table>
-</td>
-<td align="left" width="50%">
-<table cellspacing="0" align="right" border="0">
-<tr>
-<td align="left"> <a href="https://twitter.com/share"
-class="twitter-share-button"
-data-text="Powerful Load Testing with
-Apache #JMeter" data-via="ApacheJMeter"
-data-lang="en-gb" data-size="large">Tweet</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-</td>
-<td align="right"> <a
-href="https://twitter.com/ApacheJMeter"
-class="twitter-follow-button"
-data-show-count="false" data-lang="en-gb"
-data-size="large">Follow</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-</td>
-</tr>
-</table>
-</td></tr>
-</table>
-
-<table border="0" width="100%" cellspacing="4">
-<tr><td colspan="2">
-<hr noshade size="1"/>
-</td></tr>
-<tr>
-<!-- LEFT SIDE NAVIGATION -->
-<td width="20%" valign="top" nowrap="true">
-#makeProject()
-</td>
-<td width="80%" align="left" valign="top">
-#pagelinks()
-<br>
-#if ($root.getAttributeValue("index") == "yes")
-#makeIndex($root.getChild("body").getChildren("section"))
-#end
-#set ($allSections = $root.getChild("body").getChildren("section"))
-#foreach ( $section in $allSections )
-#section ($section)
-#end
-<br>
-#pagelinks()
-</td>
-</tr>
-<tr><td colspan="2">
-<hr noshade size="1"/>
-</td></tr>
-<tr><td colspan="2">
-<div align="center"><font color="$bodylink" size="-1"><em>
-Copyright &copy; 1999-$year, Apache Software Foundation
-</em></font></div>
-</td></tr>
-<tr><td colspan="2">
-<div align="center"><font color="$bodylink" size="-1">
-Apache, Apache JMeter, JMeter, the Apache feather, and the Apache JMeter logo are
-trademarks of the Apache Software Foundation.
-</font>
-</div>
-</td></tr>
-</table>
-</body>
-</html>
-#end
-
diff --git a/xdocs/stylesheets/site.xsl b/xdocs/stylesheets/site.xsl
deleted file mode 100644
index f31ec5ac447..00000000000
--- a/xdocs/stylesheets/site.xsl
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to you under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!-- Content Stylesheet for "jakarta-site2" Documentation -->
-<!-- NOTE:  Changes here should also be reflected in "site.vsl" and vice
-      versa, so either Anakia or XSLT can be used for document generation.   -->
-
-
-<!-- Outstanding Compatibility Issues (with Anakia-based stylesheets):
-
-            *****  THIS STYLESHEET IS NOW VERY OUT OF DATE  *****
-
-* Calculation of the hyperlink for navigation menu items (site.xsl prefixes
-  with relative path unconditionally; needs conditional logic like the
-  "projectanchor" macro).
-
-* Handling of the <image> element to insert relative path prefixes
-
-* Special table formatting of the <table>, <tr>, and <td> tags.  (I don't
-  really like this as an approach for styling things, but it's needed
-  for strict compatibility :-).
-
-* Functional equivalent of "site_printable.vsl" not yet started.
-
--->
-
-
-<!-- $Id$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
-
-
-  <!-- Output method -->
-  <xsl:output method="html"
-                encoding="iso-8859-1"
-                  indent="no"/>
-
-
-  <!-- Defined parameters (overrideable) -->
-  <xsl:param    name="relative-path" select="'.'"/>
-
-  <!-- Defined variables (non-overrideable) -->
-  <xsl:variable name="body-bg"       select="'#ffffff'"/>
-  <xsl:variable name="body-fg"       select="'#000000'"/>
-  <xsl:variable name="body-link"     select="'#525D76'"/>
-  <xsl:variable name="banner-bg"     select="'#525D76'"/>
-  <xsl:variable name="banner-fg"     select="'#ffffff'"/>
-  <xsl:variable name="sub-banner-bg" select="'#828DA6'"/>
-  <xsl:variable name="sub-banner-fg" select="'#ffffff'"/>
-  <xsl:variable name="table-th-bg"   select="'#039acc'"/>
-  <xsl:variable name="table-td-bg"   select="'#a0ddf0'"/>
-  <xsl:variable name="source-color"  select="'#023264'"/>
-
-
-  <!-- Process an entire document into an HTML page -->
-  <xsl:template match="document">
-     <xsl:variable name="project"
-                     select="document('project.xml')/project"/>
-
-     <html>
-     <head>
-     <title><xsl:value-of select="$project/title"/> - <xsl:value-of select="properties/title"/></title>
-     <xsl:for-each select="properties/author">
-        <xsl:variable name="name">
-          <xsl:value-of select="."/>
-        </xsl:variable>
-        <xsl:variable name="email">
-          <xsl:value-of select="@email"/>
-        </xsl:variable>
-        <meta name="author" value="{$name}"/>
-        <meta name="email" value="{$email}"/>
-     </xsl:for-each>
-     </head>
-
-     <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
-             alink="{$body-link}" vlink="{$body-link}">
-
-     <table border="0" width="100%" cellspacing="4">
-
-        <xsl:comment>PAGE HEADER</xsl:comment>
-        <tr><td colspan="2">
-
-          <xsl:comment>JAKARTA LOGO</xsl:comment>
-          <a href="http://jakarta.apache.org/">
-             <img src="http://jakarta.apache.org/images/jakarta-logo.gif"
-                 align="left" alt="The Jakarta Project" border="0"/>
-          </a>
-          <xsl:if test="$project/logo">
-             <xsl:variable name="alt">
-                <xsl:value-of select="$project/logo"/>
-             </xsl:variable>
-             <xsl:variable name="home">
-                <xsl:value-of select="$project/@href"/>
-             </xsl:variable>
-             <xsl:variable name="src">
-                <xsl:value-of select="$project/logo/@href"/>
-             </xsl:variable>
-
-             <xsl:comment>PROJECT LOGO</xsl:comment>
-             <a href="{$home}">
-                <img src="{$src}" align="right" alt="{$alt}" border="0"/>
-             </a>
-          </xsl:if>
-
-        </td></tr>
-
-        <xsl:comment>HEADER SEPARATOR</xsl:comment>
-        <tr>
-          <td colspan="2">
-             <hr noshade="" size="1"/>
-          </td>
-        </tr>
-
-        <tr>
-
-          <xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
-          <td width="20%" valign="top" nowrap="true">
-             <xsl:apply-templates select="$project/body/menu"/>
-          </td>
-
-          <xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
-          <td width="80%" valign="top" align="left">
-             <xsl:apply-templates select="body/section"/>
-          </td>
-
-        </tr>
-
-        <xsl:comment>FOOTER SEPARATOR</xsl:comment>
-        <tr>
-          <td colspan="2">
-             <hr noshade="" size="1"/>
-          </td>
-        </tr>
-
-        <xsl:comment>PAGE FOOTER</xsl:comment>
-        <tr><td colspan="2">
-          <div align="center"><font color="{$body-link}" size="-1"><em>
-          Copyright &#169; 1999-2001, Apache Software Foundation
-          </em></font></div>
-        </td></tr>
-
-     </table>
-     </body>
-     </html>
-
-  </xsl:template>
-
-
-  <!-- Process a menu for the navigation bar -->
-  <xsl:template match="menu">
-     <p><strong><xsl:value-of select="@name"/></strong></p>
-     <ul>
-        <xsl:apply-templates select="item"/>
-     </ul>
-  </xsl:template>
-
-
-  <!-- Process a menu item for the navigation bar -->
-  <xsl:template match="item">
-     <xsl:variable name="href">
-        <xsl:value-of select="$relative-path"/><xsl:value-of select="@href"/>
-     </xsl:variable>
-     <li><a href="{$href}"><xsl:value-of select="@name"/></a></li>
-  </xsl:template>
-
-
-  <!-- Process a documentation section -->
-  <xsl:template match="section">
-     <xsl:variable name="name">
-        <xsl:value-of select="@anchor"/>
-     </xsl:variable>
-     <table border="0" cellspacing="0" cellpadding="2" width="100%">
-        <!-- Section heading -->
-        <tr><td bgcolor="{$banner-bg}">
-             <font color="{$banner-fg}" face="arial,helvetica.sanserif">
-             <a name="{$name}">
-             <strong><xsl:value-of select="@name"/></strong></a></font>
-        </td></tr>
-        <!-- Section body -->
-        <tr><td><blockquote>
-          <xsl:apply-templates/>
-        </blockquote></td></tr>
-     </table>
-  </xsl:template>
-
-
-  <!-- Process a documentation subsection -->
-  <xsl:template match="subsection">
-     <xsl:variable name="anchor">
-        <xsl:value-of select="@anchor"/>
-     </xsl:variable>
-     <table border="0" cellspacing="0" cellpadding="2" width="100%">
-        <!-- Subsection heading -->
-        <tr><td bgcolor="{$sub-banner-bg}">
-             <font color="{$sub-banner-fg}" face="arial,helvetica.sanserif">
-             <a name="{$anchor}">
-             <strong><xsl:value-of select="@name"/></strong></a></font>
-        </td></tr>
-        <!-- Subsection body -->
-        <tr><td><blockquote>
-          <xsl:apply-templates/>
-        </blockquote></td></tr>
-     </table>
-  </xsl:template>
-
-
-  <!-- Process a source code example -->
-  <xsl:template match="source">
-     <div align="left">
-        <table cellspacing="4" cellpadding="0" border="0">
-          <tr>
-             <td bgcolor="{$source-color}" width="1" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-             <td bgcolor="{$source-color}" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-             <td bgcolor="{$source-color}" width="1" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-          </tr>
-          <tr>
-             <td bgcolor="{$source-color}" width="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-             <td bgcolor="#ffffff" height="1"><pre>
-                <xsl:value-of select="."/>
-             </pre></td>
-             <td bgcolor="{$source-color}" width="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-          </tr>
-          <tr>
-             <td bgcolor="{$source-color}" width="1" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-             <td bgcolor="{$source-color}" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-             <td bgcolor="{$source-color}" width="1" height="1">
-                <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-             </td>
-          </tr>
-        </table>
-     </div>
-  </xsl:template>
-
-
-  <!-- Process everything else by just passing it through -->
-  <xsl:template match="*|@*">
-     <xsl:copy>
-        <xsl:apply-templates select="@*|*|text()"/>
-     </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/xdocs/stylesheets/site_printable.vsl b/xdocs/stylesheets/site_printable.vsl
deleted file mode 100644
index 3bb8f50f86b..00000000000
--- a/xdocs/stylesheets/site_printable.vsl
+++ /dev/null
@@ -1,688 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-##
-##  Content Stylesheet for Printable docs
-##
-## Defined variables
-#set ($bodybg = "#ffffff")
-#set ($bodyfg = "#000000")
-#set ($bodylink = "#525D76")
-#set ($bannerbg = "#525D76")
-#set ($bannerfg = "#ffffff")
-#set ($subbannerbg = "#828DA6")
-#set ($subbannerfg = "#ffffff")
-#set ($tablethbg = "#039acc")
-#set ($tabletdbg = "#a0ddf0")
-#set ($notebackground = "#bbbb00")
-#set ($space = " ")
-#set ($space = $space.charAt(0))
-#set ($udsc = "_")
-#set ($udsc = $udsc.charAt(0))
-#set ($year = $date.getYear()+1900)
-##
-## Printable document settings
-#set ($imgdir = "$relativePath/../docs/images")
-#set ($cssdir = "$relativePath/../docs/css")
-#set ($apidir = "$relativePath/../docs/api")
-#set ($sshotdir = "$imgdir/screenshots")
-
-<!-- start the processing -->
-#document()
-<!-- end the processing -->
-
-## This is where the macros live
-
-#macro ( sectionlink $anchor)
-#if($anchor)<a class="sectionlink" href="#$anchor.replace($space,$udsc)" title="Link to here">&para;</a>#end
-#end
-
-#macro ( table $table)
-<table>
-#foreach ( $items in $table.getChildren() )
-#if ($items.getName().equals("tr"))
-#tr ($items)
-#end
-#end
-</table>
-#end
-
-#macro ( tr $tr)
-<tr>
-#foreach ( $items in $tr.getChildren() )
-#if ($items.getName().equals("td"))
-#td ($items)
-#elseif ($items.getName().equals("th"))
-#th ($items)
-#end
-#end
-</tr>
-#end
-
-#macro ( td $value)
-#if ($value.getAttributeValue("colspan"))
-#set ($colspan = $value.getAttributeValue("colspan"))
-#end
-#if ($value.getAttributeValue("rowspan"))
-#set ($rowspan = $value.getAttributeValue("rowspan"))
-#end
-<td bgcolor="$tabletdbg" #if ($colspan)colspan="$colspan"#end #if ($rowspan)rowspan="$rowspan"#end valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.getChildren().size() > 0)
-#runloop($value)
-#else
-&nbsp;
-#end
-</font>
-</td>
-#end
-
-#macro ( th $value)
-#set ($colspan = $value.getAttributeValue("colspan"))
-#set ($rowspan = $value.getAttributeValue("rowspan"))
-<td bgcolor="$tablethbg" #if ($colspan)colspan="$colspan"#end #if ($rowspan)rowspan="$rowspan"#end valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.getChildren().size() > 0)
-$value.content
-#else
-&nbsp;
-#end
-</font>
-</td>
-#end
-
-#macro ( projectanchor $name $value )
-#if ($value.startsWith("http://"))
-<a href="$value">$name</a>
-#elseif ($value.startsWith("/site"))
-<a href="http://jakarta.apache.org$value">$name</a>
-#else
-<a href="$relativePath$value">$name</a>
-#end
-#end
-
-#macro ( metaauthor $author $email )
-<meta name="author" value="$author">
-<meta name="email" value="$email">
-#end
-
-#macro ( image $value )
-#if ($value.getAttributeValue("width"))
-#set ($width=$value.getAttributeValue("width"))
-#end
-#if ($value.getAttributeValue("height"))
-#set ($height=$value.getAttributeValue("height"))
-#end
-#if ($value.getAttributeValue("align"))
-#set ($align=$value.getAttributeValue("align"))
-#end
-<img src="$relativePath$value.getAttributeValue("src")" width="$!width" height="$!height" align="$!align"/>
-#end
-
-#macro ( code $value)
-<tt class="code">#runloop($value)</tt>##
-#end
-
-#macro ( source $value)
-<div align="left">
-<table cellspacing="4" cellpadding="0" border="0">
-<tr>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-<tr>
-<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#ffffff"><pre>#runloop($value)</pre></td>
-<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-<tr>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
-</tr>
-</table>
-</div>
-#end
-
-#macro (properties $properties)
-<p>
-<b>Parameters</b>
-</p>
-<table border="1" cellspacing="0" cellpadding="2">
-<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
-#foreach ($items in $properties.getChildren("property"))
-<tr>
-<td>$items.getAttributeValue("name")</td>
-<td>#runloop($items)</td>
-<td>
-#if("$!items.getAttributeValue('required')" != "")
-$items.getAttributeValue("required")
-#else
-No
-#end
-</td>
-</tr>
-#end
-</table>
-#end
-
-#macro (seeAlso $seeAlso)
-<p><b>See Also:</b></p>
-<ul>
-#foreach ($items in $seeAlso.getChildren())
-#if($items.getName() == "link")
-<li><a href="$items.getAttributeValue("href")">$xmlout.outputString($items,true)</a></li>
-#elseif($items.getName() == "complink")
-<li>#complink($items)</li>
-#elseif($items.getName() == "funclink")
-<li>#funclink($items)</li>
-#end
-#end
-</ul>
-#end
-
-#macro (figure $figure)
-#set ($width = "")
-#set ($width = $figure.getAttributeValue('width') )
-#set ($height = "")
-#set ($height = $figure.getAttributeValue('height') )
-#set ($dim= "")
-#if  ("$!width" != "")
-#set ($dim = "width='$width' height='$height'")
-#end
-<table border="0" cellspacing="0" cellpadding="0"><tr><td><img $dim src="$sshotdir/$figure.getAttributeValue("image")"/><br>
-<font size="-1">#runloop($figure)</font></td></tr></table>
-#end
-
-#macro (example $example)
-<a name="$example.getAttributeValue("anchor")"/>
-<p><b>$example.getAttributeValue("title")</b></p>
-#runloop($example)
-#end
-
-#macro (note $note)
-<p>
-<table border="1" bgcolor="$notebackground" width="50%" cellspacing="0" cellpadding="2">
-<tr><td>#runloop($note)</td></tr>
-</table>
-</p>
-#end
-
-#macro (scope $scope)
-#if ($scope.getText() == "")
-<a href="test_plan.html#scoping_rules">scope</a>
-#else
-<a href="test_plan.html#scoping_rules">$scope.getText()</a>
-#end
-#end
-##
-#macro ( bugzilla $id)
-<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=$id.getText()">Bug $id.getText()</a>
-#end
-
-#macro ( pullrequest $id)
-<a href="https://github.com/apache/jmeter/pull/$id.getText()">Pull request #$id.getText()</a>##
-#end
-
-#macro ( issue $id)
-<a href="https://github.com/apache/jmeter/issues/$id.getText()">Issue #$id.getText()</a>##
-#end
-
-#macro ( rfc $id)
-#if($id.getText())
-<a href="https://tools.ietf.org/html/rfc$id.getAttributeValue('link')">$id.getText()</a>##
-#else
-<a href="https://tools.ietf.org/html/rfc$id.getAttributeValue('link')">RFC $id.getAttributeValue('link')</a>##
-#end
-#end
-
-## Shorthand - automatically adds " - " before remaining text
-#macro ( bug $id)
-#bugzilla($id) - ##
-#end
-
-## Shorthand - automatically adds " - " before remaining text
-#macro ( pr $id)
-#pullrequest($id) - ##
-#end
-
-## Shorthand - automatically adds " - " before remaining text
-#macro ( issue_dash $id)
-#issue($id) - ##
-#end
-
-#macro ( contributor $id)
-Contributed by $id.getAttributeValue("name") &lt;$id.getAttributeValue("mail")&gt;
-#end
-
-#macro ( ch_section $section)
-<br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="$bodylink" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="$section.getText()">$section.getText()</a></big></big></b></font></td></tr></table><br/>
-#end
-
-#macro ( ch_category $category)
-<br/><br/><table width="90%" cellpadding="2" cellspacing="2" bgcolor="$subbannerbg" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big>$category.getText()</big></b></font></td></tr></table><br/>
-#end
-
-#macro ( ch_title $title)
-<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="$subbannerbg" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif">$title.getText()</font></td></tr></table>
-#end
-
-#macro (description $node)
-<div class="description">#runloop($node)</div>
-#end
-
-#macro (unknown $node)
-#if($node.getName() == "note")
-#note($node)
-#elseif($node.getName() == "br")
-<br>
-#elseif($node.getName() == "apilink")
-#apilink($node)
-#elseif($node.getName() == "complink")
-#complink($node)
-#elseif($node.getName() == "funclink")
-#funclink($node)
-#elseif($node.getName() == "figure")
-#figure($node)
-#elseif ($node.getName() == "links")
-#seeAlso ($node)
-#elseif ($node.getName() == "properties")
-#properties ($node)
-#elseif ($node.getName() == "example")
-#example ($node)
-#elseif ($node.getName().equals("source"))
-#source ($node)
-#elseif ($node.getName().equals("code"))
-#code ($node)
-#elseif ($node.getName().equals("table"))
-#table ($node)
-#elseif ($node.getName().equals("component"))
-#component($node)
-#elseif ($node.getName().equals("subsection"))
-#subsection ($node)
-#elseif ($node.getName().equals("scope"))
-#scope ($node)
-#elseif ($node.getName().equals("bugzilla"))
-#bugzilla ($node)
-#elseif ($node.getName().equals("bug"))
-#bug ($node)
-#elseif ($node.getName().equals("pr"))
-#pr ($node)
-#elseif ($node.getName().equals("issue"))
-#issue ($node)
-#elseif ($node.getName().equals("rfc"))
-#rfc ($node)
-#elseif ($node.getName().equals("contributor"))
-#contributor ($node)
-#elseif ($node.getName().equals("ch_section"))
-#ch_section ($node)
-#elseif ($node.getName().equals("ch_category"))
-#ch_category ($node)
-#elseif ($node.getName().equals("ch_title"))
-#ch_title ($node)
-#elseif ($node.getName().equals("menuchoice"))
-#menuchoice ($node)
-#elseif ($node.getName().equals("shortcut"))
-#shortcut ($node)
-#elseif ($node.getName().equals("keycombo"))
-#keycombo ($node)
-#elseif ($node.getName().equals("keysym"))
-#keysym ($node)
-#elseif ($node.getName().equals("guimenuitem"))
-#guimenuitem ($node)
-#elseif ($node.getName().equals("description"))
-#description ($node)
-#else
-#outputTag($node)
-#runloop($node)
-#outputEndTag($node)
-#end
-#end
-
-#macro (apilink $node)
-<a href="$apidir/$node.getAttributeValue("href")">#runloop($node)</a>##
-#end
-
-#macro (complink $complink)
-<a href="$relativePath/usermanual/component_reference.html#$complink.getAttributeValue("name").replace($space,$udsc)">$complink.getAttributeValue("name")</a>##
-#end
-
-#macro (funclink $funclink)
-<a href="$relativePath/usermanual/functions.html#$funclink.getAttributeValue("name").replace($space,$udsc).replace("(","").replace(")","")">$funclink.getAttributeValue("name")</a>##
-#end
-
-#macro (outputTag $tag)
-<$tag.getName()#getAtts($tag)>##
-#end
-
-#macro (getAtts $tag)
-#foreach ($att in $tag.getAttributes()) $att.getName()="$att.getValue()"#end##
-#end
-
-#macro (outputEndTag $tag)
-</$tag.getName()>##
-#end
-
-#macro (menuchoice $items)
- <span class="menuchoice">
- #foreach ($item in $items.getChildren("guimenuitem"))#guimenuitem($item)#if ($foreach.hasNext)&nbsp;&rarr;&nbsp;#end#end
- #foreach ($item in $items.getChildren("shortcut"))
-  #shortcut($item)
- #end
- </span>
-#end
-
-#macro (guimenuitem $item)<span class="guimenuitem">$item.getText()</span>#end
-
-#macro (shortcut $shortcut)
- (#foreach ($keycombo in $shortcut.getChildren("keycombo"))#keycombo ($keycombo)#end)
-#end
-
-#macro (keycombo $combo)<span class="keycombo">#foreach ($key in $combo.getChildren("keysym"))#keysym($key)#if ($foreach.hasNext)&nbsp;+&nbsp;#end#end</span>#end
-
-#macro (keysym $keysym)<span class="keysym">$keysym.getText()</span>#end
-
-#macro (runloop $itemToLoop)
-#foreach ($node in $itemToLoop.getContent())
-#if($node.getClass().getName().indexOf("Element") > -1)
-#unknown($node)##
-#else
-$escape.getText($node.getText())##
-#end
-#end
-#end
-
-#macro ( component $component)
-#set ($width = "")
-#set ($width = $component.getAttributeValue('width') )
-#set ($height = "")
-#set ($height = $component.getAttributeValue('height') )
-#set ($dim= "")
-#if  ("$!width" != "")
-#set ($dim = "width='$width' height='$height'")
-#end
-#set ($screenshot = "")
-#set ($screenshot = $component.getAttributeValue('screenshot') )
-<table border="0" cellspacing="0" cellpadding="2">
-<tr><td>
-<font face="arial,helvetica,sanserif">
-#set ($was = "")
-#set ($was = $component.getAttributeValue("was"))
-#if ("$!was" != "")
-<a name="$was.replace($space,$udsc)"></a>
-#set ($was = " (was: $was)")
-#end
-<h3>
-<a name="$component.getAttributeValue("name").replace($space,$udsc)">$!component.getAttributeValue("index") $component.getAttributeValue("name")$!was</a>
-</h3>
-</font>
-</td></tr>
-#if($component.getAttribute("useinstead"))
-<tr><td bgcolor="#bbbb00"><div align="center"><b>*** This element is deprecated.  Use <a href="$relativePath/usermanual/component_reference.html#$component.getAttributeValue("useinstead").replace($space,$udsc)">$component.getAttributeValue("useinstead")</a> instead ***</b></div></td></tr>
-#end
-<tr><td>
-#foreach ( $items in $component.getChildren() )
-#if ($items.getName().equals("description"))
-#runloop($items)
-#if ("$!screenshot" != "")
-<p><b>Control Panel</b></p>
-<div align="center"><img $dim src="$sshotdir/$screenshot"/></div>
-#end
-#else
-#unknown($items)
-#end
-#end
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-<hr>
-#end
-
-#macro ( subsection $subsection)
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr><td bgcolor="$subbannerbg">
-<font color="$subbannerfg" face="arial,helvetica,sanserif">
-<a name="$subsection.getAttributeValue("anchor")"><strong>$subsection.getAttributeValue("name")</strong></a>
-</font>
-</td></tr>
-<tr><td>
-<blockquote>
-#foreach ( $items in $subsection.getChildren() )
-#if ($items.getName().equals("img"))
-#image ($items)
-#else
-#unknown($items)
-#end
-#end
-</blockquote>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-#end
-
-#macro (pagelinks)
-#if (("$!next" != "") || ("$!prev" != ""))
-<table>
-<tr>
-<td bgcolor="$bannerbg">
-<div align="right"><a href="index.html"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Index</font></a></div>
-</td>
-#if ("$!next" != "")
-<td bgcolor="$bannerbg">
-<div align="right"><a href="$next"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Next</font></a></div>
-</td>
-#end
-#if ("$!prev" != "")
-<td bgcolor="$bannerbg">
-<div align="right"><a href="$prev"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Prev</font></a></div>
-</td>
-#end
-</tr>
-</table>
-#end
-#end
-
-#macro ( section $section)
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr><td bgcolor="$bannerbg">
-<font color="$bannerfg" face="arial,helvetica,sanserif">
-#set ($anchor = $section.getAttributeValue("anchor")) 
-#if($anchor)<a name="$anchor">#end<strong>$section.getAttributeValue("name")</strong>#if($anchor)</a>#end
-</font>
-</td></tr>
-<tr><td>
-<blockquote>
-#foreach ( $items in $section.getChildren() )
-#if ($items.getName().equals("img"))
-#image ($items)
-#else
-#unknown($items)
-#end
-#end
-</blockquote>
-</p>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-#end
-
-#macro ( makeProject )
-#set ($menus = $project.getChild("body").getChildren("menu"))
-#foreach ( $menu in $menus )
-<p><strong>$menu.getAttributeValue("name")</strong></p>
-<ul>
-#foreach ( $item in $menu.getChildren() )
-#set ($name = $item.getAttributeValue("name"))
-<li>#projectanchor($name $item.getAttributeValue("href"))</li>
-#end
-</ul>
-#end
-#end
-
-#macro (makeIndex $subsections)
-#set ($level2 = $root.getAttributeValue("index-level-2"))
-##  Should we display numbers for index level 2 ? (useful for checking numbering)
-#set ($index2 = $root.getAttributeValue("index-numbers"))
-#set ($colbreak = $root.getAttributeValue("colbreak"))
-#if  ("$!colbreak" != "")
-<table width="100%">
-<tr><td valign="top">
-#end
-<ul>
-#foreach ($sect in $subsections)
-#if (("$!colbreak" != "") && ($sect.getAttributeValue("name").startsWith("$colbreak")))
-</ul></td><td valign="top"><ul>
-#end
-<li><a href="#$sect.getAttributeValue("anchor")">$sect.getAttributeValue("name")</a></li>
-#if ("$!level2" != "no" and !$sect.getChildren().isEmpty())
-<ul>
-#foreach ($comp in $sect.getChildren("component"))
-<li>
-#if ("$!index2" == "yes")
-$comp.getAttributeValue("index")
-#end
-#set ($was = $comp.getAttributeValue("was"))
-#if ("$!was" != "")
-#set ($was = " (was: $was)")
-#end
-<a href="#$comp.getAttributeValue("name").replace($space,$udsc)">$comp.getAttributeValue("name")$!was</a></li>
-#end
-</ul>
-#end
-#end
-</ul>
-#if ("$!colbreak" != "")
-</td></tr>
-</table>
-#end
-#end
-
-#macro (getProjectImage)
-#if ($project.getChild("logo"))
-#set ( $logoString = $project.getChild("logo").getAttributeValue("href") )
-#set ( $logoHeight = $project.getChild("logo").getAttributeValue("height") )
-#set ( $logoWidth  = $project.getChild("logo").getAttributeValue("width") )
-<td align="left">
-<a href="http://www.apache.org"><img style="margin: 0px 30px 0px 0px" title="Apache Software Foundation" width="261" height="106" src="$imgdir/asf-logo.png" border="0"/></a>
-</td>
-<td align="right">
-#if ( $logoString.startsWith("/") )
-<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
-#else
-<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath/$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
-#end
-</td>
-#else
-<td colspan="2">
-<a href="http://www.apache.org"><img title="Apache Software Foundation" width="261" height="106" src="$imgdir/asf-logo.png" border="0"/></a>
-</td>
-#end
-#end
-
-#macro (document)
-## ======================================================================
-## Main Page Section -->
-## ======================================================================
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-#set ($authors = $root.getChild("properties").getChildren("author"))
-#foreach ( $au in $authors )
-#metaauthor ( $au.getText() $au.getAttributeValue("email") )
-#end
-#set ($next = "")
-#set ($next = $root.getAttributeValue("next"))
-#set ($prev = "")
-#set ($prev = $root.getAttributeValue("prev"))
-#set ($id = "")
-#set ($id = $root.getAttributeValue("id"))
-
-<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
-<style>
-  .code { font-weight: bold; }
-</style>
-</head>
-
-<body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
-<table border="0" cellspacing="0">
-##<!-- TOP IMAGE -->
-<tr>
-#getProjectImage()
-</tr>
-</table>
-<table border="0" cellspacing="4">
-<tr><td>
-<hr noshade size="1"/>
-</td></tr>
-<tr>
-<td align="left" valign="top">
-#pagelinks()
-<br>
-#if ($root.getAttributeValue("index") == "yes")
-#makeIndex($root.getChild("body").getChildren("section"))
-#end
-#set ($allSections = $root.getChild("body").getChildren("section"))
-#foreach ( $section in $allSections )
-#section ($section)
-#end
-<br>
-#pagelinks()
-</td>
-</tr>
-<tr><td>
-<hr noshade size="1"/>
-</td></tr>
-<tr>
-<td>
-<table width=100%>
-<tr>
-#if ("$!id" != "")
-<td>
-#else
-<td align="center">
-#end
-<font color="$bodylink" size="-1"><em>
-Copyright &copy; 1999-$year, Apache Software Foundation
-</em></font>
-</td>
-#if ("$!id" != "")
-<td align="right">
-<font color="$bodylink" size="-1"><em>
-$id
-</em></font>
-</td>
-#end
-</tr>
-<tr><td colspan="2">
-<div align="center"><font color="$bodylink" size="-1">
-Apache, Apache JMeter, JMeter, the Apache feather, and the Apache JMeter logo are
-trademarks of the Apache Software Foundation.
-</font>
-</div>
-</td></tr>
-</table>
-</td>
-</tr>
-</table>
-</body>
-</html>
-#end
diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
index b94178d3121..b12799e3e13 100644
--- a/xdocs/stylesheets/website-style.xsl
+++ b/xdocs/stylesheets/website-style.xsl
@@ -597,7 +597,7 @@
     <div class="links">
       <div class="title">See also:</div>
       <ul class="links">
-        <xsl:for-each select="link|complink">
+        <xsl:for-each select="link|complink|funclink">
           <li>
             <xsl:choose>
               <xsl:when test="name(.) = 'link'">
@@ -610,6 +610,11 @@
                   <xsl:with-param name="name" select="@name" />
                 </xsl:call-template>
               </xsl:when>
+              <xsl:when test="name(.) = 'funclink'">
+                <xsl:call-template name="funclink">
+                  <xsl:with-param name="name" select="@name" />
+                </xsl:call-template>
+              </xsl:when>
             </xsl:choose>
           </li>
         </xsl:for-each>
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 7f0242357e7..b89c6d9448e 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -225,7 +225,7 @@ apache-jmeter-X.Y/lib/
 apache-jmeter-X.Y/lib/ext
 apache-jmeter-X.Y/lib/junit
 apache-jmeter-X.Y/licenses
-apache-jmeter-X.Y/printable_docs
+apache-jmeter-X.Y/docs
 </source>
 You can rename the parent directory (i.e. <code>apache-jmeter-X.Y</code>) if you want, but do not change any of the sub-directory names.
 </p>
diff --git a/xdocs/velocity.properties b/xdocs/velocity.properties
deleted file mode 100644
index 63f61604ee4..00000000000
--- a/xdocs/velocity.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# set true to debug vsl files
-runtime.references.strict=true
-input.encoding=utf-8
-output.encoding=utf-8

From 15eacb24d909b4185d44debc4ff52b341877a048 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 23 Mar 2026 21:40:04 +0000
Subject: [PATCH 1029/1037] fix(deps): update dependency
 org.apache.mina:mina-core to v2.2.5

---
 src/bom-testing/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 2318ff77694..62af8d9d0e6 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
         api("org.apache.activemq:activemq-spring:6.2.0")
         api("org.apache.ftpserver:ftplet-api:1.2.1")
         api("org.apache.ftpserver:ftpserver-core:1.2.1")
-        api("org.apache.mina:mina-core:2.2.4")
+        api("org.apache.mina:mina-core:2.2.5")
         api("org.hamcrest:hamcrest-core:3.0")
         api("org.hamcrest:hamcrest-library:3.0")
         api("org.hamcrest:hamcrest:3.0")

From e4259c2b4a7bdf32d5206be4c96d2b30bd9b1b4c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 23 Mar 2026 21:38:05 +0000
Subject: [PATCH 1030/1037] fix(deps): update dependency
 commons-logging:commons-logging to v1.3.6

---
 gradle/verification-metadata.xml    | 6 ++++++
 src/bom-thirdparty/build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c8151a6e3fd..ae138570c88 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -211,6 +211,7 @@
          <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29" group="net.javacrumbs.json-unit"/>
          <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146" group="org.apache"/>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup"/>
+         <trusted-key id="F4DD59C90148BDC52BEB90A4530AA5F25C25011F" group="commons-logging"/>
          <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB" group="org.infinispan"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
             <trusting group="org.codehaus.plexus"/>
@@ -703,6 +704,11 @@
             <pgp value="D196A5E3E70732EEB2E5007F1861C322C56014B2"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="97">
+         <artifact name="commons-parent-97.pom">
+            <pgp value="F4DD59C90148BDC52BEB90A4530AA5F25C25011F"/>
+         </artifact>
+      </component>
       <component group="org.apache.geronimo.genesis" name="genesis" version="1.2">
          <artifact name="genesis-1.2.pom">
             <pgp value="B7574789F5018690043E6DD9C212662E12F3E1DD"/>
diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index f1bb20da6c1..178f00c9d2e 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
         api("commons-lang:commons-lang:2.6") {
             because("User might still rely on commons-lang")
         }
-        api("commons-logging:commons-logging:1.3.5")
+        api("commons-logging:commons-logging:1.3.6")
         api("commons-net:commons-net:3.12.0")
         api("dnsjava:dnsjava:3.6.4")
         api("io.burt:jmespath-core:0.6.0")

From e25de766e7ef72dfbfd84b0ac7641310683bd0b5 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 25 Mar 2026 16:42:37 +0300
Subject: [PATCH 1031/1037] Replace vendored matrix_builder with npm
 @vlsi/github-actions-random-matrix

Use the published npm package instead of vendored matrix_builder.js,
converting to ESM modules (.mjs) with seeded RNG from the package.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/main.yml                  |   3 +-
 .github/workflows/{matrix.js => matrix.mjs} |  14 +-
 .github/workflows/matrix_builder.js         | 255 --------------------
 .github/workflows/package-lock.json         |  21 ++
 .github/workflows/package.json              |   7 +
 .gitignore                                  |   1 +
 6 files changed, 38 insertions(+), 263 deletions(-)
 rename .github/workflows/{matrix.js => matrix.mjs} (93%)
 delete mode 100644 .github/workflows/matrix_builder.js
 create mode 100644 .github/workflows/package-lock.json
 create mode 100644 .github/workflows/package.json

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14164ac0797..4a44114626c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,8 @@ jobs:
       - uses: actions/checkout@v6
       - id: set-matrix
         run: |
-          node .github/workflows/matrix.js
+          npm ci --prefix .github/workflows
+          node .github/workflows/matrix.mjs
 
   test:
     needs: matrix_prep
diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.mjs
similarity index 93%
rename from .github/workflows/matrix.js
rename to .github/workflows/matrix.mjs
index aad48000fde..fa4f79ca9db 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.mjs
@@ -1,10 +1,10 @@
 // The script generates a random subset of valid jdk, os, timezone, and other axes.
-// You can preview the results by running "node matrix.js"
+// You can preview the results by running "node matrix.mjs"
 // See https://github.com/vlsi/github-actions-random-matrix
-let fs = require('fs');
-let os = require('os');
-let {MatrixBuilder} = require('./matrix_builder');
-const matrix = new MatrixBuilder();
+import { appendFileSync } from 'fs';
+import { EOL } from 'os';
+import { createGitHubMatrixBuilder } from '@vlsi/github-actions-random-matrix/github';
+const { matrix, random } = createGitHubMatrixBuilder();
 matrix.addAxis({
   name: 'java_distribution',
   values: [
@@ -130,7 +130,7 @@ include.forEach(v => {
       v.oracle_java_website = v.java_version === eaJava ? 'jdk.java.net' : 'oracle.com';
   }
   v.non_ea_java_version = v.java_version === eaJava ? '' : v.java_version;
-  if (v.java_distribution !== 'semeru' && Math.random() > 0.5) {
+  if (v.java_distribution !== 'semeru' && random() > 0.5) {
     // The following options randomize instruction selection in JIT compiler
     // so it might reveal missing synchronization
     v.name += ', stress JIT';
@@ -164,7 +164,7 @@ console.log(include);
 
 let filePath = process.env['GITHUB_OUTPUT'] || '';
 if (filePath) {
-    fs.appendFileSync(filePath, `matrix<<MATRIX_BODY${os.EOL}${JSON.stringify({include})}${os.EOL}MATRIX_BODY${os.EOL}`, {
+    appendFileSync(filePath, `matrix<<MATRIX_BODY${EOL}${JSON.stringify({include})}${EOL}MATRIX_BODY${EOL}`, {
         encoding: 'utf8'
     });
 }
diff --git a/.github/workflows/matrix_builder.js b/.github/workflows/matrix_builder.js
deleted file mode 100644
index 0c17190eded..00000000000
--- a/.github/workflows/matrix_builder.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// License: Apache-2.0
-// Copyright Vladimir Sitnikov, 2021
-// See https://github.com/vlsi/github-actions-random-matrix
-
-class Axis {
-  constructor({name, title, values}) {
-    this.name = name;
-    this.title = title;
-    this.values = values;
-    // If all entries have same weight, the axis has uniform distribution
-    this.uniform = values.reduce((a, b) => a === (b.weight || 1) ? a : 0, values[0].weight || 1) !== 0
-    this.totalWeight = this.uniform ? values.length : values.reduce((a, b) => a + (b.weight || 1), 0);
-  }
-
-  static matches(row, filter) {
-    if (typeof filter === 'function') {
-      return filter(row);
-    }
-    if (Array.isArray(filter)) {
-      // e.g. row={os: 'windows'}; filter=[{os: 'linux'}, {os: 'linux'}]
-      return filter.some(v => Axis.matches(row, v));
-    }
-    if (typeof filter === 'object') {
-      // e.g. row={jdk: {name: 'openjdk', version: 8}}; filter={jdk: {version: 8}}
-      for (const [key, value] of Object.entries(filter)) {
-        if (!row.hasOwnProperty(key) || !Axis.matches(row[key], value)) {
-          return false;
-        }
-      }
-      return true;
-    }
-    return row === filter;
-  }
-
-  pickValue(filter) {
-    let values = this.values;
-    if (filter) {
-      values = values.filter(v => Axis.matches(v, filter));
-    }
-    if (values.length === 0) {
-      const filterStr = typeof filter === 'string' ? filter.toString() : JSON.stringify(filter);
-      throw Error(`No values produces for axis '${this.name}' from ${JSON.stringify(this.values)}, filter=${filterStr}`);
-    }
-    if (values.length === 1) {
-      return values[0];
-    }
-    if (this.uniform) {
-      return values[Math.floor(Math.random() * values.length)];
-    }
-    const totalWeight = !filter ? this.totalWeight : values.reduce((a, b) => a + (b.weight || 1), 0);
-    let weight = Math.random() * totalWeight;
-    for (let i = 0; i < values.length; i++) {
-      const value = values[i];
-      weight -= value.weight || 1;
-      if (weight <= 0) {
-        return value;
-      }
-    }
-    return values[values.length - 1];
-  }
-}
-
-class MatrixBuilder {
-  constructor() {
-    this.axes = [];
-    this.axisByName = {};
-    this.rows = [];
-    this.duplicates = {};
-    this.excludes = [];
-    this.includes = [];
-    this.implications = [];
-    this.failOnUnsatisfiableFilters = false;
-  }
-
-  /**
-   * Specifies include filter (all the generated rows would comply with all the include filters)
-   * @param filter
-   */
-  include(filter) {
-    this.includes.push(filter);
-  }
-
-  /**
-   * Specifies exclude filter (e.g. exclude a forbidden combination).
-   * @param filter
-   */
-  exclude(filter) {
-    this.excludes.push(filter);
-  }
-
-  /**
-   * Adds implication like `antecedent -> consequent`.
-   * In other words, if `antecedent` holds, then `consequent` must also hold.
-   * @param antecedent
-   * @param consequent
-   */
-  imply(antecedent, consequent) {
-    this.implications.push({antecedent: antecedent, consequent: consequent});
-  }
-
-  addAxis({name, title, values}) {
-    const axis = new Axis({name, title, values});
-    this.axes.push(axis);
-    this.axisByName[name] = axis;
-    return axis;
-  }
-
-  setNamePattern(names) {
-    this.namePattern = names;
-  }
-
-  /**
-   * Returns true if the row matches the include and exclude filters.
-   * @param row input row
-   * @returns {boolean}
-   */
-  matches(row) {
-    return (this.excludes.length === 0 || !this.excludes.some(f => Axis.matches(row, f))) &&
-           (this.includes.length === 0 || this.includes.some(f => Axis.matches(row, f))) &&
-           (this.implications.length === 0 || (
-               this.implications.every(i => !Axis.matches(row, i.antecedent) || Axis.matches(row, i.consequent))));
-  }
-
-  failOnUnsatisfiableFilters(value) {
-    this.failOnUnsatisfiableFilters = value;
-  }
-
-  /**
-   * Adds a row that matches the given filter to the resulting matrix.
-   * filter values could be
-   *  - literal values: filter={os: 'windows-latest'}
-   *  - arrays: filter={os: ['windows-latest', 'linux-latest']}
-   *  - functions: filter={os: x => x!='windows-latest'}
-   * @param filter object with keys matching axes names
-   * @returns {*}
-   */
-  generateRow(filter) {
-    let res;
-    if (filter) {
-      // If matching row already exists, no need to generate more
-      res = this.rows.some(v => Axis.matches(v, filter));
-      if (res) {
-        return res;
-      }
-    }
-    for (let i = 0; i < 142; i++) {
-      res = this.axes.reduce(
-        (prev, next) =>
-          Object.assign(prev, {
-            [next.name]: next.pickValue(filter ? filter[next.name] : undefined)
-          }),
-        {}
-      );
-      if (!this.matches(res)) {
-        continue;
-      }
-      const key = JSON.stringify(res);
-      if (!this.duplicates.hasOwnProperty(key)) {
-        this.duplicates[key] = true;
-        res.name =
-          this.namePattern.map(axisName => {
-            let value = res[axisName];
-            const title = value.title;
-            if (typeof title != 'undefined') {
-              return title;
-            }
-            const computeTitle = this.axisByName[axisName].title;
-            if (computeTitle) {
-                return computeTitle(value);
-            }
-            if (typeof value === 'object' && value.hasOwnProperty('value')) {
-                return value.value;
-            }
-            return value;
-          }).filter(Boolean).join(", ");
-        this.rows.push(res);
-        return res;
-      }
-    }
-    const filterStr = typeof filter === 'string' ? filter.toString() : JSON.stringify(filter);
-    const msg = `Unable to generate row for ${filterStr}. Please check include and exclude filters`;
-    if (this.failOnUnsatisfiableFilters) {
-      throw Error(msg);
-    } else {
-      console.warn(msg);
-    }
-  }
-
-  generateRows(maxRows, filter) {
-    for (let i = 0; this.rows.length < maxRows && i < maxRows; i++) {
-      this.generateRow(filter);
-    }
-    return this.rows;
-  }
-
-  /**
-   * Computes the number of all the possible combinations.
-   * @returns {{bad: number, good: number}}
-   */
-  summary() {
-   let position = -1;
-   let indices = [];
-   let values = {};
-   const axes = this.axes;
-   function resetValuesUpTo(nextPosition) {
-     for(let i=0; i<nextPosition; i++) {
-       const axis = axes[i];
-       values[axis.name] = axis.values[0];
-       indices[i] = 1; // next index
-     }
-     position = 0;
-   }
-
-   function nextAvailablePosition() {
-    let size = axes.length;
-    for (let i = position; i < size; i++) {
-      if (indices[i] < axes[i].values.length) {
-        return i;
-      }
-    }
-    return -1;
-   }
-   // The first initialization of the values
-   resetValuesUpTo(this.axes.length);
-   let good = 0;
-   let bad = 0;
-   while (true) {
-     if (indices[position] < this.axes[position].values.length) {
-       // Advance iterator at the current position if possible
-       const axis = this.axes[position];
-       values[axis.name] = axis.values[indices[position]];
-       indices[position]++;
-     } else {
-       // Advance the next iterator, and reset [0..nextPosition)
-       position++;
-       let nextPosition = nextAvailablePosition();
-       if (nextPosition === -1) {
-         break;
-       }
-       const axis = this.axes[nextPosition];
-       values[axis.name] = axis.values[indices[nextPosition]];
-       indices[nextPosition]++;
-       resetValuesUpTo(nextPosition);
-     }
-     if (this.matches(values)) {
-       good++;
-     } else {
-       bad++;
-     }
-   }
-   return {good: good, bad: bad};
-  }
-}
-
-module.exports = {Axis, MatrixBuilder};
diff --git a/.github/workflows/package-lock.json b/.github/workflows/package-lock.json
new file mode 100644
index 00000000000..8e51ba5949a
--- /dev/null
+++ b/.github/workflows/package-lock.json
@@ -0,0 +1,21 @@
+{
+  "name": "workflows",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@vlsi/github-actions-random-matrix": "2.0.0"
+      }
+    },
+    "node_modules/@vlsi/github-actions-random-matrix": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@vlsi/github-actions-random-matrix/-/github-actions-random-matrix-2.0.0.tgz",
+      "integrity": "sha512-8lEb4eadMBKs+Hnj9dCmcHtgHoWelT4RMXAQ/VcQ1r3vjR8P2hSMVGhkRXaXibCBf0lMttS934CGo2mlBMopPA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=16"
+      }
+    }
+  }
+}
diff --git a/.github/workflows/package.json b/.github/workflows/package.json
new file mode 100644
index 00000000000..a66b1aa6f43
--- /dev/null
+++ b/.github/workflows/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "@vlsi/github-actions-random-matrix": "2.0.0"
+  }
+}
diff --git a/.gitignore b/.gitignore
index b4714dd560d..31dc34b4b3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ jmeter-fb.*
 *.iml
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+node_modules
 hs_err_pid*
 # other jvm related files
 .attach_*

From 061e587d88a12a1f81cf584cbfd195a2b0f2c2ce Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 23 Mar 2026 00:58:07 +0000
Subject: [PATCH 1032/1037] chore(deps): update release-drafter/release-drafter
 digest to 6a93d82

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 29c94025058..0ffcc9b1bdd 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -40,7 +40,7 @@ jobs:
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
-        uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6
+        uses: release-drafter/release-drafter@6a93d829887aa2e0748befe2e808c66c0ec6e4c7 # v6
         id: prepare_release
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:

From 30f2456ff24fbab7e39b2db920bda74fe1cd75c8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 25 Mar 2026 14:11:49 +0000
Subject: [PATCH 1033/1037] fix(deps): update dependency
 com.fasterxml.jackson:jackson-bom to v2.21.2

---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 178f00c9d2e..54e32a4f729 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -28,7 +28,7 @@ javaPlatform {
 dependencies {
     api(platform("org.apache.groovy:groovy-bom:5.0.4"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
-    api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
+    api(platform("com.fasterxml.jackson:jackson-bom:2.21.2"))
 
     constraints {
         // api means "the dependency is for both compilation and runtime"

From 94c94b75446fdf32b3d5dcbfee7254e1b36e304c Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 25 Mar 2026 19:35:18 +0300
Subject: [PATCH 1034/1037] chore: print stacktrace on the console should the
 test timeout

See https://github.com/apache/jmeter/issues/6681
---
 .../jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index a82326e5b42..1b158961647 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -42,5 +42,6 @@ tasks.configureEach<Test> {
         value?.let { systemProperty(name, it) }
     }
     passProperty("junit.jupiter.execution.parallel.enabled", "true")
+    passProperty("junit.jupiter.execution.timeout.threaddump.enabled", "true")
     passProperty("junit.jupiter.execution.timeout.default", "2 m")
 }

From d820a2e1cce91a4bf7c23c8c68c0bc036322039f Mon Sep 17 00:00:00 2001
From: KingRabbid <13966341+KingRabbid@users.noreply.github.com>
Date: Mon, 6 Oct 2025 13:37:17 +0300
Subject: [PATCH 1035/1037] fix: Fix File->Open recent showing old files across
 multiple JVMs

Closes #6509
---
 .../jmeter/gui/action/LoadRecentProject.java  | 15 +++++++++++
 .../apache/jmeter/gui/util/JMeterMenuBar.java | 26 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 3 files changed, 42 insertions(+)

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
index 127eb304cc1..db29326791d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -34,6 +35,9 @@
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.auto.service.AutoService;
 
 /**
@@ -47,6 +51,7 @@ public class LoadRecentProject extends Load {
     /** The number of menu items used for recent files */
     private static final int NUMBER_OF_MENU_ITEMS = 9;
     private static final Set<String> commands = new HashSet<>();
+    private static final Logger log = LoggerFactory.getLogger(LoadRecentProject.class);
 
     static {
         commands.add(ActionNames.OPEN_RECENT);
@@ -89,6 +94,11 @@ private static File getRecentFile(ActionEvent e) {
      * @return a List of JMenuItem, representing recent files. JMenuItem may not be visible
      */
     public static List<JComponent> getRecentFileMenuItems() {
+        try {
+            prefs.sync();
+        } catch (BackingStoreException e) {
+            log.warn("Unable to sync preferences for recent files", e);
+        }
         List<JComponent> menuItems = new ArrayList<>();
         // Get the preference for the recent files
         for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) {
@@ -223,6 +233,11 @@ public static String getRecentFile(int index) {
      */
     private static void setRecentFile(int index, String fileName) {
         prefs.put(USER_PREFS_KEY + index, fileName);
+        try {
+            prefs.flush();
+        } catch (BackingStoreException e) {
+            log.warn("Unable to flush preferences for recent files", e);
+        }
     }
 
     private static void removeRecentFile(int index) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index b5fed49b826..48ede565b83 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -39,6 +39,8 @@
 import javax.swing.MenuElement;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.action.ActionNames;
@@ -530,6 +532,30 @@ private void makeFileMenu() {
         fileLoadRecentFiles.forEach(jc -> recentFilesOpen.add(jc));
         recentFilesOpen.setEnabled(LoadRecentProject.hasVisibleMenuItem(fileLoadRecentFiles));
 
+        // Add menu listener to refresh recent files when menu is selected
+        recentFilesOpen.addMenuListener(new MenuListener() {
+            @Override
+            public void menuSelected(MenuEvent e) {
+                // Clear existing recent files from menu
+                recentFilesOpen.removeAll();
+
+                // Reload recent files
+                fileLoadRecentFiles = LoadRecentProject.getRecentFileMenuItems();
+                fileLoadRecentFiles.forEach(jc -> recentFilesOpen.add(jc));
+                recentFilesOpen.setEnabled(LoadRecentProject.hasVisibleMenuItem(fileLoadRecentFiles));
+            }
+
+            @Override
+            public void menuDeselected(MenuEvent e) {
+                // Not needed
+            }
+
+            @Override
+            public void menuCanceled(MenuEvent e) {
+                // Not needed
+            }
+        });
+
         addPluginsMenuItems(fileMenu, menuCreators, MENU_LOCATION.FILE);
 
         // When JMeter menu is integrated with macOS system menu, there's no need in extra "exit"
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ae1bf095044..0b6213fd252 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -70,6 +70,7 @@ Summary
     <li><issue>6352</issue> Calculate delays in Open Model Thread Group and Precise Throughput
         Timer relative to start of Thread Group instead of the start of the test.</li>
     <li><issue>6357</issue><pr>6358</pr> Ensure writable directories when copying template files while report generation.</li>
+    <li><pr>6509</pr><pr>6675</pr> Synchronize recent file menu across multiple JVMs. Contributed by Corneliu C (https://github.com/KingRabbid)</li>
   </ul>
 
   <h3>HTTP Samplers and Test Script Recorder</h3>

From 34605e4b447bc9e0cf6474129201850f3588a8a3 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 3 Apr 2026 13:28:15 +0200
Subject: [PATCH 1036/1037] chore: update rhino to 1.9.1

and add rhino-engine to re-enable support of jsr223 with javascript.
---
 src/bom-thirdparty/build.gradle.kts         |  3 ++-
 src/core/build.gradle.kts                   |  1 +
 src/dist/src/dist/expected_release_jars.csv | 13 +++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index 54e32a4f729..51d51af50c7 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -137,7 +137,8 @@ dependencies {
         api("org.jodd:jodd-log:5.1.6")
         api("org.jodd:jodd-props:6.0.2")
         api("org.jsoup:jsoup:1.21.2")
-        api("org.mozilla:rhino:1.8.0")
+        api("org.mozilla:rhino:1.9.1")
+        api("org.mozilla:rhino-engine:1.9.1")
         api("org.neo4j.driver:neo4j-java-driver:6.0.2")
         api("org.slf4j:jcl-over-slf4j:1.7.36")
         api("org.slf4j:slf4j-api:1.7.36")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index e654f4d8343..c7785a39699 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -115,6 +115,7 @@ dependencies {
     implementation("org.jodd:jodd-core")
     implementation("org.jodd:jodd-props")
     implementation("org.mozilla:rhino")
+    implementation("org.mozilla:rhino-engine")
     implementation("org.slf4j:jcl-over-slf4j")
 
     testImplementation("commons-net:commons-net")
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 8a081ba6985..01ee126af4f 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -32,7 +32,7 @@
 558963,commons-jexl3-3.5.0.jar
 931901,commons-jvm-4.8.0.jar
 709075,commons-lang3-3.19.0.jar
-73737,commons-logging-1.3.5.jar
+74010,commons-logging-1.3.6.jar
 2213560,commons-math3-3.6.1.jar
 330333,commons-net-3.12.0.jar
 152289,commons-pool2-2.12.1.jar
@@ -72,9 +72,9 @@
 327891,httpcore-4.4.16.jar
 368896,httpcore-nio-4.4.16.jar
 41727,httpmime-4.5.14.jar
-79195,jackson-annotations-2.20.jar
-593176,jackson-core-2.20.1.jar
-1688480,jackson-databind-2.20.1.jar
+82104,jackson-annotations-2.21.jar
+595531,jackson-core-2.21.2.jar
+1701926,jackson-databind-2.21.2.jar
 58964,jakarta.jms-api-3.1.0.jar
 78030,javax.activation-1.2.0.jar
 142391,jcharts-0.7.5.jar
@@ -143,8 +143,9 @@
 1498253,plot-stem-jvm-4.8.0.jar
 11640,reactive-streams-1.0.4.jar
 1897776,reactor-core-3.7.12.jar
-1262303,rhino-1.8.0.jar
-1330468,rsyntaxtextarea-3.6.1.jar
+1647024,rhino-1.9.1.jar
+15019,rhino-engine-1.9.1.jar
+1340299,rsyntaxtextarea-3.6.2.jar
 5783933,Saxon-HE-12.9.jar
 283536,serializer-2.7.3.jar
 69908,slf4j-api-2.0.17.jar

From 170647bdeadfec6a903b7ac653a5bd4480989d9d Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 31 Mar 2026 18:53:21 +0200
Subject: [PATCH 1037/1037] docs: add some entries to changes.xml and clean up
 docs for js

---
 xdocs/changes.xml | 81 +++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0b6213fd252..988377c81b1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -71,17 +71,50 @@ Summary
         Timer relative to start of Thread Group instead of the start of the test.</li>
     <li><issue>6357</issue><pr>6358</pr> Ensure writable directories when copying template files while report generation.</li>
     <li><pr>6509</pr><pr>6675</pr> Synchronize recent file menu across multiple JVMs. Contributed by Corneliu C (https://github.com/KingRabbid)</li>
+    <li><pr>6596</pr>Fallback to English locale when loading test plans that use string values for enum properties, so old sample plans load correctly even with non-English locales.</li>
   </ul>
 
   <h3>HTTP Samplers and Test Script Recorder</h3>
   <ul>
     <li><pr>5891</pr>Skip Internet Explorer 6-9 conditional comment processing when fetching resource links</li>
+    <li><issue>5466</issue>Allow enabling or disabling individual HTTP request arguments in the HTTP Sampler UI. Contributed by Pasquale Pochop (github.com/pochopsp)</li>
+    <li><issue>6250</issue>Avoid adding "; charset=" automatically to <code>multipart/form-data</code> requests to align behavior with modern HTTP clients.</li>
+    <li><issue>6080</issue>Preserve the original HTTP method when following 307 and 308 redirects according to the HTTP specification. Contributed by LeeJiWon (github.com/dlwldnjs1009)</li>
+    <li><issue>6267</issue><pr>6268</pr>Add a space between key and value after <code>:</code> in View Results Tree &gt; Sampler result tab for better readability.</li>
+  </ul>
+
+  <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+  <ul>
+    <li><issue>6448</issue>Support trailing empty default values in JSON Extractor so expressions like <code>${VAR:-}</code> are handled correctly. Contributed by Raul Almeida (github.com/ratacolita)</li>
+    <li><pr>6596</pr>Add a schema for ConstantThroughputTimer and use it to ensure required properties are initialized properly.</li>
+  </ul>
+
+  <h3>Non-functional changes</h3>
+  <ul>
+    <li>Update Apache Tika to 3.x from 1.x to use the latest parser engine.</li>
+    <li>Update Saxon-HE to 12.x from 11.x for XSLT and XQuery processing.</li>
+    <li>Update Groovy to 5.x for the Groovy-based scripting environment.</li>
+    <li>Update Bouncy Castle to 1.82 for cryptographic operations.</li>
+    <li>Update json-path to 2.10.0 for JSON query expressions.</li>
+    <li>Update Neo4j Java driver to 6.x for Bolt-based database tests.</li>
+    <li>Update Rhino JavaScript engine to 1.8.0 for JSR-223 JavaScript execution.</li>
+  </ul>
+
+  <h3>UI</h3>
+  <ul>
+    <li><pr>6333</pr>Apply HiDPI mode automatically when setting up the GUI so JMeter looks sharp on high-resolution displays. Contributed by Gabriele Coletta (github.com/gdmg92)</li>
+    <li><pr>6656</pr>Replace the previous feather icon with the new oak leaf in the JMeter logo.</li>
   </ul>
 
   <ch_section>Bug fixes</ch_section>
   <h3>General</h3>
   <ul>
     <li><pr>6654</pr><issue>6611</issue>Support JDK 25 and above for result collectors with empty file names</li>
+    <li>Trim whitespace when parsing numeric JMeter properties so accidental spaces do not silently change configuration values.</li>
+    <li><pr>6372</pr>Fix KeyManager logging when using CLI mode so keystore passwords are not incorrectly reported as missing. Contributed by Patrick Uiterwijk (patrick at puiterwijk.org)</li>
+    <li><issue>5937</issue>Remove deprecated Log4j package scanning and configure plugin metadata processing to improve startup time and avoid deprecation warnings. Contributed by Piotr P. Karwasz (github.com/piotrgithub)</li>
+    <li><pr>6620</pr>Fix report generation paths so dashboard output files are created in the correct location after internal refactoring.</li>
+    <li><bug>6456</bug>Handle malformed percent-encoded URLs gracefully when recording HTTP traffic, logging a warning instead of failing the recording.</li>
   </ul>
  <!--  =================== Thanks =================== -->
 
@@ -89,6 +122,11 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+  <li>Raul Almeida (github.com/ratacolita)</li>
+  <li>Pasquale Pochop (github.com/pochopsp)</li>
+  <li>Gabriele Coletta (github.com/gdmg92)</li>
+  <li>Patrick Uiterwijk (patrick at puiterwijk.org)</li>
+  <li>Piotr P. Karwasz (github.com/piotrgithub)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
@@ -134,41 +172,24 @@ See  <bugzilla>56357</bugzilla> for details.
 </li>
 
 <li>
-Since Java 11 the JavaScript implementation <a href="https://openjdk.java.net/jeps/335">Nashorn has been deprecated</a>.
-Java will emit the following deprecation warnings, if you are using JavaScript based on Nashorn.
-<source>
-Warning: Nashorn engine is planned to be removed from a future JDK release
-</source>
-To silence these warnings, add <code>-Dnashorn.args=--no-deprecation-warning</code> to your Java arguments.
-That can be achieved by setting the enviroment variable <code>JVM_ARGS</code>
-<source>
-export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
-</source>
-</li>
-
-<li>
-With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
-  <dl>
-    <dt>Use Mozilla Rhino</dt>
-    <dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-engine-1.7.14.jar">rhino-engine-1.7.14.jar</a> into <code>$JMETER_HOME/lib/ext</code>.</dd>
-    <dt>Use OpenJDK Nashorn</dt>
-    <dd>
-      The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 (or later) and its dependencies and set the module path is outlined below:
-      <source>
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>.
+JMeter now ships with a JSR-223 compatible JavaScript engine by default (Mozilla Rhino 1.8.0),
+so you do not need to download Rhino separately anymore.<br></br>
+If you prefer to use Nashorn instead, you can still add it as a module. One way to download
+version 15.7 (or later) and its dependencies and set the module path is outlined below:
+  <source>
 mkdir lib/modules
 pushd lib/modules
-wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.4/nashorn-core-15.4.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6/asm-util-9.6.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar
-wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.7/nashorn-core-15.7.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.9.1/asm-9.9.1.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.9.1/asm-commons-9.9.1.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.9.1/asm-util-9.9.1.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.9.1/asm-tree-9.9.1.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.9.1/asm-analysis-9.9.1.jar
 popd
 export JVM_ARGS="--module-path $PWD/lib/modules"
 ./bin/jmeter
-      </source>
-    </dd>
-  </dl>
+  </source>
 </li>
 
 </ul>